c76236fd7d
ash: fix a SEGV in ${#1}
...
function old new delta
varvalue 760 805 +45
evalvar 648 603 -45
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2014-12-29 00:04:18 +01:00
01dbfccea6
Reset the terminal to our pgrp after groups, functions, and builtins, not just external command invocations.
...
This addresses a problem where something invoked in a group or function (e.g. gsh) could change the terminal's pgrp, and this would result in hush getting backgrounded.
We can still get strange behavior when a backgrounded child process changes the pgrp. Trying to deal with this would be inherently racy. Gsh also has problems in this scenario.
2014-12-28 12:22:37 -06:00
9033a24562
Add support for additional startup files that will be sourced either always, for login shells, or for interactive shells.
2014-12-27 21:59:45 -06:00
6dfc5eadb3
Changes to support GNO-style PATH in type and source commands, and in tab completion.
2014-12-26 21:49:55 -06:00
79371e2122
Update test-running script to work on GNO (although it seems to hang on some tests)
2014-12-25 15:36:05 -06:00
3e96c3390f
Check for TERM changes every time we read input.
...
Also, fix possible crashes when termcap entries aren't found.
2014-12-24 14:54:06 -06:00
cdad130f39
Add a "prefix" builtin for setting GS/OS prefixes
2014-12-22 11:18:38 -06:00
dc3caf92e7
Use a ProDOS-compatible filename for saved history file on GNO.
2014-12-16 16:02:24 -06:00
0c9ebf3839
Fix problem with the read builtin where it wouldn't finish until you typed an additional character beyond the return that was supposed to terminate it.
2014-12-14 22:06:27 -06:00
aca9256f97
Address problem where commands to be run in subshells were getting mangled by command-line parsing.
...
They are now encoded to prevent this.
2014-12-09 19:52:58 -06:00
2d16296748
Work around an ORCA/C preprocessor bug that was causing shell conditionals not to work properly.
...
The bug is that an #if condition may be mis-evaluated if it immediately follows a use of a function-like macro. I also modified a couple other places that could possibly trigger the bug (including a possibly more reliable fix for the instance of this problem I worked around earlier in include/xatonum.h).
2014-12-04 11:42:48 -06:00
fb9b298ca4
Implement "close-on-exec" functionality for GNO.
...
We do this by maintaining a mask (for each pid) giving the fds to be closed on exec. We wrap functions that close fds so that their close-on-exec bits can be cleared at that point.
This implementation may close the fds even if the execve operation ultimately fails.
2014-12-03 21:04:46 -06:00
e97a83d054
Add code to check and report our stack usage if HUSH_STACKCHECK is defined.
...
This only covers exec'd instances of hush (run by the user, or by re_execute_shell), not the forked, pre-exec part.
2014-12-02 20:53:45 -06:00
52c59f6da1
Properly reset getopt in each invocation of getopt32() on BSD-type systems, including GNO and OS X.
...
Also, fix issue where callers of getopt32() weren't properly detecting errors on GNO due to a size mismatch.
This avoids strange behavior when commands using getopt32 (like export) are invoked multiple times, sometimes with invalid arguments.
2014-12-02 15:31:50 -06:00
1ac41557b2
Replace stack-allocated "struct utsname" in hush_main with dynamic allocation.
2014-12-02 13:56:38 -06:00
81652ca9c4
Always copy the variable strings from environ to our variable structures in hush_main, instead of trying to share them.
...
This avoids problems stemming from the fact that GNO's environment implementation may deallocate those strings, in some cases before we're done with them. It also allows us to uppercase the variable names, although since we made them case-insensitive this only matters for display purposes (in "set" output).
2014-12-02 13:42:18 -06:00
468751ba5f
Switch the vfork implementation to use procrecvtim() for waiting, and not signal the parent from the child.
...
This avoids a problem where one of the SIGALRM signals could be delivered after the original SIGALRM handler was restored, which would normally cause the process to terminate.
For now, we just rely on polling in a loop to determine when the child is done. This isn't optimal, but should be OK. If procsend() worked, we could use that in the child to signal the parent. However, procsend() is broken in GNO 2.0.6 -- it seems that it actually tries to invoke the send() call for sockets, but with the wrong arguments, leading to a crash.
2014-12-01 21:05:13 -06:00
334678c6e9
Change various uses of signal masks to use 32-bit values (previously half the signals were essentially cut off).
2014-11-25 17:43:14 -06:00
8b9da06832
Fix bug that was causing parse errors on shell control constructs (loops, if, case).
...
The bug was related to overflowing the 16-bit size of int.
2014-11-25 17:08:43 -06:00
abcab533f4
Fix to make `...` and $(...) command substitution work correctly.
...
This was a 1 -> STDOUT_FILENO change that I missed previously.
2014-11-23 15:47:39 -06:00
036cea4dbe
Add support to our execve for running scripts, which may have a #! line giving the interpreter to use.
...
We have to do this ourselves, since the GNO kernel's _execve doesn't do it for us.
2014-11-22 21:27:11 -06:00
3e7c0d0ace
Add our own version of execve for GNO, which can quote arguments and can remove variables from the environment if needed.
...
Our versions of the execv* functions have been moved to their own file. They are now used for all the exec* calls in hush.
2014-11-22 16:53:59 -06:00
8728cdf2b8
Encode functions and certain variables passed to subshells as command line arguments, to ensure they aren't mangled by ORCA/C's command line parsing.
2014-11-22 15:10:35 -06:00
2eedd5e9b3
Implement our own version of execvp for GNO, which quotes arguments containing spaces or tabs.
...
This should allow most typical cases of arguments with spaces to work correctly, although it will still break down in some cases. We can't do this perfectly, because we're ultimately dependent on the argument parsing code in the target application, and at least the code generated by ORCA/C doesn't give us a way to make an arbitrary string be treated as a single argument.
2014-11-22 12:55:07 -06:00
5c972aa397
Fix our handling of process groups for job control, working around a couple GNO bugs.
...
*Most significantly, we avoid using setpgid(), because it doesn't work and in fact corrupts the kernel's process group table.
*Also, work around tctpgrp() returning garbage instead of 0 on success.
This adds an implementation of tcsetpgrp that works by reading the process tables to find a process in the appropriate group. This isn't used for the main job control operations, though, since it might be relatively slow.
At this point, basic job control seems to work.
2014-11-21 23:05:38 -06:00
72634b98b9
In redirection operations, map fds 0/1/2 to 1/2/3 so they work as stdin/stdout/stderr, preserving compatibility with Unix shell scripts.
...
Also do a similar mapping for fds passed to "read -u" and "test -t".
2014-11-20 23:12:01 -06:00
432950e315
In glob, factor out "stat" call and structure to a separate function. This reduces stack usage in the recursive glob function.
2014-11-20 21:08:21 -06:00
62d8398fcf
Fix to assign valid pgrps to child processes. On GNO, we can't just use the pid as a pgrp; we must call tcnewpgrp instead.
2014-11-20 17:53:33 -06:00
4d60cd1043
Fixes for environment variable handling on GNO:
...
* Push/pop environment to make sure it is isolated from our parents and children.
* Make all environment vars (and shell vars) case-insensitive, consistent with GNO's internal handling of environment vars.
* Wrap putenv and unsetenv to make sure they are called with lower-case variable names, which is necessary to maintain consistency between the environ array and the kernel's internal representation of variables.
2014-11-20 13:21:23 -06:00
d958c364f9
Merge commit 'f5add44981b43490376ea0dfed1420dba09a3a75'
2014-11-19 18:49:57 -06:00
f5add44981
typo fix in comment
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2014-11-20 01:43:30 +01:00
ed1fff2c7b
Merge commit '8a475def9e3e21f780ebcf07dd607b26ceb00ea8'
...
Includes a fix for a potential overflow when doing shell arithmetic division.
2014-11-18 21:16:35 -06:00
60b6415214
Add our own implementation of fnmatch (taken from NetBSD), because the one in GNO 2.0.6's libc is broken.
...
The version in libc both matches things it shouldn't and doesn't match things it should, in (at least) cases where a pattern includes additional stuff beyond a *.
2014-11-18 20:51:04 -06:00
8a475def9e
ash,hush: do not segfault on $((2**63 / -1))
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2014-11-18 14:32:58 +01:00
08a5dab181
ash: fix handling of negative start value in ${v:start:len}
...
function old new delta
subevalvar 1140 1168 +28
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2014-11-17 20:27:18 +01:00
5f6121c091
Add initial support for getting terminal information from termcap, instead of hard-coding vt100-style codes.
...
This currently only supports output, and still doesn't quite display correctly in some cases.
2014-11-11 20:58:06 -06:00
c37475dcbc
Change vfork_and_run implementation to inspect the kernel's process tables to determine whether the child has really exec'd or exited.
...
This should avoid strange behavior due to races when the parent has resumed but the child is still running the exec* code in libc, which mainly manifests itself when running at low speed.
We also change to signaling the child's completion with SIGALRM, and setting an extra alarm in the parent in case the child doesn't actually do it.
2014-11-10 16:08:24 -06:00
6d5e65b9df
Fix corruption and hanging resulting from using _exit in forked processes by calling QuitGS directly instead.
...
GNO's _exit (contrary to its man page) does clean-up for stuff like the memory allocator, which is inappropriate in a forked child process and leads to hangs and crashes.
2014-11-09 18:49:58 -06:00
b3a419646b
Changes to handle the use of \r as newline on the IIgs.
2014-11-08 19:58:11 -06:00
c8de71ae9d
Changes so that hush can successfully re-execute itself:
...
*initialize the "environ" variable
*Reduce the stack size to 8192 (This should still be further reduced based on analysis of usage.)
2014-11-08 18:03:25 -06:00
bff0844d44
Add code to get the path of the current executable, which we need to re-execute the shell.
...
On the GS, this uses GS/OS calls. Versions for OS X and Linux are also included.
2014-11-07 23:06:34 -06:00
6bd3b140ea
Misc. fixes related to file handling:
...
*Use .null instead of /dev/null
*Account for GNO's dup2(), which non-standardly returns 0 on success
*Always call open with appropriate number of arguments
*Use STDIN_FILENO instead of (implicitly) 0
2014-11-07 19:23:04 -06:00
cae994bc22
Add an emulation of waitpid that should be better than the one in libc.
...
In particular, it will buffer information about children other than the one being waited for, so it isn't lost. It can also emulate a non-blocking wait by arranging to interrupt the wait with a signal.
2014-11-07 12:12:18 -06:00
9bc48e5ebf
Add synchronization to prevent the parent from running concurrently with the child until the child execs or terminates.
...
Our approach is to have the parent wait for SIGUSR2, and send that from the child just before it calls exec* or _exit.
2014-11-06 23:29:42 -06:00
f52d5394bf
Change code using 0/1/2 for stdin/stdout/stderr file descriptors to use macros instead, to properly deal with their different numbers on GNO.
2014-11-06 18:14:15 -06:00
3b1d003ea7
Handle globals more simply, declaring the "G" structure containing them directly in shell/hush.c.
...
This allows the "G" struct to show up in the debugger, so it can easily be inspected.
2014-11-06 13:08:38 -06:00
9320c1e704
Set things up so hush can be build with debug code turned on.
...
This involved breaking things up into more segments in debug mode, since the code is larger. I also had to remove some unused extern definitions, which were causing link errors when debug code was enabled.
To enable debug code, pass "DEBUG=1" to make or build.gs.
2014-11-06 11:42:17 -06:00
a3426d2782
Remove C99isms in hush debug code to address compilation errors when debugging stuff enabled.
2014-11-05 23:28:24 -06:00
2669183517
Define segments and make other adjustments in makefile.
...
At this point, hush can successfully build and run, although it doesn't work correctly.
The main Makefile is now dedicated to the GNO build. There's now a separate makefile for building on modern systems with GCC/Clang.
2014-11-05 22:26:33 -06:00
77ded3c27c
Use databank pragma around forked child entry methods, as required to ensure correct behavior.
2014-11-05 19:02:03 -06:00
c7f9c18893
Use GNO job control calls in place of unavailable POSIX ones.
2014-11-05 15:28:59 -06:00
a3c32aaa73
Revise terminal control code to use ioctls supported by GNO instead of termios calls that aren't supported.
2014-11-04 19:53:40 -06:00
a60c64d6c7
Replace call to sigsuspend() (not in GNO) with sigpause().
2014-11-04 15:41:05 -06:00
42c6e9e095
Replace alloca usages with malloc in shell/glob.c.
2014-11-04 11:46:36 -06:00
cbdfea4c97
Revise signal handling to work with GNO.
...
This involved using signal() rather than sigaction(), which GNO doesn't have. signal() doesn't have the signal-blocking feature of sigaction(), but I've tried to emulate it.
2014-11-04 10:45:28 -06:00
036b92595c
Address some link errors with various small changes.
...
The most significant change is to at use malloc instead of alloca in the code to evaluate shell arithmetic expressions in shell/math.c.
2014-11-03 23:29:34 -06:00
9850090331
Use STDERR_FILENO rather than 2 in debug print statements, so they'll properly go to stderr on GNO.
2014-11-03 19:20:20 -06:00
488a238ad7
Add an implementation of poll() written in terms of select(), to work around the lack of poll() on GNO.
...
This is a BSD-licensed poll() implementation by Brian M. Clapper. Its performance characteristics aren't as good as a "native" poll() would be, but this shouldn't be a problem in practice.
2014-11-03 12:26:43 -06:00
051b79efc1
Move all the source files to 15-character ProDOS-compatible file names.
...
Dmake gets confused if you use over-15-character file names, so they needed to be shortened to get it to work. While I was at it, I also switched _ to . in the filenames so they're fully ProDOS compatible.
The shell/hush_test directory (not needed to build the code) still uses ProDOS-incompatible file names.
2014-11-02 22:11:07 -06:00
d4b2c3ce8b
Various changes for GNO and ORCA/C compatibility.
2014-11-02 18:30:31 -06:00
875b1bbd0e
More GNO and ORCA/C compatibility fixes.
...
Everything in the shell directory now compiles.
2014-11-01 18:25:21 -05:00
2464399542
Convert additional vfork calls to xvfork_and_run.
2014-11-01 16:59:17 -05:00
d7a6168aa1
ORCA/C compat fixes. Variables must be at beginning of block.
2014-11-01 16:07:30 -05:00
3577d48e74
Change the ARRAY_SIZE macro to work around an ORCA/C limitation.
2014-11-01 15:47:17 -05:00
2b0d727f39
Include glob implementation from dietlibc.
...
GNO doesn't actually implement glob, although it has a header for it. The GNO header is from an old BSD version and is missing some constants we need, so don't use it.
2014-11-01 14:27:52 -05:00
f6c7fdc027
GNO/ORCA compatiblity: remove final comma in enums, and appropriately define stuff that GNO doesn't have in platform.h.
2014-11-01 14:22:47 -05:00
3709307794
Get rid of varargs macros in hush.c.
2014-11-01 11:25:19 -05:00
8f6869ae25
Miscellaneous changes for ORCA/C and GNO compatibility, mainly removing C99isms.
...
At this point, ORCA/C can process the main header files, and some smaller source files compile without errors.
2014-11-01 09:46:02 -05:00
b7676499be
More removal of stuff that used long longs
2014-10-27 19:45:38 -05:00
6c2c9d8865
Get rid of long longs in the the hush code (but not yet in the libraries)
2014-10-27 14:09:00 -05:00
16c89af688
Change vfork calls to use vfork_and_run operation with GNO-compatible semantics
2014-10-27 13:10:11 -05:00
e61b4040ec
Make char unsigned, as busybox is designed for (and as ORCA/C does)
2014-10-27 00:48:59 -05:00
a00ca4770f
Eliminate or disable all the warnings given by clang -Wall
2014-10-26 23:30:51 -05:00
472db3bd56
Delete the stuff that's irrelevant to hush. Also, include (a simplified version of) the autoconf-generated headers and a simple build script, so it can easily be build in the hush-only configuration.
2014-10-26 22:39:01 -05:00
ef1a853400
Minimal changes to enable hush-only builds on OS X
2014-10-26 21:14:47 -05:00
07f7ea70ed
ash: fix off-by-one in "jobs %4" handling. closes 7310
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2014-09-08 17:21:52 +02:00
2ec34969e7
ash: factor out ASH_HELP config option
...
It used to be aliased to !FEATURE_SH_EXTRA_QUIET for ash,
while hush had it separate from FEATURE_SH_EXTRA_QUIET.
Bring ash in line with hush.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2014-09-08 16:52:39 +02:00
e9ab07c211
ash: make ${#var} unicode-aware
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2014-08-13 18:00:08 +02:00
841f8331d7
ash,hush: run reinit_unicode() only if makes sense
...
With static Unicode support, no need to check $LANG et al.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2014-08-13 10:09:49 +02:00
c538d5bcc3
hush: make ${#var} unicode-aware
...
This mimics bash
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2014-08-13 09:57:44 +02:00
5d2e409ef8
libbb: use a wrapper around sysconf(_SC_CLK_TCK) to save a few bytes
...
function old new delta
bb_sc_clk_tck - 10 +10
timescmd 118 113 -5
print_route 1763 1758 -5
mpstat_main 1288 1283 -5
iostat_main 1947 1942 -5
INET_setroute 879 871 -8
------------------------------------------------------------------------------
(add/remove: 1/0 grow/shrink: 0/5 up/down: 10/-28) Total: -18 bytes
Signed-off-by: Bartosz Golaszewski <bartekgola@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2014-06-22 14:01:13 +02:00
3fa97af7cc
ash,hush: set $HOSTNAME is bash compat. Closes 7028
...
function old new delta
hush_main 1056 1128 +72
ash_main 1442 1487 +45
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2014-04-15 11:43:29 +02:00
109ee5d336
ash: make "locak VAR" unset VAR (bash does that)
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2014-03-16 18:41:11 +01:00
ac03a40cba
ash,hush: fix a thinko about 2^64-1 factorization
...
function old new delta
next_random 113 119 +6
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2014-03-15 09:25:46 +01:00
2bba591991
hush: make "true" built-in
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2014-03-14 12:43:57 +01:00
f93187512d
random: cosmetic tweaks in debug code
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2014-03-13 13:03:27 +01:00
fb183076a3
ash,hush: improve randomness of $RANDOM, add easy-ish way to test it
...
function old new delta
next_random 68 113 +45
change_random 103 121 +18
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2014-03-13 12:52:43 +01:00
5680e98451
ash: in bash compat mode, always export $SHLVL
...
function old new delta
ash_main 1437 1442 +5
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2014-01-07 16:12:48 +01:00
8bd810bd27
hush: typo fixes in comments
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-11-28 01:50:01 +01:00
80f8cdf04a
ash: Set SHLVL in ASH_BASH_COMPAT
...
function old new delta
ash_main 1456 1505 +49
.rodata 148488 148494 +6
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/0 up/down: 55/0) Total: 55 bytes
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
2013-11-08 14:30:20 +01:00
200c1c46f4
ash: Use setvar2 some more
...
(add/remove: 0/0 grow/shrink: 10/15 up/down: 13/-27) Total: -14 bytes
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
2013-11-08 14:12:13 +01:00
25ce3ee9f3
typo fix in comment
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-07-14 01:23:06 +02:00
e95738f635
typo fix in comment
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-07-08 03:13:08 +02:00
2301d127a2
unicode: check $LC_CTYPE too to detect Unicode mode
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-07-05 22:00:57 +02:00
3e7ecb179b
unicode: check $LC_ALL to detect Unicode mode, not only $LANG
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-07-02 17:30:23 +02:00
ff463a885d
hush: fix build failure if FEATURE_EDITING=y && !HUSH_INTERACTIVE
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-05-12 02:45:23 +02:00
d96ffda62e
ash,hush: history builtin
...
function old new delta
show_history - 39 +39
builtin_history - 16 +16
historycmd - 13 +13
bltins1 312 324 +12
builtintab 336 344 +8
popstring 134 140 +6
hush_main 1048 1046 -2
ash_main 1398 1396 -2
size_from_HISTFILESIZE 44 40 -4
------------------------------------------------------------------------------
(add/remove: 3/0 grow/shrink: 3/3 up/down: 94/-8) Total: 86 bytes
Signed-off-by: Flemming Madsen <busybox@themadsens.dk>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-04-07 18:47:24 +02:00
3beab83e4f
hush: fix for "while false && true; do echo BUG; break; done". closes 6170
...
function old new delta
run_list 959 941 -18
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-04-07 18:16:58 +02:00
091f831424
ash: add comment about failures in source builtin. No code changes.
...
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-03-17 14:25:22 +01:00
88b532d59a
hush: source builtin should override $N only if it has args
...
function old new delta
builtin_source 174 184 +10
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
2013-03-17 14:11:04 +01:00
Denys Vlasenko
Stephen Heumann
Bartosz Golaszewski
Bernhard Reutner-Fischer
Flemming Madsen