|
|
@ -140,10 +140,19 @@ bool AppInit2(int argc, char* argv[]) |
|
|
|
ParseParameters(argc, argv); |
|
|
|
ParseParameters(argc, argv); |
|
|
|
|
|
|
|
|
|
|
|
if (mapArgs.count("-datadir")) |
|
|
|
if (mapArgs.count("-datadir")) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
if (filesystem::is_directory(filesystem::system_complete(mapArgs["-datadir"]))) |
|
|
|
{ |
|
|
|
{ |
|
|
|
filesystem::path pathDataDir = filesystem::system_complete(mapArgs["-datadir"]); |
|
|
|
filesystem::path pathDataDir = filesystem::system_complete(mapArgs["-datadir"]); |
|
|
|
strlcpy(pszSetDataDir, pathDataDir.string().c_str(), sizeof(pszSetDataDir)); |
|
|
|
strlcpy(pszSetDataDir, pathDataDir.string().c_str(), sizeof(pszSetDataDir)); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
else |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
fprintf(stderr, "Error: Specified directory does not exist\n"); |
|
|
|
|
|
|
|
Shutdown(NULL); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ReadConfigFile(mapArgs, mapMultiArgs); // Must be done after processing datadir
|
|
|
|
ReadConfigFile(mapArgs, mapMultiArgs); // Must be done after processing datadir
|
|
|
|
|
|
|
|
|
|
|
|