Allow arbitrary changing of lower 9 bits of mode. Allow owner/group changing to the...

[android-x86/external-exfat.git] / fuse / main.c

diff --git a/fuse/main.c b/fuse/main.c
index ee1e505..34b3ea6 100644 (file)
--- a/fuse/main.c
+++ b/fuse/main.c
@@ -2,7 +2,7 @@
        main.c (01.09.09)
        FUSE-based exFAT implementation. Requires FUSE 2.6 or later.
 
-       Copyright (C) 2010-2012  Andrew Nayenko
+       Copyright (C) 2010-2013  Andrew Nayenko
 
        This program is free software: you can redistribute it and/or modify
        it under the terms of the GNU General Public License as published by
@@ -38,7 +38,8 @@
        #error FUSE 2.6 or later is required
 #endif
 
-const char* default_options = "ro_fallback,allow_other,blkdev,big_writes";
+const char* default_options = "ro_fallback,allow_other,blkdev,big_writes,"
+               "defer_permissions";
 
 struct exfat ef;
 
@@ -79,7 +80,7 @@ static int fuse_exfat_truncate(const char* path, off_t size)
        if (rc != 0)
                return rc;
 
-       rc = exfat_truncate(&ef, node, size);
+       rc = exfat_truncate(&ef, node, size, true);
        exfat_put_node(&ef, node);
        return rc;
 }
@@ -154,19 +155,25 @@ static int fuse_exfat_release(const char* path, struct fuse_file_info* fi)
 static int fuse_exfat_read(const char* path, char* buffer, size_t size,
                off_t offset, struct fuse_file_info* fi)
 {
+       ssize_t ret;
+
        exfat_debug("[%s] %s (%zu bytes)", __func__, path, size);
-       if (exfat_generic_pread(&ef, get_node(fi), buffer, size, offset) != size)
-               return EOF;
-       return size;
+       ret = exfat_generic_pread(&ef, get_node(fi), buffer, size, offset);
+       if (ret < 0)
+               return -EIO;
+       return ret;
 }
 
 static int fuse_exfat_write(const char* path, const char* buffer, size_t size,
                off_t offset, struct fuse_file_info* fi)
 {
+       ssize_t ret;
+
        exfat_debug("[%s] %s (%zu bytes)", __func__, path, size);
-       if (exfat_generic_pwrite(&ef, get_node(fi), buffer, size, offset) != size)
-               return EOF;
-       return size;
+       ret = exfat_generic_pwrite(&ef, get_node(fi), buffer, size, offset);
+       if (ret < 0)
+               return -EIO;
+       return ret;
 }
 
 static int fuse_exfat_unlink(const char* path)
@@ -235,14 +242,24 @@ static int fuse_exfat_utimens(const char* path, const struct timespec tv[2])
        return 0;
 }
 
-#ifdef __APPLE__
 static int fuse_exfat_chmod(const char* path, mode_t mode)
 {
+       const mode_t VALID_MODE_MASK = S_IFREG | S_IFDIR |
+                       S_IRWXU | S_IRWXG | S_IRWXO;
+
        exfat_debug("[%s] %s 0%ho", __func__, path, mode);
-       /* make OS X utilities happy */
+       if (mode & ~VALID_MODE_MASK)
+               return -EPERM;
+       return 0;
+}
+
+static int fuse_exfat_chown(const char* path, uid_t uid, gid_t gid)
+{
+       exfat_debug("[%s] %s %u:%u", __func__, path, uid, gid);
+       if (uid != ef.uid || gid != ef.gid)
+               return -EPERM;
        return 0;
 }
-#endif
 
 static int fuse_exfat_statfs(const char* path, struct statvfs* sfs)
 {
@@ -285,7 +302,7 @@ static void fuse_exfat_destroy(void* unused)
 
 static void usage(const char* prog)
 {
-       fprintf(stderr, "Usage: %s [-d] [-o options] [-v] <device> <dir>\n", prog);
+       fprintf(stderr, "Usage: %s [-d] [-o options] [-V] <device> <dir>\n", prog);
        exit(1);
 }
 
@@ -304,9 +321,8 @@ static struct fuse_operations fuse_exfat_ops =
        .mkdir          = fuse_exfat_mkdir,
        .rename         = fuse_exfat_rename,
        .utimens        = fuse_exfat_utimens,
-#ifdef __APPLE__
-       .chmod          = fuse_exfat_chmod,
-#endif
+       .chmod          = fuse_exfat_chmod,
+       .chown          = fuse_exfat_chown,
        .statfs         = fuse_exfat_statfs,
        .init           = fuse_exfat_init,
        .destroy        = fuse_exfat_destroy,
@@ -337,19 +353,6 @@ static char* add_option(char* options, const char* name, const char* value)
        return options;
 }
 
-static char* add_fsname_option(char* options, const char* spec)
-{
-       char spec_abs[PATH_MAX];
-
-       if (realpath(spec, spec_abs) == NULL)
-       {
-               free(options);
-               exfat_error("failed to get absolute path for `%s'", spec);
-               return NULL;
-       }
-       return add_option(options, "fsname", spec_abs);
-}
-
 static char* add_user_option(char* options)
 {
        struct passwd* pw;
@@ -381,7 +384,7 @@ static char* add_blksize_option(char* options, long cluster_size)
 
 static char* add_fuse_options(char* options, const char* spec)
 {
-       options = add_fsname_option(options, spec);
+       options = add_option(options, "fsname", spec);
        if (options == NULL)
                return NULL;
        options = add_user_option(options);
@@ -404,7 +407,7 @@ int main(int argc, char* argv[])
        int debug = 0;
        struct fuse_chan* fc = NULL;
        struct fuse* fh = NULL;
-       char** pp;
+       int opt;
 
        printf("FUSE exfat %u.%u.%u\n",
                        EXFAT_VERSION_MAJOR, EXFAT_VERSION_MINOR, EXFAT_VERSION_PATCH);
@@ -416,40 +419,39 @@ int main(int argc, char* argv[])
                return 1;
        }
 
-       for (pp = argv + 1; *pp; pp++)
+       while ((opt = getopt(argc, argv, "dno:Vv")) != -1)
        {
-               if (strcmp(*pp, "-o") == 0)
+               switch (opt)
                {
-                       pp++;
-                       if (*pp == NULL)
-                               usage(argv[0]);
-                       mount_options = add_option(mount_options, *pp, NULL);
+               case 'd':
+                       debug = 1;
+                       break;
+               case 'n':
+                       break;
+               case 'o':
+                       mount_options = add_option(mount_options, optarg, NULL);
                        if (mount_options == NULL)
                                return 1;
-               }
-               else if (strcmp(*pp, "-d") == 0)
-                       debug = 1;
-               else if (strcmp(*pp, "-v") == 0)
-               {
+                       break;
+               case 'V':
                        free(mount_options);
-                       puts("Copyright (C) 2010-2012  Andrew Nayenko");
+                       puts("Copyright (C) 2010-2013  Andrew Nayenko");
                        return 0;
-               }
-               else if (spec == NULL)
-                       spec = *pp;
-               else if (mount_point == NULL)
-                       mount_point = *pp;
-               else
-               {
+               case 'v':
+                       break;
+               default:
                        free(mount_options);
                        usage(argv[0]);
+                       break;
                }
        }
-       if (spec == NULL || mount_point == NULL)
+       if (argc - optind != 2)
        {
                free(mount_options);
                usage(argv[0]);
        }
+       spec = argv[optind];
+       mount_point = argv[optind + 1];
 
        if (exfat_mount(&ef, spec, mount_options) != 0)
        {