ccanlint: handle nested modules when mentioned in examples.

[ccan] / tools / ccanlint / tests / info_documentation_exists.c

diff --git a/tools/ccanlint/tests/info_documentation_exists.c b/tools/ccanlint/tests/info_documentation_exists.c
index 7be0b797532727a6fe1acd8f9af7e1ac52780837..0c0ed451494db5604e489fa036a55050360015b4 100644 (file)
--- 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");
 
@@ -43,15 +47,15 @@ static void create_info_template_doc(struct manifest *m, struct score *score)
                    " *\n"
                    " * Followed by an Example: section with a standalone\n"
                    " * (trivial and usually useless) program\n"
-                   " */\n", m->basename, m->basename) < 0) {
+                   " */\n", m->modname, m->basename) < 0) {
                unlink_noerr("_info.new");
                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);
        }
 }
 
@@ -79,7 +83,7 @@ static void check_info_documentation_exists(struct manifest *m,
        score->pass = true;
 
        list_for_each(infodocs, d, list) {
-               if (!streq(d->function, m->basename))
+               if (!streq(d->function, m->modname))
                        continue;
                if (streq(d->type, "summary"))
                        summary = true;