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

(prmptrd, uprmptrd): Should not be called while player->aborted. Check.

Browse source
This commit is contained in:
Markus Armbruster 2005-09-23 17:35:14 +00:00
parent 5100e522fe
commit fee8ac9d8f
1 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/lib/subs/pr.c
View file

@ -358,6 +358,12 @@ prmptrd(char *prompt, char *buf, int size)
{ {
int r; int r;
/*
* Each prompt must consume one line of input. recvclient()
* doesn't do that while player->aborted.
*/
CANT_HAPPEN(player->aborted);
pr_id(player, C_FLUSH, "%s\n", prompt); pr_id(player, C_FLUSH, "%s\n", prompt);
if ((r = recvclient(buf, size)) < 0) if ((r = recvclient(buf, size)) < 0)
return r; return r;
@ -384,6 +390,9 @@ uprmptrd(char *prompt, char *buf, int size)
{ {
int r; int r;
/* See prmptrd() */
CANT_HAPPEN(player->aborted);
pr_id(player, C_FLUSH, "%s\n", prompt); pr_id(player, C_FLUSH, "%s\n", prompt);
if ((r = recvclient(buf, size)) < 0) if ((r = recvclient(buf, size)) < 0)
return r; return r;