X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fdepends.c;h=dde2b3ae3673eef0094ae85c3fd8187a2d0dc78a;hp=6ac31cdc5ebce5e973c1b34b9c506c3672fa7ada;hb=6aa2f4e347e5d66a392b879fe901bc582099a552;hpb=fb4c4c3ddc24772f71a64ec02d2c9ddaeb6e9f6b

diff --git a/tools/depends.c b/tools/depends.c
index 6ac31cdc..dde2b3ae 100644
--- a/tools/depends.c
+++ b/tools/depends.c
@@ -1,88 +1,90 @@
-#include <ccan/talloc/talloc.h>
 #include <ccan/str/str.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 <ccan/rbuf/rbuf.h>
+#include <ccan/tal/path/path.h>
+#include <ccan/tal/grab_file/grab_file.h>
+#include <ccan/compiler/compiler.h>
+#include <ccan/err/err.h>
 #include "tools.h"
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
-#include <err.h>
 #include <stdbool.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 ** PRINTF_FMT(2, 3)
+lines_from_cmd(const void *ctx, const char *format, ...)
 {
 	va_list ap;
-	char *cmd, *buffer;
+	char *cmd;
 	FILE *p;
+	struct rbuf in;
 
 	va_start(ap, format);
-	cmd = talloc_vasprintf(ctx, format, ap);
+	cmd = tal_vfmt(ctx, format, ap);
 	va_end(ap);
 
 	p = popen(cmd, "r");
 	if (!p)
 		err(1, "Executing '%s'", cmd);
 
-	buffer = grab_fd(ctx, fileno(p), NULL);
-	if (!buffer)
+	/* FIXME: Use rbuf_read_str(&in, '\n') rather than strsplit! */
+	rbuf_init(&in, fileno(p), tal_arr(ctx, char, 0), 0);
+	if (!rbuf_read_str(&in, 0, do_tal_realloc) && errno)
 		err(1, "Reading from '%s'", cmd);
 	pclose(p);
 
-	return strsplit(ctx, buffer, "\n", num);
+	return tal_strsplit(ctx, in.buf, "\n", STR_EMPTY_OK);
 }
 
 /* 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 *compile_info(const void *ctx, const char *dir)
 {
-	char *info_c_file, *info, *ccandir, *compiled;
-	size_t len;
+	char *info_c_file, *info, *compiled, *output;
 	int fd;
 
 	/* Copy it to a file with proper .c suffix. */
-	info = grab_file(ctx, talloc_asprintf(ctx, "%s/_info", dir), &len);
+	info = grab_file(ctx, tal_fmt(ctx, "%s/_info", dir));
 	if (!info)
 		return NULL;
 
-	info_c_file = temp_file(ctx, ".c");
+	info_c_file = temp_file(ctx, ".c", "_info");
 	fd = open(info_c_file, O_WRONLY|O_CREAT|O_EXCL, 0600);
 	if (fd < 0)
 		return NULL;
-	if (!write_all(fd, info, len))
+	if (!write_all(fd, info, tal_count(info)-1))
 		return NULL;
 
 	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;
+	compiled = temp_file(ctx, "", "info");
+	if (compile_and_link(ctx, info_c_file, find_ccan_dir(dir), "",
+			     compiler, cflags, "", 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, const char *style,
+			   char *(*get_info)(const void *ctx, const char *dir))
 {
 	char **deps, *cmd;
+	char *infofile = get_info(ctx, dir);
 
-	if (!*infofile) {
-		*infofile = compile_info(ctx, dir);
-		if (!*infofile)
-			errx(1, "Could not compile _info for '%s'", dir);
-	}
+	if (!infofile)
+		return NULL;
 
-	cmd = talloc_asprintf(ctx, "%s depends", *infofile);
-	deps = lines_from_cmd(cmd, num, "%s", cmd);
-	if (!deps)
-		err(1, "Could not run '%s'", cmd);
+	cmd = tal_fmt(ctx, "%s %s", infofile, style);
+	deps = lines_from_cmd(cmd, "%s", cmd);
+	if (!deps) {
+		/* You must understand depends, maybe not testdepends. */
+		if (streq(style, "depends"))
+			err(1, "Could not run '%s'", cmd);
+		deps = tal(ctx, char *);
+		deps[0] = NULL;
+	}
 	return deps;
 }
 
@@ -90,7 +92,7 @@ static char **get_one_deps(const void *ctx, const char *dir,
 static char *replace(const void *ctx, const char *src,
 		     const char *from, const char *to)
 {
-	char *ret = talloc_strdup(ctx, "");
+	char *ret = tal_strdup(ctx, "");
 	unsigned int rlen, len, add;
 
 	rlen = len = 0;
@@ -101,7 +103,7 @@ static char *replace(const void *ctx, const char *src,
 		else
 			add = next - (src+len);
 
-		ret = talloc_realloc(ctx, ret, char, rlen + add + strlen(to)+1);
+		tal_resize(&ret, rlen + add + strlen(to)+1);
 		memcpy(ret+rlen, src+len, add);
 		if (!next)
 			return ret;
@@ -116,21 +118,23 @@ 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)
+				const char *style,
+				char *(*unused)(const void *, const char *))
 {
 	char **deps, **lines, *raw, *fname;
-	unsigned int i, n = 0;
+	unsigned int i, n;
+	bool correct_style = false;
 
-	fname = talloc_asprintf(ctx, "%s/_info", dir);
-	raw = grab_file(fname, fname, NULL);
+	fname = path_join(ctx, dir, "_info");
+	raw = grab_file(fname, fname);
 	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 = tal_strsplit(raw, replace(raw, raw, "\\n", "\n"), "\n",
+			     STR_EMPTY_OK);
 
-	deps = talloc_array(ctx, char *, n+1);
+	deps = tal_arr(ctx, char *, tal_count(lines));
 
 	for (n = i = 0; lines[i]; i++) {
 		char *str;
@@ -140,6 +144,14 @@ static char **get_one_safe_deps(const void *ctx,
 		if (lines[i][0] == '#')
 			continue;
 
+		if (strstr(lines[i], "\"testdepends\""))
+			correct_style = streq(style, "testdepends");
+		else if (strstr(lines[i], "\"depends\""))
+			correct_style = streq(style, "depends");
+
+		if (!correct_style)
+			continue;
+
 		/* Start of line, or after ". */
 		if (strstarts(lines[i], "ccan/"))
 			str = lines[i];
@@ -153,107 +165,185 @@ static char **get_one_safe_deps(const void *ctx,
 		len = strspn(str, "/abcdefghijklmnopqrstuvxwyz12345678980_");
 		if (len == 5)
 			continue;
-		deps[n++] = talloc_strndup(deps, str, len);
+		deps[n++] = tal_strndup(deps, str, len);
 	}
 	deps[n] = NULL;
-	talloc_free(fname);
-	if (num)
-		*num = n;
+	tal_free(fname);
+
+	/* Make sure tal_array_length() works */
+	tal_resize(&deps, n + 1);
 	return deps;
 }
 
-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 **))
+get_all_deps(const void *ctx, const char *dir, const char *style,
+	     char *(*get_info)(const void *ctx, const char *dir),
+	     char **(*get_one)(const void *, const char *, const char *,
+			       char *(*get_info)(const void *, const 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, style, get_info);
+	if (!deps)
+		return NULL;
+	for (i = 0; i < tal_count(deps)-1; i++) {
 		char **newdeps;
-		unsigned int j, newnum;
-		char *subinfo = NULL;
+		unsigned int j;
 		char *subdir;
 
 		if (!strstarts(deps[i], "ccan/"))
 			continue;
 
-		subdir = talloc_asprintf(ctx, "%s/%s",
-					 talloc_dirname(ctx, dir),
-					 deps[i] + strlen("ccan/"));
-		newdeps = get_one(ctx, subdir, &newnum, &subinfo);
+		subdir = path_join(ctx, find_ccan_dir(dir), deps[i]);
+		newdeps = get_one(ctx, subdir, "depends", get_info);
 
 		/* 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 < tal_count(newdeps)-1; j++) {
+			unsigned int num;
+
+			if (have_dep(deps, newdeps[j]))
 				continue;
 
-			deps = talloc_realloc(NULL, deps, char *, num + 2);
-			deps[num++] = newdeps[j];
-			deps[num] = NULL;
+			num = tal_count(deps)-1;
+			tal_resize(&deps, num + 2);
+			deps[num] = newdeps[j];
+			deps[num+1] = NULL;
 		}
 	}
 	return deps;
 }
 
-char **get_libs(const void *ctx, const char *dir,
-		unsigned int *num, char **infofile)
+/* Can return NULL: _info may not support 'libs'. */
+static char **get_one_libs(const void *ctx, const char *dir,
+			   char *(*get_info)(const void *ctx, const char *dir))
+{
+	char *cmd, **lines;
+
+	cmd = tal_fmt(ctx, "%s libs", get_info(ctx, dir));
+	lines = lines_from_cmd(cmd, "%s", cmd);
+	/* Strip final NULL. */
+	if (lines)
+		tal_resize(&lines, tal_count(lines)-1);
+	return lines;
+}
+
+/* O(n^2) but n is small. */
+static char **add_deps(char **deps1, char **deps2)
+{
+	unsigned int i, len;
+
+	len = tal_count(deps1);
+
+	for (i = 0; deps2[i]; i++) {
+		if (have_dep(deps1, deps2[i]))
+			continue;
+		tal_resize(&deps1, len + 1);
+		deps1[len-1] = tal_strdup(deps1, deps2[i]);
+		deps1[len++] = NULL;
+	}
+	return deps1;
+}
+
+char **get_libs(const void *ctx, const char *dir, const char *style,
+		char *(*get_info)(const void *ctx, const char *dir))
 {
-	char **libs, *cmd;
+	char **deps, **libs;
+	unsigned int i, len;
+
+	libs = get_one_libs(ctx, dir, get_info);
+	len = tal_count(libs);
+
+	if (style) {
+		deps = get_deps(ctx, dir, style, true, get_info);
+		if (streq(style, "testdepends"))
+			deps = add_deps(deps,
+					get_deps(ctx, dir, "depends", true,
+						 get_info));
 
-	if (!*infofile) {
-		*infofile = compile_info(ctx, dir);
-		if (!*infofile)
-			errx(1, "Could not compile _info for '%s'", dir);
+		for (i = 0; deps[i]; i++) {
+			char **newlibs, *subdir;
+			size_t newlen;
+
+			if (!strstarts(deps[i], "ccan/"))
+				continue;
+
+			subdir = path_join(ctx, find_ccan_dir(dir), deps[i]);
+
+			newlibs = get_one_libs(ctx, subdir, get_info);
+			newlen = tal_count(newlibs);
+			tal_resize(&libs, len + newlen);
+			memcpy(&libs[len], newlibs,
+			       sizeof(newlibs[0])*newlen);
+			len += newlen;
+		}
 	}
 
-	cmd = talloc_asprintf(ctx, "%s libs", *infofile);
-	libs = lines_from_cmd(cmd, num, "%s", cmd);
-	if (!libs)
-		err(1, "Could not run '%s'", cmd);
+	/* Append NULL entry. */
+	tal_resize(&libs, len + 1);
+	libs[len] = NULL;
 	return libs;
 }
 
-char **get_deps(const void *ctx, const char *dir,
-		bool recurse, char **infofile)
+/* FIXME: This is O(n^2), which is dumb. */
+static char **uniquify_deps(char **deps)
 {
-	char *temp = NULL, **ret;
-	if (!infofile)
-		infofile = &temp;
+	unsigned int i, j, num;
+
+	if (!deps)
+		return NULL;
+
+	num = tal_count(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 tal_count() works */
+	tal_resize(&deps, num + 1);
+	return deps;
+}
+
+char **get_deps(const void *ctx, const char *dir, const char *style,
+		bool recurse,
+		char *(*get_info)(const void *ctx, const char *dir))
+{
+	char **ret;
 
 	if (!recurse) {
-		unsigned int num;
-		ret = get_one_deps(ctx, dir, &num, infofile);
+		ret = get_one_deps(ctx, dir, style, get_info);
 	} else
-		ret = get_all_deps(ctx, dir, infofile, get_one_deps);
+		ret = get_all_deps(ctx, dir, style, get_info, get_one_deps);
 
-	if (infofile == &temp && temp) {
-		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)
+char **get_safe_ccan_deps(const void *ctx, const char *dir, const char *style,
+			  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, style, NULL);
+	} else {
+		ret = get_all_deps(ctx, dir, style, NULL, get_one_safe_deps);
 	}
-	return get_all_deps(ctx, dir, infofile, get_one_safe_deps);
+	return uniquify_deps(ret);
 }