diff options
Diffstat (limited to 'exfat/exfat-fuse')
| -rw-r--r-- | exfat/exfat-fuse/main.c | 64 | ||||
| -rw-r--r-- | exfat/exfat-fuse/mount.exfat-fuse.8 | 16 |
2 files changed, 50 insertions, 30 deletions
diff --git a/exfat/exfat-fuse/main.c b/exfat/exfat-fuse/main.c index 0023b9d13..53ce2feb5 100644 --- a/exfat/exfat-fuse/main.c +++ b/exfat/exfat-fuse/main.c @@ -92,7 +92,7 @@ static int fuse_exfat_readdir(const char* path, void* buffer, struct exfat_node* node; struct exfat_iterator it; int rc; - char name[EXFAT_NAME_MAX + 1]; + char name[UTF8_BYTES(EXFAT_NAME_MAX) + 1]; exfat_debug("[%s] %s", __func__, path); @@ -118,7 +118,7 @@ static int fuse_exfat_readdir(const char* path, void* buffer, } while ((node = exfat_readdir(&ef, &it))) { - exfat_get_name(node, name, EXFAT_NAME_MAX); + exfat_get_name(node, name, sizeof(name) - 1); exfat_debug("[%s] %s: %s, %"PRId64" bytes, cluster 0x%x", __func__, name, IS_CONTIGUOUS(*node) ? "contiguous" : "fragmented", node->size, node->start_cluster); @@ -242,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) { @@ -292,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); } @@ -311,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 + .chown = fuse_exfat_chown, .statfs = fuse_exfat_statfs, .init = fuse_exfat_init, .destroy = fuse_exfat_destroy, @@ -398,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); @@ -410,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-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) { diff --git a/exfat/exfat-fuse/mount.exfat-fuse.8 b/exfat/exfat-fuse/mount.exfat-fuse.8 index 83d2e6301..b7e9d5682 100644 --- a/exfat/exfat-fuse/mount.exfat-fuse.8 +++ b/exfat/exfat-fuse/mount.exfat-fuse.8 @@ -9,10 +9,16 @@ mount.exfat-fuse \- mount an exFAT file system .B \-d ] [ +.B \-n +] +[ .B \-o .I options ] [ +.B \-V +] +[ .B \-v ] .I device dir @@ -21,7 +27,7 @@ mount.exfat-fuse \- mount an exFAT file system .B mount.exfat-fuse is a free exFAT file system implementation with write support. exFAT is a simple file system created by Microsoft. It is intended to replace FAT32 -removing some of it's limitations. exFAT is a standard FS for SDXC memory +removing some of its limitations. exFAT is a standard FS for SDXC memory cards. .SH COMMAND LINE OPTIONS @@ -30,13 +36,19 @@ Command line options available: .BI \-d Enable debug logging and do not detach from shell. .TP +.BI \-n +Ignored. +.TP .BI \-o " options" File system specific options. For more details see .B FILE SYSTEM OPTIONS section below. .TP -.BI \-v +.BI \-V Print version and copyright. +.TP +.BI \-v +Ignored. .SH FILE SYSTEM OPTIONS .TP |