make WinMain commandline parser handle quoted strings

[xonotic/darkplaces.git] / sys_win.c

diff --git a/sys_win.c b/sys_win.c
index d9b013b0bd8471ac2c9d6e882776ae4010c48cbf..4114fdcd12743a8cfa07e0212c4c5c59fb6a0059 100644 (file)
--- a/sys_win.c
+++ b/sys_win.c
@@ -20,12 +20,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 // sys_win.c -- Win32 system interface code
 
 #include "quakedef.h"
-#include "winquake.h"
+#include <windows.h>
+#include <dsound.h>
 #include "errno.h"
 #include "resource.h"
 #include "conproc.h"
 #include "direct.h"
 
+extern void S_BlockSound (void);
+
 cvar_t sys_usetimegettime = {CVAR_SAVE, "sys_usetimegettime", "1"};
 
 // # of seconds to wait on Sys_Error running dedicated before exiting
@@ -63,7 +66,7 @@ void Sys_Error (const char *error, ...)
        static int      in_sys_error2 = 0;
 
        va_start (argptr, error);
-       vsprintf (text, error, argptr);
+       vsnprintf (text, sizeof (text), error, argptr);
        va_end (argptr);
 
        // close video so the message box is visible, unless we already tried that
@@ -106,7 +109,7 @@ void Sys_Quit (void)
        exit (0);
 }
 
-void Sys_Print(const char *text)
+void Sys_PrintToTerminal(const char *text)
 {
        DWORD dummy;
        extern HANDLE houtput;
@@ -271,9 +274,11 @@ char *Sys_ConsoleInput (void)
        return NULL;
 }
 
-void Sys_Sleep (void)
+void Sys_Sleep(int milliseconds)
 {
-       Sleep (1);
+       if (milliseconds < 1)
+               milliseconds = 1;
+       Sleep(milliseconds);
 }
 
 
@@ -316,7 +321,6 @@ WinMain
 ==================
 */
 HINSTANCE      global_hInstance;
-int                    global_nCmdShow;
 const char     *argv[MAX_NUM_ARGVS];
 char           program_name[MAX_OSPATH];
 
@@ -331,7 +335,6 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
                return 0;
 
        global_hInstance = hInstance;
-       global_nCmdShow = nCmdShow;
 
        lpBuffer.dwLength = sizeof(MEMORYSTATUS);
        GlobalMemoryStatus (&lpBuffer);
@@ -341,23 +344,46 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
        GetModuleFileNameA(NULL, program_name, sizeof(program_name) - 1);
        argv[0] = program_name;
 
+       // FIXME: this tokenizer is rather redundent, call a more general one
        while (*lpCmdLine && (com_argc < MAX_NUM_ARGVS))
        {
-               while (*lpCmdLine && ((*lpCmdLine <= 32) || (*lpCmdLine > 126)))
+               while (*lpCmdLine && *lpCmdLine <= 32)
                        lpCmdLine++;
 
                if (*lpCmdLine)
                {
-                       argv[com_argc] = lpCmdLine;
-                       com_argc++;
+                       if (*lpCmdLine == '\"')
+                       {
+                               // quoted string
+                               argv[com_argc] = lpCmdLine;
+                               com_argc++;
+
+                               while (*lpCmdLine && (*lpCmdLine != '\"'))
+                                       lpCmdLine++;
 
-                       while (*lpCmdLine && ((*lpCmdLine > 32) && (*lpCmdLine <= 126)))
-                               lpCmdLine++;
+                               if (*lpCmdLine)
+                               {
+                                       *lpCmdLine = 0;
+                                       lpCmdLine++;
+                               }
 
-                       if (*lpCmdLine)
+                               if (*lpCmdLine == '\"')
+                                       lpCmdLine++;
+                       }
+                       else
                        {
-                               *lpCmdLine = 0;
-                               lpCmdLine++;
+                               // unquoted word
+                               argv[com_argc] = lpCmdLine;
+                               com_argc++;
+
+                               while (*lpCmdLine && *lpCmdLine > 32)
+                                       lpCmdLine++;
+
+                               if (*lpCmdLine)
+                               {
+                                       *lpCmdLine = 0;
+                                       lpCmdLine++;
+                               }
                        }
                }
        }
@@ -412,7 +438,7 @@ int WINAPI WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin
        Sys_Shared_LateInit();
 
        frameoldtime = Sys_DoubleTime ();
-
+       
        /* main window message loop */
        while (1)
        {