ccanlint: fix error with --target=build

[ccan] / tools / ccanlint / file_analysis.c

diff --git a/tools/ccanlint/file_analysis.c b/tools/ccanlint/file_analysis.c
index c03931d8b45874cd97366647adbe50bf269bae80..59dd40fd9d4c04585b990fd1b0772c4b27d87352 100644 (file)
--- a/tools/ccanlint/file_analysis.c
+++ b/tools/ccanlint/file_analysis.c
@@ -4,6 +4,8 @@
 #include <ccan/str_talloc/str_talloc.h>
 #include <ccan/grab_file/grab_file.h>
 #include <ccan/noerr/noerr.h>
+#include <ccan/foreach/foreach.h>
+#include <ccan/asort/asort.h>
 #include "../tools.h"
 #include <unistd.h>
 #include <sys/types.h>
@@ -14,13 +16,25 @@
 #include <dirent.h>
 #include <ctype.h>
 #include <stdarg.h>
+#include <assert.h>
 
 const char *ccan_dir;
 
+const char *get_ccan_file_contents(struct ccan_file *f)
+{
+       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, f->contents, "\n", &f->num_lines);
+               f->lines = strsplit(f, get_ccan_file_contents(f),
+                                   "\n", &f->num_lines);
 
        return f->lines;
 }
@@ -38,6 +52,8 @@ 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;
@@ -45,6 +61,8 @@ struct ccan_file *new_ccan_file(const void *ctx, const char *dir, char *name)
        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;
 }
 
@@ -87,23 +105,15 @@ static void add_files(struct manifest *m, const char *dir)
 
                if (streq(f->name, "_info")) {
                        m->info_file = f;
-                       f->contents = grab_file(f, f->name, &f->contents_size);
-                       if (!f->contents)
-                               err(1, "Reading file %s", f->name);
                        continue;
                }
 
                is_c_src = strends(f->name, ".c");
                if (!is_c_src && !strends(f->name, ".h")) {
-                       /* We don't pull in contents of non-source files */
                        dest = &m->other_files;
                        continue;
                }
 
-               f->contents = grab_file(f, f->name, &f->contents_size);
-               if (!f->contents)
-                       err(1, "Reading file %s", f->name);
-
                if (!strchr(f->name, '/')) {
                        if (is_c_src)
                                dest = &m->c_files;
@@ -131,28 +141,28 @@ static void add_files(struct manifest *m, const char *dir)
        closedir(d);
 }
 
-char *report_on_lines(struct list_head *files,
-                     char *(*report)(const char *),
-                     char *sofar)
+static int cmp_names(struct ccan_file *const *a, struct ccan_file *const *b,
+                    void *unused)
 {
-       struct ccan_file *f;
-
-       list_for_each(files, f, list) {
-               unsigned int i;
-               char **lines = get_ccan_file_lines(f);
-
-               for (i = 0; i < f->num_lines; i++) {
-                       char *r = report(lines[i]);
-                       if (!r)
-                               continue;
+       return strcmp((*a)->name, (*b)->name);
+}
 
-                       sofar = talloc_asprintf_append(sofar,
-                                                      "%s:%u:%s\n",
-                                                      f->name, i+1, r);
-                       talloc_free(r);
-               }
+static void sort_files(struct list_head *list)
+{
+       struct ccan_file **files = NULL, *f;
+       unsigned int i, num;
+
+       num = 0;
+       while ((f = list_top(list, struct ccan_file, list)) != NULL) {
+               files = talloc_realloc(NULL, files, struct ccan_file *, num+1);
+               files[num++] = f;
+               list_del(&f->list);
        }
-       return sofar;
+       asort(files, num, cmp_names, NULL);
+
+       for (i = 0; i < num; i++)
+               list_add_tail(list, &files[i]->list);
+       talloc_free(files);
 }
 
 struct manifest *get_manifest(const void *ctx, const char *dir)
@@ -160,8 +170,10 @@ struct manifest *get_manifest(const void *ctx, const char *dir)
        struct manifest *m = talloc(ctx, struct manifest);
        char *olddir;
        unsigned int len;
+       struct list_head *list;
 
        m->info_file = NULL;
+       m->compiled = NULL;
        list_head_init(&m->c_files);
        list_head_init(&m->h_files);
        list_head_init(&m->api_tests);
@@ -171,8 +183,9 @@ struct manifest *get_manifest(const void *ctx, const char *dir)
        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->dep_dirs);
-       list_head_init(&m->dep_objs);
+       list_head_init(&m->examples);
+       list_head_init(&m->mangled_examples);
+       list_head_init(&m->deps);
 
        olddir = talloc_getcwd(NULL);
        if (!olddir)
@@ -206,6 +219,11 @@ struct manifest *get_manifest(const void *ctx, const char *dir)
 
        add_files(m, "");
 
+       /* Nicer to run tests in a predictable order. */
+       foreach_ptr(list, &m->api_tests, &m->run_tests, &m->compile_ok_tests,
+                   &m->compile_fail_tests)
+               sort_files(list);
+
        if (chdir(olddir) != 0)
                err(1, "Returning to original directory '%s'", olddir);
        talloc_free(olddir);
@@ -565,3 +583,12 @@ enum line_compiled get_ccan_line_pp(struct pp_conditions *cond,
        return ret;
 }
 
+void score_file_error(struct score *score, struct ccan_file *f, unsigned line,
+                     const char *error)
+{
+       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);
+}