New upstream version 1.3.0+git20220115

[sven/fuse-exfat.git] / libexfat / io.c

diff --git a/libexfat/io.c b/libexfat/io.c
index bae0cf15a1412dfdac2c67b4085d35aa56361bc6..0fc35d28b7cca2c7687869115c4e5eaf12cf812a 100644 (file)
--- a/libexfat/io.c
+++ b/libexfat/io.c
@@ -35,15 +35,25 @@
 #include <sys/disklabel.h>
 #include <sys/dkio.h>
 #include <sys/ioctl.h>
+#elif defined(__NetBSD__)
+#include <sys/ioctl.h>
 #elif __linux__
 #include <sys/mount.h>
 #endif
+#ifdef USE_UBLIO
+#include <sys/uio.h>
+#include <ublio.h>
+#endif
 
 struct exfat_dev
 {
        int fd;
        enum exfat_mode mode;
        off_t size; /* in bytes */
+#ifdef USE_UBLIO
+       off_t pos;
+       ublio_filehandle_t ufh;
+#endif
 };
 
 static bool is_open(int fd)
@@ -80,6 +90,9 @@ struct exfat_dev* exfat_open(const char* spec, enum exfat_mode mode)
 {
        struct exfat_dev* dev;
        struct stat stbuf;
+#ifdef USE_UBLIO
+       struct ublio_param up;
+#endif
 
        /* The system allocates file descriptors sequentially. If we have been
           started with stdin (0), stdout (1) or stderr (2) closed, the system
@@ -215,6 +228,21 @@ struct exfat_dev* exfat_open(const char* spec, enum exfat_mode mode)
                                        "you can fix this with fdisk(8)");
        }
        else
+#elif defined(__NetBSD__)
+       if (!S_ISREG(stbuf.st_mode))
+       {
+               off_t size;
+
+               if (ioctl(dev->fd, DIOCGMEDIASIZE, &size) == -1)
+               {
+                       close(dev->fd);
+                       free(dev);
+                       exfat_error("failed to get media size");
+                       return NULL;
+               }
+               dev->size = size;
+       }
+       else
 #endif
        {
                /* works for Linux, FreeBSD, Solaris */
@@ -235,6 +263,24 @@ struct exfat_dev* exfat_open(const char* spec, enum exfat_mode mode)
                }
        }
 
+#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;
 }
 
@@ -242,6 +288,13 @@ int exfat_close(struct exfat_dev* dev)
 {
        int rc = 0;
 
+#ifdef USE_UBLIO
+       if (ublio_close(dev->ufh) != 0)
+       {
+               exfat_error("failed to close ublio");
+               rc = -EIO;
+       }
+#endif
        if (close(dev->fd) != 0)
        {
                exfat_error("failed to close device: %s", strerror(errno));
@@ -255,6 +308,13 @@ int exfat_fsync(struct exfat_dev* dev)
 {
        int rc = 0;
 
+#ifdef USE_UBLIO
+       if (ublio_fsync(dev->ufh) != 0)
+       {
+               exfat_error("ublio fsync failed");
+               rc = -EIO;
+       }
+#endif
        if (fsync(dev->fd) != 0)
        {
                exfat_error("fsync failed: %s", strerror(errno));
@@ -275,52 +335,82 @@ off_t exfat_get_size(const struct exfat_dev* dev)
 
 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
 }
 
 ssize_t exfat_write(struct exfat_dev* dev, const void* buffer, size_t size)
 {
+#ifdef USE_UBLIO
+       ssize_t result = ublio_pwrite(dev->ufh, (void*) buffer, size, dev->pos);
+       if (result >= 0)
+               dev->pos += size;
+       return result;
+#else
        return write(dev->fd, buffer, size);
+#endif
 }
 
 ssize_t exfat_pread(struct exfat_dev* dev, void* buffer, size_t size,
                off_t offset)
 {
+#ifdef USE_UBLIO
+       return ublio_pread(dev->ufh, buffer, size, offset);
+#else
        return pread(dev->fd, buffer, size, offset);
+#endif
 }
 
 ssize_t exfat_pwrite(struct exfat_dev* dev, const void* buffer, size_t size,
                off_t offset)
 {
+#ifdef USE_UBLIO
+       return ublio_pwrite(dev->ufh, (void*) buffer, size, offset);
+#else
        return pwrite(dev->fd, buffer, size, offset);
+#endif
 }
 
 ssize_t exfat_generic_pread(const struct exfat* ef, struct exfat_node* node,
                void* buffer, size_t size, off_t offset)
 {
+       uint64_t newsize = offset;
        cluster_t cluster;
        char* bufp = buffer;
        off_t lsize, loffset, remainder;
 
-       if (offset >= node->size)
+       if (offset < 0)
+               return -EINVAL;
+       if (newsize >= node->size)
                return 0;
        if (size == 0)
                return 0;
 
-       cluster = exfat_advance_cluster(ef, node, offset / CLUSTER_SIZE(*ef->sb));
+       cluster = exfat_advance_cluster(ef, node, newsize / CLUSTER_SIZE(*ef->sb));
        if (CLUSTER_INVALID(*ef->sb, cluster))
        {
                exfat_error("invalid cluster 0x%x while reading", cluster);
                return -EIO;
        }
 
-       loffset = offset % CLUSTER_SIZE(*ef->sb);
-       remainder = MIN(size, node->size - offset);
+       loffset = newsize % CLUSTER_SIZE(*ef->sb);
+       remainder = MIN(size, node->size - newsize);
        while (remainder > 0)
        {
                if (CLUSTER_INVALID(*ef->sb, cluster))
@@ -342,40 +432,43 @@ ssize_t exfat_generic_pread(const struct exfat* ef, struct exfat_node* node,
        }
        if (!(node->attrib & EXFAT_ATTRIB_DIR) && !ef->ro && !ef->noatime)
                exfat_update_atime(node);
-       return MIN(size, node->size - offset) - remainder;
+       return MIN(size, node->size - newsize) - remainder;
 }
 
 ssize_t exfat_generic_pwrite(struct exfat* ef, struct exfat_node* node,
                const void* buffer, size_t size, off_t offset)
 {
+       uint64_t newsize = offset;
        int rc;
        cluster_t cluster;
        const char* bufp = buffer;
        off_t lsize, loffset, remainder;
 
-       if (offset > node->size)
+       if (offset < 0)
+               return -EINVAL;
+       if (newsize > node->size)
        {
-               rc = exfat_truncate(ef, node, offset, true);
+               rc = exfat_truncate(ef, node, newsize, true);
                if (rc != 0)
                        return rc;
        }
-       if (offset + size > node->size)
+       if (newsize + size > node->size)
        {
-               rc = exfat_truncate(ef, node, offset + size, false);
+               rc = exfat_truncate(ef, node, newsize + size, false);
                if (rc != 0)
                        return rc;
        }
        if (size == 0)
                return 0;
 
-       cluster = exfat_advance_cluster(ef, node, offset / CLUSTER_SIZE(*ef->sb));
+       cluster = exfat_advance_cluster(ef, node, newsize / CLUSTER_SIZE(*ef->sb));
        if (CLUSTER_INVALID(*ef->sb, cluster))
        {
                exfat_error("invalid cluster 0x%x while writing", cluster);
                return -EIO;
        }
 
-       loffset = offset % CLUSTER_SIZE(*ef->sb);
+       loffset = newsize % CLUSTER_SIZE(*ef->sb);
        remainder = size;
        while (remainder > 0)
        {