]> git.pond.sub.org Git - empserver/commitdiff
(prmptrd, uprmptrd): Should not be called while player->aborted. Check.
authorMarkus Armbruster <armbru@pond.sub.org>
Fri, 23 Sep 2005 17:35:14 +0000 (17:35 +0000)
committerMarkus Armbruster <armbru@pond.sub.org>
Fri, 23 Sep 2005 17:35:14 +0000 (17:35 +0000)
src/lib/subs/pr.c

index 1412e434c8fbdd3a83613d31b93b90582876eda2..6976944f76c941d079daa7f66f06ef7e5b5f4ba7 100644 (file)
@@ -358,6 +358,12 @@ prmptrd(char *prompt, char *buf, int size)
 {
     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);
     if ((r = recvclient(buf, size)) < 0)
        return r;
@@ -384,6 +390,9 @@ uprmptrd(char *prompt, char *buf, int size)
 {
     int r;
 
+    /* See prmptrd() */
+    CANT_HAPPEN(player->aborted);
+
     pr_id(player, C_FLUSH, "%s\n", prompt);
     if ((r = recvclient(buf, size)) < 0)
        return r;