sed: n cmd must reset "we had successful subst" flag. closes bug 1214.

[oweals/busybox.git] / modutils / rmmod.c

diff --git a/modutils/rmmod.c b/modutils/rmmod.c
index 7bc929de2d1b9930a990376686b4b290ccec5ba2..61cfbd1473ae6bfcd7e488c96d3240667c9f1f2f 100644 (file)
--- a/modutils/rmmod.c
+++ b/modutils/rmmod.c
@@ -4,45 +4,21 @@
  *
  * 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 <string.h>
-#include <sys/utsname.h>
+#include "libbb.h"
 #include <sys/syscall.h>
-#include "busybox.h"
 
-#ifdef CONFIG_FEATURE_2_6_MODULES
+#if ENABLE_FEATURE_2_6_MODULES
 static inline void filename2modname(char *modname, const char *afterslash)
 {
        unsigned int i;
-
-#if ENABLE_FEATURE_2_4_MODULES
        int kr_chk = 1;
-       if (get_kernel_revision() <= 2*65536+6*256)
-               kr_chk = 0;
-#else
-#define kr_chk 1
-#endif
+
+       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++) {
@@ -53,43 +29,49 @@ static inline void filename2modname(char *modname, const char *afterslash)
        }
        modname[i] = '\0';
 }
+#else
+void filename2modname(char *modname, const char *afterslash);
 #endif
 
-extern int rmmod_main(int argc, char **argv)
+// 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;
        unsigned int flags = O_NONBLOCK|O_EXCL;
-#ifdef CONFIG_FEATURE_QUERY_MODULE_INTERFACE
-       /* bb_common_bufsiz1 hold the module names which we ignore 
-          but must get */
-       size_t bufsize = sizeof(bb_common_bufsiz1);
-#endif
+
+#define misc_buf bb_common_bufsiz1
 
        /* Parse command line. */
-       n = bb_getopt_ulflags(argc, argv, "wfa");
-       if((n & 1))     // --wait
+       n = getopt32(argv, "wfa");
+       if (n & 1)      // --wait
                flags &= ~O_NONBLOCK;
-       if((n & 2))     // --force
+       if (n & 2)      // --force
                flags |= O_TRUNC;
-       if((n & 4)) {
+       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);
+                               if (errno == EFAULT)
+                                       return ret;
                                bb_perror_msg_and_die("rmmod");
                        }
                        pnmod = nmod;
-#ifdef CONFIG_FEATURE_QUERY_MODULE_INTERFACE
-                       /* 1 == QM_MODULES */
-                       if (my_query_module(NULL, 1, &bb_common_bufsiz1, &bufsize, &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");
                        }
-#endif
                }
                return EXIT_SUCCESS;
        }
@@ -98,25 +80,15 @@ extern int rmmod_main(int argc, char **argv)
                bb_show_usage();
 
        for (n = optind; n < argc; n++) {
-#ifdef CONFIG_FEATURE_2_6_MODULES
-               const char *afterslash;
-               char *module_name;
-               
-               afterslash = strrchr(argv[n], '/');
-               if (!afterslash)
-                       afterslash = argv[n];
-               else
-                       afterslash++;
-               module_name = alloca(strlen(afterslash) + 1);
-               filename2modname(module_name, afterslash);
-#else
-#define module_name            argv[n]
-#endif
-               if (syscall(__NR_delete_module, module_name, flags) != 0) {
-                       bb_perror_msg("%s", argv[n]);
+               if (ENABLE_FEATURE_2_6_MODULES) {
+                       filename2modname(misc_buf, bb_basename(argv[n]));
+               }
+
+               if (syscall(__NR_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;
 }