From 9e5c7cc1418bff5521b8a21accec40b47dbec61c Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Tue, 12 Jan 2010 16:50:44 +0000 Subject: [PATCH] Corrected free capacity measurement of stdio: drives in regular files --- libburn/trunk/cdrskin/cdrskin_timestamp.h | 2 +- libburn/trunk/libburn/sg-dummy.c | 2 +- libburn/trunk/libburn/sg-freebsd-port.c | 2 +- libburn/trunk/libburn/sg-libcdio.c | 2 +- libburn/trunk/libburn/sg-linux.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libburn/trunk/cdrskin/cdrskin_timestamp.h b/libburn/trunk/cdrskin/cdrskin_timestamp.h index dafed441..742a091c 100644 --- a/libburn/trunk/cdrskin/cdrskin_timestamp.h +++ b/libburn/trunk/cdrskin/cdrskin_timestamp.h @@ -1 +1 @@ -#define Cdrskin_timestamP "2010.01.09.142642" +#define Cdrskin_timestamP "2010.01.12.165214" diff --git a/libburn/trunk/libburn/sg-dummy.c b/libburn/trunk/libburn/sg-dummy.c index f2e9ed59..47c82a27 100644 --- a/libburn/trunk/libburn/sg-dummy.c +++ b/libburn/trunk/libburn/sg-dummy.c @@ -268,7 +268,7 @@ int burn_os_stdio_capacity(char *path, off_t *bytes) if (statvfs(testpath, &vfsbuf) == -1) return -2; - *bytes = add_size + ((off_t) vfsbuf.f_bsize) * + *bytes = add_size + ((off_t) vfsbuf.f_frsize) * (off_t) vfsbuf.f_bavail; #else /* Libburn_os_has_statvfS */ diff --git a/libburn/trunk/libburn/sg-freebsd-port.c b/libburn/trunk/libburn/sg-freebsd-port.c index e726f4a0..363ccd95 100644 --- a/libburn/trunk/libburn/sg-freebsd-port.c +++ b/libburn/trunk/libburn/sg-freebsd-port.c @@ -696,7 +696,7 @@ int burn_os_stdio_capacity(char *path, off_t *bytes) if (testpath[0]) { if (statvfs(testpath, &vfsbuf) == -1) return -2; - *bytes = add_size + ((off_t) vfsbuf.f_bsize) * + *bytes = add_size + ((off_t) vfsbuf.f_frsize) * (off_t) vfsbuf.f_bavail; } return 1; diff --git a/libburn/trunk/libburn/sg-libcdio.c b/libburn/trunk/libburn/sg-libcdio.c index c6c50f62..6b784b2f 100644 --- a/libburn/trunk/libburn/sg-libcdio.c +++ b/libburn/trunk/libburn/sg-libcdio.c @@ -753,7 +753,7 @@ int burn_os_stdio_capacity(char *path, off_t *bytes) if (statvfs(testpath, &vfsbuf) == -1) return -2; - *bytes = add_size + ((off_t) vfsbuf.f_bsize) * + *bytes = add_size + ((off_t) vfsbuf.f_frsize) * (off_t) vfsbuf.f_bavail; #else /* Libburn_os_has_statvfS */ diff --git a/libburn/trunk/libburn/sg-linux.c b/libburn/trunk/libburn/sg-linux.c index 2ceb30b4..c624a1bd 100644 --- a/libburn/trunk/libburn/sg-linux.c +++ b/libburn/trunk/libburn/sg-linux.c @@ -2101,7 +2101,7 @@ int burn_os_stdio_capacity(char *path, off_t *bytes) if (testpath[0]) { if (statvfs(testpath, &vfsbuf) == -1) return -2; - *bytes = add_size + ((off_t) vfsbuf.f_bsize) * + *bytes = add_size + ((off_t) vfsbuf.f_frsize) * (off_t) vfsbuf.f_bavail; } return 1;