Make libpq thread-safe with configure --with-threads option.

Lee Kindness

Author: bmomjian

configure

@@ -3591,6 +3591,10 @@ rm -f conftest*
 #
 # Pthreads
 #
+# For each platform, we need to know about any special compile and link
+# libraries, and whether the normal C function names are thread-safe.
+#
+NEED_REENTRANT_FUNC_NAMES=no
 if test "$with_threads" = yes; then
 echo "$as_me:$LINENO: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
@@ -3902,13 +3906,19 @@ fi
 case $host_os in
 		netbsd*|bsdi*)
 			# these require no special flags or libraries
+			NEED_REENTRANT_FUNC_NAMES=no
+			;;
+		freebsd2*|freebsd3*|freebsd4*)
+			THREAD_CFLAGS="-pthread"
+			NEED_REENTRANT_FUNC_NAMES=yes
 			;;
-		freebsd2*|freebsd3*|freebsd4*) THREAD_CFLAGS="-pthread" ;;
 		freebsd*)
 			THREAD_LIBS="-lc_r"
+			NEED_REENTRANT_FUNC_NAMES=yes
 			;;
 		linux*) THREAD_CFLAGS="-D_REENTRANT -D_THREAD_SAFE -D_POSIX_PTHREAD_SEMANTICS"
 			THREAD_LIBS="-lpthread"
+			NEED_REENTRANT_FUNC_NAMES=yes
 			;;
 		*)
 			# other operating systems might fail because they have pthread.h but need
@@ -12829,8 +12839,14 @@ fi
 #
 # Check for re-entrant versions of certain functions
 #
-# Include special flags if required
+# Include special flags if threads are enabled _and_ if required for
+# threading on this platform.  Some platforms have *_r functions but
+# their natively named funcs are threadsafe, and should be used instead.
+#
+# One trick here is that if the don't call AC_CHECK_FUNCS, the
+# functions are marked "not found", which is perfect.
 #
+if test "$NEED_REENTRANT_FUNC_NAMES" = yes ; then
 _CFLAGS="$CFLAGS"
 _LIB="$LIBS"
 CFLAGS="$CFLAGS $TREAD_CFLAGS"
@@ -12915,7 +12931,7 @@ done
 
 CFLAGS="$_CFLAGS"
 LIB="$_LIBS"
-
+fi
 
 
 # This test makes sure that run tests work at all.  Sometimes a shared

configure.in

@@ -1,5 +1,5 @@
 dnl Process this file with autoconf to produce a configure script.
-dnl $Header: /cvsroot/pgsql/configure.in,v 1.262 2003/06/14 14:35:42 momjian Exp $
+dnl $Header: /cvsroot/pgsql/configure.in,v 1.263 2003/06/14 17:49:53 momjian Exp $
 dnl
 dnl Developers, please strive to achieve this order:
 dnl
@@ -554,18 +554,28 @@ AC_SUBST(ELF_SYS)
 #
 # Pthreads
 #
+# For each platform, we need to know about any special compile and link
+# libraries, and whether the normal C function names are thread-safe.
+#
+NEED_REENTRANT_FUNC_NAMES=no
 if test "$with_threads" = yes; then
 AC_CHECK_HEADER(pthread.h, [], [AC_MSG_ERROR([pthread.h not found, required for --with-threads])])
 case $host_os in
-		netbsd*|bsdi*) 
+		netbsd*|bsdi*)
 			# these require no special flags or libraries
+			NEED_REENTRANT_FUNC_NAMES=no
+			;;
+		freebsd2*|freebsd3*|freebsd4*)
+			THREAD_CFLAGS="-pthread"
+			NEED_REENTRANT_FUNC_NAMES=yes
 			;;
-		freebsd2*|freebsd3*|freebsd4*) THREAD_CFLAGS="-pthread" ;;
 		freebsd*)
 			THREAD_LIBS="-lc_r"
+			NEED_REENTRANT_FUNC_NAMES=yes
 			;;
 		linux*) THREAD_CFLAGS="-D_REENTRANT -D_THREAD_SAFE -D_POSIX_PTHREAD_SEMANTICS"
 			THREAD_LIBS="-lpthread"
+			NEED_REENTRANT_FUNC_NAMES=yes
 			;;
 		*)
 			# other operating systems might fail because they have pthread.h but need
@@ -991,16 +1001,22 @@ AC_FUNC_FSEEKO
 #
 # Check for re-entrant versions of certain functions
 #
-# Include special flags if required
+# Include special flags if threads are enabled _and_ if required for 
+# threading on this platform.  Some platforms have *_r functions but
+# their natively named funcs are threadsafe, and should be used instead.
+#
+# One trick here is that if the don't call AC_CHECK_FUNCS, the
+# functions are marked "not found", which is perfect.
 #
+if test "$NEED_REENTRANT_FUNC_NAMES" = yes ; then
 _CFLAGS="$CFLAGS"
 _LIB="$LIBS"
 CFLAGS="$CFLAGS $TREAD_CFLAGS"
 LIBS="$LIBS $THREAD_LIBS"
 AC_CHECK_FUNCS([strerror_r getpwuid_r gethostbyname_r])
 CFLAGS="$_CFLAGS"
 LIB="$_LIBS"
-
+fi
 
 
 # This test makes sure that run tests work at all.  Sometimes a shared

src/interfaces/libpq/fe-auth.c

@@ -10,7 +10,7 @@
  * exceed INITIAL_EXPBUFFER_SIZE (currently 256 bytes).
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.79 2003/06/08 17:43:00 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.80 2003/06/14 17:49:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -391,8 +391,10 @@ pg_krb5_sendauth(char *PQerrormsg, int sock,
 	flags = fcntl(sock, F_GETFL);
 	if (flags < 0 || fcntl(sock, F_SETFL, (long) (flags & ~O_NONBLOCK)))
 	{
+		char sebuf[256];
+
 		snprintf(PQerrormsg, PQERRORMSG_LENGTH,
-				 libpq_gettext("could not set socket to blocking mode: %s\n"), strerror(errno));
+				 libpq_gettext("could not set socket to blocking mode: %s\n"), pqStrerror(errno, sebuf, sizeof(sebuf)));
 		krb5_free_principal(pg_krb5_context, server);
 		return STATUS_ERROR;
 	}
@@ -436,9 +438,11 @@ pg_krb5_sendauth(char *PQerrormsg, int sock,
 
 	if (fcntl(sock, F_SETFL, (long) flags))
 	{
+		char sebuf[256];
+
 		snprintf(PQerrormsg, PQERRORMSG_LENGTH,
 				 libpq_gettext("could not restore non-blocking mode on socket: %s\n"),
-				 strerror(errno));
+				 pqStrerror(errno, sebuf, sizeof(sebuf)));
 		ret = STATUS_ERROR;
 	}
 
@@ -495,8 +499,11 @@ pg_local_sendauth(char *PQerrormsg, PGconn *conn)
 
 	if (sendmsg(conn->sock, &msg, 0) == -1)
 	{
+		char sebuf[256];
+
 		snprintf(PQerrormsg, PQERRORMSG_LENGTH,
-				 "pg_local_sendauth: sendmsg: %s\n", strerror(errno));
+			 "pg_local_sendauth: sendmsg: %s\n",
+			 pqStrerror(errno, sebuf, sizeof(sebuf)));
 		return STATUS_ERROR;
 	}
 	return STATUS_OK;
@@ -739,10 +746,13 @@ fe_getauthname(char *PQerrormsg)
 		if (GetUserName(username, &namesize))
 			name = username;
 #else
-		struct passwd *pw = getpwuid(geteuid());
+		char pwdbuf[BUFSIZ];
+		struct passwd pwdstr;
+		struct passwd *pw = NULL;
 
-		if (pw)
-			name = pw->pw_name;
+		if( pqGetpwuid(geteuid(), &pwdstr,
+			       pwdbuf, sizeof(pwdbuf), &pw) == 0 )
+		  name = pw->pw_name;
 #endif
 	}
 

src/interfaces/libpq/fe-connect.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.247 2003/06/12 08:15:29 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.248 2003/06/14 17:49:53 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -713,9 +713,11 @@ connectMakeNonblocking(PGconn *conn)
 {
 	if (FCNTL_NONBLOCK(conn->sock) < 0)
 	{
+		char sebuf[256];
+
 		printfPQExpBuffer(&conn->errorMessage,
 		libpq_gettext("could not set socket to non-blocking mode: %s\n"),
-						  SOCK_STRERROR(SOCK_ERRNO));
+						  SOCK_STRERROR(SOCK_ERRNO, sebuf, sizeof(sebuf)));
 		return 0;
 	}
 
@@ -738,9 +740,11 @@ connectNoDelay(PGconn *conn)
 				   (char *) &on,
 				   sizeof(on)) < 0)
 	{
+		char sebuf[256];
+
 		printfPQExpBuffer(&conn->errorMessage,
 		libpq_gettext("could not set socket to TCP no delay mode: %s\n"),
-						  SOCK_STRERROR(SOCK_ERRNO));
+						  SOCK_STRERROR(SOCK_ERRNO, sebuf, sizeof(sebuf)));
 		return 0;
 	}
 #endif
@@ -759,6 +763,7 @@ connectFailureMessage(PGconn *conn, int errorno)
 {
 	char	hostname[NI_MAXHOST];
 	char	service[NI_MAXHOST];
+	char	sebuf[256];
 
 	getnameinfo((struct sockaddr *)&conn->raddr.addr, conn->raddr.salen,
 		hostname, sizeof(hostname), service, sizeof(service),
@@ -770,15 +775,15 @@ connectFailureMessage(PGconn *conn, int errorno)
 						"\tIs the server running locally and accepting\n"
 						  "\tconnections on Unix domain socket \"%s\"?\n"
 										),
-			SOCK_STRERROR(errorno), service);
+			SOCK_STRERROR(errorno, sebuf, sizeof(sebuf)), service);
 	else
 		printfPQExpBuffer(&conn->errorMessage,
 						  libpq_gettext(
 									  "could not connect to server: %s\n"
 					 "\tIs the server running on host %s and accepting\n"
 									 "\tTCP/IP connections on port %s?\n"
 										),
-						  SOCK_STRERROR(errorno),
+						  SOCK_STRERROR(errorno, sebuf, sizeof(sebuf)),
 						  conn->pghostaddr
 						  ? conn->pghostaddr
 						  : (conn->pghost
@@ -1001,6 +1006,7 @@ PostgresPollingStatusType
 PQconnectPoll(PGconn *conn)
 {
 	PGresult   *res;
+	char		sebuf[256];
 
 	if (conn == NULL)
 		return PGRES_POLLING_FAILED;
@@ -1094,7 +1100,7 @@ PQconnectPoll(PGconn *conn)
 						}
 						printfPQExpBuffer(&conn->errorMessage,
 							  libpq_gettext("could not create socket: %s\n"),
-										  SOCK_STRERROR(SOCK_ERRNO));
+										  SOCK_STRERROR(SOCK_ERRNO, sebuf, sizeof(sebuf)));
 						break;
 					}
 
@@ -1200,7 +1206,7 @@ PQconnectPoll(PGconn *conn)
 				{
 					printfPQExpBuffer(&conn->errorMessage,
 									  libpq_gettext("could not get socket error status: %s\n"),
-									  SOCK_STRERROR(SOCK_ERRNO));
+									  SOCK_STRERROR(SOCK_ERRNO, sebuf, sizeof(sebuf)));
 					goto error_return;
 				}
 				else if (optval != 0)
@@ -1237,7 +1243,7 @@ PQconnectPoll(PGconn *conn)
 				{
 					printfPQExpBuffer(&conn->errorMessage,
 						libpq_gettext("could not get client address from socket: %s\n"),
-									  SOCK_STRERROR(SOCK_ERRNO));
+									  SOCK_STRERROR(SOCK_ERRNO, sebuf, sizeof(sebuf)));
 					goto error_return;
 				}
 
@@ -1282,7 +1288,7 @@ PQconnectPoll(PGconn *conn)
 					{
 						printfPQExpBuffer(&conn->errorMessage,
 										  libpq_gettext("could not send SSL negotiation packet: %s\n"),
-										  SOCK_STRERROR(SOCK_ERRNO));
+										  SOCK_STRERROR(SOCK_ERRNO, sebuf, sizeof(sebuf)));
 						goto error_return;
 					}
 					/* Ok, wait for response */
@@ -1317,7 +1323,7 @@ PQconnectPoll(PGconn *conn)
 				{
 					printfPQExpBuffer(&conn->errorMessage,
 					libpq_gettext("could not send startup packet: %s\n"),
-									  SOCK_STRERROR(SOCK_ERRNO));
+									  SOCK_STRERROR(SOCK_ERRNO, sebuf, sizeof(sebuf)));
 					free(startpacket);
 					goto error_return;
 				}
@@ -1357,7 +1363,7 @@ PQconnectPoll(PGconn *conn)
 
 						printfPQExpBuffer(&conn->errorMessage,
 										  libpq_gettext("could not receive server response to SSL negotiation packet: %s\n"),
-										  SOCK_STRERROR(SOCK_ERRNO));
+										  SOCK_STRERROR(SOCK_ERRNO, sebuf, sizeof(sebuf)));
 						goto error_return;
 					}
 					if (nread == 0)
@@ -2037,6 +2043,7 @@ PQrequestCancel(PGconn *conn)
 {
 	int			save_errno = SOCK_ERRNO;
 	int			tmpsock = -1;
+	char		sebuf[256];
 	struct
 	{
 		uint32		packetlen;
@@ -2115,7 +2122,7 @@ PQrequestCancel(PGconn *conn)
 	return TRUE;
 
 cancel_errReturn:
-	strcat(conn->errorMessage.data, SOCK_STRERROR(SOCK_ERRNO));
+	strcat(conn->errorMessage.data, SOCK_STRERROR(SOCK_ERRNO, sebuf, sizeof(sebuf)));
 	strcat(conn->errorMessage.data, "\n");
 	conn->errorMessage.len = strlen(conn->errorMessage.data);
 	if (tmpsock >= 0)
@@ -2262,8 +2269,9 @@ parseServiceInfo(PQconninfoOption *options, PQExpBuffer errorMessage)
 							   *val;
 					int			found_keyword;
 
-					key = strtok(line, "=");
-					if (key == NULL)
+					key = line;
+					val = strchr(line, '=');
+					if( val == NULL )
 					{
 						printfPQExpBuffer(errorMessage,
 										  "ERROR: syntax error in service file '%s', line %d\n",
@@ -2272,6 +2280,7 @@ parseServiceInfo(PQconninfoOption *options, PQExpBuffer errorMessage)
 						fclose(f);
 						return 3;
 					}
+					*val++ = '\0';
 
 					/*
 					 *	If not already set, set the database name to the
@@ -2287,8 +2296,6 @@ parseServiceInfo(PQconninfoOption *options, PQExpBuffer errorMessage)
 						}
 					}
 
-					val = line + strlen(line) + 1;
-
 					/*
 					 * Set the parameter --- but don't override any
 					 * previous explicit setting.

src/interfaces/libpq/fe-lobj.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-lobj.c,v 1.41 2002/06/20 20:29:54 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-lobj.c,v 1.42 2003/06/14 17:49:54 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -396,9 +396,10 @@ lo_import(PGconn *conn, const char *filename)
 	fd = open(filename, O_RDONLY | PG_BINARY, 0666);
 	if (fd < 0)
 	{							/* error */
+		char sebuf[256];
 		printfPQExpBuffer(&conn->errorMessage,
 					   libpq_gettext("could not open file \"%s\": %s\n"),
-						  filename, strerror(errno));
+						  filename, pqStrerror(errno, sebuf, sizeof(sebuf)));
 		return InvalidOid;
 	}
 
@@ -479,9 +480,10 @@ lo_export(PGconn *conn, Oid lobjId, const char *filename)
 	fd = open(filename, O_CREAT | O_WRONLY | O_TRUNC | PG_BINARY, 0666);
 	if (fd < 0)
 	{							/* error */
+		char sebuf[256];
 		printfPQExpBuffer(&conn->errorMessage,
 					   libpq_gettext("could not open file \"%s\": %s\n"),
-						  filename, strerror(errno));
+						  filename, pqStrerror(errno, sebuf, sizeof(sebuf)));
 		(void) lo_close(conn, lobj);
 		return -1;
 	}