eukara/fteqw
1
0
Fork 0
forked from fte/fteqw
Code Pull requests Activity

Removed qstrncpyz() (why all the duplicate functions?), replaced usage of qstrncpyz() with strlcpy(), Made catbuffer() not braindead.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@2824 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Mark Olsen 2007-12-27 15:18:40 +00:00
parent 948662ecfa
commit 0ecc551f45
1 changed files with 14 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
fteqtv/rcon.c
View file

@ -20,6 +20,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "qtv.h" #include "qtv.h"
#include "bsd_string.h"
#define MAX_INFO_KEY 64 #define MAX_INFO_KEY 64
@ -222,14 +223,6 @@ void Info_SetValueForStarKey (char *s, const char *key, const char *value, int m
} }
void qstrncpyz(char *out, char *in, int length)
{
if (length < 1)
return;
strncpy(out, in, length-1);
out[length-1] = 0;
}
#define DEFAULT_PUNCTUATION "(,{})(\':;=!><&|+" #define DEFAULT_PUNCTUATION "(,{})(\':;=!><&|+"
@ -357,7 +350,7 @@ void Cmd_Hostname(cmdctxt_t *ctx)
} }
else else
{ {
qstrncpyz(ctx->cluster->hostname, Cmd_Argv(ctx, 1), sizeof(ctx->cluster->hostname)); strlcpy(ctx->cluster->hostname, Cmd_Argv(ctx, 1), sizeof(ctx->cluster->hostname));
Cmd_Printf(ctx, "hostname set to \"%s\"\n", ctx->cluster->hostname); Cmd_Printf(ctx, "hostname set to \"%s\"\n", ctx->cluster->hostname);
} }
@ -379,7 +372,7 @@ void Cmd_Master(cmdctxt_t *ctx)
if (!strcmp(newval, "-")) if (!strcmp(newval, "-"))
{ {
qstrncpyz(ctx->cluster->master, "", sizeof(ctx->cluster->master)); strlcpy(ctx->cluster->master, "", sizeof(ctx->cluster->master));
Cmd_Printf(ctx, "Master server cleared\n"); Cmd_Printf(ctx, "Master server cleared\n");
return; return;
} }
@ -390,7 +383,7 @@ void Cmd_Master(cmdctxt_t *ctx)
return; return;
} }
qstrncpyz(ctx->cluster->master, newval, sizeof(ctx->cluster->master)); strlcpy(ctx->cluster->master, newval, sizeof(ctx->cluster->master));
ctx->cluster->mastersendtime = ctx->cluster->curtime; ctx->cluster->mastersendtime = ctx->cluster->curtime;
if (ctx->cluster->qwdsocket != INVALID_SOCKET) if (ctx->cluster->qwdsocket != INVALID_SOCKET)
@ -433,7 +426,7 @@ void Cmd_AdminPassword(cmdctxt_t *ctx)
} }
else else
{ {
qstrncpyz(ctx->cluster->adminpassword, Cmd_Argv(ctx, 1), sizeof(ctx->cluster->adminpassword)); strlcpy(ctx->cluster->adminpassword, Cmd_Argv(ctx, 1), sizeof(ctx->cluster->adminpassword));
Cmd_Printf(ctx, "Password changed.\n"); Cmd_Printf(ctx, "Password changed.\n");
} }
} }
@ -451,6 +444,7 @@ void Cmd_GenericQuery(cmdctxt_t *ctx, int dataset)
address = Cmd_Argv(ctx, 1); address = Cmd_Argv(ctx, 1);
password = Cmd_Argv(ctx, 2); password = Cmd_Argv(ctx, 2);
//this is evil //this is evil
/* Holy crap, Spike... Holy crap. */
memmove(address+strlen(method), address, ARG_LEN-(1+strlen(method))); memmove(address+strlen(method), address, ARG_LEN-(1+strlen(method)));
strncpy(address, method, strlen(method)); strncpy(address, method, strlen(method));
@ -486,6 +480,7 @@ void Cmd_GenericConnect(cmdctxt_t *ctx, char *method)
address = Cmd_Argv(ctx, 1); address = Cmd_Argv(ctx, 1);
password = Cmd_Argv(ctx, 2); password = Cmd_Argv(ctx, 2);
//this is evil //this is evil
/* Holy crap, Spike... Holy crap. */
memmove(address+strlen(method), address, ARG_LEN-(1+strlen(method))); memmove(address+strlen(method), address, ARG_LEN-(1+strlen(method)));
strncpy(address, method, strlen(method)); strncpy(address, method, strlen(method));
@ -555,13 +550,13 @@ void Cmd_Exec(cmdctxt_t *ctx)
void catbuffer(char *buffer, int bufsize, char *format, ...) void catbuffer(char *buffer, int bufsize, char *format, ...)
{ {
va_list argptr; va_list argptr;
char string[1024]; unsigned int buflen;
va_start (argptr, format); buflen = strlen(buffer);
vsnprintf (string,sizeof(string)-1, format,argptr);
va_end (argptr);
Q_strncatz(buffer, string, bufsize); va_start(argptr, format);
vsnprintf(buffer + buflen, bufsize - buflen, format, argptr);
va_end(argptr);
} }
void Cmd_Say(cmdctxt_t *ctx) void Cmd_Say(cmdctxt_t *ctx)
@ -1037,7 +1032,7 @@ void Cmd_DemoDir(cmdctxt_t *ctx)
Cmd_Printf(ctx, "Rejecting path\n"); Cmd_Printf(ctx, "Rejecting path\n");
else else
{ {
qstrncpyz(ctx->cluster->demodir, val, sizeof(ctx->cluster->demodir)); strlcpy(ctx->cluster->demodir, val, sizeof(ctx->cluster->demodir));
Cmd_Printf(ctx, "Changed demo dir to \"%s\"\n", ctx->cluster->demodir); Cmd_Printf(ctx, "Changed demo dir to \"%s\"\n", ctx->cluster->demodir);
} }
} }