charon-cmd: Changed formatting of optional arguments in usage information

Optional arguments have to be specified with = after the option.
This commit is contained in:
Tobias Brunner 2013-05-07 15:05:12 +02:00
parent 6a6d0ea7cd
commit 4d38a698b8

View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2006-2012 Tobias Brunner * Copyright (C) 2006-2013 Tobias Brunner
* Copyright (C) 2005-2013 Martin Willi * Copyright (C) 2005-2013 Martin Willi
* Copyright (C) 2006 Daniel Roethlisberger * Copyright (C) 2006 Daniel Roethlisberger
* Copyright (C) 2005 Jan Hutter * Copyright (C) 2005 Jan Hutter
@ -199,7 +199,8 @@ static void segv_handler(int signal)
*/ */
static void usage(FILE *out, char *msg, char *binary) static void usage(FILE *out, char *msg, char *binary)
{ {
int i, line, pre, post, padto = 0, spacing = 2; char *pre, *post;
int i, line, padto = 0, spacing = 2;
for (i = 0; i < CMD_OPT_COUNT; i++) for (i = 0; i < CMD_OPT_COUNT; i++)
{ {
@ -218,19 +219,20 @@ static void usage(FILE *out, char *msg, char *binary)
switch (cmd_options[i].has_arg) switch (cmd_options[i].has_arg)
{ {
case required_argument: case required_argument:
pre = '<'; pre = " <";
post = '>'; post = ">";
break; break;
case optional_argument: case optional_argument:
pre = '['; pre = "[=";
post = ']'; post = "]";
break; break;
case no_argument: case no_argument:
default: default:
pre = post = ' '; pre = " ";
post = " ";
break; break;
} }
fprintf(out, " --%s %c%s%c %-*s%s\n", fprintf(out, " --%s%s%s%s %-*s%s\n",
cmd_options[i].name, cmd_options[i].name,
pre, cmd_options[i].arg, post, pre, cmd_options[i].arg, post,
padto - strlen(cmd_options[i].name) - strlen(cmd_options[i].arg), "", padto - strlen(cmd_options[i].name) - strlen(cmd_options[i].arg), "",