From: Rob Landley <rob@landley.net>
Date: Sat, 17 Sep 2005 11:13:25 +0000 (-0000)
Subject: Tito pointed out that if readlink doesn't have -f, there's no need to call
X-Git-Tag: 1_1_0~712
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=07e42dc05612653f83d31fcea325afbe38182c1f;p=oweals%2Fbusybox.git

Tito pointed out that if readlink doesn't have -f, there's no need to call
the option parsing code at all.
---

diff --git a/debianutils/readlink.c b/debianutils/readlink.c
index 3042b83ec..83abdbfa6 100644
--- a/debianutils/readlink.c
+++ b/debianutils/readlink.c
@@ -18,16 +18,16 @@
 int readlink_main(int argc, char **argv)
 {
 	char *buf;
-	unsigned long opt = bb_getopt_ulflags(argc, argv,
-							ENABLE_FEATURE_READLINK_FOLLOW ? "f" : "");
+	unsigned long opt = ENABLE_FEATURE_READLINK_FOLLOW ?
+							bb_getopt_ulflags(argc, argv, "f") : 0;
 
-	if (optind + 1 != argc)
-		bb_show_usage();
+	if (argc != (ENABLE_FEATURE_READLINK_FOLLOW ? optind + 1 : 2))
+			bb_show_usage();
 
-	if (ENABLE_FEATURE_READLINK_FOLLOW && (opt & READLINK_FLAG_f))
+	if (opt & READLINK_FLAG_f)
 		buf = realpath(argv[optind], NULL);
 	else
-		buf = xreadlink(argv[optind]);
+		buf = xreadlink(argv[ENABLE_FEATURE_READLINK_FOLLOW ? optind : 1]);
 
 	if (!buf)
 		return EXIT_FAILURE;