X-Git-Url: https://git.sven.stormbind.net/?p=sven%2Ffuse-exfat.git;a=blobdiff_plain;f=libexfat%2Fio.c;h=0fc35d28b7cca2c7687869115c4e5eaf12cf812a;hp=bc92c7cf9eab396eb465b93400cff7fc448a778b;hb=1e7534bbaa34e6c2a8c9809dfcf6588112cbdee4;hpb=65b0f9fc39c546369f4f0f43f36891f7709b891a

diff --git a/libexfat/io.c b/libexfat/io.c
index bc92c7c..0fc35d2 100644
--- a/libexfat/io.c
+++ b/libexfat/io.c
@@ -35,6 +35,8 @@
 #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
@@ -226,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 */
@@ -341,7 +358,7 @@ ssize_t exfat_read(struct exfat_dev* dev, void* buffer, size_t size)
 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);
+	ssize_t result = ublio_pwrite(dev->ufh, (void*) buffer, size, dev->pos);
 	if (result >= 0)
 		dev->pos += size;
 	return result;
@@ -364,7 +381,7 @@ 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);
+	return ublio_pwrite(dev->ufh, (void*) buffer, size, offset);
 #else
 	return pwrite(dev->fd, buffer, size, offset);
 #endif
@@ -373,24 +390,27 @@ ssize_t exfat_pwrite(struct exfat_dev* dev, const void* buffer, size_t size,
 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))
@@ -412,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)
 	{