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

13
sys/amiga/winami.c
View File

@@ -1094,7 +1094,7 @@ char def;
register char q;
char rtmp[40];
boolean digit_ok, allow_num;
char prompt[QBUFSZ];
char prompt[BUFSZ];
register struct amii_WinDesc *cw;
if( cw = amii_wins[ WIN_MESSAGE ] )
@@ -1102,13 +1102,16 @@ char def;
if (resp) {
char *rb, respbuf[QBUFSZ];
allow_num = (index(resp, '#') != 0);
allow_num = (index(resp, '#') != 0);
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);
pline("%s", prompt);
(void)strncpy(prompt, query, QBUFSZ-1);
prompt[QBUFSZ-1] = '\0';
Sprintf(eos(prompt), " [%s]", respbuf);
if (def) Sprintf(eos(prompt), " (%c)", def);
Strcat(prompt, " ");
pline("%s", prompt);
} else {
amii_putstr(WIN_MESSAGE, 0, query);
cursor_on(WIN_MESSAGE);

7
sys/wince/mswproc.c
View File

@@ -1392,8 +1392,11 @@ char mswin_yn_function(const char *question, const char *choices,
/* anything beyond <esc> is hidden */
*cb = '\0';
}
sprintf(message, "%s [%s] ", question, choicebuf);
if (def) sprintf(eos(message), "(%c) ", def);
(void)strncpy(message, question, QBUFSZ-1);
message[QBUFSZ-1] = '\0';
sprintf(eos(message), " [%s]", choicebuf);
if (def) sprintf(eos(message), " (%c)", def);
Strcat(message, " ");
/* escape maps to 'q' or 'n' or default, in that order */
yn_esc_map = (index(choices, 'q') ? 'q' :
(index(choices, 'n') ? 'n' : def));