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/realpath.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/realpath.c')
| -rw-r--r-- | src/realpath.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/realpath.c b/src/realpath.c index 292c8f3b..0c553271 100644 --- a/src/realpath.c +++ b/src/realpath.c @@ -1,5 +1,5 @@ /* realpath - print the resolved path - Copyright (C) 2011-2013 Free Software Foundation, Inc. + Copyright (C) 2011-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 @@ -51,7 +51,7 @@ static struct option const longopts[] = {"relative-to", required_argument, NULL, RELATIVE_TO_OPTION}, {"relative-base", required_argument, NULL, RELATIVE_BASE_OPTION}, {"quiet", no_argument, NULL, 'q'}, - {"strip", no_argument, NULL, 's' /* FIXME: deprecate in 2013 or so */}, + {"strip", no_argument, NULL, 's'}, {"no-symlinks", no_argument, NULL, 's'}, {"zero", no_argument, NULL, 'z'}, {"logical", no_argument, NULL, 'L'}, @@ -83,7 +83,7 @@ all but the last component must exist\n\ --relative-to=FILE print the resolved path relative to FILE\n\ --relative-base=FILE print absolute paths unless paths below FILE\n\ -s, --strip, --no-symlinks don't expand symlinks\n\ - -z, --zero separate output with NUL rather than newline\n\ + -z, --zero end each output line with NUL, not newline\n\ \n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); |