aboutsummaryrefslogtreecommitdiff
path: root/debianutils
diff options
context:
space:
mode:
authorGravatar Ned Ludd <solar@gentoo.org>2004-12-08 16:47:28 +0000
committerGravatar Ned Ludd <solar@gentoo.org>2004-12-08 16:47:28 +0000
commitc6fbed5dba0ebf333fbe7af4d07ff839492f8882 (patch)
tree32f4a2fb3de679b3b670f21909272026fd35004e /debianutils
parentd824853de335d969f4d009f445bb6dfb1b18493b (diff)
downloadbusybox-c6fbed5dba0ebf333fbe7af4d07ff839492f8882.tar.gz
busybox-c6fbed5dba0ebf333fbe7af4d07ff839492f8882.tar.bz2
- CONFIG_FEATURE_READLINK_FOLLOW readlink -f patch from Colin Watson <cjwatson@debian.org> on busybox mailing list 08/11/04
Diffstat (limited to 'debianutils')
-rw-r--r--debianutils/Config.in7
-rw-r--r--debianutils/readlink.c24
2 files changed, 29 insertions, 2 deletions
diff --git a/debianutils/Config.in b/debianutils/Config.in
index 7cf7cadb5..f13d56ec7 100644
--- a/debianutils/Config.in
+++ b/debianutils/Config.in
@@ -24,6 +24,13 @@ config CONFIG_READLINK
This program reads a symbolic link and returns the name
of the file it points to
+config CONFIG_FEATURE_READLINK_FOLLOW
+ bool " Enable canonicalization by following all symlinks (-f)"
+ default n
+ depends on CONFIG_READLINK
+ help
+ Enable the readlink option (-f).
+
config CONFIG_RUN_PARTS
bool "run-parts"
default n
diff --git a/debianutils/readlink.c b/debianutils/readlink.c
index d8d7e8c2d..90927bb74 100644
--- 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)
+ if (optind + 1 != argc)
bb_show_usage();
- buf = xreadlink(argv[1]);
+#ifdef CONFIG_FEATURE_READLINK_FOLLOW
+ if (opt & READLINK_FLAG_f) {
+ buf = realpath(argv[optind], resolved_path);
+ } else
+#endif
+ buf = xreadlink(argv[optind]);
+
if (!buf)
return EXIT_FAILURE;
puts(buf);