#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
"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 */
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;
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
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))
}
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)
{