X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Ffile_analysis.c;h=7ce65479bde929cb3e036ff73514522a9f4cddad;hp=14b2631e1ef630671748a78441e35995663659ce;hb=e8c85e38cc6e0094c8d9e286e1706756035b95e0;hpb=23e4603462692031a29ea4b2a882f957de4f2922

diff --git a/tools/ccanlint/file_analysis.c b/tools/ccanlint/file_analysis.c
index 14b2631e..7ce65479 100644
--- a/tools/ccanlint/file_analysis.c
+++ b/tools/ccanlint/file_analysis.c
@@ -1,3 +1,4 @@
+#include "config.h"
 #include "ccanlint.h"
 #include <ccan/talloc/talloc.h>
 #include <ccan/str/str.h>
@@ -54,9 +55,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;
 }
 
@@ -64,7 +66,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;
 }
@@ -91,6 +93,7 @@ static void add_files(struct manifest *m, const char *dir)
 {
 	DIR *d;
 	struct dirent *ent;
+	char **subs = NULL;
 
 	if (dir[0])
 		d = opendir(dir);
@@ -115,8 +118,9 @@ static void add_files(struct manifest *m, const char *dir)
 			err(1, "lstat %s", f->name);
 
 		if (S_ISDIR(st.st_mode)) {
-			f->name = talloc_append_string(f->name, "/");
-			add_files(m, f->name);
+			size_t len = talloc_array_length(subs);
+			subs = talloc_realloc(m, subs, char *, len+1);
+			subs[len] = talloc_append_string(f->name, "/");
 			continue;
 		}
 		if (!S_ISREG(st.st_mode)) {
@@ -132,10 +136,7 @@ static void add_files(struct manifest *m, const char *dir)
 		is_c_src = strends(f->name, ".c");
 		if (!is_c_src && !strends(f->name, ".h")) {
 			dest = &m->other_files;
-			continue;
-		}
-
-		if (!strchr(f->name, '/')) {
+		} else if (!strchr(f->name, '/')) {
 			if (is_c_src)
 				dest = &m->c_files;
 			else
@@ -160,6 +161,20 @@ static void add_files(struct manifest *m, const char *dir)
 		list_add(dest, &f->list);
 	}
 	closedir(d);
+
+	/* Before we recurse, sanity check this is a ccan module. */ 
+	if (!dir[0]) {
+		size_t i;
+
+		if (!m->info_file
+		    && list_empty(&m->c_files)
+		    && list_empty(&m->h_files))
+			errx(1, "No _info, C or H files found here!");
+
+		for (i = 0; i < talloc_array_length(subs); i++)
+			add_files(m, subs[i]);
+	}
+	talloc_free(subs);
 }
 
 static int cmp_names(struct ccan_file *const *a, struct ccan_file *const *b,
@@ -239,12 +254,17 @@ struct manifest *get_manifest(const void *ctx, const char *dir)
 
 	/* 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, '/');
+		char *p, *dir;
+		dir = talloc_strdup(NULL, m->dir);
+		p = strrchr(dir, '/');
+		if (!p)
+			errx(1, "I expect the ccan root directory in ../..");
 		*p = '\0';
-		p = strrchr(ccan_dir, '/');
+		p = strrchr(dir, '/');
+		if (!p)
+			errx(1, "I expect the ccan root directory in ../..");
 		*p = '\0';
+		ccan_dir = dir;
 	}
 
 	add_files(m, "");
@@ -343,7 +363,7 @@ bool get_token(const char **line, const char *token)
 	unsigned int toklen;
 
 	*line += strspn(*line, " \t");
-	if (isalnum(token[0]) || token[0] == '_')
+	if (cisalnum(token[0]) || token[0] == '_')
 		toklen = strspn(*line, IDENT_CHARS);
 	else {
 		/* FIXME: real tokenizer handles ++ and other multi-chars.  */
@@ -385,6 +405,17 @@ static bool parse_hash_if(struct pp_conditions *cond, const char **line)
 		return false;
 	if (!defined)
 		cond->type = PP_COND_IF;
+
+	/* FIXME: We just chain them, ignoring operators. */
+	if (get_token(line, "||") || get_token(line, "&&")) {
+		struct pp_conditions *sub = talloc(cond, struct pp_conditions);
+
+		sub->parent = cond->parent;
+		sub->type = PP_COND_IFDEF;
+		if (parse_hash_if(sub, line))
+			cond->parent = sub;
+	}
+
 	return true;
 }
 
@@ -617,11 +648,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");
 }