00677b5e3
Denys Vlasenko
2017-08-08
Subject
*: fix up use of "getopt_longopts" for longopts not in getopt applet
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
miscutils/conspy.c+2 -2
| @@ -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(); | |
util-linux/flock.c+2 -2
| @@ -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"; | |
util-linux/fstrim.c+2 -2
| @@ -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 */ | |
util-linux/script.c+2 -2
| @@ -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 */ | |