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
Erik Larsson
13bef7f308
ntfstruncate.c: Changed one reference to ntfs_mbstoucs into ntfs_mbstoucs_libntfscompat.
2010-12-02 16:51:49 +01:00
Erik Larsson
196f7f6461
Commented out all references to 'version.h' in the 'extra' utilities until libntfs-3g supports such functionality.
2010-12-02 16:49:56 +01:00
Erik Larsson
07bc8d9d17
Redirected all libntfs includes in the 'extra' utilities to libntfs-3g.
2010-12-02 16:47:06 +01:00
Erik Larsson
a0ee1d225d
Redirected libntfs includes in gnome-vfs-method.c to libntfs-3g. (And fixed Makefile.am accordingly.)
2010-12-02 16:38:39 +01:00
Erik Larsson
5b9b4c7e49
Removing all references to the libntfs library version until we have such functionality in libntfs-3g.
2010-12-02 16:38:16 +01:00
Erik Larsson
bcc00717b0
The legacy FUSE module (ntfsmount) goes away. (ntfs-3g takes care of that part.)
2010-12-02 16:37:57 +01:00
Erik Larsson
fc989c67b5
Removed the automatic 'configure' that happens in autogen.sh. It was really annoying me.
2010-12-02 16:37:47 +01:00
Erik Larsson
6d92eb591c
Re-added include/ and libntfs/ to the root Makefile.am.
2010-12-02 16:37:34 +01:00
Erik Larsson
e20dad4854
Keeping include/ directory for now (and away goes the 'list.h' symlink).
2010-12-02 16:37:23 +01:00
Erik Larsson
f893a421c2
Removed libntfs-specific sources.
2010-12-02 16:37:09 +01:00
Erik Larsson
c3fa61b4e1
Added symlink to list.h.
2010-12-02 16:36:50 +01:00
Erik Larsson
c3571d8cde
configure.ac: Fixed typo in error message.
2010-12-02 16:36:39 +01:00
Erik Larsson
3e34aebfc3
Temporary fix while the ntfs_file_values_compare situation is resolved.
...
Revert if ntfs_file_values_compare is re-added to libntfs-3g, and clean up otherwise.
2010-12-02 16:36:18 +01:00
Erik Larsson
4a641c85e0
Adapted code to latest libntfs-3g, based on PERMISSION_HANDLING_BRANCH. Now requires libntfs-3g version 2010.5.22 minimum.
2010-12-02 16:35:27 +01:00
Erik Larsson
16ba09b70f
Introduced a pkg-config check for libntfs-3g at configure time, using the CFLAGS and LDFLAGS specified in the .pc file.
2010-12-02 16:35:12 +01:00
Erik Larsson
9e20bbeec4
This port of ntfsprogs doesn't need the old libntfs, so don't compile it (disregard completely).
2010-12-02 16:34:51 +01:00
Erik Larsson
7a3ddf1e14
Modernized check for libgnutls using pkg-config. (Had to do it, since libgnutls doesn't have the necessary .m4 file in more recent releases.)
2010-12-02 16:34:41 +01:00
Erik Larsson
36b876375e
Commented out all instances of MS_NOATIME being passed to ntfs_mount, as libntfs-3g does not support that flag.
...
In fact, this is how libntfs-3g operates normally, so the MS_NOATIME flag is not needed. However, other utilities might incorrectly assume that the library updates access times for them.
Investigating whether access time needs to be manually updated in other utilities is TODO.
2010-12-02 16:31:43 +01:00
Erik Larsson
ee3297311d
utils.h: Fixed absent definition of MAX_PATH by copying the definition from libntfs's headers (dir.h).
2010-12-02 16:16:47 +01:00
Erik Larsson
9b6523ab42
mkntfs.c: Signature of 'ntfs_boot_sector_is_ntfs' has changed in libntfs-3g (unused variable 'silent' has been removed).
2010-12-02 16:13:25 +01:00
Erik Larsson
058e47afbd
Updated references to members of INDEX_HEADER and INDEX_ENTRY that have been renamed in libntfs-3g.
...
INDEX_HEADER: flags -> ih_flags
INDEX_ENTRY: flags -> ie_flags
2010-12-02 16:10:18 +01:00
Erik Larsson
b538215ddb
Replaced all occurrences of ntfs_mbstoucs with a compatibility wrapper function (ntfs_mbstoucs_libntfscompat).
...
The interface and semantics of ntfs_mbstoucs differ between libntfs and libntfs-3g, so this compatibility wrapper tries to address the differences.
2010-12-02 16:05:22 +01:00
Erik Larsson
f03d683fa0
Commented out all references to 'version.h' (which doesn't exist in libntfs-3g) and added a stub implementation of ntfs_libntfs_version in utils.h to allow things to compile.
2010-12-02 15:58:14 +01:00
Erik Larsson
1860eff1da
Updated all includes in the basic ntfsprogs utilities for libntfs-3g.
2010-12-02 15:57:58 +01:00
Erik Larsson
237b937a65
Updated build configuration of ntfsprogs to use libntfs-3g's includes and libraries.
2010-12-02 15:57:43 +01:00
Erik Larsson
8bed21697d
configure.ac: Appended a tail to the version number to show that this is a version meant to be used with the ntfs-3g libraries. Also changed the email address to indicate that this fork is managed by the ntfs-3g developers.
2010-12-02 15:57:28 +01:00
Jean-Pierre André
48caa7a45e
Took care of alignments needed on some processors
2010-11-09 09:43:31 +01:00
Jean-Pierre André
a70e40021d
Added detail to an error message to discriminate from a similar one
2010-11-09 09:41:00 +01:00
Jean-Pierre André
135cb75249
Fixed logging corrupted $UpCase
2010-11-09 09:40:02 +01:00
Jean-Pierre André
351aec3f7a
Enabled renaming of system extended attributes
2010-10-26 08:59:52 +02:00
