svn commit: trunk/busybox/libbb

[aldot at busybox.net]

Author: aldot
Date: 2006-05-31 07:12:51 -0700 (Wed, 31 May 2006)
New Revision: 15248

Log:
- make getopt_ulflags aware of CONFIG_GETOPT_LONG


Modified:
   trunk/busybox/libbb/getopt_ulflags.c


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