rebase: Support preserving merges in non-interactive mode
[git/mjg.git] / builtin-upload-archive.c
bloba9b02fa32f372a6810867c10560a20d58b5b2a91
1 /*
2 * Copyright (c) 2006 Franck Bui-Huu
3 */
4 #include "cache.h"
5 #include "builtin.h"
6 #include "archive.h"
7 #include "pkt-line.h"
8 #include "sideband.h"
10 static const char upload_archive_usage[] =
11 "git upload-archive <repo>";
13 static const char deadchild[] =
14 "git upload-archive: archiver died with error";
16 static const char lostchild[] =
17 "git upload-archive: archiver process was lost";
19 #define MAX_ARGS (64)
21 static int run_upload_archive(int argc, const char **argv, const char *prefix)
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;
29 if (argc != 2)
30 usage(upload_archive_usage);
32 if (strlen(argv[1]) + 1 > sizeof(buf))
33 die("insanely long repository name");
35 strcpy(buf, argv[1]); /* enter-repo smudges its argument */
37 if (!enter_repo(buf, 0))
38 die("not a git archive");
40 /* put received options in sent_argv[] */
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);
46 if (len == 0)
47 break; /* got a flush */
48 if (sent_argc > MAX_ARGS - 2)
49 die("Too many options (>%d)", MAX_ARGS - 2);
51 if (p[len-1] == '\n') {
52 p[--len] = 0;
54 if (len < strlen(arg_cmd) ||
55 strncmp(arg_cmd, p, strlen(arg_cmd)))
56 die("'argument' token or flush expected");
58 len -= strlen(arg_cmd);
59 memmove(p, p + strlen(arg_cmd), len);
60 sent_argv[sent_argc++] = p;
61 p += len;
62 *p++ = 0;
64 sent_argv[sent_argc] = NULL;
66 /* parse all options sent by the client */
67 return write_archive(sent_argc, sent_argv, prefix, 0);
70 static void error_clnt(const char *fmt, ...)
72 char buf[1024];
73 va_list params;
74 int len;
76 va_start(params, fmt);
77 len = vsprintf(buf, fmt, params);
78 va_end(params);
79 send_sideband(1, 3, buf, len, LARGE_PACKET_MAX);
80 die("sent error to the client: %s", buf);
83 static void process_input(int child_fd, int band)
85 char buf[16384];
86 ssize_t sz = read(child_fd, buf, sizeof(buf));
87 if (sz < 0) {
88 if (errno != EAGAIN && errno != EINTR)
89 error_clnt("read error: %s\n", strerror(errno));
90 return;
92 send_sideband(1, band, buf, sz, LARGE_PACKET_MAX);
95 int cmd_upload_archive(int argc, const char **argv, const char *prefix)
97 pid_t writer;
98 int fd1[2], fd2[2];
100 * Set up sideband subprocess.
102 * We (parent) monitor and read from child, sending its fd#1 and fd#2
103 * multiplexed out to our fd#1. If the child dies, we tell the other
104 * end over channel #3.
106 if (pipe(fd1) < 0 || pipe(fd2) < 0) {
107 int err = errno;
108 packet_write(1, "NACK pipe failed on the remote side\n");
109 die("upload-archive: %s", strerror(err));
111 writer = fork();
112 if (writer < 0) {
113 int err = errno;
114 packet_write(1, "NACK fork failed on the remote side\n");
115 die("upload-archive: %s", strerror(err));
117 if (!writer) {
118 /* child - connect fd#1 and fd#2 to the pipe */
119 dup2(fd1[1], 1);
120 dup2(fd2[1], 2);
121 close(fd1[1]); close(fd2[1]);
122 close(fd1[0]); close(fd2[0]); /* we do not read from pipe */
124 exit(run_upload_archive(argc, argv, prefix));
127 /* parent - read from child, multiplex and send out to fd#1 */
128 close(fd1[1]); close(fd2[1]); /* we do not write to pipe */
129 packet_write(1, "ACK\n");
130 packet_flush(1);
132 while (1) {
133 struct pollfd pfd[2];
134 int status;
136 pfd[0].fd = fd1[0];
137 pfd[0].events = POLLIN;
138 pfd[1].fd = fd2[0];
139 pfd[1].events = POLLIN;
140 if (poll(pfd, 2, -1) < 0) {
141 if (errno != EINTR) {
142 error("poll failed resuming: %s",
143 strerror(errno));
144 sleep(1);
146 continue;
148 if (pfd[0].revents & POLLIN)
149 /* Data stream ready */
150 process_input(pfd[0].fd, 1);
151 if (pfd[1].revents & POLLIN)
152 /* Status stream ready */
153 process_input(pfd[1].fd, 2);
154 /* Always finish to read data when available */
155 if ((pfd[0].revents | pfd[1].revents) & POLLIN)
156 continue;
158 if (waitpid(writer, &status, 0) < 0)
159 error_clnt("%s", lostchild);
160 else if (!WIFEXITED(status) || WEXITSTATUS(status) > 0)
161 error_clnt("%s", deadchild);
162 packet_flush(1);
163 break;
165 return 0;