FUSE-based exFAT implementation. Requires FUSE 2.6 or later.
Free exFAT implementation.
- Copyright (C) 2010-2016 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
struct exfat_iterator it;
int rc;
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;
}
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);
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);
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)
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;
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_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);
if (options == NULL)
return NULL;
break;
case 'V':
free(mount_options);
- puts("Copyright (C) 2010-2016 Andrew Nayenko");
+ puts("Copyright (C) 2010-2018 Andrew Nayenko");
return 0;
case 'v':
break;
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);