X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fdepends.c;h=53fed44bff722571b39d54a5f94a47a7cfe7e694;hp=399b0aadf5affee6b8b814d2facc118a40150bf0;hb=608148436caa82ffe78d758253c6b7eb5232cb70;hpb=0248fa2c84bdf4b5117d2672a68d89505aacae8f

diff --git a/tools/depends.c b/tools/depends.c
index 399b0aad..53fed44b 100644
--- a/tools/depends.c
+++ b/tools/depends.c
@@ -2,6 +2,7 @@
 #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"
@@ -42,11 +43,10 @@ lines_from_cmd(const void *ctx, const char *format, ...)
 char *compile_info(const void *ctx, const char *dir)
 {
 	char *info_c_file, *info, *compiled, *output;
-	size_t len;
 	int fd;
 
 	/* Copy it to a file with proper .c suffix. */
-	info = tal_grab_file(ctx, tal_fmt(ctx, "%s/_info", dir), &len);
+	info = grab_file(ctx, tal_fmt(ctx, "%s/_info", dir));
 	if (!info)
 		return NULL;
 
@@ -54,7 +54,7 @@ char *compile_info(const void *ctx, const char *dir)
 	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)
@@ -126,7 +126,7 @@ static char **get_one_safe_deps(const void *ctx,
 	bool correct_style = false;
 
 	fname = path_join(ctx, dir, "_info");
-	raw = tal_grab_file(fname, fname, NULL);
+	raw = grab_file(fname, fname);
 	if (!raw)
 		errx(1, "Could not open %s", fname);
 
@@ -198,6 +198,8 @@ get_all_deps(const void *ctx, const char *dir, const char *style,
 	unsigned int 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;
@@ -225,13 +227,13 @@ get_all_deps(const void *ctx, const char *dir, const char *style,
 	return deps;
 }
 
-/* Can return NULL: _info may not support 'libs'. */
-static char **get_one_libs(const void *ctx, const char *dir,
+/* Can return NULL: _info may not support prop. */
+static char **get_one_prop(const void *ctx, const char *dir, const char *prop,
 			   char *(*get_info)(const void *ctx, const char *dir))
 {
 	char *cmd, **lines;
 
-	cmd = tal_fmt(ctx, "%s libs", get_info(ctx, dir));
+	cmd = tal_fmt(ctx, "%s %s", get_info(ctx, dir), prop);
 	lines = lines_from_cmd(cmd, "%s", cmd);
 	/* Strip final NULL. */
 	if (lines)
@@ -239,6 +241,18 @@ static char **get_one_libs(const void *ctx, const char *dir,
 	return lines;
 }
 
+static char **get_one_libs(const void *ctx, const char *dir,
+			   char *(*get_info)(const void *ctx, const char *dir))
+{
+	return get_one_prop(ctx, dir, "libs", get_info);
+}
+
+static char **get_one_cflags(const void *ctx, const char *dir,
+			   char *(*get_info)(const void *ctx, const char *dir))
+{
+	return get_one_prop(ctx, dir, "cflags", get_info);
+}
+
 /* O(n^2) but n is small. */
 static char **add_deps(char **deps1, char **deps2)
 {
@@ -256,6 +270,60 @@ static char **add_deps(char **deps1, char **deps2)
 	return deps1;
 }
 
+char **get_cflags(const void *ctx, const char *dir,
+        char *(*get_info)(const void *ctx, const char *dir))
+{
+	char **flags;
+	unsigned int len;
+	flags = get_one_cflags(ctx, dir, get_info);
+	len = tal_count(flags);
+	tal_resize(&flags, len + 1);
+	flags[len] = NULL;
+	return flags;
+}
+
+static bool get_one_ported(const void *ctx, const char *dir,
+			   char *(*get_info)(const void *ctx, const char *dir))
+{
+	char **ported = get_one_prop(ctx, dir, "ported", get_info);
+
+	/* No news is good news. */
+	if (!ported || tal_count(ported) == 0)
+		return true;
+
+	if (tal_count(ported) != 1)
+		errx(1, "%s/_info ported gave %zu lines, not one",
+		     dir, tal_count(ported));
+		
+	if (streq(ported[0], "1"))
+		return true;
+	else if (streq(ported[0], "0"))
+		return false;
+	errx(1, "%s/_info ported gave invalid output '%s'", dir, ported[0]);
+}
+
+bool get_ported(const void *ctx, const char *dir, bool recurse,
+		char *(*get_info)(const void *ctx, const char *dir))
+{
+	if (!get_one_ported(ctx, dir, get_info))
+		return false;
+
+	if (recurse) {
+		size_t i;
+		char **deps = get_deps(ctx, dir, "depends", true, get_info);
+		for (i = 0; deps[i]; i++) {
+			char *subdir;
+			if (!strstarts(deps[i], "ccan/"))
+				continue;
+
+			subdir = path_join(ctx, find_ccan_dir(dir), deps[i]);
+			if (!get_one_ported(ctx, subdir, get_info))
+				return false;
+		}
+	}
+	return true;
+}
+
 char **get_libs(const void *ctx, const char *dir, const char *style,
 		char *(*get_info)(const void *ctx, const char *dir))
 {