X-Git-Url: https://git.sven.stormbind.net/?p=sven%2Fexfat-utils.git;a=blobdiff_plain;f=libexfat%2Fio.c;h=f0beddc97b0ae424c683e858a937be3379fee097;hp=25988f0a97ac84910e44abe993ef0984e10f36b4;hb=70a4b10edcf53a90140e6dd80ccaa045f3647ad7;hpb=dbe4348df2ba88986e13163ef13d09fb7247589d diff --git a/libexfat/io.c b/libexfat/io.c index 25988f0..f0beddc 100644 --- a/libexfat/io.c +++ b/libexfat/io.c @@ -2,7 +2,7 @@ io.c (02.09.09) exFAT file system implementation library. - Copyright (C) 2009, 2010 Andrew Nayenko + Copyright (C) 2010-2012 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 @@ -24,56 +24,176 @@ #include #include #include -#define __USE_UNIX98 /* for pread() in Linux */ #include +#include +#ifdef USE_UBLIO +#include +#include +#endif -#if _FILE_OFFSET_BITS != 64 +#if !defined(_FILE_OFFSET_BITS) || (_FILE_OFFSET_BITS != 64) #error You should define _FILE_OFFSET_BITS=64 #endif -int exfat_open(const char* spec, int ro) +struct exfat_dev { int fd; +#ifdef USE_UBLIO + off_t pos; + ublio_filehandle_t ufh; +#endif +}; + +struct exfat_dev* exfat_open(const char* spec, int ro) +{ + struct exfat_dev* dev; struct stat stbuf; +#ifdef USE_UBLIO + struct ublio_param up; +#endif - fd = open(spec, ro ? O_RDONLY : O_RDWR); - if (fd < 0) + dev = malloc(sizeof(struct exfat_dev)); + if (dev == NULL) { + exfat_error("failed to allocate memory for device structure"); + return NULL; + } + + dev->fd = open(spec, ro ? O_RDONLY : O_RDWR); + if (dev->fd < 0) + { + free(dev); exfat_error("failed to open `%s' in read-%s mode", spec, ro ? "only" : "write"); - return -1; + return NULL; } - if (fstat(fd, &stbuf) != 0) + if (fstat(dev->fd, &stbuf) != 0) { - close(fd); + close(dev->fd); + free(dev); exfat_error("failed to fstat `%s'", spec); - return -1; + return NULL; } - if (!S_ISBLK(stbuf.st_mode) && !S_ISREG(stbuf.st_mode)) + if (!S_ISBLK(stbuf.st_mode) && + !S_ISCHR(stbuf.st_mode) && + !S_ISREG(stbuf.st_mode)) { - close(fd); - exfat_error("`%s' is neither a block device, nor a regular file", - spec); - return -1; + close(dev->fd); + free(dev); + exfat_error("`%s' is neither a device, nor a regular file", spec); + return NULL; + } + +#ifdef USE_UBLIO + memset(&up, 0, sizeof(struct ublio_param)); + up.up_blocksize = 256 * 1024; + up.up_items = 64; + up.up_grace = 32; + up.up_priv = &dev->fd; + + dev->pos = 0; + dev->ufh = ublio_open(&up); + if (dev->ufh == NULL) + { + close(dev->fd); + free(dev); + exfat_error("failed to initialize ublio"); + return NULL; + } +#endif + + return dev; +} + +int exfat_close(struct exfat_dev* dev) +{ +#ifdef USE_UBLIO + if (ublio_close(dev->ufh) != 0) + exfat_error("failed to close ublio"); +#endif + if (close(dev->fd) != 0) + { + free(dev); + exfat_error("failed to close device"); + return 1; } - return fd; + free(dev); + return 0; +} + +int exfat_fsync(struct exfat_dev* dev) +{ +#ifdef USE_UBLIO + if (ublio_fsync(dev->ufh) != 0) +#else + if (fsync(dev->fd) != 0) +#endif + { + exfat_error("fsync failed"); + return 1; + } + return 0; +} + +off_t exfat_seek(struct exfat_dev* dev, off_t offset, int whence) +{ +#ifdef USE_UBLIO + /* XXX SEEK_CUR will be handled incorrectly */ + return dev->pos = lseek(dev->fd, offset, whence); +#else + return lseek(dev->fd, offset, whence); +#endif +} + +ssize_t exfat_read(struct exfat_dev* dev, void* buffer, size_t size) +{ +#ifdef USE_UBLIO + ssize_t result = ublio_pread(dev->ufh, buffer, size, dev->pos); + if (result >= 0) + dev->pos += size; + return result; +#else + return read(dev->fd, buffer, size); +#endif } -void exfat_read_raw(void* buffer, size_t size, off_t offset, int fd) +ssize_t exfat_write(struct exfat_dev* dev, const void* buffer, size_t size) { - if (pread(fd, buffer, size, offset) != size) +#ifdef USE_UBLIO + ssize_t result = ublio_pwrite(dev->ufh, buffer, size, dev->pos); + if (result >= 0) + dev->pos += size; + return result; +#else + return write(dev->fd, buffer, size); +#endif +} + +void exfat_pread(struct exfat_dev* dev, void* buffer, size_t size, + off_t offset) +{ +#ifdef USE_UBLIO + if (ublio_pread(dev->ufh, buffer, size, offset) != size) +#else + if (pread(dev->fd, buffer, size, offset) != size) +#endif exfat_bug("failed to read %zu bytes from file at %"PRIu64, size, (uint64_t) offset); } -void exfat_write_raw(const void* buffer, size_t size, off_t offset, int fd) +void exfat_pwrite(struct exfat_dev* dev, const void* buffer, size_t size, + off_t offset) { - if (pwrite(fd, buffer, size, offset) != size) +#ifdef USE_UBLIO + if (ublio_pwrite(dev->ufh, buffer, size, offset) != size) +#else + if (pwrite(dev->fd, buffer, size, offset) != size) +#endif exfat_bug("failed to write %zu bytes to file at %"PRIu64, size, (uint64_t) offset); } -ssize_t exfat_read(const struct exfat* ef, struct exfat_node* node, +ssize_t exfat_generic_pread(const struct exfat* ef, struct exfat_node* node, void* buffer, size_t size, off_t offset) { cluster_t cluster; @@ -102,7 +222,7 @@ ssize_t exfat_read(const struct exfat* ef, struct exfat_node* node, return -1; } lsize = MIN(CLUSTER_SIZE(*ef->sb) - loffset, remainder); - exfat_read_raw(bufp, lsize, exfat_c2o(ef, cluster) + loffset, ef->fd); + exfat_pread(ef->dev, bufp, lsize, exfat_c2o(ef, cluster) + loffset); bufp += lsize; loffset = 0; remainder -= lsize; @@ -113,7 +233,7 @@ ssize_t exfat_read(const struct exfat* ef, struct exfat_node* node, return size - remainder; } -ssize_t exfat_write(struct exfat* ef, struct exfat_node* node, +ssize_t exfat_generic_pwrite(struct exfat* ef, struct exfat_node* node, const void* buffer, size_t size, off_t offset) { cluster_t cluster; @@ -146,7 +266,7 @@ ssize_t exfat_write(struct exfat* ef, struct exfat_node* node, return -1; } lsize = MIN(CLUSTER_SIZE(*ef->sb) - loffset, remainder); - exfat_write_raw(bufp, lsize, exfat_c2o(ef, cluster) + loffset, ef->fd); + exfat_pwrite(ef->dev, bufp, lsize, exfat_c2o(ef, cluster) + loffset); bufp += lsize; loffset = 0; remainder -= lsize;