diff options
author | Ron Yorston <rmy@pobox.com> | 2016-07-07 14:28:08 +0100 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2016-07-07 14:58:55 +0100 |
commit | 613f46218c53c8cabdbf0435653e74e0e0e91e1c (patch) | |
tree | ca06a7e7a3e4c861441acb4ea20648d7827fa6ae /procps/ps.c | |
parent | a0c61c9492723dd31681f878f9c68c92817a476d (diff) | |
parent | 237bedd499c58034a1355484d6d4d906f0180308 (diff) | |
download | busybox-w32-613f46218c53c8cabdbf0435653e74e0e0e91e1c.tar.gz busybox-w32-613f46218c53c8cabdbf0435653e74e0e0e91e1c.tar.bz2 busybox-w32-613f46218c53c8cabdbf0435653e74e0e0e91e1c.zip |
Merge branch 'busybox' into merge
Diffstat (limited to 'procps/ps.c')
-rw-r--r-- | procps/ps.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/procps/ps.c b/procps/ps.c index 39cccec82..c9d33daf4 100644 --- a/procps/ps.c +++ b/procps/ps.c | |||
@@ -609,8 +609,7 @@ int ps_main(int argc UNUSED_PARAM, char **argv) | |||
609 | * procps v3.2.7 supports -T and shows tids as SPID column, | 609 | * procps v3.2.7 supports -T and shows tids as SPID column, |
610 | * it also supports -L where it shows tids as LWP column. | 610 | * it also supports -L where it shows tids as LWP column. |
611 | */ | 611 | */ |
612 | opt_complementary = "o::"; | 612 | opt = getopt32(argv, "Zo:*aAdefl"IF_FEATURE_SHOW_THREADS("T"), &opt_o); |
613 | opt = getopt32(argv, "Zo:aAdefl"IF_FEATURE_SHOW_THREADS("T"), &opt_o); | ||
614 | if (opt_o) { | 613 | if (opt_o) { |
615 | do { | 614 | do { |
616 | parse_o(llist_pop(&opt_o)); | 615 | parse_o(llist_pop(&opt_o)); |