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 473194c09c
commit ee42d8f10b
9 changed files with 109 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
contrib/pg_upgrade/file.c
View File

@ -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;
}