mirrors/Bochs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved parsing bochsrc options passed on the command line (see issue #160).

Browse Source 
If the last char of an argument is a colon, equal sign or comma and there is
at least one more argument, then concatenate these arguments to one and pass
it to parse_line_unformatted().
This commit is contained in:
Volker Ruppert 2023-12-08 14:17:40 +01:00
parent edb9c7aad8
commit 20b61b31f2
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
bochs/config.cc
View File

@ -1925,8 +1925,21 @@ int bx_parse_cmdline(int arg, int argc, char *argv[])
def_action[level] = SIM->get_default_log_action(level); def_action[level] = SIM->get_default_log_action(level);
} }
while (arg < argc) { while (arg < argc) {
BX_INFO (("parsing arg %d, %s", arg, argv[arg])); char ch = argv[arg][strlen(argv[arg]) - 1];
parse_line_unformatted("cmdline args", argv[arg]); if (((arg + 1) < argc) && ((ch == ':') || (ch == '=') || (ch == ','))) {
char tmparg[BX_PATHNAME_LEN];
strcpy(tmparg, argv[arg]);
do {
arg++;
strcat(tmparg, argv[arg]);
ch = argv[arg][strlen(argv[arg]) - 1];
} while (((arg + 1)< argc) && ((ch == ':') || (ch == '=') || (ch == ',')));
BX_INFO(("parsing concatenated arg %s", tmparg));
parse_line_unformatted("cmdline args", tmparg);
} else {
BX_INFO(("parsing arg %d, %s", arg, argv[arg]));
parse_line_unformatted("cmdline args", argv[arg]);
}
arg++; arg++;
} }
// update log actions if default has been changed // update log actions if default has been changed