hush: fix nested redirects colliding with script fds
authorDenys Vlasenko <vda.linux@googlemail.com>
Tue, 24 Jul 2018 14:54:41 +0000 (16:54 +0200)
committerDenys Vlasenko <vda.linux@googlemail.com>
Tue, 24 Jul 2018 14:54:41 +0000 (16:54 +0200)
commit41ef41b3e0a16c9f8524870a2dc4f768c237939e
tree01feb4fb17e3572f157d4f4e6e3a1de3dc4afa61
parentdfc739476343244371636d58561f7b743faf50d6
hush: fix nested redirects colliding with script fds

This necessitates switch from libc FILE api to a simple
homegrown replacement.
The change which fixes the bug here is the deleting of

restore_redirected_FILEs();

line. It was prematurely moving (restoring) script fd#3.
The fix is: we don't even _want_ to restore scrit fds,
we are perfectly fine with them being moved.
The only reason we tried to restore them is that FILE api
did not allow moving of FILE->fd.

function                                             old     new   delta
refill_HFILE_and_getc                                  -      93     +93
hfopen                                                 -      90     +90
hfclose                                                -      66     +66
pseudo_exec_argv                                     591     597      +6
hush_main                                           1089    1095      +6
builtin_source                                       209     214      +5
save_fd_on_redirect                                  197     200      +3
setup_redirects                                      320     321      +1
fgetc_interactive                                    235     236      +1
i_peek_and_eat_bkslash_nl                             99      97      -2
expand_vars_to_list                                 1103    1100      -3
restore_redirects                                     99      52     -47
fclose_and_forget                                     57       -     -57
remember_FILE                                         63       -     -63
------------------------------------------------------------------------------
(add/remove: 3/2 grow/shrink: 6/3 up/down: 271/-172)           Total: 99 bytes

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
libbb/xfuncs_printf.c
shell/ash_test/ash-heredoc/heredocB.right [new file with mode: 0644]
shell/ash_test/ash-heredoc/heredocB.tests [new file with mode: 0755]
shell/ash_test/ash-redir/redir_script.tests
shell/hush.c
shell/hush_test/hush-heredoc/heredocB.right [new file with mode: 0644]
shell/hush_test/hush-heredoc/heredocB.tests [new file with mode: 0755]
shell/hush_test/hush-redir/redir_script.tests