--- common/init.c~ 2008-02-01 06:56:26.000000000 +0100
+++ common/init.c 2009-01-21 17:48:17.000000000 +0100
@@ -323,7 +323,7 @@
}
if (EXIT_PATH (&at->clone)) {
mapstruct* first;
- snprintf(first_map_path, sizeof(first_map_path), EXIT_PATH (&at->clone));
+ snprintf(first_map_path, sizeof(first_map_path), "%s", EXIT_PATH (&at->clone));
first = ready_map_name(first_map_path, 0);
if (!first) {
LOG(llevError, "Initial map %s can't be found! Please ensure maps are correctly installed.\n", first_map_path);
--- common/map.c~ 2008-02-01 06:56:27.000000000 +0100
+++ common/map.c 2009-01-21 17:51:04.000000000 +0100
@@ -1283,10 +1283,10 @@
if (m->compressed && (m->unique || m->template || flag != SAVE_MODE_NORMAL)) {
char buf[MAX_BUF];
snprintf(buf, sizeof(buf), "%s > %s%s", uncomp[m->compressed][2], filename, TEMP_EXT);
- snprintf(final, sizeof(final), filename);
+ snprintf(final, sizeof(final), "%s", filename);
fp = popen(buf, "w");
} else {
- snprintf(final, sizeof(final), filename);
+ snprintf(final, sizeof(final), "%s", filename);
snprintf(filename, sizeof(filename), "%s%s", final, TEMP_EXT);
fp = fopen(filename, "w");
}
--- socket/lowlevel.c~ 2008-02-01 06:56:29.000000000 +0100
+++ socket/lowlevel.c 2009-01-21 17:52:20.000000000 +0100
@@ -90,7 +90,7 @@
void SockList_AddString(SockList *sl, const char *data)
{
- sprintf(&sl->buf[sl->len], data);
+ sprintf(&sl->buf[sl->len], "%s", data);
sl->len += strlen(data);
}
--- server/c_chat.c~ 2008-02-01 06:56:00.000000000 +0100
+++ server/c_chat.c 2009-01-21 17:53:20.000000000 +0100
@@ -179,7 +179,7 @@
pl->listening = original_listen;
/* Update last_tell value [mids 01/14/2002] */
- snprintf(pl->last_tell, sizeof(pl->last_tell), op->name);
+ snprintf(pl->last_tell, sizeof(pl->last_tell), "%s", op->name);
/* Hidden DMs get the message, but player should think DM isn't online. */
if (!pl->hidden || QUERY_FLAG(op, FLAG_WIZ)) {
--- server/login.c~ 2008-02-01 06:56:01.000000000 +0100
+++ server/login.c 2009-01-21 17:55:32.000000000 +0100
@@ -662,7 +662,7 @@
party_name[strlen(party_name) - 1] = '\0';
}
else if (!strcmp(buf, "party_rejoin_password")) {
- snprintf(party_password, sizeof(party_password), bufall + strlen("party_rejoin_password") + 1);
+ snprintf(party_password, sizeof(party_password), "%s", bufall + strlen("party_rejoin_password") + 1);
if (strlen(party_password) > 0)
party_password[strlen(party_password) - 1] = '\0';
}
@@ -796,7 +796,7 @@
}
if (!party && pl->rejoin_party == party_rejoin_always) {
party = form_party(op, party_name);
- snprintf(party->passwd, sizeof(party->passwd), party_password);
+ snprintf(party->passwd, sizeof(party->passwd), "%s", party_password);
}
if (party && strcmp(party->passwd, party_password) == 0) {
pl->party = party;
--- server/plugins.c~ 2008-02-01 06:56:01.000000000 +0100
+++ server/plugins.c 2009-01-21 17:58:49.000000000 +0100
@@ -1160,11 +1160,11 @@
switch (ctype)
{
case 0:
- snprintf(name, size, create_pathname(str));
+ snprintf(name, size, "%s", create_pathname(str));
break;
case 1:
- snprintf(name, size, create_overlay_pathname(str));
+ snprintf(name, size, "%s", create_overlay_pathname(str));
break;
/*case 2:
@@ -1379,7 +1379,7 @@
{
case CFAPI_MAP_PROP_PATH:
buf = va_arg(args, const char*);
- snprintf(map->path, sizeof(map->path), buf);
+ snprintf(map->path, sizeof(map->path), "%s", buf);
*type = CFAPI_STRING;
break;
@@ -1762,7 +1762,7 @@
case CFAPI_OBJECT_PROP_NAME:
rbuffer = va_arg(args, char*);
rbufsize = va_arg(args, int);
- snprintf(rbuffer, rbufsize, query_name(op));
+ snprintf(rbuffer, rbufsize, "%s", query_name(op));
*type = CFAPI_STRING;
break;
@@ -2104,7 +2104,7 @@
case CFAPI_OBJECT_PROP_SHORT_NAME:
rbuffer = va_arg(args, char*);
rbufsize = va_arg(args, int);
- snprintf(rbuffer, rbufsize, query_short_name(op));
+ snprintf(rbuffer, rbufsize, "%s", query_short_name(op));
*type = CFAPI_STRING;
break;
@@ -2114,7 +2114,7 @@
i = va_arg(args, int);
rbuffer = va_arg(args, char*);
rbufsize = va_arg(args, int);
- snprintf(rbuffer, rbufsize, query_base_name(op, i));
+ snprintf(rbuffer, rbufsize, "%s", query_base_name(op, i));
*type = CFAPI_STRING;
}
break;
@@ -2413,7 +2413,7 @@
case CFAPI_PLAYER_PROP_BED_MAP:
rbuffer = va_arg(args, char*);
rbufsize = va_arg(args, int);
- snprintf(rbuffer, rbufsize, op->contr->savebed_map);
+ snprintf(rbuffer, rbufsize, "%s", op->contr->savebed_map);
*type = CFAPI_STRING;
break;
case CFAPI_PLAYER_PROP_BED_X:
@@ -3126,7 +3126,7 @@
va_end(args);
*type = CFAPI_STRING;
- snprintf(desc, size, describe_item(op, owner));
+ snprintf(desc, size, "%s", describe_item(op, owner));
return NULL;
}
void* cfapi_object_drain(int* type, ...)
@@ -3835,7 +3835,7 @@
op = va_arg(args, object*);
sp = va_arg(args, object*);
va_end(args);
- snprintf(name, sizeof(name), query_name(sp));
+ snprintf(name, sizeof(name), "%s", query_name(sp));
do_forget_spell(op, name);
*type = CFAPI_NONE;
return NULL;
@@ -4001,7 +4001,7 @@
char name[MAX_BUF];
/* Search by query_name instead */
for (tmp = op->inv; tmp; tmp = tmp->below) {
- snprintf(name, sizeof(name), query_name(tmp));
+ snprintf(name, sizeof(name), "%s", query_name(tmp));
if (!strncmp(name, str, strlen(str)))
*robj = tmp;
if (!strncmp(tmp->name, str, strlen(str)))
--- server/shop.c~ 2008-02-01 06:56:00.000000000 +0100
+++ server/shop.c 2009-01-21 17:59:49.000000000 +0100
@@ -833,7 +833,7 @@
denominations++;
snprintf(coinbuf, sizeof(coinbuf), " %d %s,", coincount[i],
find_archetype(coins[i])->clone.name_pl);
- snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), coinbuf);
+ snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf), "%s", coinbuf);
}
}
if (denominations == 0)
