mirror of
https://github.com/git/git.git
synced 2024-10-29 21:37:53 +01:00
9ac13ec941
It has been a few times that I ended up with such a confusing display: |remote: Generating pack... |remote: Done counting 17 objects. |remote: Result has 9 objects. |remote: Deltifying 9 objects. |remote: 100% (9/9) done |remote: Unpacking 9 objects |Total 9, written 9 (delta 8), reused 0 (delta 0) | 100% (9/9) done The confusion can be avoided in most cases by writing the remote message in one go to prevent interleacing with local messages. The buffer declaration has been moved inside recv_sideband() to avoid extra string copies. Signed-off-by: Nicolas Pitre <nico@cam.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
78 lines
1.9 KiB
C
78 lines
1.9 KiB
C
#include "pkt-line.h"
|
|
#include "sideband.h"
|
|
|
|
/*
|
|
* Receive multiplexed output stream over git native protocol.
|
|
* in_stream is the input stream from the remote, which carries data
|
|
* in pkt_line format with band designator. Demultiplex it into out
|
|
* and err and return error appropriately. Band #1 carries the
|
|
* primary payload. Things coming over band #2 is not necessarily
|
|
* error; they are usually informative message on the standard error
|
|
* stream, aka "verbose"). A message over band #3 is a signal that
|
|
* the remote died unexpectedly. A flush() concludes the stream.
|
|
*/
|
|
int recv_sideband(const char *me, int in_stream, int out, int err)
|
|
{
|
|
char buf[7 + LARGE_PACKET_MAX + 1];
|
|
strcpy(buf, "remote:");
|
|
while (1) {
|
|
int band, len;
|
|
len = packet_read_line(in_stream, buf+7, LARGE_PACKET_MAX);
|
|
if (len == 0)
|
|
break;
|
|
if (len < 1) {
|
|
len = sprintf(buf, "%s: protocol error: no band designator\n", me);
|
|
safe_write(err, buf, len);
|
|
return SIDEBAND_PROTOCOL_ERROR;
|
|
}
|
|
band = buf[7] & 0xff;
|
|
len--;
|
|
switch (band) {
|
|
case 3:
|
|
buf[7] = ' ';
|
|
buf[8+len] = '\n';
|
|
safe_write(err, buf, 8+len+1);
|
|
return SIDEBAND_REMOTE_ERROR;
|
|
case 2:
|
|
buf[7] = ' ';
|
|
safe_write(err, buf, 8+len);
|
|
continue;
|
|
case 1:
|
|
safe_write(out, buf+8, len);
|
|
continue;
|
|
default:
|
|
len = sprintf(buf,
|
|
"%s: protocol error: bad band #%d\n",
|
|
me, band);
|
|
safe_write(err, buf, len);
|
|
return SIDEBAND_PROTOCOL_ERROR;
|
|
}
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* fd is connected to the remote side; send the sideband data
|
|
* over multiplexed packet stream.
|
|
*/
|
|
ssize_t send_sideband(int fd, int band, const char *data, ssize_t sz, int packet_max)
|
|
{
|
|
ssize_t ssz = sz;
|
|
const char *p = data;
|
|
|
|
while (sz) {
|
|
unsigned n;
|
|
char hdr[5];
|
|
|
|
n = sz;
|
|
if (packet_max - 5 < n)
|
|
n = packet_max - 5;
|
|
sprintf(hdr, "%04x", n + 5);
|
|
hdr[4] = band;
|
|
safe_write(fd, hdr, 5);
|
|
safe_write(fd, p, n);
|
|
p += n;
|
|
sz -= n;
|
|
}
|
|
return ssz;
|
|
}
|