diff options
| author | Denis Vlasenko | 2006-10-03 21:00:06 +0000 |
|---|---|---|
| committer | Denis Vlasenko | 2006-10-03 21:00:06 +0000 |
| commit | 67b23e6043d8e2b30b0bf3bc105b8583c2a26db5 (patch) | |
| tree | edb58560b444979051b42ab7f0c0c718f7459754 /debianutils | |
| parent | 40920825d59874cf285390434486e88c8498d2d8 (diff) | |
| download | busybox-67b23e6043d8e2b30b0bf3bc105b8583c2a26db5.zip busybox-67b23e6043d8e2b30b0bf3bc105b8583c2a26db5.tar.gz | |
getopt_ulflags -> getopt32.
It is impossible to formulate sane ABI based on
size of ulong because it can be 32-bit or 64-bit.
Basically it means that you cannot portably use
more that 32 option chars in one call anyway...
Make it explicit.
Diffstat (limited to 'debianutils')
| -rw-r--r-- | debianutils/mktemp.c | 2 | ||||
| -rw-r--r-- | debianutils/readlink.c | 4 | ||||
| -rw-r--r-- | debianutils/start_stop_daemon.c | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/debianutils/mktemp.c b/debianutils/mktemp.c index 495a2ea..546e030 100644 --- a/debianutils/mktemp.c +++ b/debianutils/mktemp.c @@ -18,7 +18,7 @@ int mktemp_main(int argc, char **argv) { - unsigned long flags = bb_getopt_ulflags(argc, argv, "dq"); + unsigned long flags = getopt32(argc, argv, "dq"); if (optind + 1 != argc) bb_show_usage(); diff --git a/debianutils/readlink.c b/debianutils/readlink.c index bfe0db6..0d5ad94 100644 --- a/debianutils/readlink.c +++ b/debianutils/readlink.c @@ -18,8 +18,8 @@ int readlink_main(int argc, char **argv) { char *buf; - unsigned long opt = ENABLE_FEATURE_READLINK_FOLLOW ? - bb_getopt_ulflags(argc, argv, "f") : 0; + unsigned opt = ENABLE_FEATURE_READLINK_FOLLOW ? + getopt32(argc, argv, "f") : 0; if (argc != (ENABLE_FEATURE_READLINK_FOLLOW ? optind + 1 : 2)) bb_show_usage(); diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c index dcff1dd..57f42d8 100644 --- a/debianutils/start_stop_daemon.c +++ b/debianutils/start_stop_daemon.c @@ -227,7 +227,7 @@ static const struct option ssd_long_options[] = { int start_stop_daemon_main(int argc, char **argv) { - unsigned long opt; + unsigned opt; char *signame = NULL; char *startas = NULL; #if ENABLE_FEATURE_START_STOP_DAEMON_FANCY @@ -235,12 +235,12 @@ int start_stop_daemon_main(int argc, char **argv) // int retries = -1; #endif #if ENABLE_FEATURE_START_STOP_DAEMON_LONG_OPTIONS - bb_applet_long_options = ssd_long_options; + applet_long_options = ssd_long_options; #endif /* Check required one context option was given */ - bb_opt_complementally = "K:S:?:K--S:S--K:m?p:K?xpun:S?xa"; - opt = bb_getopt_ulflags(argc, argv, "KSbqm" + opt_complementary = "K:S:?:K--S:S--K:m?p:K?xpun:S?xa"; + opt = getopt32(argc, argv, "KSbqm" // USE_FEATURE_START_STOP_DAEMON_FANCY("ovR:") USE_FEATURE_START_STOP_DAEMON_FANCY("ov") "a:n:s:u:c:x:p:" |