summaryrefslogtreecommitdiff
path: root/lib/replace
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-02-11 20:18:50 +1100
committerAndrew Tridgell <tridge@samba.org>2010-02-11 21:04:13 +1100
commitd6fb64c51244529388b1f79ba8220ff608e1e4de (patch)
treea251db001e467af5a8d833bc29621f8d6a305cde /lib/replace
parentc986bfb22ec6ee1bda8a7c4053770831f582cbb3 (diff)
downloadsamba-d6fb64c51244529388b1f79ba8220ff608e1e4de.tar.gz
samba-d6fb64c51244529388b1f79ba8220ff608e1e4de.tar.bz2
samba-d6fb64c51244529388b1f79ba8220ff608e1e4de.zip
libreplace: added replacements for dprintf() and vdprintf()
these are very useful for writing files with formatted writes Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
Diffstat (limited to 'lib/replace')
-rw-r--r--lib/replace/libreplace.m42
-rw-r--r--lib/replace/replace.c31
2 files changed, 32 insertions, 1 deletions
diff --git a/lib/replace/libreplace.m4 b/lib/replace/libreplace.m4
index 1353c1f7d2..7a26deb611 100644
--- a/lib/replace/libreplace.m4
+++ b/lib/replace/libreplace.m4
@@ -108,7 +108,7 @@ AC_CHECK_HEADERS(unix.h)
AC_CHECK_FUNCS(seteuid setresuid setegid setresgid chroot bzero strerror)
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>])
AC_HAVE_DECL(setresgid, [#include <unistd.h>])
diff --git a/lib/replace/replace.c b/lib/replace/replace.c
index df29185564..6f0851da7c 100644
--- a/lib/replace/replace.c
+++ b/lib/replace/replace.c
@@ -704,3 +704,34 @@ void *rep_memmem(const void *haystack, size_t haystacklen,
}
#endif
+#ifndef HAVE_VDPRINTF
+int 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
+
+#ifndef HAVE_DPRINTF
+int 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
+