notepad: Only skip valid command options.

Signed-off-by: Bruno Jesus <00cpxxx@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

notepad: Only skip valid command options.
bd19402b · Bruno Jesus · Alexandre Julliard · 57b83e14 · bd19402b
Commit bd19402b authored Jan 31, 2017 by Bruno Jesus Committed by Alexandre Julliard Jan 31, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 7 deletions

main.c programs/notepad/main.c +14 -7

No files found.
--- a/programs/notepad/main.c
+++ b/programs/notepad/main.c
@@ -615,7 +615,7 @@ static int AlertFileDoesNotExist(LPCWSTR szFileName)

 static void HandleCommandLine(LPWSTR cmdline)
 {
-    WCHAR delimiter;
+    WCHAR delimiter, *ptr;
    BOOL opt_print = FALSE;

    /* skip white space */
@@ -630,22 +630,29 @@ static void HandleCommandLine(LPWSTR cmdline)

    if (*cmdline == delimiter) cmdline++;

-    while (*cmdline == ' ' || *cmdline == '-' || *cmdline == '/')
+    ptr = cmdline;
+    while (*ptr == ' ' || *ptr == '-' || *ptr == '/')
    {
        WCHAR option;

-        if (*cmdline++ == ' ') continue;
+        if (*ptr++ == ' ') continue;

-        option = *cmdline;
-        if (option) cmdline++;
-        while (*cmdline == ' ') cmdline++;
+        option = *ptr;
+        if (option) ptr++;
+        while (*ptr == ' ') ptr++;

        switch(option)
        {
            case 'p':
            case 'P':
-                opt_print = TRUE;
+            {
+                if (!opt_print)
+                {
+                    opt_print = TRUE;
+                    cmdline = ptr;
+                }
                break;
+            }
        }
    }