summaryrefslogtreecommitdiff
path: root/filesystems/fuse-obexfs/patches/patch-aa
blob: 0e130cb2e15d8d637bfa4c572ce9ae204fe83cc7 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
$NetBSD: patch-aa,v 1.2 2007/05/16 11:02:12 xtraeme Exp $

--- fuse/obexfs.c.orig	2006-01-19 15:46:43.000000000 +0100
+++ fuse/obexfs.c	2007-05-16 12:52:58.000000000 +0200
@@ -26,6 +26,8 @@
 /* strndup */
 #define _GNU_SOURCE
 
+#include "config.h"
+
 /* at least fuse v 2.2 is needed */
 #define FUSE_USE_VERSION 22
 #include <fuse.h>
@@ -37,7 +39,11 @@
 #include <fcntl.h>
 #include <dirent.h>
 #include <errno.h>
+#if HAVE_SYS_STATVFS_H
+#include <sys/statvfs.h>
+#else
 #include <sys/statfs.h>
+#endif
 #include <sys/types.h>
 #include <dirent.h>
 #include <signal.h>
@@ -49,7 +55,6 @@
 
 #define UNUSED(x) x __attribute__((unused))
 
-#define DEBUGOUPUT
 #ifdef DEBUGOUPUT
 #define DEBUG(...) fprintf(stderr, __VA_ARGS__)
 #else
@@ -412,12 +417,20 @@
 	return 0;
 }
 
+#if HAVE_SYS_STATVFS_H
+static int ofs_statfs(const char *UNUSED(label), struct statvfs *st)
+#else
 static int ofs_statfs(const char *UNUSED(label), struct statfs *st)
+#endif
 {
 	int res;
 	int size, free;
 
+#if HAVE_SYS_STATVFS_H
+	memset(st, 0, sizeof(struct statvfs));
+#else
 	memset(st, 0, sizeof(struct statfs));
+#endif
 
 	res = ofs_connect();
 	if(res < 0)