-#include <ccan/talloc/talloc.h>
#include <ccan/str/str.h>
+#include <ccan/talloc/talloc.h>
#include <ccan/grab_file/grab_file.h>
#include <ccan/str_talloc/str_talloc.h>
#include <ccan/read_write_all/read_write_all.h>
#include <unistd.h>
#include <errno.h>
-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;
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).
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, "", "", "",
+ 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;
}
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;
/* 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);
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;
}
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;
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;
}
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 void 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 */
+ deps = talloc_realloc(NULL, deps, char *, num + 1);
+}
+
char **get_deps(const void *ctx, const char *dir,
bool recurse, char **infofile)
{
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);
unlink(temp);
talloc_free(temp);
}
+ uniquify_deps(ret);
return 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);
+ uniquify_deps(ret);
+ return ret;
}
projects / ccan / blobdiff