Merge branch 'sg/t4051-fix'
[git.git] / builtin / upload-archive.c
blob25d91163563614110d2c93802ce3fef6d5844325
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"
9 #include "run-command.h"
10 #include "argv-array.h"
12 static const char upload_archive_usage[] =
13 "git upload-archive <repo>";
15 static const char deadchild[] =
16 "git upload-archive: archiver died with error";
18 #define MAX_ARGS (64)
20 int cmd_upload_archive_writer(int argc, const char **argv, const char *prefix)
22 struct argv_array sent_argv = ARGV_ARRAY_INIT;
23 const char *arg_cmd = "argument ";
25 if (argc != 2 || !strcmp(argv[1], "-h"))
26 usage(upload_archive_usage);
28 if (!enter_repo(argv[1], 0))
29 die("'%s' does not appear to be a git repository", argv[1]);
31 /* put received options in sent_argv[] */
32 argv_array_push(&sent_argv, "git-upload-archive");
33 for (;;) {
34 char *buf = packet_read_line(0, NULL);
35 if (!buf)
36 break; /* got a flush */
37 if (sent_argv.argc > MAX_ARGS)
38 die("Too many options (>%d)", MAX_ARGS - 1);
40 if (!starts_with(buf, arg_cmd))
41 die("'argument' token or flush expected");
42 argv_array_push(&sent_argv, buf + strlen(arg_cmd));
45 /* parse all options sent by the client */
46 return write_archive(sent_argv.argc, sent_argv.argv, prefix,
47 the_repository, NULL, 1);
50 __attribute__((format (printf, 1, 2)))
51 static void error_clnt(const char *fmt, ...)
53 struct strbuf buf = STRBUF_INIT;
54 va_list params;
56 va_start(params, fmt);
57 strbuf_vaddf(&buf, fmt, params);
58 va_end(params);
59 send_sideband(1, 3, buf.buf, buf.len, LARGE_PACKET_MAX);
60 die("sent error to the client: %s", buf.buf);
63 static ssize_t process_input(int child_fd, int band)
65 char buf[16384];
66 ssize_t sz = read(child_fd, buf, sizeof(buf));
67 if (sz < 0) {
68 if (errno != EAGAIN && errno != EINTR)
69 error_clnt("read error: %s\n", strerror(errno));
70 return sz;
72 send_sideband(1, band, buf, sz, LARGE_PACKET_MAX);
73 return sz;
76 int cmd_upload_archive(int argc, const char **argv, const char *prefix)
78 struct child_process writer = { argv };
80 if (argc == 2 && !strcmp(argv[1], "-h"))
81 usage(upload_archive_usage);
84 * Set up sideband subprocess.
86 * We (parent) monitor and read from child, sending its fd#1 and fd#2
87 * multiplexed out to our fd#1. If the child dies, we tell the other
88 * end over channel #3.
90 argv[0] = "upload-archive--writer";
91 writer.out = writer.err = -1;
92 writer.git_cmd = 1;
93 if (start_command(&writer)) {
94 int err = errno;
95 packet_write_fmt(1, "NACK unable to spawn subprocess\n");
96 die("upload-archive: %s", strerror(err));
99 packet_write_fmt(1, "ACK\n");
100 packet_flush(1);
102 while (1) {
103 struct pollfd pfd[2];
105 pfd[0].fd = writer.out;
106 pfd[0].events = POLLIN;
107 pfd[1].fd = writer.err;
108 pfd[1].events = POLLIN;
109 if (poll(pfd, 2, -1) < 0) {
110 if (errno != EINTR) {
111 error_errno("poll failed resuming");
112 sleep(1);
114 continue;
116 if (pfd[1].revents & POLLIN)
117 /* Status stream ready */
118 if (process_input(pfd[1].fd, 2))
119 continue;
120 if (pfd[0].revents & POLLIN)
121 /* Data stream ready */
122 if (process_input(pfd[0].fd, 1))
123 continue;
125 if (finish_command(&writer))
126 error_clnt("%s", deadchild);
127 packet_flush(1);
128 break;
130 return 0;