traceroute: fix help text to not show -6 when traceroute6 is off

[oweals/busybox.git] / modutils / modprobe.c

diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index cfc16cb3424127435b9b2ce5a0a93e60af98451c..ca85ee76ba55ceb317b2b5a89a753da7fe85f260 100644 (file)
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -220,6 +220,12 @@ static int read_config(const char *path)
                                config_file_action, NULL, NULL, 1);
 }
 
+static const char *humanly_readable_name(struct module_entry *m)
+{
+       /* probed_name may be NULL. modname always exists. */
+       return m->probed_name ? m->probed_name : m->modname;
+}
+
 /* Return: similar to bb_init_module:
  * 0 on success,
  * -errno on open/read error,
@@ -234,7 +240,8 @@ static int do_modprobe(struct module_entry *m)
 
        if (!(m->flags & MODULE_FLAG_FOUND_IN_MODDEP)) {
                if (!(option_mask32 & INSMOD_OPT_SILENT))
-                       bb_error_msg("module %s not found in modules.dep", m->probed_name);
+                       bb_error_msg("module %s not found in modules.dep",
+                               humanly_readable_name(m));
                return -ENOENT;
        }
        DBG("do_modprob'ing %s", m->modname);
@@ -259,7 +266,7 @@ static int do_modprobe(struct module_entry *m)
                                if (rc) {
                                        if (first) {
                                                bb_error_msg("failed to unload module %s: %s",
-                                                       m2->probed_name ? m2->probed_name : m2->modname,
+                                                       humanly_readable_name(m2),
                                                        moderror(rc));
                                                break;
                                        }
@@ -286,7 +293,7 @@ static int do_modprobe(struct module_entry *m)
                free(options);
                if (rc) {
                        bb_error_msg("failed to load module %s (%s): %s",
-                       m2->probed_name ? m2->probed_name : m2->modname,
+                               humanly_readable_name(m2),
                                fn,
                                moderror(rc)
                        );
@@ -337,7 +344,7 @@ static void load_modules_dep(void)
                        G.num_unresolved_deps--;
                        llist_add_to(&m->deps, xstrdup(tokens[0]));
                        if (tokens[1])
-                               string_to_llist(tokens[1], &m->deps, " ");
+                               string_to_llist(tokens[1], &m->deps, " \t");
                } else
                        DBG("skipping dep line");
        }
@@ -366,7 +373,7 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
                         * "If name is NULL, all unused modules marked
                         * autoclean will be removed".
                         */
-                       if (bb_delete_module(NULL, O_NONBLOCK|O_EXCL) != 0)
+                       if (bb_delete_module(NULL, O_NONBLOCK | O_EXCL) != 0)
                                bb_perror_msg_and_die("rmmod");
                }
                return EXIT_SUCCESS;