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

pack short flag options togther, to shorten the usage string

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@9799 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2001-04-21 16:04:50 +00:00
parent 396aa1eb2a
commit 5381d88f33
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/roken/getarg.c
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1997 - 2000 Kungliga Tekniska H<>gskolan * Copyright (c) 1997 - 2001 Kungliga Tekniska H<>gskolan
* (Royal Institute of Technology, Stockholm, Sweden). * (Royal Institute of Technology, Stockholm, Sweden).
* All rights reserved. * All rights reserved.
* *
@@ -223,6 +223,23 @@ arg_printusage (struct getargs *args,
columns = 80; columns = 80;
col = 0; col = 0;
col += fprintf (stderr, "Usage: %s", progname); col += fprintf (stderr, "Usage: %s", progname);
buf[0] = '\0';
for (i = 0; i < num_args; ++i) {
if(args[i].short_name && ISFLAG(args[i])) {
char s[2];
if(buf[0] == '\0')
strlcpy(buf, "[-", sizeof(buf));
s[0] = args[i].short_name;
s[1] = '\0';
strlcat(buf, s, sizeof(buf));
}
}
if(buf[0] != '\0') {
strlcat(buf, "]", sizeof(buf));
col = check_column(stderr, col, strlen(buf) + 1, columns);
col += fprintf(stderr, " %s", buf);
}
for (i = 0; i < num_args; ++i) { for (i = 0; i < num_args; ++i) {
size_t len = 0; size_t len = 0;
@@ -244,7 +261,7 @@ arg_printusage (struct getargs *args,
col = check_column(stderr, col, strlen(buf) + 1, columns); col = check_column(stderr, col, strlen(buf) + 1, columns);
col += fprintf(stderr, " %s", buf); col += fprintf(stderr, " %s", buf);
} }
if (args[i].short_name) { if (args[i].short_name && !ISFLAG(args[i])) {
snprintf(buf, sizeof(buf), "[-%c", args[i].short_name); snprintf(buf, sizeof(buf), "[-%c", args[i].short_name);
len += 2; len += 2;
len += print_arg(buf + strlen(buf), sizeof(buf) - strlen(buf), len += print_arg(buf + strlen(buf), sizeof(buf) - strlen(buf),