Skip to content

Commit

Permalink
Merge branch 'js/sideband-stderr'
Browse files Browse the repository at this point in the history
* js/sideband-stderr:
  winansi: support ESC [ K (erase in line)
  recv_sideband: Bands #2 and #3 always go to stderr
  • Loading branch information
Junio C Hamano committed Mar 18, 2009
2 parents 9e6433a + 1897713 commit 6e5660a
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 17 deletions.
2 changes: 1 addition & 1 deletion builtin-archive.c
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ static int run_remote_archiver(int argc, const char **argv,
die("git archive: expected a flush");

/* Now, start reading from fd[0] and spit it out to stdout */
rv = recv_sideband("archive", fd[0], 1, 2);
rv = recv_sideband("archive", fd[0], 1);
close(fd[0]);
close(fd[1]);
rv |= finish_connect(conn);
Expand Down
2 changes: 1 addition & 1 deletion builtin-fetch-pack.c
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ static int sideband_demux(int fd, void *data)
{
int *xd = data;

return recv_sideband("fetch-pack", xd[0], fd, 2);
return recv_sideband("fetch-pack", xd[0], fd);
}

static int get_pack(int xd[2], char **pack_lockfile)
Expand Down
18 changes: 15 additions & 3 deletions compat/winansi.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
This file is git-specific. Therefore, this file does not attempt
to implement any codes that are not used by git.
TODO: K
*/

static HANDLE console;
Expand Down Expand Up @@ -79,6 +77,20 @@ static void set_console_attr(void)
SetConsoleTextAttribute(console, attributes);
}

static void erase_in_line(void)
{
CONSOLE_SCREEN_BUFFER_INFO sbi;

if (!console)
return;

GetConsoleScreenBufferInfo(console, &sbi);
FillConsoleOutputCharacterA(console, ' ',
sbi.dwSize.X - sbi.dwCursorPosition.X, sbi.dwCursorPosition,
NULL);
}


static const char *set_attr(const char *str)
{
const char *func;
Expand Down Expand Up @@ -218,7 +230,7 @@ static const char *set_attr(const char *str)
set_console_attr();
break;
case 'K':
/* TODO */
erase_in_line();
break;
default:
/* Unsupported code */
Expand Down
19 changes: 8 additions & 11 deletions sideband.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

#define FIX_SIZE 10 /* large enough for any of the above */

int recv_sideband(const char *me, int in_stream, int out, int err)
int recv_sideband(const char *me, int in_stream, int out)
{
unsigned pf = strlen(PREFIX);
unsigned sf;
Expand All @@ -41,17 +41,16 @@ int recv_sideband(const char *me, int in_stream, int out, int err)
if (len == 0)
break;
if (len < 1) {
len = sprintf(buf, "%s: protocol error: no band designator\n", me);
safe_write(err, buf, len);
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] = '\n';
safe_write(err, buf, pf+1+len+1);
buf[pf+1+len] = '\0';
fprintf(stderr, "%s\n", buf);
return SIDEBAND_REMOTE_ERROR;
case 2:
buf[pf] = ' ';
Expand Down Expand Up @@ -95,12 +94,12 @@ int recv_sideband(const char *me, int in_stream, int out, int err)
memcpy(save, b + brk, sf);
b[brk + sf - 1] = b[brk - 1];
memcpy(b + brk - 1, suffix, sf);
safe_write(err, b, brk + sf);
fprintf(stderr, "%.*s", brk + sf, b);
memcpy(b + brk, save, sf);
len -= brk;
} else {
int l = brk ? brk : len;
safe_write(err, b, l);
fprintf(stderr, "%.*s", l, b);
len -= l;
}

Expand All @@ -112,10 +111,8 @@ int recv_sideband(const char *me, int in_stream, int out, int err)
safe_write(out, buf + pf+1, len);
continue;
default:
len = sprintf(buf,
"%s: protocol error: bad band #%d\n",
me, band);
safe_write(err, buf, len);
fprintf(stderr, "%s: protocol error: bad band #%d\n",
me, band);
return SIDEBAND_PROTOCOL_ERROR;
}
}
Expand Down
2 changes: 1 addition & 1 deletion sideband.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#define DEFAULT_PACKET_MAX 1000
#define LARGE_PACKET_MAX 65520

int recv_sideband(const char *me, int in_stream, int out, int err);
int recv_sideband(const char *me, int in_stream, int out);
ssize_t send_sideband(int fd, int band, const char *data, ssize_t sz, int packet_max);

#endif

0 comments on commit 6e5660a

Please sign in to comment.