From: Chet Ramey <chet.ramey@case.edu>
Date: Fri, 11 Jan 2013 00:47:54 +0000 (-0500)
Subject: Bash-4.2 patch 40
X-Git-Tag: bash-4.3~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=774d3bf69d419308d56f7082d8bc87bbc90abe74;p=thirdparty%2Fbash.git

Bash-4.2 patch 40
---

diff --git a/patchlevel.h b/patchlevel.h
index 7193c0c2a..85d224d05 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_ */
diff --git a/redir.c b/redir.c
index 921be8cad..f4b1658cf 100644
--- a/redir.c
+++ b/redir.c
@@ -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;