Merge branch 'edge' of ssh://szaka@ntfs-3g.git.sourceforge.net/gitroot/ntfs-3g/ntfs-3g_ntfsprogs into edge

edge.strict_endians v2011_4_11
Szabolcs Szakacsits 2011-04-10 20:54:09 +03:00
commit 78e5023eaa
3 changed files with 26 additions and 3 deletions

11
README
View File

@ -41,6 +41,17 @@ the FUSE kernel module. Then unpack the source tarball and type:
Please note that NTFS-3G doesn't require the FUSE user space package any
more.
The list of options for building specific configurations is displayed by
typing :
./configure --help
Below are a few specific options to ./configure :
--disable-ntfsprogs : do not build the ntfsprogs tools,
--enable-posix-acls : enable support for Posix ACLs
--enable-xattr-mappings : enable system extended attributes mappings
--with-fuse=external : use external fuse (overriding Linux default)
Non-Linux: Please see
http://www.tuxera.com/community/ntfs-3g-download/

View File

@ -200,8 +200,13 @@ static u64 ntfs_fix_file_name(ntfs_inode *dir_ni, ntfschar *uname,
*/
lemref = entry->indexed_file;
mref = le64_to_cpu(lemref);
for (i=0; i<found->file_name_length; i++)
uname[i] = found->file_name[i];
if (NVolCaseSensitive(vol) || !vol->locase) {
for (i=0; i<found->file_name_length; i++)
uname[i] = found->file_name[i];
} else {
for (i=0; i<found->file_name_length; i++)
uname[i] = vol->locase[found->file_name[i]];
}
}
}
ntfs_index_ctx_put(icx);

View File

@ -181,6 +181,9 @@
*
* Mar 2011, version 1.3.19
* - fixed interface to ntfs_initialize_file_security()
*
* Apr 2011, version 1.3.20
* - fixed false memory leak detection
*/
/*
@ -204,7 +207,7 @@
* General parameters which may have to be adapted to needs
*/
#define AUDT_VERSION "1.3.19"
#define AUDT_VERSION "1.3.20"
#define GET_FILE_SECURITY "ntfs_get_file_security"
#define SET_FILE_SECURITY "ntfs_set_file_security"
@ -5015,7 +5018,11 @@ void showfull(const char *fullname, BOOL isdir)
| POSIX_ACL_GROUP
| POSIX_ACL_MASK))))
showposix(pxdesc);
#if USESTUBS
stdfree(pxdesc); /* allocated within library */
#else
free(pxdesc);
#endif
}
#endif
if ((opt_r || opt_b) && (securindex < MAXSECURID)