From c77a5f56351605709ab3dc27255f6aaa4fd4a6d0 Mon Sep 17 00:00:00 2001 From: Nguyễn Thái Ngọc Duy Date: Tue, 13 Apr 2010 21:46:14 +0200 Subject: win32: rebase dropouts? MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nguyễn Thái Ngọc Duy --- win32/process.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'win32') diff --git a/win32/process.c b/win32/process.c index cdae13f38..b0b981feb 100644 --- a/win32/process.c +++ b/win32/process.c @@ -267,7 +267,14 @@ mingw_execve(const char *cmd, const char *const *argv, const char *const *envp) if (ENABLE_FEATURE_PREFER_APPLETS && find_applet_by_name(cmd) >= 0) - ret = mingw_spawn_applet(mode, cmd, argv++, envp); + ret = mingw_spawn_applet(mode, cmd, argv, envp); + /* + * execve(bb_busybox_exec_path, argv, envp) won't work + * because argv[0] will be replaced to bb_busybox_exec_path + * by MSVC runtime + */ + else if (argv && cmd != argv[0] && cmd == bb_busybox_exec_path) + ret = mingw_spawn_applet(mode, argv[0], argv, envp); else ret = mingw_spawn_interpreter(mode, cmd, argv, envp); if (ret != -1) -- cgit v1.2.3-55-g6feb