win32: ash: fix path_advance() not advancing correctly

*p can be either ':' or ';' at the end of path_advance(). However the
code expects it to be ':' only. This effectively skips the rest of
$PATH after the first component when Windows' $PATH is used. This
should fix Github#1.

While at it, also fix pathopt code expecting ':' only (again).

1 files changed, 10 insertions, 1 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 5c24762f2..f1f044cbf 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -2449,10 +2449,19 @@ path_advance(const char **path, const char *name)
         pathopt = NULL;
         if (*p == '%') {
                 pathopt = ++p;
+#if ENABLE_PLATFORM_MINGW32
+                p = next_path_sep(start);
+
+                /* *p != ':' and '*' would suffice */
+                if (!p)
+                        p = pathopt - 1;
+#else
                 while (*p && *p != ':')
                         p++;
+#endif
         }
-        if (*p == ':')
+        if (*p == ':' ||
+            (ENABLE_PLATFORM_MINGW32 && *p == ';'))
                 *path = p + 1;
         else
                 *path = NULL;