From: Bruce Momjian Date: Fri, 21 Mar 2014 17:45:11 +0000 (-0400) Subject: Properly check for readdir/closedir() failures X-Git-Tag: REL9_0_18~73 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4859a710ea9b26e38a9637301f1259f6123e4de7;p=thirdparty%2Fpostgresql.git 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. --- diff --git a/contrib/pg_archivecleanup/pg_archivecleanup.c b/contrib/pg_archivecleanup/pg_archivecleanup.c index b2963decd72..5589d59ce6a 100644 --- a/contrib/pg_archivecleanup/pg_archivecleanup.c +++ b/contrib/pg_archivecleanup/pg_archivecleanup.c @@ -98,7 +98,7 @@ CleanupPriorWALFiles(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 in @@ -132,7 +132,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 archiveLocation \"%s\": %s\n", diff --git a/contrib/pg_standby/pg_standby.c b/contrib/pg_standby/pg_standby.c index adfbad5f388..af4bb37e2b6 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,13 +294,26 @@ 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"); } else fprintf(stderr, "%s: archiveLocation \"%s\" open error\n", progname, archiveLocation); - 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 29e3c06a9e0..4def03e3434 100644 --- a/contrib/pg_upgrade/file.c +++ b/contrib/pg_upgrade/file.c @@ -291,7 +291,7 @@ pg_scandir_internal(migratorContext *ctx, const char *dirname, *namelist = NULL; - while ((direntry = readdir(dirdesc)) != NULL) + while (errno = 0, (direntry = readdir(dirdesc)) != NULL) { /* Invoke the selector function to see if the direntry matches */ if ((*selector) (direntry)) @@ -318,7 +318,17 @@ pg_scandir_internal(migratorContext *ctx, const char *dirname, } } - closedir(dirdesc); +#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) + pg_log(ctx, PG_FATAL, "Could not read directory \"%s\": %s\n", dirname, getErrorText(errno)); + + if (closedir(dirdesc)) + pg_log(ctx, PG_FATAL, "Could not close directory \"%s\": %s\n", dirname, getErrorText(errno)); return count; } @@ -415,7 +425,7 @@ copy_dir(const char *src, const char *dst, bool force) return -1; } - while ((de = readdir(srcdir)) != NULL) + while (errno = 0, (de = readdir(srcdir)) != NULL) { char src_file[MAXPGPATH]; char dest_file[MAXPGPATH]; @@ -460,9 +470,19 @@ copy_dir(const char *src, const char *dst, bool force) } } +#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) + return -1; + if (srcdir != NULL) { - closedir(srcdir); + if (closedir(srcdir)) + return -1; srcdir = NULL; } return 1; diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c index 09a47086a51..3d6b6a46eec 100644 --- a/src/backend/storage/file/fd.c +++ b/src/backend/storage/file/fd.c @@ -1614,11 +1614,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/initdb/initdb.c b/src/bin/initdb/initdb.c index 901aed96787..9442444d963 100644 --- a/src/bin/initdb/initdb.c +++ b/src/bin/initdb/initdb.c @@ -822,7 +822,7 @@ check_data_dir(char *dir) if (!chkdir) 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) @@ -838,18 +838,12 @@ check_data_dir(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; diff --git a/src/bin/pg_resetxlog/pg_resetxlog.c b/src/bin/pg_resetxlog/pg_resetxlog.c index ee403c286c2..c445f3c2bbf 100644 --- a/src/bin/pg_resetxlog/pg_resetxlog.c +++ b/src/bin/pg_resetxlog/pg_resetxlog.c @@ -742,8 +742,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) @@ -767,25 +766,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 @@ -817,8 +818,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) @@ -831,25 +831,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); } @@ -873,8 +875,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 || @@ -888,25 +889,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 4034ef42f3f..ee1c0c509a8 100644 --- a/src/port/dirent.c +++ b/src/port/dirent.c @@ -100,15 +100,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 d47c03e4450..d7754418a88 100644 --- a/src/port/dirmod.c +++ b/src/port/dirmod.c @@ -330,8 +330,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) { @@ -343,17 +342,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 @@ -366,7 +362,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; }