diff options
author | Chet Ramey <chet.ramey@case.edu> | 2013-01-10 19:47:54 -0500 |
---|---|---|
committer | Chet Ramey <chet.ramey@case.edu> | 2013-01-10 19:47:54 -0500 |
commit | 774d3bf69d419308d56f7082d8bc87bbc90abe74 (patch) | |
tree | ad9cba5dea68df3a0296812ba98f054aa4a44237 | |
parent | 11d0fdf779380d2951b9ff0cc37a6872cb1a7438 (diff) | |
download | bash-774d3bf69d419308d56f7082d8bc87bbc90abe74.tar.gz |
Bash-4.2 patch 40
-rw-r--r-- | patchlevel.h | 2 | ||||
-rw-r--r-- | redir.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/patchlevel.h b/patchlevel.h index 7193c0c2..85d224d0 100644 --- a/patchlevel.h +++ b/patchlevel.h @@ -25,6 +25,6 @@ regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh looks for to find the patch level (for the sccs version string). */ -#define PATCHLEVEL 39 +#define PATCHLEVEL 40 #endif /* _PATCHLEVEL_H_ */ @@ -1091,10 +1091,12 @@ do_redirection_internal (redirect, flags) #if defined (BUFFERED_INPUT) check_bash_input (redirector); - close_buffered_fd (redirector); + r = close_buffered_fd (redirector); #else /* !BUFFERED_INPUT */ - close (redirector); + r = close (redirector); #endif /* !BUFFERED_INPUT */ + if (r < 0 && (flags & RX_INTERNAL) && (errno == EIO || errno == ENOSPC)) + REDIRECTION_ERROR (r, errno, -1); } break; |