Commit 0ac7bf6c authored by Jason Rumney's avatar Jason Rumney

(WinMain): Add quotes around executable name.

parent 513e7954
2001-06-20 Jason Rumney <jasonr@gnu.org>
* runemacs.c (WinMain): Add quotes around command in case of spaces.
2001-06-01 Andrew Innes <andrewi@gnu.org> 2001-06-01 Andrew Innes <andrewi@gnu.org>
* gmake.defs (sh_output): Don't use $(warning ...) to output * gmake.defs (sh_output): Don't use $(warning ...) to output
......
...@@ -44,8 +44,10 @@ WinMain (HINSTANCE hSelf, HINSTANCE hPrev, LPSTR cmdline, int nShow) ...@@ -44,8 +44,10 @@ WinMain (HINSTANCE hSelf, HINSTANCE hPrev, LPSTR cmdline, int nShow)
goto error; goto error;
*p = 0; *p = 0;
new_cmdline = alloca (MAX_PATH + strlen (cmdline) + 1); new_cmdline = alloca (MAX_PATH + strlen (cmdline) + 3);
strcpy (new_cmdline, modname); /* Quote executable name in case of spaces in the path. */
*new_cmdline = '"';
strcpy (new_cmdline + 1, modname);
#ifdef CHOOSE_NEWEST_EXE #ifdef CHOOSE_NEWEST_EXE
{ {
...@@ -57,7 +59,7 @@ WinMain (HINSTANCE hSelf, HINSTANCE hPrev, LPSTR cmdline, int nShow) ...@@ -57,7 +59,7 @@ WinMain (HINSTANCE hSelf, HINSTANCE hPrev, LPSTR cmdline, int nShow)
WIN32_FIND_DATA wfd; WIN32_FIND_DATA wfd;
HANDLE fh; HANDLE fh;
p = new_cmdline + strlen (new_cmdline); p = new_cmdline + strlen (new_cmdline);
strcpy (p, "\\emacs*.exe "); strcpy (p, "\\emacs*.exe\" ");
fh = FindFirstFile (new_cmdline, &wfd); fh = FindFirstFile (new_cmdline, &wfd);
if (fh == INVALID_HANDLE_VALUE) if (fh == INVALID_HANDLE_VALUE)
goto error; goto error;
...@@ -78,7 +80,7 @@ WinMain (HINSTANCE hSelf, HINSTANCE hPrev, LPSTR cmdline, int nShow) ...@@ -78,7 +80,7 @@ WinMain (HINSTANCE hSelf, HINSTANCE hPrev, LPSTR cmdline, int nShow)
strcat (p, " "); strcat (p, " ");
} }
#else #else
strcat (new_cmdline, "\\emacs.exe "); strcat (new_cmdline, "\\emacs.exe\" ");
#endif #endif
/* Append original arguments if any; first look for arguments we /* Append original arguments if any; first look for arguments we
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment