Changeset 699 for branches/samba-3.3.x/source/lib

Timestamp:

Apr 23, 2012, 8:01:39 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.3: made it high-mem aware

Location:

branches/samba-3.3.x/source/lib

Files:

• os2helper.c (modified) (2 diffs)
• select.c (modified) (2 diffs)

branches/samba-3.3.x/source/lib/os2helper.c

@@ -40 +40 @@
 #include <types.h>
 #include <string.h>
+#include <sys/socket.h>
 //YD for tmalloc
 #include <malloc.h>
@@ -177 +178 @@
 }
 */
+
+/* OS/2 specific pipe implementation, we have to use socketpair as select on 
+filehandle is not working. */
+int os2_pipe(int fds[2])
+{
+        int rc = 0;
+
+        rc = socketpair(AF_UNIX, SOCK_STREAM, 0, fds);
+        return rc;
+}
+
 /* OS/2-specific random functions. these functions used to be based on APR 
    random code, but we discovered some nasty problems with it on fast hardware

branches/samba-3.3.x/source/lib/select.c

@@ -28 +28 @@
    This means all Samba signal handlers should call sys_select_signal().
 */
+#ifdef __OS2__
+#define pipe(A) os2_pipe(A)
+#endif
 
 static pid_t initialised;
@@ -59 +62 @@
 
         if (initialised != sys_getpid()) {
-#ifndef __OS2__
                 if (pipe(select_pipe) == -1)
-#else
-                if (socketpair(AF_UNIX, SOCK_STREAM,0, select_pipe) == -1)
-#endif
                         smb_panic("Could not create select pipe");