diff options
author | Erik Andersen <andersen@codepoet.org> | 1999-12-16 23:04:20 +0000 |
---|---|---|
committer | Erik Andersen <andersen@codepoet.org> | 1999-12-16 23:04:20 +0000 |
commit | 3d7e3414da38fce26a7f53f7ea36ddf781fa0233 (patch) | |
tree | 835a088b51c9493c92cef3edc5cc0758b8de37bf | |
parent | 0aa611816772021e706f0996aa2eed56d26ad696 (diff) | |
download | busybox-w32-3d7e3414da38fce26a7f53f7ea36ddf781fa0233.tar.gz busybox-w32-3d7e3414da38fce26a7f53f7ea36ddf781fa0233.tar.bz2 busybox-w32-3d7e3414da38fce26a7f53f7ea36ddf781fa0233.zip |
Wrote rmmod for busybox.
-Erik
-rw-r--r-- | Changelog | 2 | ||||
-rw-r--r-- | applets/busybox.c | 3 | ||||
-rw-r--r-- | busybox.c | 3 | ||||
-rw-r--r-- | busybox.def.h | 1 | ||||
-rw-r--r-- | internal.h | 3 | ||||
-rw-r--r-- | modutils/rmmod.c | 73 | ||||
-rw-r--r-- | rmmod.c | 73 |
7 files changed, 156 insertions, 2 deletions
@@ -1,7 +1,7 @@ | |||
1 | 0.40 | 1 | 0.40 |
2 | * Added the -s option to du -beppu | 2 | * Added the -s option to du -beppu |
3 | * Fixed an embarrasing segfault in head -beppu | 3 | * Fixed an embarrasing segfault in head -beppu |
4 | * New App: lsmod -erik | 4 | * New Apps: lsmod, rmmod -erik |
5 | * New Apps: fbset contributed by Randolph Chung <tausq@debian.org>. | 5 | * New Apps: fbset contributed by Randolph Chung <tausq@debian.org>. |
6 | * Fixed an bug in syslogd causing it to stop logging after 20 minutes. -erik | 6 | * Fixed an bug in syslogd causing it to stop logging after 20 minutes. -erik |
7 | * Fixed the embarrasing failure of the -p opition in the logger app. -erik | 7 | * 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[] = { | |||
168 | #ifdef BB_RMDIR //bin | 168 | #ifdef BB_RMDIR //bin |
169 | {"rmdir", rmdir_main}, | 169 | {"rmdir", rmdir_main}, |
170 | #endif | 170 | #endif |
171 | #ifdef BB_RMMOD //sbin | ||
172 | {"rmmod", rmmod_main}, | ||
173 | #endif | ||
171 | #ifdef BB_SFDISK //sbin | 174 | #ifdef BB_SFDISK //sbin |
172 | {"fdisk", sfdisk_main}, | 175 | {"fdisk", sfdisk_main}, |
173 | {"sfdisk", sfdisk_main}, | 176 | {"sfdisk", sfdisk_main}, |
@@ -168,6 +168,9 @@ static const struct Applet applets[] = { | |||
168 | #ifdef BB_RMDIR //bin | 168 | #ifdef BB_RMDIR //bin |
169 | {"rmdir", rmdir_main}, | 169 | {"rmdir", rmdir_main}, |
170 | #endif | 170 | #endif |
171 | #ifdef BB_RMMOD //sbin | ||
172 | {"rmmod", rmmod_main}, | ||
173 | #endif | ||
171 | #ifdef BB_SFDISK //sbin | 174 | #ifdef BB_SFDISK //sbin |
172 | {"fdisk", sfdisk_main}, | 175 | {"fdisk", sfdisk_main}, |
173 | {"sfdisk", sfdisk_main}, | 176 | {"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 @@ | |||
59 | #define BB_REBOOT | 59 | #define BB_REBOOT |
60 | #define BB_RM | 60 | #define BB_RM |
61 | #define BB_RMDIR | 61 | #define BB_RMDIR |
62 | #define BB_RMMOD | ||
62 | //#define BB_SFDISK | 63 | //#define BB_SFDISK |
63 | #define BB_SED | 64 | #define BB_SED |
64 | #define BB_SLEEP | 65 | #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); | |||
104 | extern int ps_main(int argc, char** argv); | 104 | extern int ps_main(int argc, char** argv); |
105 | extern int pwd_main(int argc, char** argv); | 105 | extern int pwd_main(int argc, char** argv); |
106 | extern int reboot_main(int argc, char** argv); | 106 | extern int reboot_main(int argc, char** argv); |
107 | extern int rmdir_main(int argc, char **argv); | ||
108 | extern int rm_main(int argc, char** argv); | 107 | extern int rm_main(int argc, char** argv); |
108 | extern int rmdir_main(int argc, char **argv); | ||
109 | extern int rmmod_main(int argc, char** argv); | ||
109 | extern int scan_partitions_main(int argc, char** argv); | 110 | extern int scan_partitions_main(int argc, char** argv); |
110 | extern int sh_main(int argc, char** argv); | 111 | extern int sh_main(int argc, char** argv); |
111 | extern int sfdisk_main(int argc, char** argv); | 112 | 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 @@ | |||
1 | /* | ||
2 | * Mini rmmod implementation for busybox | ||
3 | * | ||
4 | * Copyright (C) 1999 by Lineo, inc. | ||
5 | * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org> | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License as published by | ||
9 | * the Free Software Foundation; either version 2 of the License, or | ||
10 | * (at your option) any later version. | ||
11 | * | ||
12 | * This program is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
15 | * General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with this program; if not, write to the Free Software | ||
19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
20 | * | ||
21 | */ | ||
22 | |||
23 | #include "internal.h" | ||
24 | #include <stdio.h> | ||
25 | #include <errno.h> | ||
26 | #include <unistd.h> | ||
27 | #include <sys/syscall.h> | ||
28 | |||
29 | |||
30 | |||
31 | /* And the system call of the day is... */ | ||
32 | extern int delete_module (const char * __name); | ||
33 | |||
34 | |||
35 | static const char rmmod_usage[] = | ||
36 | "rmmod [OPTION]... [MODULE]...\n\n" | ||
37 | "Unloads the specified kernel modules from the kernel.\n\n" | ||
38 | "Options:\n" | ||
39 | "\t-a\tTry to remove all unused kernel modules.\n"; | ||
40 | |||
41 | |||
42 | |||
43 | extern int rmmod_main(int argc, char **argv) | ||
44 | { | ||
45 | if (argc<=1) { | ||
46 | usage(rmmod_usage); | ||
47 | } | ||
48 | |||
49 | /* Parse any options */ | ||
50 | while (--argc > 0 && **(++argv) == '-') { | ||
51 | while (*(++(*argv))) { | ||
52 | switch (**argv) { | ||
53 | case 'a': | ||
54 | /* Unload _all_ modules via NULL delete_module() call */ | ||
55 | if (delete_module(NULL)) { | ||
56 | perror("rmmod"); | ||
57 | exit( FALSE); | ||
58 | } | ||
59 | exit( TRUE); | ||
60 | default: | ||
61 | usage(rmmod_usage); | ||
62 | } | ||
63 | } | ||
64 | } | ||
65 | |||
66 | while (argc-- > 0 ) { | ||
67 | if (delete_module(*argv) < 0) { | ||
68 | perror(*argv); | ||
69 | } | ||
70 | argv++; | ||
71 | } | ||
72 | exit( TRUE); | ||
73 | } | ||
diff --git a/rmmod.c b/rmmod.c new file mode 100644 index 000000000..7d3eac51e --- /dev/null +++ b/rmmod.c | |||
@@ -0,0 +1,73 @@ | |||
1 | /* | ||
2 | * Mini rmmod implementation for busybox | ||
3 | * | ||
4 | * Copyright (C) 1999 by Lineo, inc. | ||
5 | * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org> | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License as published by | ||
9 | * the Free Software Foundation; either version 2 of the License, or | ||
10 | * (at your option) any later version. | ||
11 | * | ||
12 | * This program is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
15 | * General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with this program; if not, write to the Free Software | ||
19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
20 | * | ||
21 | */ | ||
22 | |||
23 | #include "internal.h" | ||
24 | #include <stdio.h> | ||
25 | #include <errno.h> | ||
26 | #include <unistd.h> | ||
27 | #include <sys/syscall.h> | ||
28 | |||
29 | |||
30 | |||
31 | /* And the system call of the day is... */ | ||
32 | extern int delete_module (const char * __name); | ||
33 | |||
34 | |||
35 | static const char rmmod_usage[] = | ||
36 | "rmmod [OPTION]... [MODULE]...\n\n" | ||
37 | "Unloads the specified kernel modules from the kernel.\n\n" | ||
38 | "Options:\n" | ||
39 | "\t-a\tTry to remove all unused kernel modules.\n"; | ||
40 | |||
41 | |||
42 | |||
43 | extern int rmmod_main(int argc, char **argv) | ||
44 | { | ||
45 | if (argc<=1) { | ||
46 | usage(rmmod_usage); | ||
47 | } | ||
48 | |||
49 | /* Parse any options */ | ||
50 | while (--argc > 0 && **(++argv) == '-') { | ||
51 | while (*(++(*argv))) { | ||
52 | switch (**argv) { | ||
53 | case 'a': | ||
54 | /* Unload _all_ modules via NULL delete_module() call */ | ||
55 | if (delete_module(NULL)) { | ||
56 | perror("rmmod"); | ||
57 | exit( FALSE); | ||
58 | } | ||
59 | exit( TRUE); | ||
60 | default: | ||
61 | usage(rmmod_usage); | ||
62 | } | ||
63 | } | ||
64 | } | ||
65 | |||
66 | while (argc-- > 0 ) { | ||
67 | if (delete_module(*argv) < 0) { | ||
68 | perror(*argv); | ||
69 | } | ||
70 | argv++; | ||
71 | } | ||
72 | exit( TRUE); | ||
73 | } | ||