diff options
Diffstat (limited to 'libbb')
| -rw-r--r-- | libbb/get_last_path_component.c | 42 | ||||
| -rw-r--r-- | libbb/run_shell.c | 2 |
2 files changed, 27 insertions, 17 deletions
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); } diff --git a/libbb/run_shell.c b/libbb/run_shell.c index b2b4216f4..239887d85 100644 --- a/libbb/run_shell.c +++ b/libbb/run_shell.c @@ -67,7 +67,7 @@ void run_shell(const char *shell, int loginshell, const char *command, const cha args = xmalloc(sizeof(char*) * (4 + additional_args_cnt)); - args[0] = bb_get_last_path_component(xstrdup(shell)); + args[0] = bb_get_last_path_component_nostrip(xstrdup(shell)); if (loginshell) args[0] = xasprintf("-%s", args[0]); |