Merge branch 'uncool/dvbsi++' commit 3bbaddec39

Conflicts:
	src/driver/framebuffer.cpp
This commit is contained in:
Stefan Seyfried
2013-01-03 09:46:11 +01:00
14 changed files with 123 additions and 44 deletions

View File

@@ -193,7 +193,7 @@ int check_dir(const char * dir)
return ret;
}
bool get_fs_usage(const char * dir, long &btotal, long &bused)
bool get_fs_usage(const char * dir, long &btotal, long &bused, long *bsize/*=NULL*/)
{
btotal = bused = 0;
struct statfs s;
@@ -201,6 +201,8 @@ bool get_fs_usage(const char * dir, long &btotal, long &bused)
if (::statfs(dir, &s) == 0 && s.f_blocks) {
btotal = s.f_blocks;
bused = s.f_blocks - s.f_bfree;
if (bsize != NULL)
*bsize = s.f_bsize;
//printf("fs (%s): total %ld used %ld\n", dir, btotal, bused);
return true;
}