Merge tag '1.2' into since

Version 1.2

1 files changed, 134 insertions, 0 deletions

diff --git a/enaligned_strndup.c b/enaligned_strndup.c
new file mode 100644
index 0000000..6812d1c
--- /dev/null
+++ b/enaligned_strndup.c
@@ -0,0 +1,134 @@
+/* See LICENSE file for copyright and license details. */
+#include "libsimple.h"
+#ifndef TEST
+
+
+char *
+libsimple_enaligned_strndup(int status, const char *s, size_t alignment, size_t n)
+{
+	void *ret = aligned_strndup(s, alignment, n);
+	if (!ret)
+		enprintf(status, "aligned_strndup:");
+	return ret;
+}
+
+
+#else
+#include "test.h"
+
+int
+main(void)
+{
+	struct allocinfo *info;
+	void *s;
+
+	assert((s = libsimple_enaligned_strndup(1, "hello", 2, SIZE_MAX)));
+	if (have_custom_malloc()) {
+		assert((info = get_allocinfo(s)));
+		assert(info->size == 6);
+		assert(info->alignment == 2);
+		assert(!info->zeroed);
+	}
+	assert(!memcmp(s, "hello", 6));
+	free(s);
+
+	assert((s = libsimple_ealigned_strndup("test", 8, SIZE_MAX)));
+	if (have_custom_malloc()) {
+		assert((info = get_allocinfo(s)));
+		assert(info->size == 8);
+		assert(info->alignment == 8);
+		assert(!info->zeroed);
+	}
+	assert(!memcmp(s, "test", 5));
+	free(s);
+
+	assert((s = libsimple_enaligned_strndup(1, "hello", 2, 100)));
+	if (have_custom_malloc()) {
+		assert((info = get_allocinfo(s)));
+		assert(info->size == 6);
+		assert(info->alignment == 2);
+		assert(!info->zeroed);
+	}
+	assert(!memcmp(s, "hello", 6));
+	free(s);
+
+	assert((s = libsimple_ealigned_strndup("test", 8, 100)));
+	if (have_custom_malloc()) {
+		assert((info = get_allocinfo(s)));
+		assert(info->size == 8);
+		assert(info->alignment == 8);
+		assert(!info->zeroed);
+	}
+	assert(!memcmp(s, "test", 5));
+	free(s);
+
+	assert((s = libsimple_enaligned_strndup(1, "hello", 2, 6)));
+	if (have_custom_malloc()) {
+		assert((info = get_allocinfo(s)));
+		assert(info->size == 6);
+		assert(info->alignment == 2);
+		assert(!info->zeroed);
+	}
+	assert(!memcmp(s, "hello", 6));
+	free(s);
+
+	assert((s = libsimple_ealigned_strndup("test", 8, 5)));
+	if (have_custom_malloc()) {
+		assert((info = get_allocinfo(s)));
+		assert(info->size == 8);
+		assert(info->alignment == 8);
+		assert(!info->zeroed);
+	}
+	assert(!memcmp(s, "test", 5));
+	free(s);
+
+	assert((s = libsimple_enaligned_strndup(1, "hello", 2, 5)));
+	if (have_custom_malloc()) {
+		assert((info = get_allocinfo(s)));
+		assert(info->size == 6);
+		assert(info->alignment == 2);
+		assert(!info->zeroed);
+	}
+	assert(!memcmp(s, "hello", 6));
+	free(s);
+
+	assert((s = libsimple_ealigned_strndup("test", 8, 4)));
+	if (have_custom_malloc()) {
+		assert((info = get_allocinfo(s)));
+		assert(info->size == 8);
+		assert(info->alignment == 8);
+		assert(!info->zeroed);
+	}
+	assert(!memcmp(s, "test", 5));
+	free(s);
+
+	assert((s = libsimple_enaligned_strndup(1, "hello", 2, 4)));
+	if (have_custom_malloc()) {
+		assert((info = get_allocinfo(s)));
+		assert(info->size == 6);
+		assert(info->alignment == 2);
+		assert(!info->zeroed);
+	}
+	assert(!memcmp(s, "hell", 5));
+	free(s);
+
+	if (have_custom_malloc()) {
+		alloc_fail_in = 1;
+		assert_exit_ptr(libsimple_enaligned_strndup(44, "hello", 2, 10));
+		assert(exit_status == 44);
+		assert_stderr("%s: aligned_strndup: %s\n", argv0, strerror(ENOMEM));
+		assert(!alloc_fail_in);
+
+		libsimple_default_failure_exit = 55;
+		alloc_fail_in = 1;
+		assert_exit_ptr(libsimple_ealigned_strndup("test", 8, 10));
+		assert(exit_status == 55);
+		assert_stderr("%s: aligned_strndup: %s\n", argv0, strerror(ENOMEM));
+		assert(!alloc_fail_in);
+		libsimple_default_failure_exit = 1;
+	}
+
+	return 0;
+}
+
+#endif