Improve the fix for bug #19701

 src/dired.c (directory_files_internal, file_name_completion)
 [WINDOWSNT]: Signal an error when errno is set non-zero by
 'readdir', regardless of its value.
 src/w32.c (sys_readdir): Set errno to ENOENT when the directory
 doesn't exist and to EACCES when it's not accessible to the
 current user.  Set errno to zero when FindNextFile exhausts the
 directory, so that callers don't interpret that as an error and
 don't signal a file-error.
 (open_unc_volume): Set errno to ENOENT if WNetOpenEnum fails.

1 files changed, 7 insertions, 8 deletions

diff --git a/src/dired.c b/src/dired.c
index f6c47a71400..43cb8373a6d 100644
--- a/src/dired.c
+++ b/src/dired.c
@@ -251,14 +251,9 @@ directory_files_internal (Lisp_Object directory, Lisp_Object full,
           /* The MS-Windows implementation of 'opendir' doesn't
              actually open a directory until the first call to
              'readdir'.  If 'readdir' fails to open the directory, it
-             sets errno to ENOTDIR; we convert it here to ENOENT so
-             that the error message is similar to what happens on
-             Posix hosts in such cases.  */
-          if (errno == ENOTDIR)
-            {
-              errno = ENOENT;
-              report_file_error ("Opening directory", directory);
-            }
+             sets errno to ENOENT or EACCES, see w32.c.  */
+          if (errno)
+            report_file_error ("Opening directory", directory);
 #endif
           break;
         }
@@ -530,6 +525,10 @@ file_name_completion (Lisp_Object file, Lisp_Object dirname, bool all_flag,
               QUIT;
               continue;
             }
+#ifdef WINDOWSNT
+          if (errno)
+            report_file_error ("Opening directory", dirname);
+#endif
           break;
         }