emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modutils/*: rewrite by Timo Teras <timo.teras AT iki.fi>

Browse Source 
- a lot faster (linear algorithmic complexity, smaller memory foot print)
- a lot smaller (the old code was overly complicated)
- loading of aliases is now module-init-tools compliant
- blacklisting is done correctly (-b option added)
- module argument quoting done right
- depmod now correctly generates modules.symbols and modules.alias

add/remove: 16/21 grow/shrink: 4/6 up/down: 6930/-9316 Total: -2386 bytes
   text    data     bss     dec     hex filename
 806039     592    6680  813311   c68ff busybox_old
 803498     592    6676  810766   c5f0e busybox_unstripped
This commit is contained in:
Denis Vlasenko
2008-09-13 14:59:38 +00:00
parent 4f3209b9d4
commit ba1315d0fb
12 changed files with 4730 additions and 5777 deletions
Download Patch File Download Diff File Expand all files Collapse all files

87
modutils/rmmod.c
View File

@ -3,98 +3,45 @@
* Mini rmmod implementation for busybox
*
* 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.
*/
#include "libbb.h"
#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;
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);
#include "modutils.h"
int rmmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int rmmod_main(int argc, char **argv)
int rmmod_main(int argc UNUSED_PARAM, char **argv)
{
int n, ret = EXIT_SUCCESS;
int n;
unsigned int flags = O_NONBLOCK|O_EXCL;
#define misc_buf bb_common_bufsiz1
/* Parse command line. */
n = getopt32(argv, "wfa");
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 */
/* 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");
}
}
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]));
}
if (delete_module(ENABLE_FEATURE_2_6_MODULES ? misc_buf : argv[n], flags)) {
bb_simple_perror_msg(argv[n]);
ret = EXIT_FAILURE;
}
while (*argv) {
char modname[MODULE_NAME_LEN];
filename2modname(bb_basename(*argv++), modname);
if (bb_delete_module(modname, flags))
bb_error_msg_and_die("cannot unload '%s': %s",
modname, moderror(errno));
}
return ret;
return EXIT_SUCCESS;
}