X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fccanlint%2Fcompulsory_tests%2Fhas_info.c;h=ce131f85686ec88111c1b0ea709a04c77fbbcc50;hb=a1585d5b6833783d104acecadce4574115f97cea;hp=97cad5940a25374964ce24276a7c4f476122567c;hpb=304652023042670b3173de0ad5dc0eb7c836618c;p=ccan

diff --git a/tools/ccanlint/compulsory_tests/has_info.c b/tools/ccanlint/compulsory_tests/has_info.c
index 97cad594..ce131f85 100644
--- a/tools/ccanlint/compulsory_tests/has_info.c
+++ b/tools/ccanlint/compulsory_tests/has_info.c
@@ -10,20 +10,22 @@
 #include <err.h>
 #include <string.h>
 #include <ccan/noerr/noerr.h>
+#include <ccan/talloc/talloc.h>
 
-static void *check_has_info(struct manifest *m, unsigned int *timeleft)
+static void check_has_info(struct manifest *m,
+			   bool keep,
+			   unsigned int *timeleft,
+			   struct score *score)
 {
-	if (m->info_file)
-		return NULL;
-	return m;
-}
-
-static const char *describe_has_info(struct manifest *m, void *check_result)
-{
-	return "You have no _info file.\n\n"
+	if (m->info_file) {
+		score->pass = true;
+		score->score = score->total;
+	} else {
+		score->error = "You have no _info file.\n\n"
 	"The file _info contains the metadata for a ccan package: things\n"
 	"like the dependencies, the documentation for the package as a whole\n"
 	"and license information.\n";
+	}
 }
 
 static const char template[] = 
@@ -52,20 +54,22 @@ static const char template[] =
 	"	return 1;\n"
 	"}\n";
 
-static void create_info_template(struct manifest *m, void *check_result)
+static void create_info_template(struct manifest *m, struct score *score)
 {
 	FILE *info;
+	const char *filename;
 
 	if (!ask("Should I create a template _info file for you?"))
 		return;
 
-	info = fopen("_info", "w");
+	filename = talloc_asprintf(m, "%s/%s", m->dir, "_info");
+	info = fopen(filename, "w");
 	if (!info)
-		err(1, "Trying to create a template _info");
+		err(1, "Trying to create a template _info in %s", filename);
 
 	if (fprintf(info, template, m->basename) < 0) {
-		unlink_noerr("_info");
-		err(1, "Writing template into _info");
+		unlink_noerr(filename);
+		err(1, "Writing template into %s", filename);
 	}
 	fclose(info);
 }
@@ -74,7 +78,6 @@ struct ccanlint has_info = {
 	.key = "info",
 	.name = "Module has _info file",
 	.check = check_has_info,
-	.describe = describe_has_info,
 	.handle = create_info_template,
 };