X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Fdepends_exist.c;h=f69a08e432b4a91951f79c23735c11a1705e384b;hp=c63d2d2c84d6d85baafdd953a2279bd671199b29;hb=02358a946a10fc2222b9966f3861cdc10a5550b8;hpb=dc8042b42500f79f613b1197df6cdf739615a89f diff --git a/tools/ccanlint/tests/depends_exist.c b/tools/ccanlint/tests/depends_exist.c index c63d2d2c..f69a08e4 100644 --- a/tools/ccanlint/tests/depends_exist.c +++ b/tools/ccanlint/tests/depends_exist.c @@ -1,6 +1,7 @@ #include #include #include +#include #include #include #include @@ -30,7 +31,7 @@ static bool add_dep(struct manifest *m, { struct stat st; struct manifest *subm; - char *dir = tal_fmt(m, "%s/%s", ccan_dir, dep); + char *dir = path_join(m, ccan_dir, dep); /* FIXME: get_manifest has a tendency to exit. */ if (stat(dir, &st) != 0) { @@ -56,6 +57,11 @@ static void check_depends_exist(struct manifest *m, deps = get_deps(m, m->dir, "depends", true, get_or_compile_info); + if (!deps) { + score->error = tal_fmt(m, "Could not extract dependencies"); + return; + } + for (i = 0; deps[i]; i++) { if (!strstarts(deps[i], "ccan/")) continue;