projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Start 1.33.0 development cycle
[oweals/busybox.git]
/
modutils
/
rmmod.c
diff --git
a/modutils/rmmod.c
b/modutils/rmmod.c
index 4a4a91982c1e4b77b49ab7dd928b21cddfda3104..8d4639f50db78bb26ccf7d0ae748151aa66a88b9 100644
(file)
--- a/
modutils/rmmod.c
+++ b/
modutils/rmmod.c
@@
-7,8
+7,18
@@
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
*
* Licensed under GPLv2 or later, see file LICENSE in this source tree.
*/
+//config:config RMMOD
+//config: bool "rmmod (3.3 kb)"
+//config: default y
+//config: select PLATFORM_LINUX
+//config: help
+//config: rmmod is used to unload specified modules from the kernel.
-//applet:IF_RMMOD(APPLET(rmmod, BB_DIR_SBIN, BB_SUID_DROP))
+//applet:IF_RMMOD(IF_NOT_MODPROBE_SMALL(APPLET_NOEXEC(rmmod, rmmod, BB_DIR_SBIN, BB_SUID_DROP, rmmod)))
+
+//kbuild:ifneq ($(CONFIG_MODPROBE_SMALL),y)
+//kbuild:lib-$(CONFIG_RMMOD) += rmmod.o modutils.o
+//kbuild:endif
//usage:#if !ENABLE_MODPROBE_SMALL
//usage:#define rmmod_trivial_usage
//usage:#if !ENABLE_MODPROBE_SMALL
//usage:#define rmmod_trivial_usage
@@
-28,7
+38,7
@@
int rmmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int rmmod_main(int argc UNUSED_PARAM, char **argv)
{
int rmmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int rmmod_main(int argc UNUSED_PARAM, char **argv)
{
- int n;
+ int n
, err
;
unsigned flags = O_NONBLOCK | O_EXCL;
/* Parse command line. */
unsigned flags = O_NONBLOCK | O_EXCL;
/* Parse command line. */
@@
-40,8
+50,9
@@
int rmmod_main(int argc UNUSED_PARAM, char **argv)
flags |= O_TRUNC;
if (n & 4) {
/* Unload _all_ unused modules via NULL delete_module() call */
flags |= O_TRUNC;
if (n & 4) {
/* Unload _all_ unused modules via NULL delete_module() call */
- if (bb_delete_module(NULL, flags) != 0 && errno != EFAULT)
- bb_perror_msg_and_die("rmmod");
+ err = bb_delete_module(NULL, flags);
+ if (err && err != EFAULT)
+ bb_simple_perror_msg_and_die("rmmod");
return EXIT_SUCCESS;
}
return EXIT_SUCCESS;
}
@@
-58,9
+69,10
@@
int rmmod_main(int argc UNUSED_PARAM, char **argv)
safe_strncpy(modname, bname, MODULE_NAME_LEN);
else
filename2modname(bname, modname);
safe_strncpy(modname, bname, MODULE_NAME_LEN);
else
filename2modname(bname, modname);
- if (bb_delete_module(modname, flags))
- bb_error_msg_and_die("can't unload '%s': %s",
- modname, moderror(errno));
+ err = bb_delete_module(modname, flags);
+ if (err)
+ bb_perror_msg_and_die("can't unload module '%s'",
+ modname);
}
return EXIT_SUCCESS;
}
return EXIT_SUCCESS;