* Most changes are to fix warnings issued when compiling win32

* removed a few redundant defines
* get_user_name safe under win32
* rationalized pipe read EOF for win32 (UPDATED PATCH USED)
* changed all backend instances of sleep() to pg_usleep

    - except for the SLEEP_ON_ASSERT in assert.c, as it would exceed a
32-bit long [Note to patcher: If a SLEEP_ON_ASSERT of 2000 seconds is
acceptable, please replace with pg_usleep(2000000000L)]

I added a comment to that part of the code:

    /*
     *  It would be nice to use pg_usleep() here, but only does 2000 sec
     *  or 33 minutes, which seems too short.
     */
    sleep(1000000);

Claudio Natoli

4 files changed, 19 insertions, 7 deletions

diff --git a/src/port/open.c b/src/port/open.c
index ccd2a15b1d..627922b600 100644
--- a/src/port/open.c
+++ b/src/port/open.c
@@ -6,7 +6,7 @@
  *
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/port/open.c,v 1.1 2004/03/24 03:54:16 momjian Exp $
+ * $PostgreSQL: pgsql/src/port/open.c,v 1.2 2004/04/19 17:42:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -18,7 +18,8 @@
 #include <errno.h>
 #include <assert.h>
 
-int openFlagsToCreateFileFlags(int openFlags)
+static int
+openFlagsToCreateFileFlags(int openFlags)
 {
 	switch (openFlags & (O_CREAT|O_TRUNC|O_EXCL))
 	{
diff --git a/src/port/pipe.c b/src/port/pipe.c
index fe94c09111..4a707f7335 100644
--- a/src/port/pipe.c
+++ b/src/port/pipe.c
@@ -10,7 +10,7 @@
  *	must be replaced with recv/send.
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/port/pipe.c,v 1.1 2004/01/09 04:58:09 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/port/pipe.c,v 1.2 2004/04/19 17:42:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -53,3 +53,13 @@ pgpipe(int handles[2])
 	closesocket(s);
 	return 0;
 }
+
+
+int piperead(int s, char* buf, int len)
+{
+	int ret = recv(s,buf,len,0);
+	if (ret < 0 && WSAGetLastError() == WSAECONNRESET)
+		/* EOF on the pipe! (win32 socket based implementation) */
+		ret = 0;
+	return ret;
+}
diff --git a/src/port/rand.c b/src/port/rand.c
index faeec88b28..7fc3094dec 100644
--- a/src/port/rand.c
+++ b/src/port/rand.c
@@ -5,6 +5,7 @@
  *
  *-------------------------------------------------------------------------
  */
+#include "c.h"
 
 /*
  * Copyright (c) 1993 Martin Birgmeier
@@ -38,7 +39,7 @@ unsigned short _rand48_mult[3] = {
 };
 unsigned short _rand48_add = RAND48_ADD;
 
-void
+static void
 _dorand48(unsigned short xseed[3])
 {
 	unsigned long accu;
diff --git a/src/port/sprompt.c b/src/port/sprompt.c
index e771b5ebbc..664d4bc606 100644
--- a/src/port/sprompt.c
+++ b/src/port/sprompt.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/port/sprompt.c,v 1.4 2003/11/29 19:52:13 pgsql Exp $
+ *	  $PostgreSQL: pgsql/src/port/sprompt.c,v 1.5 2004/04/19 17:42:59 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -54,8 +54,8 @@ simple_prompt(const char *prompt, int maxlen, bool echo)
 
 #else
 #ifdef WIN32
-	HANDLE		t;
-	LPDWORD		t_orig;
+	HANDLE		t = NULL;
+	LPDWORD		t_orig	= NULL;
 #endif
 #endif