Changeset 745 for trunk/server/source3/lib/system.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source3/lib/system.c (modified) (18 diffs)

trunk/server/source3/lib/system.c

@@ -22 +22 @@
 
 #include "includes.h"
+
+
+
+
 
 #ifdef HAVE_SYS_PRCTL_H
 #include <sys/prctl.h>
+
+
+
 #endif
 
@@ -124 +131 @@
         do {
                 ret = read(fd, buf, count);
-        } while (ret == -1 && errno == EINTR);
+#if defined(EWOULDBLOCK)
+        } while (ret == -1 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK));
+#else
+        } while (ret == -1 && (errno == EINTR || errno == EAGAIN));
+#endif
         return ret;
 }
@@ -138 +149 @@
         do {
                 ret = write(fd, buf, count);
-        } while (ret == -1 && errno == EINTR);
+#if defined(EWOULDBLOCK)
+        } while (ret == -1 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK));
+#else
+        } while (ret == -1 && (errno == EINTR || errno == EAGAIN));
+#endif
         return ret;
 }
@@ -163 +178 @@
         do {
                 ret = writev(fd, iov, iovcnt);
-        } while (ret == -1 && errno == EINTR);
+#if defined(EWOULDBLOCK)
+        } while (ret == -1 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK));
+#else
+        } while (ret == -1 && (errno == EINTR || errno == EAGAIN));
+#endif
         return ret;
 }
@@ -208 +227 @@
 
 /*******************************************************************
-A send wrapper that will deal with EINTR.
+A send wrapper that will deal with EINTR.
 ********************************************************************/
 
@@ -217 +236 @@
         do {
                 ret = send(s, msg, len, flags);
-        } while (ret == -1 && errno == EINTR);
-        return ret;
-}
-
-/*******************************************************************
-A sendto wrapper that will deal with EINTR.
+#if defined(EWOULDBLOCK)
+        } while (ret == -1 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK));
+#else
+        } while (ret == -1 && (errno == EINTR || errno == EAGAIN));
+#endif
+        return ret;
+}
+
+/*******************************************************************
+A sendto wrapper that will deal with EINTR or EAGAIN or EWOULDBLOCK.
 ********************************************************************/
 
@@ -231 +254 @@
         do {
                 ret = sendto(s, msg, len, flags, to, tolen);
-        } while (ret == -1 && errno == EINTR);
-        return ret;
-}
-
-/*******************************************************************
-A recv wrapper that will deal with EINTR.
+#if defined(EWOULDBLOCK)
+        } while (ret == -1 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK));
+#else
+        } while (ret == -1 && (errno == EINTR || errno == EAGAIN));
+#endif
+        return ret;
+}
+
+/*******************************************************************
+A recv wrapper that will deal with EINTR or EAGAIN or EWOULDBLOCK.
 ********************************************************************/
 
@@ -245 +272 @@
         do {
                 ret = recv(fd, buf, count, flags);
-        } while (ret == -1 && errno == EINTR);
+#if defined(EWOULDBLOCK)
+        } while (ret == -1 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK));
+#else
+        } while (ret == -1 && (errno == EINTR || errno == EAGAIN));
+#endif
         return ret;
 }
@@ -259 +290 @@
         do {
                 ret = recvfrom(s, buf, len, flags, from, fromlen);
-        } while (ret == -1 && errno == EINTR);
+#if defined(EWOULDBLOCK)
+        } while (ret == -1 && (errno == EINTR || errno == EAGAIN || errno == EWOULDBLOCK));
+#else
+        } while (ret == -1 && (errno == EINTR || errno == EAGAIN));
+#endif
         return ret;
 }
@@ -637 +672 @@
 #elif defined(HAVE_POSIX_FALLOCATE) && !defined(HAVE_BROKEN_POSIX_FALLOCATE)
         return posix_fallocate(fd, offset, len);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 #else
         return ENOSYS;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 #endif
 }
@@ -743 +838 @@
 }
 
+
+
+
+
+
+
+
+
+
 
 /*******************************************************************
@@ -778 +882 @@
 #else
         return opendir(name);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 #endif
 }
@@ -1033 +1155 @@
 }
 
+
+
+
+
 /**************************************************************************
  Returns equivalent to NGROUPS_MAX - using sysconf if needed.
@@ -1053 +1179 @@
 
 #if defined(HAVE_BROKEN_GETGROUPS)
+
+
+
+
+
+
+
 static int sys_broken_getgroups(int setlen, gid_t *gidset)
 {
@@ -1232 +1365 @@
 
 /**************************************************************************
- Wrappers for setpwent(), getpwent() and endpwent()
-****************************************************************************/
-
-void sys_setpwent(void)
-{
-        setpwent();
-}
-
-struct passwd *sys_getpwent(void)
-{
-        return getpwent();
-}
-
-void sys_endpwent(void)
-{
-        endpwent();
-}
-
-/**************************************************************************
- Wrappers for getpwnam(), getpwuid(), getgrnam(), getgrgid()
-****************************************************************************/
-
-
-struct passwd *sys_getpwnam(const char *name)
-{
-        return getpwnam(name);
-}
-
-struct passwd *sys_getpwuid(uid_t uid)
-{
-        return getpwuid(uid);
-}
-
-struct group *sys_getgrnam(const char *name)
-{
-        return getgrnam(name);
-}
-
-struct group *sys_getgrgid(gid_t gid)
-{
-        return getgrgid(gid);
-}
-
-/**************************************************************************
  Extract a command into an arg list.
 ****************************************************************************/
@@ -1442 +1531 @@
 
         SAFE_FREE(entry);
-        SAFE_FREE(argl);
+        _FREE(argl);
         close(pipe_fds[0]);
         close(pipe_fds[1]);
@@ -1774 +1863 @@
                 }
                 /* Shift results back, so we can prepend prefixes */
-                buf = memmove(list + len, list, list_size);
+                buf = memmove(list + len, list, list_size);
 
                 for(i = 0; i < list_size; i += len + 1) {
@@ -2583 +2672 @@
 }
 #endif /* WITH_AIO */
-
-int sys_getpeereid( int s, uid_t *uid)
-{
-#if defined(HAVE_PEERCRED)
-        struct ucred cred;
-        socklen_t cred_len = sizeof(struct ucred);
-        int ret;
-
-        ret = getsockopt(s, SOL_SOCKET, SO_PEERCRED, (void *)&cred, &cred_len);
-        if (ret != 0) {
-                return -1;
-        }
-
-        if (cred_len != sizeof(struct ucred)) {
-                errno = EINVAL;
-                return -1;
-        }
-
-        *uid = cred.uid;
-        return 0;
-#else
-        errno = ENOSYS;
-        return -1;
-#endif
-}
-
-int sys_getnameinfo(const struct sockaddr *psa,
-                        socklen_t salen,
-                        char *host,
-                        size_t hostlen,
-                        char *service,
-                        size_t servlen,
-                        int flags)
-{
-        /*
-         * For Solaris we must make sure salen is the
-         * correct length for the incoming sa_family.
-         */
-
-        if (salen == sizeof(struct sockaddr_storage)) {
-                salen = sizeof(struct sockaddr_in);
-#if defined(HAVE_IPV6)
-                if (psa->sa_family == AF_INET6) {
-                        salen = sizeof(struct sockaddr_in6);
-                }
-#endif
-        }
-        return getnameinfo(psa, salen, host, hostlen, service, servlen, flags);
-}
-
-int sys_connect(int fd, const struct sockaddr * addr)
-{
-        socklen_t salen = -1;
-
-        if (addr->sa_family == AF_INET) {
-            salen = sizeof(struct sockaddr_in);
-        } else if (addr->sa_family == AF_UNIX) {
-            salen = sizeof(struct sockaddr_un);
-        }
-#if defined(HAVE_IPV6)
-        else if (addr->sa_family == AF_INET6) {
-            salen = sizeof(struct sockaddr_in6);
-        }
-#endif
-
-        return connect(fd, addr, salen);
-}