From 09ef1e410970b74df384047fcf4c0e18a6ec3643 Mon Sep 17 00:00:00 2001 From: Matt Mower Date: Sun, 13 Dec 2015 11:29:45 -0600 Subject: exfat: Update to 1.2.2 Change-Id: I160389afa074270c398aeb771845500f2445838a --- exfat/exfat-fuse/Android.mk | 17 -- exfat/exfat-fuse/main.c | 564 ------------------------------------ exfat/exfat-fuse/mount.exfat-fuse.8 | 88 ------ 3 files changed, 669 deletions(-) delete mode 100644 exfat/exfat-fuse/Android.mk delete mode 100644 exfat/exfat-fuse/main.c delete mode 100644 exfat/exfat-fuse/mount.exfat-fuse.8 (limited to 'exfat/exfat-fuse') diff --git a/exfat/exfat-fuse/Android.mk b/exfat/exfat-fuse/Android.mk deleted file mode 100644 index ff5ef3e0d..000000000 --- a/exfat/exfat-fuse/Android.mk +++ /dev/null @@ -1,17 +0,0 @@ -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -LOCAL_MODULE := exfat-fuse -LOCAL_MODULE_CLASS := RECOVERY_EXECUTABLES -LOCAL_MODULE_TAGS := eng -LOCAL_MODULE_PATH := $(TARGET_RECOVERY_ROOT_OUT)/sbin -LOCAL_MODULE_TAGS := optional -LOCAL_CFLAGS = -D_FILE_OFFSET_BITS=64 -LOCAL_SRC_FILES = main.c -LOCAL_C_INCLUDES += $(LOCAL_PATH) \ - $(commands_recovery_local_path)/exfat/libexfat \ - $(commands_recovery_local_path)/fuse/include -LOCAL_SHARED_LIBRARIES += libz libc libexfat_twrp libdl -LOCAL_STATIC_LIBRARIES += libfusetwrp - -include $(BUILD_EXECUTABLE) diff --git a/exfat/exfat-fuse/main.c b/exfat/exfat-fuse/main.c deleted file mode 100644 index abb60e7df..000000000 --- a/exfat/exfat-fuse/main.c +++ /dev/null @@ -1,564 +0,0 @@ -/* - main.c (01.09.09) - FUSE-based exFAT implementation. Requires FUSE 2.6 or later. - - Free exFAT implementation. - 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 - the Free Software Foundation, either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ - -#define FUSE_USE_VERSION 26 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#define exfat_debug(format, ...) - -#if !defined(FUSE_VERSION) || (FUSE_VERSION < 26) - #error FUSE 2.6 or later is required -#endif - -const char* default_options = "ro_fallback,allow_other,blkdev,big_writes," - "defer_permissions"; - -struct exfat ef; - -static struct exfat_node* get_node(const struct fuse_file_info* fi) -{ - return (struct exfat_node*) (size_t) fi->fh; -} - -static void set_node(struct fuse_file_info* fi, struct exfat_node* node) -{ - fi->fh = (uint64_t) (size_t) node; -} - -static int fuse_exfat_getattr(const char* path, struct stat* stbuf) -{ - struct exfat_node* node; - int rc; - - exfat_debug("[%s] %s", __func__, path); - - rc = exfat_lookup(&ef, &node, path); - if (rc != 0) - return rc; - - exfat_stat(&ef, node, stbuf); - exfat_put_node(&ef, node); - return 0; -} - -static int fuse_exfat_truncate(const char* path, off64_t size) -{ - struct exfat_node* node; - int rc; - - exfat_debug("[%s] %s, %"PRId64, __func__, path, size); - - rc = exfat_lookup(&ef, &node, path); - if (rc != 0) - return rc; - - rc = exfat_truncate(&ef, node, size, true); - exfat_put_node(&ef, node); - return rc; -} - -static int fuse_exfat_readdir(const char* path, void* buffer, - fuse_fill_dir_t filler, off64_t offset, struct fuse_file_info* fi) -{ - struct exfat_node* parent; - struct exfat_node* node; - struct exfat_iterator it; - int rc; - char name[UTF8_BYTES(EXFAT_NAME_MAX) + 1]; - - exfat_debug("[%s] %s", __func__, path); - - rc = exfat_lookup(&ef, &parent, path); - if (rc != 0) - return rc; - if (!(parent->flags & EXFAT_ATTRIB_DIR)) - { - exfat_put_node(&ef, parent); - exfat_error("`%s' is not a directory (0x%x)", path, parent->flags); - return -ENOTDIR; - } - - filler(buffer, ".", NULL, 0); - filler(buffer, "..", NULL, 0); - - rc = exfat_opendir(&ef, parent, &it); - if (rc != 0) - { - exfat_put_node(&ef, parent); - exfat_error("failed to open directory `%s'", path); - return rc; - } - while ((node = exfat_readdir(&ef, &it))) - { - 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); - filler(buffer, name, NULL, 0); - exfat_put_node(&ef, node); - } - exfat_closedir(&ef, &it); - exfat_put_node(&ef, parent); - return 0; -} - -static int fuse_exfat_open(const char* path, struct fuse_file_info* fi) -{ - struct exfat_node* node; - int rc; - - exfat_debug("[%s] %s", __func__, path); - - rc = exfat_lookup(&ef, &node, path); - if (rc != 0) - return rc; - set_node(fi, node); - fi->keep_cache = 1; - return 0; -} - -static int fuse_exfat_release(const char* path, struct fuse_file_info* fi) -{ - exfat_debug("[%s] %s", __func__, path); - exfat_put_node(&ef, get_node(fi)); - return 0; -} - -static int fuse_exfat_fsync(const char* path, int datasync, - struct fuse_file_info *fi) -{ - int rc; - - exfat_debug("[%s] %s", __func__, path); - rc = exfat_flush_node(&ef, get_node(fi)); - if (rc != 0) - return rc; - rc = exfat_flush(&ef); - if (rc != 0) - return rc; - return exfat_fsync(ef.dev); -} - -static int fuse_exfat_read(const char* path, char* buffer, size_t size, - off64_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; -} - -static int fuse_exfat_write(const char* path, const char* buffer, size_t size, - off64_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; -} - -static int fuse_exfat_unlink(const char* path) -{ - struct exfat_node* node; - int rc; - - exfat_debug("[%s] %s", __func__, path); - - rc = exfat_lookup(&ef, &node, path); - if (rc != 0) - return rc; - - rc = exfat_unlink(&ef, node); - exfat_put_node(&ef, node); - return rc; -} - -static int fuse_exfat_rmdir(const char* path) -{ - struct exfat_node* node; - int rc; - - exfat_debug("[%s] %s", __func__, path); - - rc = exfat_lookup(&ef, &node, path); - if (rc != 0) - return rc; - - rc = exfat_rmdir(&ef, node); - exfat_put_node(&ef, node); - return rc; -} - -static int fuse_exfat_mknod(const char* path, mode_t mode, dev_t dev) -{ - exfat_debug("[%s] %s 0%ho", __func__, path, mode); - return exfat_mknod(&ef, path); -} - -static int fuse_exfat_mkdir(const char* path, mode_t mode) -{ - exfat_debug("[%s] %s 0%ho", __func__, path, mode); - return exfat_mkdir(&ef, path); -} - -static int fuse_exfat_rename(const char* old_path, const char* new_path) -{ - exfat_debug("[%s] %s => %s", __func__, old_path, new_path); - return exfat_rename(&ef, old_path, new_path); -} - -static int fuse_exfat_utimens(const char* path, const struct timespec tv[2]) -{ - struct exfat_node* node; - int rc; - - exfat_debug("[%s] %s", __func__, path); - - rc = exfat_lookup(&ef, &node, path); - if (rc != 0) - return rc; - - exfat_utimes(node, tv); - exfat_put_node(&ef, node); - return 0; -} - -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); - 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; -} - -static int fuse_exfat_statfs(const char* path, struct statvfs* sfs) -{ - exfat_debug("[%s]", __func__); - - sfs->f_bsize = CLUSTER_SIZE(*ef.sb); - sfs->f_frsize = CLUSTER_SIZE(*ef.sb); - sfs->f_blocks = le64_to_cpu(ef.sb->sector_count) >> ef.sb->spc_bits; - sfs->f_bavail = exfat_count_free_clusters(&ef); - sfs->f_bfree = sfs->f_bavail; - sfs->f_namemax = EXFAT_NAME_MAX; - - /* - Below are fake values because in exFAT there is - a) no simple way to count files; - b) no such thing as inode; - So here we assume that inode = cluster. - */ - sfs->f_files = (sfs->f_blocks - sfs->f_bfree) >> ef.sb->spc_bits; - sfs->f_favail = sfs->f_bfree >> ef.sb->spc_bits; - sfs->f_ffree = sfs->f_bavail; - - return 0; -} - -static void* fuse_exfat_init(struct fuse_conn_info* fci) -{ - exfat_debug("[%s]", __func__); -#ifdef FUSE_CAP_BIG_WRITES - fci->want |= FUSE_CAP_BIG_WRITES; -#endif - return NULL; -} - -static void fuse_exfat_destroy(void* unused) -{ - exfat_debug("[%s]", __func__); - exfat_unmount(&ef); -} - -static void usage(const char* prog) -{ - fprintf(stderr, "Usage: %s [-d] [-o options] [-V] \n", prog); - exit(1); -} - -static struct fuse_operations fuse_exfat_ops = -{ - .getattr = fuse_exfat_getattr, - .truncate = fuse_exfat_truncate, - .readdir = fuse_exfat_readdir, - .open = fuse_exfat_open, - .release = fuse_exfat_release, - .fsync = fuse_exfat_fsync, - .fsyncdir = fuse_exfat_fsync, - .read = fuse_exfat_read, - .write = fuse_exfat_write, - .unlink = fuse_exfat_unlink, - .rmdir = fuse_exfat_rmdir, - .mknod = fuse_exfat_mknod, - .mkdir = fuse_exfat_mkdir, - .rename = fuse_exfat_rename, - .utimens = fuse_exfat_utimens, - .chmod = fuse_exfat_chmod, - .chown = fuse_exfat_chown, - .statfs = fuse_exfat_statfs, - .init = fuse_exfat_init, - .destroy = fuse_exfat_destroy, -}; - -static char* add_option(char* options, const char* name, const char* value) -{ - size_t size; - - if (value) - size = strlen(options) + strlen(name) + strlen(value) + 3; - else - size = strlen(options) + strlen(name) + 2; - - options = realloc(options, size); - if (options == NULL) - { - exfat_error("failed to reallocate options string"); - return NULL; - } - strcat(options, ","); - strcat(options, name); - if (value) - { - strcat(options, "="); - strcat(options, value); - } - return options; -} - -static char* add_user_option(char* options) -{ - struct passwd* pw; - - if (getuid() == 0) - return options; - - pw = getpwuid(getuid()); - if (pw == NULL || pw->pw_name == NULL) - { - free(options); - exfat_error("failed to determine username"); - return NULL; - } - return add_option(options, "user", pw->pw_name); -} - -static char* add_blksize_option(char* options, long cluster_size) -{ - long page_size = sysconf(_SC_PAGESIZE); - char blksize[20]; - - if (page_size < 1) - page_size = 0x1000; - - snprintf(blksize, sizeof(blksize), "%ld", MIN(page_size, cluster_size)); - return add_option(options, "blksize", blksize); -} - -static char* add_fuse_options(char* options, const char* spec) -{ - options = add_option(options, "fsname", spec); - if (options == NULL) - return NULL; - options = add_user_option(options); - if (options == NULL) - return NULL; - options = add_blksize_option(options, CLUSTER_SIZE(*ef.sb)); - if (options == NULL) - return NULL; - - return options; -} - -int main(int argc, char* argv[]) -{ - struct fuse_args mount_args = FUSE_ARGS_INIT(0, NULL); - struct fuse_args newfs_args = FUSE_ARGS_INIT(0, NULL); - const char* spec = NULL; - const char* mount_point = NULL; - char* mount_options; - int debug = 0; - struct fuse_chan* fc = NULL; - struct fuse* fh = NULL; - int opt; - - printf("FUSE exfat %u.%u.%u\n", - EXFAT_VERSION_MAJOR, EXFAT_VERSION_MINOR, EXFAT_VERSION_PATCH); - - mount_options = strdup(default_options); - if (mount_options == NULL) - { - exfat_error("failed to allocate options string"); - return 1; - } - - while ((opt = getopt(argc, argv, "dno:Vv")) != -1) - { - switch (opt) - { - case 'd': - debug = 1; - break; - case 'n': - break; - case 'o': - mount_options = add_option(mount_options, optarg, NULL); - if (mount_options == NULL) - return 1; - break; - case 'V': - free(mount_options); - puts("Copyright (C) 2010-2013 Andrew Nayenko"); - return 0; - case 'v': - break; - default: - free(mount_options); - usage(argv[0]); - break; - } - } - 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) - { - free(mount_options); - 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); - if (mount_options == NULL) - { - exfat_unmount(&ef); - return 1; - } - - /* create arguments for fuse_mount() */ - if (fuse_opt_add_arg(&mount_args, "exfat") != 0 || - fuse_opt_add_arg(&mount_args, "-o") != 0 || - fuse_opt_add_arg(&mount_args, mount_options) != 0) - { - exfat_unmount(&ef); - free(mount_options); - return 1; - } - - free(mount_options); - - /* create FUSE mount point */ - fc = fuse_mount(mount_point, &mount_args); - fuse_opt_free_args(&mount_args); - if (fc == NULL) - { - exfat_unmount(&ef); - return 1; - } - - /* create arguments for fuse_new() */ - if (fuse_opt_add_arg(&newfs_args, "") != 0 || - (debug && fuse_opt_add_arg(&newfs_args, "-d") != 0)) - { - fuse_unmount(mount_point, fc); - exfat_unmount(&ef); - return 1; - } - - /* create new FUSE file system */ - fh = fuse_new(fc, &newfs_args, &fuse_exfat_ops, - sizeof(struct fuse_operations), NULL); - fuse_opt_free_args(&newfs_args); - if (fh == NULL) - { - fuse_unmount(mount_point, fc); - exfat_unmount(&ef); - return 1; - } - - /* exit session on HUP, TERM and INT signals and ignore PIPE signal */ - if (fuse_set_signal_handlers(fuse_get_session(fh)) != 0) - { - fuse_unmount(mount_point, fc); - fuse_destroy(fh); - exfat_unmount(&ef); - exfat_error("failed to set signal handlers"); - return 1; - } - - /* go to background (unless "-d" option is passed) and run FUSE - main loop */ - if (fuse_daemonize(debug) == 0) - { - if (fuse_loop(fh) != 0) - exfat_error("FUSE loop failure"); - } - else - exfat_error("failed to daemonize"); - - fuse_remove_signal_handlers(fuse_get_session(fh)); - /* note that fuse_unmount() must be called BEFORE fuse_destroy() */ - fuse_unmount(mount_point, fc); - fuse_destroy(fh); - return 0; -} diff --git a/exfat/exfat-fuse/mount.exfat-fuse.8 b/exfat/exfat-fuse/mount.exfat-fuse.8 deleted file mode 100644 index b7e9d5682..000000000 --- a/exfat/exfat-fuse/mount.exfat-fuse.8 +++ /dev/null @@ -1,88 +0,0 @@ -.\" Copyright (C) 2010 Andrew Nayenko -.\" -.TH EXFAT-FUSE 8 "July 2010" -.SH NAME -mount.exfat-fuse \- mount an exFAT file system -.SH SYNOPSIS -.B mount.exfat-fuse -[ -.B \-d -] -[ -.B \-n -] -[ -.B \-o -.I options -] -[ -.B \-V -] -[ -.B \-v -] -.I device dir - -.SH DESCRIPTION -.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 its limitations. exFAT is a standard FS for SDXC memory -cards. - -.SH COMMAND LINE OPTIONS -Command line options available: -.TP -.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 -Print version and copyright. -.TP -.BI \-v -Ignored. - -.SH FILE SYSTEM OPTIONS -.TP -.BI umask= value -Set the umask (the bitmask of the permissions that are -.B not -present, in octal). -The default is the umask of the current process. -.TP -.BI dmask= value -Set the umask for directories only. -.TP -.BI fmask= value -Set the umask for files only. -.TP -.BI uid= n -Set the owner for all files and directories. -The default is the owner of the current process. -.TP -.BI gid= n -Set the group for all files and directories. -The default is the group of the current process. -.TP -.BI ro -Mount the file system in read only mode. -.TP -.BI noatime -Do not update access time when file is read. - -.SH EXIT CODES -Zero is returned on successful mount. Any other code means an error. - -.SH AUTHOR -Andrew Nayenko - -.SH SEE ALSO -.BR mount (8) -- cgit v1.2.3