2 files changed, 89 insertions, 51 deletions

diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index a5cf4babf..73df39c6c 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -10,6 +10,20 @@
 
 //applet:IF_MODPROBE(APPLET(modprobe, _BB_DIR_SBIN, _BB_SUID_DROP))
 
+#include "libbb.h"
+#include "modutils.h"
+#include <sys/utsname.h>
+#include <fnmatch.h>
+
+//#define DBG(fmt, ...) bb_error_msg("%s: " fmt, __func__, ## __VA_ARGS__)
+#define DBG(...) ((void)0)
+
+/* Note that unlike older versions of modules.dep/depmod (busybox and m-i-t),
+ * we expect the full dependency list to be specified in modules.dep.
+ * Older versions would only export the direct dependency list.
+ */
+
+
 //usage:#if !ENABLE_MODPROBE_SMALL
 //usage:#define modprobe_notes_usage
 //usage:        "modprobe can (un)load a stack of modules, passing each module options (when\n"
@@ -72,9 +86,8 @@
 //usage:       "   from the command line\n"
 //usage:
 //usage:#define modprobe_trivial_usage
-//usage:        "[-alrqvs"
-//usage:        IF_FEATURE_MODPROBE_BLACKLIST("b")
-//usage:        "] MODULE [symbol=value]..."
+//usage:        "[-alrqvsD" IF_FEATURE_MODPROBE_BLACKLIST("b") "]"
+//usage:        " MODULE [symbol=value]..."
 //usage:#define modprobe_full_usage "\n\n"
 //usage:       "Options:"
 //usage:     "\n        -a      Load multiple MODULEs"
@@ -83,43 +96,50 @@
 //usage:     "\n        -q      Quiet"
 //usage:     "\n        -v      Verbose"
 //usage:     "\n        -s      Log to syslog"
+//usage:     "\n        -D      Show dependencies"
 //usage:        IF_FEATURE_MODPROBE_BLACKLIST(
 //usage:     "\n        -b      Apply blacklist to module names too"
 //usage:        )
 //usage:#endif /* !ENABLE_MODPROBE_SMALL */
 
-#include "libbb.h"
-#include "modutils.h"
-#include <sys/utsname.h>
-#include <fnmatch.h>
-
-//#define DBG(fmt, ...) bb_error_msg("%s: " fmt, __func__, ## __VA_ARGS__)
-#define DBG(...) ((void)0)
-
-/* Note that unlike older versions of modules.dep/depmod (busybox and m-i-t),
- * we expect the full dependency list to be specified in modules.dep.
- * Older versions would only export the direct dependency list.
- */
-
 /* Note that usage text doesn't document various 2.4 options
  * we pull in through INSMOD_OPTS define */
-
-#define MODPROBE_COMPLEMENTARY "q-v:v-q:l--ar:a--lr:r--al"
-#define MODPROBE_OPTS  "alr" IF_FEATURE_MODPROBE_BLACKLIST("b")
-//#define MODPROBE_COMPLEMENTARY "q-v:v-q:l--acr:a--lr:r--al"
+#define MODPROBE_OPTS  "alrD" IF_FEATURE_MODPROBE_BLACKLIST("b")
+/* -a and -D _are_ in fact compatible */
+#define MODPROBE_COMPLEMENTARY ("q-v:v-q:l--arD:r--alD:a--lr:D--rl")
 //#define MODPROBE_OPTS  "acd:lnrt:C:" IF_FEATURE_MODPROBE_BLACKLIST("b")
+//#define MODPROBE_COMPLEMENTARY "q-v:v-q:l--acr:a--lr:r--al"
 enum {
-        MODPROBE_OPT_INSERT_ALL = (INSMOD_OPT_UNUSED << 0), /* a */
-        //MODPROBE_OPT_DUMP_ONLY= (INSMOD_OPT_UNUSED << x), /* c */
-        //MODPROBE_OPT_DIRNAME  = (INSMOD_OPT_UNUSED << x), /* d */
-        MODPROBE_OPT_LIST_ONLY  = (INSMOD_OPT_UNUSED << 1), /* l */
-        //MODPROBE_OPT_SHOW_ONLY= (INSMOD_OPT_UNUSED << x), /* n */
-        MODPROBE_OPT_REMOVE     = (INSMOD_OPT_UNUSED << 2), /* r */
-        //MODPROBE_OPT_RESTRICT = (INSMOD_OPT_UNUSED << x), /* t */
-        //MODPROBE_OPT_VERONLY  = (INSMOD_OPT_UNUSED << x), /* V */
-        //MODPROBE_OPT_CONFIGFILE=(INSMOD_OPT_UNUSED << x), /* C */
-        MODPROBE_OPT_BLACKLIST  = (INSMOD_OPT_UNUSED << 3) * ENABLE_FEATURE_MODPROBE_BLACKLIST,
+        OPT_INSERT_ALL   = (INSMOD_OPT_UNUSED << 0), /* a */
+        //OPT_DUMP_ONLY  = (INSMOD_OPT_UNUSED << x), /* c */
+        //OPT_DIRNAME    = (INSMOD_OPT_UNUSED << x), /* d */
+        OPT_LIST_ONLY    = (INSMOD_OPT_UNUSED << 1), /* l */
+        //OPT_SHOW_ONLY  = (INSMOD_OPT_UNUSED << x), /* n */
+        OPT_REMOVE       = (INSMOD_OPT_UNUSED << 2), /* r */
+        //OPT_RESTRICT   = (INSMOD_OPT_UNUSED << x), /* t */
+        //OPT_VERONLY    = (INSMOD_OPT_UNUSED << x), /* V */
+        //OPT_CONFIGFILE = (INSMOD_OPT_UNUSED << x), /* C */
+        OPT_SHOW_DEPS    = (INSMOD_OPT_UNUSED << 3), /* D */
+        OPT_BLACKLIST    = (INSMOD_OPT_UNUSED << 4) * ENABLE_FEATURE_MODPROBE_BLACKLIST,
 };
+#if ENABLE_LONG_OPTS
+static const char modprobe_longopts[] ALIGN1 =
+        /* nobody asked for long opts (yet) */
+        // "all\0"          No_argument "a"
+        // "list\0"         No_argument "l"
+        // "remove\0"       No_argument "r"
+        // "quiet\0"        No_argument "q"
+        // "verbose\0"      No_argument "v"
+        // "syslog\0"       No_argument "s"
+        /* module-init-tools 3.11.1 has only long opt --show-depends
+         * but no short -D, we provide long opt for scripts which
+         * were written for 3.11.1: */
+        "show-depends\0" No_argument "D"
+        // IF_FEATURE_MODPROBE_BLACKLIST(
+        // "use-blacklist\0" No_argument "b"
+        // )
+        ;
+#endif
 
 #define MODULE_FLAG_LOADED              0x0001
 #define MODULE_FLAG_NEED_DEPS           0x0002
@@ -145,9 +165,13 @@ struct globals {
         int num_unresolved_deps;
         /* bool. "Did we have 'symbol:FOO' requested on cmdline?" */
         smallint need_symbols;
+        struct utsname uts;
 } FIX_ALIASING;
 #define G (*(struct globals*)&bb_common_bufsiz1)
 #define INIT_G() do { } while (0)
+struct BUG_G_too_big {
+        char BUG_G_too_big[sizeof(G) <= COMMON_BUFSIZE ? 1 : -1];
+};
 
 
 static int read_config(const char *path);
@@ -202,7 +226,7 @@ static void add_probe(const char *name)
         struct module_entry *m;
 
         m = get_or_add_modentry(name);
-        if (!(option_mask32 & MODPROBE_OPT_REMOVE)
+        if (!(option_mask32 & (OPT_REMOVE | OPT_SHOW_DEPS))
          && (m->flags & MODULE_FLAG_LOADED)
         ) {
                 DBG("skipping %s, it is already loaded", name);
@@ -353,8 +377,6 @@ static char *parse_and_add_kcmdline_module_options(char *options, const char *mo
  */
 static int do_modprobe(struct module_entry *m)
 {
-        struct module_entry *m2 = m2; /* for compiler */
-        char *fn, *options;
         int rc, first;
         llist_t *l;
 
@@ -366,7 +388,7 @@ static int do_modprobe(struct module_entry *m)
         }
         DBG("do_modprob'ing %s", m->modname);
 
-        if (!(option_mask32 & MODPROBE_OPT_REMOVE))
+        if (!(option_mask32 & OPT_REMOVE))
                 m->deps = llist_rev(m->deps);
 
         for (l = m->deps; l != NULL; l = l->link)
@@ -375,11 +397,14 @@ static int do_modprobe(struct module_entry *m)
         first = 1;
         rc = 0;
         while (m->deps) {
+                struct module_entry *m2;
+                char *fn, *options;
+
                 rc = 0;
                 fn = llist_pop(&m->deps); /* we leak it */
                 m2 = get_or_add_modentry(fn);
 
-                if (option_mask32 & MODPROBE_OPT_REMOVE) {
+                if (option_mask32 & OPT_REMOVE) {
                         /* modprobe -r */
                         if (m2->flags & MODULE_FLAG_LOADED) {
                                 rc = bb_delete_module(m2->modname, O_EXCL);
@@ -399,16 +424,27 @@ static int do_modprobe(struct module_entry *m)
                         continue;
                 }
 
-                if (m2->flags & MODULE_FLAG_LOADED) {
-                        DBG("%s is already loaded, skipping", fn);
-                        continue;
-                }
-
                 options = m2->options;
                 m2->options = NULL;
                 options = parse_and_add_kcmdline_module_options(options, m2->modname);
                 if (m == m2)
                         options = gather_options_str(options, G.cmdline_mopts);
+
+                if (option_mask32 & OPT_SHOW_DEPS) {
+                        printf(options ? "insmod %s/%s/%s %s\n"
+                                        : "insmod %s/%s/%s\n",
+                                CONFIG_DEFAULT_MODULES_DIR, G.uts.release, fn,
+                                options);
+                        free(options);
+                        continue;
+                }
+
+                if (m2->flags & MODULE_FLAG_LOADED) {
+                        DBG("%s is already loaded, skipping", fn);
+                        free(options);
+                        continue;
+                }
+
                 rc = bb_init_module(fn, options);
                 DBG("loaded %s '%s', rc:%d", fn, options, rc);
                 if (rc == EEXIST)
@@ -456,7 +492,7 @@ static void load_modules_dep(void)
 
                 /* Optimization... */
                 if ((m->flags & MODULE_FLAG_LOADED)
-                 && !(option_mask32 & MODPROBE_OPT_REMOVE)
+                 && !(option_mask32 & (OPT_REMOVE | OPT_SHOW_DEPS))
                 ) {
                         DBG("skip deps of %s, it's already loaded", tokens[0]);
                         continue;
@@ -477,21 +513,23 @@ static void load_modules_dep(void)
 int modprobe_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int modprobe_main(int argc UNUSED_PARAM, char **argv)
 {
-        struct utsname uts;
         int rc;
         unsigned opt;
         struct module_entry *me;
 
+        INIT_G();
+
+        IF_LONG_OPTS(applet_long_options = modprobe_longopts;)
         opt_complementary = MODPROBE_COMPLEMENTARY;
         opt = getopt32(argv, INSMOD_OPTS MODPROBE_OPTS INSMOD_ARGS);
         argv += optind;
 
         /* Goto modules location */
         xchdir(CONFIG_DEFAULT_MODULES_DIR);
-        uname(&uts);
-        xchdir(uts.release);
+        uname(&G.uts);
+        xchdir(G.uts.release);
 
-        if (opt & MODPROBE_OPT_LIST_ONLY) {
+        if (opt & OPT_LIST_ONLY) {
                 char name[MODULE_NAME_LEN];
                 char *colon, *tokens[2];
                 parser_t *p = config_open2(CONFIG_DEFAULT_DEPMOD_FILE, xfopen_for_read);
@@ -521,7 +559,7 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
                 logmode = LOGMODE_SYSLOG;
 
         if (!argv[0]) {
-                if (opt & MODPROBE_OPT_REMOVE) {
+                if (opt & OPT_REMOVE) {
                         /* "modprobe -r" (w/o params).
                          * "If name is NULL, all unused modules marked
                          * autoclean will be removed".
@@ -541,7 +579,7 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
                 config_close(parser);
         }
 
-        if (opt & (MODPROBE_OPT_INSERT_ALL | MODPROBE_OPT_REMOVE)) {
+        if (opt & (OPT_INSERT_ALL | OPT_REMOVE)) {
                 /* Each argument is a module name */
                 do {
                         DBG("adding module %s", *argv);
@@ -575,7 +613,7 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
                         /* This is not an alias. Literal names are blacklisted
                          * only if '-b' is given.
                          */
-                        if (!(opt & MODPROBE_OPT_BLACKLIST)
+                        if (!(opt & OPT_BLACKLIST)
                          || !(me->flags & MODULE_FLAG_BLACKLISTED)
                         ) {
                                 rc |= do_modprobe(me);
@@ -592,7 +630,7 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
                         m2 = get_or_add_modentry(realname);
                         if (!(m2->flags & MODULE_FLAG_BLACKLISTED)
                          && (!(m2->flags & MODULE_FLAG_LOADED)
-                            || (opt & MODPROBE_OPT_REMOVE))
+                            || (opt & (OPT_REMOVE | OPT_SHOW_DEPS)))
                         ) {
 //TODO: we can pass "me" as 2nd param to do_modprobe,
 //and make do_modprobe emit more meaningful error messages
diff --git a/modutils/rmmod.c b/modutils/rmmod.c
index dde77731f..2486511d7 100644
--- a/modutils/rmmod.c
+++ b/modutils/rmmod.c
@@ -35,9 +35,9 @@ int rmmod_main(int argc UNUSED_PARAM, char **argv)
         /* Parse command line. */
         n = getopt32(argv, "wfas"); // -s ignored
         argv += optind;
-        if (n & 1)      // --wait
+        if (n & 1)  // --wait
                 flags &= ~O_NONBLOCK;
-        if (n & 2)      // --force
+        if (n & 2)  // --force
                 flags |= O_TRUNC;
         if (n & 4) {
                 /* Unload _all_ unused modules via NULL delete_module() call */