X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Fget_last_path_component.c;h=04fdf2a3e5700bc24184ed2fc0e9e47962988712;hb=8172d054db64bc80a355db111b484719930045bc;hp=497d6ae4ed9ea572dcff930beffcdb929df0a909;hpb=cad5364599eb5062d59e0c397ed638ddd61a8d5d;p=oweals%2Fbusybox.git

diff --git a/libbb/get_last_path_component.c b/libbb/get_last_path_component.c
index 497d6ae4e..04fdf2a3e 100644
--- a/libbb/get_last_path_component.c
+++ b/libbb/get_last_path_component.c
@@ -4,53 +4,47 @@
  *
  * Copyright (C) 2001  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
+#include "libbb.h"
 
-/* Set to 1 if you want basename() behavior for NULL or "". */
-/* WARNING!!! Doing so will break basename applet at least! */
-#define EMULATE_BASENAME	0
+const char* FAST_FUNC bb_basename(const char *name)
+{
+	const char *cp = strrchr(name, '/');
+	if (cp)
+		return cp + 1;
+	return name;
+}
 
-char *bb_get_last_path_component(char *path)
+/*
+ * "/"        -> "/"
+ * "abc"      -> "abc"
+ * "abc/def"  -> "def"
+ * "abc/def/" -> ""
+ */
+char* FAST_FUNC bb_get_last_path_component_nostrip(const char *path)
 {
-#if EMULATE_BASENAME
-	static const char null_or_empty[] = ".";
-#endif
-	char *first = path;
-	char *last;
+	char *slash = strrchr(path, '/');
 
-#if EMULATE_BASENAME
-	if (!path || !*path) {
-		return (char *) null_or_empty;
-	}
-#endif
+	if (!slash || (slash == path && !slash[1]))
+		return (char*)path;
 
-	last = path - 1;
+	return slash + 1;
+}
 
-	while (*path) {
-		if ((*path != '/') && (path > ++last)) {
-			last = first = path;
-		}
-		++path;
-	}
+/*
+ * "/"        -> "/"
+ * "abc"      -> "abc"
+ * "abc/def"  -> "def"
+ * "abc/def/" -> "def" !!
+ */
+char* FAST_FUNC bb_get_last_path_component_strip(char *path)
+{
+	char *slash = last_char_is(path, '/');
 
-	if (*first == '/') {
-		last = first;
-	}
-	last[1] = 0;
+	if (slash)
+		while (*slash == '/' && slash != path)
+			*slash-- = '\0';
 
-	return first;
+	return bb_get_last_path_component_nostrip(path);
 }