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

Applied patch from Jeff Garzik to getopt-ify rmmod.

Browse Source
This commit is contained in:
Mark Whitley 2001-03-09 21:49:12 +00:00
parent 8d4c397d9d
commit f90c28dd1e
2 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
modutils/rmmod.c
View File

@ -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))
@ -55,14 +52,16 @@ extern int rmmod_main(int argc, char **argv)
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);
}

25
rmmod.c
View File

@ -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))
@ -55,14 +52,16 @@ extern int rmmod_main(int argc, char **argv)
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);
}