summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--bin/sh/redir.c7
-rw-r--r--tools/regression/bin/sh/errors/redirection-error7.07
2 files changed, 13 insertions, 1 deletions
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;
diff --git a/tools/regression/bin/sh/errors/redirection-error7.0 b/tools/regression/bin/sh/errors/redirection-error7.0
new file mode 100644
index 0000000..5b20f04
--- /dev/null
+++ b/tools/regression/bin/sh/errors/redirection-error7.0
@@ -0,0 +1,7 @@
+# $FreeBSD$
+
+! dummy=$(
+ exec 3>&1 >&2 2>&3
+ ulimit -n 9
+ exec 9<.
+) && [ -n "$dummy" ]
OpenPOWER on IntegriCloud