ccanlint: fix _info option handling

[ccan] / tools / ccanlint / file_analysis.c

diff --git a/tools/ccanlint/file_analysis.c b/tools/ccanlint/file_analysis.c
index 59dd40fd9d4c04585b990fd1b0772c4b27d87352..985f259b24c3ac87821a614f01ce0ec63e9d1a89 100644 (file)
--- a/tools/ccanlint/file_analysis.c
+++ b/tools/ccanlint/file_analysis.c
@@ -2,6 +2,9 @@
 #include <ccan/talloc/talloc.h>
 #include <ccan/str/str.h>
 #include <ccan/str_talloc/str_talloc.h>
+#include <ccan/talloc_link/talloc_link.h>
+#include <ccan/hash/hash.h>
+#include <ccan/htable/htable_type.h>
 #include <ccan/grab_file/grab_file.h>
 #include <ccan/noerr/noerr.h>
 #include <ccan/foreach/foreach.h>
@@ -20,6 +23,24 @@
 
 const char *ccan_dir;
 
+static size_t dir_hash(const char *name)
+{
+       return hash(name, strlen(name), 0);
+}
+
+static const char *manifest_name(const struct manifest *m)
+{
+       return m->dir;
+}
+
+static bool dir_cmp(const struct manifest *m, const char *dir)
+{
+       return strcmp(m->dir, dir) == 0;
+}
+
+HTABLE_DEFINE_TYPE(struct manifest, manifest_name, dir_hash, dir_cmp, manifest);
+static struct htable_manifest *manifests;
+
 const char *get_ccan_file_contents(struct ccan_file *f)
 {
        if (!f->contents) {
@@ -33,9 +54,10 @@ const char *get_ccan_file_contents(struct ccan_file *f)
 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);
+               f->lines = strsplit(f, get_ccan_file_contents(f), "\n");
 
+       /* FIXME: is f->num_lines necessary? */
+       f->num_lines = talloc_array_length(f->lines) - 1;
        return f->lines;
 }
 
@@ -43,7 +65,7 @@ struct list_head *get_ccan_file_docs(struct ccan_file *f)
 {
        if (!f->doc_sections) {
                get_ccan_file_lines(f);
-               f->doc_sections = extract_doc_sections(f->lines, f->num_lines);
+               f->doc_sections = extract_doc_sections(f->lines);
        }
        return f->doc_sections;
 }
@@ -167,13 +189,33 @@ static void sort_files(struct list_head *list)
 
 struct manifest *get_manifest(const void *ctx, const char *dir)
 {
-       struct manifest *m = talloc(ctx, struct manifest);
-       char *olddir;
+       struct manifest *m;
+       char *olddir, *canon_dir;
        unsigned int len;
        struct list_head *list;
 
+       if (!manifests)
+               manifests = htable_manifest_new();
+
+       olddir = talloc_getcwd(NULL);
+       if (!olddir)
+               err(1, "Getting current directory");
+
+       if (chdir(dir) != 0)
+               err(1, "Failed to chdir to %s", dir);
+
+       canon_dir = talloc_getcwd(olddir);
+       if (!canon_dir)
+               err(1, "Getting current directory");
+
+       m = htable_manifest_get(manifests, canon_dir);
+       if (m)
+               goto done;
+
+       m = talloc_linked(ctx, talloc(NULL, struct manifest));
        m->info_file = NULL;
        m->compiled = NULL;
+       m->dir = talloc_steal(m, canon_dir);
        list_head_init(&m->c_files);
        list_head_init(&m->h_files);
        list_head_init(&m->api_tests);
@@ -187,17 +229,6 @@ struct manifest *get_manifest(const void *ctx, const char *dir)
        list_head_init(&m->mangled_examples);
        list_head_init(&m->deps);
 
-       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->dir);
        while (len && m->dir[len-1] == '/')
                m->dir[--len] = '\0';
@@ -224,6 +255,9 @@ struct manifest *get_manifest(const void *ctx, const char *dir)
                    &m->compile_fail_tests)
                sort_files(list);
 
+       htable_manifest_add(manifests, m);
+
+done:
        if (chdir(olddir) != 0)
                err(1, "Returning to original directory '%s'", olddir);
        talloc_free(olddir);
@@ -584,11 +618,35 @@ enum line_compiled get_ccan_line_pp(struct pp_conditions *cond,
 }
 
 void score_file_error(struct score *score, struct ccan_file *f, unsigned line,
-                     const char *error)
+                     const char *errorfmt, ...)
 {
+       va_list ap;
+
        struct file_error *fe = talloc(score, struct file_error);
        fe->file = f;
        fe->line = line;
-       fe->error = error;
        list_add_tail(&score->per_file_errors, &fe->list);
+
+       if (!score->error)
+               score->error = talloc_strdup(score, "");
+       
+       if (verbose < 2 && strcount(score->error, "\n") > 5)
+               return;
+
+       if (line)
+               score->error = talloc_asprintf_append(score->error,
+                                                     "%s:%u:",
+                                                     f->fullname, line);
+       else
+               score->error = talloc_asprintf_append(score->error,
+                                                     "%s:", f->fullname);
+
+       va_start(ap, errorfmt);
+       score->error = talloc_vasprintf_append(score->error, errorfmt, ap);
+       va_end(ap);
+       score->error = talloc_append_string(score->error, "\n");
+
+       if (verbose < 2 && strcount(score->error, "\n") > 5)
+               score->error = talloc_append_string(score->error,
+                                   "... more (use -vv to see them all)\n");
 }