From f0c7fd49c0b9454808486e8c56cd3d9c022d56f2 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Tue, 15 Nov 2011 15:39:33 -0800 Subject: [PATCH] Revert "upload-archive: use start_command instead of fork" This reverts commit c09cd77ea2fe3580b33918a99fe138d239ac2aaf, expecting a better version to be rerolled soon. --- builtin/archive.c | 6 +---- builtin/upload-archive.c | 68 +++++++++++++++++++++++++++++++++--------------- compat/mingw.h | 2 ++ t/t5000-tar-tree.sh | 10 +++---- 4 files changed, 55 insertions(+), 31 deletions(-) diff --git a/builtin/archive.c b/builtin/archive.c index e405566c5e..931956def9 100644 --- a/builtin/archive.c +++ b/builtin/archive.c @@ -87,7 +87,6 @@ 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"), @@ -95,9 +94,6 @@ int cmd_archive(int argc, const char **argv, const char *prefix) "retrieve the archive from remote repository "), 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() }; @@ -112,5 +108,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, is_remote); + return write_archive(argc, argv, prefix, 1, output, 0); } diff --git a/builtin/upload-archive.c b/builtin/upload-archive.c index c57e8bd8c8..2d0b38333e 100644 --- a/builtin/upload-archive.c +++ b/builtin/upload-archive.c @@ -6,7 +6,6 @@ #include "archive.h" #include "pkt-line.h" #include "sideband.h" -#include "run-command.h" static const char upload_archive_usage[] = "git upload-archive "; @@ -19,17 +18,28 @@ static const char lostchild[] = #define MAX_ARGS (64) -static void prepare_argv(const char **sent_argv, const char **argv) +static int run_upload_archive(int argc, const char **argv, const char *prefix) { + 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 = 2; - sent_argv[0] = "archive"; - sent_argv[1] = "--remote-request"; + sent_argc = 1; + sent_argv[0] = "git-upload-archive"; for (p = buf;;) { /* This will die if not enough free space in buf */ len = packet_read_line(0, p, (buf + sizeof buf) - p); @@ -52,6 +62,9 @@ static void prepare_argv(const char **sent_argv, const char **argv) *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))) @@ -83,25 +96,38 @@ static ssize_t process_input(int child_fd, int band) int cmd_upload_archive(int argc, const char **argv, const char *prefix) { - 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)) { + 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) { 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); @@ -109,9 +135,9 @@ int cmd_upload_archive(int argc, const char **argv, const char *prefix) struct pollfd pfd[2]; int status; - pfd[0].fd = cld.out; + pfd[0].fd = fd1[0]; pfd[0].events = POLLIN; - pfd[1].fd = cld.err; + pfd[1].fd = fd2[0]; pfd[1].events = POLLIN; if (poll(pfd, 2, -1) < 0) { if (errno != EINTR) { @@ -130,7 +156,7 @@ int cmd_upload_archive(int argc, const char **argv, const char *prefix) if (process_input(pfd[0].fd, 1)) continue; - if (waitpid(cld.pid, &status, 0) < 0) + if (waitpid(writer, &status, 0) < 0) error_clnt("%s", lostchild); else if (!WIFEXITED(status) || WEXITSTATUS(status) > 0) error_clnt("%s", deadchild); diff --git a/compat/mingw.h b/compat/mingw.h index dfb0e87263..fecf0d0776 100644 --- a/compat/mingw.h +++ b/compat/mingw.h @@ -85,6 +85,8 @@ static inline int symlink(const char *oldpath, const char *newpath) { errno = ENOSYS; return -1; } static inline int fchmod(int fildes, mode_t mode) { errno = ENOSYS; return -1; } +static inline pid_t fork(void) +{ errno = ENOSYS; return -1; } static inline unsigned int alarm(unsigned int seconds) { return 0; } static inline int fsync(int fd) diff --git a/t/t5000-tar-tree.sh b/t/t5000-tar-tree.sh index 889842e7fc..d9068981f8 100755 --- a/t/t5000-tar-tree.sh +++ b/t/t5000-tar-tree.sh @@ -96,7 +96,7 @@ test_expect_success 'git archive with --output' \ 'git archive --output=b4.tar HEAD && test_cmp b.tar b4.tar' -test_expect_success 'git archive --remote' \ +test_expect_success NOT_MINGW 'git archive --remote' \ 'git archive --remote=. HEAD >b5.tar && test_cmp b.tar b5.tar' @@ -266,7 +266,7 @@ test_expect_success 'archive --list mentions user filter' ' grep "^bar\$" output ' -test_expect_success 'archive --list shows only enabled remote filters' ' +test_expect_success NOT_MINGW 'archive --list shows only enabled remote filters' ' git archive --list --remote=. >output && ! grep "^tar\.foo\$" output && grep "^bar\$" output @@ -298,7 +298,7 @@ test_expect_success 'extension matching requires dot' ' test_cmp b.tar config-implicittar.foo ' -test_expect_success 'only enabled filters are available remotely' ' +test_expect_success NOT_MINGW 'only enabled filters are available remotely' ' test_must_fail git archive --remote=. --format=tar.foo HEAD \ >remote.tar.foo && git archive --remote=. --format=bar >remote.bar HEAD && @@ -341,12 +341,12 @@ test_expect_success GZIP,GUNZIP 'extract tgz file' ' test_cmp b.tar j.tar ' -test_expect_success GZIP 'remote tar.gz is allowed by default' ' +test_expect_success GZIP,NOT_MINGW 'remote tar.gz is allowed by default' ' git archive --remote=. --format=tar.gz HEAD >remote.tar.gz && test_cmp j.tgz remote.tar.gz ' -test_expect_success GZIP 'remote tar.gz can be disabled' ' +test_expect_success GZIP,NOT_MINGW 'remote tar.gz can be disabled' ' git config tar.tar.gz.remote false && test_must_fail git archive --remote=. --format=tar.gz HEAD \ >remote.tar.gz -- 2.11.4.GIT