Changeset 464

Timestamp:

Jun 10, 2010, 12:38:39 PM (15 years ago)

Author:

Silvan Scherrer

Message:

Samba Server 3.5: changed pipe() to socketpair()

Location:

trunk/server

Files:

• lib/tevent/tevent_signal.c (modified) (2 diffs)
• lib/tevent/tevent_util.c (modified) (3 diffs)
• source3/lib/recvfile.c (modified) (1 diff)
• source3/printing/print_cups.c (modified) (1 diff)

trunk/server/lib/tevent/tevent_signal.c

@@ -30 +30 @@
 #include "tevent_internal.h"
 #include "tevent_util.h"
+#ifdef __OS2__
+#include <sys/socket.h>
+#endif
 
 #define TEVENT_NUM_SIGNALS 64
@@ -246 +249 @@
            setup */
         if (ev->pipe_fde == NULL) {
+#ifndef __OS2__
                 if (pipe(ev->pipe_fds) == -1) {
+#else
+                if (socketpair(AF_UNIX, SOCK_STREAM,0, ev->pipe_fds) == -1) {
+#endif
                         talloc_free(se);
                         return NULL;

trunk/server/lib/tevent/tevent_util.c

@@ -29 +29 @@
 #include "tevent_util.h"
 #include <fcntl.h>
+#ifdef __OS2__
+#include <sys/filio.h>
+#endif
 
 /**
@@ -82 +85 @@
         if((val = fcntl(fd, F_GETFL, 0)) == -1)
                 return -1;
+#ifndef __OS2__
         if(set) /* Turn blocking on - ie. clear nonblock flag */
                 val &= ~FLAG_TO_SET;
@@ -87 +91 @@
                 val |= FLAG_TO_SET;
         return fcntl( fd, F_SETFL, val);
+#else
+        if(set) /* turn blocking on - ie. clear nonblock flag */
+                val = 0;
+        else
+                val = 1;
+        return os2_ioctl(fd, FIONBIO, (char *) &val, sizeof(val));
+#endif
+
 #undef FLAG_TO_SET
 }

trunk/server/source3/lib/recvfile.c

@@ -174 +174 @@
         }
 
+#ifndef __OS2__
         if ((pipefd[0] == -1) && (pipe(pipefd) == -1)) {
+#else
+        if ((pipefd[0] == -1) && (socketpair(AF_UNIX, SOCK_STREAM,0, pipefd) == -1)) {
+#endif
                 try_splice_call = false;
                 return default_sys_recvfile(fromfd, tofd, offset, count);

trunk/server/source3/printing/print_cups.c

@@ -408 +408 @@
         DEBUG(5,("cups_pcap_load_async: asynchronously loading cups printers\n"));
 
+#ifndef __OS2__
         if (pipe(fds) == -1) {
+#else   // on OS2 we have no select() on pipes, so we use socketpair() instead
+        if (socketpair(AF_UNIX, SOCK_STREAM,0, fds) == -1) {
+#endif
                 return false;
         }