Make manifest code do chdir into appropriate directory.

[ccan] / tools / ccanlint / file_analysis.c

diff --git a/tools/ccanlint/file_analysis.c b/tools/ccanlint/file_analysis.c
index 3152cd1e16a555e8b19ebca25c2b1836df11aed2..f2ee5d74c005467934c3e738a8f453963e3edb64 100644 (file)
--- a/tools/ccanlint/file_analysis.c
+++ b/tools/ccanlint/file_analysis.c
@@ -151,9 +151,10 @@ char *report_on_lines(struct list_head *files,
        return sofar;
 }
 
        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);
 {
        struct manifest *m = talloc(ctx, struct manifest);

+       char *olddir;

        unsigned int len;
 
        m->info_file = NULL;
        unsigned int len;
 
        m->info_file = NULL;


@@ -169,6 +170,13 @@ struct manifest *get_manifest(const void *ctx)
        list_head_init(&m->dep_dirs);
        list_head_init(&m->dep_objs);
 
        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 = talloc_getcwd(m);
        if (!m->basename)
                err(1, "Getting current directory");


@@ -182,6 +190,11 @@ struct manifest *get_manifest(const void *ctx)
        m->basename++;
 
        add_files(m, "");
        m->basename++;
 
        add_files(m, "");

+
+       if (chdir(olddir) != 0)
+               err(1, "Returning to original directory '%s'", olddir);
+       talloc_free(olddir);
+

        return m;
 }
 
        return m;
 }