BusyBox
/
busybox
mirror of https://github.com/mirror/busybox.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

modprobe: reformat to match bbox style

1_4_stable
Denis Vlasenko 2006-10-27 15:12:50 +00:00
parent 82f9e28513
commit cf70433173
2 changed files with 293 additions and 296 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libbb/kernel_version.c
View File

@ -7,9 +7,6 @@
* Licensed under GPLv2 or later, see file LICENSE in this tarball for details. * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*/ */
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <sys/utsname.h> /* for uname(2) */ #include <sys/utsname.h> /* for uname(2) */
#include "libbb.h" #include "libbb.h"
@ -27,12 +24,12 @@ int get_linux_version_code(void)
if (uname(&name) == -1) { if (uname(&name) == -1) {
bb_perror_msg("cannot get system information"); bb_perror_msg("cannot get system information");
return (0); return 0;
} }
s = name.release; s = name.release;
r = 0; r = 0;
for (i=0 ; i<3 ; i++) { for (i = 0; i < 3; i++) {
r = r * 256 + atoi(strtok(s, ".")); r = r * 256 + atoi(strtok(s, "."));
s = NULL; s = NULL;
} }

466
modutils/modprobe.c
View File

@ -72,17 +72,17 @@ static struct dep_t *depend;
static int main_opts; static int main_opts;
static int parse_tag_value ( char *buffer, char **ptag, char **pvalue ) static int parse_tag_value(char *buffer, char **ptag, char **pvalue)
{ {
char *tag, *value; char *tag, *value;
buffer = skip_whitespace ( buffer ); buffer = skip_whitespace(buffer);
tag = value = buffer; tag = value = buffer;
while ( !isspace ( *value )) while (!isspace(*value))
if (!*value) return 0; if (!*value) return 0;
else value++; else value++;
*value++ = 0; *value++ = 0;
value = skip_whitespace ( value ); value = skip_whitespace(value);
if (!*value) return 0; if (!*value) return 0;
*ptag = tag; *ptag = tag;
@ -94,28 +94,28 @@ static int parse_tag_value ( char *buffer, char **ptag, char **pvalue )
/* /*
* This function appends an option to a list * This function appends an option to a list
*/ */
static struct mod_opt_t *append_option( struct mod_opt_t *opt_list, char *opt ) static struct mod_opt_t *append_option(struct mod_opt_t *opt_list, char *opt)
{ {
struct mod_opt_t *ol = opt_list; struct mod_opt_t *ol = opt_list;
if( ol ) { if (ol) {
while( ol-> m_next ) { while (ol->m_next) {
ol = ol-> m_next; ol = ol->m_next;
} }
ol-> m_next = xmalloc( sizeof( struct mod_opt_t ) ); ol->m_next = xmalloc(sizeof(struct mod_opt_t));
ol = ol-> m_next; ol = ol->m_next;
} else { } else {
ol = opt_list = xmalloc( sizeof( struct mod_opt_t ) ); ol = opt_list = xmalloc(sizeof(struct mod_opt_t));
} }
ol-> m_opt_val = xstrdup( opt ); ol->m_opt_val = xstrdup(opt);
ol-> m_next = NULL; ol->m_next = NULL;
return opt_list; return opt_list;
} }
#if ENABLE_FEATURE_MODPROBE_MULTIPLE_OPTIONS #if ENABLE_FEATURE_MODPROBE_MULTIPLE_OPTIONS
/* static char* parse_command_string( char* src, char **dst ); /* static char* parse_command_string(char* src, char **dst);
* src: pointer to string containing argument * src: pointer to string containing argument
* dst: pointer to where to store the parsed argument * dst: pointer to where to store the parsed argument
* return value: the pointer to the first char after the parsed argument, * return value: the pointer to the first char after the parsed argument,
@ -126,37 +126,37 @@ static struct mod_opt_t *append_option( struct mod_opt_t *opt_list, char *opt )
#define ARG_EMPTY 0x00 #define ARG_EMPTY 0x00
#define ARG_IN_DQUOTES 0x01 #define ARG_IN_DQUOTES 0x01
#define ARG_IN_SQUOTES 0x02 #define ARG_IN_SQUOTES 0x02
static char *parse_command_string( char *src, char **dst ) static char *parse_command_string(char *src, char **dst)
{ {
int opt_status = ARG_EMPTY; int opt_status = ARG_EMPTY;
char* tmp_str; char* tmp_str;
/* Dumb you, I have nothing to do... */ /* Dumb you, I have nothing to do... */
if( src == NULL ) return src; if (src == NULL) return src;
/* Skip leading spaces */ /* Skip leading spaces */
while( *src == ' ' ) { while (*src == ' ') {
src++; src++;
} }
/* Is the end of string reached? */ /* Is the end of string reached? */
if( *src == '\0' ) { if (*src == '\0') {
return NULL; return NULL;
} }
/* Reached the start of an argument /* Reached the start of an argument
* By the way, we duplicate a little too much * By the way, we duplicate a little too much
* here but what is too much is freed later. */ * here but what is too much is freed later. */
*dst = tmp_str = xstrdup( src ); *dst = tmp_str = xstrdup(src);
/* Get to the end of that argument */ /* Get to the end of that argument */
while( ( *tmp_str != '\0' ) while (*tmp_str != '\0'
&& ( ( *tmp_str != ' ' ) && (*tmp_str != ' ' || (opt_status & (ARG_IN_DQUOTES | ARG_IN_SQUOTES)))
|| ( opt_status & ( ARG_IN_DQUOTES | ARG_IN_SQUOTES ) ) ) ) { ) {
switch( *tmp_str ) { switch (*tmp_str) {
case '\'': case '\'':
if( opt_status & ARG_IN_DQUOTES ) { if (opt_status & ARG_IN_DQUOTES) {
/* Already in double quotes, keep current char as is */ /* Already in double quotes, keep current char as is */
} else { } else {
/* shift left 1 char, until end of string: get rid of the opening/closing quotes */ /* shift left 1 char, until end of string: get rid of the opening/closing quotes */
memmove( tmp_str, tmp_str + 1, strlen( tmp_str ) ); memmove(tmp_str, tmp_str + 1, strlen(tmp_str));
/* mark me: we enter or leave single quotes */ /* mark me: we enter or leave single quotes */
opt_status ^= ARG_IN_SQUOTES; opt_status ^= ARG_IN_SQUOTES;
/* Back one char, as we need to re-scan the new char there. */ /* Back one char, as we need to re-scan the new char there. */
@ -164,11 +164,11 @@ static char *parse_command_string( char *src, char **dst )
} }
break; break;
case '"': case '"':
if( opt_status & ARG_IN_SQUOTES ) { if (opt_status & ARG_IN_SQUOTES) {
/* Already in single quotes, keep current char as is */ /* Already in single quotes, keep current char as is */
} else { } else {
/* shift left 1 char, until end of string: get rid of the opening/closing quotes */ /* shift left 1 char, until end of string: get rid of the opening/closing quotes */
memmove( tmp_str, tmp_str + 1, strlen( tmp_str ) ); memmove(tmp_str, tmp_str + 1, strlen(tmp_str));
/* mark me: we enter or leave double quotes */ /* mark me: we enter or leave double quotes */
opt_status ^= ARG_IN_DQUOTES; opt_status ^= ARG_IN_DQUOTES;
/* Back one char, as we need to re-scan the new char there. */ /* Back one char, as we need to re-scan the new char there. */
@ -176,10 +176,10 @@ static char *parse_command_string( char *src, char **dst )
} }
break; break;
case '\\': case '\\':
if( opt_status & ARG_IN_SQUOTES ) { if (opt_status & ARG_IN_SQUOTES) {
/* Between single quotes: keep as is. */ /* Between single quotes: keep as is. */
} else { } else {
switch( *(tmp_str+1) ) { switch (*(tmp_str+1)) {
case 'a': case 'a':
case 'b': case 'b':
case 't': case 't':
@ -196,7 +196,7 @@ static char *parse_command_string( char *src, char **dst )
/* We escaped a space or a single or double quote, /* We escaped a space or a single or double quote,
* or a back-slash, or a non-escapable char. Remove * or a back-slash, or a non-escapable char. Remove
* the '\' and keep the new current char as is. */ * the '\' and keep the new current char as is. */
memmove( tmp_str, tmp_str + 1, strlen( tmp_str ) ); memmove(tmp_str, tmp_str + 1, strlen(tmp_str));
break; break;
} }
} }
@ -215,11 +215,11 @@ static char *parse_command_string( char *src, char **dst )
src++; /* Go to next char to find the end of the argument. */ src++; /* Go to next char to find the end of the argument. */
} }
/* End of string, but still no ending quote */ /* End of string, but still no ending quote */
if( opt_status & ( ARG_IN_DQUOTES | ARG_IN_SQUOTES ) ) { if (opt_status & (ARG_IN_DQUOTES | ARG_IN_SQUOTES)) {
bb_error_msg_and_die( "unterminated (single or double) quote in options list: %s", src ); bb_error_msg_and_die("unterminated (single or double) quote in options list: %s", src);
} }
*tmp_str++ = '\0'; *tmp_str++ = '\0';
*dst = xrealloc( *dst, (tmp_str - *dst ) ); *dst = xrealloc(*dst, (tmp_str - *dst));
return src; return src;
} }
#else #else
@ -230,90 +230,90 @@ static char *parse_command_string( char *src, char **dst )
* This function reads aliases and default module options from a configuration file * This function reads aliases and default module options from a configuration file
* (/etc/modprobe.conf syntax). It supports includes (only files, no directories). * (/etc/modprobe.conf syntax). It supports includes (only files, no directories).
*/ */
static void include_conf ( struct dep_t **first, struct dep_t **current, char *buffer, int buflen, int fd ) static void include_conf(struct dep_t **first, struct dep_t **current, char *buffer, int buflen, int fd)
{ {
int continuation_line = 0; int continuation_line = 0;
// alias parsing is not 100% correct (no correct handling of continuation lines within an alias) ! // alias parsing is not 100% correct (no correct handling of continuation lines within an alias) !
while ( reads ( fd, buffer, buflen)) { while (reads(fd, buffer, buflen)) {
int l; int l;
char *p; char *p;
p = strchr ( buffer, '#' ); p = strchr(buffer, '#');
if ( p ) if (p)
*p = 0; *p = 0;
l = strlen ( buffer ); l = strlen(buffer);
while ( l && isspace ( buffer [l-1] )) { while (l && isspace(buffer[l-1])) {
buffer [l-1] = 0; buffer[l-1] = 0;
l--; l--;
} }
if ( l == 0 ) { if (l == 0) {
continuation_line = 0; continuation_line = 0;
continue; continue;
} }
if ( !continuation_line ) { if (!continuation_line) {
if (( strncmp ( buffer, "alias", 5 ) == 0 ) && isspace ( buffer [5] )) { if ((strncmp(buffer, "alias", 5) == 0) && isspace(buffer[5])) {
char *alias, *mod; char *alias, *mod;
if ( parse_tag_value ( buffer + 6, &alias, &mod )) { if (parse_tag_value(buffer + 6, &alias, &mod)) {
/* handle alias as a module dependent on the aliased module */ /* handle alias as a module dependent on the aliased module */
if ( !*current ) { if (!*current) {
(*first) = (*current) = (struct dep_t *) xzalloc (sizeof ( struct dep_t )); (*first) = (*current) = xzalloc(sizeof(struct dep_t));
} }
else { else {
(*current)-> m_next = (struct dep_t *) xzalloc (sizeof ( struct dep_t )); (*current)->m_next = xzalloc(sizeof(struct dep_t));
(*current) = (*current)-> m_next; (*current) = (*current)->m_next;
} }
(*current)-> m_name = xstrdup ( alias ); (*current)->m_name = xstrdup(alias);
(*current)-> m_isalias = 1; (*current)->m_isalias = 1;
if (( strcmp ( mod, "off" ) == 0 ) || ( strcmp ( mod, "null" ) == 0 )) { if ((strcmp(mod, "off") == 0) || (strcmp(mod, "null") == 0)) {
(*current)-> m_depcnt = 0; (*current)->m_depcnt = 0;
(*current)-> m_deparr = 0; (*current)->m_deparr = 0;
} }
else { else {
(*current)-> m_depcnt = 1; (*current)->m_depcnt = 1;
(*current)-> m_deparr = xmalloc ( 1 * sizeof( char * )); (*current)->m_deparr = xmalloc(1 * sizeof(char *));
(*current)-> m_deparr[0] = xstrdup ( mod ); (*current)->m_deparr[0] = xstrdup(mod);
} }
(*current)-> m_next = 0; (*current)->m_next = 0;
} }
} }
else if (( strncmp ( buffer, "options", 7 ) == 0 ) && isspace ( buffer [7] )) { else if ((strncmp(buffer, "options", 7) == 0) && isspace(buffer[7])) {
char *mod, *opt; char *mod, *opt;
/* split the line in the module/alias name, and options */ /* split the line in the module/alias name, and options */
if ( parse_tag_value ( buffer + 8, &mod, &opt )) { if (parse_tag_value(buffer + 8, &mod, &opt)) {
struct dep_t *dt; struct dep_t *dt;
/* find the corresponding module */ /* find the corresponding module */
for ( dt = *first; dt; dt = dt-> m_next ) { for (dt = *first; dt; dt = dt->m_next) {
if ( strcmp ( dt-> m_name, mod ) == 0 ) if (strcmp(dt->m_name, mod) == 0)
break; break;
} }
if ( dt ) { if (dt) {
if ( ENABLE_FEATURE_MODPROBE_MULTIPLE_OPTIONS ) { if (ENABLE_FEATURE_MODPROBE_MULTIPLE_OPTIONS) {
char* new_opt = NULL; char* new_opt = NULL;
while( ( opt = parse_command_string( opt, &new_opt ) ) ) { while ((opt = parse_command_string(opt, &new_opt))) {
dt-> m_options = append_option( dt-> m_options, new_opt ); dt->m_options = append_option(dt->m_options, new_opt);
} }
} else { } else {
dt-> m_options = append_option( dt-> m_options, opt ); dt->m_options = append_option(dt->m_options, opt);
} }
} }
} }
} }
else if (( strncmp ( buffer, "include", 7 ) == 0 ) && isspace ( buffer [7] )) { else if ((strncmp(buffer, "include", 7) == 0) && isspace(buffer[7])) {
int fdi; char *filename; int fdi; char *filename;
filename = skip_whitespace ( buffer + 8 ); filename = skip_whitespace(buffer + 8);
if (( fdi = open ( filename, O_RDONLY )) >= 0 ) { if ((fdi = open(filename, O_RDONLY)) >= 0) {
include_conf(first, current, buffer, buflen, fdi); include_conf(first, current, buffer, buflen, fdi);
close(fdi); close(fdi);
} }
@ -327,7 +327,7 @@ static void include_conf ( struct dep_t **first, struct dep_t **current, char *b
* It then fills every modules and aliases with their default options, found by parsing * It then fills every modules and aliases with their default options, found by parsing
* modprobe.conf (or modules.conf, or conf.modules). * modprobe.conf (or modules.conf, or conf.modules).
*/ */
static struct dep_t *build_dep ( void ) static struct dep_t *build_dep(void)
{ {
int fd; int fd;
struct utsname un; struct utsname un;
@ -338,46 +338,47 @@ static struct dep_t *build_dep ( void )
int continuation_line = 0; int continuation_line = 0;
int k_version; int k_version;
k_version = 0; if (uname(&un))
if ( uname ( &un ))
bb_error_msg_and_die("can't determine kernel version"); bb_error_msg_and_die("can't determine kernel version");
k_version = 0;
if (un.release[0] == '2') { if (un.release[0] == '2') {
k_version = un.release[2] - '0'; k_version = un.release[2] - '0';
} }
filename = xasprintf("/lib/modules/%s/modules.dep", un.release ); filename = xasprintf("/lib/modules/%s/modules.dep", un.release);
fd = open ( filename, O_RDONLY ); fd = open(filename, O_RDONLY);
if (ENABLE_FEATURE_CLEAN_UP) if (ENABLE_FEATURE_CLEAN_UP)
free(filename); free(filename);
if (fd < 0) { if (fd < 0) {
/* Ok, that didn't work. Fall back to looking in /lib/modules */ /* Ok, that didn't work. Fall back to looking in /lib/modules */
if (( fd = open ( "/lib/modules/modules.dep", O_RDONLY )) < 0 ) { fd = open("/lib/modules/modules.dep", O_RDONLY);
if (fd < 0) {
return 0; return 0;
} }
} }
while ( reads ( fd, buffer, sizeof( buffer ))) { while (reads(fd, buffer, sizeof(buffer))) {
int l = strlen ( buffer ); int l = strlen(buffer);
char *p = 0; char *p = 0;
while ( l > 0 && isspace ( buffer [l-1] )) { while (l > 0 && isspace(buffer[l-1])) {
buffer [l-1] = 0; buffer[l-1] = 0;
l--; l--;
} }
if ( l == 0 ) { if (l == 0) {
continuation_line = 0; continuation_line = 0;
continue; continue;
} }
/* Is this a new module dep description? */ /* Is this a new module dep description? */
if ( !continuation_line ) { if (!continuation_line) {
/* find the dep beginning */ /* find the dep beginning */
char *col = strchr ( buffer, ':' ); char *col = strchr(buffer, ':');
char *dot = col; char *dot = col;
if ( col ) { if (col) {
/* This line is a dep description */ /* This line is a dep description */
char *mods; char *mods;
char *modpath; char *modpath;
@ -385,43 +386,43 @@ static struct dep_t *build_dep ( void )
/* Find the beginning of the module file name */ /* Find the beginning of the module file name */
*col = 0; *col = 0;
mods = strrchr ( buffer, '/' ); mods = strrchr(buffer, '/');
if ( !mods ) if (!mods)
mods = buffer; /* no path for this module */ mods = buffer; /* no path for this module */
else else
mods++; /* there was a path for this module... */ mods++; /* there was a path for this module... */
/* find the path of the module */ /* find the path of the module */
modpath = strchr ( buffer, '/' ); /* ... and this is the path */ modpath = strchr(buffer, '/'); /* ... and this is the path */
if ( !modpath ) if (!modpath)
modpath = buffer; /* module with no path */ modpath = buffer; /* module with no path */
/* find the end of the module name in the file name */ /* find the end of the module name in the file name */
if ( ENABLE_FEATURE_2_6_MODULES && if (ENABLE_FEATURE_2_6_MODULES &&
(k_version > 4) && ( *(col-3) == '.' ) && (k_version > 4) && (*(col-3) == '.') &&
( *(col-2) == 'k' ) && ( *(col-1) == 'o' ) ) (*(col-2) == 'k') && (*(col-1) == 'o'))
dot = col - 3; dot = col - 3;
else else
if (( *(col-2) == '.' ) && ( *(col-1) == 'o' )) if ((*(col-2) == '.') && (*(col-1) == 'o'))
dot = col - 2; dot = col - 2;
mod = xstrndup ( mods, dot - mods ); mod = xstrndup(mods, dot - mods);
/* enqueue new module */ /* enqueue new module */
if ( !current ) { if (!current) {
first = current = (struct dep_t *) xmalloc ( sizeof ( struct dep_t )); first = current = xmalloc(sizeof(struct dep_t));
} }
else { else {
current-> m_next = (struct dep_t *) xmalloc ( sizeof ( struct dep_t )); current->m_next = xmalloc(sizeof(struct dep_t));
current = current-> m_next; current = current->m_next;
} }
current-> m_name = mod; current->m_name = mod;
current-> m_path = xstrdup(modpath); current->m_path = xstrdup(modpath);
current-> m_options = NULL; current->m_options = NULL;
current-> m_isalias = 0; current->m_isalias = 0;
current-> m_depcnt = 0; current->m_depcnt = 0;
current-> m_deparr = 0; current->m_deparr = 0;
current-> m_next = 0; current->m_next = 0;
p = col + 1; p = col + 1;
} }
@ -433,26 +434,24 @@ static struct dep_t *build_dep ( void )
/* It's a dep description continuation */ /* It's a dep description continuation */
p = buffer; p = buffer;
while ( p && *p && isblank(*p)) while (p && *p && isblank(*p))
p++; p++;
/* p points to the first dependable module; if NULL, no dependable module */ /* p points to the first dependable module; if NULL, no dependable module */
if ( p && *p ) { if (p && *p) {
char *end = &buffer [l-1]; char *end = &buffer[l-1];
char *deps; char *deps;
char *dep; char *dep;
char *next; char *next;
int ext = 0; int ext = 0;
while ( isblank ( *end ) || ( *end == '\\' )) while (isblank(*end) || (*end == '\\'))
end--; end--;
do do {
{
/* search the end of the dependency */ /* search the end of the dependency */
next = strchr (p, ' ' ); next = strchr(p, ' ');
if (next) if (next) {
{
*next = 0; *next = 0;
next--; next--;
} }
@ -460,60 +459,59 @@ static struct dep_t *build_dep ( void )
next = end; next = end;
/* find the beginning of the module file name */ /* find the beginning of the module file name */
deps = strrchr ( p, '/' ); deps = strrchr(p, '/');
if ( !deps || ( deps < p )) { if (!deps || (deps < p)) {
deps = p; deps = p;
while ( isblank ( *deps )) while (isblank(*deps))
deps++; deps++;
} } else
else
deps++; deps++;
/* find the end of the module name in the file name */ /* find the end of the module name in the file name */
if ( ENABLE_FEATURE_2_6_MODULES && if (ENABLE_FEATURE_2_6_MODULES
(k_version > 4) && ( *(next-2) == '.' ) && && (k_version > 4) && (*(next-2) == '.')
( *(next-1) == 'k' ) && ( *next == 'o' ) ) && (*(next-1) == 'k') && (*next == 'o'))
ext = 3; ext = 3;
else else
if (( *(next-1) == '.' ) && ( *next == 'o' )) if ((*(next-1) == '.') && (*next == 'o'))
ext = 2; ext = 2;
/* Cope with blank lines */ /* Cope with blank lines */
if ((next-deps-ext+1) <= 0) if ((next-deps-ext+1) <= 0)
continue; continue;
dep = xstrndup ( deps, next - deps - ext + 1 ); dep = xstrndup(deps, next - deps - ext + 1);
/* Add the new dependable module name */ /* Add the new dependable module name */
current-> m_depcnt++; current->m_depcnt++;
current-> m_deparr = (char **) xrealloc ( current-> m_deparr, current->m_deparr = xrealloc(current->m_deparr,
sizeof ( char *) * current-> m_depcnt ); sizeof(char *) * current->m_depcnt);
current-> m_deparr [current-> m_depcnt - 1] = dep; current->m_deparr[current->m_depcnt - 1] = dep;
p = next + 2; p = next + 2;
} while (next < end); } while (next < end);
} }
/* is there other dependable module(s) ? */ /* is there other dependable module(s) ? */
if ( buffer [l-1] == '\\' ) if (buffer[l-1] == '\\')
continuation_line = 1; continuation_line = 1;
else else
continuation_line = 0; continuation_line = 0;
} }
close ( fd ); close(fd);
/* /*
* First parse system-specific options and aliases * First parse system-specific options and aliases
* as they take precedence over the kernel ones. * as they take precedence over the kernel ones.
*/ */
if (!ENABLE_FEATURE_2_6_MODULES if (!ENABLE_FEATURE_2_6_MODULES
|| ( fd = open ( "/etc/modprobe.conf", O_RDONLY )) < 0 ) || (fd = open("/etc/modprobe.conf", O_RDONLY)) < 0)
if (( fd = open ( "/etc/modules.conf", O_RDONLY )) < 0 ) if ((fd = open("/etc/modules.conf", O_RDONLY)) < 0)
fd = open ( "/etc/conf.modules", O_RDONLY ); fd = open("/etc/conf.modules", O_RDONLY);
if (fd >= 0) { if (fd >= 0) {
include_conf (&first, &current, buffer, sizeof(buffer), fd); include_conf(&first, &current, buffer, sizeof(buffer), fd);
close(fd); close(fd);
} }
@ -521,15 +519,16 @@ static struct dep_t *build_dep ( void )
if (ENABLE_FEATURE_2_6_MODULES) { if (ENABLE_FEATURE_2_6_MODULES) {
/* Parse kernel-declared aliases */ /* Parse kernel-declared aliases */
filename = xasprintf("/lib/modules/%s/modules.alias", un.release); filename = xasprintf("/lib/modules/%s/modules.alias", un.release);
if ((fd = open ( filename, O_RDONLY )) < 0) { fd = open(filename, O_RDONLY);
if (fd < 0) {
/* Ok, that didn't work. Fall back to looking in /lib/modules */ /* Ok, that didn't work. Fall back to looking in /lib/modules */
fd = open ( "/lib/modules/modules.alias", O_RDONLY ); fd = open("/lib/modules/modules.alias", O_RDONLY);
} }
if (ENABLE_FEATURE_CLEAN_UP) if (ENABLE_FEATURE_CLEAN_UP)
free(filename); free(filename);
if (fd >= 0) { if (fd >= 0) {
include_conf (&first, &current, buffer, sizeof(buffer), fd); include_conf(&first, &current, buffer, sizeof(buffer), fd);
close(fd); close(fd);
} }
} }
@ -538,16 +537,16 @@ static struct dep_t *build_dep ( void )
} }
/* return 1 = loaded, 0 = not loaded, -1 = can't tell */ /* return 1 = loaded, 0 = not loaded, -1 = can't tell */
static int already_loaded (const char *name) static int already_loaded(const char *name)
{ {
int fd, ret = 0; int fd, ret = 0;
char buffer[4096]; char buffer[4096];
fd = open ("/proc/modules", O_RDONLY); fd = open("/proc/modules", O_RDONLY);
if (fd < 0) if (fd < 0)
return -1; return -1;
while ( reads ( fd, buffer, sizeof( buffer ))) { while (reads(fd, buffer, sizeof(buffer))) {
char *p; char *p;
p = strchr (buffer, ' '); p = strchr (buffer, ' ');
@ -578,7 +577,7 @@ done:
return ret; return ret;
} }
static int mod_process ( struct mod_list_t *list, int do_insert ) static int mod_process(struct mod_list_t *list, int do_insert)
{ {
int rc = 0; int rc = 0;
char **argv = NULL; char **argv = NULL;
@ -586,9 +585,9 @@ static int mod_process ( struct mod_list_t *list, int do_insert )
int argc_malloc; /* never used when CONFIG_FEATURE_CLEAN_UP not defined */ int argc_malloc; /* never used when CONFIG_FEATURE_CLEAN_UP not defined */
int argc; int argc;
while ( list ) { while (list) {
argc = 0; argc = 0;
if( ENABLE_FEATURE_CLEAN_UP ) if (ENABLE_FEATURE_CLEAN_UP)
argc_malloc = 0; argc_malloc = 0;
/* If CONFIG_FEATURE_CLEAN_UP is not defined, then we leak memory /* If CONFIG_FEATURE_CLEAN_UP is not defined, then we leak memory
* each time we allocate memory for argv. * each time we allocate memory for argv.
@ -601,9 +600,9 @@ static int mod_process ( struct mod_list_t *list, int do_insert )
* would not load because there is no more memory, so there's no * would not load because there is no more memory, so there's no
* problem. */ * problem. */
/* enough for minimal insmod (5 args + NULL) or rmmod (3 args + NULL) */ /* enough for minimal insmod (5 args + NULL) or rmmod (3 args + NULL) */
argv = (char**) malloc( 6 * sizeof( char* ) ); argv = xmalloc(6 * sizeof(char*));
if ( do_insert ) { if (do_insert) {
if (already_loaded (list->m_name) != 1) { if (already_loaded(list->m_name) != 1) {
argv[argc++] = "insmod"; argv[argc++] = "insmod";
if (ENABLE_FEATURE_2_4_MODULES) { if (ENABLE_FEATURE_2_4_MODULES) {
if (do_syslog) if (do_syslog)
@ -612,29 +611,29 @@ static int mod_process ( struct mod_list_t *list, int do_insert )
argv[argc++] = "-k"; argv[argc++] = "-k";
if (quiet) if (quiet)
argv[argc++] = "-q"; argv[argc++] = "-q";
else if(verbose) /* verbose and quiet are mutually exclusive */ else if (verbose) /* verbose and quiet are mutually exclusive */
argv[argc++] = "-v"; argv[argc++] = "-v";
} }
argv[argc++] = list-> m_path; argv[argc++] = list->m_path;
if( ENABLE_FEATURE_CLEAN_UP ) if (ENABLE_FEATURE_CLEAN_UP)
argc_malloc = argc; argc_malloc = argc;
opts = list-> m_options; opts = list->m_options;
while( opts ) { while (opts) {
/* Add one more option */ /* Add one more option */
argc++; argc++;
argv = (char**) xrealloc( argv, ( argc + 1 ) * sizeof( char* ) ); argv = xrealloc(argv,(argc + 1)* sizeof(char*));
argv[argc-1] = opts-> m_opt_val; argv[argc-1] = opts->m_opt_val;
opts = opts-> m_next; opts = opts->m_next;
} }
} }
} else { } else {
/* modutils uses short name for removal */ /* modutils uses short name for removal */
if (already_loaded (list->m_name) != 0) { if (already_loaded(list->m_name) != 0) {
argv[argc++] = "rmmod"; argv[argc++] = "rmmod";
if (do_syslog) if (do_syslog)
argv[argc++] = "-s"; argv[argc++] = "-s";
argv[argc++] = list->m_name; argv[argc++] = list->m_name;
if( ENABLE_FEATURE_CLEAN_UP ) if (ENABLE_FEATURE_CLEAN_UP)
argc_malloc = argc; argc_malloc = argc;
} }
} }
@ -642,7 +641,7 @@ static int mod_process ( struct mod_list_t *list, int do_insert )
if (argc) { if (argc) {
if (verbose) { if (verbose) {
printf("%s module %s\n", do_insert?"Loading":"Unloading", list-> m_name ); printf("%s module %s\n", do_insert?"Loading":"Unloading", list->m_name);
} }
if (!show_only) { if (!show_only) {
int rc2 = wait4pid(spawn(argv)); int rc2 = wait4pid(spawn(argv));
@ -654,18 +653,19 @@ static int mod_process ( struct mod_list_t *list, int do_insert )
rc = 0; /* success if remove any mod */ rc = 0; /* success if remove any mod */
} }
} }
if( ENABLE_FEATURE_CLEAN_UP ) if (ENABLE_FEATURE_CLEAN_UP) {
/* the last value in the array has index == argc, but /* the last value in the array has index == argc, but
* it is the terminating NULL, so we must not free it. */ * it is the terminating NULL, so we must not free it. */
while( argc_malloc < argc ) { while (argc_malloc < argc) {
free( argv[argc_malloc++] ); free(argv[argc_malloc++]);
} }
} }
if( ENABLE_FEATURE_CLEAN_UP ) { }
free( argv ); if (ENABLE_FEATURE_CLEAN_UP) {
free(argv);
argv = NULL; argv = NULL;
} }
list = do_insert ? list-> m_prev : list-> m_next; list = do_insert ? list->m_prev : list->m_next;
} }
return (show_only) ? 0 : rc; return (show_only) ? 0 : rc;
} }
@ -674,7 +674,7 @@ static int mod_process ( struct mod_list_t *list, int do_insert )
* Check the matching between a pattern and a module name. * Check the matching between a pattern and a module name.
* We need this as *_* is equivalent to *-*, even in pattern matching. * We need this as *_* is equivalent to *-*, even in pattern matching.
*/ */
static int check_pattern( const char* pat_src, const char* mod_src ) { static int check_pattern(const char* pat_src, const char* mod_src) {
int ret; int ret;
if (ENABLE_FEATURE_MODPROBE_FANCY_ALIAS) { if (ENABLE_FEATURE_MODPROBE_FANCY_ALIAS) {
@ -685,10 +685,10 @@ static int check_pattern( const char* pat_src, const char* mod_src ) {
pat = xstrdup (pat_src); pat = xstrdup (pat_src);
mod = xstrdup (mod_src); mod = xstrdup (mod_src);
for (p = pat; (p = strchr(p, '-')); *p++ = '_' ); for (p = pat; (p = strchr(p, '-')); *p++ = '_');
for (p = mod; (p = strchr(p, '-')); *p++ = '_' ); for (p = mod; (p = strchr(p, '-')); *p++ = '_');
ret = fnmatch ( pat, mod, 0 ); ret = fnmatch(pat, mod, 0);
if (ENABLE_FEATURE_CLEAN_UP) { if (ENABLE_FEATURE_CLEAN_UP) {
free (pat); free (pat);
@ -697,7 +697,7 @@ static int check_pattern( const char* pat_src, const char* mod_src ) {
return ret; return ret;
} else { } else {
return fnmatch ( pat_src, mod_src, 0 ); return fnmatch(pat_src, mod_src, 0);
} }
} }
@ -706,7 +706,7 @@ static int check_pattern( const char* pat_src, const char* mod_src ) {
* head: the highest module in the stack (last to insmod, first to rmmod) * head: the highest module in the stack (last to insmod, first to rmmod)
* tail: the lowest module in the stack (first to insmod, last to rmmod) * tail: the lowest module in the stack (first to insmod, last to rmmod)
*/ */
static void check_dep ( char *mod, struct mod_list_t **head, struct mod_list_t **tail ) static void check_dep(char *mod, struct mod_list_t **head, struct mod_list_t **tail)
{ {
struct mod_list_t *find; struct mod_list_t *find;
struct dep_t *dt; struct dep_t *dt;
@ -718,122 +718,122 @@ static void check_dep ( char *mod, struct mod_list_t **head, struct mod_list_t *
* so try to match the given module name against such a pattern. * so try to match the given module name against such a pattern.
* Of course if the name in the dependency rule is a plain string, * Of course if the name in the dependency rule is a plain string,
* then we consider it a pattern, and matching will still work. */ * then we consider it a pattern, and matching will still work. */
for ( dt = depend; dt; dt = dt-> m_next ) { for (dt = depend; dt; dt = dt->m_next) {
if ( check_pattern ( dt-> m_name, mod ) == 0) { if (check_pattern(dt->m_name, mod) == 0) {
break; break;
} }
} }
if( !dt ) { if (!dt) {
bb_error_msg ("module %s not found", mod); bb_error_msg("module %s not found", mod);
return; return;
} }
// resolve alias names // resolve alias names
while ( dt-> m_isalias ) { while (dt->m_isalias) {
if ( dt-> m_depcnt == 1 ) { if (dt->m_depcnt == 1) {
struct dep_t *adt; struct dep_t *adt;
for ( adt = depend; adt; adt = adt-> m_next ) { for (adt = depend; adt; adt = adt->m_next) {
if ( check_pattern ( adt-> m_name, dt-> m_deparr [0] ) == 0 ) if (check_pattern(adt->m_name, dt->m_deparr[0]) == 0)
break; break;
} }
if ( adt ) { if (adt) {
/* This is the module we are aliased to */ /* This is the module we are aliased to */
struct mod_opt_t *opts = dt-> m_options; struct mod_opt_t *opts = dt->m_options;
/* Option of the alias are appended to the options of the module */ /* Option of the alias are appended to the options of the module */
while( opts ) { while (opts) {
adt-> m_options = append_option( adt-> m_options, opts-> m_opt_val ); adt->m_options = append_option(adt->m_options, opts->m_opt_val);
opts = opts-> m_next; opts = opts->m_next;
} }
dt = adt; dt = adt;
} }
else { else {
bb_error_msg ("module %s not found", mod); bb_error_msg("module %s not found", mod);
return; return;
} }
} }
else { else {
bb_error_msg ("bad alias %s", dt-> m_name); bb_error_msg("bad alias %s", dt->m_name);
return; return;
} }
} }
mod = dt-> m_name; mod = dt->m_name;
path = dt-> m_path; path = dt->m_path;
opt = dt-> m_options; opt = dt->m_options;
// search for duplicates // search for duplicates
for ( find = *head; find; find = find-> m_next ) { for (find = *head; find; find = find->m_next) {
if ( !strcmp ( mod, find-> m_name )) { if (!strcmp(mod, find->m_name)) {
// found -> dequeue it // found ->dequeue it
if ( find-> m_prev ) if (find->m_prev)
find-> m_prev-> m_next = find-> m_next; find->m_prev->m_next = find->m_next;
else else
*head = find-> m_next; *head = find->m_next;
if ( find-> m_next ) if (find->m_next)
find-> m_next-> m_prev = find-> m_prev; find->m_next->m_prev = find->m_prev;
else else
*tail = find-> m_prev; *tail = find->m_prev;
break; // there can be only one duplicate break; // there can be only one duplicate
} }
} }
if ( !find ) { // did not find a duplicate if (!find) { // did not find a duplicate
find = (struct mod_list_t *) xmalloc ( sizeof(struct mod_list_t)); find = xmalloc(sizeof(struct mod_list_t));
find-> m_name = mod; find->m_name = mod;
find-> m_path = path; find->m_path = path;
find-> m_options = opt; find->m_options = opt;
} }
// enqueue at tail // enqueue at tail
if ( *tail ) if (*tail)
(*tail)-> m_next = find; (*tail)->m_next = find;
find-> m_prev = *tail; find->m_prev = *tail;
find-> m_next = 0; find->m_next = 0;
if ( !*head ) if (!*head)
*head = find; *head = find;
*tail = find; *tail = find;
if ( dt ) { if (dt) {
int i; int i;
/* Add all dependable module for that new module */ /* Add all dependable module for that new module */
for ( i = 0; i < dt-> m_depcnt; i++ ) for (i = 0; i < dt->m_depcnt; i++)
check_dep ( dt-> m_deparr [i], head, tail ); check_dep(dt->m_deparr[i], head, tail);
} }
} }
static int mod_insert ( char *mod, int argc, char **argv ) static int mod_insert(char *mod, int argc, char **argv)
{ {
struct mod_list_t *tail = 0; struct mod_list_t *tail = 0;
struct mod_list_t *head = 0; struct mod_list_t *head = 0;
int rc; int rc;
// get dep list for module mod // get dep list for module mod
check_dep ( mod, &head, &tail ); check_dep(mod, &head, &tail);
if ( head && tail ) { if (head && tail) {
if( argc ) { if (argc) {
int i; int i;
// append module args // append module args
for ( i = 0; i < argc; i++ ) for (i = 0; i < argc; i++)
head->m_options = append_option( head->m_options, argv[i] ); head->m_options = append_option(head->m_options, argv[i]);
} }
// process tail ---> head // process tail ---> head
if ((rc = mod_process ( tail, 1 )) != 0) { if ((rc = mod_process(tail, 1)) != 0) {
/* /*
* In case of using udev, multiple instances of modprobe can be * In case of using udev, multiple instances of modprobe can be
* spawned to load the same module (think of two same usb devices, * spawned to load the same module (think of two same usb devices,
* for example; or cold-plugging at boot time). Thus we shouldn't * for example; or cold-plugging at boot time). Thus we shouldn't
* fail if the module was loaded, and not by us. * fail if the module was loaded, and not by us.
*/ */
if (already_loaded (mod) ) if (already_loaded(mod))
rc = 0; rc = 0;
} }
} }
@ -843,7 +843,7 @@ static int mod_insert ( char *mod, int argc, char **argv )
return rc; return rc;
} }
static int mod_remove ( char *mod ) static int mod_remove(char *mod)
{ {
int rc; int rc;
static struct mod_list_t rm_a_dummy = { "-a", NULL, NULL, NULL, NULL }; static struct mod_list_t rm_a_dummy = { "-a", NULL, NULL, NULL, NULL };
@ -851,13 +851,13 @@ static int mod_remove ( char *mod )
struct mod_list_t *head = 0; struct mod_list_t *head = 0;
struct mod_list_t *tail = 0; struct mod_list_t *tail = 0;
if ( mod ) if (mod)
check_dep ( mod, &head, &tail ); check_dep(mod, &head, &tail);
else // autoclean else // autoclean
head = tail = &rm_a_dummy; head = tail = &rm_a_dummy;
if ( head && tail ) if (head && tail)
rc = mod_process ( head, 0 ); // process head ---> tail rc = mod_process(head, 0); // process head ---> tail
else else
rc = 1; rc = 1;
return rc; return rc;
@ -872,31 +872,31 @@ int modprobe_main(int argc, char** argv)
opt_complementary = "?V-:q-v:v-q"; opt_complementary = "?V-:q-v:v-q";
main_opts = getopt32(argc, argv, "acdklnqrst:vVC:", main_opts = getopt32(argc, argv, "acdklnqrst:vVC:",
&unused, &unused); &unused, &unused);
if((main_opts & (DUMP_CONF_EXIT | LIST_ALL))) if (main_opts & (DUMP_CONF_EXIT | LIST_ALL))
return EXIT_SUCCESS; return EXIT_SUCCESS;
if((main_opts & (RESTRICT_DIR | CONFIG_FILE))) if (main_opts & (RESTRICT_DIR | CONFIG_FILE))
bb_error_msg_and_die("-t and -C not supported"); bb_error_msg_and_die("-t and -C not supported");
depend = build_dep ( ); depend = build_dep();
if ( !depend ) if (!depend)
bb_error_msg_and_die ( "cannot parse modules.dep" ); bb_error_msg_and_die("cannot parse modules.dep");
if (remove_opt) { if (remove_opt) {
do { do {
if (mod_remove ( optind < argc ? if (mod_remove(optind < argc ?
argv [optind] : NULL )) { argv[optind] : NULL)) {
bb_error_msg ("failed to remove module %s", bb_error_msg("failed to remove module %s",
argv [optind] ); argv[optind]);
rc = EXIT_FAILURE; rc = EXIT_FAILURE;
} }
} while ( ++optind < argc ); } while (++optind < argc);
} else { } else {
if (optind >= argc) if (optind >= argc)
bb_error_msg_and_die ( "no module or pattern provided" ); bb_error_msg_and_die("no module or pattern provided");
if ( mod_insert ( argv [optind], argc - optind - 1, argv + optind + 1 )) if (mod_insert(argv[optind], argc - optind - 1, argv + optind + 1))
bb_error_msg_and_die ( "failed to load module %s", argv [optind] ); bb_error_msg_and_die("failed to load module %s", argv[optind]);
} }
/* Here would be a good place to free up memory allocated during the dependencies build. */ /* Here would be a good place to free up memory allocated during the dependencies build. */