b9be85ef317a960033bc2cbaadf5a9b931c20061 hiram Tue Nov 14 12:52:17 2017 -0800 trying out a srcVersion print in optionsInit() no redmine diff --git src/lib/options.c src/lib/options.c index a368267..f926f53 100644 --- src/lib/options.c +++ src/lib/options.c @@ -1,30 +1,32 @@ /* Options.c - stuff to handle command line options. * This is smaller and more flexible than the cgiSpoof * routines we used to use - though cgiSpoof is still the * method of choice for actual CGI routines that want to * be tested from the command line. * * This file is copyright 2002 Jim Kent, but license is hereby * granted for all use - public, private or commercial. */ #include "common.h" #include "hash.h" #include "verbose.h" #include "options.h" #include +#include "srcVersion.h" +static char *srcVersion = "kent source version " SRC_VERSION; #ifdef MACHTYPE_alpha #define strtoll strtol #endif static struct optionSpec commonOptions[] = { {"verbose", OPTION_INT}, {NULL, 0}, }; static struct optionSpec *matchingOption(char *name, struct optionSpec *optionSpecs) /* Go through spec table and return spec that matches name, or NULL * if none. */ { while (optionSpecs->name != NULL) @@ -312,30 +314,31 @@ * The words in argv are parsed in assending order. If a word of * "--" is encountered, argument parsing stops. * If optionSpecs is not NULL, it is an array of optionSpec that are * used to validate the options. An option must exist in the array * and the value must be convertable to the type specified in flags. * Boolean options must no value, all other options must have one. * Array is terminated by a optionSpec with a NULL name. * If array NULL, no validation is done. */ { if (options == NULL) { struct hash *hash = parseOptions(pArgc, argv, FALSE, optionSpecs, FALSE); setOptions(hash); optionSpecification = optionSpecs; + verbose(2, "### %s ###\n", srcVersion); } } static char *optGet(char *name) /* Lookup option name. Complain if options hash not set. */ { if (options == NULL) errAbort("optGet called before optionHash"); return hashFindVal(options, name); } char *optionVal(char *name, char *defaultVal) /* Return named option if in options hash, otherwise default. */ { char *ret;