[PATCH/RFC] sideband: remove line padding (was: Re: [PATCH] progress: use \r as EOL only if isatty(stderr) is true)
- From
- Steffen Daode Nurpmeso <sdaoden@googlemail.com>
- Date
- Jun 29, 2011, 17:42 UTC
- Message-ID
- <20110629174220.GA36658@sherwood.local>
- In-Reply-To
- <7vwrg5u7oz.fsf@alter.siamese.dyndns.org>
I desperately tried to reproduce the 'xy ^Mxy ^M' case, but i can't. In fact i cannot even find a piece of code which would do it. :-/ Such a shame. Still: i insist on having that seen in my arena-manager.log.
While searching around i stumbled over fetch-pack output with an ANSI escape sequence after a '(xy) 2>&1 | tee LOG'. -- Ciao, Steffen sdaoden(*)(gmail.com) () ascii ribbon campaign - against html e-mail /\ www.asciiribbon.org - against proprietary attachments
-- >8 -- Subject: [PATCH/RFC] sideband: remove line padding
For formatting purposes recv_sideband() sofar appended a suffix to band #2 (informative) messages: dependent on getenv("TERM") lines may have been space-filled ("dumb") or padded with an ANSI escape sequence (ANSI EL, mode 0: clear from cursor to end of line). This patch removes handling of terminal specifics and any pad suffixes.
It also fixes two 'signed/unsigned comparison' compiler warnings.
Signed-off-by: Steffen Daode Nurpmeso <sdaoden@gmail.com> --- I believe that users of fetch-pack, send-pack and archive, the three affected operations, will ensure that lines are refreshed as approbiate, even if 'brk-1' == CR. But even if not: i would move handling of "TERM" and dumb/non-dumb terminals out of this packet handler and into some terminal encapsulator, which can only be color.* as far as i see. The question would be how this should be done. Maybe term_fprintf_padln(?, desired-line-length-or--1)? Such a thing would surely find other users in the codebase. A second approach would be to only use the "dumb" pad, as in
fprintf(stderr, "%.*s %c", brk - 1, b, b[brk - 1]);
What do you think of that?
sideband.c | 35 +++++------------------------------ 1 files changed, 5 insertions(+), 30 deletions(-)
diff --git a/sideband.c b/sideband.c index d5ffa1c..17e1793 100644 --- a/sideband.c +++ b/sideband.c @@ -14,26 +14,13 @@ #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; + unsigned pf = sizeof(PREFIX) - 1; + char buf[LARGE_PACKET_MAX + 2*sizeof(PREFIX)]; 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; @@ -82,20 +69,8 @@ int recv_sideband(const char *me, int in_stream, int out) 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); + if ((unsigned)brk > (skip_pf ? 0 : (pf+1 +1))) { + fprintf(stderr, "%.*s", brk, b); len -= brk; } else { int l = brk ? brk : len; @@ -133,7 +108,7 @@ ssize_t send_sideband(int fd, int band, const char *data, ssize_t sz, int packet char hdr[5]; n = sz; - if (packet_max - 5 < n) + if ((unsigned)packet_max - 5 < n) n = packet_max - 5; if (0 <= band) { sprintf(hdr, "%04x", n + 5);
-- 1.7.6.1.ge79e.dirty