1 files changed, 3 insertions, 16 deletions

diff --git a/firmware/common/strlcat.c b/firmware/common/strlcat.c
index 783ea4daba..f1f0031f06 100644
--- a/firmware/common/strlcat.c
+++ b/firmware/common/strlcat.c
@@ -16,7 +16,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <string.h>
+#include "string-extra.h"
 
 /*
  * Appends src to string dst of size siz (unlike strncat, siz is the
@@ -29,9 +29,7 @@ size_t
 strlcat(char *dst, const char *src, size_t siz)
 {
         char *d = dst;
-        const char *s = src;
-        size_t n = siz;
-        size_t dlen;
+        size_t dlen, n = siz;
 
         /* Find the end of dst and adjust bytes left but don't go past end */
         while (n-- != 0 && *d != '\0')
@@ -39,17 +37,6 @@ strlcat(char *dst, const char *src, size_t siz)
         dlen = d - dst;
         n = siz - dlen;
 
-        if (n == 0)
-                return(dlen + strlen(s));
-        while (*s != '\0') {
-                if (n != 1) {
-                        *d++ = *s;
-                        n--;
-                }
-                s++;
-        }
-        *d = '\0';
-
-        return(dlen + (s - src));       /* count does not include NUL */
+        return strlcpy(dst + dlen, src, n) + dlen;
 }