From 4aca87515a5083ae0e31ce3177189fd43b6d05ac Mon Sep 17 00:00:00 2001 From: Andreas Baumann Date: Sat, 3 Jan 2015 13:58:15 +0100 Subject: patch to Vanilla Tomato 1.28 --- release/src/router/busybox/modutils/rmmod.c | 98 +++++++++++------------------ 1 file changed, 37 insertions(+), 61 deletions(-) (limited to 'release/src/router/busybox/modutils/rmmod.c') diff --git a/release/src/router/busybox/modutils/rmmod.c b/release/src/router/busybox/modutils/rmmod.c index a4ea7041..ee32dfde 100644 --- a/release/src/router/busybox/modutils/rmmod.c +++ b/release/src/router/busybox/modutils/rmmod.c @@ -2,76 +2,52 @@ /* * Mini rmmod implementation for busybox * - * Copyright (C) 1999-2003 by Erik Andersen - * - * 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 + * Copyright (C) 1999-2004 by Erik Andersen + * Copyright (C) 2008 Timo Teras * + * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. */ -#include -#include -#include -#include -#include -#include "busybox.h" +#include "libbb.h" +#include "modutils.h" -extern int delete_module(const char * name); - - -extern 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; - 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; + int n; + unsigned flags = O_NONBLOCK | O_EXCL; /* Parse command line. */ - while ((n = getopt(argc, argv, "a")) != EOF) { - switch (n) { - 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, "wfas"); // -s ignored + argv += optind; + 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 */ + if (bb_delete_module(NULL, flags) != 0 && errno != EFAULT) + bb_perror_msg_and_die("rmmod"); + return EXIT_SUCCESS; } - if (optind == argc) - bb_show_usage(); - - for (n = optind; n < argc; n++) { - if (delete_module(argv[n]) < 0) { - bb_perror_msg("%s", argv[n]); - ret = EXIT_FAILURE; - } + if (!*argv) + bb_show_usage(); + + 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; + + 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; } -- cgit v1.2.3-54-g00ecf