Revert "Use fuse_main() instead of lower level functions."

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

diff --git a/fuse/main.c b/fuse/main.c
index 5370359..6d566d9 100644 (file)
--- a/fuse/main.c
+++ b/fuse/main.c
@@ -3,7 +3,7 @@
        FUSE-based exFAT implementation. Requires FUSE 2.6 or later.
 
        Free exFAT implementation.
-       Copyright (C) 2010-2015  Andrew Nayenko
+       Copyright (C) 2010-2018  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
@@ -104,17 +104,18 @@ static int fuse_exfat_readdir(const char* path, void* buffer,
        struct exfat_node* node;
        struct exfat_iterator it;
        int rc;
-       char name[UTF8_BYTES(EXFAT_NAME_MAX) + 1];
+       char name[EXFAT_UTF8_NAME_BUFFER_MAX];
+       struct stat stbuf;
 
        exfat_debug("[%s] %s", __func__, path);
 
        rc = exfat_lookup(&ef, &parent, path);
        if (rc != 0)
                return rc;
-       if (!(parent->flags & EXFAT_ATTRIB_DIR))
+       if (!(parent->attrib & EXFAT_ATTRIB_DIR))
        {
                exfat_put_node(&ef, parent);
-               exfat_error("'%s' is not a directory (0x%x)", path, parent->flags);
+               exfat_error("'%s' is not a directory (%#hx)", path, parent->attrib);
                return -ENOTDIR;
        }
 
@@ -128,13 +129,14 @@ static int fuse_exfat_readdir(const char* path, void* buffer,
                exfat_error("failed to open directory '%s'", path);
                return rc;
        }
-       while ((node = exfat_readdir(&ef, &it)))
+       while ((node = exfat_readdir(&it)))
        {
-               exfat_get_name(node, name, sizeof(name) - 1);
+               exfat_get_name(node, name);
                exfat_debug("[%s] %s: %s, %"PRId64" bytes, cluster 0x%x", __func__,
-                               name, IS_CONTIGUOUS(*node) ? "contiguous" : "fragmented",
+                               name, node->is_contiguous ? "contiguous" : "fragmented",
                                node->size, node->start_cluster);
-               filler(buffer, name, NULL, 0);
+               exfat_stat(&ef, node, &stbuf);
+               filler(buffer, name, &stbuf, 0);
                exfat_put_node(&ef, node);
        }
        exfat_closedir(&ef, &it);
@@ -206,6 +208,9 @@ static int fuse_exfat_fsync(const char* path, int datasync,
        int rc;
 
        exfat_debug("[%s] %s", __func__, path);
+       rc = exfat_flush_nodes(&ef);
+       if (rc != 0)
+               return rc;
        rc = exfat_flush(&ef);
        if (rc != 0)
                return rc;
@@ -215,25 +220,15 @@ static int fuse_exfat_fsync(const char* path, int datasync,
 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);
-       ret = exfat_generic_pread(&ef, get_node(fi), buffer, size, offset);
-       if (ret < 0)
-               return -EIO;
-       return ret;
+       return exfat_generic_pread(&ef, get_node(fi), buffer, size, offset);
 }
 
 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);
-       ret = exfat_generic_pwrite(&ef, get_node(fi), buffer, size, offset);
-       if (ret < 0)
-               return -EIO;
-       return ret;
+       return exfat_generic_pwrite(&ef, get_node(fi), buffer, size, offset);
 }
 
 static int fuse_exfat_unlink(const char* path)
@@ -424,6 +419,41 @@ static char* add_option(char* options, const char* name, const char* value)
        return options;
 }
 
+static void escape(char* escaped, const char* orig)
+{
+       do
+       {
+               if (*orig == ',' || *orig == '\\')
+                       *escaped++ = '\\';
+       }
+       while ((*escaped++ = *orig++));
+}
+
+static char* add_fsname_option(char* options, const char* spec)
+{
+       /* escaped string cannot be more than twice as big as the original one */
+       char* escaped = malloc(strlen(spec) * 2 + 1);
+
+       if (escaped == NULL)
+       {
+               free(options);
+               exfat_error("failed to allocate escaped string for %s", spec);
+               return NULL;
+       }
+
+       /* on some platforms (e.g. Android, Solaris) device names can contain
+          commas */
+       escape(escaped, spec);
+       options = add_option(options, "fsname", escaped);
+       free(escaped);
+       return options;
+}
+
+static char* add_ro_option(char* options, bool ro)
+{
+       return ro ? add_option(options, "ro", NULL) : options;
+}
+
 static char* add_user_option(char* options)
 {
        struct passwd* pw;
@@ -453,9 +483,12 @@ static char* add_blksize_option(char* options, long cluster_size)
        return add_option(options, "blksize", blksize);
 }
 
-static char* add_fuse_options(char* options, const char* spec)
+static char* add_fuse_options(char* options, const char* spec, bool ro)
 {
-       options = add_option(options, "fsname", spec);
+       options = add_fsname_option(options, spec);
+       if (options == NULL)
+               return NULL;
+       options = add_ro_option(options, ro);
        if (options == NULL)
                return NULL;
        options = add_user_option(options);
@@ -480,8 +513,7 @@ int main(int argc, char* argv[])
        struct fuse* fh = NULL;
        int opt;
 
-       printf("FUSE exfat %u.%u.%u\n",
-                       EXFAT_VERSION_MAJOR, EXFAT_VERSION_MINOR, EXFAT_VERSION_PATCH);
+       printf("FUSE exfat %s\n", VERSION);
 
        mount_options = strdup(default_options);
        if (mount_options == NULL)
@@ -506,7 +538,7 @@ int main(int argc, char* argv[])
                        break;
                case 'V':
                        free(mount_options);
-                       puts("Copyright (C) 2010-2015  Andrew Nayenko");
+                       puts("Copyright (C) 2010-2018  Andrew Nayenko");
                        return 0;
                case 'v':
                        break;
@@ -530,17 +562,7 @@ int main(int argc, char* argv[])
                return 1;
        }
 
-       if (ef.ro == -1) /* read-only fallback was used */
-       {
-               mount_options = add_option(mount_options, "ro", NULL);
-               if (mount_options == NULL)
-               {
-                       exfat_unmount(&ef);
-                       return 1;
-               }
-       }
-
-       mount_options = add_fuse_options(mount_options, spec);
+       mount_options = add_fuse_options(mount_options, spec, (ef.ro != 0));
        if (mount_options == NULL)
        {
                exfat_unmount(&ef);