Commit 5ba40ffa authored by Russ Allbery's avatar Russ Allbery

Remove strlcpy and strlcat portability functions

Now that ad_ldap_base is the full base DN, we no longer use either
of those functions anywhere in the source tree.  Remove the
portability glue.
parent 5743ea9e
......@@ -21,8 +21,6 @@
/tests/plugin/queuing-t
/tests/portable/asprintf-t
/tests/portable/snprintf-t
/tests/portable/strlcat-t
/tests/portable/strlcpy-t
/tests/portable/strndup-t
/tests/runtests
/tests/util/concat-t
......
......@@ -89,7 +89,6 @@ warnings:
check_PROGRAMS = tests/runtests tests/plugin/heimdal-t tests/plugin/mit-t \
tests/plugin/queue-only-t tests/plugin/queuing-t \
tests/portable/asprintf-t tests/portable/snprintf-t \
tests/portable/strlcat-t tests/portable/strlcpy-t \
tests/portable/strndup-t tests/util/messages-krb5-t \
tests/util/messages-t tests/util/xmalloc
check_LIBRARIES = tests/tap/libtap.a
......@@ -128,12 +127,6 @@ tests_portable_asprintf_t_LDADD = tests/tap/libtap.a portable/libportable.la
tests_portable_snprintf_t_SOURCES = tests/portable/snprintf-t.c \
tests/portable/snprintf.c
tests_portable_snprintf_t_LDADD = tests/tap/libtap.a portable/libportable.la
tests_portable_strlcat_t_SOURCES = tests/portable/strlcat-t.c \
tests/portable/strlcat.c
tests_portable_strlcat_t_LDADD = tests/tap/libtap.a portable/libportable.la
tests_portable_strlcpy_t_SOURCES = tests/portable/strlcpy-t.c \
tests/portable/strlcpy.c
tests_portable_strlcpy_t_LDADD = tests/tap/libtap.a portable/libportable.la
tests_portable_strndup_t_SOURCES = tests/portable/strndup-t.c \
tests/portable/strndup.c
tests_portable_strndup_t_LDADD = tests/tap/libtap.a portable/libportable.la
......
......@@ -66,7 +66,7 @@ AC_CHECK_TYPES([ssize_t], [], [],
[#include <sys/types.h>])
RRA_FUNC_SNPRINTF
AC_CHECK_FUNCS([setrlimit])
AC_REPLACE_FUNCS([asprintf strlcat strlcpy strndup])
AC_REPLACE_FUNCS([asprintf strndup])
AC_CONFIG_FILES([Makefile])
AC_CONFIG_HEADER([config.h])
......
/*
* 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
# 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;
}
/*
* 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
# 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;
}
......@@ -124,12 +124,6 @@ extern int snprintf(char *, size_t, const char *, ...)
#if !HAVE_DECL_VSNPRINTF
extern int vsnprintf(char *, size_t, const char *, va_list);
#endif
#if !HAVE_STRLCAT
extern size_t strlcat(char *, const char *, size_t);
#endif
#if !HAVE_STRLCPY
extern size_t strlcpy(char *, const char *, size_t);
#endif
#if !HAVE_STRNDUP
extern char *strndup(const char *, size_t);
#endif
......
......@@ -6,8 +6,6 @@ plugin/queue-only
plugin/queuing
portable/asprintf
portable/snprintf
portable/strlcat
portable/strlcpy
portable/strndup
util/messages
util/messages-krb5
......
/*
* strlcat test suite.
*
* 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>
#include <tests/tap/basic.h>
size_t test_strlcat(char *, const char *, size_t);
int
main(void)
{
char buffer[10] = "";
plan(27);
is_int(3, test_strlcat(buffer, "foo", sizeof(buffer)),
"strlcat into empty buffer");
is_string("foo", buffer, "...with right output");
is_int(7, test_strlcat(buffer, " bar", sizeof(buffer)),
"...and append more");
is_string("foo bar", buffer, "...and output is still correct");
is_int(9, test_strlcat(buffer, "!!", sizeof(buffer)),
"...and append to buffer limit");
is_string("foo bar!!", buffer, "...output is still correct");
is_int(10, test_strlcat(buffer, "!", sizeof(buffer)),
"...append one more character");
is_string("foo bar!!", buffer, "...and output didn't change");
ok(buffer[9] == '\0', "...buffer still nul-terminated");
buffer[0] = '\0';
is_int(11, test_strlcat(buffer, "hello world", sizeof(buffer)),
"append single long string");
is_string("hello wor", buffer, "...string truncates properly");
ok(buffer[9] == '\0', "...buffer still nul-terminated");
buffer[0] = '\0';
is_int(7, test_strlcat(buffer, "sausage", 5), "lie about buffer length");
is_string("saus", buffer, "...contents are correct");
is_int(14, test_strlcat(buffer, "bacon eggs", sizeof(buffer)),
"...add more up to real size");
is_string("sausbacon", buffer, "...and result is correct");
/* Make sure that with a size of 0, the destination isn't changed. */
is_int(11, test_strlcat(buffer, "!!", 0), "no change with size of 0");
is_string("sausbacon", buffer, "...and content is the same");
/* Now play with empty strings. */
is_int(9, test_strlcat(buffer, "", 0),
"correct count when appending empty string");
is_string("sausbacon", buffer, "...and contents are unchanged");
buffer[0] = '\0';
is_int(0, test_strlcat(buffer, "", sizeof(buffer)),
"correct count when appending empty string to empty buffer");
is_string("", buffer, "...and buffer content is correct");
is_int(3, test_strlcat(buffer, "foo", 2), "append to length 2 buffer");
is_string("f", buffer, "...and got only a single character");
ok(buffer[1] == '\0', "...and buffer is still nul-terminated");
is_int(1, test_strlcat(buffer, "", sizeof(buffer)),
"append an empty string");
ok(buffer[1] == '\0', "...and buffer is still nul-terminated");
return 0;
}
#define TESTING 1
#include <portable/strlcat.c>
/*
* strlcpy test suite.
*
* 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>
#include <tests/tap/basic.h>
size_t test_strlcpy(char *, const char *, size_t);
int
main(void)
{
char buffer[10];
plan(23);
is_int(3, test_strlcpy(buffer, "foo", sizeof(buffer)), "simple strlcpy");
is_string("foo", buffer, "...result is correct");
is_int(9, test_strlcpy(buffer, "hello wor", sizeof(buffer)),
"strlcpy exact length of buffer");
is_string("hello wor", buffer, "...result is correct");
is_int(10, test_strlcpy(buffer, "world hell", sizeof(buffer)),
"strlcpy one more than buffer length");
is_string("world hel", buffer, "...result is correct");
ok(buffer[9] == '\0', "...buffer is nul-terminated");
is_int(11, test_strlcpy(buffer, "hello world", sizeof(buffer)),
"strlcpy more than buffer length");
is_string("hello wor", buffer, "...result is correct");
ok(buffer[9] == '\0', "...buffer is nul-terminated");
/* Make sure that with a size of 0, the destination isn't changed. */
is_int(3, test_strlcpy(buffer, "foo", 0), "buffer unchanged if size 0");
is_string("hello wor", buffer, "...contents still the same");
/* Now play with empty strings. */
is_int(0, test_strlcpy(buffer, "", 0), "copy empty string with size 0");
is_string("hello wor", buffer, "...buffer unchanged");
is_int(0, test_strlcpy(buffer, "", sizeof(buffer)),
"copy empty string into full buffer");
is_string("", buffer, "...buffer now empty string");
is_int(3, test_strlcpy(buffer, "foo", 2),
"copy string into buffer of size 2");
is_string("f", buffer, "...got one character");
ok(buffer[1] == '\0', "...buffer is nul-terminated");
is_int(0, test_strlcpy(buffer, "", 1),
"copy empty string into buffer of size 1");
ok(buffer[0] == '\0', "...buffer is empty string");
/* Finally, check using strlcpy as strlen. */
is_int(3, test_strlcpy(NULL, "foo", 0), "use strlcpy as strlen");
is_int(11, test_strlcpy(NULL, "hello world", 0), "...again");
return 0;
}
#define TESTING 1
#include <portable/strlcpy.c>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment