From: relan <relan@users.noreply.github.com>
Date: Wed, 14 Jan 2015 09:53:19 +0000 (+0000)
Subject: Pass default_permissions to FUSE.
X-Git-Tag: android-x86-6.0-r1~41
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fexternal-exfat.git;a=commitdiff_plain;h=54c378168620c79f5292e98dbe46074728bbe9ce

Pass default_permissions to FUSE.

This makes umask, dmask and fmask options work out-of-the-box.

Signed-off-by: Helg Bredow <xx404@msn.com>
---

diff --git a/fuse/main.c b/fuse/main.c
index 58b7b2f..08acea5 100644
--- a/fuse/main.c
+++ b/fuse/main.c
@@ -41,7 +41,7 @@
 #endif
 
 const char* default_options = "ro_fallback,allow_other,blkdev,big_writes,"
-		"defer_permissions";
+		"default_permissions";
 
 struct exfat ef;
 
diff --git a/libexfat/mount.c b/libexfat/mount.c
index 2ebf436..bb4dd09 100644
--- a/libexfat/mount.c
+++ b/libexfat/mount.c
@@ -84,13 +84,11 @@ static bool match_option(const char* options, const char* option_name)
 
 static void parse_options(struct exfat* ef, const char* options)
 {
-	int sys_umask = umask(0);
 	int opt_umask;
 
-	umask(sys_umask); /* restore umask */
-	opt_umask = get_int_option(options, "umask", 8, sys_umask);
-	ef->dmask = get_int_option(options, "dmask", 8, opt_umask) & 0777;
-	ef->fmask = get_int_option(options, "fmask", 8, opt_umask) & 0777;
+	opt_umask = get_int_option(options, "umask", 8, 0);
+	ef->dmask = get_int_option(options, "dmask", 8, opt_umask);
+	ef->fmask = get_int_option(options, "fmask", 8, opt_umask);
 
 	ef->uid = get_int_option(options, "uid", 10, geteuid());
 	ef->gid = get_int_option(options, "gid", 10, getegid());