diff options
-rw-r--r-- | apps/plugin.c | 3 | ||||
-rw-r--r-- | apps/plugin.h | 1 | ||||
-rw-r--r-- | firmware/SOURCES | 1 | ||||
-rw-r--r-- | firmware/common/strlcat.c | 56 | ||||
-rw-r--r-- | firmware/include/string.h | 1 |
5 files changed, 61 insertions, 1 deletions
diff --git a/apps/plugin.c b/apps/plugin.c index ab5ccf5a1b..47f2465631 100644 --- a/apps/plugin.c +++ b/apps/plugin.c | |||
@@ -682,8 +682,9 @@ static const struct plugin_api rockbox_api = { | |||
682 | viewportmanager_theme_undo, | 682 | viewportmanager_theme_undo, |
683 | #endif | 683 | #endif |
684 | #if !defined(SIMULATOR) || defined(__MINGW32__) || defined(__CYGWIN__) | 684 | #if !defined(SIMULATOR) || defined(__MINGW32__) || defined(__CYGWIN__) |
685 | &errno | 685 | &errno, |
686 | #endif | 686 | #endif |
687 | strlcat, | ||
687 | }; | 688 | }; |
688 | 689 | ||
689 | int plugin_load(const char* plugin, const void* parameter) | 690 | int plugin_load(const char* plugin, const void* parameter) |
diff --git a/apps/plugin.h b/apps/plugin.h index c92fcef736..cf16eef94f 100644 --- a/apps/plugin.h +++ b/apps/plugin.h | |||
@@ -863,6 +863,7 @@ struct plugin_api { | |||
863 | #if !defined(SIMULATOR) || defined(__MINGW32__) || defined(__CYGWIN__) | 863 | #if !defined(SIMULATOR) || defined(__MINGW32__) || defined(__CYGWIN__) |
864 | int* __errno; | 864 | int* __errno; |
865 | #endif | 865 | #endif |
866 | size_t (*strlcat)(char *dst, const char *src, size_t length); | ||
866 | }; | 867 | }; |
867 | 868 | ||
868 | /* plugin header */ | 869 | /* plugin header */ |
diff --git a/firmware/SOURCES b/firmware/SOURCES index a0c0629868..4b174d0d62 100644 --- a/firmware/SOURCES +++ b/firmware/SOURCES | |||
@@ -53,6 +53,7 @@ common/strcmp.c | |||
53 | common/strnatcmp.c | 53 | common/strnatcmp.c |
54 | common/strcpy.c | 54 | common/strcpy.c |
55 | common/strncmp.c | 55 | common/strncmp.c |
56 | common/strlcat.c | ||
56 | common/strlcpy.c | 57 | common/strlcpy.c |
57 | common/strrchr.c | 58 | common/strrchr.c |
58 | common/strtok.c | 59 | common/strtok.c |
diff --git a/firmware/common/strlcat.c b/firmware/common/strlcat.c new file mode 100644 index 0000000000..0a113dd134 --- /dev/null +++ b/firmware/common/strlcat.c | |||
@@ -0,0 +1,56 @@ | |||
1 | /* $OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $ */ | ||
2 | |||
3 | /* | ||
4 | * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com> | ||
5 | * | ||
6 | * Permission to use, copy, modify, and distribute this software for any | ||
7 | * purpose with or without fee is hereby granted, provided that the above | ||
8 | * copyright notice and this permission notice appear in all copies. | ||
9 | * | ||
10 | * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES | ||
11 | * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF | ||
12 | * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR | ||
13 | * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES | ||
14 | * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN | ||
15 | * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF | ||
16 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. | ||
17 | */ | ||
18 | |||
19 | #include <sys/types.h> | ||
20 | #include <string.h> | ||
21 | |||
22 | /* | ||
23 | * Appends src to string dst of size siz (unlike strncat, siz is the | ||
24 | * full size of dst, not space left). At most siz-1 characters | ||
25 | * will be copied. Always NUL terminates (unless siz <= strlen(dst)). | ||
26 | * Returns strlen(src) + MIN(siz, strlen(initial dst)). | ||
27 | * If retval >= siz, truncation occurred. | ||
28 | */ | ||
29 | size_t | ||
30 | strlcat(char *dst, const char *src, size_t siz) | ||
31 | { | ||
32 | char *d = dst; | ||
33 | const char *s = src; | ||
34 | size_t n = siz; | ||
35 | size_t dlen; | ||
36 | |||
37 | /* Find the end of dst and adjust bytes left but don't go past end */ | ||
38 | while (n-- != 0 && *d != '\0') | ||
39 | d++; | ||
40 | dlen = d - dst; | ||
41 | n = siz - dlen; | ||
42 | |||
43 | if (n == 0) | ||
44 | return(dlen + strlen(s)); | ||
45 | while (*s != '\0') { | ||
46 | if (n != 1) { | ||
47 | *d++ = *s; | ||
48 | n--; | ||
49 | } | ||
50 | s++; | ||
51 | } | ||
52 | *d = '\0'; | ||
53 | |||
54 | return(dlen + (s - src)); /* count does not include NUL */ | ||
55 | } | ||
56 | |||
diff --git a/firmware/include/string.h b/firmware/include/string.h index 6085c10eb6..c647178ffe 100644 --- a/firmware/include/string.h +++ b/firmware/include/string.h | |||
@@ -42,6 +42,7 @@ char *_EXFUN(strstr,(const char *, const char *)); | |||
42 | char *_EXFUN(strcasestr,(const char *, const char *)); | 42 | char *_EXFUN(strcasestr,(const char *, const char *)); |
43 | 43 | ||
44 | size_t strlcpy(char *dst, const char *src, size_t siz); | 44 | size_t strlcpy(char *dst, const char *src, size_t siz); |
45 | size_t strlcat(char *dst, const char *src, size_t siz); | ||
45 | 46 | ||
46 | #ifndef _REENT_ONLY | 47 | #ifndef _REENT_ONLY |
47 | char *_EXFUN(strtok,(char *, const char *)); | 48 | char *_EXFUN(strtok,(char *, const char *)); |