platform_external_mksh/Android.patch.txt
Elliott Hughes 23925bb36e Upgrade to mksh R56b.
R56b is a bugfix-only release everyone should upgrade to:

[tg] Reference the FAQ webpage
[panpo, Riviera] Fix documentation bug wrt. Esc+Ctrl-L
[tg, Larry Hynes] Fix “0” movement in vi mode
[tg] Replace broken libcs’ offsetof macro with MirBSD’s

R56 is a bugfix release with some experimental fixes:

[tg, Seb] Do not apply alias name restrictions to hash/tilde tracking
[tg] Restore ‘.’, ‘:’ and ‘[’ in alias names (“[[” is still forbidden)
[tg] Fix accidentally defanged $PATHSEP test
[tg] On ^C (INTR and QUIT edchars), shove edit line into history
[iSKUNK, tg] Begin porting to z/OS using EBCDIC encoding, incomplete
[tg] Redo fast character classes code, adding POSIX and other helpers
[tg] bind parses backslash-escaped ‘^’ (and ‘\’) as escaped
[tg] Building with -DMKSH_ASSUME_UTF8=0 no longer causes a known failure in the testsuite
[tg] New test.sh option -U to pass a UTF-8 locale to use in the tests
[tg] re_format(7) BSD: [[ $x = *[[:\<:]]foo[[:\>:]]* ]]
[tg, iSKUNK] Use Config in check.pl only if it exists
[tg] New matching code for bracket expressions, full POSIX (8bit)
[komh] Exclude FAT/HPFS/NTFS-unsafe tests on OS/2 (and Cygwin/MSYS)
[tg] Update to Unicode 10.0.0
[tg, selk] Make readonly idempotent
[tg, multiplexd] When truncating the persistent history, do not change the underlying file, do all operations on the locked one; do not stop using the history at all if it has been truncated
[tg, Jörg] Turn off UTF-8 mode upon turning on POSIX mode
[Martijn Dekker, Geoff Clare, many on the Austin list, tg] In POSIX mode, make the exec builtin force a $PATH search plus execve
[tg] Fix GCC 7, Coverity Scan warnings
[tg, Michal Hlavinka] Track background process PIDs even interactive
[tg] Always expose mksh’s hexdump shell function; speed it up by working on the input in chunks; use character classes to make it EBCDIC safe
[tg] Revamp dot.mkshrc default editor selection mechanism

Bug: N/A
Test: builds and boots
Change-Id: I35d624c4352c1b7c1ee499f9680712a30c64323b
2017-09-22 16:21:10 -07:00

48 lines
1.1 KiB
Text

--- mksh-R56b/funcs.c 2017-05-05 15:53:55.000000000 -0700
+++ src/funcs.c 2017-09-22 16:19:44.327000462 -0700
@@ -103,7 +103,9 @@
{Tsgbreak, c_brkcont},
{T__builtin, c_builtin},
{Tbuiltin, c_builtin},
+#if !defined(__ANDROID__)
{Tbcat, c_cat},
+#endif
{Tcd, c_cd},
/* dash compatibility hack */
{"chdir", c_cd},
@@ -126,7 +128,9 @@
{"pwd", c_pwd},
{Tread, c_read},
{Tdsgreadonly, c_typeset},
+#if !defined(__ANDROID__)
{"!realpath", c_realpath},
+#endif
{"~rename", c_rename},
{"*=return", c_exitreturn},
{Tsgset, c_set},
@@ -160,8 +164,10 @@
{"~printf", c_printf},
#endif
#if HAVE_SELECT
+#if !defined(__ANDROID__)
{"sleep", c_sleep},
#endif
+#endif
#ifdef __MirBSD__
/* alias to "true" for historical reasons */
{"domainname", c_true},
--- mksh-R56b/main.c 2017-04-28 04:14:14.000000000 -0700
+++ src/main.c 2017-09-22 15:58:14.134149037 -0700
@@ -410,6 +410,12 @@
}
}
+ /* override default PATH regardless of environment */
+#ifdef MKSH_DEFPATH_OVERRIDE
+ vp = global(TPATH);
+ setstr(vp, MKSH_DEFPATH_OVERRIDE, KSH_RETURN_ERROR);
+#endif
+
/* for security */
typeset(TinitIFS, 0, 0, 0, 0);