Hi hackers,

Small issue with readir implementation for Windows.
Right now it returns ENOENT in case of any error returned by FindFirstFile.
So all places in Postgres where opendir/listdir are used will assume that directory is empty and
do nothing without reporting any error.
It is not so good if directory is actually not empty but there are not enough permissions for accessing the directory and FindFirstFile
returns ERROR_ACCESS_DENIED:

struct dirent *
readdir(DIR *d)
{
    WIN32_FIND_DATA fd;

    if (d->handle == INVALID_HANDLE_VALUE)
    {
        d->handle = FindFirstFile(d->dirname, &fd);
        if (d->handle == INVALID_HANDLE_VALUE)
        {
            errno = ENOENT;
            return NULL;
        }
    }


Attached please find small patch fixing the problem.

--
Konstantin Knizhnik
Postgres Professional: http://www.postgrespro.com
The Russian Postgres Company

diff --git a/src/port/dirent.c b/src/port/dirent.c
index 7a91450..284bf27 100644
--- a/src/port/dirent.c
+++ b/src/port/dirent.c
@@ -83,7 +83,13 @@ readdir(DIR *d)
 		d->handle = FindFirstFile(d->dirname, &fd);
 		if (d->handle == INVALID_HANDLE_VALUE)
 		{
-			errno = ENOENT;
+			if (GetLastError() == ERROR_FILE_NOT_FOUND)
+			{
+				/* No more files, force errno=0 (unlike mingw) */
+				errno = 0;
+				return NULL;
+			}
+			_dosmaperr(GetLastError());
 			return NULL;
 		}
 	}

Reply via email to