|
@@ -96,9 +96,11 @@ getopt32(char **argv, const char *applet_opts, ...)
|
|
|
env -i ls -d /
|
|
|
Here we want env to process just the '-i', not the '-d'.
|
|
|
|
|
|
- "!" Report bad option, missing required options,
|
|
|
+ "!" Report bad options, missing required options,
|
|
|
inconsistent options with all-ones return value (instead of abort).
|
|
|
|
|
|
+ "^" options string is "^optchars""\0""opt_complementary".
|
|
|
+
|
|
|
uint32_t
|
|
|
getopt32long(char **argv, const char *applet_opts, const char *logopts...)
|
|
|
|
|
@@ -121,7 +123,7 @@ getopt32long(char **argv, const char *applet_opts, const char *logopts...)
|
|
|
config process and not a required feature. The current standard
|
|
|
is to name the config option CONFIG_FEATURE_<applet>_LONG_OPTIONS.
|
|
|
|
|
|
-const char *opt_complementary
|
|
|
+opt_complementary - option modifiers.
|
|
|
|
|
|
":" The colon (":") is used to separate groups of two or more chars
|
|
|
and/or groups of chars and special characters (stating some
|
|
@@ -132,8 +134,7 @@ const char *opt_complementary
|
|
|
Their flags will be turned on if the main option is found even
|
|
|
if they are not specified on the command line. For example:
|
|
|
|
|
|
- opt_complementary = "abc";
|
|
|
- flags = getopt32(argv, "abcd")
|
|
|
+ flags = getopt32(argv, "^abcd""\0""abc")
|
|
|
|
|
|
If getopt() finds "-a" on the command line, then
|
|
|
getopt32's return value will be as if "-a -b -c" were
|
|
@@ -146,8 +147,7 @@ const char *opt_complementary
|
|
|
if w is given more than once, it is "unlimited"
|
|
|
|
|
|
int w_counter = 0; // must be initialized!
|
|
|
- opt_complementary = "ww";
|
|
|
- getopt32(argv, "w", &w_counter);
|
|
|
+ getopt32(argv, "^w""\0""ww", &w_counter);
|
|
|
if (w_counter)
|
|
|
width = (w_counter == 1) ? 132 : INT_MAX;
|
|
|
else
|
|
@@ -162,8 +162,9 @@ const char *opt_complementary
|
|
|
|
|
|
llist_t *my_b = NULL;
|
|
|
int verbose_level = 0;
|
|
|
- opt_complementary = "vv:b-c:c-b";
|
|
|
- f = getopt32(argv, "vb:*c", &my_b, &verbose_level);
|
|
|
+ f = getopt32(argv, "^vb:*c"
|
|
|
+ "\0""vv:b-c:c-b"
|
|
|
+ , &my_b, &verbose_level);
|
|
|
if (f & 2) // -c after -b unsets -b flag
|
|
|
while (my_b) dosomething_with(llist_pop(&my_b));
|
|
|
if (my_b) // but llist is stored if -b is specified
|
|
@@ -199,7 +200,7 @@ Special characters:
|
|
|
getopt32 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 opt_complementary = "s-d:d-s". Only one flag value is
|
|
|
+ set opt_complementary to "s-d:d-s". Only one flag value is
|
|
|
added to getopt32'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
|
|
@@ -207,8 +208,7 @@ Special characters:
|
|
|
|
|
|
char *smax_print_depth;
|
|
|
|
|
|
- opt_complementary = "s-d:d-s:x-x";
|
|
|
- opt = getopt32(argv, "sd:x", &smax_print_depth);
|
|
|
+ opt = getopt32(argv, "^sd:x""\0""s-d:d-s:x-x", &smax_print_depth);
|
|
|
|
|
|
if (opt & 2)
|
|
|
max_print_depth = atoi(smax_print_depth);
|
|
@@ -224,7 +224,7 @@ Special characters:
|
|
|
The cut applet must have only one type of list specified, so
|
|
|
-b, -c and -f are mutually exclusive and should raise an error
|
|
|
if specified together. In this case you must set
|
|
|
- opt_complementary = "b--cf:c--bf:f--bc". If two of the
|
|
|
+ opt_complementary to "b--cf:c--bf:f--bc". If two of the
|
|
|
mutually exclusive options are found, getopt32 will call
|
|
|
bb_show_usage() and die.
|
|
|
|
|
@@ -236,8 +236,7 @@ Special characters:
|
|
|
with xatoi_positive() - allowed range is 0..INT_MAX.
|
|
|
|
|
|
int param; // "unsigned param;" will also work
|
|
|
- opt_complementary = "p+";
|
|
|
- getopt32(argv, "p:", ¶m);
|
|
|
+ getopt32(argv, "^p:""\0""p+", ¶m);
|
|
|
|
|
|
"o::" A double colon after a char in opt_complementary means that the
|
|
|
option can occur multiple times. Each occurrence will be saved as
|
|
@@ -252,8 +251,7 @@ Special characters:
|
|
|
(this pointer must be initializated to NULL if the list is empty
|
|
|
as required by llist_add_to_end(llist_t **old_head, char *new_item).)
|
|
|
|
|
|
- opt_complementary = "e::";
|
|
|
- getopt32(argv, "e:", &patterns);
|
|
|
+ getopt32(argv, "^e:""\0""e::", &patterns);
|
|
|
|
|
|
$ grep -e user -e root /etc/passwd
|
|
|
root:x:0:0:root:/root:/bin/bash
|
|
@@ -271,8 +269,7 @@ Special characters:
|
|
|
For example from "id" applet:
|
|
|
|
|
|
// Don't allow -n -r -rn -ug -rug -nug -rnug
|
|
|
- opt_complementary = "r?ug:n?ug:u--g:g--u";
|
|
|
- flags = getopt32(argv, "rnug");
|
|
|
+ flags = getopt32(argv, "^rnug""\0""r?ug:n?ug:u--g:g--u");
|
|
|
|
|
|
This example allowed only:
|
|
|
$ id; id -u; id -g; id -ru; id -nu; id -rg; id -ng; id -rnu; id -rng
|
|
@@ -283,8 +280,7 @@ Special characters:
|
|
|
For example from "start-stop-daemon" applet:
|
|
|
|
|
|
// Don't allow -KS -SK, but -S or -K is required
|
|
|
- opt_complementary = "K:S:K--S:S--K";
|
|
|
- flags = getopt32(argv, "KS...);
|
|
|
+ flags = getopt32(argv, "^KS...""\0""K:S:K--S:S--K");
|
|
|
|
|
|
|
|
|
Don't forget to use ':'. For example, "?322-22-23X-x-a"
|
|
@@ -299,8 +295,6 @@ Special characters:
|
|
|
|
|
|
const char *const bb_argv_dash[] = { "-", NULL };
|
|
|
|
|
|
-const char *opt_complementary;
|
|
|
-
|
|
|
enum {
|
|
|
PARAM_STRING,
|
|
|
PARAM_LIST,
|
|
@@ -337,10 +331,12 @@ vgetopt32(char **argv, const char *applet_opts, const char *applet_long_options,
|
|
|
int argc;
|
|
|
unsigned flags = 0;
|
|
|
unsigned requires = 0;
|
|
|
+ unsigned len;
|
|
|
t_complementary complementary[33]; /* last stays zero-filled */
|
|
|
- char first_char;
|
|
|
+ char dont_die_flag;
|
|
|
int c;
|
|
|
const unsigned char *s;
|
|
|
+ const char *opt_complementary;
|
|
|
t_complementary *on_off;
|
|
|
#if ENABLE_LONG_OPTS
|
|
|
const struct option *l_o;
|
|
@@ -349,23 +345,29 @@ vgetopt32(char **argv, const char *applet_opts, const char *applet_long_options,
|
|
|
unsigned trigger;
|
|
|
int min_arg = 0;
|
|
|
int max_arg = -1;
|
|
|
-
|
|
|
-#define SHOW_USAGE_IF_ERROR 1
|
|
|
-
|
|
|
int spec_flgs = 0;
|
|
|
|
|
|
- /* skip 0: some applets cheat: they do not actually HAVE argv[0] */
|
|
|
- argc = 1 + string_array_len(argv + 1);
|
|
|
+#define SHOW_USAGE_IF_ERROR 1
|
|
|
|
|
|
on_off = complementary;
|
|
|
memset(on_off, 0, sizeof(complementary));
|
|
|
|
|
|
- applet_opts = strcpy(alloca(strlen(applet_opts) + 1), applet_opts);
|
|
|
+ len = strlen(applet_opts);
|
|
|
|
|
|
/* skip bbox extension */
|
|
|
- first_char = applet_opts[0];
|
|
|
- if (first_char == '!')
|
|
|
+ opt_complementary = NULL;
|
|
|
+ if (applet_opts[0] == '^') {
|
|
|
applet_opts++;
|
|
|
+ /* point it past terminating NUL */
|
|
|
+ opt_complementary = applet_opts + len;
|
|
|
+ }
|
|
|
+
|
|
|
+ /* skip another bbox extension */
|
|
|
+ dont_die_flag = applet_opts[0];
|
|
|
+ if (dont_die_flag == '!')
|
|
|
+ applet_opts++;
|
|
|
+
|
|
|
+ applet_opts = strcpy(alloca(len + 1), applet_opts);
|
|
|
|
|
|
/* skip GNU extension */
|
|
|
s = (const unsigned char *)applet_opts;
|
|
@@ -435,7 +437,8 @@ vgetopt32(char **argv, const char *applet_opts, const char *applet_long_options,
|
|
|
}
|
|
|
#endif /* ENABLE_LONG_OPTS */
|
|
|
|
|
|
- for (s = (const unsigned char *)opt_complementary; s && *s; s++) {
|
|
|
+ s = (const unsigned char *)opt_complementary;
|
|
|
+ if (s) for (; *s; s++) {
|
|
|
t_complementary *pair;
|
|
|
unsigned *pair_switch;
|
|
|
|
|
@@ -513,8 +516,6 @@ vgetopt32(char **argv, const char *applet_opts, const char *applet_long_options,
|
|
|
s--;
|
|
|
}
|
|
|
|
|
|
- /* Make it unnecessary to clear it by hand after each getopt32 call */
|
|
|
- opt_complementary = NULL;
|
|
|
/* In case getopt32 was already called:
|
|
|
* reset the libc getopt() function, which keeps internal state.
|
|
|
* run_nofork_applet() does this, but we might end up here
|
|
@@ -522,6 +523,9 @@ vgetopt32(char **argv, const char *applet_opts, const char *applet_long_options,
|
|
|
*/
|
|
|
GETOPT_RESET();
|
|
|
|
|
|
+ /* skip 0: some applets cheat: they do not actually HAVE argv[0] */
|
|
|
+ argc = 1 + string_array_len(argv + 1);
|
|
|
+
|
|
|
/* Note: just "getopt() <= 0" will not work well for
|
|
|
* "fake" short options, like this one:
|
|
|
* wget $'-\203' "Test: test" http://kernel.org/
|
|
@@ -583,7 +587,7 @@ vgetopt32(char **argv, const char *applet_opts, const char *applet_long_options,
|
|
|
return flags;
|
|
|
|
|
|
error:
|
|
|
- if (first_char != '!')
|
|
|
+ if (dont_die_flag != '!')
|
|
|
bb_show_usage();
|
|
|
return (int32_t)-1;
|
|
|
}
|