diff options
author | Igor Pashev <pashev.igor@gmail.com> | 2014-09-30 18:22:54 +0400 |
---|---|---|
committer | Igor Pashev <pashev.igor@gmail.com> | 2014-09-30 18:22:54 +0400 |
commit | 08bc9e01c274a01d107b348f921e1c74dd04bd3a (patch) | |
tree | 25348bff03c29d9dd6c6dd96bf82c7c9f9265ccf /src/basename.c | |
parent | b9c7373f203ab77c58cb6b131f8b58236ea337a2 (diff) | |
parent | c18578632fd3c9e513e613a86ba2b7c4ebee6c45 (diff) | |
download | coreutils-08bc9e01c274a01d107b348f921e1c74dd04bd3a.tar.gz |
Merge tag 'upstream/8.23'
Upstream version 8.23
Diffstat (limited to 'src/basename.c')
-rw-r--r-- | src/basename.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/basename.c b/src/basename.c index 074d284d..95215399 100644 --- a/src/basename.c +++ b/src/basename.c @@ -1,5 +1,5 @@ /* basename -- strip directory and suffix from file names - Copyright (C) 1990-2013 Free Software Foundation, Inc. + Copyright (C) 1990-2014 Free Software Foundation, Inc. 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 @@ -59,8 +59,8 @@ If specified, also remove a trailing SUFFIX.\n\ 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\ + -s, --suffix=SUFFIX remove a trailing SUFFIX; implies -a\n\ + -z, --zero end each output line with NUL, not newline\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); @@ -146,6 +146,7 @@ main (int argc, char **argv) { case 's': suffix = optarg; + /* Fall through: -s implies -a. */ case 'a': multiple_names = true; |