diff options
| author | Denis Vlasenko | 2008-07-24 19:46:38 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2008-07-24 19:46:38 +0000 |
| commit | 5a867317bb1cbf36d396d9cdb552212607dcc2b1 (patch) | |
| tree | e8c01f8c4f8242694db730eed60a3616e86f3a48 /shell/ash_test | |
| parent | 6fbb43bc3c14fc30030cae77db51c322bece30ab (diff) | |
| download | busybox-5a867317bb1cbf36d396d9cdb552212607dcc2b1.zip busybox-5a867317bb1cbf36d396d9cdb552212607dcc2b1.tar.gz | |
ash: fix a bug where redirection fds were not closed afterwards.
optimize close+fcntl(DUPFD) into dup2. add testsuites.
function old new delta
copyfd 47 68 +21
argstr 1311 1298 -13
popredir 148 131 -17
redirect 1139 1107 -32
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 1/3 up/down: 21/-62) Total: -41 bytes
Diffstat (limited to 'shell/ash_test')
| -rw-r--r-- | shell/ash_test/ash-redir/redir2.right | 1 | ||||
| -rwxr-xr-x | shell/ash_test/ash-redir/redir2.tests | 5 | ||||
| -rw-r--r-- | shell/ash_test/ash-redir/redir3.right | 3 | ||||
| -rwxr-xr-x | shell/ash_test/ash-redir/redir3.tests | 5 | ||||
| -rwxr-xr-x | shell/ash_test/run-all | 4 |
5 files changed, 16 insertions, 2 deletions
diff --git a/shell/ash_test/ash-redir/redir2.right b/shell/ash_test/ash-redir/redir2.right new file mode 100644 index 0000000..d86bac9 --- /dev/null +++ b/shell/ash_test/ash-redir/redir2.right @@ -0,0 +1 @@ +OK diff --git a/shell/ash_test/ash-redir/redir2.tests b/shell/ash_test/ash-redir/redir2.tests new file mode 100755 index 0000000..61ccea3 --- /dev/null +++ b/shell/ash_test/ash-redir/redir2.tests @@ -0,0 +1,5 @@ +# ash once couldn't redirect above fd#9 +exec 1>/dev/null +(echo LOST1 >&22) 22>&1 +(echo LOST2 >&22) 22>&1 +(echo OK >&22) 22>&2 diff --git a/shell/ash_test/ash-redir/redir3.right b/shell/ash_test/ash-redir/redir3.right new file mode 100644 index 0000000..fd641a8 --- /dev/null +++ b/shell/ash_test/ash-redir/redir3.right @@ -0,0 +1,3 @@ +TEST +./redir3.tests: line 4: 9: Bad file descriptor +Output to fd#9: 1 diff --git a/shell/ash_test/ash-redir/redir3.tests b/shell/ash_test/ash-redir/redir3.tests new file mode 100755 index 0000000..f50a767 --- /dev/null +++ b/shell/ash_test/ash-redir/redir3.tests @@ -0,0 +1,5 @@ +# redirects to closed descriptors should not leave these descriptors" +# open afterwards +echo TEST 9>/dev/null +echo MUST ERROR OUT >&9 +echo "Output to fd#9: $?" diff --git a/shell/ash_test/run-all b/shell/ash_test/run-all index b0a6d10..4d0f39a 100755 --- a/shell/ash_test/run-all +++ b/shell/ash_test/run-all @@ -3,8 +3,8 @@ TOPDIR=$PWD test -x ash || { - echo "No ./ash?! Perhaps you want to run 'ln -s ../../busybox ash'" - exit + echo "No ./ash - creating a link to ../../busybox" + ln -s ../../busybox ash } test -x printenv || gcc -O2 -o printenv printenv.c || exit $? test -x recho || gcc -O2 -o recho recho.c || exit $? |