Changeset 247 for branches/samba-3.2.x/source/lib/system.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/system.c (modified) (7 diffs)

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

@@ -124 +124 @@
         do {
                 ret = read(fd, buf, count);
-#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;
 }
@@ -143 +138 @@
         do {
                 ret = write(fd, buf, count);
-#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;
 }
@@ -192 +182 @@
                 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
-
+        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)
@@ -217 +199 @@
                 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
-
+        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;
-}
-
+        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;
-}
-
+        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);
-#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;
 }
@@ -294 +247 @@
         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;
 }
@@ -313 +261 @@
         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;
 }
@@ -332 +275 @@
         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;
 }