return f->doc_sections;
}
+struct ccan_file *new_ccan_file(const void *ctx, char *name)
+{
+ struct ccan_file *f;
+
+ f = talloc(ctx, struct ccan_file);
+ f->lines = NULL;
+ f->line_info = NULL;
+ f->doc_sections = NULL;
+ f->compiled = NULL;
+ f->name = talloc_steal(f, name);
+ return f;
+}
+
static void add_files(struct manifest *m, const char *dir)
{
DIR *d;
if (ent->d_name[0] == '.')
continue;
- f = talloc(m, struct ccan_file);
- f->lines = NULL;
- f->line_info = NULL;
- f->doc_sections = NULL;
- f->name = talloc_asprintf(f, "%s%s", dir, ent->d_name);
+ f = new_ccan_file(m, talloc_asprintf(m, "%s%s",
+ dir, ent->d_name));
if (lstat(f->name, &st) != 0)
err(1, "lstat %s", f->name);
continue;
}
- if (streq(f->name, "_info.c")) {
+ if (streq(f->name, "_info")) {
m->info_file = f;
f->contents = grab_file(f, f->name, &f->contents_size);
if (!f->contents)
else if (strstarts(f->name, "test/compile_fail"))
dest = &m->compile_fail_tests;
else
- dest = &m->other_test_files;
+ dest = &m->other_test_c_files;
} else
dest = &m->other_test_files;
} else
return sofar;
}
-struct manifest *get_manifest(void)
+struct manifest *get_manifest(const void *ctx)
{
- struct manifest *m = talloc(NULL, struct manifest);
+ struct manifest *m = talloc(ctx, struct manifest);
unsigned int len;
m->info_file = NULL;
list_head_init(&m->run_tests);
list_head_init(&m->compile_ok_tests);
list_head_init(&m->compile_fail_tests);
+ list_head_init(&m->other_test_c_files);
list_head_init(&m->other_test_files);
list_head_init(&m->other_files);
+ list_head_init(&m->dep_dirs);
+ list_head_init(&m->dep_objs);
- /* *This* is why people hate C. */
- len = 32;
- m->basename = talloc_array(m, char, len);
- while (!getcwd(m->basename, len)) {
- if (errno != ERANGE)
- err(1, "Getting current directory");
- m->basename = talloc_realloc(m, m->basename, char, len *= 2);
- }
-
+ m->basename = talloc_getcwd(m);
+ if (!m->basename)
+ err(1, "Getting current directory");
len = strlen(m->basename);
while (len && m->basename[len-1] == '/')
m->basename[--len] = '\0';