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

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs Makefile.in,1.50,1.51

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

Changes by: antona

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

Modified Files:
	Makefile.in 
Log Message:
Add new utility (make extra) - ntfsdecrypt.  (Yuval)


Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/Makefile.in,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- Makefile.in	15 Jul 2005 15:53:29 -0000	1.50
+++ Makefile.in	16 Jul 2005 06:53:53 -0000	1.51
@@ -194,7 +194,6 @@ ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

[Linux-NTFS-cvs] CVS: ntfsprogs/doc Makefile.in,1.29,1.30

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

Changes by: antona

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

Modified Files:
	Makefile.in 
Log Message:
Add new utility (make extra) - ntfsdecrypt.  (Yuval)


Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/doc/Makefile.in,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- Makefile.in	15 Jul 2005 15:53:28 -0000	1.29
+++ Makefile.in	16 Jul 2005 06:53:53 -0000	1.30
@@ -119,7 +119,6 @@ ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs Makefile.in,1.26,1.27

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

Changes by: antona

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

Modified Files:
	Makefile.in 
Log Message:
Add new utility (make extra) - ntfsdecrypt.  (Yuval)


Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/Makefile.in,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -p -r1.26 -r1.27
--- Makefile.in	15 Jul 2005 15:53:29 -0000	1.26
+++ Makefile.in	16 Jul 2005 06:53:53 -0000	1.27
@@ -132,7 +132,6 @@ ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

[Linux-NTFS-cvs] CVS: ntfsprogs/include Makefile.in,1.35,1.36

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

Changes by: antona

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

Modified Files:
	Makefile.in 
Log Message:
Add new utility (make extra) - ntfsdecrypt.  (Yuval)


Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/Makefile.in,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- Makefile.in	15 Jul 2005 15:53:28 -0000	1.35
+++ Makefile.in	16 Jul 2005 06:53:53 -0000	1.36
@@ -128,7 +128,6 @@ ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

[Linux-NTFS-cvs] CVS: ntfsprogs Makefile.in,1.35,1.36 aclocal.m4,1.28,1.29 config.guess,1.24,1.25 config.sub,1.24,1.25 configure,1.87,1.88 ltmain.sh,1.21,1.22

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

Changes by: cha0smaster

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

Modified Files:
	Makefile.in aclocal.m4 config.guess config.sub configure 
	ltmain.sh 
Log Message:
ntfsmount:
* use mount function from utils.[ch]
* remove fsname option (need to support if volume already mounted)
* add force option to support mount from utils
* update manual page
* fix tiny memleak


Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/Makefile.in,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- Makefile.in	10 Jul 2005 21:42:39 -0000	1.35
+++ Makefile.in	15 Jul 2005 15:53:22 -0000	1.36
@@ -144,6 +144,7 @@ ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

Index: aclocal.m4
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/aclocal.m4,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- aclocal.m4	10 Jul 2005 21:42:39 -0000	1.28
+++ aclocal.m4	15 Jul 2005 15:53:22 -0000	1.29
@@ -123,7 +123,7 @@ esac
 
 # Sed substitution that helps us do robust quoting.  It backslashifies
 # metacharacters that are still active within double-quoted strings.
-Xsed='sed -e s/^X//'
+Xsed='sed -e 1s/^X//'
 [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
 
 # Same as above, but do not quote variable references.
@@ -191,7 +191,7 @@ if test -n "$RANLIB"; then
   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
 fi
[...1071 lines suppressed...]
+	ifelse([$4], , [AC_MSG_FAILURE(dnl
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables
+to avoid the need to call pkg-config.  See the pkg-config man page for
+more details.
 
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
+		[$4])
+else
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+	ifelse([$3], , :, [$3])
+fi[]dnl
+])# PKG_CHECK_MODULES
 
 # Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
 #

Index: config.guess
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/config.guess,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- config.guess	10 Jul 2005 21:47:23 -0000	1.24
+++ config.guess	15 Jul 2005 15:53:24 -0000	1.25
@@ -136,16 +136,6 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` |
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
-case "${UNAME_MACHINE}" in
-    i?86)
-	test -z "$VENDOR" && VENDOR=pc
-	;;
-    *)
-	test -z "$VENDOR" && VENDOR=unknown
-	;;
-esac
-test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
-
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -835,25 +825,25 @@ EOF
 	echo ${UNAME_MACHINE}-pc-minix
 	exit 0 ;;
     arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
     cris:Linux:*:*)
-	echo cris-axis-linux
+	echo cris-axis-linux-gnu
 	exit 0 ;;
     crisv32:Linux:*:*)
-	echo crisv32-axis-linux
+	echo crisv32-axis-linux-gnu
 	exit 0 ;;
     frv:Linux:*:*)
-    	echo frv-${VENDOR}-linux
+    	echo frv-unknown-linux-gnu
 	exit 0 ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
     m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
     mips:Linux:*:*)
 	eval $set_cc_for_build
@@ -872,7 +862,7 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-${VENDOR}-linux" && exit 0
+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
 	;;
     mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -891,13 +881,13 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-${VENDOR}-linux" && exit 0
+	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
 	;;
     ppc:Linux:*:*)
-	echo powerpc-${VENDOR}-linux
+	echo powerpc-unknown-linux-gnu
 	exit 0 ;;
     ppc64:Linux:*:*)
-	echo powerpc64-${VENDOR}-linux
+	echo powerpc64-unknown-linux-gnu
 	exit 0 ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -910,34 +900,34 @@ EOF
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
         esac
 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="-libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-${VENDOR}-linux${LIBC}
+	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
 	exit 0 ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-${VENDOR}-linux ;;
-	  PA8*) echo hppa2.0-${VENDOR}-linux ;;
-	  *)    echo hppa-${VENDOR}-linux ;;
+	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
+	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
+	  *)    echo hppa-unknown-linux-gnu ;;
 	esac
 	exit 0 ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-${VENDOR}-linux
+	echo hppa64-unknown-linux-gnu
 	exit 0 ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit 0 ;;
     sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-${VENDOR}-linux
+    	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-${VENDOR}-linux
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit 0 ;;
     x86_64:Linux:*:*)
-	echo x86_64-${VENDOR}-linux
+	echo x86_64-unknown-linux-gnu
 	exit 0 ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
@@ -952,18 +942,18 @@ EOF
 				    p'`
         case "$ld_supported_targets" in
 	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux"
+		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
 		;;
 	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-${VENDOR}-linuxaout"
+		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
 		exit 0 ;;
 	  coff-i386)
-		echo "${UNAME_MACHINE}-${VENDOR}-linuxcoff"
+		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
 		exit 0 ;;
 	  "")
-		# Either a pre-BFD a.out linker (linuxoldld) or
+		# Either a pre-BFD a.out linker (linux-gnuoldld) or
 		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-${VENDOR}-linuxoldld"
+		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
 		exit 0 ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
@@ -992,7 +982,7 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}" | sed 's/linux-gnu/linux/' && exit 0
+	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
 	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
 	;;
     i*86:DYNIX/ptx:4*:*)

Index: config.sub
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/config.sub,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -p -r1.24 -r1.25
--- config.sub	10 Jul 2005 21:47:23 -0000	1.24
+++ config.sub	15 Jul 2005 15:53:24 -0000	1.25
@@ -1172,7 +1172,7 @@ case $os in
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
@@ -1205,6 +1205,9 @@ case $os in
 	-linux-dietlibc)
 		os=-linux-dietlibc
 		;;
+	-linux*)
+		os=`echo $os | sed -e 's|linux|linux-gnu|'`
+		;;
 	-sunos5*)
 		os=`echo $os | sed -e 's|sunos5|solaris2|'`
 		;;

Index: configure
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/configure,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -p -r1.87 -r1.88
--- configure	10 Jul 2005 21:47:23 -0000	1.87
+++ configure	15 Jul 2005 15:53:24 -0000	1.88
@@ -466,7 +466,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar REALLYSTATIC_TRUE REALLYSTATIC_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG LIBNTFS_GNOMEVFS_CFLAGS LIBNTFS_GNOMEVFS_LIBS ENABLE_GNOME_VFS_TRUE ENABLE_GNOME_VFS_FALSE FUSE_MODULE_CFLAGS FUSE_MODULE_LIBS ENABLE_FUSE_MODULE_TRUE ENABLE_FUSE_MODULE_FALSE all_includes all_libraries AUTODIRS LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar REALLYSTATIC_TRUE REALLYSTATIC_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG ac_pt_PKG_CONFIG LIBNTFS_GNOMEVFS_CFLAGS LIBNTFS_GNOMEVFS_LIBS ENABLE_GNOME_VFS_TRUE ENABLE_GNOME_VFS_FALSE FUSE_MODULE_CFLAGS FUSE_MODULE_LIBS ENABLE_FUSE_MODULE_TRUE ENABLE_FUSE_MODULE_FALSE all_includes all_libraries AUTODIRS LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -947,6 +947,26 @@ ac_env_FFLAGS_set=${FFLAGS+set}
 ac_env_FFLAGS_value=$FFLAGS
 ac_cv_env_FFLAGS_set=${FFLAGS+set}
[...2293 lines suppressed...]
 		fi
 
-  fi
-
+else
+	FUSE_MODULE_CFLAGS=$pkg_cv_FUSE_MODULE_CFLAGS
+	FUSE_MODULE_LIBS=$pkg_cv_FUSE_MODULE_LIBS
+	 compile_fuse_module=true
+fi
 fi
 
 
@@ -23933,6 +24302,7 @@ s,@FFLAGS@,$FFLAGS,;t t
 s,@ac_ct_F77@,$ac_ct_F77,;t t
 s,@LIBTOOL@,$LIBTOOL,;t t
 s,@PKG_CONFIG@,$PKG_CONFIG,;t t
+s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
 s,@LIBNTFS_GNOMEVFS_CFLAGS@,$LIBNTFS_GNOMEVFS_CFLAGS,;t t
 s,@LIBNTFS_GNOMEVFS_LIBS@,$LIBNTFS_GNOMEVFS_LIBS,;t t
 s,@ENABLE_GNOME_VFS_TRUE@,$ENABLE_GNOME_VFS_TRUE,;t t

Index: ltmain.sh
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ltmain.sh,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- ltmain.sh	10 Jul 2005 21:47:25 -0000	1.21
+++ ltmain.sh	15 Jul 2005 15:53:27 -0000	1.22
@@ -17,7 +17,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -43,8 +43,8 @@ EXIT_FAILURE=1
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION=1.5.14
-TIMESTAMP=" (1.1220.2.195 2005/02/12 12:12:33)"
+VERSION=1.5.18
+TIMESTAMP=" (1.1220.2.245 2005/05/16 08:55:27)"
 
 # See if we are running on zsh, and set the options which allow our
 # commands through without removal of \ escapes.
@@ -112,8 +112,9 @@ if test "${LANG+set}" = set; then
 fi
 
 # Make sure IFS has a sensible default
-: ${IFS=" 	
-"}
+lt_nl='
+'
+IFS=" 	$lt_nl"
 
 if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
   $echo "$modename: not configured to build any kind of library" 1>&2
@@ -250,37 +251,14 @@ func_extract_an_archive ()
 {
     f_ex_an_ar_dir="$1"; shift
     f_ex_an_ar_oldlib="$1"
-    f_ex_an_ar_lib=`$echo "X$f_ex_an_ar_oldlib" | $Xsed -e 's%^.*/%%'`
 
     $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
     $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
     if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
      :
     else
-      $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
-      $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
-      $show "cp $f_ex_an_ar_oldlib $f_ex_an_ar_dir/$f_ex_an_ar_lib"
-      $run eval "cp \$f_ex_an_ar_oldlib \$f_ex_an_ar_dir/\$f_ex_an_ar_lib"
-      $AR t "$f_ex_an_ar_oldlib" | sort | uniq -c \
-	| $EGREP -v '^[ 	]*1[ 	]' | while read count name
-      do
-	i=1
-	while test "$i" -le "$count"
-	  do
-	  # Put our $i before any first dot (extension)
-	  # Never overwrite any file
-	  name_to="$name"
-	  while test "X$name_to" = "X$name" || test -f "$f_ex_an_ar_dir/$name_to"
-	    do
-	    name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
-	  done
-	  $show "(cd $f_ex_an_ar_dir && $AR x  $f_ex_an_ar_lib '$name' && $mv '$name' '$name_to')"
-	  $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_lib '$name' && $mv '$name' '$name_to' && $AR -d \$f_ex_an_ar_lib '$name')" || exit $?
-	  i=`expr $i + 1`
-	done
-      done
-      $show "$rm $f_ex_an_ar_dir/$f_ex_an_ar_lib"
-      $run eval "$rm \$f_ex_an_ar_dir/\$f_ex_an_ar_lib"
+      $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
+      exit $EXIT_FAILURE
     fi
 }
 
@@ -757,6 +735,15 @@ if test -z "$show_help"; then
       esac
     done
 
+    qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
+    case $qlibobj in
+      *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
+	qlibobj="\"$qlibobj\"" ;;
+    esac
+    if test "X$libobj" != "X$qlibobj"; then
+	$echo "$modename: libobj name \`$libobj' may not contain shell special characters."
+	exit $EXIT_FAILURE
+    fi
     objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
     xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
     if test "X$xdir" = "X$obj"; then
@@ -829,12 +816,17 @@ compiler."
 	$run $rm $removelist
 	exit $EXIT_FAILURE
       fi
-      $echo $srcfile > "$lockfile"
+      $echo "$srcfile" > "$lockfile"
     fi
 
     if test -n "$fix_srcfile_path"; then
       eval srcfile=\"$fix_srcfile_path\"
     fi
+    qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
+    case $qsrcfile in
+      *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
+      qsrcfile="\"$qsrcfile\"" ;;
+    esac
 
     $run $rm "$libobj" "${libobj}T"
 
@@ -856,10 +848,10 @@ EOF
       fbsd_hideous_sh_bug=$base_compile
 
       if test "$pic_mode" != no; then
-	command="$base_compile $srcfile $pic_flag"
+	command="$base_compile $qsrcfile $pic_flag"
       else
 	# Don't build PIC code
-	command="$base_compile $srcfile"
+	command="$base_compile $qsrcfile"
       fi
 
       if test ! -d "${xdir}$objdir"; then
@@ -939,9 +931,9 @@ EOF
     if test "$build_old_libs" = yes; then
       if test "$pic_mode" != yes; then
 	# Don't build PIC code
-	command="$base_compile $srcfile"
+	command="$base_compile $qsrcfile"
       else
-	command="$base_compile $srcfile $pic_flag"
+	command="$base_compile $qsrcfile $pic_flag"
       fi
       if test "$compiler_c_o" = yes; then
 	command="$command -o $obj"
@@ -1365,6 +1357,8 @@ EOF
 	  ;;
         darwin_framework)
 	  compiler_flags="$compiler_flags $arg"
+	  compile_command="$compile_command $arg"
+	  finalize_command="$finalize_command $arg"
 	  prev=
 	  continue
 	  ;;
@@ -1429,6 +1423,8 @@ EOF
       -framework)
         prev=darwin_framework
         compiler_flags="$compiler_flags $arg"
+	compile_command="$compile_command $arg"
+	finalize_command="$finalize_command $arg"
         continue
         ;;
 
@@ -2852,12 +2848,12 @@ EOF
 	      *) continue ;;
 	      esac
 	      case " $deplibs " in
-	      *" $depdepl "*) ;;
-	      *) deplibs="$depdepl $deplibs" ;;
+	      *" $path "*) ;;
+	      *) deplibs="$path $deplibs" ;;
 	      esac
 	      case " $deplibs " in
-	      *" $path "*) ;;
-	      *) deplibs="$deplibs $path" ;;
+	      *" $depdepl "*) ;;
+	      *) deplibs="$depdepl $deplibs" ;;
 	      esac
 	    done
 	  fi # link_all_deplibs != no
@@ -3124,7 +3120,7 @@ EOF
 	case $current in
 	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 	*)
-	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
+	  $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
 	  exit $EXIT_FAILURE
 	  ;;
@@ -3133,7 +3129,7 @@ EOF
 	case $revision in
 	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 	*)
-	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
+	  $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
 	  exit $EXIT_FAILURE
 	  ;;
@@ -3142,7 +3138,7 @@ EOF
 	case $age in
 	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 	*)
-	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
+	  $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
 	  exit $EXIT_FAILURE
 	  ;;
@@ -5091,6 +5087,63 @@ fi\
       if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
        cmds=$old_archive_from_new_cmds
       else
+	# POSIX demands no paths to be encoded in archives.  We have
+	# to avoid creating archives with duplicate basenames if we
+	# might have to extract them afterwards, e.g., when creating a
+	# static archive out of a convenience library, or when linking
+	# the entirety of a libtool archive into another (currently
+	# not supported by libtool).
+	if (for obj in $oldobjs
+	    do
+	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
+	    done | sort | sort -uc >/dev/null 2>&1); then
+	  :
+	else
+	  $echo "copying selected object files to avoid basename conflicts..."
+
+	  if test -z "$gentop"; then
+	    gentop="$output_objdir/${outputname}x"
+	    generated="$generated $gentop"
+
+	    $show "${rm}r $gentop"
+	    $run ${rm}r "$gentop"
+	    $show "$mkdir $gentop"
+	    $run $mkdir "$gentop"
+	    status=$?
+	    if test "$status" -ne 0 && test ! -d "$gentop"; then
+	      exit $status
+	    fi
+	  fi
+
+	  save_oldobjs=$oldobjs
+	  oldobjs=
+	  counter=1
+	  for obj in $save_oldobjs
+	  do
+	    objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
+	    case " $oldobjs " in
+	    " ") oldobjs=$obj ;;
+	    *[\ /]"$objbase "*)
+	      while :; do
+		# Make sure we don't pick an alternate name that also
+		# overlaps.
+		newobj=lt$counter-$objbase
+		counter=`expr $counter + 1`
+		case " $oldobjs " in
+		*[\ /]"$newobj "*) ;;
+		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
+		esac
+	      done
+	      $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
+	      $run ln "$obj" "$gentop/$newobj" ||
+	      $run cp "$obj" "$gentop/$newobj"
+	      oldobjs="$oldobjs $gentop/$newobj"
+	      ;;
+	    *) oldobjs="$oldobjs $obj" ;;
+	    esac
+	  done
+	fi
+
 	eval cmds=\"$old_archive_cmds\"
 
 	if len=`expr "X$cmds" : ".*"` &&
@@ -5104,20 +5157,7 @@ fi\
 	  objlist=
 	  concat_cmds=
 	  save_oldobjs=$oldobjs
-	  # GNU ar 2.10+ was changed to match POSIX; thus no paths are
-	  # encoded into archives.  This makes 'ar r' malfunction in
-	  # this piecewise linking case whenever conflicting object
-	  # names appear in distinct ar calls; check, warn and compensate.
-	    if (for obj in $save_oldobjs
-	    do
-	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
-	    done | sort | sort -uc >/dev/null 2>&1); then
-	    :
-	  else
-	    $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
-	    $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
-	    AR_FLAGS=cq
-	  fi
+
 	  # Is there a better way of finding the last object in the list?
 	  for obj in $save_oldobjs
 	  do
@@ -6026,14 +6066,14 @@ relink_command=\"$relink_command\""
       fi
 
       # Now prepare to actually exec the command.
-      exec_cmd="\"\$cmd\"$args"
+      exec_cmd="\$cmd$args"
     else
       # Display what would be done.
       if test -n "$shlibpath_var"; then
 	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
 	$echo "export $shlibpath_var"
       fi
-      eval \$echo \"\$cmd\"$args
+      $echo "$cmd$args"
       exit $EXIT_SUCCESS
     fi
     ;;

[Linux-NTFS-cvs] CVS: ntfsprogs/include Makefile.in,1.34,1.35

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

Changes by: cha0smaster

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

Modified Files:
	Makefile.in 
Log Message:
ntfsmount:
* use mount function from utils.[ch]
* remove fsname option (need to support if volume already mounted)
* add force option to support mount from utils
* update manual page
* fix tiny memleak


Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/Makefile.in,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- Makefile.in	10 Jul 2005 21:42:43 -0000	1.34
+++ Makefile.in	15 Jul 2005 15:53:28 -0000	1.35
@@ -128,6 +128,7 @@ ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

[Linux-NTFS-cvs] CVS: ntfsprogs/doc Makefile.in,1.28,1.29

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

Changes by: cha0smaster

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

Modified Files:
	Makefile.in 
Log Message:
ntfsmount:
* use mount function from utils.[ch]
* remove fsname option (need to support if volume already mounted)
* add force option to support mount from utils
* update manual page
* fix tiny memleak


Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/doc/Makefile.in,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -p -r1.28 -r1.29
--- Makefile.in	10 Jul 2005 21:42:43 -0000	1.28
+++ Makefile.in	15 Jul 2005 15:53:28 -0000	1.29
@@ -119,6 +119,7 @@ ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

[Linux-NTFS-cvs] CVS: ntfsprogs/include/ntfs Makefile.in,1.25,1.26

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

Changes by: cha0smaster

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

Modified Files:
	Makefile.in 
Log Message:
ntfsmount:
* use mount function from utils.[ch]
* remove fsname option (need to support if volume already mounted)
* add force option to support mount from utils
* update manual page
* fix tiny memleak


Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/include/ntfs/Makefile.in,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- Makefile.in	10 Jul 2005 21:42:43 -0000	1.25
+++ Makefile.in	15 Jul 2005 15:53:29 -0000	1.26
@@ -132,6 +132,7 @@ ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs Makefile.am,1.36,1.37 Makefile.in,1.76,1.77 ntfsmount.8.in,1.2,1.3 ntfsmount.c,1.10,1.11

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

Changes by: cha0smaster

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

Modified Files:
	Makefile.am Makefile.in ntfsmount.8.in ntfsmount.c 
Log Message:
ntfsmount:
* use mount function from utils.[ch]
* remove fsname option (need to support if volume already mounted)
* add force option to support mount from utils
* update manual page
* fix tiny memleak


Index: Makefile.am
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/Makefile.am,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- Makefile.am	10 Jul 2005 12:38:50 -0000	1.36
+++ Makefile.am	15 Jul 2005 15:53:29 -0000	1.37
@@ -79,7 +79,7 @@ ntfscp_LDADD		= $(AM_LIBS)
 ntfscp_LDFLAGS		= $(AM_LFLAGS)
 
 if ENABLE_FUSE_MODULE
-ntfsmount_SOURCES	= ntfsmount.c
+ntfsmount_SOURCES	= ntfsmount.c utils.c utils.h
 ntfsmount_LDADD		= $(AM_LIBS) $(FUSE_MODULE_LIBS)
 ntfsmount_LDFLAGS	= $(AM_LFLAGS)
 ntfsmount_CFLAGS	= $(FUSE_MODULE_CFLAGS) -DFUSE_USE_VERSION=22

Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/Makefile.in,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -p -r1.76 -r1.77
--- Makefile.in	10 Jul 2005 21:42:44 -0000	1.76
+++ Makefile.in	15 Jul 2005 15:53:29 -0000	1.77
@@ -111,9 +111,10 @@ ntfsls_DEPENDENCIES = $(am__DEPENDENCIES
 am_ntfsmftalloc_OBJECTS = ntfsmftalloc.$(OBJEXT) utils.$(OBJEXT)
 ntfsmftalloc_OBJECTS = $(am_ntfsmftalloc_OBJECTS)
 ntfsmftalloc_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am__ntfsmount_SOURCES_DIST = ntfsmount.c
+am__ntfsmount_SOURCES_DIST = ntfsmount.c utils.c utils.h
 @ENABLE_FUSE_MODULE_TRUE@am_ntfsmount_OBJECTS =  \
-@ENABLE_FUSE_MODULE_TRUE@	ntfsmount-ntfsmount.$(OBJEXT)
+@ENABLE_FUSE_MODULE_TRUE@	ntfsmount-ntfsmount.$(OBJEXT) \
+@ENABLE_FUSE_MODULE_TRUE@	ntfsmount-utils.$(OBJEXT)
 ntfsmount_OBJECTS = $(am_ntfsmount_OBJECTS)
 am__DEPENDENCIES_2 =
 @ENABLE_FUSE_MODULE_TRUE@ntfsmount_DEPENDENCIES =  \
@@ -240,6 +241,7 @@ ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
@@ -336,7 +338,7 @@ ntfscat_LDFLAGS = $(AM_LFLAGS)
 ntfscp_SOURCES = ntfscp.c utils.c utils.h
 ntfscp_LDADD = $(AM_LIBS)
 ntfscp_LDFLAGS = $(AM_LFLAGS)
-@ENABLE_FUSE_MODULE_TRUE@ntfsmount_SOURCES = ntfsmount.c
+@ENABLE_FUSE_MODULE_TRUE@ntfsmount_SOURCES = ntfsmount.c utils.c utils.h
 @ENABLE_FUSE_MODULE_TRUE@ntfsmount_LDADD = $(AM_LIBS) $(FUSE_MODULE_LIBS)
 @ENABLE_FUSE_MODULE_TRUE@ntfsmount_LDFLAGS = $(AM_LFLAGS)
 @ENABLE_FUSE_MODULE_TRUE@ntfsmount_CFLAGS = $(FUSE_MODULE_CFLAGS) -DFUSE_USE_VERSION=22
@@ -551,6 +553,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntfsls.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntfsmftalloc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntfsmount-ntfsmount.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntfsmount-utils.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntfsmove.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntfsresize.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ntfsrm.Po@am__quote@
@@ -596,6 +599,20 @@ ntfsmount-ntfsmount.obj: ntfsmount.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ntfsmount_CFLAGS) $(CFLAGS) -c -o ntfsmount-ntfsmount.obj `if test -f 'ntfsmount.c'; then $(CYGPATH_W) 'ntfsmount.c'; else $(CYGPATH_W) '$(srcdir)/ntfsmount.c'; fi`
 
+ntfsmount-utils.o: utils.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ntfsmount_CFLAGS) $(CFLAGS) -MT ntfsmount-utils.o -MD -MP -MF "$(DEPDIR)/ntfsmount-utils.Tpo" -c -o ntfsmount-utils.o `test -f 'utils.c' || echo '$(srcdir)/'`utils.c; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/ntfsmount-utils.Tpo" "$(DEPDIR)/ntfsmount-utils.Po"; else rm -f "$(DEPDIR)/ntfsmount-utils.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='utils.c' object='ntfsmount-utils.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ntfsmount_CFLAGS) $(CFLAGS) -c -o ntfsmount-utils.o `test -f 'utils.c' || echo '$(srcdir)/'`utils.c
+
+ntfsmount-utils.obj: utils.c
+@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ntfsmount_CFLAGS) $(CFLAGS) -MT ntfsmount-utils.obj -MD -MP -MF "$(DEPDIR)/ntfsmount-utils.Tpo" -c -o ntfsmount-utils.obj `if test -f 'utils.c'; then $(CYGPATH_W) 'utils.c'; else $(CYGPATH_W) '$(srcdir)/utils.c'; fi`; \
+@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/ntfsmount-utils.Tpo" "$(DEPDIR)/ntfsmount-utils.Po"; else rm -f "$(DEPDIR)/ntfsmount-utils.Tpo"; exit 1; fi
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='utils.c' object='ntfsmount-utils.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ntfsmount_CFLAGS) $(CFLAGS) -c -o ntfsmount-utils.obj `if test -f 'utils.c'; then $(CYGPATH_W) 'utils.c'; else $(CYGPATH_W) '$(srcdir)/utils.c'; fi`
+
 mostlyclean-libtool:
 	-rm -f *.lo
 

Index: ntfsmount.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.8.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- ntfsmount.8.in	5 Jul 2005 04:54:28 -0000	1.2
+++ ntfsmount.8.in	15 Jul 2005 15:53:29 -0000	1.3
@@ -121,8 +121,8 @@ The default is infinite.  Note that the 
 limited anyway to 32 pages (which is 128kbyte on i386).
 
 .TP
-.B fsname=
-Sets the filesystem name.  The default is the program name.
+.B force=
+Force mount even if errors occured. Use this option only if you know what are you doing and don't cry about data loss.
 
 .TP
 .B ro
@@ -130,7 +130,7 @@ Mount filesystem read-only.
 
 .TP
 .B no_def_opts
-By default ntfsmount acts as "default_permissions,kernel_cache,allow_other,fsname=ntfs#device" was passed to it, this option cancel this behaviour.
+By default ntfsmount acts as "default_permissions,kernel_cache,allow_other" was passed to it, this option cancel this behaviour.
 
 .TP
 .B succeed_chmod

Index: ntfsmount.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsmount.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ntfsmount.c	9 Jul 2005 01:11:46 -0000	1.10
+++ ntfsmount.c	15 Jul 2005 15:53:29 -0000	1.11
@@ -43,6 +43,7 @@
 #include "dir.h"
 #include "unistr.h"
 #include "layout.h"
+#include "utils.h"
 
 typedef struct {
 	fuse_fill_dir_t filler;
@@ -61,6 +62,7 @@ typedef struct {
 	BOOL ro;
 	BOOL show_sys_files;
 	BOOL succeed_chmod;
+	BOOL force;
 } ntfs_fuse_context_t;
 
 typedef enum {
@@ -74,7 +76,9 @@ static const char *EXEC_NAME = "ntfsmoun
 static char def_opts[] = "default_permissions,kernel_cache,allow_other,";
 static ntfs_fuse_context_t *ctx;
 
-#define Eprintf(arg...) fprintf(stderr, ##arg)
+GEN_PRINTF(Eprintf, stderr, NULL, FALSE)
+GEN_PRINTF(Vprintf, stderr, NULL,  TRUE)
+GEN_PRINTF(Qprintf, stderr, NULL, FALSE)
 
 static long ntfs_fuse_get_nr_free_mft_records(ntfs_volume *vol)
 {
@@ -870,9 +874,9 @@ static int ntfs_fuse_mount(const char *d
 {
 	ntfs_volume *vol;
 
-	vol = ntfs_mount(device, (ctx->ro) ? MS_RDONLY : 0);
+	vol = utils_mount_volume(device, (ctx->ro) ? MS_RDONLY : 0, ctx->force);
 	if (!vol) {
-		perror("Mount failed");
+		Eprintf("Mount failed.\n");
 		return -1;
 	}
 	ctx->vol = vol;
@@ -897,16 +901,16 @@ static void signal_handler(int arg __att
 static char *parse_options(char *options, char **device)
 {
 	char *opts, *s, *opt, *val, *ret;
-	BOOL no_def_opts = FALSE, no_fsname = FALSE;
+	BOOL no_def_opts = FALSE;
 	
 	*device = NULL;
 	/*
-	 * +8 for different in length of "fsname=ntfs#..." and "dev=...".
+	 * +3 for different in length of "fsname=..." and "dev=...".
 	 * +1 for comma
 	 * +1 for null-terminator.
-	 * Total: +10
+	 * Total: +5
 	 */
-	ret = malloc(strlen(def_opts) + strlen(options) + 10);
+	ret = malloc(strlen(def_opts) + strlen(options) + 5);
 	if (!ret) {
 		perror("malloc failed");
 		return NULL;
@@ -935,14 +939,12 @@ static char *parse_options(char *options
 			ctx->ro =TRUE;
 			strcat(ret, "ro,");
 		} else if (!strcmp(opt, "fsname")) { /* Filesystem name. */
-			if (!val) {
-				Eprintf("fsname option should have value.\n");
-				goto err_exit;
-			}
-			no_fsname = TRUE;
-			strcat(ret, "fsname=");
-			strcat(ret, val);
-			strcat(ret, ",");
+			/*
+			 * We need this to be able to check whether filesystem
+			 * mounted or not.
+			 */
+			Eprintf("fsname is unsupported option.\n");
+			goto err_exit;
 		} else if (!strcmp(opt, "no_def_opts")) {
 			if (val) {
 				Eprintf("no_def_opts option should not have "
@@ -995,6 +997,13 @@ static char *parse_options(char *options
 				goto err_exit;
 			}
 			ctx->succeed_chmod = TRUE;
+		} else if (!strcmp(opt, "force")) {
+			if (val) {
+				Eprintf("force option should not "
+						"have value.\n");
+				goto err_exit;
+			}
+			ctx->force = TRUE;
 		} else { /* Probably FUSE option. */
 			strcat(ret, opt);
 			if (val) {
@@ -1006,13 +1015,10 @@ static char *parse_options(char *options
 	}
 	if (!*device)
 		goto err_exit;
-	if (!no_def_opts) {
+	if (!no_def_opts)
 		strcat(ret, def_opts);
-		if (!no_fsname) {
-			strcat(ret, "fsname=ntfs#");
-			strcat(ret, *device);
-		}
-	}
+	strcat(ret, "fsname=");
+	strcat(ret, *device);
 exit:
 	free(opts);
 	return ret;
@@ -1031,9 +1037,9 @@ static void usage(void)
 			EXEC_NAME);
 	Eprintf("Possible options are:\n\tdefault_permissions\n\tallow_other\n"
 		"\tkernel_cache\n\tlarge_read\n\tdirect_io\n\tmax_read\n\t"
-		"fsname\n\tro\n\tno_def_opts\n\tumask\n\tfmask\n\tdmask\n\t"
+		"force\n\tro\n\tno_def_opts\n\tumask\n\tfmask\n\tdmask\n\t"
 		"uid\n\tgid\n\tshow_sys_files\n\tsucceed_chmod\n\tdev\n\n");
-	Eprintf("Default options are: \"%sfsname=ntfs#device\".\n", def_opts);
+	Eprintf("Default options are: \"%s\".\n", def_opts);
 }
 
 int main(int argc, char *argv[])
@@ -1067,18 +1073,27 @@ int main(int argc, char *argv[])
 	if (!device) {
 		Eprintf("dev option is mandatory.\n");
 		ntfs_fuse_destroy();
-		return 5;
+		return 2;
 	}
 	if (!parsed_options) {
+		free(device);
 		ntfs_fuse_destroy();
-		return 6;
+		return 3;
 	}
 
+	/* Mount volume. */
+	if (ntfs_fuse_mount(device)) {
+		free(device);
+		ntfs_fuse_destroy();
+		return 4;
+	}
+	free(device);
 	/* Create filesystem. */
 	ffd = fuse_mount(mnt_point, parsed_options);
 	if (ffd == -1) {
 		Eprintf("fuse_mount failed.\n");
-		return 2;
+		ntfs_fuse_destroy();
+		return 5;
 	}
 	free(parsed_options);
 #ifndef DEBUG
@@ -1091,14 +1106,8 @@ int main(int argc, char *argv[])
 		Eprintf("fuse_new failed.\n");
 		close(ffd);
 		fuse_unmount(mnt_point);
-		return 3;
-	}
-	/* Mount volume. */
-	if (ntfs_fuse_mount(device)) {
-		fuse_destroy(fh);
-		close(ffd);
-		fuse_unmount(mnt_point);
-		return 4;
+		ntfs_fuse_destroy();
+		return 6;
 	}
 #ifndef DEBUG
 	if (daemon(0, 0))

[Linux-NTFS-cvs] CVS: ntfsprogs/libntfs Makefile.in,1.49,1.50

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

Changes by: cha0smaster

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

Modified Files:
	Makefile.in 
Log Message:
ntfsmount:
* use mount function from utils.[ch]
* remove fsname option (need to support if volume already mounted)
* add force option to support mount from utils
* update manual page
* fix tiny memleak


Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/libntfs/Makefile.in,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- Makefile.in	10 Jul 2005 21:42:43 -0000	1.49
+++ Makefile.in	15 Jul 2005 15:53:29 -0000	1.50
@@ -194,6 +194,7 @@ ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
+ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

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

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

Changes by: flatcap

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

Modified Files:
	ntfsrm.c 
Log Message:
tidy up dt rollback and commit

Index: ntfsrm.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsrm.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- ntfsrm.c	12 Jul 2005 17:58:47 -0000	1.40
+++ ntfsrm.c	13 Jul 2005 22:55:01 -0000	1.41
@@ -1046,35 +1046,70 @@ static int ntfs_ie_test (void)
 
 
 /**
- * ntfs_dt_rollback
+ * ntfs_dt_free
  */
-static int ntfs_dt_rollback (struct ntfs_dt *dt)
+static void ntfs_dt_free (struct ntfs_dt *dt)
 {
 	int i;
 
 	if (!dt)
-		return -1;
-
-	return 0; // TEMP
+		return;
 
 	for (i = 0; i < dt->child_count; i++) {
-		if (dt->sub_nodes)
-			ntfs_dt_rollback (dt->sub_nodes[i]);
-		if (dt->inodes)
-			ntfs_inode_close2 (dt->inodes[i]);
+		ntfs_dt_free (dt->sub_nodes[i]);
+		ntfs_inode_close2 (dt->inodes[i]);
 	}
 
-	free (dt->data);
-	free (dt->children);
 	free (dt->sub_nodes);
+	free (dt->children);
 	free (dt->inodes);
+	free (dt->data);	// XXX is this always ours?
+	free (dt);
+}
 
-	dt->data = NULL;
-	dt->children = NULL;
-	dt->sub_nodes = NULL;
-	dt->inodes = NULL;
+/**
+ * ntfs_dt_rollback
+ */
+static int ntfs_dt_rollback (struct ntfs_dt *dt)
+{
+	int i;
 
-	return 0;
+	if (!dt)
+		return 0;
+	if (dt->child_count == 0)	// No children or nothing mapped
+		return 0;
+
+	if (dt->changed) {
+		// We can't trust anything below us in the tree
+		for (i = 0; i < dt->child_count; i++) {
+			ntfs_dt_free (dt->sub_nodes[i]);
+			ntfs_inode_close2 (dt->inodes[i]);
+		}
+
+		dt->child_count = 0;
+
+		free (dt->data);
+		free (dt->children);
+		free (dt->sub_nodes);
+		free (dt->inodes);
+
+		dt->data = NULL;
+		dt->children = NULL;
+		dt->sub_nodes = NULL;
+		dt->inodes = NULL;
+	} else {
+		// This node is OK, check the su-nodes
+		for (i = 0; i < dt->child_count; i++) {
+			if (ntfs_dt_rollback (dt->sub_nodes[i])) {
+				ntfs_inode_close2 (dt->inodes[i]);
+				// Child was changed so unmap it
+				dt->sub_nodes[i] = NULL;
+				dt->inodes[i] = NULL;
+			}
+		}
+	}
+
+	return (dt->child_count == 0);
 }
 
 /**
@@ -1137,32 +1172,6 @@ static int ntfs_dt_commit (struct ntfs_d
 }
 
 /**
- * ntfs_dt_free
- */
-static void ntfs_dt_free (struct ntfs_dt *dt)
-{
-	int i;
-
-	if (!dt)
-		return;
-
-	ntfs_dt_rollback (dt);
-
-	for (i = 0; i < dt->child_count; i++) {
-		//if (dt->sub_nodes)
-			ntfs_dt_free (dt->sub_nodes[i]);
-		//if (dt->inodes)
-			ntfs_inode_close2 (dt->inodes[i]);
-	}
-
-	free (dt->sub_nodes);
-	free (dt->children);
-	free (dt->inodes);
-	free (dt->data);	// XXX is this always ours?
-	free (dt);
-}
-
-/**
  * ntfs_dt_alloc_children
  */
 static INDEX_ENTRY ** ntfs_dt_alloc_children (INDEX_ENTRY **children, int count)

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsresize.c,1.74,1.75

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

Changes by: szaka

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

Modified Files:
	ntfsresize.c 
Log Message:
Fix segfault during $Bitmap shrinkage introduced very recently by not
differentiating shrinkage and enlargement 


Index: ntfsresize.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -p -r1.74 -r1.75
--- ntfsresize.c	13 Jul 2005 17:47:37 -0000	1.74
+++ ntfsresize.c	13 Jul 2005 19:37:51 -0000	1.75
@@ -1814,13 +1814,18 @@ static void truncate_badclust_bad_attr(n
  * Reallocate the metadata file $Bitmap.  It must be large enough for one bit
  * per cluster of the shrunken volume.  Also it must be a of 8 bytes in size.
  */
-static void realloc_bitmap_data_attr(ntfs_volume *vol,
-				     struct bitmap *bm,
+static void realloc_bitmap_data_attr(ntfs_resize_t *resize,
 				     runlist **rl,
-				     s64 nr_bm_clusters,
-				     s64 new_size)
+				     s64 nr_bm_clusters)
 {
 	s64 i;
+	ntfs_volume *vol = resize->vol;
+	ATTR_RECORD *a = resize->ctx->attr;
+	s64 new_size = resize->new_volume_size;
+	struct bitmap *bm = &resize->lcn_bitmap;
+
+	if (!(*rl = ntfs_mapping_pairs_decompress(vol, a, NULL)))
+		perr_exit("ntfs_mapping_pairs_decompress");
 
 	release_bitmap_clusters(bm, *rl);
 	free(*rl);
@@ -1832,6 +1837,18 @@ static void realloc_bitmap_data_attr(ntf
 		perr_exit("Couldn't allocate $Bitmap clusters");
 }
 
+static void realloc_lcn_bitmap(ntfs_resize_t *resize, s64 bm_bsize)
+{
+	u8 *tmp;
+
+	if (!(tmp = realloc(resize->lcn_bitmap.bm, bm_bsize)))
+		perr_exit("realloc");
+	
+	resize->lcn_bitmap.bm = tmp;
+	resize->lcn_bitmap.size = bm_bsize;
+	bitmap_file_data_fixup(resize->new_volume_size, &resize->lcn_bitmap);
+}
+
 /**
  * truncate_bitmap_data_attr
  */
@@ -1841,8 +1858,6 @@ static void truncate_bitmap_data_attr(nt
 	runlist *rl;
 	s64 bm_bsize, size;
 	s64 nr_bm_clusters;
-	s64 nr_clusters;
-	u8 *tmp;
 	ntfs_volume *vol = resize->vol;
 
 	a = resize->ctx->attr;
@@ -1850,21 +1865,16 @@ static void truncate_bitmap_data_attr(nt
 		/* FIXME: handle resident attribute value */
 		err_exit("Resident attribute in $Bitmap isn't supported!\n");
 
-	nr_clusters = resize->new_volume_size;
-	bm_bsize = nr_clusters_to_bitmap_byte_size(nr_clusters);
+	bm_bsize = nr_clusters_to_bitmap_byte_size(resize->new_volume_size);
 	nr_bm_clusters = rounded_up_division(bm_bsize, vol->cluster_size);
 
-	if (!(tmp = (u8 *)realloc(resize->lcn_bitmap.bm, bm_bsize)))
-		perr_exit("realloc");
-	resize->lcn_bitmap.bm = tmp;
-	resize->lcn_bitmap.size = bm_bsize;
-	bitmap_file_data_fixup(nr_clusters, &resize->lcn_bitmap);
-
-	if (!(rl = ntfs_mapping_pairs_decompress(vol, a, NULL)))
-		perr_exit("ntfs_mapping_pairs_decompress");
-
-	realloc_bitmap_data_attr(vol, &resize->lcn_bitmap, &rl, nr_bm_clusters,
-				 nr_clusters);
+	if (resize->shrink) {
+		realloc_bitmap_data_attr(resize, &rl, nr_bm_clusters);
+		realloc_lcn_bitmap(resize, bm_bsize);
+	} else {
+		realloc_lcn_bitmap(resize, bm_bsize);
+		realloc_bitmap_data_attr(resize, &rl, nr_bm_clusters);
+	}
 
 	a->highest_vcn = cpu_to_le64(nr_bm_clusters - 1LL);
 	a->allocated_size = cpu_to_le64(nr_bm_clusters * vol->cluster_size);

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsresize.c,1.73,1.74

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

Changes by: szaka

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

Modified Files:
	ntfsresize.c 
Log Message:
Fix one-time memory leak in relocate_attributes()


Index: ntfsresize.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -p -r1.73 -r1.74
--- ntfsresize.c	12 Jul 2005 22:03:13 -0000	1.73
+++ ntfsresize.c	13 Jul 2005 17:47:37 -0000	1.74
@@ -1629,7 +1629,7 @@ static void relocate_attributes(ntfs_res
 		if (ret == -1)
 			exit(1);
 		else if (ret == 1)
-			return;
+			break;
 
 		relocate_attribute(resize);
 	}

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

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

Changes by: szaka

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

Modified Files:
	ntfsclone.c 
Log Message:
Fix memory leak in ignore_bad_clusters()


Index: ntfsclone.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsclone.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- ntfsclone.c	27 Jun 2005 21:03:06 -0000	1.46
+++ ntfsclone.c	13 Jul 2005 17:07:13 -0000	1.47
@@ -1383,7 +1383,7 @@ static void ignore_bad_clusters(ntfs_wal
 {
 	ntfs_inode *ni;
 	ntfs_attr_search_ctx *ctx = NULL;
-	runlist *rl;
+	runlist *rl, *rl_bad;
 	s64 nr_bad_clusters = 0;
 
 	if (!(ni = ntfs_inode_open(vol, FILE_BadClus)))
@@ -1392,10 +1392,10 @@ static void ignore_bad_clusters(ntfs_wal
 	if ((ctx = lookup_data_attr(ni, "$Bad")) == NULL)
 		exit(1);
 
-	if (!(rl = ntfs_mapping_pairs_decompress(vol, ctx->attr, NULL)))
+	if (!(rl_bad = ntfs_mapping_pairs_decompress(vol, ctx->attr, NULL)))
 		perr_exit("ntfs_mapping_pairs_decompress");
 
-	for (; rl->length; rl++) {
+	for (rl = rl_bad; rl->length; rl++) {
 		s64 lcn = rl->lcn;
 
 		if (lcn == LCN_HOLE || lcn < 0)
@@ -1409,6 +1409,7 @@ static void ignore_bad_clusters(ntfs_wal
 	if (nr_bad_clusters)
 		Printf("WARNING: The disk has %lld or more bad sectors"
 		       " (hardware faults).\n", nr_bad_clusters);
+	free(rl_bad);
 
 	ntfs_attr_put_search_ctx(ctx);
 	if (ntfs_inode_close(ni))

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs utils.c,1.35,1.36

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

Changes by: flatcap

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

Modified Files:
	utils.c 
Log Message:
prevent a likely error from upsetting the info collection
fix a few error messages


Index: utils.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/utils.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -p -r1.35 -r1.36
--- utils.c	20 Jun 2005 14:31:59 -0000	1.35
+++ utils.c	13 Jul 2005 00:50:52 -0000	1.36
@@ -1,7 +1,7 @@
 /**
  * utils.c - Part of the Linux-NTFS project.
  *
- * Copyright (c) 2002-2004 Richard Russon
+ * Copyright (c) 2002-2005 Richard Russon
  * Copyright (c) 2003-2005 Anton Altaparmakov
  * Copyright (c) 2003 Lode Leroy
  *
@@ -895,7 +895,7 @@ int mft_next_record (struct mft_search_c
 		ctx->flags_match = 0;
 		in_use = utils_mftrec_in_use (ctx->vol, (MFT_REF) ctx->mft_num);
 		if (in_use == -1) {
-			Eprintf ("Error reading inode %llu.  Aborting.",
+			Eprintf ("Error reading inode %llu.  Aborting.\n",
 					(unsigned long long)ctx->mft_num);
 			return -1;
 		}
@@ -905,9 +905,9 @@ int mft_next_record (struct mft_search_c
 
 			ctx->inode = ntfs_inode_open (ctx->vol, (MFT_REF) ctx->mft_num);
 			if (ctx->inode == NULL) {
-				Eprintf ("Error reading inode %llu.", (unsigned
+				Eprintf ("Error reading inode %llu.\n", (unsigned
 						long long) ctx->mft_num);
-				return -1;
+				continue;
 			}
 
 			attr10 = find_first_attribute (AT_STANDARD_INFORMATION, ctx->inode->mrec);
@@ -943,7 +943,7 @@ int mft_next_record (struct mft_search_c
 				case 0: ctx->flags_match |= FEMR_NOT_METADATA; break;
 				default:
 					ctx->flags_match |= FEMR_NOT_METADATA; break;
-					//Eprintf ("Error reading inode %lld.", ctx->mft_num);
+					//Eprintf ("Error reading inode %lld.\n", ctx->mft_num);
 					//return -1;
 			}
 
@@ -954,7 +954,7 @@ int mft_next_record (struct mft_search_c
 
 			ctx->inode = calloc (1, sizeof (*ctx->inode));
 			if (!ctx->inode) {
-				Eprintf ("Out of memory.  Aborting.");
+				Eprintf ("Out of memory.  Aborting.\n");
 				return -1;
 			}
 
@@ -963,7 +963,7 @@ int mft_next_record (struct mft_search_c
 			ctx->inode->mrec   = malloc (ctx->vol->mft_record_size);
 			if (!ctx->inode->mrec) {
 				free (ctx->inode); // == ntfs_inode_close
-				Eprintf ("Out of memory.  Aborting.");
+				Eprintf ("Out of memory.  Aborting.\n");
 				return -1;
 			}
 
@@ -989,7 +989,7 @@ int mft_next_record (struct mft_search_c
 		}
 
 		if (ntfs_inode_close (ctx->inode)) {
-			Eprintf ("Error closing inode %llu.",
+			Eprintf ("Error closing inode %llu.\n",
 					(unsigned long long)ctx->mft_num);
 			return -errno;
 		}

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsresize.c,1.72,1.73

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

Changes by: szaka

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

Modified Files:
	ntfsresize.c 
Log Message:
ntfsresize: give more hint if an $MFT run should be split. This will be the
next most common restriction when $MFT with ATTRIBUTE_LIST will be supported 


Index: ntfsresize.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -p -r1.72 -r1.73
--- ntfsresize.c	12 Jul 2005 21:46:40 -0000	1.72
+++ ntfsresize.c	12 Jul 2005 22:03:13 -0000	1.73
@@ -521,7 +521,7 @@ static int parse_options(int argc, char 
 	return (!err && !help && !ver);
 }
 
-static void print_advise(ntfs_volume *vol, s64 supp_lcn)
+static void __print_advise(ntfs_volume *vol, s64 supp_lcn)
 {
 	s64 old_b, new_b, freed_b, old_mb, new_mb, freed_mb;
 
@@ -555,7 +555,11 @@ static void print_advise(ntfs_volume *vo
 	else
 	    printf("%lld bytes", (long long)freed_b);
 	printf(").\n");
+}
 
+static void print_advise(ntfs_volume *vol, s64 supp_lcn)
+{
+	__print_advise(vol, supp_lcn);
 	printf("Please make a test run using both the -n and -s options "
 	       "before real resizing!\n");
 }
@@ -751,6 +755,9 @@ static void collect_relocation_info(ntfs
 			err_printf("$MFT%s can't be split up yet. Please try "
 				   "a different size.\n", inode ? "Mirr" : "");
 			last_lcn = lcn + lcn_length - 1;
+			if (!(inode == FILE_MFT && rl->vcn == 0) && 
+			    lcn - 1 >= resize->inuse)
+				__print_advise(resize->vol, lcn - 1);
 			print_advise(resize->vol, last_lcn);
 			exit(1);
 		}

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsresize.c,1.71,1.72

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

Changes by: szaka

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

Modified Files:
	ntfsresize.c 
Log Message:
Prepare collect_resize_constraints() for $MFT with AT_ATTRIBUTE_LIST support


Index: ntfsresize.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -p -r1.71 -r1.72
--- ntfsresize.c	10 Jul 2005 23:09:03 -0000	1.71
+++ ntfsresize.c	12 Jul 2005 21:46:40 -0000	1.72
@@ -673,11 +673,22 @@ static void collect_resize_constraints(n
 		Vprintf("Bad clusters: %8lld - %lld\n", rl->lcn, last_lcn);
 		return;
 	}
+	
+	if (inode == FILE_MFT) {
+		llcn = &resize->last_mft;
+
+		/*
+		 *  First run of $MFT AT_DATA and $MFT with AT_ATTRIBUTE_LIST
+		 *  isn't supported yet.
+		 */
+		if ((resize->ctx->attr->type != AT_DATA || rl->vcn) &&
+		    !NInoAttrList(resize->ni))
+			supported = 1;
 
-	if (NInoAttrList(resize->ni)) {
+	} else if (NInoAttrList(resize->ni)) {
 		llcn = &resize->last_multi_mft;
 
-		if (inode != FILE_MFT && inode != FILE_MFTMirr)
+		if (inode != FILE_MFTMirr)
 			supported = 1;
 
 	} else if (flags & ATTR_IS_SPARSE) {
@@ -688,13 +699,6 @@ static void collect_resize_constraints(n
 		llcn = &resize->last_compressed;
 		supported = 1;
 
-	} else if (inode == FILE_MFT) {
-		llcn = &resize->last_mft;
-
-		/* First run of $MFT DATA attribute isn't supported yet */
-		if (resize->ctx->attr->type != AT_DATA || rl->vcn)
-			supported = 1;
-
 	} else if (inode == FILE_MFTMirr) {
 		llcn = &resize->last_mftmir;
 		supported = 1;

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

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

Changes by: flatcap

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

Modified Files:
	ntfsrm.c 
Log Message:
no code changes, merely reordered some functions

Index: ntfsrm.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsrm.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- ntfsrm.c	12 Jul 2005 17:13:29 -0000	1.39
+++ ntfsrm.c	12 Jul 2005 17:58:47 -0000	1.40
@@ -44,10 +44,6 @@ GEN_PRINTF (Qprintf, stdout, &opts.quiet
 
 //#define RM_WRITE 1
 
-static int ntfs_inode_close2 (ntfs_inode *ni);
-static int ntfs_dt_root_replace (struct ntfs_dt *del, int del_num, INDEX_ENTRY *del_ie, INDEX_ENTRY *suc_ie);
-static int ntfs_dir_truncate (ntfs_volume *vol, struct ntfs_dir *dir);
-
 /**
  * version - Print version information about the program
  *
@@ -286,6 +282,108 @@ static const char *ntfsinfo_time_to_str(
[...4745 lines suppressed...]
-	return 0;
+	found->dir      = dir;
+	found->dt       = dt;
+	found->dt_index = dt_num;
+	found->inode    = dt->inodes[dt_num];
+	found->mref     = found->inode->mft_no;
+	result = TRUE;
+	//printf ("dir %p, dt %p, num %d, ino %p, %lld\n", dir, dt, dt_num, dt->inodes[dt_num], MREF (found->inode->mft_no));
+close:
+	free (ascii);	// from strdup
+	free (unicode);
+	return result;
 }
 
 
@@ -5174,3 +5169,4 @@ done:
 
 	return result;
 }
+

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsrm.c,1.38,1.39 ntfsrm.h,1.10,1.11

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

Changes by: flatcap

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

Modified Files:
	ntfsrm.c ntfsrm.h 
Log Message:
fix some sloppy memory management
tidy up bmp handling

Index: ntfsrm.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsrm.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- ntfsrm.c	11 Jul 2005 11:54:38 -0000	1.38
+++ ntfsrm.c	12 Jul 2005 17:13:29 -0000	1.39
@@ -46,6 +46,7 @@ GEN_PRINTF (Qprintf, stdout, &opts.quiet
 
 static int ntfs_inode_close2 (ntfs_inode *ni);
 static int ntfs_dt_root_replace (struct ntfs_dt *del, int del_num, INDEX_ENTRY *del_ie, INDEX_ENTRY *suc_ie);
+static int ntfs_dir_truncate (ntfs_volume *vol, struct ntfs_dir *dir);
 
 /**
  * version - Print version information about the program
@@ -287,6 +288,28 @@ static const char *ntfsinfo_time_to_str(
 
 
 /**
+ * ntfs_bmp_rollback
+ */
+static int ntfs_bmp_rollback (struct ntfs_bmp *bmp)
+{
+	int i;
+
+	if ((!bmp) || (bmp->count == 0))
+		return 0;
+
+	for (i = 0; i < bmp->count; i++)
+		free (bmp->data[i]);
+
+	free (bmp->data);
+	free (bmp->data_vcn);
+	bmp->data = NULL;
+	bmp->data_vcn = NULL;
+	bmp->count = 0;
+
+	return 0;
+}
+
+/**
  * ntfs_bmp_commit
  */
 static int ntfs_bmp_commit (struct ntfs_bmp *bmp)
@@ -310,11 +333,11 @@ static int ntfs_bmp_commit (struct ntfs_
 	printf ("\ti size = %lld\n", bmp->attr->initialized_size);
 #endif
 
-	cs = bmp->vol->cluster_size;
-
-	printf ("commit bmp inode %lld, 0x%02X (%sresident)\n", bmp->attr->ni->mft_no, bmp->attr->type, NAttrNonResident (bmp->attr) ? "non-" : "");
+	//printf ("commit bmp inode %lld, 0x%02X (%sresident)\n", bmp->attr->ni->mft_no, bmp->attr->type, NAttrNonResident (bmp->attr) ? "non-" : "");
 
 	if (NAttrNonResident (bmp->attr)) {
+		cs = bmp->vol->cluster_size;
+
 		// non-resident
 		for (i = 0; i < bmp->count; i++) {
 #ifdef RM_WRITE
@@ -335,34 +358,7 @@ static int ntfs_bmp_commit (struct ntfs_
 		printf (RED "\tntfs_attr_pwrite resident (%lld)\n" END, bmp->attr->data_size);
 	}
 
-	for (i = 0; i < bmp->count; i++)
-		free (bmp->data[i]);
-
-	free (bmp->data);	// XXX wipe ->data and ->data_vcn
-	free (bmp->data_vcn);
-	bmp->count = 0;
-
-	return 0;
-}
-
-/**
- * ntfs_bmp_rollback
- */
-static int ntfs_bmp_rollback (struct ntfs_bmp *bmp)
-{
-	int i;
-
-	if ((!bmp) || (bmp->count == 0))
-		return 0;
-
-	printf ("rollback bmp\n");
-
-	for (i = 0; i < bmp->count; i++)
-		free (bmp->data[i]);
-
-	free (bmp->data);
-	free (bmp->data_vcn);
-	bmp->count = 0;
+	ntfs_bmp_rollback (bmp);
 
 	return 0;
 }
@@ -379,7 +375,6 @@ static void ntfs_bmp_free (struct ntfs_b
 
 	ntfs_attr_close (bmp->attr);
 
-	free (bmp->cache);
 	free (bmp);
 }
 
@@ -409,8 +404,6 @@ static struct ntfs_bmp * ntfs_bmp_alloc 
 	bmp->data      = NULL;
 	bmp->data_vcn  = NULL;
 	bmp->count     = 0;
-	bmp->cache     = NULL;
-	bmp->cache_vcn = -1;
 
 	return bmp;
 }
@@ -1190,6 +1183,8 @@ static int ntfs_dt_rollback (struct ntfs
 	if (!dt)
 		return -1;
 
+	return 0; // TEMP
+
 	for (i = 0; i < dt->child_count; i++) {
 		if (dt->sub_nodes)
 			ntfs_dt_rollback (dt->sub_nodes[i]);
@@ -1223,9 +1218,9 @@ static void ntfs_dt_free (struct ntfs_dt
 	ntfs_dt_rollback (dt);
 
 	for (i = 0; i < dt->child_count; i++) {
-		if (dt->sub_nodes)
-			ntfs_dt_rollback (dt->sub_nodes[i]);
-		if (dt->inodes)
+		//if (dt->sub_nodes)
+			ntfs_dt_free (dt->sub_nodes[i]);
+		//if (dt->inodes)
 			ntfs_inode_close2 (dt->inodes[i]);
 	}
 
@@ -1459,7 +1454,7 @@ static struct ntfs_dt * ntfs_dt_find2 (s
 			//printf ("match %p\n", res);
 			if (index_num)
 				*index_num = i;
-		} else if (r == -1) {
+		} else if ((r == -1) && (ie->flags & INDEX_ENTRY_NODE)) {
 			//printf ("recurse\n");
 			if (!dt->sub_nodes[i]) {
 				vcn = ntfs_ie_get_vcn (ie);
@@ -2116,6 +2111,8 @@ static int ntfs_dir_commit (struct ntfs_
 		printf (RED "\tntfs_inode_sync %llu\n" END, dir->inode->mft_no);
 	}
 
+	ntfs_dir_truncate (dir->vol, dir);
+
 	if (ntfs_dt_commit (dir->index) < 0)
 		return -1;
 
@@ -2414,8 +2411,7 @@ static int ntfs_dir_truncate (ntfs_volum
 		dir->index->header->flags = 0;
 
 		//rollback dir's bmp
-		ntfs_bmp_rollback (dir->bitmap);
-		free (dir->bitmap);
+		ntfs_bmp_free (dir->bitmap);
 		dir->bitmap = NULL;
 
 		/*
@@ -3050,12 +3046,16 @@ static BOOL utils_pathname_to_inode2 (nt
 			child = ntfs_dir_find2 (dir, unicode, len);
 			if (!child) {
 				printf ("can't find %s in %s\n", p, pathname);
-				break;
+				goto close;
 			}
 		} else {
 			//printf ("file: %s\n", p);
 
 			dt = ntfs_dt_find2 (dir->index, unicode, len, &dt_num);
+			if (!dt) {
+				printf ("can't find %s in %s (2)\n", p, pathname);
+				goto close;
+			}
 
 			if (dt->inodes[dt_num] == NULL) {
 				dt->inodes[dt_num] = ntfs_inode_open (dir->vol, dt->children[dt_num]->indexed_file);
@@ -3246,13 +3246,13 @@ static int ntfs_dt_root_replace (struct 
 	src = (u8*) del->data;
 	dst = attr;
 
-	len = del->data_len + suc_ie->length - del_ie->length;
+	len = suc_ie->length - del_ie->length;
 	free (del->data);
 	del->data = attr;
-	del->data_len = len;
+	del->data_len += len;
 	del->header = (INDEX_HEADER*) (del->data + 0x10);
-	del->header->index_length   += (suc_ie->length - del_ie->length);
-	del->header->allocated_size += (suc_ie->length - del_ie->length);
+	del->header->index_length   += len;
+	del->header->allocated_size += len;
 
 	ntfs_mft_resize_resident (del->dir->inode, AT_INDEX_ROOT, I30, 4, del->data, del->data_len);
 
@@ -3264,7 +3264,6 @@ static int ntfs_dt_root_replace (struct 
 	//	printf ("\tChild %d %p %d\n", i, del->children[i], del->children[i]->flags);
 	//printf ("\n");
 
-	len = suc_ie->length - del_ie->length;
 	//printf ("src = %p, dst = %p, len = %d\n", src, dst, len); fflush (stdout);
 
 	for (i = 0; i < del->child_count; i++)
@@ -5007,8 +5006,6 @@ static int ntfs_file_remove2 (ntfs_volum
 
 	if (1) ntfs_file_remove (vol, dt, dt_num); // remove name from index
 
-	if (1) ntfs_dir_truncate (vol, dir);
-
 	if (1) utils_volume_commit (vol);
 
 	if (0) utils_volume_rollback (vol);

Index: ntfsrm.h
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsrm.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- ntfsrm.h	19 Jun 2005 21:09:41 -0000	1.10
+++ ntfsrm.h	12 Jul 2005 17:13:30 -0000	1.11
@@ -52,8 +52,6 @@ struct ntfs_bmp {
 	int		  count;
 	u8		**data;
 	VCN		 *data_vcn;
-	u8		 *cache;
-	VCN		  cache_vcn;
 };
 
 /**

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsrm.c,1.37,1.38

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

Changes by: flatcap

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

Modified Files:
	ntfsrm.c 
Log Message:
another bmp test
fix bmp handling again
fix dt commit for iroot
fix dt root replace
rm now cleanly removes last dir entry

Index: ntfsrm.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsrm.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -p -r1.37 -r1.38
--- ntfsrm.c	8 Jul 2005 18:45:44 -0000	1.37
+++ ntfsrm.c	11 Jul 2005 11:54:38 -0000	1.38
@@ -302,9 +302,13 @@ static int ntfs_bmp_commit (struct ntfs_
 	if (bmp->count == 0)
 		return 0;
 
-	//printf ("\ta size = %lld\n", bmp->attr->allocated_size);
-	//printf ("\td size = %lld\n", bmp->attr->data_size);
-	//printf ("\ti size = %lld\n", bmp->attr->initialized_size);
+#if 0
+	printf ("attr = 0x%02X\n", bmp->attr->type);
+	printf ("resident = %d\n", !NAttrNonResident (bmp->attr));
+	printf ("\ta size = %lld\n", bmp->attr->allocated_size);
+	printf ("\td size = %lld\n", bmp->attr->data_size);
+	printf ("\ti size = %lld\n", bmp->attr->initialized_size);
+#endif
 
 	cs = bmp->vol->cluster_size;
 
@@ -498,14 +502,14 @@ static int ntfs_bmp_set_range (struct nt
 	// shouldn't all the vcns be lcns?
 	s64 i;
 	u8 *buffer;
-	int clust_size;
+	int csib;			// cluster size in bits
 
 	int block_start, block_finish;	// rename to c[sf]  (rename to clust_)
 	int vcn_start, vcn_finish;	// rename to v[sf]
 	int byte_start, byte_finish;	// rename to b[sf]
 	u8 mask_start, mask_finish;	// rename to m[sf]
 
-	int a,b;
+	s64 a,b;
 
 	if (!bmp)
 		return -1;
@@ -513,21 +517,25 @@ static int ntfs_bmp_set_range (struct nt
 	if (value)
 		value = 0xFF;
 
-	clust_size = bmp->vol->cluster_size;
+	csib = bmp->vol->cluster_size << 3;
 
 	vcn_start  = vcn;
 	vcn_finish = vcn + length - 1;
 
-	a = ROUND_DOWN (vcn_start, clust_size<<3);
-	b = ROUND_UP (vcn_finish, clust_size<<3) + 1;
-
-	for (i = a; i < b; i += (clust_size<<3)) {
-		buffer = ntfs_bmp_get_data (bmp, ROUND_DOWN (i, clust_size<<3));
+	//printf ("vcn_start = %d, vcn_finish = %d\n", vcn_start, vcn_finish);
+	a = ROUND_DOWN (vcn_start,  csib);
+	b = ROUND_DOWN (vcn_finish, csib) + 1;
+
+	//printf ("a = %lld, b = %lld\n", a, b);
+
+	for (i = a; i < b; i += csib) {
+		//printf ("ntfs_bmp_get_data %lld\n", i);
+		buffer = ntfs_bmp_get_data (bmp, i);
 		if (!buffer)
 			return -1;
 
-		block_start  = ROUND_DOWN (i, clust_size<<3);
-		block_finish = block_start + (clust_size<<3) - 1;
+		block_start  = i;
+		block_finish = block_start + csib - 1;
 
 		mask_start  = (0xFF << (vcn_start & 7));
 		mask_finish = (0xFF >> (7 - (vcn_finish & 7)));
@@ -542,7 +550,7 @@ static int ntfs_bmp_set_range (struct nt
 		if ((vcn_finish >= block_start) && (vcn_finish <= block_finish)) {
 			byte_finish = (vcn_finish - block_start) >> 3;
 		} else {
-			byte_finish = clust_size - 1;
+			byte_finish = bmp->vol->cluster_size - 1;
 			mask_finish = 0xFF;
 		}
 
@@ -571,7 +579,6 @@ static int ntfs_bmp_set_range (struct nt
 	}
 	printf (" vcn %lld-%lld\n" END, vcn>>12, (vcn+length-1)>>12);
 #endif
-
 	return 1;
 }
 
@@ -1123,6 +1130,7 @@ static int ntfs_dt_commit (struct ntfs_d
 	ntfs_attr *attr;
 	struct ntfs_dir *dir;
 	int i;
+	int size;
 
 	if (!dt)
 		return 0;
@@ -1134,17 +1142,24 @@ static int ntfs_dt_commit (struct ntfs_d
 	vol = dir->vol; // cluster size
 
 	if (dt->changed) {
-		printf ("commit dt\n");
 		if (dt->parent) {
+			printf ("commit dt (alloc)\n");
 			attr = dt->dir->ialloc;
+			size = dt->dir->index_size;
+			//utils_dump_mem (dt->data, 0, size, DM_DEFAULTS);
+#ifdef RM_WRITE
+			ntfs_attr_mst_pwrite(attr, dt->vcn * size, 1, size, dt->data); // XXX retval
+#endif
 		} else {
+			printf ("commit dt (root)\n");
 			attr = dt->dir->iroot;
-		}
-
+			size = dt->data_len;
+			//utils_dump_mem (dt->data, 0, size, DM_DEFAULTS);
 #ifdef RM_WRITE
-		//utils_dump_mem (dt->data, 0, 16, DM_DEFAULTS);
-		ntfs_attr_mst_pwrite(attr, dt->vcn * dt->dir->index_size, 1, dt->dir->index_size, dt->data); // XXX retval
+			ntfs_attr_pwrite(attr, 0, size, dt->data); // XXX retval
 #endif
+		}
+
 		printf (RED "\tntfs_attr_pwrite (vcn %lld)\n" END, dt->vcn);
 
 		dt->changed = FALSE;
@@ -2331,7 +2346,7 @@ static struct ntfs_dir * ntfs_dir_find2 
  */
 static int ntfs_dir_truncate (ntfs_volume *vol, struct ntfs_dir *dir)
 {
-	int i;
+	//int i;
 	//u8 *buffer;
 	//int buf_count;
 	s64 last_bit;
@@ -2361,9 +2376,11 @@ static int ntfs_dir_truncate (ntfs_volum
 
 	printf (BOLD YELLOW "Truncation needed\n" END);
 
+#if 0
 	printf ("\tlast bit = %lld\n", last_bit);
 	printf ("\tactual IALLOC size = %lld\n", dir->ialloc->allocated_size);
 	printf ("\tshould IALLOC size = %lld\n", dir->index_size * (last_bit + 1));
+#endif
 
 	if ((dir->index_size * (last_bit + 1)) == 0) {
 		printf ("root dt %d, vcn = %lld\n", dir->index->changed, dir->index->vcn);
@@ -2388,20 +2405,27 @@ static int ntfs_dir_truncate (ntfs_volum
 		//utils_dump_mem ((u8*)ie, 0, ie->length, DM_DEFAULTS); printf ("\n");
 		ntfs_dt_root_replace (dir->index, 0, dir->index->children[0], ie);
 		//utils_dump_mem (dir->index->data, 0, dir->index->data_len, DM_DEFAULTS); printf ("\n");
-		printf ("root dt %d, vcn = %lld\n", dir->index->changed, dir->index->vcn);
+		//printf ("root dt %d, vcn = %lld\n", dir->index->changed, dir->index->vcn);
 
 		free (ie);
 		ie = NULL;
 
+		//index flags remove LARGE_INDEX
+		dir->index->header->flags = 0;
+
 		//rollback dir's bmp
 		ntfs_bmp_rollback (dir->bitmap);
 		free (dir->bitmap);
 		dir->bitmap = NULL;
 
+		/*
 		for (i = 0; i < dir->index->child_count; i++) {
 			ntfs_dt_rollback (dir->index->sub_nodes[i]);
 			dir->index->sub_nodes[i] = NULL;
 		}
+		*/
+
+		//printf ("dir->index->inodes[0] = %p\n", dir->index->inodes[0]);
 
 		//remove 0xA0 attribute
 		ntfs_mft_remove_attr (vol->private_bmp2, dir->inode, AT_INDEX_ALLOCATION);
@@ -3226,6 +3250,9 @@ static int ntfs_dt_root_replace (struct 
 	free (del->data);
 	del->data = attr;
 	del->data_len = len;
+	del->header = (INDEX_HEADER*) (del->data + 0x10);
+	del->header->index_length   += (suc_ie->length - del_ie->length);
+	del->header->allocated_size += (suc_ie->length - del_ie->length);
 
 	ntfs_mft_resize_resident (del->dir->inode, AT_INDEX_ROOT, I30, 4, del->data, del->data_len);
 
@@ -5031,7 +5058,7 @@ static int ntfs_test_bmp2 (ntfs_volume *
 {
 	struct ntfs_bmp *bmp;
 	int i, j;
-	u8 value = 0x00;
+	u8 value = 0xFF;
 
 	bmp = calloc (1, sizeof (*bmp));
 	if (!bmp)
@@ -5041,12 +5068,23 @@ static int ntfs_test_bmp2 (ntfs_volume *
 	bmp->attr = calloc (1, sizeof (*bmp->attr));
 	bmp->attr->type = 0xB0;
 	bmp->attr->ni = calloc (1, sizeof (*bmp->attr->ni));
-	bmp->count = 1;
+	bmp->count = 2;
 	bmp->data = calloc (4, sizeof (u8*));
 	bmp->data[0] = calloc (1, vol->cluster_size);
+	bmp->data[1] = calloc (1, vol->cluster_size);
 	bmp->data_vcn = calloc (4, sizeof (VCN));
 	bmp->data_vcn[0] = 0;
+	bmp->data_vcn[1] = 1;
+
+	for (j = 4090; j < 4103; j++) {
+		memset (bmp->data[0], ~value, vol->cluster_size);
+		memset (bmp->data[1], ~value, vol->cluster_size);
+		ntfs_bmp_set_range (bmp, j, 7, value);
+		for (i = 0; i < 4; i++) { ntfs_binary_print (bmp->data[0][508+i], TRUE, TRUE); printf (" "); } printf ("| ");
+		for (i = 0; i < 4; i++) { ntfs_binary_print (bmp->data[1][i], TRUE, TRUE); printf (" "); } printf ("\n");
+	}
 
+	printf ("\n");
 	for (j = 0; j < 15; j++) {
 		memset (bmp->data[0], ~value, vol->cluster_size);
 		ntfs_bmp_set_range (bmp, j, 1, value);

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsresize.8.in,1.19,1.20 ntfsresize.c,1.70,1.71

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

Changes by: szaka

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

Modified Files:
	ntfsresize.8.in ntfsresize.c 
Log Message:
Rephrase mentioning "dirty" volumes so people hopefully won't think that
Windows repairs what ntfsresize damaged. The real function of leaving
the volume dirty is to make Windows create the backup boot sector because
we can't know where the partitioner will exactly resizes (they optionally 
round to some cylinder boundary, defined by ad hoc, arbitrariy rules).


Index: ntfsresize.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.8.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- ntfsresize.8.in	7 Jul 2005 21:20:04 -0000	1.19
+++ ntfsresize.8.in	10 Jul 2005 23:09:02 -0000	1.20
@@ -137,11 +137,12 @@ with
 first.
 .TP
 .B -f, --force
-Forces ntfsresize to proceed with the resize operation if the filesystem
-is marked "dirty" for consistency check. 
+Forces ntfsresize to proceed with the resize operation even if the filesystem
+is marked for consistency check. 
 
 Please note, ntfsresize always marks the filesystem
-"dirty" before a real resize operation and it leaves that way for extra 
+for consistency check before a real resize operation 
+and it leaves that way for extra 
 safety. Thus if NTFS was marked by ntfsresize then it's safe to 
 use this option. If you need
 to resize several times without booting into Windows between each

Index: ntfsresize.c
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsresize.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- ntfsresize.c	6 Jul 2005 22:47:19 -0000	1.70
+++ ntfsresize.c	10 Jul 2005 23:09:03 -0000	1.71
@@ -2098,8 +2098,8 @@ static ntfs_volume *mount_volume(void)
 
 	if (vol->flags & VOLUME_IS_DIRTY)
 		if (opt.force-- <= 0)
-			err_exit("Volume is dirty. Run chkdsk /f and "
-				 "please try again (or see -f option).\n");
+			err_exit("Volume is scheduled for check.\nRun chkdsk /f"
+				 " and please try again, or see option -f.\n");
 
 	if (NTFS_MAX_CLUSTER_SIZE < vol->cluster_size)
 		err_exit("Cluster size %u is too large!\n",

[Linux-NTFS-cvs] CVS: ntfsprogs/ntfsprogs ntfsfix.8.in,1.5,1.6

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

Changes by: szaka

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

Modified Files:
	ntfsfix.8.in 
Log Message:
Update ntfsfix manual


Index: ntfsfix.8.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ntfsprogs/ntfsfix.8.in,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- ntfsfix.8.in	10 Mar 2004 22:03:54 -0000	1.5
+++ ntfsfix.8.in	10 Jul 2005 22:44:00 -0000	1.6
@@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH NTFSFIX 8 "March 2004" "ntfsprogs version @VERSION@"
+.TH NTFSFIX 8 "July 2005" "ntfsprogs version @VERSION@"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -16,41 +16,25 @@
 .\" .sp <n> insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-ntfsfix \- tool for fixing NTFS partitions altered by the Linux kernel NTFS driver.
+ntfsfix \- fix common errors and force Windows to check NTFS
 .SH SYNOPSIS
 .B ntfsfix
 .I device
 .SH DESCRIPTION
-This manual page documents briefly the
-.B ntfsfix
-command.
-.PP
-.\" TeX users may be more comfortable with the \fB<whatever>\fP and
-.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
-.\" respectively.
-\fBntfsfix\fP is a program that fixes NTFS partitions altered in any
-manner with the Linux NTFS driver. \fBntfsfix\fP is \fBNOT\fP a Linux
-version of chkdsk. It only tries to leave the NTFS partition in a
-not-so-inconsistent state after the NTFS driver has written to it.
-.sp
-\fBntfsfix\fP appeared because MS chkdsk is well known for its
-stupidity when fixing altered partitions. Because the main problems
-are journal files, \fBntfsfix\fP aims to fix those issues.
-.sp
-Running ntfsfix after mounting NTFS partitions read-write is recommended
-for reducing the chance of severe data loss when NT/W2K/XP tries to remount
-the affected partition(s).
+\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.
 .sp
-In order to use \fBntfsfix\fP you must unmount the NTFS partition, and run
-ntfsfix device, where device is the NTFS partition. After this, you can
-safely reboot into NT/W2K/XP. Please note that \fBntfsfix\fP is not a
-chkdsk-like tool, and so is not guaranteed that it could fix all the
-alterations provoked by the NTFS driver.
-
+You may run 
+.B ntfsfix 
+on an NTFS volume if you think it's damaged and it can't be mounted.
 .SH AUTHOR
-This manual page was written by David Martínez Moreno
-<en...@de...>, for Debian the GNU/Linux
-system (but may be used by others).
+The original ntfsfix manual page was written by David Martínez Moreno
+<en...@de...> and rewritten 
+by Szabolcs Szakacsits to reflect the current role of
+.B ntfsfix.
 .SH AVAILABILITY
 .B ntfsfix
 is part of the ntfsprogs package and is available from

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.237,1.238

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

Changes by: szaka

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

Modified Files:
	ChangeLog 
Log Message:
Update ntfsfix manual


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.237
retrieving revision 1.238
diff -u -p -r1.237 -r1.238
--- ChangeLog	10 Jul 2005 21:42:39 -0000	1.237
+++ ChangeLog	10 Jul 2005 22:44:00 -0000	1.238
@@ -2,7 +2,8 @@ xx/07/2005 - 1.11.0-WIP - Fixes and a ne
 
 	- ntfscp: fix signal hanling: handle both SIGTERM and SIGINT, print
 	  correct message.  (Yura)
-	- Update manual pages for ntfsprogs, ntfsclone, ntfsresize.  (Szaka)
+	- Update manual pages for ntfsprogs, ntfsclone, ntfsresize and 
+	  ntfsfix.  (Szaka)
 	- ntfsclone: detect and hint users if the destination fs does not
 	  support sparse files.  (Szaka)
 	- Fix memory managament error in ntfs_inode_close.  (Yura)

[Linux-NTFS-cvs] CVS: ntfsprogs config.guess,1.23,1.24 config.sub,1.23,1.24 configure,1.86,1.87 configure.ac,1.62,1.63 ltmain.sh,1.20,1.21

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

Changes by: antona

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

Modified Files:
	config.guess config.sub configure configure.ac ltmain.sh 
Log Message:
I am a muppet.  I forgot to update the version number in configure.ac before
running autogen.sh last time.  )-:


Index: config.guess
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/config.guess,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- config.guess	10 Jul 2005 12:38:47 -0000	1.23
+++ config.guess	10 Jul 2005 21:47:23 -0000	1.24
@@ -136,6 +136,16 @@ UNAME_RELEASE=`(uname -r) 2>/dev/null` |
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
+case "${UNAME_MACHINE}" in
+    i?86)
+	test -z "$VENDOR" && VENDOR=pc
+	;;
+    *)
+	test -z "$VENDOR" && VENDOR=unknown
+	;;
+esac
+test -f /etc/SuSE-release -o -f /.buildenv && VENDOR=suse
+
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -825,25 +835,25 @@ EOF
 	echo ${UNAME_MACHINE}-pc-minix
 	exit 0 ;;
     arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux
 	exit 0 ;;
     cris:Linux:*:*)
-	echo cris-axis-linux-gnu
+	echo cris-axis-linux
 	exit 0 ;;
     crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
+	echo crisv32-axis-linux
 	exit 0 ;;
     frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
+    	echo frv-${VENDOR}-linux
 	exit 0 ;;
     ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux
 	exit 0 ;;
     m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux
 	exit 0 ;;
     m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux
 	exit 0 ;;
     mips:Linux:*:*)
 	eval $set_cc_for_build
@@ -862,7 +872,7 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	test x"${CPU}" != x && echo "${CPU}-${VENDOR}-linux" && exit 0
 	;;
     mips64:Linux:*:*)
 	eval $set_cc_for_build
@@ -881,13 +891,13 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+	test x"${CPU}" != x && echo "${CPU}-${VENDOR}-linux" && exit 0
 	;;
     ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
+	echo powerpc-${VENDOR}-linux
 	exit 0 ;;
     ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
+	echo powerpc64-${VENDOR}-linux
 	exit 0 ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
@@ -900,34 +910,34 @@ EOF
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
         esac
 	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	if test "$?" = 0 ; then LIBC="-libc1" ; else LIBC="" ; fi
+	echo ${UNAME_MACHINE}-${VENDOR}-linux${LIBC}
 	exit 0 ;;
     parisc:Linux:*:* | hppa:Linux:*:*)
 	# Look for CPU level
 	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
+	  PA7*) echo hppa1.1-${VENDOR}-linux ;;
+	  PA8*) echo hppa2.0-${VENDOR}-linux ;;
+	  *)    echo hppa-${VENDOR}-linux ;;
 	esac
 	exit 0 ;;
     parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
+	echo hppa64-${VENDOR}-linux
 	exit 0 ;;
     s390:Linux:*:* | s390x:Linux:*:*)
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit 0 ;;
     sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+    	echo ${UNAME_MACHINE}-${VENDOR}-linux
 	exit 0 ;;
     sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux
 	exit 0 ;;
     sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-${VENDOR}-linux
 	exit 0 ;;
     x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
+	echo x86_64-${VENDOR}-linux
 	exit 0 ;;
     i*86:Linux:*:*)
 	# The BFD linker knows what the default object file format is, so
@@ -942,18 +952,18 @@ EOF
 				    p'`
         case "$ld_supported_targets" in
 	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+		TENTATIVE="${UNAME_MACHINE}-${VENDOR}-linux"
 		;;
 	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+		echo "${UNAME_MACHINE}-${VENDOR}-linuxaout"
 		exit 0 ;;
 	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+		echo "${UNAME_MACHINE}-${VENDOR}-linuxcoff"
 		exit 0 ;;
 	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
+		# Either a pre-BFD a.out linker (linuxoldld) or
 		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+		echo "${UNAME_MACHINE}-${VENDOR}-linuxoldld"
 		exit 0 ;;
 	esac
 	# Determine whether the default compiler is a.out or elf
@@ -982,7 +992,7 @@ EOF
 	#endif
 EOF
 	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
+	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-${VENDOR}-linux-${LIBC}" | sed 's/linux-gnu/linux/' && exit 0
 	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
 	;;
     i*86:DYNIX/ptx:4*:*)

Index: config.sub
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/config.sub,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- config.sub	10 Jul 2005 12:38:47 -0000	1.23
+++ config.sub	10 Jul 2005 21:47:23 -0000	1.24
@@ -1172,7 +1172,7 @@ case $os in
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* \
 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+	      | -mingw32* | -linux* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
 	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
@@ -1205,9 +1205,6 @@ case $os in
 	-linux-dietlibc)
 		os=-linux-dietlibc
 		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
 	-sunos5*)
 		os=`echo $os | sed -e 's|sunos5|solaris2|'`
 		;;

Index: configure
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/configure,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -p -r1.86 -r1.87
--- configure	10 Jul 2005 21:42:39 -0000	1.86
+++ configure	10 Jul 2005 21:47:23 -0000	1.87
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for ntfsprogs 1.10.1-WIP.
+# Generated by GNU Autoconf 2.59 for ntfsprogs 1.11.0-WIP.
 #
 # Report bugs to <lin...@li...>.
 #
@@ -423,8 +423,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='ntfsprogs'
 PACKAGE_TARNAME='ntfsprogs'
-PACKAGE_VERSION='1.10.1-WIP'
-PACKAGE_STRING='ntfsprogs 1.10.1-WIP'
+PACKAGE_VERSION='1.11.0-WIP'
+PACKAGE_STRING='ntfsprogs 1.11.0-WIP'
 PACKAGE_BUGREPORT='lin...@li...'
 
 ac_unique_file="config.h.in"
@@ -955,7 +955,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ntfsprogs 1.10.1-WIP to adapt to many kinds of systems.
+\`configure' configures ntfsprogs 1.11.0-WIP to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1022,7 +1022,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ntfsprogs 1.10.1-WIP:";;
+     short | recursive ) echo "Configuration of ntfsprogs 1.11.0-WIP:";;
    esac
   cat <<\_ACEOF
 
@@ -1170,7 +1170,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-ntfsprogs configure 1.10.1-WIP
+ntfsprogs configure 1.11.0-WIP
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1184,7 +1184,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ntfsprogs $as_me 1.10.1-WIP, which was
+It was created by ntfsprogs $as_me 1.11.0-WIP, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1912,7 +1912,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='ntfsprogs'
- VERSION='1.10.1-WIP'
+ VERSION='1.11.0-WIP'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -23579,7 +23579,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by ntfsprogs $as_me 1.10.1-WIP, which was
+This file was extended by ntfsprogs $as_me 1.11.0-WIP, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -23642,7 +23642,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-ntfsprogs config.status 1.10.1-WIP
+ntfsprogs config.status 1.11.0-WIP
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 

Index: configure.ac
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/configure.ac,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -p -r1.62 -r1.63
--- configure.ac	10 Jul 2005 12:38:48 -0000	1.62
+++ configure.ac	10 Jul 2005 21:47:25 -0000	1.63
@@ -22,7 +22,7 @@
 #
 
 AC_PREREQ(2.59)
-AC_INIT([ntfsprogs],[1.10.1-WIP],[lin...@li...])
+AC_INIT([ntfsprogs],[1.11.0-WIP],[lin...@li...])
 AC_CANONICAL_HOST([])
 AC_CANONICAL_TARGET([])
 AC_CONFIG_SRCDIR([config.h.in])

Index: ltmain.sh
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ltmain.sh,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- ltmain.sh	10 Jul 2005 12:38:48 -0000	1.20
+++ ltmain.sh	10 Jul 2005 21:47:25 -0000	1.21
@@ -17,7 +17,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -43,8 +43,8 @@ EXIT_FAILURE=1
 
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION=1.5.18
-TIMESTAMP=" (1.1220.2.245 2005/05/16 08:55:27)"
+VERSION=1.5.14
+TIMESTAMP=" (1.1220.2.195 2005/02/12 12:12:33)"
 
 # See if we are running on zsh, and set the options which allow our
 # commands through without removal of \ escapes.
@@ -112,9 +112,8 @@ if test "${LANG+set}" = set; then
 fi
 
 # Make sure IFS has a sensible default
-lt_nl='
-'
-IFS=" 	$lt_nl"
+: ${IFS=" 	
+"}
 
 if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
   $echo "$modename: not configured to build any kind of library" 1>&2
@@ -251,14 +250,37 @@ func_extract_an_archive ()
 {
     f_ex_an_ar_dir="$1"; shift
     f_ex_an_ar_oldlib="$1"
+    f_ex_an_ar_lib=`$echo "X$f_ex_an_ar_oldlib" | $Xsed -e 's%^.*/%%'`
 
     $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
     $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
     if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
      :
     else
-      $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
-      exit $EXIT_FAILURE
+      $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+      $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+      $show "cp $f_ex_an_ar_oldlib $f_ex_an_ar_dir/$f_ex_an_ar_lib"
+      $run eval "cp \$f_ex_an_ar_oldlib \$f_ex_an_ar_dir/\$f_ex_an_ar_lib"
+      $AR t "$f_ex_an_ar_oldlib" | sort | uniq -c \
+	| $EGREP -v '^[ 	]*1[ 	]' | while read count name
+      do
+	i=1
+	while test "$i" -le "$count"
+	  do
+	  # Put our $i before any first dot (extension)
+	  # Never overwrite any file
+	  name_to="$name"
+	  while test "X$name_to" = "X$name" || test -f "$f_ex_an_ar_dir/$name_to"
+	    do
+	    name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+	  done
+	  $show "(cd $f_ex_an_ar_dir && $AR x  $f_ex_an_ar_lib '$name' && $mv '$name' '$name_to')"
+	  $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_lib '$name' && $mv '$name' '$name_to' && $AR -d \$f_ex_an_ar_lib '$name')" || exit $?
+	  i=`expr $i + 1`
+	done
+      done
+      $show "$rm $f_ex_an_ar_dir/$f_ex_an_ar_lib"
+      $run eval "$rm \$f_ex_an_ar_dir/\$f_ex_an_ar_lib"
     fi
 }
 
@@ -735,15 +757,6 @@ if test -z "$show_help"; then
       esac
     done
 
-    qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
-    case $qlibobj in
-      *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
-	qlibobj="\"$qlibobj\"" ;;
-    esac
-    if test "X$libobj" != "X$qlibobj"; then
-	$echo "$modename: libobj name \`$libobj' may not contain shell special characters."
-	exit $EXIT_FAILURE
-    fi
     objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
     xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
     if test "X$xdir" = "X$obj"; then
@@ -816,17 +829,12 @@ compiler."
 	$run $rm $removelist
 	exit $EXIT_FAILURE
       fi
-      $echo "$srcfile" > "$lockfile"
+      $echo $srcfile > "$lockfile"
     fi
 
     if test -n "$fix_srcfile_path"; then
       eval srcfile=\"$fix_srcfile_path\"
     fi
-    qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
-    case $qsrcfile in
-      *$quote_scanset* | *]* | *\|* | *\&* | *\(* | *\)* | "")
-      qsrcfile="\"$qsrcfile\"" ;;
-    esac
 
     $run $rm "$libobj" "${libobj}T"
 
@@ -848,10 +856,10 @@ EOF
       fbsd_hideous_sh_bug=$base_compile
 
       if test "$pic_mode" != no; then
-	command="$base_compile $qsrcfile $pic_flag"
+	command="$base_compile $srcfile $pic_flag"
       else
 	# Don't build PIC code
-	command="$base_compile $qsrcfile"
+	command="$base_compile $srcfile"
       fi
 
       if test ! -d "${xdir}$objdir"; then
@@ -931,9 +939,9 @@ EOF
     if test "$build_old_libs" = yes; then
       if test "$pic_mode" != yes; then
 	# Don't build PIC code
-	command="$base_compile $qsrcfile"
+	command="$base_compile $srcfile"
       else
-	command="$base_compile $qsrcfile $pic_flag"
+	command="$base_compile $srcfile $pic_flag"
       fi
       if test "$compiler_c_o" = yes; then
 	command="$command -o $obj"
@@ -1357,8 +1365,6 @@ EOF
 	  ;;
         darwin_framework)
 	  compiler_flags="$compiler_flags $arg"
-	  compile_command="$compile_command $arg"
-	  finalize_command="$finalize_command $arg"
 	  prev=
 	  continue
 	  ;;
@@ -1423,8 +1429,6 @@ EOF
       -framework)
         prev=darwin_framework
         compiler_flags="$compiler_flags $arg"
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
         continue
         ;;
 
@@ -2848,13 +2852,13 @@ EOF
 	      *) continue ;;
 	      esac
 	      case " $deplibs " in
-	      *" $path "*) ;;
-	      *) deplibs="$path $deplibs" ;;
-	      esac
-	      case " $deplibs " in
 	      *" $depdepl "*) ;;
 	      *) deplibs="$depdepl $deplibs" ;;
 	      esac
+	      case " $deplibs " in
+	      *" $path "*) ;;
+	      *) deplibs="$deplibs $path" ;;
+	      esac
 	    done
 	  fi # link_all_deplibs != no
 	fi # linkmode = lib
@@ -3120,7 +3124,7 @@ EOF
 	case $current in
 	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 	*)
-	  $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
+	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
 	  exit $EXIT_FAILURE
 	  ;;
@@ -3129,7 +3133,7 @@ EOF
 	case $revision in
 	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 	*)
-	  $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
+	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
 	  exit $EXIT_FAILURE
 	  ;;
@@ -3138,7 +3142,7 @@ EOF
 	case $age in
 	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
 	*)
-	  $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
+	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
 	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
 	  exit $EXIT_FAILURE
 	  ;;
@@ -5087,63 +5091,6 @@ fi\
       if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
        cmds=$old_archive_from_new_cmds
       else
-	# POSIX demands no paths to be encoded in archives.  We have
-	# to avoid creating archives with duplicate basenames if we
-	# might have to extract them afterwards, e.g., when creating a
-	# static archive out of a convenience library, or when linking
-	# the entirety of a libtool archive into another (currently
-	# not supported by libtool).
-	if (for obj in $oldobjs
-	    do
-	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
-	    done | sort | sort -uc >/dev/null 2>&1); then
-	  :
-	else
-	  $echo "copying selected object files to avoid basename conflicts..."
-
-	  if test -z "$gentop"; then
-	    gentop="$output_objdir/${outputname}x"
-	    generated="$generated $gentop"
-
-	    $show "${rm}r $gentop"
-	    $run ${rm}r "$gentop"
-	    $show "$mkdir $gentop"
-	    $run $mkdir "$gentop"
-	    status=$?
-	    if test "$status" -ne 0 && test ! -d "$gentop"; then
-	      exit $status
-	    fi
-	  fi
-
-	  save_oldobjs=$oldobjs
-	  oldobjs=
-	  counter=1
-	  for obj in $save_oldobjs
-	  do
-	    objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-	    case " $oldobjs " in
-	    " ") oldobjs=$obj ;;
-	    *[\ /]"$objbase "*)
-	      while :; do
-		# Make sure we don't pick an alternate name that also
-		# overlaps.
-		newobj=lt$counter-$objbase
-		counter=`expr $counter + 1`
-		case " $oldobjs " in
-		*[\ /]"$newobj "*) ;;
-		*) if test ! -f "$gentop/$newobj"; then break; fi ;;
-		esac
-	      done
-	      $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-	      $run ln "$obj" "$gentop/$newobj" ||
-	      $run cp "$obj" "$gentop/$newobj"
-	      oldobjs="$oldobjs $gentop/$newobj"
-	      ;;
-	    *) oldobjs="$oldobjs $obj" ;;
-	    esac
-	  done
-	fi
-
 	eval cmds=\"$old_archive_cmds\"
 
 	if len=`expr "X$cmds" : ".*"` &&
@@ -5157,7 +5104,20 @@ fi\
 	  objlist=
 	  concat_cmds=
 	  save_oldobjs=$oldobjs
-
+	  # GNU ar 2.10+ was changed to match POSIX; thus no paths are
+	  # encoded into archives.  This makes 'ar r' malfunction in
+	  # this piecewise linking case whenever conflicting object
+	  # names appear in distinct ar calls; check, warn and compensate.
+	    if (for obj in $save_oldobjs
+	    do
+	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
+	    done | sort | sort -uc >/dev/null 2>&1); then
+	    :
+	  else
+	    $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
+	    $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
+	    AR_FLAGS=cq
+	  fi
 	  # Is there a better way of finding the last object in the list?
 	  for obj in $save_oldobjs
 	  do
@@ -6066,14 +6026,14 @@ relink_command=\"$relink_command\""
       fi
 
       # Now prepare to actually exec the command.
-      exec_cmd="\$cmd$args"
+      exec_cmd="\"\$cmd\"$args"
     else
       # Display what would be done.
       if test -n "$shlibpath_var"; then
 	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
 	$echo "export $shlibpath_var"
       fi
-      $echo "$cmd$args"
+      eval \$echo \"\$cmd\"$args
       exit $EXIT_SUCCESS
     fi
     ;;

[Linux-NTFS-cvs] CVS: ntfsprogs ChangeLog,1.236,1.237 Makefile.in,1.34,1.35 aclocal.m4,1.27,1.28 configure,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-serv10538

Modified Files:
	ChangeLog Makefile.in aclocal.m4 configure 
Log Message:
Update changelog, fox more mkntfs bugs (thanks Timur!) and update build system
to SuSE 9.3 again.


Index: ChangeLog
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/ChangeLog,v
retrieving revision 1.236
retrieving revision 1.237
diff -u -p -r1.236 -r1.237
--- ChangeLog	9 Jul 2005 21:24:02 -0000	1.236
+++ ChangeLog	10 Jul 2005 21:42:39 -0000	1.237
@@ -1,4 +1,4 @@
-xx/07/2005 - 1.10.1-WIP
+xx/07/2005 - 1.11.0-WIP - Fixes and a new utility ntfsmount, a FUSE ntfsmodule.
 
 	- ntfscp: fix signal hanling: handle both SIGTERM and SIGINT, print
 	  correct message.  (Yura)
@@ -12,8 +12,11 @@ xx/07/2005 - 1.10.1-WIP
 	  having bad sectors if the new --bad-sectors option is used.  (Szaka)
 	- ntfsinfo: Dump $EA_INFORMATION and $EA attributes.  (Yura)
 	- mkntfs: Fix backup bootsector creation.  Thanks to Timur Amirkhanov
-	  for pointing this stupidity out.  (We forgot to set the size before
-	  doing it.)  (Anton)
+	  for pointing these stupidities out.  (We forgot to set the size
+	  before doing it and we wrote more bytes then there were in the buffer
+	  if sector size was above 8kiB and we only reserved one sector even
+	  when sector size was less than 512 bytes and then we wrote 512 bytes,
+	  i.e. beyond the end of the device.)  (Anton)
 
 20/06/2005 - 1.10.0 - Lots of new features, enhancements, and bug fixes.
 

Index: Makefile.in
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/Makefile.in,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- Makefile.in	10 Jul 2005 12:38:46 -0000	1.34
+++ Makefile.in	10 Jul 2005 21:42:39 -0000	1.35
@@ -144,7 +144,6 @@ ac_ct_CXX = @ac_ct_CXX@
 ac_ct_F77 = @ac_ct_F77@
 ac_ct_RANLIB = @ac_ct_RANLIB@
 ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
 all_includes = @all_includes@
 all_libraries = @all_libraries@
 am__fastdepCC_FALSE = @am__fastdepCC_FALSE@

Index: aclocal.m4
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/aclocal.m4,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -p -r1.27 -r1.28
--- aclocal.m4	10 Jul 2005 12:38:46 -0000	1.27
+++ aclocal.m4	10 Jul 2005 21:42:39 -0000	1.28
@@ -123,7 +123,7 @@ esac
 
 # Sed substitution that helps us do robust quoting.  It backslashifies
 # metacharacters that are still active within double-quoted strings.
-Xsed='sed -e 1s/^X//'
+Xsed='sed -e s/^X//'
 [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
 
 # Same as above, but do not quote variable references.
@@ -191,7 +191,7 @@ if test -n "$RANLIB"; then
   old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
 fi
[...1071 lines suppressed...]
+
+  if test $succeeded = yes; then
+     ifelse([$3], , :, [$3])
+  else
+     ifelse([$4], , AC_MSG_ERROR([Library requirements ($2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them.]), [$4])
+  fi
+])
+
 
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
-		[$4])
-else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-	ifelse([$3], , :, [$3])
-fi[]dnl
-])# PKG_CHECK_MODULES
 
 # Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
 #

Index: configure
===================================================================
RCS file: /cvsroot/linux-ntfs/ntfsprogs/configure,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- configure	10 Jul 2005 12:38:47 -0000	1.85
+++ configure	10 Jul 2005 21:42:39 -0000	1.86
@@ -466,7 +466,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar REALLYSTATIC_TRUE REALLYSTATIC_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG ac_pt_PKG_CONFIG LIBNTFS_GNOMEVFS_CFLAGS LIBNTFS_GNOMEVFS_LIBS ENABLE_GNOME_VFS_TRUE ENABLE_GNOME_VFS_FALSE FUSE_MODULE_CFLAGS FUSE_MODULE_LIBS ENABLE_FUSE_MODULE_TRUE ENABLE_FUSE_MODULE_FALSE all_includes all_libraries AUTODIRS LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar REALLYSTATIC_TRUE REALLYSTATIC_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S EGREP ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG LIBNTFS_GNOMEVFS_CFLAGS LIBNTFS_GNOMEVFS_LIBS ENABLE_GNOME_VFS_TRUE ENABLE_GNOME_VFS_FALSE FUSE_MODULE_CFLAGS FUSE_MODULE_LIBS ENABLE_FUSE_MODULE_TRUE ENABLE_FUSE_MODULE_FALSE all_includes all_libraries AUTODIRS LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -947,26 +947,6 @@ ac_env_FFLAGS_set=${FFLAGS+set}
 ac_env_FFLAGS_value=$FFLAGS
 ac_cv_env_FFLAGS_set=${FFLAGS+set}
[...2293 lines suppressed...]
 		fi
 
-else
-	FUSE_MODULE_CFLAGS=$pkg_cv_FUSE_MODULE_CFLAGS
-	FUSE_MODULE_LIBS=$pkg_cv_FUSE_MODULE_LIBS
-	 compile_fuse_module=true
-fi
+  fi
+
 fi
 
 
@@ -24302,7 +23933,6 @@ s,@FFLAGS@,$FFLAGS,;t t
 s,@ac_ct_F77@,$ac_ct_F77,;t t
 s,@LIBTOOL@,$LIBTOOL,;t t
 s,@PKG_CONFIG@,$PKG_CONFIG,;t t
-s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
 s,@LIBNTFS_GNOMEVFS_CFLAGS@,$LIBNTFS_GNOMEVFS_CFLAGS,;t t
 s,@LIBNTFS_GNOMEVFS_LIBS@,$LIBNTFS_GNOMEVFS_LIBS,;t t
 s,@ENABLE_GNOME_VFS_TRUE@,$ENABLE_GNOME_VFS_TRUE,;t t