oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

line-up help strings

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@2448 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Assar Westerlund
1997-07-19 00:25:35 +00:00
parent 269dd2347c
commit ec5a6608ff
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/roken/getarg.c
View File

@@ -70,17 +70,25 @@ arg_printusage (struct getargs *args,
const char *extra_string) const char *extra_string)
{ {
int i; int i;
size_t max_len = 0;
fprintf (stderr, "Usage: %s", __progname); fprintf (stderr, "Usage: %s", __progname);
for (i = 0; i < num_args; ++i) { for (i = 0; i < num_args; ++i) {
size_t len = 0;
if (args[i].long_name) { if (args[i].long_name) {
len += 2 + strlen(args[i].long_name);
fprintf (stderr, " [--%s", args[i].long_name); fprintf (stderr, " [--%s", args[i].long_name);
print_arg (&args[i]); print_arg (&args[i]);
} }
if (args[i].short_name) { if (args[i].short_name) {
len += 2;
fprintf (stderr, " [-%c", args[i].short_name); fprintf (stderr, " [-%c", args[i].short_name);
print_arg (&args[i]); print_arg (&args[i]);
} }
if (args[i].long_name && args[i].short_name)
len += 4;
max_len = max(max_len, len);
} }
if (extra_string) if (extra_string)
fprintf (stderr, " %s\n", extra_string); fprintf (stderr, " %s\n", extra_string);
@@ -88,14 +96,23 @@ arg_printusage (struct getargs *args,
fprintf (stderr, "\n"); fprintf (stderr, "\n");
for (i = 0; i < num_args; ++i) { for (i = 0; i < num_args; ++i) {
if (args[i].help) { if (args[i].help) {
size_t count = 0;
if (args[i].short_name) { if (args[i].short_name) {
fprintf (stderr, "-%c", args[i].short_name); fprintf (stderr, "-%c", args[i].short_name);
if (args[i].long_name) count += 2;
fprintf (stderr, " or ");
} }
if (args[i].long_name) if (args[i].short_name && args[i].long_name) {
fprintf (stderr, " or ");
count += 4;
}
if (args[i].long_name) {
fprintf (stderr, "--%s", args[i].long_name); fprintf (stderr, "--%s", args[i].long_name);
fprintf (stderr, "\t%s\n", args[i].help); count += 2 + strlen(args[i].long_name);
}
while(count++ <= max_len)
putc (' ', stderr);
fprintf (stderr, "%s\n", args[i].help);
} }
} }
} }