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

- remove warning (thanks Yann E. MORIN) and switch to ENABLE_

Browse Source 
- typo: s/begining/beginning/g
This commit is contained in:
Bernhard Reutner-Fischer 2005-12-14 08:32:44 +00:00
parent e6d88ea2a1
commit 17d355cb3c
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
modutils/modprobe.c
View File

@ -5,7 +5,7 @@
* Copyright (c) 2002 by Robert Griebl, griebl@gmx.de * Copyright (c) 2002 by Robert Griebl, griebl@gmx.de
* Copyright (c) 2003 by Andrew Dennison, andrew.dennison@motec.com.au * Copyright (c) 2003 by Andrew Dennison, andrew.dennison@motec.com.au
* Copyright (c) 2005 by Jim Bauer, jfbauer@nfr.com * Copyright (c) 2005 by Jim Bauer, jfbauer@nfr.com
* *
* Portions Copyright (c) 2005 by Yann E. MORIN, yann.morin.1998@anciens.enib.fr * Portions Copyright (c) 2005 by Yann E. MORIN, yann.morin.1998@anciens.enib.fr
* *
* 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.
@ -33,7 +33,7 @@ struct dep_t { /* one-way list of dependency rules */
char * m_name; /* the module name*/ char * m_name; /* the module name*/
char * m_path; /* the module file path */ char * m_path; /* the module file path */
struct mod_opt_t * m_options; /* the module options */ struct mod_opt_t * m_options; /* the module options */
int m_isalias : 1; /* the module is an alias */ int m_isalias : 1; /* the module is an alias */
int m_reserved : 15; /* stuffin' */ int m_reserved : 15; /* stuffin' */
@ -130,7 +130,7 @@ struct mod_opt_t *append_option( struct mod_opt_t *opt_list, char *opt )
return opt_list; return opt_list;
} }
#if (defined CONFIG_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
@ -238,7 +238,7 @@ static char *parse_command_string( char *src, char **dst )
*dst = xrealloc( *dst, strlen( *dst ) ); *dst = xrealloc( *dst, strlen( *dst ) );
return src; return src;
} }
#endif /* CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS */ #endif /* ENABLE_FEATURE_MODPROBE_MULTIPLE_OPTIONS */
/* /*
* This function builds a list of dependency rules from /lib/modules/`uname -r\modules.dep. * This function builds a list of dependency rules from /lib/modules/`uname -r\modules.dep.
@ -296,7 +296,7 @@ static struct dep_t *build_dep ( void )
/* Is this a new module dep description? */ /* Is this a new module dep description? */
if ( !continuation_line ) { if ( !continuation_line ) {
/* find the dep begining */ /* find the dep beginning */
char *col = strchr ( buffer, ':' ); char *col = strchr ( buffer, ':' );
char *dot = col; char *dot = col;
@ -382,7 +382,7 @@ static struct dep_t *build_dep ( void )
else else
next = end; next = end;
/* find the begining 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 )) {
@ -428,7 +428,7 @@ static struct dep_t *build_dep ( void )
// 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) !
#if defined(CONFIG_FEATURE_2_6_MODULES) #if ENABLE_FEATURE_2_6_MODULES
if (( fd = open ( "/etc/modprobe.conf", O_RDONLY )) < 0 ) if (( fd = open ( "/etc/modprobe.conf", O_RDONLY )) < 0 )
#endif #endif
if (( fd = open ( "/etc/modules.conf", O_RDONLY )) < 0 ) if (( fd = open ( "/etc/modules.conf", O_RDONLY )) < 0 )
@ -497,14 +497,14 @@ static struct dep_t *build_dep ( void )
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 {
dt-> m_options = append_option( dt-> m_options, opt );
} }
#else
dt-> m_options = append_option( dt-> m_options, opt );
#endif
} }
} }
} }
@ -711,7 +711,7 @@ static void check_dep ( char *mod, struct mod_list_t **head, struct mod_list_t *
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 )) {