emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

readlink: do not emit errors if file doesnt not exist / not a link

Browse Source 
getopt32: add =N support
This commit is contained in:
Denis Vlasenko 2006-10-20 18:36:55 +00:00
parent df51892690
commit 456fa6c0b1
2 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
debianutils/readlink.c
View File

@ -13,21 +13,32 @@
#include <stdlib.h> #include <stdlib.h>
#include <getopt.h> #include <getopt.h>
#define READLINK_FLAG_f (1 << 0)
int readlink_main(int argc, char **argv) int readlink_main(int argc, char **argv)
{ {
char *buf; char *buf;
unsigned opt = ENABLE_FEATURE_READLINK_FOLLOW ? char *fname;
getopt32(argc, argv, "f") : 0;
if (argc != (ENABLE_FEATURE_READLINK_FOLLOW ? optind + 1 : 2)) USE_FEATURE_READLINK_FOLLOW(
bb_show_usage(); unsigned opt;
/* We need exactly one non-option argument. */
opt_complementary = "=1";
opt = getopt32(argc, argv, "f");
fname = argv[optind];
)
SKIP_FEATURE_READLINK_FOLLOW(
const unsigned opt = 0;
if (argc != 2) bb_show_usage();
fname = argv[1];
)
if (opt & READLINK_FLAG_f) /* compat: coreutils readlink reports errors silently via exit code */
buf = realpath(argv[optind], bb_common_bufsiz1); logmode = LOGMODE_NONE;
else
buf = xreadlink(argv[ENABLE_FEATURE_READLINK_FOLLOW ? optind : 1]); if (opt) {
buf = realpath(fname, bb_common_bufsiz1);
} else {
buf = xreadlink(fname);
}
if (!buf) if (!buf)
return EXIT_FAILURE; return EXIT_FAILURE;
@ -36,5 +47,5 @@ int readlink_main(int argc, char **argv)
if (ENABLE_FEATURE_CLEAN_UP && buf != bb_common_bufsiz1) if (ENABLE_FEATURE_CLEAN_UP && buf != bb_common_bufsiz1)
free(buf); free(buf);
return EXIT_SUCCESS; bb_fflush_stdout_and_exit(EXIT_SUCCESS);
} }

9
libbb/getopt32.c
View File

@ -188,6 +188,10 @@ Special characters:
by a single digit (0-9) means that at least N non-option by a single digit (0-9) means that at least N non-option
arguments must be present on the command line arguments must be present on the command line
"=N" An equal sign as the first char in a opt_complementary group followed
by a single digit (0-9) means that exactly N non-option
arguments must be present on the command line
"V-" An option with dash before colon or end-of-line results in "V-" An option with dash before colon or end-of-line results in
bb_show_usage being called if this option is encountered. bb_show_usage being called if this option is encountered.
This is typically used to implement "print verbose usage message This is typically used to implement "print verbose usage message
@ -400,6 +404,11 @@ getopt32(int argc, char **argv, const char *applet_opts, ...)
} }
continue; continue;
} }
if (*s == '=') {
min_arg = max_arg = c - '0';
s++;
continue;
}
for (on_off = complementary; on_off->opt; on_off++) for (on_off = complementary; on_off->opt; on_off++)
if (on_off->opt == *s) if (on_off->opt == *s)
break; break;