blob: eefcd5ccc6c8f4dd867b1c24cf6f4caf33c6b47c [file] [log] [blame]
Elliott Hughesa5d35a62020-05-20 17:17:13 -07001Only in src: FAQ.htm
2diff -u mksh-R59b/funcs.c src/funcs.c
3--- mksh-R59b/funcs.c 2020-05-16 15:38:48.000000000 -0700
4+++ src/funcs.c 2020-05-20 17:14:19.588510856 -0700
Elliott Hughes2e465942020-05-15 16:16:59 -07005@@ -104,7 +104,9 @@
Elliott Hughes23925bb2017-09-22 16:04:20 -07006 {Tsgbreak, c_brkcont},
7 {T__builtin, c_builtin},
8 {Tbuiltin, c_builtin},
9+#if !defined(__ANDROID__)
10 {Tbcat, c_cat},
11+#endif
12 {Tcd, c_cd},
13 /* dash compatibility hack */
14 {"chdir", c_cd},
Elliott Hughes2e465942020-05-15 16:16:59 -070015@@ -125,7 +127,9 @@
Elliott Hughes23925bb2017-09-22 16:04:20 -070016 {"pwd", c_pwd},
17 {Tread, c_read},
18 {Tdsgreadonly, c_typeset},
19+#if !defined(__ANDROID__)
20 {"!realpath", c_realpath},
21+#endif
22 {"~rename", c_rename},
23 {"*=return", c_exitreturn},
Elliott Hughes2e465942020-05-15 16:16:59 -070024 {Tsghset, c_set},
25@@ -159,8 +163,10 @@
Elliott Hughes23925bb2017-09-22 16:04:20 -070026 {"~printf", c_printf},
27 #endif
28 #if HAVE_SELECT
29+#if !defined(__ANDROID__)
30 {"sleep", c_sleep},
31 #endif
32+#endif
33 #ifdef __MirBSD__
34 /* alias to "true" for historical reasons */
35 {"domainname", c_true},
Elliott Hughesa5d35a62020-05-20 17:17:13 -070036diff -u mksh-R59b/main.c src/main.c
37--- mksh-R59b/main.c 2020-05-16 15:51:51.000000000 -0700
38+++ src/main.c 2020-05-20 17:14:19.588510856 -0700
39@@ -414,6 +414,12 @@
Elliott Hughes47086262019-03-26 12:34:31 -070040 /* import environment */
41 init_environ();
Elliott Hughes23925bb2017-09-22 16:04:20 -070042
43+ /* override default PATH regardless of environment */
44+#ifdef MKSH_DEFPATH_OVERRIDE
45+ vp = global(TPATH);
46+ setstr(vp, MKSH_DEFPATH_OVERRIDE, KSH_RETURN_ERROR);
47+#endif
48+
49 /* for security */
50 typeset(TinitIFS, 0, 0, 0, 0);
51
Elliott Hughes2e465942020-05-15 16:16:59 -070052Only in src: main.c.orig
Elliott Hughesa5d35a62020-05-20 17:17:13 -070053Only in src: Rebuild.sh
54Only in src: rlimits.gen
55Only in src: sh_flags.gen
56Only in src: signames.inc
57Only in src: test.sh