ccanlint: add test to look for modules we use but don't list in _info.

[ccan] / tools / ccanlint / file_analysis.c

diff --git a/tools/ccanlint/file_analysis.c b/tools/ccanlint/file_analysis.c
index dc23eb964b2f5ba3c49bf03a3e52dd3de1311d1b..b83e877e0455f6c3006537c90ea023e0034b2aaf 100644 (file)
--- a/tools/ccanlint/file_analysis.c
+++ b/tools/ccanlint/file_analysis.c
@@ -14,15 +14,26 @@
 #include <dirent.h>
 #include <ctype.h>
 #include <stdarg.h>
+#include <assert.h>
 
-char **get_ccan_file_lines(struct ccan_file *f)
+const char *ccan_dir;
+
+const char *get_ccan_file_contents(struct ccan_file *f)
 {
-       if (!f->lines) {
-               char *buffer = grab_file(f, f->name, NULL);
-               if (!buffer)
-                       err(1, "Getting file %s", f->name);
-               f->lines = strsplit(f, buffer, "\n", &f->num_lines);
+       if (!f->contents) {
+               f->contents = grab_file(f, f->fullname, &f->contents_size);
+               if (!f->contents)
+                       err(1, "Reading file %s", f->fullname);
        }
+       return f->contents;
+}
+
+char **get_ccan_file_lines(struct ccan_file *f)
+{
+       if (!f->lines)
+               f->lines = strsplit(f, get_ccan_file_contents(f),
+                                   "\n", &f->num_lines);
+
        return f->lines;
 }
 
@@ -35,6 +46,24 @@ struct list_head *get_ccan_file_docs(struct ccan_file *f)
        return f->doc_sections;
 }
 
+struct ccan_file *new_ccan_file(const void *ctx, const char *dir, char *name)
+{
+       struct ccan_file *f;
+
+       assert(dir[0] == '/');
+
+       f = talloc(ctx, struct ccan_file);
+       f->lines = NULL;
+       f->line_info = NULL;
+       f->doc_sections = NULL;
+       f->compiled = NULL;
+       f->name = talloc_steal(f, name);
+       f->fullname = talloc_asprintf(f, "%s/%s", dir, f->name);
+       f->contents = NULL;
+       f->cov_compiled = NULL;
+       return f;
+}
+
 static void add_files(struct manifest *m, const char *dir)
 {
        DIR *d;
@@ -56,11 +85,9 @@ static void add_files(struct manifest *m, const char *dir)
                if (ent->d_name[0] == '.')
                        continue;
 
-               f = talloc(m, struct ccan_file);
-               f->lines = NULL;
-               f->line_info = NULL;
-               f->doc_sections = NULL;
-               f->name = talloc_asprintf(f, "%s%s", dir, ent->d_name);
+               f = new_ccan_file(m, m->dir,
+                                 talloc_asprintf(m, "%s%s",
+                                                 dir, ent->d_name));
                if (lstat(f->name, &st) != 0)
                        err(1, "lstat %s", f->name);
 
@@ -74,15 +101,18 @@ static void add_files(struct manifest *m, const char *dir)
                        continue;
                }
 
-               if (streq(f->name, "_info.c")) {
+               if (streq(f->name, "_info")) {
                        m->info_file = f;
                        continue;
                }
 
                is_c_src = strends(f->name, ".c");
-               if (!is_c_src && !strends(f->name, ".h"))
+               if (!is_c_src && !strends(f->name, ".h")) {
                        dest = &m->other_files;
-               else if (!strchr(f->name, '/')) {
+                       continue;
+               }
+
+               if (!strchr(f->name, '/')) {
                        if (is_c_src)
                                dest = &m->c_files;
                        else
@@ -98,7 +128,7 @@ static void add_files(struct manifest *m, const char *dir)
                                else if (strstarts(f->name, "test/compile_fail"))
                                        dest = &m->compile_fail_tests;
                                else
-                                       dest = &m->other_test_files;
+                                       dest = &m->other_test_c_files;
                        } else
                                dest = &m->other_test_files;
                } else
@@ -133,9 +163,10 @@ char *report_on_lines(struct list_head *files,
        return sofar;
 }
 
-struct manifest *get_manifest(void)
+struct manifest *get_manifest(const void *ctx, const char *dir)
 {
-       struct manifest *m = talloc(NULL, struct manifest);
+       struct manifest *m = talloc(ctx, struct manifest);
+       char *olddir;
        unsigned int len;
 
        m->info_file = NULL;
@@ -145,28 +176,49 @@ struct manifest *get_manifest(void)
        list_head_init(&m->run_tests);
        list_head_init(&m->compile_ok_tests);
        list_head_init(&m->compile_fail_tests);
+       list_head_init(&m->other_test_c_files);
        list_head_init(&m->other_test_files);
        list_head_init(&m->other_files);
+       list_head_init(&m->examples);
+       list_head_init(&m->mangled_examples);
+       list_head_init(&m->dep_dirs);
 
-       /* *This* is why people hate C. */
-       len = 32;
-       m->basename = talloc_array(m, char, len);
-       while (!getcwd(m->basename, len)) {
-               if (errno != ERANGE)
-                       err(1, "Getting current directory");
-               m->basename = talloc_realloc(m, m->basename, char, len *= 2);
-       }
+       olddir = talloc_getcwd(NULL);
+       if (!olddir)
+               err(1, "Getting current directory");
+
+       if (chdir(dir) != 0)
+               err(1, "Failed to chdir to %s", dir);
+
+       m->dir = talloc_getcwd(m);
+       if (!m->dir)
+               err(1, "Getting current directory");
 
-       len = strlen(m->basename);
-       while (len && m->basename[len-1] == '/')
-               m->basename[--len] = '\0';
+       len = strlen(m->dir);
+       while (len && m->dir[len-1] == '/')
+               m->dir[--len] = '\0';
 
-       m->basename = strrchr(m->basename, '/');
+       m->basename = strrchr(m->dir, '/');
        if (!m->basename)
                errx(1, "I don't expect to be run from the root directory");
        m->basename++;
 
+       /* We expect the ccan dir to be two levels above module dir. */
+       if (!ccan_dir) {
+               char *p;
+               ccan_dir = talloc_strdup(NULL, m->dir);
+               p = strrchr(ccan_dir, '/');
+               *p = '\0';
+               p = strrchr(ccan_dir, '/');
+               *p = '\0';
+       }
+
        add_files(m, "");
+
+       if (chdir(olddir) != 0)
+               err(1, "Returning to original directory '%s'", olddir);
+       talloc_free(olddir);
+
        return m;
 }