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

change the hardcoded error constant (0x80000000UL) to a nice flexible define (BB_GETOPT_ERROR)

Browse Source
This commit is contained in:
Mike Frysinger
2005-05-11 00:39:03 +00:00
parent 55e2cf6533
commit 348e84c202
11 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
coreutils/cut.c
View File

@ -300,7 +300,7 @@ extern int cut_main(int argc, char **argv)
part = opt & (OPT_BYTE_FLGS|OPT_CHAR_FLGS|OPT_FIELDS_FLGS);
if(part == 0)
bb_error_msg_and_die("you must specify a list of bytes, characters, or fields");
if(opt & 0x80000000UL)
if(opt & BB_GETOPT_ERROR)
bb_error_msg_and_die("only one type of list may be specified");
parse_lists(sopt);
if((opt & (OPT_DELIM_FLGS))) {

2
coreutils/date.c
View File

@ -166,7 +166,7 @@ int date_main(int argc, char **argv)
bb_error_msg_and_die(bb_msg_memory_exhausted);
}
use_arg = opt & DATE_OPT_DATE;
if(opt & 0x80000000UL)
if(opt & BB_GETOPT_ERROR)
bb_show_usage();
#ifdef CONFIG_FEATURE_DATE_ISOFMT
if(opt & DATE_OPT_TIMESPEC) {

2
coreutils/id.c
View File

@ -64,7 +64,7 @@ extern int id_main(int argc, char **argv)
bb_opt_complementaly = "u~g:g~u";
flags = bb_getopt_ulflags(argc, argv, "rnug");
if ((flags & 0x80000000UL)
if ((flags & BB_GETOPT_ERROR)
/* Don't allow -n -r -nr */
|| (flags <= 3 && flags > 0)
/* Don't allow more than one username */

2
coreutils/install.c
View File

@ -69,7 +69,7 @@ extern int install_main(int argc, char **argv)
flags = bb_getopt_ulflags(argc, argv, "cdpsg:m:o:", &gid_str, &mode_str, &uid_str); /* 'a' must be 2nd */
/* Check valid options were given */
if(flags & 0x80000000UL) {
if(flags & BB_GETOPT_ERROR) {
bb_show_usage();
}