#include <string.h>
#include <ctype.h>
-static char *add_dep(char *sofar, struct manifest *m, const char *dep)
+static void add_dep(struct manifest *m, const char *dep, struct score *score)
{
- char *dir;
struct stat st;
struct ccan_file *f;
- dir = talloc_asprintf(m, "%s/%s", ccan_dir, dep);
- if (stat(dir, &st) != 0) {
- return talloc_asprintf_append(sofar,
- "ccan/%s: expected it in"
- " directory %s\n",
- dep, dir);
- }
-
- f = new_ccan_file(m, "", dir);
- list_add_tail(&m->dep_dirs, &f->list);
- return sofar;
+ f = new_ccan_file(m, ccan_dir, talloc_strdup(m, dep));
+ if (stat(f->fullname, &st) != 0) {
+ score->error = "Depends don't exist";
+ score_file_error(score, f, 0, "could not stat");
+ } else
+ list_add_tail(&m->dep_dirs, &f->list);
}
-static void *check_depends_exist(struct manifest *m)
+static void check_depends_exist(struct manifest *m,
+ bool keep,
+ unsigned int *timeleft, struct score *score)
{
unsigned int i;
- char *report = NULL;
char **deps;
char *updir = talloc_strdup(m, m->dir);
if (!strstarts(deps[i], "ccan/"))
continue;
- report = add_dep(report, m, deps[i]);
+ add_dep(m, deps[i], score);
+ }
+ if (!score->error) {
+ score->pass = true;
+ score->score = score->total;
}
- return report;
-}
-
-static const char *describe_depends_exist(struct manifest *m,
- void *check_result)
-{
- return talloc_asprintf(check_result,
- "The following dependencies are are expected:\n"
- "%s", (char *)check_result);
}
struct ccanlint depends_exist = {
.key = "depends-exist",
- .name = "CCAN dependencies are present",
- .total_score = 1,
+ .name = "Module's CCAN dependencies are present",
.check = check_depends_exist,
- .describe = describe_depends_exist,
};
REGISTER_TEST(depends_exist, NULL);