X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Ftools.h;h=9a4082db63caf35a04b218ee42b4c1812476a58c;hp=841265f99ad914e58ffcd918ffa926dd2f00a857;hb=175ca4aa64c3489011b441a8c709693af1e70db0;hpb=437fa285d12183a0f1e7450b3a01cbe5620a3507

diff --git a/tools/tools.h b/tools/tools.h
index 841265f9..9a4082db 100644
--- a/tools/tools.h
+++ b/tools/tools.h
@@ -1,17 +1,52 @@
 #ifndef CCAN_TOOLS_H
 #define CCAN_TOOLS_H
+#include <stdbool.h>
 
-#define CFLAGS "-O3 -Wall -Wundef -Wstrict-prototypes -Wold-style-definition -Wmissing-prototypes -Wmissing-declarations -Werror -I."
+#define IDENT_CHARS	"ABCDEFGHIJKLMNOPQRSTUVWXYZ" \
+			"abcdefghijklmnopqrstuvwxyz" \
+			"01234567889_"
 
-char **split(const void *ctx, const char *text, const char *delims,
-	     unsigned int *nump);
+#define SPACE_CHARS	" \f\n\r\t\v"
 
-char **get_deps(const void *ctx, const char *dir);
+/* FIXME: Nested functions break with -Wmissing-prototypes -Wmissing-declarations */
+#define CFLAGS "-g -Wall -Wundef -Wstrict-prototypes -Wold-style-definition -Werror -I../.."
 
-void *grab_fd(const void *ctx, int fd);
-void *grab_file(const void *ctx, const char *filename);
+/* This actually compiles and runs the info file to get dependencies. */
+char **get_deps(const void *ctx, const char *dir, bool recurse,
+		char **infofile);
 
-#define streq(a,b) (strcmp((a),(b)) == 0)
+/* This is safer: just looks for ccan/ strings in info */
+char **get_safe_ccan_deps(const void *ctx, const char *dir,
+			  bool recurse, char **infofile);
 
-#endif /* CCAN_TOOLS_H */
+/* This also needs to compile the info file. */
+char **get_libs(const void *ctx, const char *dir,
+		unsigned int *num, char **infofile);
+
+/* From tools.c */
+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, unsigned int *time_ms, const char *fmt, ...);
+char *temp_file(const void *ctx, const char *extension);
+bool move_file(const char *oldname, const char *newname);
+
+/* From compile.c.
+ *
+ * These all compile into a temporary dir, and return the filename.
+ * On failure they return NULL, and errmsg is set to compiler output.
+ */
+/* Compile multiple object files into a single. */
+char *link_objects(const void *ctx, 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. */
+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);
 
+/* Default wait for run_command.  Should never time out. */
+extern const unsigned int default_timeout_ms;
+
+#endif /* CCAN_TOOLS_H */