valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Cleanup PrintConfigLocation function

Browse source 
Do not exit inside function, return error code instead.

Print error to stderr, and not stdout, to make life easier for users
invoking dosbox from within scripts.

Include double-dash GNU-style parameter: '--printconf'.
This commit is contained in:
Patryk Obara 2020-04-27 18:48:02 +02:00 • committed by Patryk Obara
parent 83e1a3a944
commit d230e0759c
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/gui/sdlmain.cpp
View file

@ -3012,20 +3012,22 @@ static void launchcaptures(std::string const& edit) {
exit(1);
}
static void printconfiglocation() {
std::string path,file;
static int PrintConfigLocation()
{
std::string path, file;
Cross::CreatePlatformConfigDir(path);
Cross::GetPlatformConfigName(file);
path += file;
FILE* f = fopen(path.c_str(),"r");
FILE *f = fopen(path.c_str(), "r");
if (!f && !control->PrintConfig(path)) {
printf("tried creating %s. but failed", path.c_str());
exit(1);
fprintf(stderr, "Tried creating '%s', but failed.\n", path.c_str());
return 1;
}
if(f) fclose(f);
printf("%s\n",path.c_str());
exit(0);
if (f)
fclose(f);
printf("%s\n", path.c_str());
return 0;
}
static void eraseconfigfile() {
@ -3135,8 +3137,11 @@ int main(int argc, char* argv[]) {
return 0;
}
if (control->cmdline->FindExist("-printconf"))
printconfiglocation();
if (control->cmdline->FindExist("--printconf") ||
control->cmdline->FindExist("-printconf")) {
const int err = PrintConfigLocation();
return err;
}
#if C_DEBUG
DEBUG_SetupConsole();