X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Ffile_analysis.c;h=3152cd1e16a555e8b19ebca25c2b1836df11aed2;hp=dc23eb964b2f5ba3c49bf03a3e52dd3de1311d1b;hb=165727526f785b05f67f3d88f9518a0a840acbbf;hpb=a3d9f540245cbb6d4e2dc16d51d838d753c636a2

diff --git a/tools/ccanlint/file_analysis.c b/tools/ccanlint/file_analysis.c
index dc23eb96..3152cd1e 100644
--- a/tools/ccanlint/file_analysis.c
+++ b/tools/ccanlint/file_analysis.c
@@ -17,12 +17,9 @@
 
 char **get_ccan_file_lines(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->lines)
+		f->lines = strsplit(f, f->contents, "\n", &f->num_lines);
+
 	return f->lines;
 }
 
@@ -35,6 +32,19 @@ struct list_head *get_ccan_file_docs(struct ccan_file *f)
 	return f->doc_sections;
 }
 
+struct ccan_file *new_ccan_file(const void *ctx, char *name)
+{
+	struct ccan_file *f;
+
+	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);
+	return f;
+}
+
 static void add_files(struct manifest *m, const char *dir)
 {
 	DIR *d;
@@ -56,11 +66,8 @@ 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, talloc_asprintf(m, "%s%s",
+						     dir, ent->d_name));
 		if (lstat(f->name, &st) != 0)
 			err(1, "lstat %s", f->name);
 
@@ -74,15 +81,26 @@ 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;
+			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"))
+		if (!is_c_src && !strends(f->name, ".h")) {
+			/* We don't pull in contents of non-source files */
 			dest = &m->other_files;
-		else if (!strchr(f->name, '/')) {
+			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;
 			else
@@ -98,7 +116,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 +151,9 @@ char *report_on_lines(struct list_head *files,
 	return sofar;
 }
 
-struct manifest *get_manifest(void)
+struct manifest *get_manifest(const void *ctx)
 {
-	struct manifest *m = talloc(NULL, struct manifest);
+	struct manifest *m = talloc(ctx, struct manifest);
 	unsigned int len;
 
 	m->info_file = NULL;
@@ -145,18 +163,15 @@ 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->dep_dirs);
+	list_head_init(&m->dep_objs);
 
-	/* *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);
-	}
-
+	m->basename = talloc_getcwd(m);
+	if (!m->basename)
+		err(1, "Getting current directory");
 	len = strlen(m->basename);
 	while (len && m->basename[len-1] == '/')
 		m->basename[--len] = '\0';