char *cmd;
FILE *p;
struct rbuf in;
+ char *ret;
va_start(ap, format);
cmd = tal_vfmt(ctx, format, ap);
err(1, "Executing '%s'", cmd);
/* FIXME: Use rbuf_read_str(&in, '\n') rather than strsplit! */
- rbuf_init(&in, fileno(p), tal_arr(ctx, char, 0), 0);
- if (!rbuf_read_str(&in, 0, do_tal_realloc) && errno)
+ rbuf_init(&in, fileno(p), tal_arr(ctx, char, 0), 0,
+ tal_rbuf_enlarge);
+ ret = rbuf_read_str(&in, 0);
+ if (!ret && errno)
err(1, "Reading from '%s'", cmd);
pclose(p);
- return tal_strsplit(ctx, in.buf, "\n", STR_EMPTY_OK);
+ return tal_strsplit(ctx, ret, "\n", STR_EMPTY_OK);
}
/* Be careful about trying to compile over running programs (parallel make).
fd = open(info_c_file, O_WRONLY|O_CREAT|O_EXCL, 0600);
if (fd < 0)
return NULL;
- if (!write_all(fd, info, tal_count(info)-1))
+ if (!write_all(fd, info, tal_count(info)-1)) {
+ close(fd);
return NULL;
+ }
if (close(fd) != 0)
return NULL;
return get_one_prop(ctx, dir, "cflags", get_info);
}
+static char **get_one_ccanlint(const void *ctx, const char *dir,
+ char *(*get_info)(const void *ctx, const char *dir))
+{
+ return get_one_prop(ctx, dir, "ccanlint", get_info);
+}
+
/* O(n^2) but n is small. */
static char **add_deps(char **deps1, char **deps2)
{
return flags;
}
-static bool get_one_ported(const void *ctx, const char *dir,
- char *(*get_info)(const void *ctx, const char *dir))
+char **get_ccanlint(const void *ctx, const char *dir,
+ char *(*get_info)(const void *ctx, const char *dir))
+{
+ char **ccanlint;
+ unsigned int len;
+ ccanlint = get_one_ccanlint(ctx, dir, get_info);
+ len = tal_count(ccanlint);
+ tal_resize(&ccanlint, len + 1);
+ ccanlint[len] = NULL;
+ return ccanlint;
+}
+
+static char *get_one_ported(const void *ctx, const char *dir,
+ char *(*get_info)(const void *ctx, const char *dir))
{
char **ported = get_one_prop(ctx, dir, "ported", get_info);
/* No news is good news. */
- if (!ported || tal_count(ported) == 0)
- return true;
+ if (tal_count(ported) == 0)
+ return NULL;
if (tal_count(ported) != 1)
errx(1, "%s/_info ported gave %zu lines, not one",
dir, tal_count(ported));
-
- if (streq(ported[0], "1"))
- return true;
- else if (streq(ported[0], "0"))
- return false;
- errx(1, "%s/_info ported gave invalid output '%s'", dir, ported[0]);
+
+ if (streq(ported[0], ""))
+ return NULL;
+ else
+ return ported[0];
}
-bool get_ported(const void *ctx, const char *dir, bool recurse,
+char *get_ported(const void *ctx, const char *dir, bool recurse,
char *(*get_info)(const void *ctx, const char *dir))
{
- if (!get_one_ported(ctx, dir, get_info))
- return false;
+ char *msg;
+
+ msg = get_one_ported(ctx, dir, get_info);
+ if (msg)
+ return msg;
if (recurse) {
size_t i;
continue;
subdir = path_join(ctx, find_ccan_dir(dir), deps[i]);
- if (!get_one_ported(ctx, subdir, get_info))
- return false;
+ msg = get_one_ported(ctx, subdir, get_info);
+ if (msg)
+ return msg;
}
}
- return true;
+ return NULL;
}
char **get_libs(const void *ctx, const char *dir, const char *style,