Merge commit '56a3b82e9692a25ef9c9269e88feac0d579ce8e8' into merge

Conflicts:
	coreutils/ls.c
	include/platform.h
	libbb/bb_basename.c

1 files changed, 14 insertions, 1 deletions

diff --git a/libbb/get_last_path_component.c b/libbb/get_last_path_component.c
index 72598d22e..db4be68ad 100644
--- a/libbb/get_last_path_component.c
+++ b/libbb/get_last_path_component.c
@@ -6,8 +6,21 @@
  *
  * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
 #include "libbb.h"
+
+const char* FAST_FUNC bb_basename(const char *name)
+{
+        const char *cp = strrchr(name, '/');
+        if (cp)
+                return cp + 1;
+#if ENABLE_PLATFORM_MINGW32
+        cp = strrchr(name, '\\');
+        if (cp)
+                return cp + 1;
+#endif
+        return name;
+}
+
 /*
  * "/"        -> "/"
  * "abc"      -> "abc"