diff options
Diffstat (limited to 'util-linux')
| -rw-r--r-- | util-linux/dmesg.c | 3 | ||||
| -rw-r--r-- | util-linux/fdisk.c | 3 | ||||
| -rw-r--r-- | util-linux/getopt.c | 3 | ||||
| -rw-r--r-- | util-linux/mkfs_ext2.c | 3 | ||||
| -rw-r--r-- | util-linux/mkfs_minix.c | 3 | ||||
| -rw-r--r-- | util-linux/mkfs_reiser.c | 4 | ||||
| -rw-r--r-- | util-linux/mount.c | 4 | ||||
| -rw-r--r-- | util-linux/readprofile.c | 3 |
8 files changed, 10 insertions, 16 deletions
diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c index e543446c1..50e8a0fce 100644 --- a/util-linux/dmesg.c +++ b/util-linux/dmesg.c @@ -34,8 +34,7 @@ int dmesg_main(int argc UNUSED_PARAM, char **argv) OPT_r = 1 << 3 }; - opt_complementary = "s+:n+"; /* numeric */ - opts = getopt32(argv, "cs:n:r", &len, &level); + opts = getopt32(argv, "cs:+n:+r", &len, &level); if (opts & OPT_n) { if (klogctl(8, NULL, (long) level)) bb_perror_msg_and_die("klogctl"); diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c index f49ce95a4..6391f9bd9 100644 --- a/util-linux/fdisk.c +++ b/util-linux/fdisk.c @@ -2919,8 +2919,7 @@ int fdisk_main(int argc UNUSED_PARAM, char **argv) close_dev_fd(); /* needed: fd 3 must not stay closed */ - opt_complementary = "b+:C+:H+:S+"; /* numeric params */ - opt = getopt32(argv, "b:C:H:lS:u" IF_FEATURE_FDISK_BLKSIZE("s"), + opt = getopt32(argv, "b:+C:+H:+lS:+u" IF_FEATURE_FDISK_BLKSIZE("s"), §or_size, &user_cylinders, &user_heads, &user_sectors); argv += optind; if (opt & OPT_b) { diff --git a/util-linux/getopt.c b/util-linux/getopt.c index b9dadf13c..18d490987 100644 --- a/util-linux/getopt.c +++ b/util-linux/getopt.c @@ -397,8 +397,7 @@ int getopt_main(int argc, char **argv) opt = getopt32(argv, "+o:n:qQs:Tu", &optstr, &name, &s_arg); #else applet_long_options = getopt_longopts; - opt_complementary = "l::"; - opt = getopt32(argv, "+o:n:qQs:Tual:", + opt = getopt32(argv, "+o:n:qQs:Tual:*", &optstr, &name, &s_arg, &l_arg); /* Effectuate the read options for the applet itself */ while (l_arg) { diff --git a/util-linux/mkfs_ext2.c b/util-linux/mkfs_ext2.c index f91a0b4bf..413e7aa15 100644 --- a/util-linux/mkfs_ext2.c +++ b/util-linux/mkfs_ext2.c @@ -244,8 +244,7 @@ int mkfs_ext2_main(int argc UNUSED_PARAM, char **argv) // using global "option_mask32" instead of local "opts": // we are register starved here - opt_complementary = "-1:b+:i+:I+:m+"; - /*opts =*/ getopt32(argv, "cl:b:f:i:I:J:G:N:m:o:g:L:M:O:r:E:T:U:jnqvFS", + /*opts =*/ getopt32(argv, "cl:b:+f:i:+I:+J:G:N:m:+o:g:L:M:O:r:E:T:U:jnqvFS", /*lbfi:*/ NULL, &bs, NULL, &bpi, /*IJGN:*/ &user_inodesize, NULL, NULL, NULL, /*mogL:*/ &reserved_percent, NULL, NULL, &label, diff --git a/util-linux/mkfs_minix.c b/util-linux/mkfs_minix.c index 88d797584..aaabf8453 100644 --- a/util-linux/mkfs_minix.c +++ b/util-linux/mkfs_minix.c @@ -604,8 +604,7 @@ int mkfs_minix_main(int argc UNUSED_PARAM, char **argv) bb_error_msg_and_die("bad inode size"); #endif - opt_complementary = "n+"; /* -n N */ - opt = getopt32(argv, "ci:l:n:v", &str_i, &listfile, &G.namelen); + opt = getopt32(argv, "ci:l:n:+v", &str_i, &listfile, &G.namelen); argv += optind; //if (opt & 1) -c if (opt & 2) G.req_nr_inodes = xatoul(str_i); // -i diff --git a/util-linux/mkfs_reiser.c b/util-linux/mkfs_reiser.c index 56c8f0ab5..0a31ee44f 100644 --- a/util-linux/mkfs_reiser.c +++ b/util-linux/mkfs_reiser.c @@ -169,8 +169,8 @@ int mkfs_reiser_main(int argc UNUSED_PARAM, char **argv) // using global "option_mask32" instead of local "opts": // we are register starved here - opt_complementary = "-1:b+"; - /*opts =*/ getopt32(argv, "b:j:s:o:t:B:h:u:l:fqd", + opt_complementary = "-1"; + /*opts =*/ getopt32(argv, "b:+j:s:o:t:B:h:u:l:fqd", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, &label); argv += optind; // argv[0] -- device diff --git a/util-linux/mount.c b/util-linux/mount.c index cef4f7415..13590ceb4 100644 --- a/util-linux/mount.c +++ b/util-linux/mount.c @@ -268,7 +268,7 @@ enum { }; -#define OPTION_STR "o:t:rwanfvsiO:" IF_FEATURE_MOUNT_OTHERTAB("T:") +#define OPTION_STR "o:*t:rwanfvsiO:" IF_FEATURE_MOUNT_OTHERTAB("T:") enum { OPT_o = (1 << 0), OPT_t = (1 << 1), @@ -2167,7 +2167,7 @@ int mount_main(int argc UNUSED_PARAM, char **argv) // Parse remaining options // Max 2 params; -o is a list, -v is a counter - opt_complementary = "?2o::" IF_FEATURE_MOUNT_VERBOSE("vv"); + opt_complementary = "?2" IF_FEATURE_MOUNT_VERBOSE("vv"); opt = getopt32(argv, OPTION_STR, &lst_o, &fstype, &O_optmatch IF_FEATURE_MOUNT_OTHERTAB(, &fstabname) IF_FEATURE_MOUNT_VERBOSE(, &verbose)); diff --git a/util-linux/readprofile.c b/util-linux/readprofile.c index a64540464..345b676ba 100644 --- a/util-linux/readprofile.c +++ b/util-linux/readprofile.c @@ -99,8 +99,7 @@ int readprofile_main(int argc UNUSED_PARAM, char **argv) proFile = defaultpro; mapFile = defaultmap; - opt_complementary = "M+"; /* -M N */ - opt = getopt32(argv, "M:m:p:nabsirv", &multiplier, &mapFile, &proFile); + opt = getopt32(argv, "M:+m:p:nabsirv", &multiplier, &mapFile, &proFile); if (opt & (OPT_M|OPT_r)) { /* mult or reset, or both */ int fd, to_write; |