We don't have f_type.

This commit is contained in:
ajacoutot 2010-10-27 12:00:36 +00:00
parent 0fe400b179
commit c0e5e1487d
2 changed files with 7 additions and 5 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.35 2010/10/19 15:21:04 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.36 2010/10/27 12:00:36 ajacoutot Exp $
COMMENT-main= GNOME virtual file system
COMMENT-smb= samba module for GVFS
@ -9,6 +9,8 @@ GNOME_VERSION= 1.6.4
PKGNAME-main= ${DISTNAME}
PKGNAME-smb= ${GNOME_PROJECT}-smb-${GNOME_VERSION}
REVISION-main= 0
SHARED_LIBS += gvfscommon 3.0 # .0.0
SHARED_LIBS += gvfscommon-dnssd 1.0 # .0.0

View File

@ -1,12 +1,12 @@
$OpenBSD: patch-metadata_metatree_c,v 1.3 2010/04/22 20:27:05 ajacoutot Exp $
--- metadata/metatree.c.orig Mon Feb 22 10:57:39 2010
+++ metadata/metatree.c Thu Apr 22 21:56:56 2010
$OpenBSD: patch-metadata_metatree_c,v 1.4 2010/10/27 12:00:36 ajacoutot Exp $
--- metadata/metatree.c.orig Mon Sep 27 16:51:51 2010
+++ metadata/metatree.c Wed Oct 27 12:34:44 2010
@@ -303,7 +303,7 @@ is_on_nfs (char *filename)
sizeof (statfs_buffer), 0);
# endif
if (statfs_result == 0)
- res = statfs_buffer.f_type == 0x6969;
+ res = statfs_buffer.f_fstypename == 0x6969;
+ res = strcmp(statfs_buffer.f_fstypename, MOUNT_NFS) == 0;
#elif defined(USE_STATVFS) && defined(HAVE_STRUCT_STATVFS_F_BASETYPE)
statfs_result = statvfs (dirname, &statfs_buffer);