Hello community,
here is the log from the commit of package ntfs-3g
checked in at Mon Aug 27 17:47:44 CEST 2007.
--------
--- ntfs-3g/ntfs-3g.changes 2007-08-10 17:19:19.000000000 +0200
+++ /mounts/work_src_done/STABLE/ntfs-3g/ntfs-3g.changes 2007-08-27 16:35:22.000000000 +0200
@@ -1,0 +2,10 @@
+Mon Aug 27 13:10:58 CEST 2007 - bk@suse.de
+
+- Update to version 1.826:
+ * fix: utime() also updated the timestamp of the parent directory
+ * fix: ignore the "volume dirty" bit because its real meaning is
+ "check the volume". The fact of the real dirtiness is stored in
+ the NTFS logfile which is already checked for.
+ * new: --disable-library option links libntfs-3g into ntfs-3g
+
+-------------------------------------------------------------------
Old:
----
ntfs-3g-1.810.tar.bz2
New:
----
ntfs-3g-1.826.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ntfs-3g.spec ++++++
--- /var/tmp/diff_new_pack.Y23957/_old 2007-08-27 17:47:31.000000000 +0200
+++ /var/tmp/diff_new_pack.Y23957/_new 2007-08-27 17:47:31.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package ntfs-3g (Version 1.810)
+# spec file for package ntfs-3g (Version 1.826)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,7 +11,7 @@
Name: ntfs-3g
Summary: Linux NTFS-3G userspace filesystem driver using fuse
-Version: 1.810
+Version: 1.826
Release: 1
License: GPL v2 or later
Group: System/Base
@@ -51,14 +51,14 @@
%setup -q
%build
-%configure --disable-static --disable-ldconfig
+# disable-library obsoletes disable-static and disable-ldconfig and
+# it turns libntfs-3g into an internal library, linked into ntfs-3g:
+CFLAGS="${RPM_OPT_FLAGS}" \
+%configure --disable-library
make
%install
make DESTDIR=$RPM_BUILD_ROOT install
-cd $RPM_BUILD_ROOT
-rm .%{_libdir}/libntfs-3g.{so,la}
-rm -rf .%{_includedir}/ntfs-3g/
%clean
rm -rf $RPM_BUILD_ROOT
@@ -74,10 +74,16 @@
%doc AUTHORS ChangeLog CREDITS NEWS README
/sbin/mount.ntfs-3g
%{_bindir}/ntfs-3g
-%{_libdir}/libntfs-3g.so.*
%{_mandir}/man8/*
%changelog
+* Mon Aug 27 2007 - bk@suse.de
+- Update to version 1.826:
+ * fix: utime() also updated the timestamp of the parent directory
+ * fix: ignore the "volume dirty" bit because its real meaning is
+ "check the volume". The fact of the real dirtiness is stored in
+ the NTFS logfile which is already checked for.
+ * new: --disable-library option links libntfs-3g into ntfs-3g
* Fri Aug 10 2007 - bk@suse.de
- Update to version 1.810:
fix: file rename changed the modification time of some files which
++++++ ntfs-3g-1.810.tar.bz2 -> ntfs-3g-1.826.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ntfs-3g-1.810/ChangeLog new/ntfs-3g-1.826/ChangeLog
--- old/ntfs-3g-1.810/ChangeLog 2007-08-09 23:24:10.000000000 +0200
+++ new/ntfs-3g-1.826/ChangeLog 2007-08-25 23:23:21.000000000 +0200
@@ -1,3 +1,56 @@
+2007-08-26 00:23 szaka
+
+ * configure.ac:
+
+ release 1.826
+
+2007-08-26 00:20 szaka
+
+ * libntfs-3g/volume.c:
+
+ ntfs_volume_startup: cleanup
+
+2007-08-25 23:27 szaka
+
+ * libntfs-3g/volume.c:
+
+ fix compilation with glibc 2.7 (Tom "spot" Callaway)
+
+2007-08-24 01:53 szaka
+
+ * configure.ac:
+
+ Unconditionally apply --disable-ldconfig if --disable-library used
+
+2007-08-24 01:32 szaka
+
+ * configure.ac, include/ntfs-3g/Makefile.am,
+ libntfs-3g/Makefile.am:
+
+ Add --disable-library option: don't install libntfs-3g but link into ntfs-3g.
+ Binary size is 10-15% down, performance is 2-5% up (Bernhard Kaindl)
+
+2007-08-22 22:59 szaka
+
+ * src/: ntfs-3g.8.in, utils.c:
+
+ Ignore the volume dirty bit because its real meaning is "check the volume"
+ (set by chkdsk, ntfsresize, ntfsfix) and this is what ext2, ext3, ext4,
+ reiserfs and xfs do in similar cases. The fact of the real dirtiness is
+ stored in the NTFS logfile which is already checked for.
+
+2007-08-17 20:13 szaka
+
+ * README, src/ntfs-3g.8.in:
+
+ explain the 'locale' mount option a bit better
+
+2007-08-10 18:01 szaka
+
+ * include/ntfs-3g/inode.h, libntfs-3g/inode.c, src/ntfs-3g.c:
+
+ fix: utimes() shouldn't update the parent dir mtime (Wayne Sherman, Szaka)
+
2007-08-10 00:21 szaka
* configure.ac:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ntfs-3g-1.810/configure new/ntfs-3g-1.826/configure
--- old/ntfs-3g-1.810/configure 2007-08-09 23:24:27.000000000 +0200
+++ new/ntfs-3g-1.826/configure 2007-08-25 23:23:42.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for ntfs-3g 1.810.
+# Generated by GNU Autoconf 2.61 for ntfs-3g 1.826.
#
# Report bugs to .
#
@@ -728,8 +728,8 @@
# Identity of this package.
PACKAGE_NAME='ntfs-3g'
PACKAGE_TARNAME='ntfs-3g'
-PACKAGE_VERSION='1.810'
-PACKAGE_STRING='ntfs-3g 1.810'
+PACKAGE_VERSION='1.826'
+PACKAGE_STRING='ntfs-3g 1.826'
PACKAGE_BUGREPORT='ntfs-3g-devel@lists.sf.net'
ac_unique_file="config.h.in"
@@ -846,6 +846,8 @@
MAINT
REALLYSTATIC_TRUE
REALLYSTATIC_FALSE
+INSTALL_LIBRARY_TRUE
+INSTALL_LIBRARY_FALSE
RUN_LDCONFIG_TRUE
RUN_LDCONFIG_FALSE
CC
@@ -1416,7 +1418,7 @@
# 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 ntfs-3g 1.810 to adapt to many kinds of systems.
+\`configure' configures ntfs-3g 1.826 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1487,7 +1489,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of ntfs-3g 1.810:";;
+ short | recursive ) echo "Configuration of ntfs-3g 1.826:";;
esac
cat <<\_ACEOF
@@ -1502,6 +1504,7 @@
--enable-really-static create static binaries for the utilities
--enable-warnings enable additional compiler warnings
--disable-ldconfig do not update dynamic linker cache using ldconfig
+ --disable-library do not install libntfs-3g but link it into ntfs-3g
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
--enable-fast-install[=PKGS]
@@ -1601,7 +1604,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-ntfs-3g configure 1.810
+ntfs-3g configure 1.826
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1615,7 +1618,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by ntfs-3g $as_me 1.810, which was
+It was created by ntfs-3g $as_me 1.826, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -1969,7 +1972,7 @@
ac_compiler_gnu=$ac_cv_c_compiler_gnu
-LIBNTFS_3G_VERSION=9:0:0
+LIBNTFS_3G_VERSION=10:0:0
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
@@ -2417,7 +2420,7 @@
# Define the identity of the package.
PACKAGE='ntfs-3g'
- VERSION='1.810'
+ VERSION='1.826'
cat >>confdefs.h <<_ACEOF
@@ -2700,6 +2703,31 @@
fi
+# Check whether --enable-library was given.
+if test "${enable_library+set}" = set; then
+ enableval=$enable_library;
+else
+ enable_library=yes
+
+fi
+
+if test "$enable_library" != yes; then
+ enable_shared=no
+ enable_ldconfig=no
+fi
+
+
+if test "$enable_library" = yes; then
+ INSTALL_LIBRARY_TRUE=
+ INSTALL_LIBRARY_FALSE='#'
+else
+ INSTALL_LIBRARY_TRUE='#'
+ INSTALL_LIBRARY_FALSE=
+fi
+
+
+# --disable-library will disable to run ldconfig since no point to do so.
+
if test "$enable_ldconfig" = yes; then
RUN_LDCONFIG_TRUE=
@@ -4953,7 +4981,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 4956 "configure"' > conftest.$ac_ext
+ echo '#line 4984 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -7454,11 +7482,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7457: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7485: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7461: \$? = $ac_status" >&5
+ echo "$as_me:7489: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7722,11 +7750,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7725: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7753: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:7729: \$? = $ac_status" >&5
+ echo "$as_me:7757: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7826,11 +7854,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7829: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7857: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7833: \$? = $ac_status" >&5
+ echo "$as_me:7861: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9291,7 +9319,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 9294 "configure"' > conftest.$ac_ext
+ echo '#line 9322 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -10155,7 +10183,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext < conftest.$ac_ext <&5)
+ (eval echo "\"\$as_me:12625: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:12601: \$? = $ac_status" >&5
+ echo "$as_me:12629: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -12698,11 +12726,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:12701: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:12729: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:12705: \$? = $ac_status" >&5
+ echo "$as_me:12733: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13234,7 +13262,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 13237 "configure"' > conftest.$ac_ext
+ echo '#line 13265 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -14292,11 +14320,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14295: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14323: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14299: \$? = $ac_status" >&5
+ echo "$as_me:14327: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14396,11 +14424,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14399: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14427: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14403: \$? = $ac_status" >&5
+ echo "$as_me:14431: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15841,7 +15869,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 15844 "configure"' > conftest.$ac_ext
+ echo '#line 15872 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -16619,11 +16647,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16622: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16650: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16626: \$? = $ac_status" >&5
+ echo "$as_me:16654: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16887,11 +16915,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16890: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16918: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16894: \$? = $ac_status" >&5
+ echo "$as_me:16922: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16991,11 +17019,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16994: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17022: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16998: \$? = $ac_status" >&5
+ echo "$as_me:17026: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -18456,7 +18484,7 @@
libsuff=
case "$host_cpu" in
x86_64*|s390x*|powerpc64*)
- echo '#line 18459 "configure"' > conftest.$ac_ext
+ echo '#line 18487 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -22913,6 +22941,13 @@
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${INSTALL_LIBRARY_TRUE}" && test -z "${INSTALL_LIBRARY_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"INSTALL_LIBRARY\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"INSTALL_LIBRARY\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
if test -z "${RUN_LDCONFIG_TRUE}" && test -z "${RUN_LDCONFIG_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"RUN_LDCONFIG\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -23241,7 +23276,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by ntfs-3g $as_me 1.810, which was
+This file was extended by ntfs-3g $as_me 1.826, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -23294,7 +23329,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-ntfs-3g config.status 1.810
+ntfs-3g config.status 1.826
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
@@ -23552,6 +23587,8 @@
MAINT!$MAINT$ac_delim
REALLYSTATIC_TRUE!$REALLYSTATIC_TRUE$ac_delim
REALLYSTATIC_FALSE!$REALLYSTATIC_FALSE$ac_delim
+INSTALL_LIBRARY_TRUE!$INSTALL_LIBRARY_TRUE$ac_delim
+INSTALL_LIBRARY_FALSE!$INSTALL_LIBRARY_FALSE$ac_delim
RUN_LDCONFIG_TRUE!$RUN_LDCONFIG_TRUE$ac_delim
RUN_LDCONFIG_FALSE!$RUN_LDCONFIG_FALSE$ac_delim
CC!$CC$ac_delim
@@ -23572,8 +23609,6 @@
am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
CPP!$CPP$ac_delim
GREP!$GREP$ac_delim
-EGREP!$EGREP$ac_delim
-RM!$RM$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 97; then
@@ -23615,6 +23650,8 @@
ac_delim='%!_!# '
for ac_last_try in false false false false false :; do
cat >conf$$subs.sed <<_ACEOF
+EGREP!$EGREP$ac_delim
+RM!$RM$ac_delim
LDCONFIG!$LDCONFIG$ac_delim
LN_S!$LN_S$ac_delim
ECHO!$ECHO$ac_delim
@@ -23644,7 +23681,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 27; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 29; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ntfs-3g-1.810/configure.ac new/ntfs-3g-1.826/configure.ac
--- old/ntfs-3g-1.810/configure.ac 2007-08-09 23:21:13.000000000 +0200
+++ new/ntfs-3g-1.826/configure.ac 2007-08-25 23:23:54.000000000 +0200
@@ -24,8 +24,8 @@
AC_PREREQ(2.59)
-AC_INIT([ntfs-3g],[1.810],[ntfs-3g-devel@lists.sf.net])
-LIBNTFS_3G_VERSION=9:0:0
+AC_INIT([ntfs-3g],[1.826],[ntfs-3g-devel@lists.sf.net])
+LIBNTFS_3G_VERSION=10:0:0
AC_CANONICAL_HOST([])
AC_CANONICAL_TARGET([])
@@ -76,6 +76,19 @@
using ldconfig), ,
enable_ldconfig=yes
)
+
+AC_ARG_ENABLE(library,
+ AS_HELP_STRING(--disable-library,do not install libntfs-3g but link
+ it into ntfs-3g), ,
+ enable_library=yes
+)
+if test "$enable_library" != yes; then
+ enable_shared=no
+ enable_ldconfig=no
+fi
+AM_CONDITIONAL(INSTALL_LIBRARY, test "$enable_library" = yes)
+
+# --disable-library will disable to run ldconfig since no point to do so.
AM_CONDITIONAL(RUN_LDCONFIG, test "$enable_ldconfig" = yes)
# Use GNU extensions if available.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ntfs-3g-1.810/include/Makefile.in new/ntfs-3g-1.826/include/Makefile.in
--- old/ntfs-3g-1.810/include/Makefile.in 2007-08-09 23:24:33.000000000 +0200
+++ new/ntfs-3g-1.826/include/Makefile.in 2007-08-25 23:23:49.000000000 +0200
@@ -91,6 +91,8 @@
FUSE_MODULE_LIBS = @FUSE_MODULE_LIBS@
GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
+INSTALL_LIBRARY_FALSE = @INSTALL_LIBRARY_FALSE@
+INSTALL_LIBRARY_TRUE = @INSTALL_LIBRARY_TRUE@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ntfs-3g-1.810/include/ntfs-3g/inode.h new/ntfs-3g-1.826/include/ntfs-3g/inode.h
--- old/ntfs-3g-1.810/include/ntfs-3g/inode.h 2007-08-09 16:11:53.000000000 +0200
+++ new/ntfs-3g-1.826/include/ntfs-3g/inode.h 2007-08-10 17:01:20.000000000 +0200
@@ -49,6 +49,7 @@
NI_FileNameDirty, /* 1: FILE_NAME attributes need to be updated
in the index. */
NI_NoMtimeUpdate, /* 1: Don't update modifiction time. */
+ NI_NoParentMtimeUpdate, /* 1: Don't update parent dir's mtime. */
} ntfs_inode_state_bits;
#define test_nino_flag(ni, flag) test_bit(NI_##flag, (ni)->state)
@@ -102,6 +103,11 @@
#define NInoClearNoMtimeUpdate(ni) clear_nino_flag(ni, NoMtimeUpdate)
#define NInoMtimeUpdate(ni) (!NInoNoMtimeUpdate(ni))
+#define NInoNoParentMtimeUpdate(ni) test_nino_flag(ni, NoMtimeUpdate)
+#define NInoSetNoParentMtimeUpdate(ni) set_nino_flag(ni, NoMtimeUpdate)
+#define NInoClearNoParentMtimeUpdate(ni) clear_nino_flag(ni, NoMtimeUpdate)
+#define NInoParentMtimeUpdate(ni) (!NInoNoParentMtimeUpdate(ni))
+
/**
* struct _ntfs_inode - The NTFS in-memory inode structure.
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ntfs-3g-1.810/include/ntfs-3g/Makefile.am new/ntfs-3g-1.826/include/ntfs-3g/Makefile.am
--- old/ntfs-3g-1.810/include/ntfs-3g/Makefile.am 2006-10-30 23:32:45.000000000 +0100
+++ new/ntfs-3g-1.826/include/ntfs-3g/Makefile.am 2007-08-24 00:32:25.000000000 +0200
@@ -1,4 +1,5 @@
+if INSTALL_LIBRARY
linux_ntfsincludedir = $(includedir)/ntfs-3g
linux_ntfsinclude_HEADERS = \
attrib.h \
@@ -30,5 +31,6 @@
unistr.h \
version.h \
volume.h
+endif
MAINTAINERCLEANFILES = Makefile.in
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ntfs-3g-1.810/include/ntfs-3g/Makefile.in new/ntfs-3g-1.826/include/ntfs-3g/Makefile.in
--- old/ntfs-3g-1.810/include/ntfs-3g/Makefile.in 2007-08-09 23:24:33.000000000 +0200
+++ new/ntfs-3g-1.826/include/ntfs-3g/Makefile.in 2007-08-25 23:23:49.000000000 +0200
@@ -38,8 +38,8 @@
host_triplet = @host@
target_triplet = @target@
subdir = include/ntfs-3g
-DIST_COMMON = $(linux_ntfsinclude_HEADERS) $(srcdir)/Makefile.am \
- $(srcdir)/Makefile.in
+DIST_COMMON = $(am__linux_ntfsinclude_HEADERS_DIST) \
+ $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -49,6 +49,12 @@
CONFIG_CLEAN_FILES =
SOURCES =
DIST_SOURCES =
+am__linux_ntfsinclude_HEADERS_DIST = attrib.h attrlist.h bitmap.h \
+ bootsect.h collate.h compat.h compress.h debug.h device.h \
+ device_io.h dir.h endians.h index.h inode.h layout.h \
+ lcnalloc.h list.h logfile.h logging.h mft.h mst.h ntfstime.h \
+ runlist.h security.h support.h types.h unistr.h version.h \
+ volume.h
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -95,6 +101,8 @@
FUSE_MODULE_LIBS = @FUSE_MODULE_LIBS@
GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
+INSTALL_LIBRARY_FALSE = @INSTALL_LIBRARY_FALSE@
+INSTALL_LIBRARY_TRUE = @INSTALL_LIBRARY_TRUE@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -184,37 +192,37 @@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
-linux_ntfsincludedir = $(includedir)/ntfs-3g
-linux_ntfsinclude_HEADERS = \
- attrib.h \
- attrlist.h \
- bitmap.h \
- bootsect.h \
- collate.h \
- compat.h \
- compress.h \
- debug.h \
- device.h \
- device_io.h \
- dir.h \
- endians.h \
- index.h \
- inode.h \
- layout.h \
- lcnalloc.h \
- list.h \
- logfile.h \
- logging.h \
- mft.h \
- mst.h \
- ntfstime.h \
- runlist.h \
- security.h \
- support.h \
- types.h \
- unistr.h \
- version.h \
- volume.h
+@INSTALL_LIBRARY_TRUE@linux_ntfsincludedir = $(includedir)/ntfs-3g
+@INSTALL_LIBRARY_TRUE@linux_ntfsinclude_HEADERS = \
+@INSTALL_LIBRARY_TRUE@ attrib.h \
+@INSTALL_LIBRARY_TRUE@ attrlist.h \
+@INSTALL_LIBRARY_TRUE@ bitmap.h \
+@INSTALL_LIBRARY_TRUE@ bootsect.h \
+@INSTALL_LIBRARY_TRUE@ collate.h \
+@INSTALL_LIBRARY_TRUE@ compat.h \
+@INSTALL_LIBRARY_TRUE@ compress.h \
+@INSTALL_LIBRARY_TRUE@ debug.h \
+@INSTALL_LIBRARY_TRUE@ device.h \
+@INSTALL_LIBRARY_TRUE@ device_io.h \
+@INSTALL_LIBRARY_TRUE@ dir.h \
+@INSTALL_LIBRARY_TRUE@ endians.h \
+@INSTALL_LIBRARY_TRUE@ index.h \
+@INSTALL_LIBRARY_TRUE@ inode.h \
+@INSTALL_LIBRARY_TRUE@ layout.h \
+@INSTALL_LIBRARY_TRUE@ lcnalloc.h \
+@INSTALL_LIBRARY_TRUE@ list.h \
+@INSTALL_LIBRARY_TRUE@ logfile.h \
+@INSTALL_LIBRARY_TRUE@ logging.h \
+@INSTALL_LIBRARY_TRUE@ mft.h \
+@INSTALL_LIBRARY_TRUE@ mst.h \
+@INSTALL_LIBRARY_TRUE@ ntfstime.h \
+@INSTALL_LIBRARY_TRUE@ runlist.h \
+@INSTALL_LIBRARY_TRUE@ security.h \
+@INSTALL_LIBRARY_TRUE@ support.h \
+@INSTALL_LIBRARY_TRUE@ types.h \
+@INSTALL_LIBRARY_TRUE@ unistr.h \
+@INSTALL_LIBRARY_TRUE@ version.h \
+@INSTALL_LIBRARY_TRUE@ volume.h
MAINTAINERCLEANFILES = Makefile.in
all: all-am
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ntfs-3g-1.810/libntfs-3g/inode.c new/ntfs-3g-1.826/libntfs-3g/inode.c
--- old/ntfs-3g-1.810/libntfs-3g/inode.c 2007-08-09 16:11:54.000000000 +0200
+++ new/ntfs-3g-1.826/libntfs-3g/inode.c 2007-08-10 17:01:21.000000000 +0200
@@ -686,6 +686,7 @@
/* Update FILE_NAME's in the index. */
if ((ni->mrec->flags & MFT_RECORD_IN_USE) && ni->nr_extents != -1 &&
NInoFileNameTestAndClearDirty(ni) &&
+ NInoParentMtimeUpdate(ni) &&
ntfs_inode_sync_file_name(ni)) {
if (!err || errno == EIO) {
err = errno;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ntfs-3g-1.810/libntfs-3g/Makefile.am new/ntfs-3g-1.826/libntfs-3g/Makefile.am
--- old/ntfs-3g-1.810/libntfs-3g/Makefile.am 2007-04-06 22:22:09.000000000 +0200
+++ new/ntfs-3g-1.826/libntfs-3g/Makefile.am 2007-08-24 00:32:25.000000000 +0200
@@ -27,7 +27,12 @@
linux_ntfsincludedir = -I$(top_srcdir)/include/ntfs-3g
+if INSTALL_LIBRARY
lib_LTLIBRARIES = libntfs-3g.la
+else
+noinst_LTLIBRARIES = libntfs-3g.la
+endif
+
libntfs_3g_la_LDFLAGS = -version-number $(LIBNTFS_3G_VERSION)
libntfs_3g_la_CFLAGS = $(LIBNTFS_3G_CFLAGS)
libntfs_3g_la_SOURCES = \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ntfs-3g-1.810/libntfs-3g/Makefile.in new/ntfs-3g-1.826/libntfs-3g/Makefile.in
--- old/ntfs-3g-1.810/libntfs-3g/Makefile.in 2007-08-09 23:24:34.000000000 +0200
+++ new/ntfs-3g-1.826/libntfs-3g/Makefile.in 2007-08-25 23:23:50.000000000 +0200
@@ -81,7 +81,7 @@
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(libdir)"
libLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(lib_LTLIBRARIES)
+LTLIBRARIES = $(lib_LTLIBRARIES) $(noinst_LTLIBRARIES)
libntfs_3g_la_LIBADD =
am_libntfs_3g_la_OBJECTS = libntfs_3g_la-attrib.lo \
libntfs_3g_la-attrlist.lo libntfs_3g_la-bitmap.lo \
@@ -97,6 +97,8 @@
libntfs_3g_la-unistr.lo libntfs_3g_la-version.lo \
libntfs_3g_la-volume.lo
libntfs_3g_la_OBJECTS = $(am_libntfs_3g_la_OBJECTS)
+@INSTALL_LIBRARY_FALSE@am_libntfs_3g_la_rpath =
+@INSTALL_LIBRARY_TRUE@am_libntfs_3g_la_rpath = -rpath $(libdir)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -147,6 +149,8 @@
FUSE_MODULE_LIBS = @FUSE_MODULE_LIBS@
GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
+INSTALL_LIBRARY_FALSE = @INSTALL_LIBRARY_FALSE@
+INSTALL_LIBRARY_TRUE = @INSTALL_LIBRARY_TRUE@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
@@ -237,7 +241,8 @@
target_os = @target_os@
target_vendor = @target_vendor@
linux_ntfsincludedir = -I$(top_srcdir)/include/ntfs-3g
-lib_LTLIBRARIES = libntfs-3g.la
+@INSTALL_LIBRARY_TRUE@lib_LTLIBRARIES = libntfs-3g.la
+@INSTALL_LIBRARY_FALSE@noinst_LTLIBRARIES = libntfs-3g.la
libntfs_3g_la_LDFLAGS = -version-number $(LIBNTFS_3G_VERSION)
libntfs_3g_la_CFLAGS = $(LIBNTFS_3G_CFLAGS)
libntfs_3g_la_SOURCES = \
@@ -329,8 +334,17 @@
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
+
+clean-noinstLTLIBRARIES:
+ -test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
+ @list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
+ dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
+ test "$$dir" != "$$p" || dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+ done
libntfs-3g.la: $(libntfs_3g_la_OBJECTS) $(libntfs_3g_la_DEPENDENCIES)
- $(LINK) -rpath $(libdir) $(libntfs_3g_la_LDFLAGS) $(libntfs_3g_la_OBJECTS) $(libntfs_3g_la_LIBADD) $(LIBS)
+ $(LINK) $(am_libntfs_3g_la_rpath) $(libntfs_3g_la_LDFLAGS) $(libntfs_3g_la_OBJECTS) $(libntfs_3g_la_LIBADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -672,7 +686,7 @@
clean: clean-am
clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
- mostlyclean-am
+ clean-noinstLTLIBRARIES mostlyclean-am
distclean: distclean-am
-rm -rf ./$(DEPDIR)
@@ -721,17 +735,17 @@
uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
- clean-libLTLIBRARIES clean-libtool ctags distclean \
- distclean-compile distclean-generic distclean-libtool \
- distclean-tags distdir dvi dvi-am html html-am info info-am \
- install install-am install-data install-data-am install-exec \
- install-exec-am install-info install-info-am \
- install-libLTLIBRARIES install-man install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-compile \
- mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- tags uninstall uninstall-am uninstall-info-am \
- uninstall-libLTLIBRARIES
+ clean-libLTLIBRARIES clean-libtool clean-noinstLTLIBRARIES \
+ ctags distclean distclean-compile distclean-generic \
+ distclean-libtool distclean-tags distdir dvi dvi-am html \
+ html-am info info-am install install-am install-data \
+ install-data-am install-exec install-exec-am install-info \
+ install-info-am install-libLTLIBRARIES install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
+ pdf pdf-am ps ps-am tags uninstall uninstall-am \
+ uninstall-info-am uninstall-libLTLIBRARIES
libs: $(lib_LTLIBRARIES)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ntfs-3g-1.810/libntfs-3g/volume.c new/ntfs-3g-1.826/libntfs-3g/volume.c
--- old/ntfs-3g-1.810/libntfs-3g/volume.c 2007-07-13 22:05:48.000000000 +0200
+++ new/ntfs-3g-1.826/libntfs-3g/volume.c 2007-08-25 23:20:28.000000000 +0200
@@ -76,7 +76,7 @@
*/
ntfs_volume *ntfs_volume_alloc(void)
{
- return calloc(1, sizeof(ntfs_volume));
+ return ntfs_calloc(sizeof(ntfs_volume));
}
@@ -433,6 +433,7 @@
if (!dev || !dev->d_ops || !dev->d_name) {
errno = EINVAL;
+ ntfs_log_perror("%s: dev = %p", __FUNCTION__, dev);
return NULL;
}
@@ -444,6 +445,7 @@
vol = ntfs_volume_alloc();
if (!vol)
goto error_exit;
+
/* Create the default upcase table. */
vol->upcase_len = 65536;
vol->upcase = ntfs_malloc(vol->upcase_len * sizeof(ntfschar));
@@ -452,18 +454,20 @@
ntfs_upcase_table_build(vol->upcase,
vol->upcase_len * sizeof(ntfschar));
+
if (flags & MS_RDONLY)
NVolSetReadOnly(vol);
if (flags & MS_NOATIME)
NVolSetNoATime(vol);
- ntfs_log_debug("Reading bootsector... ");
- if (dev->d_ops->open(dev, NVolReadOnly(vol) ? O_RDONLY: O_RDWR)) {
- ntfs_log_debug(FAILED);
+
+ /* ...->open needs bracketing to compile with glibc 2.7 */
+ if ((dev->d_ops->open)(dev, NVolReadOnly(vol) ? O_RDONLY: O_RDWR)) {
ntfs_log_perror("Error opening partition device");
goto error_exit;
}
/* Attach the device to the volume. */
vol->dev = dev;
+
/* Now read the bootsector. */
br = ntfs_pread(dev, 0, sizeof(NTFS_BOOT_SECTOR), bs);
if (br != sizeof(NTFS_BOOT_SECTOR)) {
@@ -471,13 +475,11 @@
if (br != -1)
errno = EINVAL;
if (!br)
- ntfs_log_error("Partition is smaller than bootsector "
- "size.\n");
+ ntfs_log_error("Failed to read bootsector (size=0)\n");
else
ntfs_log_perror("Error reading bootsector");
goto error_exit;
}
- ntfs_log_debug(OK);
if (!ntfs_boot_sector_is_ntfs(bs)) {
errno = EINVAL;
goto error_exit;
@@ -549,22 +551,16 @@
*/
/* Need to setup $MFT so we can use the library read functions. */
- ntfs_log_debug("Loading $MFT... ");
if (ntfs_mft_load(vol) < 0) {
- ntfs_log_debug(FAILED);
ntfs_log_perror("Failed to load $MFT");
goto error_exit;
}
- ntfs_log_debug(OK);
/* Need to setup $MFTMirr so we can use the write functions, too. */
- ntfs_log_debug("Loading $MFTMirr... ");
if (ntfs_mftmirr_load(vol) < 0) {
- ntfs_log_debug(FAILED);
ntfs_log_perror("Failed to load $MFTMirr");
goto error_exit;
}
- ntfs_log_debug(OK);
return vol;
error_exit:
eo = errno;
@@ -783,10 +779,8 @@
u32 u;
vol = ntfs_volume_startup(dev, flags);
- if (!vol) {
- ntfs_log_perror("Failed to startup volume");
+ if (!vol)
return NULL;
- }
/* Load data from $MFT and $MFTMirr and compare the contents. */
m = ntfs_malloc(vol->mftmirr_size << vol->mft_record_size_bits);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ntfs-3g-1.810/Makefile.in new/ntfs-3g-1.826/Makefile.in
--- old/ntfs-3g-1.810/Makefile.in 2007-08-09 23:24:34.000000000 +0200
+++ new/ntfs-3g-1.826/Makefile.in 2007-08-25 23:23:51.000000000 +0200
@@ -107,6 +107,8 @@
FUSE_MODULE_LIBS = @FUSE_MODULE_LIBS@
GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
+INSTALL_LIBRARY_FALSE = @INSTALL_LIBRARY_FALSE@
+INSTALL_LIBRARY_TRUE = @INSTALL_LIBRARY_TRUE@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ntfs-3g-1.810/README new/ntfs-3g-1.826/README
--- old/ntfs-3g-1.810/README 2007-02-20 21:14:19.000000000 +0100
+++ new/ntfs-3g-1.826/README 2007-08-17 19:13:48.000000000 +0200
@@ -50,10 +50,13 @@
or
ntfs-3g /dev/hda1 /mnt/windows
-You may also need to set the 'locale' option to make file names with national
-characters visible. Replace the below hu_HU.utf8 with the appropriate setting.
+If your Operating System vendor didn't setup your language specific settings
+then you may also need to set the 'locale' mount option to make all filenames
+with national characters visible. Replace the below en_US.UTF-8 with the
+appropriate setting. You can find more information about his topic at
+http://ntfs-3g.org/support.html#locale
- mount -t ntfs-3g /dev/hda1 /mnt/windows -o locale=hu_HU.utf8
+ mount -t ntfs-3g /dev/hda1 /mnt/windows -o locale=en_US.UTF-8
Please see the ntfs-3g manual page for more options and examples.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ntfs-3g-1.810/src/Makefile.in new/ntfs-3g-1.826/src/Makefile.in
--- old/ntfs-3g-1.810/src/Makefile.in 2007-08-09 23:24:34.000000000 +0200
+++ new/ntfs-3g-1.826/src/Makefile.in 2007-08-25 23:23:50.000000000 +0200
@@ -110,6 +110,8 @@
FUSE_MODULE_LIBS = @FUSE_MODULE_LIBS@
GREP = @GREP@
INSTALL_DATA = @INSTALL_DATA@
+INSTALL_LIBRARY_FALSE = @INSTALL_LIBRARY_FALSE@
+INSTALL_LIBRARY_TRUE = @INSTALL_LIBRARY_TRUE@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ntfs-3g-1.810/src/ntfs-3g.8.in new/ntfs-3g-1.826/src/ntfs-3g.8.in
--- old/ntfs-3g-1.810/src/ntfs-3g.8.in 2007-08-08 21:07:57.000000000 +0200
+++ new/ntfs-3g-1.826/src/ntfs-3g.8.in 2007-08-22 21:59:45.000000000 +0200
@@ -102,16 +102,16 @@
Mount filesystem read\-only.
.TP
.BI locale= value
-You can set locale with this option which is often required to make
-visible files with national charaters. It's useful if the locale
-environment variables are not set before partitions had been mounted
-from /etc/fstab.
+This option can be useful if your language specific locale environment
+variables are not set correctly or at all in your operating system.
+In such cases, the national characters can be made visible by using this
+option. Please see more information about this topic at
+http://ntfs-3g.org/support.html#locale
.TP
.B force
-Force mount even if the volume is scheduled for consistency check or
-the logfile is unclean. The logfile will be unconditionally cleared
-in the latter case. Use this option with caution and for your own
-responsibility.
+Force the mounting even if the NTFS logfile is unclean. The logfile
+will be unconditionally cleared. Use this option with caution and for
+your own responsibility.
.TP
.B show_sys_files
Show the system files in directory listings.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ntfs-3g-1.810/src/ntfs-3g.c new/ntfs-3g-1.826/src/ntfs-3g.c
--- old/ntfs-3g-1.810/src/ntfs-3g.c 2007-08-09 23:15:28.000000000 +0200
+++ new/ntfs-3g-1.826/src/ntfs-3g.c 2007-08-10 17:01:21.000000000 +0200
@@ -1245,6 +1245,9 @@
ni = ntfs_pathname_to_inode(ctx->vol, NULL, path);
if (!ni)
return -errno;
+
+ NInoSetNoParentMtimeUpdate(ni);
+
if (buf) {
ni->last_access_time = buf->actime;
ni->last_data_change_time = buf->modtime;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/ntfs-3g-1.810/src/utils.c new/ntfs-3g-1.826/src/utils.c
--- old/ntfs-3g-1.810/src/utils.c 2007-07-09 23:49:52.000000000 +0200
+++ new/ntfs-3g-1.826/src/utils.c 2007-08-22 21:59:45.000000000 +0200
@@ -84,10 +84,6 @@
"different device under /dev/mapper/, (e.g. /dev/mapper/nvidia_eahaabcc1)\n"
"to mount NTFS. Please see the 'dmraid' documentation for help.\n";
-static const char *dirty_volume_msg =
-"Volume is scheduled for check. Please boot into Windows TWICE, or\n"
-"use the 'force' mount option. For example type on the command line:\n";
-
static const char *forced_mount_msg =
"\n"
" mount -t ntfs-3g %s %s -o force\n"
@@ -141,19 +137,6 @@
return NULL;
}
- if (vol->flags & VOLUME_IS_DIRTY) {
- if (!force) {
- ntfs_log_error("%s", dirty_volume_msg);
- ntfs_log_error(forced_mount_msg, volume, mntpoint,
- volume, mntpoint);
- ntfs_umount(vol, FALSE);
-
- return NULL;
- } else
- ntfs_log_error("WARNING: Forced mount, unclean volume "
- "information is ignored.\n");
- }
-
return vol;
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org