X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Fdepends_accurate.c;h=e13eb1168bcb28568ee6e0aea349d49e021885df;hp=a6d3a73a85dd94b6b4289f4c14dd1100b260f80b;hb=9aa2e32a540e26d68be9b4c1dbca6a42ef0787c1;hpb=016a19d260cd7f4afeb5b2b2cc28c8bbed1cd170

diff --git a/tools/ccanlint/tests/depends_accurate.c b/tools/ccanlint/tests/depends_accurate.c
index a6d3a73a..e13eb116 100644
--- a/tools/ccanlint/tests/depends_accurate.c
+++ b/tools/ccanlint/tests/depends_accurate.c
@@ -2,6 +2,7 @@
 #include <tools/tools.h>
 #include <ccan/talloc/talloc.h>
 #include <ccan/str/str.h>
+#include <ccan/str_talloc/str_talloc.h>
 #include <ccan/foreach/foreach.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -15,19 +16,6 @@
 #include <string.h>
 #include <ctype.h>
 
-static char *strip_spaces(const void *ctx, char *line)
-{
-	char *p = talloc_strdup(ctx, line);
-	unsigned int i, j;
-
-	for (i = 0, j = 0; p[i]; i++) {
-		if (!isspace(p[i]))
-			p[j++] = p[i];
-	}
-	p[j] = '\0';
-	return p;
-}
-
 static bool has_dep(struct manifest *m, const char *depname)
 {
 	struct manifest *i;
@@ -49,6 +37,9 @@ static void check_depends_accurate(struct manifest *m,
 {
 	struct list_head *list;
 
+	/* FIXME: This isn't reliable enough with #ifdefs, so we don't fail. */
+	score->pass = true;
+
 	foreach_ptr(list, &m->c_files, &m->h_files,
 		    &m->run_tests, &m->api_tests,
 		    &m->compile_ok_tests, &m->compile_fail_tests,
@@ -60,28 +51,21 @@ static void check_depends_accurate(struct manifest *m,
 			char **lines = get_ccan_file_lines(f);
 
 			for (i = 0; lines[i]; i++) {
-				char *p;
-				if (lines[i][strspn(lines[i], " \t")] != '#')
-					continue;
-				p = strip_spaces(f, lines[i]);
-				if (!strstarts(p, "#include<ccan/")
-				    && !strstarts(p, "#include\"ccan/"))
-					continue;
-				p += strlen("#include\"ccan/");
-				if (!strchr(strchr(p, '/') + 1, '/'))
+				char *mod;
+				if (!strreg(f, lines[i],
+					    "^[ \t]*#[ \t]*include[ \t]*[<\"]"
+					    "ccan/+([^/]+)/", &mod))
 					continue;
-				*strchr(strchr(p, '/') + 1, '/') = '\0';
-				if (has_dep(m, p))
+				if (has_dep(m, mod))
 					continue;
-				score->error = "Includes a ccan module"
-					" not listed in _info";
-				score_file_error(score, f, i+1, lines[i]);
+				score_file_error(score, f, i+1,
+						 "%s not listed in _info",
+						 mod);
 			}
 		}
 	}
 
 	if (!score->error) {
-		score->pass = true;
 		score->score = score->total;
 	}
 }