Elliott Hughes | 4708626 | 2019-03-26 12:34:31 -0700 | [diff] [blame] | 1 | diff -ru mksh-R57/funcs.c src/funcs.c |
| 2 | --- mksh-R57/funcs.c 2018-10-20 14:04:55.000000000 -0700 |
| 3 | +++ src/funcs.c 2019-03-26 12:05:23.976821773 -0700 |
Elliott Hughes | 23925bb | 2017-09-22 16:04:20 -0700 | [diff] [blame] | 4 | @@ -103,7 +103,9 @@ |
| 5 | {Tsgbreak, c_brkcont}, |
| 6 | {T__builtin, c_builtin}, |
| 7 | {Tbuiltin, c_builtin}, |
| 8 | +#if !defined(__ANDROID__) |
| 9 | {Tbcat, c_cat}, |
| 10 | +#endif |
| 11 | {Tcd, c_cd}, |
| 12 | /* dash compatibility hack */ |
| 13 | {"chdir", c_cd}, |
| 14 | @@ -126,7 +128,9 @@ |
| 15 | {"pwd", c_pwd}, |
| 16 | {Tread, c_read}, |
| 17 | {Tdsgreadonly, c_typeset}, |
| 18 | +#if !defined(__ANDROID__) |
| 19 | {"!realpath", c_realpath}, |
| 20 | +#endif |
| 21 | {"~rename", c_rename}, |
| 22 | {"*=return", c_exitreturn}, |
| 23 | {Tsgset, c_set}, |
| 24 | @@ -160,8 +164,10 @@ |
| 25 | {"~printf", c_printf}, |
| 26 | #endif |
| 27 | #if HAVE_SELECT |
| 28 | +#if !defined(__ANDROID__) |
| 29 | {"sleep", c_sleep}, |
| 30 | #endif |
| 31 | +#endif |
| 32 | #ifdef __MirBSD__ |
| 33 | /* alias to "true" for historical reasons */ |
| 34 | {"domainname", c_true}, |
Elliott Hughes | 4708626 | 2019-03-26 12:34:31 -0700 | [diff] [blame] | 35 | diff -ru mksh-R57/main.c src/main.c |
| 36 | --- mksh-R57/main.c 2019-01-05 05:24:45.000000000 -0800 |
| 37 | +++ src/main.c 2019-03-26 12:05:23.980821764 -0700 |
| 38 | @@ -399,6 +399,12 @@ |
| 39 | /* import environment */ |
| 40 | init_environ(); |
Elliott Hughes | 23925bb | 2017-09-22 16:04:20 -0700 | [diff] [blame] | 41 | |
| 42 | + /* override default PATH regardless of environment */ |
| 43 | +#ifdef MKSH_DEFPATH_OVERRIDE |
| 44 | + vp = global(TPATH); |
| 45 | + setstr(vp, MKSH_DEFPATH_OVERRIDE, KSH_RETURN_ERROR); |
| 46 | +#endif |
| 47 | + |
| 48 | /* for security */ |
| 49 | typeset(TinitIFS, 0, 0, 0, 0); |
| 50 | |