Improved port of ifconfig... smaller and with more features.

[oweals/busybox.git] / rmmod.c

diff --git a/rmmod.c b/rmmod.c
index f5d7d359a2f889521e1814dabf4d30b68e6a8c79..aab32612352c9cdb980a6fb2932ffbf869de4c1b 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,10 +21,13 @@
  *
  */
 
-#include "busybox.h"
 #include <stdio.h>
 #include <errno.h>
 #include <unistd.h>
+#include <stdlib.h>
+#include <sys/syscall.h>
+#include <linux/unistd.h>
+#include "busybox.h"
 #define __LIBRARY__
 
 
@@ -36,7 +39,7 @@ extern int rmmod_main(int argc, char **argv)
 {
        int ret = EXIT_SUCCESS;
        if (argc <= 1) {
-               usage(rmmod_usage);
+               show_usage();
        }
 
        /* Parse any options */
@@ -45,20 +48,18 @@ extern int rmmod_main(int argc, char **argv)
                        switch (**argv) {
                        case 'a':
                                /* Unload _all_ unused modules via NULL delete_module() call */
-                               if (delete_module(NULL)) {
-                                       perror("rmmod");
-                                       return EXIT_FAILURE;
-                               }
+                               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);
+                       perror_msg("%s", *argv);
                        ret = EXIT_FAILURE;
                }
                argv++;