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

whitespace cleanup

Browse Source
This commit is contained in:
Eric Andersen 2004-01-10 11:29:31 +00:00
parent 8e2f74f5a7
commit 716ccb2635
1 changed files with 50 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
modutils/modprobe.c
View File

@ -229,37 +229,38 @@ static struct dep_t *build_dep ( void )
else else
next = end; next = end;
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++;
}
else
deps++; deps++;
}
else
deps++;
#if defined(CONFIG_FEATURE_2_6_MODULES) #if defined(CONFIG_FEATURE_2_6_MODULES)
if ((k_version > 4) && ( *(next-2) == '.' ) && *(next-1) == 'k' && if ((k_version > 4) && ( *(next-2) == '.' ) && *(next-1) == 'k' &&
( *next == 'o' )) ( *next == 'o' ))
ext = 3; ext = 3;
else else
#endif #endif
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 = bb_xstrndup ( deps, next - deps - ext + 1 ); dep = bb_xstrndup ( deps, next - deps - ext + 1 );
current-> m_depcnt++; current-> m_depcnt++;
current-> m_deparr = (char **) xrealloc ( current-> m_deparr, sizeof ( char *) * current-> m_depcnt ); current-> m_deparr = (char **) xrealloc ( current-> m_deparr,
current-> m_deparr [current-> m_depcnt - 1] = dep; sizeof ( char *) * current-> m_depcnt );
current-> m_deparr [current-> m_depcnt - 1] = dep;
//printf ( " %d) %s\n", current-> m_depcnt, current-> m_deparr [current-> m_depcnt -1] ); //printf ( " %d) %s\n", current-> m_depcnt, current-> m_deparr [current-> m_depcnt -1] );
p = next + 2; p = next + 2;
} while (next < end); } while (next < end);
} }
@ -387,10 +388,14 @@ static int mod_process ( struct mod_list_t *list, int do_insert )
*lcmd = '\0'; *lcmd = '\0';
if ( do_insert ) { if ( do_insert ) {
if (already_loaded (list->m_module) != 1) if (already_loaded (list->m_module) != 1)
snprintf ( lcmd, sizeof( lcmd ) - 1, "insmod %s %s %s %s %s", do_syslog ? "-s" : "", autoclean ? "-k" : "", quiet ? "-q" : "", list-> m_module, list-> m_options ? list-> m_options : "" ); snprintf ( lcmd, sizeof( lcmd ) - 1, "insmod %s %s %s %s %s",
do_syslog ? "-s" : "", autoclean ? "-k" : "",
quiet ? "-q" : "", list-> m_module, list-> m_options ?
list-> m_options : "" );
} else { } else {
if (already_loaded (list->m_module) != 0) if (already_loaded (list->m_module) != 0)
snprintf ( lcmd, sizeof( lcmd ) - 1, "rmmod %s %s", do_syslog ? "-s" : "", list-> m_module ); snprintf ( lcmd, sizeof( lcmd ) - 1, "rmmod %s %s",
do_syslog ? "-s" : "", list-> m_module );
} }
if ( verbose ) if ( verbose )