diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2017-08-08 14:59:35 +0200 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-08-08 14:59:35 +0200 |
| commit | 00677b5e35dd97f415f0b0bef25b55865f55ab33 (patch) | |
| tree | fa4fa2a08cecfa8edafb21d26e07e28b9ca10d74 | |
| parent | ddd1ee44436c2ec7e0125ca128c9a148bea8a2c0 (diff) | |
| download | busybox-00677b5e35dd97f415f0b0bef25b55865f55ab33.tar.gz | |
*: fix up use of "getopt_longopts" for longopts not in getopt applet
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
| -rw-r--r-- | miscutils/conspy.c | 4 | ||||
| -rw-r--r-- | util-linux/flock.c | 4 | ||||
| -rw-r--r-- | util-linux/fstrim.c | 4 | ||||
| -rw-r--r-- | util-linux/script.c | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/miscutils/conspy.c b/miscutils/conspy.c index 47b9e7207..22b29cbf3 100644 --- a/miscutils/conspy.c +++ b/miscutils/conspy.c @@ -367,7 +367,7 @@ int conspy_main(int argc UNUSED_PARAM, char **argv) 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 @@ int conspy_main(int argc UNUSED_PARAM, char **argv) "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 ec35af18f..b55e07adb 100644 --- a/util-linux/flock.c +++ b/util-linux/flock.c @@ -38,13 +38,13 @@ int flock_main(int argc UNUSED_PARAM, char **argv) }; #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 49b3ceb72..1fbf0c857 100644 --- a/util-linux/fstrim.c +++ b/util-linux/fstrim.c @@ -63,13 +63,13 @@ int fstrim_main(int argc UNUSED_PARAM, char **argv) }; #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 89b439163..4cb9842a0 100644 --- a/util-linux/script.c +++ b/util-linux/script.c @@ -71,7 +71,7 @@ int script_main(int argc UNUSED_PARAM, char **argv) }; #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 @@ int script_main(int argc UNUSED_PARAM, char **argv) "timing\0" Optional_argument "t" ; - applet_long_options = getopt_longopts; + applet_long_options = script_longopts; #endif opt_complementary = "?1"; /* max one arg */ |