bugfixes

2 files changed, 44 insertions, 19 deletions

diff --git a/include/fuse.h b/include/fuse.h
index bdc96a6..4edb0c7 100644
--- a/include/fuse.h
+++ b/include/fuse.h
@@ -13,30 +13,38 @@
 #include <utime.h>
 
 struct fuse;
-struct fuse_dh;
+typedef struct fuse_dirhandle *fuse_dirh_t;
 
-typedef int (*dirfiller_t) (struct fuse_dh *, const char *, int type);
+typedef int (*fuse_dirfil_t) (fuse_dirh_t, const char *, int type);
+
+struct fuse_cred {
+    uid_t uid;
+    gid_t gid;
+};
 
 struct fuse_operations {
-    int (*getattr)  (const char *path, struct stat *stbuf);
-    int (*readlink) (const char *path, char *buf, size_t size);
-    int (*getdir)   (const char *path, struct fuse_dh *h, dirfiller_t filler);
-    int (*mknod)    (const char *path, mode_t mode, dev_t rdev);
-    int (*mkdir)    (const char *path, mode_t mode);
-    int (*unlink)   (const char *path);
-    int (*rmdir)    (const char *path);
-    int (*symlink)  (const char *from, const char *to);
-    int (*rename)   (const char *from, const char *to);
-    int (*link)     (const char *from, const char *to);
-    int (*chmod)    (const char *path, mode_t mode);
-    int (*chown)    (const char *path, uid_t uid, gid_t gid);
-    int (*truncate) (const char *path, off_t size);
-    int (*utime)    (const char *path, struct utimbuf *buf);
-    int (*open)     (const char *path, int flags);
-    int (*pread)    (const char *path, char *buf, size_t size, off_t offset);
+    int (*getattr)  (struct fuse_cred *, const char *, struct stat *);
+    int (*readlink) (struct fuse_cred *, const char *, char *, size_t);
+    int (*getdir)   (struct fuse_cred *, const char *, fuse_dirh_t, fuse_dirfil_t);
+    int (*mknod)    (struct fuse_cred *, const char *, mode_t, dev_t);
+    int (*mkdir)    (struct fuse_cred *, const char *, mode_t);
+    int (*unlink)   (struct fuse_cred *, const char *);
+    int (*rmdir)    (struct fuse_cred *, const char *);
+    int (*symlink)  (struct fuse_cred *, const char *, const char *);
+    int (*rename)   (struct fuse_cred *, const char *, const char *);
+    int (*link)     (struct fuse_cred *, const char *, const char *);
+    int (*chmod)    (struct fuse_cred *, const char *, mode_t);
+    int (*chown)    (struct fuse_cred *, const char *, uid_t, gid_t);
+    int (*truncate) (struct fuse_cred *, const char *, off_t);
+    int (*utime)    (struct fuse_cred *, const char *, struct utimbuf *);
+    int (*open)     (struct fuse_cred *, const char *, int);
+    int (*read)     (struct fuse_cred *, const char *, char *, size_t, off_t);
+    int (*write)    (struct fuse_cred *, const char *, const char *, size_t, off_t);
 };
 
-struct fuse *fuse_new();
+#define FUSE_MULTITHREAD (1 << 0)
+
+struct fuse *fuse_new(int flags);
 
 int fuse_mount(struct fuse *f, const char *dir);
 
diff --git a/include/linux/fuse.h b/include/linux/fuse.h
index 5fe008c..a6e74df 100644
--- a/include/linux/fuse.h
+++ b/include/linux/fuse.h
@@ -54,6 +54,7 @@ enum fuse_opcode {
 	FUSE_LINK,
 	FUSE_OPEN,
 	FUSE_READ,
+	FUSE_WRITE,
 };
 
 /* Conservative buffer size for the client */
@@ -64,6 +65,10 @@ struct fuse_lookup_out {
 	struct fuse_attr attr;
 };
 
+struct fuse_forget_in {
+	int version;
+};
+
 struct fuse_getattr_out {
 	struct fuse_attr attr;
 };
@@ -104,6 +109,10 @@ struct fuse_setattr_in {
 	unsigned int valid;
 };
 
+struct fuse_setattr_out {
+	unsigned long long newsize;
+};
+
 struct fuse_open_in {
 	unsigned int flags;
 };
@@ -113,10 +122,18 @@ struct fuse_read_in {
 	unsigned int size;
 };
 
+struct fuse_write_in {
+	unsigned long long offset;
+	unsigned int size;
+	char buf[1];
+};
+
 struct fuse_in_header {
 	int unique;
 	enum fuse_opcode opcode;
 	unsigned long ino;
+	unsigned int uid;
+	unsigned int gid;
 };
 
 struct fuse_out_header {