mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r1883) -Fix: [1109400] Better test if a string actually contains any console command

This commit is contained in:
tron 2005-02-17 17:38:17 +00:00
parent f7991303e8
commit 73c0f21363
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
console.c
View File

@ -1094,8 +1094,16 @@ void IConsoleCmdExec(const char* cmdstr)
uint i; uint i;
uint l; uint l;
if (strlen(cmdstr) == 0) // only execute if there is something typed obviously for (; strchr("\n\r \t", *cmdstr) != NULL; ++cmdstr) {
return; switch (*cmdstr) {
case '\0':
case '#':
return;
default:
break;
}
}
if (_stdlib_con_developer) if (_stdlib_con_developer)
IConsolePrintF(_iconsole_color_debug, "CONDEBUG: execution_cmdline: %s", cmdstr); IConsolePrintF(_iconsole_color_debug, "CONDEBUG: execution_cmdline: %s", cmdstr);

4
console_cmds.c
View File

@ -611,9 +611,7 @@ DEF_CONSOLE_CMD(ConExec)
fgets(cmd, sizeof(cmd), _script_file); fgets(cmd, sizeof(cmd), _script_file);
while (!feof(_script_file) && _script_running) { while (!feof(_script_file) && _script_running) {
strtok(cmd, "\r\n#"); IConsoleCmdExec(cmd);
if (strlen(cmd) > 0 && cmd[0] != '#')
IConsoleCmdExec(cmd);
fgets(cmd, sizeof(cmd), _script_file); fgets(cmd, sizeof(cmd), _script_file);
} }