mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

libaegisub: use statvfs instead of statfs

Browse source 
statvfs is the portable POSIX defined interface and is supported on all
major UNIX platforms.

Originally committed to SVN as r5367.
This commit is contained in:
Grigori Goronzy 2011-02-23 00:54:18 +00:00
parent 7db22972a7
commit 066ec3014a
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
aegisub/libaegisub/include/libaegisub/util.h
View file

@ -22,6 +22,7 @@
#include <string> #include <string>
#include <stdio.h> #include <stdio.h>
#include <time.h> #include <time.h>
#include <sys/statvfs.h>
#include <algorithm> #include <algorithm>
#endif // LAGI_PRE #endif // LAGI_PRE

2
aegisub/libaegisub/lagi_pre.h
View file

@ -26,7 +26,7 @@
// Unix C // Unix C
#ifndef _WIN32 #ifndef _WIN32
# include <sys/mount.h> // yep, this exists on MacOS X as well, but not on Windows. # include <sys/statvfs.h>
#endif #endif
// Common C++ // Common C++

4
aegisub/libaegisub/unix/util.cpp
View file

@ -60,7 +60,7 @@ void time_log(timeval &tv) {
} }
uint64_t freespace(std::string &path, PathType type) { uint64_t freespace(std::string &path, PathType type) {
struct statfs fs; struct statvfs fs;
std::string check(path); std::string check(path);
if (type == TypeFile) if (type == TypeFile)
@ -68,7 +68,7 @@ uint64_t freespace(std::string &path, PathType type) {
acs::CheckDirRead(check); acs::CheckDirRead(check);
if ((statfs(check.c_str(), &fs)) == 0) { if ((statvfs(check.c_str(), &fs)) == 0) {
return fs.f_bsize * fs.f_bavail; return fs.f_bsize * fs.f_bavail;
} else { } else {
/// @todo We need a collective set of exceptions for ENOTDIR, EIO etc. /// @todo We need a collective set of exceptions for ENOTDIR, EIO etc.