opengnsys
/
ntfs-3g
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* attrib.c: refix ntfs_attr_p{read,write} 

* ntfsmount.c: code that now not really needed, but for any case
edge.strict_endians
cha0smaster 2005-08-03 13:52:50 +00:00
parent 55760d93e8
commit fe67916350
2 changed files with 43 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libntfs/attrib.c
View File

@ -817,6 +817,8 @@ res_err_out:
errno = EIO;
goto rl_err_out;
}
/* Needed for case when runs merged. */
ofs = pos + total - (rl->vcn << vol->cluster_size_bits);
}
if (!rl->length)
goto rl_err_out;
@ -1064,6 +1066,8 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, const s64 pos, s64 count, const void *b)
errno = EIO;
goto rl_err_out;
}
/* Needed for case when runs merged. */
ofs = pos + total - (rl->vcn << vol->cluster_size_bits);
}
if (!rl->length) {
errno = EIO;

56
ntfsprogs/ntfsmount.c
View File

@ -378,11 +378,10 @@ static int ntfs_fuse_read(const char *org_path, char *buf, size_t size,
{
ntfs_volume *vol;
ntfs_inode *ni = NULL;
ntfs_attr *na;
int res;
ntfs_attr *na = NULL;
char *path = NULL;
ntfschar *stream_name;
int stream_name_len;
int stream_name_len, res, total = 0;
stream_name_len = ntfs_fuse_parse_path(org_path, &path, &stream_name);
if (stream_name_len < 0)
@ -398,11 +397,25 @@ static int ntfs_fuse_read(const char *org_path, char *buf, size_t size,
res = -errno;
goto exit;
}
res = ntfs_attr_pread(na, offset, size, buf);
if (res == -1)
res = -errno;
ntfs_attr_close(na);
if (offset + size > na->data_size)
size = na->data_size - offset;
while (size) {
res = ntfs_attr_pread(na, offset, size, buf);
if (res < size)
perror("ntfs_attr_pread returned less bytes than "
"requested.");
if (res <= 0) {
res = -errno;
goto exit;
}
size -= res;
offset += res;
total += res;
}
res = total;
exit:
if (na)
ntfs_attr_close(na);
if (ni && ntfs_inode_close(ni))
perror("Failed to close inode");
free(path);
@ -416,11 +429,10 @@ static int ntfs_fuse_write(const char *org_path, const char *buf, size_t size,
{
ntfs_volume *vol;
ntfs_inode *ni = NULL;
ntfs_attr *na;
int res;
ntfs_attr *na = NULL;
char *path = NULL;
ntfschar *stream_name;
int stream_name_len;
int stream_name_len, res, total = 0;
stream_name_len = ntfs_fuse_parse_path(org_path, &path, &stream_name);
if (stream_name_len < 0)
@ -436,14 +448,24 @@ static int ntfs_fuse_write(const char *org_path, const char *buf, size_t size,
res = -errno;
goto exit;
}
res = ntfs_attr_pwrite(na, offset, size, buf);
if (res == -1)
res = -errno;
if (res < size)
perror("ntfs_attr_pwrite returned less than requested.");
while (size) {
res = ntfs_attr_pwrite(na, offset, size, buf);
if (res < size)
perror("ntfs_attr_pwrite returned less bytes than "
"requested.");
if (res <= 0) {
res = -errno;
goto exit;
}
size -= res;
offset += res;
total += res;
}
res = total;
exit:
ctx->state |= (NF_FreeClustersOutdate | NF_FreeMFTOutdate);
ntfs_attr_close(na);
exit:
if (na)
ntfs_attr_close(na);
if (ni && ntfs_inode_close(ni))
perror("Failed to close inode");
free(path);