mirrors
/
Bochs
mirror of https://github.com/bochs-emu/Bochs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- command line parameter --help added 

- this changes also fix a carbon gui compile problem (SF bug #594718)
This commit is contained in:
Volker Ruppert 2002-08-25 08:31:16 +00:00
parent e352d0b871
commit 95771fe0e5
2 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bochs/gui/siminterface.h
View File

@ -1,10 +1,10 @@
/////////////////////////////////////////////////////////////////////////
// $Id: siminterface.h,v 1.45 2002-08-24 17:11:33 vruppert Exp $
// $Id: siminterface.h,v 1.46 2002-08-25 08:31:16 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
/*
* gui/siminterface.h
* $Id: siminterface.h,v 1.45 2002-08-24 17:11:33 vruppert Exp $
* $Id: siminterface.h,v 1.46 2002-08-25 08:31:16 vruppert Exp $
*
* Interface to the simulator, currently only used by control.cc.
* The base class bx_simulator_interface_c, contains only virtual functions
@ -647,5 +647,5 @@ public:
extern bx_simulator_interface_c *SIM;
extern void bx_init_siminterface ();
extern void bx_init_main ();
extern void bx_init_main (int argc, char *argv[]);
extern int bx_continue_after_control_panel (int argc, char *argv[]);

25
bochs/main.cc
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
// $Id: main.cc,v 1.116 2002-08-24 17:11:32 vruppert Exp $
// $Id: main.cc,v 1.117 2002-08-25 08:31:15 vruppert Exp $
/////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2002 MandrakeSoft S.A.
@ -1096,7 +1096,7 @@ static void setupWorkingDirectory (char *path)
int main (int argc, char *argv[])
{
bx_init_siminterface ();
bx_init_main ();
bx_init_main (argc, argv);
bx_do_text_config_interface (argc, argv);
bx_control_panel (BX_CPANEL_INIT);
bx_continue_after_control_panel (argc, argv);
@ -1104,8 +1104,10 @@ int main (int argc, char *argv[])
#endif
void
bx_init_main ()
bx_init_main (int argc, char *argv[])
{
int help = 0;
// To deal with initialization order problems inherent in C++, use the macros
// SAFE_GET_IOFUNC and SAFE_GET_GENLOG to retrieve "io" and "genlog" in all
// constructors or functions called by constructors. The macros test for
@ -1115,9 +1117,24 @@ bx_init_main ()
SAFE_GET_IOFUNC();
SAFE_GET_GENLOG();
bx_print_header ();
if ((argc > 1) && (!strcmp ("--help", argv[1]))) {
fprintf(stderr, "Usage: bochs [options] [bochsrc options]\n\n"
" -q quickstart with default configuration file\n"
" -qf configfile quickstart with specified configuration file\n"
" --help display this help and exit\n\n"
"For information on Bochs configuration file arguments, see the\n"
#if (!defined(WIN32)) && !BX_WITH_MACOS
"bochsrc section in the user documentation or the man page of bochsrc.\n");
#else
"bochsrc section in the user documentation.\n");
#endif
help = 1;
} else {
bx_print_header ();
}
bx_init_bx_dbg ();
bx_init_options ();
if (help) exit(0);
#if BX_WITH_CARBON
/* "-psn" is passed if we are launched by double-clicking */
if ( argc >= 2 && strncmp (argv[1], "-psn", 4) == 0 ) {