Merge tag '1.4' into since

Version 1.4

1 files changed, 77 insertions, 0 deletions

diff --git a/estrndup.c b/estrndup.c
new file mode 100644
index 0000000..67f1ca4
--- /dev/null
+++ b/estrndup.c
@@ -0,0 +1,77 @@
+/* See LICENSE file for copyright and license details. */
+#include "common.h"
+#ifndef TEST
+
+
+extern inline char *libsimple_estrndup(const char *, size_t);
+
+
+#else
+#include "test.h"
+
+int
+main(void)
+{
+	struct allocinfo *info;
+	char *s;
+
+	assert((s = libsimple_estrndup("test", 10)));
+	if (have_custom_malloc()) {
+		assert((info = get_allocinfo(s)));
+		assert(info->size == 5);
+		assert(info->alignment == 1);
+		assert(!info->zeroed);
+	}
+	assert(!strcmp(s, "test"));
+	free(s);
+
+	assert((s = libsimple_estrndup("test", 3)));
+	if (have_custom_malloc()) {
+		assert((info = get_allocinfo(s)));
+		assert(info->size == 4);
+		assert(info->alignment == 1);
+		assert(!info->zeroed);
+	}
+	assert(!strcmp(s, "tes"));
+	free(s);
+
+	assert((s = libsimple_estrndup("test", 0)));
+	if (have_custom_malloc()) {
+		assert((info = get_allocinfo(s)));
+		assert(info->size == 1);
+		assert(info->alignment == 1);
+		assert(!info->zeroed);
+	}
+	assert(!strcmp(s, ""));
+	free(s);
+
+	if (have_custom_malloc()) {
+		libsimple_default_failure_exit = 15;
+		alloc_fail_in = 1;
+		assert_exit_ptr(libsimple_estrndup("test", 10));
+		assert(exit_status == 15);
+		assert_stderr("%s: strndup: %s\n", argv0, strerror(ENOMEM));
+		assert(!alloc_fail_in);
+		libsimple_default_failure_exit = 1;
+
+		libsimple_default_failure_exit = 17;
+		alloc_fail_in = 1;
+		assert_exit_ptr(libsimple_estrndup("test", 2));
+		assert(exit_status == 17);
+		assert_stderr("%s: strndup: %s\n", argv0, strerror(ENOMEM));
+		assert(!alloc_fail_in);
+		libsimple_default_failure_exit = 1;
+
+		libsimple_default_failure_exit = 19;
+		alloc_fail_in = 1;
+		assert_exit_ptr(libsimple_estrndup("test", 0));
+		assert(exit_status == 19);
+		assert_stderr("%s: strndup: %s\n", argv0, strerror(ENOMEM));
+		assert(!alloc_fail_in);
+		libsimple_default_failure_exit = 1;
+	}
+
+	return 0;
+}
+
+#endif