Move remaining manual command line parsing into CmdLine.cpp

Headless.cpp, NativeApp.cpp, and SDLMain.cpp each still hand-parsed a few
argv flags directly (mount/log/state/ignore/loglevel in headless and the
app, xres/yres/dpi/scale in SDL), duplicating and in some cases conflicting
with the shared CommandLineOptions parser. Consolidate all of it into
CmdLine.cpp/.h so there's a single source of truth, and drop the now-dead
remain_argc/remain_argv filtering in SDLMain.cpp since NativeInit no longer
reads argv itself.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01PfFvWzpHxErWgRhKqqSewN
This commit is contained in:
Henrik RydgårdandClaude Sonnet 5 committed 2026-08-05 16:02:49 +02:00
1 parent e260188c49
commit 5bd1ff8066
7 files changed
+95 -150

No files matched your search

+2 -42
View File
@@ -583,41 +583,6 @@ void NativeInit(int argc, const char *argv[], const CommandLineOptions &cmdLineO
boot_filename = g_Config.flash0Directory / "vsh/module/vshmain.prx";
}
// Parse command line
LogLevel logLevel = LogLevel::LINFO;
bool forceLogLevel = false;
const auto setLogLevel = [&logLevel, &forceLogLevel](LogLevel level) {
logLevel = level;
forceLogLevel = true;
};
if (cmdLineOptions.logLevel.has_value()) {
setLogLevel(cmdLineOptions.logLevel.value());
}
std::string fileToLog;
for (int i = 1; i < argc; i++) {
if (argv[i][0] == '-') {
#if defined(__APPLE__)
// On Apple system debugged executable may get -NSDocumentRevisionsDebugMode YES in argv.
if (!strcmp(argv[i], "-NSDocumentRevisionsDebugMode") && argc - 1 > i) {
i++;
continue;
}
#endif
switch (argv[i][1]) {
case '-':
if (!strncmp(argv[i], "--loglevel=", strlen("--loglevel=")) && strlen(argv[i]) > strlen("--loglevel="))
setLogLevel(static_cast<LogLevel>(std::atoi(argv[i] + strlen("--loglevel="))));
if (!strncmp(argv[i], "--log=", strlen("--log=")) && strlen(argv[i]) > strlen("--log="))
fileToLog = argv[i] + strlen("--log=");
break;
}
} else {
// Ignore. Boot filename is extracted in the previous step.
}
}
if (cmdLineOptions.appendConfig.has_value()) {
g_Config.SetAppendedConfigIni(Path(cmdLineOptions.appendConfig.value()));
g_Config.LoadAppendedConfig();
@@ -671,20 +636,15 @@ void NativeInit(int argc, const char *argv[], const CommandLineOptions &cmdLineO
}
}
if (!fileToLog.empty()) {
if (cmdLineOptions.log.has_value() && !cmdLineOptions.log.value().empty()) {
// Start logging immediately.
g_logManager.EnableOutput(LogOutput::File);
g_logManager.SetFileLogPath(Path(fileToLog));
g_logManager.SetFileLogPath(Path(cmdLineOptions.log.value()));
} else {
// Set a default file logging path, in case the user enables it with the checkbox later.
g_logManager.SetFileLogPath(GetSysDirectory(DIRECTORY_DUMP) / "log.txt");
}
if (forceLogLevel) {
NOTICE_LOG(Log::System, "Setting log level to %d due to command line override", (int)logLevel);
g_logManager.SetAllLogLevels(logLevel);
}
PostLoadConfig();
#if PPSSPP_PLATFORM(ANDROID)