global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-15 03:00:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'jc/archive' into next

Browse Source 
* jc/archive:
  builtin-archive.c: rename remote_request() to extract_remote_arg()
  upload-archive: monitor child communication more carefully.
This commit is contained in:
Junio C Hamano
2006-09-12 23:22:34 -07:00
parent 61af0aaf26 d751864cf7
commit 1c6bc2d53c
2 changed files with 40 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
builtin-archive.c
View File

@@ -217,7 +217,7 @@ int parse_archive_args(int argc, const char **argv, struct archiver *ar)
return i;
}
static const char *remote_request(int *ac, const char **av)
static const char *extract_remote_arg(int *ac, const char **av)
{
int ix, iy, cnt = *ac;
int no_more_options = 0;
@@ -254,7 +254,7 @@ int cmd_archive(int argc, const char **argv, const char *prefix)
int tree_idx;
const char *remote = NULL;
remote = remote_request(&argc, argv);
remote = extract_remote_arg(&argc, argv);
if (remote)
return run_remote_archiver(remote, argc, argv);

60
builtin-upload-archive.c
View File

@@ -16,6 +16,9 @@ static const char upload_archive_usage[] =
static const char deadchild[] =
"git-upload-archive: archiver died with error";
static const char lostchild[] =
"git-upload-archive: archiver process was lost";
static int run_upload_archive(int argc, const char **argv, const char *prefix)
{
@@ -73,6 +76,31 @@ static int run_upload_archive(int argc, const char **argv, const char *prefix)
return ar.write_archive(&ar.args);
}
static void error_clnt(const char *fmt, ...)
{
char buf[1024];
va_list params;
int len;
va_start(params, fmt);
len = vsprintf(buf, fmt, params);
va_end(params);
send_sideband(1, 3, buf, len, LARGE_PACKET_MAX);
die("sent error to the client: %s", buf);
}
static void process_input(int child_fd, int band)
{
char buf[16384];
ssize_t sz = read(child_fd, buf, sizeof(buf));
if (sz < 0) {
if (errno != EINTR)
error_clnt("read error: %s\n", strerror(errno));
return;
}
send_sideband(1, band, buf, sz, LARGE_PACKET_MAX);
}
int cmd_upload_archive(int argc, const char **argv, const char *prefix)
{
pid_t writer;
@@ -112,9 +140,6 @@ int cmd_upload_archive(int argc, const char **argv, const char *prefix)
while (1) {
struct pollfd pfd[2];
char buf[16384];
ssize_t sz;
pid_t pid;
int status;
pfd[0].fd = fd1[0];
@@ -129,28 +154,19 @@ int cmd_upload_archive(int argc, const char **argv, const char *prefix)
}
continue;
}
if (pfd[0].revents & (POLLIN|POLLHUP)) {
if (pfd[0].revents & POLLIN)
/* Data stream ready */
sz = read(pfd[0].fd, buf, sizeof(buf));
send_sideband(1, 1, buf, sz, LARGE_PACKET_MAX);
}
if (pfd[1].revents & (POLLIN|POLLHUP)) {
process_input(pfd[0].fd, 1);
if (pfd[1].revents & POLLIN)
/* Status stream ready */
sz = read(pfd[1].fd, buf, sizeof(buf));
send_sideband(1, 2, buf, sz, LARGE_PACKET_MAX);
}
process_input(pfd[1].fd, 2);
if ((pfd[0].revents | pfd[1].revents) == POLLIN)
continue;
if (((pfd[0].revents | pfd[1].revents) & POLLHUP) == 0)
continue;
/* did it die? */
pid = waitpid(writer, &status, WNOHANG);
if (!pid) {
fprintf(stderr, "Hmph, HUP?\n");
continue;
}
if (!WIFEXITED(status) || WEXITSTATUS(status) > 0)
send_sideband(1, 3, deadchild, strlen(deadchild),
LARGE_PACKET_MAX);
if (waitpid(writer, &status, 0) < 0)
error_clnt("%s", lostchild);
else if (!WIFEXITED(status) || WEXITSTATUS(status) > 0)
error_clnt("%s", deadchild);
packet_flush(1);
break;
}