Merge 'NetHack-3.6' updates into NetHack-3.7-Jan2020

This commit is contained in:
nhmall
2020-01-14 22:09:29 -05:00
32 changed files with 549 additions and 316 deletions

View File

@@ -6165,6 +6165,7 @@ const char *strval; /* up to 4*BUFSZ-1 long; only first few chars matter */
} else {
char *p;
/* +1: skip opening single quote */
(void) strncpy(tmp, strval + 1, sizeof tmp - 1);
tmp[sizeof tmp - 1] = '\0';
if ((p = rindex(tmp, '\'')) != 0) {
@@ -6173,7 +6174,7 @@ const char *strval; /* up to 4*BUFSZ-1 long; only first few chars matter */
} /* else buf[0] stays '\0' */
}
} else { /* not lone char nor single quote */
(void) strncpy(tmp, strval + 1, sizeof tmp - 1);
(void) strncpy(tmp, strval, sizeof tmp - 1);
tmp[sizeof tmp - 1] = '\0';
escapes(tmp, buf);
}

View File

@@ -1155,7 +1155,7 @@ boolean fullsubs; /* True -> full substitution for file name, False ->
else
Strcpy(tmpbuf, "{current date+time}");
break;
case 'v': /* version, eg. "3.6.4-0" */
case 'v': /* version, eg. "3.6.5-0" */
Sprintf(tmpbuf, "%s", version_string(verbuf));
break;
case 'u': /* UID */