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

- make getopt_ulflags aware of CONFIG_GETOPT_LONG

Browse Source
This commit is contained in:
Bernhard Reutner-Fischer 2006-05-31 14:12:51 +00:00
parent 8d3a6f7aaf
commit f9437aaf5b
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libbb/getopt_ulflags.c
View File

@ -298,13 +298,14 @@ typedef struct {
} t_complementally; } t_complementally;
/* You can set bb_applet_long_options for parse called long options */ /* You can set bb_applet_long_options for parse called long options */
#if ENABLE_GETOPT_LONG
static const struct option bb_default_long_options[] = { static const struct option bb_default_long_options[] = {
/* { "help", 0, NULL, '?' }, */ /* { "help", 0, NULL, '?' }, */
{ 0, 0, 0, 0 } { 0, 0, 0, 0 }
}; };
const struct option *bb_applet_long_options = bb_default_long_options; const struct option *bb_applet_long_options = bb_default_long_options;
#endif
unsigned long unsigned long
bb_getopt_ulflags (int argc, char **argv, const char *applet_opts, ...) bb_getopt_ulflags (int argc, char **argv, const char *applet_opts, ...)
@ -316,7 +317,9 @@ bb_getopt_ulflags (int argc, char **argv, const char *applet_opts, ...)
const unsigned char *s; const unsigned char *s;
t_complementally *on_off; t_complementally *on_off;
va_list p; va_list p;
#if ENABLE_GETOPT_LONG
const struct option *l_o; const struct option *l_o;
#endif
unsigned long trigger; unsigned long trigger;
#ifdef CONFIG_PS #ifdef CONFIG_PS
char **pargv = NULL; char **pargv = NULL;
@ -355,6 +358,7 @@ bb_getopt_ulflags (int argc, char **argv, const char *applet_opts, ...)
c++; c++;
} }
#if ENABLE_GETOPT_LONG
for(l_o = bb_applet_long_options; l_o->name; l_o++) { for(l_o = bb_applet_long_options; l_o->name; l_o++) {
if(l_o->flag) if(l_o->flag)
continue; continue;
@ -371,6 +375,7 @@ bb_getopt_ulflags (int argc, char **argv, const char *applet_opts, ...)
c++; c++;
} }
} }
#endif /* ENABLE_GETOPT_LONG */
for (s = (const unsigned char *)bb_opt_complementally; s && *s; s++) { for (s = (const unsigned char *)bb_opt_complementally; s && *s; s++) {
t_complementally *pair; t_complementally *pair;
unsigned long *pair_switch; unsigned long *pair_switch;
@ -452,8 +457,12 @@ bb_getopt_ulflags (int argc, char **argv, const char *applet_opts, ...)
} }
} }
#endif #endif
#if ENABLE_GETOPT_LONG
while ((c = getopt_long (argc, argv, applet_opts, while ((c = getopt_long (argc, argv, applet_opts,
bb_applet_long_options, NULL)) >= 0) { bb_applet_long_options, NULL)) >= 0) {
#else
while ((c = getopt (argc, argv, applet_opts)) >= 0) {
#endif /* ENABLE_GETOPT_LONG */
#ifdef CONFIG_PS #ifdef CONFIG_PS
loop_arg_is_opt: loop_arg_is_opt:
#endif #endif