diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-11-02 02:20:22 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-11-02 02:20:22 +0400 |
commit | 7406aa203ff0571815fc472486ae7271049185e6 (patch) | |
tree | 1e90b1ea1aee0daf0b69fce23379dabeaaacab1c /builtin | |
parent | 84a9ea90e1d704bcac9d26837dff9e3cd7609376 (diff) | |
parent | 2d52ea93a7ca451b967f180e0ea0d32404749a66 (diff) |
Merge branch 'ef/mingw-upload-archive'
* ef/mingw-upload-archive:
mingw: poll.h is no longer in sys/
upload-archive: use start_command instead of fork
compat/win32/poll.c: upgrade from upstream
mingw: move poll out of sys-folder
Diffstat (limited to 'builtin')
-rw-r--r-- | builtin/archive.c | 6 | ||||
-rw-r--r-- | builtin/upload-archive.c | 68 |
2 files changed, 26 insertions, 48 deletions
diff --git a/builtin/archive.c b/builtin/archive.c index 931956def9..e405566c5e 100644 --- a/builtin/archive.c +++ b/builtin/archive.c @@ -87,6 +87,7 @@ int cmd_archive(int argc, const char **argv, const char *prefix) const char *exec = "git-upload-archive"; const char *output = NULL; const char *remote = NULL; + int is_remote = 0; struct option local_opts[] = { OPT_STRING('o', "output", &output, "file", "write the archive to this file"), @@ -94,6 +95,9 @@ int cmd_archive(int argc, const char **argv, const char *prefix) "retrieve the archive from remote repository <repo>"), OPT_STRING(0, "exec", &exec, "cmd", "path to the remote git-upload-archive command"), + { OPTION_BOOLEAN, 0, "remote-request", &is_remote, NULL, + "indicate we are serving a remote request", + PARSE_OPT_NOARG | PARSE_OPT_HIDDEN }, OPT_END() }; @@ -108,5 +112,5 @@ int cmd_archive(int argc, const char **argv, const char *prefix) setvbuf(stderr, NULL, _IOLBF, BUFSIZ); - return write_archive(argc, argv, prefix, 1, output, 0); + return write_archive(argc, argv, prefix, 1, output, is_remote); } diff --git a/builtin/upload-archive.c b/builtin/upload-archive.c index 2d0b38333e..c57e8bd8c8 100644 --- a/builtin/upload-archive.c +++ b/builtin/upload-archive.c @@ -6,6 +6,7 @@ #include "archive.h" #include "pkt-line.h" #include "sideband.h" +#include "run-command.h" static const char upload_archive_usage[] = "git upload-archive <repo>"; @@ -18,28 +19,17 @@ static const char lostchild[] = #define MAX_ARGS (64) -static int run_upload_archive(int argc, const char **argv, const char *prefix) +static void prepare_argv(const char **sent_argv, const char **argv) { - const char *sent_argv[MAX_ARGS]; const char *arg_cmd = "argument "; char *p, buf[4096]; int sent_argc; int len; - if (argc != 2) - usage(upload_archive_usage); - - if (strlen(argv[1]) + 1 > sizeof(buf)) - die("insanely long repository name"); - - strcpy(buf, argv[1]); /* enter-repo smudges its argument */ - - if (!enter_repo(buf, 0)) - die("'%s' does not appear to be a git repository", buf); - /* put received options in sent_argv[] */ - sent_argc = 1; - sent_argv[0] = "git-upload-archive"; + sent_argc = 2; + sent_argv[0] = "archive"; + sent_argv[1] = "--remote-request"; for (p = buf;;) { /* This will die if not enough free space in buf */ len = packet_read_line(0, p, (buf + sizeof buf) - p); @@ -62,9 +52,6 @@ static int run_upload_archive(int argc, const char **argv, const char *prefix) *p++ = 0; } sent_argv[sent_argc] = NULL; - - /* parse all options sent by the client */ - return write_archive(sent_argc, sent_argv, prefix, 0, NULL, 1); } __attribute__((format (printf, 1, 2))) @@ -96,38 +83,25 @@ static ssize_t process_input(int child_fd, int band) int cmd_upload_archive(int argc, const char **argv, const char *prefix) { - pid_t writer; - int fd1[2], fd2[2]; - /* - * Set up sideband subprocess. - * - * We (parent) monitor and read from child, sending its fd#1 and fd#2 - * multiplexed out to our fd#1. If the child dies, we tell the other - * end over channel #3. - */ - if (pipe(fd1) < 0 || pipe(fd2) < 0) { - int err = errno; - packet_write(1, "NACK pipe failed on the remote side\n"); - die("upload-archive: %s", strerror(err)); - } - writer = fork(); - if (writer < 0) { + const char *sent_argv[MAX_ARGS]; + struct child_process cld = { sent_argv }; + cld.out = cld.err = -1; + cld.git_cmd = 1; + + if (argc != 2) + usage(upload_archive_usage); + + if (!enter_repo(argv[1], 0)) + die("'%s' does not appear to be a git repository", argv[1]); + + prepare_argv(sent_argv, argv); + if (start_command(&cld)) { int err = errno; packet_write(1, "NACK fork failed on the remote side\n"); die("upload-archive: %s", strerror(err)); } - if (!writer) { - /* child - connect fd#1 and fd#2 to the pipe */ - dup2(fd1[1], 1); - dup2(fd2[1], 2); - close(fd1[1]); close(fd2[1]); - close(fd1[0]); close(fd2[0]); /* we do not read from pipe */ - - exit(run_upload_archive(argc, argv, prefix)); - } /* parent - read from child, multiplex and send out to fd#1 */ - close(fd1[1]); close(fd2[1]); /* we do not write to pipe */ packet_write(1, "ACK\n"); packet_flush(1); @@ -135,9 +109,9 @@ int cmd_upload_archive(int argc, const char **argv, const char *prefix) struct pollfd pfd[2]; int status; - pfd[0].fd = fd1[0]; + pfd[0].fd = cld.out; pfd[0].events = POLLIN; - pfd[1].fd = fd2[0]; + pfd[1].fd = cld.err; pfd[1].events = POLLIN; if (poll(pfd, 2, -1) < 0) { if (errno != EINTR) { @@ -156,7 +130,7 @@ int cmd_upload_archive(int argc, const char **argv, const char *prefix) if (process_input(pfd[0].fd, 1)) continue; - if (waitpid(writer, &status, 0) < 0) + if (waitpid(cld.pid, &status, 0) < 0) error_clnt("%s", lostchild); else if (!WIFEXITED(status) || WEXITSTATUS(status) > 0) error_clnt("%s", deadchild); |