pmodules/bash
0
0
Fork 0
mirror of https://https.git.savannah.gnu.org/git/bash.git synced 2026-08-07 02:32:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

commit bash-20120127 snapshot

Browse Source
This commit is contained in:
Chet Ramey
2012-02-22 10:01:38 -05:00
parent a0350e0811
commit c31d56a7ba
19 changed files with 13327 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
print_cmd.c
+8 -2
View File
@@ -113,6 +113,9 @@ FILE *xtrace_fp = 0;
#define CHECK_XTRACE_FP xtrace_fp = (xtrace_fp ? xtrace_fp : stderr)
/* shell expansion characters: used in print_redirection_list */
#define EXPCHAR(c) ((c) == '{' || (c) == '~' || (c) == '$' || (c) == '`')
#define PRINT_DEFERRED_HEREDOCS(x) \
do { \
if (deferred_heredocs) \
@@ -996,6 +999,7 @@ print_redirection_list (redirects)
REDIRECT *redirects;
{
REDIRECT *heredocs, *hdtail, *newredir;
char *rw;
heredocs = (REDIRECT *)NULL;
hdtail = heredocs;
@@ -1017,10 +1021,12 @@ print_redirection_list (redirects)
else
hdtail = heredocs = newredir;
}
else if (redirects->instruction == r_duplicating_output_word && redirects->redirector.dest == 1)
else if (redirects->instruction == r_duplicating_output_word && (redirects->flags & REDIR_VARASSIGN) == 0 && redirects->redirector.dest == 1)
{
/* Temporarily translate it as the execution code does. */
redirects->instruction = r_err_and_out;
rw = redirects->redirectee.filename->word;
if (rw && *rw != '-' && DIGIT (*rw) == 0 && EXPCHAR (*rw) == 0)
redirects->instruction = r_err_and_out;
print_redirection (redirects);
redirects->instruction = r_duplicating_output_word;
}