2 files changed, 50 insertions, 7 deletions

diff --git a/libbb/get_last_path_component.c b/libbb/get_last_path_component.c
index 06033e139..254aabafd 100644
--- a/libbb/get_last_path_component.c
+++ b/libbb/get_last_path_component.c
@@ -23,6 +23,21 @@ const char* FAST_FUNC bb_basename(const char *name)
         return name;
 }
 
+#if ENABLE_PLATFORM_MINGW32
+char *get_last_slash(const char *path)
+{
+        const char *start = path + root_len(path);
+        char *slash = strrchr(start, '/');
+        char *bslash = strrchr(start, '\\');
+
+        if (slash && bslash)
+                slash = MAX(slash, bslash);
+        else if (!slash)
+                slash = bslash;
+        return slash;
+}
+#endif
+
 /*
  * "/"        -> "/"
  * "abc"      -> "abc"
@@ -33,13 +48,7 @@ char* FAST_FUNC bb_get_last_path_component_nostrip(const char *path)
 {
 #if ENABLE_PLATFORM_MINGW32
         const char *start = path + root_len(path);
-        char *slash = strrchr(start, '/');
-        char *bslash = strrchr(start, '\\');
-
-        if (slash && bslash)
-                slash = MAX(slash, bslash);
-        else if (!slash)
-                slash = bslash;
+        char *slash = get_last_slash(path);
 
         if (!slash && has_dos_drive_prefix(path) && path[2] != '\0')
                 return (char *)path + 2;
diff --git a/libbb/xreadlink.c b/libbb/xreadlink.c
index 024ee9047..e6cf90310 100644
--- a/libbb/xreadlink.c
+++ b/libbb/xreadlink.c
@@ -156,7 +156,11 @@ char* FAST_FUNC xmalloc_realpath_coreutils(char *path)
                          * $ realpath symlink
                          * /usr/bin/qwe
                          */
+#if ENABLE_PLATFORM_MINGW32
+                        if (is_relative_path(target)) {
+#else
                         if (target[0] != '/') {
+#endif
                                 /*
                                  * $ ln -s target_does_not_exist symlink
                                  * $ readlink -f symlink
@@ -175,6 +179,35 @@ char* FAST_FUNC xmalloc_realpath_coreutils(char *path)
                         return buf;
                 }
 
+#if ENABLE_PLATFORM_MINGW32
+                /* ignore leading and trailing slashes */
+                /* but keep leading slashes of UNC path */
+                if (!is_unc_path(path)) {
+                        while (is_dir_sep(path[0]) && is_dir_sep(path[1]))
+                                ++path;
+                }
+                i = strlen(path) - 1;
+                while (i > 0 && is_dir_sep(path[i]))
+                        i--;
+                c = path[i + 1];
+                path[i + 1] = '\0';
+
+                last_slash = get_last_slash(path);
+                if (last_slash == path + root_len(path))
+                        buf = xstrdup(path);
+                else if (last_slash) {
+                        char c2 = *last_slash;
+                        *last_slash = '\0';
+                        buf = xmalloc_realpath(path);
+                        *last_slash++ = c2;
+                        if (buf) {
+                                unsigned len = strlen(buf);
+                                buf = xrealloc(buf, len + strlen(last_slash) + 2);
+                                buf[len++] = c2;
+                                strcpy(buf + len, last_slash);
+                        }
+                }
+#else
                 /* ignore leading and trailing slashes */
                 while (path[0] == '/' && path[1] == '/')
                         ++path;
@@ -198,6 +231,7 @@ char* FAST_FUNC xmalloc_realpath_coreutils(char *path)
                                 strcpy(buf + len, last_slash);
                         }
                 }
+#endif
                 path[i + 1] = c;
         }