1 files changed, 32 insertions, 9 deletions

diff --git a/src/w32.c b/src/w32.c
index aedf64942e0..2faa742f9d7 100644
--- a/src/w32.c
+++ b/src/w32.c
@@ -3433,17 +3433,30 @@ sys_readdir (DIR *dirp)
 
       if (dir_find_handle == INVALID_HANDLE_VALUE)
         {
+          /* Any changes in the value of errno here should be in sync
+             with what directory_files_internal does when it calls
+             readdir.  */
           switch (GetLastError ())
             {
-            case ERROR_PATH_NOT_FOUND:
+              /* Windows uses this value when FindFirstFile finds no
+                 files that match the wildcard.  This is not supposed
+                 to happen, since our wildcard is "*", but just in
+                 case, if there's some weird empty directory with not
+                 even "." and ".." entries...  */
+            case ERROR_FILE_NOT_FOUND:
+              errno = 0;
+              /* FALLTHRU */
+            default:
+              break;
             case ERROR_ACCESS_DENIED:
+            case ERROR_NETWORK_ACCESS_DENIED:
+              errno = EACCES;
+              break;
+            case ERROR_PATH_NOT_FOUND:
             case ERROR_INVALID_DRIVE:
             case ERROR_BAD_NETPATH:
-              /* This special value will be noticed by
-                 directory_files_internal, which see.  */
-              errno = ENOTDIR;
-              break;
-            default:
+            case ERROR_BAD_NET_NAME:
+              errno = ENOENT;
               break;
             }
           return NULL;
@@ -3452,12 +3465,18 @@ sys_readdir (DIR *dirp)
   else if (w32_unicode_filenames)
     {
       if (!FindNextFileW (dir_find_handle, &dir_find_data_w))
-        return NULL;
+        {
+          errno = 0;
+          return NULL;
+        }
     }
   else
     {
       if (!FindNextFileA (dir_find_handle, &dir_find_data_a))
-        return NULL;
+        {
+          errno = 0;
+          return NULL;
+        }
     }
 
   /* Emacs never uses this value, so don't bother making it match
@@ -3559,7 +3578,11 @@ open_unc_volume (const char *path)
   if (result == NO_ERROR)
     return henum;
   else
-    return INVALID_HANDLE_VALUE;
+    {
+      /* Make sure directory_files_internal reports a sensible error.  */
+      errno = ENOENT;
+      return INVALID_HANDLE_VALUE;
+    }
 }
 
 static void *