1 files changed, 41 insertions, 0 deletions

diff --git a/libbb/get_last_path_component.c b/libbb/get_last_path_component.c
index 04fdf2a3e..46a87d7fc 100644
--- a/libbb/get_last_path_component.c
+++ b/libbb/get_last_path_component.c
@@ -10,12 +10,34 @@
 
 const char* FAST_FUNC bb_basename(const char *name)
 {
+#if ENABLE_PLATFORM_MINGW32
+        const char *cp;
+        for (cp = name; *cp; cp++)
+                if (*cp == '/' || *cp == '\\' || *cp == ':')
+                        name = cp + 1;
+#else
         const char *cp = strrchr(name, '/');
         if (cp)
                 return cp + 1;
+#endif
         return name;
 }
 
+#if ENABLE_PLATFORM_MINGW32
+char * FAST_FUNC 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"
@@ -24,10 +46,20 @@ const char* FAST_FUNC bb_basename(const char *name)
  */
 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 = get_last_slash(path);
+
+        if (!slash && has_dos_drive_prefix(path) && path[2] != '\0')
+                return (char *)path + 2;
+        if (!slash || (slash == start && !slash[1]))
+                return (char*)path;
+#else
         char *slash = strrchr(path, '/');
 
         if (!slash || (slash == path && !slash[1]))
                 return (char*)path;
+#endif
 
         return slash + 1;
 }
@@ -40,11 +72,20 @@ char* FAST_FUNC bb_get_last_path_component_nostrip(const char *path)
  */
 char* FAST_FUNC bb_get_last_path_component_strip(char *path)
 {
+#if ENABLE_PLATFORM_MINGW32
+        char *slash = last_char_is_dir_sep(path);
+        const char *start = has_dos_drive_prefix(path) ? path+2 : path;
+
+        if (slash)
+                while (is_dir_sep(*slash) && slash != start)
+                        *slash-- = '\0';
+#else
         char *slash = last_char_is(path, '/');
 
         if (slash)
                 while (*slash == '/' && slash != path)
                         *slash-- = '\0';
+#endif
 
         return bb_get_last_path_component_nostrip(path);
 }