qf/newtree
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/newtree synced 2024-11-22 12:11:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add $-expansion code.

Browse source
This commit is contained in:
Anton E. Gavrilov 2000-06-11 02:57:08 +00:00
parent b5a2d30444
commit 092e377dc1
2 changed files with 58 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/cmd.h
View file

@ -121,7 +121,8 @@ void Cmd_StuffCmds_f (void);
void Cbuf_Execute_Sets (void);
void Cmd_Exec_File (char *path);
extern char com_token[1024];
#define MAX_COM_TOKEN 1024
extern char com_token[MAX_COM_TOKEN];
char *COM_Parse (char *data);
#endif // _CMD_H

54
source/cmd.c
View file

@ -796,7 +796,7 @@ void Cmd_Init (void)
}
char com_token[1024];
char com_token[MAX_COM_TOKEN];
/*
==============
@ -809,6 +809,9 @@ char *COM_Parse (char *data)
{
int c;
int len;
char buf[255];
int i;
cvar_t *var, *bestvar;
len = 0;
com_token[0] = 0;
@ -853,10 +856,59 @@ skipwhite:
// parse a regular word
do
{
// FIXME: only check for $'s when parsing
// command-line text (not entity data!)
if (c == '$')
{
data++;
// Copy the text after '$' to a temp buffer
i = 0;
buf[0] = 0;
bestvar = NULL;
while ((c = *data) > 32)
{
if (c == '$')
break;
data++;
buf[i++] = c;
buf[i] = 0;
if (var = Cvar_FindVar(buf))
bestvar = var;
}
if (bestvar)
{
// check buffer size
if (len + strlen(bestvar->string) >= MAX_COM_TOKEN-1)
break;
strcpy(&com_token[len], bestvar->string);
len += strlen(bestvar->string);
i = strlen(bestvar->name);
while (buf[i])
com_token[len++] = buf[i++];
}
else
{
// no matching cvar name was found
com_token[len++] = '$';
if (len + strlen(buf) >= MAX_COM_TOKEN-1)
break;
strcpy (&com_token[len], buf);
len += strlen(buf);
}
}
else
{
com_token[len] = c;
data++;
len++;
if (len >= MAX_COM_TOKEN-1)
break;
}
c = *data;
} while (c>32);