Rewritten by Manuel Novoa III.

[oweals/busybox.git] / rmmod.c

diff --git a/rmmod.c b/rmmod.c
index d01725329e923fb7ca7cfcaad523732731232f7d..7596d023237bf36cf46684659d06320fa685c4a4 100644 (file)
--- a/rmmod.c
+++ b/rmmod.c
@@ -2,7 +2,7 @@
 /*
  * Mini rmmod implementation for busybox
  *
- * Copyright (C) 1999,2000 by Lineo, inc.
+ * Copyright (C) 1999,2000,2001 by Lineo, inc.
  * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -21,54 +21,42 @@
  *
  */
 
-#include "internal.h"
 #include <stdio.h>
 #include <errno.h>
 #include <unistd.h>
-#include <sys/syscall.h>
-
-
-
-/* And the system call of the day is...  */
-_syscall1(int, delete_module, const char *, name)
-
-
-static const char rmmod_usage[] =
-       "rmmod [OPTION]... [MODULE]...\n\n"
-       "Unloads the specified kernel modules from the kernel.\n\n"
-
-       "Options:\n" "\t-a\tTry to remove all unused kernel modules.\n";
+#include <stdlib.h>
+#include <getopt.h>
+#include "busybox.h"
 
+extern int delete_module(const char * name);
 
 
 extern int rmmod_main(int argc, char **argv)
 {
-       if (argc <= 1) {
-               usage(rmmod_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)) {
-                                       perror("rmmod");
-                                       exit(FALSE);
-                               }
-                               exit(TRUE);
+                               if (delete_module(NULL))
+                                       perror_msg_and_die("rmmod");
+                               return EXIT_SUCCESS;
                        default:
-                               usage(rmmod_usage);
-                       }
+                               show_usage();
                }
        }
 
-       while (argc-- > 0) {
-               if (delete_module(*argv) < 0) {
-                       perror(*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++;
        }
-       exit(TRUE);
+
+       return(ret);
 }