emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

getopt_ulflags -> getopt32.

Browse Source 
It is impossible to formulate sane ABI based on
size of ulong because it can be 32-bit or 64-bit.
Basically it means that you cannot portably use
more that 32 option chars in one call anyway...
Make it explicit.
This commit is contained in:
Denis Vlasenko
2006-10-03 21:00:06 +00:00
parent 40920825d5
commit 67b23e6043
120 changed files with 322 additions and 327 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
procps/pidof.c
View File

@@ -39,11 +39,11 @@ int pidof_main(int argc, char **argv)
unsigned long int opt;
#if ENABLE_FEATURE_PIDOF_OMIT
llist_t *omits = NULL; /* list of pids to omit */
bb_opt_complementally = _OMIT_COMPL("o::");
opt_complementary = _OMIT_COMPL("o::");
#endif
/* do unconditional option parsing */
opt = bb_getopt_ulflags(argc, argv,
opt = getopt32(argc, argv,
_SINGLE_COMPL("s") _OMIT_COMPL("o:")
_OMIT(&omits));

8
procps/ps.c
View File

@@ -23,7 +23,7 @@ int ps_main(int argc, char **argv)
int terminal_width;
int w_count = 0;
bb_opt_complementally = "-:ww";
opt_complementary = "-:ww";
#else
# define terminal_width 79
#endif
@@ -31,11 +31,11 @@ int ps_main(int argc, char **argv)
#if ENABLE_FEATURE_PS_WIDE || ENABLE_SELINUX
/* handle arguments */
#if ENABLE_FEATURE_PS_WIDE && ENABLE_SELINUX
i = bb_getopt_ulflags(argc, argv, "wc", &w_count);
i = getopt32(argc, argv, "wc", &w_count);
#elif ENABLE_FEATURE_PS_WIDE && !ENABLE_SELINUX
bb_getopt_ulflags(argc, argv, "w", &w_count);
getopt32(argc, argv, "w", &w_count);
#else /* !ENABLE_FEATURE_PS_WIDE && ENABLE_SELINUX */
i = bb_getopt_ulflags(argc, argv, "c");
i = getopt32(argc, argv, "c");
#endif
#if ENABLE_FEATURE_PS_WIDE
/* if w is given once, GNU ps sets the width to 132,

4
procps/top.c
View File

@@ -397,8 +397,8 @@ int top_main(int argc, char **argv)
/* do normal option parsing */
interval = 5;
bb_opt_complementally = "-";
option_mask = bb_getopt_ulflags(argc, argv, "d:n:b",
opt_complementary = "-";
option_mask = getopt32(argc, argv, "d:n:b",
&sinterval, &siterations);
if (option_mask & 0x1) interval = atoi(sinterval); // -d
if (option_mask & 0x2) iterations = atoi(siterations); // -n