nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

yn_function() band-aid

Browse Source 
If the yn_function() delivers its impossible about returning a result
that isn't considered to be viable, put the prompt into paniclog.

The updated comment contains my guess about what it going wrong, and
I'm fairly sure it is correct.  But I don't know how to fix it unless
we change ^A to just repeat the last command without attempting to
also repeat whatever followed.

At the moment, users will occasionally get strange outcome from ^A.
This commit is contained in:
PatR
2025-04-17 13:49:45 -07:00
parent 1dfbfa12e6
commit 8b7cbbdb0f
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/cmd.c
View File

@@ -5307,15 +5307,28 @@ yn_function(
}
#endif
/* should not happen but cq.key has been observed to not obey 'resp';
do this after dumplog has recorded the potentially bad value */
it is most likely caused by saving a keystroke that was just used
to answer a context-sensitive prompt, then using the do-again
command with context that has changed */
if (resp && res && !strchr(resp, res)) {
/* this probably needs refinement since caller is expecting something
within 'resp' and ESC won't be (it could be present, but as a flag
for unshown possibilities rather than as acceptable input) */
int altres = def ? def : '\033';
impossible("yn_function() returned '%s'; using '%s' instead",
visctrl(res), visctrl(altres));
if (!gi.in_doagain || wizard) {
/*TEMP*/ xint8 fuzzing = iflags.debug_fuzzer;
char dbg_buf[BUFSZ];
Snprintf(dbg_buf, sizeof dbg_buf, "%s [%s] (%s)",
query, resp ? resp : "", def ? visctrl(def) : "");
paniclog("yn debug", dbg_buf);
/*TEMP*/ /* don't let this known problem kill the fuzzer */
/*TEMP*/ iflags.debug_fuzzer = fuzzer_impossible_continue;
impossible("yn_function() returned '%s'; using '%s' instead",
visctrl(res), visctrl(altres));
/*TEMP*/ iflags.debug_fuzzer = fuzzing;
}
res = altres;
}
/* in case we're called via getdir() which sets input_state */