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

1) bb_opt_complementaly -> bb_opt_complementally

Browse Source 
2) better support long options
3) new flag '!' for bb_opt_complementally: produce bb_show_usage() if BB_GETOPT_ERROR internally
This commit is contained in:
"Vladimir N. Oleynik" 2005-09-05 14:46:07 +00:00
parent bef14d7a87
commit 27421a1878
20 changed files with 176 additions and 167 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
archival/ar.c
View File

@ -67,10 +67,10 @@ extern int ar_main(int argc, char **argv)
archive_handle = init_handle();
bb_opt_complementaly = "p~tx:t~px:x~pt";
bb_opt_complementally = "!p~tx:t~px:x~pt";
opt = bb_getopt_ulflags(argc, argv, "ptxovcr");
if ((opt & BB_GETOPT_ERROR) || (opt == 0) || (optind == argc)) {
if ((opt == 0) || (optind == argc)) {
bb_show_usage();
}

4
archival/dpkg_deb.c
View File

@ -56,7 +56,7 @@ extern int dpkg_deb_main(int argc, char **argv)
control_tar_llist = llist_add_to(control_tar_llist, "control.tar.bz2");
#endif
bb_opt_complementaly = "c~efXx:e~cfXx:f~ceXx:X~cefx:x~cefX";
bb_opt_complementally = "!c~efXx:e~cfXx:f~ceXx:X~cefx:x~cefX";
opt = bb_getopt_ulflags(argc, argv, "cefXx");
if (opt & DPKG_DEB_OPT_CONTENTS) {
@ -88,7 +88,7 @@ extern int dpkg_deb_main(int argc, char **argv)
argcount = 2;
}
if ((optind + argcount != argc) || (opt & BB_GETOPT_ERROR)) {
if ((optind + argcount) != argc) {
bb_show_usage();
}

6
archival/tar.c
View File

@ -706,7 +706,7 @@ int tar_main(int argc, char **argv)
tar_handle = init_handle();
tar_handle->flags = ARCHIVE_CREATE_LEADING_DIRS | ARCHIVE_PRESERVE_DATE | ARCHIVE_EXTRACT_UNCONDITIONAL;
bb_opt_complementaly = "c~tx:t~cx:x~ct:X*:T*";
bb_opt_complementally = "!c~tx:t~cx:x~ct:X*:T*";
#ifdef CONFIG_FEATURE_TAR_LONG_OPTIONS
bb_applet_long_options = tar_long_options;
#endif
@ -720,10 +720,6 @@ int tar_main(int argc, char **argv)
#endif
);
/* Check one and only one context option was given */
if(opt & BB_GETOPT_ERROR) {
bb_show_usage();
}
#ifdef CONFIG_FEATURE_TAR_CREATE
ctx_flag = opt & (CTX_CREATE | CTX_TEST | CTX_EXTRACT);
#else

2
coreutils/cut.c
View File

@ -295,7 +295,7 @@ extern int cut_main(int argc, char **argv)
unsigned long opt;
char *sopt, *sdopt;
bb_opt_complementaly = "b~bcf:c~bcf:f~bcf";
bb_opt_complementally = "b~bcf:c~bcf:f~bcf";
opt = bb_getopt_ulflags(argc, argv, optstring, &sopt, &sopt, &sopt, &sdopt);
part = opt & (OPT_BYTE_FLGS|OPT_CHAR_FLGS|OPT_FIELDS_FLGS);
if(part == 0)

4
coreutils/date.c
View File

@ -152,7 +152,7 @@ int date_main(int argc, char **argv)
#else
# define GETOPT_ISOFMT
#endif
bb_opt_complementaly = "d~ds:s~ds";
bb_opt_complementally = "!d~ds:s~ds";
opt = bb_getopt_ulflags(argc, argv, "Rs:ud:r:" GETOPT_ISOFMT,
&date_str, &date_str, &filename
#ifdef CONFIG_FEATURE_DATE_ISOFMT
@ -165,8 +165,6 @@ int date_main(int argc, char **argv)
bb_error_msg_and_die(bb_msg_memory_exhausted);
}
use_arg = opt & DATE_OPT_DATE;
if(opt & BB_GETOPT_ERROR)
bb_show_usage();
#ifdef CONFIG_FEATURE_DATE_ISOFMT
if(opt & DATE_OPT_TIMESPEC) {
if (!isofmt_arg) {

2
coreutils/df.c
View File

@ -62,7 +62,7 @@ extern int df_main(int argc, char **argv)
const char *disp_units_hdr = hdr_1k;
#ifdef CONFIG_FEATURE_HUMAN_READABLE
bb_opt_complementaly = "h-km:k-hm:m-hk";
bb_opt_complementally = "h-km:k-hm:m-hk";
opt = bb_getopt_ulflags(argc, argv, "hmk");
if(opt & 1) {
df_disp_hr = 0;

4
coreutils/du.c
View File

@ -191,7 +191,7 @@ int du_main(int argc, char **argv)
* ignore -a. This is consistent with -s being equivalent to -d 0.
*/
#ifdef CONFIG_FEATURE_HUMAN_READABLE
bb_opt_complementaly = "h-km:k-hm:m-hk:H-L:L-H:s-d:d-s";
bb_opt_complementally = "h-km:k-hm:m-hk:H-L:L-H:s-d:d-s";
opt = bb_getopt_ulflags(argc, argv, "aHkLsx" "d:" "lc" "hm", &smax_print_depth);
if((opt & (1 << 9))) {
/* -h opt */
@ -206,7 +206,7 @@ int du_main(int argc, char **argv)
disp_hr = KILOBYTE;
}
#else
bb_opt_complementaly = "H-L:L-H:s-d:d-s";
bb_opt_complementally = "H-L:L-H:s-d:d-s";
opt = bb_getopt_ulflags(argc, argv, "aHkLsx" "d:" "lc", &smax_print_depth);
#if !defined CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K
if((opt & (1 << 2))) {

2
coreutils/env.c
View File

@ -65,7 +65,7 @@ extern int env_main(int argc, char** argv)
llist_t *unset_env = NULL;
extern char **environ;
bb_opt_complementaly = "u*";
bb_opt_complementally = "u*";
bb_applet_long_options = env_long_options;
opt = bb_getopt_ulflags(argc, argv, "+iu:", &unset_env);

5
coreutils/id.c
View File

@ -61,12 +61,11 @@ extern int id_main(int argc, char **argv)
unsigned long flags;
short status;
bb_opt_complementaly = "u~g:g~u";
bb_opt_complementally = "!u~g:g~u";
flags = bb_getopt_ulflags(argc, argv, "rnug");
if ((flags & BB_GETOPT_ERROR)
/* Don't allow -n -r -nr */
|| (flags <= 3 && flags > 0)
if ((flags <= 3 && flags > 0)
/* Don't allow more than one username */
|| (argc > optind + 1))
bb_show_usage();

7
coreutils/install.c
View File

@ -64,15 +64,10 @@ extern int install_main(int argc, char **argv)
int i;
bb_applet_long_options = install_long_options;
bb_opt_complementaly = "s~d:d~s";
bb_opt_complementally = "!s~d:d~s";
/* -c exists for backwards compatability, its needed */
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 & BB_GETOPT_ERROR) {
bb_show_usage();
}
/* preserve access and modification time, this is GNU behaviour, BSD only preserves modification time */
if (flags & INSTALL_OPT_PRESERVE_TIME) {
copy_flags |= FILEUTILS_PRESERVE_STATUS;

2
coreutils/mv.c
View File

@ -56,7 +56,7 @@ extern int mv_main(int argc, char **argv)
int status = 0;
bb_applet_long_options = mv_long_options;
bb_opt_complementaly = "f-i:i-f";
bb_opt_complementally = "f-i:i-f";
flags = bb_getopt_ulflags(argc, argv, "fi");
if (optind + 2 > argc) {
bb_show_usage();

2
coreutils/rm.c
View File

@ -38,7 +38,7 @@ extern int rm_main(int argc, char **argv)
int flags = 0;
unsigned long opt;
bb_opt_complementaly = "f-i:i-f";
bb_opt_complementally = "f-i:i-f";
opt = bb_getopt_ulflags(argc, argv, "fiRr");
if(opt & 1)
flags |= FILEUTILS_FORCE;

6
debianutils/start_stop_daemon.c
View File

@ -233,12 +233,12 @@ start_stop_daemon_main(int argc, char **argv)
bb_applet_long_options = ssd_long_options;
bb_opt_complementaly = "K~S:S~K";
bb_opt_complementally = "!K~S:S~K";
opt = bb_getopt_ulflags(argc, argv, "KSbqma:n:s:u:x:p:",
&startas, &cmdname, &signame, &userspec, &execname, &pidfile);
/* Check one and only one context option was given */
if ((opt & BB_GETOPT_ERROR) || (opt & (SSD_CTX_STOP | SSD_CTX_START)) == 0) {
/* Check required one context option was given */
if ((opt & (SSD_CTX_STOP | SSD_CTX_START)) == 0) {
bb_show_usage();
}

4
findutils/grep.c
View File

@ -271,7 +271,7 @@ extern int grep_main(int argc, char **argv)
char *slines_before;
char *Copt;
bb_opt_complementaly = "H-h:e*:f*:C-AB";
bb_opt_complementally = "H-h:e*:f*:C-AB";
opt = bb_getopt_ulflags(argc, argv,
GREP_OPTS GREP_OPT_CONTEXT OPT_EGREP,
&pattern_head, &fopt,
@ -306,7 +306,7 @@ extern int grep_main(int argc, char **argv)
}
#else
/* with auto sanity checks */
bb_opt_complementaly = "H-h:e*:f*:c-n:q-n:l-n";
bb_opt_complementally = "H-h:e*:f*:c-n:q-n:l-n";
opt = bb_getopt_ulflags(argc, argv, GREP_OPTS OPT_EGREP,
&pattern_head, &fopt);

2
findutils/xargs.c
View File

@ -438,7 +438,7 @@ int xargs_main(int argc, char **argv)
#endif
#ifdef CONFIG_FEATURE_XARGS_SUPPORT_CONFIRMATION
bb_opt_complementaly = "pt";
bb_opt_complementally = "pt";
#endif
opt = bb_getopt_ulflags(argc, argv, "+trn:s:e::"

2
include/libbb.h
View File

@ -152,7 +152,7 @@ extern int bb_fclose_nonstdin(FILE *f);
extern void bb_fflush_stdout_and_exit(int retval) __attribute__ ((noreturn));
#define BB_GETOPT_ERROR 0x80000000UL
extern const char *bb_opt_complementaly;
extern const char *bb_opt_complementally;
extern const struct option *bb_applet_long_options;
extern unsigned long bb_getopt_ulflags(int argc, char **argv, const char *applet_opts, ...);

97
libbb/getopt_ulflags.c
View File

@ -2,7 +2,7 @@
/*
* universal getopt_ulflags implementation for busybox
*
* Copyright (C) 2003 Vladimir Oleynik <dzo@simtreas.ru>
* Copyright (C) 2003-2005 Vladimir Oleynik <dzo@simtreas.ru>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -67,39 +67,31 @@ bb_getopt_ulflags (int argc, char **argv, const char *applet_opts, ...)
The type of the pointer (char* or llist_t *) may be controlled
by the "*" special character that is set in the external string
bb_opt_complementaly (see below for more info).
bb_opt_complementally (see below for more info).
static const struct option bb_default_long_options[]
This struct allows you to define long options. The syntax for
declaring the array is just like that of getopt's longopts.
(see getopt(3))
static const struct option applet_long_options[] = {
{ "verbose", 0, 0, "v" },
{ "verbose", 0, 0, v },
{ 0, 0, 0, 0 }
};
bb_applet_long_options = applet_long_options;
The first parameter is the long option name that you would pass
to the applet (without the dashes).
The second field determines whether the option has an argument.
You can set this to 0, 1, or 2, or you can use the long named
defines of no_argument, required_argument, and optional_argument.
The third argument is used only when the long option does not
have a corresponding short option. In that case, it should be
an integer pointer. Otherwise (and normally), it should just
bet set to NULL.
The last argument is the corresponding short option (if there
is one of course).
The last argument (val) can undefined from applet_opts.
If you use this, then:
- return bit have next position after short options
- if has_arg is not "no_argument", use ptr for arg also
- bb_opt_complementally have effects for this too
Note: a good applet will make long options configurable via the
config process and not a required feature. The current standard
is to name the config option CONFIG_FEATURE_<applet>_LONG_OPTIONS.
const char *bb_opt_complementaly
const char *bb_opt_complementally
":" The colon (":") is used to separate groups of two or more chars
and/or groups of chars and special characters (stating some
@ -110,7 +102,7 @@ const char *bb_opt_complementaly
Their flags will be turned on if the main option is found even
if they are not specifed on the command line. For example:
bb_opt_complementaly = "abc";
bb_opt_complementally = "abc";
flags = bb_getopt_ulflags(argc, argv, "abcd")
@ -128,7 +120,7 @@ Special characters:
bb_getopt_ulflags finds -s, then -d is unset or if it finds -d
then -s is unset. (Note: busybox implements the GNU
"--max-depth" option as "-d".) To obtain this behavior, you
set bb_opt_complementaly = "s-d:d-s". Only one flag value is
set bb_opt_complementally = "s-d:d-s". Only one flag value is
added to bb_getopt_ulflags's return value depending on the
position of the options on the command line. If one of the
two options requires an argument pointer (":" in applet_opts
@ -136,7 +128,7 @@ Special characters:
char *smax_print_depth;
bb_opt_complementaly = "s-d:d-s";
bb_opt_complementally = "s-d:d-s";
opt = bb_getopt_ulflags(argc, argv, "sd:", &smax_print_depth);
if (opt & 2) {
@ -153,7 +145,7 @@ Special characters:
The cut applet must have only one type of list specified, so
-b, -c and -f are mutally exclusive and should raise an error
if specified together. In this case you must set
bb_opt_complementaly = "b~cf:c~bf:f~bc". If two of the
bb_opt_complementally = "b~cf:c~bf:f~bc". If two of the
mutually exclusive options are found, bb_getopt_ulflags's
return value will have the error flag set (BB_GETOPT_ERROR) so
that we can check for it:
@ -161,7 +153,10 @@ Special characters:
if (flags & BB_GETOPT_ERROR)
bb_show_usage();
"*" A star after a char in bb_opt_complementaly means that the
"!" If previous point set BB_GETOPT_ERROR, don`t return and call
previous example internally
"*" A star after a char in bb_opt_complementally means that the
option can occur multiple times:
For example:
@ -173,16 +168,15 @@ Special characters:
(this pointer must be initializated to NULL if the list is empty
as required by *llist_add_to(llist_t *old_head, char *new_item).)
bb_opt_complementaly = "e*";
bb_opt_complementally = "e*";
bb_getopt_ulflags(argc, argv, "e:", &patterns);
$ grep -e user -e root /etc/passwd
root:x:0:0:root:/root:/bin/bash
user:x:500:500::/home/user:/bin/bash
*/
const char *bb_opt_complementaly;
const char *bb_opt_complementally;
typedef struct {
unsigned char opt;
@ -191,7 +185,7 @@ typedef struct {
unsigned long switch_off;
unsigned long incongruously;
void **optarg; /* char **optarg or llist_t **optarg */
} t_complementaly;
} t_complementally;
/* You can set bb_applet_long_options for parse called long options */
@ -206,11 +200,13 @@ unsigned long
bb_getopt_ulflags (int argc, char **argv, const char *applet_opts, ...)
{
unsigned long flags = 0;
t_complementaly complementaly[sizeof(flags) * 8 + 1];
t_complementally complementally[sizeof(flags) * 8 + 1];
int c;
const unsigned char *s;
t_complementaly *on_off;
t_complementally *on_off;
va_list p;
const struct option *l_o;
char flg_show_usage_if_error = 0;
va_start (p, applet_opts);
@ -220,7 +216,7 @@ bb_getopt_ulflags (int argc, char **argv, const char *applet_opts, ...)
s++;
c = 0;
on_off = complementaly;
on_off = complementally;
for (; *s; s++) {
if(c >= (sizeof(flags)*8))
break;
@ -240,9 +236,31 @@ bb_getopt_ulflags (int argc, char **argv, const char *applet_opts, ...)
c++;
}
on_off->opt = 0;
for(l_o = bb_applet_long_options; l_o->name; l_o++) {
for(on_off = complementally; on_off->opt != 0; on_off++)
if(on_off->opt == l_o->val)
break;
if(on_off->opt == 0) {
if(c >= (sizeof(flags)*8))
break;
on_off->opt = l_o->val;
on_off->switch_on = (1 << c);
on_off->list_flg = 0;
on_off->switch_off = 0;
on_off->incongruously = 0;
if(l_o->has_arg != no_argument)
on_off->optarg = va_arg (p, void **);
else
on_off->optarg = NULL;
on_off++;
on_off->opt = 0;
c++;
}
}
c = 0;
for (s = bb_opt_complementaly; s && *s; s++) {
t_complementaly *pair;
for (s = bb_opt_complementally; s && *s; s++) {
t_complementally *pair;
if (*s == ':') {
c = 0;
@ -250,7 +268,11 @@ bb_getopt_ulflags (int argc, char **argv, const char *applet_opts, ...)
}
if (c)
continue;
for (on_off = complementaly; on_off->opt; on_off++)
if(*s == '!') {
flg_show_usage_if_error = '!';
continue;
}
for (on_off = complementally; on_off->opt; on_off++)
if (on_off->opt == *s)
break;
pair = on_off;
@ -263,7 +285,7 @@ bb_getopt_ulflags (int argc, char **argv, const char *applet_opts, ...)
unsigned long *pair_switch = &(pair->switch_on);
if(c)
pair_switch = c == '-' ? &(pair->switch_off) : &(pair->incongruously);
for (on_off = complementaly; on_off->opt; on_off++)
for (on_off = complementally; on_off->opt; on_off++)
if (on_off->opt == *s) {
*pair_switch |= on_off->switch_on;
break;
@ -275,12 +297,15 @@ bb_getopt_ulflags (int argc, char **argv, const char *applet_opts, ...)
while ((c = getopt_long (argc, argv, applet_opts,
bb_applet_long_options, NULL)) > 0) {
for (on_off = complementaly; on_off->opt != c; on_off++) {
for (on_off = complementally; on_off->opt != c; on_off++) {
if(!on_off->opt)
bb_show_usage ();
}
if(flags & on_off->incongruously)
if(flags & on_off->incongruously) {
if(flg_show_usage_if_error)
bb_show_usage ();
flags |= BB_GETOPT_ERROR;
}
flags &= ~on_off->switch_off;
flags |= on_off->switch_on;
if(on_off->list_flg) {

4
miscutils/crond.c
View File

@ -157,9 +157,9 @@ int crond_main(int ac, char **av)
#ifdef FEATURE_DEBUG_OPT
char *dopt;
bb_opt_complementaly = "f-b:b-f:S-L:L-S:d-l";
bb_opt_complementally = "f-b:b-f:S-L:L-S:d-l";
#else
bb_opt_complementaly = "f-b:b-f:S-L:L-S";
bb_opt_complementally = "f-b:b-f:S-L:L-S";
#endif
opterr = 0; /* disable getopt 'errors' message. */

2
networking/wget.c
View File

@ -191,7 +191,7 @@ int wget_main(int argc, char **argv)
/*
* Crack command line.
*/
bb_opt_complementaly = "\203*";
bb_opt_complementally = "\203*";
bb_applet_long_options = wget_long_options;
opt = bb_getopt_ulflags(argc, argv, "cq\213O:\203:P:Y:", &fname_out, &headers_llist, &dir_prefix, &proxy_flag);
if (opt & WGET_OPT_CONTINUE) {

6
util-linux/hwclock.c
View File

@ -205,12 +205,8 @@ static const struct option hwclock_long_options[] = {
bb_applet_long_options = hwclock_long_options;
#endif
bb_opt_complementaly = "r~ws:w~rs:s~wr:l~u:u~l";
bb_opt_complementally = "!r~ws:w~rs:s~wr:l~u:u~l";
opt = bb_getopt_ulflags(argc, argv, "lursw");
/* Check only one mode was given */
if(opt & BB_GETOPT_ERROR) {
bb_show_usage();
}
/* If -u or -l wasn't given check if we are using utc */
if (opt & (HWCLOCK_OPT_UTC | HWCLOCK_OPT_LOCALTIME))