Andreas/tbamud
1
0
Fork 0
mirror of https://github.com/tbamud/tbamud.git synced 2026-01-21 00:16:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make some string ops bounded and fix bug in editor toggle command (#54)

Browse source 
* Replace a few strcat/sprintf instances with bounded variants

Also cleaned up the whitespace in the parse_edit_action function as it was
not consistent.

Fix bug in editor format command introduced in earlier commit

* Fix bug in editor toggle command when an escaped @ is in the buffer

Previously, toggling between @ and \t would always try to convert
@ to \t, even if already toggled, iff an escaped @ was present in the
buffer (i.e. '@@').
This commit is contained in:
Kevin Fischer 2018-07-16 04:17:45 -05:00 • committed by wyld-sw
parent 14855c273a
commit b27003e881
3 changed files with 151 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/act.informative.c
View file

@ -2554,7 +2554,7 @@ ACMD(do_areas)
static void list_scanned_chars(struct char_data * list, struct char_data * ch, int
distance, int door)
{
char buf[MAX_STRING_LENGTH], buf2[MAX_STRING_LENGTH];
char buf[MAX_STRING_LENGTH], buf2[MAX_STRING_LENGTH - 1];
const char *how_far[] = {
"close by",
@ -2589,16 +2589,16 @@ distance, int door)
if (!CAN_SEE(ch, i))
continue;
if (!*buf)
sprintf(buf, "You see %s", GET_NAME(i));
snprintf(buf, sizeof(buf), "You see %s", GET_NAME(i));
else
strcat(buf, GET_NAME(i));
strncat(buf, GET_NAME(i), sizeof(buf) - strlen(buf) - 1);
if (--count > 1)
strcat(buf, ", ");
strncat(buf, ", ", sizeof(buf) - strlen(buf) - 1);
else if (count == 1)
strcat(buf, " and ");
strncat(buf, " and ", sizeof(buf) - strlen(buf) - 1);
else {
sprintf(buf2, " %s %s.\r\n", how_far[distance], dirs[door]);
strcat(buf, buf2);
snprintf(buf2, sizeof(buf2), " %s %s.\r\n", how_far[distance], dirs[door]);
strncat(buf, buf2, sizeof(buf) - strlen(buf) - 1);
}
}