Hello!

Through some minor changes, I have been able to compile the libpq
client libraries on the Win32 platform. Since the libpq communications
part has been rewritten, this has become much easier. Enclosed is
a patch that will allow at least Microsoft Visual C++ to compile
libpq into both a static and a dynamic library.  I will take a look
at porting the psql frontend as well, but I figured it was a good
idea to send in these patches first - so no major changes are done
to the files before it gets applied (if it does).

Regards,
  Magnus Hagander

Author: bmomjian

src/include/postgres.h

@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1995, Regents of the University of California
  *
- * $Id: postgres.h,v 1.16 1998/04/26 04:08:18 momjian Exp $
+ * $Id: postgres.h,v 1.17 1998/07/03 04:24:10 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -37,7 +37,9 @@
 #define POSTGRES_H
 
 #include "postgres_ext.h"
+#ifndef WIN32
 #include "config.h"
+#endif
 #include "c.h"
 #include "utils/elog.h"
 #include "utils/palloc.h"

src/interfaces/libpq/fe-auth.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.17 1998/06/15 19:30:22 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-auth.c,v 1.18 1998/07/03 04:24:11 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -24,6 +24,9 @@
  *
  *
  */
+#ifdef WIN32
+#include "win32.h"
+#else
 #include <stdio.h>
 #include <string.h>
 #include <sys/param.h>			/* for MAXHOSTNAMELEN on most */
@@ -33,6 +36,7 @@
 #endif
 #include <unistd.h>
 #include <pwd.h>
+#endif /* WIN32 */
 
 #include "postgres.h"
 
@@ -600,10 +604,18 @@ fe_getauthname(char *PQerrormsg)
 #endif
 		case STARTUP_MSG:
 			{
+#ifdef WIN32
+				char username[128];
+				DWORD namesize = sizeof(username) - 1;
+
+				if (GetUserName(username,&namesize)) 
+					name = username;
+#else
 				struct passwd *pw = getpwuid(geteuid());
 
 				if (pw)
 					name = pw->pw_name;
+#endif
 			}
 			break;
 		default:

src/interfaces/libpq/fe-connect.c

@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.69 1998/06/21 16:39:11 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-connect.c,v 1.70 1998/07/03 04:24:12 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -407,6 +407,7 @@ connectDB(PGconn *conn)
 				family,
 				len;
 	char		beresp;
+	int			on = 1;
 
 	/*
 	 * Initialize the startup packet.
@@ -456,8 +457,11 @@ connectDB(PGconn *conn)
 		conn->raddr.in.sin_port = htons((unsigned short) (portno));
 		len = sizeof(struct sockaddr_in);
 	}
+#ifndef WIN32
 	else
 		len = UNIXSOCK_PATH(conn->raddr.un, portno);
+#endif
+	
 
 	/* Connect to the server  */
 	if ((conn->sock = socket(family, SOCK_STREAM, 0)) < 0)
@@ -482,7 +486,11 @@ connectDB(PGconn *conn)
 	 * We need nonblocking I/O, and we don't want delay of outgoing data.
 	 */
 
+#ifndef WIN32
 	if (fcntl(conn->sock, F_SETFL, O_NONBLOCK) < 0)
+#else
+	if (ioctlsocket(conn->sock,FIONBIO, &on) != 0) 
+#endif
 	{
 		(void) sprintf(conn->errorMessage,
 					   "connectDB() -- fcntl() failed: errno=%d\n%s\n",
@@ -493,7 +501,6 @@ connectDB(PGconn *conn)
 	if (family == AF_INET)
 	{
 		struct protoent *pe;
-		int			on = 1;
 
 		pe = getprotobyname("TCP");
 		if (pe == NULL)
@@ -503,11 +510,18 @@ connectDB(PGconn *conn)
 			goto connect_errReturn;
 		}
 		if (setsockopt(conn->sock, pe->p_proto, TCP_NODELAY,
-					   &on, sizeof(on)) < 0)
+#ifdef WIN32
+			(char *)
+#endif
+					   &on, 
+					   sizeof(on)) < 0)
 		{
 			(void) sprintf(conn->errorMessage,
 						   "connectDB() -- setsockopt failed: errno=%d\n%s\n",
 						   errno, strerror(errno));
+#ifdef WIN32
+			printf("Winsock error: %i\n",WSAGetLastError());
+#endif
 			goto connect_errReturn;
 		}
 	}
@@ -666,7 +680,11 @@ connectDB(PGconn *conn)
 connect_errReturn:
 	if (conn->sock >= 0)
 	{
+#ifdef WIN32
+		closesocket(conn->sock);
+#else
 		close(conn->sock);
+#endif
 		conn->sock = -1;
 	}
 	return CONNECTION_BAD;
@@ -742,7 +760,11 @@ freePGconn(PGconn *conn)
 		return;
 	PQclearAsyncResult(conn);	/* deallocate result and curTuple */
 	if (conn->sock >= 0)
-		close(conn->sock);		/* shouldn't happen, but... */
+#ifdef WIN32
+		closesocket(conn->sock);
+#else
+		close(conn->sock);
+#endif
 	if (conn->pghost)
 		free(conn->pghost);
 	if (conn->pgport)
@@ -783,6 +805,7 @@ closePGconn(PGconn *conn)
 		 * If connection is already gone, that's cool.  No reason for kernel
 		 * to kill us when we try to write to it.  So ignore SIGPIPE signals.
 		 */
+#ifndef WIN32
 #if defined(USE_POSIX_SIGNALS)
 		struct sigaction ignore_action;
 		struct sigaction oldaction;
@@ -806,13 +829,18 @@ closePGconn(PGconn *conn)
 
 		signal(SIGPIPE, oldsignal);
 #endif
+#endif /* Win32 uses no signals at all */
 	}
 
 	/*
 	 * Close the connection, reset all transient state, flush I/O buffers.
 	 */
 	if (conn->sock >= 0)
+#ifdef WIN32
+		closesocket(conn->sock);
+#else
 		close(conn->sock);
+#endif
 	conn->sock = -1;
 	conn->status = CONNECTION_BAD;		/* Well, not really _bad_ - just
 										 * absent */

src/interfaces/libpq/fe-exec.c

@@ -7,10 +7,13 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.54 1998/06/16 07:29:48 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-exec.c,v 1.55 1998/07/03 04:24:13 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
+#ifdef WIN32
+#include "win32.h"
+#endif
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>

src/interfaces/libpq/fe-lobj.c

@@ -7,11 +7,16 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-lobj.c,v 1.13 1998/06/15 19:30:26 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-lobj.c,v 1.14 1998/07/03 04:24:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
+#ifdef WIN32
+#include "win32.h"
+#include <io.h>
+#else
 #include <unistd.h>
+#endif
 #include <stdio.h>
 #include <string.h>
 #include <fcntl.h>

src/interfaces/libpq/fe-misc.c

@@ -24,7 +24,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.15 1998/06/15 19:30:26 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-misc.c,v 1.16 1998/07/03 04:24:14 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -34,10 +34,14 @@
 #include <string.h>
 #include <errno.h>
 #include <time.h>
+#ifdef WIN32
+#include "win32.h"
+#else
 #include <sys/time.h>
 #if !defined(NO_UNISTD_H)
 #include <unistd.h>
 #endif
+#endif /* WIN32 */
 #include <sys/types.h>			/* for fd_set stuff */
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
@@ -412,7 +416,11 @@ pqReadData(PGconn *conn)
 			" before or while processing the request.\n");
 	conn->status = CONNECTION_BAD; /* No more connection to
 									* backend */
+#ifdef WIN32
+	closesocket(conn->sock);
+#else
 	close(conn->sock);
+#endif
 	conn->sock = -1;
 
 	return -1;

src/interfaces/libpq/fe-print.c

@@ -9,24 +9,31 @@
  * didn't really belong there.
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-print.c,v 1.5 1998/06/16 07:29:49 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/interfaces/libpq/fe-print.c,v 1.6 1998/07/03 04:24:15 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
+#ifdef WIN32
+#include "win32.h"
+#endif
 #include <postgres.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <signal.h>
 #include <string.h>
+#ifndef WIN32
 #include <unistd.h>
 #include <sys/ioctl.h>
+#endif
 #include "libpq/pqsignal.h"
 #include "libpq-fe.h"
+#ifndef WIN32
 #ifndef HAVE_TERMIOS_H
 #include <sys/termios.h>
 #else
 #include <termios.h>
 #endif
+#endif /* WIN32 */
 
 #ifdef MB
 #include "regex/pg_wchar.h"
@@ -143,9 +150,13 @@ PQprint(FILE *fout,
 
 		if (fout == NULL)
 			fout = stdout;
-		if (po->pager && fout == stdout &&
+		if (po->pager && fout == stdout 
+#ifndef WIN32
+			&&
 			isatty(fileno(stdin)) &&
-			isatty(fileno(stdout)))
+			isatty(fileno(stdout))
+#endif
+			)
 		{
 			/* try to pipe to the pager program if possible */
 #ifdef TIOCGWINSZ
@@ -174,11 +185,17 @@ PQprint(FILE *fout,
 				  - (po->header != 0) * 2		/* row count and newline */
 				  )))
 			{
+#ifdef WIN32
+				fout = _popen(pagerenv, "w");
+#else
 				fout = popen(pagerenv, "w");
+#endif
 				if (fout)
 				{
 					usePipe = 1;
+#ifndef WIN32
 					pqsignal(SIGPIPE, SIG_IGN);
+#endif
 				}
 				else
 					fout = stdout;
@@ -289,8 +306,12 @@ PQprint(FILE *fout,
 		free(fieldNames);
 		if (usePipe)
 		{
+#ifdef WIN32
+			_pclose(fout);
+#else
 			pclose(fout);
 			pqsignal(SIGPIPE, SIG_DFL);
+#endif
 		}
 		if (po->html3 && !po->expanded)
 			fputs("</table>\n", fout);

src/interfaces/libpq/libpqdll.c

@@ -0,0 +1,6 @@
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+BOOL WINAPI DllMain( HINSTANCE hinstDLL,                      DWORD fdwReason,
+                     LPVOID lpReserved ){
+	return (TRUE);
+}