summaryrefslogtreecommitdiff
path: root/modutils
diff options
context:
space:
mode:
authorDenis Vlasenko2006-10-03 21:00:06 +0000
committerDenis Vlasenko2006-10-03 21:00:06 +0000
commit67b23e6043d8e2b30b0bf3bc105b8583c2a26db5 (patch)
treeedb58560b444979051b42ab7f0c0c718f7459754 /modutils
parent40920825d59874cf285390434486e88c8498d2d8 (diff)
downloadbusybox-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 'modutils')
-rw-r--r--modutils/insmod.c2
-rw-r--r--modutils/modprobe.c4
-rw-r--r--modutils/rmmod.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/modutils/insmod.c b/modutils/insmod.c
index 314e873..0554def 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -3983,7 +3983,7 @@ int insmod_main( int argc, char **argv)
struct utsname myuname;
/* Parse any options */
- option_mask = bb_getopt_ulflags(argc, argv, OPTION_STR, &opt_o);
+ option_mask = getopt32(argc, argv, OPTION_STR, &opt_o);
if (option_mask & OPT_o) { // -o /* name the output module */
free(m_name);
m_name = xstrdup(opt_o);
diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index f51de56..b629390 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -902,8 +902,8 @@ int modprobe_main(int argc, char** argv)
int rc = EXIT_SUCCESS;
char *unused;
- bb_opt_complementally = "?V-:q-v:v-q";
- main_opts = bb_getopt_ulflags(argc, argv, "acdklnqrst:vVC:",
+ opt_complementary = "?V-:q-v:v-q";
+ main_opts = getopt32(argc, argv, "acdklnqrst:vVC:",
&unused, &unused);
if((main_opts & (DUMP_CONF_EXIT | LIST_ALL)))
return EXIT_SUCCESS;
diff --git a/modutils/rmmod.c b/modutils/rmmod.c
index f87fb5e..ce239a2 100644
--- a/modutils/rmmod.c
+++ b/modutils/rmmod.c
@@ -44,7 +44,7 @@ int rmmod_main(int argc, char **argv)
unsigned int flags = O_NONBLOCK|O_EXCL;
/* Parse command line. */
- n = bb_getopt_ulflags(argc, argv, "wfa");
+ n = getopt32(argc, argv, "wfa");
if((n & 1)) // --wait
flags &= ~O_NONBLOCK;
if((n & 2)) // --force