claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commandline options cleanup. Specifying a config file no longer needs the -C.

Browse Source
This commit is contained in:
waltje
2017-10-11 17:45:46 -04:00
parent 1b3cb1b501
commit c4fa87595d
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/pc.c
View File

@@ -8,7 +8,7 @@
* *
* Emulation core dispatcher. * Emulation core dispatcher.
* *
* Version: @(#)pc.c 1.0.22 2017/10/10 * Version: @(#)pc.c 1.0.23 2017/10/11
* *
* Authors: Sarah Walker, <http://pcem-emulator.co.uk/> * Authors: Sarah Walker, <http://pcem-emulator.co.uk/>
* Miran Grca, <mgrca8@gmail.com> * Miran Grca, <mgrca8@gmail.com>
@@ -215,25 +215,28 @@ pc_init(int argc, wchar_t *argv[])
_wgetcwd(cfg_path, sizeof(cfg_path)-1); _wgetcwd(cfg_path, sizeof(cfg_path)-1);
for (c=1; c<argc; c++) { for (c=1; c<argc; c++) {
if (argv[c][0] != L'-') break;
if (! _wcsicmp(argv[c], L"--help")) { if (! _wcsicmp(argv[c], L"--help")) {
usage: usage:
printf("\nCommand line options:\n\n"); printf("\nUsage: 86box [options] [cfg-file]\n\n");
printf("--config file.cfg - use given file as configuration\n"); printf("Valid options are:\n\n");
printf("--dump - always dump memory on exit\n"); printf("-D or --dump - always dump memory on exit\n");
printf("--fullscreen - start in fullscreen mode\n"); printf("-F or --fullscreen - start in fullscreen mode\n");
printf("--vmpath pathname - set 'path' to be root for vm\n"); printf("-P or --vmpath pathname - set 'path' to be root for vm\n");
printf("\nA config file can be specified. If none ie, the default file will be used.\n");
return(0); return(0);
} else if (!_wcsicmp(argv[c], L"--config") ||
!_wcsicmp(argv[c], L"-C")) {
if ((c+1) == argc) break;
cfg = argv[++c];
} else if (!_wcsicmp(argv[c], L"--dump") || } else if (!_wcsicmp(argv[c], L"--dump") ||
!_wcsicmp(argv[c], L"-D")) { !_wcsicmp(argv[c], L"-D")) {
dump_on_exit = 1; dump_on_exit = 1;
} else if (!_wcsicmp(argv[c], L"--fullscreen") || } else if (!_wcsicmp(argv[c], L"--fullscreen") ||
!_wcsicmp(argv[c], L"-F")) { !_wcsicmp(argv[c], L"-F")) {
start_in_fullscreen = 1; start_in_fullscreen = 1;
} else if (!_wcsicmp(argv[c], L"--vmpath") ||
!_wcsicmp(argv[c], L"-P")) {
if ((c+1) == argc) break;
wcscpy(cfg_path, argv[++c]);
} else if (!_wcsicmp(argv[c], L"--test")) { } else if (!_wcsicmp(argv[c], L"--test")) {
/* some (undocumented) test function here.. */ /* some (undocumented) test function here.. */
#ifdef WALTJE #ifdef WALTJE
@@ -253,17 +256,17 @@ usage:
/* .. and then exit. */ /* .. and then exit. */
return(0); return(0);
} else if (!_wcsicmp(argv[c], L"--vmpath") ||
!_wcsicmp(argv[c], L"-P")) {
if ((c+1) == argc) break;
wcscpy(cfg_path, argv[++c]);
} }
/* Uhm... out of options here.. */ /* Uhm... out of options here.. */
else goto usage; else goto usage;
} }
/* One argument (config file) allowed. */
if (c < argc)
cfg = argv[c++];
if (c != argc) goto usage;
/* /*
* This is where we start outputting to the log file, * This is where we start outputting to the log file,
* if there is one. Maybe we should log a header with * if there is one. Maybe we should log a header with