Merge branch 'maint'

[git.git] / sideband.c

diff --git a/sideband.c b/sideband.c
index 1b14ff88924668e6803229d4d2cef981823522fb..ab8a1e990db39155efc624ca99e85c1cf8eaefa9 100644 (file)
--- a/sideband.c
+++ b/sideband.c
@@ -11,10 +11,13 @@
  * 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, int bufsz)
+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 len = packet_read_line(in_stream, buf, bufsz);
+               int band, len;
+               len = packet_read_line(in_stream, buf+7, LARGE_PACKET_MAX);
                if (len == 0)
                        break;
                if (len < 1) {
@@ -22,25 +25,41 @@ int recv_sideband(const char *me, int in_stream, int out, int err, char *buf, in
                        safe_write(err, buf, len);
                        return SIDEBAND_PROTOCOL_ERROR;
                }
+               band = buf[7] & 0xff;
                len--;
-               switch (buf[0] & 0xFF) {
+               switch (band) {
                case 3:
-                       safe_write(err, "remote: ", 8);
-                       safe_write(err, buf+1, len);
-                       safe_write(err, "\n", 1);
+                       buf[7] = ' ';
+                       buf[8+len] = '\n';
+                       safe_write(err, buf, 8+len+1);
                        return SIDEBAND_REMOTE_ERROR;
                case 2:
-                       safe_write(err, "remote: ", 8);
-                       safe_write(err, buf+1, len);
+                       buf[7] = ' ';
+                       len += 8;
+                       while (1) {
+                               int brk = 8;
+                               while (brk < len) {
+                                       brk++;
+                                       if (buf[brk-1] == '\n' ||
+                                           buf[brk-1] == '\r')
+                                               break;
+                               }
+                               safe_write(err, buf, brk);
+                               if (brk < len) {
+                                       memmove(buf + 8, buf + brk, len - brk);
+                                       len = len - brk + 8;
+                               } else
+                                       break;
+                       }
                        continue;
                case 1:
-                       safe_write(out, buf+1, len);
+                       safe_write(out, buf+8, len);
                        continue;
                default:
-                       len = sprintf(buf + 1,
+                       len = sprintf(buf,
                                      "%s: protocol error: bad band #%d\n",
-                                     me, buf[0] & 0xFF);
-                       safe_write(err, buf+1, len);
+                                     me, band);
+                       safe_write(err, buf, len);
                        return SIDEBAND_PROTOCOL_ERROR;
                }
        }