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

Some minor read_simplemail improvements

Browse Source 
Make admin message use urgent_pline so it's less likely to be skipped
and inadvertently missed, make ending punctuation conditional on message
itself not containing any (similar to what's done for T-shirt messages
in read.c), guard against printing an empty message (from a line like
"name:\n"; it does mean that subsequent messages in a single batch will
be discarded, but that's true of the existing guard against malformed
lines as well, and it should make the overwriting of characters past the
'msg' ptr safer).
This commit is contained in:
Michael Meyer
2022-08-30 17:45:44 -04:00
committed by Pasi Kallinen
parent 282cc9383f
commit b18d768b26
1 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/mail.c
View File

@@ -560,8 +560,6 @@ ckmailstatus(void)
#if defined(SIMPLE_MAIL) || defined(SERVER_ADMIN_MSG)
DISABLE_WARNING_FORMAT_NONLITERAL
void
read_simplemail(char *mbox, boolean adminmsg)
{
@@ -571,9 +569,6 @@ read_simplemail(char *mbox, boolean adminmsg)
#ifdef SIMPLE_MAIL
struct flock fl = { 0 };
#endif
const char *msgfrom = adminmsg
? "The voice of %s booms through the caverns:"
: "This message is from '%s'.";
if (!mb)
goto bail;
@@ -589,34 +584,47 @@ read_simplemail(char *mbox, boolean adminmsg)
/* Allow this call to block. */
if (!adminmsg
#ifdef SIMPLE_MAIL
&& fcntl (fileno (mb), F_SETLKW, &fl) == -1
&& fcntl(fileno(mb), F_SETLKW, &fl) == -1
#endif
)
goto bail;
while (fgets(curline, 128, mb) != NULL) {
const char *endpunct;
int msglen;
if (!adminmsg) {
#ifdef SIMPLE_MAIL
fl.l_type = F_UNLCK;
fcntl (fileno(mb), F_UNLCK, &fl);
fcntl(fileno(mb), F_UNLCK, &fl);
#endif
pline("There is a%s message on this scroll.",
seen_one_already ? "nother" : "");
}
msg = strchr(curline, ':');
if (!msg)
/* if incorrectly formatted, or message is empty (':' and '\n' take
up 2 chars, so must have at least 3 to be nonempty), give up */
if (!msg || (msglen = (int) strlen(msg)) < 3)
goto bail;
*msg = '\0';
msg++;
msg[strlen(msg) - 1] = '\0'; /* kill newline */
msg++, msglen--;
msg[msglen - 1] = '\0'; /* kill newline */
pline(msgfrom, curline);
if (adminmsg)
verbalize("%s", msg);
else
pline("It reads: \"%s\".", msg);
/* supply ending punctuation only if the message doesn't have any */
endpunct = "";
if (!index(".!?", msg[msglen - 2]))
endpunct = ".";
if (adminmsg) {
urgent_pline("The voice of %s booms through the caverns:",
curline);
} else {
pline("This message is from '%s'.", curline);
pline("It reads:");
}
pline("\"%s\"%s", msg, endpunct);
seen_one_already = TRUE;
#ifdef SIMPLE_MAIL
@@ -646,8 +654,6 @@ read_simplemail(char *mbox, boolean adminmsg)
pline("It appears to be all gibberish.");
}
RESTORE_WARNING_FORMAT_NONLITERAL
#endif /* SIMPLE_MAIL */
void