2 files changed, 26 insertions, 25 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 8c39a504a..f7c12f8e1 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -13508,27 +13508,43 @@ init(void)
                  *
                  * We may end up having both Path and PATH. Then Path will be chosen
                  * because it appears first.
-                 *
-                 * Also, replace backslashes with forward slashes.
                  */
-                for (envp = environ; envp && *envp; envp++)
-                        if (!strncasecmp(*envp, "PATH=", 5) &&
-                            strncmp(*envp, "PATH=", 5))
+                for (envp = environ; envp && *envp; envp++) {
+                        if (strncasecmp(*envp, "PATH=", 5) == 0 &&
+                            strncmp(*envp, "PATH=", 5) != 0) {
                                 break;
+                        }
+                }
+
                 if (envp && *envp) {
+                        /*
+                         * If we get here it's because the environment contains a path
+                         * variable called something other than PATH.  This suggests we
+                         * haven't been invoked from an earlier instance of BusyBox.
+                         */
                         char *start, *end;
+                        struct passwd *pw;
+
                         for (envp = environ; envp && *envp; envp++) {
                                 end = strchr(*envp, '=');
                                 if (!end)
                                         continue;
+
+                                /* make all variable names uppercase */
                                 for (start = *envp;start < end;start++)
                                         *start = toupper(*start);
+
+                                /* convert backslashes to forward slashes */
                                 for ( ++end; *end; ++end ) {
                                         if ( *end == '\\' ) {
                                                 *end = '/';
                                         }
                                 }
                         }
+
+                        /* some initialisation normally performed at login */
+                        pw = xgetpwuid(getuid());
+                        setup_environment(pw->pw_shell, SETUP_ENV_CHANGEENV, pw);
                 }
 #endif
                 for (envp = environ; envp && *envp; envp++) {
@@ -13537,25 +13553,6 @@ init(void)
                         }
                 }
 
-#if ENABLE_PLATFORM_MINGW32
-                p = lookupvar("HOME");
-                if (!p) {
-                        const char *hd, *hp;
-
-                        hd = lookupvar("HOMEDRIVE");
-                        hp = lookupvar("HOMEPATH");
-                        if (hd && hp) {
-                                char *s;
-
-                                if ((s=malloc(strlen(hd) + strlen(hp) + 1)) != NULL) {
-                                        strcat(strcpy(s, hd), hp);
-                                        setvar("HOME", s, VEXPORT);
-                                        free(s);
-                                }
-                        }
-                }
-#endif
-
                 if (!ENABLE_PLATFORM_MINGW32)
                         setvar("PPID", utoa(getppid()), 0);
 
diff --git a/win32/mingw.c b/win32/mingw.c
index 4c7465482..be08c5bd5 100644
--- a/win32/mingw.c
+++ b/win32/mingw.c
@@ -527,14 +527,18 @@ struct passwd *getpwuid(int uid UNUSED_PARAM)
 {
         static char user_name[100];
         static struct passwd p;
-
         DWORD len = sizeof(user_name);
+
+        user_name[0] = '\0';
         if (!GetUserName(user_name, &len))
                 return NULL;
         p.pw_name = user_name;
         p.pw_gecos = "unknown";
         p.pw_dir = gethomedir();
         p.pw_shell = NULL;
+        p.pw_uid = 1000;
+        p.pw_gid = 1000;
+
         return &p;
 }