Feature #12205 ยป update-strl.diff
| LEGAL | ||
|---|---|---|
|
missing/strlcat.c
|
||
|
missing/strlcpy.c
|
||
|
These files are under the new-style BSD license.
|
||
|
These files are under an ISC-style license.
|
||
|
Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
|
||
|
All rights reserved.
|
||
|
Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com>
|
||
|
Redistribution and use in source and binary forms, with or without
|
||
|
modification, are permitted provided that the following conditions
|
||
|
are met:
|
||
|
1. Redistributions of source code must retain the above copyright
|
||
|
notice, this list of conditions and the following disclaimer.
|
||
|
2. Redistributions in binary form must reproduce the above copyright
|
||
|
notice, this list of conditions and the following disclaimer in the
|
||
|
documentation and/or other materials provided with the distribution.
|
||
|
3. The name of the author may not be used to endorse or promote products
|
||
|
derived from this software without specific prior written permission.
|
||
|
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.
|
||
|
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
|
||
|
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
|
||
|
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
|
||
|
THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
||
|
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||
|
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
||
|
OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
||
|
WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
||
|
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||
|
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||
|
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.
|
||
|
missing/langinfo.c
|
||
| missing/strlcat.c | ||
|---|---|---|
|
/* $OpenBSD: strlcat.c,v 1.8 2001/05/13 15:40:15 deraadt Exp $ */
|
||
|
/* $OpenBSD: strlcat.c,v 1.15 2015/03/02 21:41:08 millert Exp $ */
|
||
|
/*
|
||
|
* Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
|
||
|
* All rights reserved.
|
||
|
* Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com>
|
||
|
*
|
||
|
* Redistribution and use in source and binary forms, with or without
|
||
|
* modification, are permitted provided that the following conditions
|
||
|
* are met:
|
||
|
* 1. Redistributions of source code must retain the above copyright
|
||
|
* notice, this list of conditions and the following disclaimer.
|
||
|
* 2. Redistributions in binary form must reproduce the above copyright
|
||
|
* notice, this list of conditions and the following disclaimer in the
|
||
|
* documentation and/or other materials provided with the distribution.
|
||
|
* 3. The name of the author may not be used to endorse or promote products
|
||
|
* derived from this software without specific prior written permission.
|
||
|
* 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.
|
||
|
*
|
||
|
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
|
||
|
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
|
||
|
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
|
||
|
* THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
||
|
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||
|
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
||
|
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
||
|
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
||
|
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||
|
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||
|
* 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.
|
||
|
*/
|
||
|
#if defined(LIBC_SCCS) && !defined(lint)
|
||
|
static char *rcsid = "$OpenBSD: strlcat.c,v 1.8 2001/05/13 15:40:15 deraadt Exp $";
|
||
|
#endif /* LIBC_SCCS and not lint */
|
||
|
#include "ruby/missing.h"
|
||
|
#include <sys/types.h>
|
||
|
#include <string.h>
|
||
|
/*
|
||
|
* 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.
|
||
|
* Appends src to string dst of size dsize (unlike strncat, dsize is the
|
||
|
* full size of dst, not space left). At most dsize-1 characters
|
||
|
* will be copied. Always NUL terminates (unless dsize <= strlen(dst)).
|
||
|
* Returns strlen(src) + MIN(dsize, strlen(initial dst)).
|
||
|
* If retval >= dsize, truncation occurred.
|
||
|
*/
|
||
|
size_t
|
||
|
strlcat(dst, src, siz)
|
||
|
char *dst;
|
||
|
const char *src;
|
||
|
size_t siz;
|
||
|
strlcat(char *dst, const char *src, size_t dsize)
|
||
|
{
|
||
|
register char *d = dst;
|
||
|
register const char *s = src;
|
||
|
register size_t n = siz;
|
||
|
const char *odst = dst;
|
||
|
const char *osrc = src;
|
||
|
size_t n = dsize;
|
||
|
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;
|
||
|
/* Find the end of dst and adjust bytes left but don't go past end. */
|
||
|
while (n-- != 0 && *dst != '\0')
|
||
|
dst++;
|
||
|
dlen = dst - odst;
|
||
|
n = dsize - dlen;
|
||
|
if (n == 0)
|
||
|
return(dlen + strlen(s));
|
||
|
while (*s != '\0') {
|
||
|
if (n != 1) {
|
||
|
*d++ = *s;
|
||
|
if (n-- == 0)
|
||
|
return(dlen + strlen(src));
|
||
|
while (*src != '\0') {
|
||
|
if (n != 0) {
|
||
|
*dst++ = *src;
|
||
|
n--;
|
||
|
}
|
||
|
s++;
|
||
|
src++;
|
||
|
}
|
||
|
*d = '\0';
|
||
|
*dst = '\0';
|
||
|
return(dlen + (s - src)); /* count does not include NUL */
|
||
|
return(dlen + (src - osrc)); /* count does not include NUL */
|
||
|
}
|
||
| missing/strlcpy.c | ||
|---|---|---|
|
/* $OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp $ */
|
||
|
/* $OpenBSD: strlcpy.c,v 1.12 2015/01/15 03:54:12 millert Exp $ */
|
||
|
/*
|
||
|
* Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
|
||
|
* All rights reserved.
|
||
|
* Copyright (c) 1998, 2015 Todd C. Miller <Todd.Miller@courtesan.com>
|
||
|
*
|
||
|
* Redistribution and use in source and binary forms, with or without
|
||
|
* modification, are permitted provided that the following conditions
|
||
|
* are met:
|
||
|
* 1. Redistributions of source code must retain the above copyright
|
||
|
* notice, this list of conditions and the following disclaimer.
|
||
|
* 2. Redistributions in binary form must reproduce the above copyright
|
||
|
* notice, this list of conditions and the following disclaimer in the
|
||
|
* documentation and/or other materials provided with the distribution.
|
||
|
* 3. The name of the author may not be used to endorse or promote products
|
||
|
* derived from this software without specific prior written permission.
|
||
|
* 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.
|
||
|
*
|
||
|
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
|
||
|
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
|
||
|
* AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
|
||
|
* THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
|
||
|
* EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||
|
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
|
||
|
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
|
||
|
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
|
||
|
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
|
||
|
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||
|
* 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.
|
||
|
*/
|
||
|
#if defined(LIBC_SCCS) && !defined(lint)
|
||
|
static char *rcsid = "$OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp $";
|
||
|
#endif /* LIBC_SCCS and not lint */
|
||
|
#include "ruby/missing.h"
|
||
|
#include <sys/types.h>
|
||
|
#include <string.h>
|
||
|
/*
|
||
|
* 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.
|
||
|
* Copy string src to buffer dst of size dsize. At most dsize-1
|
||
|
* chars will be copied. Always NUL terminates (unless dsize == 0).
|
||
|
* Returns strlen(src); if retval >= dsize, truncation occurred.
|
||
|
*/
|
||
|
size_t
|
||
|
strlcpy(dst, src, siz)
|
||
|
char *dst;
|
||
|
const char *src;
|
||
|
size_t siz;
|
||
|
strlcpy(char *dst, const char *src, size_t dsize)
|
||
|
{
|
||
|
register char *d = dst;
|
||
|
register const char *s = src;
|
||
|
register size_t n = siz;
|
||
|
const char *osrc = src;
|
||
|
size_t nleft = dsize;
|
||
|
/* Copy as many bytes as will fit */
|
||
|
if (n != 0 && --n != 0) {
|
||
|
do {
|
||
|
if ((*d++ = *s++) == 0)
|
||
|
/* Copy as many bytes as will fit. */
|
||
|
if (nleft != 0) {
|
||
|
while (--nleft != 0) {
|
||
|
if ((*dst++ = *src++) == '\0')
|
||
|
break;
|
||
|
} while (--n != 0);
|
||
|
}
|
||
|
}
|
||
|
/* 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++)
|
||
|
/* Not enough room in dst, add NUL and traverse rest of src. */
|
||
|
if (nleft == 0) {
|
||
|
if (dsize != 0)
|
||
|
*dst = '\0'; /* NUL-terminate dst */
|
||
|
while (*src++)
|
||
|
;
|
||
|
}
|
||
|
return(s - src - 1); /* count does not include NUL */
|
||
|
return(src - osrc - 1); /* count does not include NUL */
|
||
|
}
|
||