#include "quakedef.h"
#define MAX_ALIAS_NAME 32
+// this is the largest script file that can be executed in one step
+// LordHavoc: inreased this from 8192 to 32768
+#define CMDBUFSIZE 32768
+// maximum number of parameters to a command
+#define MAX_ARGS 80
+// maximum tokenizable commandline length (counting NUL terminations)
+#define CMD_TOKENIZELENGTH (MAX_INPUTLINE + 80)
typedef struct cmdalias_s
{
static mempool_t *cmd_mempool;
-#define CMD_TOKENIZELENGTH 4096
static char cmd_tokenizebuffer[CMD_TOKENIZELENGTH];
static int cmd_tokenizebufferpos = 0;
=============================================================================
*/
- // LordHavoc: inreased this from 8192 to 32768
static sizebuf_t cmd_text;
-static unsigned char cmd_text_buf[32768];
+static unsigned char cmd_text_buf[CMDBUFSIZE];
/*
============
Cbuf_Execute
============
*/
+static void Cmd_PreprocessString( const char *intext, char *outtext, unsigned maxoutlen, cmdalias_t *alias );
void Cbuf_Execute (void)
{
int i;
char *text;
- char line[1024];
+ char line[MAX_INPUTLINE];
+ char preprocessed[MAX_INPUTLINE];
int quotes;
// LordHavoc: making sure the tokenizebuffer doesn't get filled up by repeated crashes
}
// execute the command line
- Cmd_ExecuteString (line, src_command);
+ Cmd_PreprocessString( line, preprocessed, sizeof(preprocessed), NULL );
+ Cmd_ExecuteString (preprocessed, src_command);
if (cmd_wait)
{ // skip out while text still remains in buffer, leaving it
{
int i, j, l;
// this is per command, and bounds checked (no buffer overflows)
- char build[2048];
+ char build[MAX_INPUTLINE];
if (Cmd_Argc () != 1)
{
static void Cmd_Alias_f (void)
{
cmdalias_t *a;
- char cmd[1024];
+ char cmd[MAX_INPUTLINE];
int i, c;
const char *s;
{
struct cmd_function_s *next;
const char *name;
+ const char *description;
xcommand_t function;
+ qboolean csqcfunc;
} cmd_function_t;
-
-#define MAX_ARGS 80
-
static int cmd_argc;
static const char *cmd_argv[MAX_ARGS];
static const char *cmd_null_string = "";
-static const char *cmd_args = NULL;
-
+static const char *cmd_args;
cmd_source_t cmd_source;
outtext[outlen++] = *in++;
} else if( *in == '*' && alias ) {
const char *linein = Cmd_Args();
- // include all params
+
+ // include all parameters
if (linein) {
while( *linein && outlen < maxoutlen ) {
outtext[outlen++] = *linein++;
}
in = tempin;
} else {
- Con_Printf( "Warning: could not find cvar %s when expanding alias %s\n %s\n", com_token, alias->name, alias->value );
+ if( alias ) {
+ Con_Printf( "Warning: could not find cvar %s when expanding alias %s\n %s\n", com_token, alias->name, alias->value );
+ } else {
+ Con_Printf( "Warning: could not find cvar %s\n", com_token );
+ }
outtext[outlen++] = '$';
}
}
*/
static void Cmd_ExecuteAlias (cmdalias_t *alias)
{
-#define ALIAS_BUFFER 1024
- static char buffer[ ALIAS_BUFFER + 2 ];
- Cmd_PreprocessString( alias->value, buffer, ALIAS_BUFFER, alias );
- Cbuf_AddText( buffer );
+ static char buffer[ MAX_INPUTLINE + 2 ];
+ Cmd_PreprocessString( alias->value, buffer, sizeof(buffer) - 2, alias );
+ // insert at start of command buffer, so that aliases execute in order
+ // (fixes bug introduced by Black on 20050705)
+ Cbuf_InsertText( buffer );
}
/*
{
if (partial && strncmp(partial, cmd->name, len))
continue;
- Con_Printf("%s\n", cmd->name);
+ Con_Printf("%s : %s\n", cmd->name, cmd->description);
count++;
}
- Con_Printf("%i Command%s", count, (count > 1) ? "s" : "");
if (partial)
- Con_Printf(" beginning with \"%s\"", partial);
-
- Con_Print("\n\n");
+ Con_Printf("%i Command%s beginning with \"%s\"\n\n", count, (count > 1) ? "s" : "", partial);
+ else
+ Con_Printf("%i Command%s\n\n", count, (count > 1) ? "s" : "");
}
/*
//
// register our commands
//
- Cmd_AddCommand ("stuffcmds",Cmd_StuffCmds_f);
- Cmd_AddCommand ("exec",Cmd_Exec_f);
- Cmd_AddCommand ("echo",Cmd_Echo_f);
- Cmd_AddCommand ("alias",Cmd_Alias_f);
- Cmd_AddCommand ("cmd", Cmd_ForwardToServer);
- Cmd_AddCommand ("wait", Cmd_Wait_f);
- 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_AddCommand ("stuffcmds",Cmd_StuffCmds_f, "execute commandline parameters (must be present in quake.rc script)");
+ Cmd_AddCommand ("exec",Cmd_Exec_f, "execute a script file");
+ Cmd_AddCommand ("echo",Cmd_Echo_f, "print a message to the console (useful in scripts)");
+ Cmd_AddCommand ("alias",Cmd_Alias_f, "create a script function (parameters are passed in as $1 through $9, and $* for all parameters)");
+ Cmd_AddCommand ("cmd", Cmd_ForwardToServer, "send a console commandline to the server (used by some mods)");
+ Cmd_AddCommand ("wait", Cmd_Wait_f, "make script execution wait for next rendered frame");
+ Cmd_AddCommand ("set", Cvar_Set_f, "create or change the value of a console variable");
+ Cmd_AddCommand ("seta", Cvar_SetA_f, "create or change the value of a console variable that will be saved to config.cfg");
+
+ // 2000-01-09 CmdList, CvarList commands By Matthias "Maddes" Buecher
+ // Added/Modified by EvilTypeGuy eviltypeguy@qeradiant.com
+ Cmd_AddCommand ("cmdlist", Cmd_List_f, "lists all console commands beginning with the specified prefix");
+ Cmd_AddCommand ("cvarlist", Cvar_List_f, "lists all console variables beginning with the specified prefix");
}
/*
Cmd_AddCommand
============
*/
-void Cmd_AddCommand (const char *cmd_name, xcommand_t function)
+void Cmd_AddCommand (const char *cmd_name, xcommand_t function, const char *description)
{
cmd_function_t *cmd;
cmd_function_t *prev, *current;
{
if (!strcmp (cmd_name, cmd->name))
{
- Con_Printf("Cmd_AddCommand: %s already defined\n", cmd_name);
- return;
+ if (function)
+ {
+ Con_Printf("Cmd_AddCommand: %s already defined\n", cmd_name);
+ return;
+ }
+ else //[515]: csqc
+ {
+ cmd->csqcfunc = true;
+ return;
+ }
}
}
cmd = (cmd_function_t *)Mem_Alloc(cmd_mempool, sizeof(cmd_function_t));
cmd->name = cmd_name;
cmd->function = function;
+ cmd->description = description;
+ if(!function) //[515]: csqc
+ cmd->csqcfunc = true;
cmd->next = cmd_functions;
// insert it at the right alphanumeric position
// check functions
for (cmd = cmd_functions; cmd; cmd = cmd->next)
- if (!strncmp(partial, cmd->name, len))
+ if (!strncasecmp(partial, cmd->name, len))
return cmd->name;
return NULL;
return buf;
}
+// written by LordHavoc
+void Cmd_CompleteCommandPrint (const char *partial)
+{
+ cmd_function_t *cmd;
+ size_t len = strlen(partial);
+ // Loop through the command list and print all matches
+ for (cmd = cmd_functions; cmd; cmd = cmd->next)
+ if (!strncasecmp(partial, cmd->name, len))
+ Con_Printf("%s : %s\n", cmd->name, cmd->description);
+}
+
/*
Cmd_CompleteAlias
return NULL;
}
+// written by LordHavoc
+void Cmd_CompleteAliasPrint (const char *partial)
+{
+ cmdalias_t *alias;
+ size_t len = strlen(partial);
+ // Loop through the alias list and print all matches
+ for (alias = cmd_alias; alias; alias = alias->next)
+ if (!strncasecmp(partial, alias->name, len))
+ Con_Printf("%s : %s\n", alias->name, alias->value);
+}
+
+
/*
Cmd_CompleteAliasCountPossible
return buf;
}
+void Cmd_ClearCsqcFuncs (void)
+{
+ cmd_function_t *cmd;
+ for (cmd=cmd_functions ; cmd ; cmd=cmd->next)
+ cmd->csqcfunc = false;
+}
+
+qboolean CL_VM_ConsoleCommand (const char *cmd);
/*
============
Cmd_ExecuteString
*/
void Cmd_ExecuteString (const char *text, cmd_source_t src)
{
-#define EXECUTESTRING_BUFFER 4096
- static char buffer[ EXECUTESTRING_BUFFER ];
int oldpos;
cmd_function_t *cmd;
cmdalias_t *a;
oldpos = cmd_tokenizebufferpos;
cmd_source = src;
- Cmd_PreprocessString( text, buffer, EXECUTESTRING_BUFFER, NULL );
- Cmd_TokenizeString (buffer);
+ Cmd_TokenizeString (text);
// execute the command line
if (!Cmd_Argc())
{
if (!strcasecmp (cmd_argv[0],cmd->name))
{
- cmd->function ();
+ if(cmd->function && !cmd->csqcfunc)
+ cmd->function ();
+ else
+ if(CL_VM_ConsoleCommand (text)) //[515]: csqc
+ return;
+ else
+ if(cmd->function)
+ cmd->function ();
cmd_tokenizebufferpos = oldpos;
return;
}
return;
}
- if (cls.demoplayback)
- return; // not really connected
+ if (!cls.netcon)
+ 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.
- MSG_WriteByte(&cls.message, clc_stringcmd);
- SZ_Write(&cls.message, (const unsigned char *)s, (int)strlen(s) + 1);
+ if (cls.protocol == PROTOCOL_QUAKEWORLD)
+ MSG_WriteByte(&cls.netcon->message, qw_clc_stringcmd);
+ else
+ MSG_WriteByte(&cls.netcon->message, clc_stringcmd);
+ SZ_Write(&cls.netcon->message, (const unsigned char *)s, (int)strlen(s) + 1);
}
/*
projects / xonotic / darkplaces.git / blobdiff