diff options
Diffstat (limited to 'procps')
| -rw-r--r-- | procps/pgrep.c | 3 | ||||
| -rw-r--r-- | procps/pidof.c | 3 | ||||
| -rw-r--r-- | procps/ps.c | 3 | ||||
| -rw-r--r-- | procps/watch.c | 4 |
4 files changed, 5 insertions, 8 deletions
diff --git a/procps/pgrep.c b/procps/pgrep.c index 1c7c7c4..1c594cf 100644 --- a/procps/pgrep.c +++ b/procps/pgrep.c @@ -106,8 +106,7 @@ int pgrep_main(int argc UNUSED_PARAM, char **argv) /* Parse remaining options */ ppid2match = -1; sid2match = -1; - opt_complementary = "s+:P+"; /* numeric opts */ - opt = getopt32(argv, "vlfxons:P:", &sid2match, &ppid2match); + opt = getopt32(argv, "vlfxons:+P:+", &sid2match, &ppid2match); argv += optind; if (pkill && OPT_LIST) { /* -l: print the whole signal list */ diff --git a/procps/pidof.c b/procps/pidof.c index 6d7b591..6d26566 100644 --- a/procps/pidof.c +++ b/procps/pidof.c @@ -51,13 +51,12 @@ int pidof_main(int argc UNUSED_PARAM, char **argv) unsigned opt; #if ENABLE_FEATURE_PIDOF_OMIT llist_t *omits = NULL; /* list of pids to omit */ - opt_complementary = "o::"; #endif /* do unconditional option parsing */ opt = getopt32(argv, "" IF_FEATURE_PIDOF_SINGLE ("s") - IF_FEATURE_PIDOF_OMIT("o:", &omits)); + IF_FEATURE_PIDOF_OMIT("o:*", &omits)); #if ENABLE_FEATURE_PIDOF_OMIT /* fill omit list. */ diff --git a/procps/ps.c b/procps/ps.c index 08dfce1..ce63826 100644 --- a/procps/ps.c +++ b/procps/ps.c @@ -593,8 +593,7 @@ int ps_main(int argc UNUSED_PARAM, char **argv) * procps v3.2.7 supports -T and shows tids as SPID column, * it also supports -L where it shows tids as LWP column. */ - opt_complementary = "o::"; - opt = getopt32(argv, "Zo:aAdefl"IF_FEATURE_SHOW_THREADS("T"), &opt_o); + opt = getopt32(argv, "Zo:*aAdefl"IF_FEATURE_SHOW_THREADS("T"), &opt_o); if (opt_o) { do { parse_o(llist_pop(&opt_o)); diff --git a/procps/watch.c b/procps/watch.c index 97aa047..20859c3 100644 --- a/procps/watch.c +++ b/procps/watch.c @@ -51,9 +51,9 @@ int watch_main(int argc UNUSED_PARAM, char **argv) xopen("/dev/null", O_RDONLY); #endif - opt_complementary = "-1:n+"; // at least one param; -n NUM + opt_complementary = "-1"; // at least one param; -n NUM // "+": stop at first non-option (procps 3.x only) - opt = getopt32(argv, "+dtn:", &period); + opt = getopt32(argv, "+dtn:+", &period); argv += optind; // watch from both procps 2.x and 3.x does concatenation. Example: |