From e3df947be8e062fd21aacfd052dcc53447dccf9e Mon Sep 17 00:00:00 2001
From: jilles <jilles@FreeBSD.org>
Date: Fri, 31 Dec 2010 18:20:17 +0000
Subject: sh: Check if dup2 for redirection from/to a file succeeds.

A failure (e.g. caused by ulimit -n being set very low) is a redirection
error.

Example:
  ulimit -n 9; exec 9<.
---
 bin/sh/redir.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'bin/sh/redir.c')

diff --git a/bin/sh/redir.c b/bin/sh/redir.c
index 4f0a40c..6e6f7a5 100644
--- a/bin/sh/redir.c
+++ b/bin/sh/redir.c
@@ -155,6 +155,7 @@ openredirect(union node *redir, char memory[10])
 	int fd = redir->nfile.fd;
 	char *fname;
 	int f;
+	int e;
 
 	/*
 	 * We suppress interrupts so that we won't leave open file
@@ -173,7 +174,11 @@ openredirect(union node *redir, char memory[10])
 			error("cannot open %s: %s", fname, strerror(errno));
 movefd:
 		if (f != fd) {
-			dup2(f, fd);
+			if (dup2(f, fd) == -1) {
+				e = errno;
+				close(f);
+				error("%d: %s", fd, strerror(e));
+			}
 			close(f);
 		}
 		break;
-- 
cgit v1.1