Merge branch 'gawk-4.1-stable'

2 files changed, 7 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 3e2a643f..c5f18868 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-09-29         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* main.c (main): In optlist, it should say "h", not "h:", since there
+	is no argument for the help option.  Thanks to Joep van Delft for
+	the bug report.
+
 2014-09-29         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* gawkapi.h: Minor edits to sync with documentation. Does not
diff --git a/main.c b/main.c
index 41f10a17..3e9c18e1 100644
--- a/main.c
+++ b/main.c
@@ -212,7 +212,7 @@ main(int argc, char **argv)
 	/*
 	 * The + on the front tells GNU getopt not to rearrange argv.
 	 */
-	const char *optlist = "+F:f:v:W;bcCd::D::e:E:gh:i:l:L:nNo::Op::MPrStVY";
+	const char *optlist = "+F:f:v:W;bcCd::D::e:E:ghi:l:L:nNo::Op::MPrStVY";
 	bool stopped_early = false;
 	int old_optind;
 	int i;