adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added '--version'

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1573 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
meep-eep
2005-03-06 04:03:52 +00:00
parent 293e7cf906
commit cfd005f8a9
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
+1
View File
@@ -1,4 +1,5 @@
Changes towards version 0.4: Changes towards version 0.4:
- Added '--version' - Svdb
- Fixed a bad memory access which could occur when the code relies - Fixed a bad memory access which could occur when the code relies
on CharCount for determining the end of a string (bug #701). - SvdB on CharCount for determining the end of a string (bug #701). - SvdB
- Battle planet images now have corrected transparency info, so there - Battle planet images now have corrected transparency info, so there
sc2/src/starcon2.c
+15 -3
View File
@@ -51,7 +51,8 @@ struct options_struct {
const char *logFile; const char *logFile;
enum { enum {
runMode_normal, runMode_normal,
runMode_usage runMode_usage,
runMode_version,
} runMode; } runMode;
int gfxDriver; int gfxDriver;
int gfxFlags; int gfxFlags;
@@ -147,6 +148,13 @@ main (int argc, char *argv[])
fprintf (stderr, "argv[%d] = [%s]\n", i, argv[i]); fprintf (stderr, "argv[%d] = [%s]\n", i, argv[i]);
} }
if (options.runMode == runMode_version)
{
printf ("%d.%d%s\n", UQM_MAJOR_VERSION, UQM_MINOR_VERSION,
UQM_EXTRA_VERSION);
return EXIT_SUCCESS;
}
fprintf (stderr, "The Ur-Quan Masters v%d.%d%s (compiled %s %s)\n" fprintf (stderr, "The Ur-Quan Masters v%d.%d%s (compiled %s %s)\n"
"This software comes with ABSOLUTELY NO WARRANTY;\n" "This software comes with ABSOLUTELY NO WARRANTY;\n"
"for details see the included 'COPYING' file.\n\n", "for details see the included 'COPYING' file.\n\n",
@@ -158,7 +166,7 @@ main (int argc, char *argv[])
usage (stdout, &options); usage (stdout, &options);
return EXIT_SUCCESS; return EXIT_SUCCESS;
} }
/* mem_init () uses mutexes. Mutex creation cannot use /* mem_init () uses mutexes. Mutex creation cannot use
the memory system until the memory system is rewritten the memory system until the memory system is rewritten
to rely on a thread-safe allocator. to rely on a thread-safe allocator.
@@ -249,7 +257,7 @@ enum
ADDON_OPT ADDON_OPT
}; };
static const char *optString = "+r:d:foc:b:spC:n:?hM:S:T:m:q:ug:l:i:"; static const char *optString = "+r:d:foc:b:spC:n:?hM:S:T:m:q:ug:l:i:v";
static struct option longOptions[] = static struct option longOptions[] =
{ {
{"res", 1, NULL, 'r'}, {"res", 1, NULL, 'r'},
@@ -272,6 +280,7 @@ static struct option longOptions[] =
{"gamma", 1, NULL, 'g'}, {"gamma", 1, NULL, 'g'},
{"logfile", 1, NULL, 'l'}, {"logfile", 1, NULL, 'l'},
{"intro", 1, NULL, 'i'}, {"intro", 1, NULL, 'i'},
{"version", 0, NULL, 'v'},
// options with no short equivalent: // options with no short equivalent:
{"cscan", 1, NULL, CSCAN_OPT}, {"cscan", 1, NULL, CSCAN_OPT},
@@ -310,6 +319,9 @@ preParseOptions(int argc, char *argv[], struct options_struct *options)
case 'h': case 'h':
options->runMode = runMode_usage; options->runMode = runMode_usage;
return EXIT_SUCCESS; return EXIT_SUCCESS;
case 'v':
options->runMode = runMode_version;
return EXIT_SUCCESS;
} }
} }
optind = 1; optind = 1;