diff options
| author | Ron Yorston <rmy@pobox.com> | 2016-11-10 10:52:50 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2016-11-10 10:52:50 +0000 |
| commit | 550b6b0421d3f74c2c6ff3f8d9dfbc9e7ac22c3a (patch) | |
| tree | 9c48aa74b3a7ca2d58a740af4eca3bbf7d8e7096 /libbb/executable.c | |
| parent | 87ff6cda847a11db5994205cb068d8deb8c4fdd1 (diff) | |
| parent | 87e039d0160be16a9a242f74af2e90cdb9f97e12 (diff) | |
| download | busybox-w32-550b6b0421d3f74c2c6ff3f8d9dfbc9e7ac22c3a.tar.gz busybox-w32-550b6b0421d3f74c2c6ff3f8d9dfbc9e7ac22c3a.tar.bz2 busybox-w32-550b6b0421d3f74c2c6ff3f8d9dfbc9e7ac22c3a.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'libbb/executable.c')
| -rw-r--r-- | libbb/executable.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libbb/executable.c b/libbb/executable.c index 308c525a3..5f0ff8c6e 100644 --- a/libbb/executable.c +++ b/libbb/executable.c | |||
| @@ -111,5 +111,5 @@ void FAST_FUNC exec_prog_or_SHELL(char **argv) | |||
| 111 | if (argv[0]) { | 111 | if (argv[0]) { |
| 112 | BB_EXECVP_or_die(argv); | 112 | BB_EXECVP_or_die(argv); |
| 113 | } | 113 | } |
| 114 | run_shell(getenv("SHELL"), /*login:*/ 1, NULL, NULL); | 114 | run_shell(getenv("SHELL"), /*login:*/ 1, NULL); |
| 115 | } | 115 | } |