Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-02 14:16:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Show last error (GetLastError) in log when lock file cannot be accessed on Windows.

Browse source 
Fixed german language.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4101 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2011-03-21 22:16:03 +00:00
parent e44c52d256
commit cfcb6ac5c4
3 changed files with 74 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libretroshare/src/rsserver/rsinit.cc
View file

@ -119,7 +119,7 @@ class RsInitConfig
static bool outStderr;
static bool haveDebugLevel;
static int debugLevel;
static char logfname[1024];
static std::string logfname;
static bool firsttime_run;
static bool load_trustedpeer;
@ -182,7 +182,7 @@ bool RsInitConfig::haveLogFile;
bool RsInitConfig::outStderr;
bool RsInitConfig::haveDebugLevel;
int RsInitConfig::debugLevel;
char RsInitConfig::logfname[1024];
std::string RsInitConfig::logfname;
bool RsInitConfig::firsttime_run;
bool RsInitConfig::load_trustedpeer;
@ -237,7 +237,6 @@ void RsInit::InitRsConfig()
RsInitConfig::forceExtPort = false;
strcpy(RsInitConfig::inet, "127.0.0.1");
strcpy(RsInitConfig::logfname, "");
RsInitConfig::autoLogin = false; // .
RsInitConfig::startMinimised = false;
@ -412,7 +411,7 @@ int RsInit::InitRetroShare(int argcIgnored, char **argvIgnored, bool strictCheck
std::cerr << std::endl;
break;
case 'l':
strncpy(RsInitConfig::logfname, optarg, 1024);
RsInitConfig::logfname = optarg;
std::cerr << "LogFile (" << RsInitConfig::logfname;
std::cerr << ") Selected" << std::endl;
RsInitConfig::haveLogFile = true;
@ -515,7 +514,7 @@ int RsInit::InitRetroShare(int argcIgnored, char **argvIgnored, bool strictCheck
// set the debug file.
if (RsInitConfig::haveLogFile)
{
setDebugFile(RsInitConfig::logfname);
setDebugFile(RsInitConfig::logfname.c_str());
}
/******************************** WINDOWS/UNIX SPECIFIC PART ******************/
@ -1112,7 +1111,8 @@ int RsInit::LockConfigDirectory(const std::string& accountDir, std::string& lock
if (RsInitConfig::lockHandle == INVALID_HANDLE_VALUE) {
DWORD lasterror = GetLastError();
std::cerr << "Could not open lock file " << lockFile.c_str() << std::flush;
std::cerr << "Could not open lock file " << lockFile.c_str() << std::endl;
std::cerr << "Last error: " << lasterror << std::endl << std::flush;
perror(NULL);
if (lasterror == ERROR_SHARING_VIOLATION || lasterror == ERROR_ACCESS_DENIED) {