mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 15:32:52 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'uncool/dvbsi++' commit 9ec9ae527b

Browse Source 
Conflicts:
	src/driver/framebuffer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8d69036be5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-01-03 (Thu, 03 Jan 2013)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2013-01-03 09:46:11 +01:00
parent 99f4494aeb 9ec9ae527b
commit e4acb04e3b
14 changed files with 123 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/system/helpers.cpp
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;
}