{
int l;
- l = strlen (text);
+ l = (int)strlen (text);
if (cmd_text.cursize + l >= cmd_text.maxsize)
{
return;
}
- SZ_Write (&cmd_text, text, strlen (text));
+ SZ_Write (&cmd_text, text, (int)strlen (text));
}
for (i=0 ; i< cmd_text.cursize ; i++)
{
if (text[i] == '"')
- quotes++;
- if ( !(quotes&1) && text[i] == ';')
+ quotes ^= 1;
+ if ( !quotes && text[i] == ';')
break; // don't break if inside a quoted string
if (text[i] == '\r' || text[i] == '\n')
break;
static cmd_function_t *cmd_functions; // possible commands to execute
+/*
+============
+Cmd_ExecuteAlias
+
+Called for aliases and fills in the alias into the cbuffer
+============
+*/
+static void Cmd_ExecuteAlias (cmdalias_t *alias)
+{
+#define ALIAS_BUFFER 1024
+ static char buffer[ ALIAS_BUFFER + 2 ];
+ const char *in;
+ char *out;
+ unsigned outlen;
+ int inquote;
+
+ in = alias->value;
+ out = buffer;
+ outlen = 0;
+ inquote = 0;
+
+ while( *in && outlen < ALIAS_BUFFER )
+ {
+ if( *in == '"' )
+ {
+ inquote ^= 1;
+ }
+ else if( *in == '$' && !inquote )
+ {
+ // $* is replaced with all formal parameters, $num is parsed as an argument (or as $num if there arent enough parameters), $bla becomes $bla and $$bla becomes $$bla
+ // read over the $
+ in++;
+ if( *in == '*' )
+ {
+ const char *linein = Cmd_Args();
+ // include all params
+ while( *linein && outlen < ALIAS_BUFFER ) {
+ *out++ = *linein++;
+ outlen++;
+ }
+
+ in++;
+ } else {
+ char *nexttoken;
+ int argnum;
+
+ argnum = strtol( in, &nexttoken, 10 );
+
+ if( 0 < argnum && argnum < Cmd_Argc() )
+ {
+ const char *param = Cmd_Argv( argnum );
+ while( *param && outlen < ALIAS_BUFFER ) {
+ *out++ = *param++;
+ outlen++;
+ }
+ in = nexttoken;
+ }
+ else if( argnum >= Cmd_Argc() )
+ {
+ Con_Printf( "Warning: Not enough parameters passed to alias '%s', at least %i expected:\n %s\n", alias->name, argnum, alias->value );
+ *out++ = '$';
+ outlen++;
+ }
+ // not a number
+ else if( argnum == 0 )
+ {
+ *out++ = '$';
+ outlen++;
+ }
+ }
+ } else {
+ *out++ = *in++;
+ outlen++;
+ }
+ }
+ *out++ = '\n';
+ *out++ = 0;
+ Cbuf_AddText( buffer );
+}
+
/*
========
Cmd_List
if (Cmd_Argc() > 1)
{
partial = Cmd_Argv (1);
- len = strlen(partial);
+ len = (int)strlen(partial);
}
else
{
if (!COM_ParseTokenConsole(&text))
return;
+ // check for $cvar
+ // (perhaps use another target buffer?)
+ if (com_token[0] == '$' && com_token[1])
+ {
+ cvar_t *cvar;
+
+ cvar = Cvar_FindVar(&com_token[1]);
+ if (cvar)
+ {
+ strcpy(com_token, cvar->string);
+ }
+ else if( com_token[1] == '$' )
+ {
+ // remove the first $
+ char *pos;
+
+ for( pos = com_token ; *pos ; pos++ )
+ {
+ *pos = *(pos + 1);
+ }
+ }
+ }
+
if (cmd_argc < MAX_ARGS)
{
- l = strlen(com_token) + 1;
+ l = (int)strlen(com_token) + 1;
if (cmd_tokenizebufferpos + l > CMD_TOKENIZELENGTH)
- Sys_Error("Cmd_TokenizeString: ran out of %i character buffer space for command arguements\n", CMD_TOKENIZELENGTH);
+ {
+ Con_Printf("Cmd_TokenizeString: ran out of %i character buffer space for command arguements\n", CMD_TOKENIZELENGTH);
+ break;
+ }
strcpy (cmd_tokenizebuffer + cmd_tokenizebufferpos, com_token);
cmd_argv[cmd_argc] = cmd_tokenizebuffer + cmd_tokenizebufferpos;
cmd_tokenizebufferpos += l;
cmd_argc++;
}
}
-
}
cmd_function_t *prev, *current;
// fail if the command is a variable name
- if (Cvar_VariableString(cmd_name)[0])
+ if (Cvar_FindVar( cmd_name ))
{
Con_Printf("Cmd_AddCommand: %s already defined as a var\n", cmd_name);
return;
const char *Cmd_CompleteCommand (const char *partial)
{
cmd_function_t *cmd;
- int len;
+ size_t len;
len = strlen(partial);
int Cmd_CompleteCountPossible (const char *partial)
{
cmd_function_t *cmd;
- int len, h;
+ size_t len;
+ int h;
h = 0;
len = strlen(partial);
const char **Cmd_CompleteBuildList (const char *partial)
{
cmd_function_t *cmd;
- int len = 0;
- int bpos = 0;
- int sizeofbuf = (Cmd_CompleteCountPossible (partial) + 1) * sizeof (const char *);
+ size_t len = 0;
+ size_t bpos = 0;
+ size_t sizeofbuf = (Cmd_CompleteCountPossible (partial) + 1) * sizeof (const char *);
const char **buf;
len = strlen(partial);
const char *Cmd_CompleteAlias (const char *partial)
{
cmdalias_t *alias;
- int len;
+ size_t len;
len = strlen(partial);
int Cmd_CompleteAliasCountPossible (const char *partial)
{
cmdalias_t *alias;
- int len;
+ size_t len;
int h;
h = 0;
const char **Cmd_CompleteAliasBuildList (const char *partial)
{
cmdalias_t *alias;
- int len = 0;
- int bpos = 0;
- int sizeofbuf = (Cmd_CompleteAliasCountPossible (partial) + 1) * sizeof (const char *);
+ size_t len = 0;
+ size_t bpos = 0;
+ size_t sizeofbuf = (Cmd_CompleteAliasCountPossible (partial) + 1) * sizeof (const char *);
const char **buf;
len = strlen(partial);
{
if (!strcasecmp (cmd_argv[0], a->name))
{
- Cbuf_InsertText (a->value);
+ Cmd_ExecuteAlias(a);
cmd_tokenizebufferpos = oldpos;
return;
}
}
// check cvars
- if (!Cvar_Command ())
+ if (!Cvar_Command () && host_framecount > 0)
Con_Printf("Unknown command \"%s\"\n", Cmd_Argv(0));
cmd_tokenizebufferpos = oldpos;
// attention, it has been eradicated from here, its only (former) use in
// all of darkplaces.
MSG_WriteByte(&cls.message, clc_stringcmd);
- SZ_Write(&cls.message, s, strlen(s) + 1);
+ SZ_Write(&cls.message, s, (int)strlen(s) + 1);
}
/*
void Cmd_ForwardToServer (void)
{
const char *s;
- if (strcasecmp(Cmd_Argv(0), "cmd"))
- s = va("%s %s", Cmd_Argv(0), Cmd_Argc() > 1 ? Cmd_Args() : "");
- else
+ if (!strcasecmp(Cmd_Argv(0), "cmd"))
+ {
+ // we want to strip off "cmd", so just send the args
s = Cmd_Argc() > 1 ? Cmd_Args() : "";
+ }
+ else
+ {
+ // we need to keep the command name, so send Cmd_Argv(0), a space and then Cmd_Args()
+ s = va("%s %s", Cmd_Argv(0), Cmd_Argc() > 1 ? Cmd_Args() : "");
+ }
+ // don't send an empty forward message if the user tries "cmd" by itself
+ if (!s || !*s)
+ return;
Cmd_ForwardStringToServer(s);
}
int i;
if (!parm)
- Sys_Error ("Cmd_CheckParm: NULL");
+ {
+ Con_Printf ("Cmd_CheckParm: NULL");
+ return 0;
+ }
for (i = 1; i < Cmd_Argc (); i++)
if (!strcasecmp (parm, Cmd_Argv (i)))
projects / xonotic / darkplaces.git / blobdiff