X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fdepends.c;h=ee39a12f134e4405c98f45f10cefe9fff829752a;hp=d215441eead6acebe84b629d2b3c855b4191098c;hb=fee8416f9d5c23f05d0c4fc57cfb56aaf91c0769;hpb=023f704e8089f64bd7a77bb7f95b8ea5355fe640 diff --git a/tools/depends.c b/tools/depends.c index d215441e..ee39a12f 100644 --- a/tools/depends.c +++ b/tools/depends.c @@ -1,12 +1,19 @@ -#include "talloc/talloc.h" -#include "string/string.h" +#include +#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, ...) +static char ** __attribute__((format(printf, 2, 3))) +lines_from_cmd(const void *ctx, char *format, ...) { va_list ap; char *cmd, *buffer; @@ -25,40 +32,59 @@ lines_from_cmd(const void *ctx, unsigned int *num, char *format, ...) err(1, "Reading from '%s'", cmd); pclose(p); - return strsplit(ctx, buffer, "\n", num); + return strsplit(ctx, buffer, "\n"); } -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, *output; + 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 = 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; - return infofile; + ccandir = talloc_dirname(ctx, dir); + *strrchr(ccandir, '/') = '\0'; + + compiled = maybe_temp_file(ctx, "", false, "info"); + if (compile_and_link(ctx, info_c_file, ccandir, "", "", "", + compiled, &output)) + return compiled; + return NULL; } -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); - deps = lines_from_cmd(cmd, num, "%s", cmd); + cmd = talloc_asprintf(ctx, "%s depends", *infofile); + deps = lines_from_cmd(cmd, "%s", cmd); if (!deps) err(1, "Could not run '%s'", cmd); + /* FIXME: Do we need num arg? */ + *num = talloc_array_length(deps) - 1; return deps; } @@ -91,25 +117,31 @@ 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; + unsigned int i, n; - 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); /* Replace \n by actual line breaks, and split it. */ - lines = strsplit(raw, replace(raw, raw, "\\n", "\n"), "\n", &n); + lines = strsplit(raw, replace(raw, raw, "\\n", "\n"), "\n"); - deps = talloc_array(ctx, char *, n+1); + deps = talloc_array(ctx, char *, talloc_array_length(lines)); for (n = i = 0; lines[i]; i++) { 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]; @@ -145,20 +177,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++) { @@ -173,21 +212,52 @@ 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, "%s", cmd); + if (!libs) + err(1, "Could not run '%s'", cmd); + /* FIXME: Do we need num arg? */ + *num = talloc_array_length(libs) - 1; + 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); } -