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
55
56
57
58
59
60
61
62
63
64
65
|
$NetBSD: patch-aa,v 1.3 2022/01/22 18:43:20 pho Exp $
* Use the correct API version: opendir() appeared on FUSE 2.3, not
2.2.
* Work around an API incompatibility in the past versions of NetBSD
librefuse: it had a wrong prototype for the callback
statfs(). Already fixed in HEAD.
--- fuse/obexfs.c.orig 2006-01-19 14:46:43.000000000 +0000
+++ fuse/obexfs.c
@@ -26,8 +26,10 @@
/* strndup */
#define _GNU_SOURCE
-/* at least fuse v 2.2 is needed */
-#define FUSE_USE_VERSION 22
+#include "config.h"
+
+/* at least fuse v 2.3 is needed */
+#define FUSE_USE_VERSION 23
#include <fuse.h>
#include <stdio.h>
#include <stdlib.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 @@ static int ofs_release(const char *path,
return 0;
}
+#if HAVE_SYS_STATVFS_H && defined(__NetBSD__) && FUSE_H_ < 20211204
+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 && defined(__NetBSD__) && FUSE_H_ < 20211204
+ memset(st, 0, sizeof(struct statvfs));
+#else
memset(st, 0, sizeof(struct statfs));
+#endif
res = ofs_connect();
if(res < 0)
|
