cpio: testsuite for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=466771
[oweals/busybox.git] / modutils / modprobe.c
index 96b442cabd2677c5d25a6d964321191c7064c23b..1a4f5d4d42c60f404a4a316ef46919cf1c9ff373 100644 (file)
@@ -5,23 +5,17 @@
  * 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
- * 
+ *
  * 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.
 */
 
+#include "libbb.h"
 #include <sys/utsname.h>
-#include <sys/types.h>
-#include <sys/wait.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"
+#include <fnmatch.h>
+
+#define line_buffer bb_common_bufsiz1
 
 struct mod_opt_t {     /* one-way list of options to pass to a module */
        char *  m_opt_val;
@@ -30,24 +24,25 @@ struct mod_opt_t {  /* one-way list of options to pass to a module */
 
 struct dep_t { /* one-way list of dependency rules */
        /* a dependency rule */
-       char *  m_name;                         /* the module name*/
-       char *  m_path;                         /* the module file path */
-       struct mod_opt_t *  m_options;  /* the module options */
-       
-       int     m_isalias  : 1;                 /* the module is an alias */
-       int     m_reserved : 15;                /* stuffin' */
+       char *  m_name;                     /* the module name*/
+       char *  m_path;                     /* the module file path */
+       struct mod_opt_t *  m_options;      /* the module options */
+
+       unsigned int m_isalias      :1;     /* the module is an alias */
+       unsigned int m_isblacklisted:1;     /* the module is blacklisted */
+       unsigned int m_reserved     :14;    /* stuffin' */
 
-       int     m_depcnt   : 16;                /* the number of dependable module(s) */
-       char ** m_deparr;                       /* the list of dependable module(s) */
+       unsigned int m_depcnt       :16;    /* the number of dependable module(s) */
+       char ** m_deparr;                   /* the list of dependable module(s) */
 
-       struct dep_t * m_next;                  /* the next dependency rule */
+       struct dep_t * m_next;              /* the next dependency rule */
 };
 
 struct mod_list_t {    /* two-way list of modules to process */
        /* a module description */
-       char *  m_name;
-       char *  m_path;
-       struct mod_opt_t *  m_options;
+       const char * m_name;
+       char * m_path;
+       struct mod_opt_t * m_options;
 
        struct mod_list_t * m_prev;
        struct mod_list_t * m_next;
@@ -55,22 +50,44 @@ struct mod_list_t { /* two-way list of modules to process */
 
 
 static struct dep_t *depend;
-static int autoclean, show_only, quiet, do_syslog, verbose;
 
-static int parse_tag_value ( char *buffer, char **ptag, char **pvalue )
+#define MAIN_OPT_STR "acdklnqrst:vVC:"
+#define INSERT_ALL     1        /* a */
+#define DUMP_CONF_EXIT 2        /* c */
+#define D_OPT_IGNORED  4        /* d */
+#define AUTOCLEAN_FLG  8        /* k */
+#define LIST_ALL       16       /* l */
+#define SHOW_ONLY      32       /* n */
+#define QUIET          64       /* q */
+#define REMOVE_OPT     128      /* r */
+#define DO_SYSLOG      256      /* s */
+#define RESTRICT_DIR   512      /* t */
+#define VERBOSE        1024     /* v */
+#define VERSION_ONLY   2048     /* V */
+#define CONFIG_FILE    4096     /* C */
+
+#define autoclean       (option_mask32 & AUTOCLEAN_FLG)
+#define show_only       (option_mask32 & SHOW_ONLY)
+#define quiet           (option_mask32 & QUIET)
+#define remove_opt      (option_mask32 & REMOVE_OPT)
+#define do_syslog       (option_mask32 & DO_SYSLOG)
+#define verbose         (option_mask32 & VERBOSE)
+
+static int parse_tag_value(char *buffer, char **ptag, char **pvalue)
 {
        char *tag, *value;
 
-       while ( isspace ( *buffer ))
-               buffer++;
+       buffer = skip_whitespace(buffer);
        tag = value = buffer;
-       while ( !isspace ( *value ))
-               if (!*value) return 0;
-               else value++;
-       *value++ = 0;
-       while ( isspace ( *value ))
+       while (!isspace(*value)) {
+               if (!*value)
+                       return 0;
                value++;
-       if (!*value) return 0;
+       }
+       *value++ = '\0';
+       value = skip_whitespace(value);
+       if (!*value)
+               return 0;
 
        *ptag = tag;
        *pvalue = value;
@@ -78,474 +95,500 @@ static int parse_tag_value ( char *buffer, char **ptag, char **pvalue )
        return 1;
 }
 
-/* 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 )
-{
-       int n = read ( fd, buffer, len );
-
-       if ( n > 0 ) {
-               char *p;
-
-               buffer [len-1] = 0;
-               p = strchr ( buffer, '\n' );
-
-               if ( p ) {
-                       off_t offset;
-
-                       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
-
-                       p[1] = 0;
-               }
-               return buffer;
-       }
-
-       else
-               return 0;
-}
-
 /*
  * This function appends an option to a list
  */
-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;
 
-       if( ol ) {
-               while( ol-> m_next ) {
-                       ol = ol-> m_next;
+       if (ol) {
+               while (ol->m_next) {
+                       ol = ol->m_next;
                }
-               ol-> m_next = xmalloc( sizeof( struct mod_opt_t ) );
-               ol = ol-> m_next;
+               ol->m_next = xzalloc(sizeof(struct mod_opt_t));
+               ol = ol->m_next;
        } else {
-               ol = opt_list = xmalloc( sizeof( struct mod_opt_t ) );
+               ol = opt_list = xzalloc(sizeof(struct mod_opt_t));
        }
 
-       ol-> m_opt_val = bb_xstrdup( opt );
-       ol-> m_next = NULL;
+       ol->m_opt_val = xstrdup(opt);
+       /*ol->m_next = NULL; - done by xzalloc*/
 
        return opt_list;
 }
 
-#if (defined CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS)
-/* static char* parse_command_string( char* src, char **dst );
+#if ENABLE_FEATURE_MODPROBE_MULTIPLE_OPTIONS
+/* static char* parse_command_string(char* src, char **dst);
  *   src: pointer to string containing argument
  *   dst: pointer to where to store the parsed argument
  *   return value: the pointer to the first char after the parsed argument,
  *                 NULL if there was no argument parsed (only trailing spaces).
- *   Note that memory is allocated with bb_xstrdup when a new argument was
+ *   Note that memory is allocated with xstrdup when a new argument was
  *   parsed. Don't forget to free it!
  */
 #define ARG_EMPTY      0x00
 #define ARG_IN_DQUOTES 0x01
 #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;
        char* tmp_str;
 
        /* Dumb you, I have nothing to do... */
-       if( src == NULL ) return src;
+       if (src == NULL) return src;
 
        /* Skip leading spaces */
-       while( *src == ' ' ) {
+       while (*src == ' ') {
                src++;
        }
        /* Is the end of string reached? */
-       if( *src == '\0' ) {
+       if (*src == '\0') {
                return NULL;
        }
        /* Reached the start of an argument
         * By the way, we duplicate a little too much
         * here but what is too much is freed later. */
-       *dst = tmp_str = bb_xstrdup( src );
+       *dst = tmp_str = xstrdup(src);
        /* Get to the end of that argument */
-       while(    ( *tmp_str != '\0' )
-              && (    ( *tmp_str != ' ' )
-                   || ( opt_status & ( ARG_IN_DQUOTES | ARG_IN_SQUOTES ) ) ) ) {
-               switch( *tmp_str ) {
-                       case '\'':
-                               if( opt_status & ARG_IN_DQUOTES ) {
-                                       /* Already in double quotes, keep current char as is */
-                               } else {
-                                       /* shift left 1 char, until end of string: get rid of the opening/closing quotes */
-                                       memmove( tmp_str, tmp_str + 1, strlen( tmp_str ) );
-                                       /* mark me: we enter or leave single quotes */
-                                       opt_status ^= ARG_IN_SQUOTES;
-                                       /* Back one char, as we need to re-scan the new char there. */
-                                       tmp_str--;
-                               }
+       while (*tmp_str != '\0'
+        && (*tmp_str != ' ' || (opt_status & (ARG_IN_DQUOTES | ARG_IN_SQUOTES)))
+       ) {
+               switch (*tmp_str) {
+               case '\'':
+                       if (opt_status & ARG_IN_DQUOTES) {
+                               /* Already in double quotes, keep current char as is */
+                       } else {
+                               /* shift left 1 char, until end of string: get rid of the opening/closing quotes */
+                               memmove(tmp_str, tmp_str + 1, strlen(tmp_str));
+                               /* mark me: we enter or leave single quotes */
+                               opt_status ^= ARG_IN_SQUOTES;
+                               /* Back one char, as we need to re-scan the new char there. */
+                               tmp_str--;
+                       }
                        break;
-                       case '"':
-                               if( opt_status & ARG_IN_SQUOTES ) {
-                                       /* Already in single quotes, keep current char as is */
-                               } else {
-                                       /* shift left 1 char, until end of string: get rid of the opening/closing quotes */
-                                       memmove( tmp_str, tmp_str + 1, strlen( tmp_str ) );
-                                       /* mark me: we enter or leave double quotes */
-                                       opt_status ^= ARG_IN_DQUOTES;
-                                       /* Back one char, as we need to re-scan the new char there. */
-                                       tmp_str--;
-                               }
+               case '"':
+                       if (opt_status & ARG_IN_SQUOTES) {
+                               /* Already in single quotes, keep current char as is */
+                       } else {
+                               /* shift left 1 char, until end of string: get rid of the opening/closing quotes */
+                               memmove(tmp_str, tmp_str + 1, strlen(tmp_str));
+                               /* mark me: we enter or leave double quotes */
+                               opt_status ^= ARG_IN_DQUOTES;
+                               /* Back one char, as we need to re-scan the new char there. */
+                               tmp_str--;
+                       }
                        break;
-                       case '\\':
-                               if( opt_status & ARG_IN_SQUOTES ) {
-                                       /* Between single quotes: keep as is. */
-                               } else {
-                                       switch( *(tmp_str+1) ) {
-                                               case 'a':
-                                               case 'b':
-                                               case 't':
-                                               case 'n':
-                                               case 'v':
-                                               case 'f':
-                                               case 'r':
-                                               case '0':
-                                                       /* We escaped a special character. For now, keep
-                                                        * both the back-slash and the following char. */
-                                                       tmp_str++; src++;
-                                                       break;
-                                               default:
-                                                       /* We escaped a space or a single or double quote,
-                                                        * or a back-slash, or a non-escapable char. Remove
-                                                        * the '\' and keep the new current char as is. */
-                                                       memmove( tmp_str, tmp_str + 1, strlen( tmp_str ) );
-                                                       break;
-                                       }
+               case '\\':
+                       if (opt_status & ARG_IN_SQUOTES) {
+                               /* Between single quotes: keep as is. */
+                       } else {
+                               switch (*(tmp_str+1)) {
+                               case 'a':
+                               case 'b':
+                               case 't':
+                               case 'n':
+                               case 'v':
+                               case 'f':
+                               case 'r':
+                               case '0':
+                                       /* We escaped a special character. For now, keep
+                                        * both the back-slash and the following char. */
+                                       tmp_str++;
+                                       src++;
+                                       break;
+                               default:
+                                       /* We escaped a space or a single or double quote,
+                                        * or a back-slash, or a non-escapable char. Remove
+                                        * the '\' and keep the new current char as is. */
+                                       memmove(tmp_str, tmp_str + 1, strlen(tmp_str));
+                                       break;
                                }
+                       }
+                       break;
+               /* Any other char that is special shall appear here.
+                * Example: $ starts a variable
+               case '$':
+                       do_variable_expansion();
+                       break;
+                * */
+               default:
+                       /* any other char is kept as is. */
                        break;
-                       /* Any other char that is special shall appear here.
-                        * Example: $ starts a variable
-                       case '$':
-                               do_variable_expansion();
-                               break;
-                        * */
-                       default:
-                               /* any other char is kept as is. */
-                               break;
                }
                tmp_str++; /* Go to next char */
                src++; /* Go to next char to find the end of the argument. */
        }
        /* End of string, but still no ending quote */
-       if( opt_status & ( ARG_IN_DQUOTES | ARG_IN_SQUOTES ) ) {
-               bb_error_msg_and_die( "unterminated (single or double) quote in options list: %s", src );
+       if (opt_status & (ARG_IN_DQUOTES | ARG_IN_SQUOTES)) {
+               bb_error_msg_and_die("unterminated (single or double) quote in options list: %s", src);
        }
-       *tmp_str = '\0';
-       *dst = xrealloc( *dst, strlen( *dst ) );
+       *tmp_str++ = '\0';
+       *dst = xrealloc(*dst, (tmp_str - *dst));
        return src;
 }
-#endif /* CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS */
+#else
+#define parse_command_string(src, dst) (0)
+#endif /* ENABLE_FEATURE_MODPROBE_MULTIPLE_OPTIONS */
+
+static int is_conf_command(char *buffer, const char *command)
+{
+       int len = strlen(command);
+       return ((strstr(buffer, command) == buffer) &&
+                       isspace(buffer[len]));
+}
 
 /*
- * This function builds a list of dependency rules from /lib/modules/`uname -r\modules.dep.
- * It then fills every modules and aliases with their  default options, found by parsing
+ * This function reads aliases and default module options from a configuration file
+ * (/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)
+{
+       int continuation_line = 0;
+
+       // alias parsing is not 100% correct (no correct handling of continuation lines within an alias)!
+
+       while (reads(fd, buffer, buflen)) {
+               int l;
+
+               *strchrnul(buffer, '#') = '\0';
+
+               l = strlen(buffer);
+
+               while (l && isspace(buffer[l-1])) {
+                       buffer[l-1] = '\0';
+                       l--;
+               }
+
+               if (l == 0) {
+                       continuation_line = 0;
+                       continue;
+               }
+
+               if (continuation_line)
+                       continue;
+
+               if (is_conf_command(buffer, "alias")) {
+                       char *alias, *mod;
+
+                       if (parse_tag_value(buffer + 6, &alias, &mod)) {
+                               /* handle alias as a module dependent on the aliased module */
+                               if (!*current) {
+                                       (*first) = (*current) = xzalloc(sizeof(struct dep_t));
+                               } else {
+                                       (*current)->m_next = xzalloc(sizeof(struct dep_t));
+                                       (*current) = (*current)->m_next;
+                               }
+                               (*current)->m_name = xstrdup(alias);
+                               (*current)->m_isalias = 1;
+
+                               if ((strcmp(mod, "off") == 0) || (strcmp(mod, "null") == 0)) {
+                                       /*(*current)->m_depcnt = 0; - done by xzalloc */
+                                       /*(*current)->m_deparr = 0;*/
+                               } else {
+                                       (*current)->m_depcnt = 1;
+                                       (*current)->m_deparr = xmalloc(sizeof(char *));
+                                       (*current)->m_deparr[0] = xstrdup(mod);
+                               }
+                               /*(*current)->m_next = NULL; - done by xzalloc */
+                       }
+               } else if (is_conf_command(buffer, "options")) {
+                       char *mod, *opt;
+
+                       /* split the line in the module/alias name, and options */
+                       if (parse_tag_value(buffer + 8, &mod, &opt)) {
+                               struct dep_t *dt;
+
+                               /* find the corresponding module */
+                               for (dt = *first; dt; dt = dt->m_next) {
+                                       if (strcmp(dt->m_name, mod) == 0)
+                                               break;
+                               }
+                               if (dt) {
+                                       if (ENABLE_FEATURE_MODPROBE_MULTIPLE_OPTIONS) {
+                                               char* new_opt = NULL;
+                                               while ((opt = parse_command_string(opt, &new_opt))) {
+                                                       dt->m_options = append_option(dt->m_options, new_opt);
+                                               }
+                                       } else {
+                                               dt->m_options = append_option(dt->m_options, opt);
+                                       }
+                               }
+                       }
+               } else if (is_conf_command(buffer, "include")) {
+                       int fdi;
+                       char *filename;
+
+                       filename = skip_whitespace(buffer + 8);
+                       fdi = open(filename, O_RDONLY);
+                       if (fdi >= 0) {
+                               include_conf(first, current, buffer, buflen, fdi);
+                               close(fdi);
+                       }
+               } else if (ENABLE_FEATURE_MODPROBE_BLACKLIST &&
+                               (is_conf_command(buffer, "blacklist"))) {
+                       char *mod;
+                       struct dep_t *dt;
+
+                       mod = skip_whitespace(buffer + 10);
+                       for (dt = *first; dt; dt = dt->m_next) {
+                               if (strcmp(dt->m_name, mod) == 0)
+                                       break;
+                       }
+                       if (dt)
+                               dt->m_isblacklisted = 1;
+               }
+       } /* while (reads(...)) */
+}
+
+/*
+ * This function builds a list of dependency rules from /lib/modules/`uname -r`/modules.dep.
+ * It then fills every modules and aliases with their default options, found by parsing
  * modprobe.conf (or modules.conf, or conf.modules).
  */
-static struct dep_t *build_dep ( void )
+static struct dep_t *build_dep(void)
 {
        int fd;
        struct utsname un;
-       struct dep_t *first = 0;
-       struct dep_t *current = 0;
-       char buffer[2048];
-       char *filename = buffer;
+       struct dep_t *first = NULL;
+       struct dep_t *current = NULL;
+       char *filename;
        int continuation_line = 0;
        int k_version;
 
-       k_version = 0;
-       if ( uname ( &un ))
+       if (uname(&un))
                bb_error_msg_and_die("can't determine kernel version");
 
-       // check for buffer overflow in following code
-       if ( bb_strlen ( un.release ) > ( sizeof( buffer ) - 64 )) {
-               return 0;
-       }
+       k_version = 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 ) {
-
+       filename = xasprintf(CONFIG_DEFAULT_MODULES_DIR"/%s/"CONFIG_DEFAULT_DEPMOD_FILE, un.release);
+       fd = open(filename, O_RDONLY);
+       if (ENABLE_FEATURE_CLEAN_UP)
+               free(filename);
+       if (fd < 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;
+               fd = open(CONFIG_DEFAULT_MODULES_DIR"/"CONFIG_DEFAULT_DEPMOD_FILE, O_RDONLY);
+               if (fd < 0) {
+                       bb_error_msg_and_die("cannot parse " CONFIG_DEFAULT_DEPMOD_FILE);
                }
        }
 
-       while ( reads ( fd, buffer, sizeof( buffer ))) {
-               int l = bb_strlen ( buffer );
+       while (reads(fd, line_buffer, sizeof(line_buffer))) {
+               int l = strlen(line_buffer);
                char *p = 0;
 
-               while ( isspace ( buffer [l-1] )) {
-                       buffer [l-1] = 0;
+               while (l > 0 && isspace(line_buffer[l-1])) {
+                       line_buffer[l-1] = '\0';
                        l--;
                }
 
-               if ( l == 0 ) {
+               if (l == 0) {
                        continuation_line = 0;
                        continue;
                }
 
                /* Is this a new module dep description? */
-               if ( !continuation_line ) {
-                       /* find the dep begining */
-                       char *col = strchr ( buffer, ':' );
+               if (!continuation_line) {
+                       /* find the dep beginning */
+                       char *col = strchr(line_buffer, ':');
                        char *dot = col;
 
-                       if ( col ) {
+                       if (col) {
                                /* This line is a dep description */
-                               char *mods;
+                               const char *mods;
                                char *modpath;
                                char *mod;
 
                                /* Find the beginning of the module file name */
-                               *col = 0;
-                               mods = strrchr ( buffer, '/' );
-
-                               if ( !mods )
-                                       mods = buffer; /* no path for this module */
-                               else
-                                       mods++; /* there was a path for this module... */
+                               *col = '\0';
+                               mods = bb_basename(line_buffer);
 
                                /* find the path of the module */
-                               modpath = strchr ( buffer, '/' ); /* ... and this is the path */
-                               if ( !modpath )
-                                       modpath = buffer; /* module with no path */
+                               modpath = strchr(line_buffer, '/'); /* ... and this is the path */
+                               if (!modpath)
+                                       modpath = line_buffer; /* module with no path */
                                /* find the end of the module name in the file name */
-                               if ( ENABLE_FEATURE_2_6_MODULES &&
-                                    (k_version > 4) && ( *(col-3) == '.' ) &&
-                                    ( *(col-2) == 'k' ) && ( *(col-1) == 'o' ) )
+                               if (ENABLE_FEATURE_2_6_MODULES &&
+                                   (k_version > 4) && (col[-3] == '.') &&
+                                   (col[-2] == 'k') && (col[-1] == 'o'))
                                        dot = col - 3;
-                               else
-                                       if (( *(col-2) == '.' ) && ( *(col-1) == 'o' ))
-                                               dot = col - 2;
+                               else if ((col[-2] == '.') && (col[-1] == 'o'))
+                                       dot = col - 2;
 
-                               mod = bb_xstrndup ( mods, dot - mods );
+                               mod = xstrndup(mods, dot - mods);
 
                                /* enqueue new module */
-                               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;
+                               if (!current) {
+                                       first = current = xzalloc(sizeof(struct dep_t));
+                               } else {
+                                       current->m_next = xzalloc(sizeof(struct dep_t));
+                                       current = current->m_next;
                                }
-                               current-> m_name  = mod;
-                               current-> m_path  = bb_xstrdup(modpath);
-                               current-> m_options = NULL;
-                               current-> m_isalias = 0;
-                               current-> m_depcnt  = 0;
-                               current-> m_deparr  = 0;
-                               current-> m_next    = 0;
+                               current->m_name = mod;
+                               current->m_path = xstrdup(modpath);
+                               /*current->m_options = NULL; - xzalloc did it*/
+                               /*current->m_isalias = 0;*/
+                               /*current->m_depcnt = 0;*/
+                               /*current->m_deparr = 0;*/
+                               /*current->m_next = 0;*/
 
                                p = col + 1;
-                       }
-                       else
+                       } else
                                /* this line is not a dep description */
-                               p = 0;
-               }
-               else
+                               p = NULL;
+               } else
                        /* It's a dep description continuation */
-                       p = buffer;
-
-               while ( p && *p && isblank(*p))
-                       p++;
+                       p = line_buffer;
 
                /* p points to the first dependable module; if NULL, no dependable module */
-               if ( p && *p ) {
-                       char *end = &buffer [l-1];
-                       char *deps;
+               if (p && (p = skip_whitespace(p))[0] != '\0') {
+                       char *end = &line_buffer[l-1];
+                       const char *deps;
                        char *dep;
                        char *next;
                        int ext = 0;
 
-                       while ( isblank ( *end ) || ( *end == '\\' ))
+                       while (isblank(*end) || (*end == '\\'))
                                end--;
 
-                       do
-                       {
+                       do {
                                /* search the end of the dependency */
-                               next = strchr (p, ' ' );
-                               if (next)
-                               {
-                                       *next = 0;
+                               next = strchr(p, ' ');
+                               if (next) {
+                                       *next = '\0';
                                        next--;
-                               }
-                               else
+                               } else
                                        next = end;
 
-                               /* find the begining of the module file name */
-                               deps = strrchr ( p, '/' );
-
-                               if ( !deps || ( deps < p )) {
-                                       deps = p;
-
-                                       while ( isblank ( *deps ))
-                                               deps++;
-                               }
-                               else
-                                       deps++;
+                               /* find the beginning of the module file name */
+                               deps = bb_basename(p);
+                               if (deps == p)
+                                       deps = skip_whitespace(deps);
 
                                /* find the end of the module name in the file name */
-                               if ( ENABLE_FEATURE_2_6_MODULES &&
-                                    (k_version > 4) && ( *(next-2) == '.' ) &&
-                                    ( *(next-1) == 'k' )  && ( *next == 'o' ) )
+                               if (ENABLE_FEATURE_2_6_MODULES
+                                && (k_version > 4) && (next[-2] == '.')
+                                && (next[-1] == 'k') && (next[0] == 'o'))
                                        ext = 3;
-                               else
-                                       if (( *(next-1) == '.' ) && ( *next == 'o' ))
-                                               ext = 2;
+                               else if ((next[-1] == '.') && (next[0] == 'o'))
+                                       ext = 2;
 
                                /* Cope with blank lines */
                                if ((next-deps-ext+1) <= 0)
                                        continue;
-                               dep = bb_xstrndup ( deps, next - deps - ext + 1 );
+                               dep = xstrndup(deps, next - deps - ext + 1);
 
                                /* Add the new dependable module name */
-                               current-> m_depcnt++;
-                               current-> m_deparr = (char **) xrealloc ( current-> m_deparr,
-                                               sizeof ( char *) * current-> m_depcnt );
-                               current-> m_deparr [current-> m_depcnt - 1] = dep;
+                               current->m_deparr = xrealloc_vector(current->m_deparr, 2, current->m_depcnt);
+                               current->m_deparr[current->m_depcnt++] = dep;
 
                                p = next + 2;
                        } while (next < end);
                }
 
                /* is there other dependable module(s) ? */
-               if ( buffer [l-1] == '\\' )
-                       continuation_line = 1;
-               else
-                       continuation_line = 0;
+               continuation_line = (line_buffer[l-1] == '\\');
+       } /* while (reads(...)) */
+       close(fd);
+
+       /*
+        * First parse system-specific options and aliases
+        * as they take precedence over the kernel ones.
+        * >=2.6: we only care about modprobe.conf
+        * <=2.4: we care about modules.conf and conf.modules
+        */
+       if (ENABLE_FEATURE_2_6_MODULES
+        && (fd = open("/etc/modprobe.conf", O_RDONLY)) < 0)
+               if (ENABLE_FEATURE_2_4_MODULES
+                && (fd = open("/etc/modules.conf", O_RDONLY)) < 0)
+                       if (ENABLE_FEATURE_2_4_MODULES)
+                               fd = open("/etc/conf.modules", O_RDONLY);
+
+       if (fd >= 0) {
+               include_conf(&first, &current, line_buffer, sizeof(line_buffer), fd);
+               close(fd);
        }
-       close ( fd );
-
-       // alias parsing is not 100% correct (no correct handling of continuation lines within an alias) !
-
-#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 ))) {
-               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--;
+       /* Only 2.6 has a modules.alias file */
+       if (ENABLE_FEATURE_2_6_MODULES) {
+               /* Parse kernel-declared module aliases */
+               filename = xasprintf(CONFIG_DEFAULT_MODULES_DIR"/%s/modules.alias", un.release);
+               fd = open(filename, O_RDONLY);
+               if (fd < 0) {
+                       /* Ok, that didn't work.  Fall back to looking in /lib/modules */
+                       fd = open(CONFIG_DEFAULT_MODULES_DIR"/modules.alias", O_RDONLY);
                }
+               if (ENABLE_FEATURE_CLEAN_UP)
+                       free(filename);
 
-               if ( l == 0 ) {
-                       continuation_line = 0;
-                       continue;
+               if (fd >= 0) {
+                       include_conf(&first, &current, line_buffer, sizeof(line_buffer), fd);
+                       close(fd);
                }
 
-               if ( !continuation_line ) {
-                       if (( strncmp ( buffer, "alias", 5 ) == 0 ) && isspace ( buffer [5] )) {
-                               char *alias, *mod;
-
-                               if ( parse_tag_value ( buffer + 6, &alias, &mod )) {
-                                       /* handle alias as a module dependent on the aliased module */
-                                       if ( !current ) {
-                                               first = current = (struct dep_t *) xcalloc ( 1, sizeof ( struct dep_t ));
-                                       }
-                                       else {
-                                               current-> m_next = (struct dep_t *) xcalloc ( 1, sizeof ( struct dep_t ));
-                                               current = current-> m_next;
-                                       }
-                                       current-> m_name  = bb_xstrdup ( alias );
-                                       current-> m_isalias = 1;
-
-                                       if (( strcmp ( mod, "off" ) == 0 ) || ( strcmp ( mod, "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;
-                               }
-                       }
-                       else if (( strncmp ( buffer, "options", 7 ) == 0 ) && isspace ( buffer [7] )) {
-                               char *mod, *opt;
-
-                               /* split the line in the module/alias name, and options */
-                               if ( parse_tag_value ( buffer + 8, &mod, &opt )) {
-                                       struct dep_t *dt;
+               /* Parse kernel-declared symbol aliases */
+               filename = xasprintf(CONFIG_DEFAULT_MODULES_DIR"/%s/modules.symbols", un.release);
+               fd = open(filename, O_RDONLY);
+               if (fd < 0) {
+                       /* Ok, that didn't work.  Fall back to looking in /lib/modules */
+                       fd = open(CONFIG_DEFAULT_MODULES_DIR"/modules.symbols", O_RDONLY);
+               }
+               if (ENABLE_FEATURE_CLEAN_UP)
+                       free(filename);
 
-                                       /* find the corresponding module */
-                                       for ( dt = first; dt; dt = dt-> m_next ) {
-                                               if ( strcmp ( dt-> m_name, mod ) == 0 )
-                                                       break;
-                                       }
-                                       if ( dt ) {
-                                               if ( CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS ) {
-                                                       char* new_opt = NULL;
-                                                       while( ( opt = parse_command_string( opt, &new_opt ) ) ) {
-                                                               dt-> m_options = append_option( dt-> m_options, new_opt );
-                                                       }
-                                               } else {
-                                                       dt-> m_options = append_option( dt-> m_options, opt );
-                                               }
-                                       }
-                               }
-                       }
+               if (fd >= 0) {
+                       include_conf(&first, &current, line_buffer, sizeof(line_buffer), fd);
+                       close(fd);
                }
        }
-       close ( fd );
 
        return first;
 }
 
 /* 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;
-       char buffer[4096];
+       int fd, ret = 0;
 
-       fd = open ("/proc/modules", O_RDONLY);
+       fd = open("/proc/modules", O_RDONLY);
        if (fd < 0)
                return -1;
 
-       while ( reads ( fd, buffer, sizeof( buffer ))) {
+       while (reads(fd, line_buffer, sizeof(line_buffer))) {
                char *p;
 
-               p = strchr (buffer, ' ');
+               p = strchr(line_buffer, ' ');
                if (p) {
-                       *p = 0;
-                       for( p = buffer; ENABLE_FEATURE_2_6_MODULES && *p; p++ ) {
-                               *p = ((*p)=='-')?'_':*p;
-                       }
-                       if (strcmp (name, buffer) == 0) {
-                               close (fd);
-                               return 1;
+                       const char *n;
+
+                       // Truncate buffer at first space and check for matches, with
+                       // the idiosyncrasy that _ and - are interchangeable because the
+                       // 2.6 kernel does weird things.
+
+                       *p = '\0';
+                       for (p = line_buffer, n = name; ; p++, n++) {
+                               if (*p != *n) {
+                                       if ((*p == '_' || *p == '-') && (*n == '_' || *n == '-'))
+                                               continue;
+                                       break;
+                               }
+                               // If we made it to the end, that's a match.
+                               if (!*p) {
+                                       ret = 1;
+                                       goto done;
+                               }
                        }
                }
        }
-
-       close (fd);
-       return 0;
+ done:
+       close(fd);
+       return ret;
 }
 
-static int mod_process ( struct mod_list_t *list, int do_insert )
+static int mod_process(const struct mod_list_t *list, int do_insert)
 {
        int rc = 0;
        char **argv = NULL;
@@ -553,9 +596,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;
 
-       while ( list ) {
+       while (list) {
                argc = 0;
-               if( ENABLE_FEATURE_CLEAN_UP )
+               if (ENABLE_FEATURE_CLEAN_UP)
                        argc_malloc = 0;
                /* If CONFIG_FEATURE_CLEAN_UP is not defined, then we leak memory
                 * each time we allocate memory for argv.
@@ -568,38 +611,40 @@ 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
                 * problem. */
                /* enough for minimal insmod (5 args + NULL) or rmmod (3 args + NULL) */
-               argv = (char**) malloc( 6 * sizeof( char* ) );
-               if ( do_insert ) {
-                       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";
-                               else if(verbose) /* verbose and quiet are mutually exclusive */
-                                       argv[argc++] = "-v";
-                               argv[argc++] = list-> m_path;
-                               if( ENABLE_FEATURE_CLEAN_UP )
+               argv = xmalloc(6 * sizeof(char*));
+               if (do_insert) {
+                       if (already_loaded(list->m_name) != 1) {
+                               argv[argc++] = (char*)"insmod";
+                               if (ENABLE_FEATURE_2_4_MODULES) {
+                                       if (do_syslog)
+                                               argv[argc++] = (char*)"-s";
+                                       if (autoclean)
+                                               argv[argc++] = (char*)"-k";
+                                       if (quiet)
+                                               argv[argc++] = (char*)"-q";
+                                       else if (verbose) /* verbose and quiet are mutually exclusive */
+                                               argv[argc++] = (char*)"-v";
+                               }
+                               argv[argc++] = list->m_path;
+                               if (ENABLE_FEATURE_CLEAN_UP)
                                        argc_malloc = argc;
-                               opts = list-> m_options;
-                               while( opts ) {
+                               opts = list->m_options;
+                               while (opts) {
                                        /* Add one more option */
                                        argc++;
-                                       argv = (char**) xrealloc( argv, ( argc + 1 ) * sizeof( char* ) );
-                                       argv[argc-1] = opts-> m_opt_val;
-                                       opts = opts-> m_next;
+                                       argv = xrealloc(argv, (argc + 1) * sizeof(char*));
+                                       argv[argc-1] = opts->m_opt_val;
+                                       opts = opts->m_next;
                                }
                        }
                } else {
                        /* modutils uses short name for removal */
-                       if (already_loaded (list->m_name) != 0) {
-                               argv[argc++] = "rmmod";
+                       if (already_loaded(list->m_name) != 0) {
+                               argv[argc++] = (char*)"rmmod";
                                if (do_syslog)
-                                       argv[argc++] = "-s";
-                               argv[argc++] = list->m_name;
-                               if( ENABLE_FEATURE_CLEAN_UP )
+                                       argv[argc++] = (char*)"-s";
+                               argv[argc++] = (char*)list->m_name;
+                               if (ENABLE_FEATURE_CLEAN_UP)
                                        argc_malloc = argc;
                        }
                }
@@ -607,269 +652,259 @@ static int mod_process ( struct mod_list_t *list, int do_insert )
 
                if (argc) {
                        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) {
-                               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;
-                               }
+                               int rc2 = wait4pid(spawn(argv));
+
                                if (do_insert) {
                                        rc = rc2; /* only last module matters */
-                               }
-                               else if (!rc2) {
+                               } else if (!rc2) {
                                        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
                                 * it is the terminating NULL, so we must not free it. */
-                               while( argc_malloc < argc ) {
-                                       free( argv[argc_malloc++] );
+                               while (argc_malloc < argc) {
+                                       free(argv[argc_malloc++]);
+                               }
                        }
                }
-               if( ENABLE_FEATURE_CLEAN_UP ) {
-                       free( argv );
+               if (ENABLE_FEATURE_CLEAN_UP) {
+                       free(argv);
                        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;
 }
 
+/*
+ * Check the matching between a pattern and a module name.
+ * We need this as *_* is equivalent to *-*, even in pattern matching.
+ */
+static int check_pattern(const char* pat_src, const char* mod_src)
+{
+       int ret;
+
+       if (ENABLE_FEATURE_MODPROBE_FANCY_ALIAS) {
+               char* pat;
+               char* mod;
+               char* p;
+
+               pat = xstrdup(pat_src);
+               mod = xstrdup(mod_src);
+
+               for (p = pat; (p = strchr(p, '-')); *p++ = '_');
+               for (p = mod; (p = strchr(p, '-')); *p++ = '_');
+
+               ret = fnmatch(pat, mod, 0);
+
+               if (ENABLE_FEATURE_CLEAN_UP) {
+                       free(pat);
+                       free(mod);
+               }
+
+               return ret;
+       }
+       return fnmatch(pat_src, mod_src, 0);
+}
+
 /*
  * Builds the dependency list (aka stack) of a module.
  * 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)
  */
-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 dep_t *dt;
-       struct mod_opt_t *opt = 0;
-       char *path = 0;
-
-       // check dependencies
-       for ( dt = depend; dt; dt = dt-> m_next ) {
-               if ( strcmp ( dt-> m_name, mod ) == 0) {
+       struct mod_opt_t *opt = NULL;
+       char *path = NULL;
+
+       /* Search for the given module name amongst all dependency rules.
+        * The module name in a dependency rule can be a shell 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,
+        * then we consider it a pattern, and matching will still work. */
+       for (dt = depend; dt; dt = dt->m_next) {
+               if (check_pattern(dt->m_name, mod) == 0) {
                        break;
                }
        }
 
-       if( !dt ) {
-               bb_error_msg ("module %s not found.", mod);
+       if (!dt) {
+               bb_error_msg("module %s not found", mod);
                return;
        }
 
        // resolve alias names
-       while ( dt-> m_isalias ) {
-               if ( dt-> m_depcnt == 1 ) {
+       while (dt->m_isalias) {
+               if (dt->m_depcnt == 1) {
                        struct dep_t *adt;
 
-                       for ( adt = depend; adt; adt = adt-> m_next ) {
-                               if ( strcmp ( adt-> m_name, dt-> m_deparr [0] ) == 0 )
+                       for (adt = depend; adt; adt = adt->m_next) {
+                               if (check_pattern(adt->m_name, dt->m_deparr[0]) == 0 &&
+                                               !(ENABLE_FEATURE_MODPROBE_BLACKLIST &&
+                                                       adt->m_isblacklisted))
                                        break;
                        }
-                       if ( adt ) {
+                       if (adt) {
                                /* 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 */
-                               while( opts ) {
-                                       adt-> m_options = append_option( adt-> m_options, opts-> m_opt_val );
-                                       opts = opts-> m_next;
+                               while (opts) {
+                                       adt->m_options = append_option(adt->m_options, opts->m_opt_val);
+                                       opts = opts->m_next;
                                }
                                dt = adt;
-                       }
-                       else {
-                               bb_error_msg ("module %s not found.", mod);
+                       } else {
+                               bb_error_msg("module %s not found", mod);
                                return;
                        }
-               }
-               else {
-                       bb_error_msg ("Bad alias %s", dt-> m_name);
+               } else {
+                       bb_error_msg("bad alias %s", dt->m_name);
                        return;
                }
        }
 
-       mod = dt-> m_name;
-       path = dt-> m_path;
-       opt = dt-> m_options;
-                       
+       mod = dt->m_name;
+       path = dt->m_path;
+       opt = dt->m_options;
+
        // search for duplicates
-       for ( find = *head; find; find = find-> m_next ) {
-               if ( !strcmp ( mod, find-> m_name )) {
+       for (find = *head; find; find = find->m_next) {
+               if (strcmp(mod, find->m_name) == 0) {
                        // found -> dequeue it
 
-                       if ( find-> m_prev )
-                               find-> m_prev-> m_next = find-> m_next;
+                       if (find->m_prev)
+                               find->m_prev->m_next = find->m_next;
                        else
-                               *head = find-> m_next;
+                               *head = find->m_next;
 
-                       if ( find-> m_next )
-                               find-> m_next-> m_prev = find-> m_prev;
+                       if (find->m_next)
+                               find->m_next->m_prev = find->m_prev;
                        else
-                               *tail = find-> m_prev;
+                               *tail = find->m_prev;
 
                        break; // there can be only one duplicate
                }
        }
 
-       if ( !find ) { // did not find a duplicate
-               find = (struct mod_list_t *) xmalloc ( sizeof(struct mod_list_t));
-               find-> m_name = mod;
-               find-> m_path = path;
-               find-> m_options = opt;
+       if (!find) { // did not find a duplicate
+               find = xzalloc(sizeof(struct mod_list_t));
+               find->m_name = mod;
+               find->m_path = path;
+               find->m_options = opt;
        }
 
        // enqueue at tail
-       if ( *tail )
-               (*tail)-> m_next = find;
-       find-> m_prev   = *tail;
-       find-> m_next   = 0;
+       if (*tail)
+               (*tail)->m_next = find;
+       find->m_prev = *tail;
+       find->m_next = NULL; /* possibly NOT done by xzalloc! */
 
-       if ( !*head )
+       if (!*head)
                *head = find;
        *tail = find;
 
-       if ( dt ) {
+       if (dt) {
                int i;
 
                /* Add all dependable module for that new module */
-               for ( i = 0; i < dt-> m_depcnt; i++ )
-                       check_dep ( dt-> m_deparr [i], head, tail );
+               for (i = 0; i < dt->m_depcnt; i++)
+                       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 *head = 0;
+       struct mod_list_t *tail = NULL;
+       struct mod_list_t *head = NULL;
        int rc;
 
        // get dep list for module mod
-       check_dep ( mod, &head, &tail );
+       check_dep(mod, &head, &tail);
 
-       if ( head && tail ) {
-               if( argc ) {
+       rc = 1;
+       if (head && tail) {
+               if (argc) {
                        int i;
                        // append module args
-                       for ( i = 0; i < argc; i++ )
-                               head->m_options = append_option( head->m_options, argv[i] );
+                       for (i = 0; i < argc; i++)
+                               head->m_options = append_option(head->m_options, argv[i]);
                }
 
                // process tail ---> head
-               rc = mod_process ( tail, 1 );
+               rc = mod_process(tail, 1);
+               if (rc) {
+                       /*
+                        * In case of using udev, multiple instances of modprobe can be
+                        * spawned to load the same module (think of two same usb devices,
+                        * for example; or cold-plugging at boot time). Thus we shouldn't
+                        * fail if the module was loaded, and not by us.
+                        */
+                       if (already_loaded(mod))
+                               rc = 0;
+               }
        }
-       else
-               rc = 1;
-
        return rc;
 }
 
-static int mod_remove ( char *mod )
+static int mod_remove(char *mod)
 {
        int rc;
-       static struct mod_list_t rm_a_dummy = { "-a", 0, 0 };
+       static const struct mod_list_t rm_a_dummy = { "-a", NULL, NULL, NULL, NULL };
 
-       struct mod_list_t *head = 0;
-       struct mod_list_t *tail = 0;
+       struct mod_list_t *head = NULL;
+       struct mod_list_t *tail = NULL;
 
-       if ( mod )
-               check_dep ( mod, &head, &tail );
+       if (mod)
+               check_dep(mod, &head, &tail);
        else  // autoclean
-               head = tail = &rm_a_dummy;
+               head = tail = (struct mod_list_t*) &rm_a_dummy;
 
-       if ( head && tail )
-               rc = mod_process ( head, 0 );  // process head ---> tail
-       else
-               rc = 1;
+       rc = 1;
+       if (head && tail)
+               rc = mod_process(head, 0);  // process head ---> tail
        return rc;
-
 }
 
-extern int modprobe_main(int argc, char** argv)
+int modprobe_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+int modprobe_main(int argc, char **argv)
 {
-       int     opt;
        int rc = EXIT_SUCCESS;
-       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++; verbose=0;
-                               break;
-                       case 'r':
-                               remove_opt++;
-                               break;
-                       case 's':
-                               do_syslog++;
-                               break;
-                       case 'v':
-                               verbose++; quiet=0;
-                               break;
-                       case 'V':
-                       default:
-                               bb_show_usage();
-                               break;
-               }
-       }
+       char *unused;
+
+       opt_complementary = "q-v:v-q";
+       getopt32(argv, MAIN_OPT_STR, &unused, &unused);
+
+       if (option_mask32 & (DUMP_CONF_EXIT | LIST_ALL))
+               return EXIT_SUCCESS;
+       if (option_mask32 & (RESTRICT_DIR | CONFIG_FILE))
+               bb_error_msg_and_die("-t and -C not supported");
 
-       depend = build_dep ( );
+       depend = build_dep();
 
-       if ( !depend )
-               bb_error_msg_and_die ( "could not parse modules.dep\n" );
+       if (!depend)
+               bb_error_msg_and_die("cannot parse "CONFIG_DEFAULT_DEPMOD_FILE);
 
        if (remove_opt) {
                do {
-                       if (mod_remove ( optind < argc ?
-                                               bb_xstrdup (argv [optind]) : NULL )) {
-                               bb_error_msg ("failed to remove module %s",
-                                               argv [optind] );
+                       /* argv[optind] can be NULL here */
+                       if (mod_remove(argv[optind])) {
+                               bb_error_msg("failed to %s module %s", "remove",
+                                               argv[optind]);
                                rc = EXIT_FAILURE;
                        }
-               } while ( ++optind < argc );
+               } while (++optind < argc);
        } else {
                if (optind >= argc)
-                       bb_error_msg_and_die ( "No module or pattern provided\n" );
+                       bb_error_msg_and_die("no module or pattern provided");
 
-               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] );
+               if (mod_insert(argv[optind], argc - optind - 1, argv + optind + 1))
+                       bb_error_msg_and_die("failed to %s module %s", "load", argv[optind]);
        }
 
        /* Here would be a good place to free up memory allocated during the dependencies build. */