Changeset 773 for branches/samba-3.5.x/lib/replace

Timestamp:

Jul 2, 2013, 7:27:06 PM (12 years ago)

Author:

Herwig Bauernfeind

Message:

Samba Server 3.5: Update branch to 3.5.20

Location:

branches/samba-3.5.x/lib/replace

Files:

• libreplace.m4 (modified) (2 diffs)
• replace.c (modified) (1 diff)
• replace.h (modified) (3 diffs)
• snprintf.c (modified) (6 diffs)
• test/testsuite.c (modified) (2 diffs)

branches/samba-3.5.x/lib/replace/libreplace.m4

@@ -109 +109 @@
 AC_CHECK_FUNCS(vsyslog setlinebuf mktime ftruncate chsize rename)
 AC_CHECK_FUNCS(waitpid wait4 strlcpy strlcat initgroups memmove strdup)
-AC_CHECK_FUNCS(pread pwrite strndup strcasestr strtok_r mkdtemp dup2)
+AC_CHECK_FUNCS(pread pwrite strndup strcasestr strtok_r mkdtemp dup2 dprintf vdprintf)
 AC_CHECK_FUNCS(isatty chown lchown link readlink symlink realpath)
 AC_HAVE_DECL(setresuid, [#include <unistd.h>])
@@ -229 +229 @@
 AC_CHECK_FUNCS(strtoull __strtoull strtouq strtoll __strtoll strtoq)
 
+AC_CHECK_FUNCS(memmem)
+
 # this test disabled as we don't actually need __VA_ARGS__ yet
 AC_TRY_CPP([

branches/samba-3.5.x/lib/replace/replace.c

@@ -682 +682 @@
 }
 #endif
+
+
+#ifndef HAVE_MEMMEM
+void *rep_memmem(const void *haystack, size_t haystacklen,
+                 const void *needle, size_t needlelen)
+{
+        if (needlelen == 0) {
+                return discard_const(haystack);
+        }
+        while (haystacklen >= needlelen) {
+                char *p = memchr(haystack, *(const char *)needle,
+                                 haystacklen-(needlelen-1));
+                if (!p) return NULL;
+                if (memcmp(p, needle, needlelen) == 0) {
+                        return p;
+                }
+                haystack = p+1;
+                haystacklen -= (p - (const char *)haystack) + 1;
+        }
+        return NULL;
+}
+#endif
+
+#if !defined(HAVE_VDPRINTF) || !defined(HAVE_C99_VSNPRINTF)
+int rep_vdprintf(int fd, const char *format, va_list ap)
+{
+        char *s = NULL;
+        int ret;
+
+        vasprintf(&s, format, ap);
+        if (s == NULL) {
+                errno = ENOMEM;
+                return -1;
+        }
+        ret = write(fd, s, strlen(s));
+        free(s);
+        return ret;
+}
+#endif
+
+#if !defined(HAVE_DPRINTF) || !defined(HAVE_C99_VSNPRINTF)
+int rep_dprintf(int fd, const char *format, ...)
+{
+        int ret;
+        va_list ap;
+
+        va_start(ap, format);
+        ret = vdprintf(fd, format, ap);
+        va_end(ap);
+
+        return ret;
+}
+#endif
+

branches/samba-3.5.x/lib/replace/replace.h

@@ -141 +141 @@
 #endif
 
+#ifndef HAVE_MEMMEM
+#define memmem rep_memmem
+void *rep_memmem(const void *haystack, size_t haystacklen,
+                 const void *needle, size_t needlelen);
+#endif
+
 #ifndef HAVE_MKTIME
 #define mktime rep_mktime
@@ -351 +357 @@
 #endif
 
-#ifndef HAVE_VASPRINTF
+#if !defined(HAVE_VDPRINTF) || !defined(HAVE_C99_VSNPRINTF)
+#define vdprintf rep_vdprintf
+int rep_vdprintf(int fd, const char *format, va_list ap) PRINTF_ATTRIBUTE(2,0);
+#endif
+
+#if !defined(HAVE_DPRINTF) || !defined(HAVE_C99_VSNPRINTF)
+#define dprintf rep_dprintf
+int rep_dprintf(int fd, const char *format, ...) PRINTF_ATTRIBUTE(2,3);
+#endif
+
+#if !defined(HAVE_VASPRINTF) || !defined(HAVE_C99_VSNPRINTF)
 #define vasprintf rep_vasprintf
 int rep_vasprintf(char **ptr, const char *format, va_list ap) PRINTF_ATTRIBUTE(2,0);
@@ -366 +382 @@
 #endif
 
-#ifndef HAVE_ASPRINTF
+#if !defined(HAVE_ASPRINTF) || !defined(HAVE_C99_VSNPRINTF)
 #define asprintf rep_asprintf
 int rep_asprintf(char **,const char *, ...) PRINTF_ATTRIBUTE(2,3);
+#endif
+
+#if !defined(HAVE_C99_VSNPRINTF)
+#ifdef REPLACE_BROKEN_PRINTF
+/*
+ * We do not redefine printf by default
+ * as it breaks the build if system headers
+ * use __attribute__((format(printf, 3, 0)))
+ * instead of __attribute__((format(__printf__, 3, 0)))
+ */
+#define printf rep_printf
+#endif
+int rep_printf(const char *, ...) PRINTF_ATTRIBUTE(1,2);
+#endif
+
+#if !defined(HAVE_C99_VSNPRINTF)
+#define fprintf rep_fprintf
+int rep_fprintf(FILE *stream, const char *, ...) PRINTF_ATTRIBUTE(2,3);
 #endif
 

branches/samba-3.5.x/lib/replace/snprintf.c

@@ -1188 +1188 @@
 }
 
- int vsnprintf (char *str, size_t count, const char *fmt, va_list args)
+ int rep_vsnprintf (char *str, size_t count, const char *fmt, va_list args)
 {
         return dopr(str, count, fmt, args);
@@ -1201 +1201 @@
  */
 #if !defined(HAVE_SNPRINTF) || !defined(HAVE_C99_VSNPRINTF)
- int snprintf(char *str,size_t count,const char *fmt,...)
+ int rep_snprintf(char *str,size_t count,const char *fmt,...)
 {
         size_t ret;
@@ -1214 +1214 @@
 
 #ifndef HAVE_C99_VSNPRINTF
- int printf(const char *fmt, ...)
+ int rep_printf(const char *fmt, ...)
 {
         va_list ap;
@@ -1235 +1235 @@
 
 #ifndef HAVE_C99_VSNPRINTF
- int fprintf(FILE *stream, const char *fmt, ...)
+ int rep_fprintf(FILE *stream, const char *fmt, ...)
 {
         va_list ap;
@@ -1257 +1257 @@
 #endif 
 
-#ifndef HAVE_VASPRINTF
- int vasprintf(char **ptr, const char *format, va_list ap)
+#if !defined(HAVE_VASPRINTF) || !defined(HAVE_C99_VSNPRINTF)
+ int rep_vasprintf(char **ptr, const char *format, va_list ap)
 {
         int ret;
@@ -1279 +1279 @@
 #endif
 
-
-#ifndef HAVE_ASPRINTF
- int asprintf(char **ptr, const char *format, ...)
+#if !defined(HAVE_ASPRINTF) || !defined(HAVE_C99_VSNPRINTF)
+ int rep_asprintf(char **ptr, const char *format, ...)
 {
         va_list ap;

branches/samba-3.5.x/lib/replace/test/testsuite.c

@@ -1015 +1015 @@
         return true;
 }
+
+static int test_memmem(void)
+{
+        char *s;
+
+        printf("test: memmem\n");
+
+        s = memmem("foo", 3, "fo", 2);
+        if (strcmp(s, "foo") != 0) {
+                printf(__location__ ": Failed memmem\n");
+                return false;
+        }
+
+        s = memmem("foo", 3, "", 0);
+        if (strcmp(s, "foo") != 0) {
+                printf(__location__ ": Failed memmem\n");
+                return false;
+        }
+
+        s = memmem("foo", 4, "o", 1);
+        if (strcmp(s, "oo") != 0) {
+                printf(__location__ ": Failed memmem\n");
+                return false;
+        }
+
+        s = memmem("foobarfodx", 11, "fod", 3);
+        if (strcmp(s, "fodx") != 0) {
+                printf(__location__ ": Failed memmem\n");
+                return false;
+        }
+
+        printf("success: memmem\n");
+
+        return true;
+}
+
 
 struct torture_context;
@@ -1066 +1102 @@
         ret &= test_utime();
         ret &= test_utimes();
+        ret &= test_memmem();
 
         return ret;