X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=modutils%2Fmodprobe.c;h=218a898a8ea7f3b0a899108e77277ac0b2e6b376;hb=ea4f0847c3d765a782eb9afe3b0f9fb0659cd1bc;hp=68754696b5c22f32aa65aad1f0e45b7b0e6444c5;hpb=8e2f74f5a7f6222d759c32431a562ce9728f7fc9;p=oweals%2Fbusybox.git

diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index 68754696b..218a898a8 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -2,634 +2,397 @@
 /*
  * Modprobe written from scratch for BusyBox
  *
- * Copyright (c) 2002 by Robert Griebl, griebl@gmx.de
- * Copyright (c) 2003 by Andrew Dennison, andrew.dennison@motec.com.au
+ * Copyright (c) 2008 Timo Teras <timo.teras@iki.fi>
+ * Copyright (c) 2008 Vladimir Dronnikov
  *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
-*/
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ */
 
+#include "libbb.h"
+#include "modutils.h"
 #include <sys/utsname.h>
-#include <getopt.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <syslog.h>
-#include <string.h>
-#include <ctype.h>
-#include <fcntl.h>
-#include "busybox.h"
-
-
-
-struct dep_t {
-	char *  m_module;
-	char *  m_options;
-
-	int     m_isalias  : 1;
-	int     m_reserved : 15;
-
-	int     m_depcnt   : 16;	
-	char ** m_deparr;
-
-	struct dep_t * m_next;
+#include <fnmatch.h>
+
+//#define DBG(...) bb_error_msg(__VA_ARGS__)
+#define DBG(...) ((void)0)
+
+#define MODULE_FLAG_LOADED		0x0001
+#define MODULE_FLAG_NEED_DEPS		0x0002
+/* "was seen in modules.dep": */
+#define MODULE_FLAG_FOUND_IN_MODDEP	0x0004
+#define MODULE_FLAG_BLACKLISTED		0x0008
+
+struct module_entry { /* I'll call it ME. */
+	unsigned flags;
+	char *modname; /* stripped of /path/, .ext and s/-/_/g */
+	const char *probed_name; /* verbatim as seen on cmdline */
+	char *options; /* options from config files */
+	llist_t *realnames; /* strings. if this module is an alias, */
+	/* real module name is one of these. */
+//Can there really be more than one? Example from real kernel?
+	llist_t *deps; /* strings. modules we depend on */
 };
 
-struct mod_list_t {
-	char *  m_module;
-	char *  m_options;
+#define MODPROBE_OPTS  "acdlnrt:VC:" USE_FEATURE_MODPROBE_BLACKLIST("b")
+enum {
+	MODPROBE_OPT_INSERT_ALL	= (INSMOD_OPT_UNUSED << 0), /* a */
+	MODPROBE_OPT_DUMP_ONLY	= (INSMOD_OPT_UNUSED << 1), /* c */
+	MODPROBE_OPT_D		= (INSMOD_OPT_UNUSED << 2), /* d */
+	MODPROBE_OPT_LIST_ONLY	= (INSMOD_OPT_UNUSED << 3), /* l */
+	MODPROBE_OPT_SHOW_ONLY	= (INSMOD_OPT_UNUSED << 4), /* n */
+	MODPROBE_OPT_REMOVE	= (INSMOD_OPT_UNUSED << 5), /* r */
+	MODPROBE_OPT_RESTRICT	= (INSMOD_OPT_UNUSED << 6), /* t */
+	MODPROBE_OPT_VERONLY	= (INSMOD_OPT_UNUSED << 7), /* V */
+	MODPROBE_OPT_CONFIGFILE	= (INSMOD_OPT_UNUSED << 8), /* C */
+	MODPROBE_OPT_BLACKLIST	= (INSMOD_OPT_UNUSED << 9) * ENABLE_FEATURE_MODPROBE_BLACKLIST,
+};
 
-	struct mod_list_t * m_prev;
-	struct mod_list_t * m_next;
+struct globals {
+	llist_t *db; /* MEs of all modules ever seen (caching for speed) */
+	llist_t *probes; /* MEs of module(s) requested on cmdline */
+	char *cmdline_mopts; /* module options from cmdline */
+	int num_unresolved_deps;
+	/* bool. "Did we have 'symbol:FOO' requested on cmdline?" */
+	smallint need_symbols;
 };
+#define G (*(struct globals*)&bb_common_bufsiz1)
+#define INIT_G() do { } while (0)
 
 
-static struct dep_t *depend;
-static int autoclean, show_only, quiet, do_syslog, verbose;
-static int k_version;
+static int read_config(const char *path);
 
-int parse_tag_value ( char *buffer, char **ptag, char **pvalue )
+static char *gather_options_str(char *opts, const char *append)
 {
-	char *tag, *value;
-
-	while ( isspace ( *buffer ))
-		buffer++;			
-	tag = value = buffer;
-	while ( !isspace ( *value ))
-		value++;
-	*value++ = 0;
-	while ( isspace ( *value ))
-		value++;
-
-	*ptag = tag;
-	*pvalue = value;
-
-	return bb_strlen( tag ) && bb_strlen( value );
+	/* Speed-optimized. We call gather_options_str many times. */
+	if (opts == NULL) {
+		opts = xstrdup(append);
+	} else {
+		int optlen = strlen(opts);
+		opts = xrealloc(opts, optlen + strlen(append) + 2);
+		sprintf(opts + optlen, " %s", append);
+	}
+	return opts;
 }
 
-/* Jump through hoops to simulate how fgets() grabs just one line at a
- * time... Don't use any stdio since modprobe gets called from a kernel
- * thread and stdio junk can overflow the limited stack... 
- */
-static char *reads ( int fd, char *buffer, size_t len )
+static struct module_entry *helper_get_module(const char *module, int create)
 {
-	int n = read ( fd, buffer, len );
-
-	if ( n > 0 ) {
-		char *p;
+	char modname[MODULE_NAME_LEN];
+	struct module_entry *e;
+	llist_t *l;
+
+	filename2modname(module, modname);
+	for (l = G.db; l != NULL; l = l->link) {
+		e = (struct module_entry *) l->data;
+		if (strcmp(e->modname, modname) == 0)
+			return e;
+	}
+	if (!create)
+		return NULL;
 
-		buffer [len-1] = 0;
-		p = strchr ( buffer, '\n' );
+	e = xzalloc(sizeof(*e));
+	e->modname = xstrdup(modname);
+	llist_add_to(&G.db, e);
 
-		if ( p ) {
-			off_t offset;
+	return e;
+}
+static struct module_entry *get_or_add_modentry(const char *module)
+{
+	return helper_get_module(module, 1);
+}
+static struct module_entry *get_modentry(const char *module)
+{
+	return helper_get_module(module, 0);
+}
 
-			offset = lseek ( fd, 0L, SEEK_CUR );               // Get the current file descriptor offset 
-			lseek ( fd, offset-n + (p-buffer) + 1, SEEK_SET ); // Set the file descriptor offset to right after the \n
+static void add_probe(const char *name)
+{
+	struct module_entry *m;
 
-			p[1] = 0;
-		}
-		return buffer;
+	m = get_or_add_modentry(name);
+	if (m->flags & MODULE_FLAG_LOADED) {
+		DBG("skipping %s, it is already loaded", name);
+		return;
 	}
 
-	else
-		return 0;
+	m->probed_name = name;
+	m->flags |= MODULE_FLAG_NEED_DEPS;
+	llist_add_to_end(&G.probes, m);
+	G.num_unresolved_deps++;
+	if (ENABLE_FEATURE_MODUTILS_SYMBOLS
+	 && strncmp(m->modname, "symbol:", 7) == 0
+	) {
+		G.need_symbols = 1;
+	}
 }
 
-static struct dep_t *build_dep ( void )
+static int FAST_FUNC config_file_action(const char *filename,
+					struct stat *statbuf UNUSED_PARAM,
+					void *userdata UNUSED_PARAM,
+					int depth UNUSED_PARAM)
 {
-	int fd;
-	struct utsname un;
-	struct dep_t *first = 0;
-	struct dep_t *current = 0;
-	char buffer[256];
-	char *filename = buffer;
-	int continuation_line = 0;
-
-	k_version = 0;
-	if ( uname ( &un ))
-		return 0;
-
-	// check for buffer overflow in following code
-	if ( bb_strlen ( un.release ) > ( sizeof( buffer ) - 64 )) {
-		return 0;
-	}
-	if (un.release[0] == '2') {
-		k_version = un.release[2] - '0';
-	}
-
-	strcpy ( filename, "/lib/modules/" );
-	strcat ( filename, un.release );
-	strcat ( filename, "/modules.dep" );
-
-	if (( fd = open ( filename, O_RDONLY )) < 0 ) {
-
-		/* Ok, that didn't work.  Fall back to looking in /lib/modules */
-		if (( fd = open ( "/lib/modules/modules.dep", O_RDONLY )) < 0 ) {
-			return 0;
-		}
+	char *tokens[3];
+	parser_t *p;
+        struct module_entry *m;
+	int rc = TRUE;
+
+	if (bb_basename(filename)[0] == '.')
+		goto error;
+
+	p = config_open2(filename, fopen_for_read);
+	if (p == NULL) {
+		rc = FALSE;
+		goto error;
 	}
 
-	while ( reads ( fd, buffer, sizeof( buffer ))) {
-		int l = bb_strlen ( buffer );
-		char *p = 0;
-
-		while ( isspace ( buffer [l-1] )) {
-			buffer [l-1] = 0;
-			l--;
-		}
+	while (config_read(p, tokens, 3, 2, "# \t", PARSE_NORMAL)) {
+//Use index_in_strings?
+		if (strcmp(tokens[0], "alias") == 0) {
+			/* alias <wildcard> <modulename> */
+			llist_t *l;
+			char wildcard[MODULE_NAME_LEN];
+			char *rmod;
 
-		if ( l == 0 ) {
-			continuation_line = 0;
-			continue;
-		}
-
-		if ( !continuation_line ) {		
-			char *col = strchr ( buffer, ':' );
-
-			if ( col ) {
-				char *mods;
-				char *mod;
-				int ext = 0;
-
-				*col = 0;
-				mods = strrchr ( buffer, '/' );
-
-				if ( !mods )
-					mods = buffer;
-				else
-					mods++;
-
-#if defined(CONFIG_FEATURE_2_6_MODULES)
-				if ((k_version > 4) && ( *(col-3) == '.' ) &&
-						( *(col-2) == 'k' ) && ( *(col-1) == 'o' ))
-					ext = 3;
-				else
-#endif
-					if (( *(col-2) == '.' ) && ( *(col-1) == 'o' ))
-						ext = 2;
-
-				mod = bb_xstrndup ( mods, col - mods - ext );
-
-				if ( !current ) {
-					first = current = (struct dep_t *) xmalloc ( sizeof ( struct dep_t ));
-				}
-				else {
-					current-> m_next = (struct dep_t *) xmalloc ( sizeof ( struct dep_t ));
-					current = current-> m_next;
-				}
-				current-> m_module  = mod;
-				current-> m_options = 0;
-				current-> m_isalias = 0;
-				current-> m_depcnt  = 0;
-				current-> m_deparr  = 0;
-				current-> m_next    = 0;
-
-				//printf ( "%s:\n", mod );
-				p = col + 1;		
-			}
-			else
-				p = 0;
-		}
-		else
-			p = buffer;
-
-		while ( p && *p && isblank(*p))
-			p++;
-
-		if ( p && *p ) {
-			char *end = &buffer [l-1];
-			char *deps;
-			char *dep;
-			char *next;
-			int ext = 0;
-
-			while ( isblank ( *end ) || ( *end == '\\' ))
-				end--;
-
-			do
-			{
-				next = strchr (p, ' ' );
-				if (next)
-				{
-					*next = 0;
-					next--;
-				}
-				else
-					next = end;
-
-			deps = strrchr ( p, '/' );
-
-			if ( !deps || ( deps < p )) {
-				deps = p;
-
-				while ( isblank ( *deps ))
-					deps++;
-			}
-			else
-				deps++;
-
-#if defined(CONFIG_FEATURE_2_6_MODULES)
-				if ((k_version > 4) && ( *(next-2) == '.' ) && *(next-1) == 'k'  &&
-						( *next == 'o' ))
-				ext = 3;
-			else
-#endif
-					if (( *(next-1) == '.' ) && ( *next == 'o' ))
-					ext = 2;
-
-			/* Cope with blank lines */
-				if ((next-deps-ext+1) <= 0)
+			if (tokens[2] == NULL)
 				continue;
-				dep = bb_xstrndup ( deps, next - deps - ext + 1 );
-
-			current-> m_depcnt++;
-			current-> m_deparr = (char **) xrealloc ( current-> m_deparr, 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] );
-			p = next + 2;
-			} while (next < end);
-		}
-
-		if ( buffer [l-1] == '\\' )
-			continuation_line = 1;
-		else
-			continuation_line = 0;
-	}
-	close ( fd );
-
-	// 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;
-
-	continuation_line = 0;
-	while ( reads ( fd, buffer, sizeof( buffer ))) {
-		int l;
-		char *p;
-
-		p = strchr ( buffer, '#' );	
-		if ( p )
-			*p = 0;
-
-		l = bb_strlen ( buffer );
-
-		while ( l && isspace ( buffer [l-1] )) {
-			buffer [l-1] = 0;
-			l--;
-		}
-
-		if ( l == 0 ) {
-			continuation_line = 0;
-			continue;
-		}
-
-		if ( !continuation_line ) {		
-			if (( strncmp ( buffer, "alias", 5 ) == 0 ) && isspace ( buffer [5] )) {
-				char *alias, *mod;
-
-				if ( parse_tag_value ( buffer + 6, &alias, &mod )) {
-					// fprintf ( stderr, "ALIAS: '%s' -> '%s'\n", alias, mod );
-
-					if ( !current ) {
-						first = current = (struct dep_t *) xmalloc ( sizeof ( struct dep_t ));
-					}
-					else {
-						current-> m_next = (struct dep_t *) xmalloc ( sizeof ( struct dep_t ));
-						current = current-> m_next;
-					}
-					current-> m_module  = bb_xstrdup ( alias );
-					current-> m_isalias = 1;
-
-					if (( strcmp ( alias, "off" ) == 0 ) || ( strcmp ( alias, "null" ) == 0 )) {
-						current-> m_depcnt = 0;
-						current-> m_deparr = 0;
-					}
-					else {
-						current-> m_depcnt  = 1;
-						current-> m_deparr  = xmalloc ( 1 * sizeof( char * ));
-						current-> m_deparr[0] = bb_xstrdup ( mod );
-					}
-					current-> m_next    = 0;					
+			filename2modname(tokens[1], wildcard);
+
+			for (l = G.probes; l != NULL; l = l->link) {
+				m = (struct module_entry *) l->data;
+				if (fnmatch(wildcard, m->modname, 0) != 0)
+					continue;
+				rmod = filename2modname(tokens[2], NULL);
+				llist_add_to(&m->realnames, rmod);
+
+				if (m->flags & MODULE_FLAG_NEED_DEPS) {
+					m->flags &= ~MODULE_FLAG_NEED_DEPS;
+					G.num_unresolved_deps--;
 				}
-			}				
-			else if (( strncmp ( buffer, "options", 7 ) == 0 ) && isspace ( buffer [7] )) { 
-				char *mod, *opt;
-
-				if ( parse_tag_value ( buffer + 8, &mod, &opt )) {
-					struct dep_t *dt;
-
-					for ( dt = first; dt; dt = dt-> m_next ) {
-						if ( strcmp ( dt-> m_module, 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 );
-					}
+
+				m = get_or_add_modentry(rmod);
+				if (!(m->flags & MODULE_FLAG_NEED_DEPS)) {
+					m->flags |= MODULE_FLAG_NEED_DEPS;
+					G.num_unresolved_deps++;
 				}
 			}
+		} else if (strcmp(tokens[0], "options") == 0) {
+			/* options <modulename> <option...> */
+			if (tokens[2] == NULL)
+				continue;
+			m = get_or_add_modentry(tokens[1]);
+			m->options = gather_options_str(m->options, tokens[2]);
+		} else if (strcmp(tokens[0], "include") == 0) {
+			/* include <filename> */
+			read_config(tokens[1]);
+		} else if (ENABLE_FEATURE_MODPROBE_BLACKLIST
+		 && strcmp(tokens[0], "blacklist") == 0
+		) {
+			/* blacklist <modulename> */
+			get_or_add_modentry(tokens[1])->flags |= MODULE_FLAG_BLACKLISTED;
 		}
 	}
-	close ( fd );
-
-	return first;
+	config_close(p);
+error:
+	return rc;
 }
 
-/* return 1 = loaded, 0 = not loaded, -1 = can't tell */
-static int already_loaded (const char *name)
+static int read_config(const char *path)
 {
-	int fd;
-	char buffer[256];
-
-	fd = open ("/proc/modules", O_RDONLY);
-	if (fd < 0)
-		return -1;
-
-	while ( reads ( fd, buffer, sizeof( buffer ))) {
-		char *p;
-
-		p = strchr (buffer, ' ');
-		if (p) {
-			*p = 0;
-			if (strcmp (name, buffer) == 0) {
-				close (fd);
-				return 1;
-			}
-		}
-	}
-
-	close (fd);
-	return 0;
+	return recursive_action(path, ACTION_RECURSE | ACTION_QUIET,
+				config_file_action, NULL, NULL, 1);
 }
 
-static int mod_process ( struct mod_list_t *list, int do_insert )
+static int do_modprobe(struct module_entry *m)
 {
-	char lcmd [256];
-	int rc = 1;
-
-	while ( list ) {
-		*lcmd = '\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 : "" );
-		} else {
-			if (already_loaded (list->m_module) != 0)
-				snprintf ( lcmd, sizeof( lcmd ) - 1, "rmmod %s %s", do_syslog ? "-s" : "", list-> m_module );
-		}
-
-		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 */
-		}
+	struct module_entry *m2;
+	char *fn, *options;
+	int rc = -1;
 
-		list = do_insert ? list-> m_prev : list-> m_next;
+	if (!(m->flags & MODULE_FLAG_FOUND_IN_MODDEP)) {
+		DBG("skipping %s, not found in modules.dep", m->modname);
+		return -ENOENT;
 	}
-	return (show_only) ? 0 : rc;
-}
-
-static void check_dep ( char *mod, struct mod_list_t **head, struct mod_list_t **tail )
-{
-	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;
-
-	// check dependencies
-	for ( dt = depend; dt; dt = dt-> m_next ) {
-		if ( strcmp ( dt-> m_module, mod ) == 0 ) {
-			opt = dt-> m_options;
-			break;
-		}
-	}
-
-	// resolve alias names
-	while ( dt && dt-> m_isalias ) {
-		if ( dt-> m_depcnt == 1 ) {
-			struct dep_t *adt;
-
-			for ( adt = depend; adt; adt = adt-> m_next ) {
-				if ( strcmp ( adt-> m_module, dt-> m_deparr [0] ) == 0 )
-					break;
-			}
-			if ( adt ) {
-				dt = adt;			
-				mod = dt-> m_module;
-				if ( !opt )
-					opt = dt-> m_options;
-			}
-			else
-				return;
+	DBG("do_modprob'ing %s", m->modname);
+
+	if (!(option_mask32 & MODPROBE_OPT_REMOVE))
+		m->deps = llist_rev(m->deps);
+
+	rc = 0;
+	while (m->deps && rc == 0) {
+		fn = llist_pop(&m->deps);
+		m2 = get_or_add_modentry(fn);
+		if (option_mask32 & MODPROBE_OPT_REMOVE) {
+			if (bb_delete_module(m->modname, O_EXCL) != 0)
+				rc = errno;
+		} else if (!(m2->flags & MODULE_FLAG_LOADED)) {
+			options = m2->options;
+			m2->options = NULL;
+			if (m == m2)
+				options = gather_options_str(options, G.cmdline_mopts);
+			rc = bb_init_module(fn, options);
+			DBG("loaded %s '%s', rc:%d", fn, options, rc);
+			if (rc == 0)
+				m2->flags |= MODULE_FLAG_LOADED;
+			free(options);
+		} else {
+			DBG("%s is already loaded, skipping", fn);
 		}
-		else
-			return;			
-	}
-
-	// search for duplicates
-	for ( find = *head; find; find = find-> m_next ) {
-		if ( !strcmp ( mod, find-> m_module )) {
-			// found -> dequeue it
 
-			if ( find-> m_prev )
-				find-> m_prev-> m_next = find-> m_next;
-			else
-				*head = find-> m_next;
-
-			if ( find-> m_next )
-				find-> m_next-> m_prev = find-> m_prev;
-			else
-				*tail = find-> m_prev;
-
-			break; // there can be only one duplicate
-		}				
+		free(fn);
 	}
 
-	if ( !find ) { // did not find a duplicate
-		find = (struct mod_list_t *) xmalloc ( sizeof(struct mod_list_t));		
-		find-> m_module = mod;
-		find-> m_options = opt;
+//FIXME: what if rc < 0?
+	if (rc > 0 && !(option_mask32 & INSMOD_OPT_SILENT)) {
+		bb_error_msg("failed to %sload module %s: %s",
+			(option_mask32 & MODPROBE_OPT_REMOVE) ? "un" : "",
+			m->probed_name ? m->probed_name : m->modname,
+			moderror(rc)
+		);
 	}
 
-	// enqueue at tail	
-	if ( *tail )
-		(*tail)-> m_next = find;
-	find-> m_prev   = *tail;
-	find-> m_next   = 0;
-
-	if ( !*head )
-		*head = find;
-	*tail = find;
-
-	if ( dt ) {	
-		int i;
-
-		for ( i = 0; i < dt-> m_depcnt; i++ )
-			check_dep ( dt-> m_deparr [i], head, tail );
-	}
+	return rc;
 }
 
-
-
-static int mod_insert ( char *mod, int argc, char **argv )
+static void load_modules_dep(void)
 {
-	struct mod_list_t *tail = 0;
-	struct mod_list_t *head = 0; 	
-	int rc;
-
-	// get dep list for module mod
-	check_dep ( mod, &head, &tail );
-
-	if ( head && tail ) {
-		if ( argc ) {
-			int i;		
-			int l = 0;
-
-			// append module args
-			for ( i = 0; i < argc; i++ ) 
-				l += ( bb_strlen ( argv [i] ) + 1 );
+	struct module_entry *m;
+	char *colon, *tokens[2];
+	parser_t *p;
+
+	/* Modprobe does not work at all without modprobe.dep,
+	 * even if the full module name is given. Returning error here
+	 * was making us later confuse user with this message:
+	 * "module /full/path/to/existing/file/module.ko not found".
+	 * It's better to die immediately, with good message.
+	 * xfopen_for_read provides that. */
+	p = config_open2(CONFIG_DEFAULT_DEPMOD_FILE, xfopen_for_read);
+
+	while (G.num_unresolved_deps
+	 && config_read(p, tokens, 2, 1, "# \t", PARSE_NORMAL)
+	) {
+		colon = last_char_is(tokens[0], ':');
+		if (colon == NULL)
+			continue;
+		*colon = 0;
 
-			head-> m_options = xrealloc ( head-> m_options, l + 1 );
-			head-> m_options [0] = 0;
+		m = get_modentry(tokens[0]);
+		if (m == NULL)
+			continue;
 
-			for ( i = 0; i < argc; i++ ) {
-				strcat ( head-> m_options, argv [i] );
-				strcat ( head-> m_options, " " );
-			}
+		/* Optimization... */
+		if ((m->flags & MODULE_FLAG_LOADED)
+		 && !(option_mask32 & MODPROBE_OPT_REMOVE)
+		) {
+			DBG("skip deps of %s, it's already loaded", tokens[0]);
+			continue;
 		}
 
-		// process tail ---> head
-		rc = mod_process ( tail, 1 );
+		m->flags |= MODULE_FLAG_FOUND_IN_MODDEP;
+		if ((m->flags & MODULE_FLAG_NEED_DEPS) && (m->deps == NULL)) {
+			G.num_unresolved_deps--;
+			llist_add_to(&m->deps, xstrdup(tokens[0]));
+			if (tokens[1])
+				string_to_llist(tokens[1], &m->deps, " ");
+		}
 	}
-	else
-		rc = 1;
-
-	return rc;
+	config_close(p);
 }
 
-static int mod_remove ( char *mod )
+int modprobe_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int modprobe_main(int argc UNUSED_PARAM, char **argv)
 {
+	struct utsname uts;
 	int rc;
-	static struct mod_list_t rm_a_dummy = { "-a", 0, 0 }; 
-
-	struct mod_list_t *head = 0;
-	struct mod_list_t *tail = 0;
-
-	if ( mod )
-		check_dep ( mod, &head, &tail );
-	else  // autoclean
-		head = tail = &rm_a_dummy;
-
-	if ( head && tail )
-		rc = mod_process ( head, 0 );  // process head ---> tail
-	else
-		rc = 1;
-	return rc;
-
-}
-
-
-
-extern int modprobe_main(int argc, char** argv)
-{
-	int	opt;
-	int remove_opt = 0;
-
-	autoclean = show_only = quiet = do_syslog = verbose = 0;
-
-	while ((opt = getopt(argc, argv, "acdklnqrst:vVC:")) != -1) {
-		switch(opt) {
-			case 'c': // no config used
-			case 'l': // no pattern matching
-				return EXIT_SUCCESS;
-				break;
-			case 'C': // no config used
-			case 't': // no pattern matching
-				bb_error_msg_and_die("-t and -C not supported");
-
-			case 'a': // ignore
-			case 'd': // ignore
-				break;
-			case 'k':
-				autoclean++;
-				break;
-			case 'n':
-				show_only++;
-				break;
-			case 'q':
-				quiet++;
-				break;
-			case 'r':
-				remove_opt++;
-				break;
-			case 's':
-				do_syslog++;
-				break;
-			case 'v':
-				verbose++;
-				break;
-			case 'V':
-			default:
-				bb_show_usage();
-				break;
+	unsigned opt;
+	struct module_entry *me;
+
+	opt_complementary = "q-v:v-q";
+	opt = getopt32(argv, INSMOD_OPTS MODPROBE_OPTS INSMOD_ARGS, NULL, NULL);
+	argv += optind;
+
+	if (opt & (MODPROBE_OPT_DUMP_ONLY | MODPROBE_OPT_LIST_ONLY |
+				MODPROBE_OPT_SHOW_ONLY))
+		bb_error_msg_and_die("not supported");
+
+	if (!argv[0]) {
+		if (opt & MODPROBE_OPT_REMOVE) {
+			/* "modprobe -r" (w/o params).
+			 * "If name is NULL, all unused modules marked
+			 * autoclean will be removed".
+			 */
+			if (bb_delete_module(NULL, O_NONBLOCK|O_EXCL) != 0)
+				bb_perror_msg_and_die("rmmod");
 		}
+		return EXIT_SUCCESS;
 	}
 
-	depend = build_dep ( );	
-
-	if ( !depend ) 
-		bb_error_msg_and_die ( "could not parse modules.dep\n" );
+	/* Goto modules location */
+	xchdir(CONFIG_DEFAULT_MODULES_DIR);
+	uname(&uts);
+	xchdir(uts.release);
+
+	/* Retrieve module names of already loaded modules */
+	{
+		char *s;
+		parser_t *parser = config_open2("/proc/modules", fopen_for_read);
+		while (config_read(parser, &s, 1, 1, "# \t", PARSE_NORMAL & ~PARSE_GREEDY))
+			get_or_add_modentry(s)->flags |= MODULE_FLAG_LOADED;
+		config_close(parser);
+	}
 
-	if (remove_opt) {
-		int rc = EXIT_SUCCESS;
+	if (opt & MODPROBE_OPT_INSERT_ALL) {
+		/* Each argument is a module name */
 		do {
-			if (mod_remove ( optind < argc ?
-						bb_xstrdup (argv [optind]) : NULL )) {
-				bb_error_msg ("failed to remove module %s",
-						argv [optind] );
-				rc = EXIT_FAILURE;
-			}
-		} while ( ++optind < argc );
-
-		return rc;
+			add_probe(*argv++);
+		} while (*argv);
+	} else {
+		/* First argument is module name, rest are parameters */
+		add_probe(argv[0]);
+		G.cmdline_mopts = parse_cmdline_module_options(argv);
 	}
 
-	if (optind >= argc) 
-		bb_error_msg_and_die ( "No module or pattern provided\n" );
+	/* Happens if all requested modules are already loaded */
+	if (G.probes == NULL)
+		return EXIT_SUCCESS;
+
+	read_config("/etc/modprobe.conf");
+	read_config("/etc/modprobe.d");
+	if (ENABLE_FEATURE_MODUTILS_SYMBOLS && G.need_symbols)
+		read_config("modules.symbols");
+	load_modules_dep();
+	if (ENABLE_FEATURE_MODUTILS_ALIAS && G.num_unresolved_deps) {
+		read_config("modules.alias");
+		load_modules_dep();
+	}
 
-	if ( mod_insert ( bb_xstrdup ( argv [optind] ), argc - optind - 1, argv + optind + 1 )) 
-		bb_error_msg_and_die ( "failed to load module %s", argv [optind] );
+	while ((me = llist_pop(&G.probes)) != NULL) {
+		if (me->realnames == NULL) {
+			/* This is not an alias. Literal names are blacklisted
+			 * only if '-b' is given.
+			 */
+			if (!(opt & MODPROBE_OPT_BLACKLIST)
+			 || !(me->flags & MODULE_FLAG_BLACKLISTED)
+			) {
+				rc = do_modprobe(me);
+//FIXME: what if rc > 0?
+				if (rc < 0 && !(opt & INSMOD_OPT_SILENT))
+					bb_error_msg("module %s not found",
+						     me->probed_name);
+			}
+		} else {
+			/* Probe all realnames */
+			do {
+				char *realname = llist_pop(&me->realnames);
+				struct module_entry *m2;
+
+				DBG("probing %s by realname %s", me->modname, realname);
+				m2 = get_or_add_modentry(realname);
+				if (!(m2->flags & MODULE_FLAG_BLACKLISTED))
+					do_modprobe(m2);
+//FIXME: error check?
+				free(realname);
+			} while (me->realnames != NULL);
+		}
+	}
 
 	return EXIT_SUCCESS;
 }
-
-