From: Tobias Brunner <tobias@strongswan.org>
Date: Tue, 7 May 2013 13:05:12 +0000 (+0200)
Subject: charon-cmd: Changed formatting of optional arguments in usage information
X-Git-Tag: 5.1.0dr1~150^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4d38a698b81f9d223142eb04c666472e1d1343ed;p=thirdparty%2Fstrongswan.git

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

Optional arguments have to be specified with = after the option.
---

diff --git a/src/charon-cmd/charon-cmd.c b/src/charon-cmd/charon-cmd.c
index a77794abe6..f898fd6500 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), "",