X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=sideband.c;h=b6777812cb92c1c169ee395164d53a0c2e6eceb2;hb=5411bdc4e4b170a57a61b2d486ab344896c41500;hp=277fa3c10d19ee7997ee5b38c5f77a6cd04576f1;hpb=e92ea62425fb89713bc47241af29a79f5f191cc6;p=git.git

diff --git a/sideband.c b/sideband.c
index 277fa3c10..b6777812c 100644
--- a/sideband.c
+++ b/sideband.c
@@ -11,13 +11,32 @@
  * stream, aka "verbose").  A message over band #3 is a signal that
  * the remote died unexpectedly.  A flush() concludes the stream.
  */
+
+#define PREFIX "remote:"
+
+#define ANSI_SUFFIX "\033[K"
+#define DUMB_SUFFIX "        "
+
+#define FIX_SIZE 10  /* large enough for any of the above */
+
 int recv_sideband(const char *me, int in_stream, int out, int err)
 {
-	char buf[7 + LARGE_PACKET_MAX + 1];
-	strcpy(buf, "remote:");
+	unsigned pf = strlen(PREFIX);
+	unsigned sf;
+	char buf[LARGE_PACKET_MAX + 2*FIX_SIZE];
+	char *suffix, *term;
+
+	memcpy(buf, PREFIX, pf);
+	term = getenv("TERM");
+	if (term && strcmp(term, "dumb"))
+		suffix = ANSI_SUFFIX;
+	else
+		suffix = DUMB_SUFFIX;
+	sf = strlen(suffix);
+
 	while (1) {
 		int band, len;
-		len	= packet_read_line(in_stream, buf+7, LARGE_PACKET_MAX);
+		len = packet_read_line(in_stream, buf + pf, LARGE_PACKET_MAX);
 		if (len == 0)
 			break;
 		if (len < 1) {
@@ -25,20 +44,52 @@ int recv_sideband(const char *me, int in_stream, int out, int err)
 			safe_write(err, buf, len);
 			return SIDEBAND_PROTOCOL_ERROR;
 		}
-		band = buf[7] & 0xff;
+		band = buf[pf] & 0xff;
 		len--;
 		switch (band) {
 		case 3:
-			buf[7] = ' ';
-			buf[8+len] = '\n';
-			safe_write(err, buf, 8+len+1);
+			buf[pf] = ' ';
+			buf[pf+1+len] = '\n';
+			safe_write(err, buf, pf+1+len+1);
 			return SIDEBAND_REMOTE_ERROR;
 		case 2:
-			buf[7] = ' ';
-			safe_write(err, buf, 8+len);
+			buf[pf] = ' ';
+			len += pf+1;
+			while (1) {
+				int brk = pf+1;
+
+				/* Break the buffer into separate lines. */
+				while (brk < len) {
+					brk++;
+					if (buf[brk-1] == '\n' ||
+					    buf[brk-1] == '\r')
+						break;
+				}
+
+				/*
+				 * Let's insert a suffix to clear the end
+				 * of the screen line, but only if current
+				 * line data actually contains something.
+				 */
+				if (brk > pf+1 + 1) {
+					char save[FIX_SIZE];
+					memcpy(save, buf + brk, sf);
+					buf[brk + sf - 1] = buf[brk - 1];
+					memcpy(buf + brk - 1, suffix, sf);
+					safe_write(err, buf, brk + sf);
+					memcpy(buf + brk, save, sf);
+				} else
+					safe_write(err, buf, brk);
+
+				if (brk < len) {
+					memmove(buf + pf+1, buf + brk, len - brk);
+					len = len - brk + pf+1;
+				} else
+					break;
+			}
 			continue;
 		case 1:
-			safe_write(out, buf+8, len);
+			safe_write(out, buf + pf+1, len);
 			continue;
 		default:
 			len = sprintf(buf,