diff options
Diffstat (limited to 'src/readlink.c')
| -rw-r--r-- | src/readlink.c | 150 |
1 files changed, 77 insertions, 73 deletions
diff --git a/src/readlink.c b/src/readlink.c index 121c7ff..2444f86 100644 --- a/src/readlink.c +++ b/src/readlink.c @@ -1,10 +1,10 @@ /* readlink -- display value of a symbolic link. - Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. + Copyright (C) 2002-2016 Free Software Foundation, Inc. - This program is free software; you can redistribute it and/or modify + 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 - the Free Software Foundation; either version 2, or (at your option) - any later version. + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -12,8 +12,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + along with this program. If not, see <http://www.gnu.org/licenses/>. */ /* Written by Dmitry V. Levin */ @@ -25,16 +24,12 @@ #include "system.h" #include "canonicalize.h" #include "error.h" -#include "xreadlink.h" -#include "quote.h" +#include "areadlink.h" -/* The official name of this program (e.g., no `g' prefix). */ +/* The official name of this program (e.g., no 'g' prefix). */ #define PROGRAM_NAME "readlink" -#define AUTHORS "Dmitry V. Levin" - -/* Name this program was run with. */ -char *program_name; +#define AUTHORS proper_name ("Dmitry V. Levin") /* If true, do not output the trailing newline. */ static bool no_newline; @@ -51,6 +46,7 @@ static struct option const longopts[] = {"quiet", no_argument, NULL, 'q'}, {"silent", no_argument, NULL, 's'}, {"verbose", no_argument, NULL, 'v'}, + {"zero", no_argument, NULL, 'z'}, {GETOPT_HELP_OPTION_DECL}, {GETOPT_VERSION_OPTION_DECL}, {NULL, 0, NULL, 0} @@ -60,33 +56,36 @@ void usage (int status) { if (status != EXIT_SUCCESS) - fprintf (stderr, _("Try `%s --help' for more information.\n"), - program_name); + emit_try_help (); else { - printf (_("Usage: %s [OPTION]... FILE\n"), program_name); - fputs (_("Display value of a symbolic link on standard output.\n\n"), - stdout); + printf (_("Usage: %s [OPTION]... FILE...\n"), program_name); + fputs (_("Print value of a symbolic link or canonical file name\n\n"), + stdout); fputs (_("\ -f, --canonicalize canonicalize by following every symlink in\n\ - every component of the given name recursively;\n\ + every component of the given name recursively;\ +\n\ all but the last component must exist\n\ -e, --canonicalize-existing canonicalize by following every symlink in\n\ - every component of the given name recursively,\n\ + every component of the given name recursively,\ +\n\ all components must exist\n\ "), stdout); fputs (_("\ -m, --canonicalize-missing canonicalize by following every symlink in\n\ - every component of the given name recursively,\n\ + every component of the given name recursively,\ +\n\ without requirements on components existence\n\ - -n, --no-newline do not output the trailing newline\n\ + -n, --no-newline do not output the trailing delimiter\n\ -q, --quiet,\n\ -s, --silent suppress most error messages\n\ -v, --verbose report error messages\n\ + -z, --zero end each output line with NUL, not newline\n\ "), stdout); fputs (HELP_OPTION_DESCRIPTION, stdout); fputs (VERSION_OPTION_DESCRIPTION, stdout); - printf (_("\nReport bugs to <%s>.\n"), PACKAGE_BUGREPORT); + emit_ancillary_info (PROGRAM_NAME); } exit (status); } @@ -96,51 +95,49 @@ main (int argc, char **argv) { /* If not -1, use this method to canonicalize. */ int can_mode = -1; - - /* File name to canonicalize. */ - const char *fname; - - /* Result of canonicalize. */ - char *value; - + int status = EXIT_SUCCESS; int optc; + bool use_nuls = false; initialize_main (&argc, &argv); - program_name = argv[0]; + set_program_name (argv[0]); setlocale (LC_ALL, ""); bindtextdomain (PACKAGE, LOCALEDIR); textdomain (PACKAGE); atexit (close_stdout); - while ((optc = getopt_long (argc, argv, "efmnqsv", longopts, NULL)) != -1) + while ((optc = getopt_long (argc, argv, "efmnqsvz", longopts, NULL)) != -1) { switch (optc) - { - case 'e': - can_mode = CAN_EXISTING; - break; - case 'f': - can_mode = CAN_ALL_BUT_LAST; - break; - case 'm': - can_mode = CAN_MISSING; - break; - case 'n': - no_newline = true; - break; - case 'q': - case 's': - verbose = false; - break; - case 'v': - verbose = true; - break; - case_GETOPT_HELP_CHAR; - case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); - default: - usage (EXIT_FAILURE); - } + { + case 'e': + can_mode = CAN_EXISTING; + break; + case 'f': + can_mode = CAN_ALL_BUT_LAST; + break; + case 'm': + can_mode = CAN_MISSING; + break; + case 'n': + no_newline = true; + break; + case 'q': + case 's': + verbose = false; + break; + case 'v': + verbose = true; + break; + case 'z': + use_nuls = true; + break; + case_GETOPT_HELP_CHAR; + case_GETOPT_VERSION_CHAR (PROGRAM_NAME, AUTHORS); + default: + usage (EXIT_FAILURE); + } } if (optind >= argc) @@ -149,26 +146,33 @@ main (int argc, char **argv) usage (EXIT_FAILURE); } - fname = argv[optind++]; - - if (optind < argc) + if (argc - optind > 1) { - error (0, 0, _("extra operand %s"), quote (argv[optind])); - usage (EXIT_FAILURE); + if (no_newline) + error (0, 0, _("ignoring --no-newline with multiple arguments")); + no_newline = false; } - value = (can_mode != -1 - ? canonicalize_filename_mode (fname, can_mode) - : xreadlink (fname)); - if (value) + for (; optind < argc; ++optind) { - printf ("%s%s", value, (no_newline ? "" : "\n")); - free (value); - return EXIT_SUCCESS; + const char *fname = argv[optind]; + char *value = (can_mode != -1 + ? canonicalize_filename_mode (fname, can_mode) + : areadlink_with_size (fname, 63)); + if (value) + { + fputs (value, stdout); + if (! no_newline) + putchar (use_nuls ? '\0' : '\n'); + free (value); + } + else + { + status = EXIT_FAILURE; + if (verbose) + error (0, errno, "%s", quotef (fname)); + } } - if (verbose) - error (EXIT_FAILURE, errno, "%s", fname); - - return EXIT_FAILURE; + return status; } |