mirrors/ntfs-3g
0
0
Fork 0
mirror of https://git.code.sf.net/p/ntfs-3g/ntfs-3g.git synced 2024-11-23 18:14:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

- Apply patch from Szaka to fix all %L to %ll.

Browse Source 
- Fix remaining %L ti %ll (compress.c).
- Run ./autogen.sh on SuSE 9.0.

(Logical change 1.263)
This commit is contained in:
cantab.net!aia21 2004-01-15 16:57:10 +00:00
parent cb2bace779
commit c9076ef627
26 changed files with 18607 additions and 5335 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

239
Makefile.in
View File

@ -1,7 +1,7 @@
# Makefile.in generated by automake 1.6.3 from Makefile.am.
# Makefile.in generated by automake 1.7.6 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@ -13,88 +13,140 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
sbindir = @sbindir@
libexecdir = @libexecdir@
datadir = @datadir@
sysconfdir = @sysconfdir@
sharedstatedir = @sharedstatedir@
localstatedir = @localstatedir@
libdir = @libdir@
infodir = @infodir@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = .
ACLOCAL = @ACLOCAL@
AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
host_alias = @host_alias@
host_triplet = @host@
EXEEXT = @EXEEXT@
OBJEXT = @OBJEXT@
PATH_SEPARATOR = @PATH_SEPARATOR@
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AS = @AS@
AR = @AR@
AUTOCONF = @AUTOCONF@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
ENABLE_GNOME_VFS_FALSE = @ENABLE_GNOME_VFS_FALSE@
ENABLE_GNOME_VFS_TRUE = @ENABLE_GNOME_VFS_TRUE@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBNTFS_GNOMEVFS_CFLAGS = @LIBNTFS_GNOMEVFS_CFLAGS@
LIBNTFS_GNOMEVFS_LIBS = @LIBNTFS_GNOMEVFS_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIBTOOL_DEPS = @LIBTOOL_DEPS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
OBJDUMP = @OBJDUMP@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
REALLYSTATIC_FALSE = @REALLYSTATIC_FALSE@
REALLYSTATIC_TRUE = @REALLYSTATIC_TRUE@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
mandir = @mandir@
oldincludedir = @oldincludedir@
prefix = @prefix@
program_transform_name = @program_transform_name@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target = @target@
target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
SUBDIRS = doc include libntfs ntfsprogs
@ -111,10 +163,11 @@ CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = ntfsprogs.spec
DIST_SOURCES =
RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
uninstall-info-recursive all-recursive install-data-recursive \
install-exec-recursive installdirs-recursive install-recursive \
uninstall-recursive check-recursive installcheck-recursive
RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
ps-recursive install-info-recursive uninstall-info-recursive \
all-recursive install-data-recursive install-exec-recursive \
installdirs-recursive install-recursive uninstall-recursive \
check-recursive installcheck-recursive
DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
Makefile.in NEWS aclocal.m4 compile config.guess config.h.in \
config.sub configure configure.ac depcomp install-sh ltconfig \
@ -224,10 +277,17 @@ tags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
done
ctags-recursive:
list='$(SUBDIRS)'; for subdir in $$list; do \
test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
done
ETAGS = etags
ETAGSFLAGS =
CTAGS = ctags
CTAGSFLAGS =
tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@ -243,9 +303,15 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
if (etags --etags-include --version) >/dev/null 2>&1; then \
include_option=--etags-include; \
else \
include_option=--include; \
fi; \
list='$(SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
test -f $$subdir/TAGS && \
tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
fi; \
done; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
@ -258,13 +324,28 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
|| $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
$$tags $$unique
ctags: CTAGS
CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& cd $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = .
@ -276,13 +357,20 @@ am__remove_distdir = \
&& rm -fr $(distdir); }; }
GZIP_ENV = --best
distuninstallcheck_listfiles = find . -type f -print
distcleancheck_listfiles = find . -type f -print
distdir: $(DISTFILES)
$(am__remove_distdir)
mkdir $(distdir)
$(mkinstalldirs) $(distdir)/. $(distdir)/libntfs $(distdir)/ntfsprogs
@list='$(DISTFILES)'; for file in $$list; do \
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
case $$file in \
$(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
$(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
esac; \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@ -316,7 +404,7 @@ distdir: $(DISTFILES)
fi; \
done
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="${top_distdir}" distdir="$(distdir)" \
top_distdir="$(top_distdir)" distdir="$(distdir)" \
dist-hook
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
@ -338,12 +426,13 @@ distcheck: dist
$(am__remove_distdir)
GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
chmod -R a-w $(distdir); chmod a+w $(distdir)
mkdir $(distdir)/=build
mkdir $(distdir)/=inst
mkdir $(distdir)/_build
mkdir $(distdir)/_inst
chmod a-w $(distdir)
dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
&& cd $(distdir)/=build \
&& ../configure --srcdir=.. --prefix=$$dc_install_base \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& cd $(distdir)/_build \
&& ../configure --srcdir=.. --prefix="$$dc_install_base" \
$(DISTCHECK_CONFIGURE_FLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
@ -351,23 +440,39 @@ distcheck: dist
&& $(MAKE) $(AM_MAKEFLAGS) install \
&& $(MAKE) $(AM_MAKEFLAGS) installcheck \
&& $(MAKE) $(AM_MAKEFLAGS) uninstall \
&& (test `find $$dc_install_base -type f -print | wc -l` -le 1 \
|| { echo "ERROR: files left after uninstall:" ; \
find $$dc_install_base -type f -print ; \
exit 1; } >&2 ) \
&& $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
distuninstallcheck \
&& chmod -R a-w "$$dc_install_base" \
&& ({ \
(cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
&& $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
} || { rm -rf "$$dc_destdir"; exit 1; }) \
&& rm -rf "$$dc_destdir" \
&& $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
&& rm -f $(distdir).tar.gz \
&& $(MAKE) $(AM_MAKEFLAGS) distcleancheck
$(am__remove_distdir)
@echo "$(distdir).tar.gz is ready for distribution" | \
sed 'h;s/./=/g;p;x;p;x'
distuninstallcheck:
@cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
|| { echo "ERROR: files left after uninstall:" ; \
if test -n "$(DESTDIR)"; then \
echo " (check DESTDIR support)"; \
fi ; \
$(distuninstallcheck_listfiles) ; \
exit 1; } >&2
distcleancheck: distclean
if test '$(srcdir)' = . ; then \
@if test '$(srcdir)' = . ; then \
echo "ERROR: distcleancheck can only run from a VPATH build" ; \
exit 1 ; \
fi
test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
|| { echo "ERROR: files left after distclean:" ; \
@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
|| { echo "ERROR: files left in build directory after distclean:" ; \
$(distcleancheck_listfiles) ; \
exit 1; } >&2
check-am: all-am
@ -429,22 +534,31 @@ installcheck-am:
maintainer-clean: maintainer-clean-recursive
-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-rm -rf autom4te.cache
-rm -rf $(top_srcdir)/autom4te.cache
maintainer-clean-am: distclean-am maintainer-clean-generic
mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-generic mostlyclean-libtool
pdf: pdf-recursive
pdf-am:
ps: ps-recursive
ps-am:
uninstall-am: uninstall-info-am
uninstall-info: uninstall-info-recursive
.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
clean-generic clean-libtool clean-recursive dist dist-all \
dist-gzip distcheck distclean distclean-generic distclean-hdr \
distclean-libtool distclean-recursive distclean-tags \
distcleancheck distdir dvi dvi-am dvi-recursive info info-am \
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
clean-generic clean-libtool clean-recursive ctags \
ctags-recursive dist dist-all dist-gzip distcheck distclean \
distclean-generic distclean-hdr distclean-libtool \
distclean-recursive distclean-tags distcleancheck distdir \
distuninstallcheck dvi dvi-am dvi-recursive info info-am \
info-recursive install install-am install-data install-data-am \
install-data-recursive install-exec install-exec-am \
install-exec-recursive install-info install-info-am \
@ -453,7 +567,8 @@ uninstall-info: uninstall-info-recursive
installdirs-am installdirs-recursive maintainer-clean \
maintainer-clean-generic maintainer-clean-recursive mostlyclean \
mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
tags tags-recursive uninstall uninstall-am uninstall-info-am \
pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
tags-recursive uninstall uninstall-am uninstall-info-am \
uninstall-info-recursive uninstall-recursive

7451
aclocal.m4 vendored
View File

File diff suppressed because it is too large Load Diff

15012
configure vendored
View File

File diff suppressed because it is too large Load Diff

146
doc/Makefile.in
View File

@ -1,7 +1,7 @@
# Makefile.in generated by automake 1.6.3 from Makefile.am.
# Makefile.in generated by automake 1.7.6 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@ -13,88 +13,140 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
sbindir = @sbindir@
libexecdir = @libexecdir@
datadir = @datadir@
sysconfdir = @sysconfdir@
sharedstatedir = @sharedstatedir@
localstatedir = @localstatedir@
libdir = @libdir@
infodir = @infodir@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
ACLOCAL = @ACLOCAL@
AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
host_alias = @host_alias@
host_triplet = @host@
EXEEXT = @EXEEXT@
OBJEXT = @OBJEXT@
PATH_SEPARATOR = @PATH_SEPARATOR@
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AS = @AS@
AR = @AR@
AUTOCONF = @AUTOCONF@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
ENABLE_GNOME_VFS_FALSE = @ENABLE_GNOME_VFS_FALSE@
ENABLE_GNOME_VFS_TRUE = @ENABLE_GNOME_VFS_TRUE@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBNTFS_GNOMEVFS_CFLAGS = @LIBNTFS_GNOMEVFS_CFLAGS@
LIBNTFS_GNOMEVFS_LIBS = @LIBNTFS_GNOMEVFS_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIBTOOL_DEPS = @LIBTOOL_DEPS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
OBJDUMP = @OBJDUMP@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
REALLYSTATIC_FALSE = @REALLYSTATIC_FALSE@
REALLYSTATIC_TRUE = @REALLYSTATIC_TRUE@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
mandir = @mandir@
oldincludedir = @oldincludedir@
prefix = @prefix@
program_transform_name = @program_transform_name@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target = @target@
target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
EXTRA_DIST = \
CodingStyle \
attribute_definitions \
@ -107,6 +159,7 @@ EXTRA_DIST = \
system_security_descriptors.txt
subdir = doc
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@ -133,13 +186,22 @@ uninstall-info-am:
tags: TAGS
TAGS:
ctags: CTAGS
CTAGS:
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = ..
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
@list='$(DISTFILES)'; for file in $$list; do \
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
case $$file in \
$(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
$(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
esac; \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@ -164,7 +226,6 @@ check: check-am
all-am: Makefile
installdirs:
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@ -223,6 +284,14 @@ mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic mostlyclean-libtool
pdf: pdf-am
pdf-am:
ps: ps-am
ps-am:
uninstall-am: uninstall-info-am
.PHONY: all all-am check check-am clean clean-generic clean-libtool \
@ -232,7 +301,8 @@ uninstall-am: uninstall-info-am
install-info-am install-man install-strip installcheck \
installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool uninstall uninstall-am uninstall-info-am
mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
uninstall-info-am
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.

175
include/Makefile.in
View File

@ -1,7 +1,7 @@
# Makefile.in generated by automake 1.6.3 from Makefile.am.
# Makefile.in generated by automake 1.7.6 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@ -13,88 +13,140 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
sbindir = @sbindir@
libexecdir = @libexecdir@
datadir = @datadir@
sysconfdir = @sysconfdir@
sharedstatedir = @sharedstatedir@
localstatedir = @localstatedir@
libdir = @libdir@
infodir = @infodir@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
ACLOCAL = @ACLOCAL@
AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
host_alias = @host_alias@
host_triplet = @host@
EXEEXT = @EXEEXT@
OBJEXT = @OBJEXT@
PATH_SEPARATOR = @PATH_SEPARATOR@
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AS = @AS@
AR = @AR@
AUTOCONF = @AUTOCONF@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
ENABLE_GNOME_VFS_FALSE = @ENABLE_GNOME_VFS_FALSE@
ENABLE_GNOME_VFS_TRUE = @ENABLE_GNOME_VFS_TRUE@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBNTFS_GNOMEVFS_CFLAGS = @LIBNTFS_GNOMEVFS_CFLAGS@
LIBNTFS_GNOMEVFS_LIBS = @LIBNTFS_GNOMEVFS_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIBTOOL_DEPS = @LIBTOOL_DEPS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
OBJDUMP = @OBJDUMP@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
REALLYSTATIC_FALSE = @REALLYSTATIC_FALSE@
REALLYSTATIC_TRUE = @REALLYSTATIC_TRUE@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
mandir = @mandir@
oldincludedir = @oldincludedir@
prefix = @prefix@
program_transform_name = @program_transform_name@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target = @target@
target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
linux_ntfsincludedir = $(includedir)/ntfs
linux_ntfsinclude_HEADERS = \
@ -124,6 +176,7 @@ linux_ntfsinclude_HEADERS = \
volume.h
subdir = include
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@ -171,6 +224,9 @@ uninstall-linux_ntfsincludeHEADERS:
ETAGS = etags
ETAGSFLAGS =
CTAGS = ctags
CTAGSFLAGS =
tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@ -196,20 +252,41 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|| $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
$$tags $$unique
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& cd $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = ..
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
@list='$(DISTFILES)'; for file in $$list; do \
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
case $$file in \
$(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
$(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
esac; \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@ -235,7 +312,6 @@ all-am: Makefile $(HEADERS)
installdirs:
$(mkinstalldirs) $(DESTDIR)$(linux_ntfsincludedir)
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@ -295,18 +371,27 @@ mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-generic mostlyclean-libtool
pdf: pdf-am
pdf-am:
ps: ps-am
ps-am:
uninstall-am: uninstall-info-am uninstall-linux_ntfsincludeHEADERS
.PHONY: GTAGS all all-am check check-am clean clean-generic \
clean-libtool distclean distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am info info-am install \
install-am install-data install-data-am install-exec \
install-exec-am install-info install-info-am \
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-libtool ctags distclean distclean-generic \
distclean-libtool distclean-tags distdir dvi dvi-am info \
info-am install install-am install-data install-data-am \
install-exec install-exec-am install-info install-info-am \
install-linux_ntfsincludeHEADERS install-man install-strip \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic \
mostlyclean-libtool tags uninstall uninstall-am \
uninstall-info-am uninstall-linux_ntfsincludeHEADERS
mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
uninstall-am uninstall-info-am \
uninstall-linux_ntfsincludeHEADERS
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.

2
include/bitmap.h
View File

@ -46,7 +46,7 @@
static __inline__ void ntfs_bit_set(u8 *bitmap, const u64 bit,
const u8 new_value)
{
// Dprintf("bitmap %p, bit 0x%Lx, new_value %i\n", bitmap, bit, new_value);
// Dprintf("bitmap %p, bit 0x%llx, new_value %i\n", bitmap, bit, new_value);
if (!bitmap || new_value > 1)
return;
if (!new_value)

306
libntfs/Makefile.in
View File

@ -1,7 +1,7 @@
# Makefile.in generated by automake 1.6.3 from Makefile.am.
# Makefile.in generated by automake 1.7.6 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@ -40,88 +40,140 @@
#
# - If the interface is the same as the previous version, change to C:R+1:A
#
SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
sbindir = @sbindir@
libexecdir = @libexecdir@
datadir = @datadir@
sysconfdir = @sysconfdir@
sharedstatedir = @sharedstatedir@
localstatedir = @localstatedir@
libdir = @libdir@
infodir = @infodir@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
ACLOCAL = @ACLOCAL@
AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
host_alias = @host_alias@
host_triplet = @host@
EXEEXT = @EXEEXT@
OBJEXT = @OBJEXT@
PATH_SEPARATOR = @PATH_SEPARATOR@
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AS = @AS@
AR = @AR@
AUTOCONF = @AUTOCONF@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
ENABLE_GNOME_VFS_FALSE = @ENABLE_GNOME_VFS_FALSE@
ENABLE_GNOME_VFS_TRUE = @ENABLE_GNOME_VFS_TRUE@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBNTFS_GNOMEVFS_CFLAGS = @LIBNTFS_GNOMEVFS_CFLAGS@
LIBNTFS_GNOMEVFS_LIBS = @LIBNTFS_GNOMEVFS_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIBTOOL_DEPS = @LIBTOOL_DEPS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
OBJDUMP = @OBJDUMP@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
REALLYSTATIC_FALSE = @REALLYSTATIC_FALSE@
REALLYSTATIC_TRUE = @REALLYSTATIC_TRUE@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
mandir = @mandir@
oldincludedir = @oldincludedir@
prefix = @prefix@
program_transform_name = @program_transform_name@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target = @target@
target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
LTVERSION_LIBNTFS = 5:0:0
LTVERSION_LIBNTFS_GNOMEVFS = 1:0:0
@ -170,6 +222,7 @@ INCLUDES = $(linux_ntfsincludedir) $(all_includes)
EXTRA_DIST = unix_io.c win32_io.c libntfs.conf.in
subdir = libntfs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = libntfs.conf libntfs-gnomevfs.8
@ -185,7 +238,6 @@ am_libntfs_la_OBJECTS = attrib.lo bitmap.lo bootsect.lo compat.lo \
lcnalloc.lo mft.lo mst.lo runlist.lo unistr.lo volume.lo
libntfs_la_OBJECTS = $(am_libntfs_la_OBJECTS)
DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@ -254,7 +306,7 @@ clean-gnomevfsmoduleslibLTLIBRARIES:
-test -z "$(gnomevfsmoduleslib_LTLIBRARIES)" || rm -f $(gnomevfsmoduleslib_LTLIBRARIES)
@list='$(gnomevfsmoduleslib_LTLIBRARIES)'; for p in $$list; do \
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
test -z "$dir" && dir=.; \
test "$$dir" = "$$p" && dir=.; \
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
@ -282,12 +334,10 @@ clean-libLTLIBRARIES:
-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
test -z "$dir" && dir=.; \
test "$$dir" = "$$p" && dir=.; \
echo "rm -f \"$${dir}/so_locations\""; \
rm -f "$${dir}/so_locations"; \
done
libntfs_gnomevfs_la-gnome-vfs-method.lo: gnome-vfs-method.c
libntfs_gnomevfs_la-gnome-vfs-module.lo: gnome-vfs-module.c
libntfs-gnomevfs.la: $(libntfs_gnomevfs_la_OBJECTS) $(libntfs_gnomevfs_la_DEPENDENCIES)
$(LINK) -rpath $(gnomevfsmoduleslibdir) $(libntfs_gnomevfs_la_LDFLAGS) $(libntfs_gnomevfs_la_OBJECTS) $(libntfs_gnomevfs_la_LIBADD) $(LIBS)
libntfs.la: $(libntfs_la_OBJECTS) $(libntfs_la_DEPENDENCIES)
@ -322,59 +372,103 @@ distclean-depend:
-rm -rf ./$(DEPDIR)
.c.o:
@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
.c.obj:
@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(COMPILE) -c `cygpath -w $<`
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
.c.lo:
@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
libntfs_gnomevfs_la-gnome-vfs-method.o: gnome-vfs-method.c
@AMDEP_TRUE@ source='gnome-vfs-method.c' object='libntfs_gnomevfs_la-gnome-vfs-method.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-method.Po' tmpdepfile='$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-method.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntfs_gnomevfs_la_CFLAGS) $(CFLAGS) -c -o libntfs_gnomevfs_la-gnome-vfs-method.o `test -f 'gnome-vfs-method.c' || echo '$(srcdir)/'`gnome-vfs-method.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntfs_gnomevfs_la_CFLAGS) $(CFLAGS) -MT libntfs_gnomevfs_la-gnome-vfs-method.o -MD -MP -MF "$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-method.Tpo" \
@am__fastdepCC_TRUE@ -c -o libntfs_gnomevfs_la-gnome-vfs-method.o `test -f 'gnome-vfs-method.c' || echo '$(srcdir)/'`gnome-vfs-method.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-method.Tpo" "$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-method.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-method.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gnome-vfs-method.c' object='libntfs_gnomevfs_la-gnome-vfs-method.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-method.Po' tmpdepfile='$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-method.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntfs_gnomevfs_la_CFLAGS) $(CFLAGS) -c -o libntfs_gnomevfs_la-gnome-vfs-method.o `test -f 'gnome-vfs-method.c' || echo '$(srcdir)/'`gnome-vfs-method.c
libntfs_gnomevfs_la-gnome-vfs-method.obj: gnome-vfs-method.c
@AMDEP_TRUE@ source='gnome-vfs-method.c' object='libntfs_gnomevfs_la-gnome-vfs-method.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-method.Po' tmpdepfile='$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-method.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntfs_gnomevfs_la_CFLAGS) $(CFLAGS) -c -o libntfs_gnomevfs_la-gnome-vfs-method.obj `cygpath -w gnome-vfs-method.c`
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntfs_gnomevfs_la_CFLAGS) $(CFLAGS) -MT libntfs_gnomevfs_la-gnome-vfs-method.obj -MD -MP -MF "$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-method.Tpo" \
@am__fastdepCC_TRUE@ -c -o libntfs_gnomevfs_la-gnome-vfs-method.obj `if test -f 'gnome-vfs-method.c'; then $(CYGPATH_W) 'gnome-vfs-method.c'; else $(CYGPATH_W) '$(srcdir)/gnome-vfs-method.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-method.Tpo" "$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-method.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-method.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gnome-vfs-method.c' object='libntfs_gnomevfs_la-gnome-vfs-method.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-method.Po' tmpdepfile='$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-method.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntfs_gnomevfs_la_CFLAGS) $(CFLAGS) -c -o libntfs_gnomevfs_la-gnome-vfs-method.obj `if test -f 'gnome-vfs-method.c'; then $(CYGPATH_W) 'gnome-vfs-method.c'; else $(CYGPATH_W) '$(srcdir)/gnome-vfs-method.c'; fi`
libntfs_gnomevfs_la-gnome-vfs-method.lo: gnome-vfs-method.c
@AMDEP_TRUE@ source='gnome-vfs-method.c' object='libntfs_gnomevfs_la-gnome-vfs-method.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-method.Plo' tmpdepfile='$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-method.TPlo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntfs_gnomevfs_la_CFLAGS) $(CFLAGS) -c -o libntfs_gnomevfs_la-gnome-vfs-method.lo `test -f 'gnome-vfs-method.c' || echo '$(srcdir)/'`gnome-vfs-method.c
@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntfs_gnomevfs_la_CFLAGS) $(CFLAGS) -MT libntfs_gnomevfs_la-gnome-vfs-method.lo -MD -MP -MF "$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-method.Tpo" \
@am__fastdepCC_TRUE@ -c -o libntfs_gnomevfs_la-gnome-vfs-method.lo `test -f 'gnome-vfs-method.c' || echo '$(srcdir)/'`gnome-vfs-method.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-method.Tpo" "$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-method.Plo"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-method.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gnome-vfs-method.c' object='libntfs_gnomevfs_la-gnome-vfs-method.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-method.Plo' tmpdepfile='$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-method.TPlo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntfs_gnomevfs_la_CFLAGS) $(CFLAGS) -c -o libntfs_gnomevfs_la-gnome-vfs-method.lo `test -f 'gnome-vfs-method.c' || echo '$(srcdir)/'`gnome-vfs-method.c
libntfs_gnomevfs_la-gnome-vfs-module.o: gnome-vfs-module.c
@AMDEP_TRUE@ source='gnome-vfs-module.c' object='libntfs_gnomevfs_la-gnome-vfs-module.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-module.Po' tmpdepfile='$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-module.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntfs_gnomevfs_la_CFLAGS) $(CFLAGS) -c -o libntfs_gnomevfs_la-gnome-vfs-module.o `test -f 'gnome-vfs-module.c' || echo '$(srcdir)/'`gnome-vfs-module.c
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntfs_gnomevfs_la_CFLAGS) $(CFLAGS) -MT libntfs_gnomevfs_la-gnome-vfs-module.o -MD -MP -MF "$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-module.Tpo" \
@am__fastdepCC_TRUE@ -c -o libntfs_gnomevfs_la-gnome-vfs-module.o `test -f 'gnome-vfs-module.c' || echo '$(srcdir)/'`gnome-vfs-module.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-module.Tpo" "$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-module.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-module.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gnome-vfs-module.c' object='libntfs_gnomevfs_la-gnome-vfs-module.o' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-module.Po' tmpdepfile='$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-module.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntfs_gnomevfs_la_CFLAGS) $(CFLAGS) -c -o libntfs_gnomevfs_la-gnome-vfs-module.o `test -f 'gnome-vfs-module.c' || echo '$(srcdir)/'`gnome-vfs-module.c
libntfs_gnomevfs_la-gnome-vfs-module.obj: gnome-vfs-module.c
@AMDEP_TRUE@ source='gnome-vfs-module.c' object='libntfs_gnomevfs_la-gnome-vfs-module.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-module.Po' tmpdepfile='$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-module.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntfs_gnomevfs_la_CFLAGS) $(CFLAGS) -c -o libntfs_gnomevfs_la-gnome-vfs-module.obj `cygpath -w gnome-vfs-module.c`
@am__fastdepCC_TRUE@ if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntfs_gnomevfs_la_CFLAGS) $(CFLAGS) -MT libntfs_gnomevfs_la-gnome-vfs-module.obj -MD -MP -MF "$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-module.Tpo" \
@am__fastdepCC_TRUE@ -c -o libntfs_gnomevfs_la-gnome-vfs-module.obj `if test -f 'gnome-vfs-module.c'; then $(CYGPATH_W) 'gnome-vfs-module.c'; else $(CYGPATH_W) '$(srcdir)/gnome-vfs-module.c'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-module.Tpo" "$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-module.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-module.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gnome-vfs-module.c' object='libntfs_gnomevfs_la-gnome-vfs-module.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-module.Po' tmpdepfile='$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-module.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntfs_gnomevfs_la_CFLAGS) $(CFLAGS) -c -o libntfs_gnomevfs_la-gnome-vfs-module.obj `if test -f 'gnome-vfs-module.c'; then $(CYGPATH_W) 'gnome-vfs-module.c'; else $(CYGPATH_W) '$(srcdir)/gnome-vfs-module.c'; fi`
libntfs_gnomevfs_la-gnome-vfs-module.lo: gnome-vfs-module.c
@AMDEP_TRUE@ source='gnome-vfs-module.c' object='libntfs_gnomevfs_la-gnome-vfs-module.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-module.Plo' tmpdepfile='$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-module.TPlo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntfs_gnomevfs_la_CFLAGS) $(CFLAGS) -c -o libntfs_gnomevfs_la-gnome-vfs-module.lo `test -f 'gnome-vfs-module.c' || echo '$(srcdir)/'`gnome-vfs-module.c
CCDEPMODE = @CCDEPMODE@
@am__fastdepCC_TRUE@ if $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntfs_gnomevfs_la_CFLAGS) $(CFLAGS) -MT libntfs_gnomevfs_la-gnome-vfs-module.lo -MD -MP -MF "$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-module.Tpo" \
@am__fastdepCC_TRUE@ -c -o libntfs_gnomevfs_la-gnome-vfs-module.lo `test -f 'gnome-vfs-module.c' || echo '$(srcdir)/'`gnome-vfs-module.c; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-module.Tpo" "$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-module.Plo"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-module.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='gnome-vfs-module.c' object='libntfs_gnomevfs_la-gnome-vfs-module.lo' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-module.Plo' tmpdepfile='$(DEPDIR)/libntfs_gnomevfs_la-gnome-vfs-module.TPlo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libntfs_gnomevfs_la_CFLAGS) $(CFLAGS) -c -o libntfs_gnomevfs_la-gnome-vfs-module.lo `test -f 'gnome-vfs-module.c' || echo '$(srcdir)/'`gnome-vfs-module.c
mostlyclean-libtool:
-rm -f *.lo
@ -422,6 +516,10 @@ uninstall-man8:
done; \
for i in $$list; do \
ext=`echo $$i | sed -e 's/^.*\\.//'`; \
case "$$ext" in \
8*) ;; \
*) ext='8' ;; \
esac; \
inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
inst=`echo $$inst | sed -e 's/^.*\///'`; \
inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@ -450,6 +548,9 @@ uninstall-gnomevfsmodulesconfDATA:
ETAGS = etags
ETAGSFLAGS =
CTAGS = ctags
CTAGSFLAGS =
tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@ -475,20 +576,41 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|| $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
$$tags $$unique
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& cd $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = ..
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
@list='$(DISTFILES)'; for file in $$list; do \
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
case $$file in \
$(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
$(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
esac; \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@ -514,7 +636,6 @@ all-am: Makefile $(LTLIBRARIES) $(MANS) $(DATA)
installdirs:
$(mkinstalldirs) $(DESTDIR)$(gnomevfsmoduleslibdir) $(DESTDIR)$(libdir) $(DESTDIR)$(man8dir) $(DESTDIR)$(gnomevfsmodulesconfdir)
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@ -577,25 +698,34 @@ mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-compile mostlyclean-generic \
mostlyclean-libtool
pdf: pdf-am
pdf-am:
ps: ps-am
ps-am:
uninstall-am: uninstall-gnomevfsmodulesconfDATA \
uninstall-gnomevfsmoduleslibLTLIBRARIES uninstall-info-am \
uninstall-libLTLIBRARIES uninstall-man
uninstall-man: uninstall-man8
.PHONY: GTAGS all all-am check check-am clean clean-generic \
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
clean-gnomevfsmoduleslibLTLIBRARIES clean-libLTLIBRARIES \
clean-libtool distclean distclean-compile distclean-depend \
distclean-generic distclean-libtool distclean-tags distdir dvi \
dvi-am info info-am install install-am install-data \
install-data-am install-exec install-exec-am \
install-gnomevfsmodulesconfDATA \
clean-libtool ctags distclean distclean-compile \
distclean-depend distclean-generic distclean-libtool \
distclean-tags distdir dvi dvi-am info info-am install \
install-am install-data install-data-am install-exec \
install-exec-am install-gnomevfsmodulesconfDATA \
install-gnomevfsmoduleslibLTLIBRARIES install-info \
install-info-am install-libLTLIBRARIES install-man install-man8 \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
tags uninstall uninstall-am uninstall-gnomevfsmodulesconfDATA \
mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
pdf-am ps ps-am tags uninstall uninstall-am \
uninstall-gnomevfsmodulesconfDATA \
uninstall-gnomevfsmoduleslibLTLIBRARIES uninstall-info-am \
uninstall-libLTLIBRARIES uninstall-man uninstall-man8

38
libntfs/attrib.c
View File

@ -327,7 +327,7 @@ ntfs_attr *ntfs_attr_open(ntfs_inode *ni, const ATTR_TYPES type,
ATTR_RECORD *a;
int err;
Dprintf("%s(): Entering for inode 0x%Lx, attr 0x%x.\n", __FUNCTION__,
Dprintf("%s(): Entering for inode 0x%llx, attr 0x%x.\n", __FUNCTION__,
(unsigned long long)ni->mft_no, type);
if (!ni || !ni->vol || !ni->mrec) {
errno = EINVAL;
@ -410,7 +410,7 @@ int ntfs_attr_map_runlist(ntfs_attr *na, VCN vcn)
ntfs_attr_search_ctx *ctx;
int err;
Dprintf("%s(): Entering for inode 0x%Lx, attr 0x%x, vcn 0x%Lx.\n",
Dprintf("%s(): Entering for inode 0x%llx, attr 0x%x, vcn 0x%llx.\n",
__FUNCTION__, (unsigned long long)na->ni->mft_no,
na->type, (long long)vcn);
@ -459,7 +459,7 @@ int ntfs_attr_map_whole_runlist(ntfs_attr *na)
ATTR_RECORD *a;
int err;
Dprintf("%s(): Entering for inode 0x%Lx, attr 0x%x.\n", __FUNCTION__,
Dprintf("%s(): Entering for inode 0x%llx, attr 0x%x.\n", __FUNCTION__,
(unsigned long long)na->ni->mft_no, na->type);
ctx = ntfs_attr_get_search_ctx(na->ni, NULL);
@ -528,7 +528,7 @@ int ntfs_attr_map_whole_runlist(ntfs_attr *na)
Dprintf("%s(): Failed to load the complete run list for the "
"attribute. Bug or corrupt inode.\n",
__FUNCTION__);
Dprintf("%s(): highest_vcn = 0x%Lx, last_vcn - 1 = 0x%Lx\n",
Dprintf("%s(): highest_vcn = 0x%llx, last_vcn - 1 = 0x%llx\n",
__FUNCTION__, (long long)highest_vcn,
(long long)last_vcn - 1);
errno = EIO;
@ -694,8 +694,8 @@ s64 ntfs_attr_pread(ntfs_attr *na, const s64 pos, s64 count, void *b)
ntfs_volume *vol;
runlist_element *rl;
Dprintf("%s(): Entering for inode 0x%Lx, attr 0x%x, pos 0x%Lx, "
"count 0x%Lx.\n", __FUNCTION__,
Dprintf("%s(): Entering for inode 0x%llx, attr 0x%x, pos 0x%llx, "
"count 0x%llx.\n", __FUNCTION__,
(unsigned long long)na->ni->mft_no, na->type,
(long long)pos, (long long)count);
if (!na || !na->ni || !na->ni->vol || !b || pos < 0 || count < 0) {
@ -802,8 +802,8 @@ res_err_out:
to_read = min(count, (rl->length << vol->cluster_size_bits) -
ofs);
retry:
Dprintf("%s(): Reading 0x%Lx bytes from vcn 0x%Lx, lcn 0x%Lx, "
"ofs 0x%Lx.\n", __FUNCTION__, to_read,
Dprintf("%s(): Reading 0x%llx bytes from vcn 0x%llx, lcn 0x%llx, "
"ofs 0x%llx.\n", __FUNCTION__, to_read,
rl->vcn, rl->lcn, ofs);
br = ntfs_pread(vol->dev, (rl->lcn << vol->cluster_size_bits) +
ofs, to_read, b);
@ -865,8 +865,8 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, const s64 pos, s64 count, void *b)
unsigned int initialized_size : 1;
} need_to_undo = { 0 };
Dprintf("%s(): Entering for inode 0x%Lx, attr 0x%x, pos 0x%Lx, "
"count 0x%Lx.\n", __FUNCTION__, na->ni->mft_no,
Dprintf("%s(): Entering for inode 0x%llx, attr 0x%x, pos 0x%llx, "
"count 0x%llx.\n", __FUNCTION__, na->ni->mft_no,
na->type, (long long)pos, (long long)count);
if (!na || !na->ni || !na->ni->vol || !b || pos < 0 || count < 0) {
errno = EINVAL;
@ -1059,8 +1059,8 @@ s64 ntfs_attr_pwrite(ntfs_attr *na, const s64 pos, s64 count, void *b)
to_write = min(count, (rl->length << vol->cluster_size_bits) -
ofs);
retry:
Dprintf("%s(): Writing 0x%Lx bytes to vcn 0x%Lx, lcn 0x%Lx, "
"ofs 0x%Lx.\n", __FUNCTION__, to_write,
Dprintf("%s(): Writing 0x%llx bytes to vcn 0x%llx, lcn 0x%llx, "
"ofs 0x%llx.\n", __FUNCTION__, to_write,
rl->vcn, rl->lcn, ofs);
if (!NVolReadOnly(vol))
written = ntfs_pwrite(vol->dev, (rl->lcn <<
@ -1175,7 +1175,7 @@ s64 ntfs_attr_mst_pread(ntfs_attr *na, const s64 pos, const s64 bk_cnt,
s64 br;
u8 *end;
Dprintf("%s(): Entering for inode 0x%Lx, attr type 0x%x, pos 0x%Lx.\n",
Dprintf("%s(): Entering for inode 0x%llx, attr type 0x%x, pos 0x%llx.\n",
__FUNCTION__, (unsigned long long)na->ni->mft_no,
na->type, (long long)pos);
if (bk_cnt < 0 || bk_size % NTFS_SECTOR_SIZE) {
@ -1227,7 +1227,7 @@ s64 ntfs_attr_mst_pwrite(ntfs_attr *na, const s64 pos, s64 bk_cnt,
{
s64 written, i;
Dprintf("%s(): Entering for inode 0x%Lx, attr type 0x%x, pos 0x%Lx.\n",
Dprintf("%s(): Entering for inode 0x%llx, attr type 0x%x, pos 0x%llx.\n",
__FUNCTION__, (unsigned long long)na->ni->mft_no,
na->type, (long long)pos);
if (bk_cnt < 0 || bk_size % NTFS_SECTOR_SIZE) {
@ -1544,7 +1544,7 @@ static int ntfs_external_attr_find(ATTR_TYPES type, const uchar_t *name,
ni = ctx->ntfs_ino;
base_ni = ctx->base_ntfs_ino;
Dprintf("Entering for inode %Lu, attribute type 0x%x.\n",
Dprintf("Entering for inode %llu, attribute type 0x%x.\n",
(unsigned long long)ni->mft_no, type);
if (!base_ni) {
/* First call happens with the base mft record. */
@ -2387,7 +2387,7 @@ static int ntfs_attr_make_non_resident(ntfs_attr *na,
err = errno;
// FIXME: Eeek!
fprintf(stderr, "%s(): Eeek! Failed to write out attribute "
"value (bw = %Li, errno = %i). Aborting...\n",
"value (bw = %lli, errno = %i). Aborting...\n",
__FUNCTION__, (long long)bw, err);
if (bw >= 0)
err = EIO;
@ -2518,7 +2518,7 @@ static int ntfs_resident_attr_resize(ntfs_attr *na, const s64 newsize)
ntfs_volume *vol;
int err;
Dprintf("%s(): Entering for inode 0x%Lx, attr 0x%x.\n", __FUNCTION__,
Dprintf("%s(): Entering for inode 0x%llx, attr 0x%x.\n", __FUNCTION__,
(unsigned long long)na->ni->mft_no, na->type);
/* Get the attribute record that needs modification. */
ctx = ntfs_attr_get_search_ctx(na->ni, NULL);
@ -2828,7 +2828,7 @@ static int ntfs_non_resident_attr_shrink(ntfs_attr *na, const s64 newsize)
u32 new_alen, new_muse;
int err, mp_size;
Dprintf("%s(): Entering for inode 0x%Lx, attr 0x%x.\n", __FUNCTION__,
Dprintf("%s(): Entering for inode 0x%llx, attr 0x%x.\n", __FUNCTION__,
(unsigned long long)na->ni->mft_no, na->type);
vol = na->ni->vol;
@ -2944,7 +2944,7 @@ static int ntfs_non_resident_attr_shrink(ntfs_attr *na, const s64 newsize)
if (!newsize && na->compressed_size) {
fprintf(stderr, "%s(): Eeek! !newsize but "
"na->compressed_size not zero "
"(= %Li)! Fixing up by hand!\n",
"(= %lli)! Fixing up by hand!\n",
__FUNCTION__, (long long)
na->compressed_size);
na->compressed_size = 0;

2
libntfs/bitmap.c
View File

@ -161,7 +161,7 @@ static int ntfs_bitmap_set_bits_in_run(ntfs_attr *na, s64 start_bit, s64 count,
if (lastbyte && count != 0) {
// FIXME: Eeek! BUG!
fprintf(stderr, "%s(): Eeek! Last buffer but count is "
"not zero (= %Li). Leaving "
"not zero (= %lli). Leaving "
"inconsistent metadata.\n",
__FUNCTION__, count);
err = EIO;

6
libntfs/bootsect.c
View File

@ -195,7 +195,7 @@ int ntfs_boot_sector_parse(ntfs_volume *vol, const NTFS_BOOT_SECTOR *bs)
* ntfs_boot_sector_is_ntfs but in this way we can just do this once.
*/
sectors_per_cluster = bs->bpb.sectors_per_cluster;
Dprintf("NumberOfSectors = %Li\n", sle64_to_cpu(bs->number_of_sectors));
Dprintf("NumberOfSectors = %lli\n", sle64_to_cpu(bs->number_of_sectors));
Dprintf("SectorsPerCluster = 0x%x\n", sectors_per_cluster);
if (sectors_per_cluster & (sectors_per_cluster - 1)) {
Dprintf("Error: %s is not a valid NTFS partition! "
@ -208,8 +208,8 @@ int ntfs_boot_sector_parse(ntfs_volume *vol, const NTFS_BOOT_SECTOR *bs)
vol->mft_lcn = sle64_to_cpu(bs->mft_lcn);
vol->mftmirr_lcn = sle64_to_cpu(bs->mftmirr_lcn);
Dprintf("MFT LCN = 0x%Lx\n", vol->mft_lcn);
Dprintf("MFTMirr LCN = 0x%Lx\n", vol->mftmirr_lcn);
Dprintf("MFT LCN = 0x%llx\n", vol->mft_lcn);
Dprintf("MFTMirr LCN = 0x%llx\n", vol->mftmirr_lcn);
if (vol->mft_lcn > vol->nr_clusters ||
vol->mftmirr_lcn > vol->nr_clusters) {
Dprintf("Error: %s is not a valid NTFS partition! ($Mft LCN "

4
libntfs/compress.c
View File

@ -261,8 +261,8 @@ s64 ntfs_compressed_attr_pread(ntfs_attr *na, s64 pos, s64 count, void *b)
int err;
unsigned int nr_cbs, cb_clusters;
Dprintf("%s(): Entering for inode 0x%Lx, attr 0x%x, pos 0x%Lx, "
"count 0x%Lx.\n", __FUNCTION__,
Dprintf("%s(): Entering for inode 0x%llx, attr 0x%x, pos 0x%llx, "
"count 0x%llx.\n", __FUNCTION__,
(unsigned long long)na->ni->mft_no, na->type,
(long long)pos, (long long)count);
if (!na || !NAttrCompressed(na) || !na->ni || !na->ni->vol || !b ||

4
libntfs/debug.c
View File

@ -46,11 +46,11 @@ void ntfs_debug_runlist_dump(const runlist_element *rl)
if (index > -LCN_EINVAL - 1)
index = 4;
Dprintf("%-16Lx %s %-16Lx%s\n", rl[i].vcn,
Dprintf("%-16llx %s %-16llx%s\n", rl[i].vcn,
lcn_str[index], rl[i].length,
rl[i].length ? "" : " (runlist end)");
} else
Dprintf("%-16Lx %-16Lx %-16Lx%s\n", rl[i].vcn,
Dprintf("%-16llx %-16llx %-16llx%s\n", rl[i].vcn,
rl[i].lcn, rl[i].length,
rl[i].length ? "" : " (runlist end)");
} while (rl[i++].length);

8
libntfs/device.c
View File

@ -135,7 +135,7 @@ s64 ntfs_pread(struct ntfs_device *dev, const s64 pos, s64 count, void *b)
s64 br, total;
struct ntfs_device_operations *dops;
Dprintf("%s(): Entering for pos 0x%Lx, count 0x%Lx.\n", __FUNCTION__,
Dprintf("%s(): Entering for pos 0x%llx, count 0x%llx.\n", __FUNCTION__,
pos, count);
if (!b || count < 0 || pos < 0) {
errno = EINVAL;
@ -146,7 +146,7 @@ s64 ntfs_pread(struct ntfs_device *dev, const s64 pos, s64 count, void *b)
dops = dev->d_ops;
/* Locate to position. */
if (dops->seek(dev, pos, SEEK_SET) == (off_t)-1) {
Dprintf("ntfs_pread: device seek to 0x%Lx returned error: "
Dprintf("ntfs_pread: device seek to 0x%llx returned error: "
"%s\n", pos, strerror(errno));
return -1;
}
@ -191,7 +191,7 @@ s64 ntfs_pwrite(struct ntfs_device *dev, const s64 pos, s64 count,
s64 written, total;
struct ntfs_device_operations *dops;
Dprintf("%s(): Entering for pos 0x%Lx, count 0x%Lx.\n", __FUNCTION__,
Dprintf("%s(): Entering for pos 0x%llx, count 0x%llx.\n", __FUNCTION__,
pos, count);
if (!b || count < 0 || pos < 0) {
errno = EINVAL;
@ -206,7 +206,7 @@ s64 ntfs_pwrite(struct ntfs_device *dev, const s64 pos, s64 count,
dops = dev->d_ops;
/* Locate to position. */
if (dops->seek(dev, pos, SEEK_SET) == (off_t)-1) {
Dprintf("ntfs_pwrite: seek to 0x%Lx returned error: %s\n",
Dprintf("ntfs_pwrite: seek to 0x%llx returned error: %s\n",
pos, strerror(errno));
return -1;
}

54
libntfs/dir.c
View File

@ -92,7 +92,7 @@ u64 ntfs_inode_lookup_by_name(ntfs_inode *dir_ni, const uchar_t *uname,
if (ntfs_attr_lookup(AT_INDEX_ROOT, I30, 4, CASE_SENSITIVE, 0, NULL,
0, ctx)) {
Dprintf("Index root attribute missing in directory inode "
"0x%Lx: %s\n",
"0x%llx: %s\n",
(unsigned long long)dir_ni->mft_no,
strerror(errno));
goto put_err_out;
@ -228,7 +228,7 @@ found_it:
ia_na = ntfs_attr_open(dir_ni, AT_INDEX_ALLOCATION, I30, 4);
if (!ia_na) {
Dprintf("Failed to open index allocation attribute. Directory "
"inode 0x%Lx is corrupt or driver bug: %s\n",
"inode 0x%llx is corrupt or driver bug: %s\n",
(unsigned long long)dir_ni->mft_no,
strerror(errno));
goto put_err_out;
@ -261,20 +261,20 @@ descend_into_child_node:
if (br != 1) {
if (br != -1)
errno = EIO;
Dprintf("Failed to read vcn 0x%Lx: %s\n", vcn, strerror(errno));
Dprintf("Failed to read vcn 0x%llx: %s\n", vcn, strerror(errno));
goto close_err_out;
}
if (sle64_to_cpu(ia->index_block_vcn) != vcn) {
Dprintf("Actual VCN (0x%Lx) of index buffer is different from "
"expected VCN (0x%Lx).\n",
Dprintf("Actual VCN (0x%llx) of index buffer is different from "
"expected VCN (0x%llx).\n",
(long long)sle64_to_cpu(ia->index_block_vcn),
(long long)vcn);
errno = EIO;
goto close_err_out;
}
if (le32_to_cpu(ia->index.allocated_size) + 0x18 != index_block_size) {
Dprintf("Index buffer (VCN 0x%Lx) of directory inode 0x%Lx "
Dprintf("Index buffer (VCN 0x%llx) of directory inode 0x%llx "
"has a size (%u) differing from the directory "
"specified size (%u).\n", (long long)vcn,
(unsigned long long)dir_ni->mft_no,
@ -285,8 +285,8 @@ descend_into_child_node:
}
index_end = (u8*)&ia->index + le32_to_cpu(ia->index.index_length);
if (index_end > (u8*)ia + index_block_size) {
Dprintf("Size of index buffer (VCN 0x%Lx) of directory inode "
"0x%Lx exceeds maximum size.\n", (long long)vcn,
Dprintf("Size of index buffer (VCN 0x%llx) of directory inode "
"0x%llx exceeds maximum size.\n", (long long)vcn,
(unsigned long long)dir_ni->mft_no);
errno = EIO;
goto close_err_out;
@ -307,7 +307,7 @@ descend_into_child_node:
(u8*)ie + le16_to_cpu(ie->key_length) >
index_end) {
Dprintf("Index entry out of bounds in directory inode "
"0x%Lx.\n",
"0x%llx.\n",
(unsigned long long)dir_ni->mft_no);
errno = EIO;
goto close_err_out;
@ -408,7 +408,7 @@ found_it2:
if (ie->flags & INDEX_ENTRY_NODE) {
if ((ia->index.flags & NODE_MASK) == LEAF_NODE) {
Dprintf("Index entry with child node found in a leaf "
"node in directory inode 0x%Lx.\n",
"node in directory inode 0x%llx.\n",
(unsigned long long)dir_ni->mft_no);
errno = EIO;
goto close_err_out;
@ -417,7 +417,7 @@ found_it2:
vcn = sle64_to_cpup((u8*)ie + le16_to_cpu(ie->length) - 8);
if (vcn >= 0)
goto descend_into_child_node;
Dprintf("Negative child node vcn in directory inode 0x%Lx.\n",
Dprintf("Negative child node vcn in directory inode 0x%llx.\n",
(unsigned long long)dir_ni->mft_no);
errno = EIO;
goto close_err_out;
@ -547,20 +547,20 @@ static MFT_REF ntfs_mft_get_parent_ref(ntfs_inode *ni)
if (!ctx)
return ERR_MREF(-1);
if (ntfs_attr_lookup(AT_FILE_NAME, AT_UNNAMED, 0, 0, 0, NULL, 0, ctx)) {
Dprintf("No file name found in inode 0x%Lx. Corrupt inode.\n",
Dprintf("No file name found in inode 0x%llx. Corrupt inode.\n",
(unsigned long long)ni->mft_no);
goto err_out;
}
if (ctx->attr->non_resident) {
Dprintf("File name attribute must be resident. Corrupt inode "
"0x%Lx.\n", (unsigned long long)ni->mft_no);
"0x%llx.\n", (unsigned long long)ni->mft_no);
goto io_err_out;
}
fn = (FILE_NAME_ATTR*)((u8*)ctx->attr +
le16_to_cpu(ctx->attr->value_offset));
if ((u8*)fn + le32_to_cpu(ctx->attr->value_length) >
(u8*)ctx->attr + le32_to_cpu(ctx->attr->length)) {
Dprintf("Corrupt file name attribute in inode 0x%Lx.\n",
Dprintf("Corrupt file name attribute in inode 0x%llx.\n",
(unsigned long long)ni->mft_no);
goto io_err_out;
}
@ -619,7 +619,7 @@ int ntfs_readdir(ntfs_inode *dir_ni, s64 *pos,
vol = dir_ni->vol;
Dprintf("Entering for inode 0x%Lx, *pos 0x%Lx.\n",
Dprintf("Entering for inode 0x%llx, *pos 0x%llx.\n",
(unsigned long long)dir_ni->mft_no, (long long)*pos);
/* Open the index allocation attribute. */
@ -627,7 +627,7 @@ int ntfs_readdir(ntfs_inode *dir_ni, s64 *pos,
if (!ia_na) {
if (errno != ENOENT) {
Dprintf("Failed to open index allocation attribute. "
"Directory inode 0x%Lx is corrupt or "
"Directory inode 0x%llx is corrupt or "
"bug: %s\n",
(unsigned long long)dir_ni->mft_no,
strerror(errno));
@ -679,7 +679,7 @@ int ntfs_readdir(ntfs_inode *dir_ni, s64 *pos,
if (ntfs_attr_lookup(AT_INDEX_ROOT, I30, 4, CASE_SENSITIVE, 0, NULL,
0, ctx)) {
Dprintf("Index root attribute missing in directory inode "
"0x%Lx.\n", (unsigned long long)dir_ni->mft_no);
"0x%llx.\n", (unsigned long long)dir_ni->mft_no);
goto dir_err_out;
}
/* Get to the index root value. */
@ -820,7 +820,7 @@ find_next_index_buffer:
}
}
Dprintf("Handling index block 0x%Lx.", (long long)bmp_pos);
Dprintf("Handling index block 0x%llx.", (long long)bmp_pos);
/* Read the index block starting at bmp_pos. */
br = ntfs_attr_mst_pread(ia_na, bmp_pos << index_block_size_bits, 1,
@ -835,15 +835,15 @@ find_next_index_buffer:
ia_start = ia_pos & ~(s64)(index_block_size - 1);
if (sle64_to_cpu(ia->index_block_vcn) != ia_start >>
index_vcn_size_bits) {
Dprintf("Actual VCN (0x%Lx) of index buffer is different from "
"expected VCN (0x%Lx) in inode 0x%Lx.\n",
Dprintf("Actual VCN (0x%llx) of index buffer is different from "
"expected VCN (0x%llx) in inode 0x%llx.\n",
(long long)sle64_to_cpu(ia->index_block_vcn),
(long long)ia_start >> index_vcn_size_bits,
(unsigned long long)dir_ni->mft_no);
goto dir_err_out;
}
if (le32_to_cpu(ia->index.allocated_size) + 0x18 != index_block_size) {
Dprintf("Index buffer (VCN 0x%Lx) of directory inode 0x%Lx "
Dprintf("Index buffer (VCN 0x%llx) of directory inode 0x%llx "
"has a size (%u) differing from the directory "
"specified size (%u).\n",
(long long)ia_start >> index_vcn_size_bits,
@ -854,8 +854,8 @@ find_next_index_buffer:
}
index_end = (u8*)&ia->index + le32_to_cpu(ia->index.index_length);
if (index_end > (u8*)ia + index_block_size) {
Dprintf("Size of index buffer (VCN 0x%Lx) of directory inode "
"0x%Lx exceeds maximum size.\n",
Dprintf("Size of index buffer (VCN 0x%llx) of directory inode "
"0x%llx exceeds maximum size.\n",
(long long)ia_start >> index_vcn_size_bits,
(unsigned long long)dir_ni->mft_no);
goto dir_err_out;
@ -869,7 +869,7 @@ find_next_index_buffer:
* enough or signals an error (both covered by the rc test).
*/
for (;; ie = (INDEX_ENTRY*)((u8*)ie + le16_to_cpu(ie->length))) {
Dprintf("In index allocation, offset 0x%Lx.\n",
Dprintf("In index allocation, offset 0x%llx.\n",
(long long)ia_start + ((u8*)ie - (u8*)ia));
/* Bounds checks. */
if ((u8*)ie < (u8*)ia || (u8*)ie +
@ -877,7 +877,7 @@ find_next_index_buffer:
(u8*)ie + le16_to_cpu(ie->key_length) >
index_end) {
Dprintf("Index entry out of bounds in directory inode "
"0x%Lx.\n",
"0x%llx.\n",
(unsigned long long)dir_ni->mft_no);
goto dir_err_out;
}
@ -907,9 +907,9 @@ done:
ntfs_attr_close(ia_na);
#ifdef DEBUG
if (!rc)
Dprintf("EOD, *pos 0x%Lx, returning 0.\n", (long long)*pos);
Dprintf("EOD, *pos 0x%llx, returning 0.\n", (long long)*pos);
else
Dprintf("filldir returned %i, *pos 0x%Lx, returning 0.\n",
Dprintf("filldir returned %i, *pos 0x%llx, returning 0.\n",
rc, (long long)*pos);
#endif
return 0;

4
libntfs/inode.c
View File

@ -110,7 +110,7 @@ ntfs_inode *ntfs_inode_open(ntfs_volume *vol, const MFT_REF mref)
ntfs_attr_search_ctx *ctx;
int err = 0;
Dprintf("%s(): Entering for inode 0x%Lx.\n", __FUNCTION__, MREF(mref));
Dprintf("%s(): Entering for inode 0x%llx.\n", __FUNCTION__, MREF(mref));
if (!vol) {
errno = EINVAL;
return NULL;
@ -290,7 +290,7 @@ ntfs_inode *ntfs_extent_inode_open(ntfs_inode *base_ni, const MFT_REF mref)
errno = EINVAL;
return NULL;
}
Dprintf("Opening extent inode %Lu (base mft record 0x%Lu).\n",
Dprintf("Opening extent inode %llu (base mft record 0x%llu).\n",
(unsigned long long)mft_no,
(unsigned long long)base_ni->mft_no);
/* Is the extent inode already open and attached to the base inode? */

96
libntfs/lcnalloc.c
View File

@ -101,7 +101,7 @@ runlist *ntfs_cluster_alloc(ntfs_volume *vol, s64 count, LCN start_lcn,
int err = 0, rlpos, rlsize, buf_size;
u8 pass, done_zones, search_zone, need_writeback, bit;
Dprintf("%s(): Entering with count = 0x%Lx, start_lcn = 0x%Lx, "
Dprintf("%s(): Entering with count = 0x%llx, start_lcn = 0x%llx, "
"zone = %s_ZONE.\n", __FUNCTION__, (long long)count,
(long long)start_lcn,
zone == MFT_ZONE ? "MFT" : "DATA");
@ -192,15 +192,15 @@ runlist *ntfs_cluster_alloc(ntfs_volume *vol, s64 count, LCN start_lcn,
while (1) {
Dprintf("%s(): Start of outer while loop: done_zones = 0x%x, "
"search_zone = %i, pass = %i, zone_start = "
"0x%Lx, zone_end = 0x%Lx, bmp_initial_pos = "
"0x%Lx, bmp_pos = 0x%Lx, rlpos = %i, rlsize = "
"0x%llx, zone_end = 0x%llx, bmp_initial_pos = "
"0x%llx, bmp_pos = 0x%llx, rlpos = %i, rlsize = "
"%i.\n", __FUNCTION__, done_zones, search_zone,
pass, (long long)zone_start,
(long long)zone_end, (long long)bmp_initial_pos,
(long long)bmp_pos, rlpos, rlsize);
/* Loop until we run out of free clusters. */
last_read_pos = bmp_pos >> 3;
Dprintf("%s(): last_read_pos = 0x%Lx.\n", __FUNCTION__,
Dprintf("%s(): last_read_pos = 0x%llx.\n", __FUNCTION__,
(long long)last_read_pos);
br = ntfs_attr_pread(vol->lcnbmp_na, last_read_pos, 8192, buf);
if (br <= 0) {
@ -225,14 +225,14 @@ runlist *ntfs_cluster_alloc(ntfs_volume *vol, s64 count, LCN start_lcn,
bmp_pos &= ~7;
need_writeback = 0;
Dprintf("%s(): Before inner while loop: buf_size = %i, "
"lcn = 0x%Lx, bmp_pos = 0x%Lx, need_writeback "
"lcn = 0x%llx, bmp_pos = 0x%llx, need_writeback "
"= %i.\n", __FUNCTION__, buf_size,
(long long)lcn, (long long)bmp_pos,
need_writeback);
while (lcn < buf_size && lcn + bmp_pos < zone_end) {
byte = buf + (lcn >> 3);
Dprintf("%s(): In inner while loop: buf_size = %i, "
"lcn = 0x%Lx, bmp_pos = 0x%Lx, "
"lcn = 0x%llx, bmp_pos = 0x%llx, "
"need_writeback = %i, byte ofs = 0x%x, "
"*byte = 0x%x.\n", __FUNCTION__,
buf_size, (long long)lcn,
@ -267,7 +267,7 @@ runlist *ntfs_cluster_alloc(ntfs_volume *vol, s64 count, LCN start_lcn,
/* Setup first free bit return value. */
if (!rl) {
start_lcn = lcn + bmp_pos;
Dprintf("%s(): start_lcn = 0x%Lx.\n",
Dprintf("%s(): start_lcn = 0x%llx.\n",
__FUNCTION__,
(long long)start_lcn);
}
@ -290,23 +290,23 @@ runlist *ntfs_cluster_alloc(ntfs_volume *vol, s64 count, LCN start_lcn,
* Coalesce with previous run if adjacent LCNs.
* Otherwise, append a new run.
*/
Dprintf("%s(): Adding run (lcn 0x%Lx, len 0x%Lx), "
"prev_lcn = 0x%Lx, lcn = 0x%Lx, "
"bmp_pos = 0x%Lx, prev_run_len = 0x%x, "
Dprintf("%s(): Adding run (lcn 0x%llx, len 0x%llx), "
"prev_lcn = 0x%llx, lcn = 0x%llx, "
"bmp_pos = 0x%llx, prev_run_len = 0x%x, "
"rlpos = %i.\n", __FUNCTION__,
(long long)(lcn + bmp_pos), 1LL,
(long long)prev_lcn, (long long)lcn,
(long long)bmp_pos,
(long long)prev_run_len, rlpos);
if (prev_lcn == lcn + bmp_pos - prev_run_len && rlpos) {
Dprintf("%s(): Coalescing to run (lcn 0x%Lx, "
"len 0x%Lx).\n", __FUNCTION__,
Dprintf("%s(): Coalescing to run (lcn 0x%llx, "
"len 0x%llx).\n", __FUNCTION__,
(long long)rl[rlpos - 1].lcn,
(long long)
rl[rlpos - 1].length);
rl[rlpos - 1].length = ++prev_run_len;
Dprintf("%s(): Run now (lcn 0x%Lx, len 0x%Lx), "
"prev_run_len = 0x%Lx.\n",
Dprintf("%s(): Run now (lcn 0x%llx, len 0x%llx), "
"prev_run_len = 0x%llx.\n",
__FUNCTION__,
(long long)rl[rlpos - 1].lcn,
(long long)rl[rlpos - 1].length,
@ -315,7 +315,7 @@ runlist *ntfs_cluster_alloc(ntfs_volume *vol, s64 count, LCN start_lcn,
if (rlpos) {
Dprintf("%s(): Adding new run, "
"(previous run lcn "
"0x%Lx, len 0x%Lx).\n",
"0x%llx, len 0x%llx).\n",
__FUNCTION__,
(long long)
rl[rlpos - 1].lcn,
@ -343,7 +343,7 @@ runlist *ntfs_cluster_alloc(ntfs_volume *vol, s64 count, LCN start_lcn,
*/
tc = lcn + bmp_pos + 1;
Dprintf("%s(): Done. Updating current zone "
"position, tc = 0x%Lx, "
"position, tc = 0x%llx, "
"search_zone = %i.\n",
__FUNCTION__, (long long)tc,
search_zone);
@ -351,7 +351,7 @@ runlist *ntfs_cluster_alloc(ntfs_volume *vol, s64 count, LCN start_lcn,
case 1:
Dprintf("%s(): Before checks, "
"vol->mft_zone_pos = "
"0x%Lx.\n",
"0x%llx.\n",
__FUNCTION__,
(long long)
vol->mft_zone_pos);
@ -367,7 +367,7 @@ runlist *ntfs_cluster_alloc(ntfs_volume *vol, s64 count, LCN start_lcn,
vol->mft_zone_pos = tc;
Dprintf("%s(): After checks, "
"vol->mft_zone_pos = "
"0x%Lx.\n",
"0x%llx.\n",
__FUNCTION__,
(long long)
vol->mft_zone_pos);
@ -375,7 +375,7 @@ runlist *ntfs_cluster_alloc(ntfs_volume *vol, s64 count, LCN start_lcn,
case 2:
Dprintf("%s(): Before checks, "
"vol->data1_zone_pos = "
"0x%Lx.\n",
"0x%llx.\n",
__FUNCTION__,
(long long)
vol->data1_zone_pos);
@ -389,7 +389,7 @@ runlist *ntfs_cluster_alloc(ntfs_volume *vol, s64 count, LCN start_lcn,
vol->data1_zone_pos = tc;
Dprintf("%s(): After checks, "
"vol->data1_zone_pos = "
"0x%Lx.\n",
"0x%llx.\n",
__FUNCTION__,
(long long)
vol->data1_zone_pos);
@ -397,7 +397,7 @@ runlist *ntfs_cluster_alloc(ntfs_volume *vol, s64 count, LCN start_lcn,
case 4:
Dprintf("%s(): Before checks, "
"vol->data2_zone_pos = "
"0x%Lx.\n",
"0x%llx.\n",
__FUNCTION__,
(long long)
vol->data2_zone_pos);
@ -409,7 +409,7 @@ runlist *ntfs_cluster_alloc(ntfs_volume *vol, s64 count, LCN start_lcn,
vol->data2_zone_pos = tc;
Dprintf("%s(): After checks, "
"vol->data2_zone_pos = "
"0x%Lx.\n",
"0x%llx.\n",
__FUNCTION__,
(long long)
vol->data2_zone_pos);
@ -429,7 +429,7 @@ runlist *ntfs_cluster_alloc(ntfs_volume *vol, s64 count, LCN start_lcn,
}
bmp_pos += buf_size;
Dprintf("%s(): After inner while loop: buf_size = 0x%x, "
"lcn = 0x%Lx, bmp_pos = 0x%Lx, need_writeback "
"lcn = 0x%llx, bmp_pos = 0x%llx, need_writeback "
"= %i.\n", __FUNCTION__, buf_size,
(long long)lcn, (long long)bmp_pos,
need_writeback);
@ -453,7 +453,7 @@ runlist *ntfs_cluster_alloc(ntfs_volume *vol, s64 count, LCN start_lcn,
}
if (bmp_pos < zone_end) {
Dprintf("%s(): Continuing outer while loop, bmp_pos = "
"0x%Lx, zone_end = 0x%Lx.\n",
"0x%llx, zone_end = 0x%llx.\n",
__FUNCTION__, (long long)bmp_pos,
(long long)zone_end);
continue;
@ -486,8 +486,8 @@ zone_pass_done: /* Finished with the current zone pass. */
zone_end = zone_start;
bmp_pos = zone_start;
Dprintf("%s(): Continuing outer while loop, pass = 2, "
"zone_start = 0x%Lx, zone_end = 0x%Lx, "
"bmp_pos = 0x%Lx.\n", __FUNCTION__,
"zone_start = 0x%llx, zone_end = 0x%llx, "
"bmp_pos = 0x%llx.\n", __FUNCTION__,
zone_start, zone_end, bmp_pos);
continue;
} /* pass == 2 */
@ -510,7 +510,7 @@ done_zones_check:
LCN tc;
Dprintf("%s(): Before checks, "
"vol->mft_zone_pos = "
"0x%Lx.\n",
"0x%llx.\n",
__FUNCTION__,
(long long)
vol->mft_zone_pos);
@ -528,7 +528,7 @@ done_zones_check:
vol->mft_zone_pos = tc;
Dprintf("%s(): After checks, "
"vol->mft_zone_pos = "
"0x%Lx.\n",
"0x%llx.\n",
__FUNCTION__,
(long long)
vol->mft_zone_pos);
@ -554,7 +554,7 @@ switch_to_data1_zone: search_zone = 2;
LCN tc;
Dprintf("%s(): Before checks, "
"vol->data1_zone_pos = "
"0x%Lx.\n",
"0x%llx.\n",
__FUNCTION__,
(long long)
vol->data1_zone_pos);
@ -570,7 +570,7 @@ switch_to_data1_zone: search_zone = 2;
vol->data1_zone_pos = tc;
Dprintf("%s(): After checks, "
"vol->data1_zone_pos = "
"0x%Lx.\n",
"0x%llx.\n",
__FUNCTION__,
(long long)
vol->data1_zone_pos);
@ -596,7 +596,7 @@ switch_to_data1_zone: search_zone = 2;
LCN tc;
Dprintf("%s(): Before checks, "
"vol->data2_zone_pos = "
"0x%Lx.\n",
"0x%llx.\n",
__FUNCTION__,
(long long)
vol->data2_zone_pos);
@ -610,7 +610,7 @@ switch_to_data1_zone: search_zone = 2;
vol->data2_zone_pos = tc;
Dprintf("%s(): After checks, "
"vol->data2_zone_pos = "
"0x%Lx.\n",
"0x%llx.\n",
__FUNCTION__,
(long long)
vol->data2_zone_pos);
@ -621,9 +621,9 @@ switch_to_data1_zone: search_zone = 2;
NTFS_BUG("switch(search_zone) 3");
}
Dprintf("%s(): After zone switch, search_zone = %i, "
"pass = %i, bmp_initial_pos = 0x%Lx, "
"zone_start = 0x%Lx, zone_end = "
"0x%Lx.\n", __FUNCTION__, search_zone,
"pass = %i, bmp_initial_pos = 0x%llx, "
"zone_start = 0x%llx, zone_end = "
"0x%llx.\n", __FUNCTION__, search_zone,
pass, (long long)bmp_initial_pos,
(long long)zone_start,
(long long)zone_end);
@ -645,8 +645,8 @@ switch_to_data1_zone: search_zone = 2;
* MFT_ZONE, we have really run out of space.
*/
mft_zone_size = vol->mft_zone_end - vol->mft_zone_start;
Dprintf("%s(): vol->mft_zone_start = 0x%Lx, vol->mft_zone_end "
"= 0x%Lx, mft_zone_size = 0x%Lx.\n",
Dprintf("%s(): vol->mft_zone_start = 0x%llx, vol->mft_zone_end "
"= 0x%llx, mft_zone_size = 0x%llx.\n",
__FUNCTION__, (long long)vol->mft_zone_start,
(long long)vol->mft_zone_end,
(long long)mft_zone_size);
@ -676,12 +676,12 @@ switch_to_data1_zone: search_zone = 2;
pass = 2;
done_zones &= ~2;
Dprintf("%s(): After shrinking mft zone, mft_zone_size = "
"0x%Lx, vol->mft_zone_start = 0x%Lx, "
"vol->mft_zone_end = 0x%Lx, vol->mft_zone_pos "
"= 0x%Lx, search_zone = 2, pass = 2, "
"dones_zones = 0x%x, zone_start = 0x%Lx, "
"zone_end = 0x%Lx, vol->data1_zone_pos = "
"0x%Lx, continuing outer while loop.\n",
"0x%llx, vol->mft_zone_start = 0x%llx, "
"vol->mft_zone_end = 0x%llx, vol->mft_zone_pos "
"= 0x%llx, search_zone = 2, pass = 2, "
"dones_zones = 0x%x, zone_start = 0x%llx, "
"zone_end = 0x%llx, vol->data1_zone_pos = "
"0x%llx, continuing outer while loop.\n",
__FUNCTION__, (long long)mft_zone_size,
(long long)vol->mft_zone_start,
(long long)vol->mft_zone_end,
@ -744,8 +744,8 @@ err_ret:
Dprintf("%s(): At err_ret.\n", __FUNCTION__);
if (rl) {
if (err == ENOSPC) {
Dprintf("%s(): err = ENOSPC, first free lcn = 0x%Lx, "
"could allocate up to = 0x%Lx "
Dprintf("%s(): err = ENOSPC, first free lcn = 0x%llx, "
"could allocate up to = 0x%llx "
"clusters.\n", __FUNCTION__,
(long long)rl[0].lcn,
(long long)count - clusters);
@ -766,7 +766,7 @@ err_ret:
} else {
if (err == ENOSPC) {
Dprintf("%s(): No space left at all, err = ENOSPC, "
"first free lcn = 0x%Lx.\n",
"first free lcn = 0x%llx.\n",
__FUNCTION__,
(long long)vol->data1_zone_pos);
}
@ -846,7 +846,7 @@ int ntfs_cluster_free(ntfs_volume *vol, ntfs_attr *na, VCN start_vcn, s64 count)
// list support! (AIA)
if (rl->lcn < 0 && rl->lcn != LCN_HOLE) {
// FIXME: Eeek! We need rollback! (AIA)
fprintf(stderr, "%s(): Eeek! invalid lcn (= %Li). "
fprintf(stderr, "%s(): Eeek! invalid lcn (= %lli). "
"Should attempt to map runlist! "
"Leaving inconsistent metadata!\n",
__FUNCTION__, (long long)rl->lcn);
@ -882,7 +882,7 @@ int ntfs_cluster_free(ntfs_volume *vol, ntfs_attr *na, VCN start_vcn, s64 count)
if (count != -1 && count != 0) {
// FIXME: Eeek! BUG()
fprintf(stderr, "%s(): Eeek! count still not zero (= %Li). "
fprintf(stderr, "%s(): Eeek! count still not zero (= %lli). "
"Leaving inconsistent metadata!\n",
__FUNCTION__, (long long)count);
errno = EIO;

4
libntfs/mft.c
View File

@ -59,7 +59,7 @@ int ntfs_mft_records_read(const ntfs_volume *vol, const MFT_REF mref,
s64 br;
VCN m;
Dprintf("%s(): Entering for inode 0x%Lx.\n", __FUNCTION__, MREF(mref));
Dprintf("%s(): Entering for inode 0x%llx.\n", __FUNCTION__, MREF(mref));
if (!vol || !vol->mft_na || !b || count < 0) {
errno = EINVAL;
return -1;
@ -111,7 +111,7 @@ int ntfs_mft_records_write(const ntfs_volume *vol, const MFT_REF mref,
void *bmirr = NULL;
int cnt = 0, res = 0;
Dprintf("%s(): Entering for inode 0x%Lx.\n", __FUNCTION__, MREF(mref));
Dprintf("%s(): Entering for inode 0x%llx.\n", __FUNCTION__, MREF(mref));
if (!vol || !vol->mft_na || !b || count < 0) {
errno = EINVAL;
return -1;

10
libntfs/runlist.c
View File

@ -628,7 +628,7 @@ runlist_element *ntfs_runlists_merge(runlist_element *drl,
int slots = 0;
if (drl[ds].vcn == marker_vcn) {
Dprintf("Old marker = %Li, replacing with "
Dprintf("Old marker = %lli, replacing with "
"LCN_ENOENT.\n",
(long long)drl[ds].lcn);
drl[ds].lcn = (LCN)LCN_ENOENT;
@ -889,8 +889,8 @@ mpa_err:
* likely, there are more extents following this one.
*/
if (deltaxcn < --max_cluster) {
Dprintf("More extents to follow; deltaxcn = 0x%Lx, "
"max_cluster = 0x%Lx\n",
Dprintf("More extents to follow; deltaxcn = 0x%llx, "
"max_cluster = 0x%llx\n",
(long long)deltaxcn,
(long long)max_cluster);
rl[rlpos].vcn = vcn;
@ -898,8 +898,8 @@ mpa_err:
rl[rlpos].lcn = (LCN)LCN_RL_NOT_MAPPED;
rlpos++;
} else if (deltaxcn > max_cluster) {
Dprintf("Corrupt attribute. deltaxcn = 0x%Lx, "
"max_cluster = 0x%Lx",
Dprintf("Corrupt attribute. deltaxcn = 0x%llx, "
"max_cluster = 0x%llx",
(long long)deltaxcn,
(long long)max_cluster);
goto mpa_err;

12
libntfs/volume.c
View File

@ -280,7 +280,7 @@ mft_has_no_attr_list:
if (highest_vcn && highest_vcn != last_vcn - 1) {
Dputs("Failed to load the complete runlist for $MFT/$DATA. "
"Bug or corrupt $MFT. Run chkdsk.");
Dprintf("highest_vcn = 0x%Lx, last_vcn - 1 = 0x%Lx\n",
Dprintf("highest_vcn = 0x%llx, last_vcn - 1 = 0x%llx\n",
(long long)highest_vcn,
(long long)last_vcn - 1);
goto io_error_exit;
@ -485,7 +485,7 @@ ntfs_volume *ntfs_volume_startup(struct ntfs_device *dev, unsigned long rwflag)
/* Setup the mft zone. */
vol->mft_zone_start = vol->mft_zone_pos = vol->mft_lcn;
Dprintf("mft_zone_pos = 0x%Lx\n", (long long)vol->mft_zone_pos);
Dprintf("mft_zone_pos = 0x%llx\n", (long long)vol->mft_zone_pos);
/*
* Calculate the mft_lcn for an unmodified NTFS volume (see mkntfs
@ -502,7 +502,7 @@ ntfs_volume *ntfs_volume_startup(struct ntfs_device *dev, unsigned long rwflag)
vol->cluster_size;
if (vol->mft_zone_start <= mft_lcn)
vol->mft_zone_start = 0;
Dprintf("mft_zone_start = 0x%Lx\n", (long long)vol->mft_zone_start);
Dprintf("mft_zone_start = 0x%llx\n", (long long)vol->mft_zone_start);
/*
* Need to cap the mft zone on non-standard volumes so that it does
@ -514,16 +514,16 @@ ntfs_volume *ntfs_volume_startup(struct ntfs_device *dev, unsigned long rwflag)
mft_zone_size >>= 1;
vol->mft_zone_end = vol->mft_lcn + mft_zone_size;
}
Dprintf("mft_zone_end = 0x%Lx\n", (long long)vol->mft_zone_end);
Dprintf("mft_zone_end = 0x%llx\n", (long long)vol->mft_zone_end);
/*
* Set the current position within each data zone to the start of the
* respective zone.
*/
vol->data1_zone_pos = vol->mft_zone_end;
Dprintf("data1_zone_pos = 0x%Lx\n", vol->data1_zone_pos);
Dprintf("data1_zone_pos = 0x%llx\n", vol->data1_zone_pos);
vol->data2_zone_pos = 0;
Dprintf("data2_zone_pos = 0x%Lx\n", vol->data2_zone_pos);
Dprintf("data2_zone_pos = 0x%llx\n", vol->data2_zone_pos);
/* Set the mft data allocation position to mft record 24. */
vol->mft_data_pos = 24;

221
ntfsprogs/Makefile.in
View File

@ -1,7 +1,7 @@
# Makefile.in generated by automake 1.6.3 from Makefile.am.
# Makefile.in generated by automake 1.7.6 from Makefile.am.
# @configure_input@
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
# Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
@ -13,88 +13,140 @@
# PARTICULAR PURPOSE.
@SET_MAKE@
SHELL = @SHELL@
srcdir = @srcdir@
top_srcdir = @top_srcdir@
VPATH = @srcdir@
prefix = @prefix@
exec_prefix = @exec_prefix@
bindir = @bindir@
sbindir = @sbindir@
libexecdir = @libexecdir@
datadir = @datadir@
sysconfdir = @sysconfdir@
sharedstatedir = @sharedstatedir@
localstatedir = @localstatedir@
libdir = @libdir@
infodir = @infodir@
mandir = @mandir@
includedir = @includedir@
oldincludedir = /usr/include
pkgdatadir = $(datadir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@
top_builddir = ..
ACLOCAL = @ACLOCAL@
AUTOCONF = @AUTOCONF@
AUTOMAKE = @AUTOMAKE@
AUTOHEADER = @AUTOHEADER@
am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
install_sh_DATA = $(install_sh) -c -m 644
install_sh_PROGRAM = $(install_sh) -c
install_sh_SCRIPT = $(install_sh) -c
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_HEADER = $(INSTALL_DATA)
transform = @program_transform_name@
transform = $(program_transform_name)
NORMAL_INSTALL = :
PRE_INSTALL = :
POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
host_alias = @host_alias@
host_triplet = @host@
EXEEXT = @EXEEXT@
OBJEXT = @OBJEXT@
PATH_SEPARATOR = @PATH_SEPARATOR@
ACLOCAL = @ACLOCAL@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
AS = @AS@
AR = @AR@
AUTOCONF = @AUTOCONF@
AUTODIRS = @AUTODIRS@
AUTOHEADER = @AUTOHEADER@
AUTOMAKE = @AUTOMAKE@
AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CXX = @CXX@
CXXCPP = @CXXCPP@
CXXDEPMODE = @CXXDEPMODE@
CXXFLAGS = @CXXFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
DLLTOOL = @DLLTOOL@
ECHO = @ECHO@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
EGREP = @EGREP@
ENABLE_GNOME_VFS_FALSE = @ENABLE_GNOME_VFS_FALSE@
ENABLE_GNOME_VFS_TRUE = @ENABLE_GNOME_VFS_TRUE@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
LDFLAGS = @LDFLAGS@
LIBNTFS_GNOMEVFS_CFLAGS = @LIBNTFS_GNOMEVFS_CFLAGS@
LIBNTFS_GNOMEVFS_LIBS = @LIBNTFS_GNOMEVFS_LIBS@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
LIBTOOL_DEPS = @LIBTOOL_DEPS@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
OBJDUMP = @OBJDUMP@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
OBJEXT = @OBJEXT@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
PACKAGE_STRING = @PACKAGE_STRING@
PACKAGE_TARNAME = @PACKAGE_TARNAME@
PACKAGE_VERSION = @PACKAGE_VERSION@
PATH_SEPARATOR = @PATH_SEPARATOR@
PKG_CONFIG = @PKG_CONFIG@
RANLIB = @RANLIB@
REALLYSTATIC_FALSE = @REALLYSTATIC_FALSE@
REALLYSTATIC_TRUE = @REALLYSTATIC_TRUE@
SET_MAKE = @SET_MAKE@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_CXX = @ac_ct_CXX@
ac_ct_F77 = @ac_ct_F77@
ac_ct_RANLIB = @ac_ct_RANLIB@
ac_ct_STRIP = @ac_ct_STRIP@
all_includes = @all_includes@
all_libraries = @all_libraries@
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
am__include = @am__include@
am__leading_dot = @am__leading_dot@
am__quote = @am__quote@
bindir = @bindir@
build = @build@
build_alias = @build_alias@
build_cpu = @build_cpu@
build_os = @build_os@
build_vendor = @build_vendor@
datadir = @datadir@
exec_prefix = @exec_prefix@
host = @host@
host_alias = @host_alias@
host_cpu = @host_cpu@
host_os = @host_os@
host_vendor = @host_vendor@
includedir = @includedir@
infodir = @infodir@
install_sh = @install_sh@
libdir = @libdir@
libexecdir = @libexecdir@
localstatedir = @localstatedir@
mandir = @mandir@
oldincludedir = @oldincludedir@
prefix = @prefix@
program_transform_name = @program_transform_name@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target = @target@
target_alias = @target_alias@
target_cpu = @target_cpu@
target_os = @target_os@
target_vendor = @target_vendor@
@REALLYSTATIC_TRUE@AM_LIBS = $(top_srcdir)/libntfs/.libs/libntfs.a
@REALLYSTATIC_FALSE@AM_LIBS = $(top_srcdir)/libntfs/libntfs.la
@REALLYSTATIC_TRUE@AM_LFLAGS = -static
@ -180,6 +232,7 @@ dumplog_SOURCES = dumplog.c
dumplog_LDADD = $(AM_LIBS)
dumplog_LDFLAGS = $(AM_LFLAGS)
subdir = ntfsprogs
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = mkntfs.8 ntfscat.8 ntfsclone.8 ntfscluster.8 \
@ -280,7 +333,6 @@ ntfswipe_OBJECTS = $(am_ntfswipe_OBJECTS)
@REALLYSTATIC_FALSE@ntfswipe_DEPENDENCIES = \
@REALLYSTATIC_FALSE@ $(top_srcdir)/libntfs/libntfs.la
DEFS = @DEFS@
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@ -358,7 +410,7 @@ install-binPROGRAMS: $(bin_PROGRAMS)
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
else :; fi; \
done
@ -387,7 +439,7 @@ install-sbinPROGRAMS: $(sbin_PROGRAMS)
; then \
f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f"; \
$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f; \
$(INSTALL_PROGRAM_ENV) $(LIBTOOL) --mode=install $(sbinPROGRAMS_INSTALL) $$p $(DESTDIR)$(sbindir)/$$f || exit 1; \
else :; fi; \
done
@ -478,23 +530,37 @@ distclean-depend:
-rm -rf ./$(DEPDIR)
.c.o:
@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
.c.obj:
@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(COMPILE) -c `cygpath -w $<`
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'; fi`
.c.lo:
@AMDEP_TRUE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
$(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
CCDEPMODE = @CCDEPMODE@
@am__fastdepCC_TRUE@ if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
@am__fastdepCC_TRUE@ -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
@am__fastdepCC_TRUE@ then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; \
@am__fastdepCC_TRUE@ else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
@am__fastdepCC_TRUE@ fi
@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
mostlyclean-libtool:
-rm -f *.lo
@ -542,6 +608,10 @@ uninstall-man8:
done; \
for i in $$list; do \
ext=`echo $$i | sed -e 's/^.*\\.//'`; \
case "$$ext" in \
8*) ;; \
*) ext='8' ;; \
esac; \
inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
inst=`echo $$inst | sed -e 's/^.*\///'`; \
inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@ -552,6 +622,9 @@ uninstall-man8:
ETAGS = etags
ETAGSFLAGS =
CTAGS = ctags
CTAGSFLAGS =
tags: TAGS
ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@ -577,20 +650,41 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
|| $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
$$tags $$unique
ctags: CTAGS
CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
$(TAGS_FILES) $(LISP)
tags=; \
here=`pwd`; \
list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
unique=`for i in $$list; do \
if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
done | \
$(AWK) ' { files[$$0] = 1; } \
END { for (i in files) print i; }'`; \
test -z "$(CTAGS_ARGS)$$tags$$unique" \
|| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
$$tags $$unique
GTAGS:
here=`$(am__cd) $(top_builddir) && pwd` \
&& cd $(top_srcdir) \
&& gtags -i $(GTAGS_ARGS) $$here
distclean-tags:
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
top_distdir = ..
distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
distdir: $(DISTFILES)
@list='$(DISTFILES)'; for file in $$list; do \
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
list='$(DISTFILES)'; for file in $$list; do \
case $$file in \
$(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
$(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
esac; \
if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@ -616,7 +710,6 @@ all-am: Makefile $(PROGRAMS) $(MANS)
installdirs:
$(mkinstalldirs) $(DESTDIR)$(bindir) $(DESTDIR)$(sbindir) $(DESTDIR)$(man8dir)
install: install-am
install-exec: install-exec-am
install-data: install-data-am
@ -679,13 +772,21 @@ mostlyclean: mostlyclean-am
mostlyclean-am: mostlyclean-compile mostlyclean-generic \
mostlyclean-libtool
pdf: pdf-am
pdf-am:
ps: ps-am
ps-am:
uninstall-am: uninstall-binPROGRAMS uninstall-info-am uninstall-man \
uninstall-sbinPROGRAMS
uninstall-man: uninstall-man8
.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
clean-generic clean-libtool clean-sbinPROGRAMS distclean \
.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
clean-generic clean-libtool clean-sbinPROGRAMS ctags distclean \
distclean-compile distclean-depend distclean-generic \
distclean-libtool distclean-tags distdir dvi dvi-am info \
info-am install install-am install-binPROGRAMS install-data \
@ -693,10 +794,10 @@ uninstall-man: uninstall-man8
install-info-am install-man install-man8 install-sbinPROGRAMS \
install-strip installcheck installcheck-am installdirs \
maintainer-clean maintainer-clean-generic mostlyclean \
mostlyclean-compile mostlyclean-generic mostlyclean-libtool \
tags uninstall uninstall-am uninstall-binPROGRAMS \
uninstall-info-am uninstall-man uninstall-man8 \
uninstall-sbinPROGRAMS
mostlyclean-compile mostlyclean-generic mostlyclean-libtool pdf \
pdf-am ps ps-am tags uninstall uninstall-am \
uninstall-binPROGRAMS uninstall-info-am uninstall-man \
uninstall-man8 uninstall-sbinPROGRAMS
# Extra targets

30
ntfsprogs/dumplog.c
View File

@ -94,7 +94,7 @@ int main(int argc, char **argv)
l = sbuf.st_size;
if (l > 0x400000LL) {
printf("Only analysing the first four megabytes of the "
"logfile (real size = 0x%Lx).\n",
"logfile (real size = 0x%llx).\n",
(unsigned long long)l);
l = 0x400000LL;
}
@ -157,12 +157,12 @@ pass_loc:
le16_to_cpu(rph->minor_ver));
printf("\n%s restart area:\n", pass == 1? "1st": "2nd");
printf("magic = RSTR\n");
printf("ChkDskLsn = 0x%Lx\n", sle64_to_cpu(rph->chkdsk_lsn));
printf("ChkDskLsn = 0x%llx\n", sle64_to_cpu(rph->chkdsk_lsn));
printf("SystemPageSize = %u\n", le32_to_cpu(rph->system_page_size));
printf("LogPageSize = %u\n", le32_to_cpu(rph->log_page_size));
printf("RestartOffset = 0x%x\n", le16_to_cpu(rph->restart_offset));
printf("\n(1st) restart record:\n");
printf("CurrentLsn = %Lx\n", sle64_to_cpu(rr->current_lsn));
printf("CurrentLsn = %llx\n", sle64_to_cpu(rr->current_lsn));
printf("LogClients = %u\n", le16_to_cpu(rr->log_clients));
printf("ClientFreeList = %i\n", sle16_to_cpu(rr->client_free_list));
printf("ClientInUseList = %i\n", sle16_to_cpu(rr->client_in_use_list));
@ -173,7 +173,7 @@ pass_loc:
le16_to_cpu(rr->restart_area_length));
printf("ClientArrayOffset = 0x%x\n",
le16_to_cpu(rr->client_array_offset));
printf("FileSize = %Lu (0x%Lx)\n", sle64_to_cpu(rr->file_size),
printf("FileSize = %llu (0x%llx)\n", sle64_to_cpu(rr->file_size),
sle64_to_cpu(rr->file_size));
printf("LastLsnDataLength = 0x%x\n",
le32_to_cpu(rr->last_lsn_data_length));
@ -182,12 +182,12 @@ pass_loc:
le16_to_cpu(rr->log_page_data_offset));
for (client = 0; client < le16_to_cpu(rr->log_clients); client++) {
printf("\nRestart client record number %i:\n", client);
printf("OldestLsn = 0x%Lx\n", sle64_to_cpu(cr->oldest_lsn));
printf("ClientRestartLsn = 0x%Lx\n",
printf("OldestLsn = 0x%llx\n", sle64_to_cpu(cr->oldest_lsn));
printf("ClientRestartLsn = 0x%llx\n",
sle64_to_cpu(cr->client_restart_lsn));
printf("PrevClient = %i\n", sle16_to_cpu(cr->prev_client));
printf("NextClient = %i\n", sle16_to_cpu(cr->next_client));
printf("SeqNumber = 0x%Lx\n", le64_to_cpu(cr->seq_number));
printf("SeqNumber = 0x%llx\n", le64_to_cpu(cr->seq_number));
printf("ClientNameLength = 0x%x\n",
le32_to_cpu(cr->client_name_length));
if (le32_to_cpu(cr->client_name_length)) {
@ -226,14 +226,14 @@ rcrd_pass_loc:
printf(":");
/* Dump log record page */
printf("\nmagic = RCRD\n");
printf("copy.last_lsn/file_offset = 0x%Lx\n",
printf("copy.last_lsn/file_offset = 0x%llx\n",
le64_to_cpu(rcrd_ph->copy.last_lsn));
printf("flags = 0x%x\n", le32_to_cpu(rcrd_ph->flags));
printf("page count = %i\n", le16_to_cpu(rcrd_ph->page_count));
printf("page position = %i\n", le16_to_cpu(rcrd_ph->page_position));
printf("header.next_record_offset = 0x%Lx\n",
printf("header.next_record_offset = 0x%llx\n",
le64_to_cpu(rcrd_ph->header.packed.next_record_offset));
printf("header.last_end_lsn = 0x%Lx\n",
printf("header.last_end_lsn = 0x%llx\n",
le64_to_cpu(rcrd_ph->header.packed.last_end_lsn));
/*
* Where does the 0x40 come from? Is it just usa_offset +
@ -243,10 +243,10 @@ rcrd_pass_loc:
client = 0;
log_record_pass:
printf("\nLog record %i:\n", client);
printf("this lsn = 0x%Lx\n", le64_to_cpu(lr->this_lsn));
printf("client previous lsn = 0x%Lx\n",
printf("this lsn = 0x%llx\n", le64_to_cpu(lr->this_lsn));
printf("client previous lsn = 0x%llx\n",
le64_to_cpu(lr->client_previous_lsn));
printf("client undo next lsn = 0x%Lx\n",
printf("client undo next lsn = 0x%llx\n",
le64_to_cpu(lr->client_undo_next_lsn));
printf("client data length = 0x%x\n",
le32_to_cpu(lr->client_data_length));
@ -283,11 +283,11 @@ log_record_pass:
printf("lcns_to_follow = 0x%x\n", le16_to_cpu(lr->lcns_to_follow));
printf("record_offset = 0x%x\n", le16_to_cpu(lr->record_offset));
printf("attribute_offset = 0x%x\n", le16_to_cpu(lr->attribute_offset));
printf("target_vcn = 0x%Lx\n", sle64_to_cpu(lr->target_vcn));
printf("target_vcn = 0x%llx\n", sle64_to_cpu(lr->target_vcn));
if (le16_to_cpu(lr->lcns_to_follow) > 0)
printf("Array of lcns:\n");
for (i = 0; i < le16_to_cpu(lr->lcns_to_follow); i++)
printf("lcn_list[%i].lcn = 0x%Lx\n", i,
printf("lcn_list[%i].lcn = 0x%llx\n", i,
sle64_to_cpu(lr->lcn_list[i].lcn));
client++;
lr = (LOG_RECORD*)((char*)lr + 0x70);

22
ntfsprogs/mkntfs.c
View File

@ -767,9 +767,9 @@ void dump_non_resident_attr(ATTR_RECORD *a)
int i;
l = sle64_to_cpu(a->lowest_vcn);
printf("Lowest VCN = %Li (0x%Lx)\n", l, l);
printf("Lowest VCN = %lli (0x%llx)\n", l, l);
l = sle64_to_cpu(a->highest_vcn);
printf("Highest VCN = %Li (0x%Lx)\n", l, l);
printf("Highest VCN = %lli (0x%llx)\n", l, l);
printf("Mapping pairs array offset = 0x%x\n",
le16_to_cpu(a->mapping_pairs_offset));
printf("Compression unit = 0x%x: %sCOMPRESSED\n", a->compression_unit,
@ -778,14 +778,14 @@ void dump_non_resident_attr(ATTR_RECORD *a)
printf("Attribute is not the first extent. The following "
"sizes are meaningless:\n");
l = sle64_to_cpu(a->allocated_size);
printf("Allocated size = %Li (0x%Lx)\n", l, l);
printf("Allocated size = %lli (0x%llx)\n", l, l);
l = sle64_to_cpu(a->data_size);
printf("Data size = %Li (0x%Lx)\n", l, l);
printf("Data size = %lli (0x%llx)\n", l, l);
l = sle64_to_cpu(a->initialized_size);
printf("Initialized size = %Li (0x%Lx)\n", l, l);
printf("Initialized size = %lli (0x%llx)\n", l, l);
if (a->flags & ATTR_COMPRESSION_MASK) {
l = sle64_to_cpu(a->compressed_size);
printf("Compressed size = %Li (0x%Lx)\n", l, l);
printf("Compressed size = %lli (0x%llx)\n", l, l);
}
i = le16_to_cpu(a->mapping_pairs_offset);
dump_mapping_pairs_array((char*)a + i, le32_to_cpu(a->length) - i);
@ -902,7 +902,7 @@ void dump_mft_record(MFT_RECORD *m)
u = le16_to_cpu(m->usa_ofs);
printf("Update sequence array offset = %u (0x%x)\n", u, u);
printf("Update sequence array size = %u\n", le16_to_cpu(m->usa_count));
printf("$LogFile sequence number (lsn) = %Lu\n", le64_to_cpu(m->lsn));
printf("$LogFile sequence number (lsn) = %llu\n", le64_to_cpu(m->lsn));
printf("Sequence number = %u\n", le16_to_cpu(m->sequence_number));
printf("Reference (hard link) count = %u\n",
le16_to_cpu(m->link_count));
@ -921,7 +921,7 @@ void dump_mft_record(MFT_RECORD *m)
u = le32_to_cpu(m->bytes_allocated);
printf("Bytes allocated = %u (0x%x)\n", u, u);
r = le64_to_cpu(m->base_mft_record);
printf("Base mft record reference:\n\tMft record number = %Lu\n\t"
printf("Base mft record reference:\n\tMft record number = %llu\n\t"
"Sequence number = %u\n", MREF(r), MSEQNO(r));
printf("Next attribute instance = %u\n",
le16_to_cpu(m->next_attr_instance));
@ -2682,7 +2682,7 @@ int main(int argc, char **argv)
"specify it manually.\n",
vol->dev->d_name);
}
Dprintf("number of sectors = %Ld (0x%Lx)\n", opts.nr_sectors,
Dprintf("number of sectors = %lld (0x%llx)\n", opts.nr_sectors,
opts.nr_sectors);
/* Reserve the last sector for the backup boot sector. */
opts.nr_sectors--;
@ -2696,7 +2696,7 @@ int main(int argc, char **argv)
if (opts.volume_size < 1 << 20 /* 1MiB */)
err_exit("Error: device is too small (%ikiB). Minimum NTFS "
"volume size is 1MiB.\n", opts.volume_size / 1024);
Dprintf("volume size = %LikiB\n", opts.volume_size / 1024);
Dprintf("volume size = %llikiB\n", opts.volume_size / 1024);
/* If user didn't specify the cluster size, determine it now. */
if (!vol->cluster_size) {
if (opts.volume_size <= 512LL << 20) /* <= 512MB */
@ -2754,7 +2754,7 @@ int main(int argc, char **argv)
opts.volume_size / vol->cluster_size != opts.nr_clusters)
err_exit("Illegal combination of volume/cluster/sector size "
"and/or cluster/sector number.\n");
Dprintf("number of clusters = %Lu (0x%Lx)\n", opts.nr_clusters,
Dprintf("number of clusters = %llu (0x%llx)\n", opts.nr_clusters,
opts.nr_clusters);
/* Determine lcn bitmap byte size and allocate it. */
lcn_bitmap_byte_size = (opts.nr_clusters + 7) >> 3;

18
ntfsprogs/ntfsclone.c
View File

@ -436,7 +436,7 @@ void clone_ntfs(u64 nr_clusters)
while (1) {
count = ntfs_attr_pread(vol->lcnbmp_na, pos, NTFS_BUF_SIZE, bm);
if (count == -1)
perr_exit("Couldn't read $Bitmap (pos = %Ld)\n", pos);
perr_exit("Couldn't read $Bitmap (pos = %lld)\n", pos);
if (count == 0)
return;
@ -609,7 +609,7 @@ void compare_bitmaps(struct bitmap *a)
if (count == 0) {
if (a->size != pos)
err_exit("$Bitmap file size doesn't match "
"calculated size (%Ld != %Ld)\n",
"calculated size (%lld != %lld)\n",
a->size, pos);
break;
}
@ -630,8 +630,8 @@ void compare_bitmaps(struct bitmap *a)
if (++mismatch > 10)
continue;
Printf("Cluster accounting failed at %Lu "
"(0x%Lx): %s cluster in $Bitmap\n",
Printf("Cluster accounting failed at %llu "
"(0x%llx): %s cluster in $Bitmap\n",
cl, cl, bit ? "missing" : "extra");
}
}
@ -767,7 +767,7 @@ out:
}
if (ntfs_inode_close(ni))
perr_exit("ntfs_inode_close for inode %Ld", inode);
perr_exit("ntfs_inode_close for inode %lld", inode);
}
return 0;
@ -952,13 +952,13 @@ int main(int argc, char **argv)
device_size = ntfs_device_size_get(vol->dev, 1);
if (device_size <= 0)
err_exit("Couldn't get device size (%Ld)!\n", device_size);
err_exit("Couldn't get device size (%lld)!\n", device_size);
print_volume_size("Current device size", device_size);
if (device_size < vol->nr_clusters * vol->cluster_size)
err_exit("Current NTFS volume size is bigger than the device "
"size (%Ld)!\nCorrupt partition table or incorrect "
"size (%lld)!\nCorrupt partition table or incorrect "
"device partitioning?\n", device_size);
if (opt.stdout) {
@ -995,7 +995,7 @@ int main(int argc, char **argv)
} else {
s64 dest_size = device_size_get(fd_out);
if (dest_size < device_size)
err_exit("Output device size (%Ld) is too small"
err_exit("Output device size (%lld) is too small"
" to fit an NTFS clone\n", dest_size);
}
}
@ -1032,7 +1032,7 @@ int main(int argc, char **argv)
walk_clusters(vol, &backup_clusters);
Printf("Num of MFT records = %8Ld\n", vol->nr_mft_records);
Printf("Num of MFT records = %8lld\n", vol->nr_mft_records);
Printf("Num of used MFT records = %8d\n", nr_used_mft_records);
Printf("Wiped unused MFT data = %8d\n", wiped_unused_mft_data);

28
ntfsprogs/ntfsdump_logfile.c
View File

@ -207,12 +207,12 @@ pass_loc:
le16_to_cpu(rph->minor_ver));
printf("\n%s restart area:\n", pass == 1? "1st": "2nd");
printf("magic = RSTR\n");
printf("ChkDskLsn = 0x%Lx\n", sle64_to_cpu(rph->chkdsk_lsn));
printf("ChkDskLsn = 0x%llx\n", sle64_to_cpu(rph->chkdsk_lsn));
printf("SystemPageSize = %u\n", le32_to_cpu(rph->system_page_size));
printf("LogPageSize = %u\n", le32_to_cpu(rph->log_page_size));
printf("RestartOffset = 0x%x\n", le16_to_cpu(rph->restart_offset));
printf("\n(1st) restart record:\n");
printf("CurrentLsn = %Lx\n", sle64_to_cpu(rr->current_lsn));
printf("CurrentLsn = %llx\n", sle64_to_cpu(rr->current_lsn));
printf("LogClients = %u\n", le16_to_cpu(rr->log_clients));
printf("ClientFreeList = %i\n", sle16_to_cpu(rr->client_free_list));
printf("ClientInUseList = %i\n", sle16_to_cpu(rr->client_in_use_list));
@ -223,7 +223,7 @@ pass_loc:
le16_to_cpu(rr->restart_area_length));
printf("ClientArrayOffset = 0x%x\n",
le16_to_cpu(rr->client_array_offset));
printf("FileSize = %Lu (0x%Lx)\n", sle64_to_cpu(rr->file_size),
printf("FileSize = %llu (0x%llx)\n", sle64_to_cpu(rr->file_size),
sle64_to_cpu(rr->file_size));
if (sle64_to_cpu(rr->file_size) != l)
puts("$LogFile restart area indicates a log file size"
@ -235,12 +235,12 @@ pass_loc:
le16_to_cpu(rr->log_page_data_offset));
for (client = 0; client < le16_to_cpu(rr->log_clients); client++) {
printf("\nRestart client record number %i:\n", client);
printf("OldestLsn = 0x%Lx\n", sle64_to_cpu(cr->oldest_lsn));
printf("ClientRestartLsn = 0x%Lx\n",
printf("OldestLsn = 0x%llx\n", sle64_to_cpu(cr->oldest_lsn));
printf("ClientRestartLsn = 0x%llx\n",
sle64_to_cpu(cr->client_restart_lsn));
printf("PrevClient = %i\n", sle16_to_cpu(cr->prev_client));
printf("NextClient = %i\n", sle16_to_cpu(cr->next_client));
printf("SeqNumber = 0x%Lx\n", le64_to_cpu(cr->seq_number));
printf("SeqNumber = 0x%llx\n", le64_to_cpu(cr->seq_number));
printf("ClientNameLength = 0x%x\n",
le32_to_cpu(cr->client_name_length));
if (le32_to_cpu(cr->client_name_length)) {
@ -279,14 +279,14 @@ rcrd_pass_loc:
printf(":");
/* Dump log record page */
printf("\nmagic = RCRD\n");
printf("copy.last_lsn/file_offset = 0x%Lx\n",
printf("copy.last_lsn/file_offset = 0x%llx\n",
le64_to_cpu(rcrd_ph->copy.last_lsn));
printf("flags = 0x%x\n", le32_to_cpu(rcrd_ph->flags));
printf("page count = %i\n", le16_to_cpu(rcrd_ph->page_count));
printf("page position = %i\n", le16_to_cpu(rcrd_ph->page_position));
printf("header.next_record_offset = 0x%Lx\n",
printf("header.next_record_offset = 0x%llx\n",
le64_to_cpu(rcrd_ph->header.packed.next_record_offset));
printf("header.last_end_lsn = 0x%Lx\n",
printf("header.last_end_lsn = 0x%llx\n",
le64_to_cpu(rcrd_ph->header.packed.last_end_lsn));
/*
* Where does the 0x40 come from? Is it just usa_offset +
@ -296,10 +296,10 @@ rcrd_pass_loc:
client = 0;
log_record_pass:
printf("\nLog record %i:\n", client);
printf("this lsn = 0x%Lx\n", le64_to_cpu(lr->this_lsn));
printf("client previous lsn = 0x%Lx\n",
printf("this lsn = 0x%llx\n", le64_to_cpu(lr->this_lsn));
printf("client previous lsn = 0x%llx\n",
le64_to_cpu(lr->client_previous_lsn));
printf("client undo next lsn = 0x%Lx\n",
printf("client undo next lsn = 0x%llx\n",
le64_to_cpu(lr->client_undo_next_lsn));
printf("client data length = 0x%x\n",
le32_to_cpu(lr->client_data_length));
@ -336,11 +336,11 @@ log_record_pass:
printf("lcns_to_follow = 0x%x\n", le16_to_cpu(lr->lcns_to_follow));
printf("record_offset = 0x%x\n", le16_to_cpu(lr->record_offset));
printf("attribute_offset = 0x%x\n", le16_to_cpu(lr->attribute_offset));
printf("target_vcn = 0x%Lx\n", sle64_to_cpu(lr->target_vcn));
printf("target_vcn = 0x%llx\n", sle64_to_cpu(lr->target_vcn));
if (le16_to_cpu(lr->lcns_to_follow) > 0)
printf("Array of lcns:\n");
for (i = 0; i < le16_to_cpu(lr->lcns_to_follow); i++)
printf("lcn_list[%i].lcn = 0x%Lx\n", i,
printf("lcn_list[%i].lcn = 0x%llx\n", i,
sle64_to_cpu(lr->lcn_list[i].lcn));
client++;
lr = (LOG_RECORD*)((char*)lr + 0x70);

24
ntfsprogs/ntfsresize.c
View File

@ -574,8 +574,8 @@ void collect_shrink_info(ntfs_resize_t *resize, runlist *rl)
if (opt.info && !resize->new_volume_size)
return;
printf("Relocation needed for inode %8Ld attr 0x%x LCN 0x%08Lx "
"length %6Ld\n", resize->ni->mft_no,
printf("Relocation needed for inode %8lld attr 0x%x LCN 0x%08llx "
"length %6lld\n", resize->ni->mft_no,
resize->ctx->attr->type, start, len);
}
}
@ -626,7 +626,7 @@ void build_lcn_usage_bitmap(ntfs_resize_t *resize)
if (++resize->multi_ref > 10)
continue;
printf("Cluster %Lu (0x%Lx) referenced "
printf("Cluster %llu (0x%llx) referenced "
"multiply times!\n", k, k);
}
}
@ -688,7 +688,7 @@ void compare_bitmaps(struct bitmap *a)
if (count == 0) {
if (a->size != pos)
err_exit("$Bitmap file size doesn't match "
"calculated size (%Ld != %Ld)\n",
"calculated size (%lld != %lld)\n",
a->size, pos);
break;
}
@ -718,8 +718,8 @@ void compare_bitmaps(struct bitmap *a)
if (++mismatch > 10)
continue;
printf("Cluster accounting failed at %Lu "
"(0x%Lx): %s cluster in $Bitmap\n",
printf("Cluster accounting failed at %llu "
"(0x%llx): %s cluster in $Bitmap\n",
cl, cl, bit ? "missing" : "extra");
}
}
@ -805,7 +805,7 @@ void walk_inodes(ntfs_resize_t *resize)
walk_attributes(resize);
close_inode:
if (ntfs_inode_close(ni))
perr_exit("ntfs_inode_close for inode %Ld", inode);
perr_exit("ntfs_inode_close for inode %lld", inode);
}
}
@ -818,7 +818,7 @@ void print_hint(const char *s, struct llcn_t llcn)
runs_b = llcn.lcn * vol->cluster_size;
runs_mb = rounded_up_division(runs_b, NTFS_MBYTE);
printf("%-19s: %9Ld MB %8Ld\n", s, runs_mb, llcn.inode);
printf("%-19s: %9lld MB %8lld\n", s, runs_mb, llcn.inode);
}
/**
@ -1282,7 +1282,7 @@ void print_disk_usage(ntfs_resize_t *resize)
100.0 * ((float)used / total));
if (opt.bytes)
printf("Needed relocations : %Ld (%Ld MB)\n",
printf("Needed relocations : %lld (%lld MB)\n",
resize->relocations,
rounded_up_division(relocations, NTFS_MBYTE));
}
@ -1397,19 +1397,19 @@ int main(int argc, char **argv)
device_size = ntfs_device_size_get(vol->dev, vol->sector_size);
device_size *= vol->sector_size;
if (device_size <= 0)
err_exit("Couldn't get device size (%Ld)!\n", device_size);
err_exit("Couldn't get device size (%lld)!\n", device_size);
print_volume_size("Current device size", device_size);
if (device_size < vol->nr_clusters * vol->cluster_size)
err_exit("Current NTFS volume size is bigger than the device "
"size (%Ld)!\nCorrupt partition table or incorrect "
"size (%lld)!\nCorrupt partition table or incorrect "
"device partitioning?\n", device_size);
if (opt.bytes) {
if (device_size < opt.bytes)
err_exit("New size can't be bigger than the "
"device size (%Ld bytes).\nIf you want to "
"device size (%lld bytes).\nIf you want to "
"enlarge NTFS then first enlarge the device "
"size by e.g. fdisk.\n", device_size);
} else if (!opt.info)

26
ntfsprogs/ntfstruncate.c
View File

@ -238,7 +238,7 @@ void parse_options(int argc, char *argv[])
if (*s || !ll || (ll >= LLONG_MAX && errno == ERANGE))
err_exit("Invalid inode number: %s\n", argv[optind - 1]);
inode = ll;
Dprintf("inode = %Li\n", (long long)inode);
Dprintf("inode = %lli\n", (long long)inode);
if (optind == argc)
usage();
@ -290,7 +290,7 @@ void parse_options(int argc, char *argv[])
if (*s2 || ll < 0 || (ll >= LLONG_MAX && errno == ERANGE))
err_exit("Invalid new length: %s\n", s);
new_len = ll;
Dprintf("new length = %Li\n", new_len);
Dprintf("new length = %lli\n", new_len);
}
/**
@ -511,9 +511,9 @@ void dump_non_resident_attr(ATTR_RECORD *a)
int i;
l = sle64_to_cpu(a->lowest_vcn);
printf("Lowest VCN = %Li (0x%Lx)\n", l, l);
printf("Lowest VCN = %lli (0x%llx)\n", l, l);
l = sle64_to_cpu(a->highest_vcn);
printf("Highest VCN = %Li (0x%Lx)\n", l, l);
printf("Highest VCN = %lli (0x%llx)\n", l, l);
printf("Mapping pairs array offset = 0x%x\n",
le16_to_cpu(a->mapping_pairs_offset));
printf("Compression unit = 0x%x: %sCOMPRESSED\n", a->compression_unit,
@ -522,14 +522,14 @@ void dump_non_resident_attr(ATTR_RECORD *a)
printf("Attribute is not the first extent. The following "
"sizes are meaningless:\n");
l = sle64_to_cpu(a->allocated_size);
printf("Allocated size = %Li (0x%Lx)\n", l, l);
printf("Allocated size = %lli (0x%llx)\n", l, l);
l = sle64_to_cpu(a->data_size);
printf("Data size = %Li (0x%Lx)\n", l, l);
printf("Data size = %lli (0x%llx)\n", l, l);
l = sle64_to_cpu(a->initialized_size);
printf("Initialized size = %Li (0x%Lx)\n", l, l);
printf("Initialized size = %lli (0x%llx)\n", l, l);
if (a->flags & ATTR_COMPRESSION_MASK) {
l = sle64_to_cpu(a->compressed_size);
printf("Compressed size = %Li (0x%Lx)\n", l, l);
printf("Compressed size = %lli (0x%llx)\n", l, l);
}
i = le16_to_cpu(a->mapping_pairs_offset);
dump_mapping_pairs_array((char*)a + i, le32_to_cpu(a->length) - i);
@ -648,7 +648,7 @@ void dump_mft_record(MFT_RECORD *m)
u = le16_to_cpu(m->usa_ofs);
printf("Update sequence array offset = %u (0x%x)\n", u, u);
printf("Update sequence array size = %u\n", le16_to_cpu(m->usa_count));
printf("$LogFile sequence number (lsn) = %Lu\n", le64_to_cpu(m->lsn));
printf("$LogFile sequence number (lsn) = %llu\n", le64_to_cpu(m->lsn));
printf("Sequence number = %u\n", le16_to_cpu(m->sequence_number));
printf("Reference (hard link) count = %u\n",
le16_to_cpu(m->link_count));
@ -667,7 +667,7 @@ void dump_mft_record(MFT_RECORD *m)
u = le32_to_cpu(m->bytes_allocated);
printf("Bytes allocated = %u (0x%x)\n", u, u);
r = le64_to_cpu(m->base_mft_record);
printf("Base mft record reference:\n\tMft record number = %Lu\n\t"
printf("Base mft record reference:\n\tMft record number = %llu\n\t"
"Sequence number = %u\n", MREF(r), MSEQNO(r));
printf("Next attribute instance = %u\n",
le16_to_cpu(m->next_attr_instance));
@ -697,7 +697,7 @@ void ntfstruncate_exit(void)
ntfs_attr_close(na);
/* Close the inode. */
if (ni && ntfs_inode_close(ni)) {
fprintf(stderr, "Warning: Failed to close inode %Li: %s\n",
fprintf(stderr, "Warning: Failed to close inode %lli: %s\n",
(long long)inode, strerror(errno));
}
/* Unmount the volume. */
@ -766,7 +766,7 @@ int main(int argc, char **argv)
/* Open the specified inode. */
ni = ntfs_inode_open(vol, inode);
if (!ni)
err_exit("Failed to open inode %Li: %s\n", (long long)inode,
err_exit("Failed to open inode %lli: %s\n", (long long)inode,
strerror(errno));
/* Open the specified attribute. */
@ -800,7 +800,7 @@ int main(int argc, char **argv)
/* Close the inode. */
err = ntfs_inode_close(ni);
if (err)
err_exit("Failed to close inode %Li: %s\n", (long long)inode,
err_exit("Failed to close inode %lli: %s\n", (long long)inode,
strerror(errno));
/* Unmount the volume. */