#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 <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"
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
-#include <err.h>
#include <stdbool.h>
#include <unistd.h>
#include <errno.h>
lines_from_cmd(const void *ctx, const char *format, ...)
{
va_list ap;
- char *cmd, *buffer;
+ char *cmd;
FILE *p;
+ struct rbuf in;
+ char *ret;
va_start(ap, format);
- cmd = talloc_vasprintf(ctx, format, ap);
+ cmd = tal_vfmt(ctx, format, ap);
va_end(ap);
p = popen(cmd, "r");
if (!p)
err(1, "Executing '%s'", cmd);
- buffer = grab_fd(ctx, fileno(p), NULL);
- if (!buffer)
+ /* FIXME: Use rbuf_read_str(&in, '\n') rather than strsplit! */
+ 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 strsplit(ctx, buffer, "\n");
+ return tal_strsplit(ctx, ret, "\n", STR_EMPTY_OK);
}
/* Be careful about trying to compile over running programs (parallel make).
* temp_file helps here. */
char *compile_info(const void *ctx, const char *dir)
{
- char *info_c_file, *info, *ccandir, *compiled, *output;
- size_t len;
+ char *info_c_file, *info, *compiled, *output;
int fd;
/* Copy it to a file with proper .c suffix. */
- info = grab_file(ctx, talloc_asprintf(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)) {
+ close(fd);
return NULL;
+ }
if (close(fd) != 0)
return NULL;
- ccandir = talloc_dirname(ctx, dir);
- if (strrchr(ccandir, '/'))
- *strrchr(ccandir, '/') = '\0';
-
compiled = temp_file(ctx, "", "info");
- if (compile_and_link(ctx, info_c_file, ccandir, "",
- CCAN_COMPILER, CCAN_CFLAGS " -I.", "",
- compiled, &output))
+ if (compile_and_link(ctx, info_c_file, find_ccan_dir(dir), "",
+ compiler, cflags, "", compiled, &output))
return compiled;
return NULL;
}
-static char **get_one_deps(const void *ctx, const char *dir,
+static char **get_one_deps(const void *ctx, const char *dir, const char *style,
char *(*get_info)(const void *ctx, const char *dir))
{
char **deps, *cmd;
if (!infofile)
return NULL;
- cmd = talloc_asprintf(ctx, "%s depends", infofile);
+ cmd = tal_fmt(ctx, "%s %s", infofile, style);
deps = lines_from_cmd(cmd, "%s", cmd);
- if (!deps)
- err(1, "Could not run '%s'", cmd);
+ if (!deps) {
+ /* You must understand depends, maybe not testdepends. */
+ if (streq(style, "depends"))
+ err(1, "Could not run '%s'", cmd);
+ deps = tal(ctx, char *);
+ deps[0] = NULL;
+ }
return deps;
}
static char *replace(const void *ctx, const char *src,
const char *from, const char *to)
{
- char *ret = talloc_strdup(ctx, "");
+ char *ret = tal_strdup(ctx, "");
unsigned int rlen, len, add;
rlen = len = 0;
else
add = next - (src+len);
- ret = talloc_realloc(ctx, ret, char, rlen + add + strlen(to)+1);
+ tal_resize(&ret, rlen + add + strlen(to)+1);
memcpy(ret+rlen, src+len, add);
if (!next)
return ret;
/* This is a terrible hack. We scan for ccan/ strings. */
static char **get_one_safe_deps(const void *ctx,
const char *dir,
+ const char *style,
char *(*unused)(const void *, const char *))
{
char **deps, **lines, *raw, *fname;
unsigned int i, n;
+ bool correct_style = false;
- fname = talloc_asprintf(ctx, "%s/_info", dir);
- raw = 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);
/* Replace \n by actual line breaks, and split it. */
- lines = strsplit(raw, replace(raw, raw, "\\n", "\n"), "\n");
+ lines = tal_strsplit(raw, replace(raw, raw, "\\n", "\n"), "\n",
+ STR_EMPTY_OK);
- deps = talloc_array(ctx, char *, talloc_array_length(lines));
+ deps = tal_arr(ctx, char *, tal_count(lines));
for (n = i = 0; lines[i]; i++) {
char *str;
if (lines[i][0] == '#')
continue;
+ if (strstr(lines[i], "\"testdepends\""))
+ correct_style = streq(style, "testdepends");
+ else if (strstr(lines[i], "\"depends\""))
+ correct_style = streq(style, "depends");
+
+ if (!correct_style)
+ continue;
+
/* Start of line, or after ". */
if (strstarts(lines[i], "ccan/"))
str = lines[i];
len = strspn(str, "/abcdefghijklmnopqrstuvxwyz12345678980_");
if (len == 5)
continue;
- deps[n++] = talloc_strndup(deps, str, len);
+ deps[n++] = tal_strndup(deps, str, len);
}
deps[n] = NULL;
- talloc_free(fname);
+ tal_free(fname);
- /* Make sure talloc_array_length() works */
- return talloc_realloc(NULL, deps, char *, n + 1);
+ /* Make sure tal_array_length() works */
+ tal_resize(&deps, n + 1);
+ return deps;
}
static bool have_dep(char **deps, const char *dep)
/* Gets all the dependencies, recursively. */
static char **
-get_all_deps(const void *ctx, const char *dir,
+get_all_deps(const void *ctx, const char *dir, const char *style,
char *(*get_info)(const void *ctx, const char *dir),
- char **(*get_one)(const void *, const char *,
+ char **(*get_one)(const void *, const char *, const char *,
char *(*get_info)(const void *, const char *)))
{
char **deps;
unsigned int i;
- deps = get_one(ctx, dir, get_info);
- for (i = 0; i < talloc_array_length(deps)-1; 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;
char *subdir;
if (!strstarts(deps[i], "ccan/"))
continue;
- subdir = talloc_asprintf(ctx, "%s/%s",
- talloc_dirname(ctx, dir),
- deps[i] + strlen("ccan/"));
- newdeps = get_one(ctx, subdir, get_info);
+ 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. */
- for (j = 0; j < talloc_array_length(newdeps)-1; j++) {
+ for (j = 0; j < tal_count(newdeps)-1; j++) {
unsigned int num;
if (have_dep(deps, newdeps[j]))
continue;
- num = talloc_array_length(deps)-1;
- deps = talloc_realloc(NULL, deps, char *, num + 2);
+ num = tal_count(deps)-1;
+ tal_resize(&deps, num + 2);
deps[num] = newdeps[j];
deps[num+1] = NULL;
}
return deps;
}
-/* Can return NULL: _info may not support 'libs'. */
-static char **get_one_libs(const void *ctx, const char *dir,
+/* Can return NULL: _info may not support prop. */
+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 = talloc_asprintf(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)
- lines = talloc_realloc(NULL, lines, char *,
- talloc_array_length(lines)-1);
+ tal_resize(&lines, tal_count(lines)-1);
return lines;
}
-char **get_libs(const void *ctx, const char *dir, bool recurse,
+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);
+}
+
+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)
+{
+ unsigned int i, len;
+
+ len = tal_count(deps1);
+
+ for (i = 0; deps2[i]; i++) {
+ if (have_dep(deps1, deps2[i]))
+ continue;
+ tal_resize(&deps1, len + 1);
+ deps1[len-1] = tal_strdup(deps1, deps2[i]);
+ deps1[len++] = NULL;
+ }
+ 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_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 (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], ""))
+ return NULL;
+ else
+ return ported[0];
+}
+
+char *get_ported(const void *ctx, const char *dir, bool recurse,
+ char *(*get_info)(const void *ctx, const char *dir))
+{
+ char *msg;
+
+ msg = get_one_ported(ctx, dir, get_info);
+ if (msg)
+ return msg;
+
+ if (recurse) {
+ size_t i;
+ char **deps = get_deps(ctx, dir, "depends", true, get_info);
+ for (i = 0; deps[i]; i++) {
+ char *subdir;
+ if (!strstarts(deps[i], "ccan/"))
+ continue;
+
+ subdir = path_join(ctx, find_ccan_dir(dir), deps[i]);
+ msg = get_one_ported(ctx, subdir, get_info);
+ if (msg)
+ return msg;
+ }
+ }
+ return NULL;
+}
+
+char **get_libs(const void *ctx, const char *dir, const char *style,
char *(*get_info)(const void *ctx, const char *dir))
{
char **deps, **libs;
unsigned int i, len;
libs = get_one_libs(ctx, dir, get_info);
- len = talloc_array_length(libs);
+ len = tal_count(libs);
+
+ if (style) {
+ deps = get_deps(ctx, dir, style, true, get_info);
+ if (streq(style, "testdepends"))
+ deps = add_deps(deps,
+ get_deps(ctx, dir, "depends", true,
+ get_info));
- if (recurse) {
- deps = get_deps(ctx, dir, true, get_info);
for (i = 0; deps[i]; i++) {
char **newlibs, *subdir;
size_t newlen;
if (!strstarts(deps[i], "ccan/"))
continue;
- subdir = talloc_asprintf(ctx, "%s/%s",
- talloc_dirname(ctx, dir),
- deps[i] + strlen("ccan/"));
+ subdir = path_join(ctx, find_ccan_dir(dir), deps[i]);
newlibs = get_one_libs(ctx, subdir, get_info);
- newlen = talloc_array_length(newlibs);
- libs = talloc_realloc(ctx, libs, char *, len + newlen);
+ newlen = tal_count(newlibs);
+ tal_resize(&libs, len + newlen);
memcpy(&libs[len], newlibs,
sizeof(newlibs[0])*newlen);
len += newlen;
}
/* Append NULL entry. */
- libs = talloc_realloc(ctx, libs, char *, len + 1);
+ tal_resize(&libs, len + 1);
libs[len] = NULL;
return libs;
}
if (!deps)
return NULL;
- num = talloc_array_length(deps) - 1;
+ num = tal_count(deps) - 1;
for (i = 0; i < num; i++) {
for (j = i + 1; j < num; j++) {
if (streq(deps[i], deps[j])) {
}
}
deps[num] = NULL;
- /* Make sure talloc_array_length() works */
- return talloc_realloc(NULL, deps, char *, num + 1);
+ /* Make sure tal_count() works */
+ tal_resize(&deps, num + 1);
+ return deps;
}
-char **get_deps(const void *ctx, const char *dir, bool recurse,
+char **get_deps(const void *ctx, const char *dir, const char *style,
+ bool recurse,
char *(*get_info)(const void *ctx, const char *dir))
{
char **ret;
if (!recurse) {
- ret = get_one_deps(ctx, dir, get_info);
+ ret = get_one_deps(ctx, dir, style, get_info);
} else
- ret = get_all_deps(ctx, dir, get_info, get_one_deps);
+ ret = get_all_deps(ctx, dir, style, get_info, get_one_deps);
return uniquify_deps(ret);
}
-char **get_safe_ccan_deps(const void *ctx, const char *dir,
+char **get_safe_ccan_deps(const void *ctx, const char *dir, const char *style,
bool recurse)
{
char **ret;
if (!recurse) {
- ret = get_one_safe_deps(ctx, dir, NULL);
+ ret = get_one_safe_deps(ctx, dir, style, NULL);
} else {
- ret = get_all_deps(ctx, dir, NULL, get_one_safe_deps);
+ ret = get_all_deps(ctx, dir, style, NULL, get_one_safe_deps);
}
return uniquify_deps(ret);
}
projects / ccan / blobdiff