From 457dda2930287e4bb1bbc3c3ff56fcd4e9ffa3de Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Mon, 12 Nov 2018 20:52:29 -0800 Subject: basename: -s SUFFIX. AOSP doesn't need -a specifically, but since it's needed for -s we may as well accept it too. --- toys/posix/basename.c | 33 ++++++++++++++++++++++++++------- 1 file changed, 26 insertions(+), 7 deletions(-) (limited to 'toys/posix/basename.c') diff --git a/toys/posix/basename.c b/toys/posix/basename.c index 0436bfe7..11b96227 100644 --- a/toys/posix/basename.c +++ b/toys/posix/basename.c @@ -5,25 +5,44 @@ * See http://opengroup.org/onlinepubs/9699919799/utilities/basename.html -USE_BASENAME(NEWTOY(basename, "<1>2", TOYFLAG_USR|TOYFLAG_BIN)) +USE_BASENAME(NEWTOY(basename, "<1as:", TOYFLAG_USR|TOYFLAG_BIN)) config BASENAME bool "basename" default y help - usage: basename string [suffix] + usage: basename [-a] [-s SUFFIX] NAME... | NAME [SUFFIX] - Return non-directory portion of a pathname removing suffix + Return non-directory portion of a pathname removing suffix. + + -a All arguments are names. + -s SUFFIX Remove suffix (implies -a). */ +#define FOR_basename #include "toys.h" +GLOBALS( + char *s; +) + void basename_main(void) { - char *base = basename(*toys.optargs), *suffix = toys.optargs[1]; + char **arg; + + if (toys.optflags&FLAG_s) toys.optflags |= FLAG_a; + + if (!(toys.optflags&FLAG_a)) { + if (toys.optc > 2) error_exit("too many args"); + TT.s = toys.optargs[1]; + toys.optargs[1] = NULL; + } - // chop off the suffix if provided - if (suffix && *suffix && (suffix = strend(base, suffix))) *suffix = 0; + for (arg = toys.optargs; *arg; ++arg) { + char *base = basename(*arg), *p; - puts(base); + // Chop off the suffix if provided. + if (TT.s && *TT.s && (p = strend(base, TT.s))) *p = 0; + puts(base); + } } -- cgit v1.2.3