Bash-4.2 patch 40

diff --git a/patchlevel.h b/patchlevel.h
index 7193c0c2aa2d2acd4ac324920cccfa3528e2d4b9..85d224d05e5b1e96b4ec635316e934b3673a2221 100644 (file)
--- 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 921be8cad4c684bff3c1ed1b96567a2c79c14c92..f4b1658cfb936c887947e044b3f42d538bb946f2 100644 (file)
--- 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;