From 818322b9b19a452d66a07ca69256e2c092f5db5f Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Mon, 24 Sep 2007 18:27:04 +0000 Subject: *: kill bb_get_last_path_component, replace with two functions (one which strips trailing slash and one which does not) wget: straighten out as a result of above change text data bss dec hex filename 5056 1 0 5057 13c1 busybox.t4/networking/wget.o 5022 0 0 5022 139e busybox.t5/networking/wget.o --- libbb/get_last_path_component.c | 42 +++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 16 deletions(-) (limited to 'libbb/get_last_path_component.c') diff --git a/libbb/get_last_path_component.c b/libbb/get_last_path_component.c index b7bc0e626..0f602157d 100644 --- a/libbb/get_last_path_component.c +++ b/libbb/get_last_path_component.c @@ -8,25 +8,35 @@ */ #include "libbb.h" - -char *bb_get_last_path_component(char *path) +/* + * "/" -> "/" + * "abc" -> "abc" + * "abc/def" -> "def" + * "abc/def/" -> "" + */ +char *bb_get_last_path_component_nostrip(const char *path) { - char *first = path; - char *last; + char *slash = strrchr(path, '/'); + + 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 *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); } -- cgit v1.2.3