1 files changed, 44 insertions, 1 deletions

diff --git a/libbb/xreadlink.c b/libbb/xreadlink.c
index 2682f6975..fc10a2939 100644
--- a/libbb/xreadlink.c
+++ b/libbb/xreadlink.c
@@ -17,6 +17,7 @@
  * NOTE: This function returns a malloced char* that you will have to free
  * yourself.
  */
+#if !ENABLE_PLATFORM_MINGW32
 char* FAST_FUNC xmalloc_readlink(const char *path)
 {
         enum { GROWBY = 80 }; /* how large we will grow strings by */
@@ -38,6 +39,7 @@ char* FAST_FUNC xmalloc_readlink(const char *path)
 
         return buf;
 }
+#endif
 
 /*
  * This routine is not the same as realpath(), which
@@ -64,19 +66,26 @@ char* FAST_FUNC xmalloc_follow_symlinks(const char *path)
                 linkpath = xmalloc_readlink(buf);
                 if (!linkpath) {
                         /* not a symlink, or doesn't exist */
-                        if (errno == EINVAL || errno == ENOENT)
+                        if (errno == EINVAL || errno == ENOENT || (ENABLE_PLATFORM_MINGW32 && errno == ENOSYS))
                                 return buf;
                         goto free_buf_ret_null;
                 }
 
                 if (!--looping) {
+#if ENABLE_PLATFORM_MINGW32
+                        errno = ELOOP;
+#endif
                         free(linkpath);
  free_buf_ret_null:
                         free(buf);
                         return NULL;
                 }
 
+#if ENABLE_PLATFORM_MINGW32
+                if (is_relative_path(linkpath)) {
+#else
                 if (*linkpath != '/') {
+#endif
                         bufsize += strlen(linkpath);
                         buf = xrealloc(buf, bufsize);
                         lpc = bb_get_last_path_component_strip(buf);
@@ -149,7 +158,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
@@ -168,6 +181,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;
@@ -191,6 +233,7 @@ char* FAST_FUNC xmalloc_realpath_coreutils(char *path)
                                 strcpy(buf + len, last_slash);
                         }
                 }
+#endif
                 path[i + 1] = c;
         }