empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix client's command abort at beginning of first input line

Browse source 
Commit 3cceb59b (v4.3.26) fixed the client to abort commands reliably
on ^C, even when it arrives at the beginning of an input line.  Except
it didn't work at the beginning of the first input line, because
input_eol was initialized to zero.

Easily fixed, but "end of line" isn't quite right there.  Revert sense
and rename to partial_line_sent.
This commit is contained in:
Markus Armbruster 2012-01-26 20:46:42 +01:00
parent a89af8c64d
commit 8342618450
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/client/play.c
View file

@ -465,7 +465,7 @@ play(int sock)
struct sigaction sa; struct sigaction sa;
struct ring inbuf; /* input buffer, draining to SOCK */ struct ring inbuf; /* input buffer, draining to SOCK */
int eof_fd0; /* read fd 0 hit EOF? */ int eof_fd0; /* read fd 0 hit EOF? */
int input_eol; /* input ends with '\n'? */ int partial_line_sent; /* partial input line sent? */
fd_set rdfd, wrfd; fd_set rdfd, wrfd;
int n; int n;
@ -477,7 +477,7 @@ play(int sock)
sigaction(SIGPIPE, &sa, NULL); sigaction(SIGPIPE, &sa, NULL);
ring_init(&inbuf); ring_init(&inbuf);
eof_fd0 = input_eol = send_eof = send_intr = 0; eof_fd0 = partial_line_sent = send_eof = send_intr = 0;
input_fd = 0; input_fd = 0;
sysdep_stdin_init(); sysdep_stdin_init();
@ -506,13 +506,13 @@ play(int sock)
} }
} }
if ((send_eof || send_intr) && !input_eol if ((send_eof || send_intr) && partial_line_sent
&& ring_putc(&inbuf, '\n') != EOF) && ring_putc(&inbuf, '\n') != EOF)
input_eol = 1; partial_line_sent = 0;
if (send_eof && input_eol if (send_eof && !partial_line_sent
&& ring_putm(&inbuf, EOF_COOKIE, sizeof(EOF_COOKIE) - 1) >= 0) && ring_putm(&inbuf, EOF_COOKIE, sizeof(EOF_COOKIE) - 1) >= 0)
send_eof--; send_eof--;
if (send_intr && input_eol if (send_intr && !partial_line_sent
&& ring_putm(&inbuf, INTR_COOKIE, sizeof(INTR_COOKIE) - 1) >= 0) { && ring_putm(&inbuf, INTR_COOKIE, sizeof(INTR_COOKIE) - 1) >= 0) {
send_intr = 0; send_intr = 0;
if (input_fd) { if (input_fd) {
@ -547,7 +547,7 @@ play(int sock)
sigaction(SIGINT, &sa, NULL); sigaction(SIGINT, &sa, NULL);
} }
} else } else
input_eol = ring_peek(&inbuf, -1) == '\n'; partial_line_sent = ring_peek(&inbuf, -1) != '\n';
} }
/* send it to the server */ /* send it to the server */