tools: don't unnecessarily redefine _GNU_SOURCE in config.h

[ccan] / tools / depends.c

diff --git a/tools/depends.c b/tools/depends.c
index 4bac1b063fbcb1cdc5aea75ed3b543d8ebe9fb53..16f7cb69777cf733f73dda0e2358b2d32308bfb6 100644 (file)
--- a/tools/depends.c
+++ b/tools/depends.c
@@ -1,5 +1,5 @@
-#include <ccan/talloc/talloc.h>
 #include <ccan/str/str.h>
+#include <ccan/talloc/talloc.h>
 #include <ccan/grab_file/grab_file.h>
 #include <ccan/str_talloc/str_talloc.h>
 #include <ccan/read_write_all/read_write_all.h>
@@ -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, const char *format, ...)
 {
        va_list ap;
        char *cmd, *buffer;
@@ -32,7 +32,7 @@ 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).
@@ -59,10 +59,12 @@ static char *compile_info(const void *ctx, const char *dir)
                return NULL;
 
        ccandir = talloc_dirname(ctx, dir);
-       *strrchr(ccandir, '/') = '\0';
+       if (strrchr(ccandir, '/'))
+               *strrchr(ccandir, '/') = '\0';
 
        compiled = maybe_temp_file(ctx, "", false, "info");
-       if (compile_and_link(ctx, info_c_file, ccandir, "", "", "",
+       if (compile_and_link(ctx, info_c_file, ccandir, "",
+                            CCAN_COMPILER, CCAN_CFLAGS " -I.", "",
                             compiled, &output))
                return compiled;
        return NULL;
@@ -80,9 +82,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;
 }
 
@@ -120,7 +124,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);
@@ -128,9 +132,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;
@@ -222,9 +226,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;
 }