/* 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, "");
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. */
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;
}