From: Miklos Szeredi <miklos@szeredi.hu>
Date: Sun, 15 Apr 2007 19:34:08 +0000 (+0000)
Subject: Add -lulockmgr to compilation comment in fusexmp_fh.c
X-Git-Tag: fuse_2_6_4~4
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=63482fbeeb1b883ccd40d34f051fcda51e8e3aab;p=qemu-gpiodev%2Flibfuse.git

Add -lulockmgr to compilation comment in fusexmp_fh.c
---

diff --git a/ChangeLog b/ChangeLog
index d5a254e..a1d24a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-04-15  Miklos Szeredi <miklos@szeredi.hu>
+
+	* Add -lulockmgr to compilation comment in fusexmp_fh.c
+
 2007-04-05  Miklos Szeredi <miklos@szeredi.hu>
 
 	* mount.fuse should handle spaces in paths.  Debian Bug#417834.
diff --git a/example/fusexmp_fh.c b/example/fusexmp_fh.c
index c10044c..f8c1ed4 100644
--- a/example/fusexmp_fh.c
+++ b/example/fusexmp_fh.c
@@ -5,7 +5,7 @@
     This program can be distributed under the terms of the GNU GPL.
     See the file COPYING.
 
-    gcc -Wall `pkg-config fuse --cflags --libs` fusexmp_fh.c -o fusexmp_fh
+    gcc -Wall `pkg-config fuse --cflags --libs` -lulockmgr fusexmp_fh.c -o fusexmp_fh
 */
 
 #define FUSE_USE_VERSION 26
diff --git a/util/mount.fuse b/util/mount.fuse
index 6ee636e..e8febfe 100644
--- a/util/mount.fuse
+++ b/util/mount.fuse
@@ -57,4 +57,8 @@ IFS=" "
 # add "-o " and remove trailing comma
 OPTIONS="-o `echo $OPTIONS | sed "s/,$//"`"
 
-"${FSTYPE}" "${MOUNTPATH}" "${MOUNTPOINT}" ${OPTIONS}
+if test -z "$MOUNTPATH"; then
+    "${FSTYPE}" "${MOUNTPOINT}" ${OPTIONS}
+else
+    "${FSTYPE}" "${MOUNTPATH}" "${MOUNTPOINT}" ${OPTIONS}
+fi