[4/6] start: Make it more obvious that progid_open implies unix_mode
Per Johansson
per at morth.org
Wed Oct 24 15:55:37 CDT 2012
---
programs/start/start.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/programs/start/start.c b/programs/start/start.c
index f3d934e..7019abc 100644
--- a/programs/start/start.c
+++ b/programs/start/start.c
@@ -233,7 +233,7 @@ int wmain (int argc, WCHAR *argv[])
break;
/* Unix paths can start with / so we have to assume anything following /unix is not a flag */
- if (unix_mode || progid_open)
+ if (unix_mode)
break;
if (argv[i][0] == '/' && (argv[i][1] == 'd' || argv[i][1] == 'D')) {
@@ -317,6 +317,7 @@ int wmain (int argc, WCHAR *argv[])
}
else if (is_option(argv[i], progIDOpenW)) {
progid_open = 1;
+ unix_mode = 1;
} else
{
@@ -333,7 +334,7 @@ int wmain (int argc, WCHAR *argv[])
}
if (i == argc) {
- if (progid_open || unix_mode)
+ if (unix_mode)
usage();
sei.lpFile = cmdW;
}
@@ -343,7 +344,7 @@ int wmain (int argc, WCHAR *argv[])
args = build_args( argc - i, &argv[i] );
sei.lpParameters = args;
- if (unix_mode || progid_open) {
+ if (unix_mode) {
LPWSTR (*CDECL wine_get_dos_file_name_ptr)(LPCSTR);
char* multibyte_unixpath;
int multibyte_unixpath_len;
--
1.8.0
More information about the wine-patches
mailing list