Commit Graph

58 Commits (0ec31405c6fdb0015dfa797c8723592676b49c3e)

Author SHA1 Message Date
Jean-Pierre André 0ec31405c6 Fixed casting data to printf format in ntfsck, ntfsmove and ntfswipe 2011-07-05 12:17:28 +02:00
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 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 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 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 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 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 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 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
Yura Pakhuchiy 37476cf609 Introduce NTFS_MNT_FORCE instead of third parameter of utils_mount_volume 2007-09-15 18:12:32 +03:00
aia21 5302d23f7b - Empty the journal at mount time. (Anton)
- Set the volume dirty bit at mount time (if it is not set already and
  clear it again at umount time but only if it was not set to start
  with.  (Anton)
2006-11-28 10:09:56 +00:00
yura cb27c9f616 * Rename MS_{RDONLY,NOATIME} to NTFS_MNT_{RDONLY,NOATIME}.

							
						
2006-11-12 22:46:50 +00:00
szaka c7a53338c0 Fix all incorrect getopt_long() return value usages. 2006-04-05 12:43:06 +00:00
flatcap 8a363705cd upgrade to use new logging
change stderror messages to ntfs_log_perror
2005-10-28 18:23:32 +00:00
flatcap 8a584700c5 whitespace fixes - no code changes 2005-10-26 22:54:57 +00:00
uvman 0dd0cdc6be Remove {Dputs, Dprintf, Dperror} and convert callers to ntfs_log_*. Make ntfsinfo use ntfs_logging_parse_option(). 2005-10-25 01:28:10 +00:00
szaka 746dff1a24 NTFS_INDEX_ prefix $I30, $SII, $SDH, $O and $Q indexes 2005-10-23 18:35:58 +00:00
antona 0c293d0407 - Add API (actually renamed from what Rich/FlatCap did):
volume.[hc]::ntfs_libntfs_version() which returns a pointer to a
  static const string of the libntfs verion, i.e. at the moment this is
  "8.0.0".  This required moving the version specifications from
  libntfs/Makefile.am to configure.ac.  This should hopefully have the
  sideeffect that I will remember to increment it when incrementing the
  ntfsprogs version number when making a release given the two are
  right under one another.  (Anton)
- Change ALL utilities to display the libntfs version they are running
  on.  This should make debugging easier in the case that people are
  running mismatched utilities/library.  (Anton)
2005-10-07 14:10:56 +00:00
antona 8db479a6b1 Patch from Christophe:
A lot of headers are checked by autoconf (AC_CHECK_HEADERS in configure.ac).
Please find a patch that add the missing "#ifdef" to the source code.
2005-09-28 13:47:47 +00:00
antona 2a104d8eda Megapatch!!! Check evecrything!!! I probably broke everything!!! 2005-09-24 22:54:55 +00:00
flatcap 7a142ef54c got bored. don't read the diffs. 2005-07-06 22:47:01 +00:00
flatcap 949043ab36 Tidy whitespace: trailing space; <space><tab> at the beginning of lines
Fix warnings about sign differences
Fix warnings about unused parameters
Tidy a few functions that didn't have { on a new line
2005-06-19 21:09:40 +00:00
cha0smaster e323ed6a03 Move utils_pathname_to_inode from to library (dir.c), adapt it for library, rename it to ntfs_pathname_to_inode, update all users. 2005-06-12 18:12:55 +00:00
void!yura 0a16746ca2 remove logfile reset
(Logical change 1.672)
2005-01-30 18:13:25 +00:00
cantab.net!aia21 b82469ba50 Remove vol->nr_mft_records and update all users. (Anton)
(Logical change 1.549)
2004-09-13 10:28:54 +00:00
!uv 2e082893fe Warning fixes: missing const and mixing declerations with code.
(Logical change 1.508)
2004-08-20 12:30:34 +00:00
!uv 868e8aa002 A printf format fix and Variable type fixes.
(Logical change 1.507)
2004-08-20 12:18:22 +00:00
(none)!yura 631668c253 Added code to determine INDX record size from $INDEX_ROOT
(Logical change 1.448)
2004-07-08 20:19:52 +00:00
cantab.net!aia21 82a284b4ab Use libntfs/volume.c::ntfs_logfile_reset() instead of wipe_logfile() at the
end of ntfswipe.c.  Also, always do the reset (unless act == act_info) to
ensure windows can boot and so journal replay does not cause corruption.

(Logical change 1.447)
2004-07-07 12:49:45 +00:00
(none)!yura 5286770d63 * wipe_directory implementation
* don't force overwrite logfile with 0xFF for ntfs v3.1
* endian fix
* indention fixes
* cleanups
* bugfix ntfswipe_tail for compressed blocks followed by >1 sparse blocks

(Logical change 1.446)
2004-07-06 19:53:05 +00:00
(none)!yura 3a41564173 Various cleanups and fixes
(Logical change 1.445)
2004-07-04 16:41:24 +00:00
(none)!yura 07ef30bdf6 wipe_tails:
* proper implementation of wipe_compressed_attribute
* various fixes

(Logical change 1.444)
2004-06-28 23:05:50 +00:00
(none)!yura 9d0b3d8069 wipe_tails:
* disable of handling compressed DATA attribute (it isn't safe now), until I implement it properly
* fixed bug in handling very fragmented files

(Logical change 1.441)
2004-06-25 17:08:20 +00:00
(none)!yura 0f0a8013fc wipe_tails:
* Support of very fragmented files (runlist don't fit one mft record)
* Code restructure
* Minor bugfixes

(Logical change 1.438)
2004-06-23 23:20:53 +00:00
(none)!yura d09e6a7f4a wipe_tails implementation for compressed, encrypted and sparce files.
(Logical change 1.435)
2004-06-22 17:55:38 +00:00
flatcap.org!ntfs fb1cdc8825 wipe file tails
(Logical change 1.428)
2004-06-20 16:47:19 +00:00
cantab.net!aia21 123b1028ec Fix lots of warnings about no prototypes by adding
the 'static' keyword.  (Yuval)

(Logical change 1.381)
2004-04-23 13:55:49 +00:00
cantab.net!aia21 f90c2cd5b9 Fix some compiler warnings. (Yuval)
(Logical change 1.379)
2004-04-23 10:12:49 +00:00
elisa-laajakaista.fi!szaka 8c67ce1c36 Fix incorrect getopt_long() usage: converted argv[optind-1] to optarg
so utilities won't do bogus and unexpected things

(Logical change 1.366)
2004-04-15 00:42:33 +00:00
cantab.net!aia21 41c90506c5 Auto merged
2004/03/10 21:54:27+00:00 cantab.net!aia21
 Typo fixes (Ender)

(Logical change 1.317)
2004-03-10 22:03:54 +00:00
cantab.net!aia21 6dea839252 Auto merged
2004/03/09 14:38:51+00:00 cantab.net!aia21
Fix all occurences of printf with %ll length modifiers but 64 bit
arguments to typecast the arguments to (unsigned) long long to avoid
the warnings when compiling on 64 bit architectures.

(Logical change 1.306)
2004-03-09 14:47:34 +00:00
flatcap.org!ntfs 65182be272 Auto merged
2003/10/28 15:50:53+00:00 flatcap.org!ntfs
some cut'n'pasted code to wipe the pagefile and logfile

(Logical change 1.299)
2004-03-06 17:42:28 +00:00
flatcap.org!ntfs fafd832996 clear up a few minor build warnings
(Logical change 1.238)
2003-11-19 00:05:30 +00:00
flatcap.org!ntfs 3234ada8a2 wipe the tails of mft records that are in use
(Logical change 1.206)
2003-10-12 23:11:03 +00:00
flatcap.org!ntfs 6be430ea08 wipe the mft slack space
(Logical change 1.205)
2003-10-12 17:38:05 +00:00
flatcap.org!ntfs ff9c58f35e typo
(Logical change 1.203)
2003-10-12 12:48:46 +00:00
flatcap.org!ntfs 5420628b1d wipe unused space seems to work
(Logical change 1.202)
2003-10-12 12:45:23 +00:00
flatcap.org!flatcap 3987a55edd minor tidyup
(Logical change 1.117)
2003-02-09 22:55:20 +00:00