Index: src/backend/commands/user.c
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/backend/commands/user.c,v
retrieving revision 1.134
diff -c -r1.134 user.c
*** src/backend/commands/user.c	2 Feb 2004 00:17:21 -0000	1.134
--- src/backend/commands/user.c	2 Feb 2004 06:10:52 -0000
***************
*** 140,149 ****
  	tempname = (char *) palloc(bufsize);
  	snprintf(tempname, bufsize, "%s.%d", filename, MyProcPid);
  #if defined(WIN32) || defined(CYGWIN)
! 	filename = repalloc(filename, strlen(filename) + 1 + strlen(".new");
  	strcat(filename, ".new");
  #endif
! 	
  	oumask = umask((mode_t) 077);
  	fp = AllocateFile(tempname, "w");
  	umask(oumask);
--- 140,149 ----
  	tempname = (char *) palloc(bufsize);
  	snprintf(tempname, bufsize, "%s.%d", filename, MyProcPid);
  #if defined(WIN32) || defined(CYGWIN)
! 	filename = repalloc(filename, strlen(filename) + 1 + strlen(".new"));
  	strcat(filename, ".new");
  #endif
! 
  	oumask = umask((mode_t) 077);
  	fp = AllocateFile(tempname, "w");
  	umask(oumask);
***************
*** 291,297 ****
  	tempname = (char *) palloc(bufsize);
  	snprintf(tempname, bufsize, "%s.%d", filename, MyProcPid);
  #if defined(WIN32) || defined(CYGWIN)
! 	filename = repalloc(filename, strlen(filename) + 1 + strlen(".new");
  	strcat(filename, ".new");
  #endif
  
--- 291,297 ----
  	tempname = (char *) palloc(bufsize);
  	snprintf(tempname, bufsize, "%s.%d", filename, MyProcPid);
  #if defined(WIN32) || defined(CYGWIN)
! 	filename = repalloc(filename, strlen(filename) + 1 + strlen(".new"));
  	strcat(filename, ".new");
  #endif
  
***************
*** 470,476 ****
  			/* Rename active file while not holding an exclusive lock */
  			char *filename = user_getfilename(), *filename_new;
  
! 			filename_new = palloc(strlen(filename) + 1 + strlen(".new")));
  			sprintf(filename_new, "%s.new", filename);
  			rename(filename_new, filename);
  			pfree(filename);
--- 470,476 ----
  			/* Rename active file while not holding an exclusive lock */
  			char *filename = user_getfilename(), *filename_new;
  
! 			filename_new = palloc(strlen(filename) + 1 + strlen(".new"));
  			sprintf(filename_new, "%s.new", filename);
  			rename(filename_new, filename);
  			pfree(filename);
***************
*** 489,495 ****
  			/* Rename active file while not holding an exclusive lock */
  			char *filename = group_getfilename(), *filename_new;
  
! 			filename_new = palloc(strlen(filename) + 1 + strlen(".new")));
  			sprintf(filename_new, "%s.new", filename);
  			rename(filename_new, filename);
  			pfree(filename);
--- 489,495 ----
  			/* Rename active file while not holding an exclusive lock */
  			char *filename = group_getfilename(), *filename_new;
  
! 			filename_new = palloc(strlen(filename) + 1 + strlen(".new"));
  			sprintf(filename_new, "%s.new", filename);
  			rename(filename_new, filename);
  			pfree(filename);
Index: src/backend/postmaster/pgstat.c
===================================================================
RCS file: /projects/cvsroot/pgsql-server/src/backend/postmaster/pgstat.c,v
retrieving revision 1.57
diff -c -r1.57 pgstat.c
*** src/backend/postmaster/pgstat.c	28 Jan 2004 21:02:40 -0000	1.57
--- src/backend/postmaster/pgstat.c	2 Feb 2004 06:10:55 -0000
***************
*** 49,54 ****
--- 49,55 ----
  #include "utils/hsearch.h"
  #include "utils/ps_status.h"
  #include "utils/syscache.h"
+ #include "tcop/tcopprot.h"
  
  #ifdef WIN32
  extern pid_t win32_forkexec(const char* path, char *argv[]);
Index: src/backend/postmaster/postmaster.c