From: Markus Armbruster <armbru@pond.sub.org>
Date: Fri, 27 Jan 2006 18:00:47 +0000 (+0000)
Subject: (main, usage): New option -v.
X-Git-Tag: PZ5~124
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=68a7ae71b0b08536e0998a93b00b8bd5791cf95f

(main, usage): New option -v.

(usage): Improve usage message.
---

diff --git a/src/util/fairland.c b/src/util/fairland.c
index f1ce5ec8d..03ed39f96 100644
--- a/src/util/fairland.c
+++ b/src/util/fairland.c
@@ -83,6 +83,7 @@ static int quiet = 0;
 #include "xy.h"
 #include "optlist.h"
 #include "prototypes.h"
+#include "version.h"
 
 /* do not change these 4 defines */
 #define LANDMIN		1	/* plate altitude for normal land */
@@ -197,32 +198,35 @@ main(int argc, char *argv[])
     program_name = argv[0];
     rnd_seed = time(NULL);
 
-    while ((opt = getopt(argc, argv, "ae:hioqs:R:")) != EOF) {
+    while ((opt = getopt(argc, argv, "ae:hioqR:s:v")) != EOF) {
 	switch (opt) {
 	case 'a':
 	    AIRPORT_MARKER = 1;
 	    break;
-	case 'i':
-	    DISTINCT_ISLANDS = 0;
-	    break;
 	case 'e':
 	    config_file = optarg;
 	    break;
+	case 'i':
+	    DISTINCT_ISLANDS = 0;
+	    break;
 	case 'o':
 	    ORE = 0;
 	    break;
 	case 'q':
 	    quiet = 1;
 	    break;
-	case 's':
-	    outfile = optarg;
-	    break;
 	case 'R':
 	    rnd_seed = strtoul(optarg, NULL, 10);
 	    break;
+	case 's':
+	    outfile = optarg;
+	    break;
 	case 'h':
 	    usage();
-	    return 0;
+	    exit(0);
+	case 'v':
+	    printf("%s\n\n%s", version, legal);
+	    exit(0);
 	default:
 	    help(NULL);
 	    exit(1);
@@ -314,24 +318,25 @@ help(char *complaint)
 static void
 usage(void)
 {
-    printf("Usage: %s [-e CONFIG] [-aiqo] [-s SCRIPT] [-R SEED] NC SC [NI] [IS] [SP] [PM] [DI] [ID]\n"
-	   "  -q            quiet\n"
-	   "  -o            don't set resources\n"
-	   "  -a            airport marker for continents\n"
-	   "  -i            islands may merge\n"
-	   "  -R SEED       seed for random number generator\n"
-	   "  -e CONFIG     configuration file\n"
-	   "  -s SCRIPT     name of script to create (default %s)\n"
-	   "  NC            number of continents\n"
-	   "  SC            continent size\n"
-	   "  NI            number of islands (default NC)\n"
-	   "  IS            average island size (default SC/2)\n"
-	   "  SP            spike percentage: 0 = round, 100 = snake\n"
-	   "                (default = %d)\n"
-	   "  PM            percentage of land that is mountain (default %d)\n"
-	   "  DI            minimum distance between continents (default %d)\n"
-	   "  ID            minimum distance from islands to continents (default %d)\n",
-	   program_name, DEFAULT_OUTFILE_NAME,
+    printf("Usage: %s [OPTION]... NC SC [NI] [IS] [SP] [PM] [DI] [ID]\n"
+	   "  -a              airport marker for continents\n"
+	   "  -e CONFIG-FILE  configuration file\n"
+	   "                  (default %s)\n"
+	   "  -h              display this help and exit\n"
+	   "  -i              islands may merge\n"
+	   "  -o              don't set resources\n"
+	   "  -q              quiet\n"
+	   "  -R SEED         seed for random number generator\n"
+	   "  -s SCRIPT       name of script to create (default %s)\n"
+	   "  NC              number of continents\n"
+	   "  SC              continent size\n"
+	   "  NI              number of islands (default NC)\n"
+	   "  IS              average island size (default SC/2)\n"
+	   "  SP              spike percentage: 0 = round, 100 = snake (default %d)\n"
+	   "  PM              percentage of land that is mountain (default %d)\n"
+	   "  DI              minimum distance between continents (default %d)\n"
+	   "  ID              minimum distance from islands to continents (default %d)\n",
+	   program_name, dflt_econfig, DEFAULT_OUTFILE_NAME,
 	   DEFAULT_SPIKE, DEFAULT_MOUNTAIN, DEFAULT_CONTDIST, DEFAULT_ISLDIST);
 }