aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTobias Brunner <tobias@strongswan.org>2013-05-07 15:05:12 +0200
committerTobias Brunner <tobias@strongswan.org>2013-05-08 12:30:36 +0200
commit4d38a698b81f9d223142eb04c666472e1d1343ed (patch)
treedfd2063b5afcb43de7218ccb52775a82b3d995f0 /src
parent6a6d0ea7cd7b313b8f4d2f85f42a66a2f6e78b57 (diff)
downloadstrongswan-4d38a698b81f9d223142eb04c666472e1d1343ed.tar.bz2
strongswan-4d38a698b81f9d223142eb04c666472e1d1343ed.tar.xz
charon-cmd: Changed formatting of optional arguments in usage information
Optional arguments have to be specified with = after the option.
Diffstat (limited to 'src')
-rw-r--r--src/charon-cmd/charon-cmd.c18
1 files changed, 10 insertions, 8 deletions
diff --git a/src/charon-cmd/charon-cmd.c b/src/charon-cmd/charon-cmd.c
index a77794abe..f898fd650 100644
--- a/src/charon-cmd/charon-cmd.c
+++ b/src/charon-cmd/charon-cmd.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006-2012 Tobias Brunner
+ * Copyright (C) 2006-2013 Tobias Brunner
* Copyright (C) 2005-2013 Martin Willi
* Copyright (C) 2006 Daniel Roethlisberger
* Copyright (C) 2005 Jan Hutter
@@ -199,7 +199,8 @@ static void segv_handler(int signal)
*/
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++)
{
@@ -218,19 +219,20 @@ static void usage(FILE *out, char *msg, char *binary)
switch (cmd_options[i].has_arg)
{
case required_argument:
- pre = '<';
- post = '>';
+ pre = " <";
+ post = ">";
break;
case optional_argument:
- pre = '[';
- post = ']';
+ pre = "[=";
+ post = "]";
break;
case no_argument:
default:
- pre = post = ' ';
+ pre = " ";
+ post = " ";
break;
}
- fprintf(out, " --%s %c%s%c %-*s%s\n",
+ fprintf(out, " --%s%s%s%s %-*s%s\n",
cmd_options[i].name,
pre, cmd_options[i].arg, post,
padto - strlen(cmd_options[i].name) - strlen(cmd_options[i].arg), "",