diff options
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/common/file_internal.c | 1 | ||||
| -rw-r--r-- | firmware/common/strlcpy.c | 2 | ||||
| -rw-r--r-- | firmware/common/zip.c | 3 | ||||
| -rw-r--r-- | firmware/drivers/fat.c | 2 | ||||
| -rw-r--r-- | firmware/libc/include/string.h | 3 |
5 files changed, 4 insertions, 7 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" diff --git a/firmware/drivers/fat.c b/firmware/drivers/fat.c index 30d16f3666..20c8f2b8e0 100644 --- a/firmware/drivers/fat.c +++ b/firmware/drivers/fat.c @@ -22,7 +22,7 @@ #include "config.h" #include "system.h" #include "sys/types.h" -#include <string.h> +#include "string-extra.h" #include <ctype.h> #include <stdlib.h> #include <stdio.h> diff --git a/firmware/libc/include/string.h b/firmware/libc/include/string.h index 4ec2f8dd67..6217fff15c 100644 --- a/firmware/libc/include/string.h +++ b/firmware/libc/include/string.h @@ -40,9 +40,6 @@ size_t _EXFUN(strspn,(const char *, const char *)); char *_EXFUN(strstr,(const char *, const char *)); char *_EXFUN(strcasestr,(const char *, const char *)); -size_t strlcpy(char *dst, const char *src, size_t siz); -size_t strlcat(char *dst, const char *src, size_t siz); - #ifndef _REENT_ONLY char *_EXFUN(strtok,(char *, const char *)); #endif |