Remove remaining uses of strlcpy and strlcat

2 files changed, 0 insertions, 102 deletions

diff --git a/portable/strlcat.c b/portable/strlcat.c
deleted file mode 100644
index 613d3f2..0000000
--- a/portable/strlcat.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Replacement for a missing strlcat.
- *
- * Provides the same functionality as the *BSD function strlcat, originally
- * developed by Todd Miller and Theo de Raadt.  strlcat works similarly to
- * strncat, except simpler.  The result is always nul-terminated even if the
- * source string is longer than the space remaining in the destination string,
- * and the total space required is returned.  The third argument is the total
- * space available in the destination buffer, not just the amount of space
- * remaining.
- *
- * The canonical version of this file is maintained in the rra-c-util package,
- * which can be found at <http://www.eyrie.org/~eagle/software/rra-c-util/>.
- *
- * Written by Russ Allbery <eagle@eyrie.org>
- *
- * The authors hereby relinquish any claim to any copyright that they may have
- * in this work, whether granted under contract or by operation of law or
- * international treaty, and hereby commit to the public, at large, that they
- * shall not, at any time in the future, seek to enforce any copyright in this
- * work against any person or entity, or prevent any person or entity from
- * copying, publishing, distributing or creating derivative works of this
- * work.
- */
-
-#include <config.h>
-#include <portable/system.h>
-
-/*
- * If we're running the test suite, rename strlcat to avoid conflicts with
- * the system version.
- */
-#if TESTING
-# undef strlcat
-# define strlcat test_strlcat
-size_t test_strlcat(char *, const char *, size_t);
-#endif
-
-size_t
-strlcat(char *dst, const char *src, size_t size)
-{
-    size_t used, length, copy;
-
-    used = strlen(dst);
-    length = strlen(src);
-    if (size > 0 && used < size - 1) {
-        copy = (length >= size - used) ? size - used - 1 : length;
-        memcpy(dst + used, src, copy);
-        dst[used + copy] = '\0';
-    }
-    return used + length;
-}
diff --git a/portable/strlcpy.c b/portable/strlcpy.c
deleted file mode 100644
index 60fdab3..0000000
--- a/portable/strlcpy.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Replacement for a missing strlcpy.
- *
- * Provides the same functionality as the *BSD function strlcpy, originally
- * developed by Todd Miller and Theo de Raadt.  strlcpy works similarly to
- * strncpy, except saner and simpler.  The result is always nul-terminated
- * even if the source string is longer than the destination string, and the
- * total space required is returned.  The destination string is not nul-filled
- * like strncpy does, just nul-terminated.
- *
- * The canonical version of this file is maintained in the rra-c-util package,
- * which can be found at <http://www.eyrie.org/~eagle/software/rra-c-util/>.
- *
- * Written by Russ Allbery <eagle@eyrie.org>
- *
- * The authors hereby relinquish any claim to any copyright that they may have
- * in this work, whether granted under contract or by operation of law or
- * international treaty, and hereby commit to the public, at large, that they
- * shall not, at any time in the future, seek to enforce any copyright in this
- * work against any person or entity, or prevent any person or entity from
- * copying, publishing, distributing or creating derivative works of this
- * work.
- */
-
-#include <config.h>
-#include <portable/system.h>
-
-/*
- * If we're running the test suite, rename strlcpy to avoid conflicts with
- * the system version.
- */
-#if TESTING
-# undef strlcpy
-# define strlcpy test_strlcpy
-size_t test_strlcpy(char *, const char *, size_t);
-#endif
-
-size_t
-strlcpy(char *dst, const char *src, size_t size)
-{
-    size_t length, copy;
-
-    length = strlen(src);
-    if (size > 0) {
-        copy = (length >= size) ? size - 1 : length;
-        memcpy(dst, src, copy);
-        dst[copy] = '\0';
-    }
-    return length;
-}