From b24ef035bd08919075edd79b906e18909ac44eb9 Mon Sep 17 00:00:00 2001
From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Mon, 23 May 2011 00:40:54 +0200
Subject: find: cater for libc w/o FNM_CASEFOLD

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---
 libbb/Kbuild.src                |  1 -
 libbb/bb_basename.c             | 18 ------------------
 libbb/get_last_path_component.c | 10 +++++++++-
 3 files changed, 9 insertions(+), 20 deletions(-)
 delete mode 100644 libbb/bb_basename.c

(limited to 'libbb')

diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index a22e70892..fa6e5b6e3 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -13,7 +13,6 @@ INSERT
 lib-y += appletlib.o
 lib-y += ask_confirmation.o
 lib-y += bb_askpass.o
-lib-y += bb_basename.o
 lib-y += bb_bswap_64.o
 lib-y += bb_do_delay.o
 lib-y += bb_pwd.o
diff --git a/libbb/bb_basename.c b/libbb/bb_basename.c
deleted file mode 100644
index d678360fc..000000000
--- a/libbb/bb_basename.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/* vi: set sw=4 ts=4: */
-/*
- * Utility routines.
- *
- * Copyright (C) 2007 Denys Vlasenko
- *
- * Licensed under GPLv2, 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;
-	return name;
-}
diff --git a/libbb/get_last_path_component.c b/libbb/get_last_path_component.c
index 72598d22e..04fdf2a3e 100644
--- a/libbb/get_last_path_component.c
+++ b/libbb/get_last_path_component.c
@@ -6,8 +6,16 @@
  *
  * 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;
+	return name;
+}
+
 /*
  * "/"        -> "/"
  * "abc"      -> "abc"
-- 
cgit v1.2.3-55-g6feb