midfavila/ubase
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Import strl{cpy,cat}() from sbase

Browse Source
This commit is contained in:
sin 2014-06-30 14:05:20 +01:00
parent f5ebc6350b
commit 67d38a7e43
2 changed files with 85 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
util/strlcat.c
View File

@ -1,19 +1,51 @@
#include <stdio.h> /*
* Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
*
* 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 <sys/types.h>
#include <string.h> #include <string.h>
#include "../util.h" #include "../util.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.
*/
size_t size_t
strlcat(char *dest, const char *src, size_t count) strlcat(char *dst, const char *src, size_t siz)
{ {
size_t dsize = strlen(dest); char *d = dst;
size_t len = strlen(src); const char *s = src;
size_t res = dsize + len; size_t n = siz;
size_t dlen;
dest += dsize; /* Find the end of dst and adjust bytes left but don't go past end */
count -= dsize; while (n-- != 0 && *d != '\0')
if (len >= count) d++;
len = count-1; dlen = d - dst;
memcpy(dest, src, len); n = siz - dlen;
dest[len] = 0; if (n == 0)
return res; 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 */
} }

49
util/strlcpy.c
View File

@ -1,16 +1,47 @@
#include <stdio.h> /*
* Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
*
* 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 <sys/types.h>
#include <string.h> #include <string.h>
#include "../util.h" #include "../util.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.
*/
size_t size_t
strlcpy(char *dest, const char *src, size_t size) strlcpy(char *dst, const char *src, size_t siz)
{ {
size_t ret = strlen(src); char *d = dst;
const char *s = src;
if (size) { size_t n = siz;
size_t len = (ret >= size) ? size - 1 : ret; /* Copy as many bytes as will fit */
memcpy(dest, src, len); if (n != 0) {
dest[len] = '\0'; while (--n != 0) {
if ((*d++ = *s++) == '\0')
break;
}
} }
return ret; /* 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++)
;
}
return(s - src - 1); /* count does not include NUL */
} }