MPW changes

guido · guido · commit 7c05e2cd8e51 · 1994-08-29T10:43:12.000Z
git-svn-id: http://svn.python.org/projects/python/trunk@4278 6015fed2-1504-0410-9fe1-9d1591cc4771
diff --git a/Python/dup2.c b/Python/dup2.c
@@ -20,17 +20,12 @@ 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;
 }

Original file line number	Diff line number	Diff line change
`@@ -20,17 +20,12 @@ dup2(fd1, fd2)`
`20`	`20`	`int fd1, fd2;`
`21`	`21`	`{`
`22`	`22`	`if (fd1 != fd2) {`
`23`		`-#ifdef MPW`
`24`		`- close (fd2); /* XXX RJW MPW does not implement F_GETFL but it does have dup */`
`25`		`- fd2 = dup(fd1);`
`26`		`-#else`
`27`	`23`	`if (fcntl(fd1, F_GETFL) < 0)`
`28`	`24`	`return BADEXIT;`
`29`	`25`	`if (fcntl(fd2, F_GETFL) >= 0)`
`30`	`26`	`close(fd2);`
`31`	`27`	`if (fcntl(fd1, F_DUPFD, fd2) < 0)`
`32`	`28`	`return BADEXIT;`
`33`		`-#endif`
`34`	`29`	`}`
`35`	`30`	`return fd2;`
`36`	`31`	`}`