Commit | Line | Data |
---|---|---|
59f0d218 FF |
1 | diff -u -r ../ruby-2.1.2/process.c ./process.c |
2 | --- ../ruby-2.1.2/process.c 2014-02-20 05:44:35.000000000 +0100 | |
3 | +++ ./process.c 2014-06-27 09:37:35.479988774 +0200 | |
4 | @@ -1148,9 +1148,9 @@ | |
5 | *argv = (char *)prog; | |
6 | *--argv = (char *)"sh"; | |
7 | if (envp) | |
8 | - execve("/bin/sh", argv, envp); /* async-signal-safe */ | |
9 | + execve("/system/bin/sh", argv, envp); /* async-signal-safe */ | |
10 | else | |
11 | - execv("/bin/sh", argv); /* async-signal-safe */ | |
12 | + execv("/system/bin/sh", argv); /* async-signal-safe */ | |
13 | } | |
14 | ||
15 | #else | |
16 | @@ -1307,9 +1307,9 @@ | |
17 | } | |
18 | #else | |
19 | if (envp_str) | |
20 | - execle("/bin/sh", "sh", "-c", str, (char *)NULL, (char **)RSTRING_PTR(envp_str)); /* async-signal-safe */ | |
21 | + execle("/system/bin/sh", "sh", "-c", str, (char *)NULL, (char **)RSTRING_PTR(envp_str)); /* async-signal-safe */ | |
22 | else | |
23 | - execl("/bin/sh", "sh", "-c", str, (char *)NULL); /* async-signal-safe */ | |
24 | + execl("/system/bin/sh", "sh", "-c", str, (char *)NULL); /* async-signal-safe */ | |
25 | #endif | |
26 | return -1; | |
27 | #endif /* _WIN32 */ | |
28 | @@ -1418,7 +1418,7 @@ | |
29 | if (status == -1 && errno == ENOEXEC) { | |
30 | *argv = (char *)prog; | |
31 | *--argv = (char *)"sh"; | |
32 | - status = spawnv(P_NOWAIT, "/bin/sh", (const char **)argv); | |
33 | + status = spawnv(P_NOWAIT, "/system/bin/sh", (const char **)argv); | |
34 | after_exec(); | |
35 | if (status == -1) errno = ENOEXEC; | |
36 | } | |
37 | @@ -1456,7 +1456,7 @@ | |
38 | ||
39 | char *shell = dln_find_exe_r("sh", 0, fbuf, sizeof(fbuf)); | |
40 | before_exec(); | |
41 | - status = spawnl(P_NOWAIT, (shell ? shell : "/bin/sh"), "sh", "-c", str, (char*)NULL); | |
42 | + status = spawnl(P_NOWAIT, (shell ? shell : "/system/bin/sh"), "sh", "-c", str, (char*)NULL); | |
43 | after_exec(); | |
44 | return status; | |
45 | } |