Changeset 170

Timestamp:

Apr 14, 2009, 3:59:26 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Fix for Ticket #69 and #71

Location:

branches/samba-3.0/source/lib

Files:

• system.c (modified) (6 diffs)
• util.c (modified) (2 diffs)

branches/samba-3.0/source/lib/system.c

@@ -115 +115 @@
 #endif /* HAVE_USLEEP */
 }
-
 /*******************************************************************
 A read wrapper that will deal with EINTR.
 ********************************************************************/
-#ifndef __OS2__
 ssize_t sys_read(int fd, void *buf, size_t count)
 {
         ssize_t ret;
-
         do {
                 ret = read(fd, buf, count);
@@ -129 +126 @@
         return ret;
 }
-#else
-ssize_t sys_read(int fd, void *buf, size_t count)
+/*******************************************************************
+A write wrapper that will deal with EINTR.
+********************************************************************/
+ssize_t sys_write(int fd, const void *buf, size_t count)
 {
         ssize_t ret;
-        int fds, err = 0;
-
-        int timeout=1000; /* Timeout for select */
-        do {
-                if (err == EAGAIN && timeout != 0) {
-                        fds = fd;
-                        ret = os2_select(&fds, 1, 0, 0, timeout);
-                        if (ret != 1) {
-                                err = errno;
-                                DEBUG(3,("sys_read: select ret: %d,%s\n", ret, strerror(errno))); 
-                                if (ret == 0) {
-                                        err = errno = EAGAIN;
-                                        ret = -1;
-                                        continue;
-                                }
-                                if (err == EINTR)
-                                        continue;
-                                return -1;
-                        }
-                }
-                ret = read(fd, buf, count);
-                err = errno;
-        } while (ret == -1 && (errno == EINTR  || (errno == EAGAIN && timeout != 0)));
-        return ret;
-}
-#endif
-
-/*******************************************************************
-A write wrapper that will deal with EINTR.
-********************************************************************/
- 
-#ifndef __OS2__
-ssize_t sys_write(int fd, const void *buf, size_t count)
-{
-        ssize_t ret;
-
         do {
                 ret = write(fd, buf, count);
@@ -174 +137 @@
         return ret;
 }
-
-#else
-ssize_t sys_write(int fd, const void *buf, size_t count)
-{
-        ssize_t ret;
-        int fds, err = 0;
-
-        int timeout=1000; /* Timeout for select */
-        do {
-                if (err == EAGAIN && timeout != 0) {
-                        fds = fd;
-                        ret = os2_select(&fds, 0, 1, 0, timeout);
-                        if (ret != 1) {
-                                err = errno;
-                                DEBUG(3,("sys_write: select ret: %d,%s\n", ret, strerror(errno))); 
-                                if (ret == 0) {
-                                        err = errno = EAGAIN;
-                                        ret = -1;
-                                        continue;
-                                }
-                                if (err == EINTR)
-                                        continue;
-                                return -1;
-                        }
-                }
-                ret = write(fd, buf, count);
-                err = errno;    
-        } while (ret == -1 && (errno == EINTR || (errno == EAGAIN && timeout != 0)));
-        return ret;
-}
-#endif
-
 /*******************************************************************
 A pread wrapper that will deal with EINTR and 64-bit file offsets.
 ********************************************************************/
-
 #if defined(HAVE_PREAD) || defined(HAVE_PREAD64)
 ssize_t sys_pread(int fd, void *buf, size_t count, SMB_OFF_T off)
 {
         ssize_t ret;
-
         do {
 #if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_OFF64_T) && defined(HAVE_PREAD64)
@@ -221 +150 @@
                 ret = pread(fd, buf, count, off);
 #endif
-#ifndef __OS2__
         } while (ret == -1 && errno == EINTR);
-#else
-/* On OS/2 - we randomly get 'Resource Temporarily Unavailable' errors - ignore these */
-        } while (ret == -1 && ((errno == EINTR)||(errno == EAGAIN)));
-#endif
         return ret;
 }
 #endif
-
 /*******************************************************************
 A write wrapper that will deal with EINTR and 64-bit file offsets.
 ********************************************************************/
-
 #if defined(HAVE_PWRITE) || defined(HAVE_PWRITE64)
 ssize_t sys_pwrite(int fd, const void *buf, size_t count, SMB_OFF_T off)
 {
         ssize_t ret;
-
         do {
 #if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_OFF64_T) && defined(HAVE_PWRITE64)
@@ -246 +167 @@
                 ret = pwrite(fd, buf, count, off);
 #endif
-#ifndef __OS2__
         } while (ret == -1 && errno == EINTR);
-#else
-/* On OS/2 - we randomly get 'Resource Temporarily Unavailable' errors - ignore these */
-        } while (ret == -1 && ((errno == EINTR)||(errno == EAGAIN)));
-#endif
         return ret;
 }
 #endif
-
 /*******************************************************************
 A send wrapper that will deal with EINTR.
 ********************************************************************/
-
 ssize_t sys_send(int s, const void *msg, size_t len, int flags)
 {
         ssize_t ret;
-
         do {
                 ret = send(s, msg, len, flags);
-#ifndef __OS2__
         } while (ret == -1 && errno == EINTR);
-#else
-/* On OS/2 - we randomly get 'Resource Temporarily Unavailable' errors - ignore these */
-        } while (ret == -1 && ((errno == EINTR)||(errno == EAGAIN)));
-#endif
         return ret;
 }
-
 /*******************************************************************
 A sendto wrapper that will deal with EINTR.
 ********************************************************************/
-
 ssize_t sys_sendto(int s,  const void *msg, size_t len, int flags, const struct sockaddr *to, socklen_t tolen)
 {
         ssize_t ret;
-
         do {
                 ret = sendto(s, msg, len, flags, to, tolen);
-#ifndef __OS2__
         } while (ret == -1 && errno == EINTR);
-#else
-/* On OS/2 - we randomly get 'Resource Temporarily Unavailable' errors - ignore these */
-        } while (ret == -1 && ((errno == EINTR)||(errno == EAGAIN)));
-#endif
         return ret;
 }
-
 /*******************************************************************
 A recv wrapper that will deal with EINTR.
 ********************************************************************/
-
 ssize_t sys_recv(int fd, void *buf, size_t count, int flags)
 {
         ssize_t ret;
-
         do {
                 ret = recv(fd, buf, count, flags);
@@ -307 +204 @@
         return ret;
 }
-
 /*******************************************************************
 A recvfrom wrapper that will deal with EINTR.
 ********************************************************************/
-
 ssize_t sys_recvfrom(int s, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlen)
 {
         ssize_t ret;
-
         do {
                 ret = recvfrom(s, buf, len, flags, from, fromlen);
-#ifndef __OS2__
         } while (ret == -1 && errno == EINTR);
-#else
-/* On OS/2 - we randomly get 'Resource Temporarily Unavailable' errors - ignore these */
-        } while (ret == -1 && ((errno == EINTR)||(errno == EAGAIN)));
-#endif
         return ret;
 }
-
 /*******************************************************************
 A fcntl wrapper that will deal with EINTR.
 ********************************************************************/
-
 int sys_fcntl_ptr(int fd, int cmd, void *arg)
 {
         int ret;
-
         do {
                 ret = fcntl(fd, cmd, arg);
-#ifndef __OS2__
         } while (ret == -1 && errno == EINTR);
-#else
-/* On OS/2 - we randomly get 'Resource Temporarily Unavailable' errors - ignore these */
-        } while (ret == -1 && ((errno == EINTR)||(errno == EAGAIN)));
-#endif
         return ret;
 }
-
 /*******************************************************************
 A fcntl wrapper that will deal with EINTR.
 ********************************************************************/
-
 int sys_fcntl_long(int fd, int cmd, long arg)
 {
         int ret;
-
         do {
                 ret = fcntl(fd, cmd, arg);
-#ifndef __OS2__
         } while (ret == -1 && errno == EINTR);
-#else
-/* On OS/2 - we randomly get 'Resource Temporarily Unavailable' errors - ignore these */
-        } while (ret == -1 && ((errno == EINTR)||(errno == EAGAIN)));
-#endif
-
         return ret;
 }

branches/samba-3.0/source/lib/util.c

@@ -747 +747 @@
         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;
@@ -752 +753 @@
                 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
 }