Revert "upload-archive: use start_command instead of fork"
This reverts commit c09cd77ea2fe3580b33918a99fe138d239ac2aaf, expecting a better version to be rerolled soon.
Junio C Hamano committed
Nov 15, 2011 at 15:39 UTC
f0c7fd49c0b9454808486e8c56cd3d9c022d56f2
4 files changed
+55
-31
builtin/archive.c
+1
-5
@@ -87,7 +87,6 @@ int cmd_archive(int argc, const char **argv, const char *prefix)
87
const char *exec = "git-upload-archive";
88
const char *output = NULL;
89
const char *remote = NULL;
90
- int is_remote = 0;
90
struct option local_opts[] = {
91
OPT_STRING('o', "output", &output, "file",
92
"write the archive to this file"),
@@ -95,9 +94,6 @@ int cmd_archive(int argc, const char **argv, const char *prefix)
94
"retrieve the archive from remote repository <repo>"),
95
OPT_STRING(0, "exec", &exec, "cmd",
96
"path to the remote git-upload-archive command"),
98
- { OPTION_BOOLEAN, 0, "remote-request", &is_remote, NULL,
99
- "indicate we are serving a remote request",
100
- PARSE_OPT_NOARG | PARSE_OPT_HIDDEN },
97
OPT_END()
98
};
99
@@ -112,5 +108,5 @@ int cmd_archive(int argc, const char **argv, const char *prefix)
108
109
setvbuf(stderr, NULL, _IOLBF, BUFSIZ);
110
115
- return write_archive(argc, argv, prefix, 1, output, is_remote);
111
+ return write_archive(argc, argv, prefix, 1, output, 0);
112
}
builtin/upload-archive.c
+47
-21
@@ -6,7 +6,6 @@
6
#include "archive.h"
7
#include "pkt-line.h"
8
#include "sideband.h"
9
-#include "run-command.h"
9
10
static const char upload_archive_usage[] =
11
"git upload-archive <repo>";
@@ -19,17 +18,28 @@ static const char lostchild[] =
18
19
#define MAX_ARGS (64)
20
22
-static void prepare_argv(const char **sent_argv, const char **argv)
21
+static int run_upload_archive(int argc, const char **argv, const char *prefix)
22
{
23
+ const char *sent_argv[MAX_ARGS];
24
const char *arg_cmd = "argument ";
25
char *p, buf[4096];
26
int sent_argc;
27
int len;
28
29
+ if (argc != 2)
30
+ usage(upload_archive_usage);
31
+
32
+ if (strlen(argv[1]) + 1 > sizeof(buf))
33
+ die("insanely long repository name");
34
+
35
+ strcpy(buf, argv[1]); /* enter-repo smudges its argument */
36
+
37
+ if (!enter_repo(buf, 0))
38
+ die("'%s' does not appear to be a git repository", buf);
39
+
40
/* put received options in sent_argv[] */
30
- sent_argc = 2;
31
- sent_argv[0] = "archive";
32
- sent_argv[1] = "--remote-request";
41
+ sent_argc = 1;
42
+ sent_argv[0] = "git-upload-archive";
43
for (p = buf;;) {
44
/* This will die if not enough free space in buf */
45
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)
62
*p++ = 0;
63
}
64
sent_argv[sent_argc] = NULL;
65
+
66
+ /* parse all options sent by the client */
67
+ return write_archive(sent_argc, sent_argv, prefix, 0, NULL, 1);
68
}
69
70
__attribute__((format (printf, 1, 2)))
@@ -83,25 +96,38 @@ static ssize_t process_input(int child_fd, int band)
96
97
int cmd_upload_archive(int argc, const char **argv, const char *prefix)
98
{
86
- const char *sent_argv[MAX_ARGS];
87
- struct child_process cld = { sent_argv };
88
- cld.out = cld.err = -1;
89
- cld.git_cmd = 1;
90
-
91
- if (argc != 2)
92
- usage(upload_archive_usage);
93
-
94
- if (!enter_repo(argv[1], 0))
95
- die("'%s' does not appear to be a git repository", argv[1]);
96
-
97
- prepare_argv(sent_argv, argv);
98
- if (start_command(&cld)) {
99
+ pid_t writer;
100
+ int fd1[2], fd2[2];
101
+ /*
102
+ * Set up sideband subprocess.
103
+ *
104
+ * We (parent) monitor and read from child, sending its fd#1 and fd#2
105
+ * multiplexed out to our fd#1. If the child dies, we tell the other
106
+ * end over channel #3.
107
+ */
108
+ if (pipe(fd1) < 0 || pipe(fd2) < 0) {
109
+ int err = errno;
110
+ packet_write(1, "NACK pipe failed on the remote side\n");
111
+ die("upload-archive: %s", strerror(err));
112
+ }
113
+ writer = fork();
114
+ if (writer < 0) {
115
int err = errno;
116
packet_write(1, "NACK fork failed on the remote side\n");
117
die("upload-archive: %s", strerror(err));
118
}
119
+ if (!writer) {
120
+ /* child - connect fd#1 and fd#2 to the pipe */
121
+ dup2(fd1[1], 1);
122
+ dup2(fd2[1], 2);
123
+ close(fd1[1]); close(fd2[1]);
124
+ close(fd1[0]); close(fd2[0]); /* we do not read from pipe */
125
+
126
+ exit(run_upload_archive(argc, argv, prefix));
127
+ }
128
129
/* parent - read from child, multiplex and send out to fd#1 */
130
+ close(fd1[1]); close(fd2[1]); /* we do not write to pipe */
131
packet_write(1, "ACK\n");
132
packet_flush(1);
133
@@ -109,9 +135,9 @@ int cmd_upload_archive(int argc, const char **argv, const char *prefix)
135
struct pollfd pfd[2];
136
int status;
137
112
- pfd[0].fd = cld.out;
138
+ pfd[0].fd = fd1[0];
139
pfd[0].events = POLLIN;
114
- pfd[1].fd = cld.err;
140
+ pfd[1].fd = fd2[0];
141
pfd[1].events = POLLIN;
142
if (poll(pfd, 2, -1) < 0) {
143
if (errno != EINTR) {
@@ -130,7 +156,7 @@ int cmd_upload_archive(int argc, const char **argv, const char *prefix)
156
if (process_input(pfd[0].fd, 1))
157
continue;
158
133
- if (waitpid(cld.pid, &status, 0) < 0)
159
+ if (waitpid(writer, &status, 0) < 0)
160
error_clnt("%s", lostchild);
161
else if (!WIFEXITED(status) || WEXITSTATUS(status) > 0)
162
error_clnt("%s", deadchild);
compat/mingw.h
+2
@@ -85,6 +85,8 @@ static inline int symlink(const char *oldpath, const char *newpath)
85
{ errno = ENOSYS; return -1; }
86
static inline int fchmod(int fildes, mode_t mode)
87
{ errno = ENOSYS; return -1; }
88
+static inline pid_t fork(void)
89
+{ errno = ENOSYS; return -1; }
90
static inline unsigned int alarm(unsigned int seconds)
91
{ return 0; }
92
static inline int fsync(int fd)
t/t5000-tar-tree.sh
+5
-5
@@ -96,7 +96,7 @@ test_expect_success 'git archive with --output' \
96
'git archive --output=b4.tar HEAD &&
97
test_cmp b.tar b4.tar'
98
99
-test_expect_success 'git archive --remote' \
99
+test_expect_success NOT_MINGW 'git archive --remote' \
100
'git archive --remote=. HEAD >b5.tar &&
101
test_cmp b.tar b5.tar'
102
@@ -266,7 +266,7 @@ test_expect_success 'archive --list mentions user filter' '
266
grep "^bar\$" output
267
'
268
269
-test_expect_success 'archive --list shows only enabled remote filters' '
269
+test_expect_success NOT_MINGW 'archive --list shows only enabled remote filters' '
270
git archive --list --remote=. >output &&
271
! grep "^tar\.foo\$" output &&
272
grep "^bar\$" output
@@ -298,7 +298,7 @@ test_expect_success 'extension matching requires dot' '
298
test_cmp b.tar config-implicittar.foo
299
'
300
301
-test_expect_success 'only enabled filters are available remotely' '
301
+test_expect_success NOT_MINGW 'only enabled filters are available remotely' '
302
test_must_fail git archive --remote=. --format=tar.foo HEAD \
303
>remote.tar.foo &&
304
git archive --remote=. --format=bar >remote.bar HEAD &&
@@ -341,12 +341,12 @@ test_expect_success GZIP,GUNZIP 'extract tgz file' '
341
test_cmp b.tar j.tar
342
'
343
344
-test_expect_success GZIP 'remote tar.gz is allowed by default' '
344
+test_expect_success GZIP,NOT_MINGW 'remote tar.gz is allowed by default' '
345
git archive --remote=. --format=tar.gz HEAD >remote.tar.gz &&
346
test_cmp j.tgz remote.tar.gz
347
'
348
349
-test_expect_success GZIP 'remote tar.gz can be disabled' '
349
+test_expect_success GZIP,NOT_MINGW 'remote tar.gz can be disabled' '
350
git config tar.tar.gz.remote false &&
351
test_must_fail git archive --remote=. --format=tar.gz HEAD \
352
>remote.tar.gz