ash, su: add -d flag to set directory in ash, use it in su

When busybox-w32 is installed in C:/Windows/System32 su doesn't
run in the same directory as its parent as intended.

Work around this by adding a flag to the shell to set the working
directory.

1 files changed, 5 insertions, 2 deletions

diff --git a/loginutils/suw32.c b/loginutils/suw32.c
index 3aa478f33..be1a5211e 100644
--- a/loginutils/suw32.c
+++ b/loginutils/suw32.c
@@ -28,6 +28,7 @@ int suw32_main(int argc UNUSED_PARAM, char **argv)
 {
         char *opt_command = NULL;
         SHELLEXECUTEINFO info;
+        char *cwd;
 
         getopt32(argv, "c:", &opt_command);
         if (argv[optind])
@@ -39,10 +40,12 @@ int suw32_main(int argc UNUSED_PARAM, char **argv)
         /* info.hwnd = NULL; */
         info.lpVerb = "runas";
         info.lpFile = bb_busybox_exec_path;
+        cwd = getcwd(NULL, 0);
         if (opt_command)
-                info.lpParameters = xasprintf("ash -s -c \"%s\"", opt_command);
+                info.lpParameters =
+                        xasprintf("ash -d \"%s\" -s -c \"%s\"", cwd, opt_command);
         else
-                info.lpParameters = "ash";
+                info.lpParameters = xasprintf("ash -d \"%s\"", cwd);
         /* info.lpDirectory = NULL; */
         info.nShow = SW_SHOWNORMAL;