summaryrefslogtreecommitdiff
path: root/fetch-clone.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-09-10 08:06:33 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-09-10 20:36:35 (GMT)
commit49a52b1d1fb120f52de3a67f1e4e5ae81512ab81 (patch)
tree47a0c3903f39026b2a907616177fde61adf79f65 /fetch-clone.c
parenta41fae9c46a4cb5e59cc1a17d19f6a3a6cbfbb2f (diff)
downloadgit-49a52b1d1fb120f52de3a67f1e4e5ae81512ab81.zip
git-49a52b1d1fb120f52de3a67f1e4e5ae81512ab81.tar.gz
git-49a52b1d1fb120f52de3a67f1e4e5ae81512ab81.tar.bz2
Move sideband client side support into reusable form.
This moves the receiver side of the sideband support from fetch-clone.c to sideband.c and its header file, so that archiver protocol can use it. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'fetch-clone.c')
-rw-r--r--fetch-clone.c32
1 files changed, 5 insertions, 27 deletions
diff --git a/fetch-clone.c b/fetch-clone.c
index c5cf477..b62feac 100644
--- a/fetch-clone.c
+++ b/fetch-clone.c
@@ -1,6 +1,7 @@
#include "cache.h"
#include "exec_cmd.h"
#include "pkt-line.h"
+#include "sideband.h"
#include <sys/wait.h>
#include <sys/time.h>
@@ -114,36 +115,13 @@ static pid_t setup_sideband(int sideband, const char *me, int fd[2], int xd[2])
die("%s: unable to fork off sideband demultiplexer", me);
if (!side_pid) {
/* subprocess */
+ char buf[DEFAULT_PACKET_MAX];
+
close(fd[0]);
if (xd[0] != xd[1])
close(xd[1]);
- while (1) {
- char buf[1024];
- int len = packet_read_line(xd[0], buf, sizeof(buf));
- if (len == 0)
- break;
- if (len < 1)
- die("%s: protocol error: no band designator",
- me);
- len--;
- switch (buf[0] & 0xFF) {
- case 3:
- safe_write(2, "remote: ", 8);
- safe_write(2, buf+1, len);
- safe_write(2, "\n", 1);
- exit(1);
- case 2:
- safe_write(2, "remote: ", 8);
- safe_write(2, buf+1, len);
- continue;
- case 1:
- safe_write(fd[1], buf+1, len);
- continue;
- default:
- die("%s: protocol error: bad band #%d",
- me, (buf[0] & 0xFF));
- }
- }
+ if (recv_sideband(me, xd[0], fd[1], 2, buf, sizeof(buf)))
+ exit(1);
exit(0);
}
close(xd[0]);