diff options
| author | Erik Andersen <andersen@codepoet.org> | 1999-12-17 01:08:27 +0000 |
|---|---|---|
| committer | Erik Andersen <andersen@codepoet.org> | 1999-12-17 01:08:27 +0000 |
| commit | 6da0ae8183a31d4faab745d534a363c7e66ef864 (patch) | |
| tree | ace76c8f54a854d9e24d303e4fbe4564425b233b | |
| parent | c144e330c0342a8ed0c9d917fd5a064317652c8a (diff) | |
| download | busybox-w32-6da0ae8183a31d4faab745d534a363c7e66ef864.tar.gz busybox-w32-6da0ae8183a31d4faab745d534a363c7e66ef864.tar.bz2 busybox-w32-6da0ae8183a31d4faab745d534a363c7e66ef864.zip | |
Minor fixes to rmmod. First pass at insmod (not yet working).
-Erik
| -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 | 1 | ||||
| -rw-r--r-- | modutils/rmmod.c | 2 | ||||
| -rw-r--r-- | rmmod.c | 2 |
6 files changed, 10 insertions, 2 deletions
diff --git a/applets/busybox.c b/applets/busybox.c index a9cd6e079..895accd93 100644 --- a/applets/busybox.c +++ b/applets/busybox.c | |||
| @@ -87,6 +87,9 @@ static const struct Applet applets[] = { | |||
| 87 | #ifdef BB_INIT //sbin | 87 | #ifdef BB_INIT //sbin |
| 88 | {"init", init_main}, | 88 | {"init", init_main}, |
| 89 | #endif | 89 | #endif |
| 90 | #ifdef BB_INSMOD //sbin | ||
| 91 | {"insmod", insmod_main}, | ||
| 92 | #endif | ||
| 90 | #ifdef BB_FEATURE_LINUXRC // | 93 | #ifdef BB_FEATURE_LINUXRC // |
| 91 | {"linuxrc", init_main}, | 94 | {"linuxrc", init_main}, |
| 92 | #endif | 95 | #endif |
| @@ -87,6 +87,9 @@ static const struct Applet applets[] = { | |||
| 87 | #ifdef BB_INIT //sbin | 87 | #ifdef BB_INIT //sbin |
| 88 | {"init", init_main}, | 88 | {"init", init_main}, |
| 89 | #endif | 89 | #endif |
| 90 | #ifdef BB_INSMOD //sbin | ||
| 91 | {"insmod", insmod_main}, | ||
| 92 | #endif | ||
| 90 | #ifdef BB_FEATURE_LINUXRC // | 93 | #ifdef BB_FEATURE_LINUXRC // |
| 91 | {"linuxrc", init_main}, | 94 | {"linuxrc", init_main}, |
| 92 | #endif | 95 | #endif |
diff --git a/busybox.def.h b/busybox.def.h index a86550e3b..0655d3ec7 100644 --- a/busybox.def.h +++ b/busybox.def.h | |||
| @@ -28,6 +28,7 @@ | |||
| 28 | #define BB_HEAD | 28 | #define BB_HEAD |
| 29 | #define BB_HOSTNAME | 29 | #define BB_HOSTNAME |
| 30 | #define BB_INIT | 30 | #define BB_INIT |
| 31 | #define BB_INSMOD | ||
| 31 | #define BB_KILL | 32 | #define BB_KILL |
| 32 | #define BB_KLOGD | 33 | #define BB_KLOGD |
| 33 | //#define BB_LENGTH | 34 | //#define BB_LENGTH |
diff --git a/internal.h b/internal.h index 9b51edcd2..6bb9341ef 100644 --- a/internal.h +++ b/internal.h | |||
| @@ -79,6 +79,7 @@ extern int halt_main(int argc, char** argv); | |||
| 79 | extern int head_main(int argc, char** argv); | 79 | extern int head_main(int argc, char** argv); |
| 80 | extern int hostname_main(int argc, char** argv); | 80 | extern int hostname_main(int argc, char** argv); |
| 81 | extern int init_main(int argc, char** argv); | 81 | extern int init_main(int argc, char** argv); |
| 82 | extern int insmod_main(int argc, char** argv); | ||
| 82 | extern int kill_main(int argc, char** argv); | 83 | extern int kill_main(int argc, char** argv); |
| 83 | extern int length_main(int argc, char** argv); | 84 | extern int length_main(int argc, char** argv); |
| 84 | extern int ln_main(int argc, char** argv); | 85 | extern int ln_main(int argc, char** argv); |
diff --git a/modutils/rmmod.c b/modutils/rmmod.c index 650a5b04f..6b15b48bb 100644 --- a/modutils/rmmod.c +++ b/modutils/rmmod.c | |||
| @@ -29,7 +29,7 @@ | |||
| 29 | 29 | ||
| 30 | 30 | ||
| 31 | /* And the system call of the day is... */ | 31 | /* And the system call of the day is... */ |
| 32 | extern int delete_module (const char * __name); | 32 | _syscall1(int, delete_module, const char *, name) |
| 33 | 33 | ||
| 34 | 34 | ||
| 35 | static const char rmmod_usage[] = | 35 | static const char rmmod_usage[] = |
| @@ -29,7 +29,7 @@ | |||
| 29 | 29 | ||
| 30 | 30 | ||
| 31 | /* And the system call of the day is... */ | 31 | /* And the system call of the day is... */ |
| 32 | extern int delete_module (const char * __name); | 32 | _syscall1(int, delete_module, const char *, name) |
| 33 | 33 | ||
| 34 | 34 | ||
| 35 | static const char rmmod_usage[] = | 35 | static const char rmmod_usage[] = |