diff --git a/FileUtils.cpp b/FileUtils.cpp index 76e3098d..b3bcdffb 100644 --- a/FileUtils.cpp +++ b/FileUtils.cpp @@ -109,18 +109,18 @@ bool CFile::FType(const CString sFileName, EFileTypes eType, bool bUseLstat) { // Functions to retrieve file information // bool CFile::Exists() const { return CFile::Exists(m_sLongName); } -unsigned long long CFile::GetSize() const { return CFile::GetSize(m_sLongName); } +off_t CFile::GetSize() const { return CFile::GetSize(m_sLongName); } time_t CFile::GetATime() const { return CFile::GetATime(m_sLongName); } time_t CFile::GetMTime() const { return CFile::GetMTime(m_sLongName); } time_t CFile::GetCTime() const { return CFile::GetCTime(m_sLongName); } -int CFile::GetUID() const { return CFile::GetUID(m_sLongName); } -int CFile::GetGID() const { return CFile::GetGID(m_sLongName); } +uid_t CFile::GetUID() const { return CFile::GetUID(m_sLongName); } +gid_t CFile::GetGID() const { return CFile::GetGID(m_sLongName); } bool CFile::Exists(const CString& sFile) { struct stat st; return (stat(sFile.c_str(), &st) == 0); } -unsigned long long CFile::GetSize(const CString& sFile) { +off_t CFile::GetSize(const CString& sFile) { struct stat st; if (stat(sFile.c_str(), &st) != 0) { return 0; @@ -144,12 +144,12 @@ time_t CFile::GetCTime(const CString& sFile) { return (stat(sFile.c_str(), &st) != 0) ? 0 : st.st_ctime; } -int CFile::GetUID(const CString& sFile) { +uid_t CFile::GetUID(const CString& sFile) { struct stat st; return (stat(sFile.c_str(), &st) != 0) ? -1 : (int) st.st_uid; } -int CFile::GetGID(const CString& sFile) { +gid_t CFile::GetGID(const CString& sFile) { struct stat st; return (stat(sFile.c_str(), &st) != 0) ? -1 : (int) st.st_gid; } @@ -161,11 +161,11 @@ int CFile::GetInfo(const CString& sFile, struct stat& st) { // Functions to manipulate the file on the filesystem // bool CFile::Delete() { return CFile::Delete(m_sLongName); } -int CFile::Move(const CString& sNewFileName, bool bOverwrite) { +bool CFile::Move(const CString& sNewFileName, bool bOverwrite) { return CFile::Move(m_sLongName, sNewFileName, bOverwrite); } -int CFile::Copy(const CString& sNewFileName, bool bOverwrite) { +bool CFile::Copy(const CString& sNewFileName, bool bOverwrite) { return CFile::Copy(m_sLongName, sNewFileName, bOverwrite); } diff --git a/FileUtils.h b/FileUtils.h index cdbfa260..4200c96a 100644 --- a/FileUtils.h +++ b/FileUtils.h @@ -68,28 +68,28 @@ public: // Functions to retrieve file information // bool Exists() const; - unsigned long long GetSize() const; + off_t GetSize() const; time_t GetATime() const; time_t GetMTime() const; time_t GetCTime() const; - int GetUID() const; - int GetGID() const; + uid_t GetUID() const; + gid_t GetGID() const; static bool Exists(const CString& sFile); - static unsigned long long GetSize(const CString& sFile); + static off_t GetSize(const CString& sFile); static time_t GetATime(const CString& sFile); static time_t GetMTime(const CString& sFile); static time_t GetCTime(const CString& sFile); - static int GetUID(const CString& sFile); - static int GetGID(const CString& sFile); + static uid_t GetUID(const CString& sFile); + static gid_t GetGID(const CString& sFile); static int GetInfo(const CString& sFile, struct stat& st); // // Functions to manipulate the file on the filesystem // bool Delete(); - int Move(const CString& sNewFileName, bool bOverwrite = false); - int Copy(const CString& sNewFileName, bool bOverwrite = false); + bool Move(const CString& sNewFileName, bool bOverwrite = false); + bool Copy(const CString& sNewFileName, bool bOverwrite = false); static bool Delete(const CString& sFileName); static bool Move(const CString& sOldFileName, const CString& sNewFileName, bool bOverwrite = false);