X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fdepends.c;h=e8cb53b8394c807aa9ddb6a7ba7a55777a06c38b;hp=aaae03a94a655d4c9fe8a3d0c686253fb21d0777;hb=a13257dd9b06ccd236092ccb7df8e1239ba79fa6;hpb=437fa285d12183a0f1e7450b3a01cbe5620a3507;ds=sidebyside

diff --git a/tools/depends.c b/tools/depends.c
index aaae03a9..e8cb53b8 100644
--- a/tools/depends.c
+++ b/tools/depends.c
@@ -1,9 +1,12 @@
 #include "talloc/talloc.h"
+#include "string/string.h"
 #include "tools.h"
 #include <err.h>
+#include <stdbool.h>
+#include <unistd.h>
 
-static char ** __attribute__((format(printf, 2, 3)))
-lines_from_cmd(const void *ctx, char *format, ...)
+static char ** __attribute__((format(printf, 3, 4)))
+lines_from_cmd(const void *ctx, unsigned int *num, char *format, ...)
 {
 	va_list ap;
 	char *cmd, *buffer;
@@ -22,30 +25,78 @@ lines_from_cmd(const void *ctx, char *format, ...)
 		err(1, "Reading from '%s'", cmd);
 	pclose(p);
 
-	return split(ctx, buffer, "\n", NULL);
+	return strsplit(ctx, buffer, "\n", num);
 }
 
-static char *build_info(const void *ctx, const char *dir)
+static int unlink_info(char *infofile)
 {
-	char *file, *cfile, *cmd;
+	unlink(infofile);
+	return 0;
+}
 
-	cfile = talloc_asprintf(ctx, "%s/%s", dir, "_info.c");
-	file = talloc_asprintf(cfile, "%s/%s", dir, "_info");
-	cmd = talloc_asprintf(file, "gcc " CFLAGS " -o %s %s", file, cfile);
+/* Be careful about trying to compile over running programs (parallel make) */
+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)
-		errx(1, "Failed to compile %s", file);
+		return NULL;
 
-	return file;
+	return infofile;
 }
 
-char **get_deps(const void *ctx, const char *dir)
+static char **get_one_deps(const void *ctx, const char *dir, unsigned int *num)
 {
-	char **deps, *cmd;
+	char **deps, *cmd, *infofile;
 
-	cmd = talloc_asprintf(ctx, "%s depends", build_info(ctx, dir));
-	deps = lines_from_cmd(cmd, cmd);
+	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);
 	if (!deps)
 		err(1, "Could not run '%s'", cmd);
 	return deps;
 }
 
+static bool have_dep(char **deps, unsigned int num, const char *dep)
+{
+	unsigned int i;
+
+	for (i = 0; i < num; i++)
+		if (streq(deps[i], dep))
+			return true;
+	return false;
+}
+
+/* Gets all the dependencies, recursively. */
+char **get_deps(const void *ctx, const char *dir)
+{
+	char **deps;
+	unsigned int i, num;
+
+	deps = get_one_deps(ctx, dir, &num);
+	for (i = 0; i < num; i++) {
+		char **newdeps;
+		unsigned int j, newnum;
+
+		if (!strstarts(deps[i], "ccan/"))
+			continue;
+
+		newdeps = get_one_deps(ctx, deps[i], &newnum);
+
+		/* Should be short, so brute-force out dups. */
+		for (j = 0; j < newnum; j++) {
+			if (have_dep(deps, num, newdeps[j]))
+				continue;
+
+			deps = talloc_realloc(NULL, deps, char *, num + 2);
+			deps[num++] = newdeps[j];
+			deps[num] = NULL;
+		}
+	}
+	return deps;
+}