X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fdepends.c;h=f1e45c50ebc5fb37c1cf8a44becfbd8141c56f2d;hp=e2666d97f778ae2007127561b22415117cba9875;hb=0959991a0cae77bd404dee266aaf0667e51a459e;hpb=63bceea014e091a2f2907e49f7c3b33f042106f4 diff --git a/tools/depends.c b/tools/depends.c index e2666d97..f1e45c50 100644 --- a/tools/depends.c +++ b/tools/depends.c @@ -1,5 +1,5 @@ -#include #include +#include #include #include #include @@ -12,8 +12,8 @@ #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, const char *format, ...) { va_list ap; char *cmd, *buffer; @@ -32,14 +32,14 @@ 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"); } /* 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 *info_c_file, *info, *ccandir, *compiled; + char *info_c_file, *info, *ccandir, *compiled, *output; size_t len; int fd; @@ -59,17 +59,18 @@ static char *compile_info(const void *ctx, const char *dir) return NULL; ccandir = talloc_dirname(ctx, dir); - *strrchr(ccandir, '/') = '\0'; + if (strrchr(ccandir, '/')) + *strrchr(ccandir, '/') = '\0'; compiled = maybe_temp_file(ctx, "", false, "info"); - if (compile_and_link(ctx, info_c_file, ccandir, "", "", "", - compiled)) - return NULL; - return compiled; + if (compile_and_link(ctx, info_c_file, ccandir, "", + CCAN_COMPILER, CCAN_CFLAGS " -I.", "", + compiled, &output)) + return compiled; + return NULL; } -static char **get_one_deps(const void *ctx, const char *dir, - unsigned int *num, char **infofile) +static char **get_one_deps(const void *ctx, const char *dir, char **infofile) { char **deps, *cmd; @@ -80,7 +81,7 @@ static char **get_one_deps(const void *ctx, const char *dir, } cmd = talloc_asprintf(ctx, "%s depends", *infofile); - deps = lines_from_cmd(cmd, num, "%s", cmd); + deps = lines_from_cmd(cmd, "%s", cmd); if (!deps) err(1, "Could not run '%s'", cmd); return deps; @@ -116,11 +117,10 @@ 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, char **infofile) { char **deps, **lines, *raw, *fname; - unsigned int i, n = 0; + unsigned int i, n; fname = talloc_asprintf(ctx, "%s/_info", dir); raw = grab_file(fname, fname, NULL); @@ -128,9 +128,9 @@ static char **get_one_safe_deps(const void *ctx, 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; @@ -157,35 +157,36 @@ static char **get_one_safe_deps(const void *ctx, } deps[n] = NULL; talloc_free(fname); - if (num) - *num = n; - return deps; + + /* Make sure talloc_array_length() works */ + return talloc_realloc(NULL, deps, char *, n + 1); } -static bool have_dep(char **deps, unsigned int num, const char *dep) +static bool have_dep(char **deps, const char *dep) { unsigned int i; - for (i = 0; i < num; i++) + for (i = 0; deps[i]; i++) if (streq(deps[i], dep)) return true; return false; } + + /* Gets all the dependencies, recursively. */ static char ** get_all_deps(const void *ctx, const char *dir, char **infofile, - char **(*get_one)(const void *, const char *, - unsigned int *, char **)) + char **(*get_one)(const void *, const char *, char **)) { char **deps; - unsigned int i, num; + unsigned int i; - deps = get_one(ctx, dir, &num, infofile); - for (i = 0; i < num; i++) { + deps = get_one(ctx, dir, infofile); + for (i = 0; i < talloc_array_length(deps)-1; i++) { char **newdeps; - unsigned int j, newnum; + unsigned int j; char *subinfo = NULL; char *subdir; @@ -195,16 +196,19 @@ get_all_deps(const void *ctx, const char *dir, subdir = talloc_asprintf(ctx, "%s/%s", talloc_dirname(ctx, dir), deps[i] + strlen("ccan/")); - newdeps = get_one(ctx, subdir, &newnum, &subinfo); + newdeps = get_one(ctx, subdir, &subinfo); /* Should be short, so brute-force out dups. */ - for (j = 0; j < newnum; j++) { - if (have_dep(deps, num, newdeps[j])) + for (j = 0; j < talloc_array_length(newdeps)-1; j++) { + unsigned int num; + + if (have_dep(deps, newdeps[j])) continue; + num = talloc_array_length(deps)-1; deps = talloc_realloc(NULL, deps, char *, num + 2); - deps[num++] = newdeps[j]; - deps[num] = NULL; + deps[num] = newdeps[j]; + deps[num+1] = NULL; } } return deps; @@ -222,12 +226,34 @@ char **get_libs(const void *ctx, const char *dir, } cmd = talloc_asprintf(ctx, "%s libs", *infofile); - libs = lines_from_cmd(cmd, num, "%s", cmd); + 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; } +/* FIXME: This is O(n^2), which is dumb. */ +static char **uniquify_deps(char **deps) +{ + unsigned int i, j, num; + + num = talloc_array_length(deps) - 1; + for (i = 0; i < num; i++) { + for (j = i + 1; j < num; j++) { + if (streq(deps[i], deps[j])) { + memmove(&deps[j], &deps[j+1], + (num - j - 1) * sizeof(char *)); + num--; + } + } + } + deps[num] = NULL; + /* Make sure talloc_array_length() works */ + return talloc_realloc(NULL, deps, char *, num + 1); +} + char **get_deps(const void *ctx, const char *dir, bool recurse, char **infofile) { @@ -236,8 +262,7 @@ char **get_deps(const void *ctx, const char *dir, infofile = &temp; if (!recurse) { - unsigned int num; - ret = get_one_deps(ctx, dir, &num, infofile); + ret = get_one_deps(ctx, dir, infofile); } else ret = get_all_deps(ctx, dir, infofile, get_one_deps); @@ -245,15 +270,17 @@ char **get_deps(const void *ctx, const char *dir, unlink(temp); talloc_free(temp); } - return ret; + return uniquify_deps(ret); } char **get_safe_ccan_deps(const void *ctx, const char *dir, - bool recurse, char **infofile) + bool recurse) { + char **ret; if (!recurse) { - unsigned int num; - return get_one_safe_deps(ctx, dir, &num, infofile); + ret = get_one_safe_deps(ctx, dir, NULL); + } else { + ret = get_all_deps(ctx, dir, NULL, get_one_safe_deps); } - return get_all_deps(ctx, dir, infofile, get_one_safe_deps); + return uniquify_deps(ret); }