fix posix.c: dup2 call (delegate to dup3 only on linux and if fd is not inheritable)

cosminbasca · cosminbasca · commit f91b8c9dd851 · 2022-02-24T12:14:16.000+01:00
diff --git a/graalpython/com.oracle.graal.python.cext/posix/posix.c b/graalpython/com.oracle.graal.python.cext/posix/posix.c
@@ -130,8 +130,10 @@ int32_t call_dup(int32_t fd) {
 
 int32_t call_dup2(int32_t oldfd, int32_t newfd, int32_t inheritable) {
 #ifdef __gnu_linux__
-    return dup3(oldfd, newfd, inheritable ? 0 : O_CLOEXEC);
-#else
+    if (!inheritable) {
+        return dup3(oldfd, newfd, O_CLOEXEC);
+    }
+#endif
     int res = dup2(oldfd, newfd);
     if (res < 0) {
         return res;
@@ -143,7 +145,6 @@ int32_t call_dup2(int32_t oldfd, int32_t newfd, int32_t inheritable) {
         }
     }
     return res;
-#endif
 }
 
 int32_t call_pipe2(int32_t *pipefd) {

Original file line number	Diff line number	Diff line change
`@@ -130,8 +130,10 @@ int32_t call_dup(int32_t fd) {`
`130`	`130`
`131`	`131`	`int32_t call_dup2(int32_t oldfd, int32_t newfd, int32_t inheritable) {`
`132`	`132`	`#ifdef __gnu_linux__`
`133`		`- return dup3(oldfd, newfd, inheritable ? 0 : O_CLOEXEC);`
`134`		`-#else`
	`133`	`+ if (!inheritable) {`
	`134`	`+ return dup3(oldfd, newfd, O_CLOEXEC);`
	`135`	`+ }`
	`136`	`+#endif`
`135`	`137`	`int res = dup2(oldfd, newfd);`
`136`	`138`	`if (res < 0) {`
`137`	`139`	`return res;`
`@@ -143,7 +145,6 @@ int32_t call_dup2(int32_t oldfd, int32_t newfd, int32_t inheritable) {`
`143`	`145`	`}`
`144`	`146`	`}`
`145`	`147`	`return res;`
`146`		`-#endif`
`147`	`148`	`}`
`148`	`149`
`149`	`150`	`int32_t call_pipe2(int32_t *pipefd) {`