linux-ntfs-cvs — List for CVS checkins and comments.

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs cluster.c,1.7,1.8 mkntfs.c,1.67,1.68 ntfscat.c,1.17,1.18 ntfsclone.c,1.50,1.51 ntfscluster.c,1.26,1.27 ntfscp.c,1.26,1.27 ntfsdecrypt.c,1.18,1.19 ntfsdump_logfile.c,1.28,1.29 ntfsfix.c,1.16,1.17 ntfsinfo.c,1.75,1.76 ntfslabel.c,1.14,1.15 ntfsls.c,1.29,1.30 ntfsmftalloc.c,1.5,1.6 ntfsmount.c,1.34,1.35 ntfsmove.c,1.15,1.16 ntfsresize.c,1.89,1.90 ntfsrm.c,1.61,1.62 ntfstruncate.c,1.26,1.27 ntfsundelete.c,1.45,1.46 ntfswipe.c,1.37,1.38 upcase.c,1.8,1.9 utils.c,1.44,1.45

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9881/ntfsprogs

Modified Files:
	cluster.c mkntfs.c ntfscat.c ntfsclone.c ntfscluster.c 
	ntfscp.c ntfsdecrypt.c ntfsdump_logfile.c ntfsfix.c ntfsinfo.c 
	ntfslabel.c ntfsls.c ntfsmftalloc.c ntfsmount.c ntfsmove.c 
	ntfsresize.c ntfsrm.c ntfstruncate.c ntfsundelete.c ntfswipe.c 
	upcase.c utils.c 
Log Message:
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.


Index: cluster.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/cluster.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- cluster.c	24 Sep 2005 22:54:55 -0000	1.7
+++ cluster.c	28 Sep 2005 13:47:48 -0000	1.8
@@ -23,9 +23,15 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
 
 #include "cluster.h"
 #include "utils.h"

Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- mkntfs.c	27 Sep 2005 15:25:19 -0000	1.67
+++ mkntfs.c	28 Sep 2005 13:47:48 -0000	1.68
@@ -62,16 +62,24 @@
 #ifdef HAVE_ERRNO_H
 #	include <errno.h>
 #endif
+#ifdef HAVE_TIME_H
 #include <time.h>
+#endif
 #ifdef HAVE_GETOPT_H
 #	include <getopt.h>
 #else
 	extern char *optarg;
 	extern int optind;
 #endif
+#ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
+#endif
+#ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
+#endif
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
 #ifdef HAVE_LINUX_MAJOR_H
 #	include <linux/major.h>
 #	ifndef MAJOR
@@ -110,7 +118,9 @@
 				(M) <= SCSI_DISK7_MAJOR))
 #	endif
 #endif
+#ifdef HAVE_LIMITS_H
 #include <limits.h>
+#endif
 
 #if defined(linux) && defined(_IO) && !defined(BLKSSZGET)
 #	define BLKSSZGET _IO(0x12,104) /* Get device sector size in bytes. */

Index: ntfscat.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscat.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- ntfscat.c	4 Aug 2005 09:59:44 -0000	1.17
+++ ntfscat.c	28 Sep 2005 13:47:48 -0000	1.18
@@ -24,10 +24,18 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
 
 #include "types.h"
 #include "attrib.h"

Index: ntfsclone.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- ntfsclone.c	25 Sep 2005 21:42:48 -0000	1.50
+++ ntfsclone.c	28 Sep 2005 13:47:48 -0000	1.51
@@ -15,20 +15,42 @@
 
 #include "config.h"
 
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
+#endif
+#ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
+#endif
 #ifdef HAVE_SYS_VFS_H
 #	include <sys/vfs.h>
 #endif
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
+#ifdef HAVE_STDARG_H
 #include <stdarg.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
+#ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#endif
 
 #include "debug.h"
 #include "types.h"

Index: ntfscluster.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscluster.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- ntfscluster.c	21 Aug 2005 00:50:15 -0000	1.26
+++ ntfscluster.c	28 Sep 2005 13:47:48 -0000	1.27
@@ -23,11 +23,21 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_LIMITS_H
 #include <limits.h>
+#endif
 
 #include "ntfscluster.h"
 #include "types.h"

Index: ntfscp.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscp.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- ntfscp.c	16 Sep 2005 14:28:18 -0000	1.26
+++ ntfscp.c	28 Sep 2005 13:47:48 -0000	1.27
@@ -24,13 +24,25 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
 #include <signal.h>
+#ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
+#endif
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 
 #include "types.h"
 #include "attrib.h"

Index: ntfsdecrypt.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsdecrypt.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- ntfsdecrypt.c	26 Aug 2005 12:25:13 -0000	1.18
+++ ntfsdecrypt.c	28 Sep 2005 13:47:48 -0000	1.19
@@ -29,17 +29,39 @@
 #error A required header file is missing. Aborting.
 #endif
 
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
+#endif
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
+#ifdef HAVE_GCRYPT_H
 #include <gcrypt.h>
+#endif
+#ifdef HAVE_GNUTLS_PKCS12_H
 #include <gnutls/pkcs12.h>
+#endif
 
 #include "types.h"
 #include "attrib.h"

Index: ntfsdump_logfile.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsdump_logfile.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- ntfsdump_logfile.c	6 Jul 2005 22:47:19 -0000	1.28
+++ ntfsdump_logfile.c	28 Sep 2005 13:47:48 -0000	1.29
@@ -32,15 +32,33 @@
 
 #include "config.h"
 
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
+#endif
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+#ifdef HAVE_STDARG_H
 #include <stdarg.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
 
 #include "types.h"
 #include "endians.h"

Index: ntfsfix.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsfix.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- ntfsfix.c	24 Sep 2005 22:54:55 -0000	1.16
+++ ntfsfix.c	28 Sep 2005 13:47:48 -0000	1.17
@@ -45,13 +45,27 @@
 
 #include "config.h"
 
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#endif
 
 #include "types.h"
 #include "attrib.h"

Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- ntfsinfo.c	24 Sep 2005 22:54:55 -0000	1.75
+++ ntfsinfo.c	28 Sep 2005 13:47:48 -0000	1.76
@@ -46,11 +46,21 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_TIME_H
 #include <time.h>
+#endif
+#ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#endif
 
 #ifdef HAVE_ERRNO_H
 #include <errno.h>

Index: ntfslabel.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfslabel.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- ntfslabel.c	24 Sep 2005 22:54:55 -0000	1.14
+++ ntfslabel.c	28 Sep 2005 13:47:48 -0000	1.15
@@ -25,12 +25,24 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
+#ifdef HAVE_LOCALE_H
 #include <locale.h>
+#endif
+#ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#endif
 
 #include "debug.h"
 #include "mft.h"

Index: ntfsls.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsls.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- ntfsls.c	24 Sep 2005 22:54:55 -0000	1.29
+++ ntfsls.c	28 Sep 2005 13:47:48 -0000	1.30
@@ -26,11 +26,21 @@
  */
 #include "config.h"
 
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_TIME_H
 #include <time.h>
+#endif
+#ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
 
 #include "types.h"
 #include "mft.h"

Index: ntfsmftalloc.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmftalloc.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ntfsmftalloc.c	6 Jul 2005 22:47:19 -0000	1.5
+++ ntfsmftalloc.c	28 Sep 2005 13:47:48 -0000	1.6
@@ -41,13 +41,17 @@
 #ifdef HAVE_ERRNO_H
 #	include <errno.h>
 #endif
+#ifdef HAVE_TIME_H
 #include <time.h>
+#endif
 #ifdef HAVE_GETOPT_H
 #	include <getopt.h>
 #else
 	extern int optind;
 #endif
+#ifdef HAVE_LIMITS_H
 #include <limits.h>
+#endif
 #ifndef LLONG_MAX
 #	define LLONG_MAX 9223372036854775807LL
 #endif

Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- ntfsmount.c	25 Sep 2005 11:42:26 -0000	1.34
+++ ntfsmount.c	28 Sep 2005 13:47:48 -0000	1.35
@@ -24,15 +24,31 @@
 #include "config.h"
 
 #include <fuse.h>
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_LOCALE_H
 #include <locale.h>
+#endif
 #include <signal.h>
+#ifdef HAVE_LIMITS_H
 #include <limits.h>
+#endif
 #include <getopt.h>
 #include <time.h>
 

Index: ntfsmove.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmove.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ntfsmove.c	24 Sep 2005 23:46:54 -0000	1.15
+++ ntfsmove.c	28 Sep 2005 13:47:48 -0000	1.16
@@ -24,10 +24,18 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
 
 #include "types.h"
 #include "attrib.h"

Index: ntfsresize.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- ntfsresize.c	24 Sep 2005 22:54:55 -0000	1.89
+++ ntfsresize.c	28 Sep 2005 13:47:48 -0000	1.90
@@ -29,13 +29,27 @@
 
 #include "config.h"
 
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_STDARG_H
 #include <stdarg.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
+#ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#endif
 
 #include "debug.h"
 #include "types.h"

Index: ntfsrm.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsrm.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -p -r1.61 -r1.62
--- ntfsrm.c	24 Sep 2005 22:54:55 -0000	1.61
+++ ntfsrm.c	28 Sep 2005 13:47:48 -0000	1.62
@@ -21,11 +21,21 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_TIME_H
 #include <time.h>
+#endif
 
 #include "utils.h"
 #include "ntfsrm.h"

Index: ntfstruncate.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfstruncate.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- ntfstruncate.c	6 Jul 2005 22:47:19 -0000	1.26
+++ ntfstruncate.c	28 Sep 2005 13:47:48 -0000	1.27
@@ -42,14 +42,18 @@
 #ifdef HAVE_ERRNO_H
 #	include <errno.h>
 #endif
+#ifdef HAVE_TIME_H
 #include <time.h>
+#endif
 #ifdef HAVE_GETOPT_H
 #	include <getopt.h>
 #else
 	extern char *optarg;
 	extern int optind;
 #endif
+#ifdef HAVE_LIMITS_H
 #include <limits.h>
+#endif
 #ifndef LLONG_MAX
 #	define LLONG_MAX 9223372036854775807LL
 #endif

Index: ntfsundelete.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsundelete.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- ntfsundelete.c	14 Aug 2005 15:44:48 -0000	1.45
+++ ntfsundelete.c	28 Sep 2005 13:47:48 -0000	1.46
@@ -28,20 +28,46 @@
 #ifdef HAVE_FEATURES_H
 #	include <features.h>
 #endif
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
+#endif
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
+#ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#endif
+#ifdef HAVE_TIME_H
 #include <time.h>
+#endif
+#ifdef HAVE_LIMITS_H
 #include <limits.h>
+#endif
 #include <regex.h>
+#ifdef HAVE_STDARG_H
 #include <stdarg.h>
+#endif
+#ifdef HAVE_UTIME_H
 #include <utime.h>
+#endif
 
 #include "ntfsundelete.h"
 #include "bootsect.h"

Index: ntfswipe.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfswipe.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- ntfswipe.c	24 Sep 2005 22:54:55 -0000	1.37
+++ ntfswipe.c	28 Sep 2005 13:47:48 -0000	1.38
@@ -24,13 +24,27 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
+#ifdef HAVE_STDARG_H
 #include <stdarg.h>
+#endif
+#ifdef HAVE_GETOPT_H
 #include <getopt.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 
 #include "ntfswipe.h"
 #include "types.h"

Index: upcase.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/upcase.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- upcase.c	14 May 2004 13:02:33 -0000	1.8
+++ upcase.c	28 Sep 2005 13:47:48 -0000	1.9
@@ -24,7 +24,9 @@
 
 #include "config.h"
 
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
 
 #include "types.h"
 

Index: utils.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/utils.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- utils.c	24 Sep 2005 22:54:55 -0000	1.44
+++ utils.c	28 Sep 2005 13:47:48 -0000	1.45
@@ -25,20 +25,42 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_STDARG_H
 #include <stdarg.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
+#endif
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_LOCALE_H
 #include <locale.h>
+#endif
 #ifdef HAVE_LIBINTL_H
 #	include <libintl.h>
 #endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_LIMITS_H
 #include <limits.h>
+#endif
+#ifdef HAVE_CTYPE_H
 #include <ctype.h>
+#endif
 
 #include "config.h"
 #include "utils.h"

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.177,1.178 attrlist.c,1.29,1.30 bitmap.c,1.12,1.13 bootsect.c,1.16,1.17 compress.c,1.12,1.13 device.c,1.19,1.20 gnome-vfs-method.c,1.6,1.7 index.c,1.11,1.12 inode.c,1.66,1.67 lcnalloc.c,1.31,1.32 logfile.c,1.7,1.8 mft.c,1.33,1.34 mst.c,1.12,1.13 runlist.c,1.58,1.59 security.c,1.7,1.8 unistr.c,1.28,1.29 unix_io.c,1.4,1.5 volume.c,1.54,1.55 win32_io.c,1.38,1.39

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfsprogs/libntfs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9881/libntfs

Modified Files:
	attrib.c attrlist.c bitmap.c bootsect.c compress.c device.c 
	gnome-vfs-method.c index.c inode.c lcnalloc.c logfile.c mft.c 
	mst.c runlist.c security.c unistr.c unix_io.c volume.c 
	win32_io.c 
Log Message:
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.


Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -p -r1.177 -r1.178
--- attrib.c	24 Sep 2005 22:54:55 -0000	1.177
+++ attrib.c	28 Sep 2005 13:47:47 -0000	1.178
@@ -23,10 +23,18 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
 
 #include "compat.h"
 

Index: attrlist.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrlist.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- attrlist.c	24 Sep 2005 13:03:07 -0000	1.29
+++ attrlist.c	28 Sep 2005 13:47:48 -0000	1.30
@@ -23,8 +23,12 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
 
 #include "types.h"
 #include "layout.h"

Index: bitmap.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/bitmap.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- bitmap.c	18 Aug 2004 10:27:49 -0000	1.12
+++ bitmap.c	28 Sep 2005 13:47:48 -0000	1.13
@@ -21,10 +21,18 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
 
 #include "types.h"
 #include "attrib.h"

Index: bootsect.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/bootsect.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- bootsect.c	14 Aug 2005 15:44:47 -0000	1.16
+++ bootsect.c	28 Sep 2005 13:47:48 -0000	1.17
@@ -22,10 +22,18 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
 
 #include "compat.h"
 

Index: compress.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/compress.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- compress.c	4 Aug 2005 08:09:58 -0000	1.12
+++ compress.c	28 Sep 2005 13:47:48 -0000	1.13
@@ -23,10 +23,18 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
 
 #include "attrib.h"
 #include "debug.h"

Index: device.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/device.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- device.c	19 Aug 2005 16:01:15 -0000	1.19
+++ device.c	28 Sep 2005 13:47:48 -0000	1.20
@@ -21,14 +21,30 @@
 
 #include "config.h"
 
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
+#endif
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
 #ifdef HAVE_SYS_IOCTL_H
 #	include <sys/ioctl.h>
 #endif

Index: gnome-vfs-method.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/gnome-vfs-method.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- gnome-vfs-method.c	20 Jun 2005 14:31:58 -0000	1.6
+++ gnome-vfs-method.c	28 Sep 2005 13:47:48 -0000	1.7
@@ -34,7 +34,9 @@
 #include <glib/gmessages.h>
 #include "gnome-vfs-module.h"
 #include <glib/ghash.h>
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
 #include <libgnomevfs/gnome-vfs-utils.h>
 
 #include "volume.h"

Index: index.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/index.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- index.c	26 Aug 2005 20:17:08 -0000	1.11
+++ index.c	28 Sep 2005 13:47:48 -0000	1.12
@@ -20,7 +20,9 @@
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
 
 #include "attrib.h"
 #include "collate.h"

Index: inode.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/inode.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- inode.c	16 Sep 2005 14:28:18 -0000	1.66
+++ inode.c	28 Sep 2005 13:47:48 -0000	1.67
@@ -22,9 +22,15 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
 
 #include "compat.h"
 

Index: lcnalloc.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/lcnalloc.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- lcnalloc.c	19 Jun 2005 21:09:40 -0000	1.31
+++ lcnalloc.c	28 Sep 2005 13:47:48 -0000	1.32
@@ -22,9 +22,15 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
 
 #include "types.h"
 #include "attrib.h"

Index: logfile.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/logfile.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- logfile.c	26 Sep 2005 13:18:29 -0000	1.7
+++ logfile.c	28 Sep 2005 13:47:48 -0000	1.8
@@ -20,7 +20,9 @@
  * Foundation,Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
 
 #include "attrib.h"
 #include "debug.h"

Index: mft.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/mft.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- mft.c	14 Aug 2005 15:44:47 -0000	1.33
+++ mft.c	28 Sep 2005 13:47:48 -0000	1.34
@@ -22,10 +22,18 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
 #include <time.h>
 
 #include "compat.h"

Index: mst.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/mst.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- mst.c	6 Jul 2005 22:47:18 -0000	1.12
+++ mst.c	28 Sep 2005 13:47:48 -0000	1.13
@@ -22,7 +22,9 @@
 #include "config.h"
 
 #include "mst.h"
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
 
 /**
  * ntfs_mst_post_read_fixup - deprotect multi sector transfer protected data

Index: runlist.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/runlist.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- runlist.c	19 Sep 2005 20:58:54 -0000	1.58
+++ runlist.c	28 Sep 2005 13:47:48 -0000	1.59
@@ -23,10 +23,18 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
 
 #include "compat.h"
 

Index: security.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/security.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- security.c	19 Jun 2005 21:09:40 -0000	1.7
+++ security.c	28 Sep 2005 13:47:48 -0000	1.8
@@ -22,10 +22,18 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
 
 #include "types.h"
 #include "layout.h"

Index: unistr.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/unistr.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- unistr.c	24 Sep 2005 22:54:55 -0000	1.28
+++ unistr.c	28 Sep 2005 13:47:48 -0000	1.29
@@ -21,11 +21,21 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_WCHAR_H
 #include <wchar.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
 
 #include "types.h"
 #include "unistr.h"

Index: unix_io.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/unix_io.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- unix_io.c	6 Jul 2005 22:47:18 -0000	1.4
+++ unix_io.c	28 Sep 2005 13:47:48 -0000	1.5
@@ -21,15 +21,33 @@
 
 #include "config.h"
 
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
+#endif
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
+#ifdef HAVE_SYS_IOCTL_H
 #include <sys/ioctl.h>
+#endif
 #ifdef HAVE_LINUX_FD_H
 #	include <linux/fd.h>
 #endif

Index: volume.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/volume.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- volume.c	27 Sep 2005 18:03:00 -0000	1.54
+++ volume.c	28 Sep 2005 13:47:48 -0000	1.55
@@ -22,14 +22,30 @@
 
 #include "config.h"
 
+#ifdef HAVE_STDLIB_H
 #include <stdlib.h>
+#endif
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_STRING_H
 #include <string.h>
+#endif
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
+#ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
+#endif
+#ifdef HAVE_LIMITS_H
 #include <limits.h>
+#endif
 
 #include "volume.h"
 #include "attrib.h"

Index: win32_io.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/win32_io.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- win32_io.c	1 Aug 2005 22:10:40 -0000	1.38
+++ win32_io.c	28 Sep 2005 13:47:48 -0000	1.39
@@ -24,13 +24,23 @@
 
 #include "config.h"
 
+#ifdef HAVE_WINDOWS_H
 #include <windows.h>
+#endif
 #include <winioctl.h>
 
+#ifdef HAVE_STDIO_H
 #include <stdio.h>
+#endif
+#ifdef HAVE_CTYPE_H
 #include <ctype.h>
+#endif
+#ifdef HAVE_ERRNO_H
 #include <errno.h>
+#endif
+#ifdef HAVE_FCNTL_H
 #include <fcntl.h>
+#endif
 
 /*
  * Cannot use "../include/types.h" since it conflicts with "wintypes.h".

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs volume.c,1.53,1.54

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfsprogs/libntfs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7353

Modified Files:
	volume.c 
Log Message:
Fix the double free that just got added.  There was only half a memory leak...
It was a cut and paste error, not a real memory leak.


Index: volume.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/volume.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -p -r1.53 -r1.54
--- volume.c	27 Sep 2005 17:11:30 -0000	1.53
+++ volume.c	27 Sep 2005 18:03:00 -0000	1.54
@@ -79,10 +79,10 @@ ntfs_volume *ntfs_volume_alloc(void)
  */
 static void __ntfs_volume_release(ntfs_volume *v)
 {
-	if (v->vol_ni && NInoDirty(v->vol_ni))
-		ntfs_inode_close(v->vol_ni);
 	if (v->lcnbmp_ni && NInoDirty(v->lcnbmp_ni))
 		ntfs_inode_sync(v->lcnbmp_ni);
+	if (v->vol_ni)
+		ntfs_inode_close(v->vol_ni);
 	if (v->lcnbmp_na)
 		ntfs_attr_close(v->lcnbmp_na);
 	if (v->lcnbmp_ni)
@@ -101,8 +101,6 @@ static void __ntfs_volume_release(ntfs_v
 		ntfs_attr_close(v->mftmirr_na);
 	if (v->mftmirr_ni)
 		ntfs_inode_close(v->mftmirr_ni);
-	if (v->vol_ni)
-		ntfs_inode_close(v->vol_ni);
 	if (v->dev) {
 		struct ntfs_device *dev = v->dev;
 

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs volume.c,1.52,1.53

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/ntfsprogs/libntfs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27938

Modified Files:
	volume.c 
Log Message:
fix a memory leak - vol->vol_ni

Index: volume.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/volume.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- volume.c	24 Sep 2005 22:54:55 -0000	1.52
+++ volume.c	27 Sep 2005 17:11:30 -0000	1.53
@@ -101,6 +101,8 @@ static void __ntfs_volume_release(ntfs_v
 		ntfs_attr_close(v->mftmirr_na);
 	if (v->mftmirr_ni)
 		ntfs_inode_close(v->mftmirr_ni);
+	if (v->vol_ni)
+		ntfs_inode_close(v->vol_ni);
 	if (v->dev) {
 		struct ntfs_device *dev = v->dev;
 

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.66,1.67

[Richard R. <fl...@us...>]

Changes by: flatcap

Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32697

Modified Files:
	mkntfs.c 
Log Message:
fix a build warning

Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -p -r1.66 -r1.67
--- mkntfs.c	25 Sep 2005 19:22:11 -0000	1.66
+++ mkntfs.c	27 Sep 2005 15:25:19 -0000	1.67
@@ -1437,10 +1437,10 @@ static int mkntfs_attr_find(const ATTR_T
  *	EIO	I/O error or corrupt data structures found.
  *	ENOMEM	Not enough memory to allocate necessary buffers.
  */
-int mkntfs_attr_lookup(const ATTR_TYPES type, const ntfschar *name,
+static int mkntfs_attr_lookup(const ATTR_TYPES type, const ntfschar *name,
 		const u32 name_len, const IGNORE_CASE_BOOL ic,
-		const VCN lowest_vcn, const u8 *val, const u32 val_len,
-		ntfs_attr_search_ctx *ctx)
+		const VCN lowest_vcn __attribute__ ((unused)), const u8 *val,
+		const u32 val_len, ntfs_attr_search_ctx *ctx)
 {
 	ntfs_inode *base_ni;
 
@@ -3509,6 +3509,9 @@ static void mkntfs_fill_device_with_zero
 	Qprintf(" - Done.\n");
 }
 
+/**
+ * create_file_volume -
+ */
 static void create_file_volume(MFT_RECORD *m, MFT_REF root_ref, VOLUME_FLAGS fl)
 {
 	int i, err;

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.284,1.285

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1462

Modified Files:
	ChangeLog 
Log Message:
More $LogFile handling fixes: when chkdsk has been run, it can leave the
restart pages in the journal without multi sector transfer protection
fixups (i.e. the update sequence array is empty and in fact does not
exist).


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.284
retrieving revision 1.285
diff -u -p -r1.284 -r1.285
--- ChangeLog	26 Sep 2005 13:11:00 -0000	1.284
+++ ChangeLog	26 Sep 2005 13:18:29 -0000	1.285
@@ -55,14 +55,14 @@ xx/xx/2005 - 1.12.0-WIP
 	  set a flag, it overwrites the flags!  Rename it to
 	  ntfs_volume_write_flags() and clean it up a lot.  Update all
 	  callers.  (Anton)
-	- Change ntfsfix to no longer set the volume dirty.
+	- Change ntfsfix to no longer set the volume dirty.  (Anton)
 	- Change everything to supply an ntfs_inode and NULL for mft record
 	  when calling ntfs_attr_get_search_ctx() except a very few cases which
 	  genuinely need this functionality as they work on a too low level.
-	  Make sure all those cases are ok.
+	  Make sure all those cases are ok.  (Anton)
 	- ntfsclone: fix saving by sectors during --rescue (Scott Hansen, Szaka)
 	- Fix the definition of the CHKD ntfs record magic.  It had an off by
-	  two error causing it to be CHKB instead of CHKD.
+	  two error causing it to be CHKB instead of CHKD.  (Anton)
 
 08/08/2005 - 1.11.2 - ntfsdecrypt now works and lots of fixes and improvements.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs logfile.c,1.6,1.7

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfsprogs/libntfs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1462/libntfs

Modified Files:
	logfile.c 
Log Message:
More $LogFile handling fixes: when chkdsk has been run, it can leave the
restart pages in the journal without multi sector transfer protection
fixups (i.e. the update sequence array is empty and in fact does not
exist).


Index: logfile.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/logfile.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- logfile.c	24 Sep 2005 15:59:53 -0000	1.6
+++ logfile.c	26 Sep 2005 13:18:29 -0000	1.7
@@ -42,7 +42,8 @@
 static BOOL ntfs_check_restart_page_header(RESTART_PAGE_HEADER *rp, s64 pos)
 {
 	u32 logfile_system_page_size, logfile_log_page_size;
-	u16 usa_count, usa_ofs, usa_end, ra_ofs;
+	u16 ra_ofs, usa_count, usa_ofs, usa_end = 0;
+	BOOL have_usa = TRUE;
 
 	ntfs_debug("Entering.");
 	/*
@@ -77,6 +78,14 @@ static BOOL ntfs_check_restart_page_head
 				(int)sle16_to_cpu(rp->minor_ver));
 		return FALSE;
 	}
+	/*
+	 * If chkdsk has been run the restart page may not be protected by an
+	 * update sequence array.
+	 */
+	if (ntfs_is_chkd_record(rp->magic) && !le16_to_cpu(rp->usa_count)) {
+		have_usa = FALSE;
+		goto skip_usa_checks;
+	}
 	/* Verify the size of the update sequence array. */
 	usa_count = 1 + (logfile_system_page_size >> NTFS_BLOCK_SIZE_BITS);
 	if (usa_count != le16_to_cpu(rp->usa_count)) {
@@ -93,6 +102,7 @@ static BOOL ntfs_check_restart_page_head
 				"inconsistent update sequence array offset.");
 		return FALSE;
 	}
+skip_usa_checks:
 	/*
 	 * Verify the position of the restart area.  It must be:
 	 *	- aligned to 8-byte boundary,
@@ -100,7 +110,8 @@ static BOOL ntfs_check_restart_page_head
 	 *	- within the system page size.
 	 */
 	ra_ofs = le16_to_cpu(rp->restart_area_offset);
-	if (ra_ofs & 7 || ra_ofs < usa_end ||
+	if (ra_ofs & 7 || (have_usa ? ra_ofs < usa_end :
+			ra_ofs < sizeof(RESTART_PAGE_HEADER)) ||
 			ra_ofs > logfile_system_page_size) {
 		ntfs_error(vi->i_sb, "$LogFile restart page specifies "
 				"inconsistent restart area offset.");
@@ -360,19 +371,22 @@ static int ntfs_check_and_load_restart_p
 	 */
 	if (le32_to_cpu(rp->system_page_size) <= NTFS_BLOCK_SIZE)
 		memcpy(trp, rp, le32_to_cpu(rp->system_page_size));
-	else
-		if (ntfs_attr_pread(log_na, pos, le32_to_cpu(
-					rp->system_page_size), trp) !=
-					le32_to_cpu(rp->system_page_size)) {
-			err = errno;
-			ntfs_error(, "Failed to read whole restart page into "
-					"the buffer.");
-			if (err != ENOMEM)
-				err = EIO;
-			goto err_out;
-		}
-	/* Perform the multi sector transfer deprotection on the buffer. */
-	if (ntfs_mst_post_read_fixup((NTFS_RECORD*)trp,
+	else if (ntfs_attr_pread(log_na, pos,
+			le32_to_cpu(rp->system_page_size), trp) !=
+			le32_to_cpu(rp->system_page_size)) {
+		err = errno;
+		ntfs_error(, "Failed to read whole restart page into the "
+				"buffer.");
+		if (err != ENOMEM)
+			err = EIO;
+		goto err_out;
+	}
+	/*
+	 * Perform the multi sector transfer deprotection on the buffer if the
+	 * restart page is protected.
+	 */
+	if ((!ntfs_is_chkd_record(trp->magic) || le16_to_cpu(trp->usa_count))
+			&& ntfs_mst_post_read_fixup((NTFS_RECORD*)trp,
 			le32_to_cpu(rp->system_page_size))) {
 		/*
 		 * A multi sector tranfer error was detected.  We only need to
@@ -578,11 +592,16 @@ is_empty:
 		 * Otherwise just throw it away.
 		 */
 		if (rstr2_lsn > rstr1_lsn) {
+			ntfs_debug("Using second restart page as it is more "
+					"recent.");
 			free(rstr1_ph);
 			rstr1_ph = rstr2_ph;
 			/* rstr1_lsn = rstr2_lsn; */
-		} else  
+		} else {
+			ntfs_debug("Using first restart page as it is more "
+					"recent.");
 			free(rstr2_ph);
+		}
 		rstr2_ph = NULL;
 	}
 	/* All consistency checks passed. */

[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs layout.h,1.27,1.28

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfsprogs/include/ntfs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31836/include/ntfs

Modified Files:
	layout.h 
Log Message:
Fix the definition of the CHKD ntfs record magic.  It had an off by
two error causing it to be CHKB instead of CHKD.


Index: layout.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/layout.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- layout.h	14 Aug 2005 15:44:47 -0000	1.27
+++ layout.h	26 Sep 2005 13:11:01 -0000	1.28
@@ -112,7 +112,7 @@ typedef enum {
 	magic_RCRD = const_cpu_to_le32(0x44524352), /* Log record page. */
 
 	/* Found in $LogFile/$DATA.  (May be found in $MFT/$DATA, also?) */
-	magic_CHKD = const_cpu_to_le32(0x424b4843), /* Modified by chkdsk. */
+	magic_CHKD = const_cpu_to_le32(0x444b4843), /* Modified by chkdsk. */
 
 	/* Found in all ntfs record containing records. */
 	magic_BAAD = const_cpu_to_le32(0x44414142), /* Failed multi sector

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.283,1.284

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31836

Modified Files:
	ChangeLog 
Log Message:
Fix the definition of the CHKD ntfs record magic.  It had an off by
two error causing it to be CHKB instead of CHKD.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.283
retrieving revision 1.284
diff -u -p -r1.283 -r1.284
--- ChangeLog	25 Sep 2005 21:42:47 -0000	1.283
+++ ChangeLog	26 Sep 2005 13:11:00 -0000	1.284
@@ -61,6 +61,8 @@ xx/xx/2005 - 1.12.0-WIP
 	  genuinely need this functionality as they work on a too low level.
 	  Make sure all those cases are ok.
 	- ntfsclone: fix saving by sectors during --rescue (Scott Hansen, Szaka)
+	- Fix the definition of the CHKD ntfs record magic.  It had an off by
+	  two error causing it to be CHKB instead of CHKD.
 
 08/08/2005 - 1.11.2 - ntfsdecrypt now works and lots of fixes and improvements.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsclone.c,1.49,1.50

[Szabolcs S. <sz...@us...>]

Changes by: szaka

Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22923/ntfsprogs

Modified Files:
	ntfsclone.c 
Log Message:
Fix saving by sectors during --rescue


Index: ntfsclone.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- ntfsclone.c	24 Sep 2005 22:54:55 -0000	1.49
+++ ntfsclone.c	25 Sep 2005 21:42:48 -0000	1.50
@@ -496,18 +496,21 @@ static void rescue_sector(void *fd, off_
 }
 
 
-static void copy_cluster(int rescue, off_t rescue_pos)
+static void copy_cluster(int rescue, u64 rescue_lcn)
 {
 	char buff[NTFS_MAX_CLUSTER_SIZE]; /* overflow checked at mount time */
 	/* vol is NULL if opt.restore_image is set */
 	u32 csize = image_hdr.cluster_size;
 	void *fd = (void *)&fd_in;
+	off_t rescue_pos;
 
 	if (!opt.restore_image) {
 		csize = vol->cluster_size;
 		fd = vol->dev;
 	}
 
+	rescue_pos = (off_t)(rescue_lcn * csize);
+
 	if (read_all(fd, buff, csize) == -1) {
 
 		if (errno != EIO)

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.282,1.283

[Szabolcs S. <sz...@us...>]

Changes by: szaka

Update of /cvsroot/linux-ntfs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22923

Modified Files:
	ChangeLog 
Log Message:
Fix saving by sectors during --rescue


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -p -r1.282 -r1.283
--- ChangeLog	24 Sep 2005 22:54:55 -0000	1.282
+++ ChangeLog	25 Sep 2005 21:42:47 -0000	1.283
@@ -60,6 +60,7 @@ xx/xx/2005 - 1.12.0-WIP
 	  when calling ntfs_attr_get_search_ctx() except a very few cases which
 	  genuinely need this functionality as they work on a too low level.
 	  Make sure all those cases are ok.
+	- ntfsclone: fix saving by sectors during --rescue (Scott Hansen, Szaka)
 
 08/08/2005 - 1.11.2 - ntfsdecrypt now works and lots of fixes and improvements.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfscmp.c,1.2,1.3

[Szabolcs S. <sz...@us...>]

Changes by: szaka

Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30978/ntfsprogs

Modified Files:
	ntfscmp.c 
Log Message:
Fix uninteded output and typo


Index: ntfscmp.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscmp.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ntfscmp.c	24 Sep 2005 22:54:55 -0000	1.2
+++ ntfscmp.c	25 Sep 2005 19:35:56 -0000	1.3
@@ -583,10 +583,12 @@ static int new_attribute(ntfs_attr_searc
 	} else if (prev_name || name)
 		return 1;
 
-	print_inode(base_inode(ctx)->mft_no);
-	print_attribute_ctx(ctx);
-	Vprintf("extent %llu lowest_vcn %lld:    SKIPPED\n",
-		ctx->ntfs_ino->mft_no, ctx->attr->lowest_vcn);
+	if (opt.verbose) {
+		print_inode(base_inode(ctx)->mft_no);
+		print_attribute_ctx(ctx);
+		printf("record %llu lowest_vcn %lld:    SKIPPED\n",
+			ctx->ntfs_ino->mft_no, ctx->attr->lowest_vcn);
+	}
 	
 	return 0;
 }

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.65,1.66

[Szabolcs S. <sz...@us...>]

Changes by: szaka

Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28587/ntfsprogs

Modified Files:
	mkntfs.c 
Log Message:
Fix --enable-really-statici: mkntfs redefined ntfs_attr_put_search_ctx()


Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -p -r1.65 -r1.66
--- mkntfs.c	24 Sep 2005 22:54:55 -0000	1.65
+++ mkntfs.c	25 Sep 2005 19:22:11 -0000	1.66
@@ -1460,18 +1460,6 @@ int mkntfs_attr_lookup(const ATTR_TYPES 
 }
 
 /**
- * ntfs_attr_put_search_ctx - release an attribute search context
- * @ctx:	attribute search context to free
- *
- * Release the attribute search context @ctx.
- */
-void ntfs_attr_put_search_ctx(ntfs_attr_search_ctx *ctx)
-{
-	free(ctx);
-	return;
-}
-
-/**
  * insert_positioned_attr_in_mft_record
  * Create a non-resident attribute with a predefined on disk location
  * specified by the runlist @rl. The clusters specified by @rl are assumed to

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs dir.c,1.24,1.25

[Yura P. <cha...@us...>]

Changes by: cha0smaster

Update of /cvsroot/linux-ntfs/ntfsprogs/libntfs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25710/libntfs

Modified Files:
	dir.c 
Log Message:
fix stupid bug in ntfs_delete, optimize it a bit


Index: dir.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/dir.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- dir.c	24 Sep 2005 15:20:49 -0000	1.24
+++ dir.c	25 Sep 2005 14:12:44 -0000	1.25
@@ -1282,11 +1282,18 @@ search:
 		errno = 0;			
 		fn = (FILE_NAME_ATTR*)((u8*)actx->attr +
 				le16_to_cpu(actx->attr->value_offset));
-		if (looking_for_dos_name && fn->file_name_type == FILE_NAME_DOS)
-			break;
-		if (looking_for_win32_name &&
-				fn->file_name_type == FILE_NAME_WIN32)
-			break;
+		if (looking_for_dos_name) {
+			if (fn->file_name_type == FILE_NAME_DOS)
+				break;
+			else
+				continue;
+		}
+		if (looking_for_win32_name) {
+			if  (fn->file_name_type == FILE_NAME_WIN32)
+				break;
+			else
+				continue;
+		}
 		if (dir_ni->mft_no == MREF_LE(fn->parent_directory) &&
 				ntfs_names_are_equal(fn->file_name,
 				fn->file_name_length, name,
@@ -1295,7 +1302,6 @@ search:
 				ni->vol->upcase, ni->vol->upcase_len)) {
 			if (fn->file_name_type == FILE_NAME_WIN32) {
 				looking_for_dos_name = TRUE;
-				ntfs_attr_reinit_search_ctx(actx);
 				continue;
 			}
 			if (fn->file_name_type == FILE_NAME_DOS)

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.c,1.33,1.34

[Yura P. <cha...@us...>]

Changes by: cha0smaster

Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26694/ntfsprogs

Modified Files:
	ntfsmount.c 
Log Message:
minor cleanup


Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- ntfsmount.c	24 Sep 2005 17:06:35 -0000	1.33
+++ ntfsmount.c	25 Sep 2005 11:42:26 -0000	1.34
@@ -773,7 +773,7 @@ static int ntfs_fuse_unlink(const char *
 static int ntfs_fuse_rename(const char *old_path, const char *new_path)
 {
 	int ret;
-	
+
 	if ((ret = ntfs_fuse_link(old_path, new_path)))
 		return ret;
 	if ((ret = ntfs_fuse_unlink(old_path))) {
@@ -1427,7 +1427,7 @@ int main(int argc, char *argv[])
 	struct fuse *fh;
 	int ffd;
 
-	setlocale(LC_ALL, "");
+	utils_set_locale();
 	signal(SIGINT, signal_handler);
 	signal(SIGTERM, signal_handler);
 

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmove.c,1.14,1.15

[Szabolcs S. <sz...@us...>]

Changes by: szaka

Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5466/ntfsprogs

Modified Files:
	ntfsmove.c 
Log Message:
Fix 'make extra' (ntfsmove) compilation


Index: ntfsmove.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmove.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- ntfsmove.c	24 Sep 2005 22:54:55 -0000	1.14
+++ ntfsmove.c	24 Sep 2005 23:46:54 -0000	1.15
@@ -867,7 +867,7 @@ int main (int argc, char *argv[])
 
 	count = move_file (vol, inode, opts.location, 0);
 	if ((count > 0) && (!opts.nodirty)) {
-		if (ntfs_volume_set_flags (vol, vol->flags | VOLUME_IS_DIRTY) <
+		if (ntfs_volume_write_flags (vol, vol->flags | VOLUME_IS_DIRTY) <
 				0) {
 			Eprintf ("Couldn't mark volume dirty\n");
 		}

[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs unistr.h,1.6,1.7 volume.h,1.13,1.14

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfsprogs/include/ntfs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27122/include/ntfs

Modified Files:
	unistr.h volume.h 
Log Message:
Megapatch!!!  Check evecrything!!!  I probably broke everything!!!


Index: unistr.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/unistr.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- unistr.h	22 Aug 2005 21:33:07 -0000	1.6
+++ unistr.h	24 Sep 2005 22:54:55 -0000	1.7
@@ -61,5 +61,7 @@ extern int ntfs_ucstombs(const ntfschar 
 		int outs_len);
 extern int ntfs_mbstoucs(const char *ins, ntfschar **outs, int outs_len);
 
+extern void ntfs_upcase_table_build(ntfschar *uc, u32 uc_len);
+
 #endif /* defined _NTFS_UNISTR_H */
 

Index: volume.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/volume.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- volume.h	14 Aug 2005 15:44:47 -0000	1.13
+++ volume.h	24 Sep 2005 22:54:55 -0000	1.14
@@ -117,6 +117,8 @@ struct _ntfs_volume {
 	char *vol_name;		/* Name of the volume. */
 	unsigned long state;	/* NTFS specific flags describing this volume.
 				   See ntfs_volume_state_bits above. */
+
+	ntfs_inode *vol_ni;	/* ntfs_inode structure for FILE_Volume. */
 	u8 major_ver;		/* Ntfs major version of volume. */
 	u8 minor_ver;		/* Ntfs minor version of volume. */
 	u16 flags;		/* Bit array of VOLUME_* flags. */
@@ -198,7 +200,8 @@ extern int ntfs_umount(ntfs_volume *vol,
 
 extern int ntfs_version_is_supported(ntfs_volume *vol);
 extern int ntfs_logfile_reset(ntfs_volume *vol);
-extern int ntfs_volume_set_flags(ntfs_volume *v, const u16 flags);
+
+extern int ntfs_volume_write_flags(ntfs_volume *v, const u16 flags);
 
 #endif /* defined _NTFS_VOLUME_H */
 

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs Makefile.am,1.30,1.31 attrib.c,1.176,1.177 unistr.c,1.27,1.28 volume.c,1.51,1.52

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfsprogs/libntfs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27122/libntfs

Modified Files:
	Makefile.am attrib.c unistr.c volume.c 
Log Message:
Megapatch!!!  Check evecrything!!!  I probably broke everything!!!


Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/Makefile.am,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- Makefile.am	22 Sep 2005 16:41:43 -0000	1.30
+++ Makefile.am	24 Sep 2005 22:54:55 -0000	1.31
@@ -25,7 +25,7 @@
 #   - If the interface is the same as the previous version, change to C:R+1:A
 #
 
-LTVERSION_LIBNTFS = 7:1:0
+LTVERSION_LIBNTFS = 8:0:0
 LTVERSION_LIBNTFS_GNOMEVFS = 1:0:0
 
 

Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -p -r1.176 -r1.177
--- attrib.c	24 Sep 2005 20:28:23 -0000	1.176
+++ attrib.c	24 Sep 2005 22:54:55 -0000	1.177
@@ -1559,10 +1559,23 @@ static int ntfs_attr_find(const ATTR_TYP
 		const u8 *val, const u32 val_len, ntfs_attr_search_ctx *ctx)
 {
 	ATTR_RECORD *a;
-	ntfs_volume *vol = ctx->ntfs_ino->vol;
-	ntfschar *upcase = vol->upcase;
-	u32 upcase_len = vol->upcase_len;
+	ntfs_volume *vol;
+	ntfschar *upcase;
+	u32 upcase_len;
 
+	if (ctx->ntfs_ino) {
+		vol = ctx->ntfs_ino->vol;
+		upcase = vol->upcase;
+		upcase_len = vol->upcase_len;
+	} else {
+		if (name) {
+			errno = EINVAL;
+			return -1;
+		}
+		vol = NULL;
+		upcase = NULL;
+		upcase_len = 0;
+	}
 	/*
 	 * Iterate over attributes in mft record starting at @ctx->attr, or the
 	 * attribute following that, if @ctx->is_first is TRUE.
@@ -2196,7 +2209,7 @@ int ntfs_attr_lookup(const ATTR_TYPES ty
 static __inline__ void ntfs_attr_init_search_ctx(ntfs_attr_search_ctx *ctx,
 		ntfs_inode *ni, MFT_RECORD *mrec)
 {
-	if (ni && !mrec)
+	if (!mrec)
 		mrec = ni->mrec;
 	ctx->mrec = mrec;
 	/* Sanity checks are performed elsewhere. */
@@ -2245,19 +2258,22 @@ void ntfs_attr_reinit_search_ctx(ntfs_at
  * Allocate a new attribute search context, initialize it with @ni and @mrec,
  * and return it. Return NULL on error with errno set to ENOMEM.
  *
- * @ni can be NULL if the search context is only going to be used for searching
- * for the attribute list attribute and for searches ignoring the contents of
- * the attribute list attribute.
+ * @mrec can be NULL, in which case the mft record is taken from @ni.
  *
- * If @ni is specified, @mrec can be NULL, in which case the mft record is
- * taken from @ni.
- *
- * If both @ni and @mrec are specified, the mft record is taken from @mrec and
- * the value of @ni->mrec is ignored.
+ * Note: For low level utilities which know what they are doing we allow @ni to
+ * be NULL and @mrec to be set.  Do NOT do this unless you understand the
+ * implications!!!  For example it is no longer safe to call ntfs_attr_lookup()
+ * if you 
  */
 ntfs_attr_search_ctx *ntfs_attr_get_search_ctx(ntfs_inode *ni, MFT_RECORD *mrec)
 {
-	ntfs_attr_search_ctx *ctx = malloc(sizeof(ntfs_attr_search_ctx));
+	ntfs_attr_search_ctx *ctx;
+
+	if (!ni && !mrec) {
+		errno = EINVAL;
+		return NULL;
+	}
+	ctx = malloc(sizeof(ntfs_attr_search_ctx));
 	if (ctx)
 		ntfs_attr_init_search_ctx(ctx, ni, mrec);
 	return ctx;
@@ -2530,7 +2546,7 @@ int ntfs_resident_attr_record_add(ntfs_i
 	}
 
 	/* Locate place where record should be. */
-	ctx = ntfs_attr_get_search_ctx(NULL, ni->mrec);
+	ctx = ntfs_attr_get_search_ctx(ni, NULL);
 	if (!ctx)
 		return -1;
 	if (!ntfs_attr_lookup(type, name, name_len,
@@ -2655,7 +2671,7 @@ int ntfs_non_resident_attr_record_add(nt
 	}
 
 	/* Locate place where record should be. */
-	ctx = ntfs_attr_get_search_ctx(NULL, ni->mrec);
+	ctx = ntfs_attr_get_search_ctx(ni, NULL);
 	if (!ctx)
 		return -1;
 	if (!ntfs_attr_lookup(type, name, name_len, CASE_SENSITIVE,
@@ -3318,7 +3334,7 @@ int ntfs_attr_record_move_to(ntfs_attr_s
 
 	/* Find place in MFT record where attribute will be moved. */
 	a = ctx->attr;
-	nctx = ntfs_attr_get_search_ctx(NULL, ni->mrec);
+	nctx = ntfs_attr_get_search_ctx(ni, NULL);
 	if (!nctx) {
 		err = errno;
 		Dprintf("%s(): Couldn't obtain search context.\n",

Index: unistr.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/unistr.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- unistr.c	24 Sep 2005 20:28:23 -0000	1.27
+++ unistr.c	24 Sep 2005 22:54:55 -0000	1.28
@@ -591,3 +591,69 @@ err_out:
 	}
 	return -1;
 }
+
+/**
+ * ntfs_upcase_table_build - build the default upcase table for NTFS
+ * @uc:		destination buffer where to store the built table
+ * @uc_len:	size of destination buffer in bytes
+ *
+ * ntfs_upcase_table_build() builds the default upcase table for NTFS and
+ * stores it in the caller supplied buffer @uc of size @uc_len.
+ *
+ * Note, @uc_len must be at least 128kiB in size or bad things will happen!
+ */
+void ntfs_upcase_table_build(ntfschar *uc, u32 uc_len)
+{
+	static int uc_run_table[][3] = { /* Start, End, Add */
+	{0x0061, 0x007B,  -32}, {0x0451, 0x045D, -80}, {0x1F70, 0x1F72,  74},
+	{0x00E0, 0x00F7,  -32}, {0x045E, 0x0460, -80}, {0x1F72, 0x1F76,  86},
+	{0x00F8, 0x00FF,  -32}, {0x0561, 0x0587, -48}, {0x1F76, 0x1F78, 100},
+	{0x0256, 0x0258, -205}, {0x1F00, 0x1F08,   8}, {0x1F78, 0x1F7A, 128},
+	{0x028A, 0x028C, -217}, {0x1F10, 0x1F16,   8}, {0x1F7A, 0x1F7C, 112},
+	{0x03AC, 0x03AD,  -38}, {0x1F20, 0x1F28,   8}, {0x1F7C, 0x1F7E, 126},
+	{0x03AD, 0x03B0,  -37}, {0x1F30, 0x1F38,   8}, {0x1FB0, 0x1FB2,   8},
+	{0x03B1, 0x03C2,  -32}, {0x1F40, 0x1F46,   8}, {0x1FD0, 0x1FD2,   8},
+	{0x03C2, 0x03C3,  -31}, {0x1F51, 0x1F52,   8}, {0x1FE0, 0x1FE2,   8},
+	{0x03C3, 0x03CC,  -32}, {0x1F53, 0x1F54,   8}, {0x1FE5, 0x1FE6,   7},
+	{0x03CC, 0x03CD,  -64}, {0x1F55, 0x1F56,   8}, {0x2170, 0x2180, -16},
+	{0x03CD, 0x03CF,  -63}, {0x1F57, 0x1F58,   8}, {0x24D0, 0x24EA, -26},
+	{0x0430, 0x0450,  -32}, {0x1F60, 0x1F68,   8}, {0xFF41, 0xFF5B, -32},
+	{0}
+	};
+	static int uc_dup_table[][2] = { /* Start, End */
+	{0x0100, 0x012F}, {0x01A0, 0x01A6}, {0x03E2, 0x03EF}, {0x04CB, 0x04CC},
+	{0x0132, 0x0137}, {0x01B3, 0x01B7}, {0x0460, 0x0481}, {0x04D0, 0x04EB},
+	{0x0139, 0x0149}, {0x01CD, 0x01DD}, {0x0490, 0x04BF}, {0x04EE, 0x04F5},
+	{0x014A, 0x0178}, {0x01DE, 0x01EF}, {0x04BF, 0x04BF}, {0x04F8, 0x04F9},
+	{0x0179, 0x017E}, {0x01F4, 0x01F5}, {0x04C1, 0x04C4}, {0x1E00, 0x1E95},
+	{0x018B, 0x018B}, {0x01FA, 0x0218}, {0x04C7, 0x04C8}, {0x1EA0, 0x1EF9},
+	{0}
+	};
+	static int uc_byte_table[][2] = { /* Offset, Value */
+	{0x00FF, 0x0178}, {0x01AD, 0x01AC}, {0x01F3, 0x01F1}, {0x0269, 0x0196},
+	{0x0183, 0x0182}, {0x01B0, 0x01AF}, {0x0253, 0x0181}, {0x026F, 0x019C},
+	{0x0185, 0x0184}, {0x01B9, 0x01B8}, {0x0254, 0x0186}, {0x0272, 0x019D},
+	{0x0188, 0x0187}, {0x01BD, 0x01BC}, {0x0259, 0x018F}, {0x0275, 0x019F},
+	{0x018C, 0x018B}, {0x01C6, 0x01C4}, {0x025B, 0x0190}, {0x0283, 0x01A9},
+	{0x0192, 0x0191}, {0x01C9, 0x01C7}, {0x0260, 0x0193}, {0x0288, 0x01AE},
+	{0x0199, 0x0198}, {0x01CC, 0x01CA}, {0x0263, 0x0194}, {0x0292, 0x01B7},
+	{0x01A8, 0x01A7}, {0x01DD, 0x018E}, {0x0268, 0x0197},
+	{0}
+	};
+	int i, r;
+
+	memset((char*)uc, 0, uc_len);
+	uc_len >>= 1;
+	if (uc_len > 65536)
+		uc_len = 65536;
+	for (i = 0; (u32)i < uc_len; i++)
+		uc[i] = i;
+	for (r = 0; uc_run_table[r][0]; r++)
+		for (i = uc_run_table[r][0]; i < uc_run_table[r][1]; i++)
+			uc[i] += uc_run_table[r][2];
+	for (r = 0; uc_dup_table[r][0]; r++)
+		for (i = uc_dup_table[r][0]; i < uc_dup_table[r][1]; i += 2)
+			uc[i + 1]--;
+	for (r = 0; uc_byte_table[r][0]; r++)
+		uc[uc_byte_table[r][0]] = uc_byte_table[r][1];
+}

Index: volume.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/volume.c,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- volume.c	24 Sep 2005 15:59:53 -0000	1.51
+++ volume.c	24 Sep 2005 22:54:55 -0000	1.52
@@ -79,6 +79,8 @@ ntfs_volume *ntfs_volume_alloc(void)
  */
 static void __ntfs_volume_release(ntfs_volume *v)
 {
+	if (v->vol_ni && NInoDirty(v->vol_ni))
+		ntfs_inode_close(v->vol_ni);
 	if (v->lcnbmp_ni && NInoDirty(v->lcnbmp_ni))
 		ntfs_inode_sync(v->lcnbmp_ni);
 	if (v->lcnbmp_na)
@@ -166,7 +168,7 @@ static int ntfs_mft_load(ntfs_volume *vo
 		Dputs("Error: $MFT has invalid magic.");
 		goto io_error_exit;
 	}
-	ctx = ntfs_attr_get_search_ctx(vol->mft_ni, mb);
+	ctx = ntfs_attr_get_search_ctx(vol->mft_ni, NULL);
 	if (!ctx) {
 		Dperror("Failed to allocate attribute search context");
 		goto error_exit;
@@ -416,6 +418,15 @@ ntfs_volume *ntfs_volume_startup(struct 
 	vol = ntfs_volume_alloc();
 	if (!vol)
 		goto error_exit;
+	/* Create the default upcase table. */
+	vol->upcase_len = 65536;
+	vol->upcase = (ntfschar*)malloc(vol->upcase_len * sizeof(ntfschar));
+	if (!vol->upcase) {
+		Dperror("Error allocating memory for upcase table.");
+		goto error_exit;
+	}
+	ntfs_upcase_table_build(vol->upcase,
+			vol->upcase_len * sizeof(ntfschar));
 	if ((rwflag & MS_RDONLY) == MS_RDONLY)
 		NVolSetReadOnly(vol);
 	Dprintf("Reading bootsector... ");
@@ -889,12 +900,16 @@ ntfs_volume *ntfs_device_mount(struct nt
 		errno = EINVAL;
 		goto error_exit;
 	}
-	vol->upcase_len = na->data_size >> 1;
-	vol->upcase = (ntfschar*)malloc(na->data_size);
-	if (!vol->upcase) {
-		Dputs(FAILED);
-		Dputs("Not enough memory to load $UpCase.");
-		goto error_exit;
+	if (vol->upcase_len != na->data_size >> 1) {
+		vol->upcase_len = na->data_size >> 1;
+		/* Throw away default table. */
+		free(vol->upcase);
+		vol->upcase = (ntfschar*)malloc(na->data_size);
+		if (!vol->upcase) {
+			Dputs(FAILED);
+			Dputs("Not enough memory to load $UpCase.");
+			goto error_exit;
+		}
 	}
 	/* Read in the $DATA attribute value into the buffer. */
 	l = ntfs_attr_pread(na, 0, na->data_size, vol->upcase);
@@ -916,14 +931,14 @@ ntfs_volume *ntfs_device_mount(struct nt
 	 * vol structure accordingly.
 	 */
 	Dprintf("Loading $Volume... ");
-	ni = ntfs_inode_open(vol, FILE_Volume);
-	if (!ni) {
+	vol->vol_ni = ntfs_inode_open(vol, FILE_Volume);
+	if (!vol->vol_ni) {
 		Dputs(FAILED);
 		Dperror("Failed to open inode");
 		goto error_exit;
 	}
 	/* Get a search context for the $Volume/$VOLUME_INFORMATION lookup. */
-	ctx = ntfs_attr_get_search_ctx(ni, NULL);
+	ctx = ntfs_attr_get_search_ctx(vol->vol_ni, NULL);
 	if (!ctx) {
 		Dputs(FAILED);
 		Dperror("Failed to allocate attribute search context");
@@ -1033,9 +1048,6 @@ ntfs_volume *ntfs_device_mount(struct nt
 	Dputs(OK);
 	ntfs_attr_put_search_ctx(ctx);
 	ctx = NULL;
-	if (ntfs_inode_close(ni))
-		Dperror("Failed to close inode, leaking memory");
-
 	/* Now load the attribute definitions from $AttrDef. */
 	Dprintf("Loading $AttrDef... ");
 	ni = ntfs_inode_open(vol, FILE_AttrDef);
@@ -1080,7 +1092,6 @@ ntfs_volume *ntfs_device_mount(struct nt
 	ntfs_attr_close(na);
 	if (ntfs_inode_close(ni))
 		Dperror("Failed to close inode, leaking memory");
-
 	/*
 	 * Check for dirty logfile and hibernated Windows.
 	 * We care only about read-write mounts.
@@ -1429,7 +1440,7 @@ error_exit:
 }
 
 /**
- * ntfs_volume_set_flags - set the flags of an ntfs volume
+ * ntfs_volume_write_flags - set the flags of an ntfs volume
  * @vol:	ntfs volume where we set the volume flags
  * @flags:	new flags
  *
@@ -1438,37 +1449,22 @@ error_exit:
  *
  * Return 0 if successful and -1 if not with errno set to the error code.
  */
-int ntfs_volume_set_flags(ntfs_volume *vol, const u16 flags)
+int ntfs_volume_write_flags(ntfs_volume *vol, const u16 flags)
 {
-	MFT_RECORD *m = NULL;
-	ATTR_RECORD *r;
+	ATTR_RECORD *a;
 	VOLUME_INFORMATION *c;
 	ntfs_attr_search_ctx *ctx;
 	int ret = -1;	/* failure */
 
-	if (!vol) {
+	if (!vol || !vol->vol_ni) {
 		errno = EINVAL;
 		return -1;
 	}
-
-	if (ntfs_file_record_read(vol, FILE_Volume, &m, NULL)) {
-		Dperror("Failed to read $Volume");
-		return -1;
-	}
-
-	/* Sanity check */
-	if (!(m->flags & MFT_RECORD_IN_USE)) {
-		Dprintf("Error: $Volume has been deleted. Cannot "
-			"handle this yet. Run chkdsk to fix this.\n");
-		errno = EIO;
-		goto err_exit;
-	}
-
 	/* Get a pointer to the volume information attribute. */
-	ctx = ntfs_attr_get_search_ctx(NULL, m);
+	ctx = ntfs_attr_get_search_ctx(vol->vol_ni, NULL);
 	if (!ctx) {
 		Dperror("Failed to allocate attribute search context");
-		goto err_exit;
+		return -1;
 	}
 	if (ntfs_attr_lookup(AT_VOLUME_INFORMATION, AT_UNNAMED, 0, 0, 0, NULL,
 			0, ctx)) {
@@ -1476,40 +1472,36 @@ int ntfs_volume_set_flags(ntfs_volume *v
 				"$Volume!");
 		goto err_out;
 	}
-	r = ctx->attr;
+	a = ctx->attr;
 	/* Sanity check. */
-	if (r->non_resident) {
+	if (a->non_resident) {
 		Dputs("Error: Attribute $VOLUME_INFORMATION must be resident "
 				"(and it isn't)!");
 		errno = EIO;
 		goto err_out;
 	}
 	/* Get a pointer to the value of the attribute. */
-	c = (VOLUME_INFORMATION*)(le16_to_cpu(r->value_offset) + (char*)r);
+	c = (VOLUME_INFORMATION*)(le16_to_cpu(a->value_offset) + (char*)a);
 	/* Sanity checks. */
-	if ((char*)c + le32_to_cpu(r->value_length) >
-			le16_to_cpu(m->bytes_in_use) + (char*)m ||
-			le16_to_cpu(r->value_offset) +
-			le32_to_cpu(r->value_length) > le32_to_cpu(r->length)) {
+	if ((char*)c + le32_to_cpu(a->value_length) >
+			le16_to_cpu(ctx->mrec->bytes_in_use) +
+			(char*)ctx->mrec || le16_to_cpu(a->value_offset) +
+			le32_to_cpu(a->value_length) > le32_to_cpu(a->length)) {
 		Dputs("Error: Attribute $VOLUME_INFORMATION in $Volume is "
 				"corrupt!");
 		errno = EIO;
 		goto err_out;
 	}
 	/* Set the volume flags. */
-	vol->flags = c->flags = cpu_to_le16(flags);
-
-	if (ntfs_mft_record_write(vol, FILE_Volume, m)) {
+	vol->flags = c->flags = flags & VOLUME_FLAGS_MASK;
+	/* Write them to disk. */
+	ntfs_inode_mark_dirty(vol->vol_ni);
+	if (ntfs_inode_sync(vol->vol_ni)) {
 		Dperror("Error writing $Volume");
 		goto err_out;
 	}
-
 	ret = 0; /* success */
 err_out:
 	ntfs_attr_put_search_ctx(ctx);
-err_exit:
-	if (m)
-		free(m);
 	return ret;
 }
-

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.281,1.282

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27122

Modified Files:
	ChangeLog 
Log Message:
Megapatch!!!  Check evecrything!!!  I probably broke everything!!!


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.281
retrieving revision 1.282
diff -u -p -r1.281 -r1.282
--- ChangeLog	24 Sep 2005 20:12:36 -0000	1.281
+++ ChangeLog	24 Sep 2005 22:54:55 -0000	1.282
@@ -44,13 +44,22 @@ xx/xx/2005 - 1.12.0-WIP
 	- ntfsmount: Fix 'df' output.  (Yuval)
 	- Support journals which have been modified by chkdsk.  (Anton, Szaka)
 	- Support journals ($LogFile) with only one restart page as well as
-          journals with two different restart pages.  (Anton, Szaka)
+	  journals with two different restart pages.  (Anton, Szaka)
 	- Add @val parameter to ntfs_attr_add and @val and @size parameters to
 	  ntfs_resident_attr_record_add.  (Yura)
 	- Fix attribute list adding for always resident attributes.  (Yura)
 	- New API for hard link creating: dir.[ch]::ntfs_link.  (Yura)
 	- ntfsresize: emphasize that disk partitioning must use sector as the
 	  unit instead of cylinder to avoid shifting of the partition.  (Szaka)
+	- Rename API: ntfs_volume_set_flags() as it is misleading.  It does not
+	  set a flag, it overwrites the flags!  Rename it to
+	  ntfs_volume_write_flags() and clean it up a lot.  Update all
+	  callers.  (Anton)
+	- Change ntfsfix to no longer set the volume dirty.
+	- Change everything to supply an ntfs_inode and NULL for mft record
+	  when calling ntfs_attr_get_search_ctx() except a very few cases which
+	  genuinely need this functionality as they work on a too low level.
+	  Make sure all those cases are ok.
 
 08/08/2005 - 1.11.2 - ntfsdecrypt now works and lots of fixes and improvements.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs cluster.c,1.6,1.7 mkntfs.c,1.64,1.65 ntfsclone.c,1.48,1.49 ntfscmp.c,1.1,1.2 ntfsfix.8.in,1.6,1.7 ntfsfix.c,1.15,1.16 ntfsinfo.c,1.74,1.75 ntfslabel.c,1.13,1.14 ntfsls.c,1.28,1.29 ntfsmove.c,1.13,1.14 ntfsresize.c,1.88,1.89 ntfsrm.c,1.60,1.61 ntfswipe.c,1.36,1.37 utils.c,1.43,1.44

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27122/ntfsprogs

Modified Files:
	cluster.c mkntfs.c ntfsclone.c ntfscmp.c ntfsfix.8.in 
	ntfsfix.c ntfsinfo.c ntfslabel.c ntfsls.c ntfsmove.c 
	ntfsresize.c ntfsrm.c ntfswipe.c utils.c 
Log Message:
Megapatch!!!  Check evecrything!!!  I probably broke everything!!!


Index: cluster.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/cluster.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- cluster.c	20 Aug 2004 12:04:47 -0000	1.6
+++ cluster.c	24 Sep 2005 22:54:55 -0000	1.7
@@ -81,7 +81,7 @@ int cluster_find (ntfs_volume *vol, LCN 
 		Vprintf ("Inode: %llu\n", (unsigned long long)
 				m_ctx->inode->mft_no);
 
-		a_ctx = ntfs_attr_get_search_ctx (NULL, m_ctx->inode->mrec);
+		a_ctx = ntfs_attr_get_search_ctx (m_ctx->inode, NULL);
 
 		while ((rec = find_attribute (AT_UNUSED, a_ctx))) {
 

Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -p -r1.64 -r1.65
--- mkntfs.c	4 Aug 2005 09:59:43 -0000	1.64
+++ mkntfs.c	24 Sep 2005 22:54:55 -0000	1.65
@@ -1181,6 +1181,297 @@ err_end:
 }
 
 /**
+ * Internal:
+ *
+ * ntfs_attr_find - find (next) attribute in mft record
+ * @type:	attribute type to find
+ * @name:	attribute name to find (optional, i.e. NULL means don't care)
+ * @name_len:	attribute name length (only needed if @name present)
+ * @ic:		IGNORE_CASE or CASE_SENSITIVE (ignored if @name not present)
+ * @val:	attribute value to find (optional, resident attributes only)
+ * @val_len:	attribute value length
+ * @ctx:	search context with mft record and attribute to search from
+ *
+ * You shouldn't need to call this function directly. Use lookup_attr() instead.
+ *
+ * ntfs_attr_find() takes a search context @ctx as parameter and searches the
+ * mft record specified by @ctx->mrec, beginning at @ctx->attr, for an
+ * attribute of @type, optionally @name and @val. If found, ntfs_attr_find()
+ * returns 0 and @ctx->attr will point to the found attribute.
+ *
+ * If not found, ntfs_attr_find() returns -1, with errno set to ENOENT and
+ * @ctx->attr will point to the attribute before which the attribute being
+ * searched for would need to be inserted if such an action were to be desired.
+ *
+ * On actual error, ntfs_attr_find() returns -1 with errno set to the error
+ * code but not to ENOENT.  In this case @ctx->attr is undefined and in
+ * particular do not rely on it not changing.
+ *
+ * If @ctx->is_first is TRUE, the search begins with @ctx->attr itself. If it
+ * is FALSE, the search begins after @ctx->attr.
+ *
+ * If @type is AT_UNUSED, return the first found attribute, i.e. one can
+ * enumerate all attributes by setting @type to AT_UNUSED and then calling
+ * ntfs_attr_find() repeatedly until it returns -1 with errno set to ENOENT to
+ * indicate that there are no more entries. During the enumeration, each
+ * successful call of ntfs_attr_find() will return the next attribute in the
+ * mft record @ctx->mrec.
+ *
+ * If @type is AT_END, seek to the end and return -1 with errno set to ENOENT.
+ * AT_END is not a valid attribute, its length is zero for example, thus it is
+ * safer to return error instead of success in this case. This also allows us
+ * to interoperate cleanly with ntfs_external_attr_find().
+ *
+ * If @name is AT_UNNAMED search for an unnamed attribute. If @name is present
+ * but not AT_UNNAMED search for a named attribute matching @name. Otherwise,
+ * match both named and unnamed attributes.
+ *
+ * If @ic is IGNORE_CASE, the @name comparison is not case sensitive and
+ * @ctx->ntfs_ino must be set to the ntfs inode to which the mft record
+ * @ctx->mrec belongs. This is so we can get at the ntfs volume and hence at
+ * the upcase table. If @ic is CASE_SENSITIVE, the comparison is case
+ * sensitive. When @name is present, @name_len is the @name length in Unicode
+ * characters.
+ *
+ * If @name is not present (NULL), we assume that the unnamed attribute is
+ * being searched for.
+ *
+ * Finally, the resident attribute value @val is looked for, if present.
+ * If @val is not present (NULL), @val_len is ignored.
+ *
+ * ntfs_attr_find() only searches the specified mft record and it ignores the
+ * presence of an attribute list attribute (unless it is the one being searched
+ * for, obviously). If you need to take attribute lists into consideration, use
+ * ntfs_attr_lookup() instead (see below). This also means that you cannot use
+ * ntfs_attr_find() to search for extent records of non-resident attributes, as
+ * extents with lowest_vcn != 0 are usually described by the attribute list
+ * attribute only. - Note that it is possible that the first extent is only in
+ * the attribute list while the last extent is in the base mft record, so don't
+ * rely on being able to find the first extent in the base mft record.
+ *
+ * Warning: Never use @val when looking for attribute types which can be
+ *	    non-resident as this most likely will result in a crash!
+ */
+static int mkntfs_attr_find(const ATTR_TYPES type, const ntfschar *name,
+		const u32 name_len, const IGNORE_CASE_BOOL ic,
+		const u8 *val, const u32 val_len, ntfs_attr_search_ctx *ctx)
+{
+	ATTR_RECORD *a;
+	ntfschar *upcase = vol->upcase;
+	u32 upcase_len = vol->upcase_len;
+
+	/*
+	 * Iterate over attributes in mft record starting at @ctx->attr, or the
+	 * attribute following that, if @ctx->is_first is TRUE.
+	 */
+	if (ctx->is_first) {
+		a = ctx->attr;
+		ctx->is_first = FALSE;
+	} else
+		a = (ATTR_RECORD*)((char*)ctx->attr +
+				le32_to_cpu(ctx->attr->length));
+	for (;;	a = (ATTR_RECORD*)((char*)a + le32_to_cpu(a->length))) {
+		if (p2n(a) < p2n(ctx->mrec) || (char*)a > (char*)ctx->mrec +
+				le32_to_cpu(ctx->mrec->bytes_allocated))
+			break;
+		ctx->attr = a;
+		if (((type != AT_UNUSED) && (le32_to_cpu(a->type) >
+				le32_to_cpu(type))) ||
+				(a->type == AT_END)) {
+			errno = ENOENT;
+			return -1;
+		}
+		if (!a->length)
+			break;
+		/* If this is an enumeration return this attribute. */
+		if (type == AT_UNUSED)
+			return 0;
+		if (a->type != type)
+			continue;
+		/*
+		 * If @name is AT_UNNAMED we want an unnamed attribute.
+		 * If @name is present, compare the two names.
+		 * Otherwise, match any attribute.
+		 */
+		if (name == AT_UNNAMED) {
+			/* The search failed if the found attribute is named. */
+			if (a->name_length) {
+				errno = ENOENT;
+				return -1;
+			}
+		} else if (name && !ntfs_names_are_equal(name, name_len,
+			    (ntfschar*)((char*)a + le16_to_cpu(a->name_offset)),
+			    a->name_length, ic, upcase, upcase_len)) {
+			register int rc;
+
+			rc = ntfs_names_collate(name, name_len,
+					(ntfschar*)((char*)a +
+					le16_to_cpu(a->name_offset)),
+					a->name_length, 1, IGNORE_CASE,
+					upcase, upcase_len);
+			/*
+			 * If @name collates before a->name, there is no
+			 * matching attribute.
+			 */
+			if (rc == -1) {
+				errno = ENOENT;
+				return -1;
+			}
+			/* If the strings are not equal, continue search. */
+			if (rc)
+				continue;
+			rc = ntfs_names_collate(name, name_len,
+					(ntfschar*)((char*)a +
+					le16_to_cpu(a->name_offset)),
+					a->name_length, 1, CASE_SENSITIVE,
+					upcase, upcase_len);
+			if (rc == -1) {
+				errno = ENOENT;
+				return -1;
+			}
+			if (rc)
+				continue;
+		}
+		/*
+		 * The names match or @name not present and attribute is
+		 * unnamed. If no @val specified, we have found the attribute
+		 * and are done.
+		 */
+		if (!val)
+			return 0;
+		/* @val is present; compare values. */
+		else {
+			register int rc;
+
+			rc = memcmp(val, (char*)a +le16_to_cpu(a->value_offset),
+					min(val_len,
+					le32_to_cpu(a->value_length)));
+			/*
+			 * If @val collates before the current attribute's
+			 * value, there is no matching attribute.
+			 */
+			if (!rc) {
+				register u32 avl;
+				avl = le32_to_cpu(a->value_length);
+				if (val_len == avl)
+					return 0;
+				if (val_len < avl) {
+					errno = ENOENT;
+					return -1;
+				}
+			} else if (rc < 0) {
+				errno = ENOENT;
+				return -1;
+			}
+		}
+	}
+	Dputs("mkntfs_attr_find(): File is corrupt. Run chkdsk.");
+	errno = EIO;
+	return -1;
+}
+
+/**
+ * ntfs_attr_lookup - find an attribute in an ntfs inode
+ * @type:	attribute type to find
+ * @name:	attribute name to find (optional, i.e. NULL means don't care)
+ * @name_len:	attribute name length (only needed if @name present)
+ * @ic:		IGNORE_CASE or CASE_SENSITIVE (ignored if @name not present)
+ * @lowest_vcn:	lowest vcn to find (optional, non-resident attributes only)
+ * @val:	attribute value to find (optional, resident attributes only)
+ * @val_len:	attribute value length
+ * @ctx:	search context with mft record and attribute to search from
+ *
+ * Find an attribute in an ntfs inode. On first search @ctx->ntfs_ino must
+ * be the base mft record and @ctx must have been obtained from a call to
+ * ntfs_attr_get_search_ctx().
+ *
+ * This function transparently handles attribute lists and @ctx is used to
+ * continue searches where they were left off at.
+ *
+ * If @type is AT_UNUSED, return the first found attribute, i.e. one can
+ * enumerate all attributes by setting @type to AT_UNUSED and then calling
+ * ntfs_attr_lookup() repeatedly until it returns -1 with errno set to ENOENT
+ * to indicate that there are no more entries. During the enumeration, each
+ * successful call of ntfs_attr_lookup() will return the next attribute, with
+ * the current attribute being described by the search context @ctx.
+ *
+ * If @type is AT_END, seek to the end of the base mft record ignoring the
+ * attribute list completely and return -1 with errno set to ENOENT.  AT_END is
+ * not a valid attribute, its length is zero for example, thus it is safer to
+ * return error instead of success in this case.  It should never ne needed to
+ * do this, but we implement the functionality because it allows for simpler
+ * code inside ntfs_external_attr_find().
+ *
+ * If @name is AT_UNNAMED search for an unnamed attribute. If @name is present
+ * but not AT_UNNAMED search for a named attribute matching @name. Otherwise,
+ * match both named and unnamed attributes.
+ *
+ * After finishing with the attribute/mft record you need to call
+ * ntfs_attr_put_search_ctx() to cleanup the search context (unmapping any
+ * mapped extent inodes, etc).
+ *
+ * Return 0 if the search was successful and -1 if not, with errno set to the
+ * error code.
+ *
+ * On success, @ctx->attr is the found attribute, it is in mft record
+ * @ctx->mrec, and @ctx->al_entry is the attribute list entry for this
+ * attribute with @ctx->base_* being the base mft record to which @ctx->attr
+ * belongs.  If no attribute list attribute is present @ctx->al_entry and
+ * @ctx->base_* are NULL.
+ *
+ * On error ENOENT, i.e. attribute not found, @ctx->attr is set to the
+ * attribute which collates just after the attribute being searched for in the
+ * base ntfs inode, i.e. if one wants to add the attribute to the mft record
+ * this is the correct place to insert it into, and if there is not enough
+ * space, the attribute should be placed in an extent mft record.
+ * @ctx->al_entry points to the position within @ctx->base_ntfs_ino->attr_list
+ * at which the new attribute's attribute list entry should be inserted.  The
+ * other @ctx fields, base_ntfs_ino, base_mrec, and base_attr are set to NULL.
+ * The only exception to this is when @type is AT_END, in which case
+ * @ctx->al_entry is set to NULL also (see above).
+ *
+ *
+ * The following error codes are defined:
+ *	ENOENT	Attribute not found, not an error as such.
+ *	EINVAL	Invalid arguments.
+ *	EIO	I/O error or corrupt data structures found.
+ *	ENOMEM	Not enough memory to allocate necessary buffers.
+ */
+int mkntfs_attr_lookup(const ATTR_TYPES type, const ntfschar *name,
+		const u32 name_len, const IGNORE_CASE_BOOL ic,
+		const VCN lowest_vcn, const u8 *val, const u32 val_len,
+		ntfs_attr_search_ctx *ctx)
+{
+	ntfs_inode *base_ni;
+
+	if (!ctx || !ctx->mrec || !ctx->attr) {
+		errno = EINVAL;
+		return -1;
+	}
+	if (ctx->base_ntfs_ino)
+		base_ni = ctx->base_ntfs_ino;
+	else
+		base_ni = ctx->ntfs_ino;
+	if (!base_ni || !NInoAttrList(base_ni) || type == AT_ATTRIBUTE_LIST)
+		return mkntfs_attr_find(type, name, name_len, ic, val, val_len,
+				ctx);
+	errno = EOPNOTSUPP;
+	return -1;
+}
+
+/**
+ * ntfs_attr_put_search_ctx - release an attribute search context
+ * @ctx:	attribute search context to free
+ *
+ * Release the attribute search context @ctx.
+ */
+void ntfs_attr_put_search_ctx(ntfs_attr_search_ctx *ctx)
+{
+	free(ctx);
+	return;
+}
+
+/**
  * insert_positioned_attr_in_mft_record
  * Create a non-resident attribute with a predefined on disk location
  * specified by the runlist @rl. The clusters specified by @rl are assumed to
@@ -1229,7 +1520,7 @@ static int insert_positioned_attr_in_mft
 		err = -EOPNOTSUPP;
 		goto err_out;
 	}
-	if (!ntfs_attr_lookup(type, uname, name_len, ic, 0, NULL, 0, ctx)) {
+	if (!mkntfs_attr_lookup(type, uname, name_len, ic, 0, NULL, 0, ctx)) {
 		err = -EEXIST;
 		goto err_out;
 	}
@@ -1414,7 +1705,7 @@ static int insert_non_resident_attr_in_m
 		err = -EOPNOTSUPP;
 		goto err_out;
 	}
-	if (!ntfs_attr_lookup(type, uname, name_len, ic, 0, NULL, 0, ctx)) {
+	if (!mkntfs_attr_lookup(type, uname, name_len, ic, 0, NULL, 0, ctx)) {
 		err = -EEXIST;
 		goto err_out;
 	}
@@ -1576,7 +1867,7 @@ static int insert_resident_attr_in_mft_r
 	ntfschar *uname;
 /*
 	if (base record)
-		ntfs_attr_lookup();
+		mkntfs_attr_lookup();
 	else
 */
 	if (name_len) {
@@ -1603,7 +1894,7 @@ static int insert_resident_attr_in_mft_r
 		err = -EOPNOTSUPP;
 		goto err_out;
 	}
-	if (!ntfs_attr_lookup(type, uname, name_len, ic, 0, val, val_len,
+	if (!mkntfs_attr_lookup(type, uname, name_len, ic, 0, val, val_len,
 			ctx)) {
 		err = -EEXIST;
 		goto err_out;
@@ -1726,7 +2017,7 @@ static int add_attr_file_name(MFT_RECORD
 		Eprintf("Failed to allocate attribute search context.\n");
 		return -ENOMEM;
 	}
-	if (ntfs_attr_lookup(AT_STANDARD_INFORMATION, AT_UNNAMED, 0, 0, 0, NULL, 0,
+	if (mkntfs_attr_lookup(AT_STANDARD_INFORMATION, AT_UNNAMED, 0, 0, 0, NULL, 0,
 			ctx)) {
 		int eo = errno;
 		Eprintf("BUG: Standard information attribute not present in "
@@ -2126,7 +2417,7 @@ static int upgrade_to_large_index(MFT_RE
 			free(uname);
 		goto err_out;
 	}
-	err = ntfs_attr_lookup(AT_INDEX_ROOT, uname, name_len, ic, 0, NULL, 0,
+	err = mkntfs_attr_lookup(AT_INDEX_ROOT, uname, name_len, ic, 0, NULL, 0,
 			ctx);
 	if (uname)
 		free(uname);
@@ -3399,7 +3690,7 @@ static void mkntfs_create_root_structure
 			err_exit("Failed to allocate attribute search "
 					"context: %s\n", strerror(errno));
 		/* There is exactly one file name so this is ok. */
-		if (ntfs_attr_lookup(AT_FILE_NAME, AT_UNNAMED, 0, 0, 0, NULL, 0,
+		if (mkntfs_attr_lookup(AT_FILE_NAME, AT_UNNAMED, 0, 0, 0, NULL, 0,
 				ctx)) {
 			ntfs_attr_put_search_ctx(ctx);
 			err_exit("BUG: $FILE_NAME attribute not found.\n");
@@ -3780,7 +4071,7 @@ int main(int argc, char **argv)
 		err_exit("Failed to allocate attribute search context: %s\n",
 				strerror(errno));
 	// FIXME: This should be IGNORE_CASE!
-	if (ntfs_attr_lookup(AT_INDEX_ALLOCATION, I30, 4, 0, 0,
+	if (mkntfs_attr_lookup(AT_INDEX_ALLOCATION, I30, 4, 0, 0,
 			NULL, 0, ctx)) {
 		ntfs_attr_put_search_ctx(ctx);
 		err_exit("BUG: $INDEX_ALLOCATION attribute not found.\n");
@@ -3814,7 +4105,7 @@ int main(int argc, char **argv)
 	if (!ctx)
 		err_exit("Failed to allocate attribute search context: %s\n",
 				strerror(errno));
-	if (ntfs_attr_lookup(AT_DATA, AT_UNNAMED, 0, 0, 0, NULL, 0, ctx)) {
+	if (mkntfs_attr_lookup(AT_DATA, AT_UNNAMED, 0, 0, 0, NULL, 0, ctx)) {
 		ntfs_attr_put_search_ctx(ctx);
 		err_exit("BUG: $DATA attribute not found.\n");
 	}

Index: ntfsclone.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -p -r1.48 -r1.49
--- ntfsclone.c	24 Sep 2005 21:36:51 -0000	1.48
+++ ntfsclone.c	24 Sep 2005 22:54:55 -0000	1.49
@@ -1335,11 +1335,11 @@ static void check_output_device(s64 inpu
 		set_filesize(input_size);
 }
 
-static ntfs_attr_search_ctx *attr_get_search_ctx(ntfs_inode *ni, MFT_RECORD *mrec)
+static ntfs_attr_search_ctx *attr_get_search_ctx(ntfs_inode *ni)
 {
 	ntfs_attr_search_ctx *ret;
 
-	if ((ret = ntfs_attr_get_search_ctx(ni, mrec)) == NULL)
+	if ((ret = ntfs_attr_get_search_ctx(ni, NULL)) == NULL)
 		perr_printf("ntfs_attr_get_search_ctx");
 
 	return ret;
@@ -1371,7 +1371,7 @@ static ntfs_attr_search_ctx *lookup_data
 	ntfschar *ustr = NULL;
 	int len = 0;
 
-	if ((ctx = attr_get_search_ctx(ni, NULL)) == NULL)
+	if ((ctx = attr_get_search_ctx(ni)) == NULL)
 		return NULL;
 
 	if (str2unicode(aname, &ustr, &len) == -1)

Index: ntfscmp.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscmp.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ntfscmp.c	25 Aug 2005 20:42:55 -0000	1.1
+++ ntfscmp.c	24 Sep 2005 22:54:55 -0000	1.2
@@ -237,11 +237,11 @@ static void parse_options(int argc, char
 #endif
 }
 
-static ntfs_attr_search_ctx *attr_get_search_ctx(ntfs_inode *ni, MFT_RECORD *mrec)
+static ntfs_attr_search_ctx *attr_get_search_ctx(ntfs_inode *ni)
 {
 	ntfs_attr_search_ctx *ret;
 
-	if ((ret = ntfs_attr_get_search_ctx(ni, mrec)) == NULL)
+	if ((ret = ntfs_attr_get_search_ctx(ni, NULL)) == NULL)
 		perr_println("ntfs_attr_get_search_ctx");
 
 	return ret;
@@ -612,9 +612,9 @@ static int cmp_attributes(ntfs_inode *ni
 	ATTR_TYPES prev_atype, atype1, atype2;
 	ntfs_attr_search_ctx *ctx1, *ctx2;
 	
-	if (!(ctx1 = attr_get_search_ctx(ni1, NULL)))
+	if (!(ctx1 = attr_get_search_ctx(ni1)))
 		return -1;
-	if (!(ctx2 = attr_get_search_ctx(ni2, NULL)))
+	if (!(ctx2 = attr_get_search_ctx(ni2)))
 		goto out;
 	
 	atype1 = ctx1->attr->type; 

Index: ntfsfix.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsfix.8.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- ntfsfix.8.in	10 Jul 2005 22:44:00 -0000	1.6
+++ ntfsfix.8.in	24 Sep 2005 22:54:55 -0000	1.7
@@ -16,16 +16,15 @@
 .\" .sp <n> insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-ntfsfix \- fix common errors and force Windows to check NTFS
+ntfsfix \- fix common errors
 .SH SYNOPSIS
 .B ntfsfix
 .I device
 .SH DESCRIPTION
 \fBntfsfix\fP is a utility that fixes some common NTFS problems. 
 \fBntfsfix\fP is \fBNOT\fP a Linux
-version of chkdsk. It only repairs some fundamental NTFS inconsistencies,
-resets the NTFS journal file and schedules an NTFS consistency check for 
-the first boot into Windows.
+version of chkdsk. It only repairs some fundamental NTFS inconsistencies and
+resets the NTFS journal file.
 .sp
 You may run 
 .B ntfsfix 

Index: ntfsfix.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsfix.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- ntfsfix.c	12 Jul 2005 16:18:13 -0000	1.15
+++ ntfsfix.c	24 Sep 2005 22:54:55 -0000	1.16
@@ -73,7 +73,6 @@ GEN_PRINTF(Qprintf, stdout, NULL, FALSE)
 static const char *EXEC_NAME = "ntfsfix";
 static const char *OK        = "OK";
 static const char *FAILED    = "FAILED";
-static BOOL vol_is_dirty     = FALSE;
 static BOOL journal_is_empty = FALSE;
 
 struct {
@@ -146,32 +145,6 @@ static void parse_options(int argc, char
 	}
 }
 
-static int set_dirty_flag(ntfs_volume *vol)
-{
-	u16 flags;
-
-	if (vol_is_dirty == TRUE)
-		return 0;
-
-	printf("Setting required flags on partition... ");
-	/*
-	 * Set chkdsk flag, i.e. mark the partition dirty so chkdsk will run
-	 * and fix it for us.
-	 */
-	flags = vol->flags | VOLUME_IS_DIRTY;
-	/* If NTFS volume version >= 2.0 then set mounted on NT4 flag. */
-	if (vol->major_ver >= 2)
-		flags |= VOLUME_MOUNTED_ON_NT4;
-	if (ntfs_volume_set_flags(vol, flags)) {
-		puts(FAILED);
-		fprintf(stderr, "Error setting volume flags.\n");
-		return -1;
-	}
-	puts(OK);
-	vol_is_dirty = TRUE;
-	return 0;
-}
-
 static int empty_journal(ntfs_volume *vol)
 {
 	if (journal_is_empty == TRUE)
@@ -349,9 +322,6 @@ int main(int argc, char **argv)
 
 	printf("Processing of $MFT and $MFTMirr completed successfully.\n");
 
-	if (set_dirty_flag(vol) < 0)
-		goto error_exit;
-
 	if (empty_journal(vol) < 0)
 		goto error_exit;
 
@@ -374,9 +344,6 @@ mount_ok:
 		goto error_exit;
 	}
 
-	if (set_dirty_flag(vol) < 0)
-		goto error_exit;
-
 	if (empty_journal(vol) < 0)
 		goto error_exit;
 

Index: ntfsinfo.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsinfo.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- ntfsinfo.c	14 Aug 2005 15:44:47 -0000	1.74
+++ ntfsinfo.c	24 Sep 2005 22:54:55 -0000	1.75
@@ -1253,7 +1253,7 @@ static int get_type_and_size_of_indx(ntf
 		memcpy(name, (u8 *)attr + attr->name_offset,
 				attr->name_length * sizeof(ntfschar));
 	}
-	ctx = ntfs_attr_get_search_ctx(ni, 0);
+	ctx = ntfs_attr_get_search_ctx(ni, NULL);
 	if (!ctx) {
 		perror("ntfs_get_search_ctx failed");
 		free(name);

Index: ntfslabel.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfslabel.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- ntfslabel.c	12 Aug 2004 08:15:25 -0000	1.13
+++ ntfslabel.c	24 Sep 2005 22:54:55 -0000	1.14
@@ -248,9 +248,8 @@ static int resize_resident_attribute_val
  */
 static int change_label(ntfs_volume *vol, unsigned long mnt_flags, char *label, BOOL force)
 {
-	ntfs_attr_search_ctx *ctx = NULL;
+	ntfs_attr_search_ctx *ctx;
 	ntfschar *new_label = NULL;
-	MFT_RECORD *mrec = NULL;
 	ATTR_RECORD *a;
 	int label_len;
 	int result = 0;
@@ -269,17 +268,7 @@ static int change_label(ntfs_volume *vol
 			}
 		}
 	}
-
-	if (ntfs_file_record_read(vol, (MFT_REF)FILE_Volume, &mrec, NULL)) {
-		perror("Error reading file record");
-		goto err_out;
-	}
-	if (!(mrec->flags & MFT_RECORD_IN_USE)) {
-		fprintf(stderr, "Error: $Volume has been deleted. Run "
-				"chkdsk to fix this.\n");
-		goto err_out;
-	}
-	ctx = ntfs_attr_get_search_ctx(NULL, mrec);
+	ctx = ntfs_attr_get_search_ctx(vol->vol_ni, NULL);
 	if (!ctx) {
 		perror("Failed to get attribute search context");
 		goto err_out;
@@ -314,39 +303,38 @@ static int change_label(ntfs_volume *vol
 		new_label[label_len / sizeof(ntfschar)] = cpu_to_le16(L'\0');
 	}
 	if (a) {
-		if (resize_resident_attribute_value(mrec, a, label_len)) {
+		if (resize_resident_attribute_value(ctx->mrec, a, label_len)) {
 			perror("Error resizing resident attribute");
 			goto err_out;
 		}
 	} else {
 		/* sizeof(resident attribute record header) == 24 */
 		int asize = (24 + label_len + 7) & ~7;
-		u32 biu = le32_to_cpu(mrec->bytes_in_use);
-		if (biu + asize > le32_to_cpu(mrec->bytes_allocated)) {
+		u32 biu = le32_to_cpu(ctx->mrec->bytes_in_use);
+		if (biu + asize > le32_to_cpu(ctx->mrec->bytes_allocated)) {
 			errno = ENOSPC;
 			perror("Error adding resident attribute");
 			goto err_out;
 		}
 		a = ctx->attr;
-		memmove((u8*)a + asize, a, biu - ((u8*)a - (u8*)mrec));
-		mrec->bytes_in_use = cpu_to_le32(biu + asize);
+		memmove((u8*)a + asize, a, biu - ((u8*)a - (u8*)ctx->mrec));
+		ctx->mrec->bytes_in_use = cpu_to_le32(biu + asize);
 		a->type = AT_VOLUME_NAME;
 		a->length = cpu_to_le32(asize);
 		a->non_resident = 0;
 		a->name_length = 0;
 		a->name_offset = cpu_to_le16(24);
 		a->flags = cpu_to_le16(0);
-		a->instance = mrec->next_attr_instance;
-		mrec->next_attr_instance = cpu_to_le16((le16_to_cpu(
-				mrec->next_attr_instance) + 1) & 0xffff);
+		a->instance = ctx->mrec->next_attr_instance;
+		ctx->mrec->next_attr_instance = cpu_to_le16((le16_to_cpu(
+				ctx->mrec->next_attr_instance) + 1) & 0xffff);
 		a->value_length = cpu_to_le32(label_len);
 		a->value_offset = a->name_offset;
 		a->resident_flags = 0;
 		a->reservedR = 0;
 	}
 	memcpy((u8*)a + le16_to_cpu(a->value_offset), new_label, label_len);
-	if (!opts.noaction &&
-			ntfs_mft_record_write(vol, (MFT_REF)FILE_Volume, mrec)) {
+	if (!opts.noaction && ntfs_inode_sync(vol->vol_ni)) {
 		perror("Error writing MFT Record to disk");
 		goto err_out;
 	}
@@ -354,8 +342,6 @@ static int change_label(ntfs_volume *vol
 err_out:
 	if (new_label)
 		free(new_label);
-	if (mrec)
-		free(mrec);
 	return result;
 }
 

Index: ntfsls.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsls.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- ntfsls.c	14 Aug 2005 15:44:48 -0000	1.28
+++ ntfsls.c	24 Sep 2005 22:54:55 -0000	1.29
@@ -534,7 +534,7 @@ static int list_dir_entry(ntfsls_dirent 
 		if (!ni)
 			goto release;
 
-		ctx = ntfs_attr_get_search_ctx(ni, ni->mrec);
+		ctx = ntfs_attr_get_search_ctx(ni, NULL);
 		if (!ctx)
 			goto release;
 
@@ -658,7 +658,7 @@ int main(int argc, char **argv)
 		ntfschar *name = NULL;
 		int name_len = 0;;
 
-		ctx = ntfs_attr_get_search_ctx (NULL, ni->mrec);
+		ctx = ntfs_attr_get_search_ctx(ni, NULL);
 		if (!ctx)
 			return -1;
 

Index: ntfsmove.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmove.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- ntfsmove.c	6 Jul 2005 22:47:19 -0000	1.13
+++ ntfsmove.c	24 Sep 2005 22:54:55 -0000	1.14
@@ -867,7 +867,8 @@ int main (int argc, char *argv[])
 
 	count = move_file (vol, inode, opts.location, 0);
 	if ((count > 0) && (!opts.nodirty)) {
-		if (ntfs_volume_set_flags (vol, VOLUME_IS_DIRTY) < 0) {
+		if (ntfs_volume_set_flags (vol, vol->flags | VOLUME_IS_DIRTY) <
+				0) {
 			Eprintf ("Couldn't mark volume dirty\n");
 		}
 		printf ("Relocated %lld bytes\n", count);
@@ -884,4 +885,3 @@ int main (int argc, char *argv[])
 	ntfs_umount (vol, FALSE);
 	return result;
 }
-

Index: ntfsresize.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -p -r1.88 -r1.89
--- ntfsresize.c	24 Sep 2005 20:12:36 -0000	1.88
+++ ntfsresize.c	24 Sep 2005 22:54:55 -0000	1.89
@@ -2249,7 +2249,7 @@ static void prepare_volume_fixup(ntfs_vo
 	printf("Schedule chkdsk for NTFS consistency check at Windows "
 		"boot time ...\n");
 
-	if (ntfs_volume_set_flags(vol, flags))
+	if (ntfs_volume_write_flags(vol, flags))
 		perr_exit("Failed to set $Volume dirty");
 
 	if (vol->dev->d_ops->sync(vol->dev) == -1)

Index: ntfsrm.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsrm.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- ntfsrm.c	20 Sep 2005 00:05:49 -0000	1.60
+++ ntfsrm.c	24 Sep 2005 22:54:55 -0000	1.61
@@ -2301,7 +2301,7 @@ static int utils_free_non_residents2 (nt
 	if (!bmp)
 		return -1;
 
-	ctx = ntfs_attr_get_search_ctx (NULL, inode->mrec);
+	ctx = ntfs_attr_get_search_ctx (inode, NULL);
 	if (!ctx) {
 		printf ("can't create a search context\n");
 		return -1;
@@ -2480,7 +2480,7 @@ static int ntfs_mft_resize_resident (ntf
 	//printf ("mft_free  = %d\n", mft_free);
 	//printf ("\n");
 
-	ctx = ntfs_attr_get_search_ctx (NULL, mrec);
+	ctx = ntfs_attr_get_search_ctx (inode, NULL);
 	if (!ctx)
 		goto done;
 

Index: ntfswipe.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfswipe.c,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- ntfswipe.c	6 Jul 2005 22:47:20 -0000	1.36
+++ ntfswipe.c	24 Sep 2005 22:54:55 -0000	1.37
@@ -1391,10 +1391,6 @@ int main (int argc, char *argv[])
 
 		printf ("%lld bytes were wiped\n", (long long)total);
 	}
-	if (ntfs_volume_set_flags (vol, VOLUME_IS_DIRTY) < 0) {
-		Eprintf ("Couldn't mark volume dirty\n");
-	}
-
 	result = 0;
 umount:
 	ntfs_umount (vol, FALSE);
@@ -1403,4 +1399,3 @@ free:
 		free (opts.bytes);
 	return result;
 }
-

Index: utils.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/utils.c,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- utils.c	10 Sep 2005 07:55:58 -0000	1.43
+++ utils.c	24 Sep 2005 22:54:55 -0000	1.44
@@ -903,7 +903,7 @@ int mft_next_record (struct mft_search_c
 				ctx->flags_match |= FEMR_FILE;
 
 			if (ctx->flags_search & FEMR_DIR) {
-				attr_ctx = ntfs_attr_get_search_ctx (NULL, ctx->inode->mrec);
+				attr_ctx = ntfs_attr_get_search_ctx (ctx->inode, NULL);
 				if (attr_ctx) {
 					if (ntfs_attr_lookup (AT_INDEX_ROOT, I30, 4, 0, 0, NULL, 0, attr_ctx) == 0)
 						ctx->flags_match |= FEMR_DIR;

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsclone.c,1.47,1.48

[Szabolcs S. <sz...@us...>]

Changes by: szaka

Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10062/ntfsprogs

Modified Files:
	ntfsclone.c 
Log Message:
Hint user the --rescue option if they have bad sectors


Index: ntfsclone.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.c,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- ntfsclone.c	13 Jul 2005 17:07:13 -0000	1.47
+++ ntfsclone.c	24 Sep 2005 21:36:51 -0000	1.48
@@ -53,6 +53,14 @@
 
 static const char *EXEC_NAME = "ntfsclone";
 
+static const char *bad_sectors_warning_msg =
+"*************************************************************************\n"
+"* WARNING: The disk has bad sector. This means physical damage on the   *\n"
+"* disk surface caused by deterioration, manufacturing faults or other   *\n"
+"* reason. The reliability of the disk may stay stable or degrade fast.  *\n"
+"* Use the --rescue option to efficiently save as much data as possible! *\n"
+"*************************************************************************\n";
+
 struct {
 	int verbose;
 	int quiet;
@@ -502,13 +510,16 @@ static void copy_cluster(int rescue, off
 
 	if (read_all(fd, buff, csize) == -1) {
 
-		u32 i;
-
-		if (!rescue || errno != EIO)
+		if (errno != EIO)
 			perr_exit("read_all");
-
-		for (i = 0; i < csize; i += NTFS_SECTOR_SIZE)
-			rescue_sector(fd, rescue_pos + i, buff + i);
+		else if (rescue){
+			u32 i;
+			for (i = 0; i < csize; i += NTFS_SECTOR_SIZE)
+				rescue_sector(fd, rescue_pos + i, buff + i);
+		} else {
+			Printf(bad_sectors_warning_msg);
+			err_exit("Disk is faulty, can't make full backup!");
+		}
 	}
 
 	if (opt.save_image) {

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs attrib.c,1.175,1.176 unistr.c,1.26,1.27

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/ntfsprogs/libntfs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30146

Modified Files:
	attrib.c unistr.c 
Log Message:
Fix a very(!) longstanding bug in ntfs_attr_find() and co.
Also reapply fix to unistr.c name collation.


Index: attrib.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/attrib.c,v
retrieving revision 1.175
retrieving revision 1.176
diff -u -p -r1.175 -r1.176
--- attrib.c	24 Sep 2005 13:06:59 -0000	1.175
+++ attrib.c	24 Sep 2005 20:28:23 -0000	1.176
@@ -1559,23 +1559,10 @@ static int ntfs_attr_find(const ATTR_TYP
 		const u8 *val, const u32 val_len, ntfs_attr_search_ctx *ctx)
 {
 	ATTR_RECORD *a;
-	ntfs_volume *vol;
-	ntfschar *upcase;
-	u32 upcase_len;
+	ntfs_volume *vol = ctx->ntfs_ino->vol;
+	ntfschar *upcase = vol->upcase;
+	u32 upcase_len = vol->upcase_len;
 
-	if (!ctx || !ctx->mrec || !ctx->attr) {
-		errno = EINVAL;
-		return -1;
-	}
-	if (ic == IGNORE_CASE) {
-		vol = ctx->ntfs_ino->vol;
-		upcase = vol->upcase;
-		upcase_len = vol->upcase_len;
-	} else {
-		vol = NULL;
-		upcase = NULL;
-		upcase_len = 0;
-	}
 	/*
 	 * Iterate over attributes in mft record starting at @ctx->attr, or the
 	 * attribute following that, if @ctx->is_first is TRUE.
@@ -2176,9 +2163,12 @@ int ntfs_attr_lookup(const ATTR_TYPES ty
 		const VCN lowest_vcn, const u8 *val, const u32 val_len,
 		ntfs_attr_search_ctx *ctx)
 {
+	ntfs_volume *vol;
 	ntfs_inode *base_ni;
 
-	if (!ctx || !ctx->mrec || !ctx->attr) {
+	if (!ctx || !ctx->mrec || !ctx->attr || (name && (!ctx->ntfs_ino ||
+			!(vol = ctx->ntfs_ino->vol) || !vol->upcase ||
+			!vol->upcase_len))) {
 		errno = EINVAL;
 		return -1;
 	}

Index: unistr.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/unistr.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- unistr.c	24 Sep 2005 15:29:54 -0000	1.26
+++ unistr.c	24 Sep 2005 20:28:23 -0000	1.27
@@ -115,7 +115,7 @@ int ntfs_names_collate(const ntfschar *n
 	ntfschar c1, c2;
 
 #ifdef DEBUG
-	if (!name1 || !name2 || (ic && !upcase && upcase_len)) {
+	if (!name1 || !name2 || (ic && (!upcase || !upcase_len))) {
 		Dputs("ntfs_names_collate received NULL pointer!");
 		exit(1);
 	}

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsresize.8.in,1.24,1.25 ntfsresize.c,1.87,1.88

[Szabolcs S. <sz...@us...>]

Changes by: szaka

Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26646/ntfsprogs

Modified Files:
	ntfsresize.8.in ntfsresize.c 
Log Message:
Emphasize that disk partitioning must use sector as the unit instead of 
cylinder to avoid shifting of the partition


Index: ntfsresize.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.8.in,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- ntfsresize.8.in	15 Aug 2005 21:44:10 -0000	1.24
+++ ntfsresize.8.in	24 Sep 2005 20:12:36 -0000	1.25
@@ -1,7 +1,7 @@
 .\" -*- nroff -*-
 .\" Copyright 2002-2005 by Szabolcs Szakacsits  All Rights Reserved.
 .\"
-.TH NTFSRESIZE 8 "Aug 2005" "ntfsprogs version @VERSION@"
+.TH NTFSRESIZE 8 "Sep 2005" "ntfsprogs version @VERSION@"
 .SH NAME
 ntfsresize \- resize an NTFS filesystem without data loss
 .SH SYNOPSIS
@@ -89,8 +89,10 @@ to enlarge the size of the filesystem.
 .SH PARTITIONING
 When recreating the partition by a disk partitioning tool,
 make sure you create it at the same 
-starting sector and with the same partition type as before. 
-Otherwise you won't be able to access your filesystem.
+starting sector and with the same partition type as before.
+Otherwise you won't be able to access your filesystem. Use the 'u'
+fdisk command to switch to the reliable sector unit from the 
+default cylinder one.
 
 Also make sure you set the bootable flag for the partition if it
 existed before. Failing to do so you might not be able to boot your

Index: ntfsresize.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- ntfsresize.c	3 Aug 2005 22:40:29 -0000	1.87
+++ ntfsresize.c	24 Sep 2005 20:12:36 -0000	1.88
@@ -59,13 +59,15 @@ static const char *resize_warning_msg =
 "crash may result major data loss!\n";
 
 static const char *resize_important_msg =
-"You can go on to shrink the device e.g. with 'fdisk'.\n"
-"IMPORTANT: When recreating the partition, make sure you\n"
-"  1)  create it with the same starting disk cylinder\n"
+"You can go on to shrink the device for example with Linux fdisk.\n"
+"IMPORTANT: When recreating the partition, make sure that you\n"
+"  1)  create it at the same disk sector (use sector as the unit!)\n"
 "  2)  create it with the same partition type (usually 7, HPFS/NTFS)\n"
 "  3)  do not make it smaller than the new NTFS filesystem size\n"
 "  4)  set the bootable flag for the partition if it existed before\n"
-"Otherwise you may lose your data or can't boot your computer from the disk!\n";
+"Otherwise you won't be able to access NTFS or can't boot from the disk!\n"
+"If you make a mistake and don't have a partition table backup then you\n"
+"can recover the partition table by TestDisk or Parted's rescue mode.\n";
 
 static const char *invalid_ntfs_msg =
 "Apparently device '%s' doesn't have a valid NTFS.\n"

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.280,1.281

[Szabolcs S. <sz...@us...>]

Changes by: szaka

Update of /cvsroot/linux-ntfs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26646

Modified Files:
	ChangeLog 
Log Message:
Emphasize that disk partitioning must use sector as the unit instead of 
cylinder to avoid shifting of the partition


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.280
retrieving revision 1.281
diff -u -p -r1.280 -r1.281
--- ChangeLog	24 Sep 2005 17:00:26 -0000	1.280
+++ ChangeLog	24 Sep 2005 20:12:36 -0000	1.281
@@ -49,6 +49,8 @@ xx/xx/2005 - 1.12.0-WIP
 	  ntfs_resident_attr_record_add.  (Yura)
 	- Fix attribute list adding for always resident attributes.  (Yura)
 	- New API for hard link creating: dir.[ch]::ntfs_link.  (Yura)
+	- ntfsresize: emphasize that disk partitioning must use sector as the
+	  unit instead of cylinder to avoid shifting of the partition.  (Szaka)
 
 08/08/2005 - 1.11.2 - ntfsdecrypt now works and lots of fixes and improvements.
 

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.c,1.32,1.33

[Yura P. <cha...@us...>]

Changes by: cha0smaster

Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21587/ntfsprogs

Modified Files:
	ntfsmount.c 
Log Message:
fix potential bug


Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- ntfsmount.c	24 Sep 2005 16:19:29 -0000	1.32
+++ ntfsmount.c	24 Sep 2005 17:06:35 -0000	1.33
@@ -103,18 +103,18 @@ static long ntfs_fuse_get_nr_free_mft_re
 	
 	if (!(ctx->state & NF_FreeMFTOutdate))
 		return ctx->free_mft;
-	buf = malloc(NTFS_BUF_SIZE);
+	buf = malloc(vol->cluster_size);
 	if (!buf)
 		return -ENOMEM;
 	while (1) {
 		int i, j;
 
 		br = ntfs_attr_pread(vol->mftbmp_na, total,
-				NTFS_BLOCK_SIZE, buf);
+				vol->cluster_size, buf);
 		if (!br)
 			break;
 		total += br;
-		for (i = 0; i < NTFS_BLOCK_SIZE; i++)
+		for (i = 0; i < br; i++)
 			for (j = 0; j < 8; j++)
 				if (!((buf[i] >> j) & 1))
 					nr_free++;
@@ -135,18 +135,18 @@ static long ntfs_fuse_get_nr_free_cluste
 
 	if (!(ctx->state & NF_FreeClustersOutdate))
 		return ctx->free_clusters;
-	buf = malloc(NTFS_BUF_SIZE);
+	buf = malloc(vol->cluster_size);
 	if (!buf)
 		return -ENOMEM;
 	while (1) {
 		int i, j;
 
 		br = ntfs_attr_pread(vol->lcnbmp_na, total,
-				NTFS_BLOCK_SIZE, buf);
+				vol->cluster_size, buf);
 		if (!br)
 			break;
 		total += br;
-		for (i = 0; i < NTFS_BLOCK_SIZE; i++)
+		for (i = 0; i < br; i++)
 			for (j = 0; j < 8; j++)
 				if (!((buf[i] >> j) & 1))
 					nr_free++;