diff options
Diffstat (limited to 'procps')
-rw-r--r-- | procps/pidof.c | 4 | ||||
-rw-r--r-- | procps/ps.c | 8 | ||||
-rw-r--r-- | procps/top.c | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/procps/pidof.c b/procps/pidof.c index c686245ea..e6c954843 100644 --- a/procps/pidof.c +++ b/procps/pidof.c | |||
@@ -39,11 +39,11 @@ int pidof_main(int argc, char **argv) | |||
39 | unsigned long int opt; | 39 | unsigned long int opt; |
40 | #if ENABLE_FEATURE_PIDOF_OMIT | 40 | #if ENABLE_FEATURE_PIDOF_OMIT |
41 | llist_t *omits = NULL; /* list of pids to omit */ | 41 | llist_t *omits = NULL; /* list of pids to omit */ |
42 | bb_opt_complementally = _OMIT_COMPL("o::"); | 42 | opt_complementary = _OMIT_COMPL("o::"); |
43 | #endif | 43 | #endif |
44 | 44 | ||
45 | /* do unconditional option parsing */ | 45 | /* do unconditional option parsing */ |
46 | opt = bb_getopt_ulflags(argc, argv, | 46 | opt = getopt32(argc, argv, |
47 | _SINGLE_COMPL("s") _OMIT_COMPL("o:") | 47 | _SINGLE_COMPL("s") _OMIT_COMPL("o:") |
48 | _OMIT(&omits)); | 48 | _OMIT(&omits)); |
49 | 49 | ||
diff --git a/procps/ps.c b/procps/ps.c index 95502b284..0452a5046 100644 --- a/procps/ps.c +++ b/procps/ps.c | |||
@@ -23,7 +23,7 @@ int ps_main(int argc, char **argv) | |||
23 | int terminal_width; | 23 | int terminal_width; |
24 | int w_count = 0; | 24 | int w_count = 0; |
25 | 25 | ||
26 | bb_opt_complementally = "-:ww"; | 26 | opt_complementary = "-:ww"; |
27 | #else | 27 | #else |
28 | # define terminal_width 79 | 28 | # define terminal_width 79 |
29 | #endif | 29 | #endif |
@@ -31,11 +31,11 @@ int ps_main(int argc, char **argv) | |||
31 | #if ENABLE_FEATURE_PS_WIDE || ENABLE_SELINUX | 31 | #if ENABLE_FEATURE_PS_WIDE || ENABLE_SELINUX |
32 | /* handle arguments */ | 32 | /* handle arguments */ |
33 | #if ENABLE_FEATURE_PS_WIDE && ENABLE_SELINUX | 33 | #if ENABLE_FEATURE_PS_WIDE && ENABLE_SELINUX |
34 | i = bb_getopt_ulflags(argc, argv, "wc", &w_count); | 34 | i = getopt32(argc, argv, "wc", &w_count); |
35 | #elif ENABLE_FEATURE_PS_WIDE && !ENABLE_SELINUX | 35 | #elif ENABLE_FEATURE_PS_WIDE && !ENABLE_SELINUX |
36 | bb_getopt_ulflags(argc, argv, "w", &w_count); | 36 | getopt32(argc, argv, "w", &w_count); |
37 | #else /* !ENABLE_FEATURE_PS_WIDE && ENABLE_SELINUX */ | 37 | #else /* !ENABLE_FEATURE_PS_WIDE && ENABLE_SELINUX */ |
38 | i = bb_getopt_ulflags(argc, argv, "c"); | 38 | i = getopt32(argc, argv, "c"); |
39 | #endif | 39 | #endif |
40 | #if ENABLE_FEATURE_PS_WIDE | 40 | #if ENABLE_FEATURE_PS_WIDE |
41 | /* if w is given once, GNU ps sets the width to 132, | 41 | /* if w is given once, GNU ps sets the width to 132, |
diff --git a/procps/top.c b/procps/top.c index be8ac195b..ebfbcb80c 100644 --- a/procps/top.c +++ b/procps/top.c | |||
@@ -397,8 +397,8 @@ int top_main(int argc, char **argv) | |||
397 | 397 | ||
398 | /* do normal option parsing */ | 398 | /* do normal option parsing */ |
399 | interval = 5; | 399 | interval = 5; |
400 | bb_opt_complementally = "-"; | 400 | opt_complementary = "-"; |
401 | option_mask = bb_getopt_ulflags(argc, argv, "d:n:b", | 401 | option_mask = getopt32(argc, argv, "d:n:b", |
402 | &sinterval, &siterations); | 402 | &sinterval, &siterations); |
403 | if (option_mask & 0x1) interval = atoi(sinterval); // -d | 403 | if (option_mask & 0x1) interval = atoi(sinterval); // -d |
404 | if (option_mask & 0x2) iterations = atoi(siterations); // -n | 404 | if (option_mask & 0x2) iterations = atoi(siterations); // -n |