OSDN Git Service

DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-master
[android-x86/external-mksh.git] / Android.patch.txt
1 --- mksh-R56b/funcs.c   2017-05-05 15:53:55.000000000 -0700
2 +++ src/funcs.c 2017-09-22 16:19:44.327000462 -0700
3 @@ -103,7 +103,9 @@
4         {Tsgbreak, c_brkcont},
5         {T__builtin, c_builtin},
6         {Tbuiltin, c_builtin},
7 +#if !defined(__ANDROID__)
8         {Tbcat, c_cat},
9 +#endif
10         {Tcd, c_cd},
11         /* dash compatibility hack */
12         {"chdir", c_cd},
13 @@ -126,7 +128,9 @@
14         {"pwd", c_pwd},
15         {Tread, c_read},
16         {Tdsgreadonly, c_typeset},
17 +#if !defined(__ANDROID__)
18         {"!realpath", c_realpath},
19 +#endif
20         {"~rename", c_rename},
21         {"*=return", c_exitreturn},
22         {Tsgset, c_set},
23 @@ -160,8 +164,10 @@
24         {"~printf", c_printf},
25  #endif
26  #if HAVE_SELECT
27 +#if !defined(__ANDROID__)
28         {"sleep", c_sleep},
29  #endif
30 +#endif
31  #ifdef __MirBSD__
32         /* alias to "true" for historical reasons */
33         {"domainname", c_true},
34 --- mksh-R56b/main.c    2017-04-28 04:14:14.000000000 -0700
35 +++ src/main.c  2017-09-22 15:58:14.134149037 -0700
36 @@ -410,6 +410,12 @@
37                 }
38         }
39  
40 +       /* override default PATH regardless of environment */
41 +#ifdef MKSH_DEFPATH_OVERRIDE
42 +       vp = global(TPATH);
43 +       setstr(vp, MKSH_DEFPATH_OVERRIDE, KSH_RETURN_ERROR);
44 +#endif
45 +
46         /* for security */
47         typeset(TinitIFS, 0, 0, 0, 0);
48