diff -r ae816c83f082 -r d4902624e359 packages/language/c/libc/string/current/ChangeLog --- a/packages/language/c/libc/string/current/ChangeLog Tue May 11 16:26:19 2010 +0000 +++ b/packages/language/c/libc/string/current/ChangeLog Sun May 16 23:38:18 2010 +0200 @@ -1,3 +1,15 @@ +2010-05-16 Daniel Néri + + * src/strlcpy.c: New file, originally from OpenBSD, with added + tracing and assertions. + * src/strlcat.c: Ditto. + * src/bsdstring.h: Add prototypes for strlcpy and strlcat. + * cdl/string.cdl (CYGFUN_LIBC_STRING_BSD_FUNCS): Include strlcpy + and strlcat. Option is not compatible with strict ANSI + mode ("-ansi" option for GCC) + * include/bsdstring.h: BSD function prototypes are not provided in + strict ANSI mode. + 2010-05-10 Ross Younger * include/string.h: Declare strnlen. diff -r ae816c83f082 -r d4902624e359 packages/language/c/libc/string/current/cdl/string.cdl --- a/packages/language/c/libc/string/current/cdl/string.cdl Tue May 11 16:26:19 2010 +0000 +++ b/packages/language/c/libc/string/current/cdl/string.cdl Sun May 16 23:38:18 2010 +0200 @@ -111,12 +111,13 @@ requires { CYGBLD_ISO_STRING_BSD_FUNCS_HEADER == \ "" } requires CYGINT_ISO_CTYPE - compile bsdstring.cxx + requires { !is_substr(CYGBLD_GLOBAL_CFLAGS, " -ansi ") } + compile bsdstring.cxx strlcpy.c strlcat.c description " Enabling this option causes various compatibility functions commonly found in the BSD UNIX operating system to be included. These are functions such as bzero, bcmp, bcopy, bzero, strcasecmp, - strncasecmp, index, rindex and swab." + strncasecmp, index, rindex and swab, strlcpy and strlcat." } cdl_component CYGPKG_LIBC_STRING_STRTOK { diff -r ae816c83f082 -r d4902624e359 packages/language/c/libc/string/current/include/bsdstring.h --- a/packages/language/c/libc/string/current/include/bsdstring.h Tue May 11 16:26:19 2010 +0000 +++ b/packages/language/c/libc/string/current/include/bsdstring.h Sun May 16 23:38:18 2010 +0200 @@ -58,6 +58,7 @@ #include /* Configuration header */ #ifdef CYGFUN_LIBC_STRING_BSD_FUNCS +#ifndef __STRICT_ANSI__ #define __need_size_t #include @@ -95,12 +96,19 @@ extern void swab( const void * /* from */, void * /* to */, size_t /* n */ ); +extern size_t +strlcpy( char * /* dst */, const char * /* src */, size_t /* siz */ ); + +extern size_t +strlcat( char * /* dst */, const char * /* src */, size_t /* siz */ ); + /*=========================================================================*/ #ifdef __cplusplus } /* extern "C" */ #endif +#endif /* ifndef __STRICT_ANSI__ */ #endif /* ifdef CYGFUN_LIBC_STRING_BSD_FUNCS */ #endif /* CYGONCE_LIBC_BSDSTRING_H multiple inclusion protection */ diff -r ae816c83f082 -r d4902624e359 packages/language/c/libc/string/current/src/strlcat.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/packages/language/c/libc/string/current/src/strlcat.c Sun May 16 23:38:18 2010 +0200 @@ -0,0 +1,72 @@ +/* $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 + +#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; + size_t ret; + + CYG_REPORT_FUNCNAMETYPE("strlcat", "returning %p"); + CYG_REPORT_FUNCARG3("dst=%p, src=%p, siz=%lu", dst, src, siz); + + if (siz) { + CYG_CHECK_DATA_PTR(dst, "dst is not a valid pointer!"); + CYG_CHECK_DATA_PTR(src, "src is not a valid pointer!"); + } + + /* 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) { + ret = dlen + strlen(s); + CYG_REPORT_RETVAL(ret); + return(ret); + } + while (*s != '\0') { + if (n != 1) { + *d++ = *s; + n--; + } + s++; + } + *d = '\0'; + + ret = dlen + (s - src); /* count does not include NUL */ + CYG_REPORT_RETVAL(ret); + return(ret); +} diff -r ae816c83f082 -r d4902624e359 packages/language/c/libc/string/current/src/strlcpy.c --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/packages/language/c/libc/string/current/src/strlcpy.c Sun May 16 23:38:18 2010 +0200 @@ -0,0 +1,65 @@ +/* $OpenBSD: strlcpy.c,v 1.11 2006/05/05 15:27:38 millert 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 + +#include +#include + +/* + * Copy src to string dst of size siz. At most siz-1 characters + * will be copied. Always NUL terminates (unless siz == 0). + * Returns strlen(src); if retval >= siz, truncation occurred. + */ +size_t +strlcpy(char *dst, const char *src, size_t siz) +{ + char *d = dst; + const char *s = src; + size_t n = siz; + size_t ret; + + CYG_REPORT_FUNCNAMETYPE("strlcpy", "returning %p"); + CYG_REPORT_FUNCARG3("dst=%p, src=%p, siz=%lu", dst, src, siz); + + if (siz) { + CYG_CHECK_DATA_PTR(dst, "dst is not a valid pointer!"); + CYG_CHECK_DATA_PTR(src, "src is not a valid pointer!"); + } + + /* Copy as many bytes as will fit */ + if (n != 0) { + while (--n != 0) { + if ((*d++ = *s++) == '\0') + break; + } + } + + /* Not enough room in dst, add NUL and traverse rest of src */ + if (n == 0) { + if (siz != 0) + *d = '\0'; /* NUL-terminate dst */ + while (*s++) + ; + } + + ret = s - src - 1; /* count does not include NUL */ + CYG_REPORT_RETVAL(ret); + return(ret); +}