Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/modutils/rmmod.c

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/modutils/rmmod.c (modified) (3 diffs)

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

@@ -29 +29 @@
 int rmmod_main(int argc UNUSED_PARAM, char **argv)
 {
-    int n;
+    int n, err;
     unsigned flags = O_NONBLOCK | O_EXCL;
 
@@ -41 +41 @@
     if (n & 4) {
         /* Unload _all_ unused modules via NULL delete_module() call */
-        if (bb_delete_module(NULL, flags) != 0 && errno != EFAULT)
+        err = bb_delete_module(NULL, flags);
+        if (err && err != EFAULT)
             bb_perror_msg_and_die("rmmod");
         return EXIT_SUCCESS;
@@ -59 +60 @@
         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);
     }