Changeset 3747 for branches

Timestamp:

Mar 4, 2012, 7:45:55 PM (13 years ago)

Author:

bird

Message:

socketpair: support osfd (return sockets descriptors) pointing to high memory.

File:

• branches/libc-0.6/src/emx/src/libsocket/socketpair.c (modified) (3 diffs)

branches/libc-0.6/src/emx/src/libsocket/socketpair.c

@@ -125 +125 @@
     int             fh1;
     int             fh2;
+    int             aNativeFDs[2] = {-1, -1};
     PLIBCSOCKETFH   pFH1;
 
-    rc = __libsocket_socketpair(af, type, flags, osfd);
+    /* Make sure we crash here if parameter is invalid. */
+    osfd[0] = -1;
+    osfd[1] = -1;
+
+    /* Call the native API. */
+    rc = __libsocket_socketpair(af, type, flags, aNativeFDs);
     if (rc < 0)
     {
@@ -137 +143 @@
      * Allocate LIBC sockets.
      */
-    pFH1 = TCPNAMEG(AllocFH)(osfd[0], &fh1);
+    pFH1 = TCPNAMEG(AllocFH)(aNativeFDs[0], &fh1);
     if (pFH1)
     {
-        PLIBCSOCKETFH   pFH2 = TCPNAMEG(AllocFH)(osfd[1], &fh2);
+        PLIBCSOCKETFH   pFH2 = TCPNAMEG(AllocFH)(aNativeFDs[1], &fh2);
         if (pFH2)
         {
@@ -148 +154 @@
             LIBCLOG_RETURN_MSG(0, "ret 0 osfd[0]=%d osfd[1]=%d\n", osfd[0], osfd[1]);
         }
-        __libsocket_soclose(osfd[1]);
+         
+        __libsocket_soclose(aNativeFDs[1]);
         __libc_FHClose(fh1);
     }
     else
     {
-        __libsocket_soclose(osfd[1]);
-        __libsocket_soclose(osfd[0]);
+        __libsocket_soclose(aNativeFDs[1]);
+        __libsocket_soclose(aNativeFDs[0]);
     }