Fix linking for tools, and add tools: target.

[ccan] / tools / create_dep_tar.c

diff --git a/tools/create_dep_tar.c b/tools/create_dep_tar.c
index 09c331c6f7a09be8f3100bb9a177eb1aec5d3035..f807ae9b2b5f9199864e5dfb035a04ba7fbacf87 100644 (file)
--- a/tools/create_dep_tar.c
+++ b/tools/create_dep_tar.c
@@ -4,7 +4,8 @@
 #include <stdio.h>
 #include <string.h>
 #include <sqlite3.h>
 #include <stdio.h>
 #include <string.h>
 #include <sqlite3.h>

-#include "ccan/string/string.h"
+#include "ccan/grab_file/grab_file.h"
+#include "ccan/str_talloc/str_talloc.h"

 #include "ccan/talloc/talloc.h"
 #include "tools/_infotojson/database.h"
 
 #include "ccan/talloc/talloc.h"
 #include "tools/_infotojson/database.h"
 


@@ -53,7 +54,7 @@ create_tar(char **deps, const char *dir, const char *targetdir)
        
        if (deps != NULL) {
                cmd_args = strjoin(NULL, deps, " ");    
        
        if (deps != NULL) {
                cmd_args = strjoin(NULL, deps, " ");    

-               cmd = talloc_asprintf(NULL, TAR_CMD "%s/%s_dependencies.tar %s %s", targetdir, module, cmd_args, dir);
+               cmd = talloc_asprintf(NULL, TAR_CMD "%s/%s_with_deps.tar %s %s", targetdir, module, cmd_args, dir);

        } else 
                cmd = talloc_asprintf(NULL, TAR_CMD "%s/%s.tar %s", targetdir, module, dir);
                        
        } else 
                cmd = talloc_asprintf(NULL, TAR_CMD "%s/%s.tar %s", targetdir, module, dir);
                        


@@ -61,7 +62,7 @@ create_tar(char **deps, const char *dir, const char *targetdir)
        if (!p)
                err(1, "Executing '%s'", cmd);
 
        if (!p)
                err(1, "Executing '%s'", cmd);
 

-       buffer = grab_fd(NULL, fileno(p));
+       buffer = grab_fd(NULL, fileno(p), NULL);

        if (!buffer)
                err(1, "Reading from '%s'", cmd);
        pclose(p);
        if (!buffer)
                err(1, "Reading from '%s'", cmd);
        pclose(p);


@@ -81,7 +82,7 @@ int main(int argc, char *argv[])
        printf("creating tar ball of \"%s\"\n", argv[1]);       
 
        /* creating tar of the module dependencies */
        printf("creating tar ball of \"%s\"\n", argv[1]);       
 
        /* creating tar of the module dependencies */

-       deps = get_deps(NULL, argv[1]);
+       deps = get_deps(talloc_autofree_context(), argv[1], true);

        if (deps != NULL)
                create_tar(deps, argv[1], argv[2]);
        talloc_free(deps);
        if (deps != NULL)
                create_tar(deps, argv[1], argv[2]);
        talloc_free(deps);


@@ -91,7 +92,7 @@ int main(int argc, char *argv[])
        if (dependents != NULL)
                for (i = 0; dependents[i]; i++) {       
                        printf("creating tar ball of \"%s\"\n", dependents[i]); 
        if (dependents != NULL)
                for (i = 0; dependents[i]; i++) {       
                        printf("creating tar ball of \"%s\"\n", dependents[i]); 

-                       deps = get_deps(NULL, dependents[i]);
+                       deps = get_deps(NULL, dependents[i], true);

                        if (deps != NULL)
                                create_tar(deps, dependents[i], argv[2]);                       
                        talloc_free(deps);
                        if (deps != NULL)
                                create_tar(deps, dependents[i], argv[2]);                       
                        talloc_free(deps);