#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"
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;
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)
bool correct_style = false;
fname = path_join(ctx, dir, "_info");
- raw = tal_grab_file(fname, fname, NULL);
+ raw = grab_file(fname, fname);
if (!raw)
errx(1, "Could not open %s", fname);
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;
}
/* 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)
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)
{
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))
{