ccanlint: use ccan/time

[ccan] / tools / ccan_depends.c

diff --git a/tools/ccan_depends.c b/tools/ccan_depends.c
index ca8c4a610967402a9a8047e7e2b73172eabc81ad..b055e44eb1f53e1aee4c5e6f42731c195ce66555 100644 (file)
--- a/tools/ccan_depends.c
+++ b/tools/ccan_depends.c
@@ -2,8 +2,8 @@
 #include <err.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include "string/string.h"
-#include "talloc/talloc.h"
+#include <ccan/str/str.h>
+#include <ccan/talloc/talloc.h>
 
 int main(int argc, char *argv[])
 {
@@ -11,6 +11,7 @@ int main(int argc, char *argv[])
        unsigned int i;
        bool compile = false;
        bool recurse = true;
+       bool ccan = true;
 
        if (argv[1] && streq(argv[1], "--direct")) {
                argv++;
@@ -22,18 +23,28 @@ int main(int argc, char *argv[])
                argc--;
                compile = true;
        }
+       if (argv[1] && streq(argv[1], "--non-ccan")) {
+               argv++;
+               argc--;
+               ccan = false;
+       }
        if (argc != 2)
-               errx(1, "Usage: ccan_depends [--direct] [--compile] <dir>\n"
+               errx(1, "Usage: ccan_depends [--direct] [--compile] [--non-ccan] <dir>\n"
                        "Spits out all the ccan dependencies (recursively unless --direct)");
 
+       /* We find depends without compiling by looking for ccan/ */
+       if (!ccan && !compile)
+               errx(1, "--non-ccan needs --compile");
+
        if (compile)
-               deps = get_deps(talloc_autofree_context(), argv[1], recurse);
+               deps = get_deps(talloc_autofree_context(), argv[1],
+                               recurse, NULL);
        else
-               deps = get_safe_ccan_deps(talloc_autofree_context(), argv[1],
-                                         recurse);
+               deps = get_safe_ccan_deps(talloc_autofree_context(),
+                                         argv[1], recurse, NULL);
 
        for (i = 0; deps[i]; i++)
-               if (strstarts(deps[i], "ccan/"))
+               if (strstarts(deps[i], "ccan/") == ccan)
                        printf("%s\n", deps[i]);
        return 0;
 }