X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=modutils%2Frmmod.c;h=4a4a91982c1e4b77b49ab7dd928b21cddfda3104;hb=abc33ac8b24d2d733aba63ae19e2df6e7da16ec8;hp=4a38e35a52b6ab67866218af6d7382cc67177189;hpb=fe7cd642b0b732f5d41403c2f6983ad676b69dd9;p=oweals%2Fbusybox.git

diff --git a/modutils/rmmod.c b/modutils/rmmod.c
index 4a38e35a5..4a4a91982 100644
--- a/modutils/rmmod.c
+++ b/modutils/rmmod.c
@@ -3,92 +3,65 @@
  * Mini rmmod implementation for busybox
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
+ * Copyright (C) 2008 Timo Teras <timo.teras@iki.fi>
  *
- * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
 
-#include "libbb.h"
-#include <sys/syscall.h>
-
-#if ENABLE_FEATURE_2_6_MODULES
-static inline void filename2modname(char *modname, const char *afterslash)
-{
-	unsigned int i;
-	int kr_chk = 1;
-
-	if (ENABLE_FEATURE_2_4_MODULES
-			&& get_linux_version_code() <= KERNEL_VERSION(2,6,0))
-				kr_chk = 0;
-
-	/* Convert to underscores, stop at first . */
-	for (i = 0; afterslash[i] && afterslash[i] != '.'; i++) {
-		if (kr_chk && (afterslash[i] == '-'))
-			modname[i] = '_';
-		else
-			modname[i] = afterslash[i];
-	}
-	modname[i] = '\0';
-}
-#else
-void filename2modname(char *modname, const char *afterslash);
-#endif
+//applet:IF_RMMOD(APPLET(rmmod, BB_DIR_SBIN, BB_SUID_DROP))
 
-// There really should be a header file for this...
+//usage:#if !ENABLE_MODPROBE_SMALL
+//usage:#define rmmod_trivial_usage
+//usage:       "[-wfa] [MODULE]..."
+//usage:#define rmmod_full_usage "\n\n"
+//usage:       "Unload kernel modules\n"
+//usage:     "\n	-w	Wait until the module is no longer used"
+//usage:     "\n	-f	Force unload"
+//usage:     "\n	-a	Remove all unused modules (recursively)"
+//usage:#define rmmod_example_usage
+//usage:       "$ rmmod tulip\n"
+//usage:#endif
 
-int query_module(const char *name, int which, void *buf,
-			size_t bufsize, size_t *ret);
+#include "libbb.h"
+#include "modutils.h"
 
-int rmmod_main(int argc, char **argv);
-int rmmod_main(int argc, char **argv)
+int rmmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int rmmod_main(int argc UNUSED_PARAM, char **argv)
 {
-	int n, ret = EXIT_SUCCESS;
-	unsigned int flags = O_NONBLOCK|O_EXCL;
-
-#define misc_buf bb_common_bufsiz1
+	int n;
+	unsigned flags = O_NONBLOCK | O_EXCL;
 
 	/* Parse command line. */
-	n = getopt32(argv, "wfa");
-	if (n & 1)	// --wait
+	n = getopt32(argv, "wfas"); // -s ignored
+	argv += optind;
+	if (n & 1)  // --wait
 		flags &= ~O_NONBLOCK;
-	if (n & 2)	// --force
+	if (n & 2)  // --force
 		flags |= O_TRUNC;
 	if (n & 4) {
 		/* Unload _all_ unused modules via NULL delete_module() call */
-		/* until the number of modules does not change */
-		size_t nmod = 0; /* number of modules */
-		size_t pnmod = -1; /* previous number of modules */
-
-		while (nmod != pnmod) {
-			if (syscall(__NR_delete_module, NULL, flags) != 0) {
-				if (errno == EFAULT)
-					return ret;
-				bb_perror_msg_and_die("rmmod");
-			}
-			pnmod = nmod;
-			// the 1 here is QM_MODULES.
-			if (ENABLE_FEATURE_QUERY_MODULE_INTERFACE && query_module(NULL,
-					1, misc_buf, sizeof(misc_buf),
-					&nmod))
-			{
-				bb_perror_msg_and_die("QM_MODULES");
-			}
-		}
+		if (bb_delete_module(NULL, flags) != 0 && errno != EFAULT)
+			bb_perror_msg_and_die("rmmod");
 		return EXIT_SUCCESS;
 	}
 
-	if (optind == argc)
+	if (!*argv)
 		bb_show_usage();
 
-	for (n = optind; n < argc; n++) {
-		if (ENABLE_FEATURE_2_6_MODULES) {
-			filename2modname(misc_buf, bb_basename(argv[n]));
-		}
+	n = ENABLE_FEATURE_2_4_MODULES && get_linux_version_code() < KERNEL_VERSION(2,6,0);
+	while (*argv) {
+		char modname[MODULE_NAME_LEN];
+		const char *bname;
 
-		if (syscall(__NR_delete_module, ENABLE_FEATURE_2_6_MODULES ? misc_buf : argv[n], flags)) {
-			bb_perror_msg("%s", argv[n]);
-			ret = EXIT_FAILURE;
-		}
+		bname = bb_basename(*argv++);
+		if (n)
+			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));
 	}
 
-	return ret;
+	return EXIT_SUCCESS;
 }