PawletOS/android_bootable_recovery
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Pull fix for exFAT from original source" into twrp2.4

Browse Source
This commit is contained in:
Dees_Troy
2013-01-28 09:22:05 -06:00
committed by Gerrit Code Review
parent 6bdcbb1b96 b8fdac7be9
commit aa9dba3961
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
exfat/exfat-fuse/main.c
View File

@@ -154,19 +154,25 @@ static int fuse_exfat_release(const char* path, struct fuse_file_info* fi)
static int fuse_exfat_read(const char* path, char* buffer, size_t size,
off64_t offset, struct fuse_file_info* fi)
{
ssize_t ret;
exfat_debug("[%s] %s (%zu bytes)", __func__, path, size);
if (exfat_generic_pread(&ef, get_node(fi), buffer, size, offset) != size)
return EOF;
return size;
ret = exfat_generic_pread(&ef, get_node(fi), buffer, size, offset);
if (ret < 0)
return -EIO;
return ret;
}
static int fuse_exfat_write(const char* path, const char* buffer, size_t size,
off64_t offset, struct fuse_file_info* fi)
{
ssize_t ret;
exfat_debug("[%s] %s (%zu bytes)", __func__, path, size);
if (exfat_generic_pwrite(&ef, get_node(fi), buffer, size, offset) != size)
return EOF;
return size;
ret = exfat_generic_pwrite(&ef, get_node(fi), buffer, size, offset);
if (ret < 0)
return -EIO;
return ret;
}
static int fuse_exfat_unlink(const char* path)

2
exfat/libexfat/io.c
View File

@@ -341,7 +341,7 @@ ssize_t exfat_generic_pread(const struct exfat* ef, struct exfat_node* node,
}
if (!ef->ro && !ef->noatime)
exfat_update_atime(node);
return size - remainder;
return MIN(size, node->size - offset) - remainder;
}
ssize_t exfat_generic_pwrite(struct exfat* ef, struct exfat_node* node,