X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Fexamples_exist.c;h=61359596e1f693ed56a127c613724462e1f1f2d7;hp=073a0b2c215c74e57b1b53cbed309a864c1a5aa9;hb=HEAD;hpb=509fc838deaf1c53638bcae6c1a826c2f990b827

diff --git a/tools/ccanlint/tests/examples_exist.c b/tools/ccanlint/tests/examples_exist.c
index 073a0b2c..61359596 100644
--- a/tools/ccanlint/tests/examples_exist.c
+++ b/tools/ccanlint/tests/examples_exist.c
@@ -1,7 +1,8 @@
 #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 <ccan/take/take.h>
 #include <ccan/cast/cast.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -24,29 +25,30 @@ static char *add_example(struct manifest *m, struct ccan_file *source,
 	int fd;
 	struct ccan_file *f;
 
-	name = talloc_asprintf(m, "%s/example-%s-%s.c",
-			       talloc_dirname(m,
-					      source->fullname),
-			       source->name,
-			       example->function);
+	name = tal_fmt(m, "example-%s-%s",
+		       source->name, example->function);
 	/* example->function == 'struct foo' */
 	while (strchr(name, ' '))
 		*strchr(name, ' ') = '_';
 
-	name = temp_file(m, ".c", name);
-	f = new_ccan_file(m, talloc_dirname(m, name), talloc_basename(m, name));
-	talloc_steal(f, name);
+	name = temp_file(m, ".c", take(name));
+	f = new_ccan_file(m, take(path_dirname(m, name)),
+			  take(path_basename(m, name)));
+	tal_steal(f, name);
 	list_add_tail(&m->examples, &f->list);
 
 	fd = open(f->fullname, O_WRONLY | O_CREAT | O_EXCL, 0600);
 	if (fd < 0)
-		return talloc_asprintf(m, "Creating temporary file %s: %s",
-				       f->fullname, strerror(errno));
+		return tal_fmt(m, "Creating temporary file %s: %s",
+			       f->fullname, strerror(errno));
 
 	/* Add #line to demark where we are from, so errors are correct! */
-	linemarker = talloc_asprintf(f, "#line %i \"%s\"\n",
-				     example->srcline+2, source->fullname);
-	write(fd, linemarker, strlen(linemarker));
+	linemarker = tal_fmt(f, "#line %i \"%s\"\n",
+			     example->srcline+2, source->fullname);
+	if (write(fd, linemarker, strlen(linemarker)) != (int)strlen(linemarker)) {
+		close(fd);
+		return cast_const(char *, "Failure writing to temporary file");
+	}
 
 	for (i = 0; i < example->num_lines; i++) {
 		if (write(fd, example->lines[i], strlen(example->lines[i]))
@@ -63,7 +65,7 @@ static char *add_example(struct manifest *m, struct ccan_file *source,
 
 /* FIXME: We should have one example per function in header. */
 static void extract_examples(struct manifest *m,
-			     unsigned int *timeleft,
+			     unsigned int *timeleft UNNEEDED,
 			     struct score *score)
 {
 	struct ccan_file *f, *mainh = NULL; /* gcc complains uninitialized */
@@ -80,13 +82,12 @@ static void extract_examples(struct manifest *m,
 		}
 	}
 
-	/* Check main header. */
+	/* Check all headers for examples. */
 	list_for_each(&m->h_files, f, list) {
-		if (!strstarts(f->name, m->basename)
-		    || strlen(f->name) != strlen(m->basename) + 2)
-			continue;
+		if (strstarts(f->name, m->basename)
+		    && strlen(f->name) == strlen(m->basename) + 2)
+			mainh = f;
 
-		mainh = f;
 		list_for_each(get_ccan_file_docs(f), d, list) {
 			if (streq(d->type, "example")) {
 				score->error = add_example(m, f, d);
@@ -116,7 +117,7 @@ struct ccanlint examples_exist = {
 	.key = "examples_exist",
 	.name = "_info and main header file have Example: sections",
 	.check = extract_examples,
-	.needs = "info_exists"
+	.needs = "info_exists main_header_exists"
 };
 
 REGISTER_TEST(examples_exist);