lib: string: Fix strlcpy return value

strlcpy should always return the number of bytes copied. We were
accidentally missing the nul-terminator. We also always used to return a
non-zero value, even if we did not actually copy anything.

Fixes: 23cd138503 ("Integrate USB gadget layer and USB CDC driver layer")
Signed-off-by: Sean Anderson <seanga2@gmail.com>

diff --git a/lib/string.c b/lib/string.c
index 73b984123dc97296f10622c58d55198e3b151840..1b867ac09d0747cfaa43a8b6e7b02c8190c903aa 100644 (file)
--- a/lib/string.c
+++ b/lib/string.c
@@ -114,17 +114,21 @@ char * strncpy(char * dest,const char *src,size_t count)
  * NUL-terminated string that fits in the buffer (unless,
  * of course, the buffer size is zero). It does not pad
  * out the result like strncpy() does.
+ *
+ * Return: the number of bytes copied
  */
 size_t strlcpy(char *dest, const char *src, size_t size)
 {
-       size_t ret = strlen(src);
-
        if (size) {
-               size_t len = (ret >= size) ? size - 1 : ret;
+               size_t srclen = strlen(src);
+               size_t len = (srclen >= size) ? size - 1 : srclen;
+
                memcpy(dest, src, len);
                dest[len] = '\0';
+               return len + 1;
        }
-       return ret;
+
+       return 0;
 }
 #endif