mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2024-12-19 04:47:52 +00:00
scripts/functions: fix endless loop in debug-shell with IO redirection
CT_DEBUG_INTERACTIVE is disabled when stdin, stdout or stderr are redirected, but the check is only done at the start of the build and doesn't catch when individual build commands use redirection. When stdin is redirected it will cause the debug shell to exit immediately, causing and endless loop. Thus, save the stdin/our/err file handles and restore them before invoking the debug shell. Signed-off-by: Johannes Stezenbach <js@sig21.net> Message-Id: <20121030102225.GA8303@sig21.net> Patchwork-Id: 195409
This commit is contained in:
parent
34a6501a2e
commit
5ddbc863e1
@ -46,7 +46,7 @@ CT_OnError() {
|
||||
old_trap="$(trap -p ERR)"
|
||||
trap -- ERR
|
||||
(
|
||||
exec >&6
|
||||
exec >&6 2>&7 <&8
|
||||
printf "\r \n\nCurrent command"
|
||||
if [ -n "${cur_cmd}" ]; then
|
||||
printf ":\n %s\n" "${cur_cmd}"
|
||||
@ -131,7 +131,8 @@ set +o hashall
|
||||
|
||||
# Log policy:
|
||||
# - first of all, save stdout so we can see the live logs: fd #6
|
||||
exec 6>&1
|
||||
# (also save stdin and stderr for use by CT_DEBUG_INTERACTIVE)
|
||||
exec 6>&1 7>&2 8<&0
|
||||
# - then point stdout to the log file
|
||||
tmp_log_file="${CT_TOP_DIR}/build.log"
|
||||
rm -f "${tmp_log_file}"
|
||||
|
Loading…
Reference in New Issue
Block a user