--- OLD/sideband.c	Thu Jan  1 00:00:00 1970
+++ NEW/sideband.c	Thu Jan  1 00:00:00 1970
@@ -1,4 +1,5 @@
 #include "pkt-line.h"
+#include "progress.h"
 #include "sideband.h"
 
 /*
@@ -12,111 +13,80 @@
  * 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 */
+#define PREFIX "remote: "
 
 int recv_sideband(const char *me, int in_stream, int out)
 {
-	unsigned pf = strlen(PREFIX);
-	unsigned sf;
-	char buf[LARGE_PACKET_MAX + 2*FIX_SIZE];
-	char *suffix, *term;
-	int skip_pf = 0;
-
-	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 + pf, LARGE_PACKET_MAX);
-		if (len == 0)
-			break;
-		if (len < 1) {
-			fprintf(stderr, "%s: protocol error: no band designator\n", me);
-			return SIDEBAND_PROTOCOL_ERROR;
-		}
-		band = buf[pf] & 0xff;
-		len--;
-		switch (band) {
-		case 3:
-			buf[pf] = ' ';
-			buf[pf+1+len] = '\0';
-			fprintf(stderr, "%s\n", buf);
-			return SIDEBAND_REMOTE_ERROR;
-		case 2:
-			buf[pf] = ' ';
-			do {
-				char *b = buf;
-				int brk = 0;
-
-				/*
-				 * If the last buffer didn't end with a line
-				 * break then we should not print a prefix
-				 * this time around.
-				 */
-				if (skip_pf) {
-					b += pf+1;
-				} else {
-					len += pf+1;
-					brk += pf+1;
-				}
-
-				/* Look for a line break. */
-				for (;;) {
-					brk++;
-					if (brk > len) {
-						brk = 0;
-						break;
-					}
-					if (b[brk-1] == '\n' ||
-					    b[brk-1] == '\r')
-						break;
-				}
-
-				/*
-				 * Let's insert a suffix to clear the end
-				 * of the screen line if a line break was
-				 * found.  Also, if we don't skip the
-				 * prefix, then a non-empty string must be
-				 * present too.
-				 */
-				if (brk > (skip_pf ? 0 : (pf+1 + 1))) {
-					char save[FIX_SIZE];
-					memcpy(save, b + brk, sf);
-					b[brk + sf - 1] = b[brk - 1];
-					memcpy(b + brk - 1, suffix, sf);
-					fprintf(stderr, "%.*s", brk + sf, b);
-					memcpy(b + brk, save, sf);
-					len -= brk;
-				} else {
-					int l = brk ? brk : len;
-					fprintf(stderr, "%.*s", l, b);
-					len -= l;
-				}
-
-				skip_pf = !brk;
-				memmove(buf + pf+1, b + brk, len);
-			} while (len);
-			continue;
-		case 1:
-			safe_write(out, buf + pf+1, len);
-			continue;
-		default:
-			fprintf(stderr, "%s: protocol error: bad band #%d\n",
-				me, band);
-			return SIDEBAND_PROTOCOL_ERROR;
-		}
-	}
-	return 0;
+ char buf[LARGE_PACKET_MAX];
+ char *part = 0;
+ int parta = 0;
+ int partl;
+ int band;
+ int len;
+ char *lb;
+ int l;
+ int o;
+ int isdone;
+
+ partl = 0;
+ while (1)
+  { len = packet_read_line(in_stream,&buf[0],LARGE_PACKET_MAX);
+    if (len == 0) break;
+    if (len < 1) // can packet_read_line return <0?
+     { fprintf(stderr,"%s: protocol error: no band designator\n",me);
+       return(SIDEBAND_PROTOCOL_ERROR);
+     }
+    band = buf[0] & 0xff;
+    switch (band)
+     { case 3:
+	  progress_line(1,"%s%.*s",PREFIX,len-1,&buf[1]);
+	  return(SIDEBAND_REMOTE_ERROR);
+	  break;
+       case 2:
+	  o = 1;
+	  while (o < len)
+	   { l = len - o;
+	     isdone = -1;
+	     lb = memchr(&buf[o],'\r',len-o);
+	     if (lb && (lb-&buf[o] < l))
+	      { isdone = 0;
+		l = lb - &buf[o];
+	      }
+	     lb = memchr(&buf[o],'\n',len-o);
+	     if (lb && (lb-&buf[o] < l))
+	      { isdone = 1;
+		l = lb - &buf[o];
+	      }
+	     if (isdone < 0)
+	      { if (partl+l > parta)
+		 { parta = partl + l;
+		   part = realloc(part,parta);
+		 }
+		bcopy(&buf[o],part+partl,l);
+		partl += l;
+		o = len;
+	      }
+	     else
+	      { if (partl)
+		 { progress_line(isdone,"%s%.*s%.*s",PREFIX,partl,part,l,&buf[o]);
+		   partl = 0;
+		 }
+		else
+		 { progress_line(isdone,"%s%.*s",PREFIX,l,&buf[o]);
+		 }
+		o += l + 1;
+	      }
+	   }
+	  break;
+       case 1:
+	  safe_write(out,&buf[1],len-1);
+	  break;
+       default:
+	  fprintf(stderr,"%s: protocol error: bad band #%d\n",me,band);
+	  return(SIDEBAND_PROTOCOL_ERROR);
+     }
+  }
+ return(0);
 }
 
 /*