glib r6638 - in trunk: . gio

[alexl svn gnome org]

Author: alexl
Date: Fri Mar  7 14:36:15 2008
New Revision: 6638
URL: http://svn.gnome.org/viewvc/glib?rev=6638&view=rev

Log:
2008-03-07  Alexander Larsson  <alexl redhat com>

        * glocalfile.c:
        (g_local_file_query_filesystem_info):
	Use struct statfs.f_fstypename if availible (e.g. on OpenBSD)
	Patch from Jasper Lievisse Adriaanse



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/gio/ChangeLog
   trunk/gio/glocalfile.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Mar  7 14:36:15 2008
@@ -839,7 +839,7 @@
 
 # check for structure fields
 AC_CHECK_MEMBERS([struct stat.st_mtimensec, struct stat.st_mtim.tv_nsec, struct stat.st_atimensec, struct stat.st_atim.tv_nsec, struct stat.st_ctimensec, struct stat.st_ctim.tv_nsec])
-AC_CHECK_MEMBERS([struct stat.st_blksize, struct stat.st_blocks])
+AC_CHECK_MEMBERS([struct stat.st_blksize, struct stat.st_blocks, struct statfs.f_fstypename])
 
 # Checks for libcharset
 jm_LANGINFO_CODESET

Modified: trunk/gio/glocalfile.c
==============================================================================
--- trunk/gio/glocalfile.c	(original)
+++ trunk/gio/glocalfile.c	Fri Mar  7 14:36:15 2008
@@ -997,7 +997,11 @@
 #endif
     }
 #ifdef USE_STATFS
+#if defined(HAVE_STRUCT_STATFS_FS_TYPENAME)
+  fstype = g_strdup(statfs_buffer.f_fstypename);
+#else
   fstype = get_fs_type (statfs_buffer.f_type);
+#endif
   if (fstype &&
       g_file_attribute_matcher_matches (attribute_matcher,
 					G_FILE_ATTRIBUTE_FILESYSTEM_TYPE))