*
* Copyright (c) 2002 by Robert Griebl, griebl@gmx.de
* Copyright (c) 2003 by Andrew Dennison, andrew.dennison@motec.com.au
+ * Copyright (c) 2005 by Jim Bauer, jfbauer@nfr.com
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*/
#include <sys/utsname.h>
+#include <sys/types.h>
+#include <sys/wait.h>
#include <getopt.h>
#include <stdlib.h>
#include <unistd.h>
struct dep_t {
- char * m_module;
+ char * m_name;
+ char * m_path;
char * m_options;
int m_isalias : 1;
};
struct mod_list_t {
- char * m_module;
+ char * m_name;
+ char * m_path;
char * m_options;
struct mod_list_t * m_prev;
static int autoclean, show_only, quiet, do_syslog, verbose;
static int k_version;
-int parse_tag_value ( char *buffer, char **ptag, char **pvalue )
+static int parse_tag_value ( char *buffer, char **ptag, char **pvalue )
{
char *tag, *value;
buffer++;
tag = value = buffer;
while ( !isspace ( *value ))
- value++;
+ if (!*value) return 0;
+ else value++;
*value++ = 0;
while ( isspace ( *value ))
value++;
+ if (!*value) return 0;
*ptag = tag;
*pvalue = value;
- return bb_strlen( tag ) && bb_strlen( value );
+ return 1;
}
/* Jump through hoops to simulate how fgets() grabs just one line at a
struct utsname un;
struct dep_t *first = 0;
struct dep_t *current = 0;
- char buffer[256];
+ char buffer[2048];
char *filename = buffer;
int continuation_line = 0;
if ( !continuation_line ) {
char *col = strchr ( buffer, ':' );
+ char *dot = col;
if ( col ) {
char *mods;
+ char *modpath;
char *mod;
- int ext = 0;
*col = 0;
mods = strrchr ( buffer, '/' );
else
mods++;
+ modpath = strchr ( buffer, '/' );
+ if ( !modpath )
+ modpath = buffer;
#if defined(CONFIG_FEATURE_2_6_MODULES)
if ((k_version > 4) && ( *(col-3) == '.' ) &&
( *(col-2) == 'k' ) && ( *(col-1) == 'o' ))
- ext = 3;
+ dot = col - 3;
else
#endif
if (( *(col-2) == '.' ) && ( *(col-1) == 'o' ))
- ext = 2;
+ dot = col - 2;
- mod = bb_xstrndup ( mods, col - mods - ext );
+ mod = bb_xstrndup ( mods, dot - mods );
if ( !current ) {
first = current = (struct dep_t *) xmalloc ( sizeof ( struct dep_t ));
current-> m_next = (struct dep_t *) xmalloc ( sizeof ( struct dep_t ));
current = current-> m_next;
}
- current-> m_module = mod;
+ current-> m_name = mod;
+ current-> m_path = bb_xstrdup(modpath);
current-> m_options = 0;
current-> m_isalias = 0;
current-> m_depcnt = 0;
// alias parsing is not 100% correct (no correct handling of continuation lines within an alias) !
- if (( fd = open ( "/etc/modules.conf", O_RDONLY )) < 0 )
- if (( fd = open ( "/etc/conf.modules", O_RDONLY )) < 0 )
- return first;
+#if defined(CONFIG_FEATURE_2_6_MODULES)
+ if (( fd = open ( "/etc/modprobe.conf", O_RDONLY )) < 0 )
+#endif
+ if (( fd = open ( "/etc/modules.conf", O_RDONLY )) < 0 )
+ if (( fd = open ( "/etc/conf.modules", O_RDONLY )) < 0 )
+ return first;
continuation_line = 0;
while ( reads ( fd, buffer, sizeof( buffer ))) {
// fprintf ( stderr, "ALIAS: '%s' -> '%s'\n", alias, mod );
if ( !current ) {
- first = current = (struct dep_t *) xmalloc ( sizeof ( struct dep_t ));
+ first = current = (struct dep_t *) xcalloc ( 1, sizeof ( struct dep_t ));
}
else {
- current-> m_next = (struct dep_t *) xmalloc ( sizeof ( struct dep_t ));
+ current-> m_next = (struct dep_t *) xcalloc ( 1, sizeof ( struct dep_t ));
current = current-> m_next;
}
- current-> m_module = bb_xstrdup ( alias );
+ current-> m_name = bb_xstrdup ( alias );
current-> m_isalias = 1;
- if (( strcmp ( alias, "off" ) == 0 ) || ( strcmp ( alias, "null" ) == 0 )) {
+ if (( strcmp ( mod, "off" ) == 0 ) || ( strcmp ( mod, "null" ) == 0 )) {
current-> m_depcnt = 0;
current-> m_deparr = 0;
}
struct dep_t *dt;
for ( dt = first; dt; dt = dt-> m_next ) {
- if ( strcmp ( dt-> m_module, mod ) == 0 )
+ if ( strcmp ( dt-> m_name, mod ) == 0 )
break;
}
if ( dt ) {
dt-> m_options = xrealloc ( dt-> m_options, bb_strlen( opt ) + 1 );
strcpy ( dt-> m_options, opt );
- // fprintf ( stderr, "OPTION: '%s' -> '%s'\n", dt-> m_module, dt-> m_options );
+ // fprintf ( stderr, "OPTION: '%s' -> '%s'\n", dt-> m_name, dt-> m_options );
}
}
}
static int already_loaded (const char *name)
{
int fd;
- char buffer[256];
+ char buffer[4096];
fd = open ("/proc/modules", O_RDONLY);
if (fd < 0)
static int mod_process ( struct mod_list_t *list, int do_insert )
{
- char lcmd [256];
- int rc = 1;
+ int rc = 0;
+ char *argv[10];
+ int argc;
while ( list ) {
- *lcmd = '\0';
+ argc = 0;
if ( do_insert ) {
- 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 : "" );
+ if (already_loaded (list->m_name) != 1) {
+ argv[argc++] = "insmod";
+ if (do_syslog)
+ argv[argc++] = "-s";
+ if (autoclean)
+ argv[argc++] = "-k";
+ if (quiet)
+ argv[argc++] = "-q";
+ argv[argc++] = list-> m_path;
+ if (list-> m_options)
+ argv[argc++] = list-> m_options;
+ }
} else {
- if (already_loaded (list->m_module) != 0)
- snprintf ( lcmd, sizeof( lcmd ) - 1, "rmmod %s %s",
- do_syslog ? "-s" : "", list-> m_module );
+ /* modutils uses short name for removal */
+ if (already_loaded (list->m_name) != 0) {
+ argv[argc++] = "rmmod";
+ if (do_syslog)
+ argv[argc++] = "-s";
+ argv[argc++] = list->m_name;
+ }
}
-
- if ( verbose )
- printf ( "%s\n", lcmd );
- if ( !show_only && *lcmd) {
- int rc2 = system ( lcmd );
- if (do_insert) rc = rc2; /* only last module matters */
- else if (!rc2) rc = 0; /* success if remove any mod */
+ argv[argc] = NULL;
+
+ if (argc) {
+ if (verbose) {
+ int i;
+ for (i=0; i<argc; i++)
+ printf("%s ", argv[i]);
+ printf("\n");
+ }
+ if (!show_only) {
+ int rc2 = 0;
+ int status;
+ switch (fork()) {
+ case -1:
+ rc2 = 1;
+ break;
+ case 0: //child
+ execvp(argv[0], argv);
+ bb_perror_msg_and_die("exec of %s", argv[0]);
+ /* NOTREACHED */
+ default:
+ if (wait(&status) == -1) {
+ rc2 = 1;
+ break;
+ }
+ if (WIFEXITED(status))
+ rc2 = WEXITSTATUS(status);
+ if (WIFSIGNALED(status))
+ rc2 = WTERMSIG(status);
+ break;
+ }
+ if (do_insert) {
+ rc = rc2; /* only last module matters */
+ }
+ else if (!rc2) {
+ rc = 0; /* success if remove any mod */
+ }
+ }
}
-
list = do_insert ? list-> m_prev : list-> m_next;
}
return (show_only) ? 0 : rc;
struct mod_list_t *find;
struct dep_t *dt;
char *opt = 0;
- int lm;
-
- // remove .o extension
- lm = bb_strlen ( mod );
-
-#if defined(CONFIG_FEATURE_2_6_MODULES)
- if ((k_version > 4) && ( mod [lm-3] == '.' ) &&
- ( mod [lm-2] == 'k' ) && ( mod [lm-1] == 'o' ))
- mod [lm-3] = 0;
- else
-#endif
- if (( mod [lm-2] == '.' ) && ( mod [lm-1] == 'o' ))
- mod [lm-2] = 0;
+ char *path = 0;
// check dependencies
for ( dt = depend; dt; dt = dt-> m_next ) {
- if ( strcmp ( dt-> m_module, mod ) == 0 ) {
+ if ( strcmp ( dt-> m_name, mod ) == 0) {
+ mod = dt-> m_name;
+ path = dt-> m_path;
opt = dt-> m_options;
break;
}
struct dep_t *adt;
for ( adt = depend; adt; adt = adt-> m_next ) {
- if ( strcmp ( adt-> m_module, dt-> m_deparr [0] ) == 0 )
+ if ( strcmp ( adt-> m_name, dt-> m_deparr [0] ) == 0 )
break;
}
if ( adt ) {
dt = adt;
- mod = dt-> m_module;
+ mod = dt-> m_name;
+ path = dt-> m_path;
if ( !opt )
opt = dt-> m_options;
}
return;
}
+ if ( !path ) {
+ bb_error_msg ("module %s not found.", mod);
+ return;
+ }
+
// search for duplicates
for ( find = *head; find; find = find-> m_next ) {
- if ( !strcmp ( mod, find-> m_module )) {
+ if ( !strcmp ( mod, find-> m_name )) {
// found -> dequeue it
if ( find-> m_prev )
if ( !find ) { // did not find a duplicate
find = (struct mod_list_t *) xmalloc ( sizeof(struct mod_list_t));
- find-> m_module = mod;
+ find-> m_name = mod;
+ find-> m_path = path;
find-> m_options = opt;
}
check_dep ( mod, &head, &tail );
if ( head && tail ) {
+#if defined(CONFIG_FEATURE_2_6_MODULES)
if ( argc ) {
int i;
int l = 0;
strcat ( head-> m_options, " " );
}
}
+#endif
// process tail ---> head
rc = mod_process ( tail, 1 );
}
-
-
extern int modprobe_main(int argc, char** argv)
{
int opt;
return EXIT_SUCCESS;
}
-
-
projects / oweals / busybox.git / blobdiff