unsigned int score = 0, total_score = 0;
struct manifest *m;
struct ccanlint *i;
- const char *prefix = "";
+ const char *prefix = "", *dir = ".";
/* I'd love to use long options, but that's not standard. */
/* FIXME: getopt_long ccan package? */
while ((c = getopt(argc, argv, "sd:vn")) != -1) {
switch (c) {
case 'd':
+ dir = optarg;
prefix = talloc_append_string(talloc_basename(NULL,
optarg),
": ");
if (optind < argc)
usage(argv[0]);
- m = get_manifest(talloc_autofree_context());
+ m = get_manifest(talloc_autofree_context(), dir);
init_tests();
struct list_head dep_objs;
};
-struct manifest *get_manifest(const void *ctx);
+struct manifest *get_manifest(const void *ctx, const char *dir);
struct ccanlint {
struct list_node list;
/* FIXME: recursive ccanlint if they ask for it. */
static bool expect_obj_file(const char *dir)
{
- char *olddir;
struct manifest *dep_man;
bool has_c_files;
- olddir = talloc_getcwd(dir);
- if (!olddir)
- err(1, "Getting current directory");
-
- /* We will fail below if this doesn't exist. */
- if (chdir(dir) != 0)
- return false;
-
- dep_man = get_manifest(dir);
- if (chdir(olddir) != 0)
- err(1, "Returning to original directory '%s'", olddir);
- talloc_free(olddir);
+ dep_man = get_manifest(dir, dir);
/* If it has C files, we expect an object file built from them. */
has_c_files = !list_empty(&dep_man->c_files);
return sofar;
}
-struct manifest *get_manifest(const void *ctx)
+struct manifest *get_manifest(const void *ctx, const char *dir)
{
struct manifest *m = talloc(ctx, struct manifest);
+ char *olddir;
unsigned int len;
m->info_file = NULL;
list_head_init(&m->dep_dirs);
list_head_init(&m->dep_objs);
+ olddir = talloc_getcwd(NULL);
+ if (!olddir)
+ err(1, "Getting current directory");
+
+ if (chdir(dir) != 0)
+ err(1, "Failed to chdir to %s", dir);
+
m->basename = talloc_getcwd(m);
if (!m->basename)
err(1, "Getting current directory");
m->basename++;
add_files(m, "");
+
+ if (chdir(olddir) != 0)
+ err(1, "Returning to original directory '%s'", olddir);
+ talloc_free(olddir);
+
return m;
}