mirror of
https://git.savannah.gnu.org/git/coreutils.git
synced 2026-11-17 18:02:09 +03:00
basename: support more than one argument
* src/basename.c (perform_basename): New function refactored from main() that performs the basename work on a STRING, optionally removes a trailing SUFFIX and outputs the result. (main): Handle new options. * doc/coreutils.texi (basename invocation): Mention new options. * test/misc/basename: Add new options test cases. * NEWS (New features): Mention it.
This commit is contained in:
1 parent
4b4a465798
commit
a3eb71a98f
4 files changed
+121
-39
No files matched your search
@@ -16,6 +16,10 @@ GNU coreutils NEWS -*- outline -*-
|
||||
split now accepts the --additional-suffix option, to append an
|
||||
additional static suffix to output file names.
|
||||
|
||||
basename now supports the -a and -s options, which allow processing
|
||||
of more than one argument at a time. Also the complementary
|
||||
-z option was added to delimit output items with the NUL character.
|
||||
|
||||
** Bug fixes
|
||||
|
||||
mv now lets you move a symlink onto a same-inode destination file that
|
||||
|
||||
+28
-2
@@ -12422,6 +12422,7 @@ This section describes commands that manipulate file names.
|
||||
|
||||
@example
|
||||
basename @var{name} [@var{suffix}]
|
||||
basename @var{option}... @var{name}...
|
||||
@end example
|
||||
|
||||
If @var{suffix} is specified and is identical to the end of @var{name},
|
||||
@@ -12445,8 +12446,27 @@ for everything except file names containing a trailing newline.
|
||||
result is @samp{//} on platforms where @var{//} is distinct from
|
||||
@var{/}, and @samp{/} on platforms where there is no difference.
|
||||
|
||||
The only options are @option{--help} and @option{--version}. @xref{Common
|
||||
options}. Options must precede operands.
|
||||
The program accepts the following options. Also see @ref{Common options}.
|
||||
Options must precede operands.
|
||||
|
||||
@table @samp
|
||||
|
||||
@item -a
|
||||
@itemx --multiple
|
||||
@opindex -a
|
||||
@opindex --multiple
|
||||
Support more than one argument. Treat every argument as a @var{name}.
|
||||
With this, an optional @var{suffix} must be specified using the
|
||||
@option{-s} option.
|
||||
|
||||
@item -s @var{suffix}
|
||||
@itemx --suffix=@var{suffix}
|
||||
@opindex -s
|
||||
@opindex --suffix
|
||||
Remove a trailing @var{suffix}.
|
||||
This option implies the @option{-a} option.
|
||||
|
||||
@end table
|
||||
|
||||
@exitstatus
|
||||
|
||||
@@ -12458,6 +12478,12 @@ basename /usr/bin/sort
|
||||
|
||||
# Output "stdio".
|
||||
basename include/stdio.h .h
|
||||
|
||||
# Output "stdio".
|
||||
basename -s .h include/stdio.h
|
||||
|
||||
# Output "stdio" followed by "stdlib"
|
||||
basename -a -s .h include/stdio.h include/stdlib.h
|
||||
@end smallexample
|
||||
|
||||
|
||||
|
||||
+85
-37
@@ -14,23 +14,12 @@
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>. */
|
||||
|
||||
/* Usage: basename name [suffix]
|
||||
NAME is a file name; SUFFIX is a suffix to strip from it.
|
||||
|
||||
basename /usr/foo/lossage/functions.l
|
||||
=> functions.l
|
||||
basename /usr/foo/lossage/functions.l .l
|
||||
=> functions
|
||||
basename functions.lisp p
|
||||
=> functions.lis */
|
||||
|
||||
#include <config.h>
|
||||
#include <getopt.h>
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
#include "system.h"
|
||||
#include "long-options.h"
|
||||
#include "error.h"
|
||||
#include "quote.h"
|
||||
|
||||
@@ -39,6 +28,16 @@
|
||||
|
||||
#define AUTHORS proper_name ("David MacKenzie")
|
||||
|
||||
static struct option const longopts[] =
|
||||
{
|
||||
{"multiple", no_argument, NULL, 'a'},
|
||||
{"suffix", required_argument, NULL, 's'},
|
||||
{"zero", no_argument, NULL, 'z'},
|
||||
{GETOPT_HELP_OPTION_DECL},
|
||||
{GETOPT_VERSION_OPTION_DECL},
|
||||
{NULL, 0, NULL, 0}
|
||||
};
|
||||
|
||||
void
|
||||
usage (int status)
|
||||
{
|
||||
@@ -48,30 +47,38 @@ usage (int status)
|
||||
{
|
||||
printf (_("\
|
||||
Usage: %s NAME [SUFFIX]\n\
|
||||
or: %s OPTION\n\
|
||||
or: %s OPTION... NAME...\n\
|
||||
"),
|
||||
program_name, program_name);
|
||||
fputs (_("\
|
||||
Print NAME with any leading directory components removed.\n\
|
||||
If specified, also remove a trailing SUFFIX.\n\
|
||||
\n\
|
||||
"), stdout);
|
||||
|
||||
fputs (_("\
|
||||
-a, --multiple support multiple arguments and treat each as a NAME\n\
|
||||
-s, --suffix=SUFFIX remove a trailing SUFFIX\n\
|
||||
-z, --zero separate output with NUL rather than newline\n\
|
||||
"), stdout);
|
||||
fputs (HELP_OPTION_DESCRIPTION, stdout);
|
||||
fputs (VERSION_OPTION_DESCRIPTION, stdout);
|
||||
printf (_("\
|
||||
\n\
|
||||
Examples:\n\
|
||||
%s /usr/bin/sort Output \"sort\".\n\
|
||||
%s include/stdio.h .h Output \"stdio\".\n\
|
||||
%s /usr/bin/sort -> \"sort\"\n\
|
||||
%s include/stdio.h .h -> \"stdio\"\n\
|
||||
%s -s .h include/stdio.h -> \"stdio\"\n\
|
||||
%s -a any/str1 any/str2 -> \"str1\" followed by \"str2\"\n\
|
||||
"),
|
||||
program_name, program_name);
|
||||
program_name, program_name, program_name, program_name);
|
||||
emit_ancillary_info ();
|
||||
}
|
||||
exit (status);
|
||||
}
|
||||
|
||||
/* Remove SUFFIX from the end of NAME if it is there, unless NAME
|
||||
consists entirely of SUFFIX. */
|
||||
consists entirely of SUFFIX. */
|
||||
|
||||
static void
|
||||
remove_suffix (char *name, const char *suffix)
|
||||
@@ -89,10 +96,35 @@ remove_suffix (char *name, const char *suffix)
|
||||
*np = '\0';
|
||||
}
|
||||
|
||||
/* Perform the basename operation on STRING. If SUFFIX is non-NULL, remove
|
||||
the trailing SUFFIX. Finally, output the result string. */
|
||||
|
||||
static void
|
||||
perform_basename (const char *string, const char *suffix, bool use_nuls)
|
||||
{
|
||||
char *name = base_name (string);
|
||||
strip_trailing_slashes (name);
|
||||
|
||||
/* Per POSIX, 'basename // /' must return '//' on platforms with
|
||||
distinct //. On platforms with drive letters, this generalizes
|
||||
to making 'basename c: :' return 'c:'. This rule is captured by
|
||||
skipping suffix stripping if base_name returned an absolute path
|
||||
or a drive letter (only possible if name is a file-system
|
||||
root). */
|
||||
if (suffix && IS_RELATIVE_FILE_NAME (name) && ! FILE_SYSTEM_PREFIX_LEN (name))
|
||||
remove_suffix (name, suffix);
|
||||
|
||||
fputs (name, stdout);
|
||||
putchar (use_nuls ? '\0' : '\n');
|
||||
free (name);
|
||||
}
|
||||
|
||||
int
|
||||
main (int argc, char **argv)
|
||||
{
|
||||
char *name;
|
||||
bool multiple_names = false;
|
||||
bool use_nuls = false;
|
||||
const char *suffix = NULL;
|
||||
|
||||
initialize_main (&argc, &argv);
|
||||
set_program_name (argv[0]);
|
||||
@@ -102,10 +134,33 @@ main (int argc, char **argv)
|
||||
|
||||
atexit (close_stdout);
|
||||
|
||||
parse_long_options (argc, argv, PROGRAM_NAME, PACKAGE_NAME, Version,
|
||||
usage, AUTHORS, (char const *) NULL);
|
||||
if (getopt_long (argc, argv, "+", NULL, NULL) != -1)
|
||||
usage (EXIT_FAILURE);
|
||||
while (true)
|
||||
{
|
||||
int c = getopt_long (argc, argv, "+as:z", longopts, NULL);
|
||||
|
||||
if (c == -1)
|
||||
break;
|
||||
|
||||
switch (c)
|
||||
{
|
||||
case 's':
|
||||
suffix = optarg;
|
||||
|
||||
case 'a':
|
||||
multiple_names = true;
|
||||
break;
|
||||
|
||||
case 'z':
|
||||
use_nuls = true;
|
||||
break;
|
||||
|
||||
case_GETOPT_HELP_CHAR;
|
||||
case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS);
|
||||
|
||||
default:
|
||||
usage (EXIT_FAILURE);
|
||||
}
|
||||
}
|
||||
|
||||
if (argc < optind + 1)
|
||||
{
|
||||
@@ -113,27 +168,20 @@ main (int argc, char **argv)
|
||||
usage (EXIT_FAILURE);
|
||||
}
|
||||
|
||||
if (optind + 2 < argc)
|
||||
if (!multiple_names && optind + 2 < argc)
|
||||
{
|
||||
error (0, 0, _("extra operand %s"), quote (argv[optind + 2]));
|
||||
usage (EXIT_FAILURE);
|
||||
}
|
||||
|
||||
name = base_name (argv[optind]);
|
||||
strip_trailing_slashes (name);
|
||||
|
||||
/* Per POSIX, 'basename // /' must return '//' on platforms with
|
||||
distinct //. On platforms with drive letters, this generalizes
|
||||
to making 'basename c: :' return 'c:'. This rule is captured by
|
||||
skipping suffix stripping if base_name returned an absolute path
|
||||
or a drive letter (only possible if name is a file-system
|
||||
root). */
|
||||
if (argc == optind + 2 && IS_RELATIVE_FILE_NAME (name)
|
||||
&& ! FILE_SYSTEM_PREFIX_LEN (name))
|
||||
remove_suffix (name, argv[optind + 1]);
|
||||
|
||||
puts (name);
|
||||
free (name);
|
||||
if (multiple_names)
|
||||
{
|
||||
for (; optind < argc; optind++)
|
||||
perform_basename (argv[optind], suffix, use_nuls);
|
||||
}
|
||||
else
|
||||
perform_basename (argv[optind],
|
||||
optind + 2 == argc ? argv[optind + 1] : NULL, use_nuls);
|
||||
|
||||
exit (EXIT_SUCCESS);
|
||||
}
|
||||
@@ -47,6 +47,10 @@ my @Tests =
|
||||
['h', qw(///), {OUT => '/'}],
|
||||
['i', qw(///a///), {OUT => 'a'}],
|
||||
['j', qw(''), {OUT => ''}],
|
||||
['k', qw(aa a), {OUT => 'a'}],
|
||||
['l', qw(-a a b), {OUT => "a\nb"}],
|
||||
['m', qw(-s a aa ba ab), {OUT => "a\nb\nab"}],
|
||||
['n', qw(a-a -a), {OUT => 'a'}],
|
||||
['1', qw(f.s .s), {OUT => 'f'}],
|
||||
['2', qw(fs s), {OUT => 'f'}],
|
||||
['3', qw(fs fs), {OUT => 'fs'}],
|
||||
|
||||
Reference in new issue
Block a user