Rename snprintf replacement rpl_snprintf since we may now replace

the libc version and #define rpl_snprintf snprintf in missing.h so
we get our version when needed.  This is consistent with how we
replace glob and fnmatch.

diff --git a/compat/snprintf.c b/compat/snprintf.c
index 7384ecfa31bc522182e7271e9917fc4819607b19..3718a3c36bc70570c01a78aea65d90084d3241b6 100644 (file)
--- a/compat/snprintf.c
+++ b/compat/snprintf.c
@@ -672,7 +672,7 @@ done:
 
 #if !defined(HAVE_VSNPRINTF) || defined(PREFER_PORTABLE_SNPRINTF)
 int
-vsnprintf(char *str, size_t n, const char *fmt, va_list ap)
+rpl_vsnprintf(char *str, size_t n, const char *fmt, va_list ap)
 {
 
        return xxxprintf(&str, n, 0, fmt, ap);
@@ -681,7 +681,7 @@ vsnprintf(char *str, size_t n, const char *fmt, va_list ap)
 
 #if !defined(HAVE_SNPRINTF) || defined(PREFER_PORTABLE_SNPRINTF)
 int
-snprintf(char *str, size_t n, char const *fmt, ...)
+rpl_snprintf(char *str, size_t n, char const *fmt, ...)
 {
        int ret;
        va_list ap;
@@ -695,7 +695,7 @@ snprintf(char *str, size_t n, char const *fmt, ...)
 
 #if !defined(HAVE_VASPRINTF) || defined(PREFER_PORTABLE_SNPRINTF)
 int
-vasprintf(char **str, const char *fmt, va_list ap)
+rpl_vasprintf(char **str, const char *fmt, va_list ap)
 {
 
        return xxxprintf(str, 0, 1, fmt, ap);
@@ -704,7 +704,7 @@ vasprintf(char **str, const char *fmt, va_list ap)
 
 #if !defined(HAVE_ASPRINTF) || defined(PREFER_PORTABLE_SNPRINTF)
 int
-asprintf(char **str, char const *fmt, ...)
+rpl_asprintf(char **str, char const *fmt, ...)
 {
        int ret;
        va_list ap;

diff --git a/include/missing.h b/include/missing.h
index 9860053e94f3ae69c771283cd4919a9493962467..b2cc05e1a9645b2c20a9061ed2e9fcb0e794c7d2 100644 (file)
--- a/include/missing.h
+++ b/include/missing.h
@@ -394,17 +394,25 @@ int utimes(const char *, const struct timeval *);
 #ifdef HAVE_FUTIME
 int futimes(int, const struct timeval *);
 #endif
-#ifndef HAVE_SNPRINTF
-int snprintf(char *, size_t, const char *, ...) __printflike(3, 4);
-#endif
-#ifndef HAVE_VSNPRINTF
-int vsnprintf(char *, size_t, const char *, va_list) __printflike(3, 0);
-#endif
-#ifndef HAVE_ASPRINTF
-int asprintf(char **, const char *, ...) __printflike(2, 3);
-#endif
-#ifndef HAVE_VASPRINTF
-int vasprintf(char **, const char *, va_list) __printflike(2, 0);
+#if !defined(HAVE_SNPRINTF) || defined(PREFER_PORTABLE_SNPRINTF)
+int rpl_snprintf(char *, size_t, const char *, ...) __printflike(3, 4);
+# undef snprintf
+# define snprintf rpl_snprintf
+#endif
+#if !defined(HAVE_VSNPRINTF) || defined(PREFER_PORTABLE_SNPRINTF)
+int rpl_vsnprintf(char *, size_t, const char *, va_list) __printflike(3, 0);
+# undef vsnprintf
+# define vsnprintf rpl_vsnprintf
+#endif
+#if !defined(HAVE_ASPRINTF) || defined(PREFER_PORTABLE_SNPRINTF)
+int rpl_asprintf(char **, const char *, ...) __printflike(2, 3);
+# undef asprintf
+# define asprintf rpl_asprintf
+#endif
+#if !defined(HAVE_VASPRINTF) || defined(PREFER_PORTABLE_SNPRINTF)
+int rpl_vasprintf(char **, const char *, va_list) __printflike(2, 0);
+# undef vasprintf
+# define vasprintf rpl_vasprintf
 #endif
 #ifndef HAVE_STRLCAT
 size_t strlcat(char *, const char *, size_t);