iarv/znc
1
0
Fork 0
mirror of https://github.com/znc/znc.git synced 2026-03-28 17:42:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move m_sHomePath from CZNC to CFile

Browse Source 
Thanks to this change, linking the following object files produces no unresolved
symbols: FileUtils.o Utils.o ZNCString.o MD5.o SHA256.o

The idea here is that ZNC is a little better modularized.

Signed-off-by: Uli Schlachter <psychon@znc.in>
This commit is contained in:
Uli Schlachter
2011-03-28 21:05:39 +02:00
parent fbe2b7403a
commit f9ffe6f417
4 changed files with 34 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
znc.cpp
View File

@@ -12,7 +12,6 @@
#include "Server.h"
#include "User.h"
#include "Listener.h"
#include <pwd.h>
#include <list>
namespace
@@ -418,8 +417,6 @@ bool CZNC::AllowConnectionFrom(const CString& sIP) const {
}
void CZNC::InitDirs(const CString& sArgvPath, const CString& sDataDir) {
char *home;
// If the bin was not ran from the current directory, we need to add that dir onto our cwd
CString::size_type uPos = sArgvPath.rfind('/');
if (uPos == CString::npos)
@@ -428,27 +425,10 @@ void CZNC::InitDirs(const CString& sArgvPath, const CString& sDataDir) {
m_sCurPath = CDir::ChangeDir("./", sArgvPath.Left(uPos), "");
// Try to set the user's home dir, default to binpath on failure
home = getenv("HOME");
m_sHomePath.clear();
if (home) {
m_sHomePath = home;
}
if (m_sHomePath.empty()) {
struct passwd* pUserInfo = getpwuid(getuid());
if (pUserInfo) {
m_sHomePath = pUserInfo->pw_dir;
}
}
if (m_sHomePath.empty()) {
m_sHomePath = m_sCurPath;
}
CFile::InitHomePath(m_sCurPath);
if (sDataDir.empty()) {
m_sZNCPath = m_sHomePath + "/.znc";
m_sZNCPath = CFile::GetHomePath() + "/.znc";
} else {
m_sZNCPath = sDataDir;
}