diff options
| author | Rob Landley <rob@landley.net> | 2005-09-17 11:13:25 +0000 |
|---|---|---|
| committer | Rob Landley <rob@landley.net> | 2005-09-17 11:13:25 +0000 |
| commit | 07e42dc05612653f83d31fcea325afbe38182c1f (patch) | |
| tree | 6c324c359a322a942ef46b1e4f1394520e805c0a | |
| parent | a882126feeebb2616910a43ed388a402277434f8 (diff) | |
| download | busybox-w32-07e42dc05612653f83d31fcea325afbe38182c1f.tar.gz busybox-w32-07e42dc05612653f83d31fcea325afbe38182c1f.tar.bz2 busybox-w32-07e42dc05612653f83d31fcea325afbe38182c1f.zip | |
Tito pointed out that if readlink doesn't have -f, there's no need to call
the option parsing code at all.
| -rw-r--r-- | debianutils/readlink.c | 12 |
1 files changed, 6 insertions, 6 deletions
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 @@ | |||
| 18 | int readlink_main(int argc, char **argv) | 18 | int readlink_main(int argc, char **argv) |
| 19 | { | 19 | { |
| 20 | char *buf; | 20 | char *buf; |
| 21 | unsigned long opt = bb_getopt_ulflags(argc, argv, | 21 | unsigned long opt = ENABLE_FEATURE_READLINK_FOLLOW ? |
| 22 | ENABLE_FEATURE_READLINK_FOLLOW ? "f" : ""); | 22 | bb_getopt_ulflags(argc, argv, "f") : 0; |
| 23 | 23 | ||
| 24 | if (optind + 1 != argc) | 24 | if (argc != (ENABLE_FEATURE_READLINK_FOLLOW ? optind + 1 : 2)) |
| 25 | bb_show_usage(); | 25 | bb_show_usage(); |
| 26 | 26 | ||
| 27 | if (ENABLE_FEATURE_READLINK_FOLLOW && (opt & READLINK_FLAG_f)) | 27 | if (opt & READLINK_FLAG_f) |
| 28 | buf = realpath(argv[optind], NULL); | 28 | buf = realpath(argv[optind], NULL); |
| 29 | else | 29 | else |
| 30 | buf = xreadlink(argv[optind]); | 30 | buf = xreadlink(argv[ENABLE_FEATURE_READLINK_FOLLOW ? optind : 1]); |
| 31 | 31 | ||
| 32 | if (!buf) | 32 | if (!buf) |
| 33 | return EXIT_FAILURE; | 33 | return EXIT_FAILURE; |