Changeset 988 for vendor/current/lib/replace/replace.c

Timestamp:

Nov 24, 2016, 1:14:11 PM (9 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to version 4.4.3

File:

• vendor/current/lib/replace/replace.c (modified) (13 diffs)

vendor/current/lib/replace/replace.c

@@ -28 +28 @@
 #include "system/filesys.h"
 #include "system/time.h"
+#include "system/network.h"
 #include "system/passwd.h"
 #include "system/syslog.h"
@@ -64 +65 @@
 
 #ifndef HAVE_STRLCPY
-/* like strncpy but does not 0 fill the buffer and always null 
-   terminates. bufsize is the size of the destination buffer */
+/*
+ * Like strncpy but does not 0 fill the buffer and always null
+ * terminates. bufsize is the size of the destination buffer.
+ * Returns the length of s.
+ */
 size_t rep_strlcpy(char *d, const char *s, size_t bufsize)
 {
         size_t len = strlen(s);
         size_t ret = len;
-        if (bufsize <= 0) return 0;
-        if (len >= bufsize) len = bufsize-1;
+
+        if (bufsize <= 0) {
+                return 0;
+        }
+        if (len >= bufsize) {
+                len = bufsize - 1;
+        }
         memcpy(d, s, len);
         d[len] = 0;
@@ -84 +93 @@
 size_t rep_strlcat(char *d, const char *s, size_t bufsize)
 {
-        size_t len1 = strlen(d);
+        size_t len1 = strnlen(d, bufsize);
         size_t len2 = strlen(s);
         size_t ret = len1 + len2;
@@ -212 +221 @@
 }
 #endif /* HAVE_INITGROUPS */
-
-
-#if (defined(SecureWare) && defined(SCO))
-/* This is needed due to needing the nap() function but we don't want
-   to include the Xenix libraries since that will break other things...
-   BTW: system call # 0x0c28 is the same as calling nap() */
-long nap(long milliseconds) {
-         return syscall(0x0c28, milliseconds);
- }
-#endif
 
 
@@ -412 +411 @@
         /* have a reasonable go at emulating it. Hope that
            the system mktemp() isn't completely hopeless */
-        char *p = mktemp(template);
-        if (!p)
+        mktemp(template);
+        if (template[0] == 0)
                 return -1;
-        return open(p, O_CREAT|O_EXCL|O_RDWR, 0600);
+        return open(template, O_CREAT|O_EXCL|O_RDWR, 0600);
 }
 #endif
@@ -477 +476 @@
 #endif
 
+#ifndef HAVE_STRSEP
+char *rep_strsep(char **pps, const char *delim)
+{
+        char *ret = *pps;
+        char *p = *pps;
+
+        if (p == NULL) {
+                return NULL;
+        }
+        p += strcspn(p, delim);
+        if (*p == '\0') {
+                *pps = NULL;
+        } else {
+                *p = '\0';
+                *pps = p + 1;
+        }
+        return ret;
+}
+#endif
+
 #ifndef HAVE_STRTOK_R
 /* based on GLIBC version, copyright Free Software Foundation */
@@ -520 +539 @@
 #else
 #ifdef HAVE_BSD_STRTOLL
-#ifdef HAVE_STRTOQ
+#undef strtoll
 long long int rep_strtoll(const char *str, char **endptr, int base)
 {
-        long long int nb = strtoq(str, endptr, base);
-        /* In linux EINVAL is only returned if base is not ok */
+        int saved_errno = errno;
+        long long int nb = strtoll(str, endptr, base);
+        /* With glibc EINVAL is only returned if base is not ok */
         if (errno == EINVAL) {
                 if (base == 0 || (base >1 && base <37)) {
@@ -531 +551 @@
                          * Let's reset errno.
                          */
-                        errno = 0;
+                        errno = saved_errno;
                 }
         }
         return nb;
 }
-#else
-#error "You need the strtoq function"
-#endif /* HAVE_STRTOQ */
 #endif /* HAVE_BSD_STRTOLL */
 #endif /* HAVE_STRTOLL */
@@ -558 +575 @@
 #else
 #ifdef HAVE_BSD_STRTOLL
-#ifdef HAVE_STRTOUQ
+#undef strtoull
 unsigned long long int rep_strtoull(const char *str, char **endptr, int base)
 {
-        unsigned long long int nb = strtouq(str, endptr, base);
-        /* In linux EINVAL is only returned if base is not ok */
+        int saved_errno = errno;
+        unsigned long long int nb = strtoull(str, endptr, base);
+        /* With glibc EINVAL is only returned if base is not ok */
         if (errno == EINVAL) {
                 if (base == 0 || (base >1 && base <37)) {
@@ -569 +587 @@
                          * Let's reset errno.
                          */
-                        errno = 0;
+                        errno = saved_errno;
                 }
         }
         return nb;
 }
-#else
-#error "You need the strtouq function"
-#endif /* HAVE_STRTOUQ */
 #endif /* HAVE_BSD_STRTOLL */
 #endif /* HAVE_STRTOULL */
@@ -795 +810 @@
 #endif
 
-#if !defined(HAVE_STRERROR_R) || !defined(STRERROR_R_PROTO_COMPATIBLE)
+#ifndef HAVE_STRERROR_R
 int rep_strerror_r(int errnum, char *buf, size_t buflen)
 {
@@ -814 +829 @@
         switch (clk_id) {
                 case 0: /* CLOCK_REALTIME :*/
-#ifdef HAVE_GETTIMEOFDAY_TZ
+#if defined(HAVE_GETTIMEOFDAY_TZ) || defined(HAVE_GETTIMEOFDAY_TZ_VOID)
                         gettimeofday(&tval,NULL);
 #else
@@ -829 +844 @@
 }
 #endif
+
+#ifndef HAVE_MEMALIGN
+void *rep_memalign( size_t align, size_t size )
+{
+#if defined(HAVE_POSIX_MEMALIGN)
+        void *p = NULL;
+        int ret = posix_memalign( &p, align, size );
+        if ( ret == 0 )
+                return p;
+
+        return NULL;
+#else
+        /* On *BSD systems memaligns doesn't exist, but memory will
+         * be aligned on allocations of > pagesize. */
+#if defined(SYSCONF_SC_PAGESIZE)
+        size_t pagesize = (size_t)sysconf(_SC_PAGESIZE);
+#elif defined(HAVE_GETPAGESIZE)
+        size_t pagesize = (size_t)getpagesize();
+#else
+        size_t pagesize = (size_t)-1;
+#endif
+        if (pagesize == (size_t)-1) {
+                errno = ENOSYS;
+                return NULL;
+        }
+        if (size < pagesize) {
+                size = pagesize;
+        }
+        return malloc(size);
+#endif
+}
+#endif
+
+#ifndef HAVE_GETPEEREID
+int rep_getpeereid(int s, uid_t *uid, gid_t *gid)
+{
+#if defined(HAVE_PEERCRED)
+        struct ucred cred;
+        socklen_t cred_len = sizeof(struct ucred);
+        int ret;
+
+#undef getsockopt
+        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;
+        *gid = cred.gid;
+        return 0;
+#else
+        errno = ENOSYS;
+        return -1;
+#endif
+}
+#endif
+
+#ifndef HAVE_USLEEP
+int rep_usleep(useconds_t sec)
+{
+        struct timeval tval;
+        /*
+         * Fake it with select...
+         */
+        tval.tv_sec = 0;
+        tval.tv_usec = usecs/1000;
+        select(0,NULL,NULL,NULL,&tval);
+        return 0;
+}
+#endif /* HAVE_USLEEP */
+
+#ifndef HAVE_SETPROCTITLE
+void rep_setproctitle(const char *fmt, ...)
+{
+}
+#endif