mirrors/ntfs-3g
0
0
Fork 0
mirror of https://git.code.sf.net/p/ntfs-3g/ntfs-3g.git synced 2024-11-23 18:14:24 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,405 Commits 6 Branches 55 Tags 8 MiB
bcdc76f12d
Commit Graph

4405 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Larsson
bcdc76f12d Merge remote branch 'linux-ntfs/libntfs-3g_port-v2_0_0' into PERMISSION_HANDLING_BRANCH 
Conflicts:
	.cvsignore
	AUTHORS
	CREDITS
	ChangeLog
	NEWS
	README
	TODO.libntfs
	autogen.sh
	configure.ac
	include/ntfs/Makefile.am
	libntfs-3g/misc.c
	libntfs/Makefile.am
	libntfs/gnome-vfs-method.c
	libntfs/gnome-vfs-module.c
	ntfsprogs.spec.in
	ntfsprogs/.cvsignore
	ntfsprogs/mkntfs.c
	ntfsprogs/ntfscat.8.in
	ntfsprogs/ntfsclone.c
	ntfsprogs/ntfscp.8.in
	ntfsprogs/ntfsinfo.c
	ntfsprogs/ntfsprogs.8.in
	ntfsprogs/ntfsresize.c
	ntfsprogs/ntfsrm.c
	ntfsprogs/ntfsundelete.h
	ntfsprogs/upcase.c
	ntfsprogs/utils.c
	test/Makefile.am
 2010-12-17 09:04:01 +01:00
Erik Larsson
e12b5f2c7f ntfsclone manpage: Fixed typo 'clonning'. 2010-12-16 17:36:25 +01:00
Erik Larsson
cdc930e4bf ntfsprogs manpage: Added a reference to the ntfs-3g manpage in the "SEE ALSO" section. 2010-12-16 17:36:12 +01:00
Erik Larsson
8deb6a323c ntfsprogs manpages: Updated the link to where the package can be downloaded. It now points at "http://www.tuxera.com/community/". 2010-12-16 17:35:59 +01:00
Erik Larsson
64d5d4da1d ntfsprogs manpages: Updated references to the 'ntfsprogs package' to reference the ntfs-3g package instead. 2010-12-16 17:35:48 +01:00
Erik Larsson
2188eab0a0 ntfsprogs manpages: Replaced all references to the linux-ntfs-dev mailing list with the ntfs-3g-devel mailing list. 2010-12-16 17:35:40 +01:00
Erik Larsson
2d8befcc07 ntfsprogs manpages: Changed 'ntfsprogs' reference in headers into 'ntfs-3g'. 
The version number following 'ntfsprogs' is really the ntfs-3g version number, so the substitution seems appropriate.
 2010-12-16 17:35:22 +01:00
Erik Larsson
dedaf225e3 Cleaned out a seemingly unused declaration from Makefile.am in ntfsprogs. 2010-12-16 17:35:14 +01:00
Erik Larsson
7287c05ff4 Made ntfsprogs compilation conditional and turned off by default. It is enabled with '--enable-ntfsprogs'. 2010-12-16 17:35:06 +01:00
Erik Larsson
f3a30779dd Moved list.h into ntfsprogs and got rid of include/ntfs completely. 2010-12-16 17:34:47 +01:00
Erik Larsson
daa1f3edcd Bugfixes for 'make extra'. 2010-12-16 10:08:34 +01:00
Erik Larsson
5a41022810 Removed the libntfs-gnomevfs module as it does not seem reasonable to keep maintaining it in ntfs-3g. 2010-12-16 10:08:27 +01:00
Erik Larsson
3efdd4cf0b Merge remote branch 'linux-ntfs/libntfs-3g_port' into ntfsprogs_merge.redo 
Conflicts:
        configure.ac
 2010-12-16 10:04:22 +01:00
Erik Larsson
dd19736b9e 'include' and 'libntfs' TODO files are not applicable to ntfs-3g which uses libntfs-3g and not libntfs. 2010-12-16 10:01:13 +01:00
Erik Larsson
3c6497819f These two files from ntfsprogs are not used by ntfs-3g (and will never be). 2010-12-16 10:01:04 +01:00
Erik Larsson
2634f01ef0 Cleaned out some .cvsignore files that came from ntfsprogs. 2010-12-16 10:00:56 +01:00
Erik Larsson
d35be909a4 Removed the 'doc' directory from ntfsprogs. 
It contains interesting information but this information is available elsewhere and we want to stay as close to ntfs-3g as possible. No unnecessary added files.
 2010-12-16 10:00:27 +01:00
Erik Larsson
7fbfe73dda Removed libntfs-specific test code. 2010-12-16 10:00:07 +01:00
Erik Larsson
16dbcbec0c Restored 'local' includes for all the ntfsprogs instead of using system includes (e.g. #include "yada.h" instead of #include <ntfs-3g/yada.h>). 2010-12-16 09:59:42 +01:00
Erik Larsson
639bd5475c Fixed ntfsprogs/Makefile.am to link against internally built libntfs-3g. 2010-12-15 17:19:20 +01:00
Erik Larsson
02bab2956c Merge remote branch 'linux-ntfs/libntfs-3g_port' into PERMISSION_HANDLING_BRANCH 
Conflicts:
	AUTHORS
	COPYING
	CREDITS
	ChangeLog
	Makefile.am
	NEWS
	README
	autogen.sh
	configure.ac
	include/Makefile.am
 2010-12-15 17:12:30 +01:00
Erik Larsson
f9c7a548c7 Removed tree.h/tree.c as it was only referenced by the 'rich' code. 2010-12-15 13:43:38 +01:00
Erik Larsson
d953fec34e Increased patchstate version number. 2010-12-09 12:29:15 +01:00
Erik Larsson
7a95c46e3d Bugfix for ntfs_mbstoucs_libntfscompat: Take the the \0 terminator into account when determining whether reallocing is necessary. 2010-12-09 12:17:11 +01:00
Erik Larsson
e81fd0ee2a Important bugfix for ntfs_mbstoucs_libntfscompat: We reallocated too little memory. 2010-12-09 12:15:50 +01:00
Erik Larsson
9c581432cb Important bugfix for ntfs_mbstoucs_libntfscompat: Typo in memcpy operation led to the wrong data being copied! 2010-12-09 12:14:13 +01:00
Erik Larsson
6922b7c8d0 Disabled installation of the remaining (internal) headers when doing a 'make install'. 2010-12-04 09:41:30 +01:00
Erik Larsson
066ef925b3 Changed references to libntfs in libntfs-gnomevfs.8.in, now reflecting that libntfs-3g is the underlying library and that libntfs is not included with this version of ntfsprogs. 2010-12-04 09:39:19 +01:00
Erik Larsson
78b40e4b4c mkntfs.c: Fixed two references to missing member 'guid' in 'ntfs_volume'. 2010-12-03 07:52:31 +01:00
Erik Larsson
86eb7504eb gnome-vfs-method.c: Fixed one occurrence of NTFS_MNT_RDONLY. 2010-12-03 07:51:56 +01:00
Erik Larsson
9c0c2bf633 ntfsprogs/Makefile.am: Added libgcrypt's CFLAGS and LIBS when building ntfsdecrypt. 2010-12-03 07:50:47 +01:00
Erik Larsson
6bf6464aeb Merge branch 'libntfs-3g_port' into libntfs-3g_port-v2_0_0 2010-12-02 22:40:15 +01:00
Erik Larsson
7b62a83286 utils.h: Added missing typedef leMFT_REF. 2010-12-02 22:39:06 +01:00
Erik Larsson
3ddcb40f23 ntfsdump_logfile.c: Removed unnecessary reference to unsupported mount option NTFS_MNT_FORENSIC. (The mount option is pointless as we are mounting the volume in read-only mode anyway.) 2010-12-02 22:37:23 +01:00
Erik Larsson
d52190c3cb Fixed reference to deprecated utility 'libgnutls-config' in ntfsprogs' Makefile.am. 2010-12-02 22:37:16 +01:00
Erik Larsson
18789cdeaa Replaced all occurrences of the libntfs mount flag NTFS_MNT_FORCE with the libntfs-3g mount flag MS_RECOVER. 
Note: The NTFS_MNT_FORCE, in addition to what MS_RECOVER does, also bypasses the check for the 'dirty' bit in libntfs' ntfs_mount.
However, this check does not exist in libntfs-3g (libntfs-3g will not check or change the dirty bit, being confident that it can handle volumes marked as 'dirty'), so in essence the same behaviour is achieved with MS_RECOVER.
 2010-12-02 22:37:06 +01:00
Erik Larsson
6ff5d3f8a7 Replaced all occurrences of the libntfs mount flag NTFS_MNT_RDONLY with the corresponding libntfs-3g mount flag MS_RDONLY. 2010-12-02 22:36:58 +01:00
Erik Larsson
665555491b ntfsundelete.h: Added missing include 'utils.h'. 2010-12-02 22:36:46 +01:00
Erik Larsson
6b65b6024e ntfscp.c: libntfs-3g has added an additional argument to ntfs_create (le32 securid). We pass 0 as 'securid' as this is what should be passed when there is no inheritable security descriptor. 
This can of course be discussed. Maybe we should inherit something? From parent? I don't know enough about this.
 2010-12-02 22:36:37 +01:00
Erik Larsson
2acadfd360 mkntfs.c: Fixed reference to 'guid' member of ntfs_volume which does not exist in libntfs-3g. 2010-12-02 22:35:20 +01:00
Erik Larsson
6b513b1c55 Replaced references to NVolSetWasDirty with appropriate substitutions. 
libntfs (unlike libntfs-3g) sets the volume dirty bit automatically on ntfs_mount (if not already set) and also automatically clears the volume dirty bit on ntfs_umount (if it was not already set before mount). The 'WasDirty' flag is set to indicate that the volume was already dirty when it was mounted, so setting it means bypassing the 'clear dirty flag' behaviour on unmount (it does not mean 'set dirty flag on unmount').

NVolSetWasDirty is accordingly replaced with the actions that were intended:
- If the intention was to leave the dirty bit set on unmount, we explicitly set the bit if it is not already set.
- If the intention was to simply update the 'WasDirty' bit to be consistent with earlier changes, we just comment out the statement.
 2010-12-02 22:34:45 +01:00
Erik Larsson
f5f3878a8e Replaced all occurrences of the libntfs-specific NVolWasDirty macro with a test for the VOLUME_IS_DIRTY flag in vol->flags. 
This is not a perfect conversion. The VOLUME_IS_DIRTY flag reflects the _current_ state of the volume dirty bit and not the mount-time state.
However, since libntfs-3g (as opposed to libntfs) does not automatically change the dirty bit on mount and unmount (only when ntfs_volume_write_flags is called explicitly), and these tests are done directly after a mount (ntfsclone.c, ntfscp.c, ntfsresize.c, ntfswipe.c, utils.c) or when the volume is in an appropriate state (ntfsfix.c), the result will be the same.
 2010-12-02 22:34:35 +01:00
Erik Larsson
dd3d394010 utils.h: Added ntfs_attr_get_name, a simple inline function from libntfs that was referenced in the ntfsprogs code. 2010-12-02 22:34:00 +01:00
Erik Larsson
41e27e116a Added 'misc.h' as an include to some source files because of missing ntfs_malloc / ntfs_calloc signatures. 2010-12-02 22:31:56 +01:00
Erik Larsson
844d3213a9 ntfsck.c: Adapted includes to libntfs-3g. 2010-12-02 22:31:44 +01:00
Erik Larsson
713fbb390e Merge commit 'v2_0_0' into libntfs-3g_port-v2_0_0 
Conflicts:
	configure.ac
	include/ntfs/Makefile.am
	include/ntfs/attrib.h
	include/ntfs/bitmap.h
	include/ntfs/collate.h
	include/ntfs/debug.h
	include/ntfs/dir.h
	include/ntfs/endians.h
	include/ntfs/index.h
	include/ntfs/inode.h
	include/ntfs/layout.h
	include/ntfs/logfile.h
	include/ntfs/logging.h
	include/ntfs/mft.h
	include/ntfs/ntfstime.h
	include/ntfs/runlist.h
	include/ntfs/support.h
	include/ntfs/types.h
	include/ntfs/unistr.h
	include/ntfs/volume.h
	libntfs/Makefile.am
	libntfs/attrib.c
	libntfs/attrlist.c
	libntfs/bitmap.c
	libntfs/bootsect.c
	libntfs/collate.c
	libntfs/compress.c
	libntfs/debug.c
	libntfs/device.c
	libntfs/device_io.c
	libntfs/dir.c
	libntfs/index.c
	libntfs/inode.c
	libntfs/lcnalloc.c
	libntfs/logfile.c
	libntfs/logging.c
	libntfs/mft.c
	libntfs/mst.c
	libntfs/runlist.c
	libntfs/security.c
	libntfs/unistr.c
	libntfs/unix_io.c
	libntfs/volume.c
	libntfs/win32_io.c
	ntfsprogs/Makefile.am
	ntfsprogs/mkntfs.c
	ntfsprogs/ntfscat.c
	ntfsprogs/ntfsclone.c
	ntfsprogs/ntfscmp.c
	ntfsprogs/ntfscp.c
	ntfsprogs/ntfsinfo.c
	ntfsprogs/ntfsmount.8.in
	ntfsprogs/ntfsmount.c
	ntfsprogs/ntfsundelete.c
	ntfsprogs/upcase.c
 2010-12-02 22:31:21 +01:00
Erik Larsson
ce6a516a56 Removed the 'rich' functionality including the ntfsrm tool. 
This change should be reverted once the 'rich' stuff is ported to libntfs-3g, but right now it seems like too much work.
 2010-12-02 17:10:57 +01:00
Erik Larsson
efb3204b76 utils.h: Updated ntfs_mbstoucs_libntfscompat to comply better with how libntfs' implementation works (with respect to preallocated buffers). 2010-12-02 17:05:48 +01:00
Erik Larsson
6f42c011be ntfswipe.c: Adapt to the changed interface of ntfs_rl_pwrite in libntfs-3g. 
ntfs_rl_pwrite has an additional parameter, ofs, in libntfs-3g. Setting ofs to 0 seems to imply the same behaviour as expected from the libntfs equivalent.
 2010-12-02 17:03:08 +01:00
Erik Larsson
7478b2396c ntfsmove.c: Adapted calls to ntfs_get_size_for_mapping_pairs to the libntfs-3g interface. 
Note: libntfs-3g has a 'max_size' variable to cap the size calculation, but this variable is frequently set to INT_MAX in the libntfs-3g code itself when there is no desire to limit the size calculation. We will do the same here.
 2010-12-02 16:56:27 +01:00