X-Git-Url: https://git.sven.stormbind.net/?p=sven%2Fexfat-utils.git;a=blobdiff_plain;f=libexfat%2Fio.c;fp=libexfat%2Fio.c;h=60f28e2b88ac42740fc709fe4fb8e0673ae2f035;hp=3d7aaad2e903db2f2dbacd56d8bac62816560f46;hb=62ddc92d38808bea3aba8fe70e3a417197e9d42f;hpb=fc55662109c1fccea581594f8d6af49da79f456b

diff --git a/libexfat/io.c b/libexfat/io.c
index 3d7aaad..60f28e2 100644
--- a/libexfat/io.c
+++ b/libexfat/io.c
@@ -3,7 +3,7 @@
 	exFAT file system implementation library.
 
 	Free exFAT implementation.
-	Copyright (C) 2010-2015  Andrew Nayenko
+	Copyright (C) 2010-2016  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
@@ -37,20 +37,12 @@
 #include <sys/ioctl.h>
 #endif
 #include <sys/mount.h>
-#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 int open_ro(const char* spec)
@@ -82,9 +74,6 @@ 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
 
 	dev = malloc(sizeof(struct exfat_dev));
 	if (dev == NULL)
@@ -222,24 +211,6 @@ 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;
 }
 
@@ -247,13 +218,6 @@ 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));
@@ -267,13 +231,6 @@ 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));
@@ -294,56 +251,29 @@ 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, 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, 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,