X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fdepends.c;h=dde2b3ae3673eef0094ae85c3fd8187a2d0dc78a;hp=664b3972968263febd5ff762331ff3fd31f5d97b;hb=897626152d12d7fd13a8feb36989eb5c8c1f3485;hpb=dc8042b42500f79f613b1197df6cdf739615a89f

diff --git a/tools/depends.c b/tools/depends.c
index 664b3972..dde2b3ae 100644
--- a/tools/depends.c
+++ b/tools/depends.c
@@ -1,6 +1,8 @@
 #include <ccan/str/str.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"
@@ -41,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;
 
@@ -53,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)
@@ -61,8 +62,7 @@ char *compile_info(const void *ctx, const char *dir)
 
 	compiled = temp_file(ctx, "", "info");
 	if (compile_and_link(ctx, info_c_file, find_ccan_dir(dir), "",
-			     CCAN_COMPILER, CCAN_CFLAGS " -I.", "",
-			     compiled, &output))
+			     compiler, cflags, "", compiled, &output))
 		return compiled;
 	return NULL;
 }
@@ -125,8 +125,8 @@ static char **get_one_safe_deps(const void *ctx,
 	unsigned int i, n;
 	bool correct_style = false;
 
-	fname = tal_fmt(ctx, "%s/_info", dir);
-	raw = tal_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);
 
@@ -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;
@@ -206,7 +208,7 @@ get_all_deps(const void *ctx, const char *dir, const char *style,
 		if (!strstarts(deps[i], "ccan/"))
 			continue;
 
-		subdir = tal_fmt(ctx, "%s/%s", find_ccan_dir(dir), deps[i]);
+		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. */
@@ -279,8 +281,7 @@ char **get_libs(const void *ctx, const char *dir, const char *style,
 			if (!strstarts(deps[i], "ccan/"))
 				continue;
 
-			subdir = tal_fmt(ctx, "%s/%s",
-					 find_ccan_dir(dir), deps[i]);
+			subdir = path_join(ctx, find_ccan_dir(dir), deps[i]);
 
 			newlibs = get_one_libs(ctx, subdir, get_info);
 			newlen = tal_count(newlibs);