X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fdepends.c;h=ee39a12f134e4405c98f45f10cefe9fff829752a;hp=c83d78b2cd4e3eb090a7bd50a7395972307caf66;hb=fee8416f9d5c23f05d0c4fc57cfb56aaf91c0769;hpb=747a69435d9f83c0968d9689c4951bc0233ffc5e

diff --git a/tools/depends.c b/tools/depends.c
index c83d78b2..ee39a12f 100644
--- a/tools/depends.c
+++ b/tools/depends.c
@@ -12,8 +12,8 @@
 #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, char *format, ...)
 {
 	va_list ap;
 	char *cmd, *buffer;
@@ -32,14 +32,14 @@ lines_from_cmd(const void *ctx, unsigned int *num, char *format, ...)
 		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).
  * temp_file helps here. */
 static char *compile_info(const void *ctx, const char *dir)
 {
-	char *info_c_file, *info, *errmsg, *ccandir;
+	char *info_c_file, *info, *ccandir, *compiled, *output;
 	size_t len;
 	int fd;
 
@@ -48,7 +48,7 @@ static char *compile_info(const void *ctx, const char *dir)
 	if (!info)
 		return NULL;
 
-	info_c_file = temp_file(ctx, ".c");
+	info_c_file = maybe_temp_file(ctx, ".c", false, "_info");
 	fd = open(info_c_file, O_WRONLY|O_CREAT|O_EXCL, 0600);
 	if (fd < 0)
 		return NULL;
@@ -60,8 +60,12 @@ static char *compile_info(const void *ctx, const char *dir)
 
 	ccandir = talloc_dirname(ctx, dir);
 	*strrchr(ccandir, '/') = '\0';
-	return compile_and_link(ctx, info_c_file, ccandir, "", "", "",
-				&errmsg);
+
+	compiled = maybe_temp_file(ctx, "", false, "info");
+	if (compile_and_link(ctx, info_c_file, ccandir, "", "", "",
+			     compiled, &output))
+		return compiled;
+	return NULL;
 }
 
 static char **get_one_deps(const void *ctx, const char *dir,
@@ -76,9 +80,11 @@ static char **get_one_deps(const void *ctx, const char *dir,
 	}
 
 	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);
+	/* FIXME: Do we need num arg? */
+	*num = talloc_array_length(deps) - 1;
 	return deps;
 }
 
@@ -116,7 +122,7 @@ static char **get_one_safe_deps(const void *ctx,
 				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);
@@ -124,9 +130,9 @@ static char **get_one_safe_deps(const void *ctx,
 		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;
@@ -218,9 +224,11 @@ char **get_libs(const void *ctx, const char *dir,
 	}
 
 	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;
 }