ccanlint: handle DOS-style \r\n lines when parsing.

[ccan] / tools / ccanlint / file_analysis.c

diff --git a/tools/ccanlint/file_analysis.c b/tools/ccanlint/file_analysis.c
index e8c8ebc6dbb057f24849a6edd541c5c6cfda028d..d55e2b8c12bebd7b4d4062ed93b1d7350ae8216e 100644 (file)
--- 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>
@@ -85,6 +86,7 @@ struct ccan_file *new_ccan_file(const void *ctx, const char *dir, char *name)
        f->fullname = talloc_asprintf(f, "%s/%s", dir, f->name);
        f->contents = NULL;
        f->cov_compiled = NULL;
+       f->simplified = NULL;
        return f;
 }
 
@@ -135,10 +137,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
@@ -256,16 +255,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, "");
@@ -349,7 +349,7 @@ static char *remove_comments(const char *line, bool in_comment,
 
 static bool is_empty(const char *line)
 {
-       return strspn(line, " \t") == strlen(line);
+       return strspn(line, " \r\t") == strlen(line);
 }
 
 static bool continues(const char *line)
@@ -364,7 +364,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.  */
@@ -406,6 +406,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;
 }