[PATCH 2/2] recv_sideband: Do not use ANSI escape sequence on dumb terminals.
- From
Johannes Sixt <j.sixt@viscovery.net>
- Date
- Jan 8, 2008, 16:24 UTC
- Message-ID
- <4783A3D5.70309@viscovery.net>
From: Johannes Sixt <johannes.sixt@telecom.at>
The "clear to end of line" sequence is used to nicely output the progress indicator without leaving garbage on the terminal. However, this works only on ANSI capable terminals. We use the same check as in color.c to find out whether the terminal supports this feature and use a workaround (a few spaces in a row) if it does not.
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> --- sideband.c | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/sideband.c b/sideband.c index 513d7b3..0873e69 100644 --- a/sideband.c +++ b/sideband.c @@ -13,15 +13,22 @@ */ #define PREFIX "remote:" -#define SUFFIX "\033[K" /* change to " " if ANSI sequences don't work */ int recv_sideband(const char *me, int in_stream, int out, int err) { unsigned pf = strlen(PREFIX); - unsigned sf = strlen(SUFFIX); + unsigned sf; char *buf, *save; + char *suffix, *term; + term = getenv("TERM"); + if (term && strcmp(term, "dumb")) + suffix = "\033[K"; + else + suffix = " "; + sf = strlen(suffix); save = xmalloc(sf); + buf = xmalloc(pf + LARGE_PACKET_MAX + sf + 1); memcpy(buf, PREFIX, pf); while (1) { @@ -68,7 +75,7 @@ int recv_sideband(const char *me, int in_stream, int out, int err) if (brk > pf+1 + 1) { memcpy(save, buf + brk, sf); buf[brk + sf - 1] = buf[brk - 1]; - memcpy(buf + brk - 1, SUFFIX, sf); + memcpy(buf + brk - 1, suffix, sf); safe_write(err, buf, brk + sf); memcpy(buf + brk, save, sf); } else
-- 1.5.4.rc2.815.g2f849-dirty