From 9db3444e4070025162a87cce49ca7fe9ef44ce56 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Tue, 24 Nov 2015 17:36:53 +0900 Subject: [PATCH] explorer: Treat unrecognized options as a file to open. Signed-off-by: Alexandre Julliard --- programs/explorer/explorer.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/programs/explorer/explorer.c b/programs/explorer/explorer.c index 4f82dedfc47..c17801701c3 100644 --- a/programs/explorer/explorer.c +++ b/programs/explorer/explorer.c @@ -683,12 +683,11 @@ static void parse_command_line(LPWSTR commandline,parameters_struct *parameters) static const WCHAR arg_select[] = {'/','s','e','l','e','c','t',','}; static const WCHAR arg_desktop[] = {'/','d','e','s','k','t','o','p'}; - LPWSTR p, p2; + LPWSTR p = commandline; - p2 = commandline; - p = strchrW(commandline,'/'); - while(p) + while (*p) { + while (isspaceW(*p)) p++; if (strncmpW(p, arg_n, sizeof(arg_n)/sizeof(WCHAR))==0) { parameters->explorer_mode = FALSE; @@ -717,15 +716,12 @@ static void parse_command_line(LPWSTR commandline,parameters_struct *parameters) p += sizeof(arg_desktop)/sizeof(WCHAR); manage_desktop( p ); /* the rest of the command line is handled by desktop mode */ } - else p++; - - p2 = p; - p = strchrW(p,'/'); - } - if (p2 && *p2) - { - /* left over command line is generally the path to be opened */ - copy_path_string(parameters->root,p2); + else + { + /* left over command line is generally the path to be opened */ + copy_path_string(parameters->root,p); + break; + } } } -- 2.11.4.GIT