Author: benny
Date: 2006-07-31 12:42:03 +0000 (Mon, 31 Jul 2006)
New Revision: 22591
Modified:
thunar/trunk/ChangeLog
thunar/trunk/configure.in.in
thunar/trunk/thunar-vfs/thunar-vfs-io-local-xfer.c
thunar/trunk/thunar-vfs/thunar-vfs-io-local.c
Log:
2006-07-31 Benedikt Meurer <[EMAIL PROTECTED]>
* configure.in.in, thunar-vfs/thunar-vfs-io-local-xfer.c,
thunar-vfs/thunar-vfs-io-local.c: Use statvfs1()/fstatvfs1() on
NetBSD 2.99 and above.
Modified: thunar/trunk/ChangeLog
===================================================================
--- thunar/trunk/ChangeLog 2006-07-31 12:04:32 UTC (rev 22590)
+++ thunar/trunk/ChangeLog 2006-07-31 12:42:03 UTC (rev 22591)
@@ -1,5 +1,11 @@
2006-07-31 Benedikt Meurer <[EMAIL PROTECTED]>
+ * configure.in.in, thunar-vfs/thunar-vfs-io-local-xfer.c,
+ thunar-vfs/thunar-vfs-io-local.c: Use statvfs1()/fstatvfs1() on
+ NetBSD 2.99 and above.
+
+2006-07-31 Benedikt Meurer <[EMAIL PROTECTED]>
+
* thunar/thunar-permissions-chooser.c
(thunar_permissions_chooser_file_changed): Make sure that the file's
group is included in the "Group" box. Bug #1838.
Modified: thunar/trunk/configure.in.in
===================================================================
--- thunar/trunk/configure.in.in 2006-07-31 12:04:32 UTC (rev 22590)
+++ thunar/trunk/configure.in.in 2006-07-31 12:42:03 UTC (rev 22591)
@@ -116,7 +116,7 @@
AC_CHECK_FUNCS([attropen extattr_get_fd fgetxattr lchmod localeconv \
localtime_r mbrtowc mkdtemp mkfifo posix_madvise pread \
pwrite readdir_r sched_yield setgroupent setpassent \
- statfs statvfs strcoll strlcpy strptime symlink])
+ statfs statvfs statvfs1 strcoll strlcpy strptime symlink])
dnl ******************************************
dnl *** Linux/glibc specified work-arounds ***
Modified: thunar/trunk/thunar-vfs/thunar-vfs-io-local-xfer.c
===================================================================
--- thunar/trunk/thunar-vfs/thunar-vfs-io-local-xfer.c 2006-07-31 12:04:32 UTC
(rev 22590)
+++ thunar/trunk/thunar-vfs/thunar-vfs-io-local-xfer.c 2006-07-31 12:42:03 UTC
(rev 22591)
@@ -94,8 +94,11 @@
static gboolean
tvilx_mounted_readonly (gint fd)
{
-#if defined(HAVE_STATVFS)
+#if defined(HAVE_STATVFS1)
struct statvfs statvfsb;
+ return (fstatvfs1 (fd, &statvfsb, ST_NOWAIT) == 0 && (statvfsb.f_flag &
ST_RDONLY) != 0);
+#elif defined(HAVE_STATVFS)
+ struct statvfs statvfsb;
return (fstatvfs (fd, &statvfsb) == 0 && (statvfsb.f_flag & ST_RDONLY) != 0);
#elif defined(HAVE_STATFS)
struct statfs statfsb;
Modified: thunar/trunk/thunar-vfs/thunar-vfs-io-local.c
===================================================================
--- thunar/trunk/thunar-vfs/thunar-vfs-io-local.c 2006-07-31 12:04:32 UTC
(rev 22590)
+++ thunar/trunk/thunar-vfs/thunar-vfs-io-local.c 2006-07-31 12:42:03 UTC
(rev 22591)
@@ -101,9 +101,9 @@
_thunar_vfs_io_local_get_free_space (const ThunarVfsPath *path,
ThunarVfsFileSize *free_space_return)
{
-#if defined(HAVE_STATFS) && !defined(__sgi__) && !defined(__sun__)
+#if defined(HAVE_STATFS) && !defined(HAVE_STATVFS1) && !defined(__sgi__) &&
!defined(__sun__)
struct statfs statfsb;
-#elif defined(HAVE_STATVFS)
+#elif defined(HAVE_STATVFS) || defined(HAVE_STATVFS1)
struct statvfs statfsb;
#endif
gboolean succeed;
@@ -116,8 +116,10 @@
return FALSE;
/* determine the amount of free space for the mount point */
-#if defined(HAVE_STATFS) && !defined(__sgi__) && !defined(__sun__)
+#if defined(HAVE_STATFS) && !defined(HAVE_STATVFS1) && !defined(__sgi__) &&
!defined(__sun__)
succeed = (statfs (absolute_path, &statfsb) == 0); /* the good old BSD way
*/
+#elif defined(HAVE_STATVFS1)
+ succeed = (statvfs1 (absolute_path, &statfsb, ST_WAIT) == 0); /* the new
NetBSD way */
#elif defined(HAVE_STATVFS)
succeed = (statvfs (absolute_path, &statfsb) == 0); /* the Linux, IRIX,
Solaris way */
#else
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
