Get rid of the last strcpy() call by using an static inline function.

diff --git a/popt/system.h b/popt/system.h
index d2bbb9d..0579b8c 100644 (file)
--- a/popt/system.h
+++ b/popt/system.h
@@ -95,9 +95,25 @@ char * xstrdup (const char *str)
        /*@*/;
 /*@=redecl =redef@*/
 
+#ifndef HAVE_STRLCPY
+size_t strlcpy(char *d, const char *s, size_t bufsize);
+#endif
+
+#ifndef HAVE_STRLCAT
+size_t strlcat(char *d, const char *s, size_t bufsize);
+#endif
+
 #if HAVE_MCHECK_H && defined(__GNUC__)
 #define        vmefail()       (fprintf(stderr, "virtual memory exhausted.\n"), exit(EXIT_FAILURE), NULL)
-#define xstrdup(_str)   (strcpy((malloc(strlen(_str)+1) ? : vmefail()), (_str)))
+static inline char *
+xstrdup(const char *s)
+{
+    size_t memsize = strlen(s) + 1;
+    char *ptr = malloc(memsize);
+    if (!ptr) vmefail();
+    strlcpy(ptr, s, memsize);
+    return ptr;
+}
 #else
 #define        xstrdup(_str)   strdup(_str)
 #endif  /* HAVE_MCHECK_H && defined(__GNUC__) */
@@ -106,14 +122,6 @@ char * xstrdup (const char *str)
 #define        getenv(_s)      __secure_getenv(_s)
 #endif
 
-#ifndef HAVE_STRLCPY
-size_t strlcpy(char *d, const char *s, size_t bufsize);
-#endif
-
-#ifndef HAVE_STRLCAT
-size_t strlcat(char *d, const char *s, size_t bufsize);
-#endif
-
 #if !defined HAVE_SNPRINTF || !defined HAVE_C99_VSNPRINTF
 #define snprintf rsync_snprintf
 int snprintf(char *str,size_t count,const char *fmt,...);