X-Git-Url: http://git.sven.stormbind.net/?a=blobdiff_plain;f=libexfat%2Fio.c;h=60f28e2b88ac42740fc709fe4fb8e0673ae2f035;hb=refs%2Ftags%2Fdebian%2F1.2.5-1;hp=4413aaa52ce5b5256a5706a011e652368c0bfc6d;hpb=3c82ec1d582558487fe0d48fa2093f1f0136a727;p=sven%2Ffuse-exfat.git
diff --git a/libexfat/io.c b/libexfat/io.c
index 4413aaa..60f28e2 100644
--- a/libexfat/io.c
+++ b/libexfat/io.c
@@ -2,11 +2,12 @@
io.c (02.09.09)
exFAT file system implementation library.
- Copyright (C) 2010-2013 Andrew Nayenko
+ Free exFAT implementation.
+ Copyright (C) 2010-2016 Andrew Nayenko
- This program is free software: you can redistribute it and/or modify
+ 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
- the Free Software Foundation, either version 3 of the License, or
+ the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -14,35 +15,34 @@
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program. If not, see .
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "exfat.h"
#include
#include
#include
-#include
#include
#include
#include
-#ifdef __APPLE__
+#include
+#if defined(__APPLE__)
#include
+#elif defined(__OpenBSD__)
+#include
+#include
+#include
+#include
#endif
-#ifdef USE_UBLIO
-#include
-#include
-#endif
+#include
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)
@@ -63,6 +63,7 @@ static int open_rw(const char* spec)
if (fd != -1 && ioctl(fd, BLKROGET, &ro) == 0 && ro)
{
close(fd);
+ errno = EROFS;
return -1;
}
#endif
@@ -73,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)
@@ -91,7 +89,8 @@ struct exfat_dev* exfat_open(const char* spec, enum exfat_mode mode)
if (dev->fd == -1)
{
free(dev);
- exfat_error("failed to open `%s' in read-only mode", spec);
+ exfat_error("failed to open '%s' in read-only mode: %s", spec,
+ strerror(errno));
return NULL;
}
dev->mode = EXFAT_MODE_RO;
@@ -101,7 +100,8 @@ struct exfat_dev* exfat_open(const char* spec, enum exfat_mode mode)
if (dev->fd == -1)
{
free(dev);
- exfat_error("failed to open `%s' in read-write mode", spec);
+ exfat_error("failed to open '%s' in read-write mode: %s", spec,
+ strerror(errno));
return NULL;
}
dev->mode = EXFAT_MODE_RW;
@@ -117,11 +117,11 @@ struct exfat_dev* exfat_open(const char* spec, enum exfat_mode mode)
if (dev->fd != -1)
{
dev->mode = EXFAT_MODE_RO;
- exfat_warn("`%s' is write-protected, mounting read-only", spec);
+ exfat_warn("'%s' is write-protected, mounting read-only", spec);
break;
}
free(dev);
- exfat_error("failed to open `%s'", spec);
+ exfat_error("failed to open '%s': %s", spec, strerror(errno));
return NULL;
}
@@ -129,7 +129,7 @@ struct exfat_dev* exfat_open(const char* spec, enum exfat_mode mode)
{
close(dev->fd);
free(dev);
- exfat_error("failed to fstat `%s'", spec);
+ exfat_error("failed to fstat '%s'", spec);
return NULL;
}
if (!S_ISBLK(stbuf.st_mode) &&
@@ -138,11 +138,11 @@ struct exfat_dev* exfat_open(const char* spec, enum exfat_mode mode)
{
close(dev->fd);
free(dev);
- exfat_error("`%s' is neither a device, nor a regular file", spec);
+ exfat_error("'%s' is neither a device, nor a regular file", spec);
return NULL;
}
-#ifdef __APPLE__
+#if defined(__APPLE__)
if (!S_ISREG(stbuf.st_mode))
{
uint32_t block_size = 0;
@@ -165,6 +165,32 @@ struct exfat_dev* exfat_open(const char* spec, enum exfat_mode mode)
dev->size = blocks * block_size;
}
else
+#elif defined(__OpenBSD__)
+ if (!S_ISREG(stbuf.st_mode))
+ {
+ struct disklabel lab;
+ struct partition* pp;
+ char* partition;
+
+ if (ioctl(dev->fd, DIOCGDINFO, &lab) == -1)
+ {
+ close(dev->fd);
+ free(dev);
+ exfat_error("failed to get disklabel");
+ return NULL;
+ }
+
+ /* Don't need to check that partition letter is valid as we won't get
+ this far otherwise. */
+ partition = strchr(spec, '\0') - 1;
+ pp = &(lab.d_partitions[*partition - 'a']);
+ dev->size = DL_GETPSIZE(pp) * lab.d_secsize;
+
+ if (pp->p_fstype != FS_NTFS)
+ exfat_warn("partition type is not 0x07 (NTFS/exFAT); "
+ "you can fix this with fdisk(8)");
+ }
+ else
#endif
{
/* works for Linux, FreeBSD, Solaris */
@@ -173,67 +199,44 @@ struct exfat_dev* exfat_open(const char* spec, enum exfat_mode mode)
{
close(dev->fd);
free(dev);
- exfat_error("failed to get size of `%s'", spec);
+ exfat_error("failed to get size of '%s'", spec);
return NULL;
}
if (exfat_seek(dev, 0, SEEK_SET) == -1)
{
close(dev->fd);
free(dev);
- exfat_error("failed to seek to the beginning of `%s'", spec);
+ exfat_error("failed to seek to the beginning of '%s'", 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
+ int rc = 0;
+
if (close(dev->fd) != 0)
{
- free(dev);
- exfat_error("failed to close device");
- return 1;
+ exfat_error("failed to close device: %s", strerror(errno));
+ rc = -EIO;
}
free(dev);
- return 0;
+ return rc;
}
int exfat_fsync(struct exfat_dev* dev)
{
-#ifdef USE_UBLIO
- if (ublio_fsync(dev->ufh) != 0)
-#else
+ int rc = 0;
+
if (fsync(dev->fd) != 0)
-#endif
{
- exfat_error("fsync failed");
- return 1;
+ exfat_error("fsync failed: %s", strerror(errno));
+ rc = -EIO;
}
- return 0;
+ return rc;
}
enum exfat_mode exfat_get_mode(const struct exfat_dev* dev)
@@ -248,60 +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
}
-void exfat_pread(struct exfat_dev* dev, void* buffer, size_t size,
+ssize_t 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);
+ return pread(dev->fd, buffer, size, offset);
}
-void exfat_pwrite(struct exfat_dev* dev, const void* buffer, size_t size,
+ssize_t exfat_pwrite(struct exfat_dev* dev, const void* buffer, size_t size,
off_t offset)
{
-#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);
+ return pwrite(dev->fd, buffer, size, offset);
}
ssize_t exfat_generic_pread(const struct exfat* ef, struct exfat_node* node,
@@ -333,7 +305,12 @@ ssize_t exfat_generic_pread(const struct exfat* ef, struct exfat_node* node,
return -1;
}
lsize = MIN(CLUSTER_SIZE(*ef->sb) - loffset, remainder);
- exfat_pread(ef->dev, bufp, lsize, exfat_c2o(ef, cluster) + loffset);
+ if (exfat_pread(ef->dev, bufp, lsize,
+ exfat_c2o(ef, cluster) + loffset) < 0)
+ {
+ exfat_error("failed to read cluster %#x", cluster);
+ return -1;
+ }
bufp += lsize;
loffset = 0;
remainder -= lsize;
@@ -351,9 +328,12 @@ ssize_t exfat_generic_pwrite(struct exfat* ef, struct exfat_node* node,
const char* bufp = buffer;
off_t lsize, loffset, remainder;
- if (offset + size > node->size)
- if (exfat_truncate(ef, node, offset + size) != 0)
- return -1;
+ if (offset > node->size)
+ if (exfat_truncate(ef, node, offset, true) != 0)
+ return -1;
+ if (offset + size > node->size)
+ if (exfat_truncate(ef, node, offset + size, false) != 0)
+ return -1;
if (size == 0)
return 0;
@@ -374,7 +354,12 @@ ssize_t exfat_generic_pwrite(struct exfat* ef, struct exfat_node* node,
return -1;
}
lsize = MIN(CLUSTER_SIZE(*ef->sb) - loffset, remainder);
- exfat_pwrite(ef->dev, bufp, lsize, exfat_c2o(ef, cluster) + loffset);
+ if (exfat_pwrite(ef->dev, bufp, lsize,
+ exfat_c2o(ef, cluster) + loffset) < 0)
+ {
+ exfat_error("failed to write cluster %#x", cluster);
+ return -1;
+ }
bufp += lsize;
loffset = 0;
remainder -= lsize;