aboutsummaryrefslogtreecommitdiff
path: root/modutils
diff options
context:
space:
mode:
authorGravatar Mark Whitley <markw@lineo.com>2001-03-09 21:49:12 +0000
committerGravatar Mark Whitley <markw@lineo.com>2001-03-09 21:49:12 +0000
commitf90c28dd1ee28c29dc0f7bb4d3681f5606843793 (patch)
tree715983a318456d8391565e25607a023263c230df /modutils
parent8d4c397d9d551a9a91f0855e1ca48a5ed4130e7d (diff)
downloadbusybox-f90c28dd1ee28c29dc0f7bb4d3681f5606843793.tar.gz
busybox-f90c28dd1ee28c29dc0f7bb4d3681f5606843793.tar.bz2
Applied patch from Jeff Garzik to getopt-ify rmmod.
Diffstat (limited to 'modutils')
-rw-r--r--modutils/rmmod.c25
1 files changed, 12 insertions, 13 deletions
diff --git a/modutils/rmmod.c b/modutils/rmmod.c
index aab326123..36857e02c 100644
--- a/modutils/rmmod.c
+++ b/modutils/rmmod.c
@@ -25,6 +25,7 @@
#include <errno.h>
#include <unistd.h>
#include <stdlib.h>
+#include <getopt.h>
#include <sys/syscall.h>
#include <linux/unistd.h>
#include "busybox.h"
@@ -37,15 +38,11 @@ _syscall1(int, delete_module, const char *, name)
extern int rmmod_main(int argc, char **argv)
{
- int ret = EXIT_SUCCESS;
- if (argc <= 1) {
- show_usage();
- }
+ int n, ret = EXIT_SUCCESS;
- /* Parse any options */
- while (--argc > 0 && **(++argv) == '-') {
- while (*(++(*argv))) {
- switch (**argv) {
+ /* Parse command line. */
+ while ((n = getopt(argc, argv, "a")) != EOF) {
+ switch (n) {
case 'a':
/* Unload _all_ unused modules via NULL delete_module() call */
if (delete_module(NULL))
@@ -53,16 +50,18 @@ extern int rmmod_main(int argc, char **argv)
return EXIT_SUCCESS;
default:
show_usage();
- }
}
}
- while (argc-- > 0) {
- if (delete_module(*argv) < 0) {
- perror_msg("%s", *argv);
+ if (optind == argc)
+ show_usage();
+
+ for (n = optind; n < argc; n++) {
+ if (delete_module(argv[n]) < 0) {
+ perror_msg("%s", argv[n]);
ret = EXIT_FAILURE;
}
- argv++;
}
+
return(ret);
}