From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 19 Jul 2016 20:22:14 +0000 (-0700)
Subject: Merge branch 'lf/recv-sideband-cleanup'
X-Git-Tag: v2.10.0-rc0~113
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e0e56cbf7f6b249b17b924c92f19580b7348431b?ds=inline;hp=-c

Merge branch 'lf/recv-sideband-cleanup'

Code simplification.

* lf/recv-sideband-cleanup:
sideband.c: small optimization of strbuf usage
sideband.c: refactor recv_sideband()
---

e0e56cbf7f6b249b17b924c92f19580b7348431b
diff --combined sideband.c
index c09929dafa,c0b6dcf703..1e4d684d6c
--- a/sideband.c
+++ b/sideband.c
@@@ -13,119 -13,104 +13,103 @@@
   * the remote died unexpectedly.  A flush() concludes the stream.
   */
  
- #define PREFIX "remote:"
+ #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)
  {
- 	unsigned pf = strlen(PREFIX);
- 	unsigned sf;
- 	char buf[LARGE_PACKET_MAX + 2*FIX_SIZE];
- 	char *suffix, *term;
- 	int skip_pf = 0;
+ 	const char *term, *suffix;
+ 	char buf[LARGE_PACKET_MAX + 1];
+ 	struct strbuf outbuf = STRBUF_INIT;
+ 	int retval = 0;
  
- 	memcpy(buf, PREFIX, pf);
  	term = getenv("TERM");
  	if (isatty(2) && term && strcmp(term, "dumb"))
  		suffix = ANSI_SUFFIX;
  	else
  		suffix = DUMB_SUFFIX;
- 	sf = strlen(suffix);
  
- 	while (1) {
+ 	while (!retval) {
+ 		const char *b, *brk;
  		int band, len;
- 		len = packet_read(in_stream, NULL, NULL, buf + pf, LARGE_PACKET_MAX, 0);
+ 		len = packet_read(in_stream, NULL, NULL, buf, LARGE_PACKET_MAX, 0);
  		if (len == 0)
  			break;
  		if (len < 1) {
- 			fprintf(stderr, "%s: protocol error: no band designator\n", me);
- 			return SIDEBAND_PROTOCOL_ERROR;
+ 			strbuf_addf(&outbuf,
+ 				    "%s%s: protocol error: no band designator",
+ 				    outbuf.len ? "\n" : "", me);
+ 			retval = SIDEBAND_PROTOCOL_ERROR;
+ 			break;
  		}
- 		band = buf[pf] & 0xff;
+ 		band = buf[0] & 0xff;
+ 		buf[len] = '\0';
  		len--;
  		switch (band) {
  		case 3:
- 			buf[pf] = ' ';
- 			buf[pf+1+len] = '\0';
- 			fprintf(stderr, "%s\n", buf);
- 			return SIDEBAND_REMOTE_ERROR;
+ 			strbuf_addf(&outbuf, "%s%s%s", outbuf.len ? "\n" : "",
+ 				    PREFIX, buf + 1);
+ 			retval = SIDEBAND_REMOTE_ERROR;
+ 			break;
  		case 2:
- 			buf[pf] = ' ';
- 			do {
- 				char *b = buf;
- 				int brk = 0;
+ 			b = buf + 1;
  
- 				/*
- 				 * 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;
- 				}
+ 			/*
+ 			 * Append a suffix to each nonempty line to clear the
+ 			 * end of the screen line.
+ 			 *
+ 			 * The output is accumulated in a buffer and
+ 			 * each line is printed to stderr using
+ 			 * write(2) to ensure inter-process atomicity.
+ 			 */
+ 			while ((brk = strpbrk(b, "\n\r"))) {
+ 				int linelen = brk - b;
  
- 				/*
- 				 * 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;
+ 				if (!outbuf.len)
+ 					strbuf_addstr(&outbuf, PREFIX);
+ 				if (linelen > 0) {
+ 					strbuf_addf(&outbuf, "%.*s%s%c",
+ 						    linelen, b, suffix, *brk);
  				} else {
- 					int l = brk ? brk : len;
- 					fprintf(stderr, "%.*s", l, b);
- 					len -= l;
+ 					strbuf_addch(&outbuf, *brk);
  				}
+ 				xwrite(2, outbuf.buf, outbuf.len);
+ 				strbuf_reset(&outbuf);
  
- 				skip_pf = !brk;
- 				memmove(buf + pf+1, b + brk, len);
- 			} while (len);
- 			continue;
+ 				b = brk + 1;
+ 			}
+ 
+ 			if (*b)
+ 				strbuf_addf(&outbuf, "%s%s",
+ 					    outbuf.len ? "" : PREFIX, b);
+ 			break;
  		case 1:
- 			write_or_die(out, buf + pf+1, len);
- 			continue;
+ 			write_or_die(out, buf + 1, len);
+ 			break;
  		default:
- 			fprintf(stderr, "%s: protocol error: bad band #%d\n",
- 				me, band);
- 			return SIDEBAND_PROTOCOL_ERROR;
+ 			strbuf_addf(&outbuf, "%s%s: protocol error: bad band #%d",
+ 				    outbuf.len ? "\n" : "", me, band);
+ 			retval = SIDEBAND_PROTOCOL_ERROR;
+ 			break;
  		}
  	}
- 	return 0;
+ 
+ 	if (outbuf.len) {
+ 		strbuf_addch(&outbuf, '\n');
+ 		xwrite(2, outbuf.buf, outbuf.len);
+ 	}
+ 	strbuf_release(&outbuf);
+ 	return retval;
  }
  
  /*
   * 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)
 +void 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) {
@@@ -136,15 -121,16 +120,15 @@@
  		if (packet_max - 5 < n)
  			n = packet_max - 5;
  		if (0 <= band) {
 -			sprintf(hdr, "%04x", n + 5);
 +			xsnprintf(hdr, sizeof(hdr), "%04x", n + 5);
  			hdr[4] = band;
  			write_or_die(fd, hdr, 5);
  		} else {
 -			sprintf(hdr, "%04x", n + 4);
 +			xsnprintf(hdr, sizeof(hdr), "%04x", n + 4);
  			write_or_die(fd, hdr, 4);
  		}
  		write_or_die(fd, p, n);
  		p += n;
  		sz -= n;
  	}
 -	return ssz;
  }