X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/14175f1e7700e4e800692fc2c466cbd27a60176e..c7677b892a068d169a64fb699b6e41b0a342e390:/lib/compat.c

diff --git a/lib/compat.c b/lib/compat.c
index ef57d900..bf013763 100644
--- a/lib/compat.c
+++ b/lib/compat.c
@@ -97,12 +97,15 @@
 
 
 #ifndef HAVE_STRLCPY
-/* like strncpy but does not 0 fill the buffer and always null 
-   terminates. bufsize is the size of the destination buffer */
+/* Like strncpy but does not 0 fill the buffer and always null 
+ * terminates. bufsize is the size of the destination buffer.
+ *
+ * Returns the index of the terminating byte. */
  size_t strlcpy(char *d, const char *s, size_t bufsize)
 {
 	size_t len = strlen(s);
 	size_t ret = len;
+	if (bufsize <= 0) return 0;
 	if (len >= bufsize) len = bufsize-1;
 	memcpy(d, s, len);
 	d[len] = 0;
@@ -137,10 +140,10 @@
 	unsigned char *p = (unsigned char *)&ip.s_addr;
 	static char buf[18];
 #if WORDS_BIGENDIAN
-	slprintf(buf, 18, "%d.%d.%d.%d", 
+	snprintf(buf, 18, "%d.%d.%d.%d", 
 		 (int)p[0], (int)p[1], (int)p[2], (int)p[3]);
 #else
-	slprintf(buf, 18, "%d.%d.%d.%d", 
+	snprintf(buf, 18, "%d.%d.%d.%d", 
 		 (int)p[3], (int)p[2], (int)p[1], (int)p[0]);
 #endif
 	return buf;