3 files changed, 89 insertions, 5 deletions

diff --git a/win32/dirent.c b/win32/dirent.c
index 795fc779c..f0e8deae2 100644
--- a/win32/dirent.c
+++ b/win32/dirent.c
@@ -3,7 +3,9 @@
 struct DIR {
         struct dirent dd_dir;
         HANDLE dd_handle;     /* FindFirstFile handle */
-        int dd_stat;          /* 0-based index */
+        int not_first;
+        int got_dot;
+        int got_dotdot;
 };
 
 static inline void finddata2dirent(struct dirent *ent, WIN32_FIND_DATAA *fdata)
@@ -59,9 +61,11 @@ DIR *opendir(const char *name)
         }
 
         /* initialize DIR structure and copy first dir entry */
-        dir = xmalloc(sizeof(DIR));
+        dir = xzalloc(sizeof(DIR));
         dir->dd_handle = h;
-        dir->dd_stat = 0;
+        /* dir->not_first = 0; */
+        /* dir->got_dot = 0; */
+        /* dir->got_dotdot = 0; */
         finddata2dirent(&dir->dd_dir, &fdata);
         return dir;
 }
@@ -74,11 +78,17 @@ struct dirent *readdir(DIR *dir)
         }
 
         /* if first entry, dirent has already been set up by opendir */
-        if (dir->dd_stat) {
+        if (dir->not_first) {
                 /* get next entry and convert from WIN32_FIND_DATA to dirent */
                 WIN32_FIND_DATAA fdata;
                 if (FindNextFileA(dir->dd_handle, &fdata)) {
                         finddata2dirent(&dir->dd_dir, &fdata);
+                } else if (!dir->got_dot) {
+                        strcpy(dir->dd_dir.d_name, ".");
+                        dir->dd_dir.d_type = DT_DIR;
+                } else if (!dir->got_dotdot) {
+                        strcpy(dir->dd_dir.d_name, "..");
+                        dir->dd_dir.d_type = DT_DIR;
                 } else {
                         DWORD lasterr = GetLastError();
                         /* POSIX says you shouldn't set errno when readdir can't
@@ -89,7 +99,15 @@ struct dirent *readdir(DIR *dir)
                 }
         }
 
-        ++dir->dd_stat;
+        /* Have we seen '.' or '..'? */
+        if (dir->dd_dir.d_name[0] == '.') {
+                if (dir->dd_dir.d_name[1] == '\0')
+                        dir->got_dot = TRUE;
+                else if (dir->dd_dir.d_name[1] == '.' && dir->dd_dir.d_name[2] == '\0')
+                        dir->got_dotdot = TRUE;
+        }
+
+        dir->not_first = TRUE;
         return &dir->dd_dir;
 }
 
diff --git a/win32/mingw.c b/win32/mingw.c
index 7a5198ccf..cb1f84f30 100644
--- a/win32/mingw.c
+++ b/win32/mingw.c
@@ -2538,3 +2538,25 @@ char * FAST_FUNC exe_relative_path(const char *tail)
         free(exepath);
         return relpath;
 }
+
+int mingw_shell_execute(SHELLEXECUTEINFO *info)
+{
+        DECLARE_PROC_ADDR(BOOL, ShellExecuteExA, SHELLEXECUTEINFOA *);
+        char *lpath;
+        int ret;
+
+        if (!INIT_PROC_ADDR(shell32.dll, ShellExecuteExA)) {
+                errno = ENOSYS;
+                return FALSE;
+        }
+
+        // ShellExecuteEx() needs backslash as separator in UNC paths.
+        lpath = xstrdup(info->lpFile);
+        slash_to_bs(lpath);
+        info->lpFile = lpath;
+
+        ret = ShellExecuteExA(info);
+
+        free(lpath);
+        return ret;
+}
diff --git a/win32/process.c b/win32/process.c
index e7c9ca187..33f45ee42 100644
--- a/win32/process.c
+++ b/win32/process.c
@@ -331,7 +331,9 @@ mingw_spawn_interpreter(int mode, const char *prog, char *const *argv,
         } else {
                 errno = ENOENT;
         }
+#if ENABLE_FEATURE_PREFER_APPLETS && NUM_APPLETS > 1
  done:
+#endif
         free(path);
         free(new_argv);
         return ret;
@@ -499,6 +501,38 @@ static NORETURN void wait_for_child(HANDLE child, const char *cmd)
         exit((int)code);
 }
 
+static intptr_t
+shell_execute(const char *path, char *const *argv)
+{
+        SHELLEXECUTEINFO info;
+        char *args;
+
+        memset(&info, 0, sizeof(SHELLEXECUTEINFO));
+        info.cbSize = sizeof(SHELLEXECUTEINFO);
+        info.fMask = SEE_MASK_NOCLOSEPROCESS;
+        /* info.hwnd = NULL; */
+        info.lpVerb = "runas";
+        info.lpFile = path;
+
+        args = NULL;
+        if (*argv++) {
+                while (*argv) {
+                        char *q = quote_arg(*argv++);
+                        args = xappendword(args, q);
+                        free(q);
+                }
+        }
+
+        info.lpParameters = args;
+        /* info.lpDirectory = NULL; */
+        info.nShow = SW_SHOWNORMAL;
+
+        mingw_shell_execute(&info);
+
+        free(args);
+        return info.hProcess ? (intptr_t)info.hProcess : -1;
+}
+
 int
 mingw_execvp(const char *cmd, char *const *argv)
 {
@@ -512,6 +546,16 @@ int
 mingw_execve(const char *cmd, char *const *argv, char *const *envp)
 {
         intptr_t ret = mingw_spawn_interpreter(P_NOWAIT, cmd, argv, envp, 0);
+
+        if (ret == -1 && GetLastError() == ERROR_ELEVATION_REQUIRED) {
+                // Command exists but failed because it wants elevated privileges.
+                // Try again using ShellExecuteEx().
+                SetLastError(0);
+                ret = shell_execute(cmd, argv);
+                if (GetLastError())
+                        exit(1);
+        }
+
         if (ret != -1)
                 wait_for_child((HANDLE)ret, cmd);
         return ret;