diff options
| author | Scott Mansell <phiren@gmail.com> | 2016-07-18 12:22:33 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-18 12:22:33 +1200 |
| commit | ff3b4a0fd7df775f3bd4eeadd86176cc73d1f639 (patch) | |
| tree | e3ddafbf48f914b8844ade0bd020e381c09712ae /Source/Core | |
| parent | b9246cf5e107cbe08a53fd88226196ce2aa532e5 (diff) | |
| parent | 5bab6210ef2642110e27e272e23b05ff3befe383 (diff) | |
Merge pull request #4020 from bentley/fstat64
Use the standard stat()/fstat() interfaces, not nonstandard *64().
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Common/CommonFuncs.h | 4 | ||||
| -rw-r--r-- | Source/Core/Common/FileUtil.cpp | 21 |
2 files changed, 10 insertions, 15 deletions
diff --git a/Source/Core/Common/CommonFuncs.h b/Source/Core/Common/CommonFuncs.h index a1d6b17185..15b3debe28 100644 --- a/Source/Core/Common/CommonFuncs.h +++ b/Source/Core/Common/CommonFuncs.h @@ -84,8 +84,8 @@ inline u64 _rotr64(u64 x, unsigned int shift) #define fseeko _fseeki64 #define ftello _ftelli64 #define atoll _atoi64 -#define stat64 _stat64 -#define fstat64 _fstat64 +#define stat _stat64 +#define fstat _fstat64 #define fileno _fileno extern "C" { diff --git a/Source/Core/Common/FileUtil.cpp b/Source/Core/Common/FileUtil.cpp index 564ab58d8f..2405a76809 100644 --- a/Source/Core/Common/FileUtil.cpp +++ b/Source/Core/Common/FileUtil.cpp @@ -45,11 +45,6 @@ #define S_ISDIR(m) (((m)&S_IFMT) == S_IFDIR) #endif -#if defined BSD4_4 || defined __FreeBSD__ -#define stat64 stat -#define fstat64 fstat -#endif - // This namespace has various generic functions related to files and paths. // The code still needs a ton of cleanup. // REMEMBER: strdup considered harmful! @@ -69,7 +64,7 @@ static void StripTailDirSlashes(std::string& fname) // Returns true if file filename exists bool Exists(const std::string& filename) { - struct stat64 file_info; + struct stat file_info; std::string copy(filename); StripTailDirSlashes(copy); @@ -77,7 +72,7 @@ bool Exists(const std::string& filename) #ifdef _WIN32 int result = _tstat64(UTF8ToTStr(copy).c_str(), &file_info); #else - int result = stat64(copy.c_str(), &file_info); + int result = stat(copy.c_str(), &file_info); #endif return (result == 0); @@ -86,7 +81,7 @@ bool Exists(const std::string& filename) // Returns true if filename is a directory bool IsDirectory(const std::string& filename) { - struct stat64 file_info; + struct stat file_info; std::string copy(filename); StripTailDirSlashes(copy); @@ -94,7 +89,7 @@ bool IsDirectory(const std::string& filename) #ifdef _WIN32 int result = _tstat64(UTF8ToTStr(copy).c_str(), &file_info); #else - int result = stat64(copy.c_str(), &file_info); + int result = stat(copy.c_str(), &file_info); #endif if (result < 0) @@ -381,11 +376,11 @@ u64 GetSize(const std::string& filename) return 0; } - struct stat64 buf; + struct stat buf; #ifdef _WIN32 if (_tstat64(UTF8ToTStr(filename).c_str(), &buf) == 0) #else - if (stat64(filename.c_str(), &buf) == 0) + if (stat(filename.c_str(), &buf) == 0) #endif { DEBUG_LOG(COMMON, "GetSize: %s: %lld", filename.c_str(), (long long)buf.st_size); @@ -399,8 +394,8 @@ u64 GetSize(const std::string& filename) // Overloaded GetSize, accepts file descriptor u64 GetSize(const int fd) { - struct stat64 buf; - if (fstat64(fd, &buf) != 0) + struct stat buf; + if (fstat(fd, &buf) != 0) { ERROR_LOG(COMMON, "GetSize: stat failed %i: %s", fd, GetLastErrorMsg().c_str()); return 0; |