Module Name: src
Committed By: riz
Date: Mon Aug 8 19:53:29 UTC 2011
Modified Files:
src/lib/librefuse [netbsd-5]: refuse.c
Log Message:
Pull up following revision(s) (requested by tron in ticket #1648):
lib/librefuse/refuse.c: revision 1.93
Don't ignore "userdata" argument in "fuse_main_real". This can crash
a FUSE file-system that passes a non-NULL argument here.
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.89.4.1 src/lib/librefuse/refuse.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/librefuse/refuse.c
diff -u src/lib/librefuse/refuse.c:1.89 src/lib/librefuse/refuse.c:1.89.4.1
--- src/lib/librefuse/refuse.c:1.89 Fri Aug 1 15:54:09 2008
+++ src/lib/librefuse/refuse.c Mon Aug 8 19:53:29 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: refuse.c,v 1.89 2008/08/01 15:54:09 dillo Exp $ */
+/* $NetBSD: refuse.c,v 1.89.4.1 2011/08/08 19:53:29 riz Exp $ */
/*
* Copyright � 2007 Alistair Crooks. All rights reserved.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#if !defined(lint)
-__RCSID("$NetBSD: refuse.c,v 1.89 2008/08/01 15:54:09 dillo Exp $");
+__RCSID("$NetBSD: refuse.c,v 1.89.4.1 2011/08/08 19:53:29 riz Exp $");
#endif /* !lint */
#include <sys/types.h>
@@ -1221,8 +1221,8 @@
int multithreaded;
int fd;
- fuse = fuse_setup(argc, argv, ops, size, &mountpoint, &multithreaded,
- &fd);
+ fuse = fuse_setup_real(argc, argv, ops, size, &mountpoint,
+ &multithreaded, &fd, userdata);
return fuse_loop(fuse);
}
