database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-30 11:03:19 +03:00
Code Activity

Properly check for readdir/closedir() failures

Browse Source 
Clear errno before calling readdir() and handle old MinGW errno bug
while adding full test coverage for readdir/closedir failures.

Backpatch through 8.4.
This commit is contained in:
Bruce Momjian
2014-03-21 13:45:11 -04:00
parent 697becf743
commit d73cc5857f
8 changed files with 97 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/pg_upgrade/file.c
View File

@ -291,7 +291,7 @@ pg_scandir_internal(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 || (*selector) (direntry))
@ -324,7 +324,17 @@ pg_scandir_internal(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(PG_FATAL, "could not read directory \"%s\": %s\n", dirname, getErrorText(errno));
if (closedir(dirdesc))
pg_log(PG_FATAL, "could not close directory \"%s\": %s\n", dirname, getErrorText(errno));
return count;
}