Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/coreutils/readlink.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/coreutils/readlink.c (modified) (3 diffs)

branches/2.2.9/mindi-busybox/coreutils/readlink.c

@@ -5 +5 @@
  * Copyright (C) 2000,2001 Matt Kraai <kraai@alumni.carnegiemellon.edu>
  *
- * Licensed under GPL v2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
+ */
+#include "libbb.h"
+
+/*
+ * # readlink --version
+ * readlink (GNU coreutils) 6.10
+ * # readlink --help
+ *   -f, --canonicalize
+ *      canonicalize by following every symlink in
+ *      every component of the given name recursively;
+ *      all but the last component must exist
+ *   -e, --canonicalize-existing
+ *      canonicalize by following every symlink in
+ *      every component of the given name recursively,
+ *      all components must exist
+ *   -m, --canonicalize-missing
+ *      canonicalize by following every symlink in
+ *      every component of the given name recursively,
+ *      without requirements on components existence
+ *   -n, --no-newline              do not output the trailing newline
+ *   -q, --quiet, -s, --silent     suppress most error messages
+ *   -v, --verbose                 report error messages
+ *
+ * bbox supports: -f -n -v (fully), -q -s (accepts but ignores)
  */
 
-#include <getopt.h>
-
-#include "libbb.h"
-
-int readlink_main(int argc, char **argv);
-int readlink_main(int argc, char **argv)
+int readlink_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int readlink_main(int argc UNUSED_PARAM, char **argv)
 {
     char *buf;
     char *fname;
 
-    USE_FEATURE_READLINK_FOLLOW(
+    IF_FEATURE_READLINK_FOLLOW(
         unsigned opt;
         /* We need exactly one non-option argument.  */
         opt_complementary = "=1";
-        opt = getopt32(argv, "f");
+        opt = getopt32(argv, "fnvsq");
         fname = argv[optind];
     )
-    SKIP_FEATURE_READLINK_FOLLOW(
+    IF_NOT_FEATURE_READLINK_FOLLOW(
         const unsigned opt = 0;
         if (argc != 2) bb_show_usage();
@@ -32 +52 @@
 
     /* compat: coreutils readlink reports errors silently via exit code */
-    logmode = LOGMODE_NONE;
+    if (!(opt & 4)) /* not -v */
+        logmode = LOGMODE_NONE;
 
-    if (opt) {
-        buf = realpath(fname, bb_common_bufsiz1);
+    if (opt & 1) { /* -f */
+        buf = xmalloc_realpath(fname);
     } else {
         buf = xmalloc_readlink_or_warn(fname);
@@ -42 +63 @@
     if (!buf)
         return EXIT_FAILURE;
-    puts(buf);
+    printf((opt & 2) ? "%s" : "%s\n", buf);
 
-    if (ENABLE_FEATURE_CLEAN_UP && !opt)
+    if (ENABLE_FEATURE_CLEAN_UP)
         free(buf);