X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fdepends.c;h=e2666d97f778ae2007127561b22415117cba9875;hp=203788fe9bed29dff55021eb6cf23bef442bfa54;hb=ad3f309e3c13d6b88864aab146895c9df9bc6e5b;hpb=61088f5c752c555172e2ab6cf93a7967f79f3f2c diff --git a/tools/depends.c b/tools/depends.c index 203788fe..e2666d97 100644 --- a/tools/depends.c +++ b/tools/depends.c @@ -2,7 +2,11 @@ #include #include #include +#include #include "tools.h" +#include +#include +#include #include #include #include @@ -31,36 +35,51 @@ lines_from_cmd(const void *ctx, unsigned int *num, char *format, ...) return strsplit(ctx, buffer, "\n", num); } -static int unlink_info(char *infofile) +/* Be careful about trying to compile over running programs (parallel make). + * temp_file helps here. */ +static char *compile_info(const void *ctx, const char *dir) { - unlink(infofile); - return 0; -} + char *info_c_file, *info, *ccandir, *compiled; + size_t len; + int fd; -/* Be careful about trying to compile over running programs (parallel make) */ -static char *compile_info(const void *ctx, const char *dir, const char *name) -{ - char *infofile = talloc_asprintf(ctx, "%s/info.%u", dir, getpid()); - char *cmd = talloc_asprintf(ctx, "cc " CFLAGS - " -o %s -x c %s/%s/_info", - infofile, dir, name); - talloc_set_destructor(infofile, unlink_info); - if (system(cmd) != 0) + /* Copy it to a file with proper .c suffix. */ + info = grab_file(ctx, talloc_asprintf(ctx, "%s/_info", dir), &len); + if (!info) + return NULL; + + info_c_file = maybe_temp_file(ctx, ".c", false, "_info"); + fd = open(info_c_file, O_WRONLY|O_CREAT|O_EXCL, 0600); + if (fd < 0) return NULL; + if (!write_all(fd, info, len)) + return NULL; + + if (close(fd) != 0) + return NULL; + + ccandir = talloc_dirname(ctx, dir); + *strrchr(ccandir, '/') = '\0'; - return infofile; + compiled = maybe_temp_file(ctx, "", false, "info"); + if (compile_and_link(ctx, info_c_file, ccandir, "", "", "", + compiled)) + return NULL; + return compiled; } static char **get_one_deps(const void *ctx, const char *dir, - const char *name, unsigned int *num) + unsigned int *num, char **infofile) { - char **deps, *cmd, *infofile; + char **deps, *cmd; - infofile = compile_info(ctx, dir, name); - if (!infofile) - errx(1, "Could not compile _info for '%s'", name); + if (!*infofile) { + *infofile = compile_info(ctx, dir); + if (!*infofile) + errx(1, "Could not compile _info for '%s'", dir); + } - cmd = talloc_asprintf(ctx, "%s depends", infofile); + cmd = talloc_asprintf(ctx, "%s depends", *infofile); deps = lines_from_cmd(cmd, num, "%s", cmd); if (!deps) err(1, "Could not run '%s'", cmd); @@ -96,13 +115,14 @@ static char *replace(const void *ctx, const char *src, /* This is a terrible hack. We scan for ccan/ strings. */ static char **get_one_safe_deps(const void *ctx, - const char *dir, const char *name, - unsigned int *num) + const char *dir, + unsigned int *num, + char **infofile) { char **deps, **lines, *raw, *fname; unsigned int i, n = 0; - fname = talloc_asprintf(ctx, "%s/%s/_info", dir, name); + fname = talloc_asprintf(ctx, "%s/_info", dir); raw = grab_file(fname, fname, NULL); if (!raw) errx(1, "Could not open %s", fname); @@ -154,23 +174,28 @@ static bool have_dep(char **deps, unsigned int num, const char *dep) /* Gets all the dependencies, recursively. */ static char ** -get_all_deps(const void *ctx, const char *dir, const char *name, - char **(*get_one)(const void *, const char *, const char *, - unsigned int *)) +get_all_deps(const void *ctx, const char *dir, + char **infofile, + char **(*get_one)(const void *, const char *, + unsigned int *, char **)) { char **deps; unsigned int i, num; - deps = get_one(ctx, dir, name, &num); + deps = get_one(ctx, dir, &num, infofile); for (i = 0; i < num; i++) { char **newdeps; unsigned int j, newnum; + char *subinfo = NULL; + char *subdir; if (!strstarts(deps[i], "ccan/")) continue; - newdeps = get_one(ctx, dir, deps[i] + strlen("ccan/"), - &newnum); + subdir = talloc_asprintf(ctx, "%s/%s", + talloc_dirname(ctx, dir), + deps[i] + strlen("ccan/")); + newdeps = get_one(ctx, subdir, &newnum, &subinfo); /* Should be short, so brute-force out dups. */ for (j = 0; j < newnum; j++) { @@ -186,37 +211,49 @@ get_all_deps(const void *ctx, const char *dir, const char *name, } char **get_libs(const void *ctx, const char *dir, - const char *name, unsigned int *num) + unsigned int *num, char **infofile) { - char **libs, *cmd, *infofile; + char **libs, *cmd; - infofile = compile_info(ctx, dir, name); - if (!infofile) - errx(1, "Could not compile _info for '%s'", name); + if (!*infofile) { + *infofile = compile_info(ctx, dir); + if (!*infofile) + errx(1, "Could not compile _info for '%s'", dir); + } - cmd = talloc_asprintf(ctx, "%s libs", infofile); + cmd = talloc_asprintf(ctx, "%s libs", *infofile); libs = lines_from_cmd(cmd, num, "%s", cmd); if (!libs) err(1, "Could not run '%s'", cmd); return libs; } -char **get_deps(const void *ctx, const char *dir, const char *name, - bool recurse) +char **get_deps(const void *ctx, const char *dir, + bool recurse, char **infofile) { + char *temp = NULL, **ret; + if (!infofile) + infofile = &temp; + if (!recurse) { unsigned int num; - return get_one_deps(ctx, dir, name, &num); + ret = get_one_deps(ctx, dir, &num, infofile); + } else + ret = get_all_deps(ctx, dir, infofile, get_one_deps); + + if (infofile == &temp && temp) { + unlink(temp); + talloc_free(temp); } - return get_all_deps(ctx, dir, name, get_one_deps); + return ret; } char **get_safe_ccan_deps(const void *ctx, const char *dir, - const char *name, bool recurse) + bool recurse, char **infofile) { if (!recurse) { unsigned int num; - return get_one_safe_deps(ctx, dir, name, &num); + return get_one_safe_deps(ctx, dir, &num, infofile); } - return get_all_deps(ctx, dir, name, get_one_safe_deps); + return get_all_deps(ctx, dir, infofile, get_one_safe_deps); }