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

Added a temporary hack to make quake.rc, config.cfg, and default.cfg work

Browse source 
in some mods that would generate mismatched quotes otherwise.
This commit is contained in:
Brian Koropoff 2002-05-21 02:02:20 +00:00
parent ee5d0b7a99
commit 25969dbad7
2 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/QF/cmd.h
View file

@ -128,6 +128,8 @@ void Cbuf_AddText (const char *text);
void Cbuf_InsertText (const char *text);
// inserts text at the beginning of the active buffer, ahead of other commands
void Cbuf_InsertTextTo (cmd_buffer_t *buffer, const char *text);
// insert text at the beginning of a particular buffer
void Cbuf_Execute_Sets (void);
// executes all set and setrom commands in the console buffer. Used early in startup.

20
libs/util/cmd.c
View file

@ -822,12 +822,12 @@ Cmd_Restricted (void)
corecursively */
int
Cmd_EndDoubleQuote (const char *str)
Cmd_EndDoubleQuote (const char *str, qboolean legacy)
{
int i;
for (i = 1; i < strlen (str); i++) {
if (str[i] == '\"' && !escaped (str, i))
if (str[i] == '\"' && (!escaped (str, i) || legacy))
return i;
}
return -1; // Not found
@ -850,7 +850,7 @@ Cmd_EndBrace (const char *str)
i += n;
break;
case '\"':
n = Cmd_EndDoubleQuote (str + i);
n = Cmd_EndDoubleQuote (str + i, false);
if (n < 0)
return n;
else
@ -880,7 +880,7 @@ Cmd_EndBracket (const char *str)
i += n;
break;
case '\"':
n = Cmd_EndDoubleQuote (str + i);
n = Cmd_EndDoubleQuote (str + i, false);
if (n < 0)
return n;
else
@ -915,11 +915,11 @@ Cmd_GetToken (const char *str, qboolean legacy)
return -1;
}
if (*str == '\"')
return Cmd_EndDoubleQuote (str);
return Cmd_EndDoubleQuote (str, legacy);
for (i = 0; i < strlen (str); i++) {
if (isspace ((byte)str[i]))
break;
if (!escaped (str, i)) {
if (!escaped (str, i) || legacy) {
if (str[i] == '{' && !legacy) {
ret = Cmd_EndBrace (str+i);
if (ret < 0)
@ -927,10 +927,10 @@ Cmd_GetToken (const char *str, qboolean legacy)
i += ret;
continue;
}
else if (str[i] == '}')
else if (str[i] == '}' && !legacy)
return -1;
else if (str[i] == '\"') {
ret = Cmd_EndDoubleQuote (str+i);
ret = Cmd_EndDoubleQuote (str+i, legacy);
if (ret < 0)
return ret;
i += ret;
@ -1879,6 +1879,10 @@ Cmd_Exec_f (void)
&& (cmd_warncmd->int_val || (developer && developer->int_val)))
Sys_Printf ("execing %s\n", Cmd_Argv (1));
sub = Cmd_NewBuffer (true);
if (!strcasecmp (Cmd_Argv(1), "quake.rc")
|| !strcasecmp (Cmd_Argv(1), "default.cfg")
|| !strcasecmp (Cmd_Argv(1), "config.cfg"))
sub->legacy = true;
Cbuf_AddTextTo (sub, f);
Hunk_FreeToLowMark (mark);
Cbuf_ExecuteSubroutine (sub); // Execute file in it's own buffer