Merge "Restore some of the mksh builtins."

am: cd79a34d28

Change-Id: I4916f190dc300a629f7266d0409d34a8bbfd3bf4
This commit is contained in:
Elliott Hughes 2016-08-27 02:44:16 +00:00 committed by android-build-merger
commit b48d5773d8

View file

@ -109,9 +109,7 @@ const struct builtin mkshbuiltins[] = {
{"chdir", c_cd}, {"chdir", c_cd},
{Tcommand, c_command}, {Tcommand, c_command},
{"*=continue", c_brkcont}, {"*=continue", c_brkcont},
#if !defined(__ANDROID__)
{"echo", c_print}, {"echo", c_print},
#endif
{"*=eval", c_eval}, {"*=eval", c_eval},
{"*=exec", c_exec}, {"*=exec", c_exec},
{"*=exit", c_exitreturn}, {"*=exit", c_exitreturn},
@ -121,15 +119,11 @@ const struct builtin mkshbuiltins[] = {
{Tgetopts, c_getopts}, {Tgetopts, c_getopts},
{"=global", c_typeset}, {"=global", c_typeset},
{Tjobs, c_jobs}, {Tjobs, c_jobs},
#if !defined(__ANDROID__)
{"kill", c_kill}, {"kill", c_kill},
#endif
{"let", c_let}, {"let", c_let},
{"let]", c_let}, {"let]", c_let},
{"print", c_print}, {"print", c_print},
#if !defined(__ANDROID__)
{"pwd", c_pwd}, {"pwd", c_pwd},
#endif
{Tread, c_read}, {Tread, c_read},
{Tsgreadonly, c_typeset}, {Tsgreadonly, c_typeset},
#if !defined(__ANDROID__) #if !defined(__ANDROID__)
@ -148,9 +142,7 @@ const struct builtin mkshbuiltins[] = {
{"*=trap", c_trap}, {"*=trap", c_trap},
{Ttrue, c_true}, {Ttrue, c_true},
{Tgtypeset, c_typeset}, {Tgtypeset, c_typeset},
#if !defined(__ANDROID__)
{"ulimit", c_ulimit}, {"ulimit", c_ulimit},
#endif
{"umask", c_umask}, {"umask", c_umask},
{Tunalias, c_unalias}, {Tunalias, c_unalias},
{"*=unset", c_unset}, {"*=unset", c_unset},