=============================================================================
*/
+ // LordHavoc: inreased this from 8192 to 32768
static sizebuf_t cmd_text;
+static qbyte cmd_text_buf[32768];
/*
============
*/
void Cbuf_Init (void)
{
- // LordHavoc: inreased this from 8192 to 32768
- SZ_Alloc (&cmd_text, 32768, "command buffer"); // space for commands and script files
+ // space for commands and script files
+ cmd_text.data = cmd_text_buf;
+ cmd_text.maxsize = sizeof(cmd_text_buf);
+ cmd_text.cursize = 0;
}
+/*
+============
+Cbuf_Shutdown
+============
+*/
+void Cbuf_Shutdown (void)
+{
+}
/*
============
char *temp;
int templen;
-// copy off any commands still remaining in the exec buffer
+ // copy off any commands still remaining in the exec buffer
templen = cmd_text.cursize;
if (templen)
{
- temp = Z_Malloc (templen);
+ temp = Mem_Alloc (tempmempool, templen);
memcpy (temp, cmd_text.data, templen);
SZ_Clear (&cmd_text);
}
else
- temp = NULL; // shut up compiler
+ temp = NULL;
-// add the entire text of the file
+ // add the entire text of the file
Cbuf_AddText (text);
-// add the copied off data
- if (templen)
+ // add the copied off data
+ if (temp != NULL)
{
SZ_Write (&cmd_text, temp, templen);
- Z_Free (temp);
+ Mem_Free (temp);
}
}
*/
void Cmd_StuffCmds_f (void)
{
- int i, j;
- int s;
- char *text, *build, c;
+ int i, j, l;
+ // this is per command, and bounds checked (no buffer overflows)
+ char build[2048];
if (Cmd_Argc () != 1)
{
return;
}
-// build the combined string to parse from
- s = 0;
- for (i=1 ; i<com_argc ; i++)
+ for (i = 0;i < com_argc;i++)
{
- if (!com_argv[i])
- continue; // NEXTSTEP nulls out -NXHost
- s += strlen (com_argv[i]) + 1;
- }
- if (!s)
- return;
-
- text = Z_Malloc (s+1);
- text[0] = 0;
- for (i=1 ; i<com_argc ; i++)
- {
- if (!com_argv[i])
- continue; // NEXTSTEP nulls out -NXHost
- strcat (text,com_argv[i]);
- if (i != com_argc-1)
- strcat (text, " ");
- }
-
-// pull out the commands
- build = Z_Malloc (s+1);
- build[0] = 0;
-
- for (i=0 ; i<s-1 ; i++)
- {
- if (text[i] == '+')
+ if (com_argv[i] && com_argv[i][0] == '+' && (com_argv[i][1] < '0' || com_argv[i][1] > '9'))
{
+ l = 0;
+ j = 1;
+ while (com_argv[i][j])
+ build[l++] = com_argv[i][j++];
i++;
-
- for (j=i ; (text[j] != '+') && (text[j] != '-') && (text[j] != 0) ; j++)
- ;
-
- c = text[j];
- text[j] = 0;
-
- strcat (build, text+i);
- strcat (build, "\n");
- text[j] = c;
- i = j-1;
+ for (;i < com_argc;i++)
+ {
+ if (!com_argv[i])
+ continue;
+ if ((com_argv[i][0] == '+' || com_argv[i][0] == '-') && (com_argv[i][1] < '0' || com_argv[i][1] > '9'))
+ break;
+ if (l + strlen(com_argv[i]) + 5 > sizeof(build))
+ break;
+ build[l++] = ' ';
+ build[l++] = '\"';
+ for (j = 0;com_argv[i][j];j++)
+ build[l++] = com_argv[i][j];
+ build[l++] = '\"';
+ }
+ build[l++] = '\n';
+ build[l++] = 0;
+ Cbuf_InsertText (build);
+ i--;
}
}
-
- if (build[0])
- Cbuf_InsertText (build);
-
- Z_Free (text);
- Z_Free (build);
}
Creates a new command that executes a command string (possibly ; seperated)
===============
*/
-static char *CopyString (char *in)
-{
- char *out;
-
- out = Z_Malloc (strlen(in)+1);
- strcpy (out, in);
- return out;
-}
-
static void Cmd_Alias_f (void)
{
cmdalias_t *a;
}
strlcat (cmd, "\n", sizeof (cmd));
- a->value = CopyString (cmd);
+ a->value = Z_Malloc (strlen (cmd) + 1);
+ strcpy (a->value, cmd);
}
/*
*/
void Cmd_Init (void)
{
- cmd_mempool = Mem_AllocPool("commands");
+ cmd_mempool = Mem_AllocPool("commands", 0, NULL);
//
// register our commands
Cmd_AddCommand ("cmdlist", Cmd_List_f); // Added/Modified by EvilTypeGuy eviltypeguy@qeradiant.com
Cmd_AddCommand ("cvarlist", Cvar_List_f); // 2000-01-09 CmdList, CvarList commands
// By Matthias "Maddes" Buecher
+ Cmd_AddCommand ("set", Cvar_Set_f);
+ Cmd_AddCommand ("seta", Cvar_SetA_f);
+}
+
+/*
+============
+Cmd_Shutdown
+============
+*/
+void Cmd_Shutdown(void)
+{
+ Mem_FreePool(&cmd_mempool);
}
/*
while (1)
{
// skip whitespace up to a /n
- while (*text && *text <= ' ' && *text != '\n')
+ while (*text && *text <= ' ' && *text != '\r' && *text != '\n')
text++;
- if (*text == '\n')
+ // line endings:
+ // UNIX: \n
+ // Mac: \r
+ // Windows: \r\n
+ if (*text == '\n' || *text == '\r')
{
// a newline seperates commands in the buffer
+ if (*text == '\r' && text[1] == '\n')
+ text++;
text++;
break;
}
}
// check functions (only after host_initialized)
- if (host_initialized || !strcasecmp(cmd_argv[0], "exec"))
+ if (host_initialized || !strcasecmp(cmd_argv[0], "exec") || !strcasecmp(cmd_argv[0], "set") || !strcasecmp(cmd_argv[0], "seta"))
{
for (cmd=cmd_functions ; cmd ; cmd=cmd->next)
{
/*
===================
-Cmd_ForwardToServer
+Cmd_ForwardStringToServer
-Sends the entire command line over to the server
+Sends an entire command string over to the server, unprocessed
===================
*/
-void Cmd_ForwardToServer (void)
+void Cmd_ForwardStringToServer (const char *s)
{
- const char *s;
if (cls.state != ca_connected)
{
- Con_Printf("Can't \"%s\", not connected\n", Cmd_Argv(0));
+ Con_Printf("Can't \"%s\", not connected\n", s);
return;
}
// LordHavoc: thanks to Fuh for bringing the pure evil of SZ_Print to my
// attention, it has been eradicated from here, its only (former) use in
// all of darkplaces.
- if (strcasecmp(Cmd_Argv(0), "cmd") != 0)
- s = va("%s %s", Cmd_Argv(0), Cmd_Argc() > 1 ? Cmd_Args() : "\n");
- else
- s = Cmd_Argc() > 1 ? Cmd_Args() : "\n";
MSG_WriteByte(&cls.message, clc_stringcmd);
SZ_Write(&cls.message, s, strlen(s) + 1);
}
+/*
+===================
+Cmd_ForwardToServer
+
+Sends the entire command line over to the server
+===================
+*/
+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
+ s = Cmd_Argc() > 1 ? Cmd_Args() : "";
+ Cmd_ForwardStringToServer(s);
+}
+
/*
================
projects / xonotic / darkplaces.git / blobdiff