diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-04-13 22:23:22 +0200 |
---|---|---|
committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-04-20 19:14:35 +0200 |
commit | cd30b61a228591076fa68b28e30f4198057cb211 (patch) | |
tree | 55cbdd56baf8969b04166e524e86ba9baa509d3a /win32 | |
parent | c77a5f56351605709ab3dc27255f6aaa4fd4a6d0 (diff) | |
download | busybox-w32-cd30b61a228591076fa68b28e30f4198057cb211.tar.gz busybox-w32-cd30b61a228591076fa68b28e30f4198057cb211.tar.bz2 busybox-w32-cd30b61a228591076fa68b28e30f4198057cb211.zip |
win32: squash mingw
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Diffstat (limited to 'win32')
-rw-r--r-- | win32/process.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/win32/process.c b/win32/process.c index b0b981feb..0936e1c42 100644 --- a/win32/process.c +++ b/win32/process.c | |||
@@ -157,8 +157,7 @@ pid_t | |||
157 | mingw_spawn_applet(int mode, | 157 | mingw_spawn_applet(int mode, |
158 | const char *applet, | 158 | const char *applet, |
159 | const char *const *argv, | 159 | const char *const *argv, |
160 | const char *const *envp, | 160 | const char *const *envp) |
161 | int transfer_fd) | ||
162 | { | 161 | { |
163 | char **env = copy_environ(envp); | 162 | char **env = copy_environ(envp); |
164 | char path[MAX_PATH+20]; | 163 | char path[MAX_PATH+20]; |
@@ -166,10 +165,6 @@ mingw_spawn_applet(int mode, | |||
166 | 165 | ||
167 | sprintf(path, "BUSYBOX_APPLET_NAME=%s", applet); | 166 | sprintf(path, "BUSYBOX_APPLET_NAME=%s", applet); |
168 | env = env_setenv(env, path); | 167 | env = env_setenv(env, path); |
169 | if (transfer_fd) { | ||
170 | sprintf(path, "BUSYBOX_ASH_TRANSFER=%x", (int)_get_osfhandle(transfer_fd)); | ||
171 | env = env_setenv(env, path); | ||
172 | } | ||
173 | ret = spawnveq(mode, get_busybox_exec_path(), argv, (const char *const *)env); | 168 | ret = spawnveq(mode, get_busybox_exec_path(), argv, (const char *const *)env); |
174 | free_environ(env); | 169 | free_environ(env); |
175 | return ret; | 170 | return ret; |
@@ -193,7 +188,7 @@ mingw_spawn_interpreter(int mode, const char *prog, const char *const *argv, con | |||
193 | new_argv = malloc(sizeof(*argv)*(argc+2)); | 188 | new_argv = malloc(sizeof(*argv)*(argc+2)); |
194 | memcpy(new_argv+1, argv, sizeof(*argv)*(argc+1)); | 189 | memcpy(new_argv+1, argv, sizeof(*argv)*(argc+1)); |
195 | new_argv[0] = prog; /* pass absolute path */ | 190 | new_argv[0] = prog; /* pass absolute path */ |
196 | ret = mingw_spawn_applet(mode, "sh", new_argv, envp, 0); | 191 | ret = mingw_spawn_applet(mode, "sh", new_argv, envp); |
197 | free(new_argv); | 192 | free(new_argv); |
198 | } | 193 | } |
199 | else { | 194 | else { |