Here is an updated version of the win32 readdir patch.

bmomjian · bmomjian · commit 1f17316a3d47 · 2004-02-17T03:45:17.000Z
1) Now puts in exactly the same change as the current-cvs mingw code does. (see http://cvs.sourceforge.net/viewcvs.py/mingw/runtime/mingwex/dirent.c?r1= 1.3&r2=1.4, second part of the patch). 2) Updates both xlog.c and slru.c in backend/access/transam/ 3) Also updates pg_resetxlog, which also uses readdir() and checks the errno value after the loop. Magnus Hagander
diff --git a/src/backend/access/transam/slru.c b/src/backend/access/transam/slru.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/access/transam/slru.c,v 1.11 2004/02/10 01:55:24 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/access/transam/slru.c,v 1.12 2004/02/17 03:45:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -917,6 +917,12 @@ SlruScanDirectory(SlruCtl ctl, int cutoffPage, bool doDeletions)
 		}
 		errno = 0;
 	}
+#ifdef WIN32
+	/* This fix is in mingw cvs (runtime/mingwex/dirent.c rev 1.4), but
+	   not in released version */
+	if (GetLastError() == ERROR_NO_MORE_FILES)
+		errno = 0;
+#endif
 	if (errno)
 		ereport(ERROR,
 				(errcode_for_file_access(),
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.135 2004/02/11 22:55:24 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.136 2004/02/17 03:45:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1805,6 +1805,12 @@ MoveOfflineLogs(uint32 log, uint32 seg, XLogRecPtr endptr)
 		}
 		errno = 0;
 	}
+#ifdef WIN32
+	/* This fix is in mingw cvs (runtime/mingwex/dirent.c rev 1.4), but
+	   not in released version */
+	if (GetLastError() == ERROR_NO_MORE_FILES)
+		errno = 0;
+#endif
 	if (errno)
 		ereport(PANIC,
 				(errcode_for_file_access(),
diff --git a/src/bin/pg_resetxlog/pg_resetxlog.c b/src/bin/pg_resetxlog/pg_resetxlog.c
@@ -23,7 +23,7 @@
  * Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/bin/pg_resetxlog/pg_resetxlog.c,v 1.15 2004/02/11 22:55:25 tgl Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_resetxlog/pg_resetxlog.c,v 1.16 2004/02/17 03:45:17 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -611,6 +611,12 @@ KillExistingXLOG(void)
 		}
 		errno = 0;
 	}
+#ifdef WIN32
+	/* This fix is in mingw cvs (runtime/mingwex/dirent.c rev 1.4), but
+	   not in released version */
+	if (GetLastError() == ERROR_NO_MORE_FILES)
+		errno = 0;
+#endif
 
 	if (errno)
 	{

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group`
`7`	`7`	`* Portions Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $PostgreSQL: pgsql/src/backend/access/transam/slru.c,v 1.11 2004/02/10 01:55:24 tgl Exp $`
	`9`	`+ * $PostgreSQL: pgsql/src/backend/access/transam/slru.c,v 1.12 2004/02/17 03:45:17 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -917,6 +917,12 @@ SlruScanDirectory(SlruCtl ctl, int cutoffPage, bool doDeletions)`
`917`	`917`	`}`
`918`	`918`	`errno = 0;`
`919`	`919`	`}`
	`920`	`+#ifdef WIN32`
	`921`	`+ /* This fix is in mingw cvs (runtime/mingwex/dirent.c rev 1.4), but`
	`922`	`+ not in released version */`
	`923`	`+ if (GetLastError() == ERROR_NO_MORE_FILES)`
	`924`	`+ errno = 0;`
	`925`	`+#endif`
`920`	`926`	`if (errno)`
`921`	`927`	`ereport(ERROR,`
`922`	`928`	`(errcode_for_file_access(),`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`		`- * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.135 2004/02/11 22:55:24 tgl Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.136 2004/02/17 03:45:17 momjian Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -1805,6 +1805,12 @@ MoveOfflineLogs(uint32 log, uint32 seg, XLogRecPtr endptr)`
`1805`	`1805`	`}`
`1806`	`1806`	`errno = 0;`
`1807`	`1807`	`}`
	`1808`	`+#ifdef WIN32`
	`1809`	`+ /* This fix is in mingw cvs (runtime/mingwex/dirent.c rev 1.4), but`
	`1810`	`+ not in released version */`
	`1811`	`+ if (GetLastError() == ERROR_NO_MORE_FILES)`
	`1812`	`+ errno = 0;`
	`1813`	`+#endif`
`1808`	`1814`	`if (errno)`
`1809`	`1815`	`ereport(PANIC,`
`1810`	`1816`	`(errcode_for_file_access(),`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`* Portions Copyright (c) 1996-2003, PostgreSQL Global Development Group`
`24`	`24`	`* Portions Copyright (c) 1994, Regents of the University of California`
`25`	`25`	`*`
`26`		`- * $PostgreSQL: pgsql/src/bin/pg_resetxlog/pg_resetxlog.c,v 1.15 2004/02/11 22:55:25 tgl Exp $`
	`26`	`+ * $PostgreSQL: pgsql/src/bin/pg_resetxlog/pg_resetxlog.c,v 1.16 2004/02/17 03:45:17 momjian Exp $`
`27`	`27`	`*`
`28`	`28`	`*-------------------------------------------------------------------------`
`29`	`29`	`*/`
`@@ -611,6 +611,12 @@ KillExistingXLOG(void)`
`611`	`611`	`}`
`612`	`612`	`errno = 0;`
`613`	`613`	`}`
	`614`	`+#ifdef WIN32`
	`615`	`+ /* This fix is in mingw cvs (runtime/mingwex/dirent.c rev 1.4), but`
	`616`	`+ not in released version */`
	`617`	`+ if (GetLastError() == ERROR_NO_MORE_FILES)`
	`618`	`+ errno = 0;`
	`619`	`+#endif`
`614`	`620`
`615`	`621`	`if (errno)`
`616`	`622`	`{`