diff options
Diffstat (limited to 'coreutils')
| -rw-r--r-- | coreutils/env.c | 11 | ||||
| -rw-r--r-- | coreutils/install.c | 25 | ||||
| -rw-r--r-- | coreutils/ls.c | 9 | ||||
| -rw-r--r-- | coreutils/mkdir.c | 13 | ||||
| -rw-r--r-- | coreutils/mv.c | 11 | ||||
| -rw-r--r-- | coreutils/od_bloaty.c | 23 |
6 files changed, 43 insertions, 49 deletions
diff --git a/coreutils/env.c b/coreutils/env.c index ad30f01..8d20eac 100644 --- a/coreutils/env.c +++ b/coreutils/env.c @@ -35,11 +35,10 @@ extern char **environ; #include "libbb.h" #if ENABLE_FEATURE_ENV_LONG_OPTIONS -static const struct option env_long_options[] = { - { "ignore-environment", 0, NULL, 'i' }, - { "unset", 1, NULL, 'u' }, - { 0, 0, 0, 0 } -}; +static const char env_longopts[] = + "ignore-environment\0" No_argument "i" + "unset\0" Required_argument "u" + "\0"; #endif int env_main(int argc, char** argv); @@ -53,7 +52,7 @@ int env_main(int argc, char** argv) opt_complementary = "u::"; #if ENABLE_FEATURE_ENV_LONG_OPTIONS - applet_long_options = env_long_options; + applet_long_options = env_longopts; #endif opt = getopt32(argc, argv, "+iu:", &unset_env); argv += optind; diff --git a/coreutils/install.c b/coreutils/install.c index 8d71fa0..8d54949 100644 --- a/coreutils/install.c +++ b/coreutils/install.c @@ -16,20 +16,19 @@ #include "libcoreutils/coreutils.h" #if ENABLE_FEATURE_INSTALL_LONG_OPTIONS -static const struct option install_long_options[] = { - { "directory", 0, NULL, 'd' }, - { "preserve-timestamps", 0, NULL, 'p' }, - { "strip", 0, NULL, 's' }, - { "group", 0, NULL, 'g' }, - { "mode", 0, NULL, 'm' }, - { "owner", 0, NULL, 'o' }, +static const char install_longopts[] = + "directory\0" No_argument "d" + "preserve-timestamps\0" No_argument "p" + "strip\0" No_argument "s" + "group\0" No_argument "g" + "mode\0" No_argument "m" + "owner\0" No_argument "o" #if ENABLE_SELINUX - { "context", 1, NULL, 'Z' }, - { "preserve_context", 0, NULL, 0xff }, - { "preserve-context", 0, NULL, 0xff }, + "context\0" Required_argument "Z" + "preserve_context\0" No_argument "\xff" + "preserve-context\0" No_argument "\xff" #endif - { 0, 0, 0, 0 } -}; + "\0"; #endif @@ -97,7 +96,7 @@ int install_main(int argc, char **argv) }; #if ENABLE_FEATURE_INSTALL_LONG_OPTIONS - applet_long_options = install_long_options; + applet_long_options = install_longopts; #endif opt_complementary = "s--d:d--s" USE_SELINUX(":Z--\xff:\xff--Z"); /* -c exists for backwards compatibility, it's needed */ diff --git a/coreutils/ls.c b/coreutils/ls.c index a5bd0e3..8545edd 100644 --- a/coreutils/ls.c +++ b/coreutils/ls.c @@ -117,13 +117,12 @@ SPLIT_SUBDIR = 2, /* colored LS support by JaWi, janwillem.janssen@lxtreme.nl */ #if ENABLE_FEATURE_LS_COLOR -static int show_color; +static smallint show_color; /* long option entry used only for --color, which has no short option * equivalent */ -static const struct option ls_color_opt[] = { - { "color", optional_argument, NULL, 1 }, - { NULL, 0, NULL, 0 } -}; +static const char ls_color_opt[] = + "color\0" Optional_argument "\xff" /* no short equivalent */ + "\0"; #else enum { show_color = 0 }; #endif diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c index 60c03a1..b0595b4 100644 --- a/coreutils/mkdir.c +++ b/coreutils/mkdir.c @@ -25,14 +25,13 @@ /* This is a NOFORK applet. Be very careful! */ #if ENABLE_FEATURE_MKDIR_LONG_OPTIONS -static const struct option mkdir_long_options[] = { - { "mode" , 1, NULL, 'm' }, - { "parents", 0, NULL, 'p' }, +static const char mkdir_longopts[] = + "mode\0" Required_argument "m" + "parents\0" No_argument "p" #if ENABLE_SELINUX - { "context", 1, NULL, 'Z' }, + "context\0" Required_argument "Z" #endif - { NULL, 0, NULL, 0 } -}; + "\0"; #endif int mkdir_main(int argc, char **argv); @@ -48,7 +47,7 @@ int mkdir_main(int argc, char **argv) #endif #if ENABLE_FEATURE_MKDIR_LONG_OPTIONS - applet_long_options = mkdir_long_options; + applet_long_options = mkdir_longopts; #endif opt = getopt32(argc, argv, "m:p" USE_SELINUX("Z:"), &smode USE_SELINUX(,&scontext)); if (opt & 1) { diff --git a/coreutils/mv.c b/coreutils/mv.c index 8d9c982..bb96af8 100644 --- a/coreutils/mv.c +++ b/coreutils/mv.c @@ -21,11 +21,10 @@ #include "libcoreutils/coreutils.h" #if ENABLE_FEATURE_MV_LONG_OPTIONS -static const struct option mv_long_options[] = { - { "interactive", 0, NULL, 'i' }, - { "force", 0, NULL, 'f' }, - { 0, 0, 0, 0 } -}; +static const char mv_longopts[] = + "interactive\0" No_argument "i" + "force\0" No_argument "f" + "\0"; #endif #define OPT_FILEUTILS_FORCE 1 @@ -45,7 +44,7 @@ int mv_main(int argc, char **argv) int copy_flag = 0; #if ENABLE_FEATURE_MV_LONG_OPTIONS - applet_long_options = mv_long_options; + applet_long_options = mv_longopts; #endif opt_complementary = "f-i:i-f"; flags = getopt32(argc, argv, "fi"); diff --git a/coreutils/od_bloaty.c b/coreutils/od_bloaty.c index af5eba9..335efe7 100644 --- a/coreutils/od_bloaty.c +++ b/coreutils/od_bloaty.c @@ -1242,17 +1242,16 @@ int od_main(int argc, char **argv) OPT_traditional = (1 << 18) * ENABLE_GETOPT_LONG, }; #if ENABLE_GETOPT_LONG - static const struct option long_options[] = { - { "skip-bytes", required_argument, NULL, 'j' }, - { "address-radix", required_argument, NULL, 'A' }, - { "read-bytes", required_argument, NULL, 'N' }, - { "format", required_argument, NULL, 't' }, - { "output-duplicates", no_argument, NULL, 'v' }, - { "strings", optional_argument, NULL, 'S' }, - { "width", optional_argument, NULL, 'w' }, - { "traditional", no_argument, NULL, 0xff }, - { NULL, 0, NULL, 0 } - }; + static const char od_longopts[] = + "skip-bytes\0" Required_argument "j" + "address-radix\0" Required_argument "A" + "read-bytes\0" Required_argument "N" + "format\0" Required_argument "t" + "output-duplicates\0" No_argument "v" + "strings\0" Optional_argument "S" + "width\0" Optional_argument "w" + "traditional\0" No_argument "\xff" + "\0"; #endif char *str_A, *str_N, *str_j, *str_S; char *str_w = NULL; @@ -1267,7 +1266,7 @@ int od_main(int argc, char **argv) /* Parse command line */ opt_complementary = "t::"; // list #if ENABLE_GETOPT_LONG - applet_long_options = long_options; + applet_long_options = od_longopts; #endif opt = getopt32(argc, argv, "A:N:abcdfhij:lot:vxsS:" "w::", // -w with optional param |