applying fix for:

[people/mcb30/busybox.git] / debianutils / readlink.c

diff --git a/debianutils/readlink.c b/debianutils/readlink.c
index da52590..90927bb 100644 (file)
--- a/debianutils/readlink.c
+++ b/debianutils/readlink.c
@@ -23,18 +23,38 @@
 #include <errno.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <getopt.h>
 #include "busybox.h"
 
+#ifdef CONFIG_FEATURE_READLINK_FOLLOW
+# define READLINK_FOLLOW       "f"
+# define READLINK_FLAG_f       (1 << 0)
+#else
+# define READLINK_FOLLOW       ""
+#endif
+
+static const char readlink_options[] = READLINK_FOLLOW;
+
 int readlink_main(int argc, char **argv)
 {
        char *buf = NULL;
+       unsigned long opt = bb_getopt_ulflags(argc, argv, readlink_options);
+#ifdef CONFIG_FEATURE_READLINK_FOLLOW
+       RESERVE_CONFIG_BUFFER(resolved_path, PATH_MAX);
+#endif
 
        /* no options, no getopt */
 
-       if (argc != 2)
-               show_usage();
+       if (optind + 1 != argc)
+               bb_show_usage();
+
+#ifdef CONFIG_FEATURE_READLINK_FOLLOW
+       if (opt & READLINK_FLAG_f) {
+               buf = realpath(argv[optind], resolved_path);
+       } else
+#endif
+               buf = xreadlink(argv[optind]);
 
-       buf = xreadlink(argv[1]);
        if (!buf)
                return EXIT_FAILURE;
        puts(buf);