Wrote rmmod for busybox.

 -Erik

7 files changed, 156 insertions, 2 deletions

diff --git a/Changelog b/Changelog
index da2346ae7..5bf8a5f72 100644
--- a/Changelog
+++ b/Changelog
@@ -1,7 +1,7 @@
 0.40
         * Added the -s option to du -beppu
         * Fixed an embarrasing segfault in head -beppu
-        * New App: lsmod -erik
+        * New Apps: lsmod, rmmod -erik
         * New Apps: fbset contributed by Randolph Chung <tausq@debian.org>.
         * Fixed an bug in syslogd causing it to stop logging after 20 minutes. -erik
         * Fixed the embarrasing failure of the -p opition in the logger app. -erik
diff --git a/applets/busybox.c b/applets/busybox.c
index ed5a2b0d4..a9cd6e079 100644
--- a/applets/busybox.c
+++ b/applets/busybox.c
@@ -168,6 +168,9 @@ static const struct Applet applets[] = {
 #ifdef BB_RMDIR                 //bin
     {"rmdir", rmdir_main},
 #endif
+#ifdef BB_RMMOD                 //sbin
+    {"rmmod", rmmod_main},
+#endif
 #ifdef BB_SFDISK                //sbin
     {"fdisk", sfdisk_main},
     {"sfdisk", sfdisk_main},
diff --git a/busybox.c b/busybox.c
index ed5a2b0d4..a9cd6e079 100644
--- a/busybox.c
+++ b/busybox.c
@@ -168,6 +168,9 @@ static const struct Applet applets[] = {
 #ifdef BB_RMDIR                 //bin
     {"rmdir", rmdir_main},
 #endif
+#ifdef BB_RMMOD                 //sbin
+    {"rmmod", rmmod_main},
+#endif
 #ifdef BB_SFDISK                //sbin
     {"fdisk", sfdisk_main},
     {"sfdisk", sfdisk_main},
diff --git a/busybox.def.h b/busybox.def.h
index 834738ea2..a86550e3b 100644
--- a/busybox.def.h
+++ b/busybox.def.h
@@ -59,6 +59,7 @@
 #define BB_REBOOT
 #define BB_RM
 #define BB_RMDIR
+#define BB_RMMOD
 //#define BB_SFDISK
 #define BB_SED
 #define BB_SLEEP
diff --git a/internal.h b/internal.h
index 3e9c272f0..9b51edcd2 100644
--- a/internal.h
+++ b/internal.h
@@ -104,8 +104,9 @@ extern int printf_main(int argc, char** argv);
 extern int ps_main(int argc, char** argv);
 extern int pwd_main(int argc, char** argv);
 extern int reboot_main(int argc, char** argv);
-extern int rmdir_main(int argc, char **argv);
 extern int rm_main(int argc, char** argv);
+extern int rmdir_main(int argc, char **argv);
+extern int rmmod_main(int argc, char** argv);
 extern int scan_partitions_main(int argc, char** argv);
 extern int sh_main(int argc, char** argv);
 extern int sfdisk_main(int argc, char** argv);
diff --git a/modutils/rmmod.c b/modutils/rmmod.c
new file mode 100644
index 000000000..7d3eac51e
--- /dev/null
+++ b/modutils/rmmod.c
@@ -0,0 +1,73 @@
+/*
+ * Mini rmmod implementation for busybox
+ *
+ * Copyright (C) 1999 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
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#include "internal.h"
+#include <stdio.h>
+#include <errno.h>
+#include <unistd.h>
+#include <sys/syscall.h>
+
+
+
+/* And the system call of the day is...  */
+extern 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";
+
+
+
+extern int rmmod_main(int argc, char **argv)
+{
+    if (argc<=1) {
+        usage(rmmod_usage);
+    }
+
+    /* Parse any options */
+    while (--argc > 0 && **(++argv) == '-') {
+        while (*(++(*argv))) {
+            switch (**argv) {
+            case 'a':
+                /* Unload _all_ modules via NULL delete_module() call */
+                if (delete_module(NULL)) {
+                    perror("rmmod");
+                    exit( FALSE);
+                }
+                exit( TRUE);
+            default:
+                usage(rmmod_usage);
+            }
+        }
+    }
+
+    while (argc-- > 0 ) {
+        if (delete_module(*argv) < 0) {
+            perror(*argv);
+        }
+        argv++;
+    }
+    exit( TRUE);
+}
diff --git a/rmmod.c b/rmmod.c
new file mode 100644
index 000000000..7d3eac51e
--- /dev/null
+++ b/rmmod.c
@@ -0,0 +1,73 @@
+/*
+ * Mini rmmod implementation for busybox
+ *
+ * Copyright (C) 1999 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
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ */
+
+#include "internal.h"
+#include <stdio.h>
+#include <errno.h>
+#include <unistd.h>
+#include <sys/syscall.h>
+
+
+
+/* And the system call of the day is...  */
+extern 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";
+
+
+
+extern int rmmod_main(int argc, char **argv)
+{
+    if (argc<=1) {
+        usage(rmmod_usage);
+    }
+
+    /* Parse any options */
+    while (--argc > 0 && **(++argv) == '-') {
+        while (*(++(*argv))) {
+            switch (**argv) {
+            case 'a':
+                /* Unload _all_ modules via NULL delete_module() call */
+                if (delete_module(NULL)) {
+                    perror("rmmod");
+                    exit( FALSE);
+                }
+                exit( TRUE);
+            default:
+                usage(rmmod_usage);
+            }
+        }
+    }
+
+    while (argc-- > 0 ) {
+        if (delete_module(*argv) < 0) {
+            perror(*argv);
+        }
+        argv++;
+    }
+    exit( TRUE);
+}