iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-05-05 04:52:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Move some common pid file code into new InitPidFile()

Browse Source 
Patch by reed, thanks again. :)


git-svn-id: https://znc.svn.sourceforge.net/svnroot/znc/trunk@1929 726aef4b-f618-498e-8847-2d620e286838
This commit is contained in:
psychon
2010-04-24 08:34:33 +00:00
parent 0f6c1f9e16
commit e2b91a32c9
2 changed files with 35 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
znc.cpp
View File

@@ -311,7 +311,7 @@ void CZNC::ReleaseISpoof() {
m_pISpoofLockFile = NULL;
}
bool CZNC::WritePidFile(int iPid) {
CFile* CZNC::InitPidFile() {
if (!m_sPidFile.empty()) {
CString sFile;
@@ -321,40 +321,45 @@ bool CZNC::WritePidFile(int iPid) {
else
sFile = m_sPidFile;
CFile File(sFile);
CUtils::PrintAction("Writing pid file [" + sFile + "]");
if (File.Open(O_WRONLY | O_TRUNC | O_CREAT)) {
File.Write(CString(iPid) + "\n");
File.Close();
CUtils::PrintStatus(true);
return true;
}
CUtils::PrintStatus(false);
return new CFile(sFile);
}
return false;
return NULL;
}
bool CZNC::WritePidFile(int iPid) {
CFile* File = InitPidFile();
if (File == NULL)
return false;
CUtils::PrintAction("Writing pid file [" + File->GetLongName() + "]");
bool bRet = false;
if (File->Open(O_WRONLY | O_TRUNC | O_CREAT)) {
File->Write(CString(iPid) + "\n");
File->Close();
bRet = true;
}
delete File;
CUtils::PrintStatus(bRet);
return bRet;
}
bool CZNC::DeletePidFile() {
if (!m_sPidFile.empty()) {
CString sFile;
// absolute path or relative to the data dir?
if (m_sPidFile[0] != '/')
sFile = GetZNCPath() + "/" + m_sPidFile;
else
sFile = m_sPidFile;
CFile* File = InitPidFile();
if (File == NULL)
return false;
CFile File(sFile);
CUtils::PrintAction("Deleting pid file [" + sFile + "]");
if (File.Delete()) {
CUtils::PrintStatus(true);
return true;
}
CUtils::PrintStatus(false);
}
return false;
CUtils::PrintAction("Deleting pid file [" + File->GetLongName() + "]");
bool bRet = false;
if (File->Delete())
bRet = true;
delete File;
CUtils::PrintStatus(bRet);
return bRet;
}
bool CZNC::WritePemFile() {