Changeset 247 for branches/samba-3.2.x/source/lib/util.c

Timestamp:

Jun 1, 2009, 10:51:27 AM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Fixes for Tickets #69 and #71 (by diver) in 3.2 branch

File:

• branches/samba-3.2.x/source/lib/util.c (modified) (2 diffs)

branches/samba-3.2.x/source/lib/util.c

@@ -948 +948 @@
         if((val = sys_fcntl_long(fd, F_GETFL, 0)) == -1)
                 return -1;
+#ifndef __OS2__
         if(set) /* Turn blocking on - ie. clear nonblock flag */
                 val &= ~FLAG_TO_SET;
@@ -953 +954 @@
                 val |= FLAG_TO_SET;
         return sys_fcntl_long( 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
 }