aboutsummaryrefslogtreecommitdiff
path: root/miscutils
diff options
context:
space:
mode:
Diffstat (limited to 'miscutils')
-rw-r--r--miscutils/adjtimex.c7
-rw-r--r--miscutils/crond.c14
-rw-r--r--miscutils/crontab.c5
-rw-r--r--miscutils/flash_eraseall.c3
-rw-r--r--miscutils/flashcp.c3
-rw-r--r--miscutils/i2c_tools.c25
-rw-r--r--miscutils/makedevs.c3
-rw-r--r--miscutils/man.c3
-rw-r--r--miscutils/microcom.c5
-rw-r--r--miscutils/nandwrite.c9
-rw-r--r--miscutils/setserial.c3
-rw-r--r--miscutils/time.c5
-rw-r--r--miscutils/ubi_tools.c9
-rw-r--r--miscutils/watchdog.c5
14 files changed, 49 insertions, 50 deletions
diff --git a/miscutils/adjtimex.c b/miscutils/adjtimex.c
index ce6f8ccd8..c1718e909 100644
--- a/miscutils/adjtimex.c
+++ b/miscutils/adjtimex.c
@@ -95,9 +95,10 @@ int adjtimex_main(int argc UNUSED_PARAM, char **argv)
memset(&txc, 0, sizeof(txc));
- opt_complementary = "=0"; /* no valid non-option parameters */
- opt = getopt32(argv, "qo:f:p:t:",
- &opt_o, &opt_f, &opt_p, &opt_t);
+ opt = getopt32(argv, "^" "qo:f:p:t:"
+ "\0" "=0"/*no valid non-option args*/,
+ &opt_o, &opt_f, &opt_p, &opt_t
+ );
//if (opt & 0x1) // -q
if (opt & 0x2) { // -o
txc.offset = xatol(opt_o);
diff --git a/miscutils/crond.c b/miscutils/crond.c
index 48e429976..f6580a9d4 100644
--- a/miscutils/crond.c
+++ b/miscutils/crond.c
@@ -1021,13 +1021,17 @@ int crond_main(int argc UNUSED_PARAM, char **argv)
INIT_G();
- /* "-b after -f is ignored", and so on for every pair a-b */
- opt_complementary = "f-b:b-f:S-L:L-S" IF_FEATURE_CROND_D(":d-l")
+ opts = getopt32(argv, "^"
+ "l:L:fbSc:" IF_FEATURE_CROND_D("d:")
+ "\0"
+ /* "-b after -f is ignored", and so on for every pair a-b */
+ "f-b:b-f:S-L:L-S" IF_FEATURE_CROND_D(":d-l")
/* -l and -d have numeric param */
- ":l+" IF_FEATURE_CROND_D(":d+");
- opts = getopt32(argv, "l:L:fbSc:" IF_FEATURE_CROND_D("d:"),
+ ":l+" IF_FEATURE_CROND_D(":d+")
+ ,
&G.log_level, &G.log_filename, &G.crontab_dir_name
- IF_FEATURE_CROND_D(,&G.log_level));
+ IF_FEATURE_CROND_D(,&G.log_level)
+ );
/* both -d N and -l N set the same variable: G.log_level */
if (!(opts & OPT_f)) {
diff --git a/miscutils/crontab.c b/miscutils/crontab.c
index 804cb57f2..4787fa08f 100644
--- a/miscutils/crontab.c
+++ b/miscutils/crontab.c
@@ -99,8 +99,9 @@ int crontab_main(int argc UNUSED_PARAM, char **argv)
OPT_ler = OPT_l + OPT_e + OPT_r,
};
- opt_complementary = "?1:dr"; /* max one argument; -d implies -r */
- opt_ler = getopt32(argv, "u:c:lerd", &user_name, &crontab_dir);
+ opt_ler = getopt32(argv, "^" "u:c:lerd" "\0" "?1:dr"/*max one arg; -d implies -r*/,
+ &user_name, &crontab_dir
+ );
argv += optind;
if (sanitize_env_if_suid()) { /* Clears dangerous stuff, sets PATH */
diff --git a/miscutils/flash_eraseall.c b/miscutils/flash_eraseall.c
index 3ddd9dd99..a6ce41f27 100644
--- a/miscutils/flash_eraseall.c
+++ b/miscutils/flash_eraseall.c
@@ -82,8 +82,7 @@ int flash_eraseall_main(int argc UNUSED_PARAM, char **argv)
unsigned int flags;
char *mtd_name;
- opt_complementary = "=1";
- flags = getopt32(argv, "jNq");
+ flags = getopt32(argv, "^" "jNq" "\0" "=1");
mtd_name = argv[optind];
fd = xopen(mtd_name, O_RDWR);
diff --git a/miscutils/flashcp.c b/miscutils/flashcp.c
index c10b96ee8..858cee194 100644
--- a/miscutils/flashcp.c
+++ b/miscutils/flashcp.c
@@ -69,8 +69,7 @@ int flashcp_main(int argc UNUSED_PARAM, char **argv)
RESERVE_CONFIG_UBUFFER(buf, BUFSIZE);
RESERVE_CONFIG_UBUFFER(buf2, BUFSIZE);
- opt_complementary = "=2"; /* exactly 2 non-option args: file, dev */
- /*opts =*/ getopt32(argv, "v");
+ /*opts =*/ getopt32(argv, "^" "v" "\0" "=2"/*exactly 2 non-option args: file,dev*/);
argv += optind;
// filename = *argv++;
// devicename = *argv;
diff --git a/miscutils/i2c_tools.c b/miscutils/i2c_tools.c
index 8d04d2259..30f606e8e 100644
--- a/miscutils/i2c_tools.c
+++ b/miscutils/i2c_tools.c
@@ -455,14 +455,12 @@ int i2cget_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
int i2cget_main(int argc UNUSED_PARAM, char **argv)
{
const unsigned opt_f = (1 << 0), opt_y = (1 << 1);
- const char *const optstr = "fy";
int bus_num, bus_addr, data_addr = -1, status;
int mode = I2C_SMBUS_BYTE, pec = 0, fd;
unsigned opts;
- opt_complementary = "-2:?4"; /* from 2 to 4 args */
- opts = getopt32(argv, optstr);
+ opts = getopt32(argv, "^" "fy" "\0" "-2:?4"/*from 2 to 4 args*/);
argv += optind;
bus_num = i2c_bus_lookup(argv[0]);
@@ -544,7 +542,6 @@ int i2cset_main(int argc, char **argv)
{
const unsigned opt_f = (1 << 0), opt_y = (1 << 1),
opt_m = (1 << 2), opt_r = (1 << 3);
- const char *const optstr = "fym:r";
int bus_num, bus_addr, data_addr, mode = I2C_SMBUS_BYTE, pec = 0;
int val, blen = 0, mask = 0, fd, status;
@@ -552,8 +549,7 @@ int i2cset_main(int argc, char **argv)
char *opt_m_arg = NULL;
unsigned opts;
- opt_complementary = "-3"; /* from 3 to ? args */
- opts = getopt32(argv, optstr, &opt_m_arg);
+ opts = getopt32(argv, "^" "fym:r" "\0" "-3"/*from 3 to ? args*/, &opt_m_arg);
argv += optind;
argc -= optind;
@@ -905,7 +901,6 @@ int i2cdump_main(int argc UNUSED_PARAM, char **argv)
{
const unsigned opt_f = (1 << 0), opt_y = (1 << 1),
opt_r = (1 << 2);
- const char *const optstr = "fyr:";
int bus_num, bus_addr, mode = I2C_SMBUS_BYTE_DATA, even = 0, pec = 0;
unsigned first = 0x00, last = 0xff, opts;
@@ -913,8 +908,11 @@ int i2cdump_main(int argc UNUSED_PARAM, char **argv)
char *opt_r_str, *dash;
int fd, res;
- opt_complementary = "-2:?3"; /* from 2 to 3 args */
- opts = getopt32(argv, optstr, &opt_r_str);
+ opts = getopt32(argv, "^"
+ "fyr:"
+ "\0" "-2:?3" /* from 2 to 3 args */,
+ &opt_r_str
+ );
argv += optind;
bus_num = i2c_bus_lookup(argv[0]);
@@ -1208,15 +1206,16 @@ int i2cdetect_main(int argc UNUSED_PARAM, char **argv)
const unsigned opt_y = (1 << 0), opt_a = (1 << 1),
opt_q = (1 << 2), opt_r = (1 << 3),
opt_F = (1 << 4), opt_l = (1 << 5);
- const char *const optstr = "yaqrFl";
int fd, bus_num, i, j, mode = I2CDETECT_MODE_AUTO, status, cmd;
unsigned first = 0x03, last = 0x77, opts;
unsigned long funcs;
- opt_complementary = "q--r:r--q:" /* mutually exclusive */
- "?3"; /* up to 3 args */
- opts = getopt32(argv, optstr);
+ opts = getopt32(argv, "^"
+ "yaqrFl"
+ "\0"
+ "q--r:r--q:"/*mutually exclusive*/ "?3"/*up to 3 args*/
+ );
argv += optind;
if (opts & opt_l)
diff --git a/miscutils/makedevs.c b/miscutils/makedevs.c
index c13ad1442..80975c652 100644
--- a/miscutils/makedevs.c
+++ b/miscutils/makedevs.c
@@ -183,8 +183,7 @@ int makedevs_main(int argc UNUSED_PARAM, char **argv)
char *line = (char *)"-";
int ret = EXIT_SUCCESS;
- opt_complementary = "=1"; /* exactly one param */
- getopt32(argv, "d:", &line);
+ getopt32(argv, "^" "d:" "\0" "=1", &line);
argv += optind;
xchdir(*argv); /* ensure root dir exists */
diff --git a/miscutils/man.c b/miscutils/man.c
index a16202f25..ba6bb4c01 100644
--- a/miscutils/man.c
+++ b/miscutils/man.c
@@ -253,8 +253,7 @@ int man_main(int argc UNUSED_PARAM, char **argv)
INIT_G();
- opt_complementary = "-1"; /* at least one argument */
- opt = getopt32(argv, "+aw");
+ opt = getopt32(argv, "^+" "aw" "\0" "-1"/*at least one arg*/);
argv += optind;
sec_list = xstrdup("0p:1:1p:2:3:3p:4:5:6:7:8:9");
diff --git a/miscutils/microcom.c b/miscutils/microcom.c
index f382edebb..b87f3273f 100644
--- a/miscutils/microcom.c
+++ b/miscutils/microcom.c
@@ -74,8 +74,9 @@ int microcom_main(int argc UNUSED_PARAM, char **argv)
unsigned opts;
// fetch options
- opt_complementary = "=1";
- opts = getopt32(argv, "Xs:+d:+t:+", &speed, &delay, &timeout);
+ opts = getopt32(argv, "^" "Xs:+d:+t:+" "\0" "=1",
+ &speed, &delay, &timeout
+ );
// argc -= optind;
argv += optind;
diff --git a/miscutils/nandwrite.c b/miscutils/nandwrite.c
index 5986ab272..80a005821 100644
--- a/miscutils/nandwrite.c
+++ b/miscutils/nandwrite.c
@@ -123,13 +123,12 @@ int nandwrite_main(int argc UNUSED_PARAM, char **argv)
const char *opt_s = "0", *opt_f = "-", *opt_l, *opt_bb;
if (IS_NANDDUMP) {
- opt_complementary = "=1";
- opts = getopt32long(argv, "ons:f:l:",
+ opts = getopt32long(argv, "^" "ons:f:l:" "\0" "=1",
"bb\0" Required_argument "\xff", /* no short equivalent */
- &opt_s, &opt_f, &opt_l, &opt_bb);
+ &opt_s, &opt_f, &opt_l, &opt_bb
+ );
} else { /* nandwrite */
- opt_complementary = "-1:?2";
- opts = getopt32(argv, "pns:", &opt_s);
+ opts = getopt32(argv, "^" "pns:" "\0" "-1:?2", &opt_s);
}
argv += optind;
diff --git a/miscutils/setserial.c b/miscutils/setserial.c
index 2000de7b1..f217c3beb 100644
--- a/miscutils/setserial.c
+++ b/miscutils/setserial.c
@@ -742,8 +742,7 @@ int setserial_main(int argc UNUSED_PARAM, char **argv)
{
int opts;
- opt_complementary = "-1:b-aG:G-ab:a-bG";
- opts = getopt32(argv, "bGavzgq");
+ opts = getopt32(argv, "^" "bGavzgq" "\0" "-1:b-aG:G-ab:a-bG");
argv += optind;
if (!argv[1]) /* one arg only? (nothing to change?) */
diff --git a/miscutils/time.c b/miscutils/time.c
index 0ecdac1a6..65dbcdcf3 100644
--- a/miscutils/time.c
+++ b/miscutils/time.c
@@ -430,9 +430,10 @@ int time_main(int argc UNUSED_PARAM, char **argv)
OPT_f = (1 << 4),
};
- opt_complementary = "-1"; /* at least one arg */
/* "+": stop on first non-option */
- opt = getopt32(argv, "+vpao:f:", &output_filename, &output_format);
+ opt = getopt32(argv, "^+" "vpao:f:" "\0" "-1"/*at least one arg*/,
+ &output_filename, &output_format
+ );
argv += optind;
if (opt & OPT_v)
output_format = long_format;
diff --git a/miscutils/ubi_tools.c b/miscutils/ubi_tools.c
index 123551e94..d142d1144 100644
--- a/miscutils/ubi_tools.c
+++ b/miscutils/ubi_tools.c
@@ -145,20 +145,17 @@ int ubi_tools_main(int argc UNUSED_PARAM, char **argv)
#define OPTION_a (1 << 5)
#define OPTION_t (1 << 6)
if (do_mkvol) {
- opt_complementary = "-1";
- opts = getopt32(argv, "md:+n:+N:s:a:+t:O:+",
+ opts = getopt32(argv, "^" "md:+n:+N:s:a:+t:O:+" "\0" "-1",
&dev_num, &vol_id,
&vol_name, &size_bytes_str, &alignment, &type,
&vid_hdr_offset
);
} else
if (do_update) {
- opt_complementary = "-1";
- opts = getopt32(argv, "s:at", &size_bytes_str);
+ opts = getopt32(argv, "^" "s:at" "\0" "-1", &size_bytes_str);
opts *= OPTION_s;
} else {
- opt_complementary = "-1";
- opts = getopt32(argv, "m:+d:+n:+N:s:a:+t:",
+ opts = getopt32(argv, "^" "m:+d:+n:+N:s:a:+t:" "\0" "-1",
&mtd_num, &dev_num, &vol_id,
&vol_name, &size_bytes_str, &alignment, &type
);
diff --git a/miscutils/watchdog.c b/miscutils/watchdog.c
index ec06bcb51..392d05646 100644
--- a/miscutils/watchdog.c
+++ b/miscutils/watchdog.c
@@ -101,8 +101,9 @@ int watchdog_main(int argc UNUSED_PARAM, char **argv)
char *st_arg;
char *ht_arg;
- opt_complementary = "=1"; /* must have exactly 1 argument */
- opts = getopt32(argv, "Ft:T:", &st_arg, &ht_arg);
+ opts = getopt32(argv, "^" "Ft:T:" "\0" "=1"/*must have exactly 1 arg*/,
+ &st_arg, &ht_arg
+ );
/* We need to daemonize *before* opening the watchdog as many drivers
* will only allow one process at a time to do so. Since daemonizing
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-10 17:13:58 +0000