Merge branch 'NetHack-3.6'

This commit is contained in:
nhmall
2019-10-08 20:27:39 -04:00
11 changed files with 41 additions and 28 deletions

View File

@@ -377,6 +377,7 @@ curses_str_remainder(const char *str, int width, int line_num)
int strsize = strlen(str) + 1;
#if __STDC_VERSION__ >= 199901L
char substr[strsize];
char curstr[strsize];
char tmpstr[strsize];
strcpy(substr, str);
@@ -385,6 +386,7 @@ curses_str_remainder(const char *str, int width, int line_num)
#define BUFSZ 256
#endif
char substr[BUFSZ * 2];
char curstr[BUFSZ * 2];
char tmpstr[BUFSZ * 2];
if (strsize > (BUFSZ * 2) - 1) {
@@ -412,6 +414,10 @@ curses_str_remainder(const char *str, int width, int line_num)
if (last_space == 0) { /* No spaces found */
last_space = count - 1;
}
for (count = 0; count < last_space; count++) {
curstr[count] = substr[count];
}
curstr[count] = '\0';
if (substr[count] == '\0') {
break;
}