From 40f456ce56d86c9d4efeda9a9936e340602269de Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Tue, 16 Mar 2004 05:05:58 +0000
Subject: [PATCH] Remove double-rename used by Win32 on busy files.  Not needed
 anymore.

---
 src/backend/commands/user.c        | 34 +-----------------------------
 src/backend/utils/cache/relcache.c | 14 +-----------
 2 files changed, 2 insertions(+), 46 deletions(-)

diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
index 88af5d1969..d646c8e14b 100644
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/commands/user.c,v 1.138 2004/02/25 19:41:22 momjian Exp $
+ * $PostgreSQL: pgsql/src/backend/commands/user.c,v 1.139 2004/03/16 05:05:57 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -140,10 +140,6 @@ write_group_file(Relation grel)
 	bufsize = strlen(filename) + 12;
 	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");
@@ -291,10 +287,6 @@ write_user_file(Relation urel)
 	bufsize = strlen(filename) + 12;
 	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");
@@ -466,18 +458,6 @@ AtEOXact_UpdatePasswordFile(bool isCommit)
 		user_file_update_needed = false;
 		write_user_file(urel);
 		heap_close(urel, NoLock);
-#if defined(WIN32) || defined(__CYGWIN__)
-		{
-			/* 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);
-			pfree(filename_new);
-		}
-#endif
 	}
 
 	if (group_file_update_needed)
@@ -485,18 +465,6 @@ AtEOXact_UpdatePasswordFile(bool isCommit)
 		group_file_update_needed = false;
 		write_group_file(grel);
 		heap_close(grel, NoLock);
-#if defined(WIN32) || defined(__CYGWIN__)
-		{
-			/* 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);
-			pfree(filename_new);
-		}
-#endif
 	}
 
 	/*
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index 4900cfa527..5c302e18d3 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/cache/relcache.c,v 1.199 2004/03/14 23:41:27 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/cache/relcache.c,v 1.200 2004/03/16 05:05:58 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -3278,20 +3278,8 @@ write_relcache_init_file(void)
 		 * OK, rename the temp file to its final name, deleting any
 		 * previously-existing init file.
 		 */
-#if defined(WIN32) || defined(__CYGWIN__)
 		rename(tempfilename, finalfilename);
 		LWLockRelease(RelCacheInitLock);
-#else
-		{
-			char		finalfilename_new[MAXPGPATH];
-
-			snprintf(finalfilename_new, sizeof(finalfilename_new), "%s.new", finalfilename);
-			rename(tempfilename, finalfilename_new);
-			LWLockRelease(RelCacheInitLock);
-			/* Rename to active file after lock is released */
-			rename(finalfilename_new, finalfilename);
-		}
-#endif
 	}
 	else
 	{
-- 
2.40.0