Rework make_usage to print the usage message immediately
Signed-off-by: Alex Riesen <raa.lkml@gmail.com> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Alex Riesen committed
Oct 14, 2007 at 00:10 UTC
f389c808b6774fb0a1fc54cf2563a7b3038dd1d4
1 file changed
+22
-25
parse-options.c
+22
-25
@@ -1,6 +1,5 @@
1
#include "git-compat-util.h"
2
#include "parse-options.h"
3
-#include "strbuf.h"
3
4
#define OPT_SHORT 1
5
#define OPT_UNSET 2
@@ -172,59 +171,57 @@ int parse_options(int argc, const char **argv, const struct option *options,
171
void usage_with_options(const char * const *usagestr,
172
const struct option *opts)
173
{
175
- struct strbuf sb;
176
-
177
- strbuf_init(&sb, 4096);
178
- strbuf_addstr(&sb, *usagestr);
179
- strbuf_addch(&sb, '\n');
180
- while (*++usagestr)
181
- strbuf_addf(&sb, " %s\n", *usagestr);
174
+ fprintf(stderr, "usage: %s\n", *usagestr++);
175
+ while (*usagestr && **usagestr)
176
+ fprintf(stderr, " or: %s\n", *usagestr++);
177
+ while (*usagestr)
178
+ fprintf(stderr, " %s\n", *usagestr++);
179
180
if (opts->type != OPTION_GROUP)
184
- strbuf_addch(&sb, '\n');
181
+ fputc('\n', stderr);
182
183
for (; opts->type != OPTION_END; opts++) {
184
size_t pos;
185
int pad;
186
187
if (opts->type == OPTION_GROUP) {
191
- strbuf_addch(&sb, '\n');
188
+ fputc('\n', stderr);
189
if (*opts->help)
193
- strbuf_addf(&sb, "%s\n", opts->help);
190
+ fprintf(stderr, "%s\n", opts->help);
191
continue;
192
}
193
197
- pos = sb.len;
198
- strbuf_addstr(&sb, " ");
194
+ pos = fprintf(stderr, " ");
195
if (opts->short_name)
200
- strbuf_addf(&sb, "-%c", opts->short_name);
196
+ pos += fprintf(stderr, "-%c", opts->short_name);
197
if (opts->long_name && opts->short_name)
202
- strbuf_addstr(&sb, ", ");
198
+ pos += fprintf(stderr, ", ");
199
if (opts->long_name)
204
- strbuf_addf(&sb, "--%s", opts->long_name);
200
+ pos += fprintf(stderr, "--%s", opts->long_name);
201
202
switch (opts->type) {
203
case OPTION_INTEGER:
208
- strbuf_addstr(&sb, " <n>");
204
+ pos += fprintf(stderr, " <n>");
205
break;
206
case OPTION_STRING:
207
if (opts->argh)
212
- strbuf_addf(&sb, " <%s>", opts->argh);
208
+ pos += fprintf(stderr, " <%s>", opts->argh);
209
else
214
- strbuf_addstr(&sb, " ...");
210
+ pos += fprintf(stderr, " ...");
211
break;
212
default:
213
break;
214
}
215
220
- pad = sb.len - pos;
221
- if (pad <= USAGE_OPTS_WIDTH)
222
- pad = USAGE_OPTS_WIDTH - pad;
216
+ if (pos <= USAGE_OPTS_WIDTH)
217
+ pad = USAGE_OPTS_WIDTH - pos;
218
else {
224
- strbuf_addch(&sb, '\n');
219
+ fputc('\n', stderr);
220
pad = USAGE_OPTS_WIDTH;
221
}
227
- strbuf_addf(&sb, "%*s%s\n", pad + USAGE_GAP, "", opts->help);
222
+ fprintf(stderr, "%*s%s\n", pad + USAGE_GAP, "", opts->help);
223
}
229
- usage(sb.buf);
224
+ fputc('\n', stderr);
225
+
226
+ exit(129);
227
}