From a63d2168e900bba799a9baed3b24c7cf171e3e9d Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Mon, 7 Jun 2004 22:39:45 +0000
Subject: [PATCH] Fix strerror_r by checking return type from configure.
---
config/c-library.m4 | 19 +++++++++++++-
configure | 53 ++++++++++++++++++++++++++++++++++++++
configure.in | 3 ++-
src/include/pg_config.h.in | 3 +++
src/port/thread.c | 17 +++++++-----
5 files changed, 87 insertions(+), 8 deletions(-)
diff --git a/config/c-library.m4 b/config/c-library.m4
index f9a09c2cce7..6385ab36d41 100644
--- a/config/c-library.m4
+++ b/config/c-library.m4
@@ -1,5 +1,5 @@
# Macros that test various C library quirks
-# $PostgreSQL: pgsql/config/c-library.m4,v 1.25 2004/03/20 15:39:27 momjian Exp $
+# $PostgreSQL: pgsql/config/c-library.m4,v 1.26 2004/06/07 22:39:44 momjian Exp $
# PGAC_VAR_INT_TIMEZONE
@@ -96,6 +96,23 @@ fi
])# PGAC_FUNC_GETPWUID_R_5ARG
+# PGAC_FUNC_STRERROR_R_INT
+# ---------------------------
+# Check if strerror_r() returns an int (SUSv3) rather than a char * (GNU libc)
+# If so, define STRERROR_R_INT
+AC_DEFUN([PGAC_FUNC_STRERROR_R_INT],
+[AC_CACHE_CHECK(whether strerror_r returns int,
+pgac_func_strerror_r_int,
+[AC_TRY_COMPILE([#include <string.h>],
+[int strerror_r(int, char *, size_t);],
+[pgac_func_strerror_r_int=yes],
+[pgac_func_strerror_r_int=no])])
+if test x"$pgac_func_strerror_r_int" = xyes ; then
+ AC_DEFINE(STRERROR_R_INT,, [Define to 1 if strerror_r() returns a int.])
+fi
+])# PGAC_FUNC_STRERROR_R_INT
+
+
# PGAC_UNION_SEMUN
# ----------------
# Check if `union semun' exists. Define HAVE_UNION_SEMUN if so.
diff --git a/configure b/configure
index 30653380f85..287ebeeca6d 100755
--- a/configure
+++ b/configure
@@ -13759,6 +13759,59 @@ _ACEOF
fi
+echo "$as_me:$LINENO: checking whether strerror_r returns int" >&5
+echo $ECHO_N "checking whether strerror_r returns int... $ECHO_C" >&6
+if test "${pgac_func_strerror_r_int+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+#include "confdefs.h"
+#include <string.h>
+#ifdef F77_DUMMY_MAIN
+# ifdef __cplusplus
+ extern "C"
+# endif
+ int F77_DUMMY_MAIN() { return 1; }
+#endif
+int
+main ()
+{
+int strerror_r(int, char *, size_t);
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ pgac_func_strerror_r_int=yes
+else
+ echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+pgac_func_strerror_r_int=no
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: result: $pgac_func_strerror_r_int" >&5
+echo "${ECHO_T}$pgac_func_strerror_r_int" >&6
+if test x"$pgac_func_strerror_r_int" = xyes ; then
+
+cat >>confdefs.h <<\_ACEOF
+#define STRERROR_R_INT
+_ACEOF
+
+fi
+
else
# do not use values from template file
diff --git a/configure.in b/configure.in
index 437b5127e65..67c57abfdc7 100644
--- a/configure.in
+++ b/configure.in
@@ -1,5 +1,5 @@
dnl Process this file with autoconf to produce a configure script.
-dnl $PostgreSQL: pgsql/configure.in,v 1.360 2004/05/28 20:52:42 momjian Exp $
+dnl $PostgreSQL: pgsql/configure.in,v 1.361 2004/06/07 22:39:43 momjian Exp $
dnl
dnl Developers, please strive to achieve this order:
dnl
@@ -993,6 +993,7 @@ CFLAGS="$_CFLAGS"
LIBS="$_LIBS"
PGAC_FUNC_GETPWUID_R_5ARG
+PGAC_FUNC_STRERROR_R_INT
else
# do not use values from template file
diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in
index f9c3d5ade7f..5d3351a006d 100644
--- a/src/include/pg_config.h.in
+++ b/src/include/pg_config.h.in
@@ -607,6 +607,9 @@
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
+/* Define to 1 if strerror_r() returns a int. */
+#undef STRERROR_R_INT
+
/* Define to 1 if your <sys/time.h> declares `struct tm'. */
#undef TM_IN_SYS_TIME
diff --git a/src/port/thread.c b/src/port/thread.c
index 474ef969457..47615962e74 100644
--- a/src/port/thread.c
+++ b/src/port/thread.c
@@ -7,7 +7,7 @@
*
* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
*
- * $PostgreSQL: pgsql/src/port/thread.c,v 1.20 2004/04/23 18:15:55 momjian Exp $
+ * $PostgreSQL: pgsql/src/port/thread.c,v 1.21 2004/06/07 22:39:45 momjian Exp $
*
*-------------------------------------------------------------------------
*/
@@ -70,12 +70,17 @@ pqStrerror(int errnum, char *strerrbuf, size_t buflen)
{
#if defined(FRONTEND) && defined(ENABLE_THREAD_SAFETY) && defined(HAVE_STRERROR_R)
/* reentrant strerror_r is available */
- /* some early standards had strerror_r returning char * */
- strerror_r(errnum, strerrbuf, buflen);
- return strerrbuf;
-
+#ifdef STRERROR_R_INT
+ /* SUSv3 version */
+ if (strerror_r(errnum, strerrbuf, buflen) == 0)
+ return strerrbuf;
+ else
+ return NULL;
+#else
+ /* GNU libc */
+ return strerror_r(errnum, strerrbuf, buflen);
+#endif
#else
-
/* no strerror_r() available, just use strerror */
StrNCpy(strerrbuf, strerror(errnum), buflen);
--
GitLab