--- mon/src/mon.cpp 2000/09/25 12:44:31 1.10 +++ mon/src/mon.cpp 2000/09/25 17:52:31 1.11 @@ -1133,20 +1133,23 @@ void mon(int argc, char **argv) monout = stdout; monerr = stdout; - if (argc) { - // Access real memory if mon was started as "rmon" - char *prgname = argv[0]; - char *lastslash; - if ((lastslash = strrchr(prgname, '/')) != NULL) - prgname = lastslash + 1; - if (strcmp(prgname, "rmon") == 0) - mon_use_real_mem = true; + // Make argc/argv point to the actual arguments + if (argc) + argc--; argv++; - // Make argc/argv point to the actual arguments - argc--; - argv++; - interactive = (argc == 0); + // Parse arguments + mon_macos_mode = false; + mon_use_real_mem = false; + while (argc > 0) { + if (strcmp(argv[0], "-m") == 0) + mon_macos_mode = true; + else if (strcmp(argv[0], "-r") == 0) + mon_use_real_mem = true; + else + break; + argc--; argv++; } + interactive = (argc == 0); // Set up memory access functions if not supplied by the user if (mon_read_byte == NULL) {