| commit | b6775db241f5fe5e3dc2ca09fc6c9e6164d4b2af | [log] [tgz] |
|---|---|---|
| author | Guido van Rossum <guido@python.org> | Mon Aug 01 11:34:53 1994 +0000 |
| committer | Guido van Rossum <guido@python.org> | Mon Aug 01 11:34:53 1994 +0000 |
| tree | 9362939305b2d088b8f19a530c9015d886bc2801 | |
| parent | 2979b01ff88ac4c5b316d9bf98edbaaaffac8e24 [diff] [blame] |
Merge alpha100 branch back to main trunk
diff --git a/Python/dup2.c b/Python/dup2.c index 85ec5d5..ee1a7ad 100644 --- a/Python/dup2.c +++ b/Python/dup2.c
@@ -20,12 +20,17 @@ 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; }