Rewrote safestrncpy() using our own code instead of a call

to strncpy().  Eliminates overlap warnings.

diff --git a/citadel/tools.c b/citadel/tools.c
index 0f85643ee1ad003b2db388e7bf0bc17af6103136..a19f5c68e567626eb9c7876379452ad99ed034d2 100644 (file)
--- a/citadel/tools.c
+++ b/citadel/tools.c
@@ -42,11 +42,18 @@ char *ascmonths[12] = {
 
 char *safestrncpy(char *dest, const char *src, size_t n)
 {
+       int i = 0;
+
        if (dest == NULL || src == NULL) {
                fprintf(stderr, "safestrncpy: NULL argument\n");
                abort();
        }
-       strncpy(dest, src, n);
+
+       do {
+               dest[i] = src[i];
+               if (dest[i] == 0) return(dest);
+               ++i;
+       } while (i<n);
        dest[n - 1] = 0;
        return dest;
 }