If we fail to rename pg_internal.init into place, delete the useless

tglsfdc · tglsfdc · commit d66b10833fc4 · 2002-01-15T22:33:20.000Z
temporary file.  This seems to be a known failure mode under Cygwin,
so we might as well expend the extra line of code to be tidy.
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.149 2001/11/05 17:46:30 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.150 2002/01/15 22:33:20 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2978,5 +2978,12 @@ write_irels(void)
 	 * previously-existing init file.
 	 */
 	if (rename(tempfilename, finalfilename) < 0)
+	{
 		elog(NOTICE, "Cannot rename init file %s to %s: %m\n\tContinuing anyway, but there's something wrong.", tempfilename, finalfilename);
+		/*
+		 * If we fail, try to clean up the useless temp file; don't bother
+		 * to complain if this fails too.
+		 */
+		unlink(tempfilename);
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.149 2001/11/05 17:46:30 momjian Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.150 2002/01/15 22:33:20 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -2978,5 +2978,12 @@ write_irels(void)`
`2978`	`2978`	`* previously-existing init file.`
`2979`	`2979`	`*/`
`2980`	`2980`	`if (rename(tempfilename, finalfilename) < 0)`
	`2981`	`+ {`
`2981`	`2982`	`elog(NOTICE, "Cannot rename init file %s to %s: %m\n\tContinuing anyway, but there's something wrong.", tempfilename, finalfilename);`
	`2983`	`+ /*`
	`2984`	`+ * If we fail, try to clean up the useless temp file; don't bother`
	`2985`	`+ * to complain if this fails too.`
	`2986`	`+ */`
	`2987`	`+ unlink(tempfilename);`
	`2988`	`+ }`
`2982`	`2989`	`}`