X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Fexamples_compile.c;h=7d8803c6973db2cc4213915a30caa1e3aa67d5f3;hp=ce1d9769691d7ee6fa07736e33718f8deb2c55e5;hb=932d65dd6537250e617516749f03a00fea3b34f6;hpb=6a4d45337811b56d947e52f031b9ca0c955fcb6c

diff --git a/tools/ccanlint/tests/examples_compile.c b/tools/ccanlint/tests/examples_compile.c
index ce1d9769..7d8803c6 100644
--- a/tools/ccanlint/tests/examples_compile.c
+++ b/tools/ccanlint/tests/examples_compile.c
@@ -1,6 +1,7 @@
 #include <tools/ccanlint/ccanlint.h>
 #include <tools/tools.h>
 #include <ccan/talloc/talloc.h>
+#include <ccan/str_talloc/str_talloc.h>
 #include <ccan/cast/cast.h>
 #include <ccan/str/str.h>
 #include <sys/types.h>
@@ -83,13 +84,10 @@ static struct manifest **get_example_deps(struct manifest *m,
 
 	/* Other modules implied by includes. */
 	for (lines = get_ccan_file_lines(f); *lines; lines++) {
-		unsigned preflen = strspn(*lines, " \t");
-		if (strstarts(*lines + preflen, "#include <ccan/")) {
-			char *modname;
-
-			modname = talloc_strdup(f, *lines + preflen
-						+ strlen("#include <ccan/"));
-			modname[strcspn(modname, "/")] = '\0';
+		char *modname;
+		if (strreg(f, *lines,
+			    "^[ \t]*#[ \t]*include[ \t]*[<\"]"
+			   "ccan/+(.+)/+[^/]+\\.h", &modname)) {
 			if (!have_mod(deps, modname))
 				add_dep(&deps, modname);
 		}