Remove MinGW readdir/errno bug workaround fixed on 2003-10-10

bmomjian · bmomjian · commit 1494931d7375 · 2014-03-21T13:47:37.000-04:00
diff --git a/contrib/pg_archivecleanup/pg_archivecleanup.c b/contrib/pg_archivecleanup/pg_archivecleanup.c
@@ -165,12 +165,6 @@ CleanupPriorWALFiles(void)
 			}
 		}
 
-#ifdef WIN32
-		/* Bug in old Mingw dirent.c;  fixed in mingw-runtime-3.2, 2003-10-10 */
-		if (GetLastError() == ERROR_NO_MORE_FILES)
-			errno = 0;
-#endif
-
 		if (errno)
 			fprintf(stderr, "%s: could not read archive location \"%s\": %s\n",
 					progname, archiveLocation, strerror(errno));
diff --git a/contrib/pg_standby/pg_standby.c b/contrib/pg_standby/pg_standby.c
@@ -284,12 +284,6 @@ CustomizableCleanupPriorWALFiles(void)
 				}
 			}
 
-#ifdef WIN32
-			/* Bug in old Mingw dirent.c;  fixed in mingw-runtime-3.2, 2003-10-10 */
-			if (GetLastError() == ERROR_NO_MORE_FILES)
-				errno = 0;
-#endif
-
 			if (errno)
 				fprintf(stderr, "%s: could not read archive location \"%s\": %s\n",
 						progname, archiveLocation, strerror(errno));
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
@@ -1956,12 +1956,6 @@ ReadDir(DIR *dir, const char *dirname)
 	if ((dent = readdir(dir)) != NULL)
 		return dent;
 
-#ifdef WIN32
-	/* Bug in old Mingw dirent.c;  fixed in mingw-runtime-3.2, 2003-10-10 */
-	if (GetLastError() == ERROR_NO_MORE_FILES)
-		errno = 0;
-#endif
-
 	if (errno)
 		ereport(ERROR,
 				(errcode_for_file_access(),
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
@@ -564,12 +564,6 @@ walkdir(char *path, void (*action) (char *fname, bool isdir))
 			(*action) (subpath, false);
 	}
 
-#ifdef WIN32
-	/* Bug in old Mingw dirent.c;  fixed in mingw-runtime-3.2, 2003-10-10 */
-	if (GetLastError() == ERROR_NO_MORE_FILES)
-		errno = 0;
-#endif
-
 	if (errno)
 	{
 		fprintf(stderr, _("%s: could not read directory \"%s\": %s\n"),
diff --git a/src/bin/pg_basebackup/pg_receivexlog.c b/src/bin/pg_basebackup/pg_receivexlog.c
@@ -209,12 +209,6 @@ FindStreamingStart(uint32 *tli)
 		}
 	}
 
-#ifdef WIN32
-	/* Bug in old Mingw dirent.c;  fixed in mingw-runtime-3.2, 2003-10-10 */
-	if (GetLastError() == ERROR_NO_MORE_FILES)
-		errno = 0;
-#endif
-
 	if (errno)
 	{
 		fprintf(stderr, _("%s: could not read directory \"%s\": %s\n"),
diff --git a/src/bin/pg_dump/pg_backup_directory.c b/src/bin/pg_dump/pg_backup_directory.c
@@ -186,12 +186,6 @@ InitArchiveFmt_Directory(ArchiveHandle *AH)
 					}
 				}
 
-#ifdef WIN32
-				/* Bug in old Mingw dirent.c;  fixed in mingw-runtime-3.2, 2003-10-10 */
-				if (GetLastError() == ERROR_NO_MORE_FILES)
-					errno = 0;
-#endif
-
 				if (errno)
 					exit_horribly(modulename, "could not read directory \"%s\": %s\n",
 								  ctx->directory, strerror(errno));
diff --git a/src/bin/pg_resetxlog/pg_resetxlog.c b/src/bin/pg_resetxlog/pg_resetxlog.c
@@ -845,12 +845,6 @@ FindEndOfXLOG(void)
 		}
 	}
 
-#ifdef WIN32
-	/* Bug in old Mingw dirent.c;  fixed in mingw-runtime-3.2, 2003-10-10 */
-	if (GetLastError() == ERROR_NO_MORE_FILES)
-		errno = 0;
-#endif
-
 	if (errno)
 	{
 		fprintf(stderr, _("%s: could not read directory \"%s\": %s\n"),
@@ -908,12 +902,6 @@ KillExistingXLOG(void)
 		}
 	}
 
-#ifdef WIN32
-	/* Bug in old Mingw dirent.c;  fixed in mingw-runtime-3.2, 2003-10-10 */
-	if (GetLastError() == ERROR_NO_MORE_FILES)
-		errno = 0;
-#endif
-
 	if (errno)
 	{
 		fprintf(stderr, _("%s: could not read directory \"%s\": %s\n"),
@@ -966,12 +954,6 @@ KillExistingArchiveStatus(void)
 		}
 	}
 
-#ifdef WIN32
-	/* Bug in old Mingw dirent.c;  fixed in mingw-runtime-3.2, 2003-10-10 */
-	if (GetLastError() == ERROR_NO_MORE_FILES)
-		errno = 0;
-#endif
-
 	if (errno)
 	{
 		fprintf(stderr, _("%s: could not read directory \"%s\": %s\n"),
diff --git a/src/common/pgfnames.c b/src/common/pgfnames.c
@@ -64,12 +64,6 @@ pgfnames(const char *path)
 		}
 	}
 
-#ifdef WIN32
-	/* Bug in old Mingw dirent.c;  fixed in mingw-runtime-3.2, 2003-10-10 */
-	if (GetLastError() == ERROR_NO_MORE_FILES)
-		errno = 0;
-#endif
-
 	if (errno)
 	{
 #ifndef FRONTEND
diff --git a/src/port/pgcheckdir.c b/src/port/pgcheckdir.c
@@ -64,12 +64,6 @@ pg_check_dir(const char *dir)
 		}
 	}
 
-#ifdef WIN32
-	/* Bug in old Mingw dirent.c;  fixed in mingw-runtime-3.2, 2003-10-10 */
-	if (GetLastError() == ERROR_NO_MORE_FILES)
-		errno = 0;
-#endif
-
 	if (errno || closedir(chkdir))
 		result = -1;			/* some kind of I/O error? */
 

Original file line number	Diff line number	Diff line change
`@@ -165,12 +165,6 @@ CleanupPriorWALFiles(void)`
`165`	`165`	`}`
`166`	`166`	`}`
`167`	`167`
`168`		`-#ifdef WIN32`
`169`		`- /* Bug in old Mingw dirent.c; fixed in mingw-runtime-3.2, 2003-10-10 */`
`170`		`- if (GetLastError() == ERROR_NO_MORE_FILES)`
`171`		`- errno = 0;`
`172`		`-#endif`
`173`		`-`
`174`	`168`	`if (errno)`
`175`	`169`	`fprintf(stderr, "%s: could not read archive location \"%s\": %s\n",`
`176`	`170`	`progname, archiveLocation, strerror(errno));`
Original file line number	Diff line number	Diff line change
`@@ -284,12 +284,6 @@ CustomizableCleanupPriorWALFiles(void)`
`284`	`284`	`}`
`285`	`285`	`}`
`286`	`286`
`287`		`-#ifdef WIN32`
`288`		`- /* Bug in old Mingw dirent.c; fixed in mingw-runtime-3.2, 2003-10-10 */`
`289`		`- if (GetLastError() == ERROR_NO_MORE_FILES)`
`290`		`- errno = 0;`
`291`		`-#endif`
`292`		`-`
`293`	`287`	`if (errno)`
`294`	`288`	`fprintf(stderr, "%s: could not read archive location \"%s\": %s\n",`
`295`	`289`	`progname, archiveLocation, strerror(errno));`
Original file line number	Diff line number	Diff line change
`@@ -564,12 +564,6 @@ walkdir(char path, void (action) (char *fname, bool isdir))`
`564`	`564`	`(*action) (subpath, false);`
`565`	`565`	`}`
`566`	`566`
`567`		`-#ifdef WIN32`
`568`		`- /* Bug in old Mingw dirent.c; fixed in mingw-runtime-3.2, 2003-10-10 */`
`569`		`- if (GetLastError() == ERROR_NO_MORE_FILES)`
`570`		`- errno = 0;`
`571`		`-#endif`
`572`		`-`
`573`	`567`	`if (errno)`
`574`	`568`	`{`
`575`	`569`	`fprintf(stderr, _("%s: could not read directory \"%s\": %s\n"),`
Original file line number	Diff line number	Diff line change
`@@ -209,12 +209,6 @@ FindStreamingStart(uint32 *tli)`
`209`	`209`	`}`
`210`	`210`	`}`
`211`	`211`
`212`		`-#ifdef WIN32`
`213`		`- /* Bug in old Mingw dirent.c; fixed in mingw-runtime-3.2, 2003-10-10 */`
`214`		`- if (GetLastError() == ERROR_NO_MORE_FILES)`
`215`		`- errno = 0;`
`216`		`-#endif`
`217`		`-`
`218`	`212`	`if (errno)`
`219`	`213`	`{`
`220`	`214`	`fprintf(stderr, _("%s: could not read directory \"%s\": %s\n"),`
Original file line number	Diff line number	Diff line change
`@@ -186,12 +186,6 @@ InitArchiveFmt_Directory(ArchiveHandle *AH)`
`186`	`186`	`}`
`187`	`187`	`}`
`188`	`188`
`189`		`-#ifdef WIN32`
`190`		`- /* Bug in old Mingw dirent.c; fixed in mingw-runtime-3.2, 2003-10-10 */`
`191`		`- if (GetLastError() == ERROR_NO_MORE_FILES)`
`192`		`- errno = 0;`
`193`		`-#endif`
`194`		`-`
`195`	`189`	`if (errno)`
`196`	`190`	`exit_horribly(modulename, "could not read directory \"%s\": %s\n",`
`197`	`191`	`ctx->directory, strerror(errno));`
Original file line number	Diff line number	Diff line change
`@@ -845,12 +845,6 @@ FindEndOfXLOG(void)`
`845`	`845`	`}`
`846`	`846`	`}`
`847`	`847`
`848`		`-#ifdef WIN32`
`849`		`- /* Bug in old Mingw dirent.c; fixed in mingw-runtime-3.2, 2003-10-10 */`
`850`		`- if (GetLastError() == ERROR_NO_MORE_FILES)`
`851`		`- errno = 0;`
`852`		`-#endif`
`853`		`-`
`854`	`848`	`if (errno)`
`855`	`849`	`{`
`856`	`850`	`fprintf(stderr, _("%s: could not read directory \"%s\": %s\n"),`
`@@ -908,12 +902,6 @@ KillExistingXLOG(void)`
`908`	`902`	`}`
`909`	`903`	`}`
`910`	`904`
`911`		`-#ifdef WIN32`
`912`		`- /* Bug in old Mingw dirent.c; fixed in mingw-runtime-3.2, 2003-10-10 */`
`913`		`- if (GetLastError() == ERROR_NO_MORE_FILES)`
`914`		`- errno = 0;`
`915`		`-#endif`
`916`		`-`
`917`	`905`	`if (errno)`
`918`	`906`	`{`
`919`	`907`	`fprintf(stderr, _("%s: could not read directory \"%s\": %s\n"),`
`@@ -966,12 +954,6 @@ KillExistingArchiveStatus(void)`
`966`	`954`	`}`
`967`	`955`	`}`
`968`	`956`
`969`		`-#ifdef WIN32`
`970`		`- /* Bug in old Mingw dirent.c; fixed in mingw-runtime-3.2, 2003-10-10 */`
`971`		`- if (GetLastError() == ERROR_NO_MORE_FILES)`
`972`		`- errno = 0;`
`973`		`-#endif`
`974`		`-`
`975`	`957`	`if (errno)`
`976`	`958`	`{`
`977`	`959`	`fprintf(stderr, _("%s: could not read directory \"%s\": %s\n"),`
Original file line number	Diff line number	Diff line change
`@@ -64,12 +64,6 @@ pgfnames(const char *path)`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
`67`		`-#ifdef WIN32`
`68`		`- /* Bug in old Mingw dirent.c; fixed in mingw-runtime-3.2, 2003-10-10 */`
`69`		`- if (GetLastError() == ERROR_NO_MORE_FILES)`
`70`		`- errno = 0;`
`71`		`-#endif`
`72`		`-`
`73`	`67`	`if (errno)`
`74`	`68`	`{`
`75`	`69`	`#ifndef FRONTEND`
Original file line number	Diff line number	Diff line change
`@@ -64,12 +64,6 @@ pg_check_dir(const char *dir)`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`
`67`		`-#ifdef WIN32`
`68`		`- /* Bug in old Mingw dirent.c; fixed in mingw-runtime-3.2, 2003-10-10 */`
`69`		`- if (GetLastError() == ERROR_NO_MORE_FILES)`
`70`		`- errno = 0;`
`71`		`-#endif`
`72`		`-`
`73`	`67`	`if (errno \|\| closedir(chkdir))`
`74`	`68`	`result = -1; /* some kind of I/O error? */`
`75`	`69`