From ee42d8f10b65593aab768438665000aec070f6c2 Mon Sep 17 00:00:00 2001 From: Bruce Momjian Date: Fri, 21 Mar 2014 13:45:11 -0400 Subject: [PATCH] Properly check for readdir/closedir() failures Clear errno before calling readdir() and handle old MinGW errno bug while adding full test coverage for readdir/closedir failures. Backpatch through 8.4. --- contrib/pg_archivecleanup/pg_archivecleanup.c | 16 ++++- contrib/pg_standby/pg_standby.c | 17 ++++- contrib/pg_upgrade/file.c | 9 ++- src/backend/storage/file/fd.c | 6 +- src/bin/pg_basebackup/pg_receivexlog.c | 22 ++++++- src/bin/pg_resetxlog/pg_resetxlog.c | 63 ++++++++++--------- src/port/dirent.c | 8 ++- src/port/dirmod.c | 22 ++++--- src/port/pgcheckdir.c | 14 +---- 9 files changed, 109 insertions(+), 68 deletions(-) diff --git a/contrib/pg_archivecleanup/pg_archivecleanup.c b/contrib/pg_archivecleanup/pg_archivecleanup.c index 8f77998de1..29271e000a 100644 --- a/contrib/pg_archivecleanup/pg_archivecleanup.c +++ b/contrib/pg_archivecleanup/pg_archivecleanup.c @@ -117,7 +117,7 @@ CleanupPriorWALFiles(void) if ((xldir = opendir(archiveLocation)) != NULL) { - while ((xlde = readdir(xldir)) != NULL) + while (errno = 0, (xlde = readdir(xldir)) != NULL) { strncpy(walfile, xlde->d_name, MAXPGPATH); TrimExtension(walfile, additional_ext); @@ -175,7 +175,19 @@ CleanupPriorWALFiles(void) } } } - closedir(xldir); + +#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)); + if (closedir(xldir)) + fprintf(stderr, "%s: could not close archive location \"%s\": %s\n", + progname, archiveLocation, strerror(errno)); } else fprintf(stderr, "%s: could not open archive location \"%s\": %s\n", diff --git a/contrib/pg_standby/pg_standby.c b/contrib/pg_standby/pg_standby.c index 0f1e0c1dfc..bdb3362b4b 100644 --- a/contrib/pg_standby/pg_standby.c +++ b/contrib/pg_standby/pg_standby.c @@ -256,7 +256,7 @@ CustomizableCleanupPriorWALFiles(void) */ if ((xldir = opendir(archiveLocation)) != NULL) { - while ((xlde = readdir(xldir)) != NULL) + while (errno = 0, (xlde = readdir(xldir)) != NULL) { /* * We ignore the timeline part of the XLOG segment identifiers @@ -294,6 +294,16 @@ 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)); if (debug) fprintf(stderr, "\n"); } @@ -301,7 +311,10 @@ CustomizableCleanupPriorWALFiles(void) fprintf(stderr, "%s: could not open archive location \"%s\": %s\n", progname, archiveLocation, strerror(errno)); - closedir(xldir); + if (closedir(xldir)) + fprintf(stderr, "%s: could not close archive location \"%s\": %s\n", + progname, archiveLocation, strerror(errno)); + fflush(stderr); } } diff --git a/contrib/pg_upgrade/file.c b/contrib/pg_upgrade/file.c index a5d92c62fc..b76fcdbf79 100644 --- a/contrib/pg_upgrade/file.c +++ b/contrib/pg_upgrade/file.c @@ -258,10 +258,7 @@ load_directory(const char *dirname, char ***namelist) } #ifdef WIN32 - /* - * This fix is in mingw cvs (runtime/mingwex/dirent.c rev 1.4), but not in - * released version - */ + /* Bug in old Mingw dirent.c; fixed in mingw-runtime-3.2, 2003-10-10 */ if (GetLastError() == ERROR_NO_MORE_FILES) errno = 0; #endif @@ -270,7 +267,9 @@ load_directory(const char *dirname, char ***namelist) pg_log(PG_FATAL, "could not read directory \"%s\": %s\n", dirname, getErrorText(errno)); - closedir(dirdesc); + if (closedir(dirdesc)) + pg_log(PG_FATAL, "could not close directory \"%s\": %s\n", + dirname, getErrorText(errno)); return count; } diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c index 8410b7a528..3a595a3295 100644 --- a/src/backend/storage/file/fd.c +++ b/src/backend/storage/file/fd.c @@ -1746,11 +1746,7 @@ ReadDir(DIR *dir, const char *dirname) return dent; #ifdef WIN32 - - /* - * This fix is in mingw cvs (runtime/mingwex/dirent.c rev 1.4), but not in - * released version - */ + /* Bug in old Mingw dirent.c; fixed in mingw-runtime-3.2, 2003-10-10 */ if (GetLastError() == ERROR_NO_MORE_FILES) errno = 0; #endif diff --git a/src/bin/pg_basebackup/pg_receivexlog.c b/src/bin/pg_basebackup/pg_receivexlog.c index 2d9f6c441b..5f07bb2807 100644 --- a/src/bin/pg_basebackup/pg_receivexlog.c +++ b/src/bin/pg_basebackup/pg_receivexlog.c @@ -123,7 +123,7 @@ FindStreamingStart(XLogRecPtr currentpos, uint32 currenttimeline) disconnect_and_exit(1); } - while ((dirent = readdir(dir)) != NULL) + while (errno = 0, (dirent = readdir(dir)) != NULL) { char fullpath[MAXPGPATH]; struct stat statbuf; @@ -197,7 +197,25 @@ FindStreamingStart(XLogRecPtr currentpos, uint32 currenttimeline) } } - closedir(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) + { + fprintf(stderr, _("%s: could not read directory \"%s\": %s\n"), + progname, basedir, strerror(errno)); + disconnect_and_exit(1); + } + + if (closedir(dir)) + { + fprintf(stderr, _("%s: could not close directory \"%s\": %s\n"), + progname, basedir, strerror(errno)); + disconnect_and_exit(1); + } if (high_log > 0 || high_seg > 0) { diff --git a/src/bin/pg_resetxlog/pg_resetxlog.c b/src/bin/pg_resetxlog/pg_resetxlog.c index 80e826897c..f10524f4b7 100644 --- a/src/bin/pg_resetxlog/pg_resetxlog.c +++ b/src/bin/pg_resetxlog/pg_resetxlog.c @@ -748,8 +748,7 @@ FindEndOfXLOG(void) exit(1); } - errno = 0; - while ((xlde = readdir(xldir)) != NULL) + while (errno = 0, (xlde = readdir(xldir)) != NULL) { if (strlen(xlde->d_name) == 24 && strspn(xlde->d_name, "0123456789ABCDEF") == 24) @@ -773,25 +772,27 @@ FindEndOfXLOG(void) newXlogSeg = seg; } } - errno = 0; } -#ifdef WIN32 - /* - * This fix is in mingw cvs (runtime/mingwex/dirent.c rev 1.4), but not in - * released version - */ +#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 from directory \"%s\": %s\n"), + fprintf(stderr, _("%s: could not read directory \"%s\": %s\n"), + progname, XLOGDIR, strerror(errno)); + exit(1); + } + + if (closedir(xldir)) + { + fprintf(stderr, _("%s: could not close directory \"%s\": %s\n"), progname, XLOGDIR, strerror(errno)); exit(1); } - closedir(xldir); /* * Finally, convert to new xlog seg size, and advance by one to ensure we @@ -823,8 +824,7 @@ KillExistingXLOG(void) exit(1); } - errno = 0; - while ((xlde = readdir(xldir)) != NULL) + while (errno = 0, (xlde = readdir(xldir)) != NULL) { if (strlen(xlde->d_name) == 24 && strspn(xlde->d_name, "0123456789ABCDEF") == 24) @@ -837,25 +837,27 @@ KillExistingXLOG(void) exit(1); } } - errno = 0; } -#ifdef WIN32 - /* - * This fix is in mingw cvs (runtime/mingwex/dirent.c rev 1.4), but not in - * released version - */ +#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 from directory \"%s\": %s\n"), + fprintf(stderr, _("%s: could not read directory \"%s\": %s\n"), + progname, XLOGDIR, strerror(errno)); + exit(1); + } + + if (closedir(xldir)) + { + fprintf(stderr, _("%s: could not close directory \"%s\": %s\n"), progname, XLOGDIR, strerror(errno)); exit(1); } - closedir(xldir); } @@ -879,8 +881,7 @@ KillExistingArchiveStatus(void) exit(1); } - errno = 0; - while ((xlde = readdir(xldir)) != NULL) + while (errno = 0, (xlde = readdir(xldir)) != NULL) { if (strspn(xlde->d_name, "0123456789ABCDEF") == 24 && (strcmp(xlde->d_name + 24, ".ready") == 0 || @@ -894,25 +895,27 @@ KillExistingArchiveStatus(void) exit(1); } } - errno = 0; } -#ifdef WIN32 - /* - * This fix is in mingw cvs (runtime/mingwex/dirent.c rev 1.4), but not in - * released version - */ +#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 from directory \"%s\": %s\n"), + fprintf(stderr, _("%s: could not read directory \"%s\": %s\n"), + progname, ARCHSTATDIR, strerror(errno)); + exit(1); + } + + if (closedir(xldir)) + { + fprintf(stderr, _("%s: could not close directory \"%s\": %s\n"), progname, ARCHSTATDIR, strerror(errno)); exit(1); } - closedir(xldir); } diff --git a/src/port/dirent.c b/src/port/dirent.c index 162e40a21a..6fdb24f297 100644 --- a/src/port/dirent.c +++ b/src/port/dirent.c @@ -105,15 +105,19 @@ readdir(DIR *d) strcpy(d->ret.d_name, fd.cFileName); /* Both strings are MAX_PATH * long */ d->ret.d_namlen = strlen(d->ret.d_name); + return &d->ret; } int closedir(DIR *d) { + int ret = 0; + if (d->handle != INVALID_HANDLE_VALUE) - FindClose(d->handle); + ret = !FindClose(d->handle); free(d->dirname); free(d); - return 0; + + return ret; } diff --git a/src/port/dirmod.c b/src/port/dirmod.c index 514424f82e..80932ed966 100644 --- a/src/port/dirmod.c +++ b/src/port/dirmod.c @@ -456,8 +456,7 @@ pgfnames(const char *path) filenames = (char **) palloc(fnsize * sizeof(char *)); - errno = 0; - while ((file = readdir(dir)) != NULL) + while (errno = 0, (file = readdir(dir)) != NULL) { if (strcmp(file->d_name, ".") != 0 && strcmp(file->d_name, "..") != 0) { @@ -469,17 +468,14 @@ pgfnames(const char *path) } filenames[numnames++] = pstrdup(file->d_name); } - errno = 0; } -#ifdef WIN32 - /* - * This fix is in mingw cvs (runtime/mingwex/dirent.c rev 1.4), but not in - * released version - */ +#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 @@ -492,7 +488,15 @@ pgfnames(const char *path) filenames[numnames] = NULL; - closedir(dir); + if (closedir(dir)) + { +#ifndef FRONTEND + elog(WARNING, "could not close directory \"%s\": %m", path); +#else + fprintf(stderr, _("could not close directory \"%s\": %s\n"), + path, strerror(errno)); +#endif + } return filenames; } diff --git a/src/port/pgcheckdir.c b/src/port/pgcheckdir.c index f4bb0f218a..36545618e4 100644 --- a/src/port/pgcheckdir.c +++ b/src/port/pgcheckdir.c @@ -32,14 +32,12 @@ pg_check_dir(const char *dir) DIR *chkdir; struct dirent *file; - errno = 0; - chkdir = opendir(dir); if (chkdir == NULL) return (errno == ENOENT) ? 0 : -1; - while ((file = readdir(chkdir)) != NULL) + while (errno = 0, (file = readdir(chkdir)) != NULL) { if (strcmp(".", file->d_name) == 0 || strcmp("..", file->d_name) == 0) @@ -55,18 +53,12 @@ pg_check_dir(const char *dir) } #ifdef WIN32 - - /* - * This fix is in mingw cvs (runtime/mingwex/dirent.c rev 1.4), but not in - * released version - */ + /* Bug in old Mingw dirent.c; fixed in mingw-runtime-3.2, 2003-10-10 */ if (GetLastError() == ERROR_NO_MORE_FILES) errno = 0; #endif - closedir(chkdir); - - if (errno != 0) + if (errno || closedir(chkdir)) result = -1; /* some kind of I/O error? */ return result; -- 2.40.0