X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Finfo_documentation_exists.c;h=93954c76df5612b87ea62974481d6ec47e28c60b;hp=6d914648ca19e3852de76632d3b2fac69523f476;hb=38b87a97e4244e03d3f3887c0e632e31a0bfd8df;hpb=af5b1a18948345c5f9f9abf4eda3ab9fe0aa9a9f

diff --git a/tools/ccanlint/tests/info_documentation_exists.c b/tools/ccanlint/tests/info_documentation_exists.c
index 6d914648..93954c76 100644
--- a/tools/ccanlint/tests/info_documentation_exists.c
+++ b/tools/ccanlint/tests/info_documentation_exists.c
@@ -15,14 +15,27 @@
 #include <ccan/noerr/noerr.h>
 #include <ccan/grab_file/grab_file.h>
 
-REGISTER_TEST(info_documentation_exists);
+static void check_info_documentation_exists(struct manifest *m,
+					    unsigned int *timeleft,
+					    struct score *score);
+
+static struct ccanlint info_documentation_exists = {
+	.key = "info_documentation_exists",
+	.name = "Module has documentation in _info",
+	.check = check_info_documentation_exists,
+	.needs = "info_exists"
+};
 
 static void create_info_template_doc(struct manifest *m, struct score *score)
 {
-	int fd = open("_info.new", O_WRONLY|O_CREAT|O_EXCL, 0666);
+	int fd;
 	FILE *new;
 	char *oldcontents;
 
+	if (!ask("Should I prepend description to _info file for you?"))
+		return;
+
+	fd = open("_info.new", O_WRONLY|O_CREAT|O_EXCL, 0666);
 	if (fd < 0 || !(new = fdopen(fd, "w")))
 		err(1, "Creating _info.new to insert documentation");
 
@@ -39,10 +52,10 @@ static void create_info_template_doc(struct manifest *m, struct score *score)
 		err(1, "Writing to _info.new to insert documentation");
 	}
 
-	oldcontents = grab_file(m, "_info", NULL);
+	oldcontents = grab_file(m, m->info_file->fullname, NULL);
 	if (!oldcontents) {
 		unlink_noerr("_info.new");
-		err(1, "Reading _info");
+		err(1, "Reading %s", m->info_file->fullname);
 	}
 	if (fprintf(new, "%s", oldcontents) < 0) {
 		unlink_noerr("_info.new");
@@ -52,9 +65,9 @@ static void create_info_template_doc(struct manifest *m, struct score *score)
 		unlink_noerr("_info.new");
 		err(1, "Closing _info.new");
 	}
-	if (!move_file("_info.new", "_info")) {
+	if (!move_file("_info.new", m->info_file->fullname)) {
 		unlink_noerr("_info.new");
-		err(1, "Renaming _info.new to _info");
+		err(1, "Renaming _info.new to %s", m->info_file->fullname);
 	}
 }
 
@@ -95,10 +108,5 @@ static void check_info_documentation_exists(struct manifest *m,
 	}
 }
 
-struct ccanlint info_documentation_exists = {
-	.key = "info_documentation_exists",
-	.name = "Module has documentation in _info",
-	.check = check_info_documentation_exists,
-	.needs = "info_exists"
-};
+REGISTER_TEST(info_documentation_exists);