ccanlint: Add cflags support to _info

[ccan] / tools / depends.c

diff --git a/tools/depends.c b/tools/depends.c
index 664b3972968263febd5ff762331ff3fd31f5d97b..871a3e8712368a649dc3d2d478e696087496bd57 100644 (file)
--- 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. */
@@ -226,12 +228,12 @@ get_all_deps(const void *ctx, const char *dir, const char *style,
 }
 
 /* Can return NULL: _info may not support 'libs'. */
-static char **get_one_libs(const void *ctx, const char *dir,
+static char **get_one_prop(const void *ctx, const char *dir, const char *prop,
                           char *(*get_info)(const void *ctx, const char *dir))
 {
        char *cmd, **lines;
 
-       cmd = tal_fmt(ctx, "%s libs", get_info(ctx, dir));
+       cmd = tal_fmt(ctx, "%s %s", get_info(ctx, dir), prop);
        lines = lines_from_cmd(cmd, "%s", cmd);
        /* Strip final NULL. */
        if (lines)
@@ -239,6 +241,18 @@ static char **get_one_libs(const void *ctx, const char *dir,
        return lines;
 }
 
+static char **get_one_libs(const void *ctx, const char *dir,
+                          char *(*get_info)(const void *ctx, const char *dir))
+{
+       return get_one_prop(ctx, dir, "libs", get_info);
+}
+
+static char **get_one_cflags(const void *ctx, const char *dir,
+                          char *(*get_info)(const void *ctx, const char *dir))
+{
+       return get_one_prop(ctx, dir, "cflags", get_info);
+}
+
 /* O(n^2) but n is small. */
 static char **add_deps(char **deps1, char **deps2)
 {
@@ -256,6 +270,18 @@ static char **add_deps(char **deps1, char **deps2)
        return deps1;
 }
 
+char **get_cflags(const void *ctx, const char *dir,
+        char *(*get_info)(const void *ctx, const char *dir))
+{
+       char **flags;
+       unsigned int len;
+       flags = get_one_cflags(ctx, dir, get_info);
+       len = tal_count(flags);
+       tal_resize(&flags, len + 1);
+       flags[len] = NULL;
+       return flags;
+}
+
 char **get_libs(const void *ctx, const char *dir, const char *style,
                char *(*get_info)(const void *ctx, const char *dir))
 {
@@ -279,8 +305,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);