Don't use _GNU_SOURCE and fix strerror_r usage

glibc declares strerror_r completely different if in POSIX or GNU
mode. Nastiness. Stop using _GNU_SOURCE all together.

2 files changed, 66 insertions, 0 deletions

diff --git a/common/tests/Makefile.am b/common/tests/Makefile.am
index af4dc15..432ca95 100644
--- a/common/tests/Makefile.am
+++ b/common/tests/Makefile.am
@@ -26,6 +26,7 @@ CHECK_PROGS = \
 	test-url \
 	test-path \
 	test-lexer \
+	test-message \
 	$(NULL)
 
 noinst_PROGRAMS = \
diff --git a/common/tests/test-message.c b/common/tests/test-message.c
new file mode 100644
index 0000000..63ecf31
--- /dev/null
+++ b/common/tests/test-message.c
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2013 Red Hat Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *     * Redistributions of source code must retain the above
+ *       copyright notice, this list of conditions and the
+ *       following disclaimer.
+ *     * Redistributions in binary form must reproduce the
+ *       above copyright notice, this list of conditions and
+ *       the following disclaimer in the documentation and/or
+ *       other materials provided with the distribution.
+ *     * The names of contributors to this software may not be
+ *       used to endorse or promote products derived from this
+ *       software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
+ * THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+ * DAMAGE.
+ *
+ * Author: Stef Walter <stefw@redhat.com>
+ */
+
+#include "config.h"
+#include "test.h"
+
+#include "message.h"
+
+#include <errno.h>
+#include <stdlib.h>
+
+static void
+test_with_err (void)
+{
+	const char *last;
+	char *expected;
+
+	errno = E2BIG;
+	p11_message_err (ENOENT, "Details: %s", "value");
+	last = p11_message_last ();
+
+	if (asprintf (&expected, "Details: value: %s", strerror (ENOENT)) < 0)
+		assert_not_reached ();
+	assert_str_eq (expected, last);
+	free (expected);
+}
+
+int
+main (int argc,
+      char *argv[])
+{
+	p11_test (test_with_err, "/message/with-err");
+	return p11_test_run (argc, argv);
+}