From 6b457ffc260100e0e3e6b2143b00e34bb419665e Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Tue, 23 Jul 2013 23:02:52 +0200 Subject: 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. --- common/compat.h | 10 ++++--- common/message.c | 6 +++++ common/test.c | 1 + common/tests/Makefile.am | 1 + common/tests/test-message.c | 65 +++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 4 +-- trust/token.c | 2 +- 7 files changed, 83 insertions(+), 6 deletions(-) create mode 100644 common/tests/test-message.c diff --git a/common/compat.h b/common/compat.h index 5b76d00..b593cf6 100644 --- a/common/compat.h +++ b/common/compat.h @@ -39,6 +39,10 @@ #include +#ifdef _GNU_SOURCE +#error Make the crap stop. _GNU_SOURCE is completely unportable and breaks all sorts of behavior +#endif + #if !defined(__cplusplus) && (__GNUC__ > 2) #define GNUC_PRINTF(x, y) __attribute__((__format__(__printf__, x, y))) #else @@ -266,7 +270,7 @@ char * strconcat (const char *first, #endif /* HAVE_STRCONCAT */ -#ifndef HAVE_ASPRINTF +#if defined HAVE_DECL_ASPRINTF && !HAVE_DECL_ASPRINTF int asprintf (char **strp, const char *fmt, @@ -274,14 +278,14 @@ int asprintf (char **strp, #endif /* HAVE_ASPRINTF */ -#ifndef HAVE_VASPRINTF +#if defined HAVE_DECL_VASPRINTF && !HAVE_DECL_VASPRINTF #include int vasprintf (char **strp, const char *fmt, va_list ap); -#endif /* HAVE_VASPRINTF */ +#endif /* HAVE_DECL_VASPRINTF */ #ifndef HAVE_GMTIME_R #include diff --git a/common/message.c b/common/message.c index e68dfac..35f2764 100644 --- a/common/message.c +++ b/common/message.c @@ -37,6 +37,12 @@ #include "config.h" +/* + * Oh god. glibc is nasty. Changes behavior and definitions of POSIX + * functions to completely different signatures depending on defines + */ +#define _POSIX_C_SOURCE 200112L + #include "compat.h" #define P11_DEBUG_FLAG P11_DEBUG_LIB #include "debug.h" diff --git a/common/test.c b/common/test.c index af0ea96..daee663 100644 --- a/common/test.c +++ b/common/test.c @@ -36,6 +36,7 @@ #define P11_TEST_SOURCE 1 +#include "compat.h" #include "test.h" #include "debug.h" #include "path.h" 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 + */ + +#include "config.h" +#include "test.h" + +#include "message.h" + +#include +#include + +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); +} diff --git a/configure.ac b/configure.ac index 0587f6a..ecf9ee9 100644 --- a/configure.ac +++ b/configure.ac @@ -6,8 +6,6 @@ AC_INIT([p11-kit], [p11-kit], [http://p11-glue.freedesktop.org/p11-kit.html]) -AC_USE_SYSTEM_EXTENSIONS - # ------------------------------------------------------------------------------ # p11-kit libtool versioning # CURRENT : REVISION : AGE @@ -85,6 +83,8 @@ if test "$os_unix" = "yes"; then AC_CHECK_FUNCS([asprintf vasprintf vsnprintf]) AC_CHECK_FUNCS([timegm]) + AC_CHECK_DECLS([asprintf, vasprintf], [], [], [[#include ]]) + # Required functions AC_CHECK_FUNCS([gmtime_r], [AC_DEFINE([HAVE_GMTIME_R], 1, [Whether gmtime_r() is available])], diff --git a/trust/token.c b/trust/token.c index 1336443..4e7c631 100644 --- a/trust/token.c +++ b/trust/token.c @@ -226,7 +226,7 @@ loader_load_if_file (p11_token *token, if (stat (path, &sb) < 0) { if (errno != ENOENT) - p11_message_err (errno, "couldn't stat path: %s", path); + p11_message_err (errno, "couldn't stat path: %d: %s", errno, path); } else if (!S_ISDIR (sb.st_mode)) { return loader_load_file (token, path, &sb); -- cgit v1.1