empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(program_name, help): New.

Browse source 
(main): New option -h.  Terminate unsuccessfully on invalid option.
(usage, parse_args): Factored usage() out of parse_args().
(parse_args): More useful diagnostics.
This commit is contained in:
Markus Armbruster 2005-05-30 15:15:33 +00:00
parent 63769b0342
commit 3c58b1ae83
1 changed files with 50 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

71
src/util/fairland.c
View file

@ -102,6 +102,8 @@ static int AIRPORT_MARKER = 0;
1 = don't merge, 0 = merge. */ 1 = don't merge, 0 = merge. */
static int DISTINCT_ISLANDS = 1; static int DISTINCT_ISLANDS = 1;
static char *program_name;
#define XSIZE ((WORLD_X) / 2) /* basically world x-y size */ #define XSIZE ((WORLD_X) / 2) /* basically world x-y size */
#define YSIZE (WORLD_Y) #define YSIZE (WORLD_Y)
#define STABLE_CYCLE 4 /* stability required for perterbed capitals */ #define STABLE_CYCLE 4 /* stability required for perterbed capitals */
@ -158,6 +160,8 @@ int fl_status; /* is anything wrong? */
const char *numletter = const char *numletter =
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"; "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
static void help(char *);
static void usage(void);
static void parse_args(int argc, char *argv[]); static void parse_args(int argc, char *argv[]);
static int allocate_memory(void); static int allocate_memory(void);
static void init(void); static void init(void);
@ -191,9 +195,10 @@ main(int argc, char *argv[])
char *config_file = NULL; char *config_file = NULL;
int i = 0; int i = 0;
program_name = argv[0];
rnd_seed = time(NULL); rnd_seed = time(NULL);
while ((opt = getopt(argc, argv, "ae:ioqs:R:")) != EOF) { while ((opt = getopt(argc, argv, "ae:hioqs:R:")) != EOF) {
switch (opt) { switch (opt) {
case 'a': case 'a':
AIRPORT_MARKER = 1; AIRPORT_MARKER = 1;
@ -216,6 +221,12 @@ main(int argc, char *argv[])
case 'R': case 'R':
rnd_seed = strtoul(optarg, NULL, 10); rnd_seed = strtoul(optarg, NULL, 10);
break; break;
case 'h':
usage();
return 0;
default:
help(NULL);
exit(1);
} }
} }
srandom(rnd_seed); srandom(rnd_seed);
@ -293,29 +304,47 @@ my_sqrt(int n)
PARSE COMMAND LINE ARGUMENTS PARSE COMMAND LINE ARGUMENTS
****************************************************************************/ ****************************************************************************/
static void
help(char *complaint)
{
if (complaint)
fprintf(stderr, "%s: %s\n", program_name, complaint);
fprintf(stderr, "Try -h for help.\n");
}
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,
DEFAULT_SPIKE, DEFAULT_MOUNTAIN, DEFAULT_CONTDIST, DEFAULT_ISLDIST);
}
static void static void
parse_args(int argc, char *argv[]) parse_args(int argc, char *argv[])
{ {
if (argc < 2 || argc > 8) { if (argc < 2) {
puts("fairland syntax:\n"); help("missing arguments");
puts("fairland [-e config] [-aiqo] [-s script] [-R seed] <nc> <sc> [<ni>] [<is>] [<sp>] [<pm>] [<di>] [<id>]"); exit(1);
puts("-q = quiet, -o = no ore produced"); }
puts("-a = Airport marker for continents, -i = islands not distinct"); if (argc > 8) {
puts("-R = seed to use for random, -e = read config file"); help("too many arguments");
printf("-s = name of script (default = %s)\n",
DEFAULT_OUTFILE_NAME);
puts("nc = number of continents [MANDATORY]");
puts("sc = continent size [MANDATORY]");
puts("ni = number of islands (default = nc)");
puts("is = average size of islands (default = sc/2)");
printf("sp = spike percentage: 0 = round, 100 = snake (default = %d)\n",
DEFAULT_SPIKE);
printf("pm = the percentage of land that is mountain (default = %d)\n",
DEFAULT_MOUNTAIN);
printf("di = the minimum distance between continents (default = %d)\n",
DEFAULT_CONTDIST);
printf("id = minimum distance from islands to continents (default = %d)\n",
DEFAULT_ISLDIST);
exit(1); exit(1);
} }
nc = atoi(argv[0]); nc = atoi(argv[0]);