aboutsummaryrefslogtreecommitdiff
path: root/modutils
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2006-10-06 09:49:47 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2006-10-06 09:49:47 +0000
commitc12f53090bd41dbb87279083bc442769cb0610f0 (patch)
tree079fff1c37f04ea7f25f00cdc4360d52a69b77c5 /modutils
parent4e6ceb44554d265eed24c414b9a201d51d00fee2 (diff)
downloadbusybox-c12f53090bd41dbb87279083bc442769cb0610f0.tar.gz
dnsd fix; option_mask32 added. dnsd needs more love.
Diffstat (limited to 'modutils')
-rw-r--r--modutils/insmod.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/modutils/insmod.c b/modutils/insmod.c
index 0554def06..348feed8d 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -693,7 +693,6 @@ enum { STRVERSIONLEN = 32 };
/*======================================================================*/
-static unsigned option_mask;
#define OPTION_STR "sLo:fkvqx" USE_FEATURE_INSMOD_LOAD_MAP("m")
enum {
OPT_s = 0x1, // -s /* log to syslog */
@@ -713,13 +712,13 @@ enum {
OPT_x = 0x80, // -x /* do not export externs */
OPT_m = 0x100, // -m /* print module load map */
};
-#define flag_force_load (option_mask & OPT_f)
-#define flag_autoclean (option_mask & OPT_k)
-#define flag_verbose (option_mask & OPT_v)
-#define flag_quiet (option_mask & OPT_q)
-#define flag_noexport (option_mask & OPT_x)
+#define flag_force_load (option_mask32 & OPT_f)
+#define flag_autoclean (option_mask32 & OPT_k)
+#define flag_verbose (option_mask32 & OPT_v)
+#define flag_quiet (option_mask32 & OPT_q)
+#define flag_noexport (option_mask32 & OPT_x)
#ifdef CONFIG_FEATURE_INSMOD_LOAD_MAP
-#define flag_print_load_map (option_mask & OPT_m)
+#define flag_print_load_map (option_mask32 & OPT_m)
#else
#define flag_print_load_map 0
#endif
@@ -3983,8 +3982,8 @@ int insmod_main( int argc, char **argv)
struct utsname myuname;
/* Parse any options */
- option_mask = getopt32(argc, argv, OPTION_STR, &opt_o);
- if (option_mask & OPT_o) { // -o /* name the output module */
+ getopt32(argc, argv, OPTION_STR, &opt_o);
+ if (option_mask32 & OPT_o) { // -o /* name the output module */
free(m_name);
m_name = xstrdup(opt_o);
}