aboutsummaryrefslogtreecommitdiff
path: root/libbb/getopt_ulflags.c
diff options
context:
space:
mode:
authorDenis Vlasenko <vda.linux@googlemail.com>2006-09-23 12:22:11 +0000
committerDenis Vlasenko <vda.linux@googlemail.com>2006-09-23 12:22:11 +0000
commit6429aabbf14be7ce1585fb07b1edb11795dbefc2 (patch)
treee2807acf29f2f5c5f0281f2763df6987ae0cc61d /libbb/getopt_ulflags.c
parentb97f07f5a10b33ba115a7eb60acc25dfc86b3f55 (diff)
downloadbusybox-w32-6429aabbf14be7ce1585fb07b1edb11795dbefc2.tar.gz
busybox-w32-6429aabbf14be7ce1585fb07b1edb11795dbefc2.tar.bz2
busybox-w32-6429aabbf14be7ce1585fb07b1edb11795dbefc2.zip
bb_askpass: shorten static password buffer. 256 is way too large.
simplify code a bit.
Diffstat (limited to 'libbb/getopt_ulflags.c')
-rw-r--r--libbb/getopt_ulflags.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/libbb/getopt_ulflags.c b/libbb/getopt_ulflags.c
index e0dc1371f..941e3c96e 100644
--- a/libbb/getopt_ulflags.c
+++ b/libbb/getopt_ulflags.c
@@ -104,7 +104,6 @@ const char *bb_opt_complementally
104 if they are not specifed on the command line. For example: 104 if they are not specifed on the command line. For example:
105 105
106 bb_opt_complementally = "abc"; 106 bb_opt_complementally = "abc";
107
108 flags = bb_getopt_ulflags(argc, argv, "abcd") 107 flags = bb_getopt_ulflags(argc, argv, "abcd")
109 108
110 If getopt() finds "-a" on the command line, then 109 If getopt() finds "-a" on the command line, then
@@ -120,7 +119,6 @@ const char *bb_opt_complementally
120 int w_counter = 0; 119 int w_counter = 0;
121 bb_opt_complementally = "ww"; 120 bb_opt_complementally = "ww";
122 bb_getopt_ulflags(argc, argv, "w", &w_counter); 121 bb_getopt_ulflags(argc, argv, "w", &w_counter);
123
124 if(w_counter) 122 if(w_counter)
125 width = (w_counter == 1) ? 132 : INT_MAX; 123 width = (w_counter == 1) ? 132 : INT_MAX;
126 else 124 else
@@ -128,6 +126,7 @@ const char *bb_opt_complementally
128 126
129 w_counter is a pointer to an integer. It has to be passed to 127 w_counter is a pointer to an integer. It has to be passed to
130 bb_getopt_ulflags() after all other option argument sinks. 128 bb_getopt_ulflags() after all other option argument sinks.
129
131 For example: accept multiple -v to indicate the level of verbosity 130 For example: accept multiple -v to indicate the level of verbosity
132 and for each -b optarg, add optarg to my_b. Finally, if b is given, 131 and for each -b optarg, add optarg to my_b. Finally, if b is given,
133 turn off c and vice versa: 132 turn off c and vice versa:
@@ -136,8 +135,8 @@ const char *bb_opt_complementally
136 int verbose_level = 0; 135 int verbose_level = 0;
137 bb_opt_complementally = "vv:b::b-c:c-b"; 136 bb_opt_complementally = "vv:b::b-c:c-b";
138 f = bb_getopt_ulflags(argc, argv, "vb:c", &my_b, &verbose_level); 137 f = bb_getopt_ulflags(argc, argv, "vb:c", &my_b, &verbose_level);
139 if((f & 2)) // -c after -b unsets -b flag 138 if(f & 2) // -c after -b unsets -b flag
140 while(my_b) { dosomething_with(my_b->data) ; my_b = my_b->link; } 139 while(my_b) { dosomething_with(my_b->data); my_b = my_b->link; }
141 if(my_b) // but llist is stored if -b is specified 140 if(my_b) // but llist is stored if -b is specified
142 free_llist(my_b); 141 free_llist(my_b);
143 if(verbose_level) bb_printf("verbose level is %d\n", verbose_level); 142 if(verbose_level) bb_printf("verbose level is %d\n", verbose_level);
@@ -237,7 +236,7 @@ Special characters:
237 236
238 "--" A double dash at the beginning of bb_opt_complementally means the 237 "--" A double dash at the beginning of bb_opt_complementally means the
239 argv[1] string should always be treated as options, even if it isn't 238 argv[1] string should always be treated as options, even if it isn't
240 prefixed with a "-". This is to support the special syntax in applets 239 prefixed with a "-". This is useful for special syntax in applets
241 such as "ar" and "tar": 240 such as "ar" and "tar":
242 tar xvf foo.tar 241 tar xvf foo.tar
243 242