X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Ftools.h;h=0ea4a6cdcdc6c26b84f436e9f3036cb2a9f3b509;hp=34c2f99ff1253fe38a888fe697c79f9bb07fb323;hb=09fde153ba7a68715dcad3b53cbbb8804c3d2356;hpb=354c772e913d137034d5bcd00efdcb880697532e

diff --git a/tools/tools.h b/tools/tools.h
index 34c2f99f..0ea4a6cd 100644
--- a/tools/tools.h
+++ b/tools/tools.h
@@ -8,8 +8,9 @@
 
 #define SPACE_CHARS	" \f\n\r\t\v"
 
-/* FIXME: Nested functions break with -Wmissing-prototypes -Wmissing-declarations */
-#define CFLAGS "-g -Wall -Wundef -Wstrict-prototypes -Wold-style-definition -Werror -I../.."
+#define CFLAGS "-g -Wall -Wundef -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes -Wold-style-definition -Werror"
+
+#define COVERAGE_CFLAGS "-fprofile-arcs -ftest-coverage"
 
 /* This actually compiles and runs the info file to get dependencies. */
 char **get_deps(const void *ctx, const char *dir, bool recurse,
@@ -24,11 +25,15 @@ char **get_libs(const void *ctx, const char *dir,
 		unsigned int *num, char **infofile);
 
 /* From tools.c */
+/* If set, print all commands run, all output they give and exit status. */
+extern bool tools_verbose;
 char *talloc_basename(const void *ctx, const char *dir);
 char *talloc_dirname(const void *ctx, const char *dir);
 char *talloc_getcwd(const void *ctx);
-char *run_command(const void *ctx, const char *fmt, ...);
-char *temp_file(const void *ctx, const char *extension);
+char *run_command(const void *ctx, unsigned int *time_ms, const char *fmt, ...);
+char *run_with_timeout(const void *ctx, const char *cmd,
+		       bool *ok, unsigned *timeout_ms);
+char *temp_dir(const void *ctx);
 bool move_file(const char *oldname, const char *newname);
 
 /* From compile.c.
@@ -36,13 +41,26 @@ bool move_file(const char *oldname, const char *newname);
  * These all compile into a temporary dir, and return the filename.
  * On failure they return NULL, and errmsg is set to compiler output.
  */
+/* If set, say what we're compiling to. */
+extern bool compile_verbose;
 /* Compile multiple object files into a single. */
-char *link_objects(const void *ctx, const char *objs, char **errmsg);
+char *link_objects(const void *ctx, const char *basename, bool in_pwd,
+		   const char *objs, char **errmsg);
 /* Compile a single C file to an object file.  Returns errmsg if fails. */
 char *compile_object(const void *ctx, const char *cfile, const char *ccandir,
-		     char **errmsg);
-/* Compile and link single C file, with object files, libs, etc. */
+		     const char *extra_cflags,
+		     const char *outfile);
+/* Compile and link single C file, with object files, libs, etc.  NULL on
+ * success, error output on fail. */
 char *compile_and_link(const void *ctx, const char *cfile, const char *ccandir,
 		       const char *objs, const char *extra_cflags,
-		       const char *libs, char **errmsg);
+		       const char *libs, const char *outfile);
+
+/* If in_pwd is false, return a file int temp_dir, otherwise a local file. */
+char *maybe_temp_file(const void *ctx, const char *extension, bool in_pwd,
+		      const char *srcname);
+
+/* Default wait for run_command.  Should never time out. */
+extern const unsigned int default_timeout_ms;
+
 #endif /* CCAN_TOOLS_H */