diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-06-11 15:25:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-06-11 15:25:44 -0700 |
| commit | 2a2e10fbb38e4f4d7759f619275fa4ebd596259a (patch) | |
| tree | 34caadc0580d50956f376f9a4325db2340a51041 /toolbox | |
| parent | a6f4e65bc430e2481bf8e1aaff4b2743bfb261dd (diff) | |
| parent | 16d2b6ae4050b1232fd164cef1dbade532fe29a4 (diff) | |
| download | system_core-2a2e10fbb38e4f4d7759f619275fa4ebd596259a.zip system_core-2a2e10fbb38e4f4d7759f619275fa4ebd596259a.tar.gz system_core-2a2e10fbb38e4f4d7759f619275fa4ebd596259a.tar.bz2 | |
am 16d2b6ae: am 91e5551f: Merge "toolbox: rmmod: fix module unloading"
* commit '16d2b6ae4050b1232fd164cef1dbade532fe29a4':
toolbox: rmmod: fix module unloading
Diffstat (limited to 'toolbox')
| -rw-r--r-- | toolbox/rmmod.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/toolbox/rmmod.c b/toolbox/rmmod.c index 25257cc..c7e0d6a 100644 --- a/toolbox/rmmod.c +++ b/toolbox/rmmod.c @@ -10,7 +10,7 @@ extern int delete_module(const char *, unsigned int); int rmmod_main(int argc, char **argv) { - int ret; + int ret, i; char *modname, *dot; /* make sure we've got an argument */ @@ -31,6 +31,15 @@ int rmmod_main(int argc, char **argv) if (dot) *dot = '\0'; + /* Replace "-" with "_". This would keep rmmod + * compatible with module-init-tools version of + * rmmod + */ + for (i = 0; modname[i] != '\0'; i++) { + if (modname[i] == '-') + modname[i] = '_'; + } + /* pass it to the kernel */ ret = delete_module(modname, O_NONBLOCK | O_EXCL); if (ret != 0) { |