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
sysklogd/klogd.c
View File

@@ -45,10 +45,10 @@ int klogd_main(int argc, char **argv)
{
unsigned long opt;
unsigned opt;
/* do normal option parsing */
opt = bb_getopt_ulflags(argc, argv, "c:n", &start);
opt = getopt32(argc, argv, "c:n", &start);
if (opt & OPT_LEVEL) {
/* Valid levels are between 1 and 8 */

4
sysklogd/logger.c
View File

@@ -89,7 +89,7 @@ static int pencode(char *s)
int logger_main(int argc, char **argv)
{
unsigned long opt;
unsigned opt;
char *opt_p, *opt_t;
int pri = LOG_USER | LOG_NOTICE;
int option = 0;
@@ -100,7 +100,7 @@ int logger_main(int argc, char **argv)
bb_getpwuid(name, geteuid(), sizeof(name));
/* Parse any options */
opt = bb_getopt_ulflags(argc, argv, "p:st:", &opt_p, &opt_t);
opt = getopt32(argc, argv, "p:st:", &opt_p, &opt_t);
if (opt & 0x1) pri = pencode(opt_p); // -p
if (opt & 0x2) option |= LOG_PERROR; // -s
if (opt & 0x4) safe_strncpy(name, opt_t, sizeof(name)); // -t

2
sysklogd/syslogd.c
View File

@@ -575,7 +575,7 @@ int syslogd_main(int argc, char **argv)
char *p;
/* do normal option parsing */
option_mask = bb_getopt_ulflags(argc, argv, OPTION_STR, OPTION_PARAM);
option_mask = getopt32(argc, argv, OPTION_STR, OPTION_PARAM);
if (option_mask & OPT_mark) MarkInterval = atoi(opt_m) * 60; // -m
//if (option_mask & OPT_nofork) // -n
//if (option_mask & OPT_outfile) // -O