*: fix up use of "getopt_longopts" for longopts not in getopt applet
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
diff --git a/miscutils/conspy.c b/miscutils/conspy.c
index 47b9e72..22b29cb 100644
--- a/miscutils/conspy.c
+++ b/miscutils/conspy.c
@@ -367,7 +367,7 @@
unsigned ttynum;
int poll_timeout_ms;
#if ENABLE_LONG_OPTS
- static const char getopt_longopts[] ALIGN1 =
+ static const char conspy_longopts[] ALIGN1 =
"viewonly\0" No_argument "v"
"createdevice\0" No_argument "c"
"neverquit\0" No_argument "Q"
@@ -378,7 +378,7 @@
"framebuffer\0" No_argument "F"
;
- applet_long_options = getopt_longopts;
+ applet_long_options = conspy_longopts;
#endif
#define keybuf bb_common_bufsiz1
setup_common_bufsiz();
diff --git a/util-linux/flock.c b/util-linux/flock.c
index ec35af1..b55e07a 100644
--- a/util-linux/flock.c
+++ b/util-linux/flock.c
@@ -38,13 +38,13 @@
};
#if ENABLE_LONG_OPTS
- static const char getopt_longopts[] ALIGN1 =
+ static const char flock_longopts[] ALIGN1 =
"shared\0" No_argument "s"
"exclusive\0" No_argument "x"
"unlock\0" No_argument "u"
"nonblock\0" No_argument "n"
;
- applet_long_options = getopt_longopts;
+ applet_long_options = flock_longopts;
#endif
opt_complementary = "-1";
diff --git a/util-linux/fstrim.c b/util-linux/fstrim.c
index 49b3ceb..1fbf0c8 100644
--- a/util-linux/fstrim.c
+++ b/util-linux/fstrim.c
@@ -63,13 +63,13 @@
};
#if ENABLE_LONG_OPTS
- static const char getopt_longopts[] ALIGN1 =
+ static const char fstrim_longopts[] ALIGN1 =
"offset\0" Required_argument "o"
"length\0" Required_argument "l"
"minimum\0" Required_argument "m"
"verbose\0" No_argument "v"
;
- applet_long_options = getopt_longopts;
+ applet_long_options = fstrim_longopts;
#endif
opt_complementary = "=1"; /* exactly one non-option arg: the mountpoint */
diff --git a/util-linux/script.c b/util-linux/script.c
index 89b4391..4cb9842 100644
--- a/util-linux/script.c
+++ b/util-linux/script.c
@@ -71,7 +71,7 @@
};
#if ENABLE_LONG_OPTS
- static const char getopt_longopts[] ALIGN1 =
+ static const char script_longopts[] ALIGN1 =
"append\0" No_argument "a"
"command\0" Required_argument "c"
"flush\0" No_argument "f"
@@ -79,7 +79,7 @@
"timing\0" Optional_argument "t"
;
- applet_long_options = getopt_longopts;
+ applet_long_options = script_longopts;
#endif
opt_complementary = "?1"; /* max one arg */