*
* Known contributors to this file:
* Dave Pare, 1986
- * Markus Armbruster, 2006-2009
+ * Markus Armbruster, 2006-2012
* Ron Koenderink, 2009
*/
#include "empio.h"
#include "journal.h"
+#include "optlist.h"
#include "player.h"
#include "prototypes.h"
/*
* Receive a line of input from the current player.
- * If the player's eof flag is set, return -1 without receiving input.
- * If the player's aborted flag is set, return -2 without receiving
+ * If the player's aborted flag is set, return -1 without receiving
* input.
* Else receive one line and store it in CMD[SIZE].
* This may block for input, yielding the processor. Flush buffered
* output when blocking, to make sure player sees the prompt.
* If the player's connection has the I/O error or EOF indicator set,
- * or the line is "ctld", set the player's eof and aborted flag and
+ * or the line is "aborted", set the player's aborted flag and return
+ * -1.
+ * If we block and time out, set the EOF indicator on the player's
+ * connection, set the player's aborted flag, and return -1.
+ * If the line is "ctld", set the player's eof and aborted flag and
* return -1.
- * If the line is "aborted", set the player's aborted flag and return
- * -2.
* Else return the length of the line.
* Design bug: there is no way to indicate truncation of a long line.
*/
recvclient(char *cmd, int size)
{
int count, res;
+ time_t deadline;
count = -1;
while (!player->aborted) {
if (count >= 0) {
/* got it */
if (strcmp(cmd, "ctld") == 0)
- player->aborted = player->eof = 1;
+ player->aborted = player->got_ctld = 1;
if (strcmp(cmd, "aborted") == 0)
player->aborted = 1;
journal_input(cmd);
* Flush all queued output before potentially sleeping in
* io_input(), to make sure player sees the prompt.
*/
- while (io_output(player->iop,
- player->may_sleep >= PLAYER_SLEEP_ON_INPUT) > 0)
+ deadline = (time_t)(player->may_sleep >= PLAYER_SLEEP_ON_INPUT
+ ? -1 : 0);
+ while (io_output(player->iop, deadline) > 0)
;
/*
- * If io_output_all() blocked and got unblocked by command
+ * If io_output() blocked and got unblocked by command
* abortion, we must return without blocking in io_input().
*/
if (player->aborted)
break;
- res = io_input(player->iop, 1);
+ res = io_input(player->iop, player->curup + minutes(max_idle));
if (res > 0)
;
else if (res < 0)
- player->aborted = player->eof = 1;
+ player->aborted = 1;
else if (io_eof(player->iop))
- player->aborted = player->eof = 1;
+ player->aborted = 1;
else if (!player->aborted) {
pr_flash(player, "idle connection terminated\n");
- player->aborted = player->eof = 1;
+ io_set_eof(player->iop);
+ player->aborted = 1;
}
}
CANT_HAPPEN(player->recvfail == 256);
empth_sleep(time(NULL) + 60);
}
- return player->eof ? -1 : -2;
+ return -1;
}
player->recvfail = 0;