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

Adapted to ntfs-3g-2009.4.4

N2009_11_14_FIXES
jpandre 2009-04-03 06:53:12 +00:00
parent 1e822076d6
commit 03755a9ba5
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -23,8 +23,8 @@
# Autoconf
AC_PREREQ(2.59)
AC_INIT([ntfs-3g],[2009.3.8],[ntfs-3g-devel@lists.sf.net])
LIBNTFS_3G_VERSION="52"
AC_INIT([ntfs-3g],[2009.4.4],[ntfs-3g-devel@lists.sf.net])
LIBNTFS_3G_VERSION="54"
AC_CONFIG_SRCDIR([src/ntfs-3g.c])
# Environment

3
libntfs-3g/attrib.c
View File

@ -1407,8 +1407,9 @@ retry:
total += written;
count -= written;
b = (const u8*)b + written;
continue;
}
if (written == to_write)
continue;
/* If the syscall was interrupted, try again. */
if (written == (s64)-1 && errno == EINTR)
goto retry;

4
libntfs-3g/mft.c
View File

@ -1459,7 +1459,7 @@ found_free_rec:
free(ni);
goto undo_mftbmp_alloc;
}
if (base_ni->extent_nis) {
if (base_ni->nr_extents) {
memcpy(extent_nis, base_ni->extent_nis,
i - 4 * sizeof(ntfs_inode *));
free(base_ni->extent_nis);
@ -1761,7 +1761,7 @@ found_free_rec:
free(ni);
goto undo_mftbmp_alloc;
}
if (base_ni->extent_nis) {
if (base_ni->nr_extents) {
memcpy(extent_nis, base_ni->extent_nis,
i - 4 * sizeof(ntfs_inode *));
free(base_ni->extent_nis);

2
src/ntfs-3g.c
View File

@ -742,7 +742,7 @@ static int ntfs_fuse_filler(ntfs_fuse_fill_context_t *fill_ctx,
return 0;
if (ntfs_ucstombs(name, name_len, &filename, 0) < 0) {
ntfs_log_perror("Skipping unrepresentable filename (inode %llu)",
ntfs_log_perror("Filename decoding failed (inode %llu)",
(unsigned long long)MREF(mref));
return -1;
}