X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=modutils%2Frmmod.c;h=5129b34958adb0da37bf13849da2a0d84f278f51;hb=b2dc913527f2cb9a4590fe5e553bcc2c456007e0;hp=cc9742c0a0c2576fd78ce0fa63bf4d070892f715;hpb=c7bda1ce659294d6e22c06e087f6f265983c7578;p=oweals%2Fbusybox.git

diff --git a/modutils/rmmod.c b/modutils/rmmod.c
index cc9742c0a..5129b3495 100644
--- a/modutils/rmmod.c
+++ b/modutils/rmmod.c
@@ -4,83 +4,97 @@
  *
  * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-#include <stdio.h>
-#include <errno.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <getopt.h>
-#include <fcntl.h>
-#include <sys/syscall.h>
-#include "busybox.h"
+#include "libbb.h"
 
-extern int delete_module(const char * name);
+#ifdef __UCLIBC__
+extern int delete_module(const char *module, unsigned int flags);
+#else
+# include <sys/syscall.h>
+# define delete_module(mod, flags) syscall(__NR_delete_module, mod, flags)
+#endif
 
+#if ENABLE_FEATURE_2_6_MODULES
+static void filename2modname(char *modname, const char *afterslash)
+{
+	unsigned int i;
+	int kr_chk = 1;
 
-extern int rmmod_main(int argc, char **argv)
+	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
+
+// There really should be a header file for this...
+
+int query_module(const char *name, int which, void *buf,
+			size_t bufsize, size_t *ret);
+
+int rmmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int rmmod_main(int argc, char **argv)
 {
 	int n, ret = EXIT_SUCCESS;
-	size_t nmod = 0; /* number of modules */
-	size_t pnmod = -1; /* previous number of modules */
-	void *buf; /* hold the module names which we ignore but must get */
-	size_t bufsize = 0;
 	unsigned int flags = O_NONBLOCK|O_EXCL;
 
+#define misc_buf bb_common_bufsiz1
+
 	/* Parse command line. */
-	while ((n = getopt(argc, argv, "a")) != EOF) {
-		switch (n) {
-			case 'w':       // --wait
-				flags &= ~O_NONBLOCK;
-				break;
-			case 'f':       // --force
-				flags |= O_TRUNC;
-				break;
-			case 'a':
-				/* Unload _all_ unused modules via NULL delete_module() call */
-				/* until the number of modules does not change */
-				buf = xmalloc(bufsize = 256);
-				while (nmod != pnmod) {
-					if (delete_module(NULL))
-						bb_perror_msg_and_die("rmmod");
-					pnmod = nmod;
-					/* 1 == QM_MODULES */
-					if (my_query_module(NULL, 1, &buf, &bufsize, &nmod)) {
-						bb_perror_msg_and_die("QM_MODULES");
-					}
-				}
-#ifdef CONFIG_FEATURE_CLEAN_UP
-				free(buf);
-#endif
-				return EXIT_SUCCESS;
-			default:
-				bb_show_usage();
+	n = getopt32(argv, "wfa");
+	if (n & 1)	// --wait
+		flags &= ~O_NONBLOCK;
+	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 (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");
+			}
 		}
+		return EXIT_SUCCESS;
 	}
 
 	if (optind == argc)
 		bb_show_usage();
 
 	for (n = optind; n < argc; n++) {
-		if (syscall(__NR_delete_module, argv[n], flags) < 0) {
-			bb_perror_msg("%s", argv[n]);
+		if (ENABLE_FEATURE_2_6_MODULES) {
+			filename2modname(misc_buf, bb_basename(argv[n]));
+		}
+
+		if (delete_module(ENABLE_FEATURE_2_6_MODULES ? misc_buf : argv[n], flags)) {
+			bb_simple_perror_msg(argv[n]);
 			ret = EXIT_FAILURE;
 		}
 	}
 
-	return(ret);
+	return ret;
 }