X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fdepends.c;h=6ac31cdc5ebce5e973c1b34b9c506c3672fa7ada;hp=5878ef61e0f1cf9a536e06dede43a67c04370391;hb=bbd7380019f3ea4629d170af24b902bf734c83ea;hpb=a8b248ea9de55316cac4423a99a727ca7b54e0fc diff --git a/tools/depends.c b/tools/depends.c index 5878ef61..6ac31cdc 100644 --- a/tools/depends.c +++ b/tools/depends.c @@ -2,10 +2,15 @@ #include #include #include +#include #include "tools.h" +#include +#include +#include #include #include #include +#include static char ** __attribute__((format(printf, 3, 4))) lines_from_cmd(const void *ctx, unsigned int *num, char *format, ...) @@ -30,34 +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) -{ - unlink(infofile); - return 0; -} - -/* Be careful about trying to compile over running programs (parallel make) */ +/* 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) { - char *infofile = talloc_asprintf(ctx, "%s/_info.%u", dir, getpid()); - char *cmd = talloc_asprintf(ctx, "cc " CFLAGS " -o %s %s/_info.c", - infofile, dir); - talloc_set_destructor(infofile, unlink_info); - if (system(cmd) != 0) + char *info_c_file, *info, *ccandir, *compiled; + size_t len; + int fd; + + /* 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 = temp_file(ctx, ".c"); + 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; - return infofile; + if (close(fd) != 0) + return NULL; + + ccandir = talloc_dirname(ctx, dir); + *strrchr(ccandir, '/') = '\0'; + + compiled = temp_file(ctx, ""); + 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, unsigned int *num) +static char **get_one_deps(const void *ctx, const char *dir, + unsigned int *num, char **infofile) { - char **deps, *cmd, *infofile; + char **deps, *cmd; - infofile = compile_info(ctx, dir); - if (!infofile) - errx(1, "Could not compile _info for '%s'", dir); + 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); @@ -93,12 +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, 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/_info.c", dir); + fname = talloc_asprintf(ctx, "%s/_info", dir); raw = grab_file(fname, fname, NULL); if (!raw) errx(1, "Could not open %s", fname); @@ -112,6 +136,10 @@ static char **get_one_safe_deps(const void *ctx, char *str; unsigned int len; + /* Ignore lines starting with # (e.g. #include) */ + if (lines[i][0] == '#') + continue; + /* Start of line, or after ". */ if (strstarts(lines[i], "ccan/")) str = lines[i]; @@ -147,20 +175,27 @@ 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, - char **(*get_one)(const void *, const char *, unsigned int *)) + char **infofile, + char **(*get_one)(const void *, const char *, + unsigned int *, char **)) { char **deps; unsigned int i, num; - deps = get_one(ctx, dir, &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, deps[i], &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++) { @@ -175,21 +210,50 @@ get_all_deps(const void *ctx, const char *dir, return deps; } -char **get_deps(const void *ctx, const char *dir, bool recurse) +char **get_libs(const void *ctx, const char *dir, + unsigned int *num, char **infofile) +{ + char **libs, *cmd; + + 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); + 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, + bool recurse, char **infofile) { + char *temp = NULL, **ret; + if (!infofile) + infofile = &temp; + if (!recurse) { unsigned int num; - return get_one_deps(ctx, dir, &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, get_one_deps); + return ret; } -char **get_safe_ccan_deps(const void *ctx, const char *dir, bool recurse) +char **get_safe_ccan_deps(const void *ctx, const char *dir, + bool recurse, char **infofile) { if (!recurse) { unsigned int num; - return get_one_safe_deps(ctx, dir, &num); + return get_one_safe_deps(ctx, dir, &num, infofile); } - return get_all_deps(ctx, dir, get_one_safe_deps); + return get_all_deps(ctx, dir, infofile, get_one_safe_deps); } -