X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Fdepends_exist.c;h=09c187e98f54ccefb01c6072be479fce72784d93;hb=6aa2f4e347e5d66a392b879fe901bc582099a552;hp=3d50a063a243c857bd79179c21dae0eba118955d;hpb=10e5e329a1a8804ff6461e1724071364cf6be572;p=ccan

diff --git a/tools/ccanlint/tests/depends_exist.c b/tools/ccanlint/tests/depends_exist.c
index 3d50a063..09c187e9 100644
--- a/tools/ccanlint/tests/depends_exist.c
+++ b/tools/ccanlint/tests/depends_exist.c
@@ -1,7 +1,7 @@
 #include <tools/ccanlint/ccanlint.h>
 #include <tools/tools.h>
-#include <ccan/talloc/talloc.h>
 #include <ccan/str/str.h>
+#include <ccan/tal/path/path.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
@@ -31,14 +31,12 @@ static bool add_dep(struct manifest *m,
 {
 	struct stat st;
 	struct manifest *subm;
-	char *dir = talloc_asprintf(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) {
-		score->error
-			= talloc_asprintf(m,
-					  "Could not stat dependency %s: %s",
-					  dir, strerror(errno));
+		score->error = tal_fmt(m, "Could not stat dependency %s: %s",
+				       dir, strerror(errno));
 		return false;
 	}
 	subm = get_manifest(m, dir);
@@ -59,9 +57,16 @@ 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/"))
+		if (!strstarts(deps[i], "ccan/")) {
+			non_ccan_deps = true;
 			continue;
+		}
 
 		if (!add_dep(m, &m->deps, deps[i], score))
 			return;