X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Ftools.h;h=8d1ae04887493206107990ec810c209e475f1cb0;hp=f3e132d97a37110c92da61ba48d3f82e7c46f3e8;hb=de28abde1337e9255812ba720ffeef2c83a25dde;hpb=6165b3afe402099a7473a1f518dc26ea3b74ee84 diff --git a/tools/tools.h b/tools/tools.h index f3e132d9..8d1ae048 100644 --- a/tools/tools.h +++ b/tools/tools.h @@ -53,7 +53,7 @@ bool move_file(const char *oldname, const char *newname); /* 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 *basename, bool in_pwd, +char *link_objects(const void *ctx, const char *basename, const char *objs, char **errmsg); /* Compile a single C file to an object file. Returns false if fails. */ bool compile_object(const void *ctx, const char *cfile, const char *ccandir, @@ -66,9 +66,8 @@ bool compile_and_link(const void *ctx, const char *cfile, const char *ccandir, const char *compiler, const char *cflags, const char *libs, const char *outfile, char **output); -/* 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); +/* Returns a file in temp_dir() */ +char *temp_file(const void *ctx, const char *extension, const char *srcname); /* Default wait for run_command. Should never time out. */ extern const unsigned int default_timeout_ms; @@ -76,4 +75,6 @@ extern const unsigned int default_timeout_ms; /* Talloc destructor which unlinks file. */ int unlink_file_destructor(char *filename); +/* Get ccan/ top dir, given a directory within it. */ +const char *find_ccan_dir(const char *base); #endif /* CCAN_TOOLS_H */