#include <tools/tools.h>
#include <ccan/talloc/talloc.h>
#include <ccan/str/str.h>
+#include <ccan/str_talloc/str_talloc.h>
#include <ccan/foreach/foreach.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <string.h>
#include <ctype.h>
-static char *strip_spaces(const void *ctx, char *line)
+static bool has_dep(struct manifest *m, const char *depname)
{
- char *p = talloc_strdup(ctx, line);
- unsigned int i, j;
-
- for (i = 0, j = 0; p[i]; i++) {
- if (!isspace(p[i]))
- p[j++] = p[i];
- }
- p[j] = '\0';
- return p;
-}
-
-static bool has_dep(struct manifest *m, const char *depname, bool tap_ok)
-{
- struct ccan_file *f;
-
- if (tap_ok && streq(depname, "ccan/tap"))
- return true;
+ struct manifest *i;
/* We can include ourselves, of course. */
- if (streq(depname + strlen("ccan/"), m->basename))
+ if (streq(depname, m->basename))
return true;
- list_for_each(&m->dep_dirs, f, list) {
- if (streq(f->name, depname))
+ list_for_each(&m->deps, i, list) {
+ if (streq(i->basename, depname))
return true;
}
return false;
&m->compile_ok_tests, &m->compile_fail_tests,
&m->other_test_c_files) {
struct ccan_file *f;
- bool tap_ok;
-
- /* Including ccan/tap is fine for tests. */
- tap_ok = (list != &m->c_files && list != &m->h_files);
list_for_each(list, f, list) {
unsigned int i;
char **lines = get_ccan_file_lines(f);
for (i = 0; lines[i]; i++) {
- char *p;
- if (lines[i][strspn(lines[i], " \t")] != '#')
- continue;
- p = strip_spaces(f, lines[i]);
- if (!strstarts(p, "#include<ccan/")
- && !strstarts(p, "#include\"ccan/"))
- continue;
- p += strlen("#include\"");
- if (!strchr(strchr(p, '/') + 1, '/'))
+ char *mod;
+ if (!strreg(f, lines[i],
+ "^[ \t]*#[ \t]*include[ \t]*[<\"]"
+ "ccan/+([^/]+)/", &mod))
continue;
- *strchr(strchr(p, '/') + 1, '/') = '\0';
- if (has_dep(m, p, tap_ok))
+ if (has_dep(m, mod))
continue;
- score->error = "Includes a ccan module"
- " not listed in _info";
- score_file_error(score, f, i+1, lines[i]);
+ score_file_error(score, f, i+1,
+ "%s not listed in _info",
+ mod);
}
}
}
}
struct ccanlint depends_accurate = {
- .key = "depends-accurate",
- .name = "Module's CCAN dependencies are the only ccan files #included",
+ .key = "depends_accurate",
+ .name = "Module's CCAN dependencies are the only CCAN files #included",
.check = check_depends_accurate,
+ .needs = "depends_exist"
};
-REGISTER_TEST(depends_accurate, &depends_exist, NULL);
+REGISTER_TEST(depends_accurate);