Fix strerror_r by checking return type from configure.

5 files changed, 84 insertions, 5 deletions

diff --git a/config/c-library.m4 b/config/c-library.m4
index fd5aa53727..d772ea9714 100644
--- a/config/c-library.m4
+++ b/config/c-library.m4
@@ -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 30653380f8..287ebeeca6 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 5aa6617766..bfd20d7007 100644
--- a/configure.in
+++ b/configure.in
@@ -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 f9c3d5ade7..5d3351a006 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 bf887900af..98e616dbe4 100644
--- a/src/port/thread.c
+++ b/src/port/thread.c
@@ -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);