mirrors
/
mc
mirror of https://github.com/MidnightCommander/mc
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'origin/179_fsblkcnt_t' into mc-4.6 

* commit 'origin/179_fsblkcnt_t':
  mountlist: use fsblkcnt_t when available (fixes #179)
This commit is contained in:
Sergei Trofimovich 2009-03-18 22:04:48 +02:00
parent 8353da9e8f 6de4c5aafc
commit 97496014aa
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -31,6 +31,10 @@
* lib/mc.lib: added patch on #219 by angel_il
* vfs/extfs/u7z: patch from mandriva (#194)
2009-02-03 Enrico Weigelt, metux ITS <weigelt@metux.de>
* src/mountlist.c: fixed #179 (invalid block scale routine, problems with 32bit overflow)
2009-02-02 Enrico Weigelt, metux ITS <weigelt@metux.de>
* vfs/extfs/iso9660.in: added iso9660 fix by cppgx (#86)

16
src/mountlist.c
View File

@ -135,11 +135,11 @@ struct mount_entry
struct fs_usage
{
long fsu_blocks; /* Total blocks. */
long fsu_bfree; /* Free blocks available to superuser. */
long fsu_bavail; /* Free blocks available to non-superuser. */
long fsu_files; /* Total file nodes. */
long fsu_ffree; /* Free file nodes. */
fsblkcnt_t fsu_blocks; /* Total blocks. */
fsblkcnt_t fsu_bfree; /* Free blocks available to superuser. */
fsblkcnt_t fsu_bavail; /* Free blocks available to non-superuser. */
fsfilcnt_t fsu_files; /* Total file nodes. */
fsfilcnt_t fsu_ffree; /* Free file nodes. */
};
static int get_fs_usage (char *path, struct fs_usage *fsp);
@ -756,8 +756,8 @@ my_statfs (struct my_statfs *myfs_stats, const char *path)
BLOCKS FROMSIZE-byte blocks, rounding away from zero.
TOSIZE must be positive. Return -1 if FROMSIZE is not positive. */
static long
fs_adjust_blocks (long blocks, int fromsize, int tosize)
static fsblkcnt_t
fs_adjust_blocks (fsblkcnt_t blocks, int fromsize, int tosize)
{
if (tosize <= 0)
abort ();
@ -769,7 +769,7 @@ fs_adjust_blocks (long blocks, int fromsize, int tosize)
else if (fromsize > tosize) /* E.g., from 2048 to 512. */
return blocks * (fromsize / tosize);
else /* E.g., from 256 to 512. */
return (blocks + (blocks < 0 ? -1 : 1)) / (tosize / fromsize);
return blocks / (tosize / fromsize);
}
#if defined(_AIX) && defined(_I386)