svn commit: trunk/busybox/debianutils

landley at busybox.net landley at busybox.net
Sat Sep 17 11:13:29 UTC 2005


Author: landley
Date: 2005-09-17 04:13:25 -0700 (Sat, 17 Sep 2005)
New Revision: 11488

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


Modified:
   trunk/busybox/debianutils/readlink.c


Changeset:
Modified: trunk/busybox/debianutils/readlink.c
===================================================================
--- trunk/busybox/debianutils/readlink.c	2005-09-16 23:51:31 UTC (rev 11487)
+++ trunk/busybox/debianutils/readlink.c	2005-09-17 11:13:25 UTC (rev 11488)
@@ -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;




More information about the busybox-cvs mailing list