Skip to content

Commit

Permalink
recv_sideband: Do not use ANSI escape sequence on dumb terminals.
Browse files Browse the repository at this point in the history
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.

[jc: as an old fashoned git myself, and given the fact that the
possible prefix and suffix are small number of short constant strings,
I actually prefer a simpler-and-more-stupid approach.  This is with
Nico's clean-up.]

Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Johannes Sixt authored and Junio C Hamano committed Jan 9, 2008
1 parent f85fd3f commit 13e4760
Showing 1 changed file with 18 additions and 5 deletions.
23 changes: 18 additions & 5 deletions sideband.c
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,27 @@
*/

#define PREFIX "remote:"
#define SUFFIX "\033[K" /* change to " " if ANSI sequences don't work */

#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)
{
unsigned pf = strlen(PREFIX);
unsigned sf = strlen(SUFFIX);
char buf[pf + LARGE_PACKET_MAX + sf + 1];
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 + pf, LARGE_PACKET_MAX);
Expand Down Expand Up @@ -59,10 +72,10 @@ int recv_sideband(const char *me, int in_stream, int out, int err)
* line data actually contains something.
*/
if (brk > pf+1 + 1) {
char save[sf];
char save[FIX_SIZE];
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
Expand Down

0 comments on commit 13e4760

Please sign in to comment.