Rename warn() to warning() to fix symbol conflicts on BSD and Mac OS

[thirdparty/git.git] / builtin-bundle.c

diff --git a/builtin-bundle.c b/builtin-bundle.c
index 786808081b8d5fe233ecd6533a4f5e8beb7d126c..d1635a0a6b009ecb6706084828abd0e3928f2b8d 100644 (file)
--- a/builtin-bundle.c
+++ b/builtin-bundle.c
@@ -4,7 +4,7 @@
 #include "diff.h"
 #include "revision.h"
 #include "list-objects.h"
-#include "exec_cmd.h"
+#include "run-command.h"
 
 /*
  * Basic handler for bundle files to connect repositories via sneakernet.
@@ -87,7 +87,7 @@ static int read_header(const char *path, struct bundle_header *header) {
                if (buffer[len - 1] == '\n')
                        buffer[len - 1] = '\0';
                if (get_sha1_hex(buffer + offset, sha1)) {
-                       warn("unrecognized header: %s", buffer);
+                       warning("unrecognized header: %s", buffer);
                        continue;
                }
                delim = buffer[40 + offset];
@@ -99,67 +99,6 @@ static int read_header(const char *path, struct bundle_header *header) {
        return fd;
 }
 
-/* if in && *in >= 0, take that as input file descriptor instead */
-static int fork_with_pipe(const char **argv, int *in, int *out)
-{
-       int needs_in, needs_out;
-       int fdin[2], fdout[2], pid;
-
-       needs_in = in && *in < 0;
-       if (needs_in) {
-               if (pipe(fdin) < 0)
-                       return error("could not setup pipe");
-               *in = fdin[1];
-       }
-
-       needs_out = out && *out < 0;
-       if (needs_out) {
-               if (pipe(fdout) < 0)
-                       return error("could not setup pipe");
-               *out = fdout[0];
-       }
-
-       if ((pid = fork()) < 0) {
-               if (needs_in) {
-                       close(fdin[0]);
-                       close(fdin[1]);
-               }
-               if (needs_out) {
-                       close(fdout[0]);
-                       close(fdout[1]);
-               }
-               return error("could not fork");
-       }
-       if (!pid) {
-               if (needs_in) {
-                       dup2(fdin[0], 0);
-                       close(fdin[0]);
-                       close(fdin[1]);
-               } else if (in) {
-                       dup2(*in, 0);
-                       close(*in);
-               }
-               if (needs_out) {
-                       dup2(fdout[1], 1);
-                       close(fdout[0]);
-                       close(fdout[1]);
-               } else if (out) {
-                       dup2(*out, 1);
-                       close(*out);
-               }
-               exit(execv_git_cmd(argv));
-       }
-       if (needs_in)
-               close(fdin[0]);
-       else if (in)
-               close(*in);
-       if (needs_out)
-               close(fdout[1]);
-       else if (out)
-               close(*out);
-       return pid;
-}
-
 static int list_refs(struct ref_list *r, int argc, const char **argv)
 {
        int i;
@@ -263,9 +202,10 @@ static int create_bundle(struct bundle_header *header, const char *path,
        int bundle_fd = -1;
        const char **argv_boundary = xmalloc((argc + 4) * sizeof(const char *));
        const char **argv_pack = xmalloc(5 * sizeof(const char *));
-       int pid, in, out, i, status, ref_count = 0;
+       int i, ref_count = 0;
        char buffer[1024];
        struct rev_info revs;
+       struct child_process rls;
 
        bundle_fd = (!strcmp(path, "-") ? 1 :
                        open(path, O_CREAT | O_EXCL | O_WRONLY, 0666));
@@ -285,11 +225,13 @@ static int create_bundle(struct bundle_header *header, const char *path,
        argv_boundary[1] = "--boundary";
        argv_boundary[2] = "--pretty=oneline";
        argv_boundary[argc + 2] = NULL;
-       out = -1;
-       pid = fork_with_pipe(argv_boundary, NULL, &out);
-       if (pid < 0)
+       memset(&rls, 0, sizeof(rls));
+       rls.argv = argv_boundary;
+       rls.out = -1;
+       rls.git_cmd = 1;
+       if (start_command(&rls))
                return -1;
-       while ((i = read_string(out, buffer, sizeof(buffer))) > 0) {
+       while ((i = read_string(rls.out, buffer, sizeof(buffer))) > 0) {
                unsigned char sha1[20];
                if (buffer[0] == '-') {
                        write_or_die(bundle_fd, buffer, i);
@@ -303,11 +245,8 @@ static int create_bundle(struct bundle_header *header, const char *path,
                        object->flags |= SHOWN;
                }
        }
-       while ((i = waitpid(pid, &status, 0)) < 0)
-               if (errno != EINTR)
-                       return error("rev-list died");
-       if (!WIFEXITED(status) || WEXITSTATUS(status))
-               return error("rev-list died %d", WEXITSTATUS(status));
+       if (finish_command(&rls))
+               return error("rev-list died");
 
        /* write references */
        argc = setup_revisions(argc, argv, &revs, NULL);
@@ -329,7 +268,7 @@ static int create_bundle(struct bundle_header *header, const char *path,
                 * from getting output.
                 */
                if (!(e->item->flags & SHOWN)) {
-                       warn("ref '%s' is excluded by the rev-list options",
+                       warning("ref '%s' is excluded by the rev-list options",
                                e->name);
                        continue;
                }
@@ -352,26 +291,23 @@ static int create_bundle(struct bundle_header *header, const char *path,
        argv_pack[2] = "--stdout";
        argv_pack[3] = "--thin";
        argv_pack[4] = NULL;
-       in = -1;
-       out = bundle_fd;
-       pid = fork_with_pipe(argv_pack, &in, &out);
-       if (pid < 0)
+       memset(&rls, 0, sizeof(rls));
+       rls.argv = argv_pack;
+       rls.in = -1;
+       rls.out = bundle_fd;
+       rls.git_cmd = 1;
+       if (start_command(&rls))
                return error("Could not spawn pack-objects");
        for (i = 0; i < revs.pending.nr; i++) {
                struct object *object = revs.pending.objects[i].item;
                if (object->flags & UNINTERESTING)
-                       write(in, "^", 1);
-               write(in, sha1_to_hex(object->sha1), 40);
-               write(in, "\n", 1);
+                       write(rls.in, "^", 1);
+               write(rls.in, sha1_to_hex(object->sha1), 40);
+               write(rls.in, "\n", 1);
        }
-       close(in);
-       while (waitpid(pid, &status, 0) < 0)
-               if (errno != EINTR)
-                       return -1;
-       if (!WIFEXITED(status) || WEXITSTATUS(status))
+       if (finish_command(&rls))
                return error ("pack-objects died");
-
-       return status;
+       return 0;
 }
 
 static int unbundle(struct bundle_header *header, int bundle_fd,
@@ -379,22 +315,17 @@ static int unbundle(struct bundle_header *header, int bundle_fd,
 {
        const char *argv_index_pack[] = {"index-pack",
                "--fix-thin", "--stdin", NULL};
-       int pid, status, dev_null;
+       struct child_process ip;
 
        if (verify_bundle(header, 0))
                return -1;
-       dev_null = open("/dev/null", O_WRONLY);
-       if (dev_null < 0)
-               return error("Could not open /dev/null");
-       pid = fork_with_pipe(argv_index_pack, &bundle_fd, &dev_null);
-       if (pid < 0)
-               return error("Could not spawn index-pack");
-       while (waitpid(pid, &status, 0) < 0)
-               if (errno != EINTR)
-                       return error("index-pack died");
-       if (!WIFEXITED(status) || WEXITSTATUS(status))
-               return error("index-pack exited with status %d",
-                               WEXITSTATUS(status));
+       memset(&ip, 0, sizeof(ip));
+       ip.argv = argv_index_pack;
+       ip.in = bundle_fd;
+       ip.no_stdout = 1;
+       ip.git_cmd = 1;
+       if (run_command(&ip))
+               return error("index-pack died");
        return list_heads(header, argc, argv);
 }