Changeset 2725 in MondoRescue for branches/2.2.9/mindi-busybox/modutils/rmmod.c

Timestamp:

Feb 25, 2011, 9:26:54 PM (13 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.18.3 to avoid problems with the tar command which is now failing on recent versions with busybox 1.7.3

File:

• branches/2.2.9/mindi-busybox/modutils/rmmod.c (modified) (1 diff)

branches/2.2.9/mindi-busybox/modutils/rmmod.c

@@ -4 +4 @@
  *
  * 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.
  */
 
+//applet:IF_RMMOD(APPLET(rmmod, _BB_DIR_SBIN, _BB_SUID_DROP))
+
+//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:     "\nOptions:"
+//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
+
 #include "libbb.h"
-#include <sys/syscall.h>
+#include "modutils.h"
 
-#if ENABLE_FEATURE_2_6_MODULES
-static inline void filename2modname(char *modname, const char *afterslash)
+int rmmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int rmmod_main(int argc UNUSED_PARAM, char **argv)
 {
-    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
-
-// 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);
-int rmmod_main(int argc, 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;
 }