strlcpy finish cleanup

remove strlcpy & strlcat from string.h

document suspicious strlcpy call

convert strlcat.h users to string-extra

Change-Id: I313e75db86385c0e6d1aee75d252093be4935f60

3 files changed, 3 insertions, 3 deletions

diff --git a/firmware/common/file_internal.c b/firmware/common/file_internal.c
index 9ddbb232b4..a73d9beaa2 100644
--- a/firmware/common/file_internal.c
+++ b/firmware/common/file_internal.c
@@ -227,6 +227,7 @@ void iso_decode_d_name(char *d_name)
         return;
 
     char shortname[13];
+    /* this only gets called in the case of DOS (8.3) filenames */
     size_t len = strlcpy(shortname, d_name, sizeof (shortname));
     /* This MUST be the default codepage thus not something that could be
        loaded on call */
diff --git a/firmware/common/strlcpy.c b/firmware/common/strlcpy.c
index bfdb6482a4..5107ea1207 100644
--- a/firmware/common/strlcpy.c
+++ b/firmware/common/strlcpy.c
@@ -34,6 +34,6 @@ size_t strlcpy(char *dst, const char *src, size_t siz)
     if (d)
         return (d - dst - 1); /* count does not include NUL */
 
-    /* Not enough room in dst, add NUL and traverse rest of src */
+    /* Not enough room in dst, traverse rest of src */
     return(siz + strlen(src+siz)); /* count does not include NUL */
 }
diff --git a/firmware/common/zip.c b/firmware/common/zip.c
index 22c6226e3b..6d250abb58 100644
--- a/firmware/common/zip.c
+++ b/firmware/common/zip.c
@@ -20,8 +20,7 @@
  ****************************************************************************/
 
 #include "zip.h"
-#include <string.h>
-#include "strlcpy.h"
+#include "string-extra.h"
 #include "file.h"
 #include "dir.h"
 #include "system.h"