Rewrite much of client's playing phase code:
authorMarkus Armbruster <armbru@pond.sub.org>
Sat, 17 Nov 2007 14:17:38 +0000 (14:17 +0000)
committerMarkus Armbruster <armbru@pond.sub.org>
Sat, 17 Nov 2007 14:17:38 +0000 (14:17 +0000)
commit8b7d0b915d73a80f63743726a1dc7236f5bffa57
tree706c828706be6a72eb5b9edeb3311a9188b469ce
parent2444a5c63a423675c17f18483a9ef8016c6761e9
Rewrite much of client's playing phase code:
(EOF_COOKIE, INTR_COOKIE, input_fd, send_intr, recv_output)
(recv_input, intr, play): New playing phase code.  No native Windows
support yet.  Sends just one EOF cookie on EOF on standard input
instead of up to three.  Old servers (before recvclient.c rev. 1.16)
fail to terminate the session when they receive an EOF cookie at an
argument prompt.  The session then hangs; use SIGINT to get out.  No
longer blocks on sending input, which could deadlock the session.
Closes #827090.  Fixes error handling for select().  Fixes race
condition that could cause server output to be discarded on EOF on
standard input.
(main): Replace old playing phase code by a call to play().
(intr, sock, interrupt, handleintr): Replaced by play(), remove.
[_WIN32] (hStdIn): Ditto.
(auxfp): New.
(servercmd, prompt, doexecute): Remove parameter auxfi, use auxfp.
(eight_bit_clean): Move to servcmd.c.
(servercmd): Work on a single non-C_DATA line instead of getting lines
from an ioqueue.
(servercmd, output, screen, outch): Deal with all ids in servercmd()
rather than some there and some in output().  Don't treat C_NOECHO,
C_ABORT, C_CMDERR, C_BADCMD specially.  Fix C_FLASH and C_EXIT to
ignore redirections; they used to ignore them only for some parts.
Replace output() by outch(), fold screen into outch().
(servercmd): Truncate long prompts and telegram infos to prevent
buffer overflow.
(prompt): Use new parameters code, prompt, teles instead of global
variables mode, the_prompt, num_teles.
(num_teles, the_prompt, mode, nbtu, nmin): Remove.
(prompt): Don't write an empty line before argument prompts to auxfp.
(servercmd): Don't strip newline from redirections and execute,
doredir(), dopipe() and doexecute() need it now.
(doredir, dopipe, doexecute): Use new seen_input() instead of gettag().
(doexecute): Set input_fd and leave reading the script file to play().
(serverio, termio, sendeof): Replaced by play(), remove.
(LBUF_LEN_MAX, lbuf, lbuf_init, lbuf_len, lbuf_full, lbuf_line)
(lbuf_putc): New.
(RING_SIZE, ring, ring_init, ring_len, ring_space, ring_peek)
(ring_getc, ring_putc, ring_putm, ring_discard, ring_search)
(ring_from_file, ring_to_file): New.
(clear_recent_input, save_input, seen_input): New.
(MAX): New.
(ioqueue, io, ioq_init, ioq_dequeue, ioq_read, ioq_write, ioq_qsize)
(ioq_drain, ioq_gets, ioqtobuf, enqueuecc, dequeuecc): Unused, remove.
(QEMPTY, qelem, insque, remque, initque): Unused, remove.
(tagstruct, taglist, io_init, gettag): Unused, remove.
19 files changed:
src/client/Makefile.in
src/client/ioqueue.c [deleted file]
src/client/ioqueue.h [deleted file]
src/client/linebuf.c [new file with mode: 0644]
src/client/linebuf.h [new file with mode: 0644]
src/client/main.c
src/client/misc.h
src/client/play.c [new file with mode: 0644]
src/client/queue.c [deleted file]
src/client/queue.h [deleted file]
src/client/ringbuf.c [new file with mode: 0644]
src/client/ringbuf.h [new file with mode: 0644]
src/client/secure.c [new file with mode: 0644]
src/client/secure.h [new file with mode: 0644]
src/client/servcmd.c
src/client/serverio.c [deleted file]
src/client/tags.c [deleted file]
src/client/tags.h [deleted file]
src/client/termio.c [deleted file]