/[magellan-source]/trunk/mkinitrd-magellan/busybox/libbb/getopt32.c

Diff of /trunk/mkinitrd-magellan/busybox/libbb/getopt32.c

Parent Directory | Revision Log | View Patch Patch

-revision 983 by niro,
Fri Apr 24 18:33:46 2009 UTC
+revision 984 by niro,
Sun May 30 11:32:42 2010 UTC
 Line 72 
 getopt32(char **argv, const char *applet
          env -i ls -d /
          Here we want env to process just the '-i', not the '-d'.
+  "!"    Report bad option, missing required options,
+         inconsistent options with all-ones return value (instead of abort).
  const char *applet_long_options
          This struct allows you to define long options:
-Line 144 
 const char *opt_complementary
+Line 147 
 const char *opt_complementary
  Special characters:
-  "-"    A dash as the first char in a opt_complementary group forces
+  "-"    A group consisting of just a dash forces all arguments
-         all arguments to be treated as options, even if they have
+         to be treated as options, even if they have no leading dashes.
-         no leading dashes. Next char in this case can't be a digit (0-9),
+         Next char in this case can't be a digit (0-9), use ':' or end of line.
-         use ':' or end of line. For example:
+         Example:
-         opt_complementary = "-:w-x:x-w";
+         opt_complementary = "-:w-x:x-w"; // "-w-x:x-w" would also work,
-         getopt32(argv, "wx");
+         getopt32(argv, "wx");            // but is less readable
-         Allows any arguments to be given without a dash (./program w x)
+         This makes it possible to use options without a dash (./program w x)
          as well as with a dash (./program -x).
- 	NB: getopt32() will leak a small amount of memory if you use
+         NB: getopt32() will leak a small amount of memory if you use
- 	this option! Do not use it if there is a possibility of recursive
+         this option! Do not use it if there is a possibility of recursive
- 	getopt32() calls.
+         getopt32() calls.
   "--"   A double dash at the beginning of opt_complementary means the
          argv[1] string should always be treated as options, even if it isn't
-Line 165 
 Special characters:
+Line 168 
 Special characters:
          such as "ar" and "tar":
          tar xvf foo.tar
- 	NB: getopt32() will leak a small amount of memory if you use
+         NB: getopt32() will leak a small amount of memory if you use
- 	this option! Do not use it if there is a possibility of recursive
+         this option! Do not use it if there is a possibility of recursive
- 	getopt32() calls.
+         getopt32() calls.
   "-N"   A dash as the first char in a opt_complementary group followed
          by a single digit (0-9) means that at least N non-option
-Line 311 
 typedef struct {
+Line 314 
 typedef struct {
  } t_complementary;
  /* You can set applet_long_options for parse called long options */
- #if ENABLE_GETOPT_LONG
+ #if ENABLE_LONG_OPTS || ENABLE_FEATURE_GETOPT_LONG
  static const struct option bb_null_long_options[1] = {
  	{ 0, 0, 0, 0 }
  };
-Line 327 
 getopt32(char **argv, const char *applet
+Line 330 
 getopt32(char **argv, const char *applet
  	unsigned flags = 0;
  	unsigned requires = 0;
  	t_complementary complementary[33]; /* last stays zero-filled */
+ 	char first_char;
  	int c;
  	const unsigned char *s;
  	t_complementary *on_off;
  	va_list p;
- #if ENABLE_GETOPT_LONG
+ #if ENABLE_LONG_OPTS || ENABLE_FEATURE_GETOPT_LONG
  	const struct option *l_o;
  	struct option *long_options = (struct option *) &bb_null_long_options;
  #endif
-Line 357 
 getopt32(char **argv, const char *applet
+Line 361 
 getopt32(char **argv, const char *applet
  	on_off = complementary;
  	memset(on_off, 0, sizeof(complementary));
+ 	/* skip bbox extension */
+ 	first_char = applet_opts[0];
+ 	if (first_char == '!')
+ 		applet_opts++;
  	/* skip GNU extension */
  	s = (const unsigned char *)applet_opts;
  	if (*s == '+' || *s == '-')
-Line 375 
 getopt32(char **argv, const char *applet
+Line 384 
 getopt32(char **argv, const char *applet
  		c++;
  	}
- #if ENABLE_GETOPT_LONG
+ #if ENABLE_LONG_OPTS || ENABLE_FEATURE_GETOPT_LONG
  	if (applet_long_options) {
  		const char *optstr;
  		unsigned i, count;
-Line 415 
 getopt32(char **argv, const char *applet
+Line 424 
 getopt32(char **argv, const char *applet
   next_long: ;
  		}
  	}
- #endif /* ENABLE_GETOPT_LONG */
+ #endif /* ENABLE_LONG_OPTS || ENABLE_FEATURE_GETOPT_LONG */
  	for (s = (const unsigned char *)opt_complementary; s && *s; s++) {
  		t_complementary *pair;
  		unsigned *pair_switch;
-Line 534 
 getopt32(char **argv, const char *applet
+Line 543 
 getopt32(char **argv, const char *applet
  	 * "fake" short options, like this one:
  	 * wget $'-\203' "Test: test" http://kernel.org/
  	 * (supposed to act as --header, but doesn't) */
- #if ENABLE_GETOPT_LONG
+ #if ENABLE_LONG_OPTS || ENABLE_FEATURE_GETOPT_LONG
  	while ((c = getopt_long(argc, argv, applet_opts,
  			long_options, NULL)) != -1) {
  #else
-Line 549 
 getopt32(char **argv, const char *applet
+Line 558 
 getopt32(char **argv, const char *applet
  			 * is always NULL (see above) */
  			if (on_off->opt_char == '\0' /* && c != '\0' */) {
  				/* c is probably '?' - "bad option" */
- 				bb_show_usage();
+ 				goto error;
  			}
  		}
  		if (flags & on_off->incongruously)
- 			bb_show_usage();
+ 			goto error;
  		trigger = on_off->switch_on & on_off->switch_off;
  		flags &= ~(on_off->switch_off ^ trigger);
  		flags |= on_off->switch_on ^ trigger;
-Line 577 
 getopt32(char **argv, const char *applet
+Line 586 
 getopt32(char **argv, const char *applet
  	/* check depending requires for given options */
  	for (on_off = complementary; on_off->opt_char; on_off++) {
- 		if (on_off->requires && (flags & on_off->switch_on) &&
+ 		if (on_off->requires
- 					(flags & on_off->requires) == 0)
+ 		 && (flags & on_off->switch_on)
- 			bb_show_usage();
+ 		 && (flags & on_off->requires) == 0
+ 		) {
+ 			goto error;
+ 		}
  	}
  	if (requires && (flags & requires) == 0)
- 		bb_show_usage();
+ 		goto error;
  	argc -= optind;
  	if (argc < min_arg || (max_arg >= 0 && argc > max_arg))
- 		bb_show_usage();
+ 		goto error;
  	option_mask32 = flags;
  	return flags;
+  error:
+ 	if (first_char != '!')
+ 		bb_show_usage();
+ 	return (int32_t)-1;
  }

 Legend:



Removed from v.983
 


changed lines


 
Added in v.984
 Legend:



Removed from v.983
 


changed lines


 
Added in v.984
-Removed from v.983
+Added in v.984