ccanlint: fix spurious warning errors.

[ccan] / tools / depends.c

diff --git a/tools/depends.c b/tools/depends.c
index d215441eead6acebe84b629d2b3c855b4191098c..f1e45c50ebc5fb37c1cf8a44becfbd8141c56f2d 100644 (file)
--- a/tools/depends.c
+++ b/tools/depends.c
@@ -1,12 +1,19 @@
-#include "talloc/talloc.h"
-#include "string/string.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>

 #include "tools.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 <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 ** __attribute__((format(printf, 2, 3)))
+lines_from_cmd(const void *ctx, const char *format, ...)

 {
        va_list ap;
        char *cmd, *buffer;
 {
        va_list ap;
        char *cmd, *buffer;


@@ -25,38 +32,56 @@ lines_from_cmd(const void *ctx, unsigned int *num, char *format, ...)
                err(1, "Reading from '%s'", cmd);
        pclose(p);
 
                err(1, "Reading from '%s'", cmd);
        pclose(p);
 

-       return strsplit(ctx, buffer, "\n", num);
+       return strsplit(ctx, buffer, "\n");

 }
 
 }
 

-static int unlink_info(char *infofile)
-{
-       unlink(infofile);
-       return 0;
-}
-
-/* Be careful about trying to compile over running programs (parallel make) */
+/* 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)
 {
 static char *compile_info(const void *ctx, const char *dir)
 {

-       char *infofile = talloc_asprintf(ctx, "%s/_info.%u", dir, getpid());
-       char *cmd = talloc_asprintf(ctx, "cc " CFLAGS " -o %s %s/_info.c",
-                                   infofile, dir);
-       talloc_set_destructor(infofile, unlink_info);
-       if (system(cmd) != 0)
+       char *info_c_file, *info, *ccandir, *compiled, *output;
+       size_t len;
+       int fd;
+
+       /* Copy it to a file with proper .c suffix. */
+       info = grab_file(ctx, talloc_asprintf(ctx, "%s/_info", dir), &len);
+       if (!info)
+               return NULL;
+
+       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;
+       if (!write_all(fd, info, len))

                return NULL;
 
                return NULL;
 

-       return infofile;
+       if (close(fd) != 0)
+               return NULL;
+
+       ccandir = talloc_dirname(ctx, dir);
+       if (strrchr(ccandir, '/'))
+               *strrchr(ccandir, '/') = '\0';
+
+       compiled = maybe_temp_file(ctx, "", false, "info");
+       if (compile_and_link(ctx, info_c_file, ccandir, "",
+                            CCAN_COMPILER, CCAN_CFLAGS " -I.", "",
+                            compiled, &output))
+               return compiled;
+       return NULL;

 }
 
 }
 

-static char **get_one_deps(const void *ctx, const char *dir, unsigned int *num)
+static char **get_one_deps(const void *ctx, const char *dir, char **infofile)

 {
 {

-       char **deps, *cmd, *infofile;
+       char **deps, *cmd;

 
 

-       infofile = compile_info(ctx, dir);
-       if (!infofile)
-               errx(1, "Could not compile _info for '%s'", dir);
+       if (!*infofile) {
+               *infofile = compile_info(ctx, dir);
+               if (!*infofile)
+                       errx(1, "Could not compile _info for '%s'", dir);
+       }

 
 

-       cmd = talloc_asprintf(ctx, "%s depends", infofile);
-       deps = lines_from_cmd(cmd, num, "%s", cmd);
+       cmd = talloc_asprintf(ctx, "%s depends", *infofile);
+       deps = lines_from_cmd(cmd, "%s", cmd);

        if (!deps)
                err(1, "Could not run '%s'", cmd);
        return deps;
        if (!deps)
                err(1, "Could not run '%s'", cmd);
        return deps;


@@ -91,25 +116,30 @@ 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,
 
 /* 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)
+                               const char *dir,
+                               char **infofile)

 {
        char **deps, **lines, *raw, *fname;
 {
        char **deps, **lines, *raw, *fname;

-       unsigned int i, n = 0;
+       unsigned int i, n;

 
 

-       fname = talloc_asprintf(ctx, "%s/_info.c", dir);
+       fname = talloc_asprintf(ctx, "%s/_info", dir);

        raw = grab_file(fname, fname, NULL);
        if (!raw)
                errx(1, "Could not open %s", fname);
 
        /* Replace \n by actual line breaks, and split it. */
        raw = grab_file(fname, fname, NULL);
        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 = 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;
                unsigned int len;
 
 
        for (n = i = 0; lines[i]; i++) {
                char *str;
                unsigned int len;
 

+               /* Ignore lines starting with # (e.g. #include) */
+               if (lines[i][0] == '#')
+                       continue;
+

                /* Start of line, or after ". */
                if (strstarts(lines[i], "ccan/"))
                        str = lines[i];
                /* Start of line, or after ". */
                if (strstarts(lines[i], "ccan/"))
                        str = lines[i];


@@ -127,67 +157,130 @@ static char **get_one_safe_deps(const void *ctx,
        }
        deps[n] = NULL;
        talloc_free(fname);
        }
        deps[n] = NULL;
        talloc_free(fname);

-       if (num)
-               *num = n;
-       return deps;
+
+       /* Make sure talloc_array_length() works */
+       return talloc_realloc(NULL, deps, char *, n + 1);

 }
 
 }
 

-static bool have_dep(char **deps, unsigned int num, const char *dep)
+static bool have_dep(char **deps, const char *dep)

 {
        unsigned int i;
 
 {
        unsigned int i;
 

-       for (i = 0; i < num; i++)
+       for (i = 0; deps[i]; i++)

                if (streq(deps[i], dep))
                        return true;
        return false;
 }
 
                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,
 /* Gets all the dependencies, recursively. */
 static char **
 get_all_deps(const void *ctx, const char *dir,

-            char **(*get_one)(const void *, const char *, unsigned int *))
+            char **infofile,
+            char **(*get_one)(const void *, const char *, char **))

 {
        char **deps;
 {
        char **deps;

-       unsigned int i, num;
+       unsigned int i;

 
 

-       deps = get_one(ctx, dir, &num);
-       for (i = 0; i < num; i++) {
+       deps = get_one(ctx, dir, infofile);
+       for (i = 0; i < talloc_array_length(deps)-1; i++) {

                char **newdeps;
                char **newdeps;

-               unsigned int j, newnum;
+               unsigned int j;
+               char *subinfo = NULL;
+               char *subdir;

 
                if (!strstarts(deps[i], "ccan/"))
                        continue;
 
 
                if (!strstarts(deps[i], "ccan/"))
                        continue;
 

-               newdeps = get_one(ctx, deps[i], &newnum);
+               subdir = talloc_asprintf(ctx, "%s/%s",
+                                        talloc_dirname(ctx, dir),
+                                        deps[i] + strlen("ccan/"));
+               newdeps = get_one(ctx, subdir, &subinfo);

 
                /* Should be short, so brute-force out dups. */
 
                /* 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 < talloc_array_length(newdeps)-1; j++) {
+                       unsigned int num;
+
+                       if (have_dep(deps, newdeps[j]))

                                continue;
 
                                continue;
 

+                       num = talloc_array_length(deps)-1;

                        deps = talloc_realloc(NULL, deps, char *, num + 2);
                        deps = talloc_realloc(NULL, deps, char *, num + 2);

-                       deps[num++] = newdeps[j];
-                       deps[num] = NULL;
+                       deps[num] = newdeps[j];
+                       deps[num+1] = NULL;

                }
        }
        return deps;
 }
 
                }
        }
        return deps;
 }
 

-char **get_deps(const void *ctx, const char *dir, bool recurse)
+char **get_libs(const void *ctx, const char *dir,
+               unsigned int *num, char **infofile)
+{
+       char **libs, *cmd;
+
+       if (!*infofile) {
+               *infofile = compile_info(ctx, dir);
+               if (!*infofile)
+                       errx(1, "Could not compile _info for '%s'", dir);
+       }
+
+       cmd = talloc_asprintf(ctx, "%s libs", *infofile);
+       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;
+}
+
+/* FIXME: This is O(n^2), which is dumb. */
+static char **uniquify_deps(char **deps)

 {
 {

+       unsigned int i, j, num;
+
+       num = talloc_array_length(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 talloc_array_length() works */
+       return talloc_realloc(NULL, deps, char *, num + 1);
+}
+
+char **get_deps(const void *ctx, const char *dir,
+               bool recurse, char **infofile)
+{
+       char *temp = NULL, **ret;
+       if (!infofile)
+               infofile = &temp;
+

        if (!recurse) {
        if (!recurse) {

-               unsigned int num;
-               return get_one_deps(ctx, dir, &num);
+               ret = get_one_deps(ctx, dir, infofile);
+       } else
+               ret = get_all_deps(ctx, dir, infofile, get_one_deps);
+
+       if (infofile == &temp && temp) {
+               unlink(temp);
+               talloc_free(temp);

        }
        }

-       return get_all_deps(ctx, dir, get_one_deps);
+       return uniquify_deps(ret);

 }
 
 }
 

-char **get_safe_ccan_deps(const void *ctx, const char *dir, bool recurse)
+char **get_safe_ccan_deps(const void *ctx, const char *dir,
+                         bool recurse)

 {
 {

+       char **ret;

        if (!recurse) {
        if (!recurse) {

-               unsigned int num;
-               return get_one_safe_deps(ctx, dir, &num);
+               ret = get_one_safe_deps(ctx, dir, NULL);
+       } else {
+               ret = get_all_deps(ctx, dir, NULL, get_one_safe_deps);

        }
        }

-       return get_all_deps(ctx, dir, get_one_safe_deps);
+       return uniquify_deps(ret);

 }
 }

-