From 19d0aa9a1bc3ba6bd65075d695b944cf5e147554 Mon Sep 17 00:00:00 2001 From: Stefan Ritt Date: Mon, 9 May 2005 07:50:06 +0000 Subject: [PATCH] *** empty log message *** SVN revision: 1349 --- src/strlcpy.c | 83 --------------------------------------------------- src/strlcpy.h | 16 ---------- 2 files changed, 99 deletions(-) delete mode 100755 src/strlcpy.c delete mode 100755 src/strlcpy.h diff --git a/src/strlcpy.c b/src/strlcpy.c deleted file mode 100755 index 113a30f6..00000000 --- a/src/strlcpy.c +++ /dev/null @@ -1,83 +0,0 @@ -/********************************************************************\ - - Name: strlcpy.c - Created by: Stefan Ritt - - Contents: Contains strlcpy and strlcat which are versions of - strcpy and strcat, but which avoid buffer overflows - - $Log$ - Revision 1.1 2005/05/02 10:19:12 ritt - Initial revision - -\********************************************************************/ - -#include -#include - -/* -* Copy src to string dst of size siz. At most siz-1 characters -* will be copied. Always NUL terminates (unless size == 0). -* Returns strlen(src); if retval >= siz, truncation occurred. -*/ -size_t strlcpy(char *dst, const char *src, size_t size) -{ - char *d = dst; - const char *s = src; - size_t n = size; - - /* Copy as many bytes as will fit */ - if (n != 0 && --n != 0) { - do { - if ((*d++ = *s++) == 0) - break; - } while (--n != 0); - } - - /* Not enough room in dst, add NUL and traverse rest of src */ - if (n == 0) { - if (size != 0) - *d = '\0'; /* NUL-terminate dst */ - while (*s++); - } - - return (s - src - 1); /* count does not include NUL */ -} - -/*-------------------------------------------------------------------*/ - -/* -* 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 size <= strlen(dst)). -* Returns strlen(src) + MIN(size, strlen(initial dst)). -* If retval >= size, truncation occurred. -*/ -size_t strlcat(char *dst, const char *src, size_t size) -{ - char *d = dst; - const char *s = src; - size_t n = size; - 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 = size - 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/src/strlcpy.h b/src/strlcpy.h deleted file mode 100755 index edf2cecd..00000000 --- a/src/strlcpy.h +++ /dev/null @@ -1,16 +0,0 @@ -/********************************************************************\ - - Name: strlcpy.h - Created by: Stefan Ritt - - Contents: Header file for strlcpy.c - - $Log$ - Revision 1.1 2005/05/02 10:20:33 ritt - Initial revision - - -\********************************************************************/ - -size_t strlcpy(char *dst, const char *src, size_t size); -size_t strlcat(char *dst, const char *src, size_t size);