From 38b87a97e4244e03d3f3887c0e632e31a0bfd8df Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Thu, 22 Nov 2012 10:08:53 +1030 Subject: [PATCH 1/1] ccanlint: fix _info documentation addition. Firstly, we should always ask before altering files. Secondly, we are not in the module directory: we need to use m->info_file->fullname. Signed-off-by: Rusty Russell --- tools/ccanlint/tests/info_documentation_exists.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/tools/ccanlint/tests/info_documentation_exists.c b/tools/ccanlint/tests/info_documentation_exists.c index 7be0b797..93954c76 100644 --- a/tools/ccanlint/tests/info_documentation_exists.c +++ b/tools/ccanlint/tests/info_documentation_exists.c @@ -28,10 +28,14 @@ static struct ccanlint info_documentation_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"); @@ -48,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"); @@ -61,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); } } -- 2.39.2