From 6e9af8bd4435fca55b91d6d794099121318972dc Mon Sep 17 00:00:00 2001 From: Torne Wuff Date: Sat, 2 Jan 2010 13:31:46 +0000 Subject: Add strlcat to core to match strlcpy (also add to plugin api). Some uses of strcat could probably do with being changed to this. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24141 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugin.c | 3 ++- apps/plugin.h | 1 + firmware/SOURCES | 1 + firmware/common/strlcat.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++ firmware/include/string.h | 1 + 5 files changed, 61 insertions(+), 1 deletion(-) create mode 100644 firmware/common/strlcat.c 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 = { viewportmanager_theme_undo, #endif #if !defined(SIMULATOR) || defined(__MINGW32__) || defined(__CYGWIN__) - &errno + &errno, #endif + strlcat, }; 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 { #if !defined(SIMULATOR) || defined(__MINGW32__) || defined(__CYGWIN__) int* __errno; #endif + size_t (*strlcat)(char *dst, const char *src, size_t length); }; /* 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 common/strnatcmp.c common/strcpy.c common/strncmp.c +common/strlcat.c common/strlcpy.c common/strrchr.c 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 @@ +/* $OpenBSD: strlcat.c,v 1.13 2005/08/08 08:05:37 espie Exp $ */ + +/* + * Copyright (c) 1998 Todd C. Miller + * + * Permission to use, copy, modify, and distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES + * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR + * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES + * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN + * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF + * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + */ + +#include +#include + +/* + * Appends src to string dst of size siz (unlike strncat, siz is the + * full size of dst, not space left). At most siz-1 characters + * will be copied. Always NUL terminates (unless siz <= strlen(dst)). + * Returns strlen(src) + MIN(siz, strlen(initial dst)). + * If retval >= siz, truncation occurred. + */ +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; + + /* Find the end of dst and adjust bytes left but don't go past end */ + while (n-- != 0 && *d != '\0') + d++; + 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 */ +} + 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 *)); 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 *)); -- cgit v1.2.3