1berry/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add ERROR_NO_MORE_FILES workaround to check_data_dir(). This may or

Browse Source 
may not be obsolete, but since every other readdir loop in our code
has it, I think this should too.
This commit is contained in:
Tom Lane 2005-08-02 15:16:27 +00:00
parent 9216c8999a
commit 74888b9349
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/bin/initdb/initdb.c
View File

@ -42,7 +42,7 @@
* Portions Copyright (c) 1994, Regents of the University of California * Portions Copyright (c) 1994, Regents of the University of California
* Portions taken from FreeBSD. * Portions taken from FreeBSD.
* *
* $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.93 2005/07/25 04:52:31 tgl Exp $ * $PostgreSQL: pgsql/src/bin/initdb/initdb.c,v 1.94 2005/08/02 15:16:27 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -930,7 +930,8 @@ check_data_dir(void)
while ((file = readdir(chkdir)) != NULL) while ((file = readdir(chkdir)) != NULL)
{ {
if (strcmp(".", file->d_name) == 0 || strcmp("..", file->d_name) == 0) if (strcmp(".", file->d_name) == 0 ||
strcmp("..", file->d_name) == 0)
{ {
/* skip this and parent directory */ /* skip this and parent directory */
continue; continue;
@ -942,6 +943,15 @@ check_data_dir(void)
} }
} }
#ifdef WIN32
/*
* This fix is in mingw cvs (runtime/mingwex/dirent.c rev 1.4), but
* not in released version
*/
if (GetLastError() == ERROR_NO_MORE_FILES)
errno = 0;
#endif
closedir(chkdir); closedir(chkdir);
if (errno != 0) if (errno != 0)