Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/libbb/get_last_path_component.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/libbb/get_last_path_component.c (modified) (1 diff)

branches/2.2.9/mindi-busybox/libbb/get_last_path_component.c

@@ -5 +5 @@
  * Copyright (C) 2001  Manuel Novoa III  <mjn3@codepoet.org>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
 #include "libbb.h"
+/*
+ * "/"        -> "/"
+ * "abc"      -> "abc"
+ * "abc/def"  -> "def"
+ * "abc/def/" -> ""
+ */
+char* FAST_FUNC bb_get_last_path_component_nostrip(const char *path)
+{
+    char *slash = strrchr(path, '/');
 
-char *bb_get_last_path_component(char *path)
+    if (!slash || (slash == path && !slash[1]))
+        return (char*)path;
+
+    return slash + 1;
+}
+
+/*
+ * "/"        -> "/"
+ * "abc"      -> "abc"
+ * "abc/def"  -> "def"
+ * "abc/def/" -> "def" !!
+ */
+char* FAST_FUNC bb_get_last_path_component_strip(char *path)
 {
-    char *first = path;
-    char *last;
+    char *slash = last_char_is(path, '/');
 
-    last = path - 1;
+    if (slash)
+        while (*slash == '/' && slash != path)
+            *slash-- = '\0';
 
-    while (*path) {
-        if ((*path != '/') && (path > ++last)) {
-            last = first = path;
-        }
-        ++path;
-    }
-
-    if (*first == '/') {
-        last = first;
-    }
-    last[1] = '\0';
-
-    return first;
+    return bb_get_last_path_component_nostrip(path);
 }