read_key: remove handling for ctrl-up/down, we don't use that. -12 bytes

[oweals/busybox.git] / libbb / get_last_path_component.c

diff --git a/libbb/get_last_path_component.c b/libbb/get_last_path_component.c
index 85c7609c9aecfecfe14c1187aac9fc344ef0bcd9..7c99116e945c5c0f5bba4c3d43dac0ad2881d024 100644 (file)
--- a/libbb/get_last_path_component.c
+++ b/libbb/get_last_path_component.c
@@ -1,65 +1,42 @@
 /* vi: set sw=4 ts=4: */
 /*
- * Utility routines.
+ * bb_get_last_path_component implementation for busybox
  *
- * Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.org>
+ * 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 tarball for details.
  */
 
-#include <stdio.h>
-#include <string.h>
 #include "libbb.h"
-
-
-char *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)
 {
-       char *s;
-       register char *ptr = path;
-       register char *prev = 0;
-
-       while (*ptr)
-               ptr++;
-       s = ptr - 1;
+       char *slash = strrchr(path, '/');
 
-       /* strip trailing slashes */
-       while (s != path && *s == '/') {
-               *s-- = '\0';
-       }
+       if (!slash || (slash == path && !slash[1]))
+               return (char*)path;
 
-       /* find last component */
-       ptr = path;
-       while (*ptr != '\0') {
-               if (*ptr == '/')
-                       prev = ptr;
-               ptr++;
-       }
-       s = prev;
-
-       if (s == NULL || s[1] == '\0')
-               return path;
-       else
-               return s+1;
+       return slash + 1;
 }
 
-
-/* END CODE */
 /*
-Local Variables:
-c-file-style: "linux"
-c-basic-offset: 4
-tab-width: 4
-End:
-*/
+ * "/"        -> "/"
+ * "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 (slash)
+               while (*slash == '/' && slash != path)
+                       *slash-- = '\0';
+
+       return bb_get_last_path_component_nostrip(path);
+}