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

29
FileUtils.cpp
View File

@@ -7,12 +7,12 @@
*/
#include "FileUtils.h"
#include "znc.h"
#include "Utils.h"
#include <sys/stat.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <fcntl.h>
#include <pwd.h>
#ifndef HAVE_LSTAT
# define lstat(a, b) stat(a, b)
@@ -22,6 +22,8 @@
# define O_BINARY 0
#endif
CString CFile::m_sHomePath;
CFile::CFile() {
m_iFD = -1;
}
@@ -38,7 +40,7 @@ CFile::~CFile() {
void CFile::SetFileName(const CString& sLongName) {
if (sLongName.Left(2) == "~/") {
m_sLongName = CZNC::Get().GetHomePath() + sLongName.substr(1);
m_sLongName = CFile::GetHomePath() + sLongName.substr(1);
} else
m_sLongName = sLongName;
@@ -426,11 +428,32 @@ CString CFile::GetDir() const {
return sDir;
}
void CFile::InitHomePath(const CString& sFallback) {
const char *home = getenv("HOME");
m_sHomePath.clear();
if (home) {
m_sHomePath = home;
}
if (m_sHomePath.empty()) {
const struct passwd* pUserInfo = getpwuid(getuid());
if (pUserInfo) {
m_sHomePath = pUserInfo->pw_dir;
}
}
if (m_sHomePath.empty()) {
m_sHomePath = sFallback;
}
}
CString CDir::ChangeDir(const CString& sPath, const CString& sAdd, const CString& sHome) {
CString sHomeDir(sHome);
if (sHomeDir.empty()) {
sHomeDir = CZNC::Get().GetHomePath();
sHomeDir = CFile::GetHomePath();
}
if (sAdd == "~") {