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

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

File:

• branches/samba-3.5.x/lib/replace/replace.c (modified) (1 diff)

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
+