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

yn_function (trunk only)

Browse Source 
Explicitly truncate the query prompt string to QBUFSZ-1 characters.
For tty and Amiga, no longer include the choices and default within that
length limit; use a bigger buffer to hold them along with the prompt.
[See cvs log for doc/window.doc for more details.]
This commit is contained in:
nethack.rankin
2006-10-22 05:59:26 +00:00
parent 3dc9791685
commit 054a74d378
7 changed files with 48 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/tty/topl.c
+9 -4
View File
@@ -425,9 +425,9 @@ char def;
boolean digit_ok, allow_num;
struct WinDesc *cw = wins[WIN_MESSAGE];
boolean doprev = 0;
char prompt[QBUFSZ];
char prompt[BUFSZ];
#ifdef UNICODE_WIDEWINPORT
nhwchar wprompt[QBUFSZ];
nhwchar wprompt[BUFSZ];
#endif
if(ttyDisplay->toplin == 1 && !(cw->flags & WIN_STOP)) more();
@@ -441,8 +441,13 @@ char def;
Strcpy(respbuf, resp);
/* any acceptable responses that follow <esc> aren't displayed */
if ((rb = index(respbuf, '\033')) != 0) *rb = '\0';
Sprintf(prompt, "%s [%s] ", query, respbuf);
if (def) Sprintf(eos(prompt), "(%c) ", def);
(void)strncpy(prompt, query, QBUFSZ-1);
prompt[QBUFSZ-1] = '\0';
Sprintf(eos(prompt), " [%s]", respbuf);
if (def) Sprintf(eos(prompt), " (%c)", def);
/* not pline("%s ", prompt);
trailing space is wanted here in case of reprompt */
Strcat(prompt, " ");
pline("%s", prompt);
} else {
pline("%s ", query);