Merge branch 'gawk-4.1-stable' to sort option table by long option name.

2 files changed, 26 insertions, 21 deletions

diff --git a/ChangeLog b/ChangeLog
index 22dd20bb..660a457a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-01         Andrew J. Schorr     <aschorr@telemetry-investments.com>
+
+	* main.c (optab): Sort by long option name.
+
 2013-11-27         Andrew J. Schorr     <aschorr@telemetry-investments.com>
 
 	* main.c (optab): Add entry for --include.
diff --git a/main.c b/main.c
index 0737eae5..4f8a397d 100644
--- a/main.c
+++ b/main.c
@@ -159,37 +159,38 @@ int ngroups;			/* size of said set */
 
 void (*lintfunc)(const char *mesg, ...) = r_warning;
 
+/* Sorted by long option name! */
 static const struct option optab[] = {
-	{ "traditional",	no_argument,		NULL,	'c' },
+	{ "assign",		required_argument,	NULL,	'v' },
+	{ "bignum",		no_argument,		NULL,	'M' },
+	{ "characters-as-bytes", no_argument,		& do_binary,	 'b' },
+	{ "copyright",		no_argument,		NULL,	'C' },
+	{ "debug",		optional_argument,	NULL,	'D' },
+	{ "dump-variables",	optional_argument,	NULL,	'd' },
+	{ "exec",		required_argument,	NULL,	'E' },
+	{ "field-separator",	required_argument,	NULL,	'F' },
+	{ "file",		required_argument,	NULL,	'f' },
+	{ "gen-pot",		no_argument,		NULL,	'g' },
+	{ "help",		no_argument,		NULL,	'h' },
+	{ "include",		required_argument,	NULL,	'i' },
 	{ "lint",		optional_argument,	NULL,	'L' },
 	{ "lint-old",		no_argument,		NULL,	't' },
+	{ "load",		required_argument,	NULL,	'l' },
+	{ "non-decimal-data",	no_argument,		NULL,	'n' },
+	{ "nostalgia",		no_argument,		& do_nostalgia,	1 },
 	{ "optimize",		no_argument,		NULL,	'O' },
+#if defined(YYDEBUG) || defined(GAWKDEBUG)
+	{ "parsedebug",		no_argument,		NULL,	'Y' },
+#endif
 	{ "posix",		no_argument,		NULL,	'P' },
-	{ "nostalgia",		no_argument,		& do_nostalgia,	1 },
-	{ "gen-pot",		no_argument,		NULL,	'g' },
-	{ "non-decimal-data",	no_argument,		NULL,	'n' },
 	{ "pretty-print",	optional_argument,	NULL,	'o' },
 	{ "profile",		optional_argument,	NULL,	'p' },
-	{ "debug",		optional_argument,	NULL,	'D' },
-	{ "copyright",		no_argument,		NULL,	'C' },
-	{ "field-separator",	required_argument,	NULL,	'F' },
-	{ "file",		required_argument,	NULL,	'f' },
 	{ "re-interval",	no_argument,		NULL,	'r' },
+	{ "sandbox",		no_argument,		NULL, 	'S' },
 	{ "source",		required_argument,	NULL,	'e' },
-	{ "include",		required_argument,	NULL,	'i' },
-	{ "load",		required_argument,	NULL,	'l' },
-	{ "dump-variables",	optional_argument,	NULL,	'd' },
-	{ "assign",		required_argument,	NULL,	'v' },
-	{ "version",		no_argument,		& do_version, 'V' },
-	{ "help",		no_argument,		NULL,	'h' },
-	{ "exec",		required_argument,	NULL,	'E' },
+	{ "traditional",	no_argument,		NULL,	'c' },
 	{ "use-lc-numeric",	no_argument,		& use_lc_numeric, 1 },
-	{ "characters-as-bytes", no_argument,		& do_binary,	 'b' },
-	{ "sandbox",		no_argument,		NULL, 	'S' },
-	{ "bignum",		no_argument,		NULL,	'M' },
-#if defined(YYDEBUG) || defined(GAWKDEBUG)
-	{ "parsedebug",		no_argument,		NULL,		'Y' },
-#endif
+	{ "version",		no_argument,		& do_version, 'V' },
 	{ NULL, 0, NULL, '\0' }
 };