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

[Linux-NTFS-cvs] CVS: ntfsprogs configure.ac,1.85,1.86

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

Changes by: antona

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

Modified Files:
	configure.ac 
Log Message:
Argh, found one compiler that gives a minor version including text so cut it
off the versions.


Index: configure.ac
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/configure.ac,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- configure.ac	15 Oct 2005 09:53:36 -0000	1.85
+++ configure.ac	15 Oct 2005 10:16:26 -0000	1.86
@@ -240,9 +240,9 @@ fi
 
 # Check for gcc version being >= 2.96.
 AC_MSG_CHECKING(version of $_cc)
-cc_version=`$_cc -dumpversion`
-cc_major=`echo $cc_version | cut -d'.' -f1`
-cc_minor=`echo $cc_version | cut -d'.' -f2`
+cc_version=`$_cc -dumpversion 2> /dev/null | head -n 1`
+cc_major=`echo $cc_version | cut -d'.' -f1 | sed s/"^\([0-9]+\).*$"/"\1"/`
+cc_minor=`echo $cc_version | cut -d'.' -f2 | sed s/"^\([0-9]+\).*$"/"\1"/`
 if test -z "$cc_version"; then
 	cc_version="v. ?.??"
 	cc_major=1

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.299,1.300 configure.ac,1.84,1.85 getgccver,1.4,NONE

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

Changes by: antona

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

Modified Files:
	ChangeLog configure.ac 
Removed Files:
	getgccver 
Log Message:
Remove getgccver script and just use -dumpversion option to get the version
directly inside configure.ac.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.299
retrieving revision 1.300
diff -u -p -r1.299 -r1.300
--- ChangeLog	13 Oct 2005 08:26:02 -0000	1.299
+++ ChangeLog	15 Oct 2005 09:53:36 -0000	1.300
@@ -3,6 +3,9 @@ xx/xx/2005 - 1.12.2-WIP
 	- Temporarily disable use of the legal ansi character checking in
 	  libntfs/unistr.c::ntfs_names_collate() pending a proper fix at some
 	  point.  (Anton)
+	- Remove getgccver script and just get the version with the simple gcc
+	  option -dumpversion.  I wish I had known about it earlier!  Tested on
+	  various architectures and versions from 2.95 to 4.0.1.  (Anton)
 
 10/10/2005 - 1.12.1 - Minor fix to location of mount.ntfs-fuse and mkfs.ntfs.
 

Index: configure.ac
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/configure.ac,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- configure.ac	13 Oct 2005 08:26:02 -0000	1.84
+++ configure.ac	15 Oct 2005 09:53:36 -0000	1.85
@@ -209,7 +209,7 @@ if test "$enable_crypto" != "no"; then
 		fi
 	])
 	have_libgnutls=false
-	AM_PATH_LIBGNUTLS(1.2.3, [ have_libgnutls=true ],
+	AM_PATH_LIBGNUTLS(1.2.8, [ have_libgnutls=true ],
 	[
 		if test "$enable_crypto" = "yes"; then
 			AC_MSG_ERROR([Linux-NTFS crypto code requires the gnutls library.])
@@ -240,7 +240,7 @@ fi
 
 # Check for gcc version being >= 2.96.
 AC_MSG_CHECKING(version of $_cc)
-cc_version=`$srcdir/getgccver $_cc`
+cc_version=`$_cc -dumpversion`
 cc_major=`echo $cc_version | cut -d'.' -f1`
 cc_minor=`echo $cc_version | cut -d'.' -f2`
 if test -z "$cc_version"; then

--- getgccver DELETED ---

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

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

Changes by: antona

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

Modified Files:
	layout.h 
Log Message:
Add a comment about the valid size for $EFS attribute value.


Index: layout.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/layout.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- layout.h	26 Sep 2005 13:11:01 -0000	1.28
+++ layout.h	15 Oct 2005 09:15:46 -0000	1.29
@@ -2386,6 +2386,9 @@ typedef struct {
  *
  * Note all the below are best guesses so may have mistakes/inaccuracies.
  * Corrections/clarifications/additions are always welcome!
+ *
+ * Ntfs.sys takes an EFS value length of <= 0x54 or > 0x40000 to BSOD, i.e. it
+ * is invalid.
  */
 
 /* The header of the 0x100 attribute named "$EFS". */

[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs unistr.h,1.7,1.8

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

Changes by: antona

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

Modified Files:
	unistr.h 
Log Message:
Temporarily disable use of the legal ansi character checking in
libntfs/unistr.c::ntfs_names_collate() pending a proper fix at some
point.  (Anton)


Index: unistr.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/unistr.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- unistr.h	24 Sep 2005 22:54:55 -0000	1.7
+++ unistr.h	13 Oct 2005 08:26:02 -0000	1.8
@@ -26,8 +26,6 @@
 #include "types.h"
 #include "layout.h"
 
-extern const u8 legal_ansi_char_array[0x40];
-
 extern BOOL ntfs_names_are_equal(const ntfschar *s1, size_t s1_len,
 		const ntfschar *s2, size_t s2_len, const IGNORE_CASE_BOOL ic,
 		const ntfschar *upcase, const u32 upcase_size);

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs unistr.c,1.29,1.30

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

Changes by: antona

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

Modified Files:
	unistr.c 
Log Message:
Temporarily disable use of the legal ansi character checking in
libntfs/unistr.c::ntfs_names_collate() pending a proper fix at some
point.  (Anton)


Index: unistr.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/unistr.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- unistr.c	28 Sep 2005 13:47:48 -0000	1.29
+++ unistr.c	13 Oct 2005 08:26:02 -0000	1.30
@@ -53,7 +53,8 @@
  * This is used by the name collation functions to quickly determine what
  * characters are (in)valid.
  */
-const u8 legal_ansi_char_array[0x40] = {
+#if 0
+static const u8 legal_ansi_char_array[0x40] = {
 	0x00, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
 	0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10,
 
@@ -66,6 +67,7 @@ const u8 legal_ansi_char_array[0x40] = {
 	0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17,
 	0x17, 0x17, 0x04, 0x16, 0x18, 0x16, 0x18, 0x18,
 };
+#endif
 
 /**
  * ntfs_names_are_equal - compare two Unicode names for equality
@@ -118,8 +120,9 @@ BOOL ntfs_names_are_equal(const ntfschar
  */
 int ntfs_names_collate(const ntfschar *name1, const u32 name1_len,
 		const ntfschar *name2, const u32 name2_len,
-		const int err_val, const IGNORE_CASE_BOOL ic,
-		const ntfschar *upcase, const u32 upcase_len)
+		const int err_val __attribute__((__unused__)),
+		const IGNORE_CASE_BOOL ic, const ntfschar *upcase,
+		const u32 upcase_len)
 {
 	u32 cnt;
 	ntfschar c1, c2;
@@ -130,8 +133,7 @@ int ntfs_names_collate(const ntfschar *n
 		exit(1);
 	}
 #endif
-	for (cnt = 0; cnt < min(name1_len, name2_len); ++cnt)
-	{
+	for (cnt = 0; cnt < min(name1_len, name2_len); ++cnt) {
 		c1 = le16_to_cpu(*name1);
 		name1++;
 		c2 = le16_to_cpu(*name2);
@@ -142,8 +144,10 @@ int ntfs_names_collate(const ntfschar *n
 			if (c2 < upcase_len)
 				c2 = le16_to_cpu(upcase[c2]);
 		}
+#if 0
 		if (c1 < 64 && legal_ansi_char_array[c1] & 8)
 			return err_val;
+#endif
 		if (c1 < c2)
 			return -1;
 		if (c1 > c2)
@@ -154,9 +158,11 @@ int ntfs_names_collate(const ntfschar *n
 	if (name1_len == name2_len)
 		return 0;
 	/* name1_len > name2_len */
+#if 0
 	c1 = le16_to_cpu(*name1);
 	if (c1 < 64 && legal_ansi_char_array[c1] & 8)
 		return err_val;
+#endif
 	return 1;
 }
 

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.298,1.299 configure.ac,1.83,1.84

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

Changes by: antona

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

Modified Files:
	ChangeLog configure.ac 
Log Message:
Temporarily disable use of the legal ansi character checking in
libntfs/unistr.c::ntfs_names_collate() pending a proper fix at some
point.  (Anton)


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -p -r1.298 -r1.299
--- ChangeLog	10 Oct 2005 13:04:33 -0000	1.298
+++ ChangeLog	13 Oct 2005 08:26:02 -0000	1.299
@@ -1,3 +1,9 @@
+xx/xx/2005 - 1.12.2-WIP
+
+	- Temporarily disable use of the legal ansi character checking in
+	  libntfs/unistr.c::ntfs_names_collate() pending a proper fix at some
+	  point.  (Anton)
+
 10/10/2005 - 1.12.1 - Minor fix to location of mount.ntfs-fuse and mkfs.ntfs.
 
 	- Fix hardcoded location for uninstalling mount.ntfs-fuse hardlink to

Index: configure.ac
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/configure.ac,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -p -r1.83 -r1.84
--- configure.ac	10 Oct 2005 12:55:11 -0000	1.83
+++ configure.ac	13 Oct 2005 08:26:02 -0000	1.84
@@ -22,7 +22,7 @@
 #
 
 AC_PREREQ(2.59)
-AC_INIT([ntfsprogs],[1.12.1],[lin...@li...])
+AC_INIT([ntfsprogs],[1.12.2-WIP],[lin...@li...])
 
 #
 # Before making a release, the LTVERSION string should be modified.
@@ -50,7 +50,7 @@ AC_INIT([ntfsprogs],[1.12.1],[linux-ntfs
 #
 #   - If the interface is the same as the previous version, change to C:R+1:A
 #
-LTVERSION_LIBNTFS="8:1:0"
+LTVERSION_LIBNTFS="9:0:0"
 AC_SUBST(LTVERSION_LIBNTFS)
 
 AC_CANONICAL_HOST([])

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs mkntfs.c,1.71,1.72 ntfsclone.c,1.55,1.56 ntfscmp.c,1.8,1.9 ntfsdump_logfile.c,1.30,1.31 ntfsfix.c,1.21,1.22 ntfsmftalloc.c,1.7,1.8 ntfsresize.c,1.96,1.97 ntfstruncate.c,1.28,1.29

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

Changes by: flatcap

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

Modified Files:
	mkntfs.c ntfsclone.c ntfscmp.c ntfsdump_logfile.c ntfsfix.c 
	ntfsmftalloc.c ntfsresize.c ntfstruncate.c 
Log Message:
tidy up some __attribute__ usage


Index: mkntfs.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/mkntfs.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- mkntfs.c	7 Oct 2005 14:10:57 -0000	1.71
+++ mkntfs.c	12 Oct 2005 11:52:40 -0000	1.72
@@ -225,8 +225,7 @@ struct {
 /**
  * mkDprintf - debugging output (-vv); overridden by quiet (-q)
  */
-static void mkDprintf(const char *fmt, ...)
-		__attribute__((format(printf, 1, 2)));
+__attribute__((format(printf, 1, 2)))
 static void mkDprintf(const char *fmt, ...)
 {
 	va_list ap;
@@ -262,9 +261,8 @@ GEN_PRINTF(Qprintf, stdout, &opts.quiet,
 /**
  * err_exit - error output and terminate; ignores quiet (-q)
  */
-static void err_exit(const char *fmt, ...)
-		__attribute__((noreturn))
-		__attribute__((format(printf, 1, 2)));
+__attribute__((noreturn))
+__attribute__((format(printf, 1, 2)))
 static void err_exit(const char *fmt, ...)
 {
 	va_list ap;
@@ -300,7 +298,7 @@ static void license(void)
 /**
  * usage - print a list of the parameters to the program
  */
-static void usage(void) __attribute__ ((noreturn));
+__attribute__ ((noreturn))
 static void usage(void)
 {
 	copyright();
@@ -987,7 +985,7 @@ static void dump_attr_record(ATTR_RECORD
 /**
  * dump_mft_record
  */
-static void dump_mft_record(MFT_RECORD *m) __attribute__((unused));
+__attribute__((unused))
 static void dump_mft_record(MFT_RECORD *m)
 {
 	ATTR_RECORD *a;

Index: ntfsclone.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- ntfsclone.c	7 Oct 2005 14:10:57 -0000	1.55
+++ ntfsclone.c	12 Oct 2005 11:52:41 -0000	1.56
@@ -177,8 +177,7 @@ GEN_PRINTF(Vprintf, msg_out, &opt.verbos
 GEN_PRINTF(Qprintf, msg_out, &opt.quiet,   FALSE)
 static GEN_PRINTF(Printf,  msg_out, NULL,         FALSE)
 
-static void perr_printf(const char *fmt, ...)
-		__attribute__((format(printf, 1, 2)));
+__attribute__((format(printf, 1, 2)))
 static void perr_printf(const char *fmt, ...)
 {
 	va_list ap;
@@ -192,8 +191,7 @@ static void perr_printf(const char *fmt,
 	fflush(msg_out);
 }
 
-static void err_printf(const char *fmt, ...)
-		__attribute__((format(printf, 1, 2)));
+__attribute__((format(printf, 1, 2)))
 static void err_printf(const char *fmt, ...)
 {
 	va_list ap;
@@ -205,9 +203,8 @@ static void err_printf(const char *fmt, 
 	fflush(msg_out);
 }
 
-static int err_exit(const char *fmt, ...)
-		__attribute__((noreturn))
-		__attribute__((format(printf, 1, 2)));
+__attribute__((noreturn))
+__attribute__((format(printf, 1, 2)))
 static int err_exit(const char *fmt, ...)
 {
 	va_list ap;
@@ -220,9 +217,8 @@ static int err_exit(const char *fmt, ...
 	exit(1);
 }
 
-static int perr_exit(const char *fmt, ...)
-		__attribute__((noreturn))
-		__attribute__((format(printf, 1, 2)));
+__attribute__((noreturn))
+__attribute__((format(printf, 1, 2)))
 static int perr_exit(const char *fmt, ...)
 {
 	va_list ap;
@@ -238,7 +234,7 @@ static int perr_exit(const char *fmt, ..
 }
 
 
-static void usage(void)	__attribute__((noreturn));
+__attribute__((noreturn))
 static void usage(void)
 {
 	Eprintf("\nUsage: %s [OPTIONS] SOURCE\n"

Index: ntfscmp.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscmp.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- ntfscmp.c	11 Oct 2005 23:09:07 -0000	1.8
+++ ntfscmp.c	12 Oct 2005 11:52:41 -0000	1.9
@@ -67,8 +67,7 @@ GEN_PRINTF(Eprintf, stderr, NULL, FALSE)
 GEN_PRINTF(Vprintf, stdout, &opt.verbose, TRUE)
 GEN_PRINTF(Qprintf, stdout, NULL, FALSE)
 
-static void perr_printf(int newline, const char *fmt, ...)
-		__attribute__((format(printf, 2, 3)));
+__attribute__((format(printf, 2, 3)))
 static void perr_printf(int newline, const char *fmt, ...)
 {
 	va_list ap;
@@ -88,8 +87,7 @@ static void perr_printf(int newline, con
 #define perr_print(...)     perr_printf(0, __VA_ARGS__)
 #define perr_println(...)   perr_printf(1, __VA_ARGS__)
 
-static void err_printf(const char *fmt, ...)
-		__attribute__((format(printf, 1, 2)));
+__attribute__((format(printf, 1, 2)))
 static void err_printf(const char *fmt, ...)
 {
 	va_list ap;
@@ -107,9 +105,8 @@ static void err_printf(const char *fmt, 
  *
  * Print and error message and exit the program.
  */
-static int err_exit(const char *fmt, ...)
-		__attribute__((noreturn))
-		__attribute__((format(printf, 1, 2)));
+__attribute__((noreturn))
+__attribute__((format(printf, 1, 2)))
 static int err_exit(const char *fmt, ...)
 {
 	va_list ap;
@@ -128,9 +125,8 @@ static int err_exit(const char *fmt, ...
  *
  * Print and error message and exit the program
  */
-static int perr_exit(const char *fmt, ...)
-		__attribute__((noreturn))
-		__attribute__((format(printf, 1, 2)));
+__attribute__((noreturn))
+__attribute__((format(printf, 1, 2)))
 static int perr_exit(const char *fmt, ...)
 {
 	va_list ap;
@@ -153,7 +149,7 @@ static int perr_exit(const char *fmt, ..
  *
  * Return:  none
  */
-static void usage(void) __attribute__((noreturn));
+__attribute__((noreturn))
 static void usage(void)
 {
 

Index: ntfsdump_logfile.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsdump_logfile.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- ntfsdump_logfile.c	7 Oct 2005 14:10:57 -0000	1.30
+++ ntfsdump_logfile.c	12 Oct 2005 11:52:41 -0000	1.31
@@ -120,10 +120,9 @@ static int logfile_close(logfile_file *l
  * Use when you wish to exit and collate all the cleanups together.
  * if you don't have some parameter to pass, just pass NULL.
  */
-void device_err_exit(ntfs_volume *vol, ntfs_inode *ni,
-		ntfs_attr *na, const char *fmt, ...) __attribute__ ((noreturn))
-		__attribute__ ((format(printf, 4, 5)));
-void device_err_exit(ntfs_volume *vol, ntfs_inode *ni,
+__attribute__ ((noreturn))
+__attribute__ ((format(printf, 4, 5)))
+static void device_err_exit(ntfs_volume *vol, ntfs_inode *ni,
 		ntfs_attr *na, const char *fmt, ...)
 {
 	va_list ap;
@@ -148,9 +147,9 @@ void device_err_exit(ntfs_volume *vol, n
 /**
  * log_err_exit -
  */
-void log_err_exit(u8 *buf, const char *fmt, ...) __attribute__ ((noreturn))
-		__attribute__((format(printf, 2, 3)));
-void log_err_exit(u8 *buf, const char *fmt, ...)
+__attribute__ ((noreturn))
+__attribute__((format(printf, 2, 3)))
+static void log_err_exit(u8 *buf, const char *fmt, ...)
 {
 	va_list ap;
 
@@ -169,8 +168,8 @@ void log_err_exit(u8 *buf, const char *f
 /**
  * usage -
  */
-void usage(const char *exec_name) __attribute__ ((noreturn));
-void usage(const char *exec_name)
+__attribute__ ((noreturn))
+static void usage(const char *exec_name)
 {
 	Eprintf("%s v%s (libntfs %s) - Interpret and display information "
 			"about the journal\n($LogFile) of an NTFS volume.\n"

Index: ntfsfix.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsfix.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- ntfsfix.c	7 Oct 2005 14:10:57 -0000	1.21
+++ ntfsfix.c	12 Oct 2005 11:52:41 -0000	1.22
@@ -95,7 +95,7 @@ struct {
 	char *volume;
 } opt;
 
-static int usage(void) __attribute__((noreturn));
+__attribute__((noreturn))
 static int usage(void)
 {
 	printf("%s v%s (libntfs %s)\n"
@@ -113,7 +113,7 @@ static int usage(void)
 	exit(1);
 }
 
-static void version(void) __attribute__((noreturn));
+__attribute__((noreturn))
 static void version(void)
 {
 	printf("%s v%s\n\n"

Index: ntfsmftalloc.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmftalloc.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ntfsmftalloc.c	7 Oct 2005 14:10:57 -0000	1.7
+++ ntfsmftalloc.c	12 Oct 2005 11:52:41 -0000	1.8
@@ -91,8 +91,7 @@ static struct {
 /**
  * mkDprintf - debugging output (-vv); overridden by quiet (-q)
  */
-static void mkDprintf(const char *fmt, ...)
-		__attribute__((format(printf, 1, 2)));
+__attribute__((format(printf, 1, 2)))
 static void mkDprintf(const char *fmt, ...)
 {
 	va_list ap;
@@ -128,8 +127,8 @@ GEN_PRINTF(Qprintf, stdout, &opts.quiet,
 /**
  * err_exit - error output and terminate; ignores quiet (-q)
  */
-static void err_exit(const char *fmt, ...) __attribute__((noreturn))
-		__attribute__((format(printf, 1, 2)));
+__attribute__((noreturn))
+__attribute__((format(printf, 1, 2)))
 static void err_exit(const char *fmt, ...)
 {
 	va_list ap;
@@ -167,8 +166,8 @@ static void license(void)
 /**
  * usage - print a list of the parameters to the program
  */
-void usage(void) __attribute__ ((noreturn));
-void usage (void)
+__attribute__ ((noreturn))
+static void usage (void)
 {
 	copyright();
 	fprintf(stderr, "Usage: %s [options] device [base-mft-record]\n"

Index: ntfsresize.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- ntfsresize.c	7 Oct 2005 14:10:57 -0000	1.96
+++ ntfsresize.c	12 Oct 2005 11:52:41 -0000	1.97
@@ -220,8 +220,7 @@ static s64 rounded_up_division(s64 numer
  *
  * Print an error message.
  */
-static void perr_printf(const char *fmt, ...)
-		__attribute__((format(printf, 1, 2)));
+__attribute__((format(printf, 1, 2)))
 static void perr_printf(const char *fmt, ...)
 {
 	va_list ap;
@@ -236,8 +235,7 @@ static void perr_printf(const char *fmt,
 	fflush(stderr);
 }
 
-static void err_printf(const char *fmt, ...)
-		__attribute__((format(printf, 1, 2)));
+__attribute__((format(printf, 1, 2)))
 static void err_printf(const char *fmt, ...)
 {
 	va_list ap;
@@ -255,9 +253,8 @@ static void err_printf(const char *fmt, 
  *
  * Print and error message and exit the program.
  */
-static int err_exit(const char *fmt, ...)
-		__attribute__((noreturn))
-		__attribute__((format(printf, 1, 2)));
+__attribute__((noreturn))
+__attribute__((format(printf, 1, 2)))
 static int err_exit(const char *fmt, ...)
 {
 	va_list ap;
@@ -276,9 +273,8 @@ static int err_exit(const char *fmt, ...
  *
  * Print and error message and exit the program
  */
-static int perr_exit(const char *fmt, ...)
-		__attribute__((noreturn))
-		__attribute__((format(printf, 1, 2)));
+__attribute__((noreturn))
+__attribute__((format(printf, 1, 2)))
 static int perr_exit(const char *fmt, ...)
 {
 	va_list ap;
@@ -301,7 +297,7 @@ static int perr_exit(const char *fmt, ..
  *
  * Return:  none
  */
-static void usage(void) __attribute__((noreturn));
+__attribute__((noreturn))
 static void usage(void)
 {
 

Index: ntfstruncate.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfstruncate.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- ntfstruncate.c	7 Oct 2005 14:10:57 -0000	1.28
+++ ntfstruncate.c	12 Oct 2005 11:52:42 -0000	1.29
@@ -100,8 +100,7 @@ struct {
 /**
  * mkDprintf - debugging output (-vv); overridden by quiet (-q)
  */
-static void mkDprintf(const char *fmt, ...)
-		__attribute__((format(printf, 1, 2)));
+__attribute__((format(printf, 1, 2)))
 static void mkDprintf(const char *fmt, ...)
 {
 	va_list ap;
@@ -137,9 +136,8 @@ GEN_PRINTF(Qprintf, stdout, &opts.quiet,
 /**
  * err_exit - error output and terminate; ignores quiet (-q)
  */
-static void err_exit(const char *fmt, ...)
-		__attribute__((noreturn))
-		__attribute__((format(printf, 1, 2)));
+__attribute__((noreturn))
+__attribute__((format(printf, 1, 2)))
 static void err_exit(const char *fmt, ...)
 {
 	va_list ap;
@@ -174,8 +172,8 @@ static void license(void)
 /**
  * usage - print a list of the parameters to the program
  */
-void usage(void) __attribute__ ((noreturn));
-void usage (void)
+__attribute__ ((noreturn))
+static void usage (void)
 {
 	copyright();
 	fprintf(stderr, "Usage: %s [options] device inode [attr-type "

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfscmp.c,1.7,1.8

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

Changes by: flatcap

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

Modified Files:
	ntfscmp.c 
Log Message:
fix build bug - wouldn't build without DEBUG defined


Index: ntfscmp.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscmp.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- ntfscmp.c	9 Oct 2005 12:53:44 -0000	1.7
+++ ntfscmp.c	11 Oct 2005 23:09:07 -0000	1.8
@@ -123,7 +123,6 @@ static int err_exit(const char *fmt, ...
 	exit(1);
 }
 
-#ifdef DEBUG
 /**
  * perr_exit
  *
@@ -146,7 +145,6 @@ static int perr_exit(const char *fmt, ..
 	fflush(stderr);
 	exit(1);
 }
-#endif /* DEBUG */
 
 /**
  * usage - Print a list of the parameters to the program

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.297,1.298

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

Changes by: antona

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

Modified Files:
	ChangeLog 
Log Message:
Forgot to update the release date!


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.297
retrieving revision 1.298
diff -u -p -r1.297 -r1.298
--- ChangeLog	10 Oct 2005 12:55:11 -0000	1.297
+++ ChangeLog	10 Oct 2005 13:04:33 -0000	1.298
@@ -1,4 +1,4 @@
-08/10/2005 - 1.12.1 - Minor fix to location of mount.ntfs-fuse and mkfs.ntfs.
+10/10/2005 - 1.12.1 - Minor fix to location of mount.ntfs-fuse and mkfs.ntfs.
 
 	- Fix hardcoded location for uninstalling mount.ntfs-fuse hardlink to
 	  match the relocatable location for installing it.  (Anton, Szaka)

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs volume.c,1.56,1.57

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

Changes by: antona

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

Modified Files:
	volume.c 
Log Message:
- Revert patch from Christophe applied by Yura.
- Provide a realpath() alternative for systems which do not have it.
  This is _much_ nicer as it avoids the horrible #ifdef gunk in the code...


Index: volume.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/volume.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -p -r1.56 -r1.57
--- volume.c	10 Oct 2005 11:04:56 -0000	1.56
+++ volume.c	10 Oct 2005 12:55:11 -0000	1.57
@@ -1264,6 +1264,17 @@ int ntfs_umount(ntfs_volume *vol,
 }
 
 #ifdef HAVE_MNTENT_H
+
+#ifndef HAVE_REALPATH
+/* If there is no realpath() on the system, provide a dummy one. */
+static char *realpath(const char *path, char *resolved_path)
+{
+	strncpy(resolved_path, path, PATH_MAX);
+	resolved_path[PATH_MAX] = '\0';
+	return resolved_path;
+}
+#endif
+
 /**
  * Internal:
  *
@@ -1277,13 +1288,10 @@ int ntfs_umount(ntfs_volume *vol,
 static int ntfs_mntent_check(const char *file, unsigned long *mnt_flags)
 {
 	struct mntent *mnt;
-#ifdef HAVE_REALPATH
 	char *real_file = NULL, *real_fsname = NULL;
-#endif
 	FILE *f;
 	int err = 0;
 
-#ifdef HAVE_REALPATH
 	real_file = malloc(PATH_MAX + 1);
 	if (!real_file)
 		return -1;
@@ -1296,21 +1304,15 @@ static int ntfs_mntent_check(const char 
 		err = errno;
 		goto exit;
 	}
-#endif
 	if (!(f = setmntent(MOUNTED, "r"))) {
 		err = errno;
 		goto exit;
 	}
 	while ((mnt = getmntent(f))) {
-#ifdef HAVE_REALPATH
 		if (!realpath(mnt->mnt_fsname, real_fsname))
 			continue;
 		if (!strcmp(real_file, real_fsname))
 			break;
-#else
-		if (!strcmp(file, mnt->mnt_fsname))
-			break;
-#endif
 	}
 	endmntent(f);
 	if (!mnt)
@@ -1323,12 +1325,9 @@ static int ntfs_mntent_check(const char 
 		*mnt_flags |= NTFS_MF_READONLY;
 #endif
 exit:
-#ifdef HAVE_REALPATH
-	if (real_file)
-		free(real_file);
+	free(real_file);
 	if (real_fsname)
 		free(real_fsname);
-#endif
 	if (err) {
 		errno = err;
 		return -1;

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.296,1.297 configure.ac,1.82,1.83

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

Changes by: antona

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

Modified Files:
	ChangeLog configure.ac 
Log Message:
- Revert patch from Christophe applied by Yura.
- Provide a realpath() alternative for systems which do not have it.
  This is _much_ nicer as it avoids the horrible #ifdef gunk in the code...


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.296
retrieving revision 1.297
diff -u -p -r1.296 -r1.297
--- ChangeLog	9 Oct 2005 12:53:44 -0000	1.296
+++ ChangeLog	10 Oct 2005 12:55:11 -0000	1.297
@@ -8,6 +8,9 @@
 	  into alternate chroot / other system still works.  (Anton)
 	- ntfscmp: fix some corner cases and all memory leaks; handle corrupt
 	  NTFS more gracefully.  (Szaka)
+	- If the system does not have realpath(), supply our own dummy version
+	  which just copies the string without any kind of checking or
+	  expansion.  (Anton)
 
 07/10/2005 - 1.12.0 - Lots of fixes and enhancements!
 

Index: configure.ac
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/configure.ac,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- configure.ac	10 Oct 2005 11:04:56 -0000	1.82
+++ configure.ac	10 Oct 2005 12:55:11 -0000	1.83
@@ -317,9 +317,9 @@ AC_FUNC_STAT
 AC_FUNC_STRFTIME
 AC_FUNC_UTIME_NULL
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([atexit fdatasync hasmntopt memmove memset realpath regcomp setlocale \
-	strcasecmp strchr strdup strerror strtol strtoul utime mbsinit \
-	setxattr getopt_long ])
+AC_CHECK_FUNCS([atexit fdatasync getopt_long hasmntopt mbsinit memmove memset \
+	realpath regcomp setlocale setxattr strcasecmp strchr strdup strerror \
+	strtol strtoul utime])
 
 # Makefiles to be created by configure.
 AC_CONFIG_FILES([

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.c,1.40,1.41

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

Changes by: antona

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

Modified Files:
	ntfsmount.c 
Log Message:
- Revert patch from Christophe applied by Yura.
- Provide a realpath() alternative for systems which do not have it.
  This is _much_ nicer as it avoids the horrible #ifdef gunk in the code...


Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- ntfsmount.c	10 Oct 2005 11:04:56 -0000	1.40
+++ ntfsmount.c	10 Oct 2005 12:55:11 -0000	1.41
@@ -1336,6 +1336,16 @@ static void usage(void)
 	Eprintf("Default options are: \"%s\".\n", def_opts);
 }
 
+#ifndef HAVE_REALPATH
+/* If there is no realpath() on the system, provide a dummy one. */
+static char *realpath(const char *path, char *resolved_path)
+{
+	strncpy(resolved_path, path, PATH_MAX);
+	resolved_path[PATH_MAX] = '\0';
+	return resolved_path;
+}
+#endif
+
 /**
  * parse_options - Read and validate the programs command line
  *
@@ -1375,7 +1385,6 @@ static int parse_options(int argc, char 
 					err++;
 					break;
 				}
-#ifdef HAVE_REALPATH
 				/* We don't want relative path in /etc/mtab. */
 				if (argv[optind - 1][0] != '/') {
 					if (!realpath(argv[optind - 1],
@@ -1388,9 +1397,6 @@ static int parse_options(int argc, char 
 					}
 				} else
 					strcpy(opts.device, argv[optind - 1]);
-#else
-				strcpy(opts.device, argv[optind - 1]);
-#endif
 			} else if (!opts.mnt_point)
 				opts.mnt_point = argv[optind - 1];
 			else {

[Linux-NTFS-cvs] CVS: ntfsprogs configure.ac,1.81,1.82

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

Changes by: cha0smaster

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

Modified Files:
	configure.ac 
Log Message:
Apply patch from Christophe.


Index: configure.ac
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/configure.ac,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -p -r1.81 -r1.82
--- configure.ac	7 Oct 2005 23:01:23 -0000	1.81
+++ configure.ac	10 Oct 2005 11:04:56 -0000	1.82
@@ -317,7 +317,7 @@ AC_FUNC_STAT
 AC_FUNC_STRFTIME
 AC_FUNC_UTIME_NULL
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([atexit fdatasync hasmntopt memmove memset regcomp setlocale \
+AC_CHECK_FUNCS([atexit fdatasync hasmntopt memmove memset realpath regcomp setlocale \
 	strcasecmp strchr strdup strerror strtol strtoul utime mbsinit \
 	setxattr getopt_long ])
 

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs volume.c,1.55,1.56

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

Changes by: cha0smaster

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

Modified Files:
	volume.c 
Log Message:
Apply patch from Christophe.


Index: volume.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/volume.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- volume.c	28 Sep 2005 13:47:48 -0000	1.55
+++ volume.c	10 Oct 2005 11:04:56 -0000	1.56
@@ -1277,10 +1277,13 @@ int ntfs_umount(ntfs_volume *vol,
 static int ntfs_mntent_check(const char *file, unsigned long *mnt_flags)
 {
 	struct mntent *mnt;
+#ifdef HAVE_REALPATH
 	char *real_file = NULL, *real_fsname = NULL;
+#endif
 	FILE *f;
 	int err = 0;
 
+#ifdef HAVE_REALPATH
 	real_file = malloc(PATH_MAX + 1);
 	if (!real_file)
 		return -1;
@@ -1293,15 +1296,21 @@ static int ntfs_mntent_check(const char 
 		err = errno;
 		goto exit;
 	}
+#endif
 	if (!(f = setmntent(MOUNTED, "r"))) {
 		err = errno;
 		goto exit;
 	}
 	while ((mnt = getmntent(f))) {
+#ifdef HAVE_REALPATH
 		if (!realpath(mnt->mnt_fsname, real_fsname))
 			continue;
 		if (!strcmp(real_file, real_fsname))
 			break;
+#else
+		if (!strcmp(file, mnt->mnt_fsname))
+			break;
+#endif
 	}
 	endmntent(f);
 	if (!mnt)
@@ -1314,10 +1323,12 @@ static int ntfs_mntent_check(const char 
 		*mnt_flags |= NTFS_MF_READONLY;
 #endif
 exit:
+#ifdef HAVE_REALPATH
 	if (real_file)
 		free(real_file);
 	if (real_fsname)
 		free(real_fsname);
+#endif
 	if (err) {
 		errno = err;
 		return -1;

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsmount.c,1.39,1.40

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

Changes by: cha0smaster

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

Modified Files:
	ntfsmount.c 
Log Message:
Apply patch from Christophe.


Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- ntfsmount.c	7 Oct 2005 14:10:57 -0000	1.39
+++ ntfsmount.c	10 Oct 2005 11:04:56 -0000	1.40
@@ -1375,6 +1375,7 @@ static int parse_options(int argc, char 
 					err++;
 					break;
 				}
+#ifdef HAVE_REALPATH
 				/* We don't want relative path in /etc/mtab. */
 				if (argv[optind - 1][0] != '/') {
 					if (!realpath(argv[optind - 1],
@@ -1387,6 +1388,9 @@ static int parse_options(int argc, char 
 					}
 				} else
 					strcpy(opts.device, argv[optind - 1]);
+#else
+				strcpy(opts.device, argv[optind - 1]);
+#endif
 			} else if (!opts.mnt_point)
 				opts.mnt_point = argv[optind - 1];
 			else {

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs win32_io.c,1.39,1.40

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

Changes by: cha0smaster

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

Modified Files:
	win32_io.c 
Log Message:
fix build under cygwin if FSCTL_GET_NTFS_VOLUME_DATA is not defined


Index: win32_io.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/win32_io.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- win32_io.c	28 Sep 2005 13:47:48 -0000	1.39
+++ win32_io.c	9 Oct 2005 13:35:15 -0000	1.40
@@ -414,8 +414,8 @@ static s64 ntfs_device_win32_getdiskleng
  */
 static s64 ntfs_device_win32_getntfssize(HANDLE handle)
 {
-#ifdef FSCTL_GET_NTFS_VOLUME_DATA
 	s64 rvl;
+#ifdef FSCTL_GET_NTFS_VOLUME_DATA
 	DWORD i;
 	NTFS_VOLUME_DATA_BUFFER buf;
 

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.295,1.296

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

Changes by: szaka

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

Modified Files:
	ChangeLog 
Log Message:
Fix some corner cases and all memory leaks; handle corrupt NTFS more gracefully


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.295
retrieving revision 1.296
diff -u -p -r1.295 -r1.296
--- ChangeLog	7 Oct 2005 23:01:23 -0000	1.295
+++ ChangeLog	9 Oct 2005 12:53:44 -0000	1.296
@@ -5,7 +5,9 @@
 	- Move mount.ntfs-fuse and mkfs.ntfs to be symlinks instead of
 	  hardlinks and move both to /sbin rather than prefix/sbin.  Note we
 	  still obey $destdir so building packages works as well as installing
-	  into alternate chroot / other system still works.
+	  into alternate chroot / other system still works.  (Anton)
+	- ntfscmp: fix some corner cases and all memory leaks; handle corrupt
+	  NTFS more gracefully.  (Szaka)
 
 07/10/2005 - 1.12.0 - Lots of fixes and enhancements!
 

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

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

Changes by: szaka

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

Modified Files:
	ntfscmp.c 
Log Message:
Fix some corner cases and all memory leaks; handle corrupt NTFS more gracefully


Index: ntfscmp.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfscmp.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- ntfscmp.c	7 Oct 2005 14:10:57 -0000	1.6
+++ ntfscmp.c	9 Oct 2005 12:53:44 -0000	1.7
@@ -327,15 +327,6 @@ static const char *err2string(int err)
 	return ntfscmp_errs[err]; 
 }
 
-static const char *ret2string(int ret)
-{
-	if (ret == -1)
-		return "FAILED";
-	else if (ret != 0)
-		err_exit("Unhandled return code: %d\n", ret);
-	return "OK";
-}
-
 static const char *pret2str(void *p)
 {
 	if (p == NULL)
@@ -399,6 +390,14 @@ static void print_attribute_name(char *n
 #define	GET_ATTR_NAME(a) \
 	((ntfschar *)(((u8 *)(a)) + ((a)->name_offset))), ((a)->name_length)
 
+static void free_name(char **name)
+{
+	if (*name) {
+		free(*name);
+		*name = NULL;
+	}
+}
+
 static char *get_attr_name(u64 mft_no,
 			   ATTR_TYPES atype,
 			   const ntfschar *uname, 
@@ -421,6 +420,7 @@ static char *get_attr_name(u64 mft_no,
 	} else if (name_len > 0)
 		return name;
 
+	free_name(&name);
 	return NULL;
 }
 
@@ -446,19 +446,25 @@ static void print_attribute(ATTR_TYPES a
 
 static void print_na(ntfs_attr *na)
 {
+	char *name = get_attr_name_na(na);
 	print_inode_ni(na->ni);
-	print_attribute(na->type, get_attr_name_na(na));
+	print_attribute(na->type, name);
+	free_name(&name);
 }
 
 static void print_attribute_ctx(ntfs_attr_search_ctx *ctx)
 {
-	print_attribute(ctx->attr->type, get_attr_name_ctx(ctx));
+	char *name = get_attr_name_ctx(ctx);
+	print_attribute(ctx->attr->type, name);
+	free_name(&name);
 }
 
 static void print_ctx(ntfs_attr_search_ctx *ctx)
 {
+	char *name = get_attr_name_ctx(ctx);
 	print_inode_ni(base_inode(ctx));
-	print_attribute(ctx->attr->type, get_attr_name_ctx(ctx));
+	print_attribute(ctx->attr->type, name);
+	free_name(&name);
 }
 
 static void cmp_attribute_data(ntfs_attr *na1, ntfs_attr *na2)
@@ -568,22 +574,36 @@ static void print_attributes(ntfs_inode 
 	Vprintf("\n");
 }
 
+static int new_name(ntfs_attr_search_ctx *ctx, char *prev_name)
+{
+	int ret = 0;
+	char *name = get_attr_name_ctx(ctx);
+	
+	if (prev_name && name) {
+		if (strcmp(prev_name, name) != 0)
+			ret = 1;
+	} else if (prev_name || name)
+		ret = 1;
+
+	free_name(&name);
+	return ret;
+
+}
+
 static int new_attribute(ntfs_attr_search_ctx *ctx,
 			 ATTR_TYPES prev_atype,
 			 char *prev_name)
 {
-	char *name = get_attr_name_ctx(ctx);
-
+	if (!prev_atype && !prev_name)
+		return 1;
+	
 	if (!ctx->attr->non_resident)
 		return 1;
 
 	if (prev_atype != ctx->attr->type)
 		return 1;
 	    
-	if (prev_name && name) {
-		if (strcmp(prev_name, name) != 0)
-			return 1;
-	} else if (prev_name || name)
+	if (new_name(ctx, prev_name))
 		return 1;
 
 	if (opt.verbose) {
@@ -595,26 +615,51 @@ static int new_attribute(ntfs_attr_searc
 	
 	return 0;
 }
+	
+static void set_prev(char **prev_name, ATTR_TYPES *prev_atype, 
+		     char *name, ATTR_TYPES atype)
+{
+	free_name(prev_name);
+	if (name) {
+		*prev_name = strdup(name);
+		if (!*prev_name)
+			perr_exit("strdup error");
+	}
+
+	*prev_atype = atype;
+}
 
-static void set_prev(char **prev_name, char *name, char *name_unused,
-		     ATTR_TYPES *prev_atype, ATTR_TYPES atype)
+static void set_cmp_attr(ntfs_attr_search_ctx *ctx, ATTR_TYPES *atype, char **name)
 {
-	if (*prev_name)
-		free(*prev_name);
-	*prev_name  = name;
+	*atype = ctx->attr->type; 
 	
-	free(name_unused);
+	free_name(name);
+	*name = get_attr_name_ctx(ctx);
+}
+
+static int next_attr(ntfs_attr_search_ctx *ctx, ATTR_TYPES *atype, char **name,
+		     int *err)
+{
+	int ret;
+	 
+	ret = ntfs_attrs_walk(ctx);
+	*err = errno;
+       	if (ret) {
+		*atype = AT_END;
+		free_name(name);
+	} else
+		set_cmp_attr(ctx, atype, name);
 	
-	*prev_atype = atype;
+	return ret;
 }
 
 static int cmp_attributes(ntfs_inode *ni1, ntfs_inode *ni2)
 {
 	int ret = -1;
-	int ret1 = 0, ret2 = 0;
-	int prev_first = 1;
-	char  *prev_name = NULL, *name1, *name2;
-	ATTR_TYPES prev_atype, atype1, atype2;
+	int old_ret1, ret1 = 0, ret2 = 0;
+	int errno1 = 0, errno2 = 0;
+	char  *prev_name = NULL, *name1 = NULL, *name2 = NULL;
+	ATTR_TYPES old_atype1, prev_atype = 0, atype1, atype2;
 	ntfs_attr_search_ctx *ctx1, *ctx2;
 	
 	if (!(ctx1 = attr_get_search_ctx(ni1)))
@@ -622,58 +667,52 @@ static int cmp_attributes(ntfs_inode *ni
 	if (!(ctx2 = attr_get_search_ctx(ni2)))
 		goto out;
 	
-	atype1 = ctx1->attr->type; 
-	atype2 = ctx2->attr->type;
+	set_cmp_attr(ctx1, &atype1, &name1);
+	set_cmp_attr(ctx2, &atype2, &name2);
 
 	while (1) {
-		if (atype1 <= atype2)
-			ret1 = ntfs_attrs_walk(ctx1);
-		if (atype1 >= atype2)
-			ret2 = ntfs_attrs_walk(ctx2);
-		
-		atype1 = ctx1->attr->type;
-		atype2 = ctx2->attr->type;
-		name1 = get_attr_name_ctx(ctx1);
-		name2 = get_attr_name_ctx(ctx2);
 
-		print_attributes(ni1, atype1, atype2, name1, name2);
+		old_atype1 = atype1;
+		old_ret1 = ret1;
+		if (!ret1 && (atype1 <= atype2 || ret2))
+			ret1 = next_attr(ctx1, &atype1, &name1, &errno1);
+		if (!ret2 && (old_atype1 >= atype2 || old_ret1))
+			ret2 = next_attr(ctx2, &atype2, &name2, &errno2);
 
-		if (atype1 != AT_END && atype2 != AT_END && ret1 != ret2) {
-			print_inode_ni(ni1);
-			printf("attribute_walk:   %s  !=  %s\n",
-			       ret2string(ret1), ret2string(ret2));
+		print_attributes(ni1, atype1, atype2, name1, name2);
+		
+		if (ret1 && ret2) {
+			if (errno1 != errno2) {
+				print_inode_ni(ni1);
+				printf("attribute walk (errno):   %d  !=  %d\n",
+				       errno1, errno2);
+			}
 			break;
 		}
 
-		if (atype1 == atype2) {
-
-			if (atype1 == AT_END)
-				break;
-
-			if (prev_first || new_attribute(ctx1, prev_atype, prev_name)) {
-				prev_first = 0;
-				cmp_attribute(ctx1, ctx2);
-				set_prev(&prev_name, name1, name2, &prev_atype, atype1);
-			}
-		
-		} else if (atype2 == AT_END || atype1 < atype2) {
-			if (prev_first || new_attribute(ctx1, prev_atype, prev_name)) {
-				prev_first = 0;
+		if (ret2 || atype1 < atype2) {
+			if (new_attribute(ctx1, prev_atype, prev_name)) {
 				print_ctx(ctx1);
 				printf("presence:   EXISTS   !=   MISSING\n");
-				set_prev(&prev_name, name1, name2, &prev_atype, atype1);
+				set_prev(&prev_name, &prev_atype, name1, atype1);
 			}
 		
-		} else /* atype1 == AT_END || atype1 > atype2) */ {
-			if (prev_first || new_attribute(ctx2, prev_atype, prev_name)) {
-				prev_first = 0;
+		} else if (ret1 || atype1 > atype2) {
+			if (new_attribute(ctx2, prev_atype, prev_name)) {
 				print_ctx(ctx2);
 				printf("presence:   MISSING  !=  EXISTS \n");
-				set_prev(&prev_name, name2, name1, &prev_atype, atype2);
+				set_prev(&prev_name, &prev_atype, name2, atype2);
+			}
+		
+		} else /* atype1 == atype2 */ {
+			if (new_attribute(ctx1, prev_atype, prev_name)) {
+				cmp_attribute(ctx1, ctx2);
+				set_prev(&prev_name, &prev_atype, name1, atype1);
 			}
 		}
 	}
 
+	free_name(&prev_name);
 	ret = 0;
 	ntfs_attr_put_search_ctx(ctx2);
 out:
@@ -796,6 +835,9 @@ int main(int argc, char **argv)
 	if (cmp_inodes(vol1, vol2) != 0)
 		exit(1);
 
+	ntfs_umount(vol1, FALSE);
+	ntfs_umount(vol2, FALSE);
+
 	exit(0);
 }
 

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.294,1.295 configure.ac,1.80,1.81 ntfsprogs.spec.in,1.17,1.18

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

Changes by: antona

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

Modified Files:
	ChangeLog configure.ac ntfsprogs.spec.in 
Log Message:
Move mount.ntfs-fuse and mkfs.ntfs to be symlinks instead of
hardlinks and move both to /sbin rather than prefix/sbin.  Note we
still obey $destdir so building packages works as well as installing
into alternate chroot / other system still works.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.294
retrieving revision 1.295
diff -u -p -r1.294 -r1.295
--- ChangeLog	7 Oct 2005 16:00:42 -0000	1.294
+++ ChangeLog	7 Oct 2005 23:01:23 -0000	1.295
@@ -1,7 +1,11 @@
-xx/xx/2005 - 1.12.1-WIP
+08/10/2005 - 1.12.1 - Minor fix to location of mount.ntfs-fuse and mkfs.ntfs.
 
 	- Fix hardcoded location for uninstalling mount.ntfs-fuse hardlink to
 	  match the relocatable location for installing it.  (Anton, Szaka)
+	- Move mount.ntfs-fuse and mkfs.ntfs to be symlinks instead of
+	  hardlinks and move both to /sbin rather than prefix/sbin.  Note we
+	  still obey $destdir so building packages works as well as installing
+	  into alternate chroot / other system still works.
 
 07/10/2005 - 1.12.0 - Lots of fixes and enhancements!
 

Index: configure.ac
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/configure.ac,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -p -r1.80 -r1.81
--- configure.ac	7 Oct 2005 16:00:42 -0000	1.80
+++ configure.ac	7 Oct 2005 23:01:23 -0000	1.81
@@ -22,7 +22,7 @@
 #
 
 AC_PREREQ(2.59)
-AC_INIT([ntfsprogs],[1.12.1-WIP],[lin...@li...])
+AC_INIT([ntfsprogs],[1.12.1],[lin...@li...])
 
 #
 # Before making a release, the LTVERSION string should be modified.
@@ -155,7 +155,7 @@ esac
 AC_PROG_CC
 AC_PROG_GCC_TRADITIONAL
 AC_PROG_INSTALL
-AC_PATH_PROG(LN, ln, ln)
+AC_PATH_PROG(RM, rm, rm)
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 AC_PROG_LIBTOOL

Index: ntfsprogs.spec.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs.spec.in,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- ntfsprogs.spec.in	7 Oct 2005 15:18:47 -0000	1.17
+++ ntfsprogs.spec.in	7 Oct 2005 23:01:23 -0000	1.18
@@ -88,8 +88,8 @@ rm -rf "$RPM_BUILD_ROOT"
 %defattr(-,root,root)
 %doc AUTHORS COPYING CREDITS ChangeLog INSTALL NEWS README TODO.include TODO.libntfs TODO.ntfsprogs doc/CodingStyle doc/attribute_definitions doc/attributes.txt doc/compression.txt doc/tunable_settings doc/template.c doc/template.h doc/system_files.txt doc/system_security_descriptors.txt
 %{bindir}/ntfs[^m][^o]*
-%{sbindir}/mk*
-%{sbindir}/ntfs*
+%{sbindir}/*
+/sbin/mkfs.ntfs
 %{mandir}/man8/mkntfs.8*
 %{mandir}/man8/mkfs.ntfs.8*
 %{mandir}/man8/ntfs[^m][^o]*.8*
@@ -106,6 +106,7 @@ rm -rf "$RPM_BUILD_ROOT"
 %{bindir}/ntfsmount*
 /sbin/mount.ntfs-fuse
 %{mandir}/man8/ntfsmount.8*
+%{mandir}/man8/mount.ntfs-fuse.8*
 
 %files devel
 %defattr(-,root,root)

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs Makefile.am,1.52,1.53

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

Changes by: antona

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

Modified Files:
	Makefile.am 
Log Message:
Move mount.ntfs-fuse and mkfs.ntfs to be symlinks instead of
hardlinks and move both to /sbin rather than prefix/sbin.  Note we
still obey $destdir so building packages works as well as installing
into alternate chroot / other system still works.


Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/Makefile.am,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -p -r1.52 -r1.53
--- Makefile.am	7 Oct 2005 15:52:29 -0000	1.52
+++ Makefile.am	7 Oct 2005 23:01:23 -0000	1.53
@@ -142,17 +142,23 @@ extras:	libs $(EXTRA_PROGRAMS)
 # mkfs.ntfs[.8] and mount.ntfs-fuse hard links
 
 install-exec-hook:
-	$(LN) -f $(DESTDIR)$(sbindir)/mkntfs $(DESTDIR)$(sbindir)/mkfs.ntfs
+	$(INSTALL) -d $(DESTDIR)/sbin
+	$(LN_S) -f $(sbindir)/mkntfs $(DESTDIR)/sbin/mkfs.ntfs
 if ENABLE_FUSE_MODULE
-	$(LN) -f $(DESTDIR)$(bindir)/ntfsmount /sbin/mount.ntfs-fuse
+	$(LN_S) -f $(bindir)/ntfsmount $(DESTDIR)/sbin/mount.ntfs-fuse
 endif
 
 install-data-hook:
-	$(LN) -f $(DESTDIR)$(man8dir)/mkntfs.8 $(DESTDIR)$(man8dir)/mkfs.ntfs.8
+	$(INSTALL) -d $(DESTDIR)$(man8dir)
+	$(LN_S) -f mkntfs.8 $(DESTDIR)$(man8dir)/mkfs.ntfs.8
+if ENABLE_FUSE_MODULE
+	$(LN_S) -f ntfsmount.8 $(DESTDIR)$(man8dir)/mount.ntfs-fuse.8
+endif
 
 uninstall-local:
-	rm -f $(DESTDIR)$(sbindir)/mkfs.ntfs
-	rm -f $(DESTDIR)$(man8dir)/mkfs.ntfs.8
+	$(RM) -f $(DESTDIR)/sbin/mkfs.ntfs
+	$(RM) -f $(DESTDIR)$(man8dir)/mkfs.ntfs.8
 if ENABLE_FUSE_MODULE
-	rm -f $(DESTDIR)$(sbindir)/mount.ntfs-fuse
+	$(RM) -f $(DESTDIR)/sbin/mount.ntfs-fuse
+	$(RM) -f $(DESTDIR)$(man8dir)/mount.ntfs-fuse.8
 endif

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.293,1.294 configure.ac,1.79,1.80

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

Changes by: antona

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

Modified Files:
	ChangeLog configure.ac 
Log Message:
Update changelog and bump version number on ntfsprogs and libntfs appropriately.

NOTE: If anyone makes libntfs changes that modify the interfaces, please update
the libntfs version appropriately before the next release (see configure.ac for
explanation of how to update the version).


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.293
retrieving revision 1.294
diff -u -p -r1.293 -r1.294
--- ChangeLog	7 Oct 2005 14:10:56 -0000	1.293
+++ ChangeLog	7 Oct 2005 16:00:42 -0000	1.294
@@ -1,3 +1,8 @@
+xx/xx/2005 - 1.12.1-WIP
+
+	- Fix hardcoded location for uninstalling mount.ntfs-fuse hardlink to
+	  match the relocatable location for installing it.  (Anton, Szaka)
+
 07/10/2005 - 1.12.0 - Lots of fixes and enhancements!
 
 	- Add ./configure detection for gnutls library and make minimum version

Index: configure.ac
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/configure.ac,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -p -r1.79 -r1.80
--- configure.ac	7 Oct 2005 14:10:57 -0000	1.79
+++ configure.ac	7 Oct 2005 16:00:42 -0000	1.80
@@ -22,7 +22,7 @@
 #
 
 AC_PREREQ(2.59)
-AC_INIT([ntfsprogs],[1.12.0],[lin...@li...])
+AC_INIT([ntfsprogs],[1.12.1-WIP],[lin...@li...])
 
 #
 # Before making a release, the LTVERSION string should be modified.
@@ -50,7 +50,7 @@ AC_INIT([ntfsprogs],[1.12.0],[linux-ntfs
 #
 #   - If the interface is the same as the previous version, change to C:R+1:A
 #
-LTVERSION_LIBNTFS="8:0:0"
+LTVERSION_LIBNTFS="8:1:0"
 AC_SUBST(LTVERSION_LIBNTFS)
 
 AC_CANONICAL_HOST([])

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs Makefile.am,1.51,1.52

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

Changes by: antona

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

Modified Files:
	Makefile.am 
Log Message:
Fix hardcoded location for hardlink on uninstall.  (Anton, Szaka)


Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/Makefile.am,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- Makefile.am	7 Oct 2005 15:15:13 -0000	1.51
+++ Makefile.am	7 Oct 2005 15:52:29 -0000	1.52
@@ -154,5 +154,5 @@ uninstall-local:
 	rm -f $(DESTDIR)$(sbindir)/mkfs.ntfs
 	rm -f $(DESTDIR)$(man8dir)/mkfs.ntfs.8
 if ENABLE_FUSE_MODULE
-	rm -f /sbin/mount.ntfs-fuse
+	rm -f $(DESTDIR)$(sbindir)/mount.ntfs-fuse
 endif

Re: [Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs Makefile.am,1.50,1.51

[Anton A. <ai...@ca...>]

On Fri, 2005-10-07 at 17:45 +0200, Szakacsits Szabolcs wrote:
> On Fri, 7 Oct 2005, Szakacsits Szabolcs wrote:
> > On Fri, 7 Oct 2005, Yura Pakhuchiy wrote:
> > 
> > > Changes by: cha0smaster
> > > 
> > > Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
> > > In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13579/ntfsprogs
> > > 
> > > Modified Files:
> > > 	Makefile.am 
> > > Log Message:
> > > oops, fix previous fix
> > 
> > Anton's fix was correct. 
> > 
> > User specifies during ./configure where the utils will be installed. If
> > they choose '/' as the prefix then mount.ntfs-fuse will go exactly where
> > you would like to be.
> 
> BTW, the below line in the same file
> 
> 	rm -f /sbin/mount.ntfs-fuse
> 
> is also incorrectly hardcoded.

Argh!  Lets hope not too many people are going to do a make uninstal...

I cannot be bothered to make a .1 release just for that fix.

Thanks for point it out.  I am going to fix it in cvs in a second.

Best regards,

        Anton
-- 
Anton Altaparmakov <aia21 at cam.ac.uk> (replace at with @)
Unix Support, Computing Service, University of Cambridge, CB2 3QH, UK
Linux NTFS maintainer / IRC: #ntfs on irc.freenode.net
WWW: http://linux-ntfs.sf.net/ & http://www-stu.christs.cam.ac.uk/~aia21/

Re: [Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs Makefile.am,1.50,1.51

[Szakacsits S. <sz...@si...>]

On Fri, 7 Oct 2005, Szakacsits Szabolcs wrote:
> On Fri, 7 Oct 2005, Yura Pakhuchiy wrote:
> 
> > Changes by: cha0smaster
> > 
> > Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
> > In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13579/ntfsprogs
> > 
> > Modified Files:
> > 	Makefile.am 
> > Log Message:
> > oops, fix previous fix
> 
> Anton's fix was correct. 
> 
> User specifies during ./configure where the utils will be installed. If
> they choose '/' as the prefix then mount.ntfs-fuse will go exactly where
> you would like to be.

BTW, the below line in the same file

	rm -f /sbin/mount.ntfs-fuse

is also incorrectly hardcoded.

	Szaka

> > Index: Makefile.am
> > ===================================================================
> > RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/Makefile.am,v
> > retrieving revision 1.50
> > retrieving revision 1.51
> > diff -u -p -r1.50 -r1.51
> > --- Makefile.am	7 Oct 2005 15:13:10 -0000	1.50
> > +++ Makefile.am	7 Oct 2005 15:15:13 -0000	1.51
> > @@ -144,7 +144,7 @@ extras:	libs $(EXTRA_PROGRAMS)
> >  install-exec-hook:
> >  	$(LN) -f $(DESTDIR)$(sbindir)/mkntfs $(DESTDIR)$(sbindir)/mkfs.ntfs
> >  if ENABLE_FUSE_MODULE
> > -	$(LN) -f $(DESTDIR)$(bindir)/ntfsmount mount.ntfs-fuse
> > +	$(LN) -f $(DESTDIR)$(bindir)/ntfsmount /sbin/mount.ntfs-fuse
> >  endif
> >  
> >  install-data-hook:
> 
> 
> 

Re: [Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs Makefile.am,1.50,1.51

[Szakacsits S. <sz...@si...>]

Hi,

On Fri, 7 Oct 2005, Yura Pakhuchiy wrote:

> Changes by: cha0smaster
> 
> Update of /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs
> In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13579/ntfsprogs
> 
> Modified Files:
> 	Makefile.am 
> Log Message:
> oops, fix previous fix

Anton's fix was correct. 

User specifies during ./configure where the utils will be installed. If
they choose '/' as the prefix then mount.ntfs-fuse will go exactly where
you would like to be.

	Szaka

> Index: Makefile.am
> ===================================================================
> RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/Makefile.am,v
> retrieving revision 1.50
> retrieving revision 1.51
> diff -u -p -r1.50 -r1.51
> --- Makefile.am	7 Oct 2005 15:13:10 -0000	1.50
> +++ Makefile.am	7 Oct 2005 15:15:13 -0000	1.51
> @@ -144,7 +144,7 @@ extras:	libs $(EXTRA_PROGRAMS)
>  install-exec-hook:
>  	$(LN) -f $(DESTDIR)$(sbindir)/mkntfs $(DESTDIR)$(sbindir)/mkfs.ntfs
>  if ENABLE_FUSE_MODULE
> -	$(LN) -f $(DESTDIR)$(bindir)/ntfsmount mount.ntfs-fuse
> +	$(LN) -f $(DESTDIR)$(bindir)/ntfsmount /sbin/mount.ntfs-fuse
>  endif
>  
>  install-data-hook: