mirror of
https://github.com/sheumann/hush.git
synced 2024-09-12 00:55:11 +00:00
use libbb/get_kernel_revision(), reduce stack usage, add loses -w -f option for getopt, convert to bb_getopt_ulflags(), reduce memory usage - xmalloc to bb_common_bufsiz1, size reduce over 200 bytes
This commit is contained in:
parent
52219874fe
commit
8c44f0179d
108
modutils/rmmod.c
108
modutils/rmmod.c
@ -32,28 +32,20 @@
|
|||||||
#include "busybox.h"
|
#include "busybox.h"
|
||||||
|
|
||||||
#ifdef CONFIG_FEATURE_2_6_MODULES
|
#ifdef CONFIG_FEATURE_2_6_MODULES
|
||||||
static inline void filename2modname(char *modname, const char *filename)
|
static inline void filename2modname(char *modname, const char *afterslash)
|
||||||
{
|
{
|
||||||
const char *afterslash;
|
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
|
|
||||||
afterslash = strrchr(filename, '/');
|
#if ENABLE_FEATURE_2_4_MODULES
|
||||||
if (!afterslash)
|
int kr_chk = 1;
|
||||||
afterslash = filename;
|
if (get_kernel_revision() <= 2*65536+6*256)
|
||||||
else
|
kr_chk = 0;
|
||||||
afterslash++;
|
#else
|
||||||
|
#define kr_chk 1
|
||||||
|
#endif
|
||||||
|
|
||||||
/* Convert to underscores, stop at first . */
|
/* Convert to underscores, stop at first . */
|
||||||
for (i = 0; afterslash[i] && afterslash[i] != '.'; i++) {
|
for (i = 0; afterslash[i] && afterslash[i] != '.'; i++) {
|
||||||
int kr_chk = 1;
|
|
||||||
|
|
||||||
if (ENABLE_FEATURE_2_4_MODULES) {
|
|
||||||
struct utsname uname_info;
|
|
||||||
if (uname(&uname_info) == -1)
|
|
||||||
bb_error_msg_and_die("cannot get uname data");
|
|
||||||
if (strcmp(uname_info.release, "2.6") < 0)
|
|
||||||
kr_chk = 0;
|
|
||||||
}
|
|
||||||
if (kr_chk && (afterslash[i] == '-'))
|
if (kr_chk && (afterslash[i] == '-'))
|
||||||
modname[i] = '_';
|
modname[i] = '_';
|
||||||
else
|
else
|
||||||
@ -66,67 +58,63 @@ static inline void filename2modname(char *modname, const char *filename)
|
|||||||
extern int rmmod_main(int argc, char **argv)
|
extern int rmmod_main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
int n, ret = EXIT_SUCCESS;
|
int n, ret = EXIT_SUCCESS;
|
||||||
size_t nmod = 0; /* number of modules */
|
|
||||||
size_t pnmod = -1; /* previous number of modules */
|
|
||||||
unsigned int flags = O_NONBLOCK|O_EXCL;
|
unsigned int flags = O_NONBLOCK|O_EXCL;
|
||||||
#ifdef CONFIG_FEATURE_QUERY_MODULE_INTERFACE
|
#ifdef CONFIG_FEATURE_QUERY_MODULE_INTERFACE
|
||||||
void *buf; /* hold the module names which we ignore but must get */
|
/* bb_common_bufsiz1 hold the module names which we ignore
|
||||||
size_t bufsize = 0;
|
but must get */
|
||||||
|
size_t bufsize = sizeof(bb_common_bufsiz1);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Parse command line. */
|
/* Parse command line. */
|
||||||
while ((n = getopt(argc, argv, "a")) != EOF) {
|
n = bb_getopt_ulflags(argc, argv, "wfa");
|
||||||
switch (n) {
|
if((n & 1)) // --wait
|
||||||
case 'w': // --wait
|
flags &= ~O_NONBLOCK;
|
||||||
flags &= ~O_NONBLOCK;
|
if((n & 2)) // --force
|
||||||
break;
|
flags |= O_TRUNC;
|
||||||
case 'f': // --force
|
if((n & 4)) {
|
||||||
flags |= O_TRUNC;
|
/* Unload _all_ unused modules via NULL delete_module() call */
|
||||||
break;
|
/* until the number of modules does not change */
|
||||||
case 'a':
|
size_t nmod = 0; /* number of modules */
|
||||||
/* Unload _all_ unused modules via NULL delete_module() call */
|
size_t pnmod = -1; /* previous number of modules */
|
||||||
/* until the number of modules does not change */
|
|
||||||
|
while (nmod != pnmod) {
|
||||||
|
if (syscall(__NR_delete_module, NULL, flags) < 0) {
|
||||||
|
if (errno==EFAULT)
|
||||||
|
return(ret);
|
||||||
|
bb_perror_msg_and_die("rmmod");
|
||||||
|
}
|
||||||
|
pnmod = nmod;
|
||||||
#ifdef CONFIG_FEATURE_QUERY_MODULE_INTERFACE
|
#ifdef CONFIG_FEATURE_QUERY_MODULE_INTERFACE
|
||||||
buf = xmalloc(bufsize = 256);
|
/* 1 == QM_MODULES */
|
||||||
|
if (my_query_module(NULL, 1, &bb_common_bufsiz1, &bufsize, &nmod)) {
|
||||||
|
bb_perror_msg_and_die("QM_MODULES");
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
while (nmod != pnmod) {
|
|
||||||
if (syscall(__NR_delete_module, NULL, flags) < 0) {
|
|
||||||
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, &buf, &bufsize, &nmod)) {
|
|
||||||
bb_perror_msg_and_die("QM_MODULES");
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
#if defined CONFIG_FEATURE_CLEAN_UP && CONFIG_FEATURE_QUERY_MODULE_INTERFACE
|
|
||||||
free(buf);
|
|
||||||
#endif
|
|
||||||
return EXIT_SUCCESS;
|
|
||||||
default:
|
|
||||||
bb_show_usage();
|
|
||||||
}
|
}
|
||||||
|
return EXIT_SUCCESS;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (optind == argc)
|
if (optind == argc)
|
||||||
bb_show_usage();
|
bb_show_usage();
|
||||||
|
|
||||||
{
|
for (n = optind; n < argc; n++) {
|
||||||
for (n = optind; n < argc; n++) {
|
|
||||||
#ifdef CONFIG_FEATURE_2_6_MODULES
|
#ifdef CONFIG_FEATURE_2_6_MODULES
|
||||||
char module_name[strlen(argv[n]) + 1];
|
const char *afterslash;
|
||||||
filename2modname(module_name, argv[n]);
|
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
|
#else
|
||||||
#define module_name argv[n]
|
#define module_name argv[n]
|
||||||
#endif
|
#endif
|
||||||
if (syscall(__NR_delete_module, module_name, flags) < 0) {
|
if (syscall(__NR_delete_module, module_name, flags) < 0) {
|
||||||
bb_perror_msg("%s", argv[n]);
|
bb_perror_msg("%s", argv[n]);
|
||||||
ret = EXIT_FAILURE;
|
ret = EXIT_FAILURE;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user