X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=cmd.c;h=ce200ea2de3ad16414b041fe1a4b5978fcf3493b;hb=8bd9d978b4c3c249c7adf0b7f645e61b0f4ec513;hp=ec5e3cb5197a72e0d1a12fe02e22acedcab808b6;hpb=faafbec894094c27f0f50abb1c0b828180523854;p=xonotic%2Fdarkplaces.git diff --git a/cmd.c b/cmd.c index ec5e3cb5..ce200ea2 100644 --- a/cmd.c +++ b/cmd.c @@ -77,6 +77,15 @@ void Cbuf_Init (void) SZ_Alloc (&cmd_text, 32768, "command buffer"); // space for commands and script files } +/* +============ +Cbuf_Shutdown +============ +*/ +void Cbuf_Shutdown (void) +{ + SZ_Free (&cmd_text); +} /* ============ @@ -115,25 +124,25 @@ void Cbuf_InsertText (const char *text) 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); } } @@ -216,9 +225,9 @@ quake -nosound +cmd amlev1 */ 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) { @@ -226,56 +235,35 @@ void Cmd_StuffCmds_f (void) return; } -// build the combined string to parse from - s = 0; - for (i=1 ; i '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); } @@ -294,7 +282,7 @@ static void Cmd_Exec_f (void) return; } - f = (char *)FS_LoadFile (Cmd_Argv(1), false); + f = (char *)FS_LoadFile (Cmd_Argv(1), tempmempool, false); if (!f) { Con_Printf("couldn't exec %s\n",Cmd_Argv(1)); @@ -330,15 +318,6 @@ Cmd_Alias_f 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; @@ -390,7 +369,8 @@ static void Cmd_Alias_f (void) } strlcat (cmd, "\n", sizeof (cmd)); - a->value = CopyString (cmd); + a->value = Z_Malloc (strlen (cmd) + 1); + strcpy (a->value, cmd); } /* @@ -470,7 +450,7 @@ Cmd_Init */ void Cmd_Init (void) { - cmd_mempool = Mem_AllocPool("commands"); + cmd_mempool = Mem_AllocPool("commands", 0, NULL); // // register our commands @@ -484,6 +464,18 @@ void Cmd_Init (void) 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); } /* @@ -536,12 +528,18 @@ static void Cmd_TokenizeString (const char *text) 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; } @@ -810,7 +808,7 @@ void Cmd_ExecuteString (const char *text, cmd_source_t src) } // 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) { @@ -847,17 +845,16 @@ void Cmd_ExecuteString (const char *text, cmd_source_t src) /* =================== -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; } @@ -867,14 +864,27 @@ void Cmd_ForwardToServer (void) // 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); +} + /* ================