From b6775db241f5fe5e3dc2ca09fc6c9e6164d4b2af Mon Sep 17 00:00:00 2001
From: Guido van Rossum <guido@python.org>
Date: Mon, 1 Aug 1994 11:34:53 +0000
Subject: Merge alpha100 branch back to main trunk

---
 Python/dup2.c | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'Python/dup2.c')

diff --git a/Python/dup2.c b/Python/dup2.c
index 85ec5d5e5f..ee1a7ad690 100644
--- a/Python/dup2.c
+++ b/Python/dup2.c
@@ -20,12 +20,17 @@ dup2(fd1, fd2)
 int fd1, fd2;
 {
 	if (fd1 != fd2) {
+#ifdef MPW
+		close (fd2); /* XXX RJW MPW does not implement F_GETFL but it does have dup */
+		fd2 = dup(fd1);
+#else
 		if (fcntl(fd1, F_GETFL) < 0)
 			return BADEXIT;
 		if (fcntl(fd2, F_GETFL) >= 0)
 			close(fd2);
 		if (fcntl(fd1, F_DUPFD, fd2) < 0)
 			return BADEXIT;
+#endif
 	}
 	return fd2;
 }
-- 
cgit v1.2.1