qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-27 14:42:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixed a bug with escaped braces and quotes and added the strlen and streq

Browse source 
commands to GIB.
This commit is contained in:
Brian Koropoff 2002-04-22 04:23:36 +00:00
parent 44a905e98c
commit 349fbf7150
1 changed files with 29 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
libs/util/cmd.c
View file

@ -925,27 +925,27 @@ Cmd_GetToken (const char *str, qboolean legacy)
if (isspace ((byte)str[i])) if (isspace ((byte)str[i]))
break; break;
if (!legacy) { if (!legacy) {
if (str[i] == '\'') { if (str[i] == '\'' && !escaped (str,i)) {
ret = Cmd_EndSingleQuote (str+i); ret = Cmd_EndSingleQuote (str+i);
if (ret < 0) if (ret < 0)
return ret; return ret;
i += ret; i += ret;
continue; continue;
} }
if (str[i] == '{') { if (str[i] == '{' && !escaped (str,i)) {
ret = Cmd_EndBrace (str+i); ret = Cmd_EndBrace (str+i);
if (ret < 0) if (ret < 0)
return ret; return ret;
i += ret; i += ret;
continue; continue;
} }
if (str[i] == '}') if (str[i] == '}' && !escaped (str,i))
return -1; return -1;
} }
if (str[i] == '\"') { if (str[i] == '\"' && !escaped (str,i)) {
ret = Cmd_EndDoubleQuote (str+i); ret = Cmd_EndDoubleQuote (str+i);
if (ret < 0) if (ret < 0)
return ret; return ret;
i += ret; i += ret;
continue; continue;
} }
@ -2015,11 +2015,33 @@ Cmd_Backtrace_f (void)
void void
Cmd_Randint_f (void) { Cmd_Randint_f (void) {
int low, high; int low, high;
if (Cmd_Argc () != 3) {
Cmd_Error ("randint: invalid number of arguments.\n");
return;
}
low = atoi(Cmd_Argv(1)); low = atoi(Cmd_Argv(1));
high = atoi(Cmd_Argv(2)); high = atoi(Cmd_Argv(2));
Cmd_Return (va("%i", (int)(low+(float)rand()/(float)RAND_MAX*(float)(high-low+1)))); Cmd_Return (va("%i", (int)(low+(float)rand()/(float)RAND_MAX*(float)(high-low+1))));
} }
void
Cmd_Streq_f (void) {
if (Cmd_Argc () != 3) {
Cmd_Error ("streq: invalid number of arguments.\n");
return;
}
Cmd_Return (va("%i",!strcmp (Cmd_Argv(1), Cmd_Argv(2))));
}
void
Cmd_Strlen_f (void) {
if (Cmd_Argc () != 2) {
Cmd_Error ("strlen: invalid number of arguments.\n");
return;
}
Cmd_Return (va("%i",strlen (Cmd_Argv(1))));
}
void void
Cmd_Hash_Stats_f (void) Cmd_Hash_Stats_f (void)
{ {
@ -2100,6 +2122,8 @@ Cmd_Init (void)
Cmd_AddCommand ("backtrace", Cmd_Backtrace_f, "Show a description of the last GIB error and a backtrace."); Cmd_AddCommand ("backtrace", Cmd_Backtrace_f, "Show a description of the last GIB error and a backtrace.");
Cmd_AddCommand ("randint", Cmd_Randint_f, "Returns a random integer between $1 and $2"); Cmd_AddCommand ("randint", Cmd_Randint_f, "Returns a random integer between $1 and $2");
Cmd_AddCommand ("streq", Cmd_Streq_f, "Returns 1 if $1 and $2 are the same string, 0 otherwise");
Cmd_AddCommand ("strlen", Cmd_Strlen_f, "Returns the length of $1");
//Cmd_AddCommand ("cmd_hash_stats", Cmd_Hash_Stats_f, "Display statistics " //Cmd_AddCommand ("cmd_hash_stats", Cmd_Hash_Stats_f, "Display statistics "
// "alias and command hash tables"); // "alias and command hash tables");