From e49d5ecbbe51718fa925b6890a735e5937cc2aa2 Mon Sep 17 00:00:00 2001 From: Erik Andersen Date: Tue, 8 Feb 2000 19:58:47 +0000 Subject: Some formatting updates (ran the code through indent) -Erik --- modutils/insmod.c | 240 +++++++++++++++++++++++++++--------------------------- modutils/lsmod.c | 6 +- modutils/rmmod.c | 55 +++++++------ 3 files changed, 154 insertions(+), 147 deletions(-) (limited to 'modutils') diff --git a/modutils/insmod.c b/modutils/insmod.c index 31cb11261..7cbbed441 100644 --- a/modutils/insmod.c +++ b/modutils/insmod.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini insmod implementation for busybox * @@ -41,8 +42,7 @@ /* Some firendly syscalls to cheer everyone's day... */ _syscall2(int, init_module, const char *, name, - const struct module *, info) - + const struct module *, info) #ifndef BB_RMMOD _syscall1(int, delete_module, const char *, name) #else @@ -52,155 +52,159 @@ extern int delete_module(const char *); #if defined(__i386__) || defined(__m68k__) || defined(__arm__) /* Jump through hoops to fixup error return codes */ #define __NR__create_module __NR_create_module -static inline _syscall2(long, _create_module, const char *, name, size_t, size) +static inline _syscall2(long, _create_module, const char *, name, size_t, + size) unsigned long create_module(const char *name, size_t size) { - long ret = _create_module(name, size); - if (ret == -1 && errno > 125) { - ret = -errno; - errno = 0; - } - return ret; + long ret = _create_module(name, size); + + if (ret == -1 && errno > 125) { + ret = -errno; + errno = 0; + } + return ret; } #else _syscall2(unsigned long, create_module, const char *, name, size_t, size) #endif - - static char m_filename[PATH_MAX + 1] = "\0"; static char m_fullName[PATH_MAX + 1] = "\0"; static const char insmod_usage[] = - "insmod [OPTION]... MODULE [symbol=value]...\n\n" - "Loads the specified kernel modules into the kernel.\n\n" - "Options:\n" - "\t-f\tForce module to load into the wrong kernel version.\n" - "\t-k\tMake module autoclean-able.\n"; + "insmod [OPTION]... MODULE [symbol=value]...\n\n" + "Loads the specified kernel modules into the kernel.\n\n" + "Options:\n" + + "\t-f\tForce module to load into the wrong kernel version.\n" + "\t-k\tMake module autoclean-able.\n"; -static int findNamedModule(const char *fileName, struct stat* statbuf) +static int findNamedModule(const char *fileName, struct stat *statbuf) { - if (m_fullName[0]=='\0') - return( FALSE); - else { - char* tmp = strrchr( fileName, '/'); - if (tmp == NULL) - tmp = (char*)fileName; - else - tmp++; - if (check_wildcard_match(tmp, m_fullName) == TRUE) { - /* Stop searching if we find a match */ - memcpy(m_filename, fileName, strlen(fileName)); - return( FALSE); + if (m_fullName[0] == '\0') + return (FALSE); + else { + char *tmp = strrchr(fileName, '/'); + + if (tmp == NULL) + tmp = (char *) fileName; + else + tmp++; + if (check_wildcard_match(tmp, m_fullName) == TRUE) { + /* Stop searching if we find a match */ + memcpy(m_filename, fileName, strlen(fileName)); + return (FALSE); + } } - } - return( TRUE); + return (TRUE); } extern int insmod_main(int argc, char **argv) { - int len; - char *tmp; - char m_name[PATH_MAX + 1] ="\0"; - FILE *fp; - - if (argc<=1) { - usage( insmod_usage); - } - - /* Parse any options */ - while (--argc > 0 && **(++argv) == '-') { - while (*(++(*argv))) { - switch (**argv) { - case 'f': - break; - case 'k': - break; - default: + int len; + char *tmp; + char m_name[PATH_MAX + 1] = "\0"; + FILE *fp; + + if (argc <= 1) { usage(insmod_usage); - } } - } - - if (argc <= 0 ) - usage(insmod_usage); - - /* Grab the module name */ - if ((tmp = strrchr(*argv, '/')) != NULL) - tmp++; - else - tmp = *argv; - len = strlen(tmp); - - if (len > 2 && tmp[len - 2] == '.' && tmp[len - 1] == 'o') - len -= 2; - memcpy(m_name, tmp, len); - strcpy(m_fullName, m_name); - strcat(m_fullName, ".o"); - - /* Get a filedesc for the module */ - if ((fp = fopen(*argv, "r")) == NULL) { - /* Hmpf. Could not open it. Search through _PATH_MODULES to find a module named m_name */ - if (recursiveAction(_PATH_MODULES, TRUE, FALSE, FALSE, - findNamedModule, findNamedModule) == FALSE) { - if ( m_filename[0] == '\0' || ((fp = fopen(m_filename, "r")) == NULL)) { - perror("No module by that name found in " _PATH_MODULES "\n"); - exit( FALSE); - } + + /* Parse any options */ + while (--argc > 0 && **(++argv) == '-') { + while (*(++(*argv))) { + switch (**argv) { + case 'f': + break; + case 'k': + break; + default: + usage(insmod_usage); + } + } } - } else - memcpy(m_filename, *argv, strlen(*argv)); + if (argc <= 0) + usage(insmod_usage); - fprintf(stderr, "m_filename='%s'\n", m_filename); - fprintf(stderr, "m_name='%s'\n", m_name); + /* Grab the module name */ + if ((tmp = strrchr(*argv, '/')) != NULL) + tmp++; + else + tmp = *argv; + len = strlen(tmp); + + if (len > 2 && tmp[len - 2] == '.' && tmp[len - 1] == 'o') + len -= 2; + memcpy(m_name, tmp, len); + strcpy(m_fullName, m_name); + strcat(m_fullName, ".o"); + + /* Get a filedesc for the module */ + if ((fp = fopen(*argv, "r")) == NULL) { + /* Hmpf. Could not open it. Search through _PATH_MODULES to find a module named m_name */ + if (recursiveAction(_PATH_MODULES, TRUE, FALSE, FALSE, + findNamedModule, findNamedModule) == FALSE) { + if (m_filename[0] == '\0' + || ((fp = fopen(m_filename, "r")) == NULL)) { + perror("No module by that name found in " _PATH_MODULES + "\n"); + exit(FALSE); + } + } + } else + memcpy(m_filename, *argv, strlen(*argv)); + + + fprintf(stderr, "m_filename='%s'\n", m_filename); + fprintf(stderr, "m_name='%s'\n", m_name); + + + /* TODO: do something roughtly like this... */ +#if 0 + if ((f = obj_load(fp)) == NULL) { + perror("Could not load the module\n"); + exit(FALSE); + } - /* TODO: do something roughtly like this... */ -#if 0 + /* Let the module know about the kernel symbols. */ + add_kernel_symbols(f); - if ((f = obj_load(fp)) == NULL) { - perror("Could not load the module\n"); - exit( FALSE); - } - - /* Let the module know about the kernel symbols. */ - add_kernel_symbols(f); - - if (!create_this_module(f, m_name)) { - perror("Could not create the module\n"); - exit( FALSE); - } - - if (!obj_check_undefineds(f, quiet)) { - perror("Undefined symbols in the module\n"); - exit( FALSE); - } - obj_allocate_commons(f); - - /* Perse the module's arguments */ - while (argc-- >0 && *(argv++) != '\0') { - if (!process_module_arguments(f, argc - optind, argv + optind)) { - perror("Undefined symbols in the module\n"); - exit( FALSE); + if (!create_this_module(f, m_name)) { + perror("Could not create the module\n"); + exit(FALSE); } - } - /* Find current size of the module */ - m_size = obj_load_size(f); + if (!obj_check_undefineds(f, quiet)) { + perror("Undefined symbols in the module\n"); + exit(FALSE); + } + obj_allocate_commons(f); + + /* Perse the module's arguments */ + while (argc-- > 0 && *(argv++) != '\0') { + if (!process_module_arguments(f, argc - optind, argv + optind)) { + perror("Undefined symbols in the module\n"); + exit(FALSE); + } + } + + /* Find current size of the module */ + m_size = obj_load_size(f); - errno = 0; - m_addr = create_module(m_name, m_size); - switch (errno) { - /* yada yada */ + errno = 0; + m_addr = create_module(m_name, m_size); + switch (errno) { + /* yada yada */ default: - perror("create_module: %m"); + perror("create_module: %m"); - } + } #endif - fclose( fp); - exit( TRUE); + fclose(fp); + exit(TRUE); } diff --git a/modutils/lsmod.c b/modutils/lsmod.c index 1696f756e..d9c40eaaf 100644 --- a/modutils/lsmod.c +++ b/modutils/lsmod.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini lsmod implementation for busybox * @@ -30,6 +31,7 @@ extern int lsmod_main(int argc, char **argv) { - char* cmd[] = { "cat", "/proc/modules", "\0" }; - exit(cat_main( 3, cmd)); + char *cmd[] = { "cat", "/proc/modules", "\0" }; + + exit(cat_main(3, cmd)); } diff --git a/modutils/rmmod.c b/modutils/rmmod.c index 6b15b48bb..a0db4ae5c 100644 --- a/modutils/rmmod.c +++ b/modutils/rmmod.c @@ -1,3 +1,4 @@ +/* vi: set sw=4 ts=4: */ /* * Mini rmmod implementation for busybox * @@ -33,41 +34,41 @@ _syscall1(int, delete_module, const char *, name) static const char rmmod_usage[] = - "rmmod [OPTION]... [MODULE]...\n\n" - "Unloads the specified kernel modules from the kernel.\n\n" - "Options:\n" - "\t-a\tTry to remove all unused kernel modules.\n"; + "rmmod [OPTION]... [MODULE]...\n\n" + "Unloads the specified kernel modules from the kernel.\n\n" + + "Options:\n" "\t-a\tTry to remove all unused kernel modules.\n"; extern int rmmod_main(int argc, char **argv) { - if (argc<=1) { - usage(rmmod_usage); - } + if (argc <= 1) { + usage(rmmod_usage); + } - /* Parse any options */ - while (--argc > 0 && **(++argv) == '-') { - while (*(++(*argv))) { - switch (**argv) { - case 'a': - /* Unload _all_ unused modules via NULL delete_module() call */ - if (delete_module(NULL)) { - perror("rmmod"); - exit( FALSE); + /* Parse any options */ + while (--argc > 0 && **(++argv) == '-') { + while (*(++(*argv))) { + switch (**argv) { + case 'a': + /* Unload _all_ unused modules via NULL delete_module() call */ + if (delete_module(NULL)) { + perror("rmmod"); + exit(FALSE); + } + exit(TRUE); + default: + usage(rmmod_usage); + } } - exit( TRUE); - default: - usage(rmmod_usage); - } } - } - while (argc-- > 0 ) { - if (delete_module(*argv) < 0) { - perror(*argv); + while (argc-- > 0) { + if (delete_module(*argv) < 0) { + perror(*argv); + } + argv++; } - argv++; - } - exit( TRUE); + exit(TRUE); } -- cgit v1.2.3