pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merged fix for bug #503 from SDL 1.2 revision 3487

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%402677
This commit is contained in:
Sam Lantinga 2007-12-29 19:29:20 +00:00
parent 42495af337
commit feb78335ca
1 changed files with 33 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/main/win32/SDL_win32_main.c
View file

@ -25,14 +25,37 @@
#define isspace(a) (((CHAR)a == ' ') || ((CHAR)a == '\t'))
#endif /* _WIN32_WCE < 300 */
static void
UnEscapeQuotes(char *arg)
{
char *last = NULL;
while (*arg) {
if (*arg == '"' && *last == '\\') {
char *c_curr = arg;
char *c_last = last;
while (*c_curr) {
*c_last = *c_curr;
c_last = c_curr;
c_curr++;
}
*c_last = '\0';
}
last = arg;
arg++;
}
}
/* Parse a command line buffer into arguments */
static int
ParseCommandLine(char *cmdline, char **argv)
{
char *bufp;
int argc;
char *lastp = NULL;
int argc, last_argc;
argc = 0;
argc = last_argc = 0;
for (bufp = cmdline; *bufp;) {
/* Skip leading whitespace */
while (isspace(*bufp)) {
@ -48,7 +71,8 @@ ParseCommandLine(char *cmdline, char **argv)
++argc;
}
/* Skip over word */
while (*bufp && (*bufp != '"')) {
while (*bufp && (*bufp != '"' || *lastp == '\\')) {
lastp = bufp;
++bufp;
}
} else {
@ -69,6 +93,12 @@ ParseCommandLine(char *cmdline, char **argv)
}
++bufp;
}
/* Strip out \ from \" sequences */
if (argv && last_argc != argc) {
UnEscapeQuotes(argv[last_argc]);
}
last_argc = argc;
}
if (argv) {
argv[argc] = NULL;