No OneTemporary
Actions

Size

1 MB

Referenced Files

None

Subscribers

None

View Options

This file is larger than 256 KB, so syntax highlighting was skipped.

	diff --git a/tags/xmount-0.7.0/AUTHORS b/tags/xmount-0.7.0/AUTHORS
	new file mode 100644
	index 0000000..956a44d
	--- /dev/null
	+++ b/tags/xmount-0.7.0/AUTHORS
	@@ -0,0 +1 @@
	+Gillen Daniel <gillen.dan@pinguin.lu>
	diff --git a/tags/xmount-0.7.0/BuildLibs.sh b/tags/xmount-0.7.0/BuildLibs.sh
	new file mode 100755
	index 0000000..48d6fee
	--- /dev/null
	+++ b/tags/xmount-0.7.0/BuildLibs.sh
	@@ -0,0 +1,47 @@
	+#!/bin/bash
	+
	+control_c() {
	+ echo
	+ echo Exiting
	+ exit 0
	+}
	+
	+trap control_c SIGINT
	+
	+if [ -z "$1" ]; then
	+ echo "Usage: $0 <jobs>"
	+ exit 1
	+fi
	+
	+JOBS=$1
	+
	+(
	+ cd libxmount_input/libxmount_input_aff/
	+ echo
	+ echo "Extracting libaff"
	+ rm -rf libaff &>/dev/null
	+ tar xfz libaff-*.tar.gz
	+ echo
	+ read -p "Ready to configure LIBAFF?"
	+ cd libaff
	+ ./bootstrap.sh
	+ CFLAGS="-fPIC" CXXFLAGS="-fPIC" ./configure --disable-qemu --disable-libewf --disable-fuse --disable-s3 --disable-shared --enable-static --enable-threading
	+ echo
	+ read -p "Ready to compile LIBAFF?"
	+ make -j$JOBS
	+)
	+(
	+ cd libxmount_input/libxmount_input_ewf
	+ echo
	+ echo "Extracting libewf"
	+ rm -rf libewf &>/dev/null
	+ tar xfz libewf-*.tar.gz
	+ echo
	+ read -p "Ready to configure LIBEWF?"
	+ cd libewf
	+ CFLAGS="-fPIC" ./configure --disable-v1-api --disable-shared --enable-static --without-libbfio --without-libfuse --without-openssl
	+ echo
	+ read -p "Ready to compile LIBEWF?"
	+ make -j$JOBS
	+)
	+
	diff --git a/tags/xmount-0.7.0/BuildOsxPkg.sh b/tags/xmount-0.7.0/BuildOsxPkg.sh
	new file mode 100755
	index 0000000..2660b63
	--- /dev/null
	+++ b/tags/xmount-0.7.0/BuildOsxPkg.sh
	@@ -0,0 +1,24 @@
	+#!/bin/bash
	+
	+CWD=`pwd`
	+sudo tar xfvz osxdstroot.tar.gz
	+sudo mv osxdstroot dstroot
	+sudo cp xmount dstroot/usr/local/bin/
	+sudo cp xmount.1 dstroot/usr/local/share/man/man1/
	+DSTROOT="$CWD/dstroot"
	+
	+FULL_PKG_NAME=`basename "$CWD"`
	+PKG_VERSION_LONG=`echo "$FULL_PKG_NAME" \| cut -d"-" -f2`
	+PKG_VERSION_SHORT=`echo "$PKG_VERSION_LONG" \| tr -d "."`
	+
	+sed -i -e "s#OSXDSTROOT#$DSTROOT#g" xmount.pmdoc/01dstroot-contents.xml
	+sed -i -e "s#OSXDSTROOT#$DSTROOT#g" xmount.pmdoc/01dstroot.xml
	+sed -i -e "s/VERSION_LONG/$PKG_VERSION_LONG/g" xmount.pmdoc/01dstroot.xml
	+sed -i -e "s/VERSION/$PKG_VERSION_SHORT/g" xmount.pmdoc/01dstroot.xml
	+sed -i -e "s#OSXDSTROOT#$DSTROOT#g" xmount.pmdoc/index.xml
	+sed -i -e "s#CURRENT_PATH#$CWD#g" xmount.pmdoc/index.xml
	+sed -i -e "s/VERSION_LONG/$PKG_VERSION_LONG/g" xmount.pmdoc/index.xml
	+sed -i -e "s/VERSION/$PKG_VERSION_SHORT/g" xmount.pmdoc/index.xml
	+
	+open xmount.pmdoc
	+
	diff --git a/trunk/CMakeLists.txt b/tags/xmount-0.7.0/CMakeLists.txt
	similarity index 97%
	copy from trunk/CMakeLists.txt
	copy to tags/xmount-0.7.0/CMakeLists.txt
	index 3f417cc..b1529d7 100644
	--- a/trunk/CMakeLists.txt
	+++ b/tags/xmount-0.7.0/CMakeLists.txt
	@@ -1,96 +1,99 @@
	cmake_minimum_required(VERSION 2.8)
	project(xmount C)

	include(CheckIncludeFiles)
	#include(CheckCSourceCompiles)

	# Only for internal packaging
	-#set(STATIC_EWF 1)
	-#set(STATIC_AFF 1)
	+#set(STATIC 1)
	+if(STATIC)
	+ set(STATIC_EWF 1)
	+ set(STATIC_AFF 1)
	+endif(STATIC)

	add_definitions(-DXMOUNT_VERSION="0.7.0")

	if(APPLE)
	# On OSx, do not try to find frameworks but only std headers / libraries
	set(CMAKE_FIND_FRAMEWORK "NEVER")
	endif(APPLE)

	# Make sure CMAKE_BUILD_TYPE is set
	if(NOT CMAKE_BUILD_TYPE)
	set(CMAKE_BUILD_TYPE "Release")
	else(NOT CMAKE_BUILD_TYPE)
	if(NOT (CMAKE_BUILD_TYPE STREQUAL "Release" OR
	CMAKE_BUILD_TYPE STREQUAL "Debug"))
	message(FATAL_ERROR "Only build types 'Release' and 'Debug' are supported!")
	endif(NOT (CMAKE_BUILD_TYPE STREQUAL "Release" OR
	CMAKE_BUILD_TYPE STREQUAL "Debug"))
	endif(NOT CMAKE_BUILD_TYPE)

	# Add cmake_modules dir to CMAKE_MODULE_PATH
	set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake_modules/")

	# Check required headers
	check_include_files(stdlib.h HAVE_STDLIB_H)
	check_include_files(stdio.h HAVE_STDIO_H)
	check_include_files(stdint.h HAVE_STDINT_H)
	check_include_files(stdarg.h HAVE_STDARG_H)
	check_include_files(string.h HAVE_STRING_H)
	check_include_files(errno.h HAVE_ERRNO_H)
	check_include_files(fcntl.h HAVE_FCNTL_H)
	check_include_files(dlfcn.h HAVE_DLFCN_H)
	check_include_files(dirent.h HAVE_DIRENT_H)
	check_include_files(unistd.h HAVE_UNISTD_H)
	check_include_files(sys/ioctl.h HAVE_SYS_IOCTL_H)
	check_include_files(sys/stat.h HAVE_SYS_STAT_H)
	check_include_files(sys/types.h HAVE_SYS_TYPES_H)
	check_include_files(linux/fs.h HAVE_LINUX_FS_H)
	check_include_files(grp.h HAVE_GRP_H)
	check_include_files(pwd.h HAVE_PWD_H)
	check_include_files(pthread.h HAVE_PTHREAD_H)
	check_include_files(time.h HAVE_TIME_H)
	check_include_files(inttypes.h HAVE_INTTYPES_H)
	check_include_files(byteswap.h HAVE_BYTESWAP_H)
	check_include_files(endian.h HAVE_ENDIAN_H)
	check_include_files(libkern/OSByteOrder.h HAVE_LIBKERN_OSBYTEORDER_H)

	# Check for required libs
	if(NOT APPLE)
	find_package(LibFUSE REQUIRED)
	else(NOT APPLE)
	# On OSx, search for osxfuse
	find_package(LibOSXFUSE REQUIRED)
	endif(NOT APPLE)

	# Generate config.h and add it's path to the include dirs
	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
	${CMAKE_CURRENT_BINARY_DIR}/config.h)
	include_directories(${CMAKE_CURRENT_BINARY_DIR})

	# Add preprocessor definitions
	add_definitions(-D_LARGEFILE64_SOURCE)
	add_definitions(-D_FILE_OFFSET_BITS=64)
	add_definitions(-D_GNU_SOURCE)
	set(CMAKE_C_FLAGS "-fno-strict-aliasing -std=c99 -Wall")
	set(CMAKE_C_FLAGS_RELEASE "-O2 ${CMAKE_C_FLAGS}")
	set(CMAKE_C_FLAGS_DEBUG "-ggdb -O0 ${CMAKE_C_FLAGS}")

	# Check that off_t can represent 2**63 - 1 correctly.
	# If it can't, we need to set _FILE_OFFSET_BITS=64
	#check_c_source_compiles("
	# #include <sys/types.h>
	# #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
	# int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1];
	# int main() { return 0; }
	#" _OFFT_IS_64BIT)
	#if(NOT ${_OFFT_IS_64BIT})
	# set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} "-D_FILE_OFFSET_BITS=64")
	#endif(NOT ${_OFFT_IS_64BIT})

	# Compile stuff in sub dirs
	add_subdirectory(libxmount_input)
	add_subdirectory(libxmount_morphing)
	add_subdirectory(src)

	# Install man page
	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/xmount.1 DESTINATION share/man/man1)

	diff --git a/tags/xmount-0.7.0/COPYING b/tags/xmount-0.7.0/COPYING
	new file mode 100644
	index 0000000..94a9ed0
	--- /dev/null
	+++ b/tags/xmount-0.7.0/COPYING
	@@ -0,0 +1,674 @@
	+ GNU GENERAL PUBLIC LICENSE
	+ Version 3, 29 June 2007
	+
	+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
	+ Everyone is permitted to copy and distribute verbatim copies
	+ of this license document, but changing it is not allowed.
	+
	+ Preamble
	+
	+ The GNU General Public License is a free, copyleft license for
	+software and other kinds of works.
	+
	+ The licenses for most software and other practical works are designed
	+to take away your freedom to share and change the works. By contrast,
	+the GNU General Public License is intended to guarantee your freedom to
	+share and change all versions of a program--to make sure it remains free
	+software for all its users. We, the Free Software Foundation, use the
	+GNU General Public License for most of our software; it applies also to
	+any other work released this way by its authors. You can apply it to
	+your programs, too.
	+
	+ When we speak of free software, we are referring to freedom, not
	+price. Our General Public Licenses are designed to make sure that you
	+have the freedom to distribute copies of free software (and charge for
	+them if you wish), that you receive source code or can get it if you
	+want it, that you can change the software or use pieces of it in new
	+free programs, and that you know you can do these things.
	+
	+ To protect your rights, we need to prevent others from denying you
	+these rights or asking you to surrender the rights. Therefore, you have
	+certain responsibilities if you distribute copies of the software, or if
	+you modify it: responsibilities to respect the freedom of others.
	+
	+ For example, if you distribute copies of such a program, whether
	+gratis or for a fee, you must pass on to the recipients the same
	+freedoms that you received. You must make sure that they, too, receive
	+or can get the source code. And you must show them these terms so they
	+know their rights.
	+
	+ Developers that use the GNU GPL protect your rights with two steps:
	+(1) assert copyright on the software, and (2) offer you this License
	+giving you legal permission to copy, distribute and/or modify it.
	+
	+ For the developers' and authors' protection, the GPL clearly explains
	+that there is no warranty for this free software. For both users' and
	+authors' sake, the GPL requires that modified versions be marked as
	+changed, so that their problems will not be attributed erroneously to
	+authors of previous versions.
	+
	+ Some devices are designed to deny users access to install or run
	+modified versions of the software inside them, although the manufacturer
	+can do so. This is fundamentally incompatible with the aim of
	+protecting users' freedom to change the software. The systematic
	+pattern of such abuse occurs in the area of products for individuals to
	+use, which is precisely where it is most unacceptable. Therefore, we
	+have designed this version of the GPL to prohibit the practice for those
	+products. If such problems arise substantially in other domains, we
	+stand ready to extend this provision to those domains in future versions
	+of the GPL, as needed to protect the freedom of users.
	+
	+ Finally, every program is threatened constantly by software patents.
	+States should not allow patents to restrict development and use of
	+software on general-purpose computers, but in those that do, we wish to
	+avoid the special danger that patents applied to a free program could
	+make it effectively proprietary. To prevent this, the GPL assures that
	+patents cannot be used to render the program non-free.
	+
	+ The precise terms and conditions for copying, distribution and
	+modification follow.
	+
	+ TERMS AND CONDITIONS
	+
	+ 0. Definitions.
	+
	+ "This License" refers to version 3 of the GNU General Public License.
	+
	+ "Copyright" also means copyright-like laws that apply to other kinds of
	+works, such as semiconductor masks.
	+
	+ "The Program" refers to any copyrightable work licensed under this
	+License. Each licensee is addressed as "you". "Licensees" and
	+"recipients" may be individuals or organizations.
	+
	+ To "modify" a work means to copy from or adapt all or part of the work
	+in a fashion requiring copyright permission, other than the making of an
	+exact copy. The resulting work is called a "modified version" of the
	+earlier work or a work "based on" the earlier work.
	+
	+ A "covered work" means either the unmodified Program or a work based
	+on the Program.
	+
	+ To "propagate" a work means to do anything with it that, without
	+permission, would make you directly or secondarily liable for
	+infringement under applicable copyright law, except executing it on a
	+computer or modifying a private copy. Propagation includes copying,
	+distribution (with or without modification), making available to the
	+public, and in some countries other activities as well.
	+
	+ To "convey" a work means any kind of propagation that enables other
	+parties to make or receive copies. Mere interaction with a user through
	+a computer network, with no transfer of a copy, is not conveying.
	+
	+ An interactive user interface displays "Appropriate Legal Notices"
	+to the extent that it includes a convenient and prominently visible
	+feature that (1) displays an appropriate copyright notice, and (2)
	+tells the user that there is no warranty for the work (except to the
	+extent that warranties are provided), that licensees may convey the
	+work under this License, and how to view a copy of this License. If
	+the interface presents a list of user commands or options, such as a
	+menu, a prominent item in the list meets this criterion.
	+
	+ 1. Source Code.
	+
	+ The "source code" for a work means the preferred form of the work
	+for making modifications to it. "Object code" means any non-source
	+form of a work.
	+
	+ A "Standard Interface" means an interface that either is an official
	+standard defined by a recognized standards body, or, in the case of
	+interfaces specified for a particular programming language, one that
	+is widely used among developers working in that language.
	+
	+ The "System Libraries" of an executable work include anything, other
	+than the work as a whole, that (a) is included in the normal form of
	+packaging a Major Component, but which is not part of that Major
	+Component, and (b) serves only to enable use of the work with that
	+Major Component, or to implement a Standard Interface for which an
	+implementation is available to the public in source code form. A
	+"Major Component", in this context, means a major essential component
	+(kernel, window system, and so on) of the specific operating system
	+(if any) on which the executable work runs, or a compiler used to
	+produce the work, or an object code interpreter used to run it.
	+
	+ The "Corresponding Source" for a work in object code form means all
	+the source code needed to generate, install, and (for an executable
	+work) run the object code and to modify the work, including scripts to
	+control those activities. However, it does not include the work's
	+System Libraries, or general-purpose tools or generally available free
	+programs which are used unmodified in performing those activities but
	+which are not part of the work. For example, Corresponding Source
	+includes interface definition files associated with source files for
	+the work, and the source code for shared libraries and dynamically
	+linked subprograms that the work is specifically designed to require,
	+such as by intimate data communication or control flow between those
	+subprograms and other parts of the work.
	+
	+ The Corresponding Source need not include anything that users
	+can regenerate automatically from other parts of the Corresponding
	+Source.
	+
	+ The Corresponding Source for a work in source code form is that
	+same work.
	+
	+ 2. Basic Permissions.
	+
	+ All rights granted under this License are granted for the term of
	+copyright on the Program, and are irrevocable provided the stated
	+conditions are met. This License explicitly affirms your unlimited
	+permission to run the unmodified Program. The output from running a
	+covered work is covered by this License only if the output, given its
	+content, constitutes a covered work. This License acknowledges your
	+rights of fair use or other equivalent, as provided by copyright law.
	+
	+ You may make, run and propagate covered works that you do not
	+convey, without conditions so long as your license otherwise remains
	+in force. You may convey covered works to others for the sole purpose
	+of having them make modifications exclusively for you, or provide you
	+with facilities for running those works, provided that you comply with
	+the terms of this License in conveying all material for which you do
	+not control copyright. Those thus making or running the covered works
	+for you must do so exclusively on your behalf, under your direction
	+and control, on terms that prohibit them from making any copies of
	+your copyrighted material outside their relationship with you.
	+
	+ Conveying under any other circumstances is permitted solely under
	+the conditions stated below. Sublicensing is not allowed; section 10
	+makes it unnecessary.
	+
	+ 3. Protecting Users' Legal Rights From Anti-Circumvention Law.
	+
	+ No covered work shall be deemed part of an effective technological
	+measure under any applicable law fulfilling obligations under article
	+11 of the WIPO copyright treaty adopted on 20 December 1996, or
	+similar laws prohibiting or restricting circumvention of such
	+measures.
	+
	+ When you convey a covered work, you waive any legal power to forbid
	+circumvention of technological measures to the extent such circumvention
	+is effected by exercising rights under this License with respect to
	+the covered work, and you disclaim any intention to limit operation or
	+modification of the work as a means of enforcing, against the work's
	+users, your or third parties' legal rights to forbid circumvention of
	+technological measures.
	+
	+ 4. Conveying Verbatim Copies.
	+
	+ You may convey verbatim copies of the Program's source code as you
	+receive it, in any medium, provided that you conspicuously and
	+appropriately publish on each copy an appropriate copyright notice;
	+keep intact all notices stating that this License and any
	+non-permissive terms added in accord with section 7 apply to the code;
	+keep intact all notices of the absence of any warranty; and give all
	+recipients a copy of this License along with the Program.
	+
	+ You may charge any price or no price for each copy that you convey,
	+and you may offer support or warranty protection for a fee.
	+
	+ 5. Conveying Modified Source Versions.
	+
	+ You may convey a work based on the Program, or the modifications to
	+produce it from the Program, in the form of source code under the
	+terms of section 4, provided that you also meet all of these conditions:
	+
	+ a) The work must carry prominent notices stating that you modified
	+ it, and giving a relevant date.
	+
	+ b) The work must carry prominent notices stating that it is
	+ released under this License and any conditions added under section
	+ 7. This requirement modifies the requirement in section 4 to
	+ "keep intact all notices".
	+
	+ c) You must license the entire work, as a whole, under this
	+ License to anyone who comes into possession of a copy. This
	+ License will therefore apply, along with any applicable section 7
	+ additional terms, to the whole of the work, and all its parts,
	+ regardless of how they are packaged. This License gives no
	+ permission to license the work in any other way, but it does not
	+ invalidate such permission if you have separately received it.
	+
	+ d) If the work has interactive user interfaces, each must display
	+ Appropriate Legal Notices; however, if the Program has interactive
	+ interfaces that do not display Appropriate Legal Notices, your
	+ work need not make them do so.
	+
	+ A compilation of a covered work with other separate and independent
	+works, which are not by their nature extensions of the covered work,
	+and which are not combined with it such as to form a larger program,
	+in or on a volume of a storage or distribution medium, is called an
	+"aggregate" if the compilation and its resulting copyright are not
	+used to limit the access or legal rights of the compilation's users
	+beyond what the individual works permit. Inclusion of a covered work
	+in an aggregate does not cause this License to apply to the other
	+parts of the aggregate.
	+
	+ 6. Conveying Non-Source Forms.
	+
	+ You may convey a covered work in object code form under the terms
	+of sections 4 and 5, provided that you also convey the
	+machine-readable Corresponding Source under the terms of this License,
	+in one of these ways:
	+
	+ a) Convey the object code in, or embodied in, a physical product
	+ (including a physical distribution medium), accompanied by the
	+ Corresponding Source fixed on a durable physical medium
	+ customarily used for software interchange.
	+
	+ b) Convey the object code in, or embodied in, a physical product
	+ (including a physical distribution medium), accompanied by a
	+ written offer, valid for at least three years and valid for as
	+ long as you offer spare parts or customer support for that product
	+ model, to give anyone who possesses the object code either (1) a
	+ copy of the Corresponding Source for all the software in the
	+ product that is covered by this License, on a durable physical
	+ medium customarily used for software interchange, for a price no
	+ more than your reasonable cost of physically performing this
	+ conveying of source, or (2) access to copy the
	+ Corresponding Source from a network server at no charge.
	+
	+ c) Convey individual copies of the object code with a copy of the
	+ written offer to provide the Corresponding Source. This
	+ alternative is allowed only occasionally and noncommercially, and
	+ only if you received the object code with such an offer, in accord
	+ with subsection 6b.
	+
	+ d) Convey the object code by offering access from a designated
	+ place (gratis or for a charge), and offer equivalent access to the
	+ Corresponding Source in the same way through the same place at no
	+ further charge. You need not require recipients to copy the
	+ Corresponding Source along with the object code. If the place to
	+ copy the object code is a network server, the Corresponding Source
	+ may be on a different server (operated by you or a third party)
	+ that supports equivalent copying facilities, provided you maintain
	+ clear directions next to the object code saying where to find the
	+ Corresponding Source. Regardless of what server hosts the
	+ Corresponding Source, you remain obligated to ensure that it is
	+ available for as long as needed to satisfy these requirements.
	+
	+ e) Convey the object code using peer-to-peer transmission, provided
	+ you inform other peers where the object code and Corresponding
	+ Source of the work are being offered to the general public at no
	+ charge under subsection 6d.
	+
	+ A separable portion of the object code, whose source code is excluded
	+from the Corresponding Source as a System Library, need not be
	+included in conveying the object code work.
	+
	+ A "User Product" is either (1) a "consumer product", which means any
	+tangible personal property which is normally used for personal, family,
	+or household purposes, or (2) anything designed or sold for incorporation
	+into a dwelling. In determining whether a product is a consumer product,
	+doubtful cases shall be resolved in favor of coverage. For a particular
	+product received by a particular user, "normally used" refers to a
	+typical or common use of that class of product, regardless of the status
	+of the particular user or of the way in which the particular user
	+actually uses, or expects or is expected to use, the product. A product
	+is a consumer product regardless of whether the product has substantial
	+commercial, industrial or non-consumer uses, unless such uses represent
	+the only significant mode of use of the product.
	+
	+ "Installation Information" for a User Product means any methods,
	+procedures, authorization keys, or other information required to install
	+and execute modified versions of a covered work in that User Product from
	+a modified version of its Corresponding Source. The information must
	+suffice to ensure that the continued functioning of the modified object
	+code is in no case prevented or interfered with solely because
	+modification has been made.
	+
	+ If you convey an object code work under this section in, or with, or
	+specifically for use in, a User Product, and the conveying occurs as
	+part of a transaction in which the right of possession and use of the
	+User Product is transferred to the recipient in perpetuity or for a
	+fixed term (regardless of how the transaction is characterized), the
	+Corresponding Source conveyed under this section must be accompanied
	+by the Installation Information. But this requirement does not apply
	+if neither you nor any third party retains the ability to install
	+modified object code on the User Product (for example, the work has
	+been installed in ROM).
	+
	+ The requirement to provide Installation Information does not include a
	+requirement to continue to provide support service, warranty, or updates
	+for a work that has been modified or installed by the recipient, or for
	+the User Product in which it has been modified or installed. Access to a
	+network may be denied when the modification itself materially and
	+adversely affects the operation of the network or violates the rules and
	+protocols for communication across the network.
	+
	+ Corresponding Source conveyed, and Installation Information provided,
	+in accord with this section must be in a format that is publicly
	+documented (and with an implementation available to the public in
	+source code form), and must require no special password or key for
	+unpacking, reading or copying.
	+
	+ 7. Additional Terms.
	+
	+ "Additional permissions" are terms that supplement the terms of this
	+License by making exceptions from one or more of its conditions.
	+Additional permissions that are applicable to the entire Program shall
	+be treated as though they were included in this License, to the extent
	+that they are valid under applicable law. If additional permissions
	+apply only to part of the Program, that part may be used separately
	+under those permissions, but the entire Program remains governed by
	+this License without regard to the additional permissions.
	+
	+ When you convey a copy of a covered work, you may at your option
	+remove any additional permissions from that copy, or from any part of
	+it. (Additional permissions may be written to require their own
	+removal in certain cases when you modify the work.) You may place
	+additional permissions on material, added by you to a covered work,
	+for which you have or can give appropriate copyright permission.
	+
	+ Notwithstanding any other provision of this License, for material you
	+add to a covered work, you may (if authorized by the copyright holders of
	+that material) supplement the terms of this License with terms:
	+
	+ a) Disclaiming warranty or limiting liability differently from the
	+ terms of sections 15 and 16 of this License; or
	+
	+ b) Requiring preservation of specified reasonable legal notices or
	+ author attributions in that material or in the Appropriate Legal
	+ Notices displayed by works containing it; or
	+
	+ c) Prohibiting misrepresentation of the origin of that material, or
	+ requiring that modified versions of such material be marked in
	+ reasonable ways as different from the original version; or
	+
	+ d) Limiting the use for publicity purposes of names of licensors or
	+ authors of the material; or
	+
	+ e) Declining to grant rights under trademark law for use of some
	+ trade names, trademarks, or service marks; or
	+
	+ f) Requiring indemnification of licensors and authors of that
	+ material by anyone who conveys the material (or modified versions of
	+ it) with contractual assumptions of liability to the recipient, for
	+ any liability that these contractual assumptions directly impose on
	+ those licensors and authors.
	+
	+ All other non-permissive additional terms are considered "further
	+restrictions" within the meaning of section 10. If the Program as you
	+received it, or any part of it, contains a notice stating that it is
	+governed by this License along with a term that is a further
	+restriction, you may remove that term. If a license document contains
	+a further restriction but permits relicensing or conveying under this
	+License, you may add to a covered work material governed by the terms
	+of that license document, provided that the further restriction does
	+not survive such relicensing or conveying.
	+
	+ If you add terms to a covered work in accord with this section, you
	+must place, in the relevant source files, a statement of the
	+additional terms that apply to those files, or a notice indicating
	+where to find the applicable terms.
	+
	+ Additional terms, permissive or non-permissive, may be stated in the
	+form of a separately written license, or stated as exceptions;
	+the above requirements apply either way.
	+
	+ 8. Termination.
	+
	+ You may not propagate or modify a covered work except as expressly
	+provided under this License. Any attempt otherwise to propagate or
	+modify it is void, and will automatically terminate your rights under
	+this License (including any patent licenses granted under the third
	+paragraph of section 11).
	+
	+ However, if you cease all violation of this License, then your
	+license from a particular copyright holder is reinstated (a)
	+provisionally, unless and until the copyright holder explicitly and
	+finally terminates your license, and (b) permanently, if the copyright
	+holder fails to notify you of the violation by some reasonable means
	+prior to 60 days after the cessation.
	+
	+ Moreover, your license from a particular copyright holder is
	+reinstated permanently if the copyright holder notifies you of the
	+violation by some reasonable means, this is the first time you have
	+received notice of violation of this License (for any work) from that
	+copyright holder, and you cure the violation prior to 30 days after
	+your receipt of the notice.
	+
	+ Termination of your rights under this section does not terminate the
	+licenses of parties who have received copies or rights from you under
	+this License. If your rights have been terminated and not permanently
	+reinstated, you do not qualify to receive new licenses for the same
	+material under section 10.
	+
	+ 9. Acceptance Not Required for Having Copies.
	+
	+ You are not required to accept this License in order to receive or
	+run a copy of the Program. Ancillary propagation of a covered work
	+occurring solely as a consequence of using peer-to-peer transmission
	+to receive a copy likewise does not require acceptance. However,
	+nothing other than this License grants you permission to propagate or
	+modify any covered work. These actions infringe copyright if you do
	+not accept this License. Therefore, by modifying or propagating a
	+covered work, you indicate your acceptance of this License to do so.
	+
	+ 10. Automatic Licensing of Downstream Recipients.
	+
	+ Each time you convey a covered work, the recipient automatically
	+receives a license from the original licensors, to run, modify and
	+propagate that work, subject to this License. You are not responsible
	+for enforcing compliance by third parties with this License.
	+
	+ An "entity transaction" is a transaction transferring control of an
	+organization, or substantially all assets of one, or subdividing an
	+organization, or merging organizations. If propagation of a covered
	+work results from an entity transaction, each party to that
	+transaction who receives a copy of the work also receives whatever
	+licenses to the work the party's predecessor in interest had or could
	+give under the previous paragraph, plus a right to possession of the
	+Corresponding Source of the work from the predecessor in interest, if
	+the predecessor has it or can get it with reasonable efforts.
	+
	+ You may not impose any further restrictions on the exercise of the
	+rights granted or affirmed under this License. For example, you may
	+not impose a license fee, royalty, or other charge for exercise of
	+rights granted under this License, and you may not initiate litigation
	+(including a cross-claim or counterclaim in a lawsuit) alleging that
	+any patent claim is infringed by making, using, selling, offering for
	+sale, or importing the Program or any portion of it.
	+
	+ 11. Patents.
	+
	+ A "contributor" is a copyright holder who authorizes use under this
	+License of the Program or a work on which the Program is based. The
	+work thus licensed is called the contributor's "contributor version".
	+
	+ A contributor's "essential patent claims" are all patent claims
	+owned or controlled by the contributor, whether already acquired or
	+hereafter acquired, that would be infringed by some manner, permitted
	+by this License, of making, using, or selling its contributor version,
	+but do not include claims that would be infringed only as a
	+consequence of further modification of the contributor version. For
	+purposes of this definition, "control" includes the right to grant
	+patent sublicenses in a manner consistent with the requirements of
	+this License.
	+
	+ Each contributor grants you a non-exclusive, worldwide, royalty-free
	+patent license under the contributor's essential patent claims, to
	+make, use, sell, offer for sale, import and otherwise run, modify and
	+propagate the contents of its contributor version.
	+
	+ In the following three paragraphs, a "patent license" is any express
	+agreement or commitment, however denominated, not to enforce a patent
	+(such as an express permission to practice a patent or covenant not to
	+sue for patent infringement). To "grant" such a patent license to a
	+party means to make such an agreement or commitment not to enforce a
	+patent against the party.
	+
	+ If you convey a covered work, knowingly relying on a patent license,
	+and the Corresponding Source of the work is not available for anyone
	+to copy, free of charge and under the terms of this License, through a
	+publicly available network server or other readily accessible means,
	+then you must either (1) cause the Corresponding Source to be so
	+available, or (2) arrange to deprive yourself of the benefit of the
	+patent license for this particular work, or (3) arrange, in a manner
	+consistent with the requirements of this License, to extend the patent
	+license to downstream recipients. "Knowingly relying" means you have
	+actual knowledge that, but for the patent license, your conveying the
	+covered work in a country, or your recipient's use of the covered work
	+in a country, would infringe one or more identifiable patents in that
	+country that you have reason to believe are valid.
	+
	+ If, pursuant to or in connection with a single transaction or
	+arrangement, you convey, or propagate by procuring conveyance of, a
	+covered work, and grant a patent license to some of the parties
	+receiving the covered work authorizing them to use, propagate, modify
	+or convey a specific copy of the covered work, then the patent license
	+you grant is automatically extended to all recipients of the covered
	+work and works based on it.
	+
	+ A patent license is "discriminatory" if it does not include within
	+the scope of its coverage, prohibits the exercise of, or is
	+conditioned on the non-exercise of one or more of the rights that are
	+specifically granted under this License. You may not convey a covered
	+work if you are a party to an arrangement with a third party that is
	+in the business of distributing software, under which you make payment
	+to the third party based on the extent of your activity of conveying
	+the work, and under which the third party grants, to any of the
	+parties who would receive the covered work from you, a discriminatory
	+patent license (a) in connection with copies of the covered work
	+conveyed by you (or copies made from those copies), or (b) primarily
	+for and in connection with specific products or compilations that
	+contain the covered work, unless you entered into that arrangement,
	+or that patent license was granted, prior to 28 March 2007.
	+
	+ Nothing in this License shall be construed as excluding or limiting
	+any implied license or other defenses to infringement that may
	+otherwise be available to you under applicable patent law.
	+
	+ 12. No Surrender of Others' Freedom.
	+
	+ If conditions are imposed on you (whether by court order, agreement or
	+otherwise) that contradict the conditions of this License, they do not
	+excuse you from the conditions of this License. If you cannot convey a
	+covered work so as to satisfy simultaneously your obligations under this
	+License and any other pertinent obligations, then as a consequence you may
	+not convey it at all. For example, if you agree to terms that obligate you
	+to collect a royalty for further conveying from those to whom you convey
	+the Program, the only way you could satisfy both those terms and this
	+License would be to refrain entirely from conveying the Program.
	+
	+ 13. Use with the GNU Affero General Public License.
	+
	+ Notwithstanding any other provision of this License, you have
	+permission to link or combine any covered work with a work licensed
	+under version 3 of the GNU Affero General Public License into a single
	+combined work, and to convey the resulting work. The terms of this
	+License will continue to apply to the part which is the covered work,
	+but the special requirements of the GNU Affero General Public License,
	+section 13, concerning interaction through a network will apply to the
	+combination as such.
	+
	+ 14. Revised Versions of this License.
	+
	+ The Free Software Foundation may publish revised and/or new versions of
	+the GNU General Public License from time to time. Such new versions will
	+be similar in spirit to the present version, but may differ in detail to
	+address new problems or concerns.
	+
	+ Each version is given a distinguishing version number. If the
	+Program specifies that a certain numbered version of the GNU General
	+Public License "or any later version" applies to it, you have the
	+option of following the terms and conditions either of that numbered
	+version or of any later version published by the Free Software
	+Foundation. If the Program does not specify a version number of the
	+GNU General Public License, you may choose any version ever published
	+by the Free Software Foundation.
	+
	+ If the Program specifies that a proxy can decide which future
	+versions of the GNU General Public License can be used, that proxy's
	+public statement of acceptance of a version permanently authorizes you
	+to choose that version for the Program.
	+
	+ Later license versions may give you additional or different
	+permissions. However, no additional obligations are imposed on any
	+author or copyright holder as a result of your choosing to follow a
	+later version.
	+
	+ 15. Disclaimer of Warranty.
	+
	+ THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
	+APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
	+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
	+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
	+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
	+PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
	+IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
	+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
	+
	+ 16. Limitation of Liability.
	+
	+ IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
	+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
	+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
	+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
	+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
	+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
	+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
	+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
	+SUCH DAMAGES.
	+
	+ 17. Interpretation of Sections 15 and 16.
	+
	+ If the disclaimer of warranty and limitation of liability provided
	+above cannot be given local legal effect according to their terms,
	+reviewing courts shall apply local law that most closely approximates
	+an absolute waiver of all civil liability in connection with the
	+Program, unless a warranty or assumption of liability accompanies a
	+copy of the Program in return for a fee.
	+
	+ END OF TERMS AND CONDITIONS
	+
	+ How to Apply These Terms to Your New Programs
	+
	+ If you develop a new program, and you want it to be of the greatest
	+possible use to the public, the best way to achieve this is to make it
	+free software which everyone can redistribute and change under these terms.
	+
	+ To do so, attach the following notices to the program. It is safest
	+to attach them to the start of each source file to most effectively
	+state the exclusion of warranty; and each file should have at least
	+the "copyright" line and a pointer to where the full notice is found.
	+
	+ <one line to give the program's name and a brief idea of what it does.>
	+ Copyright (C) <year> <name of author>
	+
	+ This program is free software: you can redistribute it and/or modify
	+ it under the terms of the GNU General Public License as published by
	+ the Free Software Foundation, either version 3 of the License, or
	+ (at your option) any later version.
	+
	+ This program is distributed in the hope that it will be useful,
	+ but WITHOUT ANY WARRANTY; without even the implied warranty of
	+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	+ GNU General Public License for more details.
	+
	+ You should have received a copy of the GNU General Public License
	+ along with this program. If not, see <http://www.gnu.org/licenses/>.
	+
	+Also add information on how to contact you by electronic and paper mail.
	+
	+ If the program does terminal interaction, make it output a short
	+notice like this when it starts in an interactive mode:
	+
	+ <program> Copyright (C) <year> <name of author>
	+ This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
	+ This is free software, and you are welcome to redistribute it
	+ under certain conditions; type `show c' for details.
	+
	+The hypothetical commands `show w' and `show c' should show the appropriate
	+parts of the General Public License. Of course, your program's commands
	+might be different; for a GUI interface, you would use an "about box".
	+
	+ You should also get your employer (if you work as a programmer) or school,
	+if any, to sign a "copyright disclaimer" for the program, if necessary.
	+For more information on this, and how to apply and follow the GNU GPL, see
	+<http://www.gnu.org/licenses/>.
	+
	+ The GNU General Public License does not permit incorporating your program
	+into proprietary programs. If your program is a subroutine library, you
	+may consider it more useful to permit linking proprietary applications with
	+the library. If this is what you want to do, use the GNU Lesser General
	+Public License instead of this License. But first, please read
	+<http://www.gnu.org/philosophy/why-not-lgpl.html>.
	diff --git a/tags/xmount-0.7.0/ChangeLog b/tags/xmount-0.7.0/ChangeLog
	new file mode 100644
	index 0000000..d25268c
	--- /dev/null
	+++ b/tags/xmount-0.7.0/ChangeLog
	@@ -0,0 +1 @@
	+For a full list of changes please refer to the source files.
	diff --git a/tags/xmount-0.7.0/INSTALL b/tags/xmount-0.7.0/INSTALL
	new file mode 100644
	index 0000000..d4193a7
	--- /dev/null
	+++ b/tags/xmount-0.7.0/INSTALL
	@@ -0,0 +1 @@
	+See README for detailed instructions
	diff --git a/tags/xmount-0.7.0/NEWS b/tags/xmount-0.7.0/NEWS
	new file mode 100644
	index 0000000..403f2aa
	--- /dev/null
	+++ b/tags/xmount-0.7.0/NEWS
	@@ -0,0 +1,68 @@
	+This file lists the most important changes to the previous released version.
	+For a full list of changes please refer to the source files.
	+
	+New for version 0.7.0:
	+ - Switched build system from autoconf / autoamke to cmake
	+ - Massiv code cleanup
	+ - Input image support is now controlled by external libxmount_input libraries
	+ - Added support for morphing all input images into a virtual output image using libxmount_morphing libraries
	+ - Added support for --offset and --sizelimit command line argument
	+
	+New for version 0.6.0:
	+ - Added support for split DD input files.
	+
	+New for version 0.5.0:
	+ - Added support for VHD emulation.
	+
	+New for version 0.4.6:
	+ - Added support for libewf v2
	+
	+New for version 0.4.5:
	+ - Show the name of the mounted file in mount output
	+
	+New for version 0.4.4:
	+ - Fixed a bug that prevents VirtualBox 3.2.8 or above from recognising the
	+ generated VDIs.
	+
	+New for version 0.4.1:
	+ - Code cleanups and some minor bugfixes
	+
	+New for version 0.4.0:
	+ - AFFLIB support for input images
	+ - AFFLIB and LIBEWF are now statically linked to xmount
	+
	+New for version 0.3.2:
	+ - Automatic addition of FUSE's "-o allow_other" option if it is supported.
	+
	+New for version 0.3.1:
	+ - Some bugfixes for VMDK emulation (Still experimental)
	+ - It is now possible to specify whether VMDK disks are attached to the IDE
	+ or SCSI bus. (Output type vmdk or vmdks)
	+
	+New for version 0.3.0:
	+ - Added experimental support for VMDK emulation
	+
	+New for version 0.2.3:
	+ - Virtual write support finally fixed
	+
	+New for version 0.2.2:
	+ - Fixed yet another bug in virtual write support
	+
	+New for version 0.2.1:
	+ - Fixed a bug in virtual write support
	+
	+New for version 0.2.0:
	+ - Name changed from mountewf to xmount
	+ - Support for multiple input image formats (DD and EWF)
	+ - Support for virtual write access
	+
	+New for version 0.1.2:
	+ - Added random generator initialisation (Makes it possible to use more than 1
	+ mounted vdi in VBox)
	+
	+New for version 0.1.1:
	+ - Fixed some severe bugs
	+
	+New for version 0.1.0:
	+ - First release
	+ - Support for emulation of dd and vdi files
	diff --git a/tags/xmount-0.7.0/README b/tags/xmount-0.7.0/README
	new file mode 100644
	index 0000000..cbd679f
	--- /dev/null
	+++ b/tags/xmount-0.7.0/README
	@@ -0,0 +1,224 @@
	+XMOUNT README FILE v0.7.0
	+
	+Table of contents
	+ 0.0 Author and license stuff
	+ 1.0 What is xmount? - A short description
	+ 2.0 Input image support
	+ 2.1 libxmount_input_raw
	+ 2.2 libxmount_input_ewf
	+ 2.3 libxmount_input_aewf
	+ 2.4 libxmount_input_aff
	+ 2.5 libxmount_input_aaff
	+ 3.0 Morphing support
	+ 3.1 libxmount_morphing_combine
	+ 3.2 libxmount_morphing_raid
	+ 3.3 libxmount_morphing_unallocated
	+ 4.0 Output image
	+ 4.1 Emulated RAW file
	+ 4.2 Emulated DMG file
	+ 4.3 Emulated VDI file
	+ 4.4 Emulated VMDK file
	+ 4.5 Emulated VHD file
	+ 5.0 Virtual write access
	+ 6.0 Installation instructions
	+ 6.1 Prerequisits
	+ 6.1 Install from a package
	+ 6.2 Install from source
	+ 7.0 xmount command line parameters
	+ 7.1 xmount usage examples
	+
	+0.0 Author and license stuff
	+ xmount Copyright (c) 2008-2014 by Gillen Daniel <gillen.dan@pinguin.lu>
	+
	+ This program is free software: you can redistribute it and/or modify it under
	+ the terms of the GNU General Public License as published by the Free Software
	+ Foundation, either version 3 of the License, or (at your option) any later
	+ version.
	+
	+ This program is distributed in the hope that it will be useful, but WITHOUT
	+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
	+ FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
	+
	+ You should have received a copy of the GNU General Public License along with
	+ this program. If not, see <http://www.gnu.org/licenses/>.
	+
	+ ---
	+
	+ Due to AFFLIB, I have to mention that:
	+
	+ This product includes software developed by Simson L. Garfinkel and Basis
	+ Technology Corp.
	+
	+1.0 What is xmount? - A short description
	+ xmount allows you to convert on-the-fly between multiple input and output
	+ harddisk image formats. xmount creates a virtual file system using FUSE
	+ (Filesystem in Userspace) that contains a virtual representation of the input
	+ image.
	+
	+ The virtual representation can be in raw DD, Apple's Disk Image format (DMG),
	+ VirtualBox's virtual disk file format (VDI), Microsoft's Virtual Hard Disk
	+ Image format (VHD) or in VmWare's VMDK file format.
	+
	+ Input images can be raw DD, EWF (Expert Witness Compression Format) or AFF
	+ (Advanced Forensic Format) files.
	+
	+ In addition, xmount also supports virtual write access to the output files
	+ that is redirected to a cache file. This makes it for example possible to boot
	+ acquired harddisk images using QEMU, KVM, VirtualBox, VmWare or alike.
	+
	+2.0 Input image support
	+ Starting with version 0.7.0, input image support has been moved into external
	+ libraries. The following chapters list the officially supported ones. They
	+ might not all be available on your system though.
	+
	+ 2.1 libxmount_input_raw
	+ Supports raw DD images ("--in raw" or "--in dd").
	+
	+ 2.2 libxmount_input_ewf
	+ Supports EWF (Expert Witness Compression Format) images ("--in ewf") using
	+ Joachim Metz's libewf (https://code.google.com/p/libewf/).
	+
	+ 2.3 libxmount_input_aewf
	+ Supports EWF (Expert Witness Compression Format) images ("--in aewf")
	+ generated with Guymager (http://guymager.sourceforge.net/). This library
	+ uses an EWF implementation written by Guy Voncken. It consumes much less
	+ memory than libewf when mounting big (>1TB) images.
	+
	+ 2.4 libxmount_input_aff
	+ Supports AFF (Advanced Forensic Format) images ("--in aff") using Simson
	+ Garfinkel's afflib (https://github.com/simsong/AFFLIBv3).
	+
	+ 2.5 libxmount_input_aaff
	+ Supports AFF (Advanced Forensic Format) images ("--in aaff") using an AFF
	+ implementation written by Guy Voncken. In essence, it is a lot faster than
	+ afflib.
	+
	+3.0 Morphing support
	+ Also starting with xmount version 0.7.0, a new concept of input image morphing
	+ has been added. Morphing is a process which is applied to the data of all
	+ specified input images and produces a single virtual image which can then be
	+ converted into an output image. The following chapters list the currently
	+ officially supported morphing libraries. As with the input image libs, not all
	+ might be available on your system.
	+
	+ 3.1 libxmount_morphing_combine
	+ Using "--morph combine", data from all input images is concatenated into
	+ a single image. Images are appended in the same order they are specified on
	+ the command line. This morphing type is also the default if no "--morph"
	+ option is specified.
	+
	+ 3.2 libxmount_morphing_raid
	+ This morphing library supports emulation of hardware / software raid.
	+ Currently, only RAID0 ("--morph raid0") is supported. The used chunk /
	+ stripe size in bytes can be specified with "--morphopts raid_chunksize=XXX".
	+ All input images are treated as member disks of the original raid.
	+
	+ 3.3 libxmount_morphing_unallocated
	+ Using "--morph unallocated" it is possible to extract unallocated sectors
	+ from a filesystem. For this to work, your input image must start with the
	+ volume you want to extract unallocated sectors from. If you have an image of
	+ a whole disk, you might need to use xmounts "--offset" parameter to move the
	+ start of the data to the start of the volume. Currently, unallocated
	+ sectors from HFS and FAT can be extracted.
	+
	+4.0 Output image
	+ 4.1 Emulated RAW file
	+ This is the standard data representation used by xmount. It is a file
	+ containing the raw data contained in the input image file. Except for OSx
	+ (see 2.2) this is the default output format when no --out option is
	+ specified.
	+
	+ 4.2 Emulated DMG file
	+ This is also a file containing the raw data contained in the input image
	+ file but with a .dmg file extension. On OSx, this is the default output
	+ format when no --out option is specified.
	+
	+ 4.3 Emulated VDI file
	+ When using the "--out vdi" command line parameter, a VirtualBox disk file
	+ is emulated. This means that xmount builds a virtual VDI header and prepends
	+ it to the raw data contained in the input image. The VDI file can be used in
	+ VirtualBox as a virtual disk file.
	+
	+ 4.4 Emulated VMDK file
	+ When using the "--out vmdk(s)" command line paramter, a VMWare virtual disk
	+ file will be emulated. This mainly consists in building a VMDK descriptor
	+ file that will access an emulated RAW file. You can use this VMDK file to
	+ add your input image as virtual disk to a VMWare virtual machine. "vmdk" is
	+ a VMWare disk attached to the IDE bus and "vmdks" is attached to the SCSI
	+ bus.
	+
	+ When emulating VMDK files to be used in VMWare, you have to enable
	+ "user_allow_other" in /etc/fuse.conf or run xmount and VmWare as root.
	+
	+ WARNING: VMDK support should be considered experimental and currently the
	+ VMDK descriptor file isn't cached.
	+
	+ 4.5 Emulated VHD file
	+ When using the "--out vhd" command line parameter, a Virtual Hard Disk Image
	+ file is emulated by appending to the raw data a valid VHD footer. Valid here
	+ means as described in Microsoft's Virtual Hard Disk Image Format specs v1.
	+
	+5.0 Virtual write access
	+ By using the "--cache <cache_file>" command line parameter, xmount allows
	+ you to change data in the emulated image files. All changes are written to a
	+ separate cache file. No data will ever be written to the original input
	+ image files! Write access is limited to change existing data. It isn't
	+ possible to change the emulated image's file size (no append or truncate)!
	+ The same cache file can be used with different output image formats without
	+ loosing changed data.
	+
	+6.0 Installation instructions
	+ To install xmount, you can use a prebuild package for your distribution or
	+ you can build xmount from source. The two methods are described in the
	+ following sections.
	+
	+ 6.1 Prerequisits
	+ SYSTEM:
	+ - Linux: Some sort of Linux with a recent kernel (2.6.x or above).
	+ - OSx: OSx 10.6 or above
	+
	+ FUSE:
	+ Your os must support FUSE and have the appropriate libraries installed.
	+ (See http://fuse.sourceforge.net/ for more informations). To be able to
	+ install from source, you also need the FUSE header files. On OSx, you can
	+ use osxfuse instead.
	+
	+ LIBEWF:
	+ To enable EWF input image support. Get it from
	+ http://sourceforge.net/projects/libewf/
	+
	+ LIBAFF:
	+ To enable AFF input image support. Get it from http://www.afflib.org/
	+
	+ 6.2 Install from a package
	+ Chances are I provide prebuild binary packages for Debian / Ubuntu. In this
	+ case, you only have to fire up your distribution's package manager and
	+ install xmount. See https://www.pinguin.lu/xmount for more information and
	+ download links.
	+
	+ 6.3 Install from source
	+ After having checked the prerequisits, you should be able to compile and
	+ install xmount by simply issuing the following commands:
	+
	+ $ mkdir build
	+ $ cd build
	+ $ cmake -DCMAKE_BUILD_TYPE=Release ..
	+ $ make
	+ $ sudo make install
	+
	+7.1 xmount usage examples
	+ To xmount an EWF harddisk image from your acquired disk as a raw DD image
	+ under /mnt, use the following command:
	+
	+ xmount --in ewf ./acquired_disk.E?? /mnt
	+
	+ To xmount the same ewf image as vdi file, you would use a command like this:
	+
	+ xmount --in ewf ./acquired_disk.E?? --out vdi /mnt
	+
	+ And to enable virtual write support on a raw DD input image xmounted as VDI
	+ file:
	+
	+ xmount --in raw ./acquired_disk.dd --out vdi --cache ./disk.cache /mnt
	+
	+EOF
	diff --git a/tags/xmount-0.7.0/ROADMAP b/tags/xmount-0.7.0/ROADMAP
	new file mode 100644
	index 0000000..674806a
	--- /dev/null
	+++ b/tags/xmount-0.7.0/ROADMAP
	@@ -0,0 +1,5 @@
	+This file lists upcomming changes to xmount.
	+
	+ - Stable support of VMDK files
	+ - New cache file version to support some new features
	+
	diff --git a/tags/xmount-0.7.0/TODO b/tags/xmount-0.7.0/TODO
	new file mode 100644
	index 0000000..1e11206
	--- /dev/null
	+++ b/tags/xmount-0.7.0/TODO
	@@ -0,0 +1 @@
	+For a list of things that still have to be done see the file ROADMAP
	diff --git a/tags/xmount-0.7.0/cmake_modules/FindLibAFF.cmake b/tags/xmount-0.7.0/cmake_modules/FindLibAFF.cmake
	new file mode 100644
	index 0000000..7f938c8
	--- /dev/null
	+++ b/tags/xmount-0.7.0/cmake_modules/FindLibAFF.cmake
	@@ -0,0 +1,41 @@
	+# Try pkg-config first
	+find_package(PkgConfig)
	+pkg_check_modules(PKGC_LIBAFF QUIET afflib)
	+
	+if(PKGC_LIBAFF_FOUND)
	+ # Found lib using pkg-config.
	+ if(CMAKE_DEBUG)
	+ message(STATUS "\${PKGC_LIBAFF_LIBRARIES} = ${PKGC_LIBAFF_LIBRARIES}")
	+ message(STATUS "\${PKGC_LIBAFF_LIBRARY_DIRS} = ${PKGC_LIBAFF_LIBRARY_DIRS}")
	+ message(STATUS "\${PKGC_LIBAFF_LDFLAGS} = ${PKGC_LIBAFF_LDFLAGS}")
	+ message(STATUS "\${PKGC_LIBAFF_LDFLAGS_OTHER} = ${PKGC_LIBAFF_LDFLAGS_OTHER}")
	+ message(STATUS "\${PKGC_LIBAFF_INCLUDE_DIRS} = ${PKGC_LIBAFF_INCLUDE_DIRS}")
	+ message(STATUS "\${PKGC_LIBAFF_CFLAGS} = ${PKGC_LIBAFF_CFLAGS}")
	+ message(STATUS "\${PKGC_LIBAFF_CFLAGS_OTHER} = ${PKGC_LIBAFF_CFLAGS_OTHER}")
	+ endif(CMAKE_DEBUG)
	+
	+ set(LIBAFF_LIBRARIES ${PKGC_LIBAFF_LIBRARIES})
	+ set(LIBAFF_INCLUDE_DIRS ${PKGC_LIBAFF_INCLUDE_DIRS})
	+ #set(LIBAFF_DEFINITIONS ${PKGC_LIBAFF_CFLAGS_OTHER})
	+else(PKGC_LIBAFF_FOUND)
	+ # Didn't find lib using pkg-config. Try to find it manually
	+ message(WARNING "Unable to find LibAFF using pkg-config! If compilation fails, make sure pkg-config is installed and PKG_CONFIG_PATH is set correctly")
	+
	+ find_path(LIBAFF_INCLUDE_DIR afflib/afflib.h
	+ PATH_SUFFIXES afflib)
	+ find_library(LIBAFF_LIBRARY NAMES afflib libafflib)
	+
	+ if(CMAKE_DEBUG)
	+ message(STATUS "\${LIBAFF_LIBRARY} = ${LIBAFF_LIBRARY}")
	+ message(STATUS "\${LIBAFF_INCLUDE_DIR} = ${LIBAFF_INCLUDE_DIR}")
	+ endif(CMAKE_DEBUG)
	+
	+ set(LIBAFF_LIBRARIES ${LIBAFF_LIBRARY})
	+ set(LIBAFF_INCLUDE_DIRS ${LIBAFF_INCLUDE_DIR})
	+endif(PKGC_LIBAFF_FOUND)
	+
	+include(FindPackageHandleStandardArgs)
	+# Handle the QUIETLY and REQUIRED arguments and set <PREFIX>_FOUND to TRUE if
	+# all listed variables are TRUE
	+find_package_handle_standard_args(LibAFF DEFAULT_MSG LIBAFF_LIBRARIES)
	+
	diff --git a/tags/xmount-0.7.0/cmake_modules/FindLibEWF.cmake b/tags/xmount-0.7.0/cmake_modules/FindLibEWF.cmake
	new file mode 100644
	index 0000000..f5857f8
	--- /dev/null
	+++ b/tags/xmount-0.7.0/cmake_modules/FindLibEWF.cmake
	@@ -0,0 +1,41 @@
	+# Try pkg-config first
	+find_package(PkgConfig)
	+pkg_check_modules(PKGC_LIBEWF QUIET libewf)
	+
	+if(PKGC_LIBEWF_FOUND)
	+ # Found lib using pkg-config.
	+ if(CMAKE_DEBUG)
	+ message(STATUS "\${PKGC_LIBEWF_LIBRARIES} = ${PKGC_LIBEWF_LIBRARIES}")
	+ message(STATUS "\${PKGC_LIBEWF_LIBRARY_DIRS} = ${PKGC_LIBEWF_LIBRARY_DIRS}")
	+ message(STATUS "\${PKGC_LIBEWF_LDFLAGS} = ${PKGC_LIBEWF_LDFLAGS}")
	+ message(STATUS "\${PKGC_LIBEWF_LDFLAGS_OTHER} = ${PKGC_LIBEWF_LDFLAGS_OTHER}")
	+ message(STATUS "\${PKGC_LIBEWF_INCLUDE_DIRS} = ${PKGC_LIBEWF_INCLUDE_DIRS}")
	+ message(STATUS "\${PKGC_LIBEWF_CFLAGS} = ${PKGC_LIBEWF_CFLAGS}")
	+ message(STATUS "\${PKGC_LIBEWF_CFLAGS_OTHER} = ${PKGC_LIBEWF_CFLAGS_OTHER}")
	+ endif(CMAKE_DEBUG)
	+
	+ set(LIBEWF_LIBRARIES ${PKGC_LIBEWF_LIBRARIES})
	+ set(LIBEWF_INCLUDE_DIRS ${PKGC_LIBEWF_INCLUDE_DIRS})
	+ #set(LIBEWF_DEFINITIONS ${PKGC_LIBEWF_CFLAGS_OTHER})
	+else(PKGC_LIBEWF_FOUND)
	+ # Didn't find lib using pkg-config. Try to find it manually
	+ message(WARNING "Unable to find LibEWF using pkg-config! If compilation fails, make sure pkg-config is installed and PKG_CONFIG_PATH is set correctly")
	+
	+ find_path(LIBEWF_INCLUDE_DIR libewf.h
	+ PATH_SUFFIXES libewf)
	+ find_library(LIBEWF_LIBRARY NAMES ewf libewf)
	+
	+ if(CMAKE_DEBUG)
	+ message(STATUS "\${LIBEWF_LIBRARY} = ${LIBEWF_LIBRARY}")
	+ message(STATUS "\${LIBEWF_INCLUDE_DIR} = ${LIBEWF_INCLUDE_DIR}")
	+ endif(CMAKE_DEBUG)
	+
	+ set(LIBEWF_LIBRARIES ${LIBEWF_LIBRARY})
	+ set(LIBEWF_INCLUDE_DIRS ${LIBEWF_INCLUDE_DIR})
	+endif(PKGC_LIBEWF_FOUND)
	+
	+include(FindPackageHandleStandardArgs)
	+# Handle the QUIETLY and REQUIRED arguments and set <PREFIX>_FOUND to TRUE if
	+# all listed variables are TRUE
	+find_package_handle_standard_args(LibEWF DEFAULT_MSG LIBEWF_LIBRARIES)
	+
	diff --git a/tags/xmount-0.7.0/cmake_modules/FindLibFUSE.cmake b/tags/xmount-0.7.0/cmake_modules/FindLibFUSE.cmake
	new file mode 100644
	index 0000000..c022f16
	--- /dev/null
	+++ b/tags/xmount-0.7.0/cmake_modules/FindLibFUSE.cmake
	@@ -0,0 +1,41 @@
	+# Try pkg-config first
	+find_package(PkgConfig)
	+pkg_check_modules(PKGC_LIBFUSE QUIET fuse)
	+
	+if(PKGC_LIBFUSE_FOUND)
	+ # Found lib using pkg-config.
	+ if(CMAKE_DEBUG)
	+ message(STATUS "\${PKGC_LIBFUSE_LIBRARIES} = ${PKGC_LIBFUSE_LIBRARIES}")
	+ message(STATUS "\${PKGC_LIBFUSE_LIBRARY_DIRS} = ${PKGC_LIBFUSE_LIBRARY_DIRS}")
	+ message(STATUS "\${PKGC_LIBFUSE_LDFLAGS} = ${PKGC_LIBFUSE_LDFLAGS}")
	+ message(STATUS "\${PKGC_LIBFUSE_LDFLAGS_OTHER} = ${PKGC_LIBFUSE_LDFLAGS_OTHER}")
	+ message(STATUS "\${PKGC_LIBFUSE_INCLUDE_DIRS} = ${PKGC_LIBFUSE_INCLUDE_DIRS}")
	+ message(STATUS "\${PKGC_LIBFUSE_CFLAGS} = ${PKGC_LIBFUSE_CFLAGS}")
	+ message(STATUS "\${PKGC_LIBFUSE_CFLAGS_OTHER} = ${PKGC_LIBFUSE_CFLAGS_OTHER}")
	+ endif(CMAKE_DEBUG)
	+
	+ set(LIBFUSE_LIBRARIES ${PKGC_LIBFUSE_LIBRARIES})
	+ set(LIBFUSE_INCLUDE_DIRS ${PKGC_LIBFUSE_INCLUDE_DIRS})
	+ #set(LIBFUSE_DEFINITIONS ${PKGC_LIBFUSE_CFLAGS_OTHER})
	+else(PKGC_LIBFUSE_FOUND)
	+ # Didn't find lib using pkg-config. Try to find it manually
	+ message(WARNING "Unable to find LibFUSE using pkg-config! If compilation fails, make sure pkg-config is installed and PKG_CONFIG_PATH is set correctly")
	+
	+ find_path(LIBFUSE_INCLUDE_DIR fuse.h
	+ PATH_SUFFIXES fuse)
	+ find_library(LIBFUSE_LIBRARY NAMES fuse libfuse)
	+
	+ if(CMAKE_DEBUG)
	+ message(STATUS "\${LIBFUSE_LIBRARY} = ${LIBFUSE_LIBRARY}")
	+ message(STATUS "\${LIBFUSE_INCLUDE_DIR} = ${LIBFUSE_INCLUDE_DIR}")
	+ endif(CMAKE_DEBUG)
	+
	+ set(LIBFUSE_LIBRARIES ${LIBFUSE_LIBRARY})
	+ set(LIBFUSE_INCLUDE_DIRS ${LIBFUSE_INCLUDE_DIR})
	+endif(PKGC_LIBFUSE_FOUND)
	+
	+include(FindPackageHandleStandardArgs)
	+# Handle the QUIETLY and REQUIRED arguments and set <PREFIX>_FOUND to TRUE if
	+# all listed variables are TRUE
	+find_package_handle_standard_args(LibFUSE DEFAULT_MSG LIBFUSE_LIBRARIES)
	+
	diff --git a/tags/xmount-0.7.0/cmake_modules/FindLibOSXFUSE.cmake b/tags/xmount-0.7.0/cmake_modules/FindLibOSXFUSE.cmake
	new file mode 100644
	index 0000000..46cf8dc
	--- /dev/null
	+++ b/tags/xmount-0.7.0/cmake_modules/FindLibOSXFUSE.cmake
	@@ -0,0 +1,41 @@
	+# Try pkg-config first
	+find_package(PkgConfig)
	+pkg_check_modules(PKGC_LIBOSXFUSE QUIET libosxfuse)
	+
	+if(PKGC_LIBOSXFUSE_FOUND)
	+ # Found lib using pkg-config.
	+ if(CMAKE_DEBUG)
	+ message(STATUS "\${PKGC_LIBOSXFUSE_LIBRARIES} = ${PKGC_LIBOSXFUSE_LIBRARIES}")
	+ message(STATUS "\${PKGC_LIBOSXFUSE_LIBRARY_DIRS} = ${PKGC_LIBOSXFUSE_LIBRARY_DIRS}")
	+ message(STATUS "\${PKGC_LIBOSXFUSE_LDFLAGS} = ${PKGC_LIBOSXFUSE_LDFLAGS}")
	+ message(STATUS "\${PKGC_LIBOSXFUSE_LDFLAGS_OTHER} = ${PKGC_LIBOSXFUSE_LDFLAGS_OTHER}")
	+ message(STATUS "\${PKGC_LIBOSXFUSE_INCLUDE_DIRS} = ${PKGC_LIBOSXFUSE_INCLUDE_DIRS}")
	+ message(STATUS "\${PKGC_LIBOSXFUSE_CFLAGS} = ${PKGC_LIBOSXFUSE_CFLAGS}")
	+ message(STATUS "\${PKGC_LIBOSXFUSE_CFLAGS_OTHER} = ${PKGC_LIBOSXFUSE_CFLAGS_OTHER}")
	+ endif(CMAKE_DEBUG)
	+
	+ set(LIBOSXFUSE_LIBRARIES ${PKGC_LIBOSXFUSE_LIBRARIES})
	+ set(LIBOSXFUSE_INCLUDE_DIRS ${PKGC_LIBOSXFUSE_INCLUDE_DIRS})
	+ #set(LIBOSXFUSE_DEFINITIONS ${PKGC_LIBOSXFUSE_CFLAGS_OTHER})
	+else(PKGC_LIBOSXFUSE_FOUND)
	+ # Didn't find lib using pkg-config. Try to find it manually
	+ message(WARNING "Unable to find LibOSXFUSE using pkg-config! If compilation fails, make sure pkg-config is installed and PKG_CONFIG_PATH is set correctly")
	+
	+ find_path(LIBOSXFUSE_INCLUDE_DIR fuse.h
	+ PATH_SUFFIXES fuse)
	+ find_library(LIBOSXFUSE_LIBRARY NAMES osxfuse libosxfuse)
	+
	+ if(CMAKE_DEBUG)
	+ message(STATUS "\${LIBOSXFUSE_LIBRARY} = ${LIBOSXFUSE_LIBRARY}")
	+ message(STATUS "\${LIBOSXFUSE_INCLUDE_DIR} = ${LIBOSXFUSE_INCLUDE_DIR}")
	+ endif(CMAKE_DEBUG)
	+
	+ set(LIBOSXFUSE_LIBRARIES ${LIBOSXFUSE_LIBRARY})
	+ set(LIBOSXFUSE_INCLUDE_DIRS ${LIBOSXFUSE_INCLUDE_DIR})
	+endif(PKGC_LIBOSXFUSE_FOUND)
	+
	+include(FindPackageHandleStandardArgs)
	+# Handle the QUIETLY and REQUIRED arguments and set <PREFIX>_FOUND to TRUE if
	+# all listed variables are TRUE
	+find_package_handle_standard_args(LibOSXFUSE DEFAULT_MSG LIBOSXFUSE_LIBRARIES)
	+
	diff --git a/tags/xmount-0.7.0/cmake_modules/FindLibZ.cmake b/tags/xmount-0.7.0/cmake_modules/FindLibZ.cmake
	new file mode 100644
	index 0000000..9d2c7d0
	--- /dev/null
	+++ b/tags/xmount-0.7.0/cmake_modules/FindLibZ.cmake
	@@ -0,0 +1,41 @@
	+# Try pkg-config first
	+find_package(PkgConfig)
	+pkg_check_modules(PKGC_LIBZ QUIET zlib)
	+
	+if(PKGC_LIBZ_FOUND)
	+ # Found lib using pkg-config.
	+ if(CMAKE_DEBUG)
	+ message(STATUS "\${PKGC_LIBZ_LIBRARIES} = ${PKGC_LIBZ_LIBRARIES}")
	+ message(STATUS "\${PKGC_LIBZ_LIBRARY_DIRS} = ${PKGC_LIBZ_LIBRARY_DIRS}")
	+ message(STATUS "\${PKGC_LIBZ_LDFLAGS} = ${PKGC_LIBZ_LDFLAGS}")
	+ message(STATUS "\${PKGC_LIBZ_LDFLAGS_OTHER} = ${PKGC_LIBZ_LDFLAGS_OTHER}")
	+ message(STATUS "\${PKGC_LIBZ_INCLUDE_DIRS} = ${PKGC_LIBZ_INCLUDE_DIRS}")
	+ message(STATUS "\${PKGC_LIBZ_CFLAGS} = ${PKGC_LIBZ_CFLAGS}")
	+ message(STATUS "\${PKGC_LIBZ_CFLAGS_OTHER} = ${PKGC_LIBZ_CFLAGS_OTHER}")
	+ endif(CMAKE_DEBUG)
	+
	+ set(LIBZ_LIBRARIES ${PKGC_LIBZ_LIBRARIES})
	+ set(LIBZ_INCLUDE_DIRS ${PKGC_LIBZ_INCLUDE_DIRS})
	+ #set(LIBZ_DEFINITIONS ${PKGC_LIBZ_CFLAGS_OTHER})
	+else(PKGC_LIBZ_FOUND)
	+ # Didn't find lib using pkg-config. Try to find it manually
	+ message(WARNING "Unable to find LibZ using pkg-config! If compilation fails, make sure pkg-config is installed and PKG_CONFIG_PATH is set correctly")
	+
	+ find_path(LIBZ_INCLUDE_DIR zlib.h
	+ PATH_SUFFIXES zlib)
	+ find_library(LIBZ_LIBRARY NAMES z libz)
	+
	+ if(CMAKE_DEBUG)
	+ message(STATUS "\${LIBZ_LIBRARY} = ${LIBZ_LIBRARY}")
	+ message(STATUS "\${LIBZ_INCLUDE_DIR} = ${LIBZ_INCLUDE_DIR}")
	+ endif(CMAKE_DEBUG)
	+
	+ set(LIBZ_LIBRARIES ${LIBZ_LIBRARY})
	+ set(LIBZ_INCLUDE_DIRS ${LIBZ_INCLUDE_DIR})
	+endif(PKGC_LIBZ_FOUND)
	+
	+include(FindPackageHandleStandardArgs)
	+# Handle the QUIETLY and REQUIRED arguments and set <PREFIX>_FOUND to TRUE if
	+# all listed variables are TRUE
	+find_package_handle_standard_args(LibZ DEFAULT_MSG LIBZ_LIBRARIES)
	+
	diff --git a/tags/xmount-0.7.0/config.h.in b/tags/xmount-0.7.0/config.h.in
	new file mode 100644
	index 0000000..dc1d9fe
	--- /dev/null
	+++ b/tags/xmount-0.7.0/config.h.in
	@@ -0,0 +1,47 @@
	+/*******************************************************************************
	+* xmount Copyright (c) 2008-2014 by Gillen Daniel <gillen.dan@pinguin.lu> *
	+* *
	+* xmount is a small tool to "fuse mount" various harddisk image formats as dd, *
	+* vdi, vhd or vmdk files and enable virtual write access to them. *
	+* *
	+* This program is free software: you can redistribute it and/or modify it *
	+* under the terms of the GNU General Public License as published by the Free *
	+* Software Foundation, either version 3 of the License, or (at your option) *
	+* any later version. *
	+* *
	+* This program is distributed in the hope that it will be useful, but WITHOUT *
	+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
	+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for *
	+* more details. *
	+* *
	+* You should have received a copy of the GNU General Public License along with *
	+* this program. If not, see <http://www.gnu.org/licenses/>. *
	+*******************************************************************************/
	+
	+#ifndef CONFIG_H
	+#define CONFIG_H
	+
	+#cmakedefine HAVE_STDLIB_H 1
	+#cmakedefine HAVE_STDIO_H 1
	+#cmakedefine HAVE_STDINT_H 1
	+#cmakedefine HAVE_STDARG_H 1
	+#cmakedefine HAVE_STRING_H 1
	+#cmakedefine HAVE_ERRNO_H 1
	+#cmakedefine HAVE_FCNTL_H 1
	+#cmakedefine HAVE_DLFCN_H 1
	+#cmakedefine HAVE_DIRENT_H 1
	+#cmakedefine HAVE_UNISTD_H 1
	+#cmakedefine HAVE_SYS_IOCTL_H 1
	+#cmakedefine HAVE_SYS_TYPES_H 1
	+#cmakedefine HAVE_LINUX_FS_H 1
	+#cmakedefine HAVE_GRP_H 1
	+#cmakedefine HAVE_PWD_H 1
	+#cmakedefine HAVE_PTHREAD_H 1
	+#cmakedefine HAVE_TIME_H 1
	+#cmakedefine HAVE_INTTYPES_H 1
	+#cmakedefine HAVE_BYTESWAP_H 1
	+#cmakedefine HAVE_ENDIAN_H 1
	+#cmakedefine HAVE_LIBKERN_OSBYTEORDER_H 1
	+
	+#endif // CONFIG_H
	+
	diff --git a/trunk/debian/changelog b/tags/xmount-0.7.0/debian/changelog
	similarity index 94%
	copy from trunk/debian/changelog
	copy to tags/xmount-0.7.0/debian/changelog
	index 7e17636..213f3a1 100644
	--- a/trunk/debian/changelog
	+++ b/tags/xmount-0.7.0/debian/changelog
	@@ -1,112 +1,113 @@
	xmount (0.7.0) stable; urgency=low

	* Changed build system from autoconf / automake to cmake
	* Moved input image support into external libs
	- * Added --offset command line parameter
	+ * Added morphing functionality including combine, raid and unallocated
	+ * Added --offset and --sizelimit command line parameter
	* Massive code cleanup including some small bug fixes

	- -- Gillen Daniel <gillen.dan@pinguin.lu> Wed, 13 Aug 2014 17:00:00 +0200
	+ -- Gillen Daniel <gillen.dan@pinguin.lu> Fri, 26 Sep 2014 11:00:00 +0200

	xmount (0.6.0) stable; urgency=low

	* Added faster aff input support (using libaaff).
	* Added support for split DD input files (using libdd).

	-- Gillen Daniel <gillen.dan@pinguin.lu> Fri, 26 Jul 2013 16:00:00 +0200

	xmount (0.5.0) stable; urgency=low

	* Added support for virtual VHD image file emulation.

	-- Gillen Daniel <gillen.dan@pinguin.lu> Sun, 06 May 2012 12:00:00 +0200

	xmount (0.4.7) stable; urgency=low

	* Made InitVirtImageInfoFile less picky about missing EWF infos.

	-- Gillen Daniel <gillen.dan@pinguin.lu> Mon, 30 Jan 2012 12:00:00 +0100

	xmount (0.4.6) stable; urgency=low

	* Added support for libewf v2

	-- Gillen Daniel <gillen.dan@pinguin.lu> Tue, 11 Oct 2011 20:00:00 +0200

	xmount (0.4.5) stable; urgency=low

	* Added FUSE options to show mounted source in mount command output

	-- Gillen Daniel <gillen.dan@pinguin.lu> Tue, 11 Feb 2011 16:00:00 +0100

	xmount (0.4.4) stable; urgency=critical

	* Fixed a bug in UUID generation

	-- Gillen Daniel <gillen.dan@pinguin.lu> Tue, 10 Aug 2010 15:00:00 +0100

	xmount (0.4.3) stable; urgency=critical

	* Fixed a bug when moving cache files between different hw archtitectures

	-- Gillen Daniel <gillen.dan@pinguin.lu> Wed, 24 Mar 2010 11:30:00 +0100

	xmount (0.3.1) stable; urgency=low

	* Added --cache and --owcache command line options
	* Updated some parts of the documentation

	-- Gillen Daniel <gillen.dan@pinguin.lu> Fri, 10 Jul 2009 10:19:00 +0100

	xmount (0.3.0) stable; urgency=low

	* Added VMDK emulation support

	-- Gillen Daniel <gillen.dan@pinguin.lu> Fri, 22 May 2009 11:00:00 +0100

	xmount (0.2.3) stable; urgency=critical

	* Virtual write support is fixed now

	-- Gillen Daniel <gillen.dan@pinguin.lu> Fri, 10 Apr 2009 17:02:00 +0100

	xmount (0.2.2) stable; urgency=critical

	* Fixed yet another bug in virtual write support

	-- Gillen Daniel <gillen.dan@pinguin.lu> Thu, 31 Mar 2009 15:13:00 +0100

	xmount (0.2.1) stable; urgency=critical

	* Fixed a bug in virtual write support that corrupted cache files

	-- Gillen Daniel <gillen.dan@pinguin.lu> Fri, 27 Mar 2009 12:00:00 +0100

	xmount (0.2.0) stable; urgency=low

	* Changed name from mountewf to xmount
	* Massive code cleanup
	* Added support for multiple input image formats
	* Added support for virtual write access to emulated image files

	-- Gillen Daniel <gillen.dan@pinguin.lu> Mon, 16 Mar 2009 17:00:00 +0100

	mountewf (0.1.2) stable; urgency=low

	* Added random generator initialisation
	* Resolved compilation issue by fixing a typo
	* Fixed some debian specific scripts to be able to build a package

	-- Gillen Daniel <gillen.dan@pinguin.lu> Tue, 10 Feb 2009 16:12:00 +0100

	mountewf (0.1.1) stable; urgency=low

	* Fixed severe bugs in block map calculation.
	* VDI emulation should now work

	-- Gillen Daniel <gillen.dan@pinguin.lu> Thu, 03 Feb 2009 17:12:00 +0100

	mountewf (0.1.0) unstable; urgency=low

	* Initial Release.

	-- Gillen Daniel <gillen.dan@pinguin.lu> Sun, 01 Feb 2009 01:30:50 +0100
	diff --git a/tags/xmount-0.7.0/debian/compat b/tags/xmount-0.7.0/debian/compat
	new file mode 100644
	index 0000000..7ed6ff8
	--- /dev/null
	+++ b/tags/xmount-0.7.0/debian/compat
	@@ -0,0 +1 @@
	+5
	diff --git a/tags/xmount-0.7.0/debian/control b/tags/xmount-0.7.0/debian/control
	new file mode 100644
	index 0000000..5a231fe
	--- /dev/null
	+++ b/tags/xmount-0.7.0/debian/control
	@@ -0,0 +1,21 @@
	+Source: xmount
	+Section: unknown
	+Priority: low
	+Maintainer: Gillen Daniel <gillen.dan@pinguin.lu>
	+Build-Depends: debhelper (>= 5), cdbs, cmake, pkg-config, libfuse-dev (>= 2.7.1-2~bpo40+1), zlib1g-dev, libewf-dev, libafflib-dev, libssl-dev
	+Standards-Version: 3.7.3
	+
	+Package: xmount
	+Architecture: any
	+Depends: ${shlibs:Depends}, ${misc:Depends}
	+Description: Tool to crossmount between multiple input and output harddisk image files
	+ xmount allows you to convert on-the-fly between multiple input and output
	+ harddisk image types. xmount creates a virtual file system using FUSE
	+ (Filesystem in Userspace) that contains a virtual representation of the input
	+ image. The virtual representation can be in raw DD, Apple's Disk Image format (DMG),
	+ VirtualBox's virtual disk file format (VDI), VmWare's VMDK file format or Microsoft's
	+ Virtual Hard Disk Image format (VHD). Input images can be raw DD, EWF
	+ (Expert Witness Compression Format) or AFF (Advanced Forensic Format) files.
	+ In addition, xmount also supports virtual write access to the output files
	+ that is redirected to a cache file. This makes it possible to boot acquired
	+ harddisk images using QEMU, KVM, VirtualBox, VmWare or alike.
	diff --git a/tags/xmount-0.7.0/debian/copyright b/tags/xmount-0.7.0/debian/copyright
	new file mode 100644
	index 0000000..991b183
	--- /dev/null
	+++ b/tags/xmount-0.7.0/debian/copyright
	@@ -0,0 +1,33 @@
	+This package was debianized by Gillen Daniel <gillen.dan@pinguin.lu> on
	+Sat, 06 Aug 2011 22:00:00 +0200.
	+
	+Upstream Author(s):
	+
	+ Gillen Daniel <gillen.dan@pinguin.lu>
	+
	+Copyright:
	+
	+ Gillen Daniel <gillen.dan@pinguin.lu>
	+
	+License:
	+
	+ This package is free software; you can redistribute it and/or modify
	+ it under the terms of the GNU General Public License as published by
	+ the Free Software Foundation; either version 2 of the License, or
	+ (at your option) any later version.
	+
	+ This package is distributed in the hope that it will be useful,
	+ but WITHOUT ANY WARRANTY; without even the implied warranty of
	+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	+ GNU General Public License for more details.
	+
	+ You should have received a copy of the GNU General Public License
	+ along with this package; if not, write to the Free Software
	+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
	+
	+On Debian systems, the complete text of the GNU General
	+Public License can be found in `/usr/share/common-licenses/GPL'.
	+
	+The Debian packaging is (C) 2008-2012, Gillen Daniel <gillen.dan@pinguin.lu> and
	+is licensed under the GPL, see above.
	+
	diff --git a/tags/xmount-0.7.0/debian/dirs b/tags/xmount-0.7.0/debian/dirs
	new file mode 100644
	index 0000000..98d1583
	--- /dev/null
	+++ b/tags/xmount-0.7.0/debian/dirs
	@@ -0,0 +1,2 @@
	+usr/bin
	+usr/share/man/man1
	diff --git a/tags/xmount-0.7.0/debian/docs b/tags/xmount-0.7.0/debian/docs
	new file mode 100644
	index 0000000..50bd824
	--- /dev/null
	+++ b/tags/xmount-0.7.0/debian/docs
	@@ -0,0 +1,2 @@
	+NEWS
	+README
	diff --git a/tags/xmount-0.7.0/debian/rules b/tags/xmount-0.7.0/debian/rules
	new file mode 100755
	index 0000000..ee1a395
	--- /dev/null
	+++ b/tags/xmount-0.7.0/debian/rules
	@@ -0,0 +1,3 @@
	+#!/usr/bin/make -f
	+include /usr/share/cdbs/1/rules/debhelper.mk
	+include /usr/share/cdbs/1/class/cmake.mk
	diff --git a/trunk/libxmount/endianness.h b/tags/xmount-0.7.0/libxmount/endianness.h
	similarity index 96%
	copy from trunk/libxmount/endianness.h
	copy to tags/xmount-0.7.0/libxmount/endianness.h
	index 2043bb4..c69c717 100644
	--- a/trunk/libxmount/endianness.h
	+++ b/tags/xmount-0.7.0/libxmount/endianness.h
	@@ -1,170 +1,178 @@
	/*******************************************************************************
	* Copyright (c) 2008-2014 by Gillen Daniel <gillen.dan@pinguin.lu> *
	* *
	* This program is free software: you can redistribute it and/or modify it *
	* under the terms of the GNU General Public License as published by the Free *
	* Software Foundation, either version 3 of the License, or (at your option) *
	* any later version. *
	* *
	* This program is distributed in the hope that it will be useful, but WITHOUT *
	* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
	* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for *
	* more details. *
	* *
	* You should have received a copy of the GNU General Public License along with *
	* this program. If not, see <http://www.gnu.org/licenses/>. *
	*******************************************************************************/

	/*
	* This file aims at making endianness conversions using the following
	* functions portable.
	*
	* Conversion from big endian to host / from host to big endian
	* be16toh(uint16_t)
	* be32toh(uint32_t)
	* be64toh(uint64_t)
	* htobe16(uint16_t)
	* htobe32(uint32_t)
	* htobe64(uint64_t)
	*
	* Conversion from little endian to host / from host to little endian
	* le16toh(uint16_t)
	* le32toh(uint32_t)
	* le64toh(uint64_t)
	* htole16(uint16_t)
	* htole32(uint32_t)
	* htole64(uint64_t)
	*
	* In addition, including this file will define HOST_BYTEORDER_IS_BE or
	* HOST_BYTEORDER_IS_LE according to the current byte order of the host.
	*/

	#ifndef ENDIANNESS_H
	#define ENDIANNESS_H

	#include <config.h>

	#ifdef HAVE_STDINT_H
	#include <stdint.h>
	#else
	#error "Including this file requires you to have stdint.h"
	#endif

	+#ifdef HAVE_ENDIAN_H
	+ #include <endian.h>
	+#endif
	+
	// First we need to have the bswap functions
	#if defined(HAVE_BYTESWAP_H)
	#include <byteswap.h>
	-#elif defined(HAVE_ENDIAN_H)
	- #include <endian.h>
	#elif defined(__APPLE__) && defined(HAVE_LIBKERN_OSBYTEORDER_H)
	#include <libkern/OSByteOrder.h>
	#define bswap_16 OSSwapInt16
	#define bswap_32 OSSwapInt32
	#define bswap_64 OSSwapInt64
	#else
	#define bswap_16(value) { \
	((((value) & 0xff) << 8) \| ((value) >> 8)) \
	}
	#define bswap_32(value) { \
	(((uint32_t)bswap_16((uint16_t)((value) & 0xffff)) << 16) \| \
	(uint32_t)bswap_16((uint16_t)((value) >> 16))) \
	}
	#define bswap_64(value) { \
	(((uint64_t)bswap_32((uint32_t)((value) & 0xffffffff)) << 32) \| \
	(uint64_t)bswap_32((uint32_t)((value) >> 32))) \
	}
	#endif

	// Next we need to know what endianness is used
	#if defined(__LITTLE_ENDIAN__)
	#define HOST_BYTEORDER_IS_LE
	#elif defined(__BIG_ENDIAN__)
	#define HOST_BYTEORDER_IS_BE
	+#elif defined(__BYTE_ORDER)
	+ #if __BYTE_ORDER == __LITTLE_ENDIAN
	+ #define HOST_BYTEORDER_IS_LE
	+ #else
	+ #define HOST_BYTEORDER_IS_BE
	+ #endif
	#elif defined(__BYTE_ORDER__)
	#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
	#define HOST_BYTEORDER_IS_LE
	#else
	#define HOST_BYTEORDER_IS_BE
	#endif
	#else
	#error "Unable to determine host byteorder"
	#endif

	// And finally we can define the endianness conversion macros
	#ifdef HOST_BYTEORDER_IS_LE
	#ifndef be16toh
	#define be16toh(x) bswap_16(x)
	#endif
	#ifndef htobe16
	#define htobe16(x) bswap_16(x)
	#endif
	#ifndef be32toh
	#define be32toh(x) bswap_32(x)
	#endif
	#ifndef htobe32
	#define htobe32(x) bswap_32(x)
	#endif
	#ifndef be64toh
	#define be64toh(x) bswap_64(x)
	#endif
	#ifndef htobe64
	#define htobe64(x) bswap_64(x)
	#endif
	#ifndef le16toh
	#define le16toh(x) (x)
	#endif
	#ifndef htole16
	#define htole16(x) (x)
	#endif
	#ifndef le32toh
	#define le32toh(x) (x)
	#endif
	#ifndef htole32
	#define htole32(x) (x)
	#endif
	#ifndef le64toh
	#define le64toh(x) (x)
	#endif
	#ifndef htole64
	#define htole64(x) (x)
	#endif
	#else
	#ifndef be16toh
	#define be16toh(x) (x)
	#endif
	#ifndef htobe16
	#define htobe16(x) (x)
	#endif
	#ifndef be32toh
	#define be32toh(x) (x)
	#endif
	#ifndef htobe32
	#define htobe32(x) (x)
	#endif
	#ifndef be64toh
	#define be64toh(x) (x)
	#endif
	#ifndef htobe64
	#define htobe64(x) (x)
	#endif
	#ifndef le16toh
	#define le16toh(x) bswap_16(x)
	#endif
	#ifndef htole16
	#define htole16(x) bswap_16(x)
	#endif
	#ifndef le32toh
	#define le32toh(x) bswap_32(x)
	#endif
	#ifndef htole32
	#define htole32(x) bswap_32(x)
	#endif
	#ifndef le64toh
	#define le64toh(x) bswap_64(x)
	#endif
	#ifndef htole64
	#define htole64(x) bswap_64(x)
	#endif
	#endif

	#endif //ENDIANNESS_H

	diff --git a/tags/xmount-0.7.0/libxmount/libxmount.c b/tags/xmount-0.7.0/libxmount/libxmount.c
	new file mode 100644
	index 0000000..3da9b8e
	--- /dev/null
	+++ b/tags/xmount-0.7.0/libxmount/libxmount.c
	@@ -0,0 +1,126 @@
	+/*******************************************************************************
	+* xmount Copyright (c) 2008-2014 by Gillen Daniel <gillen.dan@pinguin.lu> *
	+* *
	+* This program is free software: you can redistribute it and/or modify it *
	+* under the terms of the GNU General Public License as published by the Free *
	+* Software Foundation, either version 3 of the License, or (at your option) *
	+* any later version. *
	+* *
	+* This program is distributed in the hope that it will be useful, but WITHOUT *
	+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
	+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for *
	+* more details. *
	+* *
	+* You should have received a copy of the GNU General Public License along with *
	+* this program. If not, see <http://www.gnu.org/licenses/>. *
	+*******************************************************************************/
	+
	+#include <config.h>
	+
	+#include <stdlib.h>
	+#include <stdio.h>
	+#include <stdint.h>
	+#include <errno.h>
	+#include <stdarg.h>
	+
	+#include "libxmount.h"
	+
	+//! Print error and debug messages to stdout
	+/*!
	+ * \param p_msg_type "ERROR" or "DEBUG"
	+ * \param p_calling_fun Name of calling function
	+ * \param line Line number of call
	+ * \param p_msg Message string
	+ * \param ... Variable params with values to include in message string
	+ */
	+/*
	+ * LogMessage
	+ */
	+void LogMessage(char *p_msg_type,
	+ char *p_calling_fun,
	+ int line,
	+ char *p_msg,
	+ ...)
	+{
	+ va_list var_list;
	+
	+ // Print message "header"
	+ printf("%s: %s@%u : ",p_msg_type,p_calling_fun,line);
	+ // Print message with variable parameters
	+ va_start(var_list,p_msg);
	+ vprintf(p_msg,var_list);
	+ va_end(var_list);
	+}
	+
	+/*
	+ * StrToInt32
	+ */
	+int32_t StrToInt32(const char p_value, int p_ok) {
	+ long int num;
	+ char *p_tail;
	+
	+ errno=0;
	+ num=strtol(p_value,&p_tail,0);
	+ if(errno==ERANGE \|\| *p_tail!='\0' \|\| num<INT32_MIN \|\| num>INT32_MAX) {
	+ *p_ok=0;
	+ return 0;
	+ }
	+
	+ *p_ok=1;
	+ return (int32_t)num;
	+}
	+
	+/*
	+ * StrToUint32
	+ */
	+uint32_t StrToUint32(const char p_value, int p_ok) {
	+ unsigned long int num;
	+ char *p_tail;
	+
	+ errno=0;
	+ num=strtoul(p_value,&p_tail,0);
	+ if(errno==ERANGE \|\| *p_tail!='\0' \|\| num>UINT32_MAX) {
	+ *p_ok=0;
	+ return 0;
	+ }
	+
	+ *p_ok=1;
	+ return (uint32_t)num;
	+}
	+
	+/*
	+ * StrToInt64
	+ */
	+int64_t StrToInt64(const char p_value, int p_ok) {
	+ long long int num;
	+ char *p_tail;
	+
	+ errno=0;
	+ num=strtoll(p_value,&p_tail,0);
	+ if(errno==ERANGE \|\| *p_tail!='\0' \|\| num<INT64_MIN \|\| num>INT64_MAX) {
	+ *p_ok=0;
	+ return 0;
	+ }
	+
	+ *p_ok=1;
	+ return (int64_t)num;
	+}
	+
	+/*
	+ * StrToUint64
	+ */
	+uint64_t StrToUint64(const char p_value, int p_ok) {
	+ unsigned long long int num;
	+ char *p_tail;
	+
	+ errno=0;
	+ num=strtoull(p_value,&p_tail,0);
	+ if(errno==ERANGE \|\| *p_tail!='\0' \|\| num>UINT64_MAX) {
	+ *p_ok=0;
	+ return 0;
	+ }
	+
	+ *p_ok=1;
	+ return (uint64_t)num;
	+}
	+
	diff --git a/tags/xmount-0.7.0/libxmount/libxmount.h b/tags/xmount-0.7.0/libxmount/libxmount.h
	new file mode 100644
	index 0000000..e185801
	--- /dev/null
	+++ b/tags/xmount-0.7.0/libxmount/libxmount.h
	@@ -0,0 +1,66 @@
	+/*******************************************************************************
	+* xmount Copyright (c) 2008-2014 by Gillen Daniel <gillen.dan@pinguin.lu> *
	+* *
	+* This program is free software: you can redistribute it and/or modify it *
	+* under the terms of the GNU General Public License as published by the Free *
	+* Software Foundation, either version 3 of the License, or (at your option) *
	+* any later version. *
	+* *
	+* This program is distributed in the hope that it will be useful, but WITHOUT *
	+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
	+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for *
	+* more details. *
	+* *
	+* You should have received a copy of the GNU General Public License along with *
	+* this program. If not, see <http://www.gnu.org/licenses/>. *
	+*******************************************************************************/
	+
	+#ifndef LIBXMOUNT_H
	+#define LIBXMOUNT_H
	+
	+#include "endianness.h"
	+
	+/*
	+ * Macros to ease debugging and error reporting
	+ */
	+#define LIBXMOUNT_LOG_ERROR(...) { \
	+ LogMessage("ERROR",(char*)__FUNCTION__,__LINE__,__VA_ARGS__); \
	+}
	+#define LIBXMOUNT_LOG_WARNING(...) { \
	+ LogMessage("WARNING",(char*)__FUNCTION__,__LINE__,__VA_ARGS__); \
	+}
	+#define LIBXMOUNT_LOG_DEBUG(debug,...) { \
	+ if(debug) LogMessage("DEBUG",(char*)__FUNCTION__,__LINE__,__VA_ARGS__); \
	+}
	+
	+//! Struct containing lib options
	+typedef struct s_LibXmountOptions {
	+ //! Option name
	+ char *p_key;
	+ //! Option value
	+ char *p_value;
	+ //! Set to 1 if key/value has been parsed and is valid
	+ uint8_t valid;
	+} ts_LibXmountOptions, *pts_LibXmountOptions;
	+
	+//! Log messages
	+/*!
	+ * \param p_msg_type "ERROR", "DEBUG", etc...
	+ * \param p_calling_fun Name of calling function
	+ * \param line Line number of call
	+ * \param p_msg Message string
	+ * \param ... Variable params with values to include in message string
	+ */
	+void LogMessage(char *p_msg_type,
	+ char *p_calling_fun,
	+ int line,
	+ char *p_msg,
	+ ...);
	+
	+int32_t StrToInt32(const char p_value, int p_ok);
	+uint32_t StrToUint32(const char p_value, int p_ok);
	+int64_t StrToInt64(const char p_value, int p_ok);
	+uint64_t StrToUint64(const char p_value, int p_ok);
	+
	+#endif // LIBXMOUNT_H
	+
	diff --git a/tags/xmount-0.7.0/libxmount_input/CMakeLists.txt b/tags/xmount-0.7.0/libxmount_input/CMakeLists.txt
	new file mode 100644
	index 0000000..5341d71
	--- /dev/null
	+++ b/tags/xmount-0.7.0/libxmount_input/CMakeLists.txt
	@@ -0,0 +1,28 @@
	+add_subdirectory(libxmount_input_raw)
	+
	+if(NOT STATIC_EWF)
	+ find_package(LibEWF)
	+ if(LIBEWF_FOUND)
	+ add_subdirectory(libxmount_input_ewf)
	+ endif(LIBEWF_FOUND)
	+else(NOT STATIC_EWF)
	+ message(STATUS "Not checking for LibEWF (STATIC_EWF = 1)")
	+ add_subdirectory(libxmount_input_ewf)
	+endif(NOT STATIC_EWF)
	+
	+if(NOT STATIC_AFF)
	+ find_package(LibAFF)
	+ if(LIBAFF_FOUND)
	+ add_subdirectory(libxmount_input_aff)
	+ endif(LIBAFF_FOUND)
	+else(NOT STATIC_AFF)
	+ message(STATUS "Not checking for LibAFF (STATIC_AFF = 1)")
	+ add_subdirectory(libxmount_input_aff)
	+endif(NOT STATIC_AFF)
	+
	+find_package(LibZ)
	+if(LIBZ_FOUND)
	+ add_subdirectory(libxmount_input_aewf)
	+ add_subdirectory(libxmount_input_aaff)
	+endif(LIBZ_FOUND)
	+
	diff --git a/tags/xmount-0.7.0/libxmount_input/libxmount_input.h b/tags/xmount-0.7.0/libxmount_input/libxmount_input.h
	new file mode 100644
	index 0000000..fd0fd78
	--- /dev/null
	+++ b/tags/xmount-0.7.0/libxmount_input/libxmount_input.h
	@@ -0,0 +1,225 @@
	+/*******************************************************************************
	+* xmount Copyright (c) 2008-2014 by Gillen Daniel <gillen.dan@pinguin.lu> *
	+* *
	+* This program is free software: you can redistribute it and/or modify it *
	+* under the terms of the GNU General Public License as published by the Free *
	+* Software Foundation, either version 3 of the License, or (at your option) *
	+* any later version. *
	+* *
	+* This program is distributed in the hope that it will be useful, but WITHOUT *
	+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
	+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for *
	+* more details. *
	+* *
	+* You should have received a copy of the GNU General Public License along with *
	+* this program. If not, see <http://www.gnu.org/licenses/>. *
	+*******************************************************************************/
	+
	+#ifndef LIBXMOUNT_INPUT_H
	+#define LIBXMOUNT_INPUT_H
	+
	+#define LIBXMOUNT_INPUT_API_VERSION 1
	+
	+#include <config.h>
	+
	+#include <stdint.h> // For int_t and uint_t
	+#include <inttypes.h> // For PRI*
	+
	+#include "../libxmount/libxmount.h"
	+
	+//! Structure containing pointers to the lib's functions
	+typedef struct s_LibXmountInputFunctions {
	+ //! Function to initialize handle
	+ /*!
	+ * This function is called once to allow the lib to alloc any needed
	+ * structures before other functions that rely upon a valid handle are called
	+ * (for ex. OptionsParse or Open).
	+ *
	+ * The p_format parameter specifies one of the formats returned by
	+ * LibXmount_Input_GetSupportedFormats() which should be used for this handle.
	+ *
	+ * \param pp_handle Pointer to handle
	+ * \param p_format Input image format
	+ * \param debug If set to 1, print debugging infos to stdout
	+ * \return 0 on success or error code
	+ */
	+ int (CreateHandle)(void *pp_handle,
	+ const char *p_format,
	+ uint8_t debug);
	+
	+ //! Function to destroy handle
	+ /*!
	+ * In this function, any structures allocated with CreateHandle should be
	+ * freed. It is generally the last function called before unloading of lib
	+ * happens.
	+ *
	+ * By convention, after this function has been called, *pp_handle must be
	+ * NULL.
	+ *
	+ * \param pp_handle Pointer to handle
	+ * \return 0 on success or error code
	+ */
	+ int (DestroyHandle)(void *pp_handle);
	+
	+ //! Function to open input image
	+ /*!
	+ * Opens the specified image for reading.
	+ *
	+ * \param p_handle Handle
	+ * \param pp_filename_arr Array containing all specified input images
	+ * \param filename_arr_len Length of pp_filename_arr
	+ * \return 0 on success or error code
	+ */
	+ int (Open)(void p_handle,
	+ const char **pp_filename_arr,
	+ uint64_t filename_arr_len);
	+
	+ //! Function to close opened input image
	+ /*!
	+ * Closes input image and frees any memory allocaed during opening but does
	+ * not invalidate the main handle. Further calls to for ex. Open() must still
	+ * be possible without first calling CreateHandle again!
	+ *
	+ * \param p_handle Handle
	+ * \return 0 on success or error code
	+ */
	+ int (Close)(void p_handle);
	+
	+ //! Function to get the input image's size
	+ /*!
	+ * Returns the real size of the input image. Real means the size of the
	+ * uncompressed or otherwise made available data contained inside the input
	+ * image.
	+ *
	+ * \param p_handle Handle
	+ * \param p_size Pointer to store input image's size to
	+ * \return 0 on success or error code
	+ */
	+ int (Size)(void p_handle,
	+ uint64_t *p_size);
	+
	+ //! Function to read data from input image
	+ /*!
	+ * Reads count bytes at offset from input image and copies them into memory
	+ * starting at the address of p_buf. Memory is pre-allocated to as much bytes
	+ * as should be read.
	+ *
	+ * \param p_handle Handle
	+ * \param p_buf Buffer to store read data to
	+ * \param offset Position at which to start reading
	+ * \param count Amount of bytes to read
	+ * \param p_read Amount of bytes read
	+ * \param p_errno errno in case of an error
	+ * \return 0 on success or error code
	+ */
	+ int (Read)(void p_handle,
	+ char *p_buf,
	+ off_t offset,
	+ size_t count,
	+ size_t *p_read,
	+ int *p_errno);
	+
	+ //! Function to get a help message for any supported lib-specific options
	+ /*!
	+ * Calling this function should return a string containing help messages for
	+ * any supported lib-specific options. Lines should be formated as follows:
	+ *
	+ * " option : description\n"
	+ *
	+ * Returned string will be freed by the caller using FreeBuffer().
	+ *
	+ * If there is no help text, this function must return NULL in pp_help.
	+ *
	+ * \param Pointer to a string to return help text
	+ * \return 0 on success or error code on error
	+ */
	+ int (OptionsHelp)(const char *pp_help);
	+
	+ //! Function to parse any lib-specific options
	+ /*!
	+ * This function is called with the options given with the --inopts parameter.
	+ * For all options that are valid for the lib, the option's valid member
	+ * must be set to 1. If errors are encountered, this function should fail and
	+ * return an error message in pp_error. pp_error will be freed by the caller
	+ * by using FreeBuffer.
	+ *
	+ * \param p_handle Handle
	+ * \param options_count Count of elements in pp_options
	+ * \param pp_options Input library options
	+ * \param pp_error Pointer to a string with error message
	+ * \return 0 on success or error code and error message on error
	+ */
	+ int (OptionsParse)(void p_handle,
	+ uint32_t options_count,
	+ const pts_LibXmountOptions *pp_options,
	+ const char **pp_error);
	+
	+ //! Function to get content to add to the info file
	+ /*!
	+ * The returned string is added to xmount's info file. This function is only
	+ * called once when the info file is generated. The returned string is then
	+ * freed with a call to FreeBuffer().
	+ *
	+ * \param p_handle Handle
	+ * \param pp_info_buf Pointer to store the null-terminated content
	+ * \return 0 on success or error code
	+ */
	+ int (GetInfofileContent)(void p_handle,
	+ const char **pp_info_buf);
	+
	+ //! Function to get an error message
	+ /*!
	+ * This function should translate an error code that was previously returned
	+ * by one of the library functions into a human readable error message.
	+ *
	+ * By convention, this function must always return a valid pointer to a
	+ * NULL-terminated string!
	+ *
	+ * \param err_num Error code as returned by lib
	+ */
	+ const char* (*GetErrorMessage)(int err_num);
	+
	+ //! Function to free buffers that were allocated by lib
	+ /*!
	+ * \param p_buf Buffer to free
	+ * \return 0 on success or error code
	+ */
	+ int (FreeBuffer)(void p_buf);
	+} ts_LibXmountInputFunctions, *pts_LibXmountInputFunctions;
	+
	+//! Get library API version
	+/*!
	+ * This function should return the value of LIBXMOUNT_INPUT_API_VERSION
	+ *
	+ * \return Supported version
	+ */
	+uint8_t LibXmount_Input_GetApiVersion();
	+typedef uint8_t (*t_LibXmount_Input_GetApiVersion)();
	+
	+//! Get a list of supported formats
	+/*!
	+ * Gets a list of supported input image formats. These are the strings
	+ * specified with xmount's --in <string> command line option. The returned
	+ * string must be a constant vector of image formats split by \0 chars. To mark
	+ * the end of the vector, a single \0 must be used.
	+ *
	+ * As an example, "first\0second\0\0" would be a correct vector to return for
	+ * a lib supporting two input image formats.
	+ *
	+ * \return Vector containing supported format strings
	+ */
	+const char* LibXmount_Input_GetSupportedFormats();
	+typedef const char* (*t_LibXmount_Input_GetSupportedFormats)();
	+
	+//! Get the lib's s_LibXmountInputFunctions structure
	+/*!
	+ * This function should set the members of the given s_LibXmountInputFunctions
	+ * structure to the internal lib functions. All members have to be set.
	+ *
	+ * \param p_functions s_LibXmountInputFunctions structure to fill
	+ */
	+void LibXmount_Input_GetFunctions(pts_LibXmountInputFunctions p_functions);
	+typedef void (*t_LibXmount_Input_GetFunctions)(pts_LibXmountInputFunctions);
	+
	+#endif // LIBXMOUNT_INPUT_H
	+
	diff --git a/trunk/libxmount_input/libxmount_input_aaff/CMakeLists.txt b/tags/xmount-0.7.0/libxmount_input/libxmount_input_aaff/CMakeLists.txt
	similarity index 65%
	copy from trunk/libxmount_input/libxmount_input_aaff/CMakeLists.txt
	copy to tags/xmount-0.7.0/libxmount_input/libxmount_input_aaff/CMakeLists.txt
	index 5b82e5a..bc66c4d 100644
	--- a/trunk/libxmount_input/libxmount_input_aaff/CMakeLists.txt
	+++ b/tags/xmount-0.7.0/libxmount_input/libxmount_input_aaff/CMakeLists.txt
	@@ -1,8 +1,14 @@
	-project(libxmount_input_aaff)
	+if(POLICY CMP0042)
	+ cmake_policy(SET CMP0042 NEW) # CMake 3.0
	+endif(POLICY CMP0042)
	+
	+project(libxmount_input_aaff C)

	add_library(xmount_input_aaff SHARED libxmount_input_aaff.c)
	+
	include_directories(${LIBZ_INCLUDE_DIRS})
	+
	target_link_libraries(xmount_input_aaff ${LIBZ_LIBRARIES})

	install(TARGETS xmount_input_aaff DESTINATION lib/xmount)

	diff --git a/trunk/libxmount_input/libxmount_input_aaff/libxmount_input_aaff.c b/tags/xmount-0.7.0/libxmount_input/libxmount_input_aaff/libxmount_input_aaff.c
	similarity index 99%
	copy from trunk/libxmount_input/libxmount_input_aaff/libxmount_input_aaff.c
	copy to tags/xmount-0.7.0/libxmount_input/libxmount_input_aaff/libxmount_input_aaff.c
	index 272896b..c81c1ef 100644
	--- a/trunk/libxmount_input/libxmount_input_aaff/libxmount_input_aaff.c
	+++ b/tags/xmount-0.7.0/libxmount_input/libxmount_input_aaff/libxmount_input_aaff.c
	@@ -1,1046 +1,1046 @@
	/*******************************************************************************
	* xmount Copyright (c) 2008-2014 by Gillen Daniel <gillen.dan@pinguin.lu> *
	* *
	* This module has been written by Guy Voncken. It contains the functions for *
	* accessing simple AFF images created by Guymager. *
	* *
	* This program is free software: you can redistribute it and/or modify it *
	* under the terms of the GNU General Public License as published by the Free *
	* Software Foundation, either version 3 of the License, or (at your option) *
	* any later version. *
	* *
	* This program is distributed in the hope that it will be useful, but WITHOUT *
	* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
	* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for *
	* more details. *
	* *
	* You should have received a copy of the GNU General Public License along with *
	* this program. If not, see <http://www.gnu.org/licenses/>. *
	*******************************************************************************/

	// Please don't touch source code formatting!

	#ifdef LINTING
	// #define _LARGEFILE_SOURCE
	// #define _FILE_OFFSET_BITS 64
	#define AAFF_STANDALONE
	#endif

	#ifdef AAFF_STANDALONE
	#define LOG_STDOUT TRUE
	#endif

	#include <netinet/in.h>
	#include <string.h>
	#include <stddef.h>
	#include <stdio.h>
	#include <stdlib.h>
	+#include <stdarg.h>
	#include <locale.h>
	#include <limits.h>
	#include <zlib.h>
	#include <time.h>
	#include <errno.h>

	-
	#include "../libxmount_input.h"

	#include "libxmount_input_aaff.h"

	static int AaffClose (void *pHandle);
	static const char* AaffGetErrorMessage (int ErrNum);

	#define AAFF_OPTION_MAXPAGEARRMEM "aaffmaxmem"
	#define AAFF_OPTION_LOG "aafflog"

	// ----------------------------
	// Logging and error handling
	// ----------------------------

	#define LOG_HEADER_LEN 80

	int LogvEntry (const char pLogFileName, uint8_t LogStdout, const char pFileName, const char pFunctionName, int LineNr, const char pFormat, va_list pArguments)
	{
	time_t NowT;
	struct tm *pNowTM;
	FILE *pFile;
	int wr;
	char *pFullLogFileName = NULL;
	const char *pBase;
	char LogLineHeader[1024];
	pid_t OwnPID;

	if (!LogStdout && (pLogFileName==NULL))
	return AAFF_OK;

	time (&NowT);
	pNowTM = localtime (&NowT);
	OwnPID = getpid(); // pthread_self()
	wr = (int) strftime (&LogLineHeader[0] , sizeof(LogLineHeader) , "%a %d.%b.%Y %H:%M:%S ", pNowTM); //lint !e713
	wr += snprintf (&LogLineHeader[wr], sizeof(LogLineHeader)-wr, "%5d ", OwnPID); //lint !e737

	if (pFileName && pFunctionName)
	{
	pBase = strrchr(pFileName, '/');
	if (pBase)
	pFileName = pBase+1;
	wr += snprintf (&LogLineHeader[wr], sizeof(LogLineHeader)-wr, "%s %s %d ", pFileName, pFunctionName, LineNr); //lint !e737
	}

	// while (wr < LOG_HEADER_LEN)
	// LogLineHeader[wr++] = ' ';

	if (pLogFileName)
	{
	wr = asprintf (&pFullLogFileName, "%s_%d", pLogFileName, OwnPID);
	if ((wr <= 0) \|\| (pFullLogFileName == NULL))
	{
	if (LogStdout)
	printf ("\nLog file error: Can't build filename");
	return AAFF_MEMALLOC_FAILED;
	}
	else
	{
	pFile = fopen64 (pFullLogFileName, "a");
	if (pFile == NULL)
	{
	if (LogStdout)
	printf ("\nLog file error: Can't be opened");
	return AAFF_CANNOT_OPEN_LOGFILE;
	}
	else
	{
	fprintf (pFile, "%-*s", LOG_HEADER_LEN, &LogLineHeader[0]);
	vfprintf (pFile, pFormat, pArguments);
	fprintf (pFile, "\n");
	fclose (pFile);
	}
	free (pFullLogFileName);
	}
	}
	if (LogStdout)
	{
	printf ("%s", &LogLineHeader[0]);
	vprintf (pFormat, pArguments);
	printf ("\n");
	}
	return AAFF_OK;
	}

	int LogEntry (const char pLogFileName, uint8_t LogStdout, const char pFileName, const char pFunctionName, int LineNr, const char pFormat, ...)
	{
	va_list VaList;
	int rc;

	if (!LogStdout && (pLogFileName==NULL))
	return AAFF_OK;

	va_start (VaList, pFormat); //lint !e530 Symbol 'VaList' not initialized
	rc = LogvEntry (pLogFileName, LogStdout, pFileName, pFunctionName, LineNr, pFormat, VaList);
	va_end(VaList);
	return rc;
	}

	// CHK requires existance of pAaff handle

	#ifdef AAFF_STANDALONE
	#define LOG_ERRORS_ON_STDOUT TRUE
	#else
	#define LOG_ERRORS_ON_STDOUT pAaff->LogStdout
	#endif

	#define CHK(ChkVal) \
	{ \
	int ChkValRc; \
	if ((ChkValRc=(ChkVal)) != AAFF_OK) \
	{ \
	const char *pErr = AaffGetErrorMessage (ChkValRc); \
	LogEntry (pAaff->pLogFilename, LOG_ERRORS_ON_STDOUT, __FILE__, __FUNCTION__, __LINE__, "Error %d (%s) occured", ChkValRc, pErr); \
	return ChkValRc; \
	} \
	}

	#define LOG(...) \
	LogEntry (pAaff->pLogFilename, pAaff->LogStdout, __FILE__, __FUNCTION__, __LINE__, __VA_ARGS__);


	// AaffCheckError is called before exiting AaffRead. It should not
	// be called elsewehere or else the statistics would become wrong.
	static void AaffCheckError (t_pAaff pAaff, int Ret, int *pErrno)
	{
	*pErrno = 0;
	if (Ret != AAFF_OK)
	{
	if ((Ret >= AAFF_ERROR_ENOMEM_START) && (Ret <= AAFF_ERROR_ENOMEM_END)) *pErrno = ENOMEM;
	else if ((Ret >= AAFF_ERROR_EINVAL_START) && (Ret <= AAFF_ERROR_EINVAL_END)) *pErrno = EINVAL;
	else *pErrno = EIO; // all other errors
	}
	}

	// ------------------------------------
	// Internal functions
	// ------------------------------------

	uint64_t AaffU64 (char *pData)
	{
	uint64_t Val=0;
	int i;

	for (i=4; i<8; i++) Val = (Val << 8) \| pData[i];
	for (i=0; i<4; i++) Val = (Val << 8) \| pData[i];

	return Val;
	}

	static int AaffPageNumberFromSegmentName (char pSegmentName, uint64_t pPageNumber)
	{
	char *pSegmentNamePageNumber;
	char *pTail;

	pSegmentNamePageNumber = &pSegmentName[strlen(AFF_SEGNAME_PAGE)];
	*pPageNumber = strtoull (pSegmentNamePageNumber, &pTail, 10);
	if (*pTail != '\0')
	return AAFF_INVALID_PAGE_NUMBER; // There should be no extra chars after the number

	return AAFF_OK;
	}

	static inline uint64_t AaffGetCurrentSeekPos (t_Aaff *pAaff)
	{
	return ftello (pAaff->pFile);
	}

	static inline uint64_t AaffSetCurrentSeekPos (t_Aaff *pAaff, uint64_t Val, int Whence)
	{
	if (fseeko (pAaff->pFile, Val, Whence) != 0)
	return AAFF_CANNOT_SEEK;
	return AAFF_OK;
	}


	static int AaffReadFile (t_Aaff pAaff, void pData, uint32_t DataLen)
	{
	if (fread (pData, DataLen, 1, pAaff->pFile) != 1)
	return AAFF_CANNOT_READ_DATA;

	return AAFF_OK;
	}

	static int AaffRealloc (void *ppBuff, uint32_t pCurrentLen, uint32_t NewLen)
	{
	if (NewLen > *pCurrentLen)
	{
	ppBuff = realloc (ppBuff, NewLen);
	if (*ppBuff == NULL)
	return AAFF_MEMALLOC_FAILED;
	*pCurrentLen = NewLen;
	}
	return AAFF_OK;
	}

	static int AaffReadSegment (t_pAaff pAaff, char *ppName, uint32_t pArg, char *ppData, uint32_t pDataLen)
	{
	t_AffSegmentHeader Header;
	t_AffSegmentFooter Footer;

	CHK (AaffReadFile (pAaff, &Header, offsetof(t_AffSegmentHeader, Name)))
	if (strcmp (&Header.Magic[0], AFF_SEGMENT_HEADER_MAGIC) != 0)
	return AAFF_INVALID_HEADER;
	Header.NameLen = ntohl (Header.NameLen );
	Header.DataLen = ntohl (Header.DataLen );
	Header.Argument = ntohl (Header.Argument);
	CHK (AaffRealloc ((void**)&pAaff->pNameBuff, &pAaff->NameBuffLen, Header.NameLen+1)) // alloc +1, as is might be a string which can be more
	CHK (AaffRealloc ((void**)&pAaff->pDataBuff, &pAaff->DataBuffLen, Header.DataLen+1)) // easily handled by the calling fn when adding a \0
	CHK (AaffReadFile (pAaff, pAaff->pNameBuff, Header.NameLen))
	if (Header.DataLen)
	CHK (AaffReadFile (pAaff, pAaff->pDataBuff, Header.DataLen))

	pAaff->pNameBuff[Header.NameLen] = '\0';
	pAaff->pDataBuff[Header.DataLen] = '\0';

	if (ppName) *ppName = pAaff->pNameBuff;
	if (pArg ) *pArg = Header.Argument;
	if (ppData) *ppData = pAaff->pDataBuff;
	if (pDataLen) *pDataLen = Header.DataLen;

	// Read footer and position file pointer to next segemnt at the same time
	// ----------------------------------------------------------------------
	CHK (AaffReadFile (pAaff, &Footer, sizeof(Footer)))
	if (strcmp (&Footer.Magic[0], AFF_SEGMENT_FOOTER_MAGIC) != 0)
	return AAFF_INVALID_FOOTER;

	return AAFF_OK;
	}

	static int AaffReadSegmentPage (t_pAaff pAaff, uint64_t SearchPage, uint64_t pFoundPage, char ppData, uint32_t pDataLen)
	{
	t_AffSegmentHeader Header;
	t_AffSegmentFooter Footer;
	char SearchPageStr[128];
	int rc = AAFF_OK;

	*ppData = NULL;
	*pDataLen = 0;
	sprintf (SearchPageStr, "page%" PRIu64, SearchPage);

	CHK (AaffReadFile (pAaff, &Header, offsetof(t_AffSegmentHeader, Name)))
	if (strcmp (&Header.Magic[0], AFF_SEGMENT_HEADER_MAGIC) != 0)
	return AAFF_INVALID_HEADER;
	Header.NameLen = ntohl (Header.NameLen );
	Header.DataLen = ntohl (Header.DataLen );
	Header.Argument = ntohl (Header.Argument);
	CHK (AaffRealloc ((void**)&pAaff->pNameBuff, &pAaff->NameBuffLen, Header.NameLen+1))
	CHK (AaffReadFile (pAaff, pAaff->pNameBuff, Header.NameLen))
	pAaff->pNameBuff[Header.NameLen] = '\0';

	if (strncmp (pAaff->pNameBuff, AFF_SEGNAME_PAGE, strlen(AFF_SEGNAME_PAGE)) != 0)
	return AAFF_WRONG_SEGMENT;

	CHK (AaffPageNumberFromSegmentName (pAaff->pNameBuff, pFoundPage))
	if (*pFoundPage == SearchPage)
	{
	unsigned int Len;
	uLongf ZLen;
	int zrc;

	switch (Header.Argument)
	{
	case AFF_PAGEFLAGS_UNCOMPRESSED:
	CHK (AaffReadFile (pAaff, pAaff->pPageBuff, Header.DataLen))
	pAaff->PageBuffDataLen = Header.DataLen;
	break;
	case AFF_PAGEFLAGS_COMPRESSED_ZERO:
	CHK (AaffReadFile (pAaff, &Len, sizeof(Len)))
	Len = ntohl (Len);
	memset (pAaff->pPageBuff, 0, Len);
	pAaff->PageBuffDataLen = Len;
	break;
	case AFF_PAGEFLAGS_COMPRESSED_ZLIB:
	CHK (AaffRealloc ((void**)&pAaff->pDataBuff, &pAaff->DataBuffLen, Header.DataLen));
	CHK (AaffReadFile (pAaff, pAaff->pDataBuff, Header.DataLen)) // read into pDataBuff
	ZLen = pAaff->PageSize; // size of pPageBuff
	zrc = uncompress ((unsigned char)(pAaff->pPageBuff), &ZLen, (unsigned char)(pAaff->pDataBuff), Header.DataLen); // uncompress into pPageBuff
	pAaff->PageBuffDataLen = ZLen;
	if (zrc != Z_OK)
	return AAFF_UNCOMPRESS_FAILED;
	break;
	default:
	return AAFF_INVALID_PAGE_ARGUMENT;
	}
	*ppData = pAaff->pPageBuff;
	*pDataLen = pAaff->PageBuffDataLen;
	pAaff->CurrentPage = *pFoundPage;
	rc = AAFF_FOUND;
	}
	else
	{
	CHK (AaffSetCurrentSeekPos (pAaff, Header.DataLen, SEEK_CUR))
	}

	// Read footer and position file pointer to next segemnt at the same time
	// ----------------------------------------------------------------------
	CHK (AaffReadFile (pAaff, &Footer, sizeof(Footer)))
	if (strcmp (&Footer.Magic[0], AFF_SEGMENT_FOOTER_MAGIC) != 0)
	return AAFF_INVALID_FOOTER;

	return rc;
	}

	static int AaffReadPage (t_pAaff pAaff, uint64_t Page, char *ppBuffer, uint32_t pLen)
	{
	if (Page >= pAaff->TotalPages)
	return AAFF_READ_BEYOND_LAST_PAGE;

	// Check if it's the current page
	// ------------------------------
	if (Page == pAaff->CurrentPage)
	{
	*ppBuffer = pAaff->pPageBuff;
	*pLen = pAaff->PageBuffDataLen;
	return AAFF_OK;
	}

	// Set the seek position for starting the search
	// ---------------------------------------------
	int MaxHops;

	if ((pAaff->CurrentPage != AAFF_CURRENTPAGE_NOTSET) &&
	(pAaff->CurrentPage+1 == Page)) // The current seek pos already is the correct one
	{
	MaxHops = 1;
	}
	else // Find the closest entry in PageSeekArr
	{
	int64_t Entry;

	Entry = Page / pAaff->Interleave;
	while (pAaff->pPageSeekArr[Entry] == 0)
	{
	Entry--;
	if (Entry<0)
	return AAFF_SEEKARR_CORRUPT;
	}
	AaffSetCurrentSeekPos (pAaff, pAaff->pPageSeekArr[Entry], SEEK_SET);
	MaxHops = Page - (Entry * pAaff->Interleave) +1;
	}

	// Run through segment list until page is found
	// --------------------------------------------
	uint64_t Seek;
	uint64_t FoundPage=0;
	int rc;

	LOG ("Searching for page %" PRIu64 ", MaxHops=%d", Page, MaxHops);
	while (MaxHops--)
	{
	Seek = AaffGetCurrentSeekPos (pAaff);
	rc = AaffReadSegmentPage (pAaff, Page, &FoundPage, ppBuffer, pLen);
	if (rc != AAFF_FOUND)
	CHK (rc)
	LOG (" %" PRIu64 " (%d)", FoundPage, rc);
	if ((FoundPage % pAaff->Interleave) == 0)
	pAaff->pPageSeekArr[FoundPage/pAaff->Interleave] = Seek;
	if (rc == AAFF_FOUND)
	break;
	}
	if (MaxHops < 0)
	return AAFF_PAGE_NOT_FOUND;

	return AAFF_OK;
	}

	// ---------------
	// API functions
	// ---------------

	static int AaffCreateHandle (void *ppHandle, const char pFormat, uint8_t Debug)
	{
	t_pAaff pAaff;

	*ppHandle = NULL;

	pAaff = (t_pAaff) malloc (sizeof(t_Aaff));
	if (pAaff == NULL)
	return AAFF_MEMALLOC_FAILED;

	memset (pAaff, 0, sizeof(t_Aaff));
	pAaff->MaxPageArrMem = AAFF_DEFAULT_MAX_PAGE_ARR_MEM;
	pAaff->LogStdout = Debug;

	ppHandle = (void) pAaff;

	return AAFF_OK;
	}

	static int AaffDestroyHandle (void **ppHandle)
	{
	t_pAaff pAaff = (t_pAaff) *ppHandle;

	if (pAaff->pFilename) free (pAaff->pFilename);
	if (pAaff->pPageSeekArr) free (pAaff->pPageSeekArr);
	if (pAaff->pLibVersion) free (pAaff->pLibVersion);
	if (pAaff->pFileType) free (pAaff->pFileType);
	if (pAaff->pNameBuff) free (pAaff->pNameBuff);
	if (pAaff->pDataBuff) free (pAaff->pDataBuff);
	if (pAaff->pPageBuff) free (pAaff->pPageBuff);
	if (pAaff->pInfoBuffConst) free (pAaff->pInfoBuffConst);
	if (pAaff->pInfoBuff) free (pAaff->pInfoBuff);

	memset (pAaff, 0, sizeof(t_Aaff));
	free (pAaff);
	*ppHandle = NULL;

	return AAFF_OK;
	}


	int AaffOpen (void pHandle, const char *ppFilenameArr, uint64_t FilenameArrLen)
	{
	t_pAaff pAaff = (t_pAaff) pHandle;
	char Signature[strlen(AFF_HEADER)+1];
	uint64_t Seek;

	LOG ("Called - Files=%" PRIu64, FilenameArrLen);

	if (FilenameArrLen != 1)
	CHK (AAFF_SPLIT_IMAGES_NOT_SUPPORTED)

	pAaff->pFilename = strdup (ppFilenameArr[0]);
	pAaff->pFile = fopen (ppFilenameArr[0],"r");
	if(pAaff->pFile==NULL)
	{
	(void) AaffDestroyHandle ((void**) &pAaff);
	CHK (AAFF_FILE_OPEN_FAILED)
	}

	// Check signature
	// ---------------
	CHK (AaffReadFile (pAaff, &Signature, sizeof(Signature)))
	if (memcmp (Signature, AFF_HEADER, sizeof(Signature)) !=0)
	{
	(void)AaffClose((void**)&pAaff);
	CHK (AAFF_INVALID_SIGNATURE)
	}

	// Read header segments
	// --------------------
	char *pName;
	uint32_t Arg;
	char *pData;
	uint32_t DataLen;
	const int MAX_HEADER_SEGMENTS = 100;
	int Seg;
	unsigned int i;
	int wr;
	int Pos = 0;
	const unsigned HexStrLen = 32;
	char HexStr[HexStrLen+1];

	#define REM (AaffInfoBuffLen-Pos)

	pAaff->pInfoBuffConst = (char *) malloc (AaffInfoBuffLen);
	pAaff->pInfoBuff = (char ) malloc (AaffInfoBuffLen2);

	// Search for known segments at the image start
	for (Seg=0; Seg<MAX_HEADER_SEGMENTS; Seg++)
	{
	Seek = AaffGetCurrentSeekPos (pAaff);
	CHK (AaffReadSegment (pAaff, &pName, &Arg, &pData, &DataLen))

	if (strcmp (pName, AFF_SEGNAME_PAGESIZE) == 0 ) pAaff->PageSize = Arg;
	else if (strcmp (pName, AFF_SEGNAME_SECTORSIZE) == 0 ) pAaff->SectorSize = Arg;
	else if (strcmp (pName, AFF_SEGNAME_SECTORS) == 0 ) pAaff->Sectors = AaffU64(pData);
	else if (strcmp (pName, AFF_SEGNAME_IMAGESIZE) == 0 ) pAaff->ImageSize = AaffU64(pData);
	else if (strcmp (pName, AFF_SEGNAME_AFFLIB_VERSION) == 0 ) pAaff->pLibVersion = strdup((char*)pData);
	else if (strcmp (pName, AFF_SEGNAME_FILETYPE) == 0 ) pAaff->pFileType = strdup((char*)pData);
	else if ((strcmp(pName, AFF_SEGNAME_GID) == 0 ) \|\|
	(strcmp(pName, AFF_SEGNAME_BADFLAG) == 0 ))
	{
	wr=0;
	for (i=0; i<GETMIN(DataLen,HexStrLen/2); i++)
	wr += sprintf (&HexStr[wr], "%02X", pData[i]);
	HexStr[i] = '\0';
	Pos += snprintf (&(pAaff->pInfoBuffConst[Pos]), REM,"%-25s %s", pName, HexStr);
	if (i<DataLen)
	Pos += snprintf (&(pAaff->pInfoBuffConst[Pos]), REM,"...");
	Pos += snprintf (&(pAaff->pInfoBuffConst[Pos]), REM,"\n");
	}
	else if (strncmp(pName,AFF_SEGNAME_PAGE,strlen(AFF_SEGNAME_PAGE))==0)
	{
	break;
	}
	else
	{
	if ((Arg == 0) && DataLen)
	Pos += snprintf (&(pAaff->pInfoBuffConst[Pos]), REM,"%-25s %s\n", pName, pData);
	}
	}
	#undef REM

	if (Seg >= MAX_HEADER_SEGMENTS)
	{
	(void) AaffClose ((void**)&pAaff);
	CHK (AAFF_TOO_MANY_HEADER_SEGEMENTS)
	}

	if (strstr (pAaff->pLibVersion, "Guymager") == NULL)
	{
	(void) AaffClose ((void**)&pAaff);
	CHK (AAFF_NOT_CREATED_BY_GUYMAGER)
	}

	// Prepare page seek array
	// -----------------------
	uint64_t MaxEntries;
	int ArrBytes;

	pAaff->TotalPages = pAaff->ImageSize / pAaff->PageSize;
	if (pAaff->ImageSize % pAaff->PageSize)
	pAaff->TotalPages++;

	MaxEntries = (pAaff->MaxPageArrMem10241024) / (sizeof (unsigned long long *) + 1); // +1 in order not to risk a result of 0
	MaxEntries = GETMIN (MaxEntries, pAaff->TotalPages);

	pAaff->Interleave = pAaff->TotalPages / MaxEntries;
	if (pAaff->TotalPages % MaxEntries)
	pAaff->Interleave++;

	pAaff->PageSeekArrLen = pAaff->TotalPages / pAaff->Interleave;
	ArrBytes = pAaff->PageSeekArrLen * sizeof(uint64_t *);
	pAaff->pPageSeekArr = (uint64_t*)malloc (ArrBytes);
	memset (pAaff->pPageSeekArr, 0, ArrBytes);
	CHK (AaffPageNumberFromSegmentName (pName, &pAaff->CurrentPage));
	if (pAaff->CurrentPage != 0)
	{
	(void) AaffClose ((void**)&pAaff);
	CHK (AAFF_UNEXPECTED_PAGE_NUMBER)
	}
	pAaff->pPageSeekArr[0] = Seek;

	// Alloc Buffers
	// -------------
	pAaff->pPageBuff = (char *) malloc (pAaff->PageSize);
	pAaff->CurrentPage = AAFF_CURRENTPAGE_NOTSET;

	LOG ("Ret");
	return AAFF_OK;
	}

	static int AaffClose (void *pHandle)
	{
	t_pAaff pAaff = (t_pAaff) pHandle;
	int rc = AAFF_OK;

	LOG ("Called");

	if (fclose (pAaff->pFile))
	rc = AAFF_CANNOT_CLOSE_FILE;

	LOG ("Ret");
	return rc;
	}

	static int AaffSize (void pHandle, uint64_t pSize)
	{
	t_pAaff pAaff = (t_pAaff) pHandle;

	LOG ("Called");
	*pSize = pAaff->ImageSize;

	LOG ("Ret - Size=%" PRIu64, *pSize);
	return AAFF_OK;
	}

	static int AaffRead (void pHandle, char pBuf, off_t Seek, size_t Count, size_t pRead, int pErrno)
	{
	t_pAaff pAaff = (t_pAaff) pHandle;
	- char *pPageBuffer;
	+ char *pPageBuffer=NULL;
	uint64_t Page;
	uint64_t Seek64;
	uint64_t Remaining;
	- uint32_t PageLen, Ofs, ToCopy;
	+ uint32_t PageLen=0, Ofs, ToCopy;
	int Ret = AAFF_OK;

	LOG ("Called - Seek=%'" PRIu64 ",Count=%'" PRIu64, Seek, Count);
	*pRead = 0;
	*pErrno = 0;

	if (Seek < 0)
	{
	Ret = AAFF_NEGATIVE_SEEK;
	goto Leave;
	}
	Seek64 = Seek;

	if (Seek64 >= pAaff->ImageSize) // If calling function asks
	goto Leave; // for data beyond end of
	if ((Seek64+Count) > pAaff->ImageSize) // image simply return what
	Count = pAaff->ImageSize - Seek64; // is possible.

	Page = Seek64 / pAaff->PageSize;
	Ofs = Seek64 % pAaff->PageSize;
	Remaining = Count;

	while (Count)
	{
	Ret = AaffReadPage (pAaff, Page, &pPageBuffer, &PageLen);
	if (Ret)
	goto Leave;
	if (PageLen == 0)
	{
	Ret = AAFF_PAGE_LENGTH_ZERO;
	goto Leave;
	}
	ToCopy = GETMIN (PageLen-Ofs, Remaining);
	memcpy (pBuf, pPageBuffer+Ofs, ToCopy);
	Remaining -= ToCopy;
	pBuf += ToCopy;
	*pRead += ToCopy;
	Ofs=0;
	Page++;
	}

	Leave:
	AaffCheckError (pAaff, Ret, pErrno);
	LOG ("Ret %d - Read=%" PRIu32, Ret, *pRead);
	return Ret;
	}

	static int AaffOptionsHelp (const char **ppHelp)
	{
	char *pHelp=NULL;
	int wr;

	wr = asprintf (&pHelp, " %-12s : Maximum amount of RAM cache, in MiB, for image seek offsets. Default: %"PRIu64" MiB\n"
	" %-12s : Log file name.\n"
	" Specify full path for %s. The given file name is extended by _<pid>.\n",
	AAFF_OPTION_MAXPAGEARRMEM, AAFF_DEFAULT_MAX_PAGE_ARR_MEM,
	AAFF_OPTION_LOG,
	AAFF_OPTION_LOG);
	if ((pHelp == NULL) \|\| (wr<=0))
	return AAFF_MEMALLOC_FAILED;

	*ppHelp = pHelp;
	return AAFF_OK;
	}

	static int AaffOptionsParse (void pHandle, uint32_t OptionCount, const pts_LibXmountOptions ppOptions, const char **ppError)
	{
	pts_LibXmountOptions pOption;
	t_pAaff pAaff = (t_pAaff) pHandle;
	const char *pError = NULL;
	int rc = AAFF_OK;
	int Ok;

	LOG ("Called - OptionCount=%" PRIu32, OptionCount);
	*ppError = NULL;

	#define TEST_OPTION_UINT64(Opt,DestField) \
	if (strcmp (pOption->p_key, Opt) == 0) \
	{ \
	pAaff->DestField = StrToUint64 (pOption->p_value, &Ok); \
	if (!Ok) \
	{ \
	pError = "Error in option %s: Invalid value"; \
	break; \
	} \
	LOG ("Option %s set to %" PRIu64, Opt, pAaff->DestField) \
	}

	for (uint32_t i=0; i<OptionCount; i++)
	{
	pOption = ppOptions[i];
	if (strcmp (pOption->p_key, AAFF_OPTION_LOG) == 0)
	{
	pAaff->pLogFilename = strdup (pOption->p_value);
	rc = LOG ("Logging for libxmount_input_aaff started")
	if (rc != AAFF_OK)
	{
	pError = "Write test to log file failed";
	break;
	}
	pOption->valid = TRUE;
	LOG ("Option %s set to %s", AAFF_OPTION_LOG, pAaff->pLogFilename);
	}
	else TEST_OPTION_UINT64 (AAFF_OPTION_MAXPAGEARRMEM, MaxPageArrMem)
	}
	#undef TEST_OPTION_UINT64

	if (pError)
	*ppError = strdup (pError);
	LOG ("Ret - rc=%d,Error=%s", rc, *ppError);
	return rc;
	}

	static int AaffGetInfofileContent (void pHandle, const char *ppInfoBuf)
	{
	t_pAaff pAaff = (t_pAaff) pHandle;
	uint64_t i;
	uint64_t Entries = 0;
	int Pos = 0;

	LOG ("Called");

	#define REM (AaffInfoBuffLen-Pos)

	Pos += snprintf (&pAaff->pInfoBuff[Pos], REM, "AFF IMAGE INFORMATION");
	Pos += snprintf (&pAaff->pInfoBuff[Pos], REM, "\n---------------------");
	Pos += snprintf (&pAaff->pInfoBuff[Pos], REM, "\nAFF file %s" , pAaff->pFilename );

	Pos += snprintf (&pAaff->pInfoBuff[Pos], REM, "\nPage size %u" , pAaff->PageSize );
	Pos += snprintf (&pAaff->pInfoBuff[Pos], REM, "\nSector size %d" , pAaff->SectorSize );
	Pos += snprintf (&pAaff->pInfoBuff[Pos], REM, "\nSectors %" PRIu64, pAaff->Sectors);
	Pos += snprintf (&pAaff->pInfoBuff[Pos], REM, "\nImage size %" PRIu64 " (%0.1f GiB)", pAaff->ImageSize, pAaff->ImageSize/(1024.01024.01024.0));
	Pos += snprintf (&pAaff->pInfoBuff[Pos], REM, "\nTotal pages %" PRIu64, pAaff->TotalPages);
	Pos += snprintf (&pAaff->pInfoBuff[Pos], REM, "\n");
	Pos += snprintf (&pAaff->pInfoBuff[Pos], REM, "\n%s", pAaff->pInfoBuffConst);
	Pos += snprintf (&pAaff->pInfoBuff[Pos], REM, "\n");
	Pos += snprintf (&pAaff->pInfoBuff[Pos], REM, "\nCurrent page ");
	if (pAaff->CurrentPage == AAFF_CURRENTPAGE_NOTSET)
	Pos += snprintf (&pAaff->pInfoBuff[Pos], REM, "not set");
	else Pos += snprintf (&pAaff->pInfoBuff[Pos], REM, "%" PRIu64, pAaff->CurrentPage);
	Pos += snprintf (&pAaff->pInfoBuff[Pos], REM, "\nSeek array length %" PRIu64, pAaff->PageSeekArrLen);
	Pos += snprintf (&pAaff->pInfoBuff[Pos], REM, "\nSeek interleave %" PRIu64, pAaff->Interleave);

	for (i=0; i<pAaff->PageSeekArrLen; i++)
	{
	if (pAaff->pPageSeekArr[i])
	Entries++;
	}
	Pos += snprintf (&pAaff->pInfoBuff[Pos], REM, "\nSeek array entries %" PRIu64, Entries);
	Pos += snprintf (&pAaff->pInfoBuff[Pos], REM, "\n");
	#undef REM

	*ppInfoBuf = strdup (pAaff->pInfoBuff);
	if (*ppInfoBuf == NULL)
	CHK (AAFF_MEMALLOC_FAILED)

	LOG ("Ret - %d bytes of info", strlen(*ppInfoBuf)+1);
	return AAFF_OK;
	}

	static const char* AaffGetErrorMessage (int ErrNum)
	{
	const char *pMsg;
	#define ADD_ERR(ErrCode) \
	case ErrCode: pMsg = #ErrCode; \
	break;

	switch (ErrNum)
	{
	ADD_ERR (AAFF_OK)
	ADD_ERR (AAFF_FOUND)
	ADD_ERR (AAFF_MEMALLOC_FAILED)
	ADD_ERR (AAFF_OPTIONS_ERROR)
	ADD_ERR (AAFF_SPLIT_IMAGES_NOT_SUPPORTED)
	ADD_ERR (AAFF_INVALID_SIGNATURE)
	ADD_ERR (AAFF_NOT_CREATED_BY_GUYMAGER)
	ADD_ERR (AAFF_CANNOT_OPEN_LOGFILE)
	ADD_ERR (AAFF_FILE_OPEN_FAILED)
	ADD_ERR (AAFF_CANNOT_READ_DATA)
	ADD_ERR (AAFF_INVALID_HEADER)
	ADD_ERR (AAFF_INVALID_FOOTER)
	ADD_ERR (AAFF_TOO_MANY_HEADER_SEGEMENTS)
	ADD_ERR (AAFF_INVALID_PAGE_NUMBER)
	ADD_ERR (AAFF_UNEXPECTED_PAGE_NUMBER)
	ADD_ERR (AAFF_CANNOT_CLOSE_FILE)
	ADD_ERR (AAFF_CANNOT_SEEK)
	ADD_ERR (AAFF_WRONG_SEGMENT)
	ADD_ERR (AAFF_UNCOMPRESS_FAILED)
	ADD_ERR (AAFF_INVALID_PAGE_ARGUMENT)
	ADD_ERR (AAFF_SEEKARR_CORRUPT)
	ADD_ERR (AAFF_PAGE_NOT_FOUND)
	ADD_ERR (AAFF_READ_BEYOND_IMAGE_LENGTH)
	ADD_ERR (AAFF_READ_BEYOND_LAST_PAGE)
	ADD_ERR (AAFF_PAGE_LENGTH_ZERO)
	ADD_ERR (AAFF_NEGATIVE_SEEK)
	default:
	pMsg = "Unknown error";
	}
	#undef ARR_ERR
	return pMsg;
	}

	static int AaffFreeBuffer (void *pBuf)
	{
	free (pBuf);
	return AAFF_OK;
	}


	// ------------------------------------
	// LibXmount_Input API implementation
	// ------------------------------------

	uint8_t LibXmount_Input_GetApiVersion ()
	{
	return LIBXMOUNT_INPUT_API_VERSION;
	}

	const char* LibXmount_Input_GetSupportedFormats ()
	{
	return "aaff\0\0";
	}

	void LibXmount_Input_GetFunctions(ts_LibXmountInputFunctions *pFunctions)
	{
	pFunctions->CreateHandle = &AaffCreateHandle;
	pFunctions->DestroyHandle = &AaffDestroyHandle;
	pFunctions->Open = &AaffOpen;
	pFunctions->Close = &AaffClose;
	pFunctions->Size = &AaffSize;
	pFunctions->Read = &AaffRead;
	pFunctions->OptionsHelp = &AaffOptionsHelp;
	pFunctions->OptionsParse = &AaffOptionsParse;
	pFunctions->GetInfofileContent = &AaffGetInfofileContent;
	pFunctions->GetErrorMessage = &AaffGetErrorMessage;
	pFunctions->FreeBuffer = &AaffFreeBuffer;
	}

	// -----------------------------------------------------
	// Small main routine for testing
	// It converts an aff file to dd
	// -----------------------------------------------------

	#ifdef AAFF_STANDALONE

	#define PRINT_ERROR_AND_EXIT(...) \
	{ \
	printf (__VA_ARGS__); \
	exit (1); \
	}

	int ParseOptions (t_pAaff pAaff, char *pOptions)
	{
	pts_LibXmountOptions pOptionArr;
	pts_LibXmountOptions *ppOptionArr;
	int OptionCount;
	char *pSep;
	char *pEqual;
	char *pTmp;
	const char *pError;
	char *pOpt;
	int rc;

	if (pOptions == NULL)
	return AAFF_OK;

	if (*pOptions == '\0')
	return AAFF_OK;

	if (*pOptions == ',')
	return AAFF_OPTIONS_ERROR;

	if (pOptions[strlen(pOptions)-1] == ',')
	return AAFF_OPTIONS_ERROR;

	pOpt = strdup (pOptions);

	// Count number of comma separated options
	OptionCount = 1;
	pTmp = pOpt;
	while ((pTmp = strchr (pTmp, ',')) != NULL)
	{
	OptionCount++;
	pTmp++;
	}

	// Create and fill option array
	pOptionArr = (pts_LibXmountOptions) malloc (OptionCount * sizeof(ts_LibXmountOptions));
	if (pOptionArr == NULL)
	PRINT_ERROR_AND_EXIT ("Cannot allocate pOptionArr");
	memset (pOptionArr, 0, OptionCount * sizeof(ts_LibXmountOptions));
	pTmp = pOpt;
	for (int i=0; i<OptionCount; i++)
	{
	pOptionArr[i].p_key = pTmp;
	pSep = strchr (pTmp, ',');
	if (pSep)
	*pSep ='\0';
	pEqual = strchr (pTmp, '=');
	if (pEqual)
	{
	*pEqual = '\0';
	pOptionArr[i].p_value = pEqual+1;
	}
	if (pSep != NULL)
	pTmp = pSep+1;
	}

	// Create pointer array and call parse function
	ppOptionArr = (pts_LibXmountOptions )malloc (OptionCountsizeof (pts_LibXmountOptions));
	if (ppOptionArr == NULL)
	PRINT_ERROR_AND_EXIT ("Cannot allocate ppOptionArr");
	for (int i=0; i<OptionCount; i++)
	ppOptionArr[i] = &pOptionArr[i];

	rc = AaffOptionsParse ((void*) pAaff, OptionCount, ppOptionArr, &pError);
	free (ppOptionArr);
	free ( pOptionArr);
	free ( pOpt);
	if (pError)
	PRINT_ERROR_AND_EXIT ("Error while setting options: %s", pError);
	CHK (rc)

	return AAFF_OK;
	}

	int main(int argc, const char *argv[])
	{
	t_pAaff pAaff;
	const char *pInfoBuff;
	const char *pHelp;
	uint64_t Remaining;
	uint64_t CurrentPos=0;
	int rc;
	int Errno;
	int Percent;
	int PercentOld;
	char *pOptions = NULL;

	setbuf (stdout, NULL);
	setbuf (stderr, NULL);
	setlocale (LC_ALL, "");

	printf ("AFF to DD converter\n");
	if (argc != 3)
	{
	(void) AaffOptionsHelp (&pHelp);
	printf ("Usage: %s <EWF segment file 1> <EWF segment file 2> <...> [-comma_separated_options]\n", argv[0]);
	printf ("Possible options:\n%s\n", pHelp);
	printf ("The output file will be named dd.\n");
	CHK (AaffFreeBuffer ((void*) pHelp))
	exit (1);
	}
	if (argv[argc-1][0] == '-')
	{
	pOptions = strdup (&(argv[argc-1][1]));
	argc--;
	}

	rc = AaffCreateHandle ((void**) &pAaff, "aaff", LOG_STDOUT);
	if (rc != AAFF_OK)
	PRINT_ERROR_AND_EXIT ("Cannot create handle, rc=%d\n", rc)
	if (pOptions)
	CHK (ParseOptions(pAaff, pOptions))

	rc = AaffOpen (pAaff, &argv[1], 1);
	if (rc)
	{
	printf ("Error %d while opening file %s\n", rc, argv[1]);
	exit (2);
	}

	CHK (AaffGetInfofileContent ((void*) pAaff, &pInfoBuff))
	if (pInfoBuff)
	printf ("Contents of info buffer:\n%s\n", pInfoBuff);
	CHK (AaffFreeBuffer ((void*)pInfoBuff))

	// Create destination file and fill it with data from aff
	// ------------------------------------------------------
	FILE *pFile;
	pFile = fopen (argv[2], "w");
	// const unsigned BuffSize = 13; // weird Buffsize for testing
	const unsigned BuffSize = 65536;
	char *pBuff;
	uint64_t ToRead;
	uint64_t Read;

	Remaining = pAaff->ImageSize;

	pBuff = (char *) malloc (BuffSize);
	CurrentPos=0;

	Errno = 0;
	PercentOld = -1;

	while (Remaining)
	{
	ToRead = GETMIN (Remaining, BuffSize);
	rc = AaffRead ((void*) pAaff, pBuff, CurrentPos, ToRead, &Read, &Errno);
	if ((rc != AAFF_OK) \|\| (Errno != 0))
	PRINT_ERROR_AND_EXIT("Error %d while calling AewfRead (Errno %d)\n", rc, Errno);
	if (Read != ToRead)
	PRINT_ERROR_AND_EXIT("Only %" PRIu64 " out of %" PRIu64 " bytes read\n", Read, ToRead);

	if (fwrite (pBuff, Read, 1, pFile) != 1)
	{
	printf ("Could not write to destinationfile\n");
	exit (2);
	}
	CurrentPos += Read;
	Remaining -= Read;
	Percent = (100*CurrentPos) / pAaff->ImageSize;
	if (Percent != PercentOld)
	{
	printf ("\r%d%% done...", Percent);
	PercentOld = Percent;
	}
	}
	free (pBuff);
	fclose (pFile);

	return 0;
	}

	#endif

	diff --git a/tags/xmount-0.7.0/libxmount_input/libxmount_input_aaff/libxmount_input_aaff.h b/tags/xmount-0.7.0/libxmount_input/libxmount_input_aaff/libxmount_input_aaff.h
	new file mode 100644
	index 0000000..95b7d87
	--- /dev/null
	+++ b/tags/xmount-0.7.0/libxmount_input/libxmount_input_aaff/libxmount_input_aaff.h
	@@ -0,0 +1,180 @@
	+/*******************************************************************************
	+* xmount Copyright (c) 2008-2014 by Gillen Daniel <gillen.dan@pinguin.lu> *
	+* *
	+* This module has been written by Guy Voncken. It contains the functions for *
	+* accessing simple AFF images created by Guymager. *
	+* *
	+* This program is free software: you can redistribute it and/or modify it *
	+* under the terms of the GNU General Public License as published by the Free *
	+* Software Foundation, either version 3 of the License, or (at your option) *
	+* any later version. *
	+* *
	+* This program is distributed in the hope that it will be useful, but WITHOUT *
	+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
	+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for *
	+* more details. *
	+* *
	+* You should have received a copy of the GNU General Public License along with *
	+* this program. If not, see <http://www.gnu.org/licenses/>. *
	+*******************************************************************************/
	+
	+// Please don't touch source code formatting!
	+
	+#ifndef AAFF_H
	+#define AAFF_H
	+
	+typedef struct _t_Aaff *t_pAaff;
	+
	+// ----------------------
	+// Constant definitions
	+// ----------------------
	+
	+#define GETMAX(a,b) ((a)>(b)?(a):(b))
	+#define GETMIN(a,b) ((a)<(b)?(a):(b))
	+
	+#define FALSE 0
	+#define TRUE 1
	+
	+const uint64_t AAFF_DEFAULT_MAX_PAGE_ARR_MEM = 10; // Default max. memory for caching seek points for fast page access (MiB)
	+const uint64_t AAFF_CURRENTPAGE_NOTSET = UINT64_MAX;
	+
	+// -----------------
	+// AFF definitions
	+// -----------------
	+
	+#define AFF_GID_LENGTH 16
	+#define AFF_SEGARG_U64 2 // Used as argument for segments that contain a 64 bit unsigned in the data field
	+
	+#define AFF_HEADER "AFF10\r\n"
	+#define AFF_SEGMENT_HEADER_MAGIC "AFF"
	+#define AFF_SEGMENT_FOOTER_MAGIC "ATT"
	+#define AFF_BADSECTOR_HEADER "BAD SECTOR"
	+#define AFF_FILE_TYPE "AFF"
	+
	+#define AFF_SEGNAME_BADFLAG "badflag"
	+#define AFF_SEGNAME_AFFLIB_VERSION "afflib_version"
	+#define AFF_SEGNAME_FILETYPE "aff_file_type"
	+#define AFF_SEGNAME_GID "image_gid"
	+#define AFF_SEGNAME_SECTORS "devicesectors"
	+#define AFF_SEGNAME_SECTORSIZE "sectorsize"
	+#define AFF_SEGNAME_IMAGESIZE "imagesize"
	+#define AFF_SEGNAME_PAGESIZE "pagesize"
	+#define AFF_SEGNAME_BADSECTORS "badsectors"
	+#define AFF_SEGNAME_MD5 "md5"
	+#define AFF_SEGNAME_SHA256 "sha256"
	+#define AFF_SEGNAME_DURATION "acquisition_seconds"
	+#define AFF_SEGNAME_PAGE "page"
	+
	+#define AAFF_SEGNAME_COMMAND_LINE "acquisition_commandline"
	+#define AAFF_SEGNAME_MACADDR "acquisition_macaddr"
	+#define AAFF_SEGNAME_DATE "acquisition_date" // Format: YYYY-MM-DD HH:MM:SS TZT
	+#define AAFF_SEGNAME_DEVICE "acquisition_device"
	+#define AAFF_SEGNAME_MODEL "device_model"
	+#define AAFF_SEGNAME_SN "device_sn"
	+
	+#define AFF_PAGEFLAGS_UNCOMPRESSED 0x0000
	+#define AFF_PAGEFLAGS_COMPRESSED_ZLIB 0x0001
	+#define AFF_PAGEFLAGS_COMPRESSED_ZERO 0x0033
	+
	+#define AAFF_MD5_LEN 16
	+#define AAFF_SHA256_LEN 32
	+#define AAFF_BADSECTORMARKER_MAXLEN 65536
	+
	+typedef struct
	+{
	+ char Magic[4];
	+ unsigned int NameLen;
	+ unsigned int DataLen;
	+ unsigned int Argument; // Named "flags" in original aff source, named "arg" in afinfo output.
	+ char Name[]; //lint !e1501
	+} __attribute__ ((packed)) t_AffSegmentHeader;
	+typedef t_AffSegmentHeader *t_pAffSegmentHeader;
	+
	+// Between header and footer lie the segment name and the data
	+
	+typedef struct
	+{
	+ char Magic[4];
	+ unsigned int SegmentLen;
	+} __attribute__ ((packed)) t_AffSegmentFooter;
	+
	+const int AaffInfoBuffLen = 1024*1024;
	+
	+typedef struct _t_Aaff
	+{
	+ char *pFilename;
	+ FILE *pFile;
	+
	+ char *pLibVersion; // AFF File Header info
	+ char *pFileType;
	+ unsigned int PageSize;
	+ unsigned int SectorSize;
	+ uint64_t Sectors;
	+ uint64_t ImageSize;
	+ uint64_t TotalPages;
	+
	+ char *pNameBuff; // Buffers
	+ char *pDataBuff;
	+ unsigned int NameBuffLen;
	+ unsigned int DataBuffLen;
	+
	+ uint64_t CurrentPage;
	+ char *pPageBuff; // Length is PageSize, contains data of CurrentPage
	+ unsigned int PageBuffDataLen; // Length of current data in PageBuff (the same for all pages, but the last one might contain less data)
	+
	+ char *pInfoBuff;
	+ char *pInfoBuffConst;
	+
	+ uint64_t *pPageSeekArr;
	+ uint64_t PageSeekArrLen;
	+ uint64_t Interleave; // The number of pages lying between 2 entries in the PageSeekArr
	+
	+ // Options
	+ char *pLogFilename;
	+ uint64_t MaxPageArrMem; // Maximum amount of memory (in MiB) for storing page pointers
	+ uint8_t LogStdout;
	+} t_Aaff;
	+
	+
	+// Possible error codes
	+enum
	+{
	+ AAFF_OK = 0,
	+ AAFF_FOUND,
	+
	+ AAFF_ERROR_ENOMEM_START=1000,
	+ AAFF_MEMALLOC_FAILED,
	+ AAFF_ERROR_ENOMEM_END,
	+
	+ AAFF_ERROR_EINVAL_START=2000,
	+ AAFF_OPTIONS_ERROR,
	+ AAFF_SPLIT_IMAGES_NOT_SUPPORTED,
	+ AAFF_INVALID_SIGNATURE,
	+ AAFF_NOT_CREATED_BY_GUYMAGER,
	+ AAFF_CANNOT_OPEN_LOGFILE,
	+ AAFF_ERROR_EINVAL_END,
	+
	+ AAFF_ERROR_EIO_START=3000,
	+ AAFF_FILE_OPEN_FAILED,
	+ AAFF_CANNOT_READ_DATA,
	+ AAFF_INVALID_HEADER,
	+ AAFF_INVALID_FOOTER,
	+ AAFF_TOO_MANY_HEADER_SEGEMENTS,
	+ AAFF_INVALID_PAGE_NUMBER,
	+ AAFF_UNEXPECTED_PAGE_NUMBER,
	+ AAFF_CANNOT_CLOSE_FILE,
	+ AAFF_CANNOT_SEEK,
	+ AAFF_WRONG_SEGMENT,
	+ AAFF_UNCOMPRESS_FAILED,
	+ AAFF_INVALID_PAGE_ARGUMENT,
	+ AAFF_SEEKARR_CORRUPT,
	+ AAFF_PAGE_NOT_FOUND,
	+ AAFF_READ_BEYOND_IMAGE_LENGTH,
	+ AAFF_READ_BEYOND_LAST_PAGE,
	+ AAFF_PAGE_LENGTH_ZERO,
	+ AAFF_NEGATIVE_SEEK,
	+ AAFF_ERROR_EIO_END,
	+};
	+
	+
	+#endif
	diff --git a/trunk/libxmount_input/libxmount_input_aewf/CMakeLists.txt b/tags/xmount-0.7.0/libxmount_input/libxmount_input_aewf/CMakeLists.txt
	similarity index 99%
	copy from trunk/libxmount_input/libxmount_input_aewf/CMakeLists.txt
	copy to tags/xmount-0.7.0/libxmount_input/libxmount_input_aewf/CMakeLists.txt
	index 2b15230..77bcfea 100644
	--- a/trunk/libxmount_input/libxmount_input_aewf/CMakeLists.txt
	+++ b/tags/xmount-0.7.0/libxmount_input/libxmount_input_aewf/CMakeLists.txt
	@@ -1,12 +1,14 @@
	if(POLICY CMP0042)
	cmake_policy(SET CMP0042 NEW) # CMake 3.0
	endif(POLICY CMP0042)

	project(libxmount_input_aewf C)

	add_library(xmount_input_aewf SHARED libxmount_input_aewf.c ../../libxmount/libxmount.c)
	+
	include_directories(${LIBZ_INCLUDE_DIRS})
	+
	target_link_libraries(xmount_input_aewf ${LIBZ_LIBRARIES})

	install(TARGETS xmount_input_aewf DESTINATION lib/xmount)

	diff --git a/tags/xmount-0.7.0/libxmount_input/libxmount_input_aewf/libxmount_input_aewf.c b/tags/xmount-0.7.0/libxmount_input/libxmount_input_aewf/libxmount_input_aewf.c
	new file mode 100644
	index 0000000..ae04299
	--- /dev/null
	+++ b/tags/xmount-0.7.0/libxmount_input/libxmount_input_aewf/libxmount_input_aewf.c
	@@ -0,0 +1,1530 @@
	+/*******************************************************************************
	+* xmount Copyright (c) 2008-2014 by Gillen Daniel <gillen.dan@pinguin.lu> *
	+* *
	+* This module has been written by Guy Voncken. It contains the functions for *
	+* accessing EWF images created by Guymager and others. *
	+* *
	+* This program is free software: you can redistribute it and/or modify it *
	+* under the terms of the GNU General Public License as published by the Free *
	+* Software Foundation, either version 3 of the License, or (at your option) *
	+* any later version. *
	+* *
	+* This program is distributed in the hope that it will be useful, but WITHOUT *
	+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
	+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for *
	+* more details. *
	+* *
	+* You should have received a copy of the GNU General Public License along with *
	+* this program. If not, see <http://www.gnu.org/licenses/>. *
	+*******************************************************************************/
	+
	+// Aewf has been written in order to reduce xmount's memory footprint when
	+// operating on large EWF images. Before Aewf, xmount exclusively relied on
	+// libewf for accessing EWF images, resulting in enormous memory consumption.
	+//
	+// Aewf uses 2 main structures for handling image access: pAewf->pSegmentArr
	+// contains everything about the image files (segments) and pAewf->pTableArr
	+// handles the EWF chunk offset tables.
	+//
	+// At the same time, those structures serve as caches for the two most vital
	+// ressouces, namely the number of segment files opened in parallel and the
	+// memory consumed by the chunk offset tables.
	+//
	+// The max. values for both are configurable, see pAewf->MaxOpenSegments and
	+// pAewf->MaxTableCache.
	+
	+// Please don't touch source code formatting!
	+
	+#ifdef LINTING
	+// #define _LARGEFILE_SOURCE
	+// #define _FILE_OFFSET_BITS 64
	+ #define AEWF_STANDALONE
	+#endif
	+
	+#include <string.h>
	+#include <stdio.h>
	+#include <stdlib.h>
	+#include <locale.h>
	+#include <limits.h>
	+#include <time.h> //lint !e537 !e451 Include file messages
	+#include <zlib.h>
	+#include <unistd.h> //lint !e537
	+#include <wchar.h> //lint !e537 !e451
	+#include <stdarg.h> //lint !e537 !e451
	+#include <limits.h> //lint !e537 !e451
	+#include <errno.h>
	+
	+#include "../libxmount_input.h"
	+
	+#include "libxmount_input_aewf.h"
	+
	+#ifdef AEWF_STANDALONE
	+ #define CREATE_REVERSE_FILE
	+// #define REVERSE_FILE_USES_SEPARATE_HANDLE
	+ #define LOG_STDOUT TRUE
	+#endif
	+
	+//#ifdef AEWF_STANDALONE
	+// #define _GNU_SOURCE
	+//#endif
	+
	+
	+#define AEWF_OPTION_TABLECACHE "aewfmaxmem"
	+#define AEWF_OPTION_MAXOPENSEGMENTS "aewfmaxfiles"
	+#define AEWF_OPTION_STATS "aewfstats"
	+#define AEWF_OPTION_STATSREFRESH "aewfrefresh"
	+#define AEWF_OPTION_LOG "aewflog"
	+
	+static int AewfClose (void *pHandle);
	+static const char* AewfGetErrorMessage (int ErrNum);
	+
	+const uint64_t AEWF_DEFAULT_TABLECACHE = 10; // MiB
	+const uint64_t AEWF_DEFAULT_MAXOPENSEGMENTS = 10;
	+const uint64_t AEWF_DEFAULT_STATSREFRESH = 10;
	+
	+// ----------------------------
	+// Logging and error handling
	+// ----------------------------
	+
	+#define LOG_HEADER_LEN 80
	+
	+int LogvEntry (const char pLogFileName, uint8_t LogStdout, const char pFileName, const char pFunctionName, int LineNr, const char pFormat, va_list pArguments)
	+{
	+ time_t NowT;
	+ struct tm *pNowTM;
	+ FILE *pFile;
	+ int wr;
	+ char *pFullLogFileName = NULL;
	+ const char *pBase;
	+ char LogLineHeader[1024];
	+ pid_t OwnPID;
	+
	+ if (!LogStdout && (pLogFileName==NULL))
	+ return AEWF_OK;
	+
	+ time (&NowT);
	+ pNowTM = localtime (&NowT);
	+ OwnPID = getpid(); // pthread_self()
	+ wr = (int) strftime (&LogLineHeader[0] , sizeof(LogLineHeader) , "%a %d.%b.%Y %H:%M:%S ", pNowTM); //lint !e713
	+ wr += snprintf (&LogLineHeader[wr], sizeof(LogLineHeader)-wr, "%5d ", OwnPID); //lint !e737
	+
	+ if (pFileName && pFunctionName)
	+ {
	+ pBase = strrchr(pFileName, '/');
	+ if (pBase)
	+ pFileName = pBase+1;
	+ wr += snprintf (&LogLineHeader[wr], sizeof(LogLineHeader)-wr, "%s %s %d ", pFileName, pFunctionName, LineNr); //lint !e737
	+ }
	+
	+// while (wr < LOG_HEADER_LEN)
	+// LogLineHeader[wr++] = ' ';
	+
	+ if (pLogFileName)
	+ {
	+ wr = asprintf (&pFullLogFileName, "%s_%d", pLogFileName, OwnPID);
	+ if ((wr <= 0) \|\| (pFullLogFileName == NULL))
	+ {
	+ if (LogStdout)
	+ printf ("\nLog file error: Can't build filename");
	+ return AEWF_MEMALLOC_FAILED;
	+ }
	+ else
	+ {
	+ pFile = fopen64 (pFullLogFileName, "a");
	+ if (pFile == NULL)
	+ {
	+ if (LogStdout)
	+ printf ("\nLog file error: Can't be opened");
	+ return AEWF_CANNOT_OPEN_LOGFILE;
	+ }
	+ else
	+ {
	+ fprintf (pFile, "%-*s", LOG_HEADER_LEN, &LogLineHeader[0]);
	+ vfprintf (pFile, pFormat, pArguments);
	+ fprintf (pFile, "\n");
	+ fclose (pFile);
	+ }
	+ free (pFullLogFileName);
	+ }
	+ }
	+ if (LogStdout)
	+ {
	+ printf ("%s", &LogLineHeader[0]);
	+ vprintf (pFormat, pArguments);
	+ printf ("\n");
	+ }
	+ return AEWF_OK;
	+}
	+
	+int LogEntry (const char pLogFileName, uint8_t LogStdout, const char pFileName, const char pFunctionName, int LineNr, const char pFormat, ...)
	+{
	+ va_list VaList;
	+ int rc;
	+
	+ if (!LogStdout && (pLogFileName==NULL))
	+ return AEWF_OK;
	+
	+ va_start (VaList, pFormat); //lint !e530 Symbol 'VaList' not initialized
	+ rc = LogvEntry (pLogFileName, LogStdout, pFileName, pFunctionName, LineNr, pFormat, VaList);
	+ va_end(VaList);
	+ return rc;
	+}
	+
	+// CHK requires existance of pAewf handle
	+
	+#ifdef AEWF_STANDALONE
	+ #define LOG_ERRORS_ON_STDOUT TRUE
	+#else
	+ #define LOG_ERRORS_ON_STDOUT pAewf->LogStdout
	+#endif
	+
	+#define CHK(ChkVal) \
	+{ \
	+ int ChkValRc; \
	+ if ((ChkValRc=(ChkVal)) != AEWF_OK) \
	+ { \
	+ const char *pErr = AewfGetErrorMessage (ChkValRc); \
	+ LogEntry (pAewf->pLogFilename, LOG_ERRORS_ON_STDOUT, __FILE__, __FUNCTION__, __LINE__, "Error %d (%s) occured", ChkValRc, pErr); \
	+ return ChkValRc; \
	+ } \
	+}
	+
	+#define LOG(...) \
	+ LogEntry (pAewf->pLogFilename, pAewf->LogStdout, __FILE__, __FUNCTION__, __LINE__, __VA_ARGS__);
	+
	+
	+// AewfCheckError is called before exiting AewfRead. It should not
	+// be called elsewehere or else the statistics would become wrong.
	+static void AewfCheckError (t_pAewf pAewf, int Ret, int *pErrno)
	+{
	+ *pErrno = 0;
	+ if (Ret != AEWF_OK)
	+ {
	+ pAewf->Errors++;
	+ pAewf->LastError = Ret;
	+
	+ if ((Ret >= AEWF_ERROR_ENOMEM_START) && (Ret <= AEWF_ERROR_ENOMEM_END)) *pErrno = ENOMEM;
	+ else if ((Ret >= AEWF_ERROR_EINVAL_START) && (Ret <= AEWF_ERROR_EINVAL_END)) *pErrno = EINVAL;
	+ else *pErrno = EIO; // all other errors
	+ }
	+}
	+
	+// ------------------------------------
	+// Internal functions
	+// ------------------------------------
	+
	+static int OpenFile (FILE *ppFile, const char pFilename)
	+{
	+ *ppFile = fopen (pFilename, "r");
	+ if (*ppFile == NULL)
	+ return AEWF_FILE_OPEN_FAILED;
	+ return AEWF_OK;
	+}
	+
	+static int CloseFile (FILE **ppFile)
	+{
	+ if (fclose (*ppFile))
	+ return AEWF_FILE_CLOSE_FAILED;
	+ *ppFile = NULL;
	+
	+ return AEWF_OK;
	+}
	+
	+#define NO_SEEK ULLONG_MAX
	+
	+static int ReadFilePos (t_pAewf pAewf, FILE pFile, void pMem, unsigned int Size, uint64_t Pos)
	+{
	+ if (Size == 0)
	+ return AEWF_OK;
	+
	+ if (Pos != NO_SEEK)
	+ {
	+ if (fseeko64 (pFile, Pos, SEEK_SET))
	+ return AEWF_FILE_SEEK_FAILED;
	+ }
	+ if (fread (pMem, Size, 1UL, pFile) != 1)
	+ return AEWF_FILE_READ_FAILED;
	+
	+ return AEWF_OK;
	+}
	+
	+static int ReadFileAllocPos (t_pAewf pAewf, FILE pFile, void *ppMem, unsigned int Size, uint64_t Pos)
	+{
	+ ppMem = (void) malloc (Size);
	+ if (*ppMem == NULL)
	+ return AEWF_MEMALLOC_FAILED;
	+
	+ CHK (ReadFilePos (pAewf, pFile, *ppMem, Size, Pos))
	+ return AEWF_OK;
	+}
	+
	+static int ReadFileAlloc (t_pAewf pAewf, FILE pFile, void *ppMem, unsigned int Size)
	+{
	+ CHK (ReadFileAllocPos (pAewf, pFile, ppMem, Size, NO_SEEK))
	+
	+ return AEWF_OK;
	+}
	+
	+static int QsortCompareSegments (const void pA, const void pB)
	+{
	+ const t_pSegment pSegmentA = ((const t_pSegment)pA); //lint !e1773 Attempt to cast way const
	+ const t_pSegment pSegmentB = ((const t_pSegment)pB); //lint !e1773 Attempt to cast way const
	+ return (int)pSegmentA->Number - (int)pSegmentB->Number;
	+}
	+
	+static int CreateInfoData (t_pAewf pAewf, t_pAewfSectionVolume pVolume, char *pHeader , unsigned HeaderLen,
	+ char *pHeader2, unsigned Header2Len)
	+{
	+ char *pInfo1 = NULL;
	+ char *pInfo2 = NULL;
	+ char *pInfo3 = NULL;
	+ char *pInfo4 = NULL;
	+ char *pInfo5 = NULL;
	+ char *pHdr = NULL;
	+ unsigned HdrLen= 0;
	+ char *pText = NULL;
	+ char *pCurrent;
	+ char *pDesc = NULL;
	+ char *pData = NULL;
	+ char *pEnd;
	+ uLongf DstLen0;
	+ int zrc;
	+ const int MaxTextSize = 65536;
	+ unsigned UncompressedLen;
	+ int rc = AEWF_OK;
	+
	+ #define RET_ERR(ErrCode) \
	+ { \
	+ rc = ErrCode; \
	+ goto CleanUp; \
	+ }
	+
	+ #define ASPRINTF(...) \
	+ { \
	+ if (asprintf(__VA_ARGS__) < 0) \
	+ RET_ERR (AEWF_ASPRINTF_FAILED) \
	+ }
	+
	+
	+ ASPRINTF(&pInfo1, "Image size %" PRIu64 " (%0.2f GiB)\n"
	+ "Bytes per sector %u\n"
	+ "Sector count %" PRIu64 "\n"
	+ "Sectors per chunk %u\n"
	+ "Chunk count %u\n"
	+ "Error block size %u\n"
	+ "Compression level %u\n"
	+ "Media type %02X\n"
	+ "Cylinders/Heads/Sectors %u/%u/%u\n"
	+ "Media flags %02X\n"
	+ "Palm volume start sector %u\n"
	+ "Smart logs start sector %u\n",
	+ pAewf->ImageSize, pAewf->ImageSize / (1024.0 * 1024.0* 1024.0),
	+ pVolume->BytesPerSector,
	+ pVolume->SectorCount,
	+ pVolume->SectorsPerChunk,
	+ pVolume->ChunkCount,
	+ pVolume->ErrorBlockSize,
	+ pVolume->CompressionLevel,
	+ pVolume->MediaType,
	+ pVolume->CHS_Cylinders, pVolume->CHS_Heads, pVolume->CHS_Sectors,
	+ pVolume->MediaFlags,
	+ pVolume->PalmVolumeStartSector,
	+ pVolume->SmartLogsStartSector);
	+ ASPRINTF (&pInfo2, "AcquirySystemGUID %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X %02X\n",
	+ pVolume->AcquirySystemGUID[ 0], pVolume->AcquirySystemGUID[ 1], pVolume->AcquirySystemGUID[ 2], pVolume->AcquirySystemGUID[ 3],
	+ pVolume->AcquirySystemGUID[ 4], pVolume->AcquirySystemGUID[ 4], pVolume->AcquirySystemGUID[ 6], pVolume->AcquirySystemGUID[ 7],
	+ pVolume->AcquirySystemGUID[ 8], pVolume->AcquirySystemGUID[ 9], pVolume->AcquirySystemGUID[10], pVolume->AcquirySystemGUID[11],
	+ pVolume->AcquirySystemGUID[12], pVolume->AcquirySystemGUID[13], pVolume->AcquirySystemGUID[14], pVolume->AcquirySystemGUID[15]);
	+
	+ if (pHeader2) { pHdr = pHeader2; HdrLen = Header2Len; }
	+ else if (pHeader ) { pHdr = pHeader; HdrLen = HeaderLen; }
	+ if (pHdr)
	+ {
	+ pText = (char *) malloc (MaxTextSize);
	+ if (pText == NULL)
	+ RET_ERR (AEWF_MEMALLOC_FAILED)
	+ DstLen0 = MaxTextSize;
	+ zrc = uncompress ((unsigned char )pText, &DstLen0, (const Bytef)pHdr, HdrLen);
	+ UncompressedLen = DstLen0;
	+ if (zrc != Z_OK)
	+ RET_ERR (AEWF_UNCOMPRESS_HEADER_FAILED)
	+ if (pHeader2) // We must convert from silly Windows 2 byte wchar_t to
	+ { // correct Unix 4 byte wchar_t, before we can convert to UTF8
	+ wchar_t pTemp = (wchar_t) malloc ((UncompressedLen/2)*sizeof(wchar_t));
	+ if (pTemp == NULL)
	+ RET_ERR (AEWF_MEMALLOC_FAILED)
	+ for (unsigned i=0; i<(UncompressedLen/2); i++)
	+ pTemp[i] = (wchar_t) (((unsigned char)pText)[2i ]) \|
	+ (((wchar_t) (((unsigned char)pText)[2i+1])) << 8);
	+ (void) wcstombs(pText, pTemp, UncompressedLen/2);
	+ free (pTemp);
	+ }
	+
	+ // Extract descriptor and data lines
	+ // ---------------------------------
	+ pCurrent = pText; // pText may start with BOM (Header2), but that's no problem as
	+ while (pCurrent) // first line anyway never is the "main" line.
	+ {
	+ if (strcasestr(pCurrent, "main") == pCurrent) // The header line is the one that
	+ break; // follows the line beginning with "main"
	+ pCurrent = strstr (pCurrent, "\n");
	+ if (pCurrent)
	+ pCurrent++;
	+ }
	+ if (pCurrent)
	+ {
	+ pDesc = strstr (pCurrent, "\n");
	+ if (pDesc)
	+ {
	+ *pDesc++ = '\0';
	+ pData = strstr (pDesc, "\n");
	+ if (pData)
	+ {
	+ *pData++ = '\0';
	+ pEnd = strstr (pData, "\n");
	+ if (pEnd)
	+ *pEnd = '\0';
	+ }
	+ }
	+ }
	+
	+ // Scan descriptor and data lines
	+ // ------------------------------
	+
	+ char *pCurDesc = pDesc;
	+ char *pCurData = pData;
	+ const char *pField;
	+ char *pTabDesc;
	+ char *pTabData;
	+ char *pValue;
	+ int wr = 0;
	+ time_t Time;
	+ struct tm *pTM;
	+ char TimeBuff[64];
	+
	+ if (pCurDesc && pCurData)
	+ {
	+ pInfo3 = (char *) malloc (strlen (pCurData) + 4096);
	+ if (pInfo3 == NULL)
	+ RET_ERR (AEWF_MEMALLOC_FAILED)
	+
	+ while (pCurDesc && pCurData)
	+ {
	+ pTabDesc = strstr (pCurDesc, "\t");
	+ pTabData = strstr (pCurData, "\t");
	+ if (pTabDesc) *pTabDesc = '\0';
	+ if (pTabData) *pTabData = '\0';
	+ if (strcasecmp(pCurDesc, "a" ) == 0) pField = "Description";
	+ else if (strcasecmp(pCurDesc, "c" ) == 0) pField = "Case";
	+ else if (strcasecmp(pCurDesc, "n" ) == 0) pField = "Evidence";
	+ else if (strcasecmp(pCurDesc, "e" ) == 0) pField = "Examiner";
	+ else if (strcasecmp(pCurDesc, "t" ) == 0) pField = "Notes";
	+ else if (strcasecmp(pCurDesc, "md") == 0) pField = "Model";
	+ else if (strcasecmp(pCurDesc, "sn") == 0) pField = "Serial number";
	+ else if (strcasecmp(pCurDesc, "av") == 0) pField = "Imager version";
	+ else if (strcasecmp(pCurDesc, "ov") == 0) pField = "OS version";
	+ else if (strcasecmp(pCurDesc, "m" ) == 0) pField = "Acquired time";
	+ else if (strcasecmp(pCurDesc, "u" ) == 0) pField = "System time";
	+ else if (strcasecmp(pCurDesc, "p" ) == 0) pField = NULL;
	+ else if (strcasecmp(pCurDesc, "dc") == 0) pField = NULL;
	+ else pField = "--";
	+ if (pField)
	+ {
	+ pValue = pCurData;
	+ if (strstr (pField, "time"))
	+ {
	+ size_t w;
	+
	+ Time = atoll (pCurData);
	+ pTM = localtime (&Time);
	+ pValue = &TimeBuff[0];
	+ w = strftime (pValue, sizeof(TimeBuff), "%Y-%m-%d %H:%M:%S (%z)", pTM);
	+ sprintf (&pValue[w], " (epoch %s)", pCurData);
	+ }
	+ wr += sprintf (&pInfo3[wr], "%-17s %s\n", pField, pValue);
	+ }
	+ if (!pTabDesc \|\| !pTabData)
	+ break;
	+ pCurDesc = pTabDesc+1;
	+ pCurData = pTabData+1;
	+ }
	+ }
	+ }
	+
	+ if (pAewf->Segments == 1)
	+ ASPRINTF (&pInfo4, "%"PRIu64" segment file: %s\n",
	+ pAewf->Segments,
	+ pAewf->pSegmentArr[0].pName)
	+ else ASPRINTF (&pInfo4, "%"PRIu64" segment files\n First: %s\n Last: %s\n",
	+ pAewf->Segments,
	+ pAewf->pSegmentArr[0 ].pName,
	+ pAewf->pSegmentArr[pAewf->Segments-1].pName);
	+
	+ ASPRINTF (&pInfo5, "%"PRIu64" tables\n", pAewf->Tables);
	+
	+ if (pInfo3)
	+ ASPRINTF (&pAewf->pInfo, "%s%s\n%s\n%s%s", pInfo1, pInfo2, pInfo3, pInfo4, pInfo5)
	+ else ASPRINTF (&pAewf->pInfo, "%s%s%s%s" , pInfo1, pInfo2, pInfo4, pInfo5)
	+
	+ #undef RET_ERR
	+ #undef ASPRINTF
	+
	+CleanUp:
	+ if (pText ) free (pText );
	+ if (pInfo1) free (pInfo1);
	+ if (pInfo2) free (pInfo2);
	+ if (pInfo3) free (pInfo3);
	+ if (pInfo4) free (pInfo4);
	+ if (pInfo5) free (pInfo5);
	+
	+ return rc;
	+}
	+
	+static int AewfOpenSegment (t_pAewf pAewf, t_pTable pTable)
	+{
	+ t_pSegment pOldestSegment;
	+
	+ if (pTable->pSegment->pFile != NULL) // is already opened ?
	+ {
	+ pAewf->SegmentCacheHits++;
	+ return AEWF_OK;
	+ }
	+ pAewf->SegmentCacheMisses++;
	+
	+ // Check if another segment file must be closed first
	+ // --------------------------------------------------
	+ while (pAewf->OpenSegments >= pAewf->MaxOpenSegments)
	+ {
	+ pOldestSegment = NULL;
	+
	+ for (unsigned i=0; i<pAewf->Segments; i++)
	+ {
	+ if (pAewf->pSegmentArr[i].pFile == NULL)
	+ continue;
	+ if (pOldestSegment == NULL)
	+ {
	+ pOldestSegment = &pAewf->pSegmentArr[i];
	+ }
	+ else
	+ {
	+ if (pAewf->pSegmentArr[i].LastUsed < pOldestSegment->LastUsed)
	+ pOldestSegment = &pAewf->pSegmentArr[i];
	+ }
	+ }
	+ if (pOldestSegment == NULL)
	+ break;
	+
	+ LOG ("Closing %s", pOldestSegment->pName);
	+ CHK (CloseFile (&pOldestSegment->pFile))
	+ pAewf->OpenSegments--;
	+ }
	+
	+ // Read the desired table into RAM
	+ // -------------------------------
	+ LOG ("Opening %s", pTable->pSegment->pName);
	+ CHK (OpenFile(&pTable->pSegment->pFile, pTable->pSegment->pName))
	+ pAewf->OpenSegments++;
	+
	+ return AEWF_OK;
	+}
	+
	+static int AewfLoadEwfTable (t_pAewf pAewf, t_pTable pTable)
	+{
	+ t_pTable pOldestTable = NULL;
	+
	+ if (pTable->pEwfTable != NULL) // is already loaded?
	+ {
	+ pAewf->TableCacheHits++;
	+ return AEWF_OK;
	+ }
	+ pAewf->TableCacheMisses++;
	+
	+ // Check if another pEwfTable must be given up first
	+ // -------------------------------------------------
	+ while ((pAewf->TableCache + pTable->Size) > pAewf->MaxTableCache)
	+ {
	+ pOldestTable = NULL;
	+
	+ for (unsigned i=0; i<pAewf->Tables; i++)
	+ {
	+ if (pAewf->pTableArr[i].pEwfTable == NULL)
	+ continue;
	+ if (pOldestTable == NULL)
	+ {
	+ pOldestTable = &pAewf->pTableArr[i];
	+ }
	+ else
	+ {
	+ if (pAewf->pTableArr[i].LastUsed < pOldestTable->LastUsed)
	+ pOldestTable = &pAewf->pTableArr[i];
	+ }
	+ }
	+ if (pOldestTable == NULL)
	+ break;
	+ pAewf->TableCache -= pOldestTable->Size;
	+ free (pOldestTable->pEwfTable);
	+ pOldestTable->pEwfTable = NULL;
	+ LOG ("Releasing table %" PRIu64 " (%lu bytes)", pOldestTable->Nr, pOldestTable->Size);
	+ }
	+
	+ // Read the desired table into RAM
	+ // -------------------------------
	+ LOG ("Loading table %" PRIu64 " (%lu bytes)", pTable->Nr, pTable->Size);
	+ CHK (AewfOpenSegment (pAewf, pTable));
	+ CHK (ReadFileAllocPos (pAewf, pTable->pSegment->pFile, (void**) &pTable->pEwfTable, pTable->Size, pTable->Offset))
	+ pAewf->TableCache += pTable->Size;
	+ pAewf->TablesReadFromImage = pTable->Size;
	+
	+ return AEWF_OK;
	+}
	+
	+// AewfReadChunk0 reads exactly one chunk. It expects the EWF table be present
	+// in memory and the required segment be opened.
	+static int AewfReadChunk0 (t_pAewf pAewf, t_pTable pTable, uint64_t AbsoluteChunk, unsigned TableChunk)
	+{
	+ int Compressed;
	+ uint64_t SeekPos;
	+ t_pAewfSectionTable pEwfTable;
	+ unsigned int Offset;
	+ unsigned int ReadLen;
	+ uLongf DstLen0;
	+ int zrc;
	+ uint CalcCRC;
	+ uint *pStoredCRC;
	+ uint64_t ChunkSize;
	+ int Ret = AEWF_OK;
	+
	+ pEwfTable = pTable->pEwfTable;
	+ if (pEwfTable == NULL)
	+ return AEWF_ERROR_EWF_TABLE_NOT_READY;
	+ if (pTable->pSegment->pFile == NULL)
	+ return AEWF_ERROR_EWF_SEGMENT_NOT_READY;
	+
	+ Compressed = pEwfTable->OffsetArray[TableChunk] & AEWF_COMPRESSED;
	+ Offset = pEwfTable->OffsetArray[TableChunk] & ~AEWF_COMPRESSED;
	+ SeekPos = pEwfTable->TableBaseOffset + Offset;
	+
	+ if (TableChunk < (pEwfTable->ChunkCount-1))
	+ ReadLen = (pEwfTable->OffsetArray[TableChunk+1] & ~AEWF_COMPRESSED) - Offset;
	+ else ReadLen = (pTable->SectionSectorsSize - sizeof(t_AewfSection)) - (Offset - (pEwfTable->OffsetArray[0] & ~AEWF_COMPRESSED));
	+// else ReadLen = pAewf->ChunkBuffSize; // This also works! It looks as if uncompress is able to find out by itself the real size of the input data.
	+
	+ if (ReadLen > pAewf->ChunkBuffSize)
	+ {
	+ LOG ("Chunk too big %u / %u", ReadLen, pAewf->ChunkBuffSize);
	+ return AEWF_CHUNK_TOO_BIG;
	+ }
	+
	+ ChunkSize = pAewf->ChunkSize;
	+ if (AbsoluteChunk == (pAewf->Chunks-1)) // The very last chunk of the image may be smaller than the default
	+ { // chunk size if the image isn't a multiple of the chunk size.
	+ ChunkSize = pAewf->ImageSize % pAewf->ChunkSize;
	+ if (ChunkSize == 0)
	+ ChunkSize = pAewf->ChunkSize;
	+ }
	+
	+ if (Compressed)
	+ {
	+ CHK (ReadFilePos (pAewf, pTable->pSegment->pFile, pAewf->pChunkBuffCompressed, ReadLen, SeekPos))
	+ DstLen0 = pAewf->ChunkBuffSize;
	+ zrc = uncompress ((unsigned char)pAewf->pChunkBuffUncompressed, &DstLen0, (const Bytef)pAewf->pChunkBuffCompressed, ReadLen);
	+ if (zrc != Z_OK)
	+ Ret = AEWF_UNCOMPRESS_FAILED;
	+ if (DstLen0 != ChunkSize)
	+ Ret = AEWF_BAD_UNCOMPRESSED_LENGTH;
	+ }
	+ else
	+ {
	+ CHK (ReadFilePos (pAewf, pTable->pSegment->pFile, pAewf->pChunkBuffUncompressed, ReadLen, SeekPos))
	+ CalcCRC = adler32 (1, (const Bytef *) pAewf->pChunkBuffUncompressed, ChunkSize);
	+ pStoredCRC = (uint *) (pAewf->pChunkBuffUncompressed + ChunkSize); //lint !e826 Suspicious pointer-to-pointer conversion (area too small)
	+ if (CalcCRC != *pStoredCRC)
	+ Ret = AEWF_CHUNK_CRC_ERROR;
	+ }
	+
	+ pAewf->DataReadFromImage += ReadLen;
	+ pAewf->DataReadFromImageRaw += ChunkSize;
	+ if (Ret == AEWF_OK)
	+ {
	+ pAewf->ChunkInBuff = AbsoluteChunk;
	+ pAewf->ChunkBuffUncompressedDataLen = ChunkSize;
	+ }
	+ else
	+ {
	+ pAewf->ChunkInBuff = AEWF_NONE;
	+ pAewf->ChunkBuffUncompressedDataLen = 0;
	+ }
	+
	+ return Ret;
	+}
	+
	+static int AewfReadChunk (t_pAewf pAewf, uint64_t AbsoluteChunk, char *ppBuffer, unsigned int pLen)
	+{
	+ t_pTable pTable;
	+ int Found=FALSE;
	+ unsigned TableChunk;
	+ unsigned TableNr;
	+
	+ *ppBuffer = pAewf->pChunkBuffUncompressed;
	+ *pLen = 0;
	+
	+ if (pAewf->ChunkInBuff == AbsoluteChunk)
	+ {
	+ *pLen = pAewf->ChunkBuffUncompressedDataLen;
	+ pAewf->ChunkCacheHits++;
	+ return AEWF_OK;
	+ }
	+ pAewf->ChunkCacheMisses++;
	+
	+ // Find table containing desired chunk
	+ // -----------------------------------
	+ for (TableNr=0; TableNr<pAewf->Tables; TableNr++)
	+ {
	+ pTable = &pAewf->pTableArr[TableNr];
	+ Found = (AbsoluteChunk >= pTable->ChunkFrom) &&
	+ (AbsoluteChunk <= pTable->ChunkTo);
	+ if (Found)
	+ break;
	+ }
	+ if (!Found)
	+ CHK (AEWF_CHUNK_NOT_FOUND)
	+
	+ // Load corresponding table and get chunk
	+ // --------------------------------------
	+ pTable->LastUsed = time(NULL); //lint !e771 pTable' (line 640) conceivably not initialized
	+ pTable->pSegment->LastUsed = pTable->LastUsed; // Update LastUsed here, in order not to remove the required data from cache
	+
	+ CHK (AewfLoadEwfTable (pAewf, pTable))
	+ CHK (AewfOpenSegment (pAewf, pTable));
	+ if ((AbsoluteChunk - pTable->ChunkFrom) > UINT_MAX)
	+ CHK (AEWF_ERROR_IN_CHUNK_NUMBER)
	+ TableChunk = AbsoluteChunk - pTable->ChunkFrom;
	+// LOG ("table %d / entry %" PRIu64 " (%s)", TableNr, TableChunk, pTable->pSegment->pName)
	+ CHK (AewfReadChunk0 (pAewf, pTable, AbsoluteChunk, TableChunk))
	+ *pLen = pAewf->ChunkBuffUncompressedDataLen;
	+
	+ return AEWF_OK;
	+}
	+
	+static int UpdateStats (t_pAewf pAewf, int Force)
	+{
	+ time_t NowT;
	+ pid_t pid;
	+ FILE *pFile;
	+ char *pFilename = NULL;
	+ char *pCurrentWorkDir = NULL;
	+
	+ if (pAewf->pStatsFilename)
	+ {
	+ time (&NowT);
	+ if (((NowT - pAewf->LastStatsUpdate) >= (int)pAewf->StatsRefresh) \|\| Force)
	+ {
	+ pAewf->LastStatsUpdate = NowT;
	+
	+ pid = getpid ();
	+ if (asprintf (&pFilename, "%s_%d", pAewf->pStatsFilename, pid) < 0)
	+ return AEWF_MEMALLOC_FAILED;
	+ pFile = fopen (pFilename, "w");
	+ if (pFile == NULL) // May be the file is locked by someone else, let's retry in 1 second
	+ {
	+ pAewf->LastStatsUpdate = NowT - pAewf->StatsRefresh + 1;
	+ return AEWF_OK;
	+ }
	+
	+ fprintf (pFile, "Image segment files %6"PRIu64"\n" , pAewf->Segments);
	+ fprintf (pFile, "Image tables %6"PRIu64"\n" , pAewf->Tables);
	+ fprintf (pFile, "\n");
	+ fprintf (pFile, "Cache hits misses ratio\n");
	+ fprintf (pFile, "--------------------------------------\n");
	+ fprintf (pFile, "Segment %10" PRIu64 " %10" PRIu64 " %5.1f%%\n", pAewf->SegmentCacheHits, pAewf->SegmentCacheMisses, (100.0*pAewf->SegmentCacheHits)/(pAewf->SegmentCacheHits+pAewf->SegmentCacheMisses));
	+ fprintf (pFile, "Table %10" PRIu64 " %10" PRIu64 " %5.1f%%\n", pAewf->TableCacheHits , pAewf->TableCacheMisses , (100.0*pAewf->TableCacheHits) /(pAewf->TableCacheHits +pAewf->TableCacheMisses ));
	+ fprintf (pFile, "Chunk %10" PRIu64 " %10" PRIu64 " %5.1f%%\n", pAewf->ChunkCacheHits , pAewf->ChunkCacheMisses , (100.0*pAewf->ChunkCacheHits) /(pAewf->ChunkCacheHits +pAewf->ChunkCacheMisses ));
	+ fprintf (pFile, "\n");
	+ fprintf (pFile, "Read operations %10" PRIu64 "\n", pAewf->ReadOperations);
	+ fprintf (pFile, "Errors %10" PRIu64 "\n", pAewf->Errors);
	+ fprintf (pFile, "Open segment files %10" PRIu64"\n" , pAewf->OpenSegments);
	+ fprintf (pFile, "Last error %10d (%s)\n" , pAewf->LastError, AewfGetErrorMessage (pAewf->LastError));
	+ fprintf (pFile, "Data read from image %10.1f MiB (compressed)\n", pAewf->DataReadFromImage / (1024.0*1024.0));
	+ fprintf (pFile, "Data read from image %10.1f MiB (raw)\n" , pAewf->DataReadFromImageRaw / (1024.0*1024.0));
	+ fprintf (pFile, "Data requested by caller %10.1f MiB\n" , pAewf->DataRequestedByCaller/ (1024.0*1024.0));
	+ fprintf (pFile, "Tables read from image %10.1f MiB\n" , pAewf->TablesReadFromImage / (1024.0*1024.0));
	+ fprintf (pFile, "RAM used as table cache %10.1f MiB\n" , pAewf->TableCache / (1024.0*1024.0));
	+ fprintf (pFile, "Size of all image tables %10.1f MiB\n" , pAewf->TotalTableSize / (1024.0*1024.0));
	+
	+ pCurrentWorkDir = getcwd (NULL, 0);
	+ if (pCurrentWorkDir == NULL)
	+ return AEWF_MEMALLOC_FAILED;
	+ fprintf (pFile, "\nCurrent working directory: %s\n", pCurrentWorkDir);
	+ free (pCurrentWorkDir);
	+
	+ (void) fclose (pFile);
	+ free (pFilename);
	+
	+ return AEWF_OK;
	+ }
	+ }
	+ return AEWF_OK;
	+}
	+
	+// ---------------
	+// API functions
	+// ---------------
	+
	+static int AewfCreateHandle (void *ppHandle, const char pFormat, uint8_t Debug)
	+{
	+ t_pAewf pAewf;
	+
	+ *ppHandle = NULL;
	+
	+ // Create handle and clear it
	+ // --------------------------
	+ pAewf = (t_pAewf) malloc (sizeof(t_Aewf));
	+ if (pAewf == NULL)
	+ return AEWF_MEMALLOC_FAILED;
	+
	+ memset(pAewf,0,sizeof(t_Aewf));
	+ pAewf->ChunkInBuff = AEWF_NONE;
	+ pAewf->pErrorText = NULL;
	+ pAewf->StatsRefresh = 10;
	+ pAewf->SegmentCacheHits = 0;
	+ pAewf->SegmentCacheMisses = 0;
	+ pAewf->TableCacheHits = 0;
	+ pAewf->TableCacheMisses = 0;
	+ pAewf->ChunkCacheHits = 0;
	+ pAewf->ChunkCacheMisses = 0;
	+ pAewf->ReadOperations = 0;
	+ pAewf->DataReadFromImage = 0;
	+ pAewf->DataReadFromImageRaw = 0;
	+ pAewf->DataRequestedByCaller = 0;
	+ pAewf->TablesReadFromImage = 0;
	+ pAewf->ChunksRead = 0;
	+ pAewf->BytesRead = 0;
	+ pAewf->Errors = 0;
	+ pAewf->LastError = AEWF_OK;
	+ pAewf->MaxTableCache = 0;
	+ pAewf->MaxOpenSegments = 0;
	+ pAewf->pStatsFilename = NULL;
	+ pAewf->StatsRefresh = 0;
	+ pAewf->pLogFilename = NULL;
	+ pAewf->LogStdout = Debug;
	+
	+ pAewf->MaxTableCache = AEWF_DEFAULT_TABLECACHE * 1024*1024;
	+ pAewf->MaxOpenSegments = AEWF_DEFAULT_MAXOPENSEGMENTS;
	+ pAewf->StatsRefresh = AEWF_DEFAULT_STATSREFRESH;
	+
	+ ppHandle = (void) pAewf;
	+
	+ return AEWF_OK;
	+}
	+
	+int AewfDestroyHandle(void **ppHandle)
	+{
	+ t_pAewf pAewf = (t_pAewf) *ppHandle;
	+
	+ LOG ("Called");
	+ LOG ("Remark: 'Ret' won't be logged"); // Handle gets destroyed, 'ret' logging not possible
	+
	+ if (pAewf->pLogFilename) free(pAewf->pLogFilename);
	+ if (pAewf->pStatsFilename) free(pAewf->pStatsFilename);
	+
	+ memset (pAewf, 0, sizeof(t_Aewf));
	+ free (pAewf);
	+ *ppHandle = NULL;
	+
	+ return AEWF_OK;
	+}
	+
	+int AewfOpen (void pHandle, const char *ppFilenameArr, uint64_t FilenameArrLen)
	+{
	+ t_pAewf pAewf = (t_pAewf) pHandle;
	+ t_AewfFileHeader FileHeader;
	+ t_AewfSection Section;
	+ FILE *pFile;
	+ t_pSegment pSegment;
	+ t_pTable pTable;
	+ uint64_t Pos;
	+ t_pAewfSectionTable pEwfTable = NULL;
	+ t_pAewfSectionVolume pVolume = NULL;
	+ char *pHeader = NULL;
	+ char *pHeader2 = NULL;
	+ int LastSection;
	+ unsigned int SectionSectorsSize;
	+ unsigned HeaderLen = 0;
	+ unsigned Header2Len = 0;
	+
	+ LOG ("Called - Files=%" PRIu64, FilenameArrLen);
	+
	+ // Create pSegmentArr and put the segment files in it
	+ // --------------------------------------------------
	+ int SegmentArrLen = FilenameArrLen * sizeof(t_Segment);
	+ pAewf->pSegmentArr = (t_pSegment) malloc (SegmentArrLen);
	+ pAewf->Segments = FilenameArrLen;
	+ if (pAewf->pSegmentArr == NULL)
	+ return AEWF_MEMALLOC_FAILED;
	+ memset (pAewf->pSegmentArr, 0, SegmentArrLen);
	+
	+ for (unsigned i=0; i<FilenameArrLen; i++)
	+ {
	+ pSegment = &pAewf->pSegmentArr[i];
	+ pSegment->pName = canonicalize_file_name (ppFilenameArr[i]); // canonicalize_file_name allocates a buffer
	+
	+ LOG ("Opening segment %s", ppFilenameArr[i]);
	+ CHK (OpenFile (&pFile, pSegment->pName))
	+ CHK (ReadFilePos (pAewf, pFile, (void*)&FileHeader, sizeof(FileHeader), 0))
	+
	+ pSegment->Number = FileHeader.SegmentNumber;
	+ pSegment->LastUsed = 0;
	+ pSegment->pFile = NULL;
	+
	+ CHK (CloseFile (&pFile))
	+ }
	+
	+ // Put segment array into correct sequence and check if segment number are correct
	+ // -------------------------------------------------------------------------------
	+ qsort (pAewf->pSegmentArr, pAewf->Segments, sizeof (t_Segment), &QsortCompareSegments);
	+ for (unsigned i=0; i<pAewf->Segments; i++)
	+ {
	+ if ((i+1) != pAewf->pSegmentArr[i].Number)
	+ return AEWF_INVALID_SEGMENT_NUMBER;
	+ }
	+
	+ // Find all tables in the segment files
	+ // ------------------------------------
	+ pAewf->pTableArr = NULL;
	+ pAewf->Tables = 0;
	+ pAewf->Chunks = 0;
	+ pAewf->TotalTableSize = 0;
	+ SectionSectorsSize = 0;
	+
	+ LOG ("Reading tables");
	+ for (unsigned i=0; i<pAewf->Segments; i++)
	+ {
	+ pSegment = &pAewf->pSegmentArr[i];
	+ CHK (OpenFile (&pFile, pSegment->pName))
	+ CHK (ReadFilePos (pAewf, pFile, &FileHeader, sizeof(FileHeader), 0))
	+ Pos = sizeof (FileHeader);
	+ LOG ("Segment %s ", pSegment->pName);
	+ do
	+ {
	+ CHK (ReadFilePos (pAewf, pFile, &Section, sizeof (t_AewfSection), Pos))
	+
	+ if (strcasecmp ((char *)Section.Type, "sectors") == 0)
	+ {
	+ SectionSectorsSize = Section.Size;
	+ }
	+ else if (strcasecmp ((char *)Section.Type, "table") == 0)
	+ {
	+ if (pVolume == NULL)
	+ return AEWF_VOLUME_MUST_PRECEDE_TABLES;
	+ if (SectionSectorsSize == 0)
	+ return AEWF_SECTORS_MUST_PRECEDE_TABLES;
	+ pAewf->Tables++;
	+ pAewf->pTableArr = (t_pTable) realloc (pAewf->pTableArr, pAewf->Tables * sizeof (t_Table));
	+ CHK (ReadFileAlloc (pAewf, pFile, (void**) &pEwfTable, sizeof(t_AewfSectionTable))) // No need to read the actual offset table
	+ pTable = &pAewf->pTableArr[pAewf->Tables-1];
	+ pTable->Nr = pAewf->Tables-1;
	+ pTable->pSegment = pSegment;
	+ pTable->Offset = Pos + sizeof (t_AewfSection);
	+ pTable->Size = Section.Size;
	+ pTable->ChunkCount = pEwfTable->ChunkCount;
	+ pTable->LastUsed = 0;
	+ pTable->pEwfTable = NULL;
	+ pTable->ChunkFrom = pAewf->Chunks;
	+ pTable->SectionSectorsSize = SectionSectorsSize;
	+ pAewf->TotalTableSize += pTable->Size;
	+ pAewf->Chunks += pTable->ChunkCount;
	+ pTable->ChunkTo = pAewf->Chunks-1;
	+ free (pEwfTable);
	+ pEwfTable = NULL;
	+ SectionSectorsSize = 0;
	+ }
	+ else if ((strcasecmp ((char *)Section.Type, "header") == 0) && (pHeader==NULL))
	+ {
	+ HeaderLen = Section.Size - sizeof(t_AewfSection);
	+ CHK (ReadFileAlloc (pAewf, pFile, (void**) &pHeader, HeaderLen))
	+ }
	+ else if ((strcasecmp ((char *)Section.Type, "header2") == 0) && (pHeader2==NULL))
	+ {
	+ Header2Len = Section.Size - sizeof(t_AewfSection);
	+ CHK (ReadFileAlloc (pAewf, pFile, (void**) &pHeader2, Header2Len))
	+ }
	+ else if ((strcasecmp ((char *)Section.Type, "volume") == 0) && (pVolume==NULL))
	+ {
	+ CHK (ReadFileAlloc (pAewf, pFile, (void**) &pVolume, sizeof(t_AewfSectionVolume)))
	+ pAewf->Sectors = pVolume->SectorCount;
	+ pAewf->SectorSize = pVolume->BytesPerSector;
	+ pAewf->ChunkSize = pVolume->SectorsPerChunk * pVolume->BytesPerSector; //lint !e647 Suspicious truncation
	+ pAewf->ImageSize = pAewf->Sectors * pAewf->SectorSize;
	+ }
	+
	+ LastSection = (Pos == Section.OffsetNextSection);
	+ Pos = Section.OffsetNextSection;
	+ } while (!LastSection);
	+ CHK (CloseFile (&pFile))
	+ }
	+ if (pVolume == NULL)
	+ return AEWF_VOLUME_MISSING;
	+
	+ if (pAewf->Chunks != pVolume->ChunkCount)
	+ {
	+ LOG ("Error: Wrong chunk count: %"PRIu64" / %"PRIu64, pAewf->Chunks, pVolume->ChunkCount);
	+ LOG ("Maybe some segment files are missing. Perhaps you specified E01 instead of E?? or the segments continue beyond extension .EZZ.");
	+ return AEWF_WRONG_CHUNK_COUNT;
	+ }
	+ pAewf->ChunkBuffSize = pAewf->ChunkSize + 4096; // reserve some extra space (for CRC and as compressed data might be slightly larger than uncompressed data with some imagers)
	+ pAewf->pChunkBuffCompressed = (char *) malloc (pAewf->ChunkBuffSize);
	+ pAewf->pChunkBuffUncompressed = (char *) malloc (pAewf->ChunkBuffSize);
	+ if ((pAewf->pChunkBuffCompressed == NULL) \|\|
	+ (pAewf->pChunkBuffUncompressed == NULL))
	+ return AEWF_MEMALLOC_FAILED;
	+
	+ pAewf->TableCache = 0;
	+ pAewf->OpenSegments = 0;
	+
	+ CHK (CreateInfoData (pAewf, pVolume, pHeader, HeaderLen, pHeader2, Header2Len))
	+ free (pVolume);
	+ free (pHeader);
	+ free (pHeader2);
	+
	+ LOG ("Ret");
	+ return AEWF_OK;
	+}
	+
	+static int AewfClose (void *pHandle)
	+{
	+ t_pAewf pAewf = (t_pAewf) pHandle;
	+ t_pTable pTable;
	+ t_pSegment pSegment;
	+
	+ LOG ("Called");
	+ CHK (UpdateStats (pAewf,TRUE))
	+
	+ for (unsigned i=0; i<pAewf->Tables; i++)
	+ {
	+ pTable = &pAewf->pTableArr[i];
	+ if (pTable->pEwfTable)
	+ free (pTable->pEwfTable);
	+ }
	+
	+ for (unsigned i=0;i<pAewf->Segments;i++)
	+ {
	+ pSegment = &pAewf->pSegmentArr[i];
	+ if (pSegment->pFile)
	+ CHK (CloseFile (&pSegment->pFile));
	+ free (pSegment->pName);
	+ }
	+
	+ free (pAewf->pTableArr);
	+ free (pAewf->pSegmentArr);
	+ free (pAewf->pChunkBuffCompressed);
	+ free (pAewf->pChunkBuffUncompressed);
	+
	+ LOG ("Ret");
	+ return AEWF_OK;
	+}
	+
	+static int AewfSize (void pHandle, uint64_t pSize)
	+{
	+ t_pAewf pAewf = (t_pAewf) pHandle;
	+
	+ LOG ("Called");
	+ *pSize = pAewf->ImageSize;
	+
	+ LOG ("Ret - Size=%" PRIu64, *pSize);
	+ return AEWF_OK;
	+}
	+
	+static int AewfRead (void pHandle, char pBuf, off_t Seek, size_t Count, size_t pRead, int pErrno)
	+{
	+ t_pAewf pAewf = (t_pAewf) pHandle;
	+ char *pChunkBuffer;
	+ uint64_t Seek64;
	+ uint64_t Chunk;
	+ uint64_t Remaining;
	+ unsigned int ChunkLen, Ofs, ToCopy;
	+ int Ret = AEWF_OK;
	+
	+ LOG ("Called - Seek=%'" PRIu64 ",Count=%'" PRIu64, Seek, Count);
	+ *pRead = 0;
	+ *pErrno = 0;
	+
	+ if (Seek < 0)
	+ {
	+ Ret = AEWF_NEGATIVE_SEEK;
	+ goto Leave;
	+ }
	+ Seek64 = Seek;
	+
	+ pAewf->ReadOperations++;
	+ pAewf->DataRequestedByCaller+=Count;
	+
	+ if (Seek64 >= pAewf->ImageSize) // If calling function asks
	+ goto Leave; // for data beyond end of
	+ if ((Seek64+Count) > pAewf->ImageSize) // image simply return what
	+ Count = pAewf->ImageSize - Seek64; // is possible.
	+
	+ Ofs = Seek64 % pAewf->ChunkSize;
	+ Chunk = Seek64 / pAewf->ChunkSize;
	+ Remaining = Count;
	+
	+ while (Remaining)
	+ {
	+ Ret = AewfReadChunk (pAewf, Chunk, &pChunkBuffer, &ChunkLen);
	+ if (Ret)
	+ goto Leave;
	+ if (ChunkLen == 0)
	+ {
	+ Ret = AEWF_CHUNK_LENGTH_ZERO;
	+ goto Leave;
	+ }
	+ ToCopy = GETMIN (ChunkLen-Ofs, Remaining);
	+ memcpy (pBuf, pChunkBuffer+Ofs, ToCopy);
	+ Remaining -= ToCopy;
	+ pBuf += ToCopy;
	+ *pRead += ToCopy;
	+ Ofs = 0;
	+ Chunk++;
	+ }
	+
	+Leave:
	+ AewfCheckError (pAewf, Ret, pErrno);
	+ CHK (UpdateStats (pAewf, (Ret != AEWF_OK)))
	+ LOG ("Ret %d - Read=%" PRIu32, Ret, *pRead);
	+ return Ret;
	+}
	+
	+static int AewfOptionsHelp (const char **ppHelp)
	+{
	+ char *pHelp=NULL;
	+ int wr;
	+
	+ wr = asprintf (&pHelp, " %-12s : Maximum amount of RAM cache, in MiB, for image offset tables. Default: %"PRIu64" MiB\n"
	+ " %-12s : Maximum number of concurrently opened image segment files. Default: %"PRIu64"\n"
	+ " %-12s : Output statistics at regular intervals to this file.\n"
	+ " %-12s : The update interval, in seconds, for the statistics. Ignored if %s is not set. Default: %"PRIu64"s.\n"
	+ " %-12s : Log file name.\n"
	+ " Specify full paths for %s and %s options. The given file names are extended by _<pid>.\n",
	+ AEWF_OPTION_TABLECACHE, AEWF_DEFAULT_TABLECACHE,
	+ AEWF_OPTION_MAXOPENSEGMENTS, AEWF_DEFAULT_MAXOPENSEGMENTS,
	+ AEWF_OPTION_STATS,
	+ AEWF_OPTION_STATSREFRESH, AEWF_OPTION_STATS, AEWF_DEFAULT_STATSREFRESH,
	+ AEWF_OPTION_LOG,
	+ AEWF_OPTION_STATS, AEWF_OPTION_LOG);
	+ if ((pHelp == NULL) \|\| (wr<=0))
	+ return AEWF_MEMALLOC_FAILED;
	+
	+ *ppHelp = pHelp;
	+ return AEWF_OK;
	+}
	+
	+static int AewfOptionsParse (void pHandle, uint32_t OptionCount, const pts_LibXmountOptions ppOptions, const char **ppError)
	+{
	+ pts_LibXmountOptions pOption;
	+ t_pAewf pAewf = (t_pAewf) pHandle;
	+ const char *pError = NULL;
	+ int rc = AEWF_OK;
	+ int Ok;
	+
	+ LOG ("Called - OptionCount=%" PRIu32, OptionCount);
	+ *ppError = NULL;
	+
	+ #define TEST_OPTION_UINT64(Opt,DestField) \
	+ if (strcmp (pOption->p_key, Opt) == 0) \
	+ { \
	+ pAewf->DestField = StrToUint64 (pOption->p_value, &Ok); \
	+ if (!Ok) \
	+ { \
	+ pError = "Error in option %s: Invalid value"; \
	+ break; \
	+ } \
	+ LOG ("Option %s set to %" PRIu64, Opt, pAewf->DestField) \
	+ }
	+
	+ for (uint32_t i=0; i<OptionCount; i++)
	+ {
	+ pOption = ppOptions[i];
	+ if (strcmp (pOption->p_key, AEWF_OPTION_LOG) == 0)
	+ {
	+ pAewf->pLogFilename = strdup (pOption->p_value);
	+ rc = LOG ("Logging for libxmount_input_aewf started")
	+ if (rc != AEWF_OK)
	+ {
	+ pError = "Write test to log file failed";
	+ break;
	+ }
	+ pOption->valid = TRUE;
	+ LOG ("Option %s set to %s", AEWF_OPTION_LOG, pAewf->pLogFilename);
	+ }
	+ if (strcmp (pOption->p_key, AEWF_OPTION_STATS) == 0)
	+ {
	+ pAewf->pStatsFilename = strdup (pOption->p_value);
	+ pOption->valid = TRUE;
	+ LOG ("Option %s set to %s", AEWF_OPTION_STATS, pAewf->pStatsFilename);
	+ }
	+
	+ else TEST_OPTION_UINT64 (AEWF_OPTION_MAXOPENSEGMENTS, MaxOpenSegments)
	+ else TEST_OPTION_UINT64 (AEWF_OPTION_TABLECACHE , MaxTableCache)
	+ else TEST_OPTION_UINT64 (AEWF_OPTION_STATSREFRESH , StatsRefresh)
	+ }
	+ #undef TEST_OPTION_UINT64
	+
	+ if (pError)
	+ *ppError = strdup (pError);
	+ LOG ("Ret - rc=%d,Error=%s", rc, *ppError);
	+ return rc;
	+}
	+
	+static int AewfGetInfofileContent (void pHandle, const char *ppInfoBuf)
	+{
	+ t_pAewf pAewf = (t_pAewf) pHandle;
	+ char *pInfo;
	+
	+ LOG ("Called");
	+ pInfo = strdup (pAewf->pInfo);
	+ if (pInfo == NULL)
	+ return AEWF_MEMALLOC_FAILED;
	+ *ppInfoBuf = pInfo;
	+
	+ LOG ("Ret - %d bytes of info", strlen(pInfo)+1);
	+ return AEWF_OK;
	+}
	+
	+static const char* AewfGetErrorMessage (int ErrNum)
	+{
	+ const char *pMsg;
	+ #define ADD_ERR(AewfErrCode) \
	+ case AewfErrCode: pMsg = #AewfErrCode; \
	+ break;
	+
	+ switch (ErrNum)
	+ {
	+ ADD_ERR (AEWF_OK)
	+ ADD_ERR (AEWF_MEMALLOC_FAILED)
	+ ADD_ERR (AEWF_READ_BEYOND_END_OF_IMAGE)
	+ ADD_ERR (AEWF_OPTIONS_ERROR)
	+ ADD_ERR (AEWF_CANNOT_OPEN_LOGFILE)
	+ ADD_ERR (AEWF_FILE_OPEN_FAILED)
	+ ADD_ERR (AEWF_FILE_CLOSE_FAILED)
	+ ADD_ERR (AEWF_FILE_SEEK_FAILED)
	+ ADD_ERR (AEWF_FILE_READ_FAILED)
	+ ADD_ERR (AEWF_READFILE_BAD_MEM)
	+ ADD_ERR (AEWF_INVALID_SEGMENT_NUMBER)
	+ ADD_ERR (AEWF_WRONG_SEGMENT_FILE_COUNT)
	+ ADD_ERR (AEWF_VOLUME_MUST_PRECEDE_TABLES)
	+ ADD_ERR (AEWF_SECTORS_MUST_PRECEDE_TABLES)
	+ ADD_ERR (AEWF_WRONG_CHUNK_COUNT)
	+ ADD_ERR (AEWF_CHUNK_NOT_FOUND)
	+ ADD_ERR (AEWF_VOLUME_MISSING)
	+ ADD_ERR (AEWF_ERROR_EWF_TABLE_NOT_READY)
	+ ADD_ERR (AEWF_ERROR_EWF_SEGMENT_NOT_READY)
	+ ADD_ERR (AEWF_CHUNK_TOO_BIG)
	+ ADD_ERR (AEWF_UNCOMPRESS_FAILED)
	+ ADD_ERR (AEWF_BAD_UNCOMPRESSED_LENGTH)
	+ ADD_ERR (AEWF_CHUNK_CRC_ERROR)
	+ ADD_ERR (AEWF_ERROR_IN_CHUNK_NUMBER)
	+ ADD_ERR (AEWF_VASPRINTF_FAILED)
	+ ADD_ERR (AEWF_UNCOMPRESS_HEADER_FAILED)
	+ ADD_ERR (AEWF_ASPRINTF_FAILED)
	+ ADD_ERR (AEWF_CHUNK_LENGTH_ZERO)
	+ ADD_ERR (AEWF_NEGATIVE_SEEK)
	+ default:
	+ pMsg = "Unknown error";
	+ }
	+ #undef ARR_ERR
	+ return pMsg;
	+}
	+
	+static int AewfFreeBuffer (void *pBuf)
	+{
	+ free (pBuf);
	+
	+ return AEWF_OK;
	+}
	+
	+
	+// ------------------------------------
	+// LibXmount_Input API implementation
	+// ------------------------------------
	+
	+uint8_t LibXmount_Input_GetApiVersion ()
	+{
	+ return LIBXMOUNT_INPUT_API_VERSION;
	+}
	+
	+const char* LibXmount_Input_GetSupportedFormats ()
	+{
	+ return "aewf\0\0"; //lint !e840 Use of nul character in a string literal
	+}
	+
	+void LibXmount_Input_GetFunctions (ts_LibXmountInputFunctions *pFunctions)
	+{
	+ pFunctions->CreateHandle = &AewfCreateHandle;
	+ pFunctions->DestroyHandle = &AewfDestroyHandle;
	+ pFunctions->Open = &AewfOpen;
	+ pFunctions->Close = &AewfClose;
	+ pFunctions->Size = &AewfSize;
	+ pFunctions->Read = &AewfRead;
	+ pFunctions->OptionsHelp = &AewfOptionsHelp;
	+ pFunctions->OptionsParse = &AewfOptionsParse;
	+ pFunctions->GetInfofileContent = &AewfGetInfofileContent;
	+ pFunctions->GetErrorMessage = &AewfGetErrorMessage;
	+ pFunctions->FreeBuffer = &AewfFreeBuffer;
	+}
	+
	+// -----------------------------------------------------
	+// Small main routine for testing
	+// It converts an EWF file into dd
	+// -----------------------------------------------------
	+
	+#ifdef AEWF_STANDALONE
	+
	+#define PRINT_ERROR_AND_EXIT(...) \
	+{ \
	+ printf (__VA_ARGS__); \
	+ exit (1); \
	+}
	+
	+int ParseOptions (t_pAewf pAewf, char *pOptions)
	+{
	+ pts_LibXmountOptions pOptionArr;
	+ pts_LibXmountOptions *ppOptionArr;
	+ int OptionCount;
	+ char *pSep;
	+ char *pEqual;
	+ char *pTmp;
	+ const char *pError;
	+ char *pOpt;
	+ int rc;
	+
	+ if (pOptions == NULL)
	+ return AEWF_OK;
	+
	+ if (*pOptions == '\0')
	+ return AEWF_OK;
	+
	+ if (*pOptions == ',')
	+ return AEWF_OPTIONS_ERROR;
	+
	+ if (pOptions[strlen(pOptions)-1] == ',')
	+ return AEWF_OPTIONS_ERROR;
	+
	+ pOpt = strdup (pOptions);
	+
	+ // Count number of comma separated options
	+ OptionCount = 1;
	+ pTmp = pOpt;
	+ while ((pTmp = strchr (pTmp, ',')) != NULL)
	+ {
	+ OptionCount++;
	+ pTmp++;
	+ }
	+
	+ // Create and fill option array
	+ pOptionArr = (pts_LibXmountOptions) malloc (OptionCount * sizeof(ts_LibXmountOptions));
	+ if (pOptionArr == NULL)
	+ PRINT_ERROR_AND_EXIT ("Cannot allocate pOptionArr");
	+ memset (pOptionArr, 0, OptionCount * sizeof(ts_LibXmountOptions));
	+ pTmp = pOpt;
	+ for (int i=0; i<OptionCount; i++)
	+ {
	+ pOptionArr[i].p_key = pTmp;
	+ pSep = strchr (pTmp, ',');
	+ if (pSep)
	+ *pSep ='\0';
	+ pEqual = strchr (pTmp, '=');
	+ if (pEqual)
	+ {
	+ *pEqual = '\0';
	+ pOptionArr[i].p_value = pEqual+1;
	+ }
	+ if (pSep != NULL)
	+ pTmp = pSep+1;
	+ }
	+
	+ // Create pointer array and call AEWF parse function
	+ ppOptionArr = (pts_LibXmountOptions )malloc (OptionCountsizeof (pts_LibXmountOptions));
	+ if (ppOptionArr == NULL)
	+ PRINT_ERROR_AND_EXIT ("Cannot allocate ppOptionArr");
	+ for (int i=0; i<OptionCount; i++)
	+ ppOptionArr[i] = &pOptionArr[i];
	+
	+ rc = AewfOptionsParse ((void*) pAewf, OptionCount, ppOptionArr, &pError);
	+ free (ppOptionArr);
	+ free ( pOptionArr);
	+ free ( pOpt);
	+ if (pError)
	+ PRINT_ERROR_AND_EXIT ("Error while setting options: %s", pError);
	+ CHK (rc)
	+
	+ return AEWF_OK;
	+}
	+
	+int main(int argc, const char *argv[])
	+{
	+ t_pAewf pAewf=NULL;
	+ uint64_t TotalSize;
	+ uint64_t Remaining;
	+ uint64_t ToRead;
	+ uint64_t Read;
	+ uint64_t Pos;
	+ unsigned int BuffSize = 13*65536; // A multiple of chunk size for good performance
	+ char Buff[BuffSize];
	+ FILE *pFile;
	+ int Percent;
	+ int PercentOld;
	+ int rc;
	+ int Errno;
	+ char *pOptions = NULL;
	+ const char *pHelp;
	+ const char *pInfoBuff;
	+
	+ #ifdef CREATE_REVERSE_FILE
	+ FILE *pFileRev;
	+ uint64_t PosRev;
	+ #ifdef REVERSE_FILE_USES_SEPARATE_HANDLE
	+ t_pAewf pAewfRev;
	+ #else
	+ #define pAewfRev pAewf
	+ #endif
	+ #endif
	+
	+ setbuf(stdout, NULL);
	+ setbuf(stderr, NULL);
	+ (void) setlocale (LC_ALL, "");
	+
	+ printf ("EWF to DD converter - result file is named dd\n");
	+ printf (" Result file is named dd");
	+ #ifdef CREATE_REVERSE_FILE
	+ printf ("; Also creates a backwards read file named rev");
	+ #ifdef REVERSE_FILE_USES_SEPARATE_HANDLE
	+ printf ("; Uses separate AEWF handle for reverse file");
	+ #else
	+ printf ("; Uses the same AEWF handle for reverse file");
	+ #endif
	+ #endif
	+ printf ("\n");
	+
	+
	+ if (argc < 2)
	+ {
	+ (void) AewfOptionsHelp (&pHelp);
	+ printf ("Usage: %s <EWF segment file 1> <EWF segment file 2> <...> [-comma_separated_options]\n", argv[0]);
	+ printf ("Possible options:\n%s\n", pHelp);
	+ printf ("The output file will be named dd.\n");
	+ CHK (AewfFreeBuffer ((void*) pHelp))
	+ exit (1);
	+ }
	+
	+ if (argv[argc-1][0] == '-')
	+ {
	+ pOptions = strdup (&(argv[argc-1][1]));
	+ argc--;
	+ }
	+ rc = AewfCreateHandle ((void**) &pAewf, "aewf", LOG_STDOUT);
	+ if (rc != AEWF_OK)
	+ PRINT_ERROR_AND_EXIT ("Cannot create handle, rc=%d\n", rc)
	+
	+ if (pOptions)
	+ CHK (ParseOptions(pAewf, pOptions))
	+ rc = AewfOpen (pAewf, &argv[1], argc-1);
	+ if (rc != AEWF_OK)
	+ PRINT_ERROR_AND_EXIT ("Cannot open EWF files, rc=%d\n", rc)
	+
	+ #if defined(CREATE_REVERSE_FILE) && defined(REVERSE_FILE_USES_SEPARATE_HANDLE)
	+ rc = AewfCreateHandle ((void**) &pAewfRev, "aewf", LOG_STDOUT);
	+ if (rc != AEWF_OK)
	+ PRINT_ERROR_AND_EXIT ("Cannot create reverse handle, rc=%d\n", rc)
	+ if (pOptions)
	+ CHK (ParseOptions (pAewfRev, pOptions))
	+ rc = AewfOpen (pAewfRev, &argv[1], argc-1);
	+ if (rc != AEWF_OK)
	+ PRINT_ERROR_AND_EXIT ("Cannot open EWF files, rc=%d\n", rc)
	+ #endif
	+
	+ CHK (AewfGetInfofileContent ((void*) pAewf, &pInfoBuff))
	+ if (pInfoBuff)
	+ printf ("Contents of info buffer:\n%s\n", pInfoBuff);
	+ CHK (AewfFreeBuffer ((void*) pInfoBuff))
	+
	+ CHK (AewfSize (pAewf, &TotalSize))
	+ printf ("Total size: %" PRIu64 " bytes\n", TotalSize);
	+
	+ pFile = fopen ("dd", "w");
	+ if (pFile == NULL)
	+ PRINT_ERROR_AND_EXIT("Cannot open destination file\n");
	+
	+ #ifdef CREATE_REVERSE_FILE
	+ pFileRev = fopen ("rev", "w");
	+ if (pFileRev == NULL)
	+ PRINT_ERROR_AND_EXIT("Cannot open reverse destination file\n");
	+ PosRev = TotalSize;
	+ #endif
	+
	+ Remaining = TotalSize;
	+ Pos = 0;
	+ PercentOld = -1;
	+ Errno = 0;
	+ while (Remaining)
	+ {
	+// LOG ("Pos %" PRIu64 " -- Remaining %" PRIu64 " ", Pos, Remaining);
	+ ToRead = GETMIN (Remaining, BuffSize);
	+
	+ rc = AewfRead ((void*) pAewf, &Buff[0], Pos, ToRead, &Read, &Errno);
	+ if ((rc != AEWF_OK) \|\| (Errno != 0))
	+ PRINT_ERROR_AND_EXIT("Error %d while calling AewfRead (Errno %d)\n", rc, Errno);
	+ if (Read != ToRead)
	+ PRINT_ERROR_AND_EXIT("Only %" PRIu64 " out of %" PRIu64 " bytes read\n", Read, ToRead);
	+
	+ if (fwrite (Buff, Read, 1, pFile) != 1)
	+ PRINT_ERROR_AND_EXIT("Could not write to destination file\n");
	+
	+ Remaining -= ToRead;
	+ Pos += ToRead;
	+
	+ #ifdef CREATE_REVERSE_FILE
	+ PosRev -= ToRead;
	+ rc = AewfRead ((void*) pAewfRev, &Buff[0], PosRev, ToRead, &Read, &Errno);
	+ if ((rc != AEWF_OK) \|\| (Errno != 0))
	+ PRINT_ERROR_AND_EXIT("Error %d while reverse calling AewfRead (Errno %d)\n", rc, Errno);
	+ if (Read != ToRead)
	+ PRINT_ERROR_AND_EXIT("Only %" PRIu64 " out of %" PRIu64 " bytes read from rev file\n", Read, ToRead);
	+
	+ if (fseeko (pFileRev, PosRev, SEEK_SET))
	+ return AEWF_FILE_SEEK_FAILED;
	+
	+ if (fwrite (Buff, Read, 1, pFileRev) != 1)
	+ PRINT_ERROR_AND_EXIT("Could not write to reverse destination file\n");
	+ #endif
	+
	+
	+ Percent = (100*Pos) / TotalSize;
	+ if (Percent != PercentOld)
	+ {
	+ printf ("\r%d%% done...", Percent);
	+ PercentOld = Percent;
	+ }
	+ }
	+ if (AewfClose (pAewf))
	+ PRINT_ERROR_AND_EXIT("Error while closing AEWF files\n");
	+ if (AewfDestroyHandle ((void**)&pAewf))
	+ PRINT_ERROR_AND_EXIT("Error while destroying AEWF handle\n");
	+ if (fclose (pFile))
	+ PRINT_ERROR_AND_EXIT ("Error while closing destination file\n");
	+
	+ #ifdef CREATE_REVERSE_FILE
	+ #ifdef REVERSE_FILE_USES_SEPARATE_HANDLE
	+ if (AewfClose (pAewfRev))
	+ PRINT_ERROR_AND_EXIT("Error while closing reverse AEWF files\n");
	+ if (AewfDestroyHandle ((void**)&pAewfRev))
	+ PRINT_ERROR_AND_EXIT("Error while destroying reverse AEWF handle\n");
	+ #endif
	+ if (fclose (pFileRev))
	+ PRINT_ERROR_AND_EXIT ("Error while closing reverse destination file\n");
	+ #endif
	+
	+ printf ("\n");
	+ return 0;
	+}
	+
	+#endif
	+
	diff --git a/tags/xmount-0.7.0/libxmount_input/libxmount_input_aewf/libxmount_input_aewf.h b/tags/xmount-0.7.0/libxmount_input/libxmount_input_aewf/libxmount_input_aewf.h
	new file mode 100644
	index 0000000..f50ca87
	--- /dev/null
	+++ b/tags/xmount-0.7.0/libxmount_input/libxmount_input_aewf/libxmount_input_aewf.h
	@@ -0,0 +1,246 @@
	+/*******************************************************************************
	+* xmount Copyright (c) 2008-2014 by Gillen Daniel <gillen.dan@pinguin.lu> *
	+* *
	+* This module has been written by Guy Voncken. It contains the functions for *
	+* accessing EWF images created by Guymager and others. *
	+* *
	+* This program is free software: you can redistribute it and/or modify it *
	+* under the terms of the GNU General Public License as published by the Free *
	+* Software Foundation, either version 3 of the License, or (at your option) *
	+* any later version. *
	+* *
	+* This program is distributed in the hope that it will be useful, but WITHOUT *
	+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
	+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for *
	+* more details. *
	+* *
	+* You should have received a copy of the GNU General Public License along with *
	+* this program. If not, see <http://www.gnu.org/licenses/>. *
	+*******************************************************************************/
	+
	+// Please don't touch source code formatting!
	+
	+#ifndef AEWF_H
	+#define AEWF_H
	+
	+typedef struct _t_Aewf *t_pAewf;
	+
	+// ----------------------
	+// Constant definitions
	+// ----------------------
	+
	+#define GETMAX(a,b) ((a)>(b)?(a):(b))
	+#define GETMIN(a,b) ((a)<(b)?(a):(b))
	+
	+#define FALSE 0
	+#define TRUE 1
	+
	+// ---------------------
	+// Types and strutures
	+// ---------------------
	+
	+typedef struct
	+{
	+ unsigned char Signature[8];
	+ unsigned char StartOfFields; // 0x01;
	+ unsigned short int SegmentNumber;
	+ unsigned short int EndOfFields; // 0x0000
	+} __attribute__ ((packed)) t_AewfFileHeader, *t_AewfpFileHeader;
	+
	+typedef struct
	+{
	+ unsigned char Type[16];
	+ uint64_t OffsetNextSection;
	+ uint64_t Size;
	+ unsigned char Padding[40];
	+ uint32_t Checksum;
	+ char Data[]; //lint !e1501 data member has zero size
	+} __attribute__ ((packed)) t_AewfSection, *t_pAewfSection;
	+
	+typedef struct
	+{
	+ unsigned char MediaType;
	+ unsigned char Unknown1[3]; // contains 0x00
	+ uint32_t ChunkCount;
	+ uint32_t SectorsPerChunk;
	+ uint32_t BytesPerSector;
	+ uint64_t SectorCount;
	+ uint32_t CHS_Cylinders;
	+ uint32_t CHS_Heads;
	+ uint32_t CHS_Sectors;
	+ unsigned char MediaFlags;
	+ unsigned char Unknown2[3]; // contains 0x00
	+ uint32_t PalmVolumeStartSector;
	+ unsigned char Padding1[4]; // contains 0x00
	+ uint32_t SmartLogsStartSector;
	+ unsigned char CompressionLevel;
	+ unsigned char Unknown3[3]; // contains 0x00
	+ uint32_t ErrorBlockSize;
	+ unsigned char Unknown4[4];
	+ unsigned char AcquirySystemGUID[16];
	+ unsigned char Padding2[963];
	+ unsigned char Reserved [5];
	+ uint32_t Checksum;
	+} __attribute__ ((packed)) t_AewfSectionVolume, *t_pAewfSectionVolume;
	+
	+typedef struct
	+{
	+ uint32_t ChunkCount;
	+ unsigned char Padding1 [4];
	+ uint64_t TableBaseOffset;
	+ unsigned char Padding2 [4];
	+ uint32_t Checksum;
	+ uint32_t OffsetArray[]; //lint !e1501 data member has zero size
	+} __attribute__ ((packed)) t_AewfSectionTable, *t_pAewfSectionTable;
	+
	+const uint32_t AEWF_COMPRESSED = 0x80000000;
	+
	+typedef struct
	+{
	+ uint32_t FirstSector;
	+ uint32_t NumberOfSectors;
	+} __attribute__ ((packed)) t_AewfSectionErrorEntry, *t_pAewfSectionErrorEntry;
	+
	+typedef struct
	+{
	+ uint32_t NumberOfErrors;
	+ unsigned char Padding[512];
	+ uint32_t Checksum;
	+ t_AewfSectionErrorEntry ErrorArr[0]; //lint !e1501 data member 'ErrorArr' has zero size
	+ uint32_t ChecksumArr;
	+} __attribute__ ((packed)) t_AewfSectionError, *t_pAewfSectionError;
	+
	+typedef struct
	+{
	+ unsigned char MD5[16];
	+ unsigned char Unknown[16];
	+ uint32_t Checksum;
	+} __attribute__ ((packed)) t_AewfSectionHash, *t_pAewfSectionHash;
	+
	+
	+typedef struct
	+{
	+ char *pName;
	+ unsigned Number;
	+ FILE *pFile; // NULL if file is not opened (never read or kicked out form cache)
	+ time_t LastUsed;
	+} t_Segment, *t_pSegment;
	+
	+typedef struct
	+{
	+ uint64_t Nr; // The table's position in the pAewf->pTableArr, for debug output only
	+ uint64_t ChunkFrom; // Number of the chunk referred to by the first entry of this table (very first chunk has number 0)
	+ uint64_t ChunkTo; // Number of the chunk referred to by the last entry of this table
	+ t_pSegment pSegment; // The file segment where the table is located
	+ uint64_t Offset; // The offset of the table inside the segment file (start of t_AewfSectionTable, not of the preceding t_AewfSection)
	+ unsigned long Size; // The length of the table (same as allocated length for pEwfTable)
	+ uint32_t ChunkCount; // The number of chunk; this is the same as pTableData->Chunkcount, however, pTableData might not be available (NULL)
	+ uint32_t SectionSectorsSize; // Silly EWF format has no clean way of knowing size of the last (possibly compressed) chunk of a table
	+ time_t LastUsed; // Last usage of this table, for cache management
	+ t_pAewfSectionTable pEwfTable; // Contains the original EWF table section or NULL, if never read or kicked out from cache
	+} t_Table, *t_pTable;
	+
	+#define AEWF_NONE UINT64_MAX
	+
	+typedef struct _t_Aewf
	+{
	+ t_pSegment pSegmentArr; // Array of all segment files (in correct order)
	+ t_pTable pTableArr; // Array of all chunk offset tables found in the segment files (in correct order)
	+ uint64_t Segments;
	+ uint64_t Tables;
	+ uint64_t Chunks; // Total number of chunks in all tables
	+ uint64_t TotalTableSize; // Total size of all tables
	+ uint64_t TableCache; // Current amount RAM used by tables, in bytes
	+ uint64_t OpenSegments; // Current number of open segment files
	+ uint64_t SectorSize;
	+ uint64_t Sectors;
	+ uint64_t ChunkSize;
	+ uint64_t ImageSize; // Equals to Sectors * SectorSize
	+ char *pChunkBuffCompressed;
	+ char *pChunkBuffUncompressed;
	+ uint64_t ChunkBuffUncompressedDataLen; // This normally always is equal to the chunk size (32K), except maybe for the last chunk, if the image's total size is not a multiple of the chunk size
	+ uint32_t ChunkBuffSize;
	+ uint64_t ChunkInBuff; // Chunk currently residing in pChunkBuffUncompressed (AEWF_NONE if none)
	+ char *pErrorText; // Used for assembling error text during option parsing
	+ time_t LastStatsUpdate;
	+ char *pInfo;
	+
	+ // Statistics
	+ uint64_t SegmentCacheHits;
	+ uint64_t SegmentCacheMisses;
	+ uint64_t TableCacheHits;
	+ uint64_t TableCacheMisses;
	+ uint64_t ChunkCacheHits;
	+ uint64_t ChunkCacheMisses;
	+ uint64_t ReadOperations; // How many times did xmount call the function AewfRead
	+ uint64_t DataReadFromImage; // The data (in bytes) read from the image
	+ uint64_t DataReadFromImageRaw; // The same data (in bytes), after uncompression (if any)
	+ uint64_t DataRequestedByCaller; // How much data was given back to the caller
	+ uint64_t TablesReadFromImage; // The overhead of the table read operations (in bytes)
	+ uint64_t ChunksRead;
	+ uint64_t BytesRead;
	+ uint64_t Errors;
	+ int LastError;
	+
	+ // Options
	+ uint64_t MaxTableCache; // Max. amount of bytes in pTableArr[x].pTableData, in bytes
	+ uint64_t MaxOpenSegments; // Max. number of open files in pSegmentArr
	+ char *pStatsFilename; // Statistics file
	+ uint64_t StatsRefresh; // The time in seconds between update of the stats file
	+ char *pLogFilename;
	+ uint8_t LogStdout;
	+} t_Aewf;
	+
	+// ----------------
	+// Error codes
	+// ----------------
	+
	+// AEWF Error codes are automatically mapped to errno codes by means of the groups
	+// below. AEWF uses these errno codes:
	+// ENOMEM memory allocation errors
	+// EINVAL wrong parameter(s) passed to an AEWF function
	+// EIO all others: AEWF function errors, EWF image errors
	+
	+enum
	+{
	+ AEWF_OK = 0,
	+
	+ AEWF_ERROR_ENOMEM_START=1000,
	+ AEWF_MEMALLOC_FAILED,
	+ AEWF_ERROR_ENOMEM_END,
	+
	+ AEWF_ERROR_EINVAL_START=2000,
	+ AEWF_READ_BEYOND_END_OF_IMAGE,
	+ AEWF_OPTIONS_ERROR,
	+ AEWF_CANNOT_OPEN_LOGFILE,
	+ AEWF_ERROR_EINVAL_END,
	+
	+ AEWF_ERROR_EIO_START=3000,
	+ AEWF_FILE_OPEN_FAILED,
	+ AEWF_FILE_CLOSE_FAILED,
	+ AEWF_FILE_SEEK_FAILED,
	+ AEWF_FILE_READ_FAILED,
	+ AEWF_READFILE_BAD_MEM,
	+ AEWF_INVALID_SEGMENT_NUMBER,
	+ AEWF_WRONG_SEGMENT_FILE_COUNT,
	+ AEWF_VOLUME_MUST_PRECEDE_TABLES,
	+ AEWF_SECTORS_MUST_PRECEDE_TABLES,
	+ AEWF_WRONG_CHUNK_COUNT,
	+ AEWF_CHUNK_NOT_FOUND,
	+ AEWF_VOLUME_MISSING,
	+ AEWF_ERROR_EWF_TABLE_NOT_READY,
	+ AEWF_ERROR_EWF_SEGMENT_NOT_READY,
	+ AEWF_CHUNK_TOO_BIG,
	+ AEWF_UNCOMPRESS_FAILED,
	+ AEWF_BAD_UNCOMPRESSED_LENGTH,
	+ AEWF_CHUNK_CRC_ERROR,
	+ AEWF_ERROR_IN_CHUNK_NUMBER,
	+ AEWF_VASPRINTF_FAILED,
	+ AEWF_UNCOMPRESS_HEADER_FAILED,
	+ AEWF_ASPRINTF_FAILED,
	+ AEWF_CHUNK_LENGTH_ZERO,
	+ AEWF_NEGATIVE_SEEK,
	+ AEWF_ERROR_EIO_END,
	+};
	+
	+#endif
	diff --git a/trunk/libxmount_input/libxmount_input_aff/CMakeLists.txt b/tags/xmount-0.7.0/libxmount_input/libxmount_input_aff/CMakeLists.txt
	similarity index 85%
	copy from trunk/libxmount_input/libxmount_input_aff/CMakeLists.txt
	copy to tags/xmount-0.7.0/libxmount_input/libxmount_input_aff/CMakeLists.txt
	index 1825382..c42978d 100644
	--- a/trunk/libxmount_input/libxmount_input_aff/CMakeLists.txt
	+++ b/tags/xmount-0.7.0/libxmount_input/libxmount_input_aff/CMakeLists.txt
	@@ -1,36 +1,40 @@
	if(POLICY CMP0042)
	cmake_policy(SET CMP0042 NEW) # CMake 3.0
	endif(POLICY CMP0042)

	project(libxmount_input_aff C)

	add_library(xmount_input_aff SHARED libxmount_input_aff.c)

	if(NOT STATIC_AFF)
	include_directories(${LIBAFF_INCLUDE_DIRS})
	include_directories(${OPENSSL_INCLUDE_DIRS})
	set(LIBS ${LIBS} ${LIBAFF_LIBRARIES})
	set(LIBS ${LIBS} ${OPENSSL_LIBRARIES})
	else(NOT STATIC_AFF)
	add_definitions(-DHAVE_LIBAFF_STATIC)
	include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libaff/lib)
	set(LIBS ${LIBS} ${CMAKE_CURRENT_SOURCE_DIR}/libaff/lib/.libs/libafflib.a)
	if(NOT APPLE)
	- set(LIBS ${LIBS} "-lstdc++ -lcrypto -lssl -lrt -lz")
	+ set(LIBS ${LIBS} "/usr/lib/libcrypto.a")
	+ set(LIBS ${LIBS} "/usr/lib/libssl.a")
	+ set(LIBS ${LIBS} "/usr/lib/libexpat.a")
	+ set(LIBS ${LIBS} "/usr/lib/librt.a")
	+ set(LIBS ${LIBS} "-lstdc++ -lz")
	else(NOT APPLE)
	# As most of afflib's deps on OSx come from MacPorts, better link in
	# everything statically
	set(LIBS ${LIBS} "/opt/local/lib/libcrypto.a")
	set(LIBS ${LIBS} "/opt/local/lib/libssl.a")
	set(LIBS ${LIBS} "/opt/local/lib/libexpat.a")
	set(LIBS ${LIBS} "/opt/local/lib/libncurses.a")
	set(LIBS ${LIBS} "/opt/local/lib/libreadline.a")
	set(LIBS ${LIBS} "/opt/local/lib/libz.a")
	set(LIBS ${LIBS} "-lstdc++")
	endif(NOT APPLE)
	endif(NOT STATIC_AFF)

	target_link_libraries(xmount_input_aff ${LIBS})

	install(TARGETS xmount_input_aff DESTINATION lib/xmount)

	diff --git a/tags/xmount-0.7.0/libxmount_input/libxmount_input_aff/libaff-3.7.3.tar.gz b/tags/xmount-0.7.0/libxmount_input/libxmount_input_aff/libaff-3.7.3.tar.gz
	new file mode 100644
	index 0000000..aae5af4
	Binary files /dev/null and b/tags/xmount-0.7.0/libxmount_input/libxmount_input_aff/libaff-3.7.3.tar.gz differ
	diff --git a/tags/xmount-0.7.0/libxmount_input/libxmount_input_aff/libxmount_input_aff.c b/tags/xmount-0.7.0/libxmount_input/libxmount_input_aff/libxmount_input_aff.c
	new file mode 100644
	index 0000000..f0fb198
	--- /dev/null
	+++ b/tags/xmount-0.7.0/libxmount_input/libxmount_input_aff/libxmount_input_aff.c
	@@ -0,0 +1,260 @@
	+/*******************************************************************************
	+* xmount Copyright (c) 2008-2014 by Gillen Daniel <gillen.dan@pinguin.lu> *
	+* *
	+* This program is free software: you can redistribute it and/or modify it *
	+* under the terms of the GNU General Public License as published by the Free *
	+* Software Foundation, either version 3 of the License, or (at your option) *
	+* any later version. *
	+* *
	+* This program is distributed in the hope that it will be useful, but WITHOUT *
	+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
	+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for *
	+* more details. *
	+* *
	+* You should have received a copy of the GNU General Public License along with *
	+* this program. If not, see <http://www.gnu.org/licenses/>. *
	+*******************************************************************************/
	+
	+#include <stdlib.h>
	+#include <string.h>
	+#include <fcntl.h> // For O_RDONLY
	+
	+#include "../libxmount_input.h"
	+
	+#ifndef HAVE_LIBAFF_STATIC
	+ #include <afflib/afflib.h>
	+#else
	+ #include "libaff/lib/afflib.h"
	+#endif
	+
	+#include "libxmount_input_aff.h"
	+
	+/*******************************************************************************
	+ * LibXmount_Input API implementation
	+ ******************************************************************************/
	+/*
	+ * LibXmount_Input_GetApiVersion
	+ */
	+uint8_t LibXmount_Input_GetApiVersion() {
	+ return LIBXMOUNT_INPUT_API_VERSION;
	+}
	+
	+/*
	+ * LibXmount_Input_GetSupportedFormats
	+ */
	+const char* LibXmount_Input_GetSupportedFormats() {
	+ return "aff\0\0";
	+}
	+
	+/*
	+ * LibXmount_Input_GetFunctions
	+ */
	+void LibXmount_Input_GetFunctions(ts_LibXmountInputFunctions *p_functions) {
	+ p_functions->CreateHandle=&AffCreateHandle;
	+ p_functions->DestroyHandle=&AffDestroyHandle;
	+ p_functions->Open=&AffOpen;
	+ p_functions->Close=&AffClose;
	+ p_functions->Size=&AffSize;
	+ p_functions->Read=&AffRead;
	+ p_functions->OptionsHelp=&AffOptionsHelp;
	+ p_functions->OptionsParse=&AffOptionsParse;
	+ p_functions->GetInfofileContent=&AffGetInfofileContent;
	+ p_functions->GetErrorMessage=&AffGetErrorMessage;
	+ p_functions->FreeBuffer=&AffFreeBuffer;
	+}
	+
	+/*******************************************************************************
	+ * Private
	+ ******************************************************************************/
	+/*
	+ * AffCreateHandle
	+ */
	+static int AffCreateHandle(void **pp_handle,
	+ const char *p_format,
	+ uint8_t debug)
	+{
	+ (void)p_format;
	+ pts_AffHandle p_aff_handle;
	+
	+ // Alloc new lib handle
	+ p_aff_handle=(pts_AffHandle)malloc(sizeof(ts_AffHandle));
	+ if(p_aff_handle==NULL) return AFF_MEMALLOC_FAILED;
	+
	+ // Init lib handle
	+ p_aff_handle->h_aff=NULL;
	+
	+ *pp_handle=p_aff_handle;
	+ return AFF_OK;
	+}
	+
	+/*
	+ * AffDestroyHandle
	+ */
	+static int AffDestroyHandle(void **pp_handle) {
	+ pts_AffHandle p_aff_handle=(pts_AffHandle)*pp_handle;
	+
	+ // Free lib handle
	+ if(p_aff_handle!=NULL) free(p_aff_handle);
	+
	+ *pp_handle=NULL;
	+ return AFF_OK;
	+}
	+
	+/*
	+ * AffOpen
	+ */
	+static int AffOpen(void *p_handle,
	+ const char **pp_filename_arr,
	+ uint64_t filename_arr_len)
	+{
	+ pts_AffHandle p_aff_handle=(pts_AffHandle)p_handle;
	+
	+ // We need exactly one file
	+ if(filename_arr_len==0) return AFF_NO_INPUT_FILES;
	+ if(filename_arr_len>1) return AFF_TOO_MANY_INPUT_FILES;
	+
	+ // Open AFF file
	+ p_aff_handle->h_aff=af_open(pp_filename_arr[0],O_RDONLY,0);
	+ if(p_aff_handle->h_aff==NULL) {
	+ // LOG_ERROR("Couldn't open AFF file!\n")
	+ return AFF_OPEN_FAILED;
	+ }
	+
	+ // Encrypted images aren't supported for now
	+ // TODO: Add support trough lib params, f. ex. aff_password=xxxx
	+ if(af_cannot_decrypt(p_aff_handle->h_aff)) {
	+ af_close(p_aff_handle->h_aff);
	+ return AFF_ENCRYPTION_UNSUPPORTED;
	+ }
	+
	+ return AFF_OK;
	+}
	+
	+/*
	+ * AffClose
	+ */
	+static int AffClose(void *p_handle) {
	+ pts_AffHandle p_aff_handle=(pts_AffHandle)p_handle;
	+
	+ // Close AFF handle
	+ if(af_close(p_aff_handle->h_aff)!=0) return AFF_CLOSE_FAILED;
	+
	+ return AFF_OK;
	+}
	+
	+/*
	+ * AffSize
	+ */
	+static int AffSize(void p_handle, uint64_t p_size) {
	+ pts_AffHandle p_aff_handle=(pts_AffHandle)p_handle;
	+
	+ // TODO: Check for error. Unfortunately, I don't know how :(
	+ *p_size=af_seek(p_aff_handle->h_aff,0,SEEK_END);
	+
	+ return AFF_OK;
	+}
	+
	+/*
	+ * AffRead
	+ */
	+static int AffRead(void *p_handle,
	+ char *p_buf,
	+ off_t offset,
	+ size_t count,
	+ size_t *p_read,
	+ int *p_errno)
	+{
	+ pts_AffHandle p_aff_handle=(pts_AffHandle)p_handle;
	+ size_t bytes_read;
	+
	+ // Seek to requested position
	+ if(af_seek(p_aff_handle->h_aff,offset,SEEK_SET)!=offset) {
	+ return AFF_SEEK_FAILED;
	+ }
	+
	+ // Read data
	+ // TODO: Check for errors
	+ bytes_read=af_read(p_aff_handle->h_aff,(unsigned char*)p_buf,count);
	+ if(bytes_read!=count) return AFF_READ_FAILED;
	+
	+ *p_read=bytes_read;
	+ return AFF_OK;
	+}
	+
	+/*
	+ * AffOptionsHelp
	+ */
	+static int AffOptionsHelp(const char **pp_help) {
	+ *pp_help=NULL;
	+ return AFF_OK;
	+}
	+
	+/*
	+ * AffOptionsParse
	+ */
	+static int AffOptionsParse(void *p_handle,
	+ uint32_t options_count,
	+ const pts_LibXmountOptions *pp_options,
	+ const char **pp_error)
	+{
	+ return AFF_OK;
	+}
	+
	+/*
	+ * AffGetInfofileContent
	+ */
	+static int AffGetInfofileContent(void p_handle, const char *pp_info_buf) {
	+ // TODO
	+ *pp_info_buf=NULL;
	+ return AFF_OK;
	+}
	+
	+/*
	+ * AffGetErrorMessage
	+ */
	+static const char* AffGetErrorMessage(int err_num) {
	+ switch(err_num) {
	+ case AFF_MEMALLOC_FAILED:
	+ return "Unable to allocate memory";
	+ break;
	+ case AFF_NO_INPUT_FILES:
	+ return "No input file(s) specified";
	+ break;
	+ case AFF_TOO_MANY_INPUT_FILES:
	+ return "Too many input files specified";
	+ break;
	+ case AFF_OPEN_FAILED:
	+ return "Unable to open EWF file(s)";
	+ break;
	+ case AFF_CLOSE_FAILED:
	+ return "Unable to close EWF file(s)";
	+ break;
	+ case AFF_ENCRYPTION_UNSUPPORTED:
	+ return "Encrypted AFF files are currently not supported";
	+ break;
	+ case AFF_SEEK_FAILED:
	+ return "Unable to seek into EWF data";
	+ break;
	+ case AFF_READ_FAILED:
	+ return "Unable to read EWF data";
	+ break;
	+ default:
	+ return "Unknown error";
	+ }
	+}
	+
	+/*
	+ * AffFreeBuffer
	+ */
	+static int AffFreeBuffer(void *p_buf) {
	+ free(p_buf);
	+ return AFF_OK;
	+}
	+
	+/*
	+ ----- Change log -----
	+ 20140724: * Initial version implementing AffOpen, AffSize, AffRead, AffClose,
	+ AffOptionsHelp, AffOptionsParse and AffFreeBuffer
	+ 20140804: * Added error handling and AffGetErrorMessage
	+*/
	+
	diff --git a/tags/xmount-0.7.0/libxmount_input/libxmount_input_aff/libxmount_input_aff.h b/tags/xmount-0.7.0/libxmount_input/libxmount_input_aff/libxmount_input_aff.h
	new file mode 100644
	index 0000000..608a0e6
	--- /dev/null
	+++ b/tags/xmount-0.7.0/libxmount_input/libxmount_input_aff/libxmount_input_aff.h
	@@ -0,0 +1,73 @@
	+/*******************************************************************************
	+* xmount Copyright (c) 2008-2014 by Gillen Daniel <gillen.dan@pinguin.lu> *
	+* *
	+* This program is free software: you can redistribute it and/or modify it *
	+* under the terms of the GNU General Public License as published by the Free *
	+* Software Foundation, either version 3 of the License, or (at your option) *
	+* any later version. *
	+* *
	+* This program is distributed in the hope that it will be useful, but WITHOUT *
	+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
	+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for *
	+* more details. *
	+* *
	+* You should have received a copy of the GNU General Public License along with *
	+* this program. If not, see <http://www.gnu.org/licenses/>. *
	+*******************************************************************************/
	+
	+#ifndef LIBXMOUNT_INPUT_AFF_H
	+#define LIBXMOUNT_INPUT_AFF_H
	+
	+/*******************************************************************************
	+ * Enums, Typedefs, etc...
	+ ******************************************************************************/
	+//! Possible error return codes
	+enum {
	+ AFF_OK=0,
	+ AFF_MEMALLOC_FAILED,
	+ AFF_NO_INPUT_FILES,
	+ AFF_TOO_MANY_INPUT_FILES,
	+ AFF_OPEN_FAILED,
	+ AFF_CLOSE_FAILED,
	+ AFF_ENCRYPTION_UNSUPPORTED,
	+ AFF_SEEK_FAILED,
	+ AFF_READ_FAILED
	+};
	+
	+//! Library handle
	+typedef struct s_AffHandle {
	+ //! AFF handle
	+ AFFILE *h_aff;
	+} ts_AffHandle, *pts_AffHandle;
	+
	+/*******************************************************************************
	+ * Forward declarations
	+ ******************************************************************************/
	+static int AffCreateHandle(void **pp_handle,
	+ const char *p_format,
	+ uint8_t debug);
	+static int AffDestroyHandle(void **pp_handle);
	+static int AffOpen(void *p_handle,
	+ const char **pp_filename_arr,
	+ uint64_t filename_arr_len);
	+static int AffClose(void *p_handle);
	+static int AffSize(void *p_handle,
	+ uint64_t *p_size);
	+static int AffRead(void *p_handle,
	+ char *p_buf,
	+ off_t seek,
	+ size_t count,
	+ size_t *p_read,
	+ int *p_errno);
	+static int AffOptionsHelp(const char **pp_help);
	+static int AffOptionsParse(void *p_handle,
	+ uint32_t options_count,
	+ const pts_LibXmountOptions *pp_options,
	+ const char **pp_error);
	+static int AffGetInfofileContent(void *p_handle,
	+ const char **pp_info_buf);
	+static const char* AffGetErrorMessage(int err_num);
	+static int AffFreeBuffer(void *p_buf);
	+
	+#endif // LIBXMOUNT_INPUT_AFF_H
	+
	diff --git a/trunk/libxmount_input/libxmount_input_ewf/CMakeLists.txt b/tags/xmount-0.7.0/libxmount_input/libxmount_input_ewf/CMakeLists.txt
	similarity index 96%
	copy from trunk/libxmount_input/libxmount_input_ewf/CMakeLists.txt
	copy to tags/xmount-0.7.0/libxmount_input/libxmount_input_ewf/CMakeLists.txt
	index 84fc848..9e12de0 100644
	--- a/trunk/libxmount_input/libxmount_input_ewf/CMakeLists.txt
	+++ b/tags/xmount-0.7.0/libxmount_input/libxmount_input_ewf/CMakeLists.txt
	@@ -1,28 +1,28 @@
	if(POLICY CMP0042)
	cmake_policy(SET CMP0042 NEW) # CMake 3.0
	endif(POLICY CMP0042)

	project(libxmount_input_ewf C)

	add_library(xmount_input_ewf SHARED libxmount_input_ewf.c)

	if(NOT STATIC_EWF)
	include_directories(${LIBEWF_INCLUDE_DIRS})
	set(LIBS ${LIBS} ${LIBEWF_LIBRARIES})
	else(NOT STATIC_EWF)
	add_definitions(-DHAVE_LIBEWF_STATIC)
	include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libewf/include)
	set(LIBS ${LIBS} ${CMAKE_CURRENT_SOURCE_DIR}/libewf/libewf/.libs/libewf.a)
	if(NOT APPLE)
	- set(LIBS ${LIBS} -lz)
	+ set(LIBS ${LIBS} "-lz")
	else(NOT APPLE)
	# As most of libewf's deps on OSx come from MacPorts, better link in
	# everything statically
	set(LIBS ${LIBS} "/opt/local/lib/libz.a")
	endif(NOT APPLE)
	endif(NOT STATIC_EWF)

	target_link_libraries(xmount_input_ewf ${LIBS})

	install(TARGETS xmount_input_ewf DESTINATION lib/xmount)

	diff --git a/tags/xmount-0.7.0/libxmount_input/libxmount_input_ewf/libewf-20140608.tar.gz b/tags/xmount-0.7.0/libxmount_input/libxmount_input_ewf/libewf-20140608.tar.gz
	new file mode 100644
	index 0000000..2ad52c7
	Binary files /dev/null and b/tags/xmount-0.7.0/libxmount_input/libxmount_input_ewf/libewf-20140608.tar.gz differ
	diff --git a/tags/xmount-0.7.0/libxmount_input/libxmount_input_ewf/libxmount_input_ewf.c b/tags/xmount-0.7.0/libxmount_input/libxmount_input_ewf/libxmount_input_ewf.c
	new file mode 100644
	index 0000000..6d5cb9b
	--- /dev/null
	+++ b/tags/xmount-0.7.0/libxmount_input/libxmount_input_ewf/libxmount_input_ewf.c
	@@ -0,0 +1,486 @@
	+/*******************************************************************************
	+* xmount Copyright (c) 2008-2014 by Gillen Daniel <gillen.dan@pinguin.lu> *
	+* *
	+* This program is free software: you can redistribute it and/or modify it *
	+* under the terms of the GNU General Public License as published by the Free *
	+* Software Foundation, either version 3 of the License, or (at your option) *
	+* any later version. *
	+* *
	+* This program is distributed in the hope that it will be useful, but WITHOUT *
	+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
	+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for *
	+* more details. *
	+* *
	+* You should have received a copy of the GNU General Public License along with *
	+* this program. If not, see <http://www.gnu.org/licenses/>. *
	+*******************************************************************************/
	+
	+#include <stdlib.h>
	+#include <string.h>
	+
	+#include "../libxmount_input.h"
	+
	+#ifndef HAVE_LIBEWF_STATIC
	+ #include <libewf.h>
	+#else
	+ #include "libewf/include/libewf.h"
	+#endif
	+
	+#ifndef LIBEWF_HANDLE
	+ // libewf version 2 no longer defines LIBEWF_HANDLE
	+ #define HAVE_LIBEWF_V2_API
	+#endif
	+
	+#include "libxmount_input_ewf.h"
	+
	+/*******************************************************************************
	+ * LibXmount_Input API implementation
	+ ******************************************************************************/
	+/*
	+ * LibXmount_Input_GetApiVersion
	+ */
	+uint8_t LibXmount_Input_GetApiVersion() {
	+ return LIBXMOUNT_INPUT_API_VERSION;
	+}
	+
	+/*
	+ * LibXmount_Input_GetSupportedFormats
	+ */
	+const char* LibXmount_Input_GetSupportedFormats() {
	+ return "ewf\0\0";
	+}
	+
	+/*
	+ * LibXmount_Input_GetFunctions
	+ */
	+void LibXmount_Input_GetFunctions(ts_LibXmountInputFunctions *p_functions) {
	+ p_functions->CreateHandle=&EwfCreateHandle;
	+ p_functions->DestroyHandle=&EwfDestroyHandle;
	+ p_functions->Open=&EwfOpen;
	+ p_functions->Size=&EwfSize;
	+ p_functions->Read=&EwfRead;
	+ p_functions->Close=&EwfClose;
	+ p_functions->OptionsHelp=&EwfOptionsHelp;
	+ p_functions->OptionsParse=&EwfOptionsParse;
	+ p_functions->GetInfofileContent=&EwfGetInfofileContent;
	+ p_functions->GetErrorMessage=&EwfGetErrorMessage;
	+ p_functions->FreeBuffer=&EwfFreeBuffer;
	+}
	+
	+/*******************************************************************************
	+ * Private
	+ ******************************************************************************/
	+/*
	+ * EwfCreateHandle
	+ */
	+static int EwfCreateHandle(void **pp_handle,
	+ const char *p_format,
	+ uint8_t debug)
	+{
	+ (void)p_format;
	+ pts_EwfHandle p_ewf_handle;
	+
	+ // Alloc new lib handle
	+ p_ewf_handle=(pts_EwfHandle)malloc(sizeof(ts_EwfHandle));
	+ if(p_ewf_handle==NULL) return EWF_MEMALLOC_FAILED;
	+
	+ // Init handle values
	+ p_ewf_handle->h_ewf=NULL;
	+
	+ // Init lib handle
	+#ifdef HAVE_LIBEWF_V2_API
	+ if(libewf_handle_initialize(&(p_ewf_handle->h_ewf),NULL)!=1) {
	+ return EWF_HANDLE_CREATION_FAILED;
	+ }
	+#endif
	+
	+ *pp_handle=p_ewf_handle;
	+ return EWF_OK;
	+}
	+
	+/*
	+ * EwfDestroyHandle
	+ */
	+static int EwfDestroyHandle(void **pp_handle) {
	+ pts_EwfHandle p_ewf_handle=(pts_EwfHandle)*pp_handle;
	+ int ret=EWF_OK;
	+
	+ if(p_ewf_handle!=NULL) {
	+ // Free EWF handle
	+#ifdef HAVE_LIBEWF_V2_API
	+ if(libewf_handle_free(&(p_ewf_handle->h_ewf),NULL)!=1) {
	+ ret=EWF_HANDLE_DESTRUCTION_FAILED;
	+ }
	+#endif
	+ // Free lib handle
	+ free(p_ewf_handle);
	+ p_ewf_handle=NULL;
	+ }
	+
	+ *pp_handle=p_ewf_handle;
	+ return ret;
	+}
	+
	+/*
	+ * EwfOpen
	+ */
	+static int EwfOpen(void *p_handle,
	+ const char **pp_filename_arr,
	+ uint64_t filename_arr_len)
	+{
	+ pts_EwfHandle p_ewf_handle=(pts_EwfHandle)p_handle;
	+
	+ // We need at least one file
	+ if(filename_arr_len==0) return EWF_NO_INPUT_FILES;
	+
	+ // Make sure all files are EWF files
	+ for(uint64_t i=0;i<filename_arr_len;i++) {
	+#ifdef HAVE_LIBEWF_V2_API
	+ if(libewf_check_file_signature(pp_filename_arr[i],NULL)!=1)
	+#else
	+ if(libewf_check_file_signature(pp_filename_arr[i])!=1)
	+#endif
	+ {
	+ return EWF_INVALID_INPUT_FILES;
	+ }
	+ }
	+
	+ // Open EWF file
	+#ifdef HAVE_LIBEWF_V2_API
	+ if(libewf_handle_open(p_ewf_handle->h_ewf,
	+ (char* const*)pp_filename_arr,
	+ filename_arr_len,
	+ libewf_get_access_flags_read(),
	+ NULL)!=1)
	+#else
	+ p_ewf_handle->h_ewf=libewf_open((char* const*)pp_filename_arr,
	+ filename_arr_len,
	+ libewf_get_flags_read());
	+ if(p_ewf_handle->h_ewf==NULL)
	+#endif
	+ {
	+ return EWF_OPEN_FAILED;
	+ }
	+
	+#ifndef HAVE_LIBEWF_V2_API
	+ // Parse EWF header
	+ if(libewf_parse_header_values(p_ewf_handle->h_ewf,
	+ LIBEWF_DATE_FORMAT_ISO8601)!=1)
	+ {
	+ return EWF_HEADER_PARSING_FAILED;
	+ }
	+#endif
	+
	+ return EWF_OK;
	+}
	+
	+/*
	+ * EwfClose
	+ */
	+static int EwfClose(void *p_handle) {
	+ pts_EwfHandle p_ewf_handle=(pts_EwfHandle)p_handle;
	+
	+ // Close EWF handle
	+#ifdef HAVE_LIBEWF_V2_API
	+ if(libewf_handle_close(p_ewf_handle->h_ewf,NULL)!=0)
	+#else
	+ if(libewf_close(p_ewf_handle->h_ewf)!=0)
	+#endif
	+ {
	+ return EWF_CLOSE_FAILED;
	+ }
	+
	+ return EWF_OK;
	+}
	+
	+/*
	+ * EwfSize
	+ */
	+static int EwfSize(void p_handle, uint64_t p_size) {
	+ pts_EwfHandle p_ewf_handle=(pts_EwfHandle)p_handle;
	+
	+#ifdef HAVE_LIBEWF_V2_API
	+ if(libewf_handle_get_media_size(p_ewf_handle->h_ewf,p_size,NULL)!=1) {
	+#else
	+ if(libewf_get_media_size(p_ewf_handle->h_ewf,p_size)!=1) {
	+#endif
	+ return EWF_GET_SIZE_FAILED;
	+ }
	+
	+ return EWF_OK;
	+}
	+
	+/*
	+ * EwfRead
	+ */
	+static int EwfRead(void *p_handle,
	+ char *p_buf,
	+ off_t offset,
	+ size_t count,
	+ size_t *p_read,
	+ int *p_errno)
	+{
	+ pts_EwfHandle p_ewf_handle=(pts_EwfHandle)p_handle;
	+ size_t bytes_read;
	+
	+#ifdef HAVE_LIBEWF_V2_API
	+ if(libewf_handle_seek_offset(p_ewf_handle->h_ewf,
	+ offset,
	+ SEEK_SET,
	+ NULL)!=-1)
	+#else
	+ if(libewf_seek_offset(p_ewf_handle->h_ewf,offset)!=-1)
	+#endif
	+ {
	+#ifdef HAVE_LIBEWF_V2_API
	+ bytes_read=libewf_handle_read_buffer(p_ewf_handle->h_ewf,
	+ p_buf,
	+ count,
	+ NULL);
	+#else
	+ bytes_read=libewf_read_buffer(p_ewf_handle->h_ewf,p_buf,count);
	+#endif
	+ if(bytes_read!=count) return EWF_READ_FAILED;
	+ } else {
	+ return EWF_SEEK_FAILED;
	+ }
	+
	+ *p_read=bytes_read;
	+ return EWF_OK;
	+}
	+
	+/*
	+ * EwfOptionsHelp
	+ */
	+static int EwfOptionsHelp(const char **pp_help) {
	+ *pp_help=NULL;
	+ return EWF_OK;
	+}
	+
	+/*
	+ * EwfOptionsParse
	+ */
	+static int EwfOptionsParse(void *p_handle,
	+ uint32_t options_count,
	+ const pts_LibXmountOptions *pp_options,
	+ const char **pp_error)
	+{
	+ return EWF_OK;
	+}
	+
	+/*
	+ * EwfGetInfofileContent
	+ */
	+static int EwfGetInfofileContent(void p_handle, const char *pp_info_buf) {
	+ pts_EwfHandle p_ewf_handle=(pts_EwfHandle)p_handle;
	+ char *p_infobuf=NULL;
	+ int ret;
	+ char buf[512];
	+ uint8_t uint8value;
	+ uint32_t uint32value;
	+ uint64_t uint64value;
	+
	+#define EWF_INFOBUF_REALLOC(size) { \
	+ p_infobuf=(char*)realloc(p_infobuf,size); \
	+ if(p_infobuf==NULL) return EWF_MEMALLOC_FAILED; \
	+}
	+#define EWF_INFOBUF_APPEND_STR(str) { \
	+ if(p_infobuf!=NULL) { \
	+ EWF_INFOBUF_REALLOC(strlen(p_infobuf)+strlen(str)+1); \
	+ strcpy(p_infobuf+strlen(p_infobuf),str); \
	+ } else { \
	+ EWF_INFOBUF_REALLOC(strlen(str)+1); \
	+ strcpy(p_infobuf,str); \
	+ } \
	+}
	+#define EWF_INFOBUF_APPEND_VALUE(desc) { \
	+ if(ret==1) { \
	+ EWF_INFOBUF_APPEND_STR(desc); \
	+ EWF_INFOBUF_APPEND_STR(buf); \
	+ EWF_INFOBUF_APPEND_STR("\n"); \
	+ } \
	+}
	+
	+ EWF_INFOBUF_APPEND_STR("_Acquiry information_\n");
	+
	+#ifdef HAVE_LIBEWF_V2_API
	+ #define EWF_GET_HEADER_VALUE(fun) { \
	+ ret=fun(p_ewf_handle->h_ewf,(uint8_t*)buf,sizeof(buf),NULL); \
	+ }
	+
	+ EWF_GET_HEADER_VALUE(libewf_handle_get_utf8_header_value_case_number);
	+ EWF_INFOBUF_APPEND_VALUE("Case number: ");
	+ EWF_GET_HEADER_VALUE(libewf_handle_get_utf8_header_value_description);
	+ EWF_INFOBUF_APPEND_VALUE("Description: ");
	+ EWF_GET_HEADER_VALUE(libewf_handle_get_utf8_header_value_examiner_name);
	+ EWF_INFOBUF_APPEND_VALUE("Examiner: ");
	+ EWF_GET_HEADER_VALUE(libewf_handle_get_utf8_header_value_evidence_number);
	+ EWF_INFOBUF_APPEND_VALUE("Evidence number: ");
	+ EWF_GET_HEADER_VALUE(libewf_handle_get_utf8_header_value_notes);
	+ EWF_INFOBUF_APPEND_VALUE("Notes: ");
	+ EWF_GET_HEADER_VALUE(libewf_handle_get_utf8_header_value_acquiry_date);
	+ EWF_INFOBUF_APPEND_VALUE("Acquiry date: ");
	+ EWF_GET_HEADER_VALUE(libewf_handle_get_utf8_header_value_system_date);
	+ EWF_INFOBUF_APPEND_VALUE("System date: ");
	+ EWF_GET_HEADER_VALUE(libewf_handle_get_utf8_header_value_acquiry_operating_system);
	+ EWF_INFOBUF_APPEND_VALUE("Acquiry os: ");
	+ EWF_GET_HEADER_VALUE(libewf_handle_get_utf8_header_value_acquiry_software_version);
	+ EWF_INFOBUF_APPEND_VALUE("Acquiry sw version: ");
	+ EWF_GET_HEADER_VALUE(libewf_handle_get_utf8_header_value_model);
	+ EWF_INFOBUF_APPEND_VALUE("Model: ");
	+ EWF_GET_HEADER_VALUE(libewf_handle_get_utf8_header_value_serial_number);
	+ EWF_INFOBUF_APPEND_VALUE("Serial number: ");
	+ EWF_GET_HEADER_VALUE(libewf_handle_get_utf8_hash_value_md5);
	+ EWF_INFOBUF_APPEND_VALUE("MD5 hash: ");
	+ EWF_GET_HEADER_VALUE(libewf_handle_get_utf8_hash_value_sha1);
	+ EWF_INFOBUF_APPEND_VALUE("SHA1 hash: ");
	+
	+ #undef EWF_GET_HEADER_VALUE
	+#else
	+ #define EWF_GET_HEADER_VALUE(fun) { \
	+ ret=fun(p_ewf_handle->h_ewf,buf,sizeof(buf)); \
	+ }
	+
	+ EWF_GET_HEADER_VALUE(libewf_get_header_value_case_number);
	+ EWF_INFOBUF_APPEND_VALUE("Case number: ");
	+ EWF_GET_HEADER_VALUE(libewf_get_header_value_description);
	+ EWF_INFOBUF_APPEND_VALUE("Description: ");
	+ EWF_GET_HEADER_VALUE(libewf_get_header_value_examiner_name);
	+ EWF_INFOBUF_APPEND_VALUE("Examiner: ");
	+ EWF_GET_HEADER_VALUE(libewf_get_header_value_evidence_number);
	+ EWF_INFOBUF_APPEND_VALUE("Evidence number: ");
	+ EWF_GET_HEADER_VALUE(libewf_get_header_value_notes);
	+ EWF_INFOBUF_APPEND_VALUE("Notes: ");
	+ EWF_GET_HEADER_VALUE(libewf_get_header_value_acquiry_date);
	+ EWF_INFOBUF_APPEND_VALUE("Acquiry date: ");
	+ EWF_GET_HEADER_VALUE(libewf_get_header_value_system_date);
	+ EWF_INFOBUF_APPEND_VALUE("System date: ");
	+ EWF_GET_HEADER_VALUE(libewf_get_header_value_acquiry_operating_system);
	+ EWF_INFOBUF_APPEND_VALUE("Acquiry os: ");
	+ EWF_GET_HEADER_VALUE(libewf_get_header_value_acquiry_software_version);
	+ EWF_INFOBUF_APPEND_VALUE("Acquiry sw version: ");
	+ EWF_GET_HEADER_VALUE(libewf_get_header_value_model);
	+ EWF_INFOBUF_APPEND_VALUE("Model: ");
	+ EWF_GET_HEADER_VALUE(libewf_get_header_value_serial_number);
	+ EWF_INFOBUF_APPEND_VALUE("Serial number: ");
	+ EWF_GET_HEADER_VALUE(libewf_get_hash_value_md5);
	+ EWF_INFOBUF_APPEND_VALUE("MD5 hash: ");
	+ EWF_GET_HEADER_VALUE(libewf_get_hash_value_sha1);
	+ EWF_INFOBUF_APPEND_VALUE("SHA1 hash: ");
	+
	+ #undef EWF_GET_HEADER_VALUE
	+#endif
	+
	+ EWF_INFOBUF_APPEND_STR("\n_Media information_\n");
	+
	+#ifdef HAVE_LIBEWF_V2_API
	+ ret=libewf_handle_get_media_type(p_ewf_handle->h_ewf,&uint8value,NULL);
	+#else
	+ ret=libewf_get_media_type(p_ewf_handle->h_ewf,&uint8value);
	+#endif
	+ if(ret==1) {
	+ EWF_INFOBUF_APPEND_STR("Media type: ");
	+ switch(uint8value) {
	+ case LIBEWF_MEDIA_TYPE_REMOVABLE:
	+ EWF_INFOBUF_APPEND_STR("removable disk\n");
	+ break;
	+ case LIBEWF_MEDIA_TYPE_FIXED:
	+ EWF_INFOBUF_APPEND_STR("fixed disk\n");
	+ break;
	+ case LIBEWF_MEDIA_TYPE_OPTICAL:
	+ EWF_INFOBUF_APPEND_STR("optical\n");
	+ break;
	+ case LIBEWF_MEDIA_TYPE_SINGLE_FILES:
	+ EWF_INFOBUF_APPEND_STR("single files\n");
	+ break;
	+ case LIBEWF_MEDIA_TYPE_MEMORY:
	+ EWF_INFOBUF_APPEND_STR("memory\n");
	+ break;
	+ default:
	+ EWF_INFOBUF_APPEND_STR("unknown\n");
	+ }
	+ }
	+
	+#ifdef HAVE_LIBEWF_V2_API
	+ ret=libewf_handle_get_bytes_per_sector(p_ewf_handle->h_ewf,&uint32value,NULL);
	+ sprintf(buf,"%" PRIu32,uint32value);
	+ EWF_INFOBUF_APPEND_VALUE("Bytes per sector: ");
	+ ret=libewf_handle_get_number_of_sectors(p_ewf_handle->h_ewf,&uint64value,NULL);
	+ sprintf(buf,"%" PRIu64,uint64value);
	+ EWF_INFOBUF_APPEND_VALUE("Number of sectors: ");
	+#else
	+ ret=libewf_get_bytes_per_sector(p_ewf_handle->h_ewf,&uint32value);
	+ sprintf(buf,"%" PRIu32,uint32value);
	+ EWF_INFOBUF_APPEND_VALUE("Bytes per sector: ");
	+ ret=libewf_handle_get_amount_of_sectors(p_ewf_handle->h_ewf,&uint64value);
	+ sprintf(buf,"%" PRIu64,uint64value);
	+ EWF_INFOBUF_APPEND_VALUE("Number of sectors: ");
	+#endif
	+
	+#undef EWF_INFOBUF_APPEND_VALUE
	+#undef EWF_INFOBUF_APPEND_STR
	+#undef EWF_INFOBUF_REALLOC
	+
	+ *pp_info_buf=p_infobuf;
	+ return EWF_OK;
	+}
	+
	+/*
	+ * EwfGetErrorMessage
	+ */
	+static const char* EwfGetErrorMessage(int err_num) {
	+ switch(err_num) {
	+ case EWF_MEMALLOC_FAILED:
	+ return "Unable to allocate memory";
	+ break;
	+ case EWF_HANDLE_CREATION_FAILED:
	+ return "Unable to create EWF handle";
	+ break;
	+ case EWF_HANDLE_DESTRUCTION_FAILED:
	+ return "Unable to destroy EWF handle";
	+ break;
	+ case EWF_NO_INPUT_FILES:
	+ return "No input file(s) specified";
	+ break;
	+ case EWF_INVALID_INPUT_FILES:
	+ return "The specified input file(s) are not valid EWF files";
	+ break;
	+ case EWF_OPEN_FAILED:
	+ return "Unable to open EWF file(s)";
	+ break;
	+ case EWF_HEADER_PARSING_FAILED:
	+ return "Unable to parse EWF header values";
	+ break;
	+ case EWF_CLOSE_FAILED:
	+ return "Unable to close EWF file(s)";
	+ break;
	+ case EWF_GET_SIZE_FAILED:
	+ return "Unable to get EWF data size";
	+ break;
	+ case EWF_SEEK_FAILED:
	+ return "Unable to seek into EWF data";
	+ break;
	+ case EWF_READ_FAILED:
	+ return "Unable to read EWF data";
	+ break;
	+ default:
	+ return "Unknown error";
	+ }
	+}
	+
	+/*
	+ * EwfFreeBuffer
	+ */
	+static int EwfFreeBuffer(void *p_buf) {
	+ free(p_buf);
	+ return EWF_OK;
	+}
	+
	+/*
	+ ----- Change log -----
	+ 20140724: * Initial version implementing EwfOpen, EwfSize, EwfRead, EwfClose,
	+ EwfOptionsHelp, EwfOptionsParse and EwfFreeBuffer.
	+ 20140731: * Added support for libewf v1 API.
	+ 20140803: * Added EwfCreateHandle, EwfDestroyHandle and EwfGetInfofileContent.
	+*/
	+
	diff --git a/tags/xmount-0.7.0/libxmount_input/libxmount_input_ewf/libxmount_input_ewf.h b/tags/xmount-0.7.0/libxmount_input/libxmount_input_ewf/libxmount_input_ewf.h
	new file mode 100644
	index 0000000..e06c545
	--- /dev/null
	+++ b/tags/xmount-0.7.0/libxmount_input/libxmount_input_ewf/libxmount_input_ewf.h
	@@ -0,0 +1,81 @@
	+/*******************************************************************************
	+* xmount Copyright (c) 2008-2014 by Gillen Daniel <gillen.dan@pinguin.lu> *
	+* *
	+* This program is free software: you can redistribute it and/or modify it *
	+* under the terms of the GNU General Public License as published by the Free *
	+* Software Foundation, either version 3 of the License, or (at your option) *
	+* any later version. *
	+* *
	+* This program is distributed in the hope that it will be useful, but WITHOUT *
	+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
	+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for *
	+* more details. *
	+* *
	+* You should have received a copy of the GNU General Public License along with *
	+* this program. If not, see <http://www.gnu.org/licenses/>. *
	+*******************************************************************************/
	+
	+#ifndef LIBXMOUNT_INPUT_EWF_H
	+#define LIBXMOUNT_INPUT_EWF_H
	+
	+/*******************************************************************************
	+ * Enums, Typedefs, etc...
	+ ******************************************************************************/
	+//! Possible error return codes
	+enum {
	+ EWF_OK=0,
	+ EWF_MEMALLOC_FAILED,
	+ EWF_HANDLE_CREATION_FAILED,
	+ EWF_HANDLE_DESTRUCTION_FAILED,
	+ EWF_NO_INPUT_FILES,
	+ EWF_INVALID_INPUT_FILES,
	+ EWF_OPEN_FAILED,
	+ EWF_HEADER_PARSING_FAILED,
	+ EWF_CLOSE_FAILED,
	+ EWF_GET_SIZE_FAILED,
	+ EWF_SEEK_FAILED,
	+ EWF_READ_FAILED
	+};
	+
	+//! Library handle
	+typedef struct s_EwfHandle {
	+#ifdef HAVE_LIBEWF_V2_API
	+ //! EWF handle
	+ libewf_handle_t *h_ewf;
	+#else
	+ //! EWF handle
	+ LIBEWF_HANDLE *h_ewf;
	+#endif
	+} ts_EwfHandle, *pts_EwfHandle;
	+
	+/*******************************************************************************
	+ * Forward declarations
	+ ******************************************************************************/
	+static int EwfCreateHandle(void **pp_handle,
	+ const char *p_format,
	+ uint8_t debug);
	+static int EwfDestroyHandle(void **pp_handle);
	+static int EwfOpen(void *p_handle,
	+ const char **pp_filename_arr,
	+ uint64_t filename_arr_len);
	+static int EwfClose(void *p_handle);
	+static int EwfSize(void *p_handle,
	+ uint64_t *p_size);
	+static int EwfRead(void *p_handle,
	+ char *p_buf,
	+ off_t seek,
	+ size_t count,
	+ size_t *p_read,
	+ int *p_errno);
	+static int EwfOptionsHelp(const char **pp_help);
	+static int EwfOptionsParse(void *p_handle,
	+ uint32_t options_count,
	+ const pts_LibXmountOptions *pp_options,
	+ const char **pp_error);
	+static int EwfGetInfofileContent(void *p_handle,
	+ const char **pp_info_buf);
	+static const char* EwfGetErrorMessage(int err_num);
	+static int EwfFreeBuffer(void *p_buf);
	+
	+#endif // LIBXMOUNT_INPUT_EWF_H
	+
	diff --git a/tags/xmount-0.7.0/libxmount_input/libxmount_input_raw/CMakeLists.txt b/tags/xmount-0.7.0/libxmount_input/libxmount_input_raw/CMakeLists.txt
	new file mode 100644
	index 0000000..0bd6b42
	--- /dev/null
	+++ b/tags/xmount-0.7.0/libxmount_input/libxmount_input_raw/CMakeLists.txt
	@@ -0,0 +1,10 @@
	+if(POLICY CMP0042)
	+ cmake_policy(SET CMP0042 NEW) # CMake 3.0
	+endif(POLICY CMP0042)
	+
	+project(libxmount_input_raw C)
	+
	+add_library(xmount_input_raw SHARED libxmount_input_raw.c ../../libxmount/libxmount.c)
	+
	+install(TARGETS xmount_input_raw DESTINATION lib/xmount)
	+
	diff --git a/tags/xmount-0.7.0/libxmount_input/libxmount_input_raw/libxmount_input_raw.c b/tags/xmount-0.7.0/libxmount_input/libxmount_input_raw/libxmount_input_raw.c
	new file mode 100644
	index 0000000..ccacbad
	--- /dev/null
	+++ b/tags/xmount-0.7.0/libxmount_input/libxmount_input_raw/libxmount_input_raw.c
	@@ -0,0 +1,333 @@
	+/*******************************************************************************
	+* xmount Copyright (c) 2008-2014 by Gillen Daniel <gillen.dan@pinguin.lu> *
	+* *
	+* Mostly based upon code written and copyright 2014 by Guy Voncken. *
	+* *
	+* This program is free software: you can redistribute it and/or modify it *
	+* under the terms of the GNU General Public License as published by the Free *
	+* Software Foundation, either version 3 of the License, or (at your option) *
	+* any later version. *
	+* *
	+* This program is distributed in the hope that it will be useful, but WITHOUT *
	+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
	+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for *
	+* more details. *
	+* *
	+* You should have received a copy of the GNU General Public License along with *
	+* this program. If not, see <http://www.gnu.org/licenses/>. *
	+*******************************************************************************/
	+
	+#include <stdlib.h>
	+#include <stdio.h>
	+#include <string.h>
	+
	+#include "../libxmount_input.h"
	+#include "libxmount_input_raw.h"
	+
	+#define LOG_WARNING(...) { \
	+ LIBXMOUNT_LOG_WARNING(__VA_ARGS__); \
	+}
	+
	+/*******************************************************************************
	+ * LibXmount_Input API implementation
	+ ******************************************************************************/
	+/*
	+ * LibXmount_Input_GetApiVersion
	+ */
	+uint8_t LibXmount_Input_GetApiVersion() {
	+ return LIBXMOUNT_INPUT_API_VERSION;
	+}
	+
	+/*
	+ * LibXmount_Input_GetSupportedFormats
	+ */
	+const char* LibXmount_Input_GetSupportedFormats() {
	+ return "raw\0dd\0\0";
	+}
	+
	+/*
	+ * LibXmount_Input_GetFunctions
	+ */
	+void LibXmount_Input_GetFunctions(ts_LibXmountInputFunctions *p_functions) {
	+ p_functions->CreateHandle=&RawCreateHandle;
	+ p_functions->DestroyHandle=&RawDestroyHandle;
	+ p_functions->Open=&RawOpen;
	+ p_functions->Close=&RawClose;
	+ p_functions->Size=&RawSize;
	+ p_functions->Read=&RawRead;
	+ p_functions->OptionsHelp=&RawOptionsHelp;
	+ p_functions->OptionsParse=&RawOptionsParse;
	+ p_functions->GetInfofileContent=&RawGetInfofileContent;
	+ p_functions->GetErrorMessage=&RawGetErrorMessage;
	+ p_functions->FreeBuffer=&RawFreeBuffer;
	+}
	+
	+/*******************************************************************************
	+ * Private
	+ ******************************************************************************/
	+
	+// ---------------------------
	+// Internal static functions
	+// ---------------------------
	+
	+static inline uint64_t RawGetCurrentSeekPos(t_pPiece pPiece) {
	+ return ftello(pPiece->pFile);
	+}
	+
	+static inline int RawSetCurrentSeekPos(t_pPiece pPiece,
	+ uint64_t Val,
	+ int Whence)
	+{
	+ if (fseeko (pPiece->pFile, Val, Whence) != 0) return RAW_CANNOT_SEEK;
	+ return RAW_OK;
	+}
	+
	+static int RawRead0(t_praw praw, char pBuffer, uint64_t Seek, uint32_t pCount)
	+{
	+ t_pPiece pPiece;
	+ uint64_t i;
	+
	+ // Find correct piece to read from
	+ // -------------------------------
	+
	+ for (i=0; i<praw->Pieces; i++)
	+ {
	+ pPiece = &praw->pPieceArr[i];
	+ if (Seek < pPiece->FileSize) break;
	+ Seek -= pPiece->FileSize;
	+ }
	+ if (i >= praw->Pieces) return RAW_READ_BEYOND_END_OF_IMAGE;
	+
	+ // Read from this piece
	+ // --------------------
	+ CHK (RawSetCurrentSeekPos (pPiece, Seek, SEEK_SET))
	+
	+ pCount = GETMIN (pCount, pPiece->FileSize - Seek);
	+
	+ if (fread (pBuffer, *pCount, 1, pPiece->pFile) != 1)
	+ {
	+ return RAW_CANNOT_READ_DATA;
	+ }
	+
	+ return RAW_OK;
	+}
	+
	+// ---------------
	+// API functions
	+// ---------------
	+
	+/*
	+ * RawCreateHandle
	+ */
	+static int RawCreateHandle(void **pp_handle,
	+ const char *p_format,
	+ uint8_t debug)
	+{
	+ (void)p_format;
	+ t_praw p_raw=NULL;
	+
	+ p_raw=(t_praw)malloc(sizeof(t_raw));
	+ if(p_raw==NULL) return RAW_MEMALLOC_FAILED;
	+
	+ memset(p_raw,0,sizeof(t_raw));
	+
	+ if(strcmp(p_format,"dd")==0) {
	+ LOG_WARNING("Using '--in dd' is deprecated and will be removed in the next "
	+ "release. Please use '--in raw' instead.\n");
	+ }
	+
	+ *pp_handle=p_raw;
	+ return RAW_OK;
	+}
	+
	+/*
	+ * RawDestroyHandle
	+ */
	+static int RawDestroyHandle(void **pp_handle) {
	+ free(*pp_handle);
	+ *pp_handle=NULL;
	+ return RAW_OK;
	+}
	+
	+/*
	+ * RawOpen
	+ */
	+static int RawOpen(void *p_handle,
	+ const char **pp_filename_arr,
	+ uint64_t filename_arr_len)
	+{
	+ t_praw praw=(t_praw)p_handle;
	+ t_pPiece pPiece;
	+
	+ praw->Pieces = filename_arr_len;
	+ praw->pPieceArr = (t_pPiece) malloc (praw->Pieces * sizeof(t_Piece));
	+ if (praw->pPieceArr == NULL) return RAW_MEMALLOC_FAILED;
	+ // Need to set everything to 0 in case an error occurs later and RawClose is
	+ // called
	+ memset(praw->pPieceArr,0,praw->Pieces * sizeof(t_Piece));
	+
	+ praw->TotalSize = 0;
	+ for (uint64_t i=0; i < praw->Pieces; i++)
	+ {
	+ pPiece = &praw->pPieceArr[i];
	+ pPiece->pFilename = strdup (pp_filename_arr[i]);
	+ if (pPiece->pFilename == NULL)
	+ {
	+ RawClose(p_handle);
	+ return RAW_MEMALLOC_FAILED;
	+ }
	+ pPiece->pFile = fopen (pPiece->pFilename, "r");
	+ if (pPiece->pFile == NULL)
	+ {
	+ RawClose(p_handle);
	+ return RAW_FILE_OPEN_FAILED;
	+ }
	+ CHK(RawSetCurrentSeekPos(pPiece, 0, SEEK_END))
	+ pPiece->FileSize = RawGetCurrentSeekPos (pPiece);
	+ praw->TotalSize += pPiece->FileSize;
	+ }
	+
	+ return RAW_OK;
	+}
	+
	+/*
	+ * RawClose
	+ */
	+static int RawClose(void *p_handle) {
	+ t_praw praw = (t_praw)p_handle;
	+ t_pPiece pPiece;
	+ int CloseErrors = 0;
	+
	+ if (praw->pPieceArr)
	+ {
	+ for (uint64_t i=0; i < praw->Pieces; i++)
	+ {
	+ pPiece = &praw->pPieceArr[i];
	+ if (pPiece->pFile) {
	+ if (fclose (pPiece->pFile)) CloseErrors=1;
	+ }
	+ if (pPiece->pFilename) free (pPiece->pFilename);
	+ }
	+ free (praw->pPieceArr);
	+ }
	+
	+ if (CloseErrors) return RAW_CANNOT_CLOSE_FILE;
	+
	+ return RAW_OK;
	+}
	+
	+/*
	+ * RawSize
	+ */
	+static int RawSize(void p_handle, uint64_t p_size) {
	+ t_praw p_raw_handle=(t_praw)p_handle;
	+
	+ *p_size=p_raw_handle->TotalSize;
	+ return RAW_OK;
	+}
	+
	+/*
	+ * RawRead
	+ */
	+static int RawRead(void *p_handle,
	+ char *p_buf,
	+ off_t seek,
	+ size_t count,
	+ size_t *p_read,
	+ int *p_errno)
	+{
	+ t_praw p_raw_handle=(t_praw)p_handle;
	+ uint32_t remaining=count;
	+ uint32_t to_read;
	+
	+ if((seek+count)>p_raw_handle->TotalSize) {
	+ return RAW_READ_BEYOND_END_OF_IMAGE;
	+ }
	+
	+ do {
	+ to_read=remaining;
	+ CHK(RawRead0(p_raw_handle,p_buf,seek,&to_read))
	+ remaining-=to_read;
	+ p_buf+=to_read;
	+ seek+=to_read;
	+ } while(remaining);
	+
	+ *p_read=count;
	+ return RAW_OK;
	+}
	+
	+/*
	+ * RawOptionsHelp
	+ */
	+static int RawOptionsHelp(const char **pp_help) {
	+ *pp_help=NULL;
	+ return RAW_OK;
	+}
	+
	+/*
	+ * RawOptionsParse
	+ */
	+static int RawOptionsParse(void *p_handle,
	+ uint32_t options_count,
	+ const pts_LibXmountOptions *pp_options,
	+ const char **pp_error)
	+{
	+ return RAW_OK;
	+}
	+
	+/*
	+ * RawGetInfofileContent
	+ */
	+static int RawGetInfofileContent(void p_handle, const char *pp_info_buf) {
	+ t_praw p_raw_handle=(t_praw)p_handle;
	+ int ret;
	+ char *p_info_buf;
	+
	+ ret=asprintf(&p_info_buf,
	+ "RAW image assembled of %" PRIu64 " piece(s)\n"
	+ "%" PRIu64 " bytes in total (%0.3f GiB)\n",
	+ p_raw_handle->Pieces,
	+ p_raw_handle->TotalSize,
	+ p_raw_handle->TotalSize/(1024.01024.01024.0));
	+ if(ret<0 \|\| *pp_info_buf==NULL) return RAW_MEMALLOC_FAILED;
	+
	+ *pp_info_buf=p_info_buf;
	+ return RAW_OK;
	+}
	+
	+/*
	+ * RawGetErrorMessage
	+ */
	+static const char* RawGetErrorMessage(int err_num) {
	+ switch(err_num) {
	+ case RAW_MEMALLOC_FAILED:
	+ return "Unable to allocate memory";
	+ break;
	+ case RAW_FILE_OPEN_FAILED:
	+ return "Unable to open raw file(s)";
	+ break;
	+ case RAW_CANNOT_READ_DATA:
	+ return "Unable to read raw data";
	+ break;
	+ case RAW_CANNOT_CLOSE_FILE:
	+ return "Unable to close raw file(s)";
	+ break;
	+ case RAW_CANNOT_SEEK:
	+ return "Unable to seek into raw data";
	+ break;
	+ case RAW_READ_BEYOND_END_OF_IMAGE:
	+ return "Unable to read raw data: Attempt to read past EOF";
	+ break;
	+ default:
	+ return "Unknown error";
	+ }
	+}
	+
	+/*
	+ * RawFreeBuffer
	+ */
	+static int RawFreeBuffer(void *p_buf) {
	+ free(p_buf);
	+ return RAW_OK;
	+}
	+
	diff --git a/tags/xmount-0.7.0/libxmount_input/libxmount_input_raw/libxmount_input_raw.h b/tags/xmount-0.7.0/libxmount_input/libxmount_input_raw/libxmount_input_raw.h
	new file mode 100644
	index 0000000..ce69ea8
	--- /dev/null
	+++ b/tags/xmount-0.7.0/libxmount_input/libxmount_input_raw/libxmount_input_raw.h
	@@ -0,0 +1,115 @@
	+/*******************************************************************************
	+* xmount Copyright (c) 2008-2014 by Gillen Daniel <gillen.dan@pinguin.lu> *
	+* *
	+* Mostly based upon code written and copyright 2014 by Guy Voncken. *
	+* *
	+* This program is free software: you can redistribute it and/or modify it *
	+* under the terms of the GNU General Public License as published by the Free *
	+* Software Foundation, either version 3 of the License, or (at your option) *
	+* any later version. *
	+* *
	+* This program is distributed in the hope that it will be useful, but WITHOUT *
	+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
	+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for *
	+* more details. *
	+* *
	+* You should have received a copy of the GNU General Public License along with *
	+* this program. If not, see <http://www.gnu.org/licenses/>. *
	+*******************************************************************************/
	+
	+#ifndef LIBXMOUNT_INPUT_RAW_H
	+#define LIBXMOUNT_INPUT_RAW_H
	+
	+/*******************************************************************************
	+ * Error codes etc...
	+ ******************************************************************************/
	+enum {
	+ RAW_OK=0,
	+ RAW_MEMALLOC_FAILED,
	+ RAW_FILE_OPEN_FAILED,
	+ RAW_CANNOT_READ_DATA,
	+ RAW_CANNOT_CLOSE_FILE,
	+ RAW_CANNOT_SEEK,
	+ RAW_READ_BEYOND_END_OF_IMAGE
	+};
	+
	+// ----------------------
	+// Constant definitions
	+// ----------------------
	+
	+#define GETMAX(a,b) ((a)>(b)?(a):(b))
	+#define GETMIN(a,b) ((a)<(b)?(a):(b))
	+
	+// ---------------------
	+// Types and strutures
	+// ---------------------
	+
	+typedef struct {
	+ char *pFilename;
	+ uint64_t FileSize;
	+ FILE *pFile;
	+} t_Piece, *t_pPiece;
	+
	+typedef struct {
	+ t_pPiece pPieceArr;
	+ uint64_t Pieces;
	+ uint64_t TotalSize;
	+} t_raw, *t_praw;
	+
	+// ----------------
	+// Error handling
	+// ----------------
	+
	+#ifdef RAW_DEBUG
	+ #define CHK(ChkVal) \
	+ { \
	+ int ChkValRc; \
	+ if ((ChkValRc=(ChkVal)) != RAW_OK) \
	+ { \
	+ printf ("Err %d in %s, %d\n", ChkValRc, __FILE__, __LINE__); \
	+ return ChkValRc; \
	+ } \
	+ }
	+ #define DEBUG_PRINTF(pFormat, ...) \
	+ printf (pFormat, ##__VA_ARGS__);
	+#else
	+ #define CHK(ChkVal) \
	+ { \
	+ int ChkValRc; \
	+ if ((ChkValRc=(ChkVal)) != RAW_OK) \
	+ return ChkValRc; \
	+ }
	+ #define DEBUG_PRINTF(...)
	+#endif
	+
	+/*******************************************************************************
	+ * Forward declarations
	+ ******************************************************************************/
	+static int RawCreateHandle(void **pp_handle,
	+ const char *p_format,
	+ uint8_t debug);
	+static int RawDestroyHandle(void **pp_handle);
	+static int RawOpen(void *p_handle,
	+ const char **pp_filename_arr,
	+ uint64_t filename_arr_len);
	+static int RawClose(void *p_handle);
	+static int RawSize(void *p_handle,
	+ uint64_t *p_size);
	+static int RawRead(void *p_handle,
	+ char *p_buf,
	+ off_t seek,
	+ size_t count,
	+ size_t *p_read,
	+ int *p_errno);
	+static int RawOptionsHelp(const char **pp_help);
	+static int RawOptionsParse(void *p_handle,
	+ uint32_t options_count,
	+ const pts_LibXmountOptions *pp_options,
	+ const char **pp_error);
	+static int RawGetInfofileContent(void *p_handle,
	+ const char **pp_info_buf);
	+static const char* RawGetErrorMessage(int err_num);
	+static int RawFreeBuffer(void *p_buf);
	+
	+#endif // LIBXMOUNT_INPUT_RAW_H
	+
	diff --git a/tags/xmount-0.7.0/libxmount_morphing/CMakeLists.txt b/tags/xmount-0.7.0/libxmount_morphing/CMakeLists.txt
	new file mode 100644
	index 0000000..2c44991
	--- /dev/null
	+++ b/tags/xmount-0.7.0/libxmount_morphing/CMakeLists.txt
	@@ -0,0 +1,4 @@
	+add_subdirectory(libxmount_morphing_combine)
	+add_subdirectory(libxmount_morphing_raid)
	+add_subdirectory(libxmount_morphing_unallocated)
	+
	diff --git a/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing.h b/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing.h
	new file mode 100644
	index 0000000..7c90343
	--- /dev/null
	+++ b/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing.h
	@@ -0,0 +1,248 @@
	+/*******************************************************************************
	+* xmount Copyright (c) 2008-2014 by Gillen Daniel <gillen.dan@pinguin.lu> *
	+* *
	+* This program is free software: you can redistribute it and/or modify it *
	+* under the terms of the GNU General Public License as published by the Free *
	+* Software Foundation, either version 3 of the License, or (at your option) *
	+* any later version. *
	+* *
	+* This program is distributed in the hope that it will be useful, but WITHOUT *
	+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
	+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for *
	+* more details. *
	+* *
	+* You should have received a copy of the GNU General Public License along with *
	+* this program. If not, see <http://www.gnu.org/licenses/>. *
	+*******************************************************************************/
	+
	+#ifndef LIBXMOUNT_MORPHING_H
	+#define LIBXMOUNT_MORPHING_H
	+
	+#define LIBXMOUNT_MORPHING_API_VERSION 1
	+
	+#include <config.h>
	+
	+#include <stdlib.h> // For alloc, calloc, free
	+#include <stdio.h> // For printf
	+#include <stdint.h> // For int_t and uint_t
	+#include <stdarg.h> // For va_*, vprintf
	+#include <inttypes.h> // For PRI*
	+
	+#include "../libxmount/libxmount.h"
	+
	+/*******************************************************************************
	+ * Type defs
	+ ******************************************************************************/
	+//! Struct containing pointers to input image functions
	+typedef struct s_LibXmountMorphingInputFunctions {
	+ //! Function to get the amount of input images
	+ /*!
	+ * \param p_count Count of input images
	+ * \return 0 on success
	+ */
	+ int (ImageCount)(uint64_t p_count);
	+
	+ //! Function to get the size of the morphed data
	+ /*!
	+ * \param image Image number
	+ * \param p_size Pointer to store input image's size to
	+ * \return 0 on success
	+ */
	+ int (*Size)(uint64_t image,
	+ uint64_t *p_size);
	+
	+ //! Function to read data from input image
	+ /*!
	+ * \param image Image number
	+ * \param p_buf Buffer to store read data to
	+ * \param offset Position at which to start reading
	+ * \param count Amount of bytes to read
	+ * \param p_read Number of read bytes on success
	+ * \return 0 on success or negated error code on error
	+ */
	+ int (*Read)(uint64_t image,
	+ char *p_buf,
	+ off_t offset,
	+ size_t count,
	+ size_t *p_read);
	+} ts_LibXmountMorphingInputFunctions, *pts_LibXmountMorphingInputFunctions;
	+
	+//! Structure containing pointers to the lib's functions
	+typedef struct s_LibXmountMorphingFunctions {
	+ //! Function to initialize handle
	+ /*!
	+ * This function is called once to allow the lib to alloc any needed
	+ * structures before other functions that rely upon a valid handle are called
	+ * (for ex. OptionsParse or Morph).
	+ *
	+ * The p_format parameter specifies one of the morphing functions returned by
	+ * LibXmount_Morphing_GetSupportedMorphFunctions() which should be used for
	+ * this handle.
	+ *
	+ * \param pp_handle Pointer to store handle to
	+ * \param p_type Morph type to use
	+ * \param debug If set to 1, print debugging infos to stdout
	+ * \return 0 on success or error code
	+ */
	+ int (CreateHandle)(void *pp_handle,
	+ const char *p_type,
	+ uint8_t debug);
	+
	+ //! Function to destroy handle
	+ /*!
	+ * In this function, any structures allocated with CreateHandle should be
	+ * freed. It is generally the last function called before unloading of lib
	+ * happens.
	+ *
	+ * By convention, after this function has been called, *pp_handle must be
	+ * NULL.
	+ *
	+ * \param pp_handle Pointer to store handle to
	+ * \return 0 on success or error code
	+ */
	+ int (DestroyHandle)(void *pp_handle);
	+
	+ //! Function to start morphing
	+ /*!
	+ * Begins to morph input image
	+ *
	+ * \param p_handle Handle
	+ * \param p_input_functions ts_LibXmountInputFunctions structure
	+ * \return 0 on success or error code
	+ */
	+ int (Morph)(void p_handle,
	+ pts_LibXmountMorphingInputFunctions p_input_functions);
	+
	+ //! Function to get the size of the morphed data
	+ /*!
	+ * \param p_handle Handle to the opened image
	+ * \param p_size Pointer to store input image's size to
	+ * \return 0 on success or error code
	+ */
	+ int (Size)(void p_handle,
	+ uint64_t *p_size);
	+
	+ //! Function to read data from an input image
	+ /*!
	+ * Reads count bytes at offset from input image and copies them into memory
	+ * starting at the address of p_buf. Memory is pre-allocated to as much bytes
	+ * as should be read.
	+ *
	+ * \param p_handle Handle to the opened image
	+ * \param p_buf Buffer to store read data to
	+ * \param offset Position at which to start reading
	+ * \param count Amount of bytes to read
	+ * \param p_read Number of read bytes on success
	+ * \return 0 on success or negated error code on error
	+ */
	+ int (Read)(void p_handle,
	+ char *p_buf,
	+ off_t offset,
	+ size_t count,
	+ size_t *p_read);
	+
	+ //! Function to get a help message for any supported lib-specific options
	+ /*!
	+ * Calling this function should return a string containing help messages for
	+ * any supported lib-specific options. Lines should be formated as follows:
	+ *
	+ * " option : description\n"
	+ *
	+ * Returned string will be freed by the caller using FreeBuffer().
	+ *
	+ * If there is no help text, this function must return NULL in pp_help.
	+ *
	+ * \param Pointer to a string to return help text
	+ * \return 0 on success or error code on error
	+ */
	+ int (OptionsHelp)(const char *pp_help);
	+
	+ //! Function to parse any lib-specific options
	+ /*!
	+ * This function is called with the options given with the --inopts parameter.
	+ * All contained options are for the lib. If errors or unknown options are
	+ * found, this function should fail and return an error message in pp_error.
	+ * pp_error will be freed by the caller by using FreeBuffer.
	+ *
	+ * \param p_handle Handle to the opened image
	+ * \param p_options String with specified options
	+ * \param pp_error Pointer to a string with error message
	+ * \return 0 on success or error code and error message
	+ */
	+ int (OptionsParse)(void p_handle,
	+ uint32_t options_count,
	+ const pts_LibXmountOptions *pp_options,
	+ const char **pp_error);
	+
	+ //! Function to get content to add to the info file
	+ /*!
	+ * The returned string is added to xmount's info file. This function is only
	+ * called once when the info file is generated. The returned string is then
	+ * freed with a call to FreeBuffer.
	+ *
	+ * \param p_handle Handle to the opened image
	+ * \param pp_info_buf Pointer to store the null-terminated content
	+ * \return 0 on success or error code
	+ */
	+ int (GetInfofileContent)(void p_handle,
	+ const char **pp_info_buf);
	+
	+ //! Function to get an error message
	+ /*!
	+ * This function should translate an error code that was previously returned
	+ * by one of the library functions into a human readable error message.
	+ *
	+ * By convention, this function must always return a valid pointer to a
	+ * NULL-terminated string!
	+ *
	+ * \param err_num Error code as returned by lib
	+ */
	+ const char* (*GetErrorMessage)(int err_num);
	+
	+ //! Function to free buffers that were allocated by lib
	+ /*!
	+ * \param p_buf Buffer to free
	+ */
	+ void (FreeBuffer)(void p_buf);
	+} ts_LibXmountMorphingFunctions, *pts_LibXmountMorphingFunctions;
	+
	+/*******************************************************************************
	+ * API functions
	+ ******************************************************************************/
	+//! Get library API version
	+/*!
	+ * This function should return the value of LIBXMOUNT_MORPHING_API_VERSION
	+ *
	+ * \return Supported version
	+ */
	+uint8_t LibXmount_Morphing_GetApiVersion();
	+typedef uint8_t (*t_LibXmount_Morphing_GetApiVersion)();
	+
	+//! Get a list of supported morphing functions
	+/*!
	+ * Gets a list of supported morphing functions. These is the string
	+ * specified with xmount's --morph <string> command line option. The returned
	+ * string must be a constant vector of morphing functions split by \0 chars. To
	+ * mark the end of the vector, a single \0 must be used.
	+ *
	+ * As an example, "first\0second\0\0" would be a correct string to return for
	+ * a lib supporting two morphing functions.
	+ *
	+ * \return Vector containing supported morphing functions
	+ */
	+const char* LibXmount_Morphing_GetSupportedTypes();
	+typedef const char* (*t_LibXmount_Morphing_GetSupportedTypes)();
	+
	+//! Get the lib's s_LibXmountMorphingFunctions structure
	+/*!
	+ * This function should set the members of the given
	+ * s_LibXmountMorphingFunctions structure to the internal lib functions. All
	+ * members have to be set.
	+ *
	+ * \param p_functions s_LibXmountMorphingFunctions structure to fill
	+ */
	+void LibXmount_Morphing_GetFunctions(pts_LibXmountMorphingFunctions p_functions);
	+typedef void (*t_LibXmount_Morphing_GetFunctions)(pts_LibXmountMorphingFunctions);
	+
	+#endif // LIBXMOUNT_MORPHING_H
	+
	diff --git a/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_combine/CMakeLists.txt b/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_combine/CMakeLists.txt
	new file mode 100644
	index 0000000..13a4222
	--- /dev/null
	+++ b/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_combine/CMakeLists.txt
	@@ -0,0 +1,10 @@
	+if(POLICY CMP0042)
	+ cmake_policy(SET CMP0042 NEW) # CMake 3.0
	+endif(POLICY CMP0042)
	+
	+project(libxmount_morphing_combine C)
	+
	+add_library(xmount_morphing_combine SHARED libxmount_morphing_combine.c)
	+
	+install(TARGETS xmount_morphing_combine DESTINATION lib/xmount)
	+
	diff --git a/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_combine/libxmount_morphing_combine.c b/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_combine/libxmount_morphing_combine.c
	new file mode 100644
	index 0000000..6813d67
	--- /dev/null
	+++ b/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_combine/libxmount_morphing_combine.c
	@@ -0,0 +1,297 @@
	+/*******************************************************************************
	+* xmount Copyright (c) 2008-2014 by Gillen Daniel <gillen.dan@pinguin.lu> *
	+* *
	+* This program is free software: you can redistribute it and/or modify it *
	+* under the terms of the GNU General Public License as published by the Free *
	+* Software Foundation, either version 3 of the License, or (at your option) *
	+* any later version. *
	+* *
	+* This program is distributed in the hope that it will be useful, but WITHOUT *
	+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
	+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for *
	+* more details. *
	+* *
	+* You should have received a copy of the GNU General Public License along with *
	+* this program. If not, see <http://www.gnu.org/licenses/>. *
	+*******************************************************************************/
	+
	+#include <stdlib.h>
	+#include <stdio.h>
	+#include <string.h>
	+
	+#include "../libxmount_morphing.h"
	+#include "libxmount_morphing_combine.h"
	+
	+#define LOG_DEBUG(...) { \
	+ LIBXMOUNT_LOG_DEBUG(p_combine_handle->debug,__VA_ARGS__); \
	+}
	+
	+/*******************************************************************************
	+ * LibXmount_Morphing API implementation
	+ ******************************************************************************/
	+/*
	+ * LibXmount_Morphing_GetApiVersion
	+ */
	+uint8_t LibXmount_Morphing_GetApiVersion() {
	+ return LIBXMOUNT_MORPHING_API_VERSION;
	+}
	+
	+/*
	+ * LibXmount_Morphing_GetSupportedFormats
	+ */
	+const char* LibXmount_Morphing_GetSupportedTypes() {
	+ return "combine\0\0";
	+}
	+
	+/*
	+ * LibXmount_Morphing_GetFunctions
	+ */
	+void LibXmount_Morphing_GetFunctions(ts_LibXmountMorphingFunctions *p_functions)
	+{
	+ p_functions->CreateHandle=&CombineCreateHandle;
	+ p_functions->DestroyHandle=&CombineDestroyHandle;
	+ p_functions->Morph=&CombineMorph;
	+ p_functions->Size=&CombineSize;
	+ p_functions->Read=&CombineRead;
	+ p_functions->OptionsHelp=&CombineOptionsHelp;
	+ p_functions->OptionsParse=&CombineOptionsParse;
	+ p_functions->GetInfofileContent=&CombineGetInfofileContent;
	+ p_functions->GetErrorMessage=&CombineGetErrorMessage;
	+ p_functions->FreeBuffer=&CombineFreeBuffer;
	+}
	+
	+/*******************************************************************************
	+ * Private
	+ ******************************************************************************/
	+/*
	+ * CombineCreateHandle
	+ */
	+static int CombineCreateHandle(void **pp_handle,
	+ const char *p_format,
	+ uint8_t debug)
	+{
	+ pts_CombineHandle p_combine_handle;
	+
	+ // Alloc new handle
	+ p_combine_handle=malloc(sizeof(ts_CombineHandle));
	+ if(p_combine_handle==NULL) return COMBINE_MEMALLOC_FAILED;
	+
	+ // Init handle values
	+ p_combine_handle->debug=debug;
	+ p_combine_handle->input_images_count=0;
	+ p_combine_handle->p_input_functions=NULL;
	+ p_combine_handle->morphed_image_size=0;
	+
	+ LOG_DEBUG("Created new LibXmount_Morphing_Combine handle\n");
	+
	+ // Return new handle
	+ *pp_handle=p_combine_handle;
	+ return COMBINE_OK;
	+}
	+
	+/*
	+ * CombineDestroyHandle
	+ */
	+static int CombineDestroyHandle(void **pp_handle) {
	+ pts_CombineHandle p_combine_handle=(pts_CombineHandle)*pp_handle;
	+
	+ LOG_DEBUG("Destroying LibXmount_Morphing_Combine handle\n");
	+
	+ // Free handle
	+ free(p_combine_handle);
	+
	+ *pp_handle=NULL;
	+ return COMBINE_OK;
	+}
	+
	+/*
	+ * CombineMorph
	+ */
	+static int CombineMorph(void *p_handle,
	+ pts_LibXmountMorphingInputFunctions p_input_functions)
	+{
	+ pts_CombineHandle p_combine_handle=(pts_CombineHandle)p_handle;
	+ int ret;
	+ uint64_t input_image_size;
	+
	+ LOG_DEBUG("Initializing LibXmount_Morphing_Combine\n");
	+
	+ // Set input functions and get image count
	+ p_combine_handle->p_input_functions=p_input_functions;
	+ if(p_combine_handle->
	+ p_input_functions->
	+ ImageCount(&p_combine_handle->input_images_count)!=0)
	+ {
	+ return COMBINE_CANNOT_GET_IMAGECOUNT;
	+ }
	+
	+ // Calculate morphed image size
	+ for(uint64_t i=0;i<p_combine_handle->input_images_count;i++) {
	+ ret=p_combine_handle->
	+ p_input_functions->
	+ Size(i,&input_image_size);
	+ if(ret!=0) return COMBINE_CANNOT_GET_IMAGESIZE;
	+
	+ LOG_DEBUG("Adding %" PRIu64 " bytes from image %" PRIu64 "\n",
	+ input_image_size,
	+ i);
	+
	+ p_combine_handle->morphed_image_size+=input_image_size;
	+ }
	+
	+ LOG_DEBUG("Total morphed image size is %" PRIu64 " bytes\n",
	+ p_combine_handle->morphed_image_size);
	+
	+ return COMBINE_OK;
	+}
	+
	+/*
	+ * CombineSize
	+ */
	+static int CombineSize(void p_handle, uint64_t p_size) {
	+ *p_size=((pts_CombineHandle)(p_handle))->morphed_image_size;
	+ return COMBINE_OK;
	+}
	+
	+/*
	+ * CombineRead
	+ */
	+static int CombineRead(void *p_handle,
	+ char *p_buf,
	+ off_t offset,
	+ size_t count,
	+ size_t *p_read)
	+{
	+ pts_CombineHandle p_combine_handle=(pts_CombineHandle)p_handle;
	+ uint64_t cur_input_image=0;
	+ uint64_t cur_input_image_size=0;
	+ off_t cur_offset=offset;
	+ int ret;
	+ size_t cur_count;
	+ size_t read;
	+
	+ LOG_DEBUG("Reading %zu bytes at offset %zu from morphed image\n",
	+ count,
	+ offset);
	+
	+ // Make sure read parameters are within morphed image bounds
	+ if(offset>=p_combine_handle->morphed_image_size \|\|
	+ offset+count>p_combine_handle->morphed_image_size)
	+ {
	+ return COMBINE_READ_BEYOND_END_OF_IMAGE;
	+ }
	+
	+ // Search starting image to read from
	+ ret=p_combine_handle->p_input_functions->Size(cur_input_image,
	+ &cur_input_image_size);
	+ while(ret==0 && cur_offset>=cur_input_image_size) {
	+ cur_offset-=cur_input_image_size;
	+ cur_input_image++;
	+ ret=p_combine_handle->p_input_functions->Size(cur_input_image,
	+ &cur_input_image_size);
	+ }
	+ if(ret!=0) return COMBINE_CANNOT_GET_IMAGESIZE;
	+
	+ // Init p_read
	+ *p_read=0;
	+
	+ // Read data
	+ while(cur_input_image<p_combine_handle->input_images_count && count!=0) {
	+ // Get current input image size
	+ ret=p_combine_handle->p_input_functions->Size(cur_input_image,
	+ &cur_input_image_size);
	+ if(ret!=0) return COMBINE_CANNOT_GET_IMAGESIZE;
	+
	+ // Calculate how many bytes to read from current input image
	+ if(cur_offset+count>cur_input_image_size) {
	+ cur_count=cur_input_image_size-cur_offset;
	+ } else {
	+ cur_count=count;
	+ }
	+
	+ LOG_DEBUG("Reading %zu bytes at offset %zu from input image %" PRIu64 "\n",
	+ cur_count,
	+ cur_offset,
	+ cur_input_image);
	+
	+ // Read bytes
	+ ret=p_combine_handle->p_input_functions->
	+ Read(cur_input_image,
	+ p_buf,
	+ cur_offset,
	+ cur_count,
	+ &read);
	+ if(ret!=0 \|\| read!=cur_count) return COMBINE_CANNOT_READ_DATA;
	+
	+ p_buf+=cur_count;
	+ cur_offset=0;
	+ count-=cur_count;
	+ cur_input_image++;
	+ (*p_read)+=cur_count;
	+ }
	+ if(count!=0) return COMBINE_CANNOT_READ_DATA;
	+
	+ return COMBINE_OK;
	+}
	+
	+/*
	+ * CombineOptionsHelp
	+ */
	+static int CombineOptionsHelp(const char **pp_help) {
	+ *pp_help=NULL;
	+ return COMBINE_OK;
	+}
	+
	+/*
	+ * CombineOptionsParse
	+ */
	+static int CombineOptionsParse(void *p_handle,
	+ uint32_t options_count,
	+ const pts_LibXmountOptions *pp_options,
	+ const char **pp_error)
	+{
	+ return COMBINE_OK;
	+}
	+
	+/*
	+ * CombineGetInfofileContent
	+ */
	+static int CombineGetInfofileContent(void *p_handle,
	+ const char **pp_info_buf)
	+{
	+ *pp_info_buf=NULL;
	+ return COMBINE_OK;
	+}
	+
	+/*
	+ * CombineGetErrorMessage
	+ */
	+static const char* CombineGetErrorMessage(int err_num) {
	+ switch(err_num) {
	+ case COMBINE_MEMALLOC_FAILED:
	+ return "Unable to allocate memory";
	+ break;
	+ case COMBINE_CANNOT_GET_IMAGECOUNT:
	+ return "Unable to get input image count";
	+ break;
	+ case COMBINE_CANNOT_GET_IMAGESIZE:
	+ return "Unable to get input image size";
	+ break;
	+ case COMBINE_READ_BEYOND_END_OF_IMAGE:
	+ return "Unable to read data: Attempt to read past EOF";
	+ break;
	+ case COMBINE_CANNOT_READ_DATA:
	+ return "Unable to read data";
	+ break;
	+ default:
	+ return "Unknown error";
	+ }
	+}
	+
	+/*
	+ * CombineFreeBuffer
	+ */
	+static void CombineFreeBuffer(void *p_buf) {
	+ free(p_buf);
	+}
	+
	diff --git a/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_combine/libxmount_morphing_combine.h b/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_combine/libxmount_morphing_combine.h
	new file mode 100644
	index 0000000..f359824
	--- /dev/null
	+++ b/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_combine/libxmount_morphing_combine.h
	@@ -0,0 +1,67 @@
	+/*******************************************************************************
	+* xmount Copyright (c) 2008-2014 by Gillen Daniel <gillen.dan@pinguin.lu> *
	+* *
	+* This program is free software: you can redistribute it and/or modify it *
	+* under the terms of the GNU General Public License as published by the Free *
	+* Software Foundation, either version 3 of the License, or (at your option) *
	+* any later version. *
	+* *
	+* This program is distributed in the hope that it will be useful, but WITHOUT *
	+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
	+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for *
	+* more details. *
	+* *
	+* You should have received a copy of the GNU General Public License along with *
	+* this program. If not, see <http://www.gnu.org/licenses/>. *
	+*******************************************************************************/
	+
	+#ifndef LIBXMOUNT_MORPHING_COMBINE_H
	+#define LIBXMOUNT_MORPHING_COMBINE_H
	+
	+/*******************************************************************************
	+ * Enums, type defs, etc...
	+ ******************************************************************************/
	+enum {
	+ COMBINE_OK=0,
	+ COMBINE_MEMALLOC_FAILED,
	+ COMBINE_CANNOT_GET_IMAGECOUNT,
	+ COMBINE_CANNOT_GET_IMAGESIZE,
	+ COMBINE_READ_BEYOND_END_OF_IMAGE,
	+ COMBINE_CANNOT_READ_DATA
	+};
	+
	+typedef struct s_CombineHandle {
	+ uint8_t debug;
	+ uint64_t input_images_count;
	+ pts_LibXmountMorphingInputFunctions p_input_functions;
	+ uint64_t morphed_image_size;
	+} ts_CombineHandle, *pts_CombineHandle;
	+
	+/*******************************************************************************
	+ * Forward declarations
	+ ******************************************************************************/
	+static int CombineCreateHandle(void **pp_handle,
	+ const char *p_format,
	+ uint8_t debug);
	+static int CombineDestroyHandle(void **pp_handle);
	+static int CombineMorph(void *p_handle,
	+ pts_LibXmountMorphingInputFunctions p_input_functions);
	+static int CombineSize(void *p_handle,
	+ uint64_t *p_size);
	+static int CombineRead(void *p_handle,
	+ char *p_buf,
	+ off_t offset,
	+ size_t count,
	+ size_t *p_read);
	+static int CombineOptionsHelp(const char **pp_help);
	+static int CombineOptionsParse(void *p_handle,
	+ uint32_t options_count,
	+ const pts_LibXmountOptions *pp_options,
	+ const char **pp_error);
	+static int CombineGetInfofileContent(void *p_handle,
	+ const char **pp_info_buf);
	+static const char* CombineGetErrorMessage(int err_num);
	+static void CombineFreeBuffer(void *p_buf);
	+
	+#endif // LIBXMOUNT_MORPHING_COMBINE_H
	+
	diff --git a/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_raid/CMakeLists.txt b/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_raid/CMakeLists.txt
	new file mode 100644
	index 0000000..69e976a
	--- /dev/null
	+++ b/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_raid/CMakeLists.txt
	@@ -0,0 +1,10 @@
	+if(POLICY CMP0042)
	+ cmake_policy(SET CMP0042 NEW) # CMake 3.0
	+endif(POLICY CMP0042)
	+
	+project(libxmount_morphing_raid C)
	+
	+add_library(xmount_morphing_raid SHARED libxmount_morphing_raid.c ../../libxmount/libxmount.c)
	+
	+install(TARGETS xmount_morphing_raid DESTINATION lib/xmount)
	+
	diff --git a/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_raid/libxmount_morphing_raid.c b/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_raid/libxmount_morphing_raid.c
	new file mode 100644
	index 0000000..0d468ba
	--- /dev/null
	+++ b/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_raid/libxmount_morphing_raid.c
	@@ -0,0 +1,374 @@
	+/*******************************************************************************
	+* xmount Copyright (c) 2008-2014 by Gillen Daniel <gillen.dan@pinguin.lu> *
	+* *
	+* This program is free software: you can redistribute it and/or modify it *
	+* under the terms of the GNU General Public License as published by the Free *
	+* Software Foundation, either version 3 of the License, or (at your option) *
	+* any later version. *
	+* *
	+* This program is distributed in the hope that it will be useful, but WITHOUT *
	+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
	+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for *
	+* more details. *
	+* *
	+* You should have received a copy of the GNU General Public License along with *
	+* this program. If not, see <http://www.gnu.org/licenses/>. *
	+*******************************************************************************/
	+
	+#include <stdlib.h>
	+#include <stdio.h>
	+#include <string.h>
	+
	+#include "../libxmount_morphing.h"
	+#include "libxmount_morphing_raid.h"
	+
	+#define LOG_DEBUG(...) { \
	+ LIBXMOUNT_LOG_DEBUG(p_raid_handle->debug,__VA_ARGS__); \
	+}
	+
	+/*******************************************************************************
	+ * LibXmount_Morphing API implementation
	+ ******************************************************************************/
	+/*
	+ * LibXmount_Morphing_GetApiVersion
	+ */
	+uint8_t LibXmount_Morphing_GetApiVersion() {
	+ return LIBXMOUNT_MORPHING_API_VERSION;
	+}
	+
	+/*
	+ * LibXmount_Morphing_GetSupportedFormats
	+ */
	+const char* LibXmount_Morphing_GetSupportedTypes() {
	+ return "raid0\0\0";
	+}
	+
	+/*
	+ * LibXmount_Morphing_GetFunctions
	+ */
	+void LibXmount_Morphing_GetFunctions(ts_LibXmountMorphingFunctions *p_functions)
	+{
	+ p_functions->CreateHandle=&RaidCreateHandle;
	+ p_functions->DestroyHandle=&RaidDestroyHandle;
	+ p_functions->Morph=&RaidMorph;
	+ p_functions->Size=&RaidSize;
	+ p_functions->Read=&RaidRead;
	+ p_functions->OptionsHelp=&RaidOptionsHelp;
	+ p_functions->OptionsParse=&RaidOptionsParse;
	+ p_functions->GetInfofileContent=&RaidGetInfofileContent;
	+ p_functions->GetErrorMessage=&RaidGetErrorMessage;
	+ p_functions->FreeBuffer=&RaidFreeBuffer;
	+}
	+
	+/*******************************************************************************
	+ * Private
	+ ******************************************************************************/
	+/*
	+ * RaidCreateHandle
	+ */
	+static int RaidCreateHandle(void **pp_handle,
	+ const char *p_format,
	+ uint8_t debug)
	+{
	+ pts_RaidHandle p_raid_handle;
	+
	+ // Alloc new handle
	+ p_raid_handle=malloc(sizeof(ts_RaidHandle));
	+ if(p_raid_handle==NULL) return RAID_MEMALLOC_FAILED;
	+
	+ // Init handle values
	+ p_raid_handle->debug=debug;
	+ p_raid_handle->input_images_count=0;
	+ p_raid_handle->chunk_size=RAID_DEFAULT_CHUNKSIZE;
	+ p_raid_handle->chunks_per_image=0;
	+ p_raid_handle->p_input_functions=NULL;
	+ p_raid_handle->morphed_image_size=0;
	+
	+ LOG_DEBUG("Created new LibXmount_Morphing_Raid handle\n");
	+
	+ // Return new handle
	+ *pp_handle=p_raid_handle;
	+ return RAID_OK;
	+}
	+
	+/*
	+ * RaidDestroyHandle
	+ */
	+static int RaidDestroyHandle(void **pp_handle) {
	+ pts_RaidHandle p_raid_handle=(pts_RaidHandle)*pp_handle;
	+
	+ LOG_DEBUG("Destroying LibXmount_Morphing_Raid handle\n");
	+
	+ // Free handle
	+ free(p_raid_handle);
	+
	+ *pp_handle=NULL;
	+ return RAID_OK;
	+}
	+
	+/*
	+ * RaidMorph
	+ */
	+static int RaidMorph(void *p_handle,
	+ pts_LibXmountMorphingInputFunctions p_input_functions)
	+{
	+ pts_RaidHandle p_raid_handle=(pts_RaidHandle)p_handle;
	+ int ret;
	+ uint64_t input_image_size;
	+ uint64_t chunks_per_image;
	+
	+ LOG_DEBUG("Initializing LibXmount_Morphing_Raid\n");
	+
	+ // Set input functions and get image count
	+ p_raid_handle->p_input_functions=p_input_functions;
	+ if(p_raid_handle->
	+ p_input_functions->
	+ ImageCount(&p_raid_handle->input_images_count)!=0)
	+ {
	+ return RAID_CANNOT_GET_IMAGECOUNT;
	+ }
	+
	+ // Calculate chunks per image
	+ for(uint64_t i=0;i<p_raid_handle->input_images_count;i++) {
	+ ret=p_raid_handle->
	+ p_input_functions->
	+ Size(i,&input_image_size);
	+ if(ret!=0) return RAID_CANNOT_GET_IMAGESIZE;
	+
	+ chunks_per_image=input_image_size/p_raid_handle->chunk_size;
	+
	+ LOG_DEBUG("Image %" PRIu64 " can hold a maximum of %" PRIu64 " chunks of %"
	+ PRIu32 " bytes\n",
	+ i,
	+ chunks_per_image,
	+ p_raid_handle->chunk_size);
	+
	+ // The smallest image determines how many chunks are availbale on all images
	+ if(p_raid_handle->chunks_per_image==0) {
	+ p_raid_handle->chunks_per_image=chunks_per_image;
	+ } else if(chunks_per_image<p_raid_handle->chunks_per_image) {
	+ p_raid_handle->chunks_per_image=chunks_per_image;
	+ }
	+ }
	+
	+ LOG_DEBUG("Smallest image holds %" PRIu64 " chunks of %" PRIu32 " bytes\n",
	+ p_raid_handle->chunks_per_image,
	+ p_raid_handle->chunk_size);
	+
	+ // Calculate total raid capacity based on smallest disk
	+ p_raid_handle->morphed_image_size=
	+ p_raid_handle->chunks_per_image*
	+ p_raid_handle->chunk_size*p_raid_handle->input_images_count;
	+
	+ LOG_DEBUG("Total raid capacity is %" PRIu64 " bytes\n",
	+ p_raid_handle->morphed_image_size);
	+
	+ return RAID_OK;
	+}
	+
	+/*
	+ * RaidSize
	+ */
	+static int RaidSize(void p_handle, uint64_t p_size) {
	+ *p_size=((pts_RaidHandle)(p_handle))->morphed_image_size;
	+ return RAID_OK;
	+}
	+
	+/*
	+ * RaidRead
	+ */
	+static int RaidRead(void *p_handle,
	+ char *p_buf,
	+ off_t offset,
	+ size_t count,
	+ size_t *p_read)
	+{
	+ pts_RaidHandle p_raid_handle=(pts_RaidHandle)p_handle;
	+ uint64_t cur_chunk;
	+ uint64_t cur_image;
	+ off_t cur_chunk_offset;
	+ off_t cur_image_offset;
	+ size_t cur_count;
	+ int ret;
	+ size_t read;
	+
	+ LOG_DEBUG("Reading %zu bytes at offset %zu from morphed image\n",
	+ count,
	+ offset);
	+
	+ // Make sure read parameters are within morphed image bounds
	+ if(offset>=p_raid_handle->morphed_image_size \|\|
	+ offset+count>p_raid_handle->morphed_image_size)
	+ {
	+ return RAID_READ_BEYOND_END_OF_IMAGE;
	+ }
	+
	+ // Calculate starting chunk, and chunk offset
	+ cur_chunk=offset/p_raid_handle->chunk_size;
	+ cur_chunk_offset=offset-(cur_chunk*p_raid_handle->chunk_size);
	+
	+ // Init p_read
	+ *p_read=0;
	+
	+ while(count!=0) {
	+ // Calculate image and image offset to read from
	+ cur_image=cur_chunk%p_raid_handle->input_images_count;
	+ cur_image_offset=
	+ (cur_chunk/p_raid_handle->input_images_count)*p_raid_handle->chunk_size;
	+
	+ // Calculate how many bytes to read from current chunk
	+ if(cur_chunk_offset+count>p_raid_handle->chunk_size) {
	+ cur_count=p_raid_handle->chunk_size-cur_chunk_offset;
	+ } else {
	+ cur_count=count;
	+ }
	+
	+ LOG_DEBUG("Reading %zu bytes at offset %zu from image %" PRIu64
	+ " (chunk %" PRIu64 ")\n",
	+ cur_count,
	+ cur_image_offset+cur_chunk_offset,
	+ cur_image,
	+ cur_chunk);
	+
	+ // Read bytes
	+ ret=p_raid_handle->p_input_functions->
	+ Read(cur_image,
	+ p_buf,
	+ cur_image_offset+cur_chunk_offset,
	+ cur_count,
	+ &read);
	+ if(ret!=0 \|\| read!=cur_count) return RAID_CANNOT_READ_DATA;
	+
	+ p_buf+=cur_count;
	+ cur_chunk_offset=0;
	+ count-=cur_count;
	+ cur_chunk++;
	+ (*p_read)+=cur_count;
	+ }
	+
	+ return RAID_OK;
	+}
	+
	+/*
	+ * RaidOptionsHelp
	+ */
	+static int RaidOptionsHelp(const char **pp_help) {
	+ int ok;
	+ char *p_buf;
	+
	+ ok=asprintf(&p_buf,
	+ " raid_chunksize : Specify the chunk size to use in bytes. "
	+ "Defaults to 524288 (512k).\n");
	+ if(ok<0 \|\| p_buf==NULL) {
	+ *pp_help=NULL;
	+ return RAID_MEMALLOC_FAILED;
	+ }
	+
	+ *pp_help=p_buf;
	+ return RAID_OK;
	+}
	+
	+/*
	+ * RaidOptionsParse
	+ */
	+static int RaidOptionsParse(void *p_handle,
	+ uint32_t options_count,
	+ const pts_LibXmountOptions *pp_options,
	+ const char **pp_error)
	+{
	+ pts_RaidHandle p_raid_handle=(pts_RaidHandle)p_handle;
	+ int ok;
	+ uint32_t uint32value;
	+ char *p_buf;
	+
	+ for(uint32_t i=0;i<options_count;i++) {
	+ if(strcmp(pp_options[i]->p_key,"raid_chunksize")) {
	+ // Convert value to uint32
	+ uint32value=StrToUint32(pp_options[i]->p_value,&ok);
	+ if(ok==0 \|\| uint32value==0) {
	+ // Conversion failed, generate error message and return
	+ ok=asprintf(&p_buf,
	+ "Unable to parse value '%s' of '%s' as valid 32bit number",
	+ pp_options[i]->p_value,
	+ pp_options[i]->p_key);
	+ if(ok<0 \|\| *pp_error==NULL) {
	+ *pp_error=NULL;
	+ return RAID_MEMALLOC_FAILED;
	+ }
	+ *pp_error=p_buf;
	+ return RAID_CANNOT_PARSE_OPTION;
	+ }
	+
	+ LOG_DEBUG("Setting chunk size to %" PRIu32 " bytes\n",uint32value);
	+
	+ // Conversion ok, save value and mark option as valid
	+ p_raid_handle->chunk_size=uint32value;
	+ pp_options[i]->valid=1;
	+ continue;
	+ }
	+ }
	+
	+ return RAID_OK;
	+}
	+
	+/*
	+ * RaidGetInfofileContent
	+ */
	+static int RaidGetInfofileContent(void *p_handle,
	+ const char **pp_info_buf)
	+{
	+ pts_RaidHandle p_raid_handle=(pts_RaidHandle)p_handle;
	+ int ret;
	+ char *p_buf;
	+
	+ ret=asprintf(&p_buf,
	+ "Simulating RAID level 0 over %" PRIu64 " disks.\n"
	+ "Chunk size: %" PRIu32 " bytes\n"
	+ "Chunks per disk: %" PRIu64 "\n"
	+ "Total capacity: %" PRIu64 " bytes (%0.3f GiB)\n",
	+ p_raid_handle->input_images_count,
	+ p_raid_handle->chunk_size,
	+ p_raid_handle->chunks_per_image,
	+ p_raid_handle->morphed_image_size,
	+ p_raid_handle->morphed_image_size/(1024.01024.01024.0));
	+ if(ret<0 \|\| *pp_info_buf==NULL) return RAID_MEMALLOC_FAILED;
	+
	+ *pp_info_buf=p_buf;
	+ return RAID_OK;
	+}
	+
	+/*
	+ * RaidGetErrorMessage
	+ */
	+static const char* RaidGetErrorMessage(int err_num) {
	+ switch(err_num) {
	+ case RAID_MEMALLOC_FAILED:
	+ return "Unable to allocate memory";
	+ break;
	+ case RAID_CANNOT_GET_IMAGECOUNT:
	+ return "Unable to get input image count";
	+ break;
	+ case RAID_CANNOT_GET_IMAGESIZE:
	+ return "Unable to get input image size";
	+ break;
	+ case RAID_READ_BEYOND_END_OF_IMAGE:
	+ return "Unable to read data: Attempt to read past EOF";
	+ break;
	+ case RAID_CANNOT_READ_DATA:
	+ return "Unable to read data";
	+ break;
	+ case RAID_CANNOT_PARSE_OPTION:
	+ return "Unable to parse library option";
	+ break;
	+ default:
	+ return "Unknown error";
	+ }
	+}
	+
	+/*
	+ * RaidFreeBuffer
	+ */
	+static void RaidFreeBuffer(void *p_buf) {
	+ free(p_buf);
	+}
	+
	diff --git a/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_raid/libxmount_morphing_raid.h b/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_raid/libxmount_morphing_raid.h
	new file mode 100644
	index 0000000..4c6dea9
	--- /dev/null
	+++ b/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_raid/libxmount_morphing_raid.h
	@@ -0,0 +1,71 @@
	+/*******************************************************************************
	+* xmount Copyright (c) 2008-2014 by Gillen Daniel <gillen.dan@pinguin.lu> *
	+* *
	+* This program is free software: you can redistribute it and/or modify it *
	+* under the terms of the GNU General Public License as published by the Free *
	+* Software Foundation, either version 3 of the License, or (at your option) *
	+* any later version. *
	+* *
	+* This program is distributed in the hope that it will be useful, but WITHOUT *
	+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
	+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for *
	+* more details. *
	+* *
	+* You should have received a copy of the GNU General Public License along with *
	+* this program. If not, see <http://www.gnu.org/licenses/>. *
	+*******************************************************************************/
	+
	+#ifndef LIBXMOUNT_MORPHING_RAID_H
	+#define LIBXMOUNT_MORPHING_RAID_H
	+
	+/*******************************************************************************
	+ * Enums, type defs, etc...
	+ ******************************************************************************/
	+enum {
	+ RAID_OK=0,
	+ RAID_MEMALLOC_FAILED,
	+ RAID_CANNOT_GET_IMAGECOUNT,
	+ RAID_CANNOT_GET_IMAGESIZE,
	+ RAID_READ_BEYOND_END_OF_IMAGE,
	+ RAID_CANNOT_READ_DATA,
	+ RAID_CANNOT_PARSE_OPTION
	+};
	+
	+#define RAID_DEFAULT_CHUNKSIZE 512*1024
	+typedef struct s_RaidHandle {
	+ uint8_t debug;
	+ uint64_t input_images_count;
	+ uint32_t chunk_size;
	+ uint64_t chunks_per_image;
	+ pts_LibXmountMorphingInputFunctions p_input_functions;
	+ uint64_t morphed_image_size;
	+} ts_RaidHandle, *pts_RaidHandle;
	+
	+/*******************************************************************************
	+ * Forward declarations
	+ ******************************************************************************/
	+static int RaidCreateHandle(void **pp_handle,
	+ const char *p_format,
	+ uint8_t debug);
	+static int RaidDestroyHandle(void **pp_handle);
	+static int RaidMorph(void *p_handle,
	+ pts_LibXmountMorphingInputFunctions p_input_functions);
	+static int RaidSize(void *p_handle,
	+ uint64_t *p_size);
	+static int RaidRead(void *p_handle,
	+ char *p_buf,
	+ off_t offset,
	+ size_t count,
	+ size_t *p_read);
	+static int RaidOptionsHelp(const char **pp_help);
	+static int RaidOptionsParse(void *p_handle,
	+ uint32_t options_count,
	+ const pts_LibXmountOptions *pp_options,
	+ const char **pp_error);
	+static int RaidGetInfofileContent(void *p_handle,
	+ const char **pp_info_buf);
	+static const char* RaidGetErrorMessage(int err_num);
	+static void RaidFreeBuffer(void *p_buf);
	+
	+#endif // LIBXMOUNT_MORPHING_RAID_H
	+
	diff --git a/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_unallocated/CMakeLists.txt b/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_unallocated/CMakeLists.txt
	new file mode 100644
	index 0000000..a90805f
	--- /dev/null
	+++ b/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_unallocated/CMakeLists.txt
	@@ -0,0 +1,10 @@
	+if(POLICY CMP0042)
	+ cmake_policy(SET CMP0042 NEW) # CMake 3.0
	+endif(POLICY CMP0042)
	+
	+project(libxmount_morphing_unallocated C)
	+
	+add_library(xmount_morphing_unallocated SHARED libxmount_morphing_unallocated.c hfs_functions.c fat_functions.c ../../libxmount/libxmount.c)
	+
	+install(TARGETS xmount_morphing_unallocated DESTINATION lib/xmount)
	+
	diff --git a/trunk/libxmount_morphing/libxmount_morphing_unallocated/fat_functions.c b/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_unallocated/fat_functions.c
	similarity index 89%
	copy from trunk/libxmount_morphing/libxmount_morphing_unallocated/fat_functions.c
	copy to tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_unallocated/fat_functions.c
	index 2259b87..698e1e4 100644
	--- a/trunk/libxmount_morphing/libxmount_morphing_unallocated/fat_functions.c
	+++ b/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_unallocated/fat_functions.c
	@@ -1,406 +1,406 @@
	/*******************************************************************************
	* xmount Copyright (c) 2008-2014 by Gillen Daniel <gillen.dan@pinguin.lu> *
	* *
	* This program is free software: you can redistribute it and/or modify it *
	* under the terms of the GNU General Public License as published by the Free *
	* Software Foundation, either version 3 of the License, or (at your option) *
	* any later version. *
	* *
	* This program is distributed in the hope that it will be useful, but WITHOUT *
	* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
	* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for *
	* more details. *
	* *
	* You should have received a copy of the GNU General Public License along with *
	* this program. If not, see <http://www.gnu.org/licenses/>. *
	*******************************************************************************/

	#include "fat_functions.h"
	#include "libxmount_morphing_unallocated_retvalues.h"

	#include <string.h> // For memset

	#define LOG_DEBUG(...) { \
	LIBXMOUNT_LOG_DEBUG(p_fat_handle->debug,__VA_ARGS__); \
	}

	/*
	* ReadFatHeader
	*/
	int ReadFatHeader(pts_FatHandle p_fat_handle,
	pts_LibXmountMorphingInputFunctions p_input_functions,
	uint8_t debug)
	{
	pts_FatVH p_fat_vh;
	int ret;
	size_t bytes_read;
	uint32_t root_dir_sectors;
	uint32_t fat_size;
	uint32_t total_sectors;
	uint32_t data_sectors;
	uint32_t cluster_count;

	// Init FAT handle
	memset(p_fat_handle,0,sizeof(ts_FatHandle));
	p_fat_handle->fat_type=FatType_Unknown;
	p_fat_handle->debug=debug;

	LOG_DEBUG("Trying to read FAT volume header\n");

	// Alloc buffer for header
	p_fat_vh=calloc(1,sizeof(ts_FatVH));
	if(p_fat_vh==NULL) return UNALLOCATED_MEMALLOC_FAILED;

	// Read VH from input image
	ret=p_input_functions->Read(0,
	(char*)(p_fat_vh),
	0,
	sizeof(ts_FatVH),
	&bytes_read);
	if(ret!=0 \|\| bytes_read!=sizeof(ts_FatVH)) {
	free(p_fat_vh);
	return UNALLOCATED_FAT_CANNOT_READ_HEADER;
	}

	// Convert values to host endianness (FAT values are always stored in little
	// endian)
	p_fat_vh->bytes_per_sector=le16toh(p_fat_vh->bytes_per_sector);
	p_fat_vh->reserved_sectors=le16toh(p_fat_vh->reserved_sectors);
	p_fat_vh->root_entry_count=le16toh(p_fat_vh->root_entry_count);
	p_fat_vh->total_sectors_16=le16toh(p_fat_vh->total_sectors_16);
	p_fat_vh->fat16_sectors=le16toh(p_fat_vh->fat16_sectors);
	p_fat_vh->total_sectors_32=le32toh(p_fat_vh->total_sectors_32);
	p_fat_vh->fat32_sectors=le32toh(p_fat_vh->fat32_sectors);

	LOG_DEBUG("FAT VH jump instruction 1: 0x%02X\n",p_fat_vh->jump_inst[0]);
	LOG_DEBUG("FAT bytes per sector: %" PRIu16 "\n",
	p_fat_vh->bytes_per_sector);
	LOG_DEBUG("FAT sectors per cluster: %" PRIu8 "\n",
	p_fat_vh->sectors_per_cluster);
	LOG_DEBUG("FAT reserved sectors: %" PRIu16 "\n",
	p_fat_vh->reserved_sectors);
	LOG_DEBUG("FAT count: %" PRIu8 "\n",p_fat_vh->fat_count);
	LOG_DEBUG("FAT root entry count: %" PRIu16 "\n",
	p_fat_vh->root_entry_count);
	LOG_DEBUG("FAT media type: %02X\n",p_fat_vh->media_type);
	LOG_DEBUG("FAT total sector count (16bit): %" PRIu16 "\n",
	p_fat_vh->total_sectors_16);
	LOG_DEBUG("FAT sectors per FAT (16bit): %" PRIu16 "\n",
	p_fat_vh->fat16_sectors);
	LOG_DEBUG("FAT total sector count (32bit): %" PRIu32 "\n",
	p_fat_vh->total_sectors_32);
	LOG_DEBUG("FAT sectors per FAT (32bit): %" PRIu32 "\n",
	p_fat_vh->fat32_sectors);

	// Check header values
	if((p_fat_vh->jump_inst[0]!=0xEB && p_fat_vh->jump_inst[0]!=0xE9) \|\|
	p_fat_vh->bytes_per_sector==0 \|\|
	p_fat_vh->bytes_per_sector%512!=0 \|\|
	p_fat_vh->sectors_per_cluster==0 \|\|
	p_fat_vh->sectors_per_cluster%2!=0 \|\|
	p_fat_vh->reserved_sectors==0 \|\|
	p_fat_vh->fat_count==0 \|\|
	(p_fat_vh->total_sectors_16==0 && p_fat_vh->total_sectors_32==0) \|\|
	(p_fat_vh->total_sectors_16!=0 && p_fat_vh->total_sectors_32!=0))
	{
	free(p_fat_vh);
	return UNALLOCATED_FAT_INVALID_HEADER;
	}

	LOG_DEBUG("Determining FAT type\n");

	// Determine the count of sectors occupied by the root directory
	root_dir_sectors=((p_fat_vh->root_entry_count*32)+
	(p_fat_vh->bytes_per_sector-1))/p_fat_vh->bytes_per_sector;

	// Determine the count of sectors in the data region
	if(p_fat_vh->fat16_sectors!=0) fat_size=p_fat_vh->fat16_sectors;
	else fat_size=p_fat_vh->fat32_sectors;
	if(p_fat_vh->total_sectors_16!=0) total_sectors=p_fat_vh->total_sectors_16;
	else total_sectors=p_fat_vh->total_sectors_32;
	data_sectors=total_sectors-(p_fat_vh->reserved_sectors+
	(p_fat_vh->fat_count*fat_size)+root_dir_sectors);

	// Determine the count of clusters
	cluster_count=data_sectors/p_fat_vh->sectors_per_cluster;

	// Determine FAT type
	if(cluster_count<4085) {
	LOG_DEBUG("FAT is of unsupported type FAT12\n");
	free(p_fat_vh);
	return UNALLOCATED_FAT_UNSUPPORTED_FS_TYPE;
	} else if(cluster_count<65525) {
	LOG_DEBUG("FAT is of type FAT16\n");
	p_fat_handle->fat_type=FatType_Fat16;
	} else {
	LOG_DEBUG("FAT is of type FAT32\n");
	p_fat_handle->fat_type=FatType_Fat32;
	}
	// TODO: What about newer version of FAT like exFAT etc... ??

	p_fat_handle->p_fat_vh=p_fat_vh;
	return UNALLOCATED_OK;
	}

	/*
	* FreeFatHeader
	*/
	void FreeFatHeader(pts_FatHandle p_fat_handle) {
	if(p_fat_handle==NULL) return;
	if(p_fat_handle->p_fat_vh!=NULL) free(p_fat_handle->p_fat_vh);
	switch(p_fat_handle->fat_type) {
	case FatType_Fat16: {
	- if(p_fat_handle->p_fat16!=NULL) free(p_fat_handle->p_fat16);
	+ if(p_fat_handle->u_fat.p_fat16!=NULL) free(p_fat_handle->u_fat.p_fat16);
	break;
	}
	case FatType_Fat32: {
	- if(p_fat_handle->p_fat32!=NULL) free(p_fat_handle->p_fat32);
	+ if(p_fat_handle->u_fat.p_fat32!=NULL) free(p_fat_handle->u_fat.p_fat32);
	break;
	}
	case FatType_Unknown:
	default:
	break;
	}
	}

	/*
	* ReadFat
	*/
	int ReadFat(pts_FatHandle p_fat_handle,
	pts_LibXmountMorphingInputFunctions p_input_functions)
	{
	pts_FatVH p_fat_vh=p_fat_handle->p_fat_vh;
	int ret;
	size_t fat_size;
	off_t fat_offset;
	size_t bytes_read;

	LOG_DEBUG("Trying to read FAT\n");

	// Determine FAT size
	if(p_fat_vh->fat16_sectors!=0) fat_size=p_fat_vh->fat16_sectors;
	else fat_size=p_fat_vh->fat32_sectors;
	fat_size*=p_fat_vh->bytes_per_sector;

	// Calculate FAT offset
	fat_offset=p_fat_vh->reserved_sectors*p_fat_vh->bytes_per_sector;

	LOG_DEBUG("FAT consists of %zu bytes starting at offset %zu\n",
	fat_size,
	fat_offset);

	// Alloc buffer and Read FAT
	if(p_fat_handle->fat_type==FatType_Fat32) {
	// Alloc buffer
	- p_fat_handle->p_fat32=(uint32_t*)calloc(1,fat_size);
	- if(p_fat_handle->p_fat32==NULL) return UNALLOCATED_MEMALLOC_FAILED;
	+ p_fat_handle->u_fat.p_fat32=(uint32_t*)calloc(1,fat_size);
	+ if(p_fat_handle->u_fat.p_fat32==NULL) return UNALLOCATED_MEMALLOC_FAILED;

	// Read FAT
	ret=p_input_functions->Read(0,
	- (char*)(p_fat_handle->p_fat32),
	+ (char*)(p_fat_handle->u_fat.p_fat32),
	fat_offset,
	fat_size,
	&bytes_read);
	if(ret!=0 \|\| bytes_read!=fat_size) {
	- free(p_fat_handle->p_fat32);
	- p_fat_handle->p_fat32=NULL;
	+ free(p_fat_handle->u_fat.p_fat32);
	+ p_fat_handle->u_fat.p_fat32=NULL;
	return UNALLOCATED_FAT_CANNOT_READ_FAT;
	}

	// Convert FAT to host endianness
	for(uint64_t i=0;i<fat_size/sizeof(uint32_t);i++) {
	- p_fat_handle->p_fat32[i]=le32toh(p_fat_handle->p_fat32[i]);
	+ p_fat_handle->u_fat.p_fat32[i]=le32toh(p_fat_handle->u_fat.p_fat32[i]);
	}
	} else {
	// Alloc buffer
	- p_fat_handle->p_fat16=(uint16_t*)calloc(1,fat_size);
	- if(p_fat_handle->p_fat16==NULL) return UNALLOCATED_MEMALLOC_FAILED;
	+ p_fat_handle->u_fat.p_fat16=(uint16_t*)calloc(1,fat_size);
	+ if(p_fat_handle->u_fat.p_fat16==NULL) return UNALLOCATED_MEMALLOC_FAILED;

	// Read FAT
	ret=p_input_functions->Read(0,
	- (char*)(p_fat_handle->p_fat16),
	+ (char*)(p_fat_handle->u_fat.p_fat16),
	fat_offset,
	fat_size,
	&bytes_read);
	if(ret!=0 \|\| bytes_read!=fat_size) {
	- free(p_fat_handle->p_fat16);
	- p_fat_handle->p_fat16=NULL;
	+ free(p_fat_handle->u_fat.p_fat16);
	+ p_fat_handle->u_fat.p_fat16=NULL;
	return UNALLOCATED_FAT_CANNOT_READ_FAT;
	}

	// Convert FAT to host endianness
	for(uint64_t i=0;i<fat_size/sizeof(uint16_t);i++) {
	- p_fat_handle->p_fat16[i]=le16toh(p_fat_handle->p_fat16[i]);
	+ p_fat_handle->u_fat.p_fat16[i]=le16toh(p_fat_handle->u_fat.p_fat16[i]);
	}
	}

	LOG_DEBUG("FAT read successfully\n");

	return UNALLOCATED_OK;
	}

	/*
	* BuildFatBlockMap
	*/
	int BuildFatBlockMap(pts_FatHandle p_fat_handle,
	uint64_t **pp_free_block_map,
	uint64_t *p_free_block_map_size,
	uint64_t *p_block_size)
	{
	pts_FatVH p_fat_vh=p_fat_handle->p_fat_vh;
	uint64_t data_offset;
	uint64_t total_clusters;
	uint64_t *p_free_block_map=NULL;
	uint64_t free_block_map_size=0;

	LOG_DEBUG("Searching unallocated FAT clusters\n");

	// Calculate offset of first data cluster
	data_offset=p_fat_vh->reserved_sectors+
	(((p_fat_vh->root_entry_count*32)+(p_fat_vh->bytes_per_sector-1))/
	p_fat_vh->bytes_per_sector);
	if(p_fat_vh->fat16_sectors!=0) {
	data_offset+=(p_fat_vh->fat_count*p_fat_vh->fat16_sectors);
	} else {
	data_offset+=(p_fat_vh->fat_count*p_fat_vh->fat32_sectors);
	}
	data_offset*=p_fat_vh->bytes_per_sector;

	// Calculate total amount of data clusters
	if(p_fat_vh->total_sectors_16!=0) total_clusters=p_fat_vh->total_sectors_16;
	else total_clusters=p_fat_vh->total_sectors_32;
	total_clusters-=(data_offset/p_fat_vh->bytes_per_sector);
	total_clusters/=p_fat_vh->sectors_per_cluster;
	// Add 2 clusters as clusters 0 and 1 do not exist
	total_clusters+=2;

	LOG_DEBUG("Filesystem contains a total of %" PRIu64 " (2-%" PRIu64 ") "
	" data clusters starting at offset %" PRIu64 "\n",
	total_clusters-2,
	total_clusters-1,
	data_offset);

	// Save offset of every unallocated cluster in block map
	// Clusters 0 and 1 can not hold data in a FAT fs
	if(p_fat_handle->fat_type==FatType_Fat32) {
	for(uint64_t cur_cluster=2;cur_cluster<total_clusters;cur_cluster++) {
	- if((p_fat_handle->p_fat32[cur_cluster] & 0x0FFFFFFF)==0 \|\|
	- (p_fat_handle->p_fat32[cur_cluster] & 0x0FFFFFFF)==0x0FFFFFF7)
	+ if((p_fat_handle->u_fat.p_fat32[cur_cluster] & 0x0FFFFFFF)==0 \|\|
	+ (p_fat_handle->u_fat.p_fat32[cur_cluster] & 0x0FFFFFFF)==0x0FFFFFF7)
	{
	p_free_block_map=realloc(p_free_block_map,
	(free_block_map_size+1)*sizeof(uint64_t));
	if(p_free_block_map==NULL) return UNALLOCATED_MEMALLOC_FAILED;
	p_free_block_map[free_block_map_size]=data_offset+((cur_cluster-2)*
	p_fat_vh->bytes_per_sector*p_fat_vh->sectors_per_cluster);

	LOG_DEBUG("Cluster %" PRIu64 " is unallocated "
	"(FAT value 0x%04X, Image offset %" PRIu64 ")\n",
	cur_cluster,
	- p_fat_handle->p_fat32[cur_cluster],
	+ p_fat_handle->u_fat.p_fat32[cur_cluster],
	p_free_block_map[free_block_map_size]);

	free_block_map_size++;
	} else {
	LOG_DEBUG("Cluster %" PRIu64 " is allocated (FAT value 0x%08X)\n",
	cur_cluster,
	- p_fat_handle->p_fat32[cur_cluster]);
	+ p_fat_handle->u_fat.p_fat32[cur_cluster]);
	}
	}
	} else {
	for(uint64_t cur_cluster=2;cur_cluster<total_clusters;cur_cluster++) {
	- if((p_fat_handle->p_fat16[cur_cluster] & 0x0FFF)==0 \|\|
	- (p_fat_handle->p_fat16[cur_cluster] & 0x0FFF)==0x0FF7)
	+ if((p_fat_handle->u_fat.p_fat16[cur_cluster] & 0x0FFF)==0 \|\|
	+ (p_fat_handle->u_fat.p_fat16[cur_cluster] & 0x0FFF)==0x0FF7)
	{
	p_free_block_map=realloc(p_free_block_map,
	(free_block_map_size+1)*sizeof(uint64_t));
	if(p_free_block_map==NULL) return UNALLOCATED_MEMALLOC_FAILED;
	p_free_block_map[free_block_map_size]=data_offset+((cur_cluster-2)*
	p_fat_vh->sectors_per_cluster*p_fat_vh->bytes_per_sector);

	LOG_DEBUG("Cluster %" PRIu64 " is unallocated "
	"(FAT value 0x%04X, Image offset %" PRIu64 ")\n",
	cur_cluster,
	- p_fat_handle->p_fat16[cur_cluster],
	+ p_fat_handle->u_fat.p_fat16[cur_cluster],
	p_free_block_map[free_block_map_size]);

	free_block_map_size++;
	} else {
	LOG_DEBUG("Cluster %" PRIu64 " is allocated (FAT value 0x%04X)\n",
	cur_cluster,
	- p_fat_handle->p_fat16[cur_cluster]);
	+ p_fat_handle->u_fat.p_fat16[cur_cluster]);
	}
	}
	}

	LOG_DEBUG("Found %" PRIu64 " unallocated FAT clusters\n",
	free_block_map_size);

	// Free FAT as it is no longer needed
	if(p_fat_handle->fat_type==FatType_Fat32) {
	- free(p_fat_handle->p_fat32);
	- p_fat_handle->p_fat32=NULL;
	+ free(p_fat_handle->u_fat.p_fat32);
	+ p_fat_handle->u_fat.p_fat32=NULL;
	} else {
	- free(p_fat_handle->p_fat16);
	- p_fat_handle->p_fat16=NULL;
	+ free(p_fat_handle->u_fat.p_fat16);
	+ p_fat_handle->u_fat.p_fat16=NULL;
	}

	// TODO: There may be trailing unclustered sectors. Add them?

	*pp_free_block_map=p_free_block_map;
	*p_free_block_map_size=free_block_map_size;
	p_block_size=p_fat_vh->bytes_per_sectorp_fat_vh->sectors_per_cluster;
	return UNALLOCATED_OK;
	}

	/*
	* GetFatInfos
	*/
	int GetFatInfos(pts_FatHandle p_fat_handle, char **pp_buf) {
	pts_FatVH p_fat_vh=p_fat_handle->p_fat_vh;
	int ret;
	char *p_buf=NULL;
	char *p_fat_type;

	switch(p_fat_handle->fat_type) {
	case FatType_Fat16:
	p_fat_type="FAT16";
	break;
	case FatType_Fat32:
	p_fat_type="FAT32";
	break;
	case FatType_Unknown:
	default:
	p_fat_type="Unknown";
	}

	ret=asprintf(&p_buf,
	"FAT filesystem type: %s\n"
	"FAT bytes per sector: %" PRIu16 "\n"
	"FAT sectors per cluster: %" PRIu8 "\n"
	"FAT reserved sectors: %" PRIu16 "\n"
	"FAT count: %" PRIu8 "\n"
	"FAT root entry count: %" PRIu16 "\n"
	"FAT media type: 0x%02X\n"
	"FAT total sector count (16bit): %" PRIu16 "\n"
	"FAT sectors per FAT (16bit): %" PRIu16 "\n"
	"FAT total sector count (32bit): %" PRIu32 "\n"
	"FAT sectors per FAT (32bit): %" PRIu32,
	p_fat_type,
	p_fat_vh->bytes_per_sector,
	p_fat_vh->sectors_per_cluster,
	p_fat_vh->reserved_sectors,
	p_fat_vh->fat_count,
	p_fat_vh->root_entry_count,
	p_fat_vh->media_type,
	p_fat_vh->total_sectors_16,
	p_fat_vh->fat16_sectors,
	p_fat_vh->total_sectors_32,
	p_fat_vh->fat32_sectors);

	// Check if asprintf worked
	if(ret<0 \|\| p_buf==NULL) return UNALLOCATED_MEMALLOC_FAILED;

	*pp_buf=p_buf;
	return UNALLOCATED_OK;
	}

	diff --git a/trunk/libxmount_morphing/libxmount_morphing_unallocated/fat_functions.h b/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_unallocated/fat_functions.h
	similarity index 99%
	copy from trunk/libxmount_morphing/libxmount_morphing_unallocated/fat_functions.h
	copy to tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_unallocated/fat_functions.h
	index b1e9fda..c908268 100644
	--- a/trunk/libxmount_morphing/libxmount_morphing_unallocated/fat_functions.h
	+++ b/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_unallocated/fat_functions.h
	@@ -1,72 +1,72 @@
	/*******************************************************************************
	* xmount Copyright (c) 2008-2014 by Gillen Daniel <gillen.dan@pinguin.lu> *
	* *
	* This program is free software: you can redistribute it and/or modify it *
	* under the terms of the GNU General Public License as published by the Free *
	* Software Foundation, either version 3 of the License, or (at your option) *
	* any later version. *
	* *
	* This program is distributed in the hope that it will be useful, but WITHOUT *
	* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
	* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for *
	* more details. *
	* *
	* You should have received a copy of the GNU General Public License along with *
	* this program. If not, see <http://www.gnu.org/licenses/>. *
	*******************************************************************************/

	#ifndef FAT_FUNCTIONS_H
	#define FAT_FUNCTIONS_H

	#include "../libxmount_morphing.h"

	// Supported FAT types
	typedef enum e_FatType {
	FatType_Unknown=0,
	FatType_Fat16,
	FatType_Fat32
	} te_FatType;

	// Needed parts of the FAT volume header
	typedef struct s_FatVH {
	uint8_t jump_inst[3];
	uint8_t oem_name[8];
	uint16_t bytes_per_sector;
	uint8_t sectors_per_cluster;
	uint16_t reserved_sectors;
	uint8_t fat_count;
	uint16_t root_entry_count;
	uint16_t total_sectors_16;
	uint8_t media_type;
	uint16_t fat16_sectors;
	uint64_t unused01;
	uint32_t total_sectors_32;
	// Following value is only valid for FAT32
	uint32_t fat32_sectors;
	} __attribute__ ((packed)) ts_FatVH, *pts_FatVH;

	// FAT handle
	typedef struct s_FatHandle {
	te_FatType fat_type;
	pts_FatVH p_fat_vh;
	union {
	uint16_t *p_fat16;
	uint32_t *p_fat32;
	- };
	+ } u_fat;
	uint8_t debug;
	} ts_FatHandle, *pts_FatHandle;

	int ReadFatHeader(pts_FatHandle p_fat_handle,
	pts_LibXmountMorphingInputFunctions p_input_functions,
	uint8_t debug);
	void FreeFatHeader(pts_FatHandle p_fat_handle);
	int ReadFat(pts_FatHandle p_fat_handle,
	pts_LibXmountMorphingInputFunctions p_input_functions);
	int BuildFatBlockMap(pts_FatHandle p_fat_handle,
	uint64_t **pp_free_block_map,
	uint64_t *p_free_block_map_size,
	uint64_t *p_block_size);
	int GetFatInfos(pts_FatHandle p_fat_handle, char **pp_buf);

	#endif // FAT_FUNCTIONS_H

	diff --git a/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_unallocated/hfs_functions.c b/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_unallocated/hfs_functions.c
	new file mode 100644
	index 0000000..167764b
	--- /dev/null
	+++ b/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_unallocated/hfs_functions.c
	@@ -0,0 +1,260 @@
	+/*******************************************************************************
	+* xmount Copyright (c) 2008-2014 by Gillen Daniel <gillen.dan@pinguin.lu> *
	+* *
	+* This program is free software: you can redistribute it and/or modify it *
	+* under the terms of the GNU General Public License as published by the Free *
	+* Software Foundation, either version 3 of the License, or (at your option) *
	+* any later version. *
	+* *
	+* This program is distributed in the hope that it will be useful, but WITHOUT *
	+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
	+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for *
	+* more details. *
	+* *
	+* You should have received a copy of the GNU General Public License along with *
	+* this program. If not, see <http://www.gnu.org/licenses/>. *
	+*******************************************************************************/
	+
	+#include "hfs_functions.h"
	+#include "libxmount_morphing_unallocated_retvalues.h"
	+
	+#define LOG_DEBUG(...) { \
	+ LIBXMOUNT_LOG_DEBUG(p_hfs_handle->debug,__VA_ARGS__); \
	+}
	+
	+/*
	+ * ReadHfsHeader
	+ */
	+int ReadHfsHeader(pts_HfsHandle p_hfs_handle,
	+ pts_LibXmountMorphingInputFunctions p_input_functions,
	+ uint8_t debug)
	+{
	+ pts_HfsVH p_hfs_vh;
	+ int ret;
	+ size_t bytes_read;
	+ pts_HfsExtend p_extend;
	+
	+ // Init HFS handle
	+ p_hfs_handle->p_hfs_vh=NULL;
	+ p_hfs_handle->p_alloc_file=NULL;
	+ p_hfs_handle->debug=debug;
	+
	+ LOG_DEBUG("Trying to read HFS volume header\n");
	+
	+ // Alloc buffer for header
	+ p_hfs_vh=calloc(1,sizeof(ts_HfsVH));
	+ if(p_hfs_vh==NULL) return UNALLOCATED_MEMALLOC_FAILED;
	+
	+ // Read VH from input image
	+ ret=p_input_functions->Read(0,
	+ (char*)(p_hfs_vh),
	+ HFS_VH_OFFSET,
	+ sizeof(ts_HfsVH),
	+ &bytes_read);
	+ if(ret!=0 \|\| bytes_read!=sizeof(ts_HfsVH)) {
	+ free(p_hfs_vh);
	+ p_hfs_vh=NULL;
	+ return UNALLOCATED_HFS_CANNOT_READ_HEADER;
	+ }
	+
	+ // Convert VH to host endianness (HFS values are always stored in big endian)
	+ p_hfs_vh->signature=be16toh(p_hfs_vh->signature);
	+ p_hfs_vh->version=be16toh(p_hfs_vh->version);
	+ p_hfs_vh->block_size=be32toh(p_hfs_vh->block_size);
	+ p_hfs_vh->total_blocks=be32toh(p_hfs_vh->total_blocks);
	+ p_hfs_vh->free_blocks=be32toh(p_hfs_vh->free_blocks);
	+ p_hfs_vh->alloc_file_size=be64toh(p_hfs_vh->alloc_file_size);
	+ p_hfs_vh->alloc_file_clump_size=be32toh(p_hfs_vh->alloc_file_clump_size);
	+ p_hfs_vh->alloc_file_total_blocks=be32toh(p_hfs_vh->alloc_file_total_blocks);
	+ for(int i=0;i<8;i++) {
	+ p_extend=&(p_hfs_vh->alloc_file_extends[i]);
	+ p_extend->start_block=be32toh(p_extend->start_block);
	+ p_extend->block_count=be32toh(p_extend->block_count);
	+ }
	+
	+ LOG_DEBUG("HFS VH signature: 0x%04X\n",p_hfs_vh->signature);
	+ LOG_DEBUG("HFS VH version: %" PRIu16 "\n",p_hfs_vh->version);
	+ LOG_DEBUG("HFS block size: %" PRIu32 " bytes\n",p_hfs_vh->block_size);
	+ LOG_DEBUG("HFS total blocks: %" PRIu32 "\n",p_hfs_vh->total_blocks);
	+ LOG_DEBUG("HFS free blocks: %" PRIu32 "\n",p_hfs_vh->free_blocks);
	+ LOG_DEBUG("HFS allocation file size: %" PRIu64 " bytes\n",
	+ p_hfs_vh->alloc_file_size);
	+ LOG_DEBUG("HFS allocation file blocks: %" PRIu32 "\n",
	+ p_hfs_vh->alloc_file_total_blocks);
	+
	+ // Check header signature and version
	+ if(p_hfs_vh->signature!=HFS_VH_SIGNATURE \|\|
	+ p_hfs_vh->version!=HFS_VH_VERSION)
	+ {
	+ free(p_hfs_vh);
	+ p_hfs_vh=NULL;
	+ return UNALLOCATED_HFS_INVALID_HEADER;
	+ }
	+
	+ // We currently only support HFS+
	+ p_hfs_handle->hfs_type=HfsType_HfsPlus;
	+
	+ LOG_DEBUG("HFS volume header read successfully\n");
	+
	+ p_hfs_handle->p_hfs_vh=p_hfs_vh;
	+ return UNALLOCATED_OK;
	+}
	+
	+/*
	+ * FreeHfsHeader
	+ */
	+void FreeHfsHeader(pts_HfsHandle p_hfs_handle) {
	+ if(p_hfs_handle==NULL) return;
	+ if(p_hfs_handle->p_hfs_vh!=NULL) free(p_hfs_handle->p_hfs_vh);
	+ if(p_hfs_handle->p_alloc_file!=NULL) free(p_hfs_handle->p_alloc_file);
	+}
	+
	+/*
	+ * ReadHfsAllocFile
	+ */
	+int ReadHfsAllocFile(pts_HfsHandle p_hfs_handle,
	+ pts_LibXmountMorphingInputFunctions p_input_functions)
	+{
	+ uint8_t *p_alloc_file;
	+ pts_HfsExtend p_extend;
	+ int ret;
	+ char *p_buf;
	+ size_t bytes_read;
	+ uint64_t total_bytes_read=0;
	+
	+ LOG_DEBUG("Trying to read HFS allocation file\n");
	+
	+ // Alloc buffer for file
	+ p_alloc_file=calloc(1,p_hfs_handle->p_hfs_vh->alloc_file_size);
	+ if(p_alloc_file==NULL) return UNALLOCATED_MEMALLOC_FAILED;
	+
	+ // Loop over extends and read data
	+ p_buf=(char*)(p_alloc_file);
	+ for(int i=0;i<8;i++) {
	+ p_extend=&(p_hfs_handle->p_hfs_vh->alloc_file_extends[i]);
	+
	+ // If start_block and block_count are zero, we parsed last extend
	+ if(p_extend->start_block==0 && p_extend->block_count==0) break;
	+
	+ LOG_DEBUG("Extend %d contains %" PRIu32
	+ " block(s) starting with block %" PRIu32 "\n",
	+ i,
	+ p_extend->block_count,
	+ p_extend->start_block);
	+
	+ // Read data
	+ for(uint32_t ii=0;ii<p_extend->block_count;ii++) {
	+ LOG_DEBUG("Reading %" PRIu32 " bytes from block %" PRIu32
	+ " at offset %" PRIu64 "\n",
	+ p_hfs_handle->p_hfs_vh->block_size,
	+ p_extend->start_block+ii,
	+ (uint64_t)((p_extend->start_block+ii)*
	+ p_hfs_handle->p_hfs_vh->block_size));
	+
	+ ret=p_input_functions->Read(0,
	+ p_buf,
	+ (p_extend->start_block+ii)*
	+ p_hfs_handle->p_hfs_vh->block_size,
	+ p_hfs_handle->p_hfs_vh->block_size,
	+ &bytes_read);
	+ if(ret!=0 \|\| bytes_read!=p_hfs_handle->p_hfs_vh->block_size) {
	+ free(p_alloc_file);
	+ return UNALLOCATED_HFS_CANNOT_READ_ALLOC_FILE;
	+ }
	+ p_buf+=p_hfs_handle->p_hfs_vh->block_size;
	+ total_bytes_read+=p_hfs_handle->p_hfs_vh->block_size;
	+ }
	+ }
	+
	+ // Alloc files with more than 8 extends aren't supported yet
	+ if(total_bytes_read!=p_hfs_handle->p_hfs_vh->alloc_file_size) {
	+ free(p_alloc_file);
	+ return UNALLOCATED_HFS_ALLOC_FILE_HAS_TOO_MUCH_EXTENDS;
	+ }
	+
	+ LOG_DEBUG("HFS allocation file read successfully\n");
	+
	+ p_hfs_handle->p_alloc_file=p_alloc_file;
	+ return UNALLOCATED_OK;
	+}
	+
	+/*
	+ * BuildHfsBlockMap
	+ */
	+int BuildHfsBlockMap(pts_HfsHandle p_hfs_handle,
	+ uint64_t **pp_free_block_map,
	+ uint64_t *p_free_block_map_size,
	+ uint64_t *p_block_size)
	+{
	+ uint64_t *p_free_block_map=NULL;
	+ uint64_t free_block_map_size=0;
	+
	+ LOG_DEBUG("Searching unallocated HFS blocks\n");
	+
	+ // Save offset of every unallocated block in block map
	+ for(uint32_t cur_block=0;
	+ cur_block<p_hfs_handle->p_hfs_vh->total_blocks;
	+ cur_block++)
	+ {
	+ if((p_hfs_handle->p_alloc_file[cur_block/8] & (1<<(7-(cur_block%8))))==0) {
	+ p_free_block_map=realloc(p_free_block_map,
	+ (free_block_map_size+1)*sizeof(uint64_t));
	+ if(p_free_block_map==NULL) return UNALLOCATED_MEMALLOC_FAILED;
	+ p_free_block_map[free_block_map_size]=
	+ cur_block*p_hfs_handle->p_hfs_vh->block_size;
	+ free_block_map_size++;
	+ }
	+ }
	+
	+ LOG_DEBUG("Found %" PRIu64 " unallocated HFS blocks\n",
	+ free_block_map_size);
	+
	+ if(p_hfs_handle->p_hfs_vh->free_blocks!=free_block_map_size) {
	+ LIBXMOUNT_LOG_WARNING("According to VH, there should be %" PRIu64
	+ " unallocated blocks but I found %" PRIu64 "\n",
	+ p_hfs_handle->p_hfs_vh->free_blocks,
	+ free_block_map_size);
	+ }
	+
	+ // Free alloc file as it is no longer needed
	+ free(p_hfs_handle->p_alloc_file);
	+ p_hfs_handle->p_alloc_file=NULL;
	+
	+ *pp_free_block_map=p_free_block_map;
	+ *p_free_block_map_size=free_block_map_size;
	+ *p_block_size=p_hfs_handle->p_hfs_vh->block_size;
	+ return UNALLOCATED_OK;
	+}
	+
	+/*
	+ * GetHfsInfos
	+ */
	+int GetHfsInfos(pts_HfsHandle p_hfs_handle, char **pp_buf) {
	+ pts_HfsVH p_hfs_vh=p_hfs_handle->p_hfs_vh;
	+ char *p_buf=NULL;
	+ int ret;
	+
	+ ret=asprintf(&p_buf,
	+ "HFS filesystem type: HFS+\n"
	+ "HFS VH signature: 0x%04X\n"
	+ "HFS VH version: %" PRIu16 "\n"
	+ "HFS block size: %" PRIu32 " bytes\n"
	+ "HFS total blocks: %" PRIu32 "\n"
	+ "HFS free blocks: %" PRIu32 "\n"
	+ "HFS allocation file size: %" PRIu64 " bytes\n"
	+ "HFS allocation file blocks: %" PRIu32,
	+ p_hfs_vh->signature,
	+ p_hfs_vh->version,
	+ p_hfs_vh->block_size,
	+ p_hfs_vh->total_blocks,
	+ p_hfs_vh->free_blocks,
	+ p_hfs_vh->alloc_file_size,
	+ p_hfs_vh->alloc_file_total_blocks);
	+
	+ // Check if asprintf worked
	+ if(ret<0 \|\| p_buf==NULL) return UNALLOCATED_MEMALLOC_FAILED;
	+
	+ *pp_buf=p_buf;
	+ return UNALLOCATED_OK;
	+}
	+
	diff --git a/trunk/libxmount_morphing/libxmount_morphing_unallocated/fat_functions.h b/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_unallocated/hfs_functions.h
	similarity index 55%
	copy from trunk/libxmount_morphing/libxmount_morphing_unallocated/fat_functions.h
	copy to tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_unallocated/hfs_functions.h
	index b1e9fda..6e25652 100644
	--- a/trunk/libxmount_morphing/libxmount_morphing_unallocated/fat_functions.h
	+++ b/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_unallocated/hfs_functions.h
	@@ -1,72 +1,73 @@
	/*******************************************************************************
	* xmount Copyright (c) 2008-2014 by Gillen Daniel <gillen.dan@pinguin.lu> *
	* *
	* This program is free software: you can redistribute it and/or modify it *
	* under the terms of the GNU General Public License as published by the Free *
	* Software Foundation, either version 3 of the License, or (at your option) *
	* any later version. *
	* *
	* This program is distributed in the hope that it will be useful, but WITHOUT *
	* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
	* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for *
	* more details. *
	* *
	* You should have received a copy of the GNU General Public License along with *
	* this program. If not, see <http://www.gnu.org/licenses/>. *
	*******************************************************************************/

	-#ifndef FAT_FUNCTIONS_H
	-#define FAT_FUNCTIONS_H
	+#ifndef HFS_FUNCTIONS_H
	+#define HFS_FUNCTIONS_H

	#include "../libxmount_morphing.h"

	-// Supported FAT types
	-typedef enum e_FatType {
	- FatType_Unknown=0,
	- FatType_Fat16,
	- FatType_Fat32
	-} te_FatType;
	+// Supported HFS types
	+typedef enum e_HfsType {
	+ HfsType_HfsPlus=0
	+} te_HfsType;

	-// Needed parts of the FAT volume header
	-typedef struct s_FatVH {
	- uint8_t jump_inst[3];
	- uint8_t oem_name[8];
	- uint16_t bytes_per_sector;
	- uint8_t sectors_per_cluster;
	- uint16_t reserved_sectors;
	- uint8_t fat_count;
	- uint16_t root_entry_count;
	- uint16_t total_sectors_16;
	- uint8_t media_type;
	- uint16_t fat16_sectors;
	- uint64_t unused01;
	- uint32_t total_sectors_32;
	- // Following value is only valid for FAT32
	- uint32_t fat32_sectors;
	-} __attribute__ ((packed)) ts_FatVH, *pts_FatVH;
	+// HFS extend
	+typedef struct s_HfsExtend {
	+ uint32_t start_block;
	+ uint32_t block_count;
	+} __attribute__ ((packed)) ts_HfsExtend, *pts_HfsExtend;

	-// FAT handle
	-typedef struct s_FatHandle {
	- te_FatType fat_type;
	- pts_FatVH p_fat_vh;
	- union {
	- uint16_t *p_fat16;
	- uint32_t *p_fat32;
	- };
	+// Needed parts of the HFS volume header
	+#define HFS_VH_OFFSET 1024
	+#define HFS_VH_SIGNATURE 0x482b //"H+"
	+#define HFS_VH_VERSION 4
	+typedef struct s_HfsVH {
	+ uint16_t signature; // "H+"
	+ uint16_t version; // Currently 4 for HFS+
	+ uint32_t unused01[9];
	+ uint32_t block_size;
	+ uint32_t total_blocks;
	+ uint32_t free_blocks;
	+ uint32_t unused02[15];
	+ uint64_t alloc_file_size;
	+ uint32_t alloc_file_clump_size;
	+ uint32_t alloc_file_total_blocks;
	+ ts_HfsExtend alloc_file_extends[8];
	+} __attribute__ ((packed)) ts_HfsVH, *pts_HfsVH;
	+
	+// HFS handle
	+typedef struct s_HfsHandle {
	+ te_HfsType hfs_type;
	+ pts_HfsVH p_hfs_vh;
	+ uint8_t *p_alloc_file;
	uint8_t debug;
	-} ts_FatHandle, *pts_FatHandle;
	+} ts_HfsHandle, *pts_HfsHandle;

	-int ReadFatHeader(pts_FatHandle p_fat_handle,
	+int ReadHfsHeader(pts_HfsHandle p_hfs_handle,
	pts_LibXmountMorphingInputFunctions p_input_functions,
	uint8_t debug);
	-void FreeFatHeader(pts_FatHandle p_fat_handle);
	-int ReadFat(pts_FatHandle p_fat_handle,
	- pts_LibXmountMorphingInputFunctions p_input_functions);
	-int BuildFatBlockMap(pts_FatHandle p_fat_handle,
	+void FreeHfsHeader(pts_HfsHandle p_hfs_handle);
	+int ReadHfsAllocFile(pts_HfsHandle p_hfs_handle,
	+ pts_LibXmountMorphingInputFunctions p_input_functions);
	+int BuildHfsBlockMap(pts_HfsHandle p_hfs_handle,
	uint64_t **pp_free_block_map,
	uint64_t *p_free_block_map_size,
	uint64_t *p_block_size);
	-int GetFatInfos(pts_FatHandle p_fat_handle, char **pp_buf);
	+int GetHfsInfos(pts_HfsHandle p_hfs_handle, char **pp_buf);

	-#endif // FAT_FUNCTIONS_H
	+#endif // HFS_FUNCTIONS_H

	diff --git a/trunk/libxmount_morphing/libxmount_morphing_unallocated/libxmount_morphing_unallocated.c b/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_unallocated/libxmount_morphing_unallocated.c
	similarity index 95%
	copy from trunk/libxmount_morphing/libxmount_morphing_unallocated/libxmount_morphing_unallocated.c
	copy to tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_unallocated/libxmount_morphing_unallocated.c
	index 2529d4c..35fb6ae 100644
	--- a/trunk/libxmount_morphing/libxmount_morphing_unallocated/libxmount_morphing_unallocated.c
	+++ b/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_unallocated/libxmount_morphing_unallocated.c
	@@ -1,511 +1,511 @@
	/*******************************************************************************
	* xmount Copyright (c) 2008-2014 by Gillen Daniel <gillen.dan@pinguin.lu> *
	* *
	* This program is free software: you can redistribute it and/or modify it *
	* under the terms of the GNU General Public License as published by the Free *
	* Software Foundation, either version 3 of the License, or (at your option) *
	* any later version. *
	* *
	* This program is distributed in the hope that it will be useful, but WITHOUT *
	* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
	* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for *
	* more details. *
	* *
	* You should have received a copy of the GNU General Public License along with *
	* this program. If not, see <http://www.gnu.org/licenses/>. *
	*******************************************************************************/

	#include <stdlib.h>
	#include <stdio.h>
	#include <string.h>

	#include "libxmount_morphing_unallocated.h"
	#include "libxmount_morphing_unallocated_retvalues.h"

	#define LOG_DEBUG(...) { \
	LIBXMOUNT_LOG_DEBUG(p_unallocated_handle->debug,__VA_ARGS__); \
	}

	/*******************************************************************************
	* LibXmount_Morphing API implementation
	******************************************************************************/
	/*
	* LibXmount_Morphing_GetApiVersion
	*/
	uint8_t LibXmount_Morphing_GetApiVersion() {
	return LIBXMOUNT_MORPHING_API_VERSION;
	}

	/*
	* LibXmount_Morphing_GetSupportedFormats
	*/
	const char* LibXmount_Morphing_GetSupportedTypes() {
	return "unallocated\0\0";
	}

	/*
	* LibXmount_Morphing_GetFunctions
	*/
	void LibXmount_Morphing_GetFunctions(ts_LibXmountMorphingFunctions *p_functions)
	{
	p_functions->CreateHandle=&UnallocatedCreateHandle;
	p_functions->DestroyHandle=&UnallocatedDestroyHandle;
	p_functions->Morph=&UnallocatedMorph;
	p_functions->Size=&UnallocatedSize;
	p_functions->Read=&UnallocatedRead;
	p_functions->OptionsHelp=&UnallocatedOptionsHelp;
	p_functions->OptionsParse=&UnallocatedOptionsParse;
	p_functions->GetInfofileContent=&UnallocatedGetInfofileContent;
	p_functions->GetErrorMessage=&UnallocatedGetErrorMessage;
	p_functions->FreeBuffer=&UnallocatedFreeBuffer;
	}

	/*******************************************************************************
	* Private
	******************************************************************************/
	/*
	* UnallocatedCreateHandle
	*/
	static int UnallocatedCreateHandle(void **pp_handle,
	const char *p_format,
	uint8_t debug)
	{
	pts_UnallocatedHandle p_unallocated_handle;

	// Alloc new handle. Using calloc in order to set everything to 0x00
	p_unallocated_handle=calloc(1,sizeof(ts_UnallocatedHandle));
	if(p_unallocated_handle==NULL) return UNALLOCATED_MEMALLOC_FAILED;

	// Init handle values
	p_unallocated_handle->debug=debug;
	p_unallocated_handle->fs_type=UnallocatedFsType_Unknown;

	LOG_DEBUG("Created new LibXmount_Morphing_Unallocated handle\n");

	// Return new handle
	*pp_handle=p_unallocated_handle;
	return UNALLOCATED_OK;
	}

	/*
	* UnallocatedDestroyHandle
	*/
	static int UnallocatedDestroyHandle(void **pp_handle) {
	pts_UnallocatedHandle p_unallocated_handle=(pts_UnallocatedHandle)*pp_handle;

	LOG_DEBUG("Destroying LibXmount_Morphing_Unallocated handle\n");

	// TODO: Return if p_unallocated_handle==NULL

	// Free fs handle
	switch(p_unallocated_handle->fs_type) {
	case UnallocatedFsType_Hfs: {
	- FreeHfsHeader(&(p_unallocated_handle->hfs_handle));
	+ FreeHfsHeader(&(p_unallocated_handle->u_fs.hfs_handle));
	break;
	}
	case UnallocatedFsType_Fat: {
	- FreeFatHeader(&(p_unallocated_handle->fat_handle));
	+ FreeFatHeader(&(p_unallocated_handle->u_fs.fat_handle));
	break;
	}
	case UnallocatedFsType_Unknown:
	default:
	break;
	}

	// Free handle values and handle
	if(p_unallocated_handle->p_free_block_map!=NULL)
	free(p_unallocated_handle->p_free_block_map);
	free(p_unallocated_handle);

	*pp_handle=NULL;
	return UNALLOCATED_OK;
	}

	/*
	* UnallocatedMorph
	*/
	static int UnallocatedMorph(
	void *p_handle,
	pts_LibXmountMorphingInputFunctions p_input_functions)
	{
	pts_UnallocatedHandle p_unallocated_handle=(pts_UnallocatedHandle)p_handle;
	uint64_t input_images_count;
	int ret;

	LOG_DEBUG("Initializing LibXmount_Morphing_Unallocated\n");

	// Set input functions and get image count
	p_unallocated_handle->p_input_functions=p_input_functions;
	if(p_unallocated_handle->
	p_input_functions->
	ImageCount(&input_images_count)!=0)
	{
	return UNALLOCATED_CANNOT_GET_IMAGECOUNT;
	}

	// Make sure there is exactly one input image
	if(input_images_count==0 \|\| input_images_count>1) {
	return UNALLOCATED_WRONG_INPUT_IMAGE_COUNT;
	}

	// Read filesystem header
	switch(p_unallocated_handle->fs_type) {
	case UnallocatedFsType_Hfs: {
	// Read HFS VH
	- ret=ReadHfsHeader(&(p_unallocated_handle->hfs_handle),
	+ ret=ReadHfsHeader(&(p_unallocated_handle->u_fs.hfs_handle),
	p_unallocated_handle->p_input_functions,
	p_unallocated_handle->debug);
	if(ret!=UNALLOCATED_OK) return ret;
	break;
	}
	case UnallocatedFsType_Fat: {
	// Read FAT VH
	- ret=ReadFatHeader(&(p_unallocated_handle->fat_handle),
	+ ret=ReadFatHeader(&(p_unallocated_handle->u_fs.fat_handle),
	p_unallocated_handle->p_input_functions,
	p_unallocated_handle->debug);
	if(ret!=UNALLOCATED_OK) return ret;
	break;
	}
	case UnallocatedFsType_Unknown: {
	// Filesystem wasn't specified. Try to autodetect it by reading all
	// available fs headers
	LOG_DEBUG("Autodetecting filesystem\n");
	LOG_DEBUG("Trying HFS\n");
	- ret=ReadHfsHeader(&(p_unallocated_handle->hfs_handle),
	+ ret=ReadHfsHeader(&(p_unallocated_handle->u_fs.hfs_handle),
	p_unallocated_handle->p_input_functions,
	p_unallocated_handle->debug);
	if(ret==UNALLOCATED_OK) {
	LOG_DEBUG("Detected HFS fs\n");
	p_unallocated_handle->fs_type=UnallocatedFsType_Hfs;
	break;
	}
	LOG_DEBUG("Trying FAT\n");
	- ret=ReadFatHeader(&(p_unallocated_handle->fat_handle),
	+ ret=ReadFatHeader(&(p_unallocated_handle->u_fs.fat_handle),
	p_unallocated_handle->p_input_functions,
	p_unallocated_handle->debug);
	if(ret==UNALLOCATED_OK) {
	LOG_DEBUG("Detected FAT fs\n");
	p_unallocated_handle->fs_type=UnallocatedFsType_Fat;
	break;
	}

	LOG_DEBUG("Unable to autodetect fs\n");
	return UNALLOCATED_NO_SUPPORTED_FS_DETECTED;
	}
	default: {
	return UNALLOCATED_INTERNAL_ERROR;
	}
	}

	// Extract unallocated blocks from input image
	switch(p_unallocated_handle->fs_type) {
	case UnallocatedFsType_Hfs: {
	// Read HFS alloc file
	- ret=ReadHfsAllocFile(&(p_unallocated_handle->hfs_handle),
	+ ret=ReadHfsAllocFile(&(p_unallocated_handle->u_fs.hfs_handle),
	p_unallocated_handle->p_input_functions);
	if(ret!=UNALLOCATED_OK) return ret;
	// Build free block map
	- ret=BuildHfsBlockMap(&(p_unallocated_handle->hfs_handle),
	+ ret=BuildHfsBlockMap(&(p_unallocated_handle->u_fs.hfs_handle),
	&(p_unallocated_handle->p_free_block_map),
	&(p_unallocated_handle->free_block_map_size),
	&(p_unallocated_handle->block_size));
	if(ret!=UNALLOCATED_OK) return ret;
	break;
	}
	case UnallocatedFsType_Fat: {
	// Read FAT
	- ret=ReadFat(&(p_unallocated_handle->fat_handle),
	+ ret=ReadFat(&(p_unallocated_handle->u_fs.fat_handle),
	p_unallocated_handle->p_input_functions);
	if(ret!=UNALLOCATED_OK) return ret;
	// Build free block map
	- ret=BuildFatBlockMap(&(p_unallocated_handle->fat_handle),
	+ ret=BuildFatBlockMap(&(p_unallocated_handle->u_fs.fat_handle),
	&(p_unallocated_handle->p_free_block_map),
	&(p_unallocated_handle->free_block_map_size),
	&(p_unallocated_handle->block_size));
	if(ret!=UNALLOCATED_OK) return ret;
	break;
	}
	case UnallocatedFsType_Unknown:
	default:
	return UNALLOCATED_INTERNAL_ERROR;
	}

	// Calculate morphed image size
	p_unallocated_handle->morphed_image_size=p_unallocated_handle->block_size*
	p_unallocated_handle->free_block_map_size;

	LOG_DEBUG("Total size of unallocated blocks is %" PRIu64 " bytes\n",
	p_unallocated_handle->morphed_image_size);

	return UNALLOCATED_OK;
	}

	/*
	* UnallocatedSize
	*/
	static int UnallocatedSize(void p_handle, uint64_t p_size) {
	*p_size=((pts_UnallocatedHandle)(p_handle))->morphed_image_size;
	return UNALLOCATED_OK;
	}

	/*
	* UnallocatedRead
	*/
	static int UnallocatedRead(void *p_handle,
	char *p_buf,
	off_t offset,
	size_t count,
	size_t *p_read)
	{
	pts_UnallocatedHandle p_unallocated_handle=(pts_UnallocatedHandle)p_handle;
	uint64_t cur_block;
	off_t cur_block_offset;
	off_t cur_image_offset;
	size_t cur_count;
	int ret;
	size_t bytes_read;

	LOG_DEBUG("Reading %zu bytes at offset %zu from morphed image\n",
	count,
	offset);

	// Make sure read parameters are within morphed image bounds
	if(offset>=p_unallocated_handle->morphed_image_size \|\|
	offset+count>p_unallocated_handle->morphed_image_size)
	{
	return UNALLOCATED_READ_BEYOND_END_OF_IMAGE;
	}

	// Calculate starting block and block offset
	cur_block=offset/p_unallocated_handle->block_size;
	cur_block_offset=offset-(cur_block*p_unallocated_handle->block_size);

	// Init p_read
	*p_read=0;

	while(count!=0) {
	// Calculate input image offset to read from
	cur_image_offset=
	p_unallocated_handle->p_free_block_map[cur_block]+cur_block_offset;

	// Calculate how many bytes to read from current block
	if(cur_block_offset+count>p_unallocated_handle->block_size) {
	cur_count=p_unallocated_handle->block_size-cur_block_offset;
	} else {
	cur_count=count;
	}

	LOG_DEBUG("Reading %zu bytes at offset %zu (block %" PRIu64 ")\n",
	cur_count,
	cur_image_offset+cur_block_offset,
	cur_block);

	// Read bytes
	ret=p_unallocated_handle->p_input_functions->
	Read(0,
	p_buf,
	cur_image_offset+cur_block_offset,
	cur_count,
	&bytes_read);
	if(ret!=0 \|\| bytes_read!=cur_count) return UNALLOCATED_CANNOT_READ_DATA;

	p_buf+=cur_count;
	cur_block_offset=0;
	count-=cur_count;
	cur_block++;
	(*p_read)+=cur_count;
	}

	return UNALLOCATED_OK;
	}

	/*
	* UnallocatedOptionsHelp
	*/
	static int UnallocatedOptionsHelp(const char **pp_help) {
	int ok;
	char *p_buf;

	ok=asprintf(&p_buf,
	" unallocated_fs : Specify the filesystem to extract "
	"unallocated blocks from. Supported filesystems are: "
	"'hfs', 'fat'. "
	"Default: autodetect.\n");
	if(ok<0 \|\| p_buf==NULL) {
	*pp_help=NULL;
	return UNALLOCATED_MEMALLOC_FAILED;
	}

	*pp_help=p_buf;
	return UNALLOCATED_OK;
	}

	/*
	* UnallocatedOptionsParse
	*/
	static int UnallocatedOptionsParse(void *p_handle,
	uint32_t options_count,
	const pts_LibXmountOptions *pp_options,
	const char **pp_error)
	{
	pts_UnallocatedHandle p_unallocated_handle=(pts_UnallocatedHandle)p_handle;
	int ok;
	char *p_buf;

	for(uint32_t i=0;i<options_count;i++) {
	if(strcmp(pp_options[i]->p_key,"unallocated_fs")==0) {
	if(strcmp(pp_options[i]->p_value,"hfs")==0) {
	p_unallocated_handle->fs_type=UnallocatedFsType_Hfs;
	} else if(strcmp(pp_options[i]->p_value,"fat")==0) {
	p_unallocated_handle->fs_type=UnallocatedFsType_Fat;
	} else {
	ok=asprintf(&p_buf,
	"Unsupported filesystem '%s' specified",
	pp_options[i]->p_value);
	if(ok<0 \|\| p_buf==NULL) {
	*pp_error=NULL;
	return UNALLOCATED_MEMALLOC_FAILED;
	}
	*pp_error=p_buf;
	return UNALLOCATED_UNSUPPORTED_FS_SPECIFIED;
	}

	LOG_DEBUG("Setting fs to %s\n",pp_options[i]->p_value);

	pp_options[i]->valid=1;
	}
	}

	return UNALLOCATED_OK;
	}

	/*
	* UnallocatedGetInfofileContent
	*/
	static int UnallocatedGetInfofileContent(void *p_handle,
	const char **pp_info_buf)
	{
	pts_UnallocatedHandle p_unallocated_handle=(pts_UnallocatedHandle)p_handle;
	int ret=-1;
	char *p_fs_buf=NULL;
	char *p_buf=NULL;

	switch(p_unallocated_handle->fs_type) {
	case UnallocatedFsType_Hfs: {
	- ret=GetHfsInfos(&(p_unallocated_handle->hfs_handle),&p_fs_buf);
	+ ret=GetHfsInfos(&(p_unallocated_handle->u_fs.hfs_handle),&p_fs_buf);
	break;
	}
	case UnallocatedFsType_Fat: {
	- ret=GetFatInfos(&(p_unallocated_handle->fat_handle),&p_fs_buf);
	+ ret=GetFatInfos(&(p_unallocated_handle->u_fs.fat_handle),&p_fs_buf);
	break;
	}
	case UnallocatedFsType_Unknown:
	default:
	return UNALLOCATED_INTERNAL_ERROR;
	}
	if(ret!=UNALLOCATED_OK) return ret;

	if(p_fs_buf!=NULL) {
	ret=asprintf(&p_buf,
	"%s\n"
	"Discovered free blocks: %" PRIu64 "\n"
	"Total unallocated size: %" PRIu64 " bytes (%0.3f GiB)\n",
	p_fs_buf,
	p_unallocated_handle->free_block_map_size,
	p_unallocated_handle->free_block_map_size*
	p_unallocated_handle->block_size,
	(p_unallocated_handle->free_block_map_size*
	p_unallocated_handle->block_size)/(1024.01024.01024.0));
	free(p_fs_buf);
	} else {
	ret=asprintf(&p_buf,
	"Discovered free blocks: %" PRIu64 "\n"
	"Total unallocated size: %" PRIu64 " bytes (%0.3f GiB)\n",
	p_unallocated_handle->free_block_map_size,
	p_unallocated_handle->free_block_map_size*
	p_unallocated_handle->block_size,
	(p_unallocated_handle->free_block_map_size*
	p_unallocated_handle->block_size)/(1024.01024.01024.0));
	}

	// Check if asprintf worked
	if(ret<0 \|\| p_buf==NULL) return UNALLOCATED_MEMALLOC_FAILED;

	*pp_info_buf=p_buf;
	return UNALLOCATED_OK;
	}

	/*
	* UnallocatedGetErrorMessage
	*/
	static const char* UnallocatedGetErrorMessage(int err_num) {
	switch(err_num) {
	case UNALLOCATED_MEMALLOC_FAILED:
	return "Unable to allocate memory";
	break;
	case UNALLOCATED_NO_SUPPORTED_FS_DETECTED:
	return "Unable to detect a supported file system";
	break;
	case UNALLOCATED_UNSUPPORTED_FS_SPECIFIED:
	return "Unsupported fs specified";
	break;
	case UNALLOCATED_INTERNAL_ERROR:
	return "Internal error";
	break;
	case UNALLOCATED_CANNOT_GET_IMAGECOUNT:
	return "Unable to get input image count";
	break;
	case UNALLOCATED_WRONG_INPUT_IMAGE_COUNT:
	return "Only 1 input image is supported";
	break;
	case UNALLOCATED_CANNOT_GET_IMAGESIZE:
	return "Unable to get input image size";
	break;
	case UNALLOCATED_READ_BEYOND_END_OF_IMAGE:
	return "Unable to read data: Attempt to read past EOF";
	break;
	case UNALLOCATED_CANNOT_READ_DATA:
	return "Unable to read data";
	break;
	case UNALLOCATED_CANNOT_PARSE_OPTION:
	return "Unable to parse library option";
	break;
	// HFS errors
	case UNALLOCATED_HFS_CANNOT_READ_HEADER:
	return "Unable to read HFS volume header";
	break;
	case UNALLOCATED_HFS_INVALID_HEADER:
	return "Found invalid HFS volume header";
	break;
	case UNALLOCATED_HFS_CANNOT_READ_ALLOC_FILE:
	return "Unable to read HFS allocation file";
	break;
	case UNALLOCATED_HFS_ALLOC_FILE_HAS_TOO_MUCH_EXTENDS:
	return "HFS allocation file has more than 8 extends. "
	"This is unsupported";
	break;
	// FAT errors
	case UNALLOCATED_FAT_CANNOT_READ_HEADER:
	return "Unable to read FAT volume header";
	break;
	case UNALLOCATED_FAT_INVALID_HEADER:
	return "Found invalid FAT volume header";
	break;
	case UNALLOCATED_FAT_UNSUPPORTED_FS_TYPE:
	return "Found unsupported FAT type";
	break;
	case UNALLOCATED_FAT_CANNOT_READ_FAT:
	return "Unable to read FAT";
	break;
	default:
	return "Unknown error";
	}
	}

	/*
	* UnallocatedFreeBuffer
	*/
	static void UnallocatedFreeBuffer(void *p_buf) {
	free(p_buf);
	}

	diff --git a/trunk/libxmount_morphing/libxmount_morphing_unallocated/libxmount_morphing_unallocated.h b/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_unallocated/libxmount_morphing_unallocated.h
	similarity index 99%
	copy from trunk/libxmount_morphing/libxmount_morphing_unallocated/libxmount_morphing_unallocated.h
	copy to tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_unallocated/libxmount_morphing_unallocated.h
	index e84befe..e0dcae5 100644
	--- a/trunk/libxmount_morphing/libxmount_morphing_unallocated/libxmount_morphing_unallocated.h
	+++ b/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_unallocated/libxmount_morphing_unallocated.h
	@@ -1,83 +1,83 @@
	/*******************************************************************************
	* xmount Copyright (c) 2008-2014 by Gillen Daniel <gillen.dan@pinguin.lu> *
	* *
	* This program is free software: you can redistribute it and/or modify it *
	* under the terms of the GNU General Public License as published by the Free *
	* Software Foundation, either version 3 of the License, or (at your option) *
	* any later version. *
	* *
	* This program is distributed in the hope that it will be useful, but WITHOUT *
	* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
	* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for *
	* more details. *
	* *
	* You should have received a copy of the GNU General Public License along with *
	* this program. If not, see <http://www.gnu.org/licenses/>. *
	*******************************************************************************/

	#ifndef LIBXMOUNT_MORPHING_UNALLOCATED_H
	#define LIBXMOUNT_MORPHING_UNALLOCATED_H

	#include "../libxmount_morphing.h"

	#include "hfs_functions.h"
	#include "fat_functions.h"
	#include "ntfs_functions.h"

	/*******************************************************************************
	* Enums, type defs, etc...
	******************************************************************************/
	// Supported fs types
	typedef enum e_UnallocatedFsType {
	UnallocatedFsType_Unknown=0,
	UnallocatedFsType_Hfs,
	UnallocatedFsType_Fat
	} te_UnallocatedFsType;

	// Handle
	typedef struct s_UnallocatedHandle {
	uint8_t debug;
	te_UnallocatedFsType fs_type;
	pts_LibXmountMorphingInputFunctions p_input_functions;

	uint64_t block_size;
	uint64_t free_block_map_size;
	uint64_t *p_free_block_map;
	uint64_t morphed_image_size;

	union {
	ts_HfsHandle hfs_handle;
	ts_FatHandle fat_handle;
	ts_NtfsHandle ntfs_handle;
	- };
	+ } u_fs;
	} ts_UnallocatedHandle, *pts_UnallocatedHandle;

	/*******************************************************************************
	* Forward declarations
	******************************************************************************/
	static int UnallocatedCreateHandle(void **pp_handle,
	const char *p_format,
	uint8_t debug);
	static int UnallocatedDestroyHandle(void **pp_handle);
	static int UnallocatedMorph(
	void *p_handle,
	pts_LibXmountMorphingInputFunctions p_input_functions);
	static int UnallocatedSize(void *p_handle,
	uint64_t *p_size);
	static int UnallocatedRead(void *p_handle,
	char *p_buf,
	off_t offset,
	size_t count,
	size_t *p_read);
	static int UnallocatedOptionsHelp(const char **pp_help);
	static int UnallocatedOptionsParse(void *p_handle,
	uint32_t options_count,
	const pts_LibXmountOptions *pp_options,
	const char **pp_error);
	static int UnallocatedGetInfofileContent(void *p_handle,
	const char **pp_info_buf);
	static const char* UnallocatedGetErrorMessage(int err_num);
	static void UnallocatedFreeBuffer(void *p_buf);

	#endif // LIBXMOUNT_MORPHING_UNALLOCATED_H

	diff --git a/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_unallocated/libxmount_morphing_unallocated_retvalues.h b/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_unallocated/libxmount_morphing_unallocated_retvalues.h
	new file mode 100644
	index 0000000..af24799
	--- /dev/null
	+++ b/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_unallocated/libxmount_morphing_unallocated_retvalues.h
	@@ -0,0 +1,47 @@
	+/*******************************************************************************
	+* xmount Copyright (c) 2008-2014 by Gillen Daniel <gillen.dan@pinguin.lu> *
	+* *
	+* This program is free software: you can redistribute it and/or modify it *
	+* under the terms of the GNU General Public License as published by the Free *
	+* Software Foundation, either version 3 of the License, or (at your option) *
	+* any later version. *
	+* *
	+* This program is distributed in the hope that it will be useful, but WITHOUT *
	+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
	+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for *
	+* more details. *
	+* *
	+* You should have received a copy of the GNU General Public License along with *
	+* this program. If not, see <http://www.gnu.org/licenses/>. *
	+*******************************************************************************/
	+
	+#ifndef LIBXMOUNT_MORPHING_UNALLOCATED_RETVALUES_H
	+#define LIBXMOUNT_MORPHING_UNALLOCATED_RETVALUES_H
	+
	+// Error codes
	+enum {
	+ UNALLOCATED_OK=0,
	+ UNALLOCATED_MEMALLOC_FAILED,
	+ UNALLOCATED_NO_SUPPORTED_FS_DETECTED,
	+ UNALLOCATED_UNSUPPORTED_FS_SPECIFIED,
	+ UNALLOCATED_INTERNAL_ERROR,
	+ UNALLOCATED_CANNOT_GET_IMAGECOUNT,
	+ UNALLOCATED_WRONG_INPUT_IMAGE_COUNT,
	+ UNALLOCATED_CANNOT_GET_IMAGESIZE,
	+ UNALLOCATED_READ_BEYOND_END_OF_IMAGE,
	+ UNALLOCATED_CANNOT_READ_DATA,
	+ UNALLOCATED_CANNOT_PARSE_OPTION,
	+ // HFS return values
	+ UNALLOCATED_HFS_CANNOT_READ_HEADER,
	+ UNALLOCATED_HFS_INVALID_HEADER,
	+ UNALLOCATED_HFS_CANNOT_READ_ALLOC_FILE,
	+ UNALLOCATED_HFS_ALLOC_FILE_HAS_TOO_MUCH_EXTENDS,
	+ // FAT return values
	+ UNALLOCATED_FAT_CANNOT_READ_HEADER,
	+ UNALLOCATED_FAT_INVALID_HEADER,
	+ UNALLOCATED_FAT_UNSUPPORTED_FS_TYPE,
	+ UNALLOCATED_FAT_CANNOT_READ_FAT
	+};
	+
	+#endif // LIBXMOUNT_MORPHING_UNALLOCATED_RETVALUES_H
	+
	diff --git a/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_unallocated/ntfs_functions.c b/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_unallocated/ntfs_functions.c
	new file mode 100644
	index 0000000..78a6d7e
	--- /dev/null
	+++ b/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_unallocated/ntfs_functions.c
	@@ -0,0 +1,34 @@
	+/*******************************************************************************
	+* xmount Copyright (c) 2008-2014 by Gillen Daniel <gillen.dan@pinguin.lu> *
	+* *
	+* This program is free software: you can redistribute it and/or modify it *
	+* under the terms of the GNU General Public License as published by the Free *
	+* Software Foundation, either version 3 of the License, or (at your option) *
	+* any later version. *
	+* *
	+* This program is distributed in the hope that it will be useful, but WITHOUT *
	+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
	+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for *
	+* more details. *
	+* *
	+* You should have received a copy of the GNU General Public License along with *
	+* this program. If not, see <http://www.gnu.org/licenses/>. *
	+*******************************************************************************/
	+
	+#include "ntfs_functions.h"
	+#include "libxmount_morphing_unallocated_retvalues.h"
	+
	+#define LOG_DEBUG(...) { \
	+ LIBXMOUNT_LOG_DEBUG(p_ntfs_handle->debug,__VA_ARGS__); \
	+}
	+
	+/*
	+ * ReadNtfsHeader
	+ */
	+int ReadNtfsHeader(pts_NtfsHandle p_ntfs_handle,
	+ pts_LibXmountMorphingInputFunctions p_input_functions,
	+ uint8_t debug)
	+{
	+
	+}
	+
	diff --git a/trunk/libxmount_morphing/libxmount_morphing_unallocated/fat_functions.h b/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_unallocated/ntfs_functions.h
	similarity index 55%
	copy from trunk/libxmount_morphing/libxmount_morphing_unallocated/fat_functions.h
	copy to tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_unallocated/ntfs_functions.h
	index b1e9fda..66f9e38 100644
	--- a/trunk/libxmount_morphing/libxmount_morphing_unallocated/fat_functions.h
	+++ b/tags/xmount-0.7.0/libxmount_morphing/libxmount_morphing_unallocated/ntfs_functions.h
	@@ -1,72 +1,55 @@
	/*******************************************************************************
	* xmount Copyright (c) 2008-2014 by Gillen Daniel <gillen.dan@pinguin.lu> *
	* *
	* This program is free software: you can redistribute it and/or modify it *
	* under the terms of the GNU General Public License as published by the Free *
	* Software Foundation, either version 3 of the License, or (at your option) *
	* any later version. *
	* *
	* This program is distributed in the hope that it will be useful, but WITHOUT *
	* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
	* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for *
	* more details. *
	* *
	* You should have received a copy of the GNU General Public License along with *
	* this program. If not, see <http://www.gnu.org/licenses/>. *
	*******************************************************************************/

	-#ifndef FAT_FUNCTIONS_H
	-#define FAT_FUNCTIONS_H
	+#ifndef NTFS_FUNCTIONS_H
	+#define NTFS_FUNCTIONS_H

	#include "../libxmount_morphing.h"

	-// Supported FAT types
	-typedef enum e_FatType {
	- FatType_Unknown=0,
	- FatType_Fat16,
	- FatType_Fat32
	-} te_FatType;
	-
	// Needed parts of the FAT volume header
	-typedef struct s_FatVH {
	+typedef struct s_NtfsVH {
	uint8_t jump_inst[3];
	uint8_t oem_name[8];
	uint16_t bytes_per_sector;
	uint8_t sectors_per_cluster;
	uint16_t reserved_sectors;
	- uint8_t fat_count;
	- uint16_t root_entry_count;
	- uint16_t total_sectors_16;
	+ uint8_t null01;
	+ uint8_t null02;
	+ uint8_t null03;
	+ uint16_t unused01;
	uint8_t media_type;
	- uint16_t fat16_sectors;
	- uint64_t unused01;
	- uint32_t total_sectors_32;
	- // Following value is only valid for FAT32
	- uint32_t fat32_sectors;
	-} __attribute__ ((packed)) ts_FatVH, *pts_FatVH;
	-
	-// FAT handle
	-typedef struct s_FatHandle {
	- te_FatType fat_type;
	- pts_FatVH p_fat_vh;
	- union {
	- uint16_t *p_fat16;
	- uint32_t *p_fat32;
	- };
	+ uint16_t null04;
	+ uint8_t unused02[14];
	+ uint64_t total_sectors;
	+ uint64_t mft_cluster;
	+ uint64_t mftmirr_cluster;
	+ int16_t clusters_per_file_rec;
	+ int8_t clusters_per_index_buf;
	+} __attribute__ ((packed)) ts_NtfsVH, *pts_NtfsVH;
	+
	+// NTFS handle
	+typedef struct s_NtfsHandle {
	+ pts_NtfsVH p_ntfs_vh;
	uint8_t debug;
	-} ts_FatHandle, *pts_FatHandle;
	+} ts_NtfsHandle, *pts_NtfsHandle;

	-int ReadFatHeader(pts_FatHandle p_fat_handle,
	- pts_LibXmountMorphingInputFunctions p_input_functions,
	- uint8_t debug);
	-void FreeFatHeader(pts_FatHandle p_fat_handle);
	-int ReadFat(pts_FatHandle p_fat_handle,
	- pts_LibXmountMorphingInputFunctions p_input_functions);
	-int BuildFatBlockMap(pts_FatHandle p_fat_handle,
	- uint64_t **pp_free_block_map,
	- uint64_t *p_free_block_map_size,
	- uint64_t *p_block_size);
	-int GetFatInfos(pts_FatHandle p_fat_handle, char **pp_buf);
	+int ReadNtfsHeader(pts_NtfsHandle p_ntfs_handle,
	+ pts_LibXmountMorphingInputFunctions p_input_functions,
	+ uint8_t debug);

	-#endif // FAT_FUNCTIONS_H
	+#endif // NTFS_FUNCTIONS_H

	diff --git a/tags/xmount-0.7.0/old_build/Makefile.am b/tags/xmount-0.7.0/old_build/Makefile.am
	new file mode 100644
	index 0000000..ab63e93
	--- /dev/null
	+++ b/tags/xmount-0.7.0/old_build/Makefile.am
	@@ -0,0 +1,13 @@
	+##Process this file with automake to create Makefile.in
	+bin_PROGRAMS = xmount
	+man_MANS = xmount.1
	+xmount_SOURCES = md5.c xmount.c libaewf/aewf.c libaaff/aaff.c libdd/dd.c
	+xmount_CFLAGS = -fno-strict-aliasing -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -std=c99 $(fuse_CFLAGS)
	+LIBS += $(fuse_LIBS)
	+# Statically link against local libaff and libewf
	+# Linux
	+#xmount_LDADD = libaff/lib/.libs/libafflib.a libewf/libewf/.libs/libewf.a /usr/lib/libssl.a /usr/lib/libcrypto.a -lstdc++ -lz
	+#xmount_CFLAGS += -Ilibewf/include
	+# OSX using osxfuse
	+#xmount_LDADD = libaff/lib/.libs/libafflib.a libewf/libewf/.libs/libewf.a /opt/local/lib/libcrypto.a /opt/local/lib/libssl.a -lstdc++ -lz -losxfuse
	+#xmount_CFLAGS += -Ilibewf/include -I/usr/local/include/osxfuse/ -D_FILE_OFFSET_BITS=64
	diff --git a/tags/xmount-0.7.0/old_build/Makefile.in b/tags/xmount-0.7.0/old_build/Makefile.in
	new file mode 100644
	index 0000000..27fbc21
	--- /dev/null
	+++ b/tags/xmount-0.7.0/old_build/Makefile.in
	@@ -0,0 +1,775 @@
	+# Makefile.in generated by automake 1.11.3 from Makefile.am.
	+# @configure_input@
	+
	+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
	+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
	+# Foundation, Inc.
	+# This Makefile.in is free software; the Free Software Foundation
	+# gives unlimited permission to copy and/or distribute it,
	+# with or without modifications, as long as this notice is preserved.
	+
	+# This program is distributed in the hope that it will be useful,
	+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
	+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
	+# PARTICULAR PURPOSE.
	+
	+@SET_MAKE@
	+
	+VPATH = @srcdir@
	+pkgdatadir = $(datadir)/@PACKAGE@
	+pkgincludedir = $(includedir)/@PACKAGE@
	+pkglibdir = $(libdir)/@PACKAGE@
	+pkglibexecdir = $(libexecdir)/@PACKAGE@
	+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
	+install_sh_DATA = $(install_sh) -c -m 644
	+install_sh_PROGRAM = $(install_sh) -c
	+install_sh_SCRIPT = $(install_sh) -c
	+INSTALL_HEADER = $(INSTALL_DATA)
	+transform = $(program_transform_name)
	+NORMAL_INSTALL = :
	+PRE_INSTALL = :
	+POST_INSTALL = :
	+NORMAL_UNINSTALL = :
	+PRE_UNINSTALL = :
	+POST_UNINSTALL = :
	+bin_PROGRAMS = xmount$(EXEEXT)
	+subdir = .
	+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
	+ $(srcdir)/Makefile.in $(srcdir)/config.h.in \
	+ $(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
	+ TODO compile config.guess config.sub depcomp install-sh \
	+ missing
	+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
	+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
	+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
	+ $(ACLOCAL_M4)
	+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
	+ configure.lineno config.status.lineno
	+mkinstalldirs = $(install_sh) -d
	+CONFIG_HEADER = config.h
	+CONFIG_CLEAN_FILES =
	+CONFIG_CLEAN_VPATH_FILES =
	+am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"
	+PROGRAMS = $(bin_PROGRAMS)
	+am_xmount_OBJECTS = xmount-md5.$(OBJEXT) xmount-xmount.$(OBJEXT) \
	+ xmount-aaff.$(OBJEXT)
	+xmount_OBJECTS = $(am_xmount_OBJECTS)
	+xmount_LDADD = $(LDADD)
	+xmount_LINK = $(CCLD) $(xmount_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
	+ $(LDFLAGS) -o $@
	+DEFAULT_INCLUDES = -I.@am__isrc@
	+depcomp = $(SHELL) $(top_srcdir)/depcomp
	+am__depfiles_maybe = depfiles
	+am__mv = mv -f
	+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
	+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
	+CCLD = $(CC)
	+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
	+SOURCES = $(xmount_SOURCES)
	+DIST_SOURCES = $(xmount_SOURCES)
	+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" \| sed 's\|.\|.\|g'`;
	+am__vpath_adj = case $$p in \
	+ $(srcdir)/*) f=`echo "$$p" \| sed "s\|^$$srcdirstrip/\|\|"`;; \
	+ *) f=$$p;; \
	+ esac;
	+am__strip_dir = f=`echo $$p \| sed -e 's\|^.*/\|\|'`;
	+am__install_max = 40
	+am__nobase_strip_setup = \
	+ srcdirstrip=`echo "$(srcdir)" \| sed 's/[].[^$$\\*\|]/\\\\&/g'`
	+am__nobase_strip = \
	+ for p in $$list; do echo "$$p"; done \| sed -e "s\|$$srcdirstrip/\|\|"
	+am__nobase_list = $(am__nobase_strip_setup); \
	+ for p in $$list; do echo "$$p $$p"; done \| \
	+ sed "s\| $$srcdirstrip/\| \|;"' / .\//!s/ ./ ./; s,$ .$/[^/]$$,\1,' \| \
	+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
	+ if (++n[$$2] == $(am__install_max)) \
	+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
	+ END { for (dir in files) print dir, files[dir] }'
	+am__base_list = \
	+ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' \| \
	+ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
	+am__uninstall_files_from_dir = { \
	+ test -z "$$files" \
	+ \|\| { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
	+ \|\| { echo " ( cd '$$dir' && rm -f" $$files ")"; \
	+ $(am__cd) "$$dir" && rm -f $$files; }; \
	+ }
	+man1dir = $(mandir)/man1
	+NROFF = nroff
	+MANS = $(man_MANS)
	+ETAGS = etags
	+CTAGS = ctags
	+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
	+distdir = $(PACKAGE)-$(VERSION)
	+top_distdir = $(distdir)
	+am__remove_distdir = \
	+ if test -d "$(distdir)"; then \
	+ find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
	+ && rm -rf "$(distdir)" \
	+ \|\| { sleep 5 && rm -rf "$(distdir)"; }; \
	+ else :; fi
	+DIST_ARCHIVES = $(distdir).tar.gz
	+GZIP_ENV = --best
	+distuninstallcheck_listfiles = find . -type f -print
	+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
	+ \| sed 's\|^\./\|$(prefix)/\|' \| grep -v '$(infodir)/dir$$'
	+distcleancheck_listfiles = find . -type f -print
	+ACLOCAL = @ACLOCAL@
	+AMTAR = @AMTAR@
	+AUTOCONF = @AUTOCONF@
	+AUTOHEADER = @AUTOHEADER@
	+AUTOMAKE = @AUTOMAKE@
	+AWK = @AWK@
	+CC = @CC@
	+CCDEPMODE = @CCDEPMODE@
	+CFLAGS = @CFLAGS@
	+CPP = @CPP@
	+CPPFLAGS = @CPPFLAGS@
	+CYGPATH_W = @CYGPATH_W@
	+DEFS = @DEFS@
	+DEPDIR = @DEPDIR@
	+ECHO_C = @ECHO_C@
	+ECHO_N = @ECHO_N@
	+ECHO_T = @ECHO_T@
	+EGREP = @EGREP@
	+EXEEXT = @EXEEXT@
	+GREP = @GREP@
	+INSTALL = @INSTALL@
	+INSTALL_DATA = @INSTALL_DATA@
	+INSTALL_PROGRAM = @INSTALL_PROGRAM@
	+INSTALL_SCRIPT = @INSTALL_SCRIPT@
	+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
	+LDFLAGS = @LDFLAGS@
	+LIBOBJS = @LIBOBJS@
	+LIBS = @LIBS@ $(fuse_LIBS)
	+LTLIBOBJS = @LTLIBOBJS@
	+MAKEINFO = @MAKEINFO@
	+MKDIR_P = @MKDIR_P@
	+OBJEXT = @OBJEXT@
	+PACKAGE = @PACKAGE@
	+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
	+PACKAGE_NAME = @PACKAGE_NAME@
	+PACKAGE_STRING = @PACKAGE_STRING@
	+PACKAGE_TARNAME = @PACKAGE_TARNAME@
	+PACKAGE_URL = @PACKAGE_URL@
	+PACKAGE_VERSION = @PACKAGE_VERSION@
	+PATH_SEPARATOR = @PATH_SEPARATOR@
	+PKG_CONFIG = @PKG_CONFIG@
	+PKG_CONFIG_LIBDIR = @PKG_CONFIG_LIBDIR@
	+PKG_CONFIG_PATH = @PKG_CONFIG_PATH@
	+SET_MAKE = @SET_MAKE@
	+SHELL = @SHELL@
	+STRIP = @STRIP@
	+VERSION = @VERSION@
	+abs_builddir = @abs_builddir@
	+abs_srcdir = @abs_srcdir@
	+abs_top_builddir = @abs_top_builddir@
	+abs_top_srcdir = @abs_top_srcdir@
	+ac_ct_CC = @ac_ct_CC@
	+am__include = @am__include@
	+am__leading_dot = @am__leading_dot@
	+am__quote = @am__quote@
	+am__tar = @am__tar@
	+am__untar = @am__untar@
	+bindir = @bindir@
	+build_alias = @build_alias@
	+builddir = @builddir@
	+datadir = @datadir@
	+datarootdir = @datarootdir@
	+docdir = @docdir@
	+dvidir = @dvidir@
	+exec_prefix = @exec_prefix@
	+fuse_CFLAGS = @fuse_CFLAGS@
	+fuse_LIBS = @fuse_LIBS@
	+host_alias = @host_alias@
	+htmldir = @htmldir@
	+includedir = @includedir@
	+infodir = @infodir@
	+install_sh = @install_sh@
	+libdir = @libdir@
	+libexecdir = @libexecdir@
	+localedir = @localedir@
	+localstatedir = @localstatedir@
	+mandir = @mandir@
	+mkdir_p = @mkdir_p@
	+oldincludedir = @oldincludedir@
	+pdfdir = @pdfdir@
	+prefix = @prefix@
	+program_transform_name = @program_transform_name@
	+psdir = @psdir@
	+sbindir = @sbindir@
	+sharedstatedir = @sharedstatedir@
	+srcdir = @srcdir@
	+sysconfdir = @sysconfdir@
	+target_alias = @target_alias@
	+top_build_prefix = @top_build_prefix@
	+top_builddir = @top_builddir@
	+top_srcdir = @top_srcdir@
	+man_MANS = xmount.1
	+xmount_SOURCES = md5.c xmount.c libaaff/aaff.c
	+xmount_CFLAGS = -fno-strict-aliasing -D_LARGEFILE64_SOURCE -D_GNU_SOURCE -std=c99 $(fuse_CFLAGS)
	+all: config.h
	+ $(MAKE) $(AM_MAKEFLAGS) all-am
	+
	+.SUFFIXES:
	+.SUFFIXES: .c .o .obj
	+am--refresh: Makefile
	+ @:
	+$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
	+ @for dep in $?; do \
	+ case '$(am__configure_deps)' in \
	+ $$dep) \
	+ echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
	+ $(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
	+ && exit 0; \
	+ exit 1;; \
	+ esac; \
	+ done; \
	+ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
	+ $(am__cd) $(top_srcdir) && \
	+ $(AUTOMAKE) --gnu Makefile
	+.PRECIOUS: Makefile
	+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
	+ @case '$?' in \
	+ config.status) \
	+ echo ' $(SHELL) ./config.status'; \
	+ $(SHELL) ./config.status;; \
	+ *) \
	+ echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
	+ cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
	+ esac;
	+
	+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
	+ $(SHELL) ./config.status --recheck
	+
	+$(top_srcdir)/configure: $(am__configure_deps)
	+ $(am__cd) $(srcdir) && $(AUTOCONF)
	+$(ACLOCAL_M4): $(am__aclocal_m4_deps)
	+ $(am__cd) $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
	+$(am__aclocal_m4_deps):
	+
	+config.h: stamp-h1
	+ @if test ! -f $@; then rm -f stamp-h1; else :; fi
	+ @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
	+
	+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
	+ @rm -f stamp-h1
	+ cd $(top_builddir) && $(SHELL) ./config.status config.h
	+$(srcdir)/config.h.in: $(am__configure_deps)
	+ ($(am__cd) $(top_srcdir) && $(AUTOHEADER))
	+ rm -f stamp-h1
	+ touch $@
	+
	+distclean-hdr:
	+ -rm -f config.h stamp-h1
	+install-binPROGRAMS: $(bin_PROGRAMS)
	+ @$(NORMAL_INSTALL)
	+ test -z "$(bindir)" \|\| $(MKDIR_P) "$(DESTDIR)$(bindir)"
	+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" \|\| list=; \
	+ for p in $$list; do echo "$$p $$p"; done \| \
	+ sed 's/$(EXEEXT)$$//' \| \
	+ while read p p1; do if test -f $$p; \
	+ then echo "$$p"; echo "$$p"; else :; fi; \
	+ done \| \
	+ sed -e 'p;s,./,,;n;h' -e 's\|.\|.\|' \
	+ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' \| \
	+ sed 'N;N;N;s,\n, ,g' \| \
	+ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \
	+ { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \
	+ if ($$2 == $$4) files[d] = files[d] " " $$1; \
	+ else { print "f", $$3 "/" $$4, $$1; } } \
	+ END { for (d in files) print "f", d, files[d] }' \| \
	+ while read type dir files; do \
	+ if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
	+ test -z "$$files" \|\| { \
	+ echo " $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(bindir)$$dir'"; \
	+ $(INSTALL_PROGRAM_ENV) $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(bindir)$$dir" \|\| exit $$?; \
	+ } \
	+ ; done
	+
	+uninstall-binPROGRAMS:
	+ @$(NORMAL_UNINSTALL)
	+ @list='$(bin_PROGRAMS)'; test -n "$(bindir)" \|\| list=; \
	+ files=`for p in $$list; do echo "$$p"; done \| \
	+ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \
	+ -e 's/$$/$(EXEEXT)/' `; \
	+ test -n "$$list" \|\| exit 0; \
	+ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \
	+ cd "$(DESTDIR)$(bindir)" && rm -f $$files
	+
	+clean-binPROGRAMS:
	+ -test -z "$(bin_PROGRAMS)" \|\| rm -f $(bin_PROGRAMS)
	+xmount$(EXEEXT): $(xmount_OBJECTS) $(xmount_DEPENDENCIES) $(EXTRA_xmount_DEPENDENCIES)
	+ @rm -f xmount$(EXEEXT)
	+ $(xmount_LINK) $(xmount_OBJECTS) $(xmount_LDADD) $(LIBS)
	+
	+mostlyclean-compile:
	+ -rm -f *.$(OBJEXT)
	+
	+distclean-compile:
	+ -rm -f *.tab.c
	+
	+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmount-aaff.Po@am__quote@
	+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmount-md5.Po@am__quote@
	+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xmount-xmount.Po@am__quote@
	+
	+.c.o:
	+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
	+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$.Tpo $(DEPDIR)/$.Po
	+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
	+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
	+@am__fastdepCC_FALSE@ $(COMPILE) -c $<
	+
	+.c.obj:
	+@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
	+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$.Tpo $(DEPDIR)/$.Po
	+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
	+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
	+@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'`
	+
	+xmount-md5.o: md5.c
	+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmount_CFLAGS) $(CFLAGS) -MT xmount-md5.o -MD -MP -MF $(DEPDIR)/xmount-md5.Tpo -c -o xmount-md5.o `test -f 'md5.c' \|\| echo '$(srcdir)/'`md5.c
	+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xmount-md5.Tpo $(DEPDIR)/xmount-md5.Po
	+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='md5.c' object='xmount-md5.o' libtool=no @AMDEPBACKSLASH@
	+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
	+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmount_CFLAGS) $(CFLAGS) -c -o xmount-md5.o `test -f 'md5.c' \|\| echo '$(srcdir)/'`md5.c
	+
	+xmount-md5.obj: md5.c
	+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmount_CFLAGS) $(CFLAGS) -MT xmount-md5.obj -MD -MP -MF $(DEPDIR)/xmount-md5.Tpo -c -o xmount-md5.obj `if test -f 'md5.c'; then $(CYGPATH_W) 'md5.c'; else $(CYGPATH_W) '$(srcdir)/md5.c'; fi`
	+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xmount-md5.Tpo $(DEPDIR)/xmount-md5.Po
	+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='md5.c' object='xmount-md5.obj' libtool=no @AMDEPBACKSLASH@
	+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
	+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmount_CFLAGS) $(CFLAGS) -c -o xmount-md5.obj `if test -f 'md5.c'; then $(CYGPATH_W) 'md5.c'; else $(CYGPATH_W) '$(srcdir)/md5.c'; fi`
	+
	+xmount-xmount.o: xmount.c
	+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmount_CFLAGS) $(CFLAGS) -MT xmount-xmount.o -MD -MP -MF $(DEPDIR)/xmount-xmount.Tpo -c -o xmount-xmount.o `test -f 'xmount.c' \|\| echo '$(srcdir)/'`xmount.c
	+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xmount-xmount.Tpo $(DEPDIR)/xmount-xmount.Po
	+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xmount.c' object='xmount-xmount.o' libtool=no @AMDEPBACKSLASH@
	+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
	+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmount_CFLAGS) $(CFLAGS) -c -o xmount-xmount.o `test -f 'xmount.c' \|\| echo '$(srcdir)/'`xmount.c
	+
	+xmount-xmount.obj: xmount.c
	+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmount_CFLAGS) $(CFLAGS) -MT xmount-xmount.obj -MD -MP -MF $(DEPDIR)/xmount-xmount.Tpo -c -o xmount-xmount.obj `if test -f 'xmount.c'; then $(CYGPATH_W) 'xmount.c'; else $(CYGPATH_W) '$(srcdir)/xmount.c'; fi`
	+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xmount-xmount.Tpo $(DEPDIR)/xmount-xmount.Po
	+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xmount.c' object='xmount-xmount.obj' libtool=no @AMDEPBACKSLASH@
	+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
	+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmount_CFLAGS) $(CFLAGS) -c -o xmount-xmount.obj `if test -f 'xmount.c'; then $(CYGPATH_W) 'xmount.c'; else $(CYGPATH_W) '$(srcdir)/xmount.c'; fi`
	+
	+xmount-aaff.o: libaaff/aaff.c
	+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmount_CFLAGS) $(CFLAGS) -MT xmount-aaff.o -MD -MP -MF $(DEPDIR)/xmount-aaff.Tpo -c -o xmount-aaff.o `test -f 'libaaff/aaff.c' \|\| echo '$(srcdir)/'`libaaff/aaff.c
	+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xmount-aaff.Tpo $(DEPDIR)/xmount-aaff.Po
	+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libaaff/aaff.c' object='xmount-aaff.o' libtool=no @AMDEPBACKSLASH@
	+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
	+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmount_CFLAGS) $(CFLAGS) -c -o xmount-aaff.o `test -f 'libaaff/aaff.c' \|\| echo '$(srcdir)/'`libaaff/aaff.c
	+
	+xmount-aaff.obj: libaaff/aaff.c
	+@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmount_CFLAGS) $(CFLAGS) -MT xmount-aaff.obj -MD -MP -MF $(DEPDIR)/xmount-aaff.Tpo -c -o xmount-aaff.obj `if test -f 'libaaff/aaff.c'; then $(CYGPATH_W) 'libaaff/aaff.c'; else $(CYGPATH_W) '$(srcdir)/libaaff/aaff.c'; fi`
	+@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xmount-aaff.Tpo $(DEPDIR)/xmount-aaff.Po
	+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='libaaff/aaff.c' object='xmount-aaff.obj' libtool=no @AMDEPBACKSLASH@
	+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
	+@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xmount_CFLAGS) $(CFLAGS) -c -o xmount-aaff.obj `if test -f 'libaaff/aaff.c'; then $(CYGPATH_W) 'libaaff/aaff.c'; else $(CYGPATH_W) '$(srcdir)/libaaff/aaff.c'; fi`
	+install-man1: $(man_MANS)
	+ @$(NORMAL_INSTALL)
	+ test -z "$(man1dir)" \|\| $(MKDIR_P) "$(DESTDIR)$(man1dir)"
	+ @list=''; test -n "$(man1dir)" \|\| exit 0; \
	+ { for i in $$list; do echo "$$i"; done; \
	+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done \| \
	+ sed -n '/\.1[a-z]*$$/p'; \
	+ } \| while read p; do \
	+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
	+ echo "$$d$$p"; echo "$$p"; \
	+ done \| \
	+ sed -e 'n;s,./,,;p;h;s,.\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
	+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,' \| \
	+ sed 'N;N;s,\n, ,g' \| { \
	+ list=; while read file base inst; do \
	+ if test "$$base" = "$$inst"; then list="$$list $$file"; else \
	+ echo " $(INSTALL_DATA) '$$file' '$(DESTDIR)$(man1dir)/$$inst'"; \
	+ $(INSTALL_DATA) "$$file" "$(DESTDIR)$(man1dir)/$$inst" \|\| exit $$?; \
	+ fi; \
	+ done; \
	+ for i in $$list; do echo "$$i"; done \| $(am__base_list) \| \
	+ while read files; do \
	+ test -z "$$files" \|\| { \
	+ echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(man1dir)'"; \
	+ $(INSTALL_DATA) $$files "$(DESTDIR)$(man1dir)" \|\| exit $$?; }; \
	+ done; }
	+
	+uninstall-man1:
	+ @$(NORMAL_UNINSTALL)
	+ @list=''; test -n "$(man1dir)" \|\| exit 0; \
	+ files=`{ for i in $$list; do echo "$$i"; done; \
	+ l2='$(man_MANS)'; for i in $$l2; do echo "$$i"; done \| \
	+ sed -n '/\.1[a-z]*$$/p'; \
	+ } \| sed -e 's,./,,;h;s,.\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
	+ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
	+ dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
	+
	+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
	+ 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; nonempty = 1; } \
	+ END { if (nonempty) { for (i in files) print i; }; }'`; \
	+ mkid -fID $$unique
	+tags: TAGS
	+
	+TAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
	+ $(TAGS_FILES) $(LISP)
	+ set x; \
	+ 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; nonempty = 1; } \
	+ END { if (nonempty) { for (i in files) print i; }; }'`; \
	+ shift; \
	+ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \
	+ test -n "$$unique" \|\| unique=$$empty_fix; \
	+ if test $$# -gt 0; then \
	+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
	+ "$$@" $$unique; \
	+ else \
	+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
	+ $$unique; \
	+ fi; \
	+ fi
	+ctags: CTAGS
	+CTAGS: $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
	+ $(TAGS_FILES) $(LISP)
	+ 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; nonempty = 1; } \
	+ END { if (nonempty) { for (i in files) print i; }; }'`; \
	+ test -z "$(CTAGS_ARGS)$$unique" \
	+ \|\| $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
	+ $$unique
	+
	+GTAGS:
	+ here=`$(am__cd) $(top_builddir) && pwd` \
	+ && $(am__cd) $(top_srcdir) \
	+ && gtags -i $(GTAGS_ARGS) "$$here"
	+
	+distclean-tags:
	+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
	+
	+distdir: $(DISTFILES)
	+ @list='$(MANS)'; if test -n "$$list"; then \
	+ list=`for p in $$list; do \
	+ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
	+ if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \
	+ if test -n "$$list" && \
	+ grep 'ab help2man is required to generate this page' $$list >/dev/null; then \
	+ echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \
	+ grep -l 'ab help2man is required to generate this page' $$list \| sed 's/^/ /' >&2; \
	+ echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \
	+ echo " typically \`make maintainer-clean' will remove them" >&2; \
	+ exit 1; \
	+ else :; fi; \
	+ else :; fi
	+ $(am__remove_distdir)
	+ test -d "$(distdir)" \|\| mkdir "$(distdir)"
	+ @srcdirstrip=`echo "$(srcdir)" \| sed 's/[].[^$$\\*]/\\\\&/g'`; \
	+ topsrcdirstrip=`echo "$(top_srcdir)" \| sed 's/[].[^$$\\*]/\\\\&/g'`; \
	+ list='$(DISTFILES)'; \
	+ dist_files=`for file in $$list; do echo $$file; done \| \
	+ sed -e "s\|^$$srcdirstrip/\|\|;t" \
	+ -e "s\|^$$topsrcdirstrip/\|$(top_builddir)/\|;t"`; \
	+ case $$dist_files in \
	+ /) $(MKDIR_P) `echo "$$dist_files" \| \
	+ sed '/\//!d;s\|^\|$(distdir)/\|;s,/[^/]*$$,,' \| \
	+ sort -u` ;; \
	+ esac; \
	+ for file in $$dist_files; do \
	+ if test -f $$file \|\| test -d $$file; then d=.; else d=$(srcdir); fi; \
	+ if test -d $$d/$$file; then \
	+ dir=`echo "/$$file" \| sed -e 's,/[^/]*$$,,'`; \
	+ if test -d "$(distdir)/$$file"; then \
	+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
	+ fi; \
	+ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
	+ cp -fpR $(srcdir)/$$file "$(distdir)$$dir" \|\| exit 1; \
	+ find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
	+ fi; \
	+ cp -fpR $$d/$$file "$(distdir)$$dir" \|\| exit 1; \
	+ else \
	+ test -f "$(distdir)/$$file" \
	+ \|\| cp -p $$d/$$file "$(distdir)/$$file" \
	+ \|\| exit 1; \
	+ fi; \
	+ done
	+ -test -n "$(am__skip_mode_fix)" \
	+ \|\| find "$(distdir)" -type d ! -perm -755 \
	+ -exec chmod u+rwx,go+rx {} \; -o \
	+ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
	+ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
	+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
	+ \|\| chmod -R a+r "$(distdir)"
	+dist-gzip: distdir
	+ tardir=$(distdir) && $(am__tar) \| GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
	+ $(am__remove_distdir)
	+
	+dist-bzip2: distdir
	+ tardir=$(distdir) && $(am__tar) \| BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
	+ $(am__remove_distdir)
	+
	+dist-lzip: distdir
	+ tardir=$(distdir) && $(am__tar) \| lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
	+ $(am__remove_distdir)
	+
	+dist-lzma: distdir
	+ tardir=$(distdir) && $(am__tar) \| lzma -9 -c >$(distdir).tar.lzma
	+ $(am__remove_distdir)
	+
	+dist-xz: distdir
	+ tardir=$(distdir) && $(am__tar) \| XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
	+ $(am__remove_distdir)
	+
	+dist-tarZ: distdir
	+ tardir=$(distdir) && $(am__tar) \| compress -c >$(distdir).tar.Z
	+ $(am__remove_distdir)
	+
	+dist-shar: distdir
	+ shar $(distdir) \| GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
	+ $(am__remove_distdir)
	+
	+dist-zip: distdir
	+ -rm -f $(distdir).zip
	+ zip -rq $(distdir).zip $(distdir)
	+ $(am__remove_distdir)
	+
	+dist dist-all: distdir
	+ tardir=$(distdir) && $(am__tar) \| GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
	+ $(am__remove_distdir)
	+
	+# This target untars the dist file and tries a VPATH configuration. Then
	+# it guarantees that the distribution is self-contained by making another
	+# tarfile.
	+distcheck: dist
	+ case '$(DIST_ARCHIVES)' in \
	+ .tar.gz) \
	+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz \| $(am__untar) ;;\
	+ .tar.bz2) \
	+ bzip2 -dc $(distdir).tar.bz2 \| $(am__untar) ;;\
	+ .tar.lzma) \
	+ lzma -dc $(distdir).tar.lzma \| $(am__untar) ;;\
	+ .tar.lz) \
	+ lzip -dc $(distdir).tar.lz \| $(am__untar) ;;\
	+ .tar.xz) \
	+ xz -dc $(distdir).tar.xz \| $(am__untar) ;;\
	+ .tar.Z) \
	+ uncompress -c $(distdir).tar.Z \| $(am__untar) ;;\
	+ .shar.gz) \
	+ GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz \| unshar ;;\
	+ .zip) \
	+ unzip $(distdir).zip ;;\
	+ esac
	+ chmod -R a-w $(distdir); chmod a+w $(distdir)
	+ mkdir $(distdir)/_build
	+ mkdir $(distdir)/_inst
	+ chmod a-w $(distdir)
	+ test -d $(distdir)/_build \|\| exit 0; \
	+ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd \| sed -e 's,^[^:\\/]:[\\/],/,'` \
	+ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
	+ && am__cwd=`pwd` \
	+ && $(am__cd) $(distdir)/_build \
	+ && ../configure --srcdir=.. --prefix="$$dc_install_base" \
	+ $(AM_DISTCHECK_CONFIGURE_FLAGS) \
	+ $(DISTCHECK_CONFIGURE_FLAGS) \
	+ && $(MAKE) $(AM_MAKEFLAGS) \
	+ && $(MAKE) $(AM_MAKEFLAGS) dvi \
	+ && $(MAKE) $(AM_MAKEFLAGS) check \
	+ && $(MAKE) $(AM_MAKEFLAGS) install \
	+ && $(MAKE) $(AM_MAKEFLAGS) installcheck \
	+ && $(MAKE) $(AM_MAKEFLAGS) uninstall \
	+ && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
	+ distuninstallcheck \
	+ && chmod -R a-w "$$dc_install_base" \
	+ && ({ \
	+ (cd ../.. && umask 077 && mkdir "$$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 \
	+ && rm -rf $(DIST_ARCHIVES) \
	+ && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \
	+ && cd "$$am__cwd" \
	+ \|\| exit 1
	+ $(am__remove_distdir)
	+ @(echo "$(distdir) archives ready for distribution: "; \
	+ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) \| \
	+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
	+distuninstallcheck:
	+ @test -n '$(distuninstallcheck_dir)' \|\| { \
	+ echo 'ERROR: trying to run $@ with an empty' \
	+ '$$(distuninstallcheck_dir)' >&2; \
	+ exit 1; \
	+ }; \
	+ $(am__cd) '$(distuninstallcheck_dir)' \|\| { \
	+ echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
	+ exit 1; \
	+ }; \
	+ test `$(am__distuninstallcheck_listfiles) \| wc -l` -eq 0 \
	+ \|\| { 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 \
	+ echo "ERROR: distcleancheck can only run from a VPATH build" ; \
	+ exit 1 ; \
	+ fi
	+ @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
	+check: check-am
	+all-am: Makefile $(PROGRAMS) $(MANS) config.h
	+installdirs:
	+ for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)"; do \
	+ test -z "$$dir" \|\| $(MKDIR_P) "$$dir"; \
	+ done
	+install: install-am
	+install-exec: install-exec-am
	+install-data: install-data-am
	+uninstall: uninstall-am
	+
	+install-am: all-am
	+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
	+
	+installcheck: installcheck-am
	+install-strip:
	+ if test -z '$(STRIP)'; then \
	+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
	+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
	+ install; \
	+ else \
	+ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
	+ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
	+ "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
	+ fi
	+mostlyclean-generic:
	+
	+clean-generic:
	+
	+distclean-generic:
	+ -test -z "$(CONFIG_CLEAN_FILES)" \|\| rm -f $(CONFIG_CLEAN_FILES)
	+ -test . = "$(srcdir)" \|\| test -z "$(CONFIG_CLEAN_VPATH_FILES)" \|\| rm -f $(CONFIG_CLEAN_VPATH_FILES)
	+
	+maintainer-clean-generic:
	+ @echo "This command is intended for maintainers to use"
	+ @echo "it deletes files that may require special tools to rebuild."
	+clean: clean-am
	+
	+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
	+
	+distclean: distclean-am
	+ -rm -f $(am__CONFIG_DISTCLEAN_FILES)
	+ -rm -rf ./$(DEPDIR)
	+ -rm -f Makefile
	+distclean-am: clean-am distclean-compile distclean-generic \
	+ distclean-hdr distclean-tags
	+
	+dvi: dvi-am
	+
	+dvi-am:
	+
	+html: html-am
	+
	+html-am:
	+
	+info: info-am
	+
	+info-am:
	+
	+install-data-am: install-man
	+
	+install-dvi: install-dvi-am
	+
	+install-dvi-am:
	+
	+install-exec-am: install-binPROGRAMS
	+
	+install-html: install-html-am
	+
	+install-html-am:
	+
	+install-info: install-info-am
	+
	+install-info-am:
	+
	+install-man: install-man1
	+
	+install-pdf: install-pdf-am
	+
	+install-pdf-am:
	+
	+install-ps: install-ps-am
	+
	+install-ps-am:
	+
	+installcheck-am:
	+
	+maintainer-clean: maintainer-clean-am
	+ -rm -f $(am__CONFIG_DISTCLEAN_FILES)
	+ -rm -rf $(top_srcdir)/autom4te.cache
	+ -rm -rf ./$(DEPDIR)
	+ -rm -f Makefile
	+maintainer-clean-am: distclean-am maintainer-clean-generic
	+
	+mostlyclean: mostlyclean-am
	+
	+mostlyclean-am: mostlyclean-compile mostlyclean-generic
	+
	+pdf: pdf-am
	+
	+pdf-am:
	+
	+ps: ps-am
	+
	+ps-am:
	+
	+uninstall-am: uninstall-binPROGRAMS uninstall-man
	+
	+uninstall-man: uninstall-man1
	+
	+.MAKE: all install-am install-strip
	+
	+.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
	+ clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
	+ dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ dist-xz \
	+ dist-zip distcheck distclean distclean-compile \
	+ distclean-generic distclean-hdr distclean-tags distcleancheck \
	+ distdir distuninstallcheck dvi dvi-am html html-am info \
	+ info-am install install-am install-binPROGRAMS install-data \
	+ install-data-am install-dvi install-dvi-am install-exec \
	+ install-exec-am install-html install-html-am install-info \
	+ install-info-am install-man install-man1 install-pdf \
	+ install-pdf-am install-ps install-ps-am install-strip \
	+ installcheck installcheck-am installdirs maintainer-clean \
	+ maintainer-clean-generic mostlyclean mostlyclean-compile \
	+ mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
	+ uninstall-am uninstall-binPROGRAMS uninstall-man \
	+ uninstall-man1
	+
	+# Statically link against local libaff and libewf
	+# Linux
	+#xmount_LDADD = libaff/lib/.libs/libafflib.a libewf/libewf/.libs/libewf.a /usr/lib/libssl.a /usr/lib/libcrypto.a -lstdc++ -lz
	+#xmount_CFLAGS += -Ilibewf/include
	+# OSX using osxfuse
	+#xmount_LDADD = libaff/lib/.libs/libafflib.a libewf/libewf/.libs/libewf.a /opt/local/lib/libcrypto.a /opt/local/lib/libssl.a -lstdc++ -lz -losxfuse
	+#xmount_CFLAGS += -Ilibewf/include -I/usr/local/include/osxfuse/ -D_FILE_OFFSET_BITS=64
	+
	+# 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.
	+.NOEXPORT:
	diff --git a/tags/xmount-0.7.0/old_build/aclocal.m4 b/tags/xmount-0.7.0/old_build/aclocal.m4
	new file mode 100644
	index 0000000..15b63f0
	--- /dev/null
	+++ b/tags/xmount-0.7.0/old_build/aclocal.m4
	@@ -0,0 +1,1166 @@
	+# generated automatically by aclocal 1.11.3 -- Autoconf --
	+
	+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
	+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
	+# Inc.
	+# This file is free software; the Free Software Foundation
	+# gives unlimited permission to copy and/or distribute it,
	+# with or without modifications, as long as this notice is preserved.
	+
	+# This program is distributed in the hope that it will be useful,
	+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
	+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
	+# PARTICULAR PURPOSE.
	+
	+m4_ifndef([AC_AUTOCONF_VERSION],
	+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
	+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],,
	+[m4_warning([this file was generated for autoconf 2.68.
	+You have another version of autoconf. It may work, but is not guaranteed to.
	+If you have problems, you may need to regenerate the build system entirely.
	+To do so, use the procedure documented by the package, typically `autoreconf'.])])
	+
	+# pkg.m4 - Macros to locate and utilise pkg-config. -- Autoconf --
	+# serial 1 (pkg-config-0.24)
	+#
	+# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
	+#
	+# This program is free software; you can redistribute it and/or modify
	+# it under the terms of the GNU General Public License as published by
	+# the Free Software Foundation; either version 2 of the License, or
	+# (at your option) any later version.
	+#
	+# This program is distributed in the hope that it will be useful, but
	+# WITHOUT ANY WARRANTY; without even the implied warranty of
	+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	+# General Public License for more details.
	+#
	+# You should have received a copy of the GNU General Public License
	+# along with this program; if not, write to the Free Software
	+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
	+#
	+# As a special exception to the GNU General Public License, if you
	+# distribute this file as part of a program that contains a
	+# configuration script generated by Autoconf, you may include it under
	+# the same distribution terms that you use for the rest of that program.
	+
	+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
	+# ----------------------------------
	+AC_DEFUN([PKG_PROG_PKG_CONFIG],
	+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
	+m4_pattern_allow([^PKG_CONFIG(_(PATH\|LIBDIR\|SYSROOT_DIR\|ALLOW_SYSTEM_(CFLAGS\|LIBS)))?$])
	+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED\|TOP_BUILD_DIR\|DEBUG_SPEW)$])
	+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
	+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
	+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
	+
	+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
	+ AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
	+fi
	+if test -n "$PKG_CONFIG"; then
	+ _pkg_min_version=m4_default([$1], [0.9.0])
	+ AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
	+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
	+ AC_MSG_RESULT([yes])
	+ else
	+ AC_MSG_RESULT([no])
	+ PKG_CONFIG=""
	+ fi
	+fi[]dnl
	+])# PKG_PROG_PKG_CONFIG
	+
	+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
	+#
	+# Check to see whether a particular set of modules exists. Similar
	+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
	+#
	+# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
	+# only at the first occurence in configure.ac, so if the first place
	+# it's called might be skipped (such as if it is within an "if", you
	+# have to call PKG_CHECK_EXISTS manually
	+# --------------------------------------------------------------
	+AC_DEFUN([PKG_CHECK_EXISTS],
	+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
	+if test -n "$PKG_CONFIG" && \
	+ AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
	+ m4_default([$2], [:])
	+m4_ifvaln([$3], [else
	+ $3])dnl
	+fi])
	+
	+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
	+# ---------------------------------------------
	+m4_define([_PKG_CONFIG],
	+[if test -n "$$1"; then
	+ pkg_cv_[]$1="$$1"
	+ elif test -n "$PKG_CONFIG"; then
	+ PKG_CHECK_EXISTS([$3],
	+ [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
	+ test "x$?" != "x0" && pkg_failed=yes ],
	+ [pkg_failed=yes])
	+ else
	+ pkg_failed=untried
	+fi[]dnl
	+])# _PKG_CONFIG
	+
	+# _PKG_SHORT_ERRORS_SUPPORTED
	+# -----------------------------
	+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
	+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
	+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
	+ _pkg_short_errors_supported=yes
	+else
	+ _pkg_short_errors_supported=no
	+fi[]dnl
	+])# _PKG_SHORT_ERRORS_SUPPORTED
	+
	+
	+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
	+# [ACTION-IF-NOT-FOUND])
	+#
	+#
	+# Note that if there is a possibility the first call to
	+# PKG_CHECK_MODULES might not happen, you should be sure to include an
	+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
	+#
	+#
	+# --------------------------------------------------------------
	+AC_DEFUN([PKG_CHECK_MODULES],
	+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
	+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
	+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
	+
	+pkg_failed=no
	+AC_MSG_CHECKING([for $1])
	+
	+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
	+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
	+
	+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
	+and $1[]_LIBS to avoid the need to call pkg-config.
	+See the pkg-config man page for more details.])
	+
	+if test $pkg_failed = yes; then
	+ AC_MSG_RESULT([no])
	+ _PKG_SHORT_ERRORS_SUPPORTED
	+ if test $_pkg_short_errors_supported = yes; then
	+ $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
	+ else
	+ $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
	+ fi
	+ # Put the nasty error message in config.log where it belongs
	+ echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
	+
	+ m4_default([$4], [AC_MSG_ERROR(
	+[Package requirements ($2) were not met:
	+
	+$$1_PKG_ERRORS
	+
	+Consider adjusting the PKG_CONFIG_PATH environment variable if you
	+installed software in a non-standard prefix.
	+
	+_PKG_TEXT])[]dnl
	+ ])
	+elif test $pkg_failed = untried; then
	+ AC_MSG_RESULT([no])
	+ m4_default([$4], [AC_MSG_FAILURE(
	+[The pkg-config script could not be found or is too old. Make sure it
	+is in your PATH or set the PKG_CONFIG environment variable to the full
	+path to pkg-config.
	+
	+_PKG_TEXT
	+
	+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
	+ ])
	+else
	+ $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
	+ $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
	+ AC_MSG_RESULT([yes])
	+ $3
	+fi[]dnl
	+])# PKG_CHECK_MODULES
	+
	+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
	+# Foundation, Inc.
	+#
	+# This file is free software; the Free Software Foundation
	+# gives unlimited permission to copy and/or distribute it,
	+# with or without modifications, as long as this notice is preserved.
	+
	+# serial 1
	+
	+# AM_AUTOMAKE_VERSION(VERSION)
	+# ----------------------------
	+# Automake X.Y traces this macro to ensure aclocal.m4 has been
	+# generated from the m4 files accompanying Automake X.Y.
	+# (This private macro should not be called outside this file.)
	+AC_DEFUN([AM_AUTOMAKE_VERSION],
	+[am__api_version='1.11'
	+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
	+dnl require some minimum version. Point them to the right macro.
	+m4_if([$1], [1.11.3], [],
	+ [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
	+])
	+
	+# _AM_AUTOCONF_VERSION(VERSION)
	+# -----------------------------
	+# aclocal traces this macro to find the Autoconf version.
	+# This is a private macro too. Using m4_define simplifies
	+# the logic in aclocal, which can simply ignore this definition.
	+m4_define([_AM_AUTOCONF_VERSION], [])
	+
	+# AM_SET_CURRENT_AUTOMAKE_VERSION
	+# -------------------------------
	+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
	+# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
	+AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
	+[AM_AUTOMAKE_VERSION([1.11.3])dnl
	+m4_ifndef([AC_AUTOCONF_VERSION],
	+ [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
	+_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
	+
	+# AM_AUX_DIR_EXPAND -- Autoconf --
	+
	+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
	+#
	+# This file is free software; the Free Software Foundation
	+# gives unlimited permission to copy and/or distribute it,
	+# with or without modifications, as long as this notice is preserved.
	+
	+# serial 1
	+
	+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
	+# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
	+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
	+#
	+# Of course, Automake must honor this variable whenever it calls a
	+# tool from the auxiliary directory. The problem is that $srcdir (and
	+# therefore $ac_aux_dir as well) can be either absolute or relative,
	+# depending on how configure is run. This is pretty annoying, since
	+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
	+# source directory, any form will work fine, but in subdirectories a
	+# relative path needs to be adjusted first.
	+#
	+# $ac_aux_dir/missing
	+# fails when called from a subdirectory if $ac_aux_dir is relative
	+# $top_srcdir/$ac_aux_dir/missing
	+# fails if $ac_aux_dir is absolute,
	+# fails when called from a subdirectory in a VPATH build with
	+# a relative $ac_aux_dir
	+#
	+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
	+# are both prefixed by $srcdir. In an in-source build this is usually
	+# harmless because $srcdir is `.', but things will broke when you
	+# start a VPATH build or use an absolute $srcdir.
	+#
	+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
	+# iff we strip the leading $srcdir from $ac_aux_dir. That would be:
	+# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//$.$"`
	+# and then we would define $MISSING as
	+# MISSING="\${SHELL} $am_aux_dir/missing"
	+# This will work as long as MISSING is not called from configure, because
	+# unfortunately $(top_srcdir) has no meaning in configure.
	+# However there are other variables, like CC, which are often used in
	+# configure, and could therefore not use this "fixed" $ac_aux_dir.
	+#
	+# Another solution, used here, is to always expand $ac_aux_dir to an
	+# absolute PATH. The drawback is that using absolute paths prevent a
	+# configured tree to be moved without reconfiguration.
	+
	+AC_DEFUN([AM_AUX_DIR_EXPAND],
	+[dnl Rely on autoconf to set up CDPATH properly.
	+AC_PREREQ([2.50])dnl
	+# expand $ac_aux_dir to an absolute path
	+am_aux_dir=`cd $ac_aux_dir && pwd`
	+])
	+
	+# AM_CONDITIONAL -- Autoconf --
	+
	+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008
	+# Free Software Foundation, Inc.
	+#
	+# This file is free software; the Free Software Foundation
	+# gives unlimited permission to copy and/or distribute it,
	+# with or without modifications, as long as this notice is preserved.
	+
	+# serial 9
	+
	+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
	+# -------------------------------------
	+# Define a conditional.
	+AC_DEFUN([AM_CONDITIONAL],
	+[AC_PREREQ(2.52)dnl
	+ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])],
	+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
	+AC_SUBST([$1_TRUE])dnl
	+AC_SUBST([$1_FALSE])dnl
	+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
	+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
	+m4_define([_AM_COND_VALUE_$1], [$2])dnl
	+if $2; then
	+ $1_TRUE=
	+ $1_FALSE='#'
	+else
	+ $1_TRUE='#'
	+ $1_FALSE=
	+fi
	+AC_CONFIG_COMMANDS_PRE(
	+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
	+ AC_MSG_ERROR([[conditional "$1" was never defined.
	+Usually this means the macro was only invoked conditionally.]])
	+fi])])
	+
	+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
	+# 2010, 2011 Free Software Foundation, Inc.
	+#
	+# This file is free software; the Free Software Foundation
	+# gives unlimited permission to copy and/or distribute it,
	+# with or without modifications, as long as this notice is preserved.
	+
	+# serial 12
	+
	+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
	+# written in clear, in which case automake, when reading aclocal.m4,
	+# will think it sees a use, and therefore will trigger all it's
	+# C support machinery. Also note that it means that autoscan, seeing
	+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
	+
	+
	+# _AM_DEPENDENCIES(NAME)
	+# ----------------------
	+# See how the compiler implements dependency checking.
	+# NAME is "CC", "CXX", "GCJ", or "OBJC".
	+# We try a few techniques and use that to set a single cache variable.
	+#
	+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
	+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
	+# dependency, and given that the user is not expected to run this macro,
	+# just rely on AC_PROG_CC.
	+AC_DEFUN([_AM_DEPENDENCIES],
	+[AC_REQUIRE([AM_SET_DEPDIR])dnl
	+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
	+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
	+AC_REQUIRE([AM_DEP_TRACK])dnl
	+
	+ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
	+ [$1], CXX, [depcc="$CXX" am_compiler_list=],
	+ [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
	+ [$1], UPC, [depcc="$UPC" am_compiler_list=],
	+ [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
	+ [depcc="$$1" am_compiler_list=])
	+
	+AC_CACHE_CHECK([dependency style of $depcc],
	+ [am_cv_$1_dependencies_compiler_type],
	+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
	+ # We make a subdir and do the tests there. Otherwise we can end up
	+ # making bogus files that we don't know about and never remove. For
	+ # instance it was reported that on HP-UX the gcc test will end up
	+ # making a dummy file named `D' -- because `-MD' means `put the output
	+ # in D'.
	+ rm -rf conftest.dir
	+ mkdir conftest.dir
	+ # Copy depcomp to subdir because otherwise we won't find it if we're
	+ # using a relative directory.
	+ cp "$am_depcomp" conftest.dir
	+ cd conftest.dir
	+ # We will build objects and dependencies in a subdirectory because
	+ # it helps to detect inapplicable dependency modes. For instance
	+ # both Tru64's cc and ICC support -MD to output dependencies as a
	+ # side effect of compilation, but ICC will put the dependencies in
	+ # the current directory while Tru64 will put them in the object
	+ # directory.
	+ mkdir sub
	+
	+ am_cv_$1_dependencies_compiler_type=none
	+ if test "$am_compiler_list" = ""; then
	+ am_compiler_list=`sed -n ['s/^#$[a-zA-Z0-9]$)$/\1/p'] < ./depcomp`
	+ fi
	+ am__universal=false
	+ m4_case([$1], [CC],
	+ [case " $depcc " in #(
	+ \ -arch\ \ -arch\ *) am__universal=true ;;
	+ esac],
	+ [CXX],
	+ [case " $depcc " in #(
	+ \ -arch\ \ -arch\ *) am__universal=true ;;
	+ esac])
	+
	+ for depmode in $am_compiler_list; do
	+ # Setup a source with many dependencies, because some compilers
	+ # like to wrap large dependency lists on column 80 (with \), and
	+ # we should not choose a depcomp mode which is confused by this.
	+ #
	+ # We need to recreate these files for each test, as the compiler may
	+ # overwrite some of them when testing with obscure command lines.
	+ # This happens at least with the AIX C compiler.
	+ : > sub/conftest.c
	+ for i in 1 2 3 4 5 6; do
	+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
	+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
	+ # Solaris 8's {/usr,}/bin/sh.
	+ touch sub/conftst$i.h
	+ done
	+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
	+
	+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
	+ # mode. It turns out that the SunPro C++ compiler does not properly
	+ # handle `-M -o', and we need to detect this. Also, some Intel
	+ # versions had trouble with output in subdirs
	+ am__obj=sub/conftest.${OBJEXT-o}
	+ am__minus_obj="-o $am__obj"
	+ case $depmode in
	+ gcc)
	+ # This depmode causes a compiler race in universal mode.
	+ test "$am__universal" = false \|\| continue
	+ ;;
	+ nosideeffect)
	+ # after this tag, mechanisms are not by side-effect, so they'll
	+ # only be used when explicitly requested
	+ if test "x$enable_dependency_tracking" = xyes; then
	+ continue
	+ else
	+ break
	+ fi
	+ ;;
	+ msvc7 \| msvc7msys \| msvisualcpp \| msvcmsys)
	+ # This compiler won't grok `-c -o', but also, the minuso test has
	+ # not run yet. These depmodes are late enough in the game, and
	+ # so weak that their functioning should not be impacted.
	+ am__obj=conftest.${OBJEXT-o}
	+ am__minus_obj=
	+ ;;
	+ none) break ;;
	+ esac
	+ if depmode=$depmode \
	+ source=sub/conftest.c object=$am__obj \
	+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
	+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
	+ >/dev/null 2>conftest.err &&
	+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
	+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
	+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
	+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
	+ # icc doesn't choke on unknown options, it will just issue warnings
	+ # or remarks (even with -Werror). So we grep stderr for any message
	+ # that says an option was ignored or not supported.
	+ # When given -MP, icc 7.0 and 7.1 complain thusly:
	+ # icc: Command line warning: ignoring option '-M'; no argument required
	+ # The diagnosis changed in icc 8.0:
	+ # icc: Command line remark: option '-MP' not supported
	+ if (grep 'ignoring option' conftest.err \|\|
	+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
	+ am_cv_$1_dependencies_compiler_type=$depmode
	+ break
	+ fi
	+ fi
	+ done
	+
	+ cd ..
	+ rm -rf conftest.dir
	+else
	+ am_cv_$1_dependencies_compiler_type=none
	+fi
	+])
	+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
	+AM_CONDITIONAL([am__fastdep$1], [
	+ test "x$enable_dependency_tracking" != xno \
	+ && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
	+])
	+
	+
	+# AM_SET_DEPDIR
	+# -------------
	+# Choose a directory name for dependency files.
	+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
	+AC_DEFUN([AM_SET_DEPDIR],
	+[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
	+AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
	+])
	+
	+
	+# AM_DEP_TRACK
	+# ------------
	+AC_DEFUN([AM_DEP_TRACK],
	+[AC_ARG_ENABLE(dependency-tracking,
	+[ --disable-dependency-tracking speeds up one-time build
	+ --enable-dependency-tracking do not reject slow dependency extractors])
	+if test "x$enable_dependency_tracking" != xno; then
	+ am_depcomp="$ac_aux_dir/depcomp"
	+ AMDEPBACKSLASH='\'
	+ am__nodep='_no'
	+fi
	+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
	+AC_SUBST([AMDEPBACKSLASH])dnl
	+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
	+AC_SUBST([am__nodep])dnl
	+_AM_SUBST_NOTMAKE([am__nodep])dnl
	+])
	+
	+# Generate code to set up dependency tracking. -- Autoconf --
	+
	+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008
	+# Free Software Foundation, Inc.
	+#
	+# This file is free software; the Free Software Foundation
	+# gives unlimited permission to copy and/or distribute it,
	+# with or without modifications, as long as this notice is preserved.
	+
	+#serial 5
	+
	+# _AM_OUTPUT_DEPENDENCY_COMMANDS
	+# ------------------------------
	+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
	+[{
	+ # Autoconf 2.62 quotes --file arguments for eval, but not when files
	+ # are listed without --file. Let's play safe and only enable the eval
	+ # if we detect the quoting.
	+ case $CONFIG_FILES in
	+ \') eval set x "$CONFIG_FILES" ;;
	+ *) set x $CONFIG_FILES ;;
	+ esac
	+ shift
	+ for mf
	+ do
	+ # Strip MF so we end up with the name of the file.
	+ mf=`echo "$mf" \| sed -e 's/:.*$//'`
	+ # Check whether this is an Automake generated Makefile or not.
	+ # We used to match only the files named `Makefile.in', but
	+ # some people rename them; so instead we look at the file content.
	+ # Grep'ing the first line is not enough: some people post-process
	+ # each Makefile.in and add a new line on top of each file to say so.
	+ # Grep'ing the whole file is not good either: AIX grep has a line
	+ # limit of 2048, but all sed's we know have understand at least 4000.
	+ if sed -n 's,^#.generated by automake.,X,p' "$mf" \| grep X >/dev/null 2>&1; then
	+ dirpart=`AS_DIRNAME("$mf")`
	+ else
	+ continue
	+ fi
	+ # Extract the definition of DEPDIR, am__include, and am__quote
	+ # from the Makefile without running `make'.
	+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
	+ test -z "$DEPDIR" && continue
	+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
	+ test -z "am__include" && continue
	+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
	+ # When using ansi2knr, U may be empty or an underscore; expand it
	+ U=`sed -n 's/^U = //p' < "$mf"`
	+ # Find all dependency output files, they are included files with
	+ # $(DEPDIR) in their names. We invoke sed twice because it is the
	+ # simplest approach to changing $(DEPDIR) to its actual value in the
	+ # expansion.
	+ for file in `sed -n "
	+ s/^$am__include $am__quote$.(DEPDIR).$$am__quote"'$/\1/p' <"$mf" \| \
	+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
	+ # Make sure the directory exists.
	+ test -f "$dirpart/$file" && continue
	+ fdir=`AS_DIRNAME(["$file"])`
	+ AS_MKDIR_P([$dirpart/$fdir])
	+ # echo "creating $dirpart/$file"
	+ echo '# dummy' > "$dirpart/$file"
	+ done
	+ done
	+}
	+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
	+
	+
	+# AM_OUTPUT_DEPENDENCY_COMMANDS
	+# -----------------------------
	+# This macro should only be invoked once -- use via AC_REQUIRE.
	+#
	+# This code is only required when automatic dependency tracking
	+# is enabled. FIXME. This creates each `.P' file that we will
	+# need in order to bootstrap the dependency handling code.
	+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
	+[AC_CONFIG_COMMANDS([depfiles],
	+ [test x"$AMDEP_TRUE" != x"" \|\| _AM_OUTPUT_DEPENDENCY_COMMANDS],
	+ [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
	+])
	+
	+# Do all the work for Automake. -- Autoconf --
	+
	+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
	+# 2005, 2006, 2008, 2009 Free Software Foundation, Inc.
	+#
	+# This file is free software; the Free Software Foundation
	+# gives unlimited permission to copy and/or distribute it,
	+# with or without modifications, as long as this notice is preserved.
	+
	+# serial 16
	+
	+# This macro actually does too much. Some checks are only needed if
	+# your package does certain things. But this isn't really a big deal.
	+
	+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
	+# AM_INIT_AUTOMAKE([OPTIONS])
	+# -----------------------------------------------
	+# The call with PACKAGE and VERSION arguments is the old style
	+# call (pre autoconf-2.50), which is being phased out. PACKAGE
	+# and VERSION should now be passed to AC_INIT and removed from
	+# the call to AM_INIT_AUTOMAKE.
	+# We support both call styles for the transition. After
	+# the next Automake release, Autoconf can make the AC_INIT
	+# arguments mandatory, and then we can depend on a new Autoconf
	+# release and drop the old call support.
	+AC_DEFUN([AM_INIT_AUTOMAKE],
	+[AC_PREREQ([2.62])dnl
	+dnl Autoconf wants to disallow AM_ names. We explicitly allow
	+dnl the ones we care about.
	+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
	+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
	+AC_REQUIRE([AC_PROG_INSTALL])dnl
	+if test "`cd $srcdir && pwd`" != "`pwd`"; then
	+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
	+ # is not polluted with repeated "-I."
	+ AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
	+ # test to see if srcdir already configured
	+ if test -f $srcdir/config.status; then
	+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
	+ fi
	+fi
	+
	+# test whether we have cygpath
	+if test -z "$CYGPATH_W"; then
	+ if (cygpath --version) >/dev/null 2>/dev/null; then
	+ CYGPATH_W='cygpath -w'
	+ else
	+ CYGPATH_W=echo
	+ fi
	+fi
	+AC_SUBST([CYGPATH_W])
	+
	+# Define the identity of the package.
	+dnl Distinguish between old-style and new-style calls.
	+m4_ifval([$2],
	+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
	+ AC_SUBST([PACKAGE], [$1])dnl
	+ AC_SUBST([VERSION], [$2])],
	+[_AM_SET_OPTIONS([$1])dnl
	+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
	+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
	+ [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
	+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
	+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
	+
	+_AM_IF_OPTION([no-define],,
	+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
	+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
	+
	+# Some tools Automake needs.
	+AC_REQUIRE([AM_SANITY_CHECK])dnl
	+AC_REQUIRE([AC_ARG_PROGRAM])dnl
	+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
	+AM_MISSING_PROG(AUTOCONF, autoconf)
	+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
	+AM_MISSING_PROG(AUTOHEADER, autoheader)
	+AM_MISSING_PROG(MAKEINFO, makeinfo)
	+AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
	+AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl
	+AC_REQUIRE([AM_PROG_MKDIR_P])dnl
	+# We need awk for the "check" target. The system "awk" is bad on
	+# some platforms.
	+AC_REQUIRE([AC_PROG_AWK])dnl
	+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
	+AC_REQUIRE([AM_SET_LEADING_DOT])dnl
	+_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
	+ [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
	+ [_AM_PROG_TAR([v7])])])
	+_AM_IF_OPTION([no-dependencies],,
	+[AC_PROVIDE_IFELSE([AC_PROG_CC],
	+ [_AM_DEPENDENCIES(CC)],
	+ [define([AC_PROG_CC],
	+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
	+AC_PROVIDE_IFELSE([AC_PROG_CXX],
	+ [_AM_DEPENDENCIES(CXX)],
	+ [define([AC_PROG_CXX],
	+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
	+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
	+ [_AM_DEPENDENCIES(OBJC)],
	+ [define([AC_PROG_OBJC],
	+ defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
	+])
	+_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl
	+dnl The `parallel-tests' driver may need to know about EXEEXT, so add the
	+dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro
	+dnl is hooked onto _AC_COMPILER_EXEEXT early, see below.
	+AC_CONFIG_COMMANDS_PRE(dnl
	+[m4_provide_if([_AM_COMPILER_EXEEXT],
	+ [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl
	+])
	+
	+dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not
	+dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
	+dnl mangled by Autoconf and run in a shell conditional statement.
	+m4_define([_AC_COMPILER_EXEEXT],
	+m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])])
	+
	+
	+# When config.status generates a header, we must update the stamp-h file.
	+# This file resides in the same directory as the config header
	+# that is generated. The stamp files are numbered to have different names.
	+
	+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
	+# loop where config.status creates the headers, so we can generate
	+# our stamp files there.
	+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
	+[# Compute $1's index in $config_headers.
	+_am_arg=$1
	+_am_stamp_count=1
	+for _am_header in $config_headers :; do
	+ case $_am_header in
	+ $_am_arg \| $_am_arg:* )
	+ break ;;
	+ * )
	+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
	+ esac
	+done
	+echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
	+
	+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
	+# Inc.
	+#
	+# This file is free software; the Free Software Foundation
	+# gives unlimited permission to copy and/or distribute it,
	+# with or without modifications, as long as this notice is preserved.
	+
	+# serial 1
	+
	+# AM_PROG_INSTALL_SH
	+# ------------------
	+# Define $install_sh.
	+AC_DEFUN([AM_PROG_INSTALL_SH],
	+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
	+if test x"${install_sh}" != xset; then
	+ case $am_aux_dir in
	+ \ \| \ )
	+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
	+ *)
	+ install_sh="\${SHELL} $am_aux_dir/install-sh"
	+ esac
	+fi
	+AC_SUBST(install_sh)])
	+
	+# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
	+#
	+# This file is free software; the Free Software Foundation
	+# gives unlimited permission to copy and/or distribute it,
	+# with or without modifications, as long as this notice is preserved.
	+
	+# serial 2
	+
	+# Check whether the underlying file-system supports filenames
	+# with a leading dot. For instance MS-DOS doesn't.
	+AC_DEFUN([AM_SET_LEADING_DOT],
	+[rm -rf .tst 2>/dev/null
	+mkdir .tst 2>/dev/null
	+if test -d .tst; then
	+ am__leading_dot=.
	+else
	+ am__leading_dot=_
	+fi
	+rmdir .tst 2>/dev/null
	+AC_SUBST([am__leading_dot])])
	+
	+# Check to see how 'make' treats includes. -- Autoconf --
	+
	+# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc.
	+#
	+# This file is free software; the Free Software Foundation
	+# gives unlimited permission to copy and/or distribute it,
	+# with or without modifications, as long as this notice is preserved.
	+
	+# serial 4
	+
	+# AM_MAKE_INCLUDE()
	+# -----------------
	+# Check to see how make treats includes.
	+AC_DEFUN([AM_MAKE_INCLUDE],
	+[am_make=${MAKE-make}
	+cat > confinc << 'END'
	+am__doit:
	+ @echo this is the am__doit target
	+.PHONY: am__doit
	+END
	+# If we don't find an include directive, just comment out the code.
	+AC_MSG_CHECKING([for style of include used by $am_make])
	+am__include="#"
	+am__quote=
	+_am_result=none
	+# First try GNU make style include.
	+echo "include confinc" > confmf
	+# Ignore all kinds of additional output from `make'.
	+case `$am_make -s -f confmf 2> /dev/null` in #(
	+the\ am__doit\ target)
	+ am__include=include
	+ am__quote=
	+ _am_result=GNU
	+ ;;
	+esac
	+# Now try BSD make style include.
	+if test "$am__include" = "#"; then
	+ echo '.include "confinc"' > confmf
	+ case `$am_make -s -f confmf 2> /dev/null` in #(
	+ the\ am__doit\ target)
	+ am__include=.include
	+ am__quote="\""
	+ _am_result=BSD
	+ ;;
	+ esac
	+fi
	+AC_SUBST([am__include])
	+AC_SUBST([am__quote])
	+AC_MSG_RESULT([$_am_result])
	+rm -f confinc confmf
	+])
	+
	+# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008
	+# Free Software Foundation, Inc.
	+#
	+# This file is free software; the Free Software Foundation
	+# gives unlimited permission to copy and/or distribute it,
	+# with or without modifications, as long as this notice is preserved.
	+
	+# serial 6
	+
	+# AM_PROG_CC_C_O
	+# --------------
	+# Like AC_PROG_CC_C_O, but changed for automake.
	+AC_DEFUN([AM_PROG_CC_C_O],
	+[AC_REQUIRE([AC_PROG_CC_C_O])dnl
	+AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
	+AC_REQUIRE_AUX_FILE([compile])dnl
	+# FIXME: we rely on the cache variable name because
	+# there is no other way.
	+set dummy $CC
	+am_cc=`echo $[2] \| sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']`
	+eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
	+if test "$am_t" != yes; then
	+ # Losing compiler, so override with the script.
	+ # FIXME: It is wrong to rewrite CC.
	+ # But if we don't then we get into trouble of one sort or another.
	+ # A longer-term fix would be to have automake use am__CC in this case,
	+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
	+ CC="$am_aux_dir/compile $CC"
	+fi
	+dnl Make sure AC_PROG_CC is never called again, or it will override our
	+dnl setting of CC.
	+m4_define([AC_PROG_CC],
	+ [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])])
	+])
	+
	+# Fake the existence of programs that GNU maintainers use. -- Autoconf --
	+
	+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008
	+# Free Software Foundation, Inc.
	+#
	+# This file is free software; the Free Software Foundation
	+# gives unlimited permission to copy and/or distribute it,
	+# with or without modifications, as long as this notice is preserved.
	+
	+# serial 6
	+
	+# AM_MISSING_PROG(NAME, PROGRAM)
	+# ------------------------------
	+AC_DEFUN([AM_MISSING_PROG],
	+[AC_REQUIRE([AM_MISSING_HAS_RUN])
	+$1=${$1-"${am_missing_run}$2"}
	+AC_SUBST($1)])
	+
	+
	+# AM_MISSING_HAS_RUN
	+# ------------------
	+# Define MISSING if not defined so far and test if it supports --run.
	+# If it does, set am_missing_run to use it, otherwise, to nothing.
	+AC_DEFUN([AM_MISSING_HAS_RUN],
	+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
	+AC_REQUIRE_AUX_FILE([missing])dnl
	+if test x"${MISSING+set}" != xset; then
	+ case $am_aux_dir in
	+ \ \| \ )
	+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
	+ *)
	+ MISSING="\${SHELL} $am_aux_dir/missing" ;;
	+ esac
	+fi
	+# Use eval to expand $SHELL
	+if eval "$MISSING --run true"; then
	+ am_missing_run="$MISSING --run "
	+else
	+ am_missing_run=
	+ AC_MSG_WARN([`missing' script is too old or missing])
	+fi
	+])
	+
	+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
	+# Inc.
	+#
	+# This file is free software; the Free Software Foundation
	+# gives unlimited permission to copy and/or distribute it,
	+# with or without modifications, as long as this notice is preserved.
	+
	+# serial 1
	+
	+# AM_PROG_MKDIR_P
	+# ---------------
	+# Check for `mkdir -p'.
	+AC_DEFUN([AM_PROG_MKDIR_P],
	+[AC_PREREQ([2.60])dnl
	+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
	+dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P,
	+dnl while keeping a definition of mkdir_p for backward compatibility.
	+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
	+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
	+dnl Makefile.ins that do not define MKDIR_P, so we do our own
	+dnl adjustment using top_builddir (which is defined more often than
	+dnl MKDIR_P).
	+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
	+case $mkdir_p in
	+ [[\\/$]]* \| ?:[[\\/]]*) ;;
	+ /) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
	+esac
	+])
	+
	+# Helper functions for option handling. -- Autoconf --
	+
	+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
	+# Foundation, Inc.
	+#
	+# This file is free software; the Free Software Foundation
	+# gives unlimited permission to copy and/or distribute it,
	+# with or without modifications, as long as this notice is preserved.
	+
	+# serial 5
	+
	+# _AM_MANGLE_OPTION(NAME)
	+# -----------------------
	+AC_DEFUN([_AM_MANGLE_OPTION],
	+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
	+
	+# _AM_SET_OPTION(NAME)
	+# --------------------
	+# Set option NAME. Presently that only means defining a flag for this option.
	+AC_DEFUN([_AM_SET_OPTION],
	+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
	+
	+# _AM_SET_OPTIONS(OPTIONS)
	+# ------------------------
	+# OPTIONS is a space-separated list of Automake options.
	+AC_DEFUN([_AM_SET_OPTIONS],
	+[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
	+
	+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
	+# -------------------------------------------
	+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
	+AC_DEFUN([_AM_IF_OPTION],
	+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
	+
	+# Check to make sure that the build environment is sane. -- Autoconf --
	+
	+# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008
	+# Free Software Foundation, Inc.
	+#
	+# This file is free software; the Free Software Foundation
	+# gives unlimited permission to copy and/or distribute it,
	+# with or without modifications, as long as this notice is preserved.
	+
	+# serial 5
	+
	+# AM_SANITY_CHECK
	+# ---------------
	+AC_DEFUN([AM_SANITY_CHECK],
	+[AC_MSG_CHECKING([whether build environment is sane])
	+# Just in case
	+sleep 1
	+echo timestamp > conftest.file
	+# Reject unsafe characters in $srcdir or the absolute working directory
	+# name. Accept space and tab only in the latter.
	+am_lf='
	+'
	+case `pwd` in
	+ [[\\\"\#\$\&\'\`$am_lf]])
	+ AC_MSG_ERROR([unsafe absolute working directory name]);;
	+esac
	+case $srcdir in
	+ [[\\\"\#\$\&\'\`$am_lf\ \ ]])
	+ AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);;
	+esac
	+
	+# Do `set' in a subshell so we don't clobber the current shell's
	+# arguments. Must try -L first in case configure is actually a
	+# symlink; some systems play weird games with the mod time of symlinks
	+# (eg FreeBSD returns the mod time of the symlink's containing
	+# directory).
	+if (
	+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
	+ if test "$[*]" = "X"; then
	+ # -L didn't work.
	+ set X `ls -t "$srcdir/configure" conftest.file`
	+ fi
	+ rm -f conftest.file
	+ if test "$[*]" != "X $srcdir/configure conftest.file" \
	+ && test "$[*]" != "X conftest.file $srcdir/configure"; then
	+
	+ # If neither matched, then we have a broken ls. This can happen
	+ # if, for instance, CONFIG_SHELL is bash and it inherits a
	+ # broken ls alias from the environment. This has actually
	+ # happened. Such a system could not be considered "sane".
	+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken
	+alias in your environment])
	+ fi
	+
	+ test "$[2]" = conftest.file
	+ )
	+then
	+ # Ok.
	+ :
	+else
	+ AC_MSG_ERROR([newly created file is older than distributed files!
	+Check your system clock])
	+fi
	+AC_MSG_RESULT(yes)])
	+
	+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
	+#
	+# This file is free software; the Free Software Foundation
	+# gives unlimited permission to copy and/or distribute it,
	+# with or without modifications, as long as this notice is preserved.
	+
	+# serial 1
	+
	+# AM_PROG_INSTALL_STRIP
	+# ---------------------
	+# One issue with vendor `install' (even GNU) is that you can't
	+# specify the program used to strip binaries. This is especially
	+# annoying in cross-compiling environments, where the build's strip
	+# is unlikely to handle the host's binaries.
	+# Fortunately install-sh will honor a STRIPPROG variable, so we
	+# always use install-sh in `make install-strip', and initialize
	+# STRIPPROG with the value of the STRIP variable (set by the user).
	+AC_DEFUN([AM_PROG_INSTALL_STRIP],
	+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
	+# Installed binaries are usually stripped using `strip' when the user
	+# run `make install-strip'. However `strip' might not be the right
	+# tool to use in cross-compilation environments, therefore Automake
	+# will honor the `STRIP' environment variable to overrule this program.
	+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
	+if test "$cross_compiling" != no; then
	+ AC_CHECK_TOOL([STRIP], [strip], :)
	+fi
	+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
	+AC_SUBST([INSTALL_STRIP_PROGRAM])])
	+
	+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
	+#
	+# This file is free software; the Free Software Foundation
	+# gives unlimited permission to copy and/or distribute it,
	+# with or without modifications, as long as this notice is preserved.
	+
	+# serial 3
	+
	+# _AM_SUBST_NOTMAKE(VARIABLE)
	+# ---------------------------
	+# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in.
	+# This macro is traced by Automake.
	+AC_DEFUN([_AM_SUBST_NOTMAKE])
	+
	+# AM_SUBST_NOTMAKE(VARIABLE)
	+# --------------------------
	+# Public sister of _AM_SUBST_NOTMAKE.
	+AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
	+
	+# Check how to create a tarball. -- Autoconf --
	+
	+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
	+#
	+# This file is free software; the Free Software Foundation
	+# gives unlimited permission to copy and/or distribute it,
	+# with or without modifications, as long as this notice is preserved.
	+
	+# serial 2
	+
	+# _AM_PROG_TAR(FORMAT)
	+# --------------------
	+# Check how to create a tarball in format FORMAT.
	+# FORMAT should be one of `v7', `ustar', or `pax'.
	+#
	+# Substitute a variable $(am__tar) that is a command
	+# writing to stdout a FORMAT-tarball containing the directory
	+# $tardir.
	+# tardir=directory && $(am__tar) > result.tar
	+#
	+# Substitute a variable $(am__untar) that extract such
	+# a tarball read from stdin.
	+# $(am__untar) < result.tar
	+AC_DEFUN([_AM_PROG_TAR],
	+[# Always define AMTAR for backward compatibility. Yes, it's still used
	+# in the wild :-( We should find a proper way to deprecate it ...
	+AC_SUBST([AMTAR], ['$${TAR-tar}'])
	+m4_if([$1], [v7],
	+ [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
	+ [m4_case([$1], [ustar],, [pax],,
	+ [m4_fatal([Unknown tar format])])
	+AC_MSG_CHECKING([how to create a $1 tar archive])
	+# Loop over all known methods to create a tar archive until one works.
	+_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
	+_am_tools=${am_cv_prog_tar_$1-$_am_tools}
	+# Do not fold the above two line into one, because Tru64 sh and
	+# Solaris sh will not grok spaces in the rhs of `-'.
	+for _am_tool in $_am_tools
	+do
	+ case $_am_tool in
	+ gnutar)
	+ for _am_tar in tar gnutar gtar;
	+ do
	+ AM_RUN_LOG([$_am_tar --version]) && break
	+ done
	+ am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
	+ am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
	+ am__untar="$_am_tar -xf -"
	+ ;;
	+ plaintar)
	+ # Must skip GNU tar: if it does not support --format= it doesn't create
	+ # ustar tarball either.
	+ (tar --version) >/dev/null 2>&1 && continue
	+ am__tar='tar chf - "$$tardir"'
	+ am__tar_='tar chf - "$tardir"'
	+ am__untar='tar xf -'
	+ ;;
	+ pax)
	+ am__tar='pax -L -x $1 -w "$$tardir"'
	+ am__tar_='pax -L -x $1 -w "$tardir"'
	+ am__untar='pax -r'
	+ ;;
	+ cpio)
	+ am__tar='find "$$tardir" -print \| cpio -o -H $1 -L'
	+ am__tar_='find "$tardir" -print \| cpio -o -H $1 -L'
	+ am__untar='cpio -i -H $1 -d'
	+ ;;
	+ none)
	+ am__tar=false
	+ am__tar_=false
	+ am__untar=false
	+ ;;
	+ esac
	+
	+ # If the value was cached, stop now. We just wanted to have am__tar
	+ # and am__untar set.
	+ test -n "${am_cv_prog_tar_$1}" && break
	+
	+ # tar/untar a dummy directory, and stop if the command works
	+ rm -rf conftest.dir
	+ mkdir conftest.dir
	+ echo GrepMe > conftest.dir/file
	+ AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
	+ rm -rf conftest.dir
	+ if test -s conftest.tar; then
	+ AM_RUN_LOG([$am__untar <conftest.tar])
	+ grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
	+ fi
	+done
	+rm -rf conftest.dir
	+
	+AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
	+AC_MSG_RESULT([$am_cv_prog_tar_$1])])
	+AC_SUBST([am__tar])
	+AC_SUBST([am__untar])
	+]) # _AM_PROG_TAR
	+
	diff --git a/tags/xmount-0.7.0/old_build/compile b/tags/xmount-0.7.0/old_build/compile
	new file mode 100755
	index 0000000..1b1d232
	--- /dev/null
	+++ b/tags/xmount-0.7.0/old_build/compile
	@@ -0,0 +1,142 @@
	+#! /bin/sh
	+# Wrapper for compilers which do not understand `-c -o'.
	+
	+scriptversion=2005-05-14.22
	+
	+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
	+# Written by Tom Tromey <tromey@cygnus.com>.
	+#
	+# This program is free software; you can redistribute it and/or modify
	+# it under the terms of the GNU General Public License as published by
	+# the Free Software Foundation; either version 2, or (at your option)
	+# any later version.
	+#
	+# This program is distributed in the hope that it will be useful,
	+# but WITHOUT ANY WARRANTY; without even the implied warranty of
	+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	+# GNU General Public License for more details.
	+#
	+# You should have received a copy of the GNU General Public License
	+# along with this program; if not, write to the Free Software
	+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
	+
	+# As a special exception to the GNU General Public License, if you
	+# distribute this file as part of a program that contains a
	+# configuration script generated by Autoconf, you may include it under
	+# the same distribution terms that you use for the rest of that program.
	+
	+# This file is maintained in Automake, please report
	+# bugs to <bug-automake@gnu.org> or send patches to
	+# <automake-patches@gnu.org>.
	+
	+case $1 in
	+ '')
	+ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
	+ exit 1;
	+ ;;
	+ -h \| --h*)
	+ cat <<\EOF
	+Usage: compile [--help] [--version] PROGRAM [ARGS]
	+
	+Wrapper for compilers which do not understand `-c -o'.
	+Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
	+arguments, and rename the output as expected.
	+
	+If you are trying to build a whole package this is not the
	+right script to run: please start by reading the file `INSTALL'.
	+
	+Report bugs to <bug-automake@gnu.org>.
	+EOF
	+ exit $?
	+ ;;
	+ -v \| --v*)
	+ echo "compile $scriptversion"
	+ exit $?
	+ ;;
	+esac
	+
	+ofile=
	+cfile=
	+eat=
	+
	+for arg
	+do
	+ if test -n "$eat"; then
	+ eat=
	+ else
	+ case $1 in
	+ -o)
	+ # configure might choose to run compile as `compile cc -o foo foo.c'.
	+ # So we strip `-o arg' only if arg is an object.
	+ eat=1
	+ case $2 in
	+ .o \| .obj)
	+ ofile=$2
	+ ;;
	+ *)
	+ set x "$@" -o "$2"
	+ shift
	+ ;;
	+ esac
	+ ;;
	+ *.c)
	+ cfile=$1
	+ set x "$@" "$1"
	+ shift
	+ ;;
	+ *)
	+ set x "$@" "$1"
	+ shift
	+ ;;
	+ esac
	+ fi
	+ shift
	+done
	+
	+if test -z "$ofile" \|\| test -z "$cfile"; then
	+ # If no `-o' option was seen then we might have been invoked from a
	+ # pattern rule where we don't need one. That is ok -- this is a
	+ # normal compilation that the losing compiler can handle. If no
	+ # `.c' file was seen then we are probably linking. That is also
	+ # ok.
	+ exec "$@"
	+fi
	+
	+# Name of file we expect compiler to create.
	+cofile=`echo "$cfile" \| sed -e 's\|^.*/\|\|' -e 's/\.c$/.o/'`
	+
	+# Create the lock directory.
	+# Note: use `[/.-]' here to ensure that we don't use the same name
	+# that we are using for the .o file. Also, base the name on the expected
	+# object file name, since that is what matters with a parallel build.
	+lockdir=`echo "$cofile" \| sed -e 's\|[/.-]\|_\|g'`.d
	+while true; do
	+ if mkdir "$lockdir" >/dev/null 2>&1; then
	+ break
	+ fi
	+ sleep 1
	+done
	+# FIXME: race condition here if user kills between mkdir and trap.
	+trap "rmdir '$lockdir'; exit 1" 1 2 15
	+
	+# Run the compile.
	+"$@"
	+ret=$?
	+
	+if test -f "$cofile"; then
	+ mv "$cofile" "$ofile"
	+elif test -f "${cofile}bj"; then
	+ mv "${cofile}bj" "$ofile"
	+fi
	+
	+rmdir "$lockdir"
	+exit $ret
	+
	+# Local Variables:
	+# mode: shell-script
	+# sh-indentation: 2
	+# eval: (add-hook 'write-file-hooks 'time-stamp)
	+# time-stamp-start: "scriptversion="
	+# time-stamp-format: "%:y-%02m-%02d.%02H"
	+# time-stamp-end: "$"
	+# End:
	diff --git a/tags/xmount-0.7.0/old_build/config.guess b/tags/xmount-0.7.0/old_build/config.guess
	new file mode 100755
	index 0000000..da83314
	--- /dev/null
	+++ b/tags/xmount-0.7.0/old_build/config.guess
	@@ -0,0 +1,1561 @@
	+#! /bin/sh
	+# Attempt to guess a canonical system name.
	+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
	+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
	+# Free Software Foundation, Inc.
	+
	+timestamp='2009-04-27'
	+
	+# This file is free software; you can redistribute it and/or modify it
	+# under the terms of the GNU General Public License as published by
	+# the Free Software Foundation; either version 2 of the License, or
	+# (at your option) any later version.
	+#
	+# This program is distributed in the hope that it will be useful, but
	+# WITHOUT ANY WARRANTY; without even the implied warranty of
	+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	+# General Public License for more details.
	+#
	+# You should have received a copy of the GNU General Public License
	+# along with this program; if not, write to the Free Software
	+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
	+# 02110-1301, USA.
	+#
	+# As a special exception to the GNU General Public License, if you
	+# distribute this file as part of a program that contains a
	+# configuration script generated by Autoconf, you may include it under
	+# the same distribution terms that you use for the rest of that program.
	+
	+
	+# Originally written by Per Bothner <per@bothner.com>.
	+# Please send patches to <config-patches@gnu.org>. Submit a context
	+# diff and a properly formatted ChangeLog entry.
	+#
	+# This script attempts to guess a canonical system name similar to
	+# config.sub. If it succeeds, it prints the system name on stdout, and
	+# exits with 0. Otherwise, it exits with 1.
	+#
	+# The plan is that this can be called by configure scripts if you
	+# don't specify an explicit build system type.
	+
	+me=`echo "$0" \| sed -e 's,.*/,,'`
	+
	+usage="\
	+Usage: $0 [OPTION]
	+
	+Output the configuration name of the system \`$me' is run on.
	+
	+Operation modes:
	+ -h, --help print this help, then exit
	+ -t, --time-stamp print date of last modification, then exit
	+ -v, --version print version number, then exit
	+
	+Report bugs and patches to <config-patches@gnu.org>."
	+
	+version="\
	+GNU config.guess ($timestamp)
	+
	+Originally written by Per Bothner.
	+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
	+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
	+
	+This is free software; see the source for copying conditions. There is NO
	+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
	+
	+help="
	+Try \`$me --help' for more information."
	+
	+# Parse command line
	+while test $# -gt 0 ; do
	+ case $1 in
	+ --time-stamp \| --time* \| -t )
	+ echo "$timestamp" ; exit ;;
	+ --version \| -v )
	+ echo "$version" ; exit ;;
	+ --help \| --h* \| -h )
	+ echo "$usage"; exit ;;
	+ -- ) # Stop option processing
	+ shift; break ;;
	+ - ) # Use stdin as input.
	+ break ;;
	+ -* )
	+ echo "$me: invalid option $1$help" >&2
	+ exit 1 ;;
	+ * )
	+ break ;;
	+ esac
	+done
	+
	+if test $# != 0; then
	+ echo "$me: too many arguments$help" >&2
	+ exit 1
	+fi
	+
	+trap 'exit 1' 1 2 15
	+
	+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
	+# compiler to aid in system detection is discouraged as it requires
	+# temporary files to be created and, as you can see below, it is a
	+# headache to deal with in a portable fashion.
	+
	+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
	+# use `HOST_CC' if defined, but it is deprecated.
	+
	+# Portable tmp directory creation inspired by the Autoconf team.
	+
	+set_cc_for_build='
	+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
	+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
	+: ${TMPDIR=/tmp} ;
	+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } \|\|
	+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } \|\|
	+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } \|\|
	+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
	+dummy=$tmp/dummy ;
	+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
	+case $CC_FOR_BUILD,$HOST_CC,$CC in
	+ ,,) echo "int x;" > $dummy.c ;
	+ for c in cc gcc c89 c99 ; do
	+ if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
	+ CC_FOR_BUILD="$c"; break ;
	+ fi ;
	+ done ;
	+ if test x"$CC_FOR_BUILD" = x ; then
	+ CC_FOR_BUILD=no_compiler_found ;
	+ fi
	+ ;;
	+ ,,*) CC_FOR_BUILD=$CC ;;
	+ ,,) CC_FOR_BUILD=$HOST_CC ;;
	+esac ; set_cc_for_build= ;'
	+
	+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
	+# (ghazi@noc.rutgers.edu 1994-08-24)
	+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
	+ PATH=$PATH:/.attbin ; export PATH
	+fi
	+
	+UNAME_MACHINE=`(uname -m) 2>/dev/null` \|\| UNAME_MACHINE=unknown
	+UNAME_RELEASE=`(uname -r) 2>/dev/null` \|\| UNAME_RELEASE=unknown
	+UNAME_SYSTEM=`(uname -s) 2>/dev/null` \|\| UNAME_SYSTEM=unknown
	+UNAME_VERSION=`(uname -v) 2>/dev/null` \|\| UNAME_VERSION=unknown
	+
	+# Note: order is significant - the case branches are not exclusive.
	+
	+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
	+ :NetBSD::*)
	+ # NetBSD (nbsd) targets should (where applicable) match one or
	+ # more of the tupples: --netbsdelf, --netbsdaout,
	+ # --netbsdecoff* and --netbsd*. For targets that recently
	+ # switched to ELF, --netbsd* would select the old
	+ # object file format. This provides both forward
	+ # compatibility and a consistent mechanism for selecting the
	+ # object file format.
	+ #
	+ # Note: NetBSD doesn't particularly care about the vendor
	+ # portion of the name. We always set it to "unknown".
	+ sysctl="sysctl -n hw.machine_arch"
	+ UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null \|\| \
	+ /usr/sbin/$sysctl 2>/dev/null \|\| echo unknown)`
	+ case "${UNAME_MACHINE_ARCH}" in
	+ armeb) machine=armeb-unknown ;;
	+ arm*) machine=arm-unknown ;;
	+ sh3el) machine=shl-unknown ;;
	+ sh3eb) machine=sh-unknown ;;
	+ sh5el) machine=sh5le-unknown ;;
	+ *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
	+ esac
	+ # The Operating System including object format, if it has switched
	+ # to ELF recently, or will in the future.
	+ case "${UNAME_MACHINE_ARCH}" in
	+ arm\|i386\|m68k\|ns32k\|sh3\|sparc\|vax)
	+ eval $set_cc_for_build
	+ if echo __ELF__ \| $CC_FOR_BUILD -E - 2>/dev/null \
	+ \| grep __ELF__ >/dev/null
	+ then
	+ # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
	+ # Return netbsd for either. FIX?
	+ os=netbsd
	+ else
	+ os=netbsdelf
	+ fi
	+ ;;
	+ *)
	+ os=netbsd
	+ ;;
	+ esac
	+ # The OS release
	+ # Debian GNU/NetBSD machines have a different userland, and
	+ # thus, need a distinct triplet. However, they do not need
	+ # kernel version information, so it can be replaced with a
	+ # suitable tag, in the style of linux-gnu.
	+ case "${UNAME_VERSION}" in
	+ Debian*)
	+ release='-gnu'
	+ ;;
	+ *)
	+ release=`echo ${UNAME_RELEASE}\|sed -e 's/[-_].*/\./'`
	+ ;;
	+ esac
	+ # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
	+ # contains redundant information, the shorter form:
	+ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
	+ echo "${machine}-${os}${release}"
	+ exit ;;
	+ :OpenBSD::*)
	+ UNAME_MACHINE_ARCH=`arch \| sed 's/OpenBSD.//'`
	+ echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
	+ exit ;;
	+ :ekkoBSD::*)
	+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
	+ exit ;;
	+ :SolidBSD::*)
	+ echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
	+ exit ;;
	+ macppc:MirBSD::)
	+ echo powerpc-unknown-mirbsd${UNAME_RELEASE}
	+ exit ;;
	+ :MirBSD::*)
	+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
	+ exit ;;
	+ alpha:OSF1::)
	+ case $UNAME_RELEASE in
	+ *4.0)
	+ UNAME_RELEASE=`/usr/sbin/sizer -v \| awk '{print $3}'`
	+ ;;
	+ 5.)
	+ UNAME_RELEASE=`/usr/sbin/sizer -v \| awk '{print $4}'`
	+ ;;
	+ esac
	+ # According to Compaq, /usr/sbin/psrinfo has been available on
	+ # OSF/1 and Tru64 systems produced since 1995. I hope that
	+ # covers most systems running today. This code pipes the CPU
	+ # types through head -n 1, so we only detect the type of CPU 0.
	+ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v \| sed -n -e 's/^ The alpha $.$ processor.$/\1/p' \| head -n 1`
	+ case "$ALPHA_CPU_TYPE" in
	+ "EV4 (21064)")
	+ UNAME_MACHINE="alpha" ;;
	+ "EV4.5 (21064)")
	+ UNAME_MACHINE="alpha" ;;
	+ "LCA4 (21066/21068)")
	+ UNAME_MACHINE="alpha" ;;
	+ "EV5 (21164)")
	+ UNAME_MACHINE="alphaev5" ;;
	+ "EV5.6 (21164A)")
	+ UNAME_MACHINE="alphaev56" ;;
	+ "EV5.6 (21164PC)")
	+ UNAME_MACHINE="alphapca56" ;;
	+ "EV5.7 (21164PC)")
	+ UNAME_MACHINE="alphapca57" ;;
	+ "EV6 (21264)")
	+ UNAME_MACHINE="alphaev6" ;;
	+ "EV6.7 (21264A)")
	+ UNAME_MACHINE="alphaev67" ;;
	+ "EV6.8CB (21264C)")
	+ UNAME_MACHINE="alphaev68" ;;
	+ "EV6.8AL (21264B)")
	+ UNAME_MACHINE="alphaev68" ;;
	+ "EV6.8CX (21264D)")
	+ UNAME_MACHINE="alphaev68" ;;
	+ "EV6.9A (21264/EV69A)")
	+ UNAME_MACHINE="alphaev69" ;;
	+ "EV7 (21364)")
	+ UNAME_MACHINE="alphaev7" ;;
	+ "EV7.9 (21364A)")
	+ UNAME_MACHINE="alphaev79" ;;
	+ esac
	+ # A Pn.n version is a patched version.
	+ # A Vn.n version is a released version.
	+ # A Tn.n version is a released field test version.
	+ # A Xn.n version is an unreleased experimental baselevel.
	+ # 1.2 uses "1.2" for uname -r.
	+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} \| sed -e 's/^[PVTX]//' \| tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
	+ exit ;;
	+ Alpha\ :Windows_NT:*)
	+ # How do we know it's Interix rather than the generic POSIX subsystem?
	+ # Should we change UNAME_MACHINE based on the output of uname instead
	+ # of the specific Alpha model?
	+ echo alpha-pc-interix
	+ exit ;;
	+ 21064:Windows_NT:50:3)
	+ echo alpha-dec-winnt3.5
	+ exit ;;
	+ Amiga:UNIX_System_V:4.0:)
	+ echo m68k-unknown-sysv4
	+ exit ;;
	+ :[Aa]miga[Oo][Ss]::*)
	+ echo ${UNAME_MACHINE}-unknown-amigaos
	+ exit ;;
	+ :[Mm]orph[Oo][Ss]::*)
	+ echo ${UNAME_MACHINE}-unknown-morphos
	+ exit ;;
	+ :OS/390::*)
	+ echo i370-ibm-openedition
	+ exit ;;
	+ :z/VM::*)
	+ echo s390-ibm-zvmoe
	+ exit ;;
	+ :OS400::*)
	+ echo powerpc-ibm-os400
	+ exit ;;
	+ arm:RISC:1.[012]:\|arm:riscix:1.[012]:*)
	+ echo arm-acorn-riscix${UNAME_RELEASE}
	+ exit ;;
	+ arm:riscos::\|arm:RISCOS::)
	+ echo arm-unknown-riscos
	+ exit ;;
	+ SR2?01:HI-UX/MPP:: \| SR8000:HI-UX/MPP::)
	+ echo hppa1.1-hitachi-hiuxmpp
	+ exit ;;
	+ Pyramid:OSx:: \| MIS:OSx:: \| MIS:SMP_DC-OSx::)
	+ # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
	+ if test "`(/bin/universe) 2>/dev/null`" = att ; then
	+ echo pyramid-pyramid-sysv3
	+ else
	+ echo pyramid-pyramid-bsd
	+ fi
	+ exit ;;
	+ NILE::*:dcosx)
	+ echo pyramid-pyramid-svr4
	+ exit ;;
	+ DRS?6000:unix:4.0:6*)
	+ echo sparc-icl-nx6
	+ exit ;;
	+ DRS?6000:UNIX_SV:4.2:7 \| DRS?6000:isis:4.2:7)
	+ case `/usr/bin/uname -p` in
	+ sparc) echo sparc-icl-nx7; exit ;;
	+ esac ;;
	+ s390x:SunOS::)
	+ echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}\|sed -e 's/[^.]*//'`
	+ exit ;;
	+ sun4H:SunOS:5.:)
	+ echo sparc-hal-solaris2`echo ${UNAME_RELEASE}\|sed -e 's/[^.]*//'`
	+ exit ;;
	+ sun4:SunOS:5.:* \| tadpole:SunOS:5.:*)
	+ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}\|sed -e 's/[^.]*//'`
	+ exit ;;
	+ i86pc:SunOS:5.: \| i86xen:SunOS:5.:)
	+ eval $set_cc_for_build
	+ SUN_ARCH="i386"
	+ # If there is a compiler, see if it is configured for 64-bit objects.
	+ # Note that the Sun cc does not turn __LP64__ into 1 like gcc does.
	+ # This test works for both compilers.
	+ if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then
	+ if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') \| \
	+ (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) \| \
	+ grep IS_64BIT_ARCH >/dev/null
	+ then
	+ SUN_ARCH="x86_64"
	+ fi
	+ fi
	+ echo ${SUN_ARCH}-pc-solaris2`echo ${UNAME_RELEASE}\|sed -e 's/[^.]*//'`
	+ exit ;;
	+ sun4:SunOS:6:*)
	+ # According to config.sub, this is the proper way to canonicalize
	+ # SunOS6. Hard to guess exactly what SunOS6 will be like, but
	+ # it's likely to be more like Solaris than SunOS4.
	+ echo sparc-sun-solaris3`echo ${UNAME_RELEASE}\|sed -e 's/[^.]*//'`
	+ exit ;;
	+ sun4:SunOS::*)
	+ case "`/usr/bin/arch -k`" in
	+ Series\|S4)
	+ UNAME_RELEASE=`uname -v`
	+ ;;
	+ esac
	+ # Japanese Language versions have a version number like `4.1.3-JL'.
	+ echo sparc-sun-sunos`echo ${UNAME_RELEASE}\|sed -e 's/-/_/'`
	+ exit ;;
	+ sun3:SunOS::*)
	+ echo m68k-sun-sunos${UNAME_RELEASE}
	+ exit ;;
	+ sun::4.2BSD:*)
	+ UNAME_RELEASE=`(sed 1q /etc/motd \| awk '{print substr($5,1,3)}') 2>/dev/null`
	+ test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
	+ case "`/bin/arch`" in
	+ sun3)
	+ echo m68k-sun-sunos${UNAME_RELEASE}
	+ ;;
	+ sun4)
	+ echo sparc-sun-sunos${UNAME_RELEASE}
	+ ;;
	+ esac
	+ exit ;;
	+ aushp:SunOS::)
	+ echo sparc-auspex-sunos${UNAME_RELEASE}
	+ exit ;;
	+ # The situation for MiNT is a little confusing. The machine name
	+ # can be virtually everything (everything which is not
	+ # "atarist" or "atariste" at least should have a processor
	+ # > m68000). The system name ranges from "MiNT" over "FreeMiNT"
	+ # to the lowercase version "mint" (or "freemint"). Finally
	+ # the system name "TOS" denotes a system which is actually not
	+ # MiNT. But MiNT is downward compatible to TOS, so this should
	+ # be no problem.
	+ atarist[e]:MiNT::* \| atarist[e]:mint::* \| atarist[e]:TOS::*)
	+ echo m68k-atari-mint${UNAME_RELEASE}
	+ exit ;;
	+ atari:MiNT:: \| atari:mint:: \| atarist[e]:TOS::*)
	+ echo m68k-atari-mint${UNAME_RELEASE}
	+ exit ;;
	+ falcon:MiNT::* \| falcon:mint::* \| falcon:TOS::*)
	+ echo m68k-atari-mint${UNAME_RELEASE}
	+ exit ;;
	+ milan:MiNT:: \| milan:mint:: \| milan:TOS::*)
	+ echo m68k-milan-mint${UNAME_RELEASE}
	+ exit ;;
	+ hades:MiNT:: \| hades:mint:: \| hades:TOS::*)
	+ echo m68k-hades-mint${UNAME_RELEASE}
	+ exit ;;
	+ :MiNT:: \| :mint:: \| :TOS::)
	+ echo m68k-unknown-mint${UNAME_RELEASE}
	+ exit ;;
	+ m68k:machten::)
	+ echo m68k-apple-machten${UNAME_RELEASE}
	+ exit ;;
	+ powerpc:machten::)
	+ echo powerpc-apple-machten${UNAME_RELEASE}
	+ exit ;;
	+ RISC:Mach::*)
	+ echo mips-dec-mach_bsd4.3
	+ exit ;;
	+ RISC:ULTRIX::*)
	+ echo mips-dec-ultrix${UNAME_RELEASE}
	+ exit ;;
	+ VAX:ULTRIX::)
	+ echo vax-dec-ultrix${UNAME_RELEASE}
	+ exit ;;
	+ 2020:CLIX:: \| 2430:CLIX::)
	+ echo clipper-intergraph-clix${UNAME_RELEASE}
	+ exit ;;
	+ mips:::UMIPS \| mips:::RISCos)
	+ eval $set_cc_for_build
	+ sed 's/^ //' << EOF >$dummy.c
	+#ifdef __cplusplus
	+#include <stdio.h> /* for printf() prototype */
	+ int main (int argc, char *argv[]) {
	+#else
	+ int main (argc, argv) int argc; char *argv[]; {
	+#endif
	+ #if defined (host_mips) && defined (MIPSEB)
	+ #if defined (SYSTYPE_SYSV)
	+ printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
	+ #endif
	+ #if defined (SYSTYPE_SVR4)
	+ printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
	+ #endif
	+ #if defined (SYSTYPE_BSD43) \|\| defined(SYSTYPE_BSD)
	+ printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
	+ #endif
	+ #endif
	+ exit (-1);
	+ }
	+EOF
	+ $CC_FOR_BUILD -o $dummy $dummy.c &&
	+ dummyarg=`echo "${UNAME_RELEASE}" \| sed -n 's/$[0-9]$./\1/p'` &&
	+ SYSTEM_NAME=`$dummy $dummyarg` &&
	+ { echo "$SYSTEM_NAME"; exit; }
	+ echo mips-mips-riscos${UNAME_RELEASE}
	+ exit ;;
	+ Motorola:PowerMAX_OS::)
	+ echo powerpc-motorola-powermax
	+ exit ;;
	+ Motorola::4.3:PL8-)
	+ echo powerpc-harris-powermax
	+ exit ;;
	+ Night_Hawk:::PowerMAX_OS \| Synergy:PowerMAX_OS::)
	+ echo powerpc-harris-powermax
	+ exit ;;
	+ Night_Hawk:Power_UNIX::)
	+ echo powerpc-harris-powerunix
	+ exit ;;
	+ m88k:CX/UX:7:)
	+ echo m88k-harris-cxux7
	+ exit ;;
	+ m88k::4:R4*)
	+ echo m88k-motorola-sysv4
	+ exit ;;
	+ m88k::3:R3*)
	+ echo m88k-motorola-sysv3
	+ exit ;;
	+ AViiON:dgux::)
	+ # DG/UX returns AViiON for all architectures
	+ UNAME_PROCESSOR=`/usr/bin/uname -p`
	+ if [ $UNAME_PROCESSOR = mc88100 ] \|\| [ $UNAME_PROCESSOR = mc88110 ]
	+ then
	+ if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] \|\| \
	+ [ ${TARGET_BINARY_INTERFACE}x = x ]
	+ then
	+ echo m88k-dg-dgux${UNAME_RELEASE}
	+ else
	+ echo m88k-dg-dguxbcs${UNAME_RELEASE}
	+ fi
	+ else
	+ echo i586-dg-dgux${UNAME_RELEASE}
	+ fi
	+ exit ;;
	+ M88:DolphinOS::*) # DolphinOS (SVR3)
	+ echo m88k-dolphin-sysv3
	+ exit ;;
	+ M88::R3:)
	+ # Delta 88k system running SVR3
	+ echo m88k-motorola-sysv3
	+ exit ;;
	+ XD88:::) # Tektronix XD88 system running UTekV (SVR3)
	+ echo m88k-tektronix-sysv3
	+ exit ;;
	+ Tek43[0-9][0-9]:UTek::) # Tektronix 4300 system running UTek (BSD)
	+ echo m68k-tektronix-bsd
	+ exit ;;
	+ :IRIX::)
	+ echo mips-sgi-irix`echo ${UNAME_RELEASE}\|sed -e 's/-/_/g'`
	+ exit ;;
	+ ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
	+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
	+ exit ;; # Note that: echo "'`uname -s`'" gives 'AIX '
	+ i86:AIX::*)
	+ echo i386-ibm-aix
	+ exit ;;
	+ ia64:AIX::)
	+ if [ -x /usr/bin/oslevel ] ; then
	+ IBM_REV=`/usr/bin/oslevel`
	+ else
	+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
	+ fi
	+ echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
	+ exit ;;
	+ *:AIX:2:3)
	+ if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
	+ eval $set_cc_for_build
	+ sed 's/^ //' << EOF >$dummy.c
	+ #include <sys/systemcfg.h>
	+
	+ main()
	+ {
	+ if (!__power_pc())
	+ exit(1);
	+ puts("powerpc-ibm-aix3.2.5");
	+ exit(0);
	+ }
	+EOF
	+ if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
	+ then
	+ echo "$SYSTEM_NAME"
	+ else
	+ echo rs6000-ibm-aix3.2.5
	+ fi
	+ elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
	+ echo rs6000-ibm-aix3.2.4
	+ else
	+ echo rs6000-ibm-aix3.2
	+ fi
	+ exit ;;
	+ :AIX::[456])
	+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available \| sed 1q \| awk '{ print $1 }'`
	+ if /usr/sbin/lsattr -El ${IBM_CPU_ID} \| grep ' POWER' >/dev/null 2>&1; then
	+ IBM_ARCH=rs6000
	+ else
	+ IBM_ARCH=powerpc
	+ fi
	+ if [ -x /usr/bin/oslevel ] ; then
	+ IBM_REV=`/usr/bin/oslevel`
	+ else
	+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
	+ fi
	+ echo ${IBM_ARCH}-ibm-aix${IBM_REV}
	+ exit ;;
	+ :AIX::*)
	+ echo rs6000-ibm-aix
	+ exit ;;
	+ ibmrt:4.4BSD:\|romp-ibm:BSD:)
	+ echo romp-ibm-bsd4.4
	+ exit ;;
	+ ibmrt:BSD:\|romp-ibm:BSD:*) # covers RT/PC BSD and
	+ echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
	+ exit ;; # report: romp-ibm BSD 4.3
	+ :BOSX::*)
	+ echo rs6000-bull-bosx
	+ exit ;;
	+ DPX/2?00:B.O.S.::)
	+ echo m68k-bull-sysv3
	+ exit ;;
	+ 9000/[34]??:4.3bsd:1.:)
	+ echo m68k-hp-bsd
	+ exit ;;
	+ hp300:4.4BSD:: \| 9000/[34]??:4.3bsd:2.:)
	+ echo m68k-hp-bsd4.4
	+ exit ;;
	+ 9000/[34678]??:HP-UX::)
	+ HPUX_REV=`echo ${UNAME_RELEASE}\|sed -e 's/[^.].[0B]//'`
	+ case "${UNAME_MACHINE}" in
	+ 9000/31? ) HP_ARCH=m68000 ;;
	+ 9000/[34]?? ) HP_ARCH=m68k ;;
	+ 9000/[678][0-9][0-9])
	+ if [ -x /usr/bin/getconf ]; then
	+ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
	+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
	+ case "${sc_cpu_version}" in
	+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
	+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
	+ 532) # CPU_PA_RISC2_0
	+ case "${sc_kernel_bits}" in
	+ 32) HP_ARCH="hppa2.0n" ;;
	+ 64) HP_ARCH="hppa2.0w" ;;
	+ '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
	+ esac ;;
	+ esac
	+ fi
	+ if [ "${HP_ARCH}" = "" ]; then
	+ eval $set_cc_for_build
	+ sed 's/^ //' << EOF >$dummy.c
	+
	+ #define _HPUX_SOURCE
	+ #include <stdlib.h>
	+ #include <unistd.h>
	+
	+ int main ()
	+ {
	+ #if defined(_SC_KERNEL_BITS)
	+ long bits = sysconf(_SC_KERNEL_BITS);
	+ #endif
	+ long cpu = sysconf (_SC_CPU_VERSION);
	+
	+ switch (cpu)
	+ {
	+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
	+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
	+ case CPU_PA_RISC2_0:
	+ #if defined(_SC_KERNEL_BITS)
	+ switch (bits)
	+ {
	+ case 64: puts ("hppa2.0w"); break;
	+ case 32: puts ("hppa2.0n"); break;
	+ default: puts ("hppa2.0"); break;
	+ } break;
	+ #else /* !defined(_SC_KERNEL_BITS) */
	+ puts ("hppa2.0"); break;
	+ #endif
	+ default: puts ("hppa1.0"); break;
	+ }
	+ exit (0);
	+ }
	+EOF
	+ (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
	+ test -z "$HP_ARCH" && HP_ARCH=hppa
	+ fi ;;
	+ esac
	+ if [ ${HP_ARCH} = "hppa2.0w" ]
	+ then
	+ eval $set_cc_for_build
	+
	+ # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
	+ # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler
	+ # generating 64-bit code. GNU and HP use different nomenclature:
	+ #
	+ # $ CC_FOR_BUILD=cc ./config.guess
	+ # => hppa2.0w-hp-hpux11.23
	+ # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
	+ # => hppa64-hp-hpux11.23
	+
	+ if echo __LP64__ \| (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) \|
	+ grep __LP64__ >/dev/null
	+ then
	+ HP_ARCH="hppa2.0w"
	+ else
	+ HP_ARCH="hppa64"
	+ fi
	+ fi
	+ echo ${HP_ARCH}-hp-hpux${HPUX_REV}
	+ exit ;;
	+ ia64:HP-UX::)
	+ HPUX_REV=`echo ${UNAME_RELEASE}\|sed -e 's/[^.].[0B]//'`
	+ echo ia64-hp-hpux${HPUX_REV}
	+ exit ;;
	+ 3050:HI-UX::*)
	+ eval $set_cc_for_build
	+ sed 's/^ //' << EOF >$dummy.c
	+ #include <unistd.h>
	+ int
	+ main ()
	+ {
	+ long cpu = sysconf (_SC_CPU_VERSION);
	+ /* The order matters, because CPU_IS_HP_MC68K erroneously returns
	+ true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct
	+ results, however. */
	+ if (CPU_IS_PA_RISC (cpu))
	+ {
	+ switch (cpu)
	+ {
	+ case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
	+ case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
	+ case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
	+ default: puts ("hppa-hitachi-hiuxwe2"); break;
	+ }
	+ }
	+ else if (CPU_IS_HP_MC68K (cpu))
	+ puts ("m68k-hitachi-hiuxwe2");
	+ else puts ("unknown-hitachi-hiuxwe2");
	+ exit (0);
	+ }
	+EOF
	+ $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
	+ { echo "$SYSTEM_NAME"; exit; }
	+ echo unknown-hitachi-hiuxwe2
	+ exit ;;
	+ 9000/7??:4.3bsd:: \| 9000/8?[79]:4.3bsd:: )
	+ echo hppa1.1-hp-bsd
	+ exit ;;
	+ 9000/8??:4.3bsd::)
	+ echo hppa1.0-hp-bsd
	+ exit ;;
	+ 9??:MPE/iX:: \| 3000:MPE/iX::)
	+ echo hppa1.0-hp-mpeix
	+ exit ;;
	+ hp7??:OSF1:: \| hp8?[79]:OSF1:: )
	+ echo hppa1.1-hp-osf
	+ exit ;;
	+ hp8??:OSF1::)
	+ echo hppa1.0-hp-osf
	+ exit ;;
	+ i86:OSF1::*)
	+ if [ -x /usr/sbin/sysversion ] ; then
	+ echo ${UNAME_MACHINE}-unknown-osf1mk
	+ else
	+ echo ${UNAME_MACHINE}-unknown-osf1
	+ fi
	+ exit ;;
	+ parisc:Lites::)
	+ echo hppa1.1-hp-lites
	+ exit ;;
	+ C1:ConvexOS::* \| convex:ConvexOS:C1:)
	+ echo c1-convex-bsd
	+ exit ;;
	+ C2:ConvexOS::* \| convex:ConvexOS:C2:)
	+ if getsysinfo -f scalar_acc
	+ then echo c32-convex-bsd
	+ else echo c2-convex-bsd
	+ fi
	+ exit ;;
	+ C34:ConvexOS::* \| convex:ConvexOS:C34:)
	+ echo c34-convex-bsd
	+ exit ;;
	+ C38:ConvexOS::* \| convex:ConvexOS:C38:)
	+ echo c38-convex-bsd
	+ exit ;;
	+ C4:ConvexOS::* \| convex:ConvexOS:C4:)
	+ echo c4-convex-bsd
	+ exit ;;
	+ CRAYY-MP:::)
	+ echo ymp-cray-unicos${UNAME_RELEASE} \| sed -e 's/\.[^.]*$/.X/'
	+ exit ;;
	+ CRAY[A-Z]90:::)
	+ echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
	+ \| sed -e 's/CRAY.*$[A-Z]90$/\1/' \
	+ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
	+ -e 's/\.[^.]*$/.X/'
	+ exit ;;
	+ CRAYTS:::)
	+ echo t90-cray-unicos${UNAME_RELEASE} \| sed -e 's/\.[^.]*$/.X/'
	+ exit ;;
	+ CRAYT3E:::)
	+ echo alphaev5-cray-unicosmk${UNAME_RELEASE} \| sed -e 's/\.[^.]*$/.X/'
	+ exit ;;
	+ CRAYSV1:::)
	+ echo sv1-cray-unicos${UNAME_RELEASE} \| sed -e 's/\.[^.]*$/.X/'
	+ exit ;;
	+ :UNICOS/mp::*)
	+ echo craynv-cray-unicosmp${UNAME_RELEASE} \| sed -e 's/\.[^.]*$/.X/'
	+ exit ;;
	+ F30[01]:UNIX_System_V:: \| F700:UNIX_System_V::)
	+ FUJITSU_PROC=`uname -m \| tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
	+ FUJITSU_SYS=`uname -p \| tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' \| sed -e 's/\///'`
	+ FUJITSU_REL=`echo ${UNAME_RELEASE} \| sed -e 's/ /_/'`
	+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
	+ exit ;;
	+ 5000:UNIX_System_V:4.:)
	+ FUJITSU_SYS=`uname -p \| tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' \| sed -e 's/\///'`
	+ FUJITSU_REL=`echo ${UNAME_RELEASE} \| tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' \| sed -e 's/ /_/'`
	+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
	+ exit ;;
	+ i86:BSD/386::* \| i86:BSD/OS::* \| :Ascend\ Embedded/OS::*)
	+ echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
	+ exit ;;
	+ sparc:BSD/OS::*)
	+ echo sparc-unknown-bsdi${UNAME_RELEASE}
	+ exit ;;
	+ :BSD/OS::*)
	+ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
	+ exit ;;
	+ :FreeBSD::*)
	+ case ${UNAME_MACHINE} in
	+ pc98)
	+ echo i386-unknown-freebsd`echo ${UNAME_RELEASE}\|sed -e 's/[-(].*//'` ;;
	+ amd64)
	+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}\|sed -e 's/[-(].*//'` ;;
	+ *)
	+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}\|sed -e 's/[-(].*//'` ;;
	+ esac
	+ exit ;;
	+ i:CYGWIN:*)
	+ echo ${UNAME_MACHINE}-pc-cygwin
	+ exit ;;
	+ :MINGW:*)
	+ echo ${UNAME_MACHINE}-pc-mingw32
	+ exit ;;
	+ i:windows32:*)
	+ # uname -m includes "-pc" on this system.
	+ echo ${UNAME_MACHINE}-mingw32
	+ exit ;;
	+ i:PW:*)
	+ echo ${UNAME_MACHINE}-pc-pw32
	+ exit ;;
	+ :Interix:[3456]*)
	+ case ${UNAME_MACHINE} in
	+ x86)
	+ echo i586-pc-interix${UNAME_RELEASE}
	+ exit ;;
	+ EM64T \| authenticamd \| genuineintel)
	+ echo x86_64-unknown-interix${UNAME_RELEASE}
	+ exit ;;
	+ IA64)
	+ echo ia64-unknown-interix${UNAME_RELEASE}
	+ exit ;;
	+ esac ;;
	+ [345]86:Windows_95:* \| [345]86:Windows_98:* \| [345]86:Windows_NT:*)
	+ echo i${UNAME_MACHINE}-pc-mks
	+ exit ;;
	+ i:Windows_NT:* \| Pentium:Windows_NT:*)
	+ # How do we know it's Interix rather than the generic POSIX subsystem?
	+ # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
	+ # UNAME_MACHINE based on the output of uname instead of i386?
	+ echo i586-pc-interix
	+ exit ;;
	+ i:UWIN:*)
	+ echo ${UNAME_MACHINE}-pc-uwin
	+ exit ;;
	+ amd64:CYGWIN::* \| x86_64:CYGWIN::*)
	+ echo x86_64-unknown-cygwin
	+ exit ;;
	+ p:CYGWIN:*)
	+ echo powerpcle-unknown-cygwin
	+ exit ;;
	+ prep:SunOS:5.:*)
	+ echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}\|sed -e 's/[^.]*//'`
	+ exit ;;
	+ :GNU::*)
	+ # the GNU system
	+ echo `echo ${UNAME_MACHINE}\|sed -e 's,[-/].$,,'`-unknown-gnu`echo ${UNAME_RELEASE}\|sed -e 's,/.$,,'`
	+ exit ;;
	+ :GNU/::)
	+ # other systems with GNU libc and userland
	+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} \| sed 's,^[^/]/,,' \| tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}\|sed -e 's/[-(].//'`-gnu
	+ exit ;;
	+ i86:Minix::*)
	+ echo ${UNAME_MACHINE}-pc-minix
	+ exit ;;
	+ arm:Linux::*)
	+ eval $set_cc_for_build
	+ if echo __ARM_EABI__ \| $CC_FOR_BUILD -E - 2>/dev/null \
	+ \| grep -q __ARM_EABI__
	+ then
	+ echo ${UNAME_MACHINE}-unknown-linux-gnu
	+ else
	+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
	+ fi
	+ exit ;;
	+ avr32:Linux::*)
	+ echo ${UNAME_MACHINE}-unknown-linux-gnu
	+ exit ;;
	+ cris:Linux::)
	+ echo cris-axis-linux-gnu
	+ exit ;;
	+ crisv32:Linux::)
	+ echo crisv32-axis-linux-gnu
	+ exit ;;
	+ frv:Linux::)
	+ echo frv-unknown-linux-gnu
	+ exit ;;
	+ ia64:Linux::)
	+ echo ${UNAME_MACHINE}-unknown-linux-gnu
	+ exit ;;
	+ m32r:Linux::*)
	+ echo ${UNAME_MACHINE}-unknown-linux-gnu
	+ exit ;;
	+ m68:Linux::*)
	+ echo ${UNAME_MACHINE}-unknown-linux-gnu
	+ exit ;;
	+ mips:Linux::)
	+ eval $set_cc_for_build
	+ sed 's/^ //' << EOF >$dummy.c
	+ #undef CPU
	+ #undef mips
	+ #undef mipsel
	+ #if defined(__MIPSEL__) \|\| defined(__MIPSEL) \|\| defined(_MIPSEL) \|\| defined(MIPSEL)
	+ CPU=mipsel
	+ #else
	+ #if defined(__MIPSEB__) \|\| defined(__MIPSEB) \|\| defined(_MIPSEB) \|\| defined(MIPSEB)
	+ CPU=mips
	+ #else
	+ CPU=
	+ #endif
	+ #endif
	+EOF
	+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null \| sed -n '
	+ /^CPU/{
	+ s: ::g
	+ p
	+ }'`"
	+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
	+ ;;
	+ mips64:Linux::)
	+ eval $set_cc_for_build
	+ sed 's/^ //' << EOF >$dummy.c
	+ #undef CPU
	+ #undef mips64
	+ #undef mips64el
	+ #if defined(__MIPSEL__) \|\| defined(__MIPSEL) \|\| defined(_MIPSEL) \|\| defined(MIPSEL)
	+ CPU=mips64el
	+ #else
	+ #if defined(__MIPSEB__) \|\| defined(__MIPSEB) \|\| defined(_MIPSEB) \|\| defined(MIPSEB)
	+ CPU=mips64
	+ #else
	+ CPU=
	+ #endif
	+ #endif
	+EOF
	+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null \| sed -n '
	+ /^CPU/{
	+ s: ::g
	+ p
	+ }'`"
	+ test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
	+ ;;
	+ or32:Linux::)
	+ echo or32-unknown-linux-gnu
	+ exit ;;
	+ ppc:Linux::)
	+ echo powerpc-unknown-linux-gnu
	+ exit ;;
	+ ppc64:Linux::)
	+ echo powerpc64-unknown-linux-gnu
	+ exit ;;
	+ alpha:Linux::)
	+ case `sed -n '/^cpu model/s/^.: $.$/\1/p' < /proc/cpuinfo` in
	+ EV5) UNAME_MACHINE=alphaev5 ;;
	+ EV56) UNAME_MACHINE=alphaev56 ;;
	+ PCA56) UNAME_MACHINE=alphapca56 ;;
	+ PCA57) UNAME_MACHINE=alphapca56 ;;
	+ EV6) UNAME_MACHINE=alphaev6 ;;
	+ EV67) UNAME_MACHINE=alphaev67 ;;
	+ EV68*) UNAME_MACHINE=alphaev68 ;;
	+ esac
	+ objdump --private-headers /bin/sh \| grep ld.so.1 >/dev/null
	+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
	+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
	+ exit ;;
	+ padre:Linux::)
	+ echo sparc-unknown-linux-gnu
	+ exit ;;
	+ parisc:Linux:: \| hppa:Linux::)
	+ # Look for CPU level
	+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null \| cut -d' ' -f2` in
	+ PA7*) echo hppa1.1-unknown-linux-gnu ;;
	+ PA8*) echo hppa2.0-unknown-linux-gnu ;;
	+ *) echo hppa-unknown-linux-gnu ;;
	+ esac
	+ exit ;;
	+ parisc64:Linux:: \| hppa64:Linux::)
	+ echo hppa64-unknown-linux-gnu
	+ exit ;;
	+ s390:Linux:: \| s390x:Linux::)
	+ echo ${UNAME_MACHINE}-ibm-linux
	+ exit ;;
	+ sh64:Linux::*)
	+ echo ${UNAME_MACHINE}-unknown-linux-gnu
	+ exit ;;
	+ sh:Linux::*)
	+ echo ${UNAME_MACHINE}-unknown-linux-gnu
	+ exit ;;
	+ sparc:Linux:: \| sparc64:Linux::)
	+ echo ${UNAME_MACHINE}-unknown-linux-gnu
	+ exit ;;
	+ vax:Linux::)
	+ echo ${UNAME_MACHINE}-dec-linux-gnu
	+ exit ;;
	+ x86_64:Linux::)
	+ echo x86_64-unknown-linux-gnu
	+ exit ;;
	+ xtensa:Linux::*)
	+ echo ${UNAME_MACHINE}-unknown-linux-gnu
	+ exit ;;
	+ i86:Linux::*)
	+ # The BFD linker knows what the default object file format is, so
	+ # first see if it will tell us. cd to the root directory to prevent
	+ # problems with other programs or directories called `ld' in the path.
	+ # Set LC_ALL=C to ensure ld outputs messages in English.
	+ ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
	+ \| sed -ne '/supported targets:/!d
	+ s/[ ][ ]*/ /g
	+ s/.supported targets: //
	+ s/ .*//
	+ p'`
	+ case "$ld_supported_targets" in
	+ elf32-i386)
	+ TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
	+ ;;
	+ a.out-i386-linux)
	+ echo "${UNAME_MACHINE}-pc-linux-gnuaout"
	+ exit ;;
	+ "")
	+ # Either a pre-BFD a.out linker (linux-gnuoldld) or
	+ # one that does not give us useful --help.
	+ echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
	+ exit ;;
	+ esac
	+ # Determine whether the default compiler is a.out or elf
	+ eval $set_cc_for_build
	+ sed 's/^ //' << EOF >$dummy.c
	+ #include <features.h>
	+ #ifdef __ELF__
	+ # ifdef __GLIBC__
	+ # if __GLIBC__ >= 2
	+ LIBC=gnu
	+ # else
	+ LIBC=gnulibc1
	+ # endif
	+ # else
	+ LIBC=gnulibc1
	+ # endif
	+ #else
	+ #if defined(__INTEL_COMPILER) \|\| defined(__PGI) \|\| defined(__SUNPRO_C) \|\| defined(__SUNPRO_CC)
	+ LIBC=gnu
	+ #else
	+ LIBC=gnuaout
	+ #endif
	+ #endif
	+ #ifdef __dietlibc__
	+ LIBC=dietlibc
	+ #endif
	+EOF
	+ eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null \| sed -n '
	+ /^LIBC/{
	+ s: ::g
	+ p
	+ }'`"
	+ test x"${LIBC}" != x && {
	+ echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
	+ exit
	+ }
	+ test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
	+ ;;
	+ i86:DYNIX/ptx:4:*)
	+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
	+ # earlier versions are messed up and put the nodename in both
	+ # sysname and nodename.
	+ echo i386-sequent-sysv4
	+ exit ;;
	+ i86:UNIX_SV:4.2MP:2.)
	+ # Unixware is an offshoot of SVR4, but it has its own version
	+ # number series starting with 2...
	+ # I am not positive that other SVR4 systems won't match this,
	+ # I just have to hope. -- rms.
	+ # Use sysv4.2uw... so that sysv4* matches it.
	+ echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
	+ exit ;;
	+ i86:OS/2::*)
	+ # If we were able to find `uname', then EMX Unix compatibility
	+ # is probably installed.
	+ echo ${UNAME_MACHINE}-pc-os2-emx
	+ exit ;;
	+ i86:XTS-300::STOP)
	+ echo ${UNAME_MACHINE}-unknown-stop
	+ exit ;;
	+ i86:atheos::*)
	+ echo ${UNAME_MACHINE}-unknown-atheos
	+ exit ;;
	+ i86:syllable::*)
	+ echo ${UNAME_MACHINE}-pc-syllable
	+ exit ;;
	+ i86:LynxOS:2.:* \| i86:LynxOS:3.[01]:* \| i86:LynxOS:4.0:*)
	+ echo i386-unknown-lynxos${UNAME_RELEASE}
	+ exit ;;
	+ i86:DOS::)
	+ echo ${UNAME_MACHINE}-pc-msdosdjgpp
	+ exit ;;
	+ i86::4.: \| i86:SYSTEM_V:4.:*)
	+ UNAME_REL=`echo ${UNAME_RELEASE} \| sed 's/\/MP$//'`
	+ if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
	+ echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
	+ else
	+ echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
	+ fi
	+ exit ;;
	+ i86::5:[678]*)
	+ # UnixWare 7.x, OpenUNIX and OpenServer 6.
	+ case `/bin/uname -X \| grep "^Machine"` in
	+ 486) UNAME_MACHINE=i486 ;;
	+ *Pentium) UNAME_MACHINE=i586 ;;
	+ Pent\|*Celeron) UNAME_MACHINE=i686 ;;
	+ esac
	+ echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
	+ exit ;;
	+ i86::3.2:*)
	+ if test -f /usr/options/cb.name; then
	+ UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
	+ echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
	+ elif /bin/uname -X 2>/dev/null >/dev/null ; then
	+ UNAME_REL=`(/bin/uname -X\|grep Release\|sed -e 's/.*= //')`
	+ (/bin/uname -X\|grep i80486 >/dev/null) && UNAME_MACHINE=i486
	+ (/bin/uname -X\|grep '^Machine.*Pentium' >/dev/null) \
	+ && UNAME_MACHINE=i586
	+ (/bin/uname -X\|grep '^Machine.Pent II' >/dev/null) \
	+ && UNAME_MACHINE=i686
	+ (/bin/uname -X\|grep '^Machine.*Pentium Pro' >/dev/null) \
	+ && UNAME_MACHINE=i686
	+ echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
	+ else
	+ echo ${UNAME_MACHINE}-pc-sysv32
	+ fi
	+ exit ;;
	+ pc:::*)
	+ # Left here for compatibility:
	+ # uname -m prints for DJGPP always 'pc', but it prints nothing about
	+ # the processor, so we play safe by assuming i586.
	+ # Note: whatever this is, it MUST be the same as what config.sub
	+ # prints for the "djgpp" host, or else GDB configury will decide that
	+ # this is a cross-build.
	+ echo i586-pc-msdosdjgpp
	+ exit ;;
	+ Intel:Mach:3:)
	+ echo i386-pc-mach3
	+ exit ;;
	+ paragon:::*)
	+ echo i860-intel-osf1
	+ exit ;;
	+ i860::4.:*) # i860-SVR4
	+ if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
	+ echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
	+ else # Add other i860-SVR4 vendors below as they are discovered.
	+ echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
	+ fi
	+ exit ;;
	+ mini:CTIX:SYS5:*)
	+ # "miniframe"
	+ echo m68010-convergent-sysv
	+ exit ;;
	+ mc68k:UNIX:SYSTEM5:3.51m)
	+ echo m68k-convergent-sysv
	+ exit ;;
	+ M680?0:D-NIX:5.3:*)
	+ echo m68k-diab-dnix
	+ exit ;;
	+ M68::R3V[5678]:)
	+ test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
	+ 3[345]??::4.0:3.0 \| 3[34]??A::4.0:3.0 \| 3[34]??,::4.0:3.0 \| 3[34]??/::4.0:3.0 \| 4400::4.0:3.0 \| 4850::4.0:3.0 \| SKA40::4.0:3.0 \| SDS2::4.0:3.0 \| SHG2::4.0:3.0 \| S7501:*:4.0:3.0)
	+ OS_REL=''
	+ test -r /etc/.relid \
	+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid`
	+ /bin/uname -p 2>/dev/null \| grep 86 >/dev/null \
	+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
	+ /bin/uname -p 2>/dev/null \| /bin/grep entium >/dev/null \
	+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
	+ 3[34]??::4.0: \| 3[34]??,::4.0:*)
	+ /bin/uname -p 2>/dev/null \| grep 86 >/dev/null \
	+ && { echo i486-ncr-sysv4; exit; } ;;
	+ NCR::4.2:* \| MPRAS::4.2:*)
	+ OS_REL='.3'
	+ test -r /etc/.relid \
	+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* $[0-9][0-9]$.*/\1/p' < /etc/.relid`
	+ /bin/uname -p 2>/dev/null \| grep 86 >/dev/null \
	+ && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
	+ /bin/uname -p 2>/dev/null \| /bin/grep entium >/dev/null \
	+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; }
	+ /bin/uname -p 2>/dev/null \| /bin/grep pteron >/dev/null \
	+ && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
	+ m68:LynxOS:2.:* \| m68:LynxOS:3.0:*)
	+ echo m68k-unknown-lynxos${UNAME_RELEASE}
	+ exit ;;
	+ mc68030:UNIX_System_V:4.:)
	+ echo m68k-atari-sysv4
	+ exit ;;
	+ TSUNAMI:LynxOS:2.:)
	+ echo sparc-unknown-lynxos${UNAME_RELEASE}
	+ exit ;;
	+ rs6000:LynxOS:2.:)
	+ echo rs6000-unknown-lynxos${UNAME_RELEASE}
	+ exit ;;
	+ PowerPC:LynxOS:2.: \| PowerPC:LynxOS:3.[01]: \| PowerPC:LynxOS:4.0:)
	+ echo powerpc-unknown-lynxos${UNAME_RELEASE}
	+ exit ;;
	+ SM[BE]S:UNIX_SV::)
	+ echo mips-dde-sysv${UNAME_RELEASE}
	+ exit ;;
	+ RM:ReliantUNIX-::)
	+ echo mips-sni-sysv4
	+ exit ;;
	+ RM:SINIX-::)
	+ echo mips-sni-sysv4
	+ exit ;;
	+ :SINIX-::)
	+ if uname -p 2>/dev/null >/dev/null ; then
	+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
	+ echo ${UNAME_MACHINE}-sni-sysv4
	+ else
	+ echo ns32k-sni-sysv
	+ fi
	+ exit ;;
	+ PENTIUM::4.0:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
	+ # says <Richard.M.Bartel@ccMail.Census.GOV>
	+ echo i586-unisys-sysv4
	+ exit ;;
	+ :UNIX_System_V:4:FTX*)
	+ # From Gerald Hewes <hewes@openmarket.com>.
	+ # How about differentiating between stratus architectures? -djm
	+ echo hppa1.1-stratus-sysv4
	+ exit ;;
	+ :::FTX)
	+ # From seanf@swdc.stratus.com.
	+ echo i860-stratus-sysv4
	+ exit ;;
	+ i86:VOS::*)
	+ # From Paul.Green@stratus.com.
	+ echo ${UNAME_MACHINE}-stratus-vos
	+ exit ;;
	+ :VOS::*)
	+ # From Paul.Green@stratus.com.
	+ echo hppa1.1-stratus-vos
	+ exit ;;
	+ mc68:A/UX::*)
	+ echo m68k-apple-aux${UNAME_RELEASE}
	+ exit ;;
	+ news:NEWS-OS:6:*)
	+ echo mips-sony-newsos6
	+ exit ;;
	+ R[34]000:System_V:: \| R4000:UNIX_SYSV:: \| R000:UNIX_SV::*)
	+ if [ -d /usr/nec ]; then
	+ echo mips-nec-sysv${UNAME_RELEASE}
	+ else
	+ echo mips-unknown-sysv${UNAME_RELEASE}
	+ fi
	+ exit ;;
	+ BeBox:BeOS::) # BeOS running on hardware made by Be, PPC only.
	+ echo powerpc-be-beos
	+ exit ;;
	+ BeMac:BeOS::) # BeOS running on Mac or Mac clone, PPC only.
	+ echo powerpc-apple-beos
	+ exit ;;
	+ BePC:BeOS::) # BeOS running on Intel PC compatible.
	+ echo i586-pc-beos
	+ exit ;;
	+ BePC:Haiku::) # Haiku running on Intel PC compatible.
	+ echo i586-pc-haiku
	+ exit ;;
	+ SX-4:SUPER-UX::)
	+ echo sx4-nec-superux${UNAME_RELEASE}
	+ exit ;;
	+ SX-5:SUPER-UX::)
	+ echo sx5-nec-superux${UNAME_RELEASE}
	+ exit ;;
	+ SX-6:SUPER-UX::)
	+ echo sx6-nec-superux${UNAME_RELEASE}
	+ exit ;;
	+ SX-7:SUPER-UX::)
	+ echo sx7-nec-superux${UNAME_RELEASE}
	+ exit ;;
	+ SX-8:SUPER-UX::)
	+ echo sx8-nec-superux${UNAME_RELEASE}
	+ exit ;;
	+ SX-8R:SUPER-UX::)
	+ echo sx8r-nec-superux${UNAME_RELEASE}
	+ exit ;;
	+ Power:Rhapsody::*)
	+ echo powerpc-apple-rhapsody${UNAME_RELEASE}
	+ exit ;;
	+ :Rhapsody::*)
	+ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
	+ exit ;;
	+ :Darwin::*)
	+ UNAME_PROCESSOR=`uname -p` \|\| UNAME_PROCESSOR=unknown
	+ case $UNAME_PROCESSOR in
	+ unknown) UNAME_PROCESSOR=powerpc ;;
	+ esac
	+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
	+ exit ;;
	+ :procnto:: \| :QNX:[0123456789]:*)
	+ UNAME_PROCESSOR=`uname -p`
	+ if test "$UNAME_PROCESSOR" = "x86"; then
	+ UNAME_PROCESSOR=i386
	+ UNAME_MACHINE=pc
	+ fi
	+ echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
	+ exit ;;
	+ :QNX::4*)
	+ echo i386-pc-qnx
	+ exit ;;
	+ NSE-?:NONSTOP_KERNEL::)
	+ echo nse-tandem-nsk${UNAME_RELEASE}
	+ exit ;;
	+ NSR-?:NONSTOP_KERNEL::)
	+ echo nsr-tandem-nsk${UNAME_RELEASE}
	+ exit ;;
	+ :NonStop-UX::*)
	+ echo mips-compaq-nonstopux
	+ exit ;;
	+ BS2000:POSIX::*)
	+ echo bs2000-siemens-sysv
	+ exit ;;
	+ DS/:UNIX_System_V::*)
	+ echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
	+ exit ;;
	+ :Plan9::*)
	+ # "uname -m" is not consistent, so use $cputype instead. 386
	+ # is converted to i386 for consistency with other x86
	+ # operating systems.
	+ if test "$cputype" = "386"; then
	+ UNAME_MACHINE=i386
	+ else
	+ UNAME_MACHINE="$cputype"
	+ fi
	+ echo ${UNAME_MACHINE}-unknown-plan9
	+ exit ;;
	+ :TOPS-10::*)
	+ echo pdp10-unknown-tops10
	+ exit ;;
	+ :TENEX::*)
	+ echo pdp10-unknown-tenex
	+ exit ;;
	+ KS10:TOPS-20:: \| KL10:TOPS-20:: \| TYPE4:TOPS-20::)
	+ echo pdp10-dec-tops20
	+ exit ;;
	+ XKL-1:TOPS-20:: \| TYPE5:TOPS-20::)
	+ echo pdp10-xkl-tops20
	+ exit ;;
	+ :TOPS-20::*)
	+ echo pdp10-unknown-tops20
	+ exit ;;
	+ :ITS::*)
	+ echo pdp10-unknown-its
	+ exit ;;
	+ SEI:::SEIUX)
	+ echo mips-sei-seiux${UNAME_RELEASE}
	+ exit ;;
	+ :DragonFly::*)
	+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}\|sed -e 's/[-(].*//'`
	+ exit ;;
	+ :VMS::)
	+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
	+ case "${UNAME_MACHINE}" in
	+ A*) echo alpha-dec-vms ; exit ;;
	+ I*) echo ia64-dec-vms ; exit ;;
	+ V*) echo vax-dec-vms ; exit ;;
	+ esac ;;
	+ :XENIX::SysV)
	+ echo i386-pc-xenix
	+ exit ;;
	+ i86:skyos::*)
	+ echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` \| sed -e 's/ .*$//'
	+ exit ;;
	+ i86:rdos::*)
	+ echo ${UNAME_MACHINE}-pc-rdos
	+ exit ;;
	+ i86:AROS::*)
	+ echo ${UNAME_MACHINE}-pc-aros
	+ exit ;;
	+esac
	+
	+#echo '(No uname command or uname output not recognized.)' 1>&2
	+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
	+
	+eval $set_cc_for_build
	+cat >$dummy.c <<EOF
	+#ifdef _SEQUENT_
	+# include <sys/types.h>
	+# include <sys/utsname.h>
	+#endif
	+main ()
	+{
	+#if defined (sony)
	+#if defined (MIPSEB)
	+ /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
	+ I don't know.... */
	+ printf ("mips-sony-bsd\n"); exit (0);
	+#else
	+#include <sys/param.h>
	+ printf ("m68k-sony-newsos%s\n",
	+#ifdef NEWSOS4
	+ "4"
	+#else
	+ ""
	+#endif
	+ ); exit (0);
	+#endif
	+#endif
	+
	+#if defined (__arm) && defined (__acorn) && defined (__unix)
	+ printf ("arm-acorn-riscix\n"); exit (0);
	+#endif
	+
	+#if defined (hp300) && !defined (hpux)
	+ printf ("m68k-hp-bsd\n"); exit (0);
	+#endif
	+
	+#if defined (NeXT)
	+#if !defined (__ARCHITECTURE__)
	+#define __ARCHITECTURE__ "m68k"
	+#endif
	+ int version;
	+ version=`(hostinfo \| sed -n 's/.NeXT Mach $[0-9]$.*/\1/p') 2>/dev/null`;
	+ if (version < 4)
	+ printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
	+ else
	+ printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
	+ exit (0);
	+#endif
	+
	+#if defined (MULTIMAX) \|\| defined (n16)
	+#if defined (UMAXV)
	+ printf ("ns32k-encore-sysv\n"); exit (0);
	+#else
	+#if defined (CMU)
	+ printf ("ns32k-encore-mach\n"); exit (0);
	+#else
	+ printf ("ns32k-encore-bsd\n"); exit (0);
	+#endif
	+#endif
	+#endif
	+
	+#if defined (__386BSD__)
	+ printf ("i386-pc-bsd\n"); exit (0);
	+#endif
	+
	+#if defined (sequent)
	+#if defined (i386)
	+ printf ("i386-sequent-dynix\n"); exit (0);
	+#endif
	+#if defined (ns32000)
	+ printf ("ns32k-sequent-dynix\n"); exit (0);
	+#endif
	+#endif
	+
	+#if defined (_SEQUENT_)
	+ struct utsname un;
	+
	+ uname(&un);
	+
	+ if (strncmp(un.version, "V2", 2) == 0) {
	+ printf ("i386-sequent-ptx2\n"); exit (0);
	+ }
	+ if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
	+ printf ("i386-sequent-ptx1\n"); exit (0);
	+ }
	+ printf ("i386-sequent-ptx\n"); exit (0);
	+
	+#endif
	+
	+#if defined (vax)
	+# if !defined (ultrix)
	+# include <sys/param.h>
	+# if defined (BSD)
	+# if BSD == 43
	+ printf ("vax-dec-bsd4.3\n"); exit (0);
	+# else
	+# if BSD == 199006
	+ printf ("vax-dec-bsd4.3reno\n"); exit (0);
	+# else
	+ printf ("vax-dec-bsd\n"); exit (0);
	+# endif
	+# endif
	+# else
	+ printf ("vax-dec-bsd\n"); exit (0);
	+# endif
	+# else
	+ printf ("vax-dec-ultrix\n"); exit (0);
	+# endif
	+#endif
	+
	+#if defined (alliant) && defined (i860)
	+ printf ("i860-alliant-bsd\n"); exit (0);
	+#endif
	+
	+ exit (1);
	+}
	+EOF
	+
	+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
	+ { echo "$SYSTEM_NAME"; exit; }
	+
	+# Apollos put the system type in the environment.
	+
	+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
	+
	+# Convex versions that predate uname can use getsysinfo(1)
	+
	+if [ -x /usr/convex/getsysinfo ]
	+then
	+ case `getsysinfo -f cpu_type` in
	+ c1*)
	+ echo c1-convex-bsd
	+ exit ;;
	+ c2*)
	+ if getsysinfo -f scalar_acc
	+ then echo c32-convex-bsd
	+ else echo c2-convex-bsd
	+ fi
	+ exit ;;
	+ c34*)
	+ echo c34-convex-bsd
	+ exit ;;
	+ c38*)
	+ echo c38-convex-bsd
	+ exit ;;
	+ c4*)
	+ echo c4-convex-bsd
	+ exit ;;
	+ esac
	+fi
	+
	+cat >&2 <<EOF
	+$0: unable to guess system type
	+
	+This script, last modified $timestamp, has failed to recognize
	+the operating system you are using. It is advised that you
	+download the most up to date version of the config scripts from
	+
	+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
	+and
	+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
	+
	+If the version you run ($0) is already up to date, please
	+send the following data and any information you think might be
	+pertinent to <config-patches@gnu.org> in order to provide the needed
	+information to handle your system.
	+
	+config.guess timestamp = $timestamp
	+
	+uname -m = `(uname -m) 2>/dev/null \|\| echo unknown`
	+uname -r = `(uname -r) 2>/dev/null \|\| echo unknown`
	+uname -s = `(uname -s) 2>/dev/null \|\| echo unknown`
	+uname -v = `(uname -v) 2>/dev/null \|\| echo unknown`
	+
	+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
	+/bin/uname -X = `(/bin/uname -X) 2>/dev/null`
	+
	+hostinfo = `(hostinfo) 2>/dev/null`
	+/bin/universe = `(/bin/universe) 2>/dev/null`
	+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null`
	+/bin/arch = `(/bin/arch) 2>/dev/null`
	+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
	+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
	+
	+UNAME_MACHINE = ${UNAME_MACHINE}
	+UNAME_RELEASE = ${UNAME_RELEASE}
	+UNAME_SYSTEM = ${UNAME_SYSTEM}
	+UNAME_VERSION = ${UNAME_VERSION}
	+EOF
	+
	+exit 1
	+
	+# Local variables:
	+# eval: (add-hook 'write-file-hooks 'time-stamp)
	+# time-stamp-start: "timestamp='"
	+# time-stamp-format: "%:y-%02m-%02d"
	+# time-stamp-end: "'"
	+# End:
	diff --git a/tags/xmount-0.7.0/old_build/config.h.in b/tags/xmount-0.7.0/old_build/config.h.in
	new file mode 100644
	index 0000000..c9c3031
	--- /dev/null
	+++ b/tags/xmount-0.7.0/old_build/config.h.in
	@@ -0,0 +1,143 @@
	+/* config.h.in. Generated from configure.ac by autoheader. */
	+
	+/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
	+#undef HAVE_DOPRNT
	+
	+/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
	+#undef HAVE_FSEEKO
	+
	+/* Define to 1 if you have the <inttypes.h> header file. */
	+#undef HAVE_INTTYPES_H
	+
	+/* Define to 1 if you have the `afflib' library (-lafflib). */
	+#undef HAVE_LIBAFFLIB
	+
	+/* Define to 1 if you have the `ewf' library (-lewf). */
	+#undef HAVE_LIBEWF
	+
	+/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
	+ to 0 otherwise. */
	+#undef HAVE_MALLOC
	+
	+/* Define to 1 if you have the <memory.h> header file. */
	+#undef HAVE_MEMORY_H
	+
	+/* Define to 1 if you have the `memset' function. */
	+#undef HAVE_MEMSET
	+
	+/* Define to 1 if your system has a GNU libc compatible `realloc' function,
	+ and to 0 otherwise. */
	+#undef HAVE_REALLOC
	+
	+/* Define to 1 if you have the <stdint.h> header file. */
	+#undef HAVE_STDINT_H
	+
	+/* Define to 1 if you have the <stdlib.h> header file. */
	+#undef HAVE_STDLIB_H
	+
	+/* Define to 1 if you have the <strings.h> header file. */
	+#undef HAVE_STRINGS_H
	+
	+/* Define to 1 if you have the <string.h> header file. */
	+#undef HAVE_STRING_H
	+
	+/* Define to 1 if you have the `strrchr' function. */
	+#undef HAVE_STRRCHR
	+
	+/* Define to 1 if you have the <sys/stat.h> header file. */
	+#undef HAVE_SYS_STAT_H
	+
	+/* Define to 1 if you have the <sys/types.h> header file. */
	+#undef HAVE_SYS_TYPES_H
	+
	+/* Define to 1 if you have the <unistd.h> header file. */
	+#undef HAVE_UNISTD_H
	+
	+/* Define to 1 if you have the `vprintf' function. */
	+#undef HAVE_VPRINTF
	+
	+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
	+#undef NO_MINUS_C_MINUS_O
	+
	+/* Name of package */
	+#undef PACKAGE
	+
	+/* Define to the address where bug reports for this package should be sent. */
	+#undef PACKAGE_BUGREPORT
	+
	+/* Define to the full name of this package. */
	+#undef PACKAGE_NAME
	+
	+/* Define to the full name and version of this package. */
	+#undef PACKAGE_STRING
	+
	+/* Define to the one symbol short name of this package. */
	+#undef PACKAGE_TARNAME
	+
	+/* Define to the home page for this package. */
	+#undef PACKAGE_URL
	+
	+/* Define to the version of this package. */
	+#undef PACKAGE_VERSION
	+
	+/* Define to 1 if you have the ANSI C header files. */
	+#undef STDC_HEADERS
	+
	+/* Version number of package */
	+#undef VERSION
	+
	+/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
	+#undef _LARGEFILE_SOURCE
	+
	+/* Define for Solaris 2.5.1 so the uint32_t typedef from <sys/synch.h>,
	+ <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
	+ #define below would cause a syntax error. */
	+#undef _UINT32_T
	+
	+/* Define for Solaris 2.5.1 so the uint64_t typedef from <sys/synch.h>,
	+ <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
	+ #define below would cause a syntax error. */
	+#undef _UINT64_T
	+
	+/* Define for Solaris 2.5.1 so the uint8_t typedef from <sys/synch.h>,
	+ <pthread.h>, or <semaphore.h> is not used. If the typedef were allowed, the
	+ #define below would cause a syntax error. */
	+#undef _UINT8_T
	+
	+/* Define to empty if `const' does not conform to ANSI C. */
	+#undef const
	+
	+/* Define to the type of a signed integer type of width exactly 64 bits if
	+ such a type exists and the standard includes do not define it. */
	+#undef int64_t
	+
	+/* Define to rpl_malloc if the replacement function should be used. */
	+#undef malloc
	+
	+/* Define to `long int' if <sys/types.h> does not define. */
	+#undef off_t
	+
	+/* Define to rpl_realloc if the replacement function should be used. */
	+#undef realloc
	+
	+/* Define to `unsigned int' if <sys/types.h> does not define. */
	+#undef size_t
	+
	+/* Define to `int' if <sys/types.h> does not define. */
	+#undef ssize_t
	+
	+/* Define to the type of an unsigned integer type of width exactly 16 bits if
	+ such a type exists and the standard includes do not define it. */
	+#undef uint16_t
	+
	+/* Define to the type of an unsigned integer type of width exactly 32 bits if
	+ such a type exists and the standard includes do not define it. */
	+#undef uint32_t
	+
	+/* Define to the type of an unsigned integer type of width exactly 64 bits if
	+ such a type exists and the standard includes do not define it. */
	+#undef uint64_t
	+
	+/* Define to the type of an unsigned integer type of width exactly 8 bits if
	+ such a type exists and the standard includes do not define it. */
	+#undef uint8_t
	diff --git a/tags/xmount-0.7.0/old_build/config.sub b/tags/xmount-0.7.0/old_build/config.sub
	new file mode 100755
	index 0000000..a39437d
	--- /dev/null
	+++ b/tags/xmount-0.7.0/old_build/config.sub
	@@ -0,0 +1,1686 @@
	+#! /bin/sh
	+# Configuration validation subroutine script.
	+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
	+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
	+# Free Software Foundation, Inc.
	+
	+timestamp='2009-04-17'
	+
	+# This file is (in principle) common to ALL GNU software.
	+# The presence of a machine in this file suggests that SOME GNU software
	+# can handle that machine. It does not imply ALL GNU software can.
	+#
	+# This file is free software; you can redistribute it and/or modify
	+# it under the terms of the GNU General Public License as published by
	+# the Free Software Foundation; either version 2 of the License, or
	+# (at your option) any later version.
	+#
	+# This program is distributed in the hope that it will be useful,
	+# but WITHOUT ANY WARRANTY; without even the implied warranty of
	+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	+# GNU General Public License for more details.
	+#
	+# You should have received a copy of the GNU General Public License
	+# along with this program; if not, write to the Free Software
	+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
	+# 02110-1301, USA.
	+#
	+# As a special exception to the GNU General Public License, if you
	+# distribute this file as part of a program that contains a
	+# configuration script generated by Autoconf, you may include it under
	+# the same distribution terms that you use for the rest of that program.
	+
	+
	+# Please send patches to <config-patches@gnu.org>. Submit a context
	+# diff and a properly formatted ChangeLog entry.
	+#
	+# Configuration subroutine to validate and canonicalize a configuration type.
	+# Supply the specified configuration type as an argument.
	+# If it is invalid, we print an error message on stderr and exit with code 1.
	+# Otherwise, we print the canonical config type on stdout and succeed.
	+
	+# This file is supposed to be the same for all GNU packages
	+# and recognize all the CPU types, system types and aliases
	+# that are meaningful with any GNU software.
	+# Each package is responsible for reporting which valid configurations
	+# it does not support. The user should be able to distinguish
	+# a failure to support a valid configuration from a meaningless
	+# configuration.
	+
	+# The goal of this file is to map all the various variations of a given
	+# machine specification into a single specification in the form:
	+# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
	+# or in some cases, the newer four-part form:
	+# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
	+# It is wrong to echo any other type of specification.
	+
	+me=`echo "$0" \| sed -e 's,.*/,,'`
	+
	+usage="\
	+Usage: $0 [OPTION] CPU-MFR-OPSYS
	+ $0 [OPTION] ALIAS
	+
	+Canonicalize a configuration name.
	+
	+Operation modes:
	+ -h, --help print this help, then exit
	+ -t, --time-stamp print date of last modification, then exit
	+ -v, --version print version number, then exit
	+
	+Report bugs and patches to <config-patches@gnu.org>."
	+
	+version="\
	+GNU config.sub ($timestamp)
	+
	+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
	+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
	+
	+This is free software; see the source for copying conditions. There is NO
	+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
	+
	+help="
	+Try \`$me --help' for more information."
	+
	+# Parse command line
	+while test $# -gt 0 ; do
	+ case $1 in
	+ --time-stamp \| --time* \| -t )
	+ echo "$timestamp" ; exit ;;
	+ --version \| -v )
	+ echo "$version" ; exit ;;
	+ --help \| --h* \| -h )
	+ echo "$usage"; exit ;;
	+ -- ) # Stop option processing
	+ shift; break ;;
	+ - ) # Use stdin as input.
	+ break ;;
	+ -* )
	+ echo "$me: invalid option $1$help"
	+ exit 1 ;;
	+
	+ local)
	+ # First pass through any local machine types.
	+ echo $1
	+ exit ;;
	+
	+ * )
	+ break ;;
	+ esac
	+done
	+
	+case $# in
	+ 0) echo "$me: missing argument$help" >&2
	+ exit 1;;
	+ 1) ;;
	+ *) echo "$me: too many arguments$help" >&2
	+ exit 1;;
	+esac
	+
	+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
	+# Here we must recognize all the valid KERNEL-OS combinations.
	+maybe_os=`echo $1 \| sed 's/^$.$-$[^-]-[^-]*$$/\2/'`
	+case $maybe_os in
	+ nto-qnx* \| linux-gnu* \| linux-dietlibc \| linux-newlib* \| linux-uclibc* \| \
	+ uclinux-uclibc* \| uclinux-gnu* \| kfreebsd-gnu \| knetbsd-gnu \| netbsd-gnu \| \
	+ kopensolaris-gnu \| \
	+ storm-chaos* \| os2-emx* \| rtmk-nova*)
	+ os=-$maybe_os
	+ basic_machine=`echo $1 \| sed 's/^$.$-$[^-]-[^-]*$$/\1/'`
	+ ;;
	+ *)
	+ basic_machine=`echo $1 \| sed 's/-[^-]*$//'`
	+ if [ $basic_machine != $1 ]
	+ then os=`echo $1 \| sed 's/.*-/-/'`
	+ else os=; fi
	+ ;;
	+esac
	+
	+### Let's recognize common machines as not being operating systems so
	+### that things like config.sub decstation-3100 work. We also
	+### recognize some manufacturers as not being operating systems, so we
	+### can provide default operating systems below.
	+case $os in
	+ -sunos)
	+ # Prevent following clause from handling this invalid input.
	+ ;;
	+ -dec* \| -mips* \| -sequent* \| -encore* \| -pc532* \| -sgi* \| -sony* \| \
	+ -att* \| -7300* \| -3300* \| -delta* \| -motorola* \| -sun[234]* \| \
	+ -unicom* \| -ibm* \| -next \| -hp \| -isi* \| -apollo \| -altos* \| \
	+ -convergent* \| -ncr* \| -news \| -32* \| -3600* \| -3100* \| -hitachi* \|\
	+ -c[123]* \| -convex* \| -sun \| -crds \| -omron* \| -dg \| -ultra \| -tti* \| \
	+ -harris \| -dolphin \| -highlevel \| -gould \| -cbm \| -ns \| -masscomp \| \
	+ -apple \| -axis \| -knuth \| -cray)
	+ os=
	+ basic_machine=$1
	+ ;;
	+ -sim \| -cisco \| -oki \| -wec \| -winbond)
	+ os=
	+ basic_machine=$1
	+ ;;
	+ -scout)
	+ ;;
	+ -wrs)
	+ os=-vxworks
	+ basic_machine=$1
	+ ;;
	+ -chorusos*)
	+ os=-chorusos
	+ basic_machine=$1
	+ ;;
	+ -chorusrdb)
	+ os=-chorusrdb
	+ basic_machine=$1
	+ ;;
	+ -hiux*)
	+ os=-hiuxwe2
	+ ;;
	+ -sco6)
	+ os=-sco5v6
	+ basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`
	+ ;;
	+ -sco5)
	+ os=-sco3.2v5
	+ basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`
	+ ;;
	+ -sco4)
	+ os=-sco3.2v4
	+ basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`
	+ ;;
	+ -sco3.2.[4-9]*)
	+ os=`echo $os \| sed -e 's/sco3.2./sco3.2v/'`
	+ basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`
	+ ;;
	+ -sco3.2v[4-9]*)
	+ # Don't forget version if it is 3.2v4 or newer.
	+ basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`
	+ ;;
	+ -sco5v6*)
	+ # Don't forget version if it is 3.2v4 or newer.
	+ basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`
	+ ;;
	+ -sco*)
	+ os=-sco3.2v2
	+ basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`
	+ ;;
	+ -udk*)
	+ basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`
	+ ;;
	+ -isc)
	+ os=-isc2.2
	+ basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`
	+ ;;
	+ -clix*)
	+ basic_machine=clipper-intergraph
	+ ;;
	+ -isc*)
	+ basic_machine=`echo $1 \| sed -e 's/86-.*/86-pc/'`
	+ ;;
	+ -lynx*)
	+ os=-lynxos
	+ ;;
	+ -ptx*)
	+ basic_machine=`echo $1 \| sed -e 's/86-.*/86-sequent/'`
	+ ;;
	+ -windowsnt*)
	+ os=`echo $os \| sed -e 's/windowsnt/winnt/'`
	+ ;;
	+ -psos*)
	+ os=-psos
	+ ;;
	+ -mint \| -mint[0-9]*)
	+ basic_machine=m68k-atari
	+ os=-mint
	+ ;;
	+esac
	+
	+# Decode aliases for certain CPU-COMPANY combinations.
	+case $basic_machine in
	+ # Recognize the basic CPU types without company name.
	+ # Some are omitted here because they have special meanings below.
	+ 1750a \| 580 \
	+ \| a29k \
	+ \| alpha \| alphaev[4-8] \| alphaev56 \| alphaev6[78] \| alphapca5[67] \
	+ \| alpha64 \| alpha64ev[4-8] \| alpha64ev56 \| alpha64ev6[78] \| alpha64pca5[67] \
	+ \| am33_2.0 \
	+ \| arc \| arm \| arm[bl]e \| arme[lb] \| armv[2345] \| armv[345][lb] \| avr \| avr32 \
	+ \| bfin \
	+ \| c4x \| clipper \
	+ \| d10v \| d30v \| dlx \| dsp16xx \
	+ \| fido \| fr30 \| frv \
	+ \| h8300 \| h8500 \| hppa \| hppa1.[01] \| hppa2.0 \| hppa2.0[nw] \| hppa64 \
	+ \| i370 \| i860 \| i960 \| ia64 \
	+ \| ip2k \| iq2000 \
	+ \| lm32 \
	+ \| m32c \| m32r \| m32rle \| m68000 \| m68k \| m88k \
	+ \| maxq \| mb \| microblaze \| mcore \| mep \| metag \
	+ \| mips \| mipsbe \| mipseb \| mipsel \| mipsle \
	+ \| mips16 \
	+ \| mips64 \| mips64el \
	+ \| mips64octeon \| mips64octeonel \
	+ \| mips64orion \| mips64orionel \
	+ \| mips64r5900 \| mips64r5900el \
	+ \| mips64vr \| mips64vrel \
	+ \| mips64vr4100 \| mips64vr4100el \
	+ \| mips64vr4300 \| mips64vr4300el \
	+ \| mips64vr5000 \| mips64vr5000el \
	+ \| mips64vr5900 \| mips64vr5900el \
	+ \| mipsisa32 \| mipsisa32el \
	+ \| mipsisa32r2 \| mipsisa32r2el \
	+ \| mipsisa64 \| mipsisa64el \
	+ \| mipsisa64r2 \| mipsisa64r2el \
	+ \| mipsisa64sb1 \| mipsisa64sb1el \
	+ \| mipsisa64sr71k \| mipsisa64sr71kel \
	+ \| mipstx39 \| mipstx39el \
	+ \| mn10200 \| mn10300 \
	+ \| moxie \
	+ \| mt \
	+ \| msp430 \
	+ \| nios \| nios2 \
	+ \| ns16k \| ns32k \
	+ \| or32 \
	+ \| pdp10 \| pdp11 \| pj \| pjl \
	+ \| powerpc \| powerpc64 \| powerpc64le \| powerpcle \| ppcbe \
	+ \| pyramid \
	+ \| score \
	+ \| sh \| sh[1234] \| sh[24]a \| sh[24]aeb \| sh[23]e \| sh[34]eb \| sheb \| shbe \| shle \| sh[1234]le \| sh3ele \
	+ \| sh64 \| sh64le \
	+ \| sparc \| sparc64 \| sparc64b \| sparc64v \| sparc86x \| sparclet \| sparclite \
	+ \| sparcv8 \| sparcv9 \| sparcv9b \| sparcv9v \
	+ \| spu \| strongarm \
	+ \| tahoe \| thumb \| tic4x \| tic80 \| tron \
	+ \| v850 \| v850e \
	+ \| we32k \
	+ \| x86 \| xc16x \| xscale \| xscalee[bl] \| xstormy16 \| xtensa \
	+ \| z8k \| z80)
	+ basic_machine=$basic_machine-unknown
	+ ;;
	+ m6811 \| m68hc11 \| m6812 \| m68hc12)
	+ # Motorola 68HC11/12.
	+ basic_machine=$basic_machine-unknown
	+ os=-none
	+ ;;
	+ m88110 \| m680[12346]0 \| m683?2 \| m68360 \| m5200 \| v70 \| w65 \| z8k)
	+ ;;
	+ ms1)
	+ basic_machine=mt-unknown
	+ ;;
	+
	+ # We use `pc' rather than `unknown'
	+ # because (1) that's what they normally are, and
	+ # (2) the word "unknown" tends to confuse beginning users.
	+ i*86 \| x86_64)
	+ basic_machine=$basic_machine-pc
	+ ;;
	+ # Object if more than one company name word.
	+ --*)
	+ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
	+ exit 1
	+ ;;
	+ # Recognize the basic CPU types with company name.
	+ 580-* \
	+ \| a29k-* \
	+ \| alpha-* \| alphaev[4-8]-* \| alphaev56-* \| alphaev6[78]-* \
	+ \| alpha64-* \| alpha64ev[4-8]-* \| alpha64ev56-* \| alpha64ev6[78]-* \
	+ \| alphapca5[67]-* \| alpha64pca5[67]-* \| arc-* \
	+ \| arm-* \| armbe-* \| armle-* \| armeb-* \| armv- \
	+ \| avr-* \| avr32-* \
	+ \| bfin-* \| bs2000-* \
	+ \| c[123]* \| c30-* \| [cjt]90-* \| c4x-* \| c54x-* \| c55x-* \| c6x-* \
	+ \| clipper-* \| craynv-* \| cydra-* \
	+ \| d10v-* \| d30v-* \| dlx-* \
	+ \| elxsi-* \
	+ \| f30[01]-* \| f700-* \| fido-* \| fr30-* \| frv-* \| fx80-* \
	+ \| h8300-* \| h8500-* \
	+ \| hppa-* \| hppa1.[01]-* \| hppa2.0-* \| hppa2.0[nw]-* \| hppa64-* \
	+ \| i86- \| i860-* \| i960-* \| ia64-* \
	+ \| ip2k-* \| iq2000-* \
	+ \| lm32-* \
	+ \| m32c-* \| m32r-* \| m32rle-* \
	+ \| m68000-* \| m680[012346]0-* \| m68360-* \| m683?2-* \| m68k-* \
	+ \| m88110-* \| m88k-* \| maxq-* \| mcore-* \| metag-* \
	+ \| mips-* \| mipsbe-* \| mipseb-* \| mipsel-* \| mipsle-* \
	+ \| mips16-* \
	+ \| mips64-* \| mips64el-* \
	+ \| mips64octeon-* \| mips64octeonel-* \
	+ \| mips64orion-* \| mips64orionel-* \
	+ \| mips64r5900-* \| mips64r5900el-* \
	+ \| mips64vr-* \| mips64vrel-* \
	+ \| mips64vr4100-* \| mips64vr4100el-* \
	+ \| mips64vr4300-* \| mips64vr4300el-* \
	+ \| mips64vr5000-* \| mips64vr5000el-* \
	+ \| mips64vr5900-* \| mips64vr5900el-* \
	+ \| mipsisa32-* \| mipsisa32el-* \
	+ \| mipsisa32r2-* \| mipsisa32r2el-* \
	+ \| mipsisa64-* \| mipsisa64el-* \
	+ \| mipsisa64r2-* \| mipsisa64r2el-* \
	+ \| mipsisa64sb1-* \| mipsisa64sb1el-* \
	+ \| mipsisa64sr71k-* \| mipsisa64sr71kel-* \
	+ \| mipstx39-* \| mipstx39el-* \
	+ \| mmix-* \
	+ \| mt-* \
	+ \| msp430-* \
	+ \| nios-* \| nios2-* \
	+ \| none-* \| np1-* \| ns16k-* \| ns32k-* \
	+ \| orion-* \
	+ \| pdp10-* \| pdp11-* \| pj-* \| pjl-* \| pn-* \| power-* \
	+ \| powerpc-* \| powerpc64-* \| powerpc64le-* \| powerpcle-* \| ppcbe-* \
	+ \| pyramid-* \
	+ \| romp-* \| rs6000-* \
	+ \| sh-* \| sh[1234]-* \| sh[24]a-* \| sh[24]aeb-* \| sh[23]e-* \| sh[34]eb-* \| sheb-* \| shbe-* \
	+ \| shle-* \| sh[1234]le-* \| sh3ele-* \| sh64-* \| sh64le-* \
	+ \| sparc-* \| sparc64-* \| sparc64b-* \| sparc64v-* \| sparc86x-* \| sparclet-* \
	+ \| sparclite-* \
	+ \| sparcv8-* \| sparcv9-* \| sparcv9b-* \| sparcv9v-* \| strongarm-* \| sv1-* \| sx?-* \
	+ \| tahoe-* \| thumb-* \
	+ \| tic30-* \| tic4x-* \| tic54x-* \| tic55x-* \| tic6x-* \| tic80-* \| tile-* \
	+ \| tron-* \
	+ \| v850-* \| v850e-* \| vax-* \
	+ \| we32k-* \
	+ \| x86-* \| x86_64-* \| xc16x-* \| xps100-* \| xscale-* \| xscalee[bl]-* \
	+ \| xstormy16-* \| xtensa- \
	+ \| ymp-* \
	+ \| z8k-* \| z80-*)
	+ ;;
	+ # Recognize the basic CPU types without company name, with glob match.
	+ xtensa*)
	+ basic_machine=$basic_machine-unknown
	+ ;;
	+ # Recognize the various machine names and aliases which stand
	+ # for a CPU type and a company and sometimes even an OS.
	+ 386bsd)
	+ basic_machine=i386-unknown
	+ os=-bsd
	+ ;;
	+ 3b1 \| 7300 \| 7300-att \| att-7300 \| pc7300 \| safari \| unixpc)
	+ basic_machine=m68000-att
	+ ;;
	+ 3b*)
	+ basic_machine=we32k-att
	+ ;;
	+ a29khif)
	+ basic_machine=a29k-amd
	+ os=-udi
	+ ;;
	+ abacus)
	+ basic_machine=abacus-unknown
	+ ;;
	+ adobe68k)
	+ basic_machine=m68010-adobe
	+ os=-scout
	+ ;;
	+ alliant \| fx80)
	+ basic_machine=fx80-alliant
	+ ;;
	+ altos \| altos3068)
	+ basic_machine=m68k-altos
	+ ;;
	+ am29k)
	+ basic_machine=a29k-none
	+ os=-bsd
	+ ;;
	+ amd64)
	+ basic_machine=x86_64-pc
	+ ;;
	+ amd64-*)
	+ basic_machine=x86_64-`echo $basic_machine \| sed 's/^[^-]*-//'`
	+ ;;
	+ amdahl)
	+ basic_machine=580-amdahl
	+ os=-sysv
	+ ;;
	+ amiga \| amiga-*)
	+ basic_machine=m68k-unknown
	+ ;;
	+ amigaos \| amigados)
	+ basic_machine=m68k-unknown
	+ os=-amigaos
	+ ;;
	+ amigaunix \| amix)
	+ basic_machine=m68k-unknown
	+ os=-sysv4
	+ ;;
	+ apollo68)
	+ basic_machine=m68k-apollo
	+ os=-sysv
	+ ;;
	+ apollo68bsd)
	+ basic_machine=m68k-apollo
	+ os=-bsd
	+ ;;
	+ aros)
	+ basic_machine=i386-pc
	+ os=-aros
	+ ;;
	+ aux)
	+ basic_machine=m68k-apple
	+ os=-aux
	+ ;;
	+ balance)
	+ basic_machine=ns32k-sequent
	+ os=-dynix
	+ ;;
	+ blackfin)
	+ basic_machine=bfin-unknown
	+ os=-linux
	+ ;;
	+ blackfin-*)
	+ basic_machine=bfin-`echo $basic_machine \| sed 's/^[^-]*-//'`
	+ os=-linux
	+ ;;
	+ c90)
	+ basic_machine=c90-cray
	+ os=-unicos
	+ ;;
	+ cegcc)
	+ basic_machine=arm-unknown
	+ os=-cegcc
	+ ;;
	+ convex-c1)
	+ basic_machine=c1-convex
	+ os=-bsd
	+ ;;
	+ convex-c2)
	+ basic_machine=c2-convex
	+ os=-bsd
	+ ;;
	+ convex-c32)
	+ basic_machine=c32-convex
	+ os=-bsd
	+ ;;
	+ convex-c34)
	+ basic_machine=c34-convex
	+ os=-bsd
	+ ;;
	+ convex-c38)
	+ basic_machine=c38-convex
	+ os=-bsd
	+ ;;
	+ cray \| j90)
	+ basic_machine=j90-cray
	+ os=-unicos
	+ ;;
	+ craynv)
	+ basic_machine=craynv-cray
	+ os=-unicosmp
	+ ;;
	+ cr16)
	+ basic_machine=cr16-unknown
	+ os=-elf
	+ ;;
	+ crds \| unos)
	+ basic_machine=m68k-crds
	+ ;;
	+ crisv32 \| crisv32-* \| etraxfs*)
	+ basic_machine=crisv32-axis
	+ ;;
	+ cris \| cris-* \| etrax*)
	+ basic_machine=cris-axis
	+ ;;
	+ crx)
	+ basic_machine=crx-unknown
	+ os=-elf
	+ ;;
	+ da30 \| da30-*)
	+ basic_machine=m68k-da30
	+ ;;
	+ decstation \| decstation-3100 \| pmax \| pmax-* \| pmin \| dec3100 \| decstatn)
	+ basic_machine=mips-dec
	+ ;;
	+ decsystem10* \| dec10*)
	+ basic_machine=pdp10-dec
	+ os=-tops10
	+ ;;
	+ decsystem20* \| dec20*)
	+ basic_machine=pdp10-dec
	+ os=-tops20
	+ ;;
	+ delta \| 3300 \| motorola-3300 \| motorola-delta \
	+ \| 3300-motorola \| delta-motorola)
	+ basic_machine=m68k-motorola
	+ ;;
	+ delta88)
	+ basic_machine=m88k-motorola
	+ os=-sysv3
	+ ;;
	+ dicos)
	+ basic_machine=i686-pc
	+ os=-dicos
	+ ;;
	+ djgpp)
	+ basic_machine=i586-pc
	+ os=-msdosdjgpp
	+ ;;
	+ dpx20 \| dpx20-*)
	+ basic_machine=rs6000-bull
	+ os=-bosx
	+ ;;
	+ dpx2* \| dpx2*-bull)
	+ basic_machine=m68k-bull
	+ os=-sysv3
	+ ;;
	+ ebmon29k)
	+ basic_machine=a29k-amd
	+ os=-ebmon
	+ ;;
	+ elxsi)
	+ basic_machine=elxsi-elxsi
	+ os=-bsd
	+ ;;
	+ encore \| umax \| mmax)
	+ basic_machine=ns32k-encore
	+ ;;
	+ es1800 \| OSE68k \| ose68k \| ose \| OSE)
	+ basic_machine=m68k-ericsson
	+ os=-ose
	+ ;;
	+ fx2800)
	+ basic_machine=i860-alliant
	+ ;;
	+ genix)
	+ basic_machine=ns32k-ns
	+ ;;
	+ gmicro)
	+ basic_machine=tron-gmicro
	+ os=-sysv
	+ ;;
	+ go32)
	+ basic_machine=i386-pc
	+ os=-go32
	+ ;;
	+ h3050r* \| hiux*)
	+ basic_machine=hppa1.1-hitachi
	+ os=-hiuxwe2
	+ ;;
	+ h8300hms)
	+ basic_machine=h8300-hitachi
	+ os=-hms
	+ ;;
	+ h8300xray)
	+ basic_machine=h8300-hitachi
	+ os=-xray
	+ ;;
	+ h8500hms)
	+ basic_machine=h8500-hitachi
	+ os=-hms
	+ ;;
	+ harris)
	+ basic_machine=m88k-harris
	+ os=-sysv3
	+ ;;
	+ hp300-*)
	+ basic_machine=m68k-hp
	+ ;;
	+ hp300bsd)
	+ basic_machine=m68k-hp
	+ os=-bsd
	+ ;;
	+ hp300hpux)
	+ basic_machine=m68k-hp
	+ os=-hpux
	+ ;;
	+ hp3k9[0-9][0-9] \| hp9[0-9][0-9])
	+ basic_machine=hppa1.0-hp
	+ ;;
	+ hp9k2[0-9][0-9] \| hp9k31[0-9])
	+ basic_machine=m68000-hp
	+ ;;
	+ hp9k3[2-9][0-9])
	+ basic_machine=m68k-hp
	+ ;;
	+ hp9k6[0-9][0-9] \| hp6[0-9][0-9])
	+ basic_machine=hppa1.0-hp
	+ ;;
	+ hp9k7[0-79][0-9] \| hp7[0-79][0-9])
	+ basic_machine=hppa1.1-hp
	+ ;;
	+ hp9k78[0-9] \| hp78[0-9])
	+ # FIXME: really hppa2.0-hp
	+ basic_machine=hppa1.1-hp
	+ ;;
	+ hp9k8[67]1 \| hp8[67]1 \| hp9k80[24] \| hp80[24] \| hp9k8[78]9 \| hp8[78]9 \| hp9k893 \| hp893)
	+ # FIXME: really hppa2.0-hp
	+ basic_machine=hppa1.1-hp
	+ ;;
	+ hp9k8[0-9][13679] \| hp8[0-9][13679])
	+ basic_machine=hppa1.1-hp
	+ ;;
	+ hp9k8[0-9][0-9] \| hp8[0-9][0-9])
	+ basic_machine=hppa1.0-hp
	+ ;;
	+ hppa-next)
	+ os=-nextstep3
	+ ;;
	+ hppaosf)
	+ basic_machine=hppa1.1-hp
	+ os=-osf
	+ ;;
	+ hppro)
	+ basic_machine=hppa1.1-hp
	+ os=-proelf
	+ ;;
	+ i370-ibm* \| ibm*)
	+ basic_machine=i370-ibm
	+ ;;
	+# I'm not sure what "Sysv32" means. Should this be sysv3.2?
	+ i*86v32)
	+ basic_machine=`echo $1 \| sed -e 's/86.*/86-pc/'`
	+ os=-sysv32
	+ ;;
	+ i86v4)
	+ basic_machine=`echo $1 \| sed -e 's/86.*/86-pc/'`
	+ os=-sysv4
	+ ;;
	+ i*86v)
	+ basic_machine=`echo $1 \| sed -e 's/86.*/86-pc/'`
	+ os=-sysv
	+ ;;
	+ i*86sol2)
	+ basic_machine=`echo $1 \| sed -e 's/86.*/86-pc/'`
	+ os=-solaris2
	+ ;;
	+ i386mach)
	+ basic_machine=i386-mach
	+ os=-mach
	+ ;;
	+ i386-vsta \| vsta)
	+ basic_machine=i386-unknown
	+ os=-vsta
	+ ;;
	+ iris \| iris4d)
	+ basic_machine=mips-sgi
	+ case $os in
	+ -irix*)
	+ ;;
	+ *)
	+ os=-irix4
	+ ;;
	+ esac
	+ ;;
	+ isi68 \| isi)
	+ basic_machine=m68k-isi
	+ os=-sysv
	+ ;;
	+ m68knommu)
	+ basic_machine=m68k-unknown
	+ os=-linux
	+ ;;
	+ m68knommu-*)
	+ basic_machine=m68k-`echo $basic_machine \| sed 's/^[^-]*-//'`
	+ os=-linux
	+ ;;
	+ m88k-omron*)
	+ basic_machine=m88k-omron
	+ ;;
	+ magnum \| m3230)
	+ basic_machine=mips-mips
	+ os=-sysv
	+ ;;
	+ merlin)
	+ basic_machine=ns32k-utek
	+ os=-sysv
	+ ;;
	+ mingw32)
	+ basic_machine=i386-pc
	+ os=-mingw32
	+ ;;
	+ mingw32ce)
	+ basic_machine=arm-unknown
	+ os=-mingw32ce
	+ ;;
	+ miniframe)
	+ basic_machine=m68000-convergent
	+ ;;
	+ mint \| -mint[0-9] \| MiNT \| MiNT[0-9]*)
	+ basic_machine=m68k-atari
	+ os=-mint
	+ ;;
	+ mips3-)
	+ basic_machine=`echo $basic_machine \| sed -e 's/mips3/mips64/'`
	+ ;;
	+ mips3*)
	+ basic_machine=`echo $basic_machine \| sed -e 's/mips3/mips64/'`-unknown
	+ ;;
	+ monitor)
	+ basic_machine=m68k-rom68k
	+ os=-coff
	+ ;;
	+ morphos)
	+ basic_machine=powerpc-unknown
	+ os=-morphos
	+ ;;
	+ msdos)
	+ basic_machine=i386-pc
	+ os=-msdos
	+ ;;
	+ ms1-*)
	+ basic_machine=`echo $basic_machine \| sed -e 's/ms1-/mt-/'`
	+ ;;
	+ mvs)
	+ basic_machine=i370-ibm
	+ os=-mvs
	+ ;;
	+ ncr3000)
	+ basic_machine=i486-ncr
	+ os=-sysv4
	+ ;;
	+ netbsd386)
	+ basic_machine=i386-unknown
	+ os=-netbsd
	+ ;;
	+ netwinder)
	+ basic_machine=armv4l-rebel
	+ os=-linux
	+ ;;
	+ news \| news700 \| news800 \| news900)
	+ basic_machine=m68k-sony
	+ os=-newsos
	+ ;;
	+ news1000)
	+ basic_machine=m68030-sony
	+ os=-newsos
	+ ;;
	+ news-3600 \| risc-news)
	+ basic_machine=mips-sony
	+ os=-newsos
	+ ;;
	+ necv70)
	+ basic_machine=v70-nec
	+ os=-sysv
	+ ;;
	+ next \| m*-next )
	+ basic_machine=m68k-next
	+ case $os in
	+ -nextstep* )
	+ ;;
	+ -ns2*)
	+ os=-nextstep2
	+ ;;
	+ *)
	+ os=-nextstep3
	+ ;;
	+ esac
	+ ;;
	+ nh3000)
	+ basic_machine=m68k-harris
	+ os=-cxux
	+ ;;
	+ nh[45]000)
	+ basic_machine=m88k-harris
	+ os=-cxux
	+ ;;
	+ nindy960)
	+ basic_machine=i960-intel
	+ os=-nindy
	+ ;;
	+ mon960)
	+ basic_machine=i960-intel
	+ os=-mon960
	+ ;;
	+ nonstopux)
	+ basic_machine=mips-compaq
	+ os=-nonstopux
	+ ;;
	+ np1)
	+ basic_machine=np1-gould
	+ ;;
	+ nsr-tandem)
	+ basic_machine=nsr-tandem
	+ ;;
	+ op50n-* \| op60c-*)
	+ basic_machine=hppa1.1-oki
	+ os=-proelf
	+ ;;
	+ openrisc \| openrisc-*)
	+ basic_machine=or32-unknown
	+ ;;
	+ os400)
	+ basic_machine=powerpc-ibm
	+ os=-os400
	+ ;;
	+ OSE68000 \| ose68000)
	+ basic_machine=m68000-ericsson
	+ os=-ose
	+ ;;
	+ os68k)
	+ basic_machine=m68k-none
	+ os=-os68k
	+ ;;
	+ pa-hitachi)
	+ basic_machine=hppa1.1-hitachi
	+ os=-hiuxwe2
	+ ;;
	+ paragon)
	+ basic_machine=i860-intel
	+ os=-osf
	+ ;;
	+ parisc)
	+ basic_machine=hppa-unknown
	+ os=-linux
	+ ;;
	+ parisc-*)
	+ basic_machine=hppa-`echo $basic_machine \| sed 's/^[^-]*-//'`
	+ os=-linux
	+ ;;
	+ pbd)
	+ basic_machine=sparc-tti
	+ ;;
	+ pbb)
	+ basic_machine=m68k-tti
	+ ;;
	+ pc532 \| pc532-*)
	+ basic_machine=ns32k-pc532
	+ ;;
	+ pc98)
	+ basic_machine=i386-pc
	+ ;;
	+ pc98-*)
	+ basic_machine=i386-`echo $basic_machine \| sed 's/^[^-]*-//'`
	+ ;;
	+ pentium \| p5 \| k5 \| k6 \| nexgen \| viac3)
	+ basic_machine=i586-pc
	+ ;;
	+ pentiumpro \| p6 \| 6x86 \| athlon \| athlon_*)
	+ basic_machine=i686-pc
	+ ;;
	+ pentiumii \| pentium2 \| pentiumiii \| pentium3)
	+ basic_machine=i686-pc
	+ ;;
	+ pentium4)
	+ basic_machine=i786-pc
	+ ;;
	+ pentium-* \| p5-* \| k5-* \| k6-* \| nexgen-* \| viac3-*)
	+ basic_machine=i586-`echo $basic_machine \| sed 's/^[^-]*-//'`
	+ ;;
	+ pentiumpro-* \| p6-* \| 6x86-* \| athlon-*)
	+ basic_machine=i686-`echo $basic_machine \| sed 's/^[^-]*-//'`
	+ ;;
	+ pentiumii-* \| pentium2-* \| pentiumiii-* \| pentium3-*)
	+ basic_machine=i686-`echo $basic_machine \| sed 's/^[^-]*-//'`
	+ ;;
	+ pentium4-*)
	+ basic_machine=i786-`echo $basic_machine \| sed 's/^[^-]*-//'`
	+ ;;
	+ pn)
	+ basic_machine=pn-gould
	+ ;;
	+ power) basic_machine=power-ibm
	+ ;;
	+ ppc) basic_machine=powerpc-unknown
	+ ;;
	+ ppc-) basic_machine=powerpc-`echo $basic_machine \| sed 's/^[^-]-//'`
	+ ;;
	+ ppcle \| powerpclittle \| ppc-le \| powerpc-little)
	+ basic_machine=powerpcle-unknown
	+ ;;
	+ ppcle-* \| powerpclittle-*)
	+ basic_machine=powerpcle-`echo $basic_machine \| sed 's/^[^-]*-//'`
	+ ;;
	+ ppc64) basic_machine=powerpc64-unknown
	+ ;;
	+ ppc64-) basic_machine=powerpc64-`echo $basic_machine \| sed 's/^[^-]-//'`
	+ ;;
	+ ppc64le \| powerpc64little \| ppc64-le \| powerpc64-little)
	+ basic_machine=powerpc64le-unknown
	+ ;;
	+ ppc64le-* \| powerpc64little-*)
	+ basic_machine=powerpc64le-`echo $basic_machine \| sed 's/^[^-]*-//'`
	+ ;;
	+ ps2)
	+ basic_machine=i386-ibm
	+ ;;
	+ pw32)
	+ basic_machine=i586-unknown
	+ os=-pw32
	+ ;;
	+ rdos)
	+ basic_machine=i386-pc
	+ os=-rdos
	+ ;;
	+ rom68k)
	+ basic_machine=m68k-rom68k
	+ os=-coff
	+ ;;
	+ rm[46]00)
	+ basic_machine=mips-siemens
	+ ;;
	+ rtpc \| rtpc-*)
	+ basic_machine=romp-ibm
	+ ;;
	+ s390 \| s390-*)
	+ basic_machine=s390-ibm
	+ ;;
	+ s390x \| s390x-*)
	+ basic_machine=s390x-ibm
	+ ;;
	+ sa29200)
	+ basic_machine=a29k-amd
	+ os=-udi
	+ ;;
	+ sb1)
	+ basic_machine=mipsisa64sb1-unknown
	+ ;;
	+ sb1el)
	+ basic_machine=mipsisa64sb1el-unknown
	+ ;;
	+ sde)
	+ basic_machine=mipsisa32-sde
	+ os=-elf
	+ ;;
	+ sei)
	+ basic_machine=mips-sei
	+ os=-seiux
	+ ;;
	+ sequent)
	+ basic_machine=i386-sequent
	+ ;;
	+ sh)
	+ basic_machine=sh-hitachi
	+ os=-hms
	+ ;;
	+ sh5el)
	+ basic_machine=sh5le-unknown
	+ ;;
	+ sh64)
	+ basic_machine=sh64-unknown
	+ ;;
	+ sparclite-wrs \| simso-wrs)
	+ basic_machine=sparclite-wrs
	+ os=-vxworks
	+ ;;
	+ sps7)
	+ basic_machine=m68k-bull
	+ os=-sysv2
	+ ;;
	+ spur)
	+ basic_machine=spur-unknown
	+ ;;
	+ st2000)
	+ basic_machine=m68k-tandem
	+ ;;
	+ stratus)
	+ basic_machine=i860-stratus
	+ os=-sysv4
	+ ;;
	+ sun2)
	+ basic_machine=m68000-sun
	+ ;;
	+ sun2os3)
	+ basic_machine=m68000-sun
	+ os=-sunos3
	+ ;;
	+ sun2os4)
	+ basic_machine=m68000-sun
	+ os=-sunos4
	+ ;;
	+ sun3os3)
	+ basic_machine=m68k-sun
	+ os=-sunos3
	+ ;;
	+ sun3os4)
	+ basic_machine=m68k-sun
	+ os=-sunos4
	+ ;;
	+ sun4os3)
	+ basic_machine=sparc-sun
	+ os=-sunos3
	+ ;;
	+ sun4os4)
	+ basic_machine=sparc-sun
	+ os=-sunos4
	+ ;;
	+ sun4sol2)
	+ basic_machine=sparc-sun
	+ os=-solaris2
	+ ;;
	+ sun3 \| sun3-*)
	+ basic_machine=m68k-sun
	+ ;;
	+ sun4)
	+ basic_machine=sparc-sun
	+ ;;
	+ sun386 \| sun386i \| roadrunner)
	+ basic_machine=i386-sun
	+ ;;
	+ sv1)
	+ basic_machine=sv1-cray
	+ os=-unicos
	+ ;;
	+ symmetry)
	+ basic_machine=i386-sequent
	+ os=-dynix
	+ ;;
	+ t3e)
	+ basic_machine=alphaev5-cray
	+ os=-unicos
	+ ;;
	+ t90)
	+ basic_machine=t90-cray
	+ os=-unicos
	+ ;;
	+ tic54x \| c54x*)
	+ basic_machine=tic54x-unknown
	+ os=-coff
	+ ;;
	+ tic55x \| c55x*)
	+ basic_machine=tic55x-unknown
	+ os=-coff
	+ ;;
	+ tic6x \| c6x*)
	+ basic_machine=tic6x-unknown
	+ os=-coff
	+ ;;
	+ tile*)
	+ basic_machine=tile-unknown
	+ os=-linux-gnu
	+ ;;
	+ tx39)
	+ basic_machine=mipstx39-unknown
	+ ;;
	+ tx39el)
	+ basic_machine=mipstx39el-unknown
	+ ;;
	+ toad1)
	+ basic_machine=pdp10-xkl
	+ os=-tops20
	+ ;;
	+ tower \| tower-32)
	+ basic_machine=m68k-ncr
	+ ;;
	+ tpf)
	+ basic_machine=s390x-ibm
	+ os=-tpf
	+ ;;
	+ udi29k)
	+ basic_machine=a29k-amd
	+ os=-udi
	+ ;;
	+ ultra3)
	+ basic_machine=a29k-nyu
	+ os=-sym1
	+ ;;
	+ v810 \| necv810)
	+ basic_machine=v810-nec
	+ os=-none
	+ ;;
	+ vaxv)
	+ basic_machine=vax-dec
	+ os=-sysv
	+ ;;
	+ vms)
	+ basic_machine=vax-dec
	+ os=-vms
	+ ;;
	+ vpp\|vx\|vx-)
	+ basic_machine=f301-fujitsu
	+ ;;
	+ vxworks960)
	+ basic_machine=i960-wrs
	+ os=-vxworks
	+ ;;
	+ vxworks68)
	+ basic_machine=m68k-wrs
	+ os=-vxworks
	+ ;;
	+ vxworks29k)
	+ basic_machine=a29k-wrs
	+ os=-vxworks
	+ ;;
	+ w65*)
	+ basic_machine=w65-wdc
	+ os=-none
	+ ;;
	+ w89k-*)
	+ basic_machine=hppa1.1-winbond
	+ os=-proelf
	+ ;;
	+ xbox)
	+ basic_machine=i686-pc
	+ os=-mingw32
	+ ;;
	+ xps \| xps100)
	+ basic_machine=xps100-honeywell
	+ ;;
	+ ymp)
	+ basic_machine=ymp-cray
	+ os=-unicos
	+ ;;
	+ z8k-*-coff)
	+ basic_machine=z8k-unknown
	+ os=-sim
	+ ;;
	+ z80-*-coff)
	+ basic_machine=z80-unknown
	+ os=-sim
	+ ;;
	+ none)
	+ basic_machine=none-none
	+ os=-none
	+ ;;
	+
	+# Here we handle the default manufacturer of certain CPU types. It is in
	+# some cases the only manufacturer, in others, it is the most popular.
	+ w89k)
	+ basic_machine=hppa1.1-winbond
	+ ;;
	+ op50n)
	+ basic_machine=hppa1.1-oki
	+ ;;
	+ op60c)
	+ basic_machine=hppa1.1-oki
	+ ;;
	+ romp)
	+ basic_machine=romp-ibm
	+ ;;
	+ mmix)
	+ basic_machine=mmix-knuth
	+ ;;
	+ rs6000)
	+ basic_machine=rs6000-ibm
	+ ;;
	+ vax)
	+ basic_machine=vax-dec
	+ ;;
	+ pdp10)
	+ # there are many clones, so DEC is not a safe bet
	+ basic_machine=pdp10-unknown
	+ ;;
	+ pdp11)
	+ basic_machine=pdp11-dec
	+ ;;
	+ we32k)
	+ basic_machine=we32k-att
	+ ;;
	+ sh[1234] \| sh[24]a \| sh[24]aeb \| sh[34]eb \| sh[1234]le \| sh[23]ele)
	+ basic_machine=sh-unknown
	+ ;;
	+ sparc \| sparcv8 \| sparcv9 \| sparcv9b \| sparcv9v)
	+ basic_machine=sparc-sun
	+ ;;
	+ cydra)
	+ basic_machine=cydra-cydrome
	+ ;;
	+ orion)
	+ basic_machine=orion-highlevel
	+ ;;
	+ orion105)
	+ basic_machine=clipper-highlevel
	+ ;;
	+ mac \| mpw \| mac-mpw)
	+ basic_machine=m68k-apple
	+ ;;
	+ pmac \| pmac-mpw)
	+ basic_machine=powerpc-apple
	+ ;;
	+ *-unknown)
	+ # Make sure to match an already-canonicalized machine name.
	+ ;;
	+ *)
	+ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
	+ exit 1
	+ ;;
	+esac
	+
	+# Here we canonicalize certain aliases for manufacturers.
	+case $basic_machine in
	+ -digital)
	+ basic_machine=`echo $basic_machine \| sed 's/digital.*/dec/'`
	+ ;;
	+ -commodore)
	+ basic_machine=`echo $basic_machine \| sed 's/commodore.*/cbm/'`
	+ ;;
	+ *)
	+ ;;
	+esac
	+
	+# Decode manufacturer-specific aliases for certain operating systems.
	+
	+if [ x"$os" != x"" ]
	+then
	+case $os in
	+ # First match some system type aliases
	+ # that might get confused with valid system types.
	+ # -solaris* is a basic system type, with this one exception.
	+ -solaris1 \| -solaris1.*)
	+ os=`echo $os \| sed -e 's\|solaris1\|sunos4\|'`
	+ ;;
	+ -solaris)
	+ os=-solaris2
	+ ;;
	+ -svr4*)
	+ os=-sysv4
	+ ;;
	+ -unixware*)
	+ os=-sysv4.2uw
	+ ;;
	+ -gnu/linux*)
	+ os=`echo $os \| sed -e 's\|gnu/linux\|linux-gnu\|'`
	+ ;;
	+ # First accept the basic system types.
	+ # The portable systems comes first.
	+ # Each alternative MUST END IN A *, to match a version number.
	+ # -sysv* is not here because it comes later, after sysvr4.
	+ -gnu* \| -bsd* \| -mach* \| -minix* \| -genix* \| -ultrix* \| -irix* \
	+ \| -vms \| -sco* \| -esix* \| -isc* \| -aix* \| -sunos \| -sunos[34]*\
	+ \| -hpux* \| -unos* \| -osf* \| -luna* \| -dgux* \| -solaris* \| -sym* \
	+ \| -kopensolaris* \
	+ \| -amigaos* \| -amigados* \| -msdos* \| -newsos* \| -unicos* \| -aof* \
	+ \| -aos* \| -aros* \
	+ \| -nindy* \| -vxsim* \| -vxworks* \| -ebmon* \| -hms* \| -mvs* \
	+ \| -clix* \| -riscos* \| -uniplus* \| -iris* \| -rtu* \| -xenix* \
	+ \| -hiux* \| -386bsd* \| -knetbsd* \| -mirbsd* \| -netbsd* \
	+ \| -openbsd* \| -solidbsd* \
	+ \| -ekkobsd* \| -kfreebsd* \| -freebsd* \| -riscix* \| -lynxos* \
	+ \| -bosx* \| -nextstep* \| -cxux* \| -aout* \| -elf* \| -oabi* \
	+ \| -ptx* \| -coff* \| -ecoff* \| -winnt* \| -domain* \| -vsta* \
	+ \| -udi* \| -eabi* \| -lites* \| -ieee* \| -go32* \| -aux* \
	+ \| -chorusos* \| -chorusrdb* \| -cegcc* \
	+ \| -cygwin* \| -pe* \| -psos* \| -moss* \| -proelf* \| -rtems* \
	+ \| -mingw32* \| -linux-gnu* \| -linux-newlib* \| -linux-uclibc* \
	+ \| -uxpv* \| -beos* \| -mpeix* \| -udk* \
	+ \| -interix* \| -uwin* \| -mks* \| -rhapsody* \| -darwin* \| -opened* \
	+ \| -openstep* \| -oskit* \| -conix* \| -pw32* \| -nonstopux* \
	+ \| -storm-chaos* \| -tops10* \| -tenex* \| -tops20* \| -its* \
	+ \| -os2* \| -vos* \| -palmos* \| -uclinux* \| -nucleus* \
	+ \| -morphos* \| -superux* \| -rtmk* \| -rtmk-nova* \| -windiss* \
	+ \| -powermax* \| -dnix* \| -nx6 \| -nx7 \| -sei* \| -dragonfly* \
	+ \| -skyos* \| -haiku* \| -rdos* \| -toppers* \| -drops*)
	+ # Remember, each alternative MUST END IN *, to match a version number.
	+ ;;
	+ -qnx*)
	+ case $basic_machine in
	+ x86-* \| i86-)
	+ ;;
	+ *)
	+ os=-nto$os
	+ ;;
	+ esac
	+ ;;
	+ -nto-qnx*)
	+ ;;
	+ -nto*)
	+ os=`echo $os \| sed -e 's\|nto\|nto-qnx\|'`
	+ ;;
	+ -sim \| -es1800* \| -hms* \| -xray \| -os68k* \| -none* \| -v88r* \
	+ \| -windows* \| -osx \| -abug \| -netware* \| -os9* \| -beos* \| -haiku* \
	+ \| -macos* \| -mpw* \| -magic* \| -mmixware* \| -mon960* \| -lnews*)
	+ ;;
	+ -mac*)
	+ os=`echo $os \| sed -e 's\|mac\|macos\|'`
	+ ;;
	+ -linux-dietlibc)
	+ os=-linux-dietlibc
	+ ;;
	+ -linux*)
	+ os=`echo $os \| sed -e 's\|linux\|linux-gnu\|'`
	+ ;;
	+ -sunos5*)
	+ os=`echo $os \| sed -e 's\|sunos5\|solaris2\|'`
	+ ;;
	+ -sunos6*)
	+ os=`echo $os \| sed -e 's\|sunos6\|solaris3\|'`
	+ ;;
	+ -opened*)
	+ os=-openedition
	+ ;;
	+ -os400*)
	+ os=-os400
	+ ;;
	+ -wince*)
	+ os=-wince
	+ ;;
	+ -osfrose*)
	+ os=-osfrose
	+ ;;
	+ -osf*)
	+ os=-osf
	+ ;;
	+ -utek*)
	+ os=-bsd
	+ ;;
	+ -dynix*)
	+ os=-bsd
	+ ;;
	+ -acis*)
	+ os=-aos
	+ ;;
	+ -atheos*)
	+ os=-atheos
	+ ;;
	+ -syllable*)
	+ os=-syllable
	+ ;;
	+ -386bsd)
	+ os=-bsd
	+ ;;
	+ -ctix* \| -uts*)
	+ os=-sysv
	+ ;;
	+ -nova*)
	+ os=-rtmk-nova
	+ ;;
	+ -ns2 )
	+ os=-nextstep2
	+ ;;
	+ -nsk*)
	+ os=-nsk
	+ ;;
	+ # Preserve the version number of sinix5.
	+ -sinix5.*)
	+ os=`echo $os \| sed -e 's\|sinix\|sysv\|'`
	+ ;;
	+ -sinix*)
	+ os=-sysv4
	+ ;;
	+ -tpf*)
	+ os=-tpf
	+ ;;
	+ -triton*)
	+ os=-sysv3
	+ ;;
	+ -oss*)
	+ os=-sysv3
	+ ;;
	+ -svr4)
	+ os=-sysv4
	+ ;;
	+ -svr3)
	+ os=-sysv3
	+ ;;
	+ -sysvr4)
	+ os=-sysv4
	+ ;;
	+ # This must come after -sysvr4.
	+ -sysv*)
	+ ;;
	+ -ose*)
	+ os=-ose
	+ ;;
	+ -es1800*)
	+ os=-ose
	+ ;;
	+ -xenix)
	+ os=-xenix
	+ ;;
	+ -mint \| -mint[0-9] \| -MiNT \| -MiNT[0-9])
	+ os=-mint
	+ ;;
	+ -aros*)
	+ os=-aros
	+ ;;
	+ -kaos*)
	+ os=-kaos
	+ ;;
	+ -zvmoe)
	+ os=-zvmoe
	+ ;;
	+ -dicos*)
	+ os=-dicos
	+ ;;
	+ -none)
	+ ;;
	+ *)
	+ # Get rid of the `-' at the beginning of $os.
	+ os=`echo $os \| sed 's/[^-]*-//'`
	+ echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
	+ exit 1
	+ ;;
	+esac
	+else
	+
	+# Here we handle the default operating systems that come with various machines.
	+# The value should be what the vendor currently ships out the door with their
	+# machine or put another way, the most popular os provided with the machine.
	+
	+# Note that if you're going to try to match "-MANUFACTURER" here (say,
	+# "-sun"), then you have to tell the case statement up towards the top
	+# that MANUFACTURER isn't an operating system. Otherwise, code above
	+# will signal an error saying that MANUFACTURER isn't an operating
	+# system, and we'll never get to this point.
	+
	+case $basic_machine in
	+ score-*)
	+ os=-elf
	+ ;;
	+ spu-*)
	+ os=-elf
	+ ;;
	+ *-acorn)
	+ os=-riscix1.2
	+ ;;
	+ arm*-rebel)
	+ os=-linux
	+ ;;
	+ arm*-semi)
	+ os=-aout
	+ ;;
	+ c4x-* \| tic4x-*)
	+ os=-coff
	+ ;;
	+ # This must come before the *-dec entry.
	+ pdp10-*)
	+ os=-tops20
	+ ;;
	+ pdp11-*)
	+ os=-none
	+ ;;
	+ -dec \| vax-)
	+ os=-ultrix4.2
	+ ;;
	+ m68*-apollo)
	+ os=-domain
	+ ;;
	+ i386-sun)
	+ os=-sunos4.0.2
	+ ;;
	+ m68000-sun)
	+ os=-sunos3
	+ # This also exists in the configure program, but was not the
	+ # default.
	+ # os=-sunos4
	+ ;;
	+ m68*-cisco)
	+ os=-aout
	+ ;;
	+ mep-*)
	+ os=-elf
	+ ;;
	+ mips*-cisco)
	+ os=-elf
	+ ;;
	+ mips-)
	+ os=-elf
	+ ;;
	+ or32-*)
	+ os=-coff
	+ ;;
	+ *-tti) # must be before sparc entry or we get the wrong os.
	+ os=-sysv3
	+ ;;
	+ sparc-* \| *-sun)
	+ os=-sunos4.1.1
	+ ;;
	+ *-be)
	+ os=-beos
	+ ;;
	+ *-haiku)
	+ os=-haiku
	+ ;;
	+ *-ibm)
	+ os=-aix
	+ ;;
	+ *-knuth)
	+ os=-mmixware
	+ ;;
	+ *-wec)
	+ os=-proelf
	+ ;;
	+ *-winbond)
	+ os=-proelf
	+ ;;
	+ *-oki)
	+ os=-proelf
	+ ;;
	+ *-hp)
	+ os=-hpux
	+ ;;
	+ *-hitachi)
	+ os=-hiux
	+ ;;
	+ i860-* \| -att \| -ncr \| -altos \| -motorola \| *-convergent)
	+ os=-sysv
	+ ;;
	+ *-cbm)
	+ os=-amigaos
	+ ;;
	+ *-dg)
	+ os=-dgux
	+ ;;
	+ *-dolphin)
	+ os=-sysv3
	+ ;;
	+ m68k-ccur)
	+ os=-rtu
	+ ;;
	+ m88k-omron*)
	+ os=-luna
	+ ;;
	+ *-next )
	+ os=-nextstep
	+ ;;
	+ *-sequent)
	+ os=-ptx
	+ ;;
	+ *-crds)
	+ os=-unos
	+ ;;
	+ *-ns)
	+ os=-genix
	+ ;;
	+ i370-*)
	+ os=-mvs
	+ ;;
	+ *-next)
	+ os=-nextstep3
	+ ;;
	+ *-gould)
	+ os=-sysv
	+ ;;
	+ *-highlevel)
	+ os=-bsd
	+ ;;
	+ *-encore)
	+ os=-bsd
	+ ;;
	+ *-sgi)
	+ os=-irix
	+ ;;
	+ *-siemens)
	+ os=-sysv4
	+ ;;
	+ *-masscomp)
	+ os=-rtu
	+ ;;
	+ f30[01]-fujitsu \| f700-fujitsu)
	+ os=-uxpv
	+ ;;
	+ *-rom68k)
	+ os=-coff
	+ ;;
	+ -bug)
	+ os=-coff
	+ ;;
	+ *-apple)
	+ os=-macos
	+ ;;
	+ -atari)
	+ os=-mint
	+ ;;
	+ *)
	+ os=-none
	+ ;;
	+esac
	+fi
	+
	+# Here we handle the case where we know the os, and the CPU type, but not the
	+# manufacturer. We pick the logical manufacturer.
	+vendor=unknown
	+case $basic_machine in
	+ *-unknown)
	+ case $os in
	+ -riscix*)
	+ vendor=acorn
	+ ;;
	+ -sunos*)
	+ vendor=sun
	+ ;;
	+ -aix*)
	+ vendor=ibm
	+ ;;
	+ -beos*)
	+ vendor=be
	+ ;;
	+ -hpux*)
	+ vendor=hp
	+ ;;
	+ -mpeix*)
	+ vendor=hp
	+ ;;
	+ -hiux*)
	+ vendor=hitachi
	+ ;;
	+ -unos*)
	+ vendor=crds
	+ ;;
	+ -dgux*)
	+ vendor=dg
	+ ;;
	+ -luna*)
	+ vendor=omron
	+ ;;
	+ -genix*)
	+ vendor=ns
	+ ;;
	+ -mvs* \| -opened*)
	+ vendor=ibm
	+ ;;
	+ -os400*)
	+ vendor=ibm
	+ ;;
	+ -ptx*)
	+ vendor=sequent
	+ ;;
	+ -tpf*)
	+ vendor=ibm
	+ ;;
	+ -vxsim* \| -vxworks* \| -windiss*)
	+ vendor=wrs
	+ ;;
	+ -aux*)
	+ vendor=apple
	+ ;;
	+ -hms*)
	+ vendor=hitachi
	+ ;;
	+ -mpw* \| -macos*)
	+ vendor=apple
	+ ;;
	+ -mint \| -mint[0-9] \| -MiNT \| -MiNT[0-9])
	+ vendor=atari
	+ ;;
	+ -vos*)
	+ vendor=stratus
	+ ;;
	+ esac
	+ basic_machine=`echo $basic_machine \| sed "s/unknown/$vendor/"`
	+ ;;
	+esac
	+
	+echo $basic_machine$os
	+exit
	+
	+# Local variables:
	+# eval: (add-hook 'write-file-hooks 'time-stamp)
	+# time-stamp-start: "timestamp='"
	+# time-stamp-format: "%:y-%02m-%02d"
	+# time-stamp-end: "'"
	+# End:
	diff --git a/tags/xmount-0.7.0/old_build/configure b/tags/xmount-0.7.0/old_build/configure
	new file mode 100755
	index 0000000..156814a
	--- /dev/null
	+++ b/tags/xmount-0.7.0/old_build/configure
	@@ -0,0 +1,6682 @@
	+#! /bin/sh
	+# Guess values for system-dependent variables and create Makefiles.
	+# Generated by GNU Autoconf 2.68 for xmount 0.5.1.
	+#
	+# Report bugs to <bugs@pinguin.lu>.
	+#
	+#
	+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
	+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
	+# Foundation, Inc.
	+#
	+#
	+# This configure script is free software; the Free Software Foundation
	+# gives unlimited permission to copy, distribute and modify it.
	+## -------------------- ##
	+## M4sh Initialization. ##
	+## -------------------- ##
	+
	+# Be more Bourne compatible
	+DUALCASE=1; export DUALCASE # for MKS sh
	+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
	+ emulate sh
	+ NULLCMD=:
	+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
	+ # is contrary to our usage. Disable this feature.
	+ alias -g '${1+"$@"}'='"$@"'
	+ setopt NO_GLOB_SUBST
	+else
	+ case `(set -o) 2>/dev/null` in #(
	+ posix) :
	+ set -o posix ;; #(
	+ *) :
	+ ;;
	+esac
	+fi
	+
	+
	+as_nl='
	+'
	+export as_nl
	+# Printing a long string crashes Solaris 7 /usr/bin/printf.
	+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
	+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
	+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
	+# Prefer a ksh shell builtin over an external printf program on Solaris,
	+# but without wasting forks for bash or zsh.
	+if test -z "$BASH_VERSION$ZSH_VERSION" \
	+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
	+ as_echo='print -r --'
	+ as_echo_n='print -rn --'
	+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
	+ as_echo='printf %s\n'
	+ as_echo_n='printf %s'
	+else
	+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
	+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
	+ as_echo_n='/usr/ucb/echo -n'
	+ else
	+ as_echo_body='eval expr "X$1" : "X\$.*\$"'
	+ as_echo_n_body='eval
	+ arg=$1;
	+ case $arg in #(
	+ "$as_nl")
	+ expr "X$arg" : "X\$.*\$$as_nl";
	+ arg=`expr "X$arg" : ".$as_nl\$.\$"`;;
	+ esac;
	+ expr "X$arg" : "X\$.*\$" \| tr -d "$as_nl"
	+ '
	+ export as_echo_n_body
	+ as_echo_n='sh -c $as_echo_n_body as_echo'
	+ fi
	+ export as_echo_body
	+ as_echo='sh -c $as_echo_body as_echo'
	+fi
	+
	+# The user is always right.
	+if test "${PATH_SEPARATOR+set}" != set; then
	+ PATH_SEPARATOR=:
	+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
	+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \|\|
	+ PATH_SEPARATOR=';'
	+ }
	+fi
	+
	+
	+# IFS
	+# We need space, tab and new line, in precisely that order. Quoting is
	+# there to prevent editors from complaining about space-tab.
	+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
	+# splitting by setting IFS to empty value.)
	+IFS=" "" $as_nl"
	+
	+# Find who we are. Look in the path if we contain no directory separator.
	+as_myself=
	+case $0 in #((
	+ [\\/] ) as_myself=$0 ;;
	+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
	+for as_dir in $PATH
	+do
	+ IFS=$as_save_IFS
	+ test -z "$as_dir" && as_dir=.
	+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
	+ done
	+IFS=$as_save_IFS
	+
	+ ;;
	+esac
	+# We did not find ourselves, most probably we were run as `sh COMMAND'
	+# in which case we are not to be found in the path.
	+if test "x$as_myself" = x; then
	+ as_myself=$0
	+fi
	+if test ! -f "$as_myself"; then
	+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
	+ exit 1
	+fi
	+
	+# Unset variables that we do not need and which cause bugs (e.g. in
	+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "\|\| exit 1"
	+# suppresses any "Segmentation fault" message there. '((' could
	+# trigger a bug in pdksh 5.2.14.
	+for as_var in BASH_ENV ENV MAIL MAILPATH
	+do eval test x\${$as_var+set} = xset \
	+ && ( (unset $as_var) \|\| exit 1) >/dev/null 2>&1 && unset $as_var \|\| :
	+done
	+PS1='$ '
	+PS2='> '
	+PS4='+ '
	+
	+# NLS nuisances.
	+LC_ALL=C
	+export LC_ALL
	+LANGUAGE=C
	+export LANGUAGE
	+
	+# CDPATH.
	+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
	+
	+if test "x$CONFIG_SHELL" = x; then
	+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
	+ emulate sh
	+ NULLCMD=:
	+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which
	+ # is contrary to our usage. Disable this feature.
	+ alias -g '\${1+\"\$@\"}'='\"\$@\"'
	+ setopt NO_GLOB_SUBST
	+else
	+ case \`(set -o) 2>/dev/null\` in #(
	+ posix) :
	+ set -o posix ;; #(
	+ *) :
	+ ;;
	+esac
	+fi
	+"
	+ as_required="as_fn_return () { (exit \$1); }
	+as_fn_success () { as_fn_return 0; }
	+as_fn_failure () { as_fn_return 1; }
	+as_fn_ret_success () { return 0; }
	+as_fn_ret_failure () { return 1; }
	+
	+exitcode=0
	+as_fn_success \|\| { exitcode=1; echo as_fn_success failed.; }
	+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; }
	+as_fn_ret_success \|\| { exitcode=1; echo as_fn_ret_success failed.; }
	+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; }
	+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then :
	+
	+else
	+ exitcode=1; echo positional parameters were not saved.
	+fi
	+test x\$exitcode = x0 \|\| exit 1"
	+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
	+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
	+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
	+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' \|\| exit 1
	+test \$(( 1 + 1 )) = 2 \|\| exit 1"
	+ if (eval "$as_required") 2>/dev/null; then :
	+ as_have_required=yes
	+else
	+ as_have_required=no
	+fi
	+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then :
	+
	+else
	+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
	+as_found=false
	+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
	+do
	+ IFS=$as_save_IFS
	+ test -z "$as_dir" && as_dir=.
	+ as_found=:
	+ case $as_dir in #(
	+ /*)
	+ for as_base in sh bash ksh sh5; do
	+ # Try only shells that exist, to save several forks.
	+ as_shell=$as_dir/$as_base
	+ if { test -f "$as_shell" \|\| test -f "$as_shell.exe"; } &&
	+ { $as_echo "$as_bourne_compatible""$as_required" \| as_run=a "$as_shell"; } 2>/dev/null; then :
	+ CONFIG_SHELL=$as_shell as_have_required=yes
	+ if { $as_echo "$as_bourne_compatible""$as_suggested" \| as_run=a "$as_shell"; } 2>/dev/null; then :
	+ break 2
	+fi
	+fi
	+ done;;
	+ esac
	+ as_found=false
	+done
	+$as_found \|\| { if { test -f "$SHELL" \|\| test -f "$SHELL.exe"; } &&
	+ { $as_echo "$as_bourne_compatible""$as_required" \| as_run=a "$SHELL"; } 2>/dev/null; then :
	+ CONFIG_SHELL=$SHELL as_have_required=yes
	+fi; }
	+IFS=$as_save_IFS
	+
	+
	+ if test "x$CONFIG_SHELL" != x; then :
	+ # We cannot yet assume a decent shell, so we have to provide a
	+ # neutralization value for shells without unset; and this also
	+ # works around shells that cannot unset nonexistent variables.
	+ # Preserve -v and -x to the replacement shell.
	+ BASH_ENV=/dev/null
	+ ENV=/dev/null
	+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
	+ export CONFIG_SHELL
	+ case $- in # ((((
	+ vx* \| xv* ) as_opts=-vx ;;
	+ v ) as_opts=-v ;;
	+ x ) as_opts=-x ;;
	+ * ) as_opts= ;;
	+ esac
	+ exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"}
	+fi
	+
	+ if test x$as_have_required = xno; then :
	+ $as_echo "$0: This script requires a shell more modern than all"
	+ $as_echo "$0: the shells that I found on your system."
	+ if test x${ZSH_VERSION+set} = xset ; then
	+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should"
	+ $as_echo "$0: be upgraded to zsh 4.3.4 or later."
	+ else
	+ $as_echo "$0: Please tell bug-autoconf@gnu.org and bugs@pinguin.lu
	+$0: about your system, including any error possibly output
	+$0: before this message. Then install a modern shell, or
	+$0: manually run the script under such a shell if you do
	+$0: have one."
	+ fi
	+ exit 1
	+fi
	+fi
	+fi
	+SHELL=${CONFIG_SHELL-/bin/sh}
	+export SHELL
	+# Unset more variables known to interfere with behavior of common tools.
	+CLICOLOR_FORCE= GREP_OPTIONS=
	+unset CLICOLOR_FORCE GREP_OPTIONS
	+
	+## --------------------- ##
	+## M4sh Shell Functions. ##
	+## --------------------- ##
	+# as_fn_unset VAR
	+# ---------------
	+# Portably unset VAR.
	+as_fn_unset ()
	+{
	+ { eval $1=; unset $1;}
	+}
	+as_unset=as_fn_unset
	+
	+# as_fn_set_status STATUS
	+# -----------------------
	+# Set $? to STATUS, without forking.
	+as_fn_set_status ()
	+{
	+ return $1
	+} # as_fn_set_status
	+
	+# as_fn_exit STATUS
	+# -----------------
	+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
	+as_fn_exit ()
	+{
	+ set +e
	+ as_fn_set_status $1
	+ exit $1
	+} # as_fn_exit
	+
	+# as_fn_mkdir_p
	+# -------------
	+# Create "$as_dir" as a directory, including parents if necessary.
	+as_fn_mkdir_p ()
	+{
	+
	+ case $as_dir in #(
	+ -*) as_dir=./$as_dir;;
	+ esac
	+ test -d "$as_dir" \|\| eval $as_mkdir_p \|\| {
	+ as_dirs=
	+ while :; do
	+ case $as_dir in #(
	+ \') as_qdir=`$as_echo "$as_dir" \| sed "s/'/'\\\\\\\\''/g"`;; #'(
	+ *) as_qdir=$as_dir;;
	+ esac
	+ as_dirs="'$as_qdir' $as_dirs"
	+ as_dir=`$as_dirname -- "$as_dir" \|\|
	+$as_expr X"$as_dir" : 'X$.[^/]$//[^/][^/]/$' \\| \
	+ X"$as_dir" : 'X$//$[^/]' \\| \
	+ X"$as_dir" : 'X$//$$' \\| \
	+ X"$as_dir" : 'X$/$' \\| . 2>/dev/null \|\|
	+$as_echo X"$as_dir" \|
	+ sed '/^X$.[^/]$\/\/[^/][^/]\/$/{
	+ s//\1/
	+ q
	+ }
	+ /^X$\/\/$[^/].*/{
	+ s//\1/
	+ q
	+ }
	+ /^X$\/\/$$/{
	+ s//\1/
	+ q
	+ }
	+ /^X$\/$.*/{
	+ s//\1/
	+ q
	+ }
	+ s/.*/./; q'`
	+ test -d "$as_dir" && break
	+ done
	+ test -z "$as_dirs" \|\| eval "mkdir $as_dirs"
	+ } \|\| test -d "$as_dir" \|\| as_fn_error $? "cannot create directory $as_dir"
	+
	+
	+} # as_fn_mkdir_p
	+# as_fn_append VAR VALUE
	+# ----------------------
	+# Append the text in VALUE to the end of the definition contained in VAR. Take
	+# advantage of any shell optimizations that allow amortized linear growth over
	+# repeated appends, instead of the typical quadratic growth present in naive
	+# implementations.
	+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
	+ eval 'as_fn_append ()
	+ {
	+ eval $1+=\$2
	+ }'
	+else
	+ as_fn_append ()
	+ {
	+ eval $1=\$$1\$2
	+ }
	+fi # as_fn_append
	+
	+# as_fn_arith ARG...
	+# ------------------
	+# Perform arithmetic evaluation on the ARGs, and store the result in the
	+# global $as_val. Take advantage of shells that can avoid forks. The arguments
	+# must be portable across $(()) and expr.
	+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
	+ eval 'as_fn_arith ()
	+ {
	+ as_val=$(( $* ))
	+ }'
	+else
	+ as_fn_arith ()
	+ {
	+ as_val=`expr "$@" \|\| test $? -eq 1`
	+ }
	+fi # as_fn_arith
	+
	+
	+# as_fn_error STATUS ERROR [LINENO LOG_FD]
	+# ----------------------------------------
	+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
	+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
	+# script with STATUS, using 1 if that was 0.
	+as_fn_error ()
	+{
	+ as_status=$1; test $as_status -eq 0 && as_status=1
	+ if test "$4"; then
	+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
	+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
	+ fi
	+ $as_echo "$as_me: error: $2" >&2
	+ as_fn_exit $as_status
	+} # as_fn_error
	+
	+if expr a : '$a$' >/dev/null 2>&1 &&
	+ test "X`expr 00001 : '.*$...$'`" = X001; then
	+ as_expr=expr
	+else
	+ as_expr=false
	+fi
	+
	+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
	+ as_basename=basename
	+else
	+ as_basename=false
	+fi
	+
	+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
	+ as_dirname=dirname
	+else
	+ as_dirname=false
	+fi
	+
	+as_me=`$as_basename -- "$0" \|\|
	+$as_expr X/"$0" : './$[^/][^/]$/*$' \\| \
	+ X"$0" : 'X$//$$' \\| \
	+ X"$0" : 'X$/$' \\| . 2>/dev/null \|\|
	+$as_echo X/"$0" \|
	+ sed '/^.\/$[^/][^/]$\/*$/{
	+ s//\1/
	+ q
	+ }
	+ /^X\/$\/\/$$/{
	+ s//\1/
	+ q
	+ }
	+ /^X\/$\/$.*/{
	+ s//\1/
	+ q
	+ }
	+ s/.*/./; q'`
	+
	+# Avoid depending upon Character Ranges.
	+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
	+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
	+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
	+as_cr_digits='0123456789'
	+as_cr_alnum=$as_cr_Letters$as_cr_digits
	+
	+
	+ as_lineno_1=$LINENO as_lineno_1a=$LINENO
	+ as_lineno_2=$LINENO as_lineno_2a=$LINENO
	+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" &&
	+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' \|\| {
	+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-)
	+ sed -n '
	+ p
	+ /[$]LINENO/=
	+ ' <$as_myself \|
	+ sed '
	+ s/[$]LINENO.*/&-/
	+ t lineno
	+ b
	+ :lineno
	+ N
	+ :loop
	+ s/[$]LINENO$[^'$as_cr_alnum'_].\n$$.$/\2\1\2/
	+ t loop
	+ s/-\n.*//
	+ ' >$as_me.lineno &&
	+ chmod +x "$as_me.lineno" \|\|
	+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
	+
	+ # Don't try to exec as it changes $[0], causing all sort of problems
	+ # (the dirname of $[0] is not the place where we might find the
	+ # original and so on. Autoconf is especially sensitive to this).
	+ . "./$as_me.lineno"
	+ # Exit status is that of the last command.
	+ exit
	+}
	+
	+ECHO_C= ECHO_N= ECHO_T=
	+case `echo -n x` in #(((((
	+-n*)
	+ case `echo 'xy\c'` in
	+ c) ECHO_T=' ';; # ECHO_T is single tab character.
	+ xy) ECHO_C='\c';;
	+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
	+ ECHO_T=' ';;
	+ esac;;
	+*)
	+ ECHO_N='-n';;
	+esac
	+
	+rm -f conf$$ conf$$.exe conf$$.file
	+if test -d conf$$.dir; then
	+ rm -f conf$$.dir/conf$$.file
	+else
	+ rm -f conf$$.dir
	+ mkdir conf$$.dir 2>/dev/null
	+fi
	+if (echo >conf$$.file) 2>/dev/null; then
	+ if ln -s conf$$.file conf$$ 2>/dev/null; then
	+ as_ln_s='ln -s'
	+ # ... but there are two gotchas:
	+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
	+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
	+ # In both cases, we have to default to `cp -p'.
	+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe \|\|
	+ as_ln_s='cp -p'
	+ elif ln conf$$.file conf$$ 2>/dev/null; then
	+ as_ln_s=ln
	+ else
	+ as_ln_s='cp -p'
	+ fi
	+else
	+ as_ln_s='cp -p'
	+fi
	+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
	+rmdir conf$$.dir 2>/dev/null
	+
	+if mkdir -p . 2>/dev/null; then
	+ as_mkdir_p='mkdir -p "$as_dir"'
	+else
	+ test -d ./-p && rmdir ./-p
	+ as_mkdir_p=false
	+fi
	+
	+if test -x / >/dev/null 2>&1; then
	+ as_test_x='test -x'
	+else
	+ if ls -dL / >/dev/null 2>&1; then
	+ as_ls_L_option=L
	+ else
	+ as_ls_L_option=
	+ fi
	+ as_test_x='
	+ eval sh -c '\''
	+ if test -d "$1"; then
	+ test -d "$1/.";
	+ else
	+ case $1 in #(
	+ -*)set "./$1";;
	+ esac;
	+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
	+ ???[sx]):;;)false;;esac;fi
	+ '\'' sh
	+ '
	+fi
	+as_executable_p=$as_test_x
	+
	+# Sed expression to map a string onto a valid CPP name.
	+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
	+
	+# Sed expression to map a string onto a valid variable name.
	+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
	+
	+
	+test -n "$DJDIR" \|\| exec 7<&0 </dev/null
	+exec 6>&1
	+
	+# Name of the host.
	+# hostname on some systems (SVR3.2, old GNU/Linux) returns a bogus exit status,
	+# so uname gets run too.
	+ac_hostname=`(hostname \|\| uname -n) 2>/dev/null \| sed 1q`
	+
	+#
	+# Initializations.
	+#
	+ac_default_prefix=/usr/local
	+ac_clean_files=
	+ac_config_libobj_dir=.
	+LIBOBJS=
	+cross_compiling=no
	+subdirs=
	+MFLAGS=
	+MAKEFLAGS=
	+
	+# Identity of this package.
	+PACKAGE_NAME='xmount'
	+PACKAGE_TARNAME='xmount'
	+PACKAGE_VERSION='0.5.1'
	+PACKAGE_STRING='xmount 0.5.1'
	+PACKAGE_BUGREPORT='bugs@pinguin.lu'
	+PACKAGE_URL=''
	+
	+ac_unique_file="xmount.c"
	+# Factoring default headers for most tests.
	+ac_includes_default="\
	+#include <stdio.h>
	+#ifdef HAVE_SYS_TYPES_H
	+# include <sys/types.h>
	+#endif
	+#ifdef HAVE_SYS_STAT_H
	+# include <sys/stat.h>
	+#endif
	+#ifdef STDC_HEADERS
	+# include <stdlib.h>
	+# include <stddef.h>
	+#else
	+# ifdef HAVE_STDLIB_H
	+# include <stdlib.h>
	+# endif
	+#endif
	+#ifdef HAVE_STRING_H
	+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
	+# include <memory.h>
	+# endif
	+# include <string.h>
	+#endif
	+#ifdef HAVE_STRINGS_H
	+# include <strings.h>
	+#endif
	+#ifdef HAVE_INTTYPES_H
	+# include <inttypes.h>
	+#endif
	+#ifdef HAVE_STDINT_H
	+# include <stdint.h>
	+#endif
	+#ifdef HAVE_UNISTD_H
	+# include <unistd.h>
	+#endif"
	+
	+ac_subst_vars='am__EXEEXT_FALSE
	+am__EXEEXT_TRUE
	+LTLIBOBJS
	+LIBOBJS
	+fuse_LIBS
	+fuse_CFLAGS
	+PKG_CONFIG_LIBDIR
	+PKG_CONFIG_PATH
	+PKG_CONFIG
	+EGREP
	+GREP
	+CPP
	+am__fastdepCC_FALSE
	+am__fastdepCC_TRUE
	+CCDEPMODE
	+am__nodep
	+AMDEPBACKSLASH
	+AMDEP_FALSE
	+AMDEP_TRUE
	+am__quote
	+am__include
	+DEPDIR
	+OBJEXT
	+EXEEXT
	+ac_ct_CC
	+CPPFLAGS
	+LDFLAGS
	+CFLAGS
	+CC
	+am__untar
	+am__tar
	+AMTAR
	+am__leading_dot
	+SET_MAKE
	+AWK
	+mkdir_p
	+MKDIR_P
	+INSTALL_STRIP_PROGRAM
	+STRIP
	+install_sh
	+MAKEINFO
	+AUTOHEADER
	+AUTOMAKE
	+AUTOCONF
	+ACLOCAL
	+VERSION
	+PACKAGE
	+CYGPATH_W
	+am__isrc
	+INSTALL_DATA
	+INSTALL_SCRIPT
	+INSTALL_PROGRAM
	+target_alias
	+host_alias
	+build_alias
	+LIBS
	+ECHO_T
	+ECHO_N
	+ECHO_C
	+DEFS
	+mandir
	+localedir
	+libdir
	+psdir
	+pdfdir
	+dvidir
	+htmldir
	+infodir
	+docdir
	+oldincludedir
	+includedir
	+localstatedir
	+sharedstatedir
	+sysconfdir
	+datadir
	+datarootdir
	+libexecdir
	+sbindir
	+bindir
	+program_transform_name
	+prefix
	+exec_prefix
	+PACKAGE_URL
	+PACKAGE_BUGREPORT
	+PACKAGE_STRING
	+PACKAGE_VERSION
	+PACKAGE_TARNAME
	+PACKAGE_NAME
	+PATH_SEPARATOR
	+SHELL'
	+ac_subst_files=''
	+ac_user_opts='
	+enable_option_checking
	+enable_dependency_tracking
	+'
	+ ac_precious_vars='build_alias
	+host_alias
	+target_alias
	+CC
	+CFLAGS
	+LDFLAGS
	+LIBS
	+CPPFLAGS
	+CPP
	+PKG_CONFIG
	+PKG_CONFIG_PATH
	+PKG_CONFIG_LIBDIR
	+fuse_CFLAGS
	+fuse_LIBS'
	+
	+
	+# Initialize some variables set by options.
	+ac_init_help=
	+ac_init_version=false
	+ac_unrecognized_opts=
	+ac_unrecognized_sep=
	+# The variables have the same names as the options, with
	+# dashes changed to underlines.
	+cache_file=/dev/null
	+exec_prefix=NONE
	+no_create=
	+no_recursion=
	+prefix=NONE
	+program_prefix=NONE
	+program_suffix=NONE
	+program_transform_name=s,x,x,
	+silent=
	+site=
	+srcdir=
	+verbose=
	+x_includes=NONE
	+x_libraries=NONE
	+
	+# Installation directory options.
	+# These are left unexpanded so users can "make install exec_prefix=/foo"
	+# and all the variables that are supposed to be based on exec_prefix
	+# by default will actually change.
	+# Use braces instead of parens because sh, perl, etc. also accept them.
	+# (The list follows the same order as the GNU Coding Standards.)
	+bindir='${exec_prefix}/bin'
	+sbindir='${exec_prefix}/sbin'
	+libexecdir='${exec_prefix}/libexec'
	+datarootdir='${prefix}/share'
	+datadir='${datarootdir}'
	+sysconfdir='${prefix}/etc'
	+sharedstatedir='${prefix}/com'
	+localstatedir='${prefix}/var'
	+includedir='${prefix}/include'
	+oldincludedir='/usr/include'
	+docdir='${datarootdir}/doc/${PACKAGE_TARNAME}'
	+infodir='${datarootdir}/info'
	+htmldir='${docdir}'
	+dvidir='${docdir}'
	+pdfdir='${docdir}'
	+psdir='${docdir}'
	+libdir='${exec_prefix}/lib'
	+localedir='${datarootdir}/locale'
	+mandir='${datarootdir}/man'
	+
	+ac_prev=
	+ac_dashdash=
	+for ac_option
	+do
	+ # If the previous option needs an argument, assign it.
	+ if test -n "$ac_prev"; then
	+ eval $ac_prev=\$ac_option
	+ ac_prev=
	+ continue
	+ fi
	+
	+ case $ac_option in
	+ =?) ac_optarg=`expr "X$ac_option" : '[^=]=$.$'` ;;
	+ *=) ac_optarg= ;;
	+ *) ac_optarg=yes ;;
	+ esac
	+
	+ # Accept the important Cygnus configure options, so we can diagnose typos.
	+
	+ case $ac_dashdash$ac_option in
	+ --)
	+ ac_dashdash=yes ;;
	+
	+ -bindir \| --bindir \| --bindi \| --bind \| --bin \| --bi)
	+ ac_prev=bindir ;;
	+ -bindir=* \| --bindir=* \| --bindi=* \| --bind=* \| --bin=* \| --bi=*)
	+ bindir=$ac_optarg ;;
	+
	+ -build \| --build \| --buil \| --bui \| --bu)
	+ ac_prev=build_alias ;;
	+ -build=* \| --build=* \| --buil=* \| --bui=* \| --bu=*)
	+ build_alias=$ac_optarg ;;
	+
	+ -cache-file \| --cache-file \| --cache-fil \| --cache-fi \
	+ \| --cache-f \| --cache- \| --cache \| --cach \| --cac \| --ca \| --c)
	+ ac_prev=cache_file ;;
	+ -cache-file=* \| --cache-file=* \| --cache-fil=* \| --cache-fi=* \
	+ \| --cache-f=* \| --cache-=* \| --cache=* \| --cach=* \| --cac=* \| --ca=* \| --c=*)
	+ cache_file=$ac_optarg ;;
	+
	+ --config-cache \| -C)
	+ cache_file=config.cache ;;
	+
	+ -datadir \| --datadir \| --datadi \| --datad)
	+ ac_prev=datadir ;;
	+ -datadir=* \| --datadir=* \| --datadi=* \| --datad=*)
	+ datadir=$ac_optarg ;;
	+
	+ -datarootdir \| --datarootdir \| --datarootdi \| --datarootd \| --dataroot \
	+ \| --dataroo \| --dataro \| --datar)
	+ ac_prev=datarootdir ;;
	+ -datarootdir=* \| --datarootdir=* \| --datarootdi=* \| --datarootd=* \
	+ \| --dataroot=* \| --dataroo=* \| --dataro=* \| --datar=*)
	+ datarootdir=$ac_optarg ;;
	+
	+ -disable-* \| --disable-*)
	+ ac_useropt=`expr "x$ac_option" : 'x-disable-$.$'`
	+ # Reject names that are not valid shell variable names.
	+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
	+ as_fn_error $? "invalid feature name: $ac_useropt"
	+ ac_useropt_orig=$ac_useropt
	+ ac_useropt=`$as_echo "$ac_useropt" \| sed 's/[-+.]/_/g'`
	+ case $ac_user_opts in
	+ *"
	+"enable_$ac_useropt"
	+"*) ;;
	+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig"
	+ ac_unrecognized_sep=', ';;
	+ esac
	+ eval enable_$ac_useropt=no ;;
	+
	+ -docdir \| --docdir \| --docdi \| --doc \| --do)
	+ ac_prev=docdir ;;
	+ -docdir=* \| --docdir=* \| --docdi=* \| --doc=* \| --do=*)
	+ docdir=$ac_optarg ;;
	+
	+ -dvidir \| --dvidir \| --dvidi \| --dvid \| --dvi \| --dv)
	+ ac_prev=dvidir ;;
	+ -dvidir=* \| --dvidir=* \| --dvidi=* \| --dvid=* \| --dvi=* \| --dv=*)
	+ dvidir=$ac_optarg ;;
	+
	+ -enable-* \| --enable-*)
	+ ac_useropt=`expr "x$ac_option" : 'x-enable-$[^=]$'`
	+ # Reject names that are not valid shell variable names.
	+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
	+ as_fn_error $? "invalid feature name: $ac_useropt"
	+ ac_useropt_orig=$ac_useropt
	+ ac_useropt=`$as_echo "$ac_useropt" \| sed 's/[-+.]/_/g'`
	+ case $ac_user_opts in
	+ *"
	+"enable_$ac_useropt"
	+"*) ;;
	+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig"
	+ ac_unrecognized_sep=', ';;
	+ esac
	+ eval enable_$ac_useropt=\$ac_optarg ;;
	+
	+ -exec-prefix \| --exec_prefix \| --exec-prefix \| --exec-prefi \
	+ \| --exec-pref \| --exec-pre \| --exec-pr \| --exec-p \| --exec- \
	+ \| --exec \| --exe \| --ex)
	+ ac_prev=exec_prefix ;;
	+ -exec-prefix=* \| --exec_prefix=* \| --exec-prefix=* \| --exec-prefi=* \
	+ \| --exec-pref=* \| --exec-pre=* \| --exec-pr=* \| --exec-p=* \| --exec-=* \
	+ \| --exec=* \| --exe=* \| --ex=*)
	+ exec_prefix=$ac_optarg ;;
	+
	+ -gas \| --gas \| --ga \| --g)
	+ # Obsolete; use --with-gas.
	+ with_gas=yes ;;
	+
	+ -help \| --help \| --hel \| --he \| -h)
	+ ac_init_help=long ;;
	+ -help=r* \| --help=r* \| --hel=r* \| --he=r* \| -hr*)
	+ ac_init_help=recursive ;;
	+ -help=s* \| --help=s* \| --hel=s* \| --he=s* \| -hs*)
	+ ac_init_help=short ;;
	+
	+ -host \| --host \| --hos \| --ho)
	+ ac_prev=host_alias ;;
	+ -host=* \| --host=* \| --hos=* \| --ho=*)
	+ host_alias=$ac_optarg ;;
	+
	+ -htmldir \| --htmldir \| --htmldi \| --htmld \| --html \| --htm \| --ht)
	+ ac_prev=htmldir ;;
	+ -htmldir=* \| --htmldir=* \| --htmldi=* \| --htmld=* \| --html=* \| --htm=* \
	+ \| --ht=*)
	+ htmldir=$ac_optarg ;;
	+
	+ -includedir \| --includedir \| --includedi \| --included \| --include \
	+ \| --includ \| --inclu \| --incl \| --inc)
	+ ac_prev=includedir ;;
	+ -includedir=* \| --includedir=* \| --includedi=* \| --included=* \| --include=* \
	+ \| --includ=* \| --inclu=* \| --incl=* \| --inc=*)
	+ includedir=$ac_optarg ;;
	+
	+ -infodir \| --infodir \| --infodi \| --infod \| --info \| --inf)
	+ ac_prev=infodir ;;
	+ -infodir=* \| --infodir=* \| --infodi=* \| --infod=* \| --info=* \| --inf=*)
	+ infodir=$ac_optarg ;;
	+
	+ -libdir \| --libdir \| --libdi \| --libd)
	+ ac_prev=libdir ;;
	+ -libdir=* \| --libdir=* \| --libdi=* \| --libd=*)
	+ libdir=$ac_optarg ;;
	+
	+ -libexecdir \| --libexecdir \| --libexecdi \| --libexecd \| --libexec \
	+ \| --libexe \| --libex \| --libe)
	+ ac_prev=libexecdir ;;
	+ -libexecdir=* \| --libexecdir=* \| --libexecdi=* \| --libexecd=* \| --libexec=* \
	+ \| --libexe=* \| --libex=* \| --libe=*)
	+ libexecdir=$ac_optarg ;;
	+
	+ -localedir \| --localedir \| --localedi \| --localed \| --locale)
	+ ac_prev=localedir ;;
	+ -localedir=* \| --localedir=* \| --localedi=* \| --localed=* \| --locale=*)
	+ localedir=$ac_optarg ;;
	+
	+ -localstatedir \| --localstatedir \| --localstatedi \| --localstated \
	+ \| --localstate \| --localstat \| --localsta \| --localst \| --locals)
	+ ac_prev=localstatedir ;;
	+ -localstatedir=* \| --localstatedir=* \| --localstatedi=* \| --localstated=* \
	+ \| --localstate=* \| --localstat=* \| --localsta=* \| --localst=* \| --locals=*)
	+ localstatedir=$ac_optarg ;;
	+
	+ -mandir \| --mandir \| --mandi \| --mand \| --man \| --ma \| --m)
	+ ac_prev=mandir ;;
	+ -mandir=* \| --mandir=* \| --mandi=* \| --mand=* \| --man=* \| --ma=* \| --m=*)
	+ mandir=$ac_optarg ;;
	+
	+ -nfp \| --nfp \| --nf)
	+ # Obsolete; use --without-fp.
	+ with_fp=no ;;
	+
	+ -no-create \| --no-create \| --no-creat \| --no-crea \| --no-cre \
	+ \| --no-cr \| --no-c \| -n)
	+ no_create=yes ;;
	+
	+ -no-recursion \| --no-recursion \| --no-recursio \| --no-recursi \
	+ \| --no-recurs \| --no-recur \| --no-recu \| --no-rec \| --no-re \| --no-r)
	+ no_recursion=yes ;;
	+
	+ -oldincludedir \| --oldincludedir \| --oldincludedi \| --oldincluded \
	+ \| --oldinclude \| --oldinclud \| --oldinclu \| --oldincl \| --oldinc \
	+ \| --oldin \| --oldi \| --old \| --ol \| --o)
	+ ac_prev=oldincludedir ;;
	+ -oldincludedir=* \| --oldincludedir=* \| --oldincludedi=* \| --oldincluded=* \
	+ \| --oldinclude=* \| --oldinclud=* \| --oldinclu=* \| --oldincl=* \| --oldinc=* \
	+ \| --oldin=* \| --oldi=* \| --old=* \| --ol=* \| --o=*)
	+ oldincludedir=$ac_optarg ;;
	+
	+ -prefix \| --prefix \| --prefi \| --pref \| --pre \| --pr \| --p)
	+ ac_prev=prefix ;;
	+ -prefix=* \| --prefix=* \| --prefi=* \| --pref=* \| --pre=* \| --pr=* \| --p=*)
	+ prefix=$ac_optarg ;;
	+
	+ -program-prefix \| --program-prefix \| --program-prefi \| --program-pref \
	+ \| --program-pre \| --program-pr \| --program-p)
	+ ac_prev=program_prefix ;;
	+ -program-prefix=* \| --program-prefix=* \| --program-prefi=* \
	+ \| --program-pref=* \| --program-pre=* \| --program-pr=* \| --program-p=*)
	+ program_prefix=$ac_optarg ;;
	+
	+ -program-suffix \| --program-suffix \| --program-suffi \| --program-suff \
	+ \| --program-suf \| --program-su \| --program-s)
	+ ac_prev=program_suffix ;;
	+ -program-suffix=* \| --program-suffix=* \| --program-suffi=* \
	+ \| --program-suff=* \| --program-suf=* \| --program-su=* \| --program-s=*)
	+ program_suffix=$ac_optarg ;;
	+
	+ -program-transform-name \| --program-transform-name \
	+ \| --program-transform-nam \| --program-transform-na \
	+ \| --program-transform-n \| --program-transform- \
	+ \| --program-transform \| --program-transfor \
	+ \| --program-transfo \| --program-transf \
	+ \| --program-trans \| --program-tran \
	+ \| --progr-tra \| --program-tr \| --program-t)
	+ ac_prev=program_transform_name ;;
	+ -program-transform-name=* \| --program-transform-name=* \
	+ \| --program-transform-nam=* \| --program-transform-na=* \
	+ \| --program-transform-n=* \| --program-transform-=* \
	+ \| --program-transform=* \| --program-transfor=* \
	+ \| --program-transfo=* \| --program-transf=* \
	+ \| --program-trans=* \| --program-tran=* \
	+ \| --progr-tra=* \| --program-tr=* \| --program-t=*)
	+ program_transform_name=$ac_optarg ;;
	+
	+ -pdfdir \| --pdfdir \| --pdfdi \| --pdfd \| --pdf \| --pd)
	+ ac_prev=pdfdir ;;
	+ -pdfdir=* \| --pdfdir=* \| --pdfdi=* \| --pdfd=* \| --pdf=* \| --pd=*)
	+ pdfdir=$ac_optarg ;;
	+
	+ -psdir \| --psdir \| --psdi \| --psd \| --ps)
	+ ac_prev=psdir ;;
	+ -psdir=* \| --psdir=* \| --psdi=* \| --psd=* \| --ps=*)
	+ psdir=$ac_optarg ;;
	+
	+ -q \| -quiet \| --quiet \| --quie \| --qui \| --qu \| --q \
	+ \| -silent \| --silent \| --silen \| --sile \| --sil)
	+ silent=yes ;;
	+
	+ -sbindir \| --sbindir \| --sbindi \| --sbind \| --sbin \| --sbi \| --sb)
	+ ac_prev=sbindir ;;
	+ -sbindir=* \| --sbindir=* \| --sbindi=* \| --sbind=* \| --sbin=* \
	+ \| --sbi=* \| --sb=*)
	+ sbindir=$ac_optarg ;;
	+
	+ -sharedstatedir \| --sharedstatedir \| --sharedstatedi \
	+ \| --sharedstated \| --sharedstate \| --sharedstat \| --sharedsta \
	+ \| --sharedst \| --shareds \| --shared \| --share \| --shar \
	+ \| --sha \| --sh)
	+ ac_prev=sharedstatedir ;;
	+ -sharedstatedir=* \| --sharedstatedir=* \| --sharedstatedi=* \
	+ \| --sharedstated=* \| --sharedstate=* \| --sharedstat=* \| --sharedsta=* \
	+ \| --sharedst=* \| --shareds=* \| --shared=* \| --share=* \| --shar=* \
	+ \| --sha=* \| --sh=*)
	+ sharedstatedir=$ac_optarg ;;
	+
	+ -site \| --site \| --sit)
	+ ac_prev=site ;;
	+ -site=* \| --site=* \| --sit=*)
	+ site=$ac_optarg ;;
	+
	+ -srcdir \| --srcdir \| --srcdi \| --srcd \| --src \| --sr)
	+ ac_prev=srcdir ;;
	+ -srcdir=* \| --srcdir=* \| --srcdi=* \| --srcd=* \| --src=* \| --sr=*)
	+ srcdir=$ac_optarg ;;
	+
	+ -sysconfdir \| --sysconfdir \| --sysconfdi \| --sysconfd \| --sysconf \
	+ \| --syscon \| --sysco \| --sysc \| --sys \| --sy)
	+ ac_prev=sysconfdir ;;
	+ -sysconfdir=* \| --sysconfdir=* \| --sysconfdi=* \| --sysconfd=* \| --sysconf=* \
	+ \| --syscon=* \| --sysco=* \| --sysc=* \| --sys=* \| --sy=*)
	+ sysconfdir=$ac_optarg ;;
	+
	+ -target \| --target \| --targe \| --targ \| --tar \| --ta \| --t)
	+ ac_prev=target_alias ;;
	+ -target=* \| --target=* \| --targe=* \| --targ=* \| --tar=* \| --ta=* \| --t=*)
	+ target_alias=$ac_optarg ;;
	+
	+ -v \| -verbose \| --verbose \| --verbos \| --verbo \| --verb)
	+ verbose=yes ;;
	+
	+ -version \| --version \| --versio \| --versi \| --vers \| -V)
	+ ac_init_version=: ;;
	+
	+ -with-* \| --with-*)
	+ ac_useropt=`expr "x$ac_option" : 'x-with-$[^=]$'`
	+ # Reject names that are not valid shell variable names.
	+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
	+ as_fn_error $? "invalid package name: $ac_useropt"
	+ ac_useropt_orig=$ac_useropt
	+ ac_useropt=`$as_echo "$ac_useropt" \| sed 's/[-+.]/_/g'`
	+ case $ac_user_opts in
	+ *"
	+"with_$ac_useropt"
	+"*) ;;
	+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig"
	+ ac_unrecognized_sep=', ';;
	+ esac
	+ eval with_$ac_useropt=\$ac_optarg ;;
	+
	+ -without-* \| --without-*)
	+ ac_useropt=`expr "x$ac_option" : 'x-without-$.$'`
	+ # Reject names that are not valid shell variable names.
	+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null &&
	+ as_fn_error $? "invalid package name: $ac_useropt"
	+ ac_useropt_orig=$ac_useropt
	+ ac_useropt=`$as_echo "$ac_useropt" \| sed 's/[-+.]/_/g'`
	+ case $ac_user_opts in
	+ *"
	+"with_$ac_useropt"
	+"*) ;;
	+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig"
	+ ac_unrecognized_sep=', ';;
	+ esac
	+ eval with_$ac_useropt=no ;;
	+
	+ --x)
	+ # Obsolete; use --with-x.
	+ with_x=yes ;;
	+
	+ -x-includes \| --x-includes \| --x-include \| --x-includ \| --x-inclu \
	+ \| --x-incl \| --x-inc \| --x-in \| --x-i)
	+ ac_prev=x_includes ;;
	+ -x-includes=* \| --x-includes=* \| --x-include=* \| --x-includ=* \| --x-inclu=* \
	+ \| --x-incl=* \| --x-inc=* \| --x-in=* \| --x-i=*)
	+ x_includes=$ac_optarg ;;
	+
	+ -x-libraries \| --x-libraries \| --x-librarie \| --x-librari \
	+ \| --x-librar \| --x-libra \| --x-libr \| --x-lib \| --x-li \| --x-l)
	+ ac_prev=x_libraries ;;
	+ -x-libraries=* \| --x-libraries=* \| --x-librarie=* \| --x-librari=* \
	+ \| --x-librar=* \| --x-libra=* \| --x-libr=* \| --x-lib=* \| --x-li=* \| --x-l=*)
	+ x_libraries=$ac_optarg ;;
	+
	+ -*) as_fn_error $? "unrecognized option: \`$ac_option'
	+Try \`$0 --help' for more information"
	+ ;;
	+
	+ =)
	+ ac_envvar=`expr "x$ac_option" : 'x$[^=]*$='`
	+ # Reject names that are not valid shell variable names.
	+ case $ac_envvar in #(
	+ '' \| [0-9]* \| [!_$as_cr_alnum] )
	+ as_fn_error $? "invalid variable name: \`$ac_envvar'" ;;
	+ esac
	+ eval $ac_envvar=\$ac_optarg
	+ export $ac_envvar ;;
	+
	+ *)
	+ # FIXME: should be removed in autoconf 3.0.
	+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
	+ expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
	+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
	+ : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
	+ ;;
	+
	+ esac
	+done
	+
	+if test -n "$ac_prev"; then
	+ ac_option=--`echo $ac_prev \| sed 's/_/-/g'`
	+ as_fn_error $? "missing argument to $ac_option"
	+fi
	+
	+if test -n "$ac_unrecognized_opts"; then
	+ case $enable_option_checking in
	+ no) ;;
	+ fatal) as_fn_error $? "unrecognized options: $ac_unrecognized_opts" ;;
	+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;;
	+ esac
	+fi
	+
	+# Check all directory arguments for consistency.
	+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \
	+ datadir sysconfdir sharedstatedir localstatedir includedir \
	+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
	+ libdir localedir mandir
	+do
	+ eval ac_val=\$$ac_var
	+ # Remove trailing slashes.
	+ case $ac_val in
	+ */ )
	+ ac_val=`expr "X$ac_val" : 'X$.[^/]$' \\| "X$ac_val" : 'X$.$'`
	+ eval $ac_var=\$ac_val;;
	+ esac
	+ # Be sure to have absolute directory names.
	+ case $ac_val in
	+ [\\/$]* \| ?:[\\/]* ) continue;;
	+ NONE \| '' ) case $ac_var in *prefix ) continue;; esac;;
	+ esac
	+ as_fn_error $? "expected an absolute directory name for --$ac_var: $ac_val"
	+done
	+
	+# There might be people who depend on the old broken behavior: `$host'
	+# used to hold the argument of --host etc.
	+# FIXME: To remove some day.
	+build=$build_alias
	+host=$host_alias
	+target=$target_alias
	+
	+# FIXME: To remove some day.
	+if test "x$host_alias" != x; then
	+ if test "x$build_alias" = x; then
	+ cross_compiling=maybe
	+ $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
	+ If a cross compiler is detected then cross compile mode will be used" >&2
	+ elif test "x$build_alias" != "x$host_alias"; then
	+ cross_compiling=yes
	+ fi
	+fi
	+
	+ac_tool_prefix=
	+test -n "$host_alias" && ac_tool_prefix=$host_alias-
	+
	+test "$silent" = yes && exec 6>/dev/null
	+
	+
	+ac_pwd=`pwd` && test -n "$ac_pwd" &&
	+ac_ls_di=`ls -di .` &&
	+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` \|\|
	+ as_fn_error $? "working directory cannot be determined"
	+test "X$ac_ls_di" = "X$ac_pwd_ls_di" \|\|
	+ as_fn_error $? "pwd does not report name of working directory"
	+
	+
	+# Find the source files, if location was not specified.
	+if test -z "$srcdir"; then
	+ ac_srcdir_defaulted=yes
	+ # Try the directory containing this script, then the parent directory.
	+ ac_confdir=`$as_dirname -- "$as_myself" \|\|
	+$as_expr X"$as_myself" : 'X$.[^/]$//[^/][^/]/$' \\| \
	+ X"$as_myself" : 'X$//$[^/]' \\| \
	+ X"$as_myself" : 'X$//$$' \\| \
	+ X"$as_myself" : 'X$/$' \\| . 2>/dev/null \|\|
	+$as_echo X"$as_myself" \|
	+ sed '/^X$.[^/]$\/\/[^/][^/]\/$/{
	+ s//\1/
	+ q
	+ }
	+ /^X$\/\/$[^/].*/{
	+ s//\1/
	+ q
	+ }
	+ /^X$\/\/$$/{
	+ s//\1/
	+ q
	+ }
	+ /^X$\/$.*/{
	+ s//\1/
	+ q
	+ }
	+ s/.*/./; q'`
	+ srcdir=$ac_confdir
	+ if test ! -r "$srcdir/$ac_unique_file"; then
	+ srcdir=..
	+ fi
	+else
	+ ac_srcdir_defaulted=no
	+fi
	+if test ! -r "$srcdir/$ac_unique_file"; then
	+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .."
	+ as_fn_error $? "cannot find sources ($ac_unique_file) in $srcdir"
	+fi
	+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work"
	+ac_abs_confdir=`(
	+ cd "$srcdir" && test -r "./$ac_unique_file" \|\| as_fn_error $? "$ac_msg"
	+ pwd)`
	+# When building in place, set srcdir=.
	+if test "$ac_abs_confdir" = "$ac_pwd"; then
	+ srcdir=.
	+fi
	+# Remove unnecessary trailing slashes from srcdir.
	+# Double slashes in file names in object file debugging info
	+# mess up M-x gdb in Emacs.
	+case $srcdir in
	+/) srcdir=`expr "X$srcdir" : 'X$.[^/]$' \\| "X$srcdir" : 'X$.*$'`;;
	+esac
	+for ac_var in $ac_precious_vars; do
	+ eval ac_env_${ac_var}_set=\${${ac_var}+set}
	+ eval ac_env_${ac_var}_value=\$${ac_var}
	+ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set}
	+ eval ac_cv_env_${ac_var}_value=\$${ac_var}
	+done
	+
	+#
	+# Report the --help message.
	+#
	+if test "$ac_init_help" = "long"; then
	+ # Omit some internal or obsolete options to make the list less imposing.
	+ # This message is too long to be a string in the A/UX 3.1 sh.
	+ cat <<_ACEOF
	+\`configure' configures xmount 0.5.1 to adapt to many kinds of systems.
	+
	+Usage: $0 [OPTION]... [VAR=VALUE]...
	+
	+To assign environment variables (e.g., CC, CFLAGS...), specify them as
	+VAR=VALUE. See below for descriptions of some of the useful variables.
	+
	+Defaults for the options are specified in brackets.
	+
	+Configuration:
	+ -h, --help display this help and exit
	+ --help=short display options specific to this package
	+ --help=recursive display the short help of all the included packages
	+ -V, --version display version information and exit
	+ -q, --quiet, --silent do not print \`checking ...' messages
	+ --cache-file=FILE cache test results in FILE [disabled]
	+ -C, --config-cache alias for \`--cache-file=config.cache'
	+ -n, --no-create do not create output files
	+ --srcdir=DIR find the sources in DIR [configure dir or \`..']
	+
	+Installation directories:
	+ --prefix=PREFIX install architecture-independent files in PREFIX
	+ [$ac_default_prefix]
	+ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
	+ [PREFIX]
	+
	+By default, \`make install' will install all the files in
	+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify
	+an installation prefix other than \`$ac_default_prefix' using \`--prefix',
	+for instance \`--prefix=\$HOME'.
	+
	+For better control, use the options below.
	+
	+Fine tuning of the installation directories:
	+ --bindir=DIR user executables [EPREFIX/bin]
	+ --sbindir=DIR system admin executables [EPREFIX/sbin]
	+ --libexecdir=DIR program executables [EPREFIX/libexec]
	+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc]
	+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
	+ --localstatedir=DIR modifiable single-machine data [PREFIX/var]
	+ --libdir=DIR object code libraries [EPREFIX/lib]
	+ --includedir=DIR C header files [PREFIX/include]
	+ --oldincludedir=DIR C header files for non-gcc [/usr/include]
	+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
	+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR]
	+ --infodir=DIR info documentation [DATAROOTDIR/info]
	+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
	+ --mandir=DIR man documentation [DATAROOTDIR/man]
	+ --docdir=DIR documentation root [DATAROOTDIR/doc/xmount]
	+ --htmldir=DIR html documentation [DOCDIR]
	+ --dvidir=DIR dvi documentation [DOCDIR]
	+ --pdfdir=DIR pdf documentation [DOCDIR]
	+ --psdir=DIR ps documentation [DOCDIR]
	+_ACEOF
	+
	+ cat <<\_ACEOF
	+
	+Program names:
	+ --program-prefix=PREFIX prepend PREFIX to installed program names
	+ --program-suffix=SUFFIX append SUFFIX to installed program names
	+ --program-transform-name=PROGRAM run sed PROGRAM on installed program names
	+_ACEOF
	+fi
	+
	+if test -n "$ac_init_help"; then
	+ case $ac_init_help in
	+ short \| recursive ) echo "Configuration of xmount 0.5.1:";;
	+ esac
	+ cat <<\_ACEOF
	+
	+Optional Features:
	+ --disable-option-checking ignore unrecognized --enable/--with options
	+ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
	+ --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
	+ --disable-dependency-tracking speeds up one-time build
	+ --enable-dependency-tracking do not reject slow dependency extractors
	+
	+Some influential environment variables:
	+ CC C compiler command
	+ CFLAGS C compiler flags
	+ LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
	+ nonstandard directory <lib dir>
	+ LIBS libraries to pass to the linker, e.g. -l<library>
	+ CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
	+ you have headers in a nonstandard directory <include dir>
	+ CPP C preprocessor
	+ PKG_CONFIG path to pkg-config utility
	+ PKG_CONFIG_PATH
	+ directories to add to pkg-config's search path
	+ PKG_CONFIG_LIBDIR
	+ path overriding pkg-config's built-in search path
	+ fuse_CFLAGS C compiler flags for fuse, overriding pkg-config
	+ fuse_LIBS linker flags for fuse, overriding pkg-config
	+
	+Use these variables to override the choices made by `configure' or to help
	+it to find libraries and programs with nonstandard names/locations.
	+
	+Report bugs to <bugs@pinguin.lu>.
	+_ACEOF
	+ac_status=$?
	+fi
	+
	+if test "$ac_init_help" = "recursive"; then
	+ # If there are subdirs, report their specific --help.
	+ for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
	+ test -d "$ac_dir" \|\|
	+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } \|\|
	+ continue
	+ ac_builddir=.
	+
	+case "$ac_dir" in
	+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
	+*)
	+ ac_dir_suffix=/`$as_echo "$ac_dir" \| sed 's\|^\.[\\/]\|\|'`
	+ # A ".." for each directory in $ac_dir_suffix.
	+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" \| sed 's\|/[^\\/]*\|/..\|g;s\|/\|\|'`
	+ case $ac_top_builddir_sub in
	+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
	+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
	+ esac ;;
	+esac
	+ac_abs_top_builddir=$ac_pwd
	+ac_abs_builddir=$ac_pwd$ac_dir_suffix
	+# for backward compatibility:
	+ac_top_builddir=$ac_top_build_prefix
	+
	+case $srcdir in
	+ .) # We are building in place.
	+ ac_srcdir=.
	+ ac_top_srcdir=$ac_top_builddir_sub
	+ ac_abs_top_srcdir=$ac_pwd ;;
	+ [\\/]* \| ?:[\\/]* ) # Absolute name.
	+ ac_srcdir=$srcdir$ac_dir_suffix;
	+ ac_top_srcdir=$srcdir
	+ ac_abs_top_srcdir=$srcdir ;;
	+ *) # Relative name.
	+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
	+ ac_top_srcdir=$ac_top_build_prefix$srcdir
	+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
	+esac
	+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
	+
	+ cd "$ac_dir" \|\| { ac_status=$?; continue; }
	+ # Check for guested configure.
	+ if test -f "$ac_srcdir/configure.gnu"; then
	+ echo &&
	+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive
	+ elif test -f "$ac_srcdir/configure"; then
	+ echo &&
	+ $SHELL "$ac_srcdir/configure" --help=recursive
	+ else
	+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
	+ fi \|\| ac_status=$?
	+ cd "$ac_pwd" \|\| { ac_status=$?; break; }
	+ done
	+fi
	+
	+test -n "$ac_init_help" && exit $ac_status
	+if $ac_init_version; then
	+ cat <<\_ACEOF
	+xmount configure 0.5.1
	+generated by GNU Autoconf 2.68
	+
	+Copyright (C) 2010 Free Software Foundation, Inc.
	+This configure script is free software; the Free Software Foundation
	+gives unlimited permission to copy, distribute and modify it.
	+_ACEOF
	+ exit
	+fi
	+
	+## ------------------------ ##
	+## Autoconf initialization. ##
	+## ------------------------ ##
	+
	+# ac_fn_c_try_compile LINENO
	+# --------------------------
	+# Try to compile conftest.$ac_ext, and return whether this succeeded.
	+ac_fn_c_try_compile ()
	+{
	+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
	+ rm -f conftest.$ac_objext
	+ if { { ac_try="$ac_compile"
	+case "(($ac_try" in
	+ \" \| \` \| \\) ac_try_echo=\$ac_try;;
	+ *) ac_try_echo=$ac_try;;
	+esac
	+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
	+$as_echo "$ac_try_echo"; } >&5
	+ (eval "$ac_compile") 2>conftest.err
	+ ac_status=$?
	+ if test -s conftest.err; then
	+ grep -v '^ *+' conftest.err >conftest.er1
	+ cat conftest.er1 >&5
	+ mv -f conftest.er1 conftest.err
	+ fi
	+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
	+ test $ac_status = 0; } && {
	+ test -z "$ac_c_werror_flag" \|\|
	+ test ! -s conftest.err
	+ } && test -s conftest.$ac_objext; then :
	+ ac_retval=0
	+else
	+ $as_echo "$as_me: failed program was:" >&5
	+sed 's/^/\| /' conftest.$ac_ext >&5
	+
	+ ac_retval=1
	+fi
	+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
	+ as_fn_set_status $ac_retval
	+
	+} # ac_fn_c_try_compile
	+
	+# ac_fn_c_try_link LINENO
	+# -----------------------
	+# Try to link conftest.$ac_ext, and return whether this succeeded.
	+ac_fn_c_try_link ()
	+{
	+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
	+ rm -f conftest.$ac_objext conftest$ac_exeext
	+ if { { ac_try="$ac_link"
	+case "(($ac_try" in
	+ \" \| \` \| \\) ac_try_echo=\$ac_try;;
	+ *) ac_try_echo=$ac_try;;
	+esac
	+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
	+$as_echo "$ac_try_echo"; } >&5
	+ (eval "$ac_link") 2>conftest.err
	+ ac_status=$?
	+ if test -s conftest.err; then
	+ grep -v '^ *+' conftest.err >conftest.er1
	+ cat conftest.er1 >&5
	+ mv -f conftest.er1 conftest.err
	+ fi
	+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
	+ test $ac_status = 0; } && {
	+ test -z "$ac_c_werror_flag" \|\|
	+ test ! -s conftest.err
	+ } && test -s conftest$ac_exeext && {
	+ test "$cross_compiling" = yes \|\|
	+ $as_test_x conftest$ac_exeext
	+ }; then :
	+ ac_retval=0
	+else
	+ $as_echo "$as_me: failed program was:" >&5
	+sed 's/^/\| /' conftest.$ac_ext >&5
	+
	+ ac_retval=1
	+fi
	+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information
	+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would
	+ # interfere with the next link command; also delete a directory that is
	+ # left behind by Apple's compiler. We do this before executing the actions.
	+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
	+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
	+ as_fn_set_status $ac_retval
	+
	+} # ac_fn_c_try_link
	+
	+# ac_fn_c_try_cpp LINENO
	+# ----------------------
	+# Try to preprocess conftest.$ac_ext, and return whether this succeeded.
	+ac_fn_c_try_cpp ()
	+{
	+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
	+ if { { ac_try="$ac_cpp conftest.$ac_ext"
	+case "(($ac_try" in
	+ \" \| \` \| \\) ac_try_echo=\$ac_try;;
	+ *) ac_try_echo=$ac_try;;
	+esac
	+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
	+$as_echo "$ac_try_echo"; } >&5
	+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err
	+ ac_status=$?
	+ if test -s conftest.err; then
	+ grep -v '^ *+' conftest.err >conftest.er1
	+ cat conftest.er1 >&5
	+ mv -f conftest.er1 conftest.err
	+ fi
	+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
	+ test $ac_status = 0; } > conftest.i && {
	+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" \|\|
	+ test ! -s conftest.err
	+ }; then :
	+ ac_retval=0
	+else
	+ $as_echo "$as_me: failed program was:" >&5
	+sed 's/^/\| /' conftest.$ac_ext >&5
	+
	+ ac_retval=1
	+fi
	+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
	+ as_fn_set_status $ac_retval
	+
	+} # ac_fn_c_try_cpp
	+
	+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES
	+# -------------------------------------------------------
	+# Tests whether HEADER exists, giving a warning if it cannot be compiled using
	+# the include files in INCLUDES and setting the cache variable VAR
	+# accordingly.
	+ac_fn_c_check_header_mongrel ()
	+{
	+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
	+ if eval \${$3+:} false; then :
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
	+$as_echo_n "checking for $2... " >&6; }
	+if eval \${$3+:} false; then :
	+ $as_echo_n "(cached) " >&6
	+fi
	+eval ac_res=\$$3
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
	+$as_echo "$ac_res" >&6; }
	+else
	+ # Is the header compilable?
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5
	+$as_echo_n "checking $2 usability... " >&6; }
	+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	+/* end confdefs.h. */
	+$4
	+#include <$2>
	+_ACEOF
	+if ac_fn_c_try_compile "$LINENO"; then :
	+ ac_header_compiler=yes
	+else
	+ ac_header_compiler=no
	+fi
	+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5
	+$as_echo "$ac_header_compiler" >&6; }
	+
	+# Is the header present?
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5
	+$as_echo_n "checking $2 presence... " >&6; }
	+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	+/* end confdefs.h. */
	+#include <$2>
	+_ACEOF
	+if ac_fn_c_try_cpp "$LINENO"; then :
	+ ac_header_preproc=yes
	+else
	+ ac_header_preproc=no
	+fi
	+rm -f conftest.err conftest.i conftest.$ac_ext
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5
	+$as_echo "$ac_header_preproc" >&6; }
	+
	+# So? What about this header?
	+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #((
	+ yes:no: )
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5
	+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;}
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
	+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
	+ ;;
	+ no:yes:* )
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5
	+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;}
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5
	+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;}
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5
	+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5
	+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;}
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
	+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
	+( $as_echo "## ------------------------------ ##
	+## Report this to bugs@pinguin.lu ##
	+## ------------------------------ ##"
	+ ) \| sed "s/^/$as_me: WARNING: /" >&2
	+ ;;
	+esac
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
	+$as_echo_n "checking for $2... " >&6; }
	+if eval \${$3+:} false; then :
	+ $as_echo_n "(cached) " >&6
	+else
	+ eval "$3=\$ac_header_compiler"
	+fi
	+eval ac_res=\$$3
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
	+$as_echo "$ac_res" >&6; }
	+fi
	+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
	+
	+} # ac_fn_c_check_header_mongrel
	+
	+# ac_fn_c_try_run LINENO
	+# ----------------------
	+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes
	+# that executables can be run.
	+ac_fn_c_try_run ()
	+{
	+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
	+ if { { ac_try="$ac_link"
	+case "(($ac_try" in
	+ \" \| \` \| \\) ac_try_echo=\$ac_try;;
	+ *) ac_try_echo=$ac_try;;
	+esac
	+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
	+$as_echo "$ac_try_echo"; } >&5
	+ (eval "$ac_link") 2>&5
	+ ac_status=$?
	+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
	+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext'
	+ { { case "(($ac_try" in
	+ \" \| \` \| \\) ac_try_echo=\$ac_try;;
	+ *) ac_try_echo=$ac_try;;
	+esac
	+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
	+$as_echo "$ac_try_echo"; } >&5
	+ (eval "$ac_try") 2>&5
	+ ac_status=$?
	+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
	+ test $ac_status = 0; }; }; then :
	+ ac_retval=0
	+else
	+ $as_echo "$as_me: program exited with status $ac_status" >&5
	+ $as_echo "$as_me: failed program was:" >&5
	+sed 's/^/\| /' conftest.$ac_ext >&5
	+
	+ ac_retval=$ac_status
	+fi
	+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo
	+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
	+ as_fn_set_status $ac_retval
	+
	+} # ac_fn_c_try_run
	+
	+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES
	+# -------------------------------------------------------
	+# Tests whether HEADER exists and can be compiled using the include files in
	+# INCLUDES, setting the cache variable VAR accordingly.
	+ac_fn_c_check_header_compile ()
	+{
	+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
	+$as_echo_n "checking for $2... " >&6; }
	+if eval \${$3+:} false; then :
	+ $as_echo_n "(cached) " >&6
	+else
	+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	+/* end confdefs.h. */
	+$4
	+#include <$2>
	+_ACEOF
	+if ac_fn_c_try_compile "$LINENO"; then :
	+ eval "$3=yes"
	+else
	+ eval "$3=no"
	+fi
	+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
	+fi
	+eval ac_res=\$$3
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
	+$as_echo "$ac_res" >&6; }
	+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
	+
	+} # ac_fn_c_check_header_compile
	+
	+# ac_fn_c_find_intX_t LINENO BITS VAR
	+# -----------------------------------
	+# Finds a signed integer type with width BITS, setting cache variable VAR
	+# accordingly.
	+ac_fn_c_find_intX_t ()
	+{
	+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for int$2_t" >&5
	+$as_echo_n "checking for int$2_t... " >&6; }
	+if eval \${$3+:} false; then :
	+ $as_echo_n "(cached) " >&6
	+else
	+ eval "$3=no"
	+ # Order is important - never check a type that is potentially smaller
	+ # than half of the expected target width.
	+ for ac_type in int$2_t 'int' 'long int' \
	+ 'long long int' 'short int' 'signed char'; do
	+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	+/* end confdefs.h. */
	+$ac_includes_default
	+ enum { N = $2 / 2 - 1 };
	+int
	+main ()
	+{
	+static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))];
	+test_array [0] = 0
	+
	+ ;
	+ return 0;
	+}
	+_ACEOF
	+if ac_fn_c_try_compile "$LINENO"; then :
	+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	+/* end confdefs.h. */
	+$ac_includes_default
	+ enum { N = $2 / 2 - 1 };
	+int
	+main ()
	+{
	+static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1)
	+ < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))];
	+test_array [0] = 0
	+
	+ ;
	+ return 0;
	+}
	+_ACEOF
	+if ac_fn_c_try_compile "$LINENO"; then :
	+
	+else
	+ case $ac_type in #(
	+ int$2_t) :
	+ eval "$3=yes" ;; #(
	+ *) :
	+ eval "$3=\$ac_type" ;;
	+esac
	+fi
	+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
	+fi
	+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
	+ if eval test \"x\$"$3"\" = x"no"; then :
	+
	+else
	+ break
	+fi
	+ done
	+fi
	+eval ac_res=\$$3
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
	+$as_echo "$ac_res" >&6; }
	+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
	+
	+} # ac_fn_c_find_intX_t
	+
	+# ac_fn_c_check_type LINENO TYPE VAR INCLUDES
	+# -------------------------------------------
	+# Tests whether TYPE exists after having included INCLUDES, setting cache
	+# variable VAR accordingly.
	+ac_fn_c_check_type ()
	+{
	+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
	+$as_echo_n "checking for $2... " >&6; }
	+if eval \${$3+:} false; then :
	+ $as_echo_n "(cached) " >&6
	+else
	+ eval "$3=no"
	+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	+/* end confdefs.h. */
	+$4
	+int
	+main ()
	+{
	+if (sizeof ($2))
	+ return 0;
	+ ;
	+ return 0;
	+}
	+_ACEOF
	+if ac_fn_c_try_compile "$LINENO"; then :
	+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	+/* end confdefs.h. */
	+$4
	+int
	+main ()
	+{
	+if (sizeof (($2)))
	+ return 0;
	+ ;
	+ return 0;
	+}
	+_ACEOF
	+if ac_fn_c_try_compile "$LINENO"; then :
	+
	+else
	+ eval "$3=yes"
	+fi
	+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
	+fi
	+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
	+fi
	+eval ac_res=\$$3
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
	+$as_echo "$ac_res" >&6; }
	+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
	+
	+} # ac_fn_c_check_type
	+
	+# ac_fn_c_find_uintX_t LINENO BITS VAR
	+# ------------------------------------
	+# Finds an unsigned integer type with width BITS, setting cache variable VAR
	+# accordingly.
	+ac_fn_c_find_uintX_t ()
	+{
	+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for uint$2_t" >&5
	+$as_echo_n "checking for uint$2_t... " >&6; }
	+if eval \${$3+:} false; then :
	+ $as_echo_n "(cached) " >&6
	+else
	+ eval "$3=no"
	+ # Order is important - never check a type that is potentially smaller
	+ # than half of the expected target width.
	+ for ac_type in uint$2_t 'unsigned int' 'unsigned long int' \
	+ 'unsigned long long int' 'unsigned short int' 'unsigned char'; do
	+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	+/* end confdefs.h. */
	+$ac_includes_default
	+int
	+main ()
	+{
	+static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)];
	+test_array [0] = 0
	+
	+ ;
	+ return 0;
	+}
	+_ACEOF
	+if ac_fn_c_try_compile "$LINENO"; then :
	+ case $ac_type in #(
	+ uint$2_t) :
	+ eval "$3=yes" ;; #(
	+ *) :
	+ eval "$3=\$ac_type" ;;
	+esac
	+fi
	+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
	+ if eval test \"x\$"$3"\" = x"no"; then :
	+
	+else
	+ break
	+fi
	+ done
	+fi
	+eval ac_res=\$$3
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
	+$as_echo "$ac_res" >&6; }
	+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
	+
	+} # ac_fn_c_find_uintX_t
	+
	+# ac_fn_c_check_func LINENO FUNC VAR
	+# ----------------------------------
	+# Tests whether FUNC exists, setting the cache variable VAR accordingly
	+ac_fn_c_check_func ()
	+{
	+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
	+$as_echo_n "checking for $2... " >&6; }
	+if eval \${$3+:} false; then :
	+ $as_echo_n "(cached) " >&6
	+else
	+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	+/* end confdefs.h. */
	+/* Define $2 to an innocuous variant, in case <limits.h> declares $2.
	+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
	+#define $2 innocuous_$2
	+
	+/* System header to define __stub macros and hopefully few prototypes,
	+ which can conflict with char $2 (); below.
	+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
	+ <limits.h> exists even on freestanding compilers. */
	+
	+#ifdef __STDC__
	+# include <limits.h>
	+#else
	+# include <assert.h>
	+#endif
	+
	+#undef $2
	+
	+/* Override any GCC internal prototype to avoid an error.
	+ Use char because int might match the return type of a GCC
	+ builtin and then its argument prototype would still apply. */
	+#ifdef __cplusplus
	+extern "C"
	+#endif
	+char $2 ();
	+/* The GNU C library defines this for functions which it implements
	+ to always fail with ENOSYS. Some functions are actually named
	+ something starting with __ and the normal name is an alias. */
	+#if defined __stub_$2 \|\| defined __stub___$2
	+choke me
	+#endif
	+
	+int
	+main ()
	+{
	+return $2 ();
	+ ;
	+ return 0;
	+}
	+_ACEOF
	+if ac_fn_c_try_link "$LINENO"; then :
	+ eval "$3=yes"
	+else
	+ eval "$3=no"
	+fi
	+rm -f core conftest.err conftest.$ac_objext \
	+ conftest$ac_exeext conftest.$ac_ext
	+fi
	+eval ac_res=\$$3
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
	+$as_echo "$ac_res" >&6; }
	+ eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
	+
	+} # ac_fn_c_check_func
	+cat >config.log <<_ACEOF
	+This file contains any messages produced by compilers while
	+running configure, to aid debugging if configure makes a mistake.
	+
	+It was created by xmount $as_me 0.5.1, which was
	+generated by GNU Autoconf 2.68. Invocation command line was
	+
	+ $ $0 $@
	+
	+_ACEOF
	+exec 5>>config.log
	+{
	+cat <<_ASUNAME
	+## --------- ##
	+## Platform. ##
	+## --------- ##
	+
	+hostname = `(hostname \|\| uname -n) 2>/dev/null \| sed 1q`
	+uname -m = `(uname -m) 2>/dev/null \|\| echo unknown`
	+uname -r = `(uname -r) 2>/dev/null \|\| echo unknown`
	+uname -s = `(uname -s) 2>/dev/null \|\| echo unknown`
	+uname -v = `(uname -v) 2>/dev/null \|\| echo unknown`
	+
	+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null \|\| echo unknown`
	+/bin/uname -X = `(/bin/uname -X) 2>/dev/null \|\| echo unknown`
	+
	+/bin/arch = `(/bin/arch) 2>/dev/null \|\| echo unknown`
	+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null \|\| echo unknown`
	+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null \|\| echo unknown`
	+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null \|\| echo unknown`
	+/bin/machine = `(/bin/machine) 2>/dev/null \|\| echo unknown`
	+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null \|\| echo unknown`
	+/bin/universe = `(/bin/universe) 2>/dev/null \|\| echo unknown`
	+
	+_ASUNAME
	+
	+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
	+for as_dir in $PATH
	+do
	+ IFS=$as_save_IFS
	+ test -z "$as_dir" && as_dir=.
	+ $as_echo "PATH: $as_dir"
	+ done
	+IFS=$as_save_IFS
	+
	+} >&5
	+
	+cat >&5 <<_ACEOF
	+
	+
	+## ----------- ##
	+## Core tests. ##
	+## ----------- ##
	+
	+_ACEOF
	+
	+
	+# Keep a trace of the command line.
	+# Strip out --no-create and --no-recursion so they do not pile up.
	+# Strip out --silent because we don't want to record it for future runs.
	+# Also quote any args containing shell meta-characters.
	+# Make two passes to allow for proper duplicate-argument suppression.
	+ac_configure_args=
	+ac_configure_args0=
	+ac_configure_args1=
	+ac_must_keep_next=false
	+for ac_pass in 1 2
	+do
	+ for ac_arg
	+ do
	+ case $ac_arg in
	+ -no-create \| --no-c* \| -n \| -no-recursion \| --no-r*) continue ;;
	+ -q \| -quiet \| --quiet \| --quie \| --qui \| --qu \| --q \
	+ \| -silent \| --silent \| --silen \| --sile \| --sil)
	+ continue ;;
	+ \')
	+ ac_arg=`$as_echo "$ac_arg" \| sed "s/'/'\\\\\\\\''/g"` ;;
	+ esac
	+ case $ac_pass in
	+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;;
	+ 2)
	+ as_fn_append ac_configure_args1 " '$ac_arg'"
	+ if test $ac_must_keep_next = true; then
	+ ac_must_keep_next=false # Got value, back to normal.
	+ else
	+ case $ac_arg in
	+ = \| --config-cache \| -C \| -disable-* \| --disable-* \
	+ \| -enable-* \| --enable-* \| -gas \| --g* \| -nfp \| --nf* \
	+ \| -q \| -quiet \| --q* \| -silent \| --sil* \| -v \| -verb* \
	+ \| -with-* \| --with-* \| -without-* \| --without-* \| --x)
	+ case "$ac_configure_args0 " in
	+ "$ac_configure_args1"" '$ac_arg' " ) continue ;;
	+ esac
	+ ;;
	+ -* ) ac_must_keep_next=true ;;
	+ esac
	+ fi
	+ as_fn_append ac_configure_args " '$ac_arg'"
	+ ;;
	+ esac
	+ done
	+done
	+{ ac_configure_args0=; unset ac_configure_args0;}
	+{ ac_configure_args1=; unset ac_configure_args1;}
	+
	+# When interrupted or exit'd, cleanup temporary files, and complete
	+# config.log. We remove comments because anyway the quotes in there
	+# would cause problems or look ugly.
	+# WARNING: Use '\'' to represent an apostrophe within the trap.
	+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug.
	+trap 'exit_status=$?
	+ # Save into config.log some information that might help in debugging.
	+ {
	+ echo
	+
	+ $as_echo "## ---------------- ##
	+## Cache variables. ##
	+## ---------------- ##"
	+ echo
	+ # The following way of writing the cache mishandles newlines in values,
	+(
	+ for ac_var in `(set) 2>&1 \| sed -n '\''s/^$[a-zA-Z_][a-zA-Z0-9_]$=./\1/p'\''`; do
	+ eval ac_val=\$$ac_var
	+ case $ac_val in #(
	+ ${as_nl})
	+ case $ac_var in #(
	+ _cv_) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
	+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
	+ esac
	+ case $ac_var in #(
	+ _ \| IFS \| as_nl) ;; #(
	+ BASH_ARGV \| BASH_SOURCE) eval $ac_var= ;; #(
	+ *) { eval $ac_var=; unset $ac_var;} ;;
	+ esac ;;
	+ esac
	+ done
	+ (set) 2>&1 \|
	+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #(
	+ ${as_nl}ac_space=\ )
	+ sed -n \
	+ "s/'\''/'\''\\\\'\'''\''/g;
	+ s/^\$[_$as_cr_alnum]_cv_[_$as_cr_alnum]\$=\$.*\$/\\1='\''\\2'\''/p"
	+ ;; #(
	+ *)
	+ sed -n "/^[_$as_cr_alnum]_cv_[_$as_cr_alnum]=/p"
	+ ;;
	+ esac \|
	+ sort
	+)
	+ echo
	+
	+ $as_echo "## ----------------- ##
	+## Output variables. ##
	+## ----------------- ##"
	+ echo
	+ for ac_var in $ac_subst_vars
	+ do
	+ eval ac_val=\$$ac_var
	+ case $ac_val in
	+ \'\'') ac_val=`$as_echo "$ac_val" \| sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
	+ esac
	+ $as_echo "$ac_var='\''$ac_val'\''"
	+ done \| sort
	+ echo
	+
	+ if test -n "$ac_subst_files"; then
	+ $as_echo "## ------------------- ##
	+## File substitutions. ##
	+## ------------------- ##"
	+ echo
	+ for ac_var in $ac_subst_files
	+ do
	+ eval ac_val=\$$ac_var
	+ case $ac_val in
	+ \'\'') ac_val=`$as_echo "$ac_val" \| sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;;
	+ esac
	+ $as_echo "$ac_var='\''$ac_val'\''"
	+ done \| sort
	+ echo
	+ fi
	+
	+ if test -s confdefs.h; then
	+ $as_echo "## ----------- ##
	+## confdefs.h. ##
	+## ----------- ##"
	+ echo
	+ cat confdefs.h
	+ echo
	+ fi
	+ test "$ac_signal" != 0 &&
	+ $as_echo "$as_me: caught signal $ac_signal"
	+ $as_echo "$as_me: exit $exit_status"
	+ } >&5
	+ rm -f core .core core.conftest. &&
	+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files &&
	+ exit $exit_status
	+' 0
	+for ac_signal in 1 2 13 15; do
	+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal
	+done
	+ac_signal=0
	+
	+# confdefs.h avoids OS command line length limits that DEFS can exceed.
	+rm -f -r conftest* confdefs.h
	+
	+$as_echo "/* confdefs.h */" > confdefs.h
	+
	+# Predefined preprocessor variables.
	+
	+cat >>confdefs.h <<_ACEOF
	+#define PACKAGE_NAME "$PACKAGE_NAME"
	+_ACEOF
	+
	+cat >>confdefs.h <<_ACEOF
	+#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
	+_ACEOF
	+
	+cat >>confdefs.h <<_ACEOF
	+#define PACKAGE_VERSION "$PACKAGE_VERSION"
	+_ACEOF
	+
	+cat >>confdefs.h <<_ACEOF
	+#define PACKAGE_STRING "$PACKAGE_STRING"
	+_ACEOF
	+
	+cat >>confdefs.h <<_ACEOF
	+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
	+_ACEOF
	+
	+cat >>confdefs.h <<_ACEOF
	+#define PACKAGE_URL "$PACKAGE_URL"
	+_ACEOF
	+
	+
	+# Let the site file select an alternate cache file if it wants to.
	+# Prefer an explicitly selected file to automatically selected ones.
	+ac_site_file1=NONE
	+ac_site_file2=NONE
	+if test -n "$CONFIG_SITE"; then
	+ # We do not want a PATH search for config.site.
	+ case $CONFIG_SITE in #((
	+ -*) ac_site_file1=./$CONFIG_SITE;;
	+ /) ac_site_file1=$CONFIG_SITE;;
	+ *) ac_site_file1=./$CONFIG_SITE;;
	+ esac
	+elif test "x$prefix" != xNONE; then
	+ ac_site_file1=$prefix/share/config.site
	+ ac_site_file2=$prefix/etc/config.site
	+else
	+ ac_site_file1=$ac_default_prefix/share/config.site
	+ ac_site_file2=$ac_default_prefix/etc/config.site
	+fi
	+for ac_site_file in "$ac_site_file1" "$ac_site_file2"
	+do
	+ test "x$ac_site_file" = xNONE && continue
	+ if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5
	+$as_echo "$as_me: loading site script $ac_site_file" >&6;}
	+ sed 's/^/\| /' "$ac_site_file" >&5
	+ . "$ac_site_file" \
	+ \|\| { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
	+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
	+as_fn_error $? "failed to load site script $ac_site_file
	+See \`config.log' for more details" "$LINENO" 5; }
	+ fi
	+done
	+
	+if test -r "$cache_file"; then
	+ # Some versions of bash will fail to source /dev/null (special files
	+ # actually), so we avoid doing that. DJGPP emulates it as a regular file.
	+ if test /dev/null != "$cache_file" && test -f "$cache_file"; then
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5
	+$as_echo "$as_me: loading cache $cache_file" >&6;}
	+ case $cache_file in
	+ [\\/]* \| ?:[\\/]* ) . "$cache_file";;
	+ *) . "./$cache_file";;
	+ esac
	+ fi
	+else
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5
	+$as_echo "$as_me: creating cache $cache_file" >&6;}
	+ >$cache_file
	+fi
	+
	+# Check that the precious variables saved in the cache have kept the same
	+# value.
	+ac_cache_corrupted=false
	+for ac_var in $ac_precious_vars; do
	+ eval ac_old_set=\$ac_cv_env_${ac_var}_set
	+ eval ac_new_set=\$ac_env_${ac_var}_set
	+ eval ac_old_val=\$ac_cv_env_${ac_var}_value
	+ eval ac_new_val=\$ac_env_${ac_var}_value
	+ case $ac_old_set,$ac_new_set in
	+ set,)
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
	+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
	+ ac_cache_corrupted=: ;;
	+ ,set)
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5
	+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
	+ ac_cache_corrupted=: ;;
	+ ,);;
	+ *)
	+ if test "x$ac_old_val" != "x$ac_new_val"; then
	+ # differences in whitespace do not lead to failure.
	+ ac_old_val_w=`echo x $ac_old_val`
	+ ac_new_val_w=`echo x $ac_new_val`
	+ if test "$ac_old_val_w" != "$ac_new_val_w"; then
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5
	+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
	+ ac_cache_corrupted=:
	+ else
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5
	+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;}
	+ eval $ac_var=\$ac_old_val
	+ fi
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5
	+$as_echo "$as_me: former value: \`$ac_old_val'" >&2;}
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5
	+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;}
	+ fi;;
	+ esac
	+ # Pass precious variables to config.status.
	+ if test "$ac_new_set" = set; then
	+ case $ac_new_val in
	+ \') ac_arg=$ac_var=`$as_echo "$ac_new_val" \| sed "s/'/'\\\\\\\\''/g"` ;;
	+ *) ac_arg=$ac_var=$ac_new_val ;;
	+ esac
	+ case " $ac_configure_args " in
	+ " '$ac_arg' ") ;; # Avoid dups. Use of quotes ensures accuracy.
	+ *) as_fn_append ac_configure_args " '$ac_arg'" ;;
	+ esac
	+ fi
	+done
	+if $ac_cache_corrupted; then
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
	+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5
	+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;}
	+ as_fn_error $? "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5
	+fi
	+## -------------------- ##
	+## Main body of script. ##
	+## -------------------- ##
	+
	+ac_ext=c
	+ac_cpp='$CPP $CPPFLAGS'
	+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
	+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
	+ac_compiler_gnu=$ac_cv_c_compiler_gnu
	+
	+
	+am__api_version='1.11'
	+
	+ac_aux_dir=
	+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
	+ if test -f "$ac_dir/install-sh"; then
	+ ac_aux_dir=$ac_dir
	+ ac_install_sh="$ac_aux_dir/install-sh -c"
	+ break
	+ elif test -f "$ac_dir/install.sh"; then
	+ ac_aux_dir=$ac_dir
	+ ac_install_sh="$ac_aux_dir/install.sh -c"
	+ break
	+ elif test -f "$ac_dir/shtool"; then
	+ ac_aux_dir=$ac_dir
	+ ac_install_sh="$ac_aux_dir/shtool install -c"
	+ break
	+ fi
	+done
	+if test -z "$ac_aux_dir"; then
	+ as_fn_error $? "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5
	+fi
	+
	+# These three variables are undocumented and unsupported,
	+# and are intended to be withdrawn in a future Autoconf release.
	+# They can cause serious problems if a builder's source tree is in a directory
	+# whose full name contains unusual characters.
	+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var.
	+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var.
	+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
	+
	+
	+# Find a good install program. We prefer a C program (faster),
	+# so one script is as good as another. But avoid the broken or
	+# incompatible versions:
	+# SysV /etc/install, /usr/sbin/install
	+# SunOS /usr/etc/install
	+# IRIX /sbin/install
	+# AIX /bin/install
	+# AmigaOS /C/install, which installs bootblocks on floppy discs
	+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
	+# AFS /usr/afsws/bin/install, which mishandles nonexistent args
	+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
	+# OS/2's system install, which has a completely different semantic
	+# ./install, which can be erroneously created by make from ./install.sh.
	+# Reject install programs that cannot install multiple files.
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
	+$as_echo_n "checking for a BSD-compatible install... " >&6; }
	+if test -z "$INSTALL"; then
	+if ${ac_cv_path_install+:} false; then :
	+ $as_echo_n "(cached) " >&6
	+else
	+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
	+for as_dir in $PATH
	+do
	+ IFS=$as_save_IFS
	+ test -z "$as_dir" && as_dir=.
	+ # Account for people who put trailing slashes in PATH elements.
	+case $as_dir/ in #((
	+ ./ \| .// \| /[cC]/* \| \
	+ /etc/* \| /usr/sbin/* \| /usr/etc/* \| /sbin/* \| /usr/afsws/bin/* \| \
	+ ?:[\\/]os2[\\/]install[\\/]* \| ?:[\\/]OS2[\\/]INSTALL[\\/]* \| \
	+ /usr/ucb/* ) ;;
	+ *)
	+ # OSF1 and SCO ODT 3.0 have their own names for install.
	+ # Don't use installbsd from OSF since it installs stuff as root
	+ # by default.
	+ for ac_prog in ginstall scoinst install; do
	+ for ac_exec_ext in '' $ac_executable_extensions; do
	+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
	+ if test $ac_prog = install &&
	+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
	+ # AIX install. It has an incompatible calling convention.
	+ :
	+ elif test $ac_prog = install &&
	+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
	+ # program-specific install script used by HP pwplus--don't use.
	+ :
	+ else
	+ rm -rf conftest.one conftest.two conftest.dir
	+ echo one > conftest.one
	+ echo two > conftest.two
	+ mkdir conftest.dir
	+ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
	+ test -s conftest.one && test -s conftest.two &&
	+ test -s conftest.dir/conftest.one &&
	+ test -s conftest.dir/conftest.two
	+ then
	+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
	+ break 3
	+ fi
	+ fi
	+ fi
	+ done
	+ done
	+ ;;
	+esac
	+
	+ done
	+IFS=$as_save_IFS
	+
	+rm -rf conftest.one conftest.two conftest.dir
	+
	+fi
	+ if test "${ac_cv_path_install+set}" = set; then
	+ INSTALL=$ac_cv_path_install
	+ else
	+ # As a last resort, use the slow shell script. Don't cache a
	+ # value for INSTALL within a source directory, because that will
	+ # break other packages using the cache if that directory is
	+ # removed, or if the value is a relative name.
	+ INSTALL=$ac_install_sh
	+ fi
	+fi
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
	+$as_echo "$INSTALL" >&6; }
	+
	+# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
	+# It thinks the first close brace ends the variable substitution.
	+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
	+
	+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
	+
	+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
	+
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
	+$as_echo_n "checking whether build environment is sane... " >&6; }
	+# Just in case
	+sleep 1
	+echo timestamp > conftest.file
	+# Reject unsafe characters in $srcdir or the absolute working directory
	+# name. Accept space and tab only in the latter.
	+am_lf='
	+'
	+case `pwd` in
	+ [\\\"\#\$\&\'\`$am_lf])
	+ as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
	+esac
	+case $srcdir in
	+ [\\\"\#\$\&\'\`$am_lf\ \ ])
	+ as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
	+esac
	+
	+# Do `set' in a subshell so we don't clobber the current shell's
	+# arguments. Must try -L first in case configure is actually a
	+# symlink; some systems play weird games with the mod time of symlinks
	+# (eg FreeBSD returns the mod time of the symlink's containing
	+# directory).
	+if (
	+ set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
	+ if test "$*" = "X"; then
	+ # -L didn't work.
	+ set X `ls -t "$srcdir/configure" conftest.file`
	+ fi
	+ rm -f conftest.file
	+ if test "$*" != "X $srcdir/configure conftest.file" \
	+ && test "$*" != "X conftest.file $srcdir/configure"; then
	+
	+ # If neither matched, then we have a broken ls. This can happen
	+ # if, for instance, CONFIG_SHELL is bash and it inherits a
	+ # broken ls alias from the environment. This has actually
	+ # happened. Such a system could not be considered "sane".
	+ as_fn_error $? "ls -t appears to fail. Make sure there is not a broken
	+alias in your environment" "$LINENO" 5
	+ fi
	+
	+ test "$2" = conftest.file
	+ )
	+then
	+ # Ok.
	+ :
	+else
	+ as_fn_error $? "newly created file is older than distributed files!
	+Check your system clock" "$LINENO" 5
	+fi
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
	+$as_echo "yes" >&6; }
	+test "$program_prefix" != NONE &&
	+ program_transform_name="s&^&$program_prefix&;$program_transform_name"
	+# Use a double $ so make ignores it.
	+test "$program_suffix" != NONE &&
	+ program_transform_name="s&\$&$program_suffix&;$program_transform_name"
	+# Double any \ or $.
	+# By default was `s,x,x', remove it if useless.
	+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
	+program_transform_name=`$as_echo "$program_transform_name" \| sed "$ac_script"`
	+
	+# expand $ac_aux_dir to an absolute path
	+am_aux_dir=`cd $ac_aux_dir && pwd`
	+
	+if test x"${MISSING+set}" != xset; then
	+ case $am_aux_dir in
	+ \ \| \ )
	+ MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
	+ *)
	+ MISSING="\${SHELL} $am_aux_dir/missing" ;;
	+ esac
	+fi
	+# Use eval to expand $SHELL
	+if eval "$MISSING --run true"; then
	+ am_missing_run="$MISSING --run "
	+else
	+ am_missing_run=
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
	+$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
	+fi
	+
	+if test x"${install_sh}" != xset; then
	+ case $am_aux_dir in
	+ \ \| \ )
	+ install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
	+ *)
	+ install_sh="\${SHELL} $am_aux_dir/install-sh"
	+ esac
	+fi
	+
	+# Installed binaries are usually stripped using `strip' when the user
	+# run `make install-strip'. However `strip' might not be the right
	+# tool to use in cross-compilation environments, therefore Automake
	+# will honor the `STRIP' environment variable to overrule this program.
	+if test "$cross_compiling" != no; then
	+ if test -n "$ac_tool_prefix"; then
	+ # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
	+set dummy ${ac_tool_prefix}strip; ac_word=$2
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
	+$as_echo_n "checking for $ac_word... " >&6; }
	+if ${ac_cv_prog_STRIP+:} false; then :
	+ $as_echo_n "(cached) " >&6
	+else
	+ if test -n "$STRIP"; then
	+ ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
	+else
	+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
	+for as_dir in $PATH
	+do
	+ IFS=$as_save_IFS
	+ test -z "$as_dir" && as_dir=.
	+ for ac_exec_ext in '' $ac_executable_extensions; do
	+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	+ ac_cv_prog_STRIP="${ac_tool_prefix}strip"
	+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
	+ break 2
	+ fi
	+done
	+ done
	+IFS=$as_save_IFS
	+
	+fi
	+fi
	+STRIP=$ac_cv_prog_STRIP
	+if test -n "$STRIP"; then
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
	+$as_echo "$STRIP" >&6; }
	+else
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	+$as_echo "no" >&6; }
	+fi
	+
	+
	+fi
	+if test -z "$ac_cv_prog_STRIP"; then
	+ ac_ct_STRIP=$STRIP
	+ # Extract the first word of "strip", so it can be a program name with args.
	+set dummy strip; ac_word=$2
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
	+$as_echo_n "checking for $ac_word... " >&6; }
	+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
	+ $as_echo_n "(cached) " >&6
	+else
	+ if test -n "$ac_ct_STRIP"; then
	+ ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
	+else
	+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
	+for as_dir in $PATH
	+do
	+ IFS=$as_save_IFS
	+ test -z "$as_dir" && as_dir=.
	+ for ac_exec_ext in '' $ac_executable_extensions; do
	+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	+ ac_cv_prog_ac_ct_STRIP="strip"
	+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
	+ break 2
	+ fi
	+done
	+ done
	+IFS=$as_save_IFS
	+
	+fi
	+fi
	+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
	+if test -n "$ac_ct_STRIP"; then
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
	+$as_echo "$ac_ct_STRIP" >&6; }
	+else
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	+$as_echo "no" >&6; }
	+fi
	+
	+ if test "x$ac_ct_STRIP" = x; then
	+ STRIP=":"
	+ else
	+ case $cross_compiling:$ac_tool_warned in
	+yes:)
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
	+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
	+ac_tool_warned=yes ;;
	+esac
	+ STRIP=$ac_ct_STRIP
	+ fi
	+else
	+ STRIP="$ac_cv_prog_STRIP"
	+fi
	+
	+fi
	+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
	+
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
	+$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
	+if test -z "$MKDIR_P"; then
	+ if ${ac_cv_path_mkdir+:} false; then :
	+ $as_echo_n "(cached) " >&6
	+else
	+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
	+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
	+do
	+ IFS=$as_save_IFS
	+ test -z "$as_dir" && as_dir=.
	+ for ac_prog in mkdir gmkdir; do
	+ for ac_exec_ext in '' $ac_executable_extensions; do
	+ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } \|\| continue
	+ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
	+ 'mkdir (GNU coreutils) '* \| \
	+ 'mkdir (coreutils) '* \| \
	+ 'mkdir (fileutils) '4.1*)
	+ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
	+ break 3;;
	+ esac
	+ done
	+ done
	+ done
	+IFS=$as_save_IFS
	+
	+fi
	+
	+ test -d ./--version && rmdir ./--version
	+ if test "${ac_cv_path_mkdir+set}" = set; then
	+ MKDIR_P="$ac_cv_path_mkdir -p"
	+ else
	+ # As a last resort, use the slow shell script. Don't cache a
	+ # value for MKDIR_P within a source directory, because that will
	+ # break other packages using the cache if that directory is
	+ # removed, or if the value is a relative name.
	+ MKDIR_P="$ac_install_sh -d"
	+ fi
	+fi
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
	+$as_echo "$MKDIR_P" >&6; }
	+
	+mkdir_p="$MKDIR_P"
	+case $mkdir_p in
	+ [\\/$]* \| ?:[\\/]*) ;;
	+ /) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
	+esac
	+
	+for ac_prog in gawk mawk nawk awk
	+do
	+ # Extract the first word of "$ac_prog", so it can be a program name with args.
	+set dummy $ac_prog; ac_word=$2
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
	+$as_echo_n "checking for $ac_word... " >&6; }
	+if ${ac_cv_prog_AWK+:} false; then :
	+ $as_echo_n "(cached) " >&6
	+else
	+ if test -n "$AWK"; then
	+ ac_cv_prog_AWK="$AWK" # Let the user override the test.
	+else
	+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
	+for as_dir in $PATH
	+do
	+ IFS=$as_save_IFS
	+ test -z "$as_dir" && as_dir=.
	+ for ac_exec_ext in '' $ac_executable_extensions; do
	+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	+ ac_cv_prog_AWK="$ac_prog"
	+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
	+ break 2
	+ fi
	+done
	+ done
	+IFS=$as_save_IFS
	+
	+fi
	+fi
	+AWK=$ac_cv_prog_AWK
	+if test -n "$AWK"; then
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
	+$as_echo "$AWK" >&6; }
	+else
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	+$as_echo "no" >&6; }
	+fi
	+
	+
	+ test -n "$AWK" && break
	+done
	+
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
	+$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
	+set x ${MAKE-make}
	+ac_make=`$as_echo "$2" \| sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
	+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
	+ $as_echo_n "(cached) " >&6
	+else
	+ cat >conftest.make <<\_ACEOF
	+SHELL = /bin/sh
	+all:
	+ @echo '@@@%%%=$(MAKE)=@@@%%%'
	+_ACEOF
	+# GNU make sometimes prints "make[1]: Entering ...", which would confuse us.
	+case `${MAKE-make} -f conftest.make 2>/dev/null` in
	+ @@@%%%=?=@@@%%%*)
	+ eval ac_cv_prog_make_${ac_make}_set=yes;;
	+ *)
	+ eval ac_cv_prog_make_${ac_make}_set=no;;
	+esac
	+rm -f conftest.make
	+fi
	+if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
	+$as_echo "yes" >&6; }
	+ SET_MAKE=
	+else
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	+$as_echo "no" >&6; }
	+ SET_MAKE="MAKE=${MAKE-make}"
	+fi
	+
	+rm -rf .tst 2>/dev/null
	+mkdir .tst 2>/dev/null
	+if test -d .tst; then
	+ am__leading_dot=.
	+else
	+ am__leading_dot=_
	+fi
	+rmdir .tst 2>/dev/null
	+
	+if test "`cd $srcdir && pwd`" != "`pwd`"; then
	+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
	+ # is not polluted with repeated "-I."
	+ am__isrc=' -I$(srcdir)'
	+ # test to see if srcdir already configured
	+ if test -f $srcdir/config.status; then
	+ as_fn_error $? "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
	+ fi
	+fi
	+
	+# test whether we have cygpath
	+if test -z "$CYGPATH_W"; then
	+ if (cygpath --version) >/dev/null 2>/dev/null; then
	+ CYGPATH_W='cygpath -w'
	+ else
	+ CYGPATH_W=echo
	+ fi
	+fi
	+
	+
	+# Define the identity of the package.
	+ PACKAGE=@PACKAGE_NAME@
	+ VERSION=@PACKAGE_VERSION@
	+
	+
	+cat >>confdefs.h <<_ACEOF
	+#define PACKAGE "$PACKAGE"
	+_ACEOF
	+
	+
	+cat >>confdefs.h <<_ACEOF
	+#define VERSION "$VERSION"
	+_ACEOF
	+
	+# Some tools Automake needs.
	+
	+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
	+
	+
	+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
	+
	+
	+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
	+
	+
	+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
	+
	+
	+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
	+
	+# We need awk for the "check" target. The system "awk" is bad on
	+# some platforms.
	+# Always define AMTAR for backward compatibility. Yes, it's still used
	+# in the wild :-( We should find a proper way to deprecate it ...
	+AMTAR='$${TAR-tar}'
	+
	+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
	+
	+
	+
	+
	+
	+
	+ac_config_headers="$ac_config_headers config.h"
	+
	+
	+# Checks for programs.
	+ac_ext=c
	+ac_cpp='$CPP $CPPFLAGS'
	+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
	+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
	+ac_compiler_gnu=$ac_cv_c_compiler_gnu
	+if test -n "$ac_tool_prefix"; then
	+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
	+set dummy ${ac_tool_prefix}gcc; ac_word=$2
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
	+$as_echo_n "checking for $ac_word... " >&6; }
	+if ${ac_cv_prog_CC+:} false; then :
	+ $as_echo_n "(cached) " >&6
	+else
	+ if test -n "$CC"; then
	+ ac_cv_prog_CC="$CC" # Let the user override the test.
	+else
	+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
	+for as_dir in $PATH
	+do
	+ IFS=$as_save_IFS
	+ test -z "$as_dir" && as_dir=.
	+ for ac_exec_ext in '' $ac_executable_extensions; do
	+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
	+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
	+ break 2
	+ fi
	+done
	+ done
	+IFS=$as_save_IFS
	+
	+fi
	+fi
	+CC=$ac_cv_prog_CC
	+if test -n "$CC"; then
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
	+$as_echo "$CC" >&6; }
	+else
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	+$as_echo "no" >&6; }
	+fi
	+
	+
	+fi
	+if test -z "$ac_cv_prog_CC"; then
	+ ac_ct_CC=$CC
	+ # Extract the first word of "gcc", so it can be a program name with args.
	+set dummy gcc; ac_word=$2
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
	+$as_echo_n "checking for $ac_word... " >&6; }
	+if ${ac_cv_prog_ac_ct_CC+:} false; then :
	+ $as_echo_n "(cached) " >&6
	+else
	+ if test -n "$ac_ct_CC"; then
	+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
	+else
	+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
	+for as_dir in $PATH
	+do
	+ IFS=$as_save_IFS
	+ test -z "$as_dir" && as_dir=.
	+ for ac_exec_ext in '' $ac_executable_extensions; do
	+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	+ ac_cv_prog_ac_ct_CC="gcc"
	+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
	+ break 2
	+ fi
	+done
	+ done
	+IFS=$as_save_IFS
	+
	+fi
	+fi
	+ac_ct_CC=$ac_cv_prog_ac_ct_CC
	+if test -n "$ac_ct_CC"; then
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
	+$as_echo "$ac_ct_CC" >&6; }
	+else
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	+$as_echo "no" >&6; }
	+fi
	+
	+ if test "x$ac_ct_CC" = x; then
	+ CC=""
	+ else
	+ case $cross_compiling:$ac_tool_warned in
	+yes:)
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
	+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
	+ac_tool_warned=yes ;;
	+esac
	+ CC=$ac_ct_CC
	+ fi
	+else
	+ CC="$ac_cv_prog_CC"
	+fi
	+
	+if test -z "$CC"; then
	+ if test -n "$ac_tool_prefix"; then
	+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
	+set dummy ${ac_tool_prefix}cc; ac_word=$2
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
	+$as_echo_n "checking for $ac_word... " >&6; }
	+if ${ac_cv_prog_CC+:} false; then :
	+ $as_echo_n "(cached) " >&6
	+else
	+ if test -n "$CC"; then
	+ ac_cv_prog_CC="$CC" # Let the user override the test.
	+else
	+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
	+for as_dir in $PATH
	+do
	+ IFS=$as_save_IFS
	+ test -z "$as_dir" && as_dir=.
	+ for ac_exec_ext in '' $ac_executable_extensions; do
	+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	+ ac_cv_prog_CC="${ac_tool_prefix}cc"
	+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
	+ break 2
	+ fi
	+done
	+ done
	+IFS=$as_save_IFS
	+
	+fi
	+fi
	+CC=$ac_cv_prog_CC
	+if test -n "$CC"; then
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
	+$as_echo "$CC" >&6; }
	+else
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	+$as_echo "no" >&6; }
	+fi
	+
	+
	+ fi
	+fi
	+if test -z "$CC"; then
	+ # Extract the first word of "cc", so it can be a program name with args.
	+set dummy cc; ac_word=$2
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
	+$as_echo_n "checking for $ac_word... " >&6; }
	+if ${ac_cv_prog_CC+:} false; then :
	+ $as_echo_n "(cached) " >&6
	+else
	+ if test -n "$CC"; then
	+ ac_cv_prog_CC="$CC" # Let the user override the test.
	+else
	+ ac_prog_rejected=no
	+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
	+for as_dir in $PATH
	+do
	+ IFS=$as_save_IFS
	+ test -z "$as_dir" && as_dir=.
	+ for ac_exec_ext in '' $ac_executable_extensions; do
	+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
	+ ac_prog_rejected=yes
	+ continue
	+ fi
	+ ac_cv_prog_CC="cc"
	+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
	+ break 2
	+ fi
	+done
	+ done
	+IFS=$as_save_IFS
	+
	+if test $ac_prog_rejected = yes; then
	+ # We found a bogon in the path, so make sure we never use it.
	+ set dummy $ac_cv_prog_CC
	+ shift
	+ if test $# != 0; then
	+ # We chose a different compiler from the bogus one.
	+ # However, it has the same basename, so the bogon will be chosen
	+ # first if we set CC to just the basename; use the full file name.
	+ shift
	+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
	+ fi
	+fi
	+fi
	+fi
	+CC=$ac_cv_prog_CC
	+if test -n "$CC"; then
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
	+$as_echo "$CC" >&6; }
	+else
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	+$as_echo "no" >&6; }
	+fi
	+
	+
	+fi
	+if test -z "$CC"; then
	+ if test -n "$ac_tool_prefix"; then
	+ for ac_prog in cl.exe
	+ do
	+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
	+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
	+$as_echo_n "checking for $ac_word... " >&6; }
	+if ${ac_cv_prog_CC+:} false; then :
	+ $as_echo_n "(cached) " >&6
	+else
	+ if test -n "$CC"; then
	+ ac_cv_prog_CC="$CC" # Let the user override the test.
	+else
	+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
	+for as_dir in $PATH
	+do
	+ IFS=$as_save_IFS
	+ test -z "$as_dir" && as_dir=.
	+ for ac_exec_ext in '' $ac_executable_extensions; do
	+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
	+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
	+ break 2
	+ fi
	+done
	+ done
	+IFS=$as_save_IFS
	+
	+fi
	+fi
	+CC=$ac_cv_prog_CC
	+if test -n "$CC"; then
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5
	+$as_echo "$CC" >&6; }
	+else
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	+$as_echo "no" >&6; }
	+fi
	+
	+
	+ test -n "$CC" && break
	+ done
	+fi
	+if test -z "$CC"; then
	+ ac_ct_CC=$CC
	+ for ac_prog in cl.exe
	+do
	+ # Extract the first word of "$ac_prog", so it can be a program name with args.
	+set dummy $ac_prog; ac_word=$2
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
	+$as_echo_n "checking for $ac_word... " >&6; }
	+if ${ac_cv_prog_ac_ct_CC+:} false; then :
	+ $as_echo_n "(cached) " >&6
	+else
	+ if test -n "$ac_ct_CC"; then
	+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
	+else
	+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
	+for as_dir in $PATH
	+do
	+ IFS=$as_save_IFS
	+ test -z "$as_dir" && as_dir=.
	+ for ac_exec_ext in '' $ac_executable_extensions; do
	+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	+ ac_cv_prog_ac_ct_CC="$ac_prog"
	+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
	+ break 2
	+ fi
	+done
	+ done
	+IFS=$as_save_IFS
	+
	+fi
	+fi
	+ac_ct_CC=$ac_cv_prog_ac_ct_CC
	+if test -n "$ac_ct_CC"; then
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5
	+$as_echo "$ac_ct_CC" >&6; }
	+else
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	+$as_echo "no" >&6; }
	+fi
	+
	+
	+ test -n "$ac_ct_CC" && break
	+done
	+
	+ if test "x$ac_ct_CC" = x; then
	+ CC=""
	+ else
	+ case $cross_compiling:$ac_tool_warned in
	+yes:)
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
	+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
	+ac_tool_warned=yes ;;
	+esac
	+ CC=$ac_ct_CC
	+ fi
	+fi
	+
	+fi
	+
	+
	+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
	+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
	+as_fn_error $? "no acceptable C compiler found in \$PATH
	+See \`config.log' for more details" "$LINENO" 5; }
	+
	+# Provide some information about the compiler.
	+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
	+set X $ac_compile
	+ac_compiler=$2
	+for ac_option in --version -v -V -qversion; do
	+ { { ac_try="$ac_compiler $ac_option >&5"
	+case "(($ac_try" in
	+ \" \| \` \| \\) ac_try_echo=\$ac_try;;
	+ *) ac_try_echo=$ac_try;;
	+esac
	+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
	+$as_echo "$ac_try_echo"; } >&5
	+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err
	+ ac_status=$?
	+ if test -s conftest.err; then
	+ sed '10a\
	+... rest of stderr output deleted ...
	+ 10q' conftest.err >conftest.er1
	+ cat conftest.er1 >&5
	+ fi
	+ rm -f conftest.er1 conftest.err
	+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
	+ test $ac_status = 0; }
	+done
	+
	+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	+/* end confdefs.h. */
	+
	+int
	+main ()
	+{
	+
	+ ;
	+ return 0;
	+}
	+_ACEOF
	+ac_clean_files_save=$ac_clean_files
	+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out"
	+# Try to create an executable without -o first, disregard a.out.
	+# It will help us diagnose broken compilers, and finding out an intuition
	+# of exeext.
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5
	+$as_echo_n "checking whether the C compiler works... " >&6; }
	+ac_link_default=`$as_echo "$ac_link" \| sed 's/ -o conftest[^ ]//'`
	+
	+# The possible output files:
	+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*"
	+
	+ac_rmfiles=
	+for ac_file in $ac_files
	+do
	+ case $ac_file in
	+ .$ac_ext \| .xcoff \| .tds \| .d \| .pdb \| .xSYM \| .bb \| .bbg \| .map \| .inf \| .dSYM \| .o \| *.obj ) ;;
	+ * ) ac_rmfiles="$ac_rmfiles $ac_file";;
	+ esac
	+done
	+rm -f $ac_rmfiles
	+
	+if { { ac_try="$ac_link_default"
	+case "(($ac_try" in
	+ \" \| \` \| \\) ac_try_echo=\$ac_try;;
	+ *) ac_try_echo=$ac_try;;
	+esac
	+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
	+$as_echo "$ac_try_echo"; } >&5
	+ (eval "$ac_link_default") 2>&5
	+ ac_status=$?
	+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
	+ test $ac_status = 0; }; then :
	+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'.
	+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no'
	+# in a Makefile. We should not override ac_cv_exeext if it was cached,
	+# so that the user can short-circuit this test for compilers unknown to
	+# Autoconf.
	+for ac_file in $ac_files ''
	+do
	+ test -f "$ac_file" \|\| continue
	+ case $ac_file in
	+ .$ac_ext \| .xcoff \| .tds \| .d \| .pdb \| .xSYM \| .bb \| .bbg \| .map \| .inf \| .dSYM \| .o \| *.obj )
	+ ;;
	+ [ab].out )
	+ # We found the default executable, but exeext='' is most
	+ # certainly right.
	+ break;;
	+ . )
	+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no;
	+ then :; else
	+ ac_cv_exeext=`expr "$ac_file" : '[^.]$\..$'`
	+ fi
	+ # We set ac_cv_exeext here because the later test for it is not
	+ # safe: cross compilers may not add the suffix if given an `-o'
	+ # argument, so we may need to know it at that point already.
	+ # Even if this section looks crufty: it has the advantage of
	+ # actually working.
	+ break;;
	+ * )
	+ break;;
	+ esac
	+done
	+test "$ac_cv_exeext" = no && ac_cv_exeext=
	+
	+else
	+ ac_file=''
	+fi
	+if test -z "$ac_file"; then :
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	+$as_echo "no" >&6; }
	+$as_echo "$as_me: failed program was:" >&5
	+sed 's/^/\| /' conftest.$ac_ext >&5
	+
	+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
	+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
	+as_fn_error 77 "C compiler cannot create executables
	+See \`config.log' for more details" "$LINENO" 5; }
	+else
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
	+$as_echo "yes" >&6; }
	+fi
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5
	+$as_echo_n "checking for C compiler default output file name... " >&6; }
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5
	+$as_echo "$ac_file" >&6; }
	+ac_exeext=$ac_cv_exeext
	+
	+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out
	+ac_clean_files=$ac_clean_files_save
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5
	+$as_echo_n "checking for suffix of executables... " >&6; }
	+if { { ac_try="$ac_link"
	+case "(($ac_try" in
	+ \" \| \` \| \\) ac_try_echo=\$ac_try;;
	+ *) ac_try_echo=$ac_try;;
	+esac
	+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
	+$as_echo "$ac_try_echo"; } >&5
	+ (eval "$ac_link") 2>&5
	+ ac_status=$?
	+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
	+ test $ac_status = 0; }; then :
	+ # If both `conftest.exe' and `conftest' are `present' (well, observable)
	+# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will
	+# work properly (i.e., refer to `conftest.exe'), while it won't with
	+# `rm'.
	+for ac_file in conftest.exe conftest conftest.*; do
	+ test -f "$ac_file" \|\| continue
	+ case $ac_file in
	+ .$ac_ext \| .xcoff \| .tds \| .d \| .pdb \| .xSYM \| .bb \| .bbg \| .map \| .inf \| .dSYM \| .o \| *.obj ) ;;
	+ . ) ac_cv_exeext=`expr "$ac_file" : '[^.]$\..$'`
	+ break;;
	+ * ) break;;
	+ esac
	+done
	+else
	+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
	+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
	+as_fn_error $? "cannot compute suffix of executables: cannot compile and link
	+See \`config.log' for more details" "$LINENO" 5; }
	+fi
	+rm -f conftest conftest$ac_cv_exeext
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
	+$as_echo "$ac_cv_exeext" >&6; }
	+
	+rm -f conftest.$ac_ext
	+EXEEXT=$ac_cv_exeext
	+ac_exeext=$EXEEXT
	+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	+/* end confdefs.h. */
	+#include <stdio.h>
	+int
	+main ()
	+{
	+FILE *f = fopen ("conftest.out", "w");
	+ return ferror (f) \|\| fclose (f) != 0;
	+
	+ ;
	+ return 0;
	+}
	+_ACEOF
	+ac_clean_files="$ac_clean_files conftest.out"
	+# Check that the compiler produces executables we can run. If not, either
	+# the compiler is broken, or we cross compile.
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5
	+$as_echo_n "checking whether we are cross compiling... " >&6; }
	+if test "$cross_compiling" != yes; then
	+ { { ac_try="$ac_link"
	+case "(($ac_try" in
	+ \" \| \` \| \\) ac_try_echo=\$ac_try;;
	+ *) ac_try_echo=$ac_try;;
	+esac
	+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
	+$as_echo "$ac_try_echo"; } >&5
	+ (eval "$ac_link") 2>&5
	+ ac_status=$?
	+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
	+ test $ac_status = 0; }
	+ if { ac_try='./conftest$ac_cv_exeext'
	+ { { case "(($ac_try" in
	+ \" \| \` \| \\) ac_try_echo=\$ac_try;;
	+ *) ac_try_echo=$ac_try;;
	+esac
	+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
	+$as_echo "$ac_try_echo"; } >&5
	+ (eval "$ac_try") 2>&5
	+ ac_status=$?
	+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
	+ test $ac_status = 0; }; }; then
	+ cross_compiling=no
	+ else
	+ if test "$cross_compiling" = maybe; then
	+ cross_compiling=yes
	+ else
	+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
	+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
	+as_fn_error $? "cannot run C compiled programs.
	+If you meant to cross compile, use \`--host'.
	+See \`config.log' for more details" "$LINENO" 5; }
	+ fi
	+ fi
	+fi
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5
	+$as_echo "$cross_compiling" >&6; }
	+
	+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out
	+ac_clean_files=$ac_clean_files_save
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
	+$as_echo_n "checking for suffix of object files... " >&6; }
	+if ${ac_cv_objext+:} false; then :
	+ $as_echo_n "(cached) " >&6
	+else
	+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	+/* end confdefs.h. */
	+
	+int
	+main ()
	+{
	+
	+ ;
	+ return 0;
	+}
	+_ACEOF
	+rm -f conftest.o conftest.obj
	+if { { ac_try="$ac_compile"
	+case "(($ac_try" in
	+ \" \| \` \| \\) ac_try_echo=\$ac_try;;
	+ *) ac_try_echo=$ac_try;;
	+esac
	+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
	+$as_echo "$ac_try_echo"; } >&5
	+ (eval "$ac_compile") 2>&5
	+ ac_status=$?
	+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
	+ test $ac_status = 0; }; then :
	+ for ac_file in conftest.o conftest.obj conftest.*; do
	+ test -f "$ac_file" \|\| continue;
	+ case $ac_file in
	+ .$ac_ext \| .xcoff \| .tds \| .d \| .pdb \| .xSYM \| .bb \| .bbg \| .map \| .inf \| *.dSYM ) ;;
	+ ) ac_cv_objext=`expr "$ac_file" : '.\.$.*$'`
	+ break;;
	+ esac
	+done
	+else
	+ $as_echo "$as_me: failed program was:" >&5
	+sed 's/^/\| /' conftest.$ac_ext >&5
	+
	+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
	+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
	+as_fn_error $? "cannot compute suffix of object files: cannot compile
	+See \`config.log' for more details" "$LINENO" 5; }
	+fi
	+rm -f conftest.$ac_cv_objext conftest.$ac_ext
	+fi
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5
	+$as_echo "$ac_cv_objext" >&6; }
	+OBJEXT=$ac_cv_objext
	+ac_objext=$OBJEXT
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
	+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
	+if ${ac_cv_c_compiler_gnu+:} false; then :
	+ $as_echo_n "(cached) " >&6
	+else
	+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	+/* end confdefs.h. */
	+
	+int
	+main ()
	+{
	+#ifndef __GNUC__
	+ choke me
	+#endif
	+
	+ ;
	+ return 0;
	+}
	+_ACEOF
	+if ac_fn_c_try_compile "$LINENO"; then :
	+ ac_compiler_gnu=yes
	+else
	+ ac_compiler_gnu=no
	+fi
	+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
	+ac_cv_c_compiler_gnu=$ac_compiler_gnu
	+
	+fi
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5
	+$as_echo "$ac_cv_c_compiler_gnu" >&6; }
	+if test $ac_compiler_gnu = yes; then
	+ GCC=yes
	+else
	+ GCC=
	+fi
	+ac_test_CFLAGS=${CFLAGS+set}
	+ac_save_CFLAGS=$CFLAGS
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
	+$as_echo_n "checking whether $CC accepts -g... " >&6; }
	+if ${ac_cv_prog_cc_g+:} false; then :
	+ $as_echo_n "(cached) " >&6
	+else
	+ ac_save_c_werror_flag=$ac_c_werror_flag
	+ ac_c_werror_flag=yes
	+ ac_cv_prog_cc_g=no
	+ CFLAGS="-g"
	+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	+/* end confdefs.h. */
	+
	+int
	+main ()
	+{
	+
	+ ;
	+ return 0;
	+}
	+_ACEOF
	+if ac_fn_c_try_compile "$LINENO"; then :
	+ ac_cv_prog_cc_g=yes
	+else
	+ CFLAGS=""
	+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	+/* end confdefs.h. */
	+
	+int
	+main ()
	+{
	+
	+ ;
	+ return 0;
	+}
	+_ACEOF
	+if ac_fn_c_try_compile "$LINENO"; then :
	+
	+else
	+ ac_c_werror_flag=$ac_save_c_werror_flag
	+ CFLAGS="-g"
	+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	+/* end confdefs.h. */
	+
	+int
	+main ()
	+{
	+
	+ ;
	+ return 0;
	+}
	+_ACEOF
	+if ac_fn_c_try_compile "$LINENO"; then :
	+ ac_cv_prog_cc_g=yes
	+fi
	+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
	+fi
	+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
	+fi
	+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
	+ ac_c_werror_flag=$ac_save_c_werror_flag
	+fi
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5
	+$as_echo "$ac_cv_prog_cc_g" >&6; }
	+if test "$ac_test_CFLAGS" = set; then
	+ CFLAGS=$ac_save_CFLAGS
	+elif test $ac_cv_prog_cc_g = yes; then
	+ if test "$GCC" = yes; then
	+ CFLAGS="-g -O2"
	+ else
	+ CFLAGS="-g"
	+ fi
	+else
	+ if test "$GCC" = yes; then
	+ CFLAGS="-O2"
	+ else
	+ CFLAGS=
	+ fi
	+fi
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
	+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
	+if ${ac_cv_prog_cc_c89+:} false; then :
	+ $as_echo_n "(cached) " >&6
	+else
	+ ac_cv_prog_cc_c89=no
	+ac_save_CC=$CC
	+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	+/* end confdefs.h. */
	+#include <stdarg.h>
	+#include <stdio.h>
	+#include <sys/types.h>
	+#include <sys/stat.h>
	+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */
	+struct buf { int x; };
	+FILE * (rcsopen) (struct buf , struct stat *, int);
	+static char *e (p, i)
	+ char **p;
	+ int i;
	+{
	+ return p[i];
	+}
	+static char f (char (g) (char , int), char *p, ...)
	+{
	+ char *s;
	+ va_list v;
	+ va_start (v,p);
	+ s = g (p, va_arg (v,int));
	+ va_end (v);
	+ return s;
	+}
	+
	+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
	+ function prototypes and stuff, but not '\xHH' hex character constants.
	+ These don't provoke an error unfortunately, instead are silently treated
	+ as 'x'. The following induces an error, until -std is added to get
	+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
	+ array size at least. It's necessary to write '\x00'==0 to get something
	+ that's true only with -std. */
	+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
	+
	+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
	+ inside strings and character constants. */
	+#define FOO(x) 'x'
	+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
	+
	+int test (int i, double x);
	+struct s1 {int (*f) (int a);};
	+struct s2 {int (*f) (double a);};
	+int pairnames (int, char *, FILE ()(struct buf , struct stat *, int), int, int);
	+int argc;
	+char **argv;
	+int
	+main ()
	+{
	+return f (e, argv, 0) != argv[0] \|\| f (e, argv, 1) != argv[1];
	+ ;
	+ return 0;
	+}
	+_ACEOF
	+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
	+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
	+do
	+ CC="$ac_save_CC $ac_arg"
	+ if ac_fn_c_try_compile "$LINENO"; then :
	+ ac_cv_prog_cc_c89=$ac_arg
	+fi
	+rm -f core conftest.err conftest.$ac_objext
	+ test "x$ac_cv_prog_cc_c89" != "xno" && break
	+done
	+rm -f conftest.$ac_ext
	+CC=$ac_save_CC
	+
	+fi
	+# AC_CACHE_VAL
	+case "x$ac_cv_prog_cc_c89" in
	+ x)
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5
	+$as_echo "none needed" >&6; } ;;
	+ xno)
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5
	+$as_echo "unsupported" >&6; } ;;
	+ *)
	+ CC="$CC $ac_cv_prog_cc_c89"
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5
	+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;;
	+esac
	+if test "x$ac_cv_prog_cc_c89" != xno; then :
	+
	+fi
	+
	+ac_ext=c
	+ac_cpp='$CPP $CPPFLAGS'
	+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
	+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
	+ac_compiler_gnu=$ac_cv_c_compiler_gnu
	+DEPDIR="${am__leading_dot}deps"
	+
	+ac_config_commands="$ac_config_commands depfiles"
	+
	+
	+am_make=${MAKE-make}
	+cat > confinc << 'END'
	+am__doit:
	+ @echo this is the am__doit target
	+.PHONY: am__doit
	+END
	+# If we don't find an include directive, just comment out the code.
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
	+$as_echo_n "checking for style of include used by $am_make... " >&6; }
	+am__include="#"
	+am__quote=
	+_am_result=none
	+# First try GNU make style include.
	+echo "include confinc" > confmf
	+# Ignore all kinds of additional output from `make'.
	+case `$am_make -s -f confmf 2> /dev/null` in #(
	+the\ am__doit\ target)
	+ am__include=include
	+ am__quote=
	+ _am_result=GNU
	+ ;;
	+esac
	+# Now try BSD make style include.
	+if test "$am__include" = "#"; then
	+ echo '.include "confinc"' > confmf
	+ case `$am_make -s -f confmf 2> /dev/null` in #(
	+ the\ am__doit\ target)
	+ am__include=.include
	+ am__quote="\""
	+ _am_result=BSD
	+ ;;
	+ esac
	+fi
	+
	+
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
	+$as_echo "$_am_result" >&6; }
	+rm -f confinc confmf
	+
	+# Check whether --enable-dependency-tracking was given.
	+if test "${enable_dependency_tracking+set}" = set; then :
	+ enableval=$enable_dependency_tracking;
	+fi
	+
	+if test "x$enable_dependency_tracking" != xno; then
	+ am_depcomp="$ac_aux_dir/depcomp"
	+ AMDEPBACKSLASH='\'
	+ am__nodep='_no'
	+fi
	+ if test "x$enable_dependency_tracking" != xno; then
	+ AMDEP_TRUE=
	+ AMDEP_FALSE='#'
	+else
	+ AMDEP_TRUE='#'
	+ AMDEP_FALSE=
	+fi
	+
	+
	+
	+depcc="$CC" am_compiler_list=
	+
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
	+$as_echo_n "checking dependency style of $depcc... " >&6; }
	+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
	+ $as_echo_n "(cached) " >&6
	+else
	+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
	+ # We make a subdir and do the tests there. Otherwise we can end up
	+ # making bogus files that we don't know about and never remove. For
	+ # instance it was reported that on HP-UX the gcc test will end up
	+ # making a dummy file named `D' -- because `-MD' means `put the output
	+ # in D'.
	+ rm -rf conftest.dir
	+ mkdir conftest.dir
	+ # Copy depcomp to subdir because otherwise we won't find it if we're
	+ # using a relative directory.
	+ cp "$am_depcomp" conftest.dir
	+ cd conftest.dir
	+ # We will build objects and dependencies in a subdirectory because
	+ # it helps to detect inapplicable dependency modes. For instance
	+ # both Tru64's cc and ICC support -MD to output dependencies as a
	+ # side effect of compilation, but ICC will put the dependencies in
	+ # the current directory while Tru64 will put them in the object
	+ # directory.
	+ mkdir sub
	+
	+ am_cv_CC_dependencies_compiler_type=none
	+ if test "$am_compiler_list" = ""; then
	+ am_compiler_list=`sed -n 's/^#$[a-zA-Z0-9]$)$/\1/p' < ./depcomp`
	+ fi
	+ am__universal=false
	+ case " $depcc " in #(
	+ \ -arch\ \ -arch\ *) am__universal=true ;;
	+ esac
	+
	+ for depmode in $am_compiler_list; do
	+ # Setup a source with many dependencies, because some compilers
	+ # like to wrap large dependency lists on column 80 (with \), and
	+ # we should not choose a depcomp mode which is confused by this.
	+ #
	+ # We need to recreate these files for each test, as the compiler may
	+ # overwrite some of them when testing with obscure command lines.
	+ # This happens at least with the AIX C compiler.
	+ : > sub/conftest.c
	+ for i in 1 2 3 4 5 6; do
	+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
	+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
	+ # Solaris 8's {/usr,}/bin/sh.
	+ touch sub/conftst$i.h
	+ done
	+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
	+
	+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
	+ # mode. It turns out that the SunPro C++ compiler does not properly
	+ # handle `-M -o', and we need to detect this. Also, some Intel
	+ # versions had trouble with output in subdirs
	+ am__obj=sub/conftest.${OBJEXT-o}
	+ am__minus_obj="-o $am__obj"
	+ case $depmode in
	+ gcc)
	+ # This depmode causes a compiler race in universal mode.
	+ test "$am__universal" = false \|\| continue
	+ ;;
	+ nosideeffect)
	+ # after this tag, mechanisms are not by side-effect, so they'll
	+ # only be used when explicitly requested
	+ if test "x$enable_dependency_tracking" = xyes; then
	+ continue
	+ else
	+ break
	+ fi
	+ ;;
	+ msvc7 \| msvc7msys \| msvisualcpp \| msvcmsys)
	+ # This compiler won't grok `-c -o', but also, the minuso test has
	+ # not run yet. These depmodes are late enough in the game, and
	+ # so weak that their functioning should not be impacted.
	+ am__obj=conftest.${OBJEXT-o}
	+ am__minus_obj=
	+ ;;
	+ none) break ;;
	+ esac
	+ if depmode=$depmode \
	+ source=sub/conftest.c object=$am__obj \
	+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
	+ $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
	+ >/dev/null 2>conftest.err &&
	+ grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
	+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
	+ grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
	+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
	+ # icc doesn't choke on unknown options, it will just issue warnings
	+ # or remarks (even with -Werror). So we grep stderr for any message
	+ # that says an option was ignored or not supported.
	+ # When given -MP, icc 7.0 and 7.1 complain thusly:
	+ # icc: Command line warning: ignoring option '-M'; no argument required
	+ # The diagnosis changed in icc 8.0:
	+ # icc: Command line remark: option '-MP' not supported
	+ if (grep 'ignoring option' conftest.err \|\|
	+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
	+ am_cv_CC_dependencies_compiler_type=$depmode
	+ break
	+ fi
	+ fi
	+ done
	+
	+ cd ..
	+ rm -rf conftest.dir
	+else
	+ am_cv_CC_dependencies_compiler_type=none
	+fi
	+
	+fi
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
	+$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
	+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
	+
	+ if
	+ test "x$enable_dependency_tracking" != xno \
	+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
	+ am__fastdepCC_TRUE=
	+ am__fastdepCC_FALSE='#'
	+else
	+ am__fastdepCC_TRUE='#'
	+ am__fastdepCC_FALSE=
	+fi
	+
	+
	+if test "x$CC" != xcc; then
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5
	+$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; }
	+else
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5
	+$as_echo_n "checking whether cc understands -c and -o together... " >&6; }
	+fi
	+set dummy $CC; ac_cc=`$as_echo "$2" \|
	+ sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
	+if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
	+ $as_echo_n "(cached) " >&6
	+else
	+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	+/* end confdefs.h. */
	+
	+int
	+main ()
	+{
	+
	+ ;
	+ return 0;
	+}
	+_ACEOF
	+# Make sure it works both with $CC and with simple cc.
	+# We do the test twice because some compilers refuse to overwrite an
	+# existing .o file with -o, though they will create one.
	+ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
	+rm -f conftest2.*
	+if { { case "(($ac_try" in
	+ \" \| \` \| \\) ac_try_echo=\$ac_try;;
	+ *) ac_try_echo=$ac_try;;
	+esac
	+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
	+$as_echo "$ac_try_echo"; } >&5
	+ (eval "$ac_try") 2>&5
	+ ac_status=$?
	+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
	+ test $ac_status = 0; } &&
	+ test -f conftest2.$ac_objext && { { case "(($ac_try" in
	+ \" \| \` \| \\) ac_try_echo=\$ac_try;;
	+ *) ac_try_echo=$ac_try;;
	+esac
	+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
	+$as_echo "$ac_try_echo"; } >&5
	+ (eval "$ac_try") 2>&5
	+ ac_status=$?
	+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
	+ test $ac_status = 0; };
	+then
	+ eval ac_cv_prog_cc_${ac_cc}_c_o=yes
	+ if test "x$CC" != xcc; then
	+ # Test first that cc exists at all.
	+ if { ac_try='cc -c conftest.$ac_ext >&5'
	+ { { case "(($ac_try" in
	+ \" \| \` \| \\) ac_try_echo=\$ac_try;;
	+ *) ac_try_echo=$ac_try;;
	+esac
	+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
	+$as_echo "$ac_try_echo"; } >&5
	+ (eval "$ac_try") 2>&5
	+ ac_status=$?
	+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
	+ test $ac_status = 0; }; }; then
	+ ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
	+ rm -f conftest2.*
	+ if { { case "(($ac_try" in
	+ \" \| \` \| \\) ac_try_echo=\$ac_try;;
	+ *) ac_try_echo=$ac_try;;
	+esac
	+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
	+$as_echo "$ac_try_echo"; } >&5
	+ (eval "$ac_try") 2>&5
	+ ac_status=$?
	+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
	+ test $ac_status = 0; } &&
	+ test -f conftest2.$ac_objext && { { case "(($ac_try" in
	+ \" \| \` \| \\) ac_try_echo=\$ac_try;;
	+ *) ac_try_echo=$ac_try;;
	+esac
	+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
	+$as_echo "$ac_try_echo"; } >&5
	+ (eval "$ac_try") 2>&5
	+ ac_status=$?
	+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
	+ test $ac_status = 0; };
	+ then
	+ # cc works too.
	+ :
	+ else
	+ # cc exists but doesn't like -o.
	+ eval ac_cv_prog_cc_${ac_cc}_c_o=no
	+ fi
	+ fi
	+ fi
	+else
	+ eval ac_cv_prog_cc_${ac_cc}_c_o=no
	+fi
	+rm -f core conftest*
	+
	+fi
	+if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
	+$as_echo "yes" >&6; }
	+else
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	+$as_echo "no" >&6; }
	+
	+$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
	+
	+fi
	+
	+# FIXME: we rely on the cache variable name because
	+# there is no other way.
	+set dummy $CC
	+am_cc=`echo $2 \| sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
	+eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o
	+if test "$am_t" != yes; then
	+ # Losing compiler, so override with the script.
	+ # FIXME: It is wrong to rewrite CC.
	+ # But if we don't then we get into trouble of one sort or another.
	+ # A longer-term fix would be to have automake use am__CC in this case,
	+ # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)"
	+ CC="$am_aux_dir/compile $CC"
	+fi
	+
	+
	+
	+# Checks for libraries.
	+##AC_CHECK_LIB([fuse],[fuse_main],,AC_MSG_ERROR([No FUSE library found! Get it from http://fuse.sourceforge.net/]))
	+#AC_CHECK_LIB([crypto],[SHA1_Init],,AC_MSG_ERROR([No CRYPTO library found! Get it from http://www.openssl.org/]))
	+
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libewf_open in -lewf" >&5
	+$as_echo_n "checking for libewf_open in -lewf... " >&6; }
	+if ${ac_cv_lib_ewf_libewf_open+:} false; then :
	+ $as_echo_n "(cached) " >&6
	+else
	+ ac_check_lib_save_LIBS=$LIBS
	+LIBS="-lewf $LIBS"
	+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	+/* end confdefs.h. */
	+
	+/* Override any GCC internal prototype to avoid an error.
	+ Use char because int might match the return type of a GCC
	+ builtin and then its argument prototype would still apply. */
	+#ifdef __cplusplus
	+extern "C"
	+#endif
	+char libewf_open ();
	+int
	+main ()
	+{
	+return libewf_open ();
	+ ;
	+ return 0;
	+}
	+_ACEOF
	+if ac_fn_c_try_link "$LINENO"; then :
	+ ac_cv_lib_ewf_libewf_open=yes
	+else
	+ ac_cv_lib_ewf_libewf_open=no
	+fi
	+rm -f core conftest.err conftest.$ac_objext \
	+ conftest$ac_exeext conftest.$ac_ext
	+LIBS=$ac_check_lib_save_LIBS
	+fi
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ewf_libewf_open" >&5
	+$as_echo "$ac_cv_lib_ewf_libewf_open" >&6; }
	+if test "x$ac_cv_lib_ewf_libewf_open" = xyes; then :
	+ cat >>confdefs.h <<_ACEOF
	+#define HAVE_LIBEWF 1
	+_ACEOF
	+
	+ LIBS="-lewf $LIBS"
	+
	+else
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No EWF library found! EWF input support will be disabled." >&5
	+$as_echo "$as_me: WARNING: No EWF library found! EWF input support will be disabled." >&2;}
	+fi
	+
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for af_open in -lafflib" >&5
	+$as_echo_n "checking for af_open in -lafflib... " >&6; }
	+if ${ac_cv_lib_afflib_af_open+:} false; then :
	+ $as_echo_n "(cached) " >&6
	+else
	+ ac_check_lib_save_LIBS=$LIBS
	+LIBS="-lafflib $LIBS"
	+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	+/* end confdefs.h. */
	+
	+/* Override any GCC internal prototype to avoid an error.
	+ Use char because int might match the return type of a GCC
	+ builtin and then its argument prototype would still apply. */
	+#ifdef __cplusplus
	+extern "C"
	+#endif
	+char af_open ();
	+int
	+main ()
	+{
	+return af_open ();
	+ ;
	+ return 0;
	+}
	+_ACEOF
	+if ac_fn_c_try_link "$LINENO"; then :
	+ ac_cv_lib_afflib_af_open=yes
	+else
	+ ac_cv_lib_afflib_af_open=no
	+fi
	+rm -f core conftest.err conftest.$ac_objext \
	+ conftest$ac_exeext conftest.$ac_ext
	+LIBS=$ac_check_lib_save_LIBS
	+fi
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_afflib_af_open" >&5
	+$as_echo "$ac_cv_lib_afflib_af_open" >&6; }
	+if test "x$ac_cv_lib_afflib_af_open" = xyes; then :
	+ cat >>confdefs.h <<_ACEOF
	+#define HAVE_LIBAFFLIB 1
	+_ACEOF
	+
	+ LIBS="-lafflib $LIBS"
	+
	+else
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No AFF library found! AFF input support will be disabled." >&5
	+$as_echo "$as_me: WARNING: No AFF library found! AFF input support will be disabled." >&2;}
	+fi
	+
	+
	+# Checks for header files.
	+ac_ext=c
	+ac_cpp='$CPP $CPPFLAGS'
	+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
	+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
	+ac_compiler_gnu=$ac_cv_c_compiler_gnu
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5
	+$as_echo_n "checking how to run the C preprocessor... " >&6; }
	+# On Suns, sometimes $CPP names a directory.
	+if test -n "$CPP" && test -d "$CPP"; then
	+ CPP=
	+fi
	+if test -z "$CPP"; then
	+ if ${ac_cv_prog_CPP+:} false; then :
	+ $as_echo_n "(cached) " >&6
	+else
	+ # Double quotes because CPP needs to be expanded
	+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
	+ do
	+ ac_preproc_ok=false
	+for ac_c_preproc_warn_flag in '' yes
	+do
	+ # Use a header file that comes with gcc, so configuring glibc
	+ # with a fresh cross-compiler works.
	+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
	+ # <limits.h> exists even on freestanding compilers.
	+ # On the NeXT, cc -E runs the code through the compiler's parser,
	+ # not just through cpp. "Syntax error" is here to catch this case.
	+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	+/* end confdefs.h. */
	+#ifdef __STDC__
	+# include <limits.h>
	+#else
	+# include <assert.h>
	+#endif
	+ Syntax error
	+_ACEOF
	+if ac_fn_c_try_cpp "$LINENO"; then :
	+
	+else
	+ # Broken: fails on valid input.
	+continue
	+fi
	+rm -f conftest.err conftest.i conftest.$ac_ext
	+
	+ # OK, works on sane cases. Now check whether nonexistent headers
	+ # can be detected and how.
	+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	+/* end confdefs.h. */
	+#include <ac_nonexistent.h>
	+_ACEOF
	+if ac_fn_c_try_cpp "$LINENO"; then :
	+ # Broken: success on invalid input.
	+continue
	+else
	+ # Passes both tests.
	+ac_preproc_ok=:
	+break
	+fi
	+rm -f conftest.err conftest.i conftest.$ac_ext
	+
	+done
	+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
	+rm -f conftest.i conftest.err conftest.$ac_ext
	+if $ac_preproc_ok; then :
	+ break
	+fi
	+
	+ done
	+ ac_cv_prog_CPP=$CPP
	+
	+fi
	+ CPP=$ac_cv_prog_CPP
	+else
	+ ac_cv_prog_CPP=$CPP
	+fi
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5
	+$as_echo "$CPP" >&6; }
	+ac_preproc_ok=false
	+for ac_c_preproc_warn_flag in '' yes
	+do
	+ # Use a header file that comes with gcc, so configuring glibc
	+ # with a fresh cross-compiler works.
	+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
	+ # <limits.h> exists even on freestanding compilers.
	+ # On the NeXT, cc -E runs the code through the compiler's parser,
	+ # not just through cpp. "Syntax error" is here to catch this case.
	+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	+/* end confdefs.h. */
	+#ifdef __STDC__
	+# include <limits.h>
	+#else
	+# include <assert.h>
	+#endif
	+ Syntax error
	+_ACEOF
	+if ac_fn_c_try_cpp "$LINENO"; then :
	+
	+else
	+ # Broken: fails on valid input.
	+continue
	+fi
	+rm -f conftest.err conftest.i conftest.$ac_ext
	+
	+ # OK, works on sane cases. Now check whether nonexistent headers
	+ # can be detected and how.
	+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	+/* end confdefs.h. */
	+#include <ac_nonexistent.h>
	+_ACEOF
	+if ac_fn_c_try_cpp "$LINENO"; then :
	+ # Broken: success on invalid input.
	+continue
	+else
	+ # Passes both tests.
	+ac_preproc_ok=:
	+break
	+fi
	+rm -f conftest.err conftest.i conftest.$ac_ext
	+
	+done
	+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
	+rm -f conftest.i conftest.err conftest.$ac_ext
	+if $ac_preproc_ok; then :
	+
	+else
	+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
	+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
	+as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
	+See \`config.log' for more details" "$LINENO" 5; }
	+fi
	+
	+ac_ext=c
	+ac_cpp='$CPP $CPPFLAGS'
	+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
	+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
	+ac_compiler_gnu=$ac_cv_c_compiler_gnu
	+
	+
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
	+$as_echo_n "checking for grep that handles long lines and -e... " >&6; }
	+if ${ac_cv_path_GREP+:} false; then :
	+ $as_echo_n "(cached) " >&6
	+else
	+ if test -z "$GREP"; then
	+ ac_path_GREP_found=false
	+ # Loop through the user's path and test for each of PROGNAME-LIST
	+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
	+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
	+do
	+ IFS=$as_save_IFS
	+ test -z "$as_dir" && as_dir=.
	+ for ac_prog in grep ggrep; do
	+ for ac_exec_ext in '' $ac_executable_extensions; do
	+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
	+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } \|\| continue
	+# Check for GNU ac_path_GREP and select it if it is found.
	+ # Check for GNU $ac_path_GREP
	+case `"$ac_path_GREP" --version 2>&1` in
	+GNU)
	+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
	+*)
	+ ac_count=0
	+ $as_echo_n 0123456789 >"conftest.in"
	+ while :
	+ do
	+ cat "conftest.in" "conftest.in" >"conftest.tmp"
	+ mv "conftest.tmp" "conftest.in"
	+ cp "conftest.in" "conftest.nl"
	+ $as_echo 'GREP' >> "conftest.nl"
	+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null \|\| break
	+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 \|\| break
	+ as_fn_arith $ac_count + 1 && ac_count=$as_val
	+ if test $ac_count -gt ${ac_path_GREP_max-0}; then
	+ # Best one so far, save it but keep looking for a better one
	+ ac_cv_path_GREP="$ac_path_GREP"
	+ ac_path_GREP_max=$ac_count
	+ fi
	+ # 10*(2^10) chars as input seems more than enough
	+ test $ac_count -gt 10 && break
	+ done
	+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
	+esac
	+
	+ $ac_path_GREP_found && break 3
	+ done
	+ done
	+ done
	+IFS=$as_save_IFS
	+ if test -z "$ac_cv_path_GREP"; then
	+ as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
	+ fi
	+else
	+ ac_cv_path_GREP=$GREP
	+fi
	+
	+fi
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
	+$as_echo "$ac_cv_path_GREP" >&6; }
	+ GREP="$ac_cv_path_GREP"
	+
	+
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
	+$as_echo_n "checking for egrep... " >&6; }
	+if ${ac_cv_path_EGREP+:} false; then :
	+ $as_echo_n "(cached) " >&6
	+else
	+ if echo a \| $GREP -E '(a\|b)' >/dev/null 2>&1
	+ then ac_cv_path_EGREP="$GREP -E"
	+ else
	+ if test -z "$EGREP"; then
	+ ac_path_EGREP_found=false
	+ # Loop through the user's path and test for each of PROGNAME-LIST
	+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
	+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
	+do
	+ IFS=$as_save_IFS
	+ test -z "$as_dir" && as_dir=.
	+ for ac_prog in egrep; do
	+ for ac_exec_ext in '' $ac_executable_extensions; do
	+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
	+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } \|\| continue
	+# Check for GNU ac_path_EGREP and select it if it is found.
	+ # Check for GNU $ac_path_EGREP
	+case `"$ac_path_EGREP" --version 2>&1` in
	+GNU)
	+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
	+*)
	+ ac_count=0
	+ $as_echo_n 0123456789 >"conftest.in"
	+ while :
	+ do
	+ cat "conftest.in" "conftest.in" >"conftest.tmp"
	+ mv "conftest.tmp" "conftest.in"
	+ cp "conftest.in" "conftest.nl"
	+ $as_echo 'EGREP' >> "conftest.nl"
	+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null \|\| break
	+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 \|\| break
	+ as_fn_arith $ac_count + 1 && ac_count=$as_val
	+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then
	+ # Best one so far, save it but keep looking for a better one
	+ ac_cv_path_EGREP="$ac_path_EGREP"
	+ ac_path_EGREP_max=$ac_count
	+ fi
	+ # 10*(2^10) chars as input seems more than enough
	+ test $ac_count -gt 10 && break
	+ done
	+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
	+esac
	+
	+ $ac_path_EGREP_found && break 3
	+ done
	+ done
	+ done
	+IFS=$as_save_IFS
	+ if test -z "$ac_cv_path_EGREP"; then
	+ as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
	+ fi
	+else
	+ ac_cv_path_EGREP=$EGREP
	+fi
	+
	+ fi
	+fi
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
	+$as_echo "$ac_cv_path_EGREP" >&6; }
	+ EGREP="$ac_cv_path_EGREP"
	+
	+
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
	+$as_echo_n "checking for ANSI C header files... " >&6; }
	+if ${ac_cv_header_stdc+:} false; then :
	+ $as_echo_n "(cached) " >&6
	+else
	+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	+/* end confdefs.h. */
	+#include <stdlib.h>
	+#include <stdarg.h>
	+#include <string.h>
	+#include <float.h>
	+
	+int
	+main ()
	+{
	+
	+ ;
	+ return 0;
	+}
	+_ACEOF
	+if ac_fn_c_try_compile "$LINENO"; then :
	+ ac_cv_header_stdc=yes
	+else
	+ ac_cv_header_stdc=no
	+fi
	+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
	+
	+if test $ac_cv_header_stdc = yes; then
	+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
	+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	+/* end confdefs.h. */
	+#include <string.h>
	+
	+_ACEOF
	+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 \|
	+ $EGREP "memchr" >/dev/null 2>&1; then :
	+
	+else
	+ ac_cv_header_stdc=no
	+fi
	+rm -f conftest*
	+
	+fi
	+
	+if test $ac_cv_header_stdc = yes; then
	+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
	+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	+/* end confdefs.h. */
	+#include <stdlib.h>
	+
	+_ACEOF
	+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 \|
	+ $EGREP "free" >/dev/null 2>&1; then :
	+
	+else
	+ ac_cv_header_stdc=no
	+fi
	+rm -f conftest*
	+
	+fi
	+
	+if test $ac_cv_header_stdc = yes; then
	+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
	+ if test "$cross_compiling" = yes; then :
	+ :
	+else
	+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	+/* end confdefs.h. */
	+#include <ctype.h>
	+#include <stdlib.h>
	+#if ((' ' & 0x0FF) == 0x020)
	+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
	+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
	+#else
	+# define ISLOWER(c) \
	+ (('a' <= (c) && (c) <= 'i') \
	+ \|\| ('j' <= (c) && (c) <= 'r') \
	+ \|\| ('s' <= (c) && (c) <= 'z'))
	+# define TOUPPER(c) (ISLOWER(c) ? ((c) \| 0x40) : (c))
	+#endif
	+
	+#define XOR(e, f) (((e) && !(f)) \|\| (!(e) && (f)))
	+int
	+main ()
	+{
	+ int i;
	+ for (i = 0; i < 256; i++)
	+ if (XOR (islower (i), ISLOWER (i))
	+ \|\| toupper (i) != TOUPPER (i))
	+ return 2;
	+ return 0;
	+}
	+_ACEOF
	+if ac_fn_c_try_run "$LINENO"; then :
	+
	+else
	+ ac_cv_header_stdc=no
	+fi
	+rm -f core .core core.conftest. gmon.out bb.out conftest$ac_exeext \
	+ conftest.$ac_objext conftest.beam conftest.$ac_ext
	+fi
	+
	+fi
	+fi
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
	+$as_echo "$ac_cv_header_stdc" >&6; }
	+if test $ac_cv_header_stdc = yes; then
	+
	+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
	+
	+fi
	+
	+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
	+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
	+ inttypes.h stdint.h unistd.h
	+do :
	+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" \| $as_tr_sh`
	+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
	+"
	+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
	+ cat >>confdefs.h <<_ACEOF
	+#define `$as_echo "HAVE_$ac_header" \| $as_tr_cpp` 1
	+_ACEOF
	+
	+fi
	+
	+done
	+
	+
	+ac_fn_c_check_header_mongrel "$LINENO" "stdio.h" "ac_cv_header_stdio_h" "$ac_includes_default"
	+if test "x$ac_cv_header_stdio_h" = xyes; then :
	+
	+else
	+ as_fn_error $? "No stdio.h header file found!" "$LINENO" 5
	+fi
	+
	+
	+ac_fn_c_check_header_mongrel "$LINENO" "string.h" "ac_cv_header_string_h" "$ac_includes_default"
	+if test "x$ac_cv_header_string_h" = xyes; then :
	+
	+else
	+ as_fn_error $? "No string.h header file found!" "$LINENO" 5
	+fi
	+
	+
	+ac_fn_c_check_header_mongrel "$LINENO" "fcntl.h" "ac_cv_header_fcntl_h" "$ac_includes_default"
	+if test "x$ac_cv_header_fcntl_h" = xyes; then :
	+
	+else
	+ as_fn_error $? "No fcntl.h header file found!" "$LINENO" 5
	+fi
	+
	+
	+ac_fn_c_check_header_mongrel "$LINENO" "errno.h" "ac_cv_header_errno_h" "$ac_includes_default"
	+if test "x$ac_cv_header_errno_h" = xyes; then :
	+
	+else
	+ as_fn_error $? "No errno.h header file found!" "$LINENO" 5
	+fi
	+
	+
	+#AC_CHECK_HEADER([inttypes.h],,AC_MSG_ERROR([No inttypes.h header file found!]))
	+ac_fn_c_check_header_mongrel "$LINENO" "stdint.h" "ac_cv_header_stdint_h" "$ac_includes_default"
	+if test "x$ac_cv_header_stdint_h" = xyes; then :
	+
	+else
	+ as_fn_error $? "No stdint.h header file found!" "$LINENO" 5
	+fi
	+
	+
	+ac_fn_c_check_header_mongrel "$LINENO" "unistd.h" "ac_cv_header_unistd_h" "$ac_includes_default"
	+if test "x$ac_cv_header_unistd_h" = xyes; then :
	+
	+else
	+ as_fn_error $? "No unistd.h header file found!" "$LINENO" 5
	+fi
	+
	+
	+ac_fn_c_check_header_mongrel "$LINENO" "sys/ioctl.h" "ac_cv_header_sys_ioctl_h" "$ac_includes_default"
	+if test "x$ac_cv_header_sys_ioctl_h" = xyes; then :
	+
	+else
	+ as_fn_error $? "No sys/ioctl.h header file found!" "$LINENO" 5
	+fi
	+
	+
	+ac_fn_c_check_header_mongrel "$LINENO" "linux/fs.h" "ac_cv_header_linux_fs_h" "$ac_includes_default"
	+if test "x$ac_cv_header_linux_fs_h" = xyes; then :
	+
	+else
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No linux/fs.h header file found! If not building on Linux this can be ignored." >&5
	+$as_echo "$as_me: WARNING: No linux/fs.h header file found! If not building on Linux this can be ignored." >&2;}
	+fi
	+
	+
	+ac_fn_c_check_header_mongrel "$LINENO" "pthread.h" "ac_cv_header_pthread_h" "$ac_includes_default"
	+if test "x$ac_cv_header_pthread_h" = xyes; then :
	+
	+else
	+ as_fn_error $? "No pthread.h header file found!" "$LINENO" 5
	+fi
	+
	+
	+ac_fn_c_check_header_mongrel "$LINENO" "time.h" "ac_cv_header_time_h" "$ac_includes_default"
	+if test "x$ac_cv_header_time_h" = xyes; then :
	+
	+else
	+ as_fn_error $? "No time.h header file found!" "$LINENO" 5
	+fi
	+
	+
	+ac_fn_c_check_header_mongrel "$LINENO" "byteswap.h" "ac_cv_header_byteswap_h" "$ac_includes_default"
	+if test "x$ac_cv_header_byteswap_h" = xyes; then :
	+
	+else
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No byteswap.h header file found! If not building on Linux this can be ignored." >&5
	+$as_echo "$as_me: WARNING: No byteswap.h header file found! If not building on Linux this can be ignored." >&2;}
	+fi
	+
	+
	+ac_fn_c_check_header_mongrel "$LINENO" "endian.h" "ac_cv_header_endian_h" "$ac_includes_default"
	+if test "x$ac_cv_header_endian_h" = xyes; then :
	+
	+else
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No endian.h header file found! If not building on Linux this can be ignored." >&5
	+$as_echo "$as_me: WARNING: No endian.h header file found! If not building on Linux this can be ignored." >&2;}
	+fi
	+
	+
	+##AC_CHECK_HEADER([fuse/fuse.h],,AC_MSG_WARN([No fuse.h header file found! This could be a false positive!]))
	+
	+
	+
	+
	+
	+
	+
	+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
	+ if test -n "$ac_tool_prefix"; then
	+ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
	+set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
	+$as_echo_n "checking for $ac_word... " >&6; }
	+if ${ac_cv_path_PKG_CONFIG+:} false; then :
	+ $as_echo_n "(cached) " >&6
	+else
	+ case $PKG_CONFIG in
	+ [\\/]* \| ?:[\\/]*)
	+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
	+ ;;
	+ *)
	+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
	+for as_dir in $PATH
	+do
	+ IFS=$as_save_IFS
	+ test -z "$as_dir" && as_dir=.
	+ for ac_exec_ext in '' $ac_executable_extensions; do
	+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
	+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
	+ break 2
	+ fi
	+done
	+ done
	+IFS=$as_save_IFS
	+
	+ ;;
	+esac
	+fi
	+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
	+if test -n "$PKG_CONFIG"; then
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
	+$as_echo "$PKG_CONFIG" >&6; }
	+else
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	+$as_echo "no" >&6; }
	+fi
	+
	+
	+fi
	+if test -z "$ac_cv_path_PKG_CONFIG"; then
	+ ac_pt_PKG_CONFIG=$PKG_CONFIG
	+ # Extract the first word of "pkg-config", so it can be a program name with args.
	+set dummy pkg-config; ac_word=$2
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
	+$as_echo_n "checking for $ac_word... " >&6; }
	+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
	+ $as_echo_n "(cached) " >&6
	+else
	+ case $ac_pt_PKG_CONFIG in
	+ [\\/]* \| ?:[\\/]*)
	+ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
	+ ;;
	+ *)
	+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
	+for as_dir in $PATH
	+do
	+ IFS=$as_save_IFS
	+ test -z "$as_dir" && as_dir=.
	+ for ac_exec_ext in '' $ac_executable_extensions; do
	+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
	+ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
	+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
	+ break 2
	+ fi
	+done
	+ done
	+IFS=$as_save_IFS
	+
	+ ;;
	+esac
	+fi
	+ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
	+if test -n "$ac_pt_PKG_CONFIG"; then
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
	+$as_echo "$ac_pt_PKG_CONFIG" >&6; }
	+else
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	+$as_echo "no" >&6; }
	+fi
	+
	+ if test "x$ac_pt_PKG_CONFIG" = x; then
	+ PKG_CONFIG=""
	+ else
	+ case $cross_compiling:$ac_tool_warned in
	+yes:)
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
	+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
	+ac_tool_warned=yes ;;
	+esac
	+ PKG_CONFIG=$ac_pt_PKG_CONFIG
	+ fi
	+else
	+ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
	+fi
	+
	+fi
	+if test -n "$PKG_CONFIG"; then
	+ _pkg_min_version=0.9.0
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
	+$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
	+ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
	+$as_echo "yes" >&6; }
	+ else
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	+$as_echo "no" >&6; }
	+ PKG_CONFIG=""
	+ fi
	+fi
	+
	+pkg_failed=no
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for fuse" >&5
	+$as_echo_n "checking for fuse... " >&6; }
	+
	+if test -n "$fuse_CFLAGS"; then
	+ pkg_cv_fuse_CFLAGS="$fuse_CFLAGS"
	+ elif test -n "$PKG_CONFIG"; then
	+ if test -n "$PKG_CONFIG" && \
	+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fuse\""; } >&5
	+ ($PKG_CONFIG --exists --print-errors "fuse") 2>&5
	+ ac_status=$?
	+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
	+ test $ac_status = 0; }; then
	+ pkg_cv_fuse_CFLAGS=`$PKG_CONFIG --cflags "fuse" 2>/dev/null`
	+ test "x$?" != "x0" && pkg_failed=yes
	+else
	+ pkg_failed=yes
	+fi
	+ else
	+ pkg_failed=untried
	+fi
	+if test -n "$fuse_LIBS"; then
	+ pkg_cv_fuse_LIBS="$fuse_LIBS"
	+ elif test -n "$PKG_CONFIG"; then
	+ if test -n "$PKG_CONFIG" && \
	+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"fuse\""; } >&5
	+ ($PKG_CONFIG --exists --print-errors "fuse") 2>&5
	+ ac_status=$?
	+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
	+ test $ac_status = 0; }; then
	+ pkg_cv_fuse_LIBS=`$PKG_CONFIG --libs "fuse" 2>/dev/null`
	+ test "x$?" != "x0" && pkg_failed=yes
	+else
	+ pkg_failed=yes
	+fi
	+ else
	+ pkg_failed=untried
	+fi
	+
	+
	+
	+if test $pkg_failed = yes; then
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	+$as_echo "no" >&6; }
	+
	+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
	+ _pkg_short_errors_supported=yes
	+else
	+ _pkg_short_errors_supported=no
	+fi
	+ if test $_pkg_short_errors_supported = yes; then
	+ fuse_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "fuse" 2>&1`
	+ else
	+ fuse_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "fuse" 2>&1`
	+ fi
	+ # Put the nasty error message in config.log where it belongs
	+ echo "$fuse_PKG_ERRORS" >&5
	+
	+ as_fn_error $? "Package requirements (fuse) were not met:
	+
	+$fuse_PKG_ERRORS
	+
	+Consider adjusting the PKG_CONFIG_PATH environment variable if you
	+installed software in a non-standard prefix.
	+
	+Alternatively, you may set the environment variables fuse_CFLAGS
	+and fuse_LIBS to avoid the need to call pkg-config.
	+See the pkg-config man page for more details." "$LINENO" 5
	+elif test $pkg_failed = untried; then
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
	+$as_echo "no" >&6; }
	+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
	+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
	+as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
	+is in your PATH or set the PKG_CONFIG environment variable to the full
	+path to pkg-config.
	+
	+Alternatively, you may set the environment variables fuse_CFLAGS
	+and fuse_LIBS to avoid the need to call pkg-config.
	+See the pkg-config man page for more details.
	+
	+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
	+See \`config.log' for more details" "$LINENO" 5; }
	+else
	+ fuse_CFLAGS=$pkg_cv_fuse_CFLAGS
	+ fuse_LIBS=$pkg_cv_fuse_LIBS
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
	+$as_echo "yes" >&6; }
	+
	+fi
	+ac_fn_c_check_header_mongrel "$LINENO" "libewf.h" "ac_cv_header_libewf_h" "$ac_includes_default"
	+if test "x$ac_cv_header_libewf_h" = xyes; then :
	+
	+else
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No libewf.h header file found! EWF input support will be disabled." >&5
	+$as_echo "$as_me: WARNING: No libewf.h header file found! EWF input support will be disabled." >&2;}
	+fi
	+
	+
	+ac_fn_c_check_header_mongrel "$LINENO" "afflib/afflib.h" "ac_cv_header_afflib_afflib_h" "$ac_includes_default"
	+if test "x$ac_cv_header_afflib_afflib_h" = xyes; then :
	+
	+else
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: No afflib.h header file found! AFF input support will be disabled." >&5
	+$as_echo "$as_me: WARNING: No afflib.h header file found! AFF input support will be disabled." >&2;}
	+fi
	+
	+
	+
	+# Checks for typedefs, structures, and compiler characteristics.
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for an ANSI C-conforming const" >&5
	+$as_echo_n "checking for an ANSI C-conforming const... " >&6; }
	+if ${ac_cv_c_const+:} false; then :
	+ $as_echo_n "(cached) " >&6
	+else
	+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	+/* end confdefs.h. */
	+
	+int
	+main ()
	+{
	+/* FIXME: Include the comments suggested by Paul. */
	+#ifndef __cplusplus
	+ /* Ultrix mips cc rejects this. */
	+ typedef int charset[2];
	+ const charset cs;
	+ /* SunOS 4.1.1 cc rejects this. */
	+ char const const pcpcc;
	+ char **ppc;
	+ /* NEC SVR4.0.2 mips cc rejects this. */
	+ struct point {int x, y;};
	+ static struct point const zero = {0,0};
	+ /* AIX XL C 1.02.0.0 rejects this.
	+ It does not let you subtract one const X* pointer from another in
	+ an arm of an if-expression whose if-part is not a constant
	+ expression */
	+ const char *g = "string";
	+ pcpcc = &g + (g ? g-g : 0);
	+ /* HPUX 7.0 cc rejects these. */
	+ ++pcpcc;
	+ ppc = (char**) pcpcc;
	+ pcpcc = (char const const ) ppc;
	+ { /* SCO 3.2v4 cc rejects this. */
	+ char *t;
	+ char const s = 0 ? (char ) 0 : (char const *) 0;
	+
	+ *t++ = 0;
	+ if (s) return 0;
	+ }
	+ { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */
	+ int x[] = {25, 17};
	+ const int *foo = &x[0];
	+ ++foo;
	+ }
	+ { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */
	+ typedef const int *iptr;
	+ iptr p = 0;
	+ ++p;
	+ }
	+ { /* AIX XL C 1.02.0.0 rejects this saying
	+ "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */
	+ struct s { int j; const int *ap[3]; };
	+ struct s *b; b->j = 5;
	+ }
	+ { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */
	+ const int foo = 10;
	+ if (!foo) return 0;
	+ }
	+ return !cs[0] && !zero.x;
	+#endif
	+
	+ ;
	+ return 0;
	+}
	+_ACEOF
	+if ac_fn_c_try_compile "$LINENO"; then :
	+ ac_cv_c_const=yes
	+else
	+ ac_cv_c_const=no
	+fi
	+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
	+fi
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_const" >&5
	+$as_echo "$ac_cv_c_const" >&6; }
	+if test $ac_cv_c_const = no; then
	+
	+$as_echo "#define const /**/" >>confdefs.h
	+
	+fi
	+
	+ac_fn_c_find_intX_t "$LINENO" "64" "ac_cv_c_int64_t"
	+case $ac_cv_c_int64_t in #(
	+ no\|yes) ;; #(
	+ *)
	+
	+cat >>confdefs.h <<_ACEOF
	+#define int64_t $ac_cv_c_int64_t
	+_ACEOF
	+;;
	+esac
	+
	+ac_fn_c_check_type "$LINENO" "off_t" "ac_cv_type_off_t" "$ac_includes_default"
	+if test "x$ac_cv_type_off_t" = xyes; then :
	+
	+else
	+
	+cat >>confdefs.h <<_ACEOF
	+#define off_t long int
	+_ACEOF
	+
	+fi
	+
	+ac_fn_c_check_type "$LINENO" "size_t" "ac_cv_type_size_t" "$ac_includes_default"
	+if test "x$ac_cv_type_size_t" = xyes; then :
	+
	+else
	+
	+cat >>confdefs.h <<_ACEOF
	+#define size_t unsigned int
	+_ACEOF
	+
	+fi
	+
	+ac_fn_c_check_type "$LINENO" "ssize_t" "ac_cv_type_ssize_t" "$ac_includes_default"
	+if test "x$ac_cv_type_ssize_t" = xyes; then :
	+
	+else
	+
	+cat >>confdefs.h <<_ACEOF
	+#define ssize_t int
	+_ACEOF
	+
	+fi
	+
	+ac_fn_c_find_uintX_t "$LINENO" "16" "ac_cv_c_uint16_t"
	+case $ac_cv_c_uint16_t in #(
	+ no\|yes) ;; #(
	+ *)
	+
	+
	+cat >>confdefs.h <<_ACEOF
	+#define uint16_t $ac_cv_c_uint16_t
	+_ACEOF
	+;;
	+ esac
	+
	+ac_fn_c_find_uintX_t "$LINENO" "32" "ac_cv_c_uint32_t"
	+case $ac_cv_c_uint32_t in #(
	+ no\|yes) ;; #(
	+ *)
	+
	+$as_echo "#define _UINT32_T 1" >>confdefs.h
	+
	+
	+cat >>confdefs.h <<_ACEOF
	+#define uint32_t $ac_cv_c_uint32_t
	+_ACEOF
	+;;
	+ esac
	+
	+ac_fn_c_find_uintX_t "$LINENO" "64" "ac_cv_c_uint64_t"
	+case $ac_cv_c_uint64_t in #(
	+ no\|yes) ;; #(
	+ *)
	+
	+$as_echo "#define _UINT64_T 1" >>confdefs.h
	+
	+
	+cat >>confdefs.h <<_ACEOF
	+#define uint64_t $ac_cv_c_uint64_t
	+_ACEOF
	+;;
	+ esac
	+
	+ac_fn_c_find_uintX_t "$LINENO" "8" "ac_cv_c_uint8_t"
	+case $ac_cv_c_uint8_t in #(
	+ no\|yes) ;; #(
	+ *)
	+
	+$as_echo "#define _UINT8_T 1" >>confdefs.h
	+
	+
	+cat >>confdefs.h <<_ACEOF
	+#define uint8_t $ac_cv_c_uint8_t
	+_ACEOF
	+;;
	+ esac
	+
	+
	+# Checks for library functions.
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGEFILE_SOURCE value needed for large files" >&5
	+$as_echo_n "checking for _LARGEFILE_SOURCE value needed for large files... " >&6; }
	+if ${ac_cv_sys_largefile_source+:} false; then :
	+ $as_echo_n "(cached) " >&6
	+else
	+ while :; do
	+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	+/* end confdefs.h. */
	+#include <sys/types.h> /* for off_t */
	+ #include <stdio.h>
	+int
	+main ()
	+{
	+int (fp) (FILE , off_t, int) = fseeko;
	+ return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
	+ ;
	+ return 0;
	+}
	+_ACEOF
	+if ac_fn_c_try_link "$LINENO"; then :
	+ ac_cv_sys_largefile_source=no; break
	+fi
	+rm -f core conftest.err conftest.$ac_objext \
	+ conftest$ac_exeext conftest.$ac_ext
	+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	+/* end confdefs.h. */
	+#define _LARGEFILE_SOURCE 1
	+#include <sys/types.h> /* for off_t */
	+ #include <stdio.h>
	+int
	+main ()
	+{
	+int (fp) (FILE , off_t, int) = fseeko;
	+ return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
	+ ;
	+ return 0;
	+}
	+_ACEOF
	+if ac_fn_c_try_link "$LINENO"; then :
	+ ac_cv_sys_largefile_source=1; break
	+fi
	+rm -f core conftest.err conftest.$ac_objext \
	+ conftest$ac_exeext conftest.$ac_ext
	+ ac_cv_sys_largefile_source=unknown
	+ break
	+done
	+fi
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_source" >&5
	+$as_echo "$ac_cv_sys_largefile_source" >&6; }
	+case $ac_cv_sys_largefile_source in #(
	+ no \| unknown) ;;
	+ *)
	+cat >>confdefs.h <<_ACEOF
	+#define _LARGEFILE_SOURCE $ac_cv_sys_largefile_source
	+_ACEOF
	+;;
	+esac
	+rm -rf conftest*
	+
	+# We used to try defining _XOPEN_SOURCE=500 too, to work around a bug
	+# in glibc 2.1.3, but that breaks too many other things.
	+# If you want fseeko and ftello with glibc, upgrade to a fixed glibc.
	+if test $ac_cv_sys_largefile_source != unknown; then
	+
	+$as_echo "#define HAVE_FSEEKO 1" >>confdefs.h
	+
	+fi
	+
	+if test $ac_cv_c_compiler_gnu = yes; then
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC needs -traditional" >&5
	+$as_echo_n "checking whether $CC needs -traditional... " >&6; }
	+if ${ac_cv_prog_gcc_traditional+:} false; then :
	+ $as_echo_n "(cached) " >&6
	+else
	+ ac_pattern="Autoconf.*'x'"
	+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	+/* end confdefs.h. */
	+#include <sgtty.h>
	+Autoconf TIOCGETP
	+_ACEOF
	+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 \|
	+ $EGREP "$ac_pattern" >/dev/null 2>&1; then :
	+ ac_cv_prog_gcc_traditional=yes
	+else
	+ ac_cv_prog_gcc_traditional=no
	+fi
	+rm -f conftest*
	+
	+
	+ if test $ac_cv_prog_gcc_traditional = no; then
	+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	+/* end confdefs.h. */
	+#include <termio.h>
	+Autoconf TCGETA
	+_ACEOF
	+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 \|
	+ $EGREP "$ac_pattern" >/dev/null 2>&1; then :
	+ ac_cv_prog_gcc_traditional=yes
	+fi
	+rm -f conftest*
	+
	+ fi
	+fi
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_gcc_traditional" >&5
	+$as_echo "$ac_cv_prog_gcc_traditional" >&6; }
	+ if test $ac_cv_prog_gcc_traditional = yes; then
	+ CC="$CC -traditional"
	+ fi
	+fi
	+
	+for ac_header in stdlib.h
	+do :
	+ ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
	+if test "x$ac_cv_header_stdlib_h" = xyes; then :
	+ cat >>confdefs.h <<_ACEOF
	+#define HAVE_STDLIB_H 1
	+_ACEOF
	+
	+fi
	+
	+done
	+
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5
	+$as_echo_n "checking for GNU libc compatible malloc... " >&6; }
	+if ${ac_cv_func_malloc_0_nonnull+:} false; then :
	+ $as_echo_n "(cached) " >&6
	+else
	+ if test "$cross_compiling" = yes; then :
	+ ac_cv_func_malloc_0_nonnull=no
	+else
	+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	+/* end confdefs.h. */
	+#if defined STDC_HEADERS \|\| defined HAVE_STDLIB_H
	+# include <stdlib.h>
	+#else
	+char *malloc ();
	+#endif
	+
	+int
	+main ()
	+{
	+return ! malloc (0);
	+ ;
	+ return 0;
	+}
	+_ACEOF
	+if ac_fn_c_try_run "$LINENO"; then :
	+ ac_cv_func_malloc_0_nonnull=yes
	+else
	+ ac_cv_func_malloc_0_nonnull=no
	+fi
	+rm -f core .core core.conftest. gmon.out bb.out conftest$ac_exeext \
	+ conftest.$ac_objext conftest.beam conftest.$ac_ext
	+fi
	+
	+fi
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5
	+$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; }
	+if test $ac_cv_func_malloc_0_nonnull = yes; then :
	+
	+$as_echo "#define HAVE_MALLOC 1" >>confdefs.h
	+
	+else
	+ $as_echo "#define HAVE_MALLOC 0" >>confdefs.h
	+
	+ case " $LIBOBJS " in
	+ " malloc.$ac_objext " ) ;;
	+ *) LIBOBJS="$LIBOBJS malloc.$ac_objext"
	+ ;;
	+esac
	+
	+
	+$as_echo "#define malloc rpl_malloc" >>confdefs.h
	+
	+fi
	+
	+
	+for ac_header in stdlib.h
	+do :
	+ ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
	+if test "x$ac_cv_header_stdlib_h" = xyes; then :
	+ cat >>confdefs.h <<_ACEOF
	+#define HAVE_STDLIB_H 1
	+_ACEOF
	+
	+fi
	+
	+done
	+
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible realloc" >&5
	+$as_echo_n "checking for GNU libc compatible realloc... " >&6; }
	+if ${ac_cv_func_realloc_0_nonnull+:} false; then :
	+ $as_echo_n "(cached) " >&6
	+else
	+ if test "$cross_compiling" = yes; then :
	+ ac_cv_func_realloc_0_nonnull=no
	+else
	+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
	+/* end confdefs.h. */
	+#if defined STDC_HEADERS \|\| defined HAVE_STDLIB_H
	+# include <stdlib.h>
	+#else
	+char *realloc ();
	+#endif
	+
	+int
	+main ()
	+{
	+return ! realloc (0, 0);
	+ ;
	+ return 0;
	+}
	+_ACEOF
	+if ac_fn_c_try_run "$LINENO"; then :
	+ ac_cv_func_realloc_0_nonnull=yes
	+else
	+ ac_cv_func_realloc_0_nonnull=no
	+fi
	+rm -f core .core core.conftest. gmon.out bb.out conftest$ac_exeext \
	+ conftest.$ac_objext conftest.beam conftest.$ac_ext
	+fi
	+
	+fi
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_realloc_0_nonnull" >&5
	+$as_echo "$ac_cv_func_realloc_0_nonnull" >&6; }
	+if test $ac_cv_func_realloc_0_nonnull = yes; then :
	+
	+$as_echo "#define HAVE_REALLOC 1" >>confdefs.h
	+
	+else
	+ $as_echo "#define HAVE_REALLOC 0" >>confdefs.h
	+
	+ case " $LIBOBJS " in
	+ " realloc.$ac_objext " ) ;;
	+ *) LIBOBJS="$LIBOBJS realloc.$ac_objext"
	+ ;;
	+esac
	+
	+
	+$as_echo "#define realloc rpl_realloc" >>confdefs.h
	+
	+fi
	+
	+
	+for ac_func in vprintf
	+do :
	+ ac_fn_c_check_func "$LINENO" "vprintf" "ac_cv_func_vprintf"
	+if test "x$ac_cv_func_vprintf" = xyes; then :
	+ cat >>confdefs.h <<_ACEOF
	+#define HAVE_VPRINTF 1
	+_ACEOF
	+
	+ac_fn_c_check_func "$LINENO" "_doprnt" "ac_cv_func__doprnt"
	+if test "x$ac_cv_func__doprnt" = xyes; then :
	+
	+$as_echo "#define HAVE_DOPRNT 1" >>confdefs.h
	+
	+fi
	+
	+fi
	+done
	+
	+
	+for ac_func in memset strrchr
	+do :
	+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" \| $as_tr_sh`
	+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
	+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
	+ cat >>confdefs.h <<_ACEOF
	+#define `$as_echo "HAVE_$ac_func" \| $as_tr_cpp` 1
	+_ACEOF
	+
	+fi
	+done
	+
	+
	+ac_config_files="$ac_config_files Makefile"
	+
	+cat >confcache <<\_ACEOF
	+# This file is a shell script that caches the results of configure
	+# tests run on this system so they can be shared between configure
	+# scripts and configure runs, see configure's option --config-cache.
	+# It is not useful on other systems. If it contains results you don't
	+# want to keep, you may remove or edit it.
	+#
	+# config.status only pays attention to the cache file if you give it
	+# the --recheck option to rerun configure.
	+#
	+# `ac_cv_env_foo' variables (set or unset) will be overridden when
	+# loading this file, other unset `ac_cv_foo' will be assigned the
	+# following values.
	+
	+_ACEOF
	+
	+# The following way of writing the cache mishandles newlines in values,
	+# but we know of no workaround that is simple, portable, and efficient.
	+# So, we kill variables containing newlines.
	+# Ultrix sh set writes to stderr and can't be redirected directly,
	+# and sets the high bit in the cache file unless we assign to the vars.
	+(
	+ for ac_var in `(set) 2>&1 \| sed -n 's/^$[a-zA-Z_][a-zA-Z0-9_]$=./\1/p'`; do
	+ eval ac_val=\$$ac_var
	+ case $ac_val in #(
	+ ${as_nl})
	+ case $ac_var in #(
	+ _cv_) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5
	+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;;
	+ esac
	+ case $ac_var in #(
	+ _ \| IFS \| as_nl) ;; #(
	+ BASH_ARGV \| BASH_SOURCE) eval $ac_var= ;; #(
	+ *) { eval $ac_var=; unset $ac_var;} ;;
	+ esac ;;
	+ esac
	+ done
	+
	+ (set) 2>&1 \|
	+ case $as_nl`(ac_space=' '; set) 2>&1` in #(
	+ ${as_nl}ac_space=\ )
	+ # `set' does not quote correctly, so add quotes: double-quote
	+ # substitution turns \\\\ into \\, and sed turns \\ into \.
	+ sed -n \
	+ "s/'/'\\\\''/g;
	+ s/^\$[_$as_cr_alnum]_cv_[_$as_cr_alnum]\$=\$.*\$/\\1='\\2'/p"
	+ ;; #(
	+ *)
	+ # `set' quotes correctly as required by POSIX, so do not add quotes.
	+ sed -n "/^[_$as_cr_alnum]_cv_[_$as_cr_alnum]=/p"
	+ ;;
	+ esac \|
	+ sort
	+) \|
	+ sed '
	+ /^ac_cv_env_/b end
	+ t clear
	+ :clear
	+ s/^$[^=]$=$.[{}].*$$/test "${\1+set}" = set \|\| &/
	+ t end
	+ s/^$[^=]$=$.$$/\1=${\1=\2}/
	+ :end' >>confcache
	+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
	+ if test -w "$cache_file"; then
	+ if test "x$cache_file" != "x/dev/null"; then
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
	+$as_echo "$as_me: updating cache $cache_file" >&6;}
	+ if test ! -f "$cache_file" \|\| test -h "$cache_file"; then
	+ cat confcache >"$cache_file"
	+ else
	+ case $cache_file in #(
	+ / \| ?:*)
	+ mv -f confcache "$cache_file"$$ &&
	+ mv -f "$cache_file"$$ "$cache_file" ;; #(
	+ *)
	+ mv -f confcache "$cache_file" ;;
	+ esac
	+ fi
	+ fi
	+ else
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
	+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
	+ fi
	+fi
	+rm -f confcache
	+
	+test "x$prefix" = xNONE && prefix=$ac_default_prefix
	+# Let make expand exec_prefix.
	+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
	+
	+DEFS=-DHAVE_CONFIG_H
	+
	+ac_libobjs=
	+ac_ltlibobjs=
	+U=
	+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
	+ # 1. Remove the extension, and $U if already installed.
	+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//'
	+ ac_i=`$as_echo "$ac_i" \| sed "$ac_script"`
	+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR
	+ # will be set to the directory where LIBOBJS objects are built.
	+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext"
	+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo'
	+done
	+LIBOBJS=$ac_libobjs
	+
	+LTLIBOBJS=$ac_ltlibobjs
	+
	+
	+ if test -n "$EXEEXT"; then
	+ am__EXEEXT_TRUE=
	+ am__EXEEXT_FALSE='#'
	+else
	+ am__EXEEXT_TRUE='#'
	+ am__EXEEXT_FALSE=
	+fi
	+
	+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
	+ as_fn_error $? "conditional \"AMDEP\" was never defined.
	+Usually this means the macro was only invoked conditionally." "$LINENO" 5
	+fi
	+if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
	+ as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
	+Usually this means the macro was only invoked conditionally." "$LINENO" 5
	+fi
	+
	+: "${CONFIG_STATUS=./config.status}"
	+ac_write_fail=0
	+ac_clean_files_save=$ac_clean_files
	+ac_clean_files="$ac_clean_files $CONFIG_STATUS"
	+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5
	+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;}
	+as_write_fail=0
	+cat >$CONFIG_STATUS <<_ASEOF \|\| as_write_fail=1
	+#! $SHELL
	+# Generated by $as_me.
	+# Run this file to recreate the current configuration.
	+# Compiler output produced by configure, useful for debugging
	+# configure, is in config.log if it exists.
	+
	+debug=false
	+ac_cs_recheck=false
	+ac_cs_silent=false
	+
	+SHELL=\${CONFIG_SHELL-$SHELL}
	+export SHELL
	+_ASEOF
	+cat >>$CONFIG_STATUS <<\_ASEOF \|\| as_write_fail=1
	+## -------------------- ##
	+## M4sh Initialization. ##
	+## -------------------- ##
	+
	+# Be more Bourne compatible
	+DUALCASE=1; export DUALCASE # for MKS sh
	+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
	+ emulate sh
	+ NULLCMD=:
	+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
	+ # is contrary to our usage. Disable this feature.
	+ alias -g '${1+"$@"}'='"$@"'
	+ setopt NO_GLOB_SUBST
	+else
	+ case `(set -o) 2>/dev/null` in #(
	+ posix) :
	+ set -o posix ;; #(
	+ *) :
	+ ;;
	+esac
	+fi
	+
	+
	+as_nl='
	+'
	+export as_nl
	+# Printing a long string crashes Solaris 7 /usr/bin/printf.
	+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
	+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
	+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
	+# Prefer a ksh shell builtin over an external printf program on Solaris,
	+# but without wasting forks for bash or zsh.
	+if test -z "$BASH_VERSION$ZSH_VERSION" \
	+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
	+ as_echo='print -r --'
	+ as_echo_n='print -rn --'
	+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
	+ as_echo='printf %s\n'
	+ as_echo_n='printf %s'
	+else
	+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
	+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
	+ as_echo_n='/usr/ucb/echo -n'
	+ else
	+ as_echo_body='eval expr "X$1" : "X\$.*\$"'
	+ as_echo_n_body='eval
	+ arg=$1;
	+ case $arg in #(
	+ "$as_nl")
	+ expr "X$arg" : "X\$.*\$$as_nl";
	+ arg=`expr "X$arg" : ".$as_nl\$.\$"`;;
	+ esac;
	+ expr "X$arg" : "X\$.*\$" \| tr -d "$as_nl"
	+ '
	+ export as_echo_n_body
	+ as_echo_n='sh -c $as_echo_n_body as_echo'
	+ fi
	+ export as_echo_body
	+ as_echo='sh -c $as_echo_body as_echo'
	+fi
	+
	+# The user is always right.
	+if test "${PATH_SEPARATOR+set}" != set; then
	+ PATH_SEPARATOR=:
	+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
	+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 \|\|
	+ PATH_SEPARATOR=';'
	+ }
	+fi
	+
	+
	+# IFS
	+# We need space, tab and new line, in precisely that order. Quoting is
	+# there to prevent editors from complaining about space-tab.
	+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
	+# splitting by setting IFS to empty value.)
	+IFS=" "" $as_nl"
	+
	+# Find who we are. Look in the path if we contain no directory separator.
	+as_myself=
	+case $0 in #((
	+ [\\/] ) as_myself=$0 ;;
	+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
	+for as_dir in $PATH
	+do
	+ IFS=$as_save_IFS
	+ test -z "$as_dir" && as_dir=.
	+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
	+ done
	+IFS=$as_save_IFS
	+
	+ ;;
	+esac
	+# We did not find ourselves, most probably we were run as `sh COMMAND'
	+# in which case we are not to be found in the path.
	+if test "x$as_myself" = x; then
	+ as_myself=$0
	+fi
	+if test ! -f "$as_myself"; then
	+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
	+ exit 1
	+fi
	+
	+# Unset variables that we do not need and which cause bugs (e.g. in
	+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "\|\| exit 1"
	+# suppresses any "Segmentation fault" message there. '((' could
	+# trigger a bug in pdksh 5.2.14.
	+for as_var in BASH_ENV ENV MAIL MAILPATH
	+do eval test x\${$as_var+set} = xset \
	+ && ( (unset $as_var) \|\| exit 1) >/dev/null 2>&1 && unset $as_var \|\| :
	+done
	+PS1='$ '
	+PS2='> '
	+PS4='+ '
	+
	+# NLS nuisances.
	+LC_ALL=C
	+export LC_ALL
	+LANGUAGE=C
	+export LANGUAGE
	+
	+# CDPATH.
	+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
	+
	+
	+# as_fn_error STATUS ERROR [LINENO LOG_FD]
	+# ----------------------------------------
	+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
	+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
	+# script with STATUS, using 1 if that was 0.
	+as_fn_error ()
	+{
	+ as_status=$1; test $as_status -eq 0 && as_status=1
	+ if test "$4"; then
	+ as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
	+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
	+ fi
	+ $as_echo "$as_me: error: $2" >&2
	+ as_fn_exit $as_status
	+} # as_fn_error
	+
	+
	+# as_fn_set_status STATUS
	+# -----------------------
	+# Set $? to STATUS, without forking.
	+as_fn_set_status ()
	+{
	+ return $1
	+} # as_fn_set_status
	+
	+# as_fn_exit STATUS
	+# -----------------
	+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
	+as_fn_exit ()
	+{
	+ set +e
	+ as_fn_set_status $1
	+ exit $1
	+} # as_fn_exit
	+
	+# as_fn_unset VAR
	+# ---------------
	+# Portably unset VAR.
	+as_fn_unset ()
	+{
	+ { eval $1=; unset $1;}
	+}
	+as_unset=as_fn_unset
	+# as_fn_append VAR VALUE
	+# ----------------------
	+# Append the text in VALUE to the end of the definition contained in VAR. Take
	+# advantage of any shell optimizations that allow amortized linear growth over
	+# repeated appends, instead of the typical quadratic growth present in naive
	+# implementations.
	+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
	+ eval 'as_fn_append ()
	+ {
	+ eval $1+=\$2
	+ }'
	+else
	+ as_fn_append ()
	+ {
	+ eval $1=\$$1\$2
	+ }
	+fi # as_fn_append
	+
	+# as_fn_arith ARG...
	+# ------------------
	+# Perform arithmetic evaluation on the ARGs, and store the result in the
	+# global $as_val. Take advantage of shells that can avoid forks. The arguments
	+# must be portable across $(()) and expr.
	+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
	+ eval 'as_fn_arith ()
	+ {
	+ as_val=$(( $* ))
	+ }'
	+else
	+ as_fn_arith ()
	+ {
	+ as_val=`expr "$@" \|\| test $? -eq 1`
	+ }
	+fi # as_fn_arith
	+
	+
	+if expr a : '$a$' >/dev/null 2>&1 &&
	+ test "X`expr 00001 : '.*$...$'`" = X001; then
	+ as_expr=expr
	+else
	+ as_expr=false
	+fi
	+
	+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
	+ as_basename=basename
	+else
	+ as_basename=false
	+fi
	+
	+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
	+ as_dirname=dirname
	+else
	+ as_dirname=false
	+fi
	+
	+as_me=`$as_basename -- "$0" \|\|
	+$as_expr X/"$0" : './$[^/][^/]$/*$' \\| \
	+ X"$0" : 'X$//$$' \\| \
	+ X"$0" : 'X$/$' \\| . 2>/dev/null \|\|
	+$as_echo X/"$0" \|
	+ sed '/^.\/$[^/][^/]$\/*$/{
	+ s//\1/
	+ q
	+ }
	+ /^X\/$\/\/$$/{
	+ s//\1/
	+ q
	+ }
	+ /^X\/$\/$.*/{
	+ s//\1/
	+ q
	+ }
	+ s/.*/./; q'`
	+
	+# Avoid depending upon Character Ranges.
	+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
	+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
	+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
	+as_cr_digits='0123456789'
	+as_cr_alnum=$as_cr_Letters$as_cr_digits
	+
	+ECHO_C= ECHO_N= ECHO_T=
	+case `echo -n x` in #(((((
	+-n*)
	+ case `echo 'xy\c'` in
	+ c) ECHO_T=' ';; # ECHO_T is single tab character.
	+ xy) ECHO_C='\c';;
	+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null
	+ ECHO_T=' ';;
	+ esac;;
	+*)
	+ ECHO_N='-n';;
	+esac
	+
	+rm -f conf$$ conf$$.exe conf$$.file
	+if test -d conf$$.dir; then
	+ rm -f conf$$.dir/conf$$.file
	+else
	+ rm -f conf$$.dir
	+ mkdir conf$$.dir 2>/dev/null
	+fi
	+if (echo >conf$$.file) 2>/dev/null; then
	+ if ln -s conf$$.file conf$$ 2>/dev/null; then
	+ as_ln_s='ln -s'
	+ # ... but there are two gotchas:
	+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
	+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
	+ # In both cases, we have to default to `cp -p'.
	+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe \|\|
	+ as_ln_s='cp -p'
	+ elif ln conf$$.file conf$$ 2>/dev/null; then
	+ as_ln_s=ln
	+ else
	+ as_ln_s='cp -p'
	+ fi
	+else
	+ as_ln_s='cp -p'
	+fi
	+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
	+rmdir conf$$.dir 2>/dev/null
	+
	+
	+# as_fn_mkdir_p
	+# -------------
	+# Create "$as_dir" as a directory, including parents if necessary.
	+as_fn_mkdir_p ()
	+{
	+
	+ case $as_dir in #(
	+ -*) as_dir=./$as_dir;;
	+ esac
	+ test -d "$as_dir" \|\| eval $as_mkdir_p \|\| {
	+ as_dirs=
	+ while :; do
	+ case $as_dir in #(
	+ \') as_qdir=`$as_echo "$as_dir" \| sed "s/'/'\\\\\\\\''/g"`;; #'(
	+ *) as_qdir=$as_dir;;
	+ esac
	+ as_dirs="'$as_qdir' $as_dirs"
	+ as_dir=`$as_dirname -- "$as_dir" \|\|
	+$as_expr X"$as_dir" : 'X$.[^/]$//[^/][^/]/$' \\| \
	+ X"$as_dir" : 'X$//$[^/]' \\| \
	+ X"$as_dir" : 'X$//$$' \\| \
	+ X"$as_dir" : 'X$/$' \\| . 2>/dev/null \|\|
	+$as_echo X"$as_dir" \|
	+ sed '/^X$.[^/]$\/\/[^/][^/]\/$/{
	+ s//\1/
	+ q
	+ }
	+ /^X$\/\/$[^/].*/{
	+ s//\1/
	+ q
	+ }
	+ /^X$\/\/$$/{
	+ s//\1/
	+ q
	+ }
	+ /^X$\/$.*/{
	+ s//\1/
	+ q
	+ }
	+ s/.*/./; q'`
	+ test -d "$as_dir" && break
	+ done
	+ test -z "$as_dirs" \|\| eval "mkdir $as_dirs"
	+ } \|\| test -d "$as_dir" \|\| as_fn_error $? "cannot create directory $as_dir"
	+
	+
	+} # as_fn_mkdir_p
	+if mkdir -p . 2>/dev/null; then
	+ as_mkdir_p='mkdir -p "$as_dir"'
	+else
	+ test -d ./-p && rmdir ./-p
	+ as_mkdir_p=false
	+fi
	+
	+if test -x / >/dev/null 2>&1; then
	+ as_test_x='test -x'
	+else
	+ if ls -dL / >/dev/null 2>&1; then
	+ as_ls_L_option=L
	+ else
	+ as_ls_L_option=
	+ fi
	+ as_test_x='
	+ eval sh -c '\''
	+ if test -d "$1"; then
	+ test -d "$1/.";
	+ else
	+ case $1 in #(
	+ -*)set "./$1";;
	+ esac;
	+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
	+ ???[sx]):;;)false;;esac;fi
	+ '\'' sh
	+ '
	+fi
	+as_executable_p=$as_test_x
	+
	+# Sed expression to map a string onto a valid CPP name.
	+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
	+
	+# Sed expression to map a string onto a valid variable name.
	+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
	+
	+
	+exec 6>&1
	+## ----------------------------------- ##
	+## Main body of $CONFIG_STATUS script. ##
	+## ----------------------------------- ##
	+_ASEOF
	+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS \|\| ac_write_fail=1
	+
	+cat >>$CONFIG_STATUS <<\_ACEOF \|\| ac_write_fail=1
	+# Save the log message, to keep $0 and so on meaningful, and to
	+# report actual input values of CONFIG_FILES etc. instead of their
	+# values after options handling.
	+ac_log="
	+This file was extended by xmount $as_me 0.5.1, which was
	+generated by GNU Autoconf 2.68. Invocation command line was
	+
	+ CONFIG_FILES = $CONFIG_FILES
	+ CONFIG_HEADERS = $CONFIG_HEADERS
	+ CONFIG_LINKS = $CONFIG_LINKS
	+ CONFIG_COMMANDS = $CONFIG_COMMANDS
	+ $ $0 $@
	+
	+on `(hostname \|\| uname -n) 2>/dev/null \| sed 1q`
	+"
	+
	+_ACEOF
	+
	+case $ac_config_files in *"
	+") set x $ac_config_files; shift; ac_config_files=$;;
	+esac
	+
	+case $ac_config_headers in *"
	+") set x $ac_config_headers; shift; ac_config_headers=$;;
	+esac
	+
	+
	+cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1
	+# Files that config.status was made for.
	+config_files="$ac_config_files"
	+config_headers="$ac_config_headers"
	+config_commands="$ac_config_commands"
	+
	+_ACEOF
	+
	+cat >>$CONFIG_STATUS <<\_ACEOF \|\| ac_write_fail=1
	+ac_cs_usage="\
	+\`$as_me' instantiates files and other configuration actions
	+from templates according to the current configuration. Unless the files
	+and actions are specified as TAGs, all are instantiated by default.
	+
	+Usage: $0 [OPTION]... [TAG]...
	+
	+ -h, --help print this help, then exit
	+ -V, --version print version number and configuration settings, then exit
	+ --config print configuration, then exit
	+ -q, --quiet, --silent
	+ do not print progress messages
	+ -d, --debug don't remove temporary files
	+ --recheck update $as_me by reconfiguring in the same conditions
	+ --file=FILE[:TEMPLATE]
	+ instantiate the configuration file FILE
	+ --header=FILE[:TEMPLATE]
	+ instantiate the configuration header FILE
	+
	+Configuration files:
	+$config_files
	+
	+Configuration headers:
	+$config_headers
	+
	+Configuration commands:
	+$config_commands
	+
	+Report bugs to <bugs@pinguin.lu>."
	+
	+_ACEOF
	+cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1
	+ac_cs_config="`$as_echo "$ac_configure_args" \| sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
	+ac_cs_version="\\
	+xmount config.status 0.5.1
	+configured by $0, generated by GNU Autoconf 2.68,
	+ with options \\"\$ac_cs_config\\"
	+
	+Copyright (C) 2010 Free Software Foundation, Inc.
	+This config.status script is free software; the Free Software Foundation
	+gives unlimited permission to copy, distribute and modify it."
	+
	+ac_pwd='$ac_pwd'
	+srcdir='$srcdir'
	+INSTALL='$INSTALL'
	+MKDIR_P='$MKDIR_P'
	+AWK='$AWK'
	+test -n "\$AWK" \|\| AWK=awk
	+_ACEOF
	+
	+cat >>$CONFIG_STATUS <<\_ACEOF \|\| ac_write_fail=1
	+# The default lists apply if the user does not specify any file.
	+ac_need_defaults=:
	+while test $# != 0
	+do
	+ case $1 in
	+ --=?)
	+ ac_option=`expr "X$1" : 'X$[^=]*$='`
	+ ac_optarg=`expr "X$1" : 'X[^=]=$.$'`
	+ ac_shift=:
	+ ;;
	+ --*=)
	+ ac_option=`expr "X$1" : 'X$[^=]*$='`
	+ ac_optarg=
	+ ac_shift=:
	+ ;;
	+ *)
	+ ac_option=$1
	+ ac_optarg=$2
	+ ac_shift=shift
	+ ;;
	+ esac
	+
	+ case $ac_option in
	+ # Handling of the options.
	+ -recheck \| --recheck \| --rechec \| --reche \| --rech \| --rec \| --re \| --r)
	+ ac_cs_recheck=: ;;
	+ --version \| --versio \| --versi \| --vers \| --ver \| --ve \| --v \| -V )
	+ $as_echo "$ac_cs_version"; exit ;;
	+ --config \| --confi \| --conf \| --con \| --co \| --c )
	+ $as_echo "$ac_cs_config"; exit ;;
	+ --debug \| --debu \| --deb \| --de \| --d \| -d )
	+ debug=: ;;
	+ --file \| --fil \| --fi \| --f )
	+ $ac_shift
	+ case $ac_optarg in
	+ \') ac_optarg=`$as_echo "$ac_optarg" \| sed "s/'/'\\\\\\\\''/g"` ;;
	+ '') as_fn_error $? "missing file argument" ;;
	+ esac
	+ as_fn_append CONFIG_FILES " '$ac_optarg'"
	+ ac_need_defaults=false;;
	+ --header \| --heade \| --head \| --hea )
	+ $ac_shift
	+ case $ac_optarg in
	+ \') ac_optarg=`$as_echo "$ac_optarg" \| sed "s/'/'\\\\\\\\''/g"` ;;
	+ esac
	+ as_fn_append CONFIG_HEADERS " '$ac_optarg'"
	+ ac_need_defaults=false;;
	+ --he \| --h)
	+ # Conflict between --help and --header
	+ as_fn_error $? "ambiguous option: \`$1'
	+Try \`$0 --help' for more information.";;
	+ --help \| --hel \| -h )
	+ $as_echo "$ac_cs_usage"; exit ;;
	+ -q \| -quiet \| --quiet \| --quie \| --qui \| --qu \| --q \
	+ \| -silent \| --silent \| --silen \| --sile \| --sil \| --si \| --s)
	+ ac_cs_silent=: ;;
	+
	+ # This is an error.
	+ -*) as_fn_error $? "unrecognized option: \`$1'
	+Try \`$0 --help' for more information." ;;
	+
	+ *) as_fn_append ac_config_targets " $1"
	+ ac_need_defaults=false ;;
	+
	+ esac
	+ shift
	+done
	+
	+ac_configure_extra_args=
	+
	+if $ac_cs_silent; then
	+ exec 6>/dev/null
	+ ac_configure_extra_args="$ac_configure_extra_args --silent"
	+fi
	+
	+_ACEOF
	+cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1
	+if \$ac_cs_recheck; then
	+ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
	+ shift
	+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
	+ CONFIG_SHELL='$SHELL'
	+ export CONFIG_SHELL
	+ exec "\$@"
	+fi
	+
	+_ACEOF
	+cat >>$CONFIG_STATUS <<\_ACEOF \|\| ac_write_fail=1
	+exec 5>>config.log
	+{
	+ echo
	+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
	+## Running $as_me. ##
	+_ASBOX
	+ $as_echo "$ac_log"
	+} >&5
	+
	+_ACEOF
	+cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1
	+#
	+# INIT-COMMANDS
	+#
	+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
	+
	+_ACEOF
	+
	+cat >>$CONFIG_STATUS <<\_ACEOF \|\| ac_write_fail=1
	+
	+# Handling of arguments.
	+for ac_config_target in $ac_config_targets
	+do
	+ case $ac_config_target in
	+ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
	+ "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
	+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
	+
	+ *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
	+ esac
	+done
	+
	+
	+# If the user did not use the arguments to specify the items to instantiate,
	+# then the envvar interface is used. Set only those that are not.
	+# We use the long form for the default assignment because of an extremely
	+# bizarre bug on SunOS 4.1.3.
	+if $ac_need_defaults; then
	+ test "${CONFIG_FILES+set}" = set \|\| CONFIG_FILES=$config_files
	+ test "${CONFIG_HEADERS+set}" = set \|\| CONFIG_HEADERS=$config_headers
	+ test "${CONFIG_COMMANDS+set}" = set \|\| CONFIG_COMMANDS=$config_commands
	+fi
	+
	+# Have a temporary directory for convenience. Make it in the build tree
	+# simply because there is no reason against having it here, and in addition,
	+# creating and moving files from /tmp can sometimes cause problems.
	+# Hook for its removal unless debugging.
	+# Note that there is a small window in which the directory will not be cleaned:
	+# after its creation but before its name has been assigned to `$tmp'.
	+$debug \|\|
	+{
	+ tmp= ac_tmp=
	+ trap 'exit_status=$?
	+ : "${ac_tmp:=$tmp}"
	+ { test ! -d "$ac_tmp" \|\| rm -fr "$ac_tmp"; } && exit $exit_status
	+' 0
	+ trap 'as_fn_exit 1' 1 2 13 15
	+}
	+# Create a (secure) tmp directory for tmp files.
	+
	+{
	+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
	+ test -d "$tmp"
	+} \|\|
	+{
	+ tmp=./conf$$-$RANDOM
	+ (umask 077 && mkdir "$tmp")
	+} \|\| as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
	+ac_tmp=$tmp
	+
	+# Set up the scripts for CONFIG_FILES section.
	+# No need to generate them if there are no CONFIG_FILES.
	+# This happens for instance with `./config.status config.h'.
	+if test -n "$CONFIG_FILES"; then
	+
	+
	+ac_cr=`echo X \| tr X '\015'`
	+# On cygwin, bash can eat \r inside `` if the user requested igncr.
	+# But we know of no other shell where ac_cr would be empty at this
	+# point, so we can use a bashism as a fallback.
	+if test "x$ac_cr" = x; then
	+ eval ac_cr=\$\'\\r\'
	+fi
	+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
	+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
	+ ac_cs_awk_cr='\\r'
	+else
	+ ac_cs_awk_cr=$ac_cr
	+fi
	+
	+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
	+_ACEOF
	+
	+
	+{
	+ echo "cat >conf$$subs.awk <<_ACEOF" &&
	+ echo "$ac_subst_vars" \| sed 's/.*/&!$&$ac_delim/' &&
	+ echo "_ACEOF"
	+} >conf$$subs.sh \|\|
	+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
	+ac_delim_num=`echo "$ac_subst_vars" \| grep -c '^'`
	+ac_delim='%!_!# '
	+for ac_last_try in false false false false false :; do
	+ . ./conf$$subs.sh \|\|
	+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
	+
	+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk \| grep -c X`
	+ if test $ac_delim_n = $ac_delim_num; then
	+ break
	+ elif $ac_last_try; then
	+ as_fn_error $? "could not make $CONFIG_STATUS" "$LINENO" 5
	+ else
	+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
	+ fi
	+done
	+rm -f conf$$subs.sh
	+
	+cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1
	+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
	+_ACEOF
	+sed -n '
	+h
	+s/^/S["/; s/!.*/"]=/
	+p
	+g
	+s/^[^!]*!//
	+:repl
	+t repl
	+s/'"$ac_delim"'$//
	+t delim
	+:nl
	+h
	+s/$.\{148\}$..*/\1/
	+t more1
	+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/
	+p
	+n
	+b repl
	+:more1
	+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
	+p
	+g
	+s/.\{148\}//
	+t nl
	+:delim
	+h
	+s/$.\{148\}$..*/\1/
	+t more2
	+s/["\\]/\\&/g; s/^/"/; s/$/"/
	+p
	+b
	+:more2
	+s/["\\]/\\&/g; s/^/"/; s/$/"\\/
	+p
	+g
	+s/.\{148\}//
	+t delim
	+' <conf$$subs.awk \| sed '
	+/^[^""]/{
	+ N
	+ s/\n//
	+}
	+' >>$CONFIG_STATUS \|\| ac_write_fail=1
	+rm -f conf$$subs.awk
	+cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1
	+_ACAWK
	+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
	+ for (key in S) S_is_set[key] = 1
	+ FS = ""
	+
	+}
	+{
	+ line = $ 0
	+ nfields = split(line, field, "@")
	+ substed = 0
	+ len = length(field[1])
	+ for (i = 2; i < nfields; i++) {
	+ key = field[i]
	+ keylen = length(key)
	+ if (S_is_set[key]) {
	+ value = S[key]
	+ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
	+ len += length(value) + length(field[++i])
	+ substed = 1
	+ } else
	+ len += 1 + keylen
	+ }
	+
	+ print line
	+}
	+
	+_ACAWK
	+_ACEOF
	+cat >>$CONFIG_STATUS <<\_ACEOF \|\| ac_write_fail=1
	+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
	+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
	+else
	+ cat
	+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
	+ \|\| as_fn_error $? "could not setup config files machinery" "$LINENO" 5
	+_ACEOF
	+
	+# VPATH may cause trouble with some makes, so we remove sole $(srcdir),
	+# ${srcdir} and @srcdir@ entries from VPATH if srcdir is ".", strip leading and
	+# trailing colons and then remove the whole line if VPATH becomes empty
	+# (actually we leave an empty line to preserve line numbers).
	+if test "x$srcdir" = x.; then
	+ ac_vpsub='/^[ ]VPATH[ ]=[ ]*/{
	+h
	+s///
	+s/^/:/
	+s/[ ]*$/:/
	+s/:\$(srcdir):/:/g
	+s/:\${srcdir}:/:/g
	+s/:@srcdir@:/:/g
	+s/^:*//
	+s/:*$//
	+x
	+s/$=[ ]$./\1/
	+G
	+s/\n//
	+s/^[^=]=[ ]$//
	+}'
	+fi
	+
	+cat >>$CONFIG_STATUS <<\_ACEOF \|\| ac_write_fail=1
	+fi # test -n "$CONFIG_FILES"
	+
	+# Set up the scripts for CONFIG_HEADERS section.
	+# No need to generate them if there are no CONFIG_HEADERS.
	+# This happens for instance with `./config.status Makefile'.
	+if test -n "$CONFIG_HEADERS"; then
	+cat >"$ac_tmp/defines.awk" <<\_ACAWK \|\|
	+BEGIN {
	+_ACEOF
	+
	+# Transform confdefs.h into an awk script `defines.awk', embedded as
	+# here-document in config.status, that substitutes the proper values into
	+# config.h.in to produce config.h.
	+
	+# Create a delimiter string that does not exist in confdefs.h, to ease
	+# handling of long lines.
	+ac_delim='%!_!# '
	+for ac_last_try in false false :; do
	+ ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
	+ if test -z "$ac_tt"; then
	+ break
	+ elif $ac_last_try; then
	+ as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
	+ else
	+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! "
	+ fi
	+done
	+
	+# For the awk script, D is an array of macro values keyed by name,
	+# likewise P contains macro parameters if any. Preserve backslash
	+# newline sequences.
	+
	+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]*
	+sed -n '
	+s/.\{148\}/&'"$ac_delim"'/g
	+t rset
	+:rset
	+s/^[ ]#[ ]define[ ][ ]*/ /
	+t def
	+d
	+:def
	+s/\\$//
	+t bsnl
	+s/["\\]/\\&/g
	+s/^ $'"$ac_word_re"'$$([^()])$[ ]$.*$/P["\1"]="\2"\
	+D["\1"]=" \3"/p
	+s/^ $'"$ac_word_re"'$[ ]$.$/D["\1"]=" \2"/p
	+d
	+:bsnl
	+s/["\\]/\\&/g
	+s/^ $'"$ac_word_re"'$$([^()])$[ ]$.*$/P["\1"]="\2"\
	+D["\1"]=" \3\\\\\\n"\\/p
	+t cont
	+s/^ $'"$ac_word_re"'$[ ]$.$/D["\1"]=" \2\\\\\\n"\\/p
	+t cont
	+d
	+:cont
	+n
	+s/.\{148\}/&'"$ac_delim"'/g
	+t clear
	+:clear
	+s/\\$//
	+t bsnlc
	+s/["\\]/\\&/g; s/^/"/; s/$/"/p
	+d
	+:bsnlc
	+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p
	+b cont
	+' <confdefs.h \| sed '
	+s/'"$ac_delim"'/"\\\
	+"/g' >>$CONFIG_STATUS \|\| ac_write_fail=1
	+
	+cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1
	+ for (key in D) D_is_set[key] = 1
	+ FS = ""
	+}
	+/^[\t ]#[\t ](define\|undef)[\t ]+$ac_word_re([\t (]\|\$)/ {
	+ line = \$ 0
	+ split(line, arg, " ")
	+ if (arg[1] == "#") {
	+ defundef = arg[2]
	+ mac1 = arg[3]
	+ } else {
	+ defundef = substr(arg[1], 2)
	+ mac1 = arg[2]
	+ }
	+ split(mac1, mac2, "(") #)
	+ macro = mac2[1]
	+ prefix = substr(line, 1, index(line, defundef) - 1)
	+ if (D_is_set[macro]) {
	+ # Preserve the white space surrounding the "#".
	+ print prefix "define", macro P[macro] D[macro]
	+ next
	+ } else {
	+ # Replace #undef with comments. This is necessary, for example,
	+ # in the case of _POSIX_SOURCE, which is predefined and required
	+ # on some systems where configure will not decide to define it.
	+ if (defundef == "undef") {
	+ print "/", prefix defundef, macro, "/"
	+ next
	+ }
	+ }
	+}
	+{ print }
	+_ACAWK
	+_ACEOF
	+cat >>$CONFIG_STATUS <<\_ACEOF \|\| ac_write_fail=1
	+ as_fn_error $? "could not setup config headers machinery" "$LINENO" 5
	+fi # test -n "$CONFIG_HEADERS"
	+
	+
	+eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :C $CONFIG_COMMANDS"
	+shift
	+for ac_tag
	+do
	+ case $ac_tag in
	+ :[FHLC]) ac_mode=$ac_tag; continue;;
	+ esac
	+ case $ac_mode$ac_tag in
	+ :[FHL]:);;
	+ :L* \| :C:) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
	+ :[FH]-) ac_tag=-:-;;
	+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
	+ esac
	+ ac_save_IFS=$IFS
	+ IFS=:
	+ set x $ac_tag
	+ IFS=$ac_save_IFS
	+ shift
	+ ac_file=$1
	+ shift
	+
	+ case $ac_mode in
	+ :L) ac_source=$1;;
	+ :[FH])
	+ ac_file_inputs=
	+ for ac_f
	+ do
	+ case $ac_f in
	+ -) ac_f="$ac_tmp/stdin";;
	+ *) # Look for the file first in the build tree, then in the source tree
	+ # (if the path is not absolute). The absolute path cannot be DOS-style,
	+ # because $ac_f cannot contain `:'.
	+ test -f "$ac_f" \|\|
	+ case $ac_f in
	+ [\\/$]*) false;;
	+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
	+ esac \|\|
	+ as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
	+ esac
	+ case $ac_f in \') ac_f=`$as_echo "$ac_f" \| sed "s/'/'\\\\\\\\''/g"`;; esac
	+ as_fn_append ac_file_inputs " '$ac_f'"
	+ done
	+
	+ # Let's still pretend it is `configure' which instantiates (i.e., don't
	+ # use $as_me), people would be surprised to read:
	+ # /* config.h. Generated by config.status. */
	+ configure_input='Generated from '`
	+ $as_echo "$" \| sed 's\|^[^:]/\|\|;s\|:[^:]*/\|, \|g'
	+ `' by configure.'
	+ if test x"$ac_file" != x-; then
	+ configure_input="$ac_file. $configure_input"
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
	+$as_echo "$as_me: creating $ac_file" >&6;}
	+ fi
	+ # Neutralize special characters interpreted by sed in replacement strings.
	+ case $configure_input in #(
	+ \& \| \\| \| \\ )
	+ ac_sed_conf_input=`$as_echo "$configure_input" \|
	+ sed 's/[\\\\&\|]/\\\\&/g'`;; #(
	+ *) ac_sed_conf_input=$configure_input;;
	+ esac
	+
	+ case $ac_tag in
	+ :-: \| *:-) cat >"$ac_tmp/stdin" \
	+ \|\| as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
	+ esac
	+ ;;
	+ esac
	+
	+ ac_dir=`$as_dirname -- "$ac_file" \|\|
	+$as_expr X"$ac_file" : 'X$.[^/]$//[^/][^/]/$' \\| \
	+ X"$ac_file" : 'X$//$[^/]' \\| \
	+ X"$ac_file" : 'X$//$$' \\| \
	+ X"$ac_file" : 'X$/$' \\| . 2>/dev/null \|\|
	+$as_echo X"$ac_file" \|
	+ sed '/^X$.[^/]$\/\/[^/][^/]\/$/{
	+ s//\1/
	+ q
	+ }
	+ /^X$\/\/$[^/].*/{
	+ s//\1/
	+ q
	+ }
	+ /^X$\/\/$$/{
	+ s//\1/
	+ q
	+ }
	+ /^X$\/$.*/{
	+ s//\1/
	+ q
	+ }
	+ s/.*/./; q'`
	+ as_dir="$ac_dir"; as_fn_mkdir_p
	+ ac_builddir=.
	+
	+case "$ac_dir" in
	+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
	+*)
	+ ac_dir_suffix=/`$as_echo "$ac_dir" \| sed 's\|^\.[\\/]\|\|'`
	+ # A ".." for each directory in $ac_dir_suffix.
	+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" \| sed 's\|/[^\\/]*\|/..\|g;s\|/\|\|'`
	+ case $ac_top_builddir_sub in
	+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
	+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;;
	+ esac ;;
	+esac
	+ac_abs_top_builddir=$ac_pwd
	+ac_abs_builddir=$ac_pwd$ac_dir_suffix
	+# for backward compatibility:
	+ac_top_builddir=$ac_top_build_prefix
	+
	+case $srcdir in
	+ .) # We are building in place.
	+ ac_srcdir=.
	+ ac_top_srcdir=$ac_top_builddir_sub
	+ ac_abs_top_srcdir=$ac_pwd ;;
	+ [\\/]* \| ?:[\\/]* ) # Absolute name.
	+ ac_srcdir=$srcdir$ac_dir_suffix;
	+ ac_top_srcdir=$srcdir
	+ ac_abs_top_srcdir=$srcdir ;;
	+ *) # Relative name.
	+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
	+ ac_top_srcdir=$ac_top_build_prefix$srcdir
	+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
	+esac
	+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
	+
	+
	+ case $ac_mode in
	+ :F)
	+ #
	+ # CONFIG_FILE
	+ #
	+
	+ case $INSTALL in
	+ [\\/$]* \| ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
	+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
	+ esac
	+ ac_MKDIR_P=$MKDIR_P
	+ case $MKDIR_P in
	+ [\\/$]* \| ?:[\\/]* ) ;;
	+ /) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
	+ esac
	+_ACEOF
	+
	+cat >>$CONFIG_STATUS <<\_ACEOF \|\| ac_write_fail=1
	+# If the template does not know about datarootdir, expand it.
	+# FIXME: This hack should be removed a few years after 2.60.
	+ac_datarootdir_hack=; ac_datarootdir_seen=
	+ac_sed_dataroot='
	+/datarootdir/ {
	+ p
	+ q
	+}
	+/@datadir@/p
	+/@docdir@/p
	+/@infodir@/p
	+/@localedir@/p
	+/@mandir@/p'
	+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
	+datarootdir) ac_datarootdir_seen=yes;;
	+@datadir@\|@docdir@\|@infodir@\|@localedir@\|@mandir@)
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
	+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
	+_ACEOF
	+cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1
	+ ac_datarootdir_hack='
	+ s&@datadir@&$datadir&g
	+ s&@docdir@&$docdir&g
	+ s&@infodir@&$infodir&g
	+ s&@localedir@&$localedir&g
	+ s&@mandir@&$mandir&g
	+ s&\\\${datarootdir}&$datarootdir&g' ;;
	+esac
	+_ACEOF
	+
	+# Neutralize VPATH when `$srcdir' = `.'.
	+# Shell code in configure.ac might set extrasub.
	+# FIXME: do we really want to maintain this feature?
	+cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1
	+ac_sed_extra="$ac_vpsub
	+$extrasub
	+_ACEOF
	+cat >>$CONFIG_STATUS <<\_ACEOF \|\| ac_write_fail=1
	+:t
	+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
	+s\|@configure_input@\|$ac_sed_conf_input\|;t t
	+s&@top_builddir@&$ac_top_builddir_sub&;t t
	+s&@top_build_prefix@&$ac_top_build_prefix&;t t
	+s&@srcdir@&$ac_srcdir&;t t
	+s&@abs_srcdir@&$ac_abs_srcdir&;t t
	+s&@top_srcdir@&$ac_top_srcdir&;t t
	+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
	+s&@builddir@&$ac_builddir&;t t
	+s&@abs_builddir@&$ac_abs_builddir&;t t
	+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
	+s&@INSTALL@&$ac_INSTALL&;t t
	+s&@MKDIR_P@&$ac_MKDIR_P&;t t
	+$ac_datarootdir_hack
	+"
	+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" \| $AWK -f "$ac_tmp/subs.awk" \
	+ >$ac_tmp/out \|\| as_fn_error $? "could not create $ac_file" "$LINENO" 5
	+
	+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
	+ { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
	+ { ac_out=`sed -n '/^[ ]datarootdir[ ]:*=/p' \
	+ "$ac_tmp/out"`; test -z "$ac_out"; } &&
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
	+which seems to be undefined. Please make sure it is defined" >&5
	+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
	+which seems to be undefined. Please make sure it is defined" >&2;}
	+
	+ rm -f "$ac_tmp/stdin"
	+ case $ac_file in
	+ -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
	+ *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
	+ esac \
	+ \|\| as_fn_error $? "could not create $ac_file" "$LINENO" 5
	+ ;;
	+ :H)
	+ #
	+ # CONFIG_HEADER
	+ #
	+ if test x"$ac_file" != x-; then
	+ {
	+ $as_echo "/* $configure_input */" \
	+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
	+ } >"$ac_tmp/config.h" \
	+ \|\| as_fn_error $? "could not create $ac_file" "$LINENO" 5
	+ if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
	+$as_echo "$as_me: $ac_file is unchanged" >&6;}
	+ else
	+ rm -f "$ac_file"
	+ mv "$ac_tmp/config.h" "$ac_file" \
	+ \|\| as_fn_error $? "could not create $ac_file" "$LINENO" 5
	+ fi
	+ else
	+ $as_echo "/* $configure_input */" \
	+ && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
	+ \|\| as_fn_error $? "could not create -" "$LINENO" 5
	+ fi
	+# Compute "$ac_file"'s index in $config_headers.
	+_am_arg="$ac_file"
	+_am_stamp_count=1
	+for _am_header in $config_headers :; do
	+ case $_am_header in
	+ $_am_arg \| $_am_arg:* )
	+ break ;;
	+ * )
	+ _am_stamp_count=`expr $_am_stamp_count + 1` ;;
	+ esac
	+done
	+echo "timestamp for $_am_arg" >`$as_dirname -- "$_am_arg" \|\|
	+$as_expr X"$_am_arg" : 'X$.[^/]$//[^/][^/]/$' \\| \
	+ X"$_am_arg" : 'X$//$[^/]' \\| \
	+ X"$_am_arg" : 'X$//$$' \\| \
	+ X"$_am_arg" : 'X$/$' \\| . 2>/dev/null \|\|
	+$as_echo X"$_am_arg" \|
	+ sed '/^X$.[^/]$\/\/[^/][^/]\/$/{
	+ s//\1/
	+ q
	+ }
	+ /^X$\/\/$[^/].*/{
	+ s//\1/
	+ q
	+ }
	+ /^X$\/\/$$/{
	+ s//\1/
	+ q
	+ }
	+ /^X$\/$.*/{
	+ s//\1/
	+ q
	+ }
	+ s/.*/./; q'`/stamp-h$_am_stamp_count
	+ ;;
	+
	+ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5
	+$as_echo "$as_me: executing $ac_file commands" >&6;}
	+ ;;
	+ esac
	+
	+
	+ case $ac_file$ac_mode in
	+ "depfiles":C) test x"$AMDEP_TRUE" != x"" \|\| {
	+ # Autoconf 2.62 quotes --file arguments for eval, but not when files
	+ # are listed without --file. Let's play safe and only enable the eval
	+ # if we detect the quoting.
	+ case $CONFIG_FILES in
	+ \') eval set x "$CONFIG_FILES" ;;
	+ *) set x $CONFIG_FILES ;;
	+ esac
	+ shift
	+ for mf
	+ do
	+ # Strip MF so we end up with the name of the file.
	+ mf=`echo "$mf" \| sed -e 's/:.*$//'`
	+ # Check whether this is an Automake generated Makefile or not.
	+ # We used to match only the files named `Makefile.in', but
	+ # some people rename them; so instead we look at the file content.
	+ # Grep'ing the first line is not enough: some people post-process
	+ # each Makefile.in and add a new line on top of each file to say so.
	+ # Grep'ing the whole file is not good either: AIX grep has a line
	+ # limit of 2048, but all sed's we know have understand at least 4000.
	+ if sed -n 's,^#.generated by automake.,X,p' "$mf" \| grep X >/dev/null 2>&1; then
	+ dirpart=`$as_dirname -- "$mf" \|\|
	+$as_expr X"$mf" : 'X$.[^/]$//[^/][^/]/$' \\| \
	+ X"$mf" : 'X$//$[^/]' \\| \
	+ X"$mf" : 'X$//$$' \\| \
	+ X"$mf" : 'X$/$' \\| . 2>/dev/null \|\|
	+$as_echo X"$mf" \|
	+ sed '/^X$.[^/]$\/\/[^/][^/]\/$/{
	+ s//\1/
	+ q
	+ }
	+ /^X$\/\/$[^/].*/{
	+ s//\1/
	+ q
	+ }
	+ /^X$\/\/$$/{
	+ s//\1/
	+ q
	+ }
	+ /^X$\/$.*/{
	+ s//\1/
	+ q
	+ }
	+ s/.*/./; q'`
	+ else
	+ continue
	+ fi
	+ # Extract the definition of DEPDIR, am__include, and am__quote
	+ # from the Makefile without running `make'.
	+ DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
	+ test -z "$DEPDIR" && continue
	+ am__include=`sed -n 's/^am__include = //p' < "$mf"`
	+ test -z "am__include" && continue
	+ am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
	+ # When using ansi2knr, U may be empty or an underscore; expand it
	+ U=`sed -n 's/^U = //p' < "$mf"`
	+ # Find all dependency output files, they are included files with
	+ # $(DEPDIR) in their names. We invoke sed twice because it is the
	+ # simplest approach to changing $(DEPDIR) to its actual value in the
	+ # expansion.
	+ for file in `sed -n "
	+ s/^$am__include $am__quote$.(DEPDIR).$$am__quote"'$/\1/p' <"$mf" \| \
	+ sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
	+ # Make sure the directory exists.
	+ test -f "$dirpart/$file" && continue
	+ fdir=`$as_dirname -- "$file" \|\|
	+$as_expr X"$file" : 'X$.[^/]$//[^/][^/]/$' \\| \
	+ X"$file" : 'X$//$[^/]' \\| \
	+ X"$file" : 'X$//$$' \\| \
	+ X"$file" : 'X$/$' \\| . 2>/dev/null \|\|
	+$as_echo X"$file" \|
	+ sed '/^X$.[^/]$\/\/[^/][^/]\/$/{
	+ s//\1/
	+ q
	+ }
	+ /^X$\/\/$[^/].*/{
	+ s//\1/
	+ q
	+ }
	+ /^X$\/\/$$/{
	+ s//\1/
	+ q
	+ }
	+ /^X$\/$.*/{
	+ s//\1/
	+ q
	+ }
	+ s/.*/./; q'`
	+ as_dir=$dirpart/$fdir; as_fn_mkdir_p
	+ # echo "creating $dirpart/$file"
	+ echo '# dummy' > "$dirpart/$file"
	+ done
	+ done
	+}
	+ ;;
	+
	+ esac
	+done # for ac_tag
	+
	+
	+as_fn_exit 0
	+_ACEOF
	+ac_clean_files=$ac_clean_files_save
	+
	+test $ac_write_fail = 0 \|\|
	+ as_fn_error $? "write failure creating $CONFIG_STATUS" "$LINENO" 5
	+
	+
	+# configure is writing to config.log, and then calls config.status.
	+# config.status does its own redirection, appending to config.log.
	+# Unfortunately, on DOS this fails, as config.log is still kept open
	+# by configure, so config.status won't be able to write to it; its
	+# output is simply discarded. So we exec the FD to /dev/null,
	+# effectively closing config.log, so it can be properly (re)opened and
	+# appended to by config.status. When coming back to configure, we
	+# need to make the FD available again.
	+if test "$no_create" != yes; then
	+ ac_cs_success=:
	+ ac_config_status_args=
	+ test "$silent" = yes &&
	+ ac_config_status_args="$ac_config_status_args --quiet"
	+ exec 5>/dev/null
	+ $SHELL $CONFIG_STATUS $ac_config_status_args \|\| ac_cs_success=false
	+ exec 5>>config.log
	+ # Use \|\|, not &&, to avoid exiting from the if with $? = 1, which
	+ # would make configure fail if this is the last instruction.
	+ $ac_cs_success \|\| as_fn_exit 1
	+fi
	+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then
	+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5
	+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;}
	+fi
	+
	diff --git a/tags/xmount-0.7.0/old_build/configure.ac b/tags/xmount-0.7.0/old_build/configure.ac
	new file mode 100644
	index 0000000..42b5738
	--- /dev/null
	+++ b/tags/xmount-0.7.0/old_build/configure.ac
	@@ -0,0 +1,60 @@
	+# Process this file with autoconf to produce a configure script.
	+
	+AC_PREREQ(2.61)
	+AC_INIT([xmount], [0.7.0], [bugs@pinguin.lu])
	+AC_CONFIG_SRCDIR([xmount.c])
	+AC_CONFIG_HEADER([config.h])
	+AM_INIT_AUTOMAKE
	+
	+# Checks for programs.
	+AC_PROG_CC
	+AM_PROG_CC_C_O
	+
	+# Checks for libraries.
	+##AC_CHECK_LIB([fuse],[fuse_main],,AC_MSG_ERROR([No FUSE library found! Get it from http://fuse.sourceforge.net/]))
	+#AC_CHECK_LIB([crypto],[SHA1_Init],,AC_MSG_ERROR([No CRYPTO library found! Get it from http://www.openssl.org/]))
	+AC_CHECK_LIB([ewf],[libewf_handle_open],,AC_MSG_WARN([No EWF library found! EWF input support will be disabled.]))
	+AC_CHECK_LIB([afflib],[af_open],,AC_MSG_WARN([No AFF library found! AFF input support will be disabled.]))
	+AC_CHECK_LIB([z],[uncompress],,AC_MSG_WARN([No ZLib library found! AEWF input support will be disabled.]))
	+
	+# Checks for header files.
	+AC_CHECK_HEADER([stdio.h],,AC_MSG_ERROR([No stdio.h header file found!]))
	+AC_CHECK_HEADER([string.h],,AC_MSG_ERROR([No string.h header file found!]))
	+AC_CHECK_HEADER([fcntl.h],,AC_MSG_ERROR([No fcntl.h header file found!]))
	+AC_CHECK_HEADER([errno.h],,AC_MSG_ERROR([No errno.h header file found!]))
	+#AC_CHECK_HEADER([inttypes.h],,AC_MSG_ERROR([No inttypes.h header file found!]))
	+AC_CHECK_HEADER([stdint.h],,AC_MSG_ERROR([No stdint.h header file found!]))
	+AC_CHECK_HEADER([unistd.h],,AC_MSG_ERROR([No unistd.h header file found!]))
	+AC_CHECK_HEADER([sys/ioctl.h],,AC_MSG_ERROR([No sys/ioctl.h header file found!]))
	+AC_CHECK_HEADER([linux/fs.h],,AC_MSG_WARN([No linux/fs.h header file found! If not building on Linux this can be ignored.]))
	+AC_CHECK_HEADER([pthread.h],,AC_MSG_ERROR([No pthread.h header file found!]))
	+AC_CHECK_HEADER([time.h],,AC_MSG_ERROR([No time.h header file found!]))
	+AC_CHECK_HEADER([zlib.h],,AC_MSG_ERROR([No zlib.h header file found!]))
	+AC_CHECK_HEADER([byteswap.h],,AC_MSG_WARN([No byteswap.h header file found! If not building on Linux this can be ignored.]))
	+AC_CHECK_HEADER([endian.h],,AC_MSG_WARN([No endian.h header file found! If not building on Linux this can be ignored.]))
	+##AC_CHECK_HEADER([fuse/fuse.h],,AC_MSG_WARN([No fuse.h header file found! This could be a false positive!]))
	+PKG_CHECK_MODULES([fuse],[fuse])
	+AC_CHECK_HEADER([libewf.h],,AC_MSG_WARN([No libewf.h header file found! EWF input support will be disabled.]))
	+AC_CHECK_HEADER([afflib/afflib.h],,AC_MSG_WARN([No afflib.h header file found! AFF input support will be disabled.]))
	+
	+# Checks for typedefs, structures, and compiler characteristics.
	+AC_C_CONST
	+AC_TYPE_INT64_T
	+AC_TYPE_OFF_T
	+AC_TYPE_SIZE_T
	+AC_TYPE_SSIZE_T
	+AC_TYPE_UINT16_T
	+AC_TYPE_UINT32_T
	+AC_TYPE_UINT64_T
	+AC_TYPE_UINT8_T
	+
	+# Checks for library functions.
	+AC_FUNC_FSEEKO
	+AC_PROG_GCC_TRADITIONAL
	+AC_FUNC_MALLOC
	+AC_FUNC_REALLOC
	+AC_FUNC_VPRINTF
	+AC_CHECK_FUNCS([memset strrchr])
	+
	+AC_CONFIG_FILES([Makefile])
	+AC_OUTPUT
	diff --git a/tags/xmount-0.7.0/old_build/depcomp b/tags/xmount-0.7.0/old_build/depcomp
	new file mode 100755
	index 0000000..e5f9736
	--- /dev/null
	+++ b/tags/xmount-0.7.0/old_build/depcomp
	@@ -0,0 +1,589 @@
	+#! /bin/sh
	+# depcomp - compile a program generating dependencies as side-effects
	+
	+scriptversion=2007-03-29.01
	+
	+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007 Free Software
	+# Foundation, Inc.
	+
	+# This program is free software; you can redistribute it and/or modify
	+# it under the terms of the GNU General Public License as published by
	+# the Free Software Foundation; either version 2, or (at your option)
	+# any later version.
	+
	+# This program is distributed in the hope that it will be useful,
	+# but WITHOUT ANY WARRANTY; without even the implied warranty of
	+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	+# GNU General Public License for more details.
	+
	+# You should have received a copy of the GNU General Public License
	+# along with this program; if not, write to the Free Software
	+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
	+# 02110-1301, USA.
	+
	+# As a special exception to the GNU General Public License, if you
	+# distribute this file as part of a program that contains a
	+# configuration script generated by Autoconf, you may include it under
	+# the same distribution terms that you use for the rest of that program.
	+
	+# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
	+
	+case $1 in
	+ '')
	+ echo "$0: No command. Try \`$0 --help' for more information." 1>&2
	+ exit 1;
	+ ;;
	+ -h \| --h*)
	+ cat <<\EOF
	+Usage: depcomp [--help] [--version] PROGRAM [ARGS]
	+
	+Run PROGRAMS ARGS to compile a file, generating dependencies
	+as side-effects.
	+
	+Environment variables:
	+ depmode Dependency tracking mode.
	+ source Source file read by `PROGRAMS ARGS'.
	+ object Object file output by `PROGRAMS ARGS'.
	+ DEPDIR directory where to store dependencies.
	+ depfile Dependency file to output.
	+ tmpdepfile Temporary file to use when outputing dependencies.
	+ libtool Whether libtool is used (yes/no).
	+
	+Report bugs to <bug-automake@gnu.org>.
	+EOF
	+ exit $?
	+ ;;
	+ -v \| --v*)
	+ echo "depcomp $scriptversion"
	+ exit $?
	+ ;;
	+esac
	+
	+if test -z "$depmode" \|\| test -z "$source" \|\| test -z "$object"; then
	+ echo "depcomp: Variables source, object and depmode must be set" 1>&2
	+ exit 1
	+fi
	+
	+# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
	+depfile=${depfile-`echo "$object" \|
	+ sed 's\|[^\\/]$\|'${DEPDIR-.deps}'/&\|;s\|\.$[^.]$$\|.P\1\|;s\|Pobj$\|Po\|'`}
	+tmpdepfile=${tmpdepfile-`echo "$depfile" \| sed 's/\.$[^.]*$$/.T\1/'`}
	+
	+rm -f "$tmpdepfile"
	+
	+# Some modes work just like other modes, but use different flags. We
	+# parameterize here, but still list the modes in the big case below,
	+# to make depend.m4 easier to write. Note that we cannot use a case
	+# here, because this file can only contain one case statement.
	+if test "$depmode" = hp; then
	+ # HP compiler uses -M and no extra arg.
	+ gccflag=-M
	+ depmode=gcc
	+fi
	+
	+if test "$depmode" = dashXmstdout; then
	+ # This is just like dashmstdout with a different argument.
	+ dashmflag=-xM
	+ depmode=dashmstdout
	+fi
	+
	+case "$depmode" in
	+gcc3)
	+## gcc 3 implements dependency tracking that does exactly what
	+## we want. Yay! Note: for some reason libtool 1.4 doesn't like
	+## it if -MD -MP comes after the -MF stuff. Hmm.
	+## Unfortunately, FreeBSD c89 acceptance of flags depends upon
	+## the command line argument order; so add the flags where they
	+## appear in depend2.am. Note that the slowdown incurred here
	+## affects only configure: in makefiles, %FASTDEP% shortcuts this.
	+ for arg
	+ do
	+ case $arg in
	+ -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
	+ *) set fnord "$@" "$arg" ;;
	+ esac
	+ shift # fnord
	+ shift # $arg
	+ done
	+ "$@"
	+ stat=$?
	+ if test $stat -eq 0; then :
	+ else
	+ rm -f "$tmpdepfile"
	+ exit $stat
	+ fi
	+ mv "$tmpdepfile" "$depfile"
	+ ;;
	+
	+gcc)
	+## There are various ways to get dependency output from gcc. Here's
	+## why we pick this rather obscure method:
	+## - Don't want to use -MD because we'd like the dependencies to end
	+## up in a subdir. Having to rename by hand is ugly.
	+## (We might end up doing this anyway to support other compilers.)
	+## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
	+## -MM, not -M (despite what the docs say).
	+## - Using -M directly means running the compiler twice (even worse
	+## than renaming).
	+ if test -z "$gccflag"; then
	+ gccflag=-MD,
	+ fi
	+ "$@" -Wp,"$gccflag$tmpdepfile"
	+ stat=$?
	+ if test $stat -eq 0; then :
	+ else
	+ rm -f "$tmpdepfile"
	+ exit $stat
	+ fi
	+ rm -f "$depfile"
	+ echo "$object : \\" > "$depfile"
	+ alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
	+## The second -e expression handles DOS-style file names with drive letters.
	+ sed -e 's/^[^:]*: / /' \
	+ -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
	+## This next piece of magic avoids the `deleted header file' problem.
	+## The problem is that when a header file which appears in a .P file
	+## is deleted, the dependency causes make to die (because there is
	+## typically no way to rebuild the header). We avoid this by adding
	+## dummy dependencies for each header file. Too bad gcc doesn't do
	+## this for us directly.
	+ tr ' ' '
	+' < "$tmpdepfile" \|
	+## Some versions of gcc put a space before the `:'. On the theory
	+## that the space means something, we add a space to the output as
	+## well.
	+## Some versions of the HPUX 10.20 sed can't process this invocation
	+## correctly. Breaking it into two sed invocations is a workaround.
	+ sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \| sed -e 's/$/ :/' >> "$depfile"
	+ rm -f "$tmpdepfile"
	+ ;;
	+
	+hp)
	+ # This case exists only to let depend.m4 do its work. It works by
	+ # looking at the text of this script. This case will never be run,
	+ # since it is checked for above.
	+ exit 1
	+ ;;
	+
	+sgi)
	+ if test "$libtool" = yes; then
	+ "$@" "-Wp,-MDupdate,$tmpdepfile"
	+ else
	+ "$@" -MDupdate "$tmpdepfile"
	+ fi
	+ stat=$?
	+ if test $stat -eq 0; then :
	+ else
	+ rm -f "$tmpdepfile"
	+ exit $stat
	+ fi
	+ rm -f "$depfile"
	+
	+ if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files
	+ echo "$object : \\" > "$depfile"
	+
	+ # Clip off the initial element (the dependent). Don't try to be
	+ # clever and replace this with sed code, as IRIX sed won't handle
	+ # lines with more than a fixed number of characters (4096 in
	+ # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines;
	+ # the IRIX cc adds comments like `#:fec' to the end of the
	+ # dependency line.
	+ tr ' ' '
	+' < "$tmpdepfile" \
	+ \| sed -e 's/^.\.o://' -e 's/#.$//' -e '/^$/ d' \| \
	+ tr '
	+' ' ' >> $depfile
	+ echo >> $depfile
	+
	+ # The second pass generates a dummy entry for each header file.
	+ tr ' ' '
	+' < "$tmpdepfile" \
	+ \| sed -e 's/^.\.o://' -e 's/#.$//' -e '/^$/ d' -e 's/$/:/' \
	+ >> $depfile
	+ else
	+ # The sourcefile does not contain any dependencies, so just
	+ # store a dummy comment line, to avoid errors with the Makefile
	+ # "include basename.Plo" scheme.
	+ echo "#dummy" > "$depfile"
	+ fi
	+ rm -f "$tmpdepfile"
	+ ;;
	+
	+aix)
	+ # The C for AIX Compiler uses -M and outputs the dependencies
	+ # in a .u file. In older versions, this file always lives in the
	+ # current directory. Also, the AIX compiler puts `$object:' at the
	+ # start of each line; $object doesn't have directory information.
	+ # Version 6 uses the directory in both cases.
	+ dir=`echo "$object" \| sed -e 's\|/[^/]*$\|/\|'`
	+ test "x$dir" = "x$object" && dir=
	+ base=`echo "$object" \| sed -e 's\|^.*/\|\|' -e 's/\.o$//' -e 's/\.lo$//'`
	+ if test "$libtool" = yes; then
	+ tmpdepfile1=$dir$base.u
	+ tmpdepfile2=$base.u
	+ tmpdepfile3=$dir.libs/$base.u
	+ "$@" -Wc,-M
	+ else
	+ tmpdepfile1=$dir$base.u
	+ tmpdepfile2=$dir$base.u
	+ tmpdepfile3=$dir$base.u
	+ "$@" -M
	+ fi
	+ stat=$?
	+
	+ if test $stat -eq 0; then :
	+ else
	+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
	+ exit $stat
	+ fi
	+
	+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3"
	+ do
	+ test -f "$tmpdepfile" && break
	+ done
	+ if test -f "$tmpdepfile"; then
	+ # Each line is of the form `foo.o: dependent.h'.
	+ # Do two passes, one to just change these to
	+ # `$object: dependent.h' and one to simply `dependent.h:'.
	+ sed -e "s,^.\.[a-z]:,$object:," < "$tmpdepfile" > "$depfile"
	+ # That's a tab and a space in the [].
	+ sed -e 's,^.\.[a-z]:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
	+ else
	+ # The sourcefile does not contain any dependencies, so just
	+ # store a dummy comment line, to avoid errors with the Makefile
	+ # "include basename.Plo" scheme.
	+ echo "#dummy" > "$depfile"
	+ fi
	+ rm -f "$tmpdepfile"
	+ ;;
	+
	+icc)
	+ # Intel's C compiler understands `-MD -MF file'. However on
	+ # icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
	+ # ICC 7.0 will fill foo.d with something like
	+ # foo.o: sub/foo.c
	+ # foo.o: sub/foo.h
	+ # which is wrong. We want:
	+ # sub/foo.o: sub/foo.c
	+ # sub/foo.o: sub/foo.h
	+ # sub/foo.c:
	+ # sub/foo.h:
	+ # ICC 7.1 will output
	+ # foo.o: sub/foo.c sub/foo.h
	+ # and will wrap long lines using \ :
	+ # foo.o: sub/foo.c ... \
	+ # sub/foo.h ... \
	+ # ...
	+
	+ "$@" -MD -MF "$tmpdepfile"
	+ stat=$?
	+ if test $stat -eq 0; then :
	+ else
	+ rm -f "$tmpdepfile"
	+ exit $stat
	+ fi
	+ rm -f "$depfile"
	+ # Each line is of the form `foo.o: dependent.h',
	+ # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
	+ # Do two passes, one to just change these to
	+ # `$object: dependent.h' and one to simply `dependent.h:'.
	+ sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
	+ # Some versions of the HPUX 10.20 sed can't process this invocation
	+ # correctly. Breaking it into two sed invocations is a workaround.
	+ sed 's,^[^:]: $.$$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" \|
	+ sed -e 's/$/ :/' >> "$depfile"
	+ rm -f "$tmpdepfile"
	+ ;;
	+
	+hp2)
	+ # The "hp" stanza above does not work with aCC (C++) and HP's ia64
	+ # compilers, which have integrated preprocessors. The correct option
	+ # to use with these is +Maked; it writes dependencies to a file named
	+ # 'foo.d', which lands next to the object file, wherever that
	+ # happens to be.
	+ # Much of this is similar to the tru64 case; see comments there.
	+ dir=`echo "$object" \| sed -e 's\|/[^/]*$\|/\|'`
	+ test "x$dir" = "x$object" && dir=
	+ base=`echo "$object" \| sed -e 's\|^.*/\|\|' -e 's/\.o$//' -e 's/\.lo$//'`
	+ if test "$libtool" = yes; then
	+ tmpdepfile1=$dir$base.d
	+ tmpdepfile2=$dir.libs/$base.d
	+ "$@" -Wc,+Maked
	+ else
	+ tmpdepfile1=$dir$base.d
	+ tmpdepfile2=$dir$base.d
	+ "$@" +Maked
	+ fi
	+ stat=$?
	+ if test $stat -eq 0; then :
	+ else
	+ rm -f "$tmpdepfile1" "$tmpdepfile2"
	+ exit $stat
	+ fi
	+
	+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
	+ do
	+ test -f "$tmpdepfile" && break
	+ done
	+ if test -f "$tmpdepfile"; then
	+ sed -e "s,^.\.[a-z]:,$object:," "$tmpdepfile" > "$depfile"
	+ # Add `dependent.h:' lines.
	+ sed -ne '2,${; s/^ //; s/ \\$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
	+ else
	+ echo "#dummy" > "$depfile"
	+ fi
	+ rm -f "$tmpdepfile" "$tmpdepfile2"
	+ ;;
	+
	+tru64)
	+ # The Tru64 compiler uses -MD to generate dependencies as a side
	+ # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
	+ # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
	+ # dependencies in `foo.d' instead, so we check for that too.
	+ # Subdirectories are respected.
	+ dir=`echo "$object" \| sed -e 's\|/[^/]*$\|/\|'`
	+ test "x$dir" = "x$object" && dir=
	+ base=`echo "$object" \| sed -e 's\|^.*/\|\|' -e 's/\.o$//' -e 's/\.lo$//'`
	+
	+ if test "$libtool" = yes; then
	+ # With Tru64 cc, shared objects can also be used to make a
	+ # static library. This mechanism is used in libtool 1.4 series to
	+ # handle both shared and static libraries in a single compilation.
	+ # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
	+ #
	+ # With libtool 1.5 this exception was removed, and libtool now
	+ # generates 2 separate objects for the 2 libraries. These two
	+ # compilations output dependencies in $dir.libs/$base.o.d and
	+ # in $dir$base.o.d. We have to check for both files, because
	+ # one of the two compilations can be disabled. We should prefer
	+ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
	+ # automatically cleaned when .libs/ is deleted, while ignoring
	+ # the former would cause a distcleancheck panic.
	+ tmpdepfile1=$dir.libs/$base.lo.d # libtool 1.4
	+ tmpdepfile2=$dir$base.o.d # libtool 1.5
	+ tmpdepfile3=$dir.libs/$base.o.d # libtool 1.5
	+ tmpdepfile4=$dir.libs/$base.d # Compaq CCC V6.2-504
	+ "$@" -Wc,-MD
	+ else
	+ tmpdepfile1=$dir$base.o.d
	+ tmpdepfile2=$dir$base.d
	+ tmpdepfile3=$dir$base.d
	+ tmpdepfile4=$dir$base.d
	+ "$@" -MD
	+ fi
	+
	+ stat=$?
	+ if test $stat -eq 0; then :
	+ else
	+ rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
	+ exit $stat
	+ fi
	+
	+ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
	+ do
	+ test -f "$tmpdepfile" && break
	+ done
	+ if test -f "$tmpdepfile"; then
	+ sed -e "s,^.\.[a-z]:,$object:," < "$tmpdepfile" > "$depfile"
	+ # That's a tab and a space in the [].
	+ sed -e 's,^.\.[a-z]:[ ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
	+ else
	+ echo "#dummy" > "$depfile"
	+ fi
	+ rm -f "$tmpdepfile"
	+ ;;
	+
	+#nosideeffect)
	+ # This comment above is used by automake to tell side-effect
	+ # dependency tracking mechanisms from slower ones.
	+
	+dashmstdout)
	+ # Important note: in order to support this mode, a compiler must
	+ # always write the preprocessed file to stdout, regardless of -o.
	+ "$@" \|\| exit $?
	+
	+ # Remove the call to Libtool.
	+ if test "$libtool" = yes; then
	+ while test $1 != '--mode=compile'; do
	+ shift
	+ done
	+ shift
	+ fi
	+
	+ # Remove `-o $object'.
	+ IFS=" "
	+ for arg
	+ do
	+ case $arg in
	+ -o)
	+ shift
	+ ;;
	+ $object)
	+ shift
	+ ;;
	+ *)
	+ set fnord "$@" "$arg"
	+ shift # fnord
	+ shift # $arg
	+ ;;
	+ esac
	+ done
	+
	+ test -z "$dashmflag" && dashmflag=-M
	+ # Require at least two characters before searching for `:'
	+ # in the target name. This is to cope with DOS-style filenames:
	+ # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
	+ "$@" $dashmflag \|
	+ sed 's:^[ ][^: ][^:][^:]\:[ ]*:'"$object"'\: :' > "$tmpdepfile"
	+ rm -f "$depfile"
	+ cat < "$tmpdepfile" > "$depfile"
	+ tr ' ' '
	+' < "$tmpdepfile" \| \
	+## Some versions of the HPUX 10.20 sed can't process this invocation
	+## correctly. Breaking it into two sed invocations is a workaround.
	+ sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \| sed -e 's/$/ :/' >> "$depfile"
	+ rm -f "$tmpdepfile"
	+ ;;
	+
	+dashXmstdout)
	+ # This case only exists to satisfy depend.m4. It is never actually
	+ # run, as this mode is specially recognized in the preamble.
	+ exit 1
	+ ;;
	+
	+makedepend)
	+ "$@" \|\| exit $?
	+ # Remove any Libtool call
	+ if test "$libtool" = yes; then
	+ while test $1 != '--mode=compile'; do
	+ shift
	+ done
	+ shift
	+ fi
	+ # X makedepend
	+ shift
	+ cleared=no
	+ for arg in "$@"; do
	+ case $cleared in
	+ no)
	+ set ""; shift
	+ cleared=yes ;;
	+ esac
	+ case "$arg" in
	+ -D\|-I)
	+ set fnord "$@" "$arg"; shift ;;
	+ # Strip any option that makedepend may not understand. Remove
	+ # the object too, otherwise makedepend will parse it as a source file.
	+ -*\|$object)
	+ ;;
	+ *)
	+ set fnord "$@" "$arg"; shift ;;
	+ esac
	+ done
	+ obj_suffix="`echo $object \| sed 's/^.*\././'`"
	+ touch "$tmpdepfile"
	+ ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
	+ rm -f "$depfile"
	+ cat < "$tmpdepfile" > "$depfile"
	+ sed '1,2d' "$tmpdepfile" \| tr ' ' '
	+' \| \
	+## Some versions of the HPUX 10.20 sed can't process this invocation
	+## correctly. Breaking it into two sed invocations is a workaround.
	+ sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' \| sed -e 's/$/ :/' >> "$depfile"
	+ rm -f "$tmpdepfile" "$tmpdepfile".bak
	+ ;;
	+
	+cpp)
	+ # Important note: in order to support this mode, a compiler must
	+ # always write the preprocessed file to stdout.
	+ "$@" \|\| exit $?
	+
	+ # Remove the call to Libtool.
	+ if test "$libtool" = yes; then
	+ while test $1 != '--mode=compile'; do
	+ shift
	+ done
	+ shift
	+ fi
	+
	+ # Remove `-o $object'.
	+ IFS=" "
	+ for arg
	+ do
	+ case $arg in
	+ -o)
	+ shift
	+ ;;
	+ $object)
	+ shift
	+ ;;
	+ *)
	+ set fnord "$@" "$arg"
	+ shift # fnord
	+ shift # $arg
	+ ;;
	+ esac
	+ done
	+
	+ "$@" -E \|
	+ sed -n -e '/^# [0-9][0-9]* "$[^"]$"./ s:: \1 \\:p' \
	+ -e '/^#line [0-9][0-9]* "$[^"]$"./ s:: \1 \\:p' \|
	+ sed '$ s: \\$::' > "$tmpdepfile"
	+ rm -f "$depfile"
	+ echo "$object : \\" > "$depfile"
	+ cat < "$tmpdepfile" >> "$depfile"
	+ sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
	+ rm -f "$tmpdepfile"
	+ ;;
	+
	+msvisualcpp)
	+ # Important note: in order to support this mode, a compiler must
	+ # always write the preprocessed file to stdout, regardless of -o,
	+ # because we must use -o when running libtool.
	+ "$@" \|\| exit $?
	+ IFS=" "
	+ for arg
	+ do
	+ case "$arg" in
	+ "-Gm"\|"/Gm"\|"-Gi"\|"/Gi"\|"-ZI"\|"/ZI")
	+ set fnord "$@"
	+ shift
	+ shift
	+ ;;
	+ *)
	+ set fnord "$@" "$arg"
	+ shift
	+ shift
	+ ;;
	+ esac
	+ done
	+ "$@" -E \|
	+ sed -n '/^#line [0-9][0-9]* "$[^"]*$"/ s::echo "`cygpath -u \\"\1\\"`":p' \| sort \| uniq > "$tmpdepfile"
	+ rm -f "$depfile"
	+ echo "$object : \\" > "$depfile"
	+ . "$tmpdepfile" \| sed 's% %\\ %g' \| sed -n '/^$.*$$/ s:: \1 \\:p' >> "$depfile"
	+ echo " " >> "$depfile"
	+ . "$tmpdepfile" \| sed 's% %\\ %g' \| sed -n '/^$.*$$/ s::\1\::p' >> "$depfile"
	+ rm -f "$tmpdepfile"
	+ ;;
	+
	+none)
	+ exec "$@"
	+ ;;
	+
	+*)
	+ echo "Unknown depmode $depmode" 1>&2
	+ exit 1
	+ ;;
	+esac
	+
	+exit 0
	+
	+# Local Variables:
	+# mode: shell-script
	+# sh-indentation: 2
	+# eval: (add-hook 'write-file-hooks 'time-stamp)
	+# time-stamp-start: "scriptversion="
	+# time-stamp-format: "%:y-%02m-%02d.%02H"
	+# time-stamp-end: "$"
	+# End:
	diff --git a/tags/xmount-0.7.0/old_build/install-sh b/tags/xmount-0.7.0/old_build/install-sh
	new file mode 100755
	index 0000000..a5897de
	--- /dev/null
	+++ b/tags/xmount-0.7.0/old_build/install-sh
	@@ -0,0 +1,519 @@
	+#!/bin/sh
	+# install - install a program, script, or datafile
	+
	+scriptversion=2006-12-25.00
	+
	+# This originates from X11R5 (mit/util/scripts/install.sh), which was
	+# later released in X11R6 (xc/config/util/install.sh) with the
	+# following copyright and license.
	+#
	+# Copyright (C) 1994 X Consortium
	+#
	+# Permission is hereby granted, free of charge, to any person obtaining a copy
	+# of this software and associated documentation files (the "Software"), to
	+# deal in the Software without restriction, including without limitation the
	+# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
	+# sell copies of the Software, and to permit persons to whom the Software is
	+# furnished to do so, subject to the following conditions:
	+#
	+# The above copyright notice and this permission notice shall be included in
	+# all copies or substantial portions of the Software.
	+#
	+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
	+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
	+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
	+# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
	+# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
	+# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
	+#
	+# Except as contained in this notice, the name of the X Consortium shall not
	+# be used in advertising or otherwise to promote the sale, use or other deal-
	+# ings in this Software without prior written authorization from the X Consor-
	+# tium.
	+#
	+#
	+# FSF changes to this file are in the public domain.
	+#
	+# Calling this script install-sh is preferred over install.sh, to prevent
	+# `make' implicit rules from creating a file called install from it
	+# when there is no Makefile.
	+#
	+# This script is compatible with the BSD install script, but was written
	+# from scratch.
	+
	+nl='
	+'
	+IFS=" "" $nl"
	+
	+# set DOITPROG to echo to test this script
	+
	+# Don't use :- since 4.3BSD and earlier shells don't like it.
	+doit=${DOITPROG-}
	+if test -z "$doit"; then
	+ doit_exec=exec
	+else
	+ doit_exec=$doit
	+fi
	+
	+# Put in absolute file names if you don't have them in your path;
	+# or use environment vars.
	+
	+chgrpprog=${CHGRPPROG-chgrp}
	+chmodprog=${CHMODPROG-chmod}
	+chownprog=${CHOWNPROG-chown}
	+cmpprog=${CMPPROG-cmp}
	+cpprog=${CPPROG-cp}
	+mkdirprog=${MKDIRPROG-mkdir}
	+mvprog=${MVPROG-mv}
	+rmprog=${RMPROG-rm}
	+stripprog=${STRIPPROG-strip}
	+
	+posix_glob='?'
	+initialize_posix_glob='
	+ test "$posix_glob" != "?" \|\| {
	+ if (set -f) 2>/dev/null; then
	+ posix_glob=
	+ else
	+ posix_glob=:
	+ fi
	+ }
	+'
	+
	+posix_mkdir=
	+
	+# Desired mode of installed file.
	+mode=0755
	+
	+chgrpcmd=
	+chmodcmd=$chmodprog
	+chowncmd=
	+mvcmd=$mvprog
	+rmcmd="$rmprog -f"
	+stripcmd=
	+
	+src=
	+dst=
	+dir_arg=
	+dst_arg=
	+
	+copy_on_change=false
	+no_target_directory=
	+
	+usage="\
	+Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
	+ or: $0 [OPTION]... SRCFILES... DIRECTORY
	+ or: $0 [OPTION]... -t DIRECTORY SRCFILES...
	+ or: $0 [OPTION]... -d DIRECTORIES...
	+
	+In the 1st form, copy SRCFILE to DSTFILE.
	+In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
	+In the 4th, create DIRECTORIES.
	+
	+Options:
	+ --help display this help and exit.
	+ --version display version info and exit.
	+
	+ -c (ignored)
	+ -C install only if different (preserve the last data modification time)
	+ -d create directories instead of installing files.
	+ -g GROUP $chgrpprog installed files to GROUP.
	+ -m MODE $chmodprog installed files to MODE.
	+ -o USER $chownprog installed files to USER.
	+ -s $stripprog installed files.
	+ -t DIRECTORY install into DIRECTORY.
	+ -T report an error if DSTFILE is a directory.
	+
	+Environment variables override the default commands:
	+ CHGRPPROG CHMODPROG CHOWNPROG CMPPROG CPPROG MKDIRPROG MVPROG
	+ RMPROG STRIPPROG
	+"
	+
	+while test $# -ne 0; do
	+ case $1 in
	+ -c) ;;
	+
	+ -C) copy_on_change=true;;
	+
	+ -d) dir_arg=true;;
	+
	+ -g) chgrpcmd="$chgrpprog $2"
	+ shift;;
	+
	+ --help) echo "$usage"; exit $?;;
	+
	+ -m) mode=$2
	+ case $mode in
	+ ' ' \| ' ' \| *'
	+'* \| ''* \| '?' \| '[')
	+ echo "$0: invalid mode: $mode" >&2
	+ exit 1;;
	+ esac
	+ shift;;
	+
	+ -o) chowncmd="$chownprog $2"
	+ shift;;
	+
	+ -s) stripcmd=$stripprog;;
	+
	+ -t) dst_arg=$2
	+ shift;;
	+
	+ -T) no_target_directory=true;;
	+
	+ --version) echo "$0 $scriptversion"; exit $?;;
	+
	+ --) shift
	+ break;;
	+
	+ -*) echo "$0: invalid option: $1" >&2
	+ exit 1;;
	+
	+ *) break;;
	+ esac
	+ shift
	+done
	+
	+if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then
	+ # When -d is used, all remaining arguments are directories to create.
	+ # When -t is used, the destination is already specified.
	+ # Otherwise, the last argument is the destination. Remove it from $@.
	+ for arg
	+ do
	+ if test -n "$dst_arg"; then
	+ # $@ is not empty: it contains at least $arg.
	+ set fnord "$@" "$dst_arg"
	+ shift # fnord
	+ fi
	+ shift # arg
	+ dst_arg=$arg
	+ done
	+fi
	+
	+if test $# -eq 0; then
	+ if test -z "$dir_arg"; then
	+ echo "$0: no input file specified." >&2
	+ exit 1
	+ fi
	+ # It's OK to call `install-sh -d' without argument.
	+ # This can happen when creating conditional directories.
	+ exit 0
	+fi
	+
	+if test -z "$dir_arg"; then
	+ trap '(exit $?); exit' 1 2 13 15
	+
	+ # Set umask so as not to create temps with too-generous modes.
	+ # However, 'strip' requires both read and write access to temps.
	+ case $mode in
	+ # Optimize common cases.
	+ *644) cp_umask=133;;
	+ *755) cp_umask=22;;
	+
	+ *[0-7])
	+ if test -z "$stripcmd"; then
	+ u_plus_rw=
	+ else
	+ u_plus_rw='% 200'
	+ fi
	+ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
	+ *)
	+ if test -z "$stripcmd"; then
	+ u_plus_rw=
	+ else
	+ u_plus_rw=,u+rw
	+ fi
	+ cp_umask=$mode$u_plus_rw;;
	+ esac
	+fi
	+
	+for src
	+do
	+ # Protect names starting with `-'.
	+ case $src in
	+ -*) src=./$src;;
	+ esac
	+
	+ if test -n "$dir_arg"; then
	+ dst=$src
	+ dstdir=$dst
	+ test -d "$dstdir"
	+ dstdir_status=$?
	+ else
	+
	+ # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
	+ # might cause directories to be created, which would be especially bad
	+ # if $src (and thus $dsttmp) contains '*'.
	+ if test ! -f "$src" && test ! -d "$src"; then
	+ echo "$0: $src does not exist." >&2
	+ exit 1
	+ fi
	+
	+ if test -z "$dst_arg"; then
	+ echo "$0: no destination specified." >&2
	+ exit 1
	+ fi
	+
	+ dst=$dst_arg
	+ # Protect names starting with `-'.
	+ case $dst in
	+ -*) dst=./$dst;;
	+ esac
	+
	+ # If destination is a directory, append the input filename; won't work
	+ # if double slashes aren't ignored.
	+ if test -d "$dst"; then
	+ if test -n "$no_target_directory"; then
	+ echo "$0: $dst_arg: Is a directory" >&2
	+ exit 1
	+ fi
	+ dstdir=$dst
	+ dst=$dstdir/`basename "$src"`
	+ dstdir_status=0
	+ else
	+ # Prefer dirname, but fall back on a substitute if dirname fails.
	+ dstdir=`
	+ (dirname "$dst") 2>/dev/null \|\|
	+ expr X"$dst" : 'X$.[^/]$//[^/][^/]/$' \\| \
	+ X"$dst" : 'X$//$[^/]' \\| \
	+ X"$dst" : 'X$//$$' \\| \
	+ X"$dst" : 'X$/$' \\| . 2>/dev/null \|\|
	+ echo X"$dst" \|
	+ sed '/^X$.[^/]$\/\/[^/][^/]\/$/{
	+ s//\1/
	+ q
	+ }
	+ /^X$\/\/$[^/].*/{
	+ s//\1/
	+ q
	+ }
	+ /^X$\/\/$$/{
	+ s//\1/
	+ q
	+ }
	+ /^X$\/$.*/{
	+ s//\1/
	+ q
	+ }
	+ s/.*/./; q'
	+ `
	+
	+ test -d "$dstdir"
	+ dstdir_status=$?
	+ fi
	+ fi
	+
	+ obsolete_mkdir_used=false
	+
	+ if test $dstdir_status != 0; then
	+ case $posix_mkdir in
	+ '')
	+ # Create intermediate dirs using mode 755 as modified by the umask.
	+ # This is like FreeBSD 'install' as of 1997-10-28.
	+ umask=`umask`
	+ case $stripcmd.$umask in
	+ # Optimize common cases.
	+ *[2367][2367]) mkdir_umask=$umask;;
	+ .*0[02][02] \| .[02][02] \| .[02]) mkdir_umask=22;;
	+
	+ *[0-7])
	+ mkdir_umask=`expr $umask + 22 \
	+ - $umask % 100 % 40 + $umask % 20 \
	+ - $umask % 10 % 4 + $umask % 2
	+ `;;
	+ *) mkdir_umask=$umask,go-w;;
	+ esac
	+
	+ # With -d, create the new directory with the user-specified mode.
	+ # Otherwise, rely on $mkdir_umask.
	+ if test -n "$dir_arg"; then
	+ mkdir_mode=-m$mode
	+ else
	+ mkdir_mode=
	+ fi
	+
	+ posix_mkdir=false
	+ case $umask in
	+ *[123567][0-7][0-7])
	+ # POSIX mkdir -p sets u+wx bits regardless of umask, which
	+ # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
	+ ;;
	+ *)
	+ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
	+ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
	+
	+ if (umask $mkdir_umask &&
	+ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
	+ then
	+ if test -z "$dir_arg" \|\| {
	+ # Check for POSIX incompatibilities with -m.
	+ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
	+ # other-writeable bit of parent directory when it shouldn't.
	+ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
	+ ls_ld_tmpdir=`ls -ld "$tmpdir"`
	+ case $ls_ld_tmpdir in
	+ d????-?r-*) different_mode=700;;
	+ d????-?--*) different_mode=755;;
	+ *) false;;
	+ esac &&
	+ $mkdirprog -m$different_mode -p -- "$tmpdir" && {
	+ ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
	+ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
	+ }
	+ }
	+ then posix_mkdir=:
	+ fi
	+ rmdir "$tmpdir/d" "$tmpdir"
	+ else
	+ # Remove any dirs left behind by ancient mkdir implementations.
	+ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
	+ fi
	+ trap '' 0;;
	+ esac;;
	+ esac
	+
	+ if
	+ $posix_mkdir && (
	+ umask $mkdir_umask &&
	+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
	+ )
	+ then :
	+ else
	+
	+ # The umask is ridiculous, or mkdir does not conform to POSIX,
	+ # or it failed possibly due to a race condition. Create the
	+ # directory the slow way, step by step, checking for races as we go.
	+
	+ case $dstdir in
	+ /*) prefix='/';;
	+ -*) prefix='./';;
	+ *) prefix='';;
	+ esac
	+
	+ eval "$initialize_posix_glob"
	+
	+ oIFS=$IFS
	+ IFS=/
	+ $posix_glob set -f
	+ set fnord $dstdir
	+ shift
	+ $posix_glob set +f
	+ IFS=$oIFS
	+
	+ prefixes=
	+
	+ for d
	+ do
	+ test -z "$d" && continue
	+
	+ prefix=$prefix$d
	+ if test -d "$prefix"; then
	+ prefixes=
	+ else
	+ if $posix_mkdir; then
	+ (umask=$mkdir_umask &&
	+ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
	+ # Don't fail if two instances are running concurrently.
	+ test -d "$prefix" \|\| exit 1
	+ else
	+ case $prefix in
	+ \') qprefix=`echo "$prefix" \| sed "s/'/'\\\\\\\\''/g"`;;
	+ *) qprefix=$prefix;;
	+ esac
	+ prefixes="$prefixes '$qprefix'"
	+ fi
	+ fi
	+ prefix=$prefix/
	+ done
	+
	+ if test -n "$prefixes"; then
	+ # Don't fail if two instances are running concurrently.
	+ (umask $mkdir_umask &&
	+ eval "\$doit_exec \$mkdirprog $prefixes") \|\|
	+ test -d "$dstdir" \|\| exit 1
	+ obsolete_mkdir_used=true
	+ fi
	+ fi
	+ fi
	+
	+ if test -n "$dir_arg"; then
	+ { test -z "$chowncmd" \|\| $doit $chowncmd "$dst"; } &&
	+ { test -z "$chgrpcmd" \|\| $doit $chgrpcmd "$dst"; } &&
	+ { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false \|\|
	+ test -z "$chmodcmd" \|\| $doit $chmodcmd $mode "$dst"; } \|\| exit 1
	+ else
	+
	+ # Make a couple of temp file names in the proper directory.
	+ dsttmp=$dstdir/_inst.$$_
	+ rmtmp=$dstdir/_rm.$$_
	+
	+ # Trap to clean up those temp files at exit.
	+ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
	+
	+ # Copy the file name to the temp name.
	+ (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
	+
	+ # and set any options; do chmod last to preserve setuid bits.
	+ #
	+ # If any of these fail, we abort the whole thing. If we want to
	+ # ignore errors from any of these, just make sure not to ignore
	+ # errors from the above "$doit $cpprog $src $dsttmp" command.
	+ #
	+ { test -z "$chowncmd" \|\| $doit $chowncmd "$dsttmp"; } &&
	+ { test -z "$chgrpcmd" \|\| $doit $chgrpcmd "$dsttmp"; } &&
	+ { test -z "$stripcmd" \|\| $doit $stripcmd "$dsttmp"; } &&
	+ { test -z "$chmodcmd" \|\| $doit $chmodcmd $mode "$dsttmp"; } &&
	+
	+ # If -C, don't bother to copy if it wouldn't change the file.
	+ if $copy_on_change &&
	+ old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` &&
	+ new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` &&
	+
	+ eval "$initialize_posix_glob" &&
	+ $posix_glob set -f &&
	+ set X $old && old=:$2:$4:$5:$6 &&
	+ set X $new && new=:$2:$4:$5:$6 &&
	+ $posix_glob set +f &&
	+
	+ test "$old" = "$new" &&
	+ $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1
	+ then
	+ rm -f "$dsttmp"
	+ else
	+ # Rename the file to the real destination.
	+ $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \|\|
	+
	+ # The rename failed, perhaps because mv can't rename something else
	+ # to itself, or perhaps because mv is so ancient that it does not
	+ # support -f.
	+ {
	+ # Now remove or move aside any old file at destination location.
	+ # We try this two ways since rm can't unlink itself on some
	+ # systems and the destination file might be busy for other
	+ # reasons. In this case, the final cleanup might fail but the new
	+ # file should still install successfully.
	+ {
	+ test ! -f "$dst" \|\|
	+ $doit $rmcmd -f "$dst" 2>/dev/null \|\|
	+ { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null &&
	+ { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }
	+ } \|\|
	+ { echo "$0: cannot unlink or rename $dst" >&2
	+ (exit 1); exit 1
	+ }
	+ } &&
	+
	+ # Now rename the file to the real destination.
	+ $doit $mvcmd "$dsttmp" "$dst"
	+ }
	+ fi \|\| exit 1
	+
	+ trap '' 0
	+ fi
	+done
	+
	+# Local variables:
	+# eval: (add-hook 'write-file-hooks 'time-stamp)
	+# time-stamp-start: "scriptversion="
	+# time-stamp-format: "%:y-%02m-%02d.%02H"
	+# time-stamp-end: "$"
	+# End:
	diff --git a/tags/xmount-0.7.0/old_build/missing b/tags/xmount-0.7.0/old_build/missing
	new file mode 100755
	index 0000000..1c8ff70
	--- /dev/null
	+++ b/tags/xmount-0.7.0/old_build/missing
	@@ -0,0 +1,367 @@
	+#! /bin/sh
	+# Common stub for a few missing GNU programs while installing.
	+
	+scriptversion=2006-05-10.23
	+
	+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
	+# Free Software Foundation, Inc.
	+# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
	+
	+# This program is free software; you can redistribute it and/or modify
	+# it under the terms of the GNU General Public License as published by
	+# the Free Software Foundation; either version 2, or (at your option)
	+# any later version.
	+
	+# This program is distributed in the hope that it will be useful,
	+# but WITHOUT ANY WARRANTY; without even the implied warranty of
	+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	+# GNU General Public License for more details.
	+
	+# You should have received a copy of the GNU General Public License
	+# along with this program; if not, write to the Free Software
	+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
	+# 02110-1301, USA.
	+
	+# As a special exception to the GNU General Public License, if you
	+# distribute this file as part of a program that contains a
	+# configuration script generated by Autoconf, you may include it under
	+# the same distribution terms that you use for the rest of that program.
	+
	+if test $# -eq 0; then
	+ echo 1>&2 "Try \`$0 --help' for more information"
	+ exit 1
	+fi
	+
	+run=:
	+sed_output='s/.* --output[ =]$[^ ]$./\1/p'
	+sed_minuso='s/.* -o $[^ ]$./\1/p'
	+
	+# In the cases where this matters, `missing' is being run in the
	+# srcdir already.
	+if test -f configure.ac; then
	+ configure_ac=configure.ac
	+else
	+ configure_ac=configure.in
	+fi
	+
	+msg="missing on your system"
	+
	+case $1 in
	+--run)
	+ # Try to run requested program, and just exit if it succeeds.
	+ run=
	+ shift
	+ "$@" && exit 0
	+ # Exit code 63 means version mismatch. This often happens
	+ # when the user try to use an ancient version of a tool on
	+ # a file that requires a minimum version. In this case we
	+ # we should proceed has if the program had been absent, or
	+ # if --run hadn't been passed.
	+ if test $? = 63; then
	+ run=:
	+ msg="probably too old"
	+ fi
	+ ;;
	+
	+ -h\|--h\|--he\|--hel\|--help)
	+ echo "\
	+$0 [OPTION]... PROGRAM [ARGUMENT]...
	+
	+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
	+error status if there is no known handling for PROGRAM.
	+
	+Options:
	+ -h, --help display this help and exit
	+ -v, --version output version information and exit
	+ --run try to run the given command, and emulate it if it fails
	+
	+Supported PROGRAM values:
	+ aclocal touch file \`aclocal.m4'
	+ autoconf touch file \`configure'
	+ autoheader touch file \`config.h.in'
	+ autom4te touch the output file, or create a stub one
	+ automake touch all \`Makefile.in' files
	+ bison create \`y.tab.[ch]', if possible, from existing .[ch]
	+ flex create \`lex.yy.c', if possible, from existing .c
	+ help2man touch the output file
	+ lex create \`lex.yy.c', if possible, from existing .c
	+ makeinfo touch the output file
	+ tar try tar, gnutar, gtar, then tar without non-portable flags
	+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
	+
	+Send bug reports to <bug-automake@gnu.org>."
	+ exit $?
	+ ;;
	+
	+ -v\|--v\|--ve\|--ver\|--vers\|--versi\|--versio\|--version)
	+ echo "missing $scriptversion (GNU Automake)"
	+ exit $?
	+ ;;
	+
	+ -*)
	+ echo 1>&2 "$0: Unknown \`$1' option"
	+ echo 1>&2 "Try \`$0 --help' for more information"
	+ exit 1
	+ ;;
	+
	+esac
	+
	+# Now exit if we have it, but it failed. Also exit now if we
	+# don't have it and --version was passed (most likely to detect
	+# the program).
	+case $1 in
	+ lex\|yacc)
	+ # Not GNU programs, they don't have --version.
	+ ;;
	+
	+ tar)
	+ if test -n "$run"; then
	+ echo 1>&2 "ERROR: \`tar' requires --run"
	+ exit 1
	+ elif test "x$2" = "x--version" \|\| test "x$2" = "x--help"; then
	+ exit 1
	+ fi
	+ ;;
	+
	+ *)
	+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
	+ # We have it, but it failed.
	+ exit 1
	+ elif test "x$2" = "x--version" \|\| test "x$2" = "x--help"; then
	+ # Could not run --version or --help. This is probably someone
	+ # running `$TOOL --version' or `$TOOL --help' to check whether
	+ # $TOOL exists and not knowing $TOOL uses missing.
	+ exit 1
	+ fi
	+ ;;
	+esac
	+
	+# If it does not exist, or fails to run (possibly an outdated version),
	+# try to emulate it.
	+case $1 in
	+ aclocal*)
	+ echo 1>&2 "\
	+WARNING: \`$1' is $msg. You should only need it if
	+ you modified \`acinclude.m4' or \`${configure_ac}'. You might want
	+ to install the \`Automake' and \`Perl' packages. Grab them from
	+ any GNU archive site."
	+ touch aclocal.m4
	+ ;;
	+
	+ autoconf)
	+ echo 1>&2 "\
	+WARNING: \`$1' is $msg. You should only need it if
	+ you modified \`${configure_ac}'. You might want to install the
	+ \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
	+ archive site."
	+ touch configure
	+ ;;
	+
	+ autoheader)
	+ echo 1>&2 "\
	+WARNING: \`$1' is $msg. You should only need it if
	+ you modified \`acconfig.h' or \`${configure_ac}'. You might want
	+ to install the \`Autoconf' and \`GNU m4' packages. Grab them
	+ from any GNU archive site."
	+ files=`sed -n 's/^[ ]A[CM]_CONFIG_HEADER($[^)]$).*/\1/p' ${configure_ac}`
	+ test -z "$files" && files="config.h"
	+ touch_files=
	+ for f in $files; do
	+ case $f in
	+ :) touch_files="$touch_files "`echo "$f" \|
	+ sed -e 's/^[^:]://' -e 's/:.//'`;;
	+ *) touch_files="$touch_files $f.in";;
	+ esac
	+ done
	+ touch $touch_files
	+ ;;
	+
	+ automake*)
	+ echo 1>&2 "\
	+WARNING: \`$1' is $msg. You should only need it if
	+ you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
	+ You might want to install the \`Automake' and \`Perl' packages.
	+ Grab them from any GNU archive site."
	+ find . -type f -name Makefile.am -print \|
	+ sed 's/\.am$/.in/' \|
	+ while read f; do touch "$f"; done
	+ ;;
	+
	+ autom4te)
	+ echo 1>&2 "\
	+WARNING: \`$1' is needed, but is $msg.
	+ You might have modified some files without having the
	+ proper tools for further handling them.
	+ You can get \`$1' as part of \`Autoconf' from any GNU
	+ archive site."
	+
	+ file=`echo "$*" \| sed -n "$sed_output"`
	+ test -z "$file" && file=`echo "$*" \| sed -n "$sed_minuso"`
	+ if test -f "$file"; then
	+ touch $file
	+ else
	+ test -z "$file" \|\| exec >$file
	+ echo "#! /bin/sh"
	+ echo "# Created by GNU Automake missing as a replacement of"
	+ echo "# $ $@"
	+ echo "exit 0"
	+ chmod +x $file
	+ exit 1
	+ fi
	+ ;;
	+
	+ bison\|yacc)
	+ echo 1>&2 "\
	+WARNING: \`$1' $msg. You should only need it if
	+ you modified a \`.y' file. You may need the \`Bison' package
	+ in order for those modifications to take effect. You can get
	+ \`Bison' from any GNU archive site."
	+ rm -f y.tab.c y.tab.h
	+ if test $# -ne 1; then
	+ eval LASTARG="\${$#}"
	+ case $LASTARG in
	+ *.y)
	+ SRCFILE=`echo "$LASTARG" \| sed 's/y$/c/'`
	+ if test -f "$SRCFILE"; then
	+ cp "$SRCFILE" y.tab.c
	+ fi
	+ SRCFILE=`echo "$LASTARG" \| sed 's/y$/h/'`
	+ if test -f "$SRCFILE"; then
	+ cp "$SRCFILE" y.tab.h
	+ fi
	+ ;;
	+ esac
	+ fi
	+ if test ! -f y.tab.h; then
	+ echo >y.tab.h
	+ fi
	+ if test ! -f y.tab.c; then
	+ echo 'main() { return 0; }' >y.tab.c
	+ fi
	+ ;;
	+
	+ lex\|flex)
	+ echo 1>&2 "\
	+WARNING: \`$1' is $msg. You should only need it if
	+ you modified a \`.l' file. You may need the \`Flex' package
	+ in order for those modifications to take effect. You can get
	+ \`Flex' from any GNU archive site."
	+ rm -f lex.yy.c
	+ if test $# -ne 1; then
	+ eval LASTARG="\${$#}"
	+ case $LASTARG in
	+ *.l)
	+ SRCFILE=`echo "$LASTARG" \| sed 's/l$/c/'`
	+ if test -f "$SRCFILE"; then
	+ cp "$SRCFILE" lex.yy.c
	+ fi
	+ ;;
	+ esac
	+ fi
	+ if test ! -f lex.yy.c; then
	+ echo 'main() { return 0; }' >lex.yy.c
	+ fi
	+ ;;
	+
	+ help2man)
	+ echo 1>&2 "\
	+WARNING: \`$1' is $msg. You should only need it if
	+ you modified a dependency of a manual page. You may need the
	+ \`Help2man' package in order for those modifications to take
	+ effect. You can get \`Help2man' from any GNU archive site."
	+
	+ file=`echo "$*" \| sed -n "$sed_output"`
	+ test -z "$file" && file=`echo "$*" \| sed -n "$sed_minuso"`
	+ if test -f "$file"; then
	+ touch $file
	+ else
	+ test -z "$file" \|\| exec >$file
	+ echo ".ab help2man is required to generate this page"
	+ exit 1
	+ fi
	+ ;;
	+
	+ makeinfo)
	+ echo 1>&2 "\
	+WARNING: \`$1' is $msg. You should only need it if
	+ you modified a \`.texi' or \`.texinfo' file, or any other file
	+ indirectly affecting the aspect of the manual. The spurious
	+ call might also be the consequence of using a buggy \`make' (AIX,
	+ DU, IRIX). You might want to install the \`Texinfo' package or
	+ the \`GNU make' package. Grab either from any GNU archive site."
	+ # The file to touch is that specified with -o ...
	+ file=`echo "$*" \| sed -n "$sed_output"`
	+ test -z "$file" && file=`echo "$*" \| sed -n "$sed_minuso"`
	+ if test -z "$file"; then
	+ # ... or it is the one specified with @setfilename ...
	+ infile=`echo "$" \| sed 's/. $[^ ]$ $/\1/'`
	+ file=`sed -n '
	+ /^@setfilename/{
	+ s/.* $[^ ]$ $/\1/
	+ p
	+ q
	+ }' $infile`
	+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
	+ test -z "$file" && file=`echo "$infile" \| sed 's,./,,;s,.[^.]$,,'`.info
	+ fi
	+ # If the file does not exist, the user really needs makeinfo;
	+ # let's fail without touching anything.
	+ test -f $file \|\| exit 1
	+ touch $file
	+ ;;
	+
	+ tar)
	+ shift
	+
	+ # We have already tried tar in the generic part.
	+ # Look for gnutar/gtar before invocation to avoid ugly error
	+ # messages.
	+ if (gnutar --version > /dev/null 2>&1); then
	+ gnutar "$@" && exit 0
	+ fi
	+ if (gtar --version > /dev/null 2>&1); then
	+ gtar "$@" && exit 0
	+ fi
	+ firstarg="$1"
	+ if shift; then
	+ case $firstarg in
	+ o)
	+ firstarg=`echo "$firstarg" \| sed s/o//`
	+ tar "$firstarg" "$@" && exit 0
	+ ;;
	+ esac
	+ case $firstarg in
	+ h)
	+ firstarg=`echo "$firstarg" \| sed s/h//`
	+ tar "$firstarg" "$@" && exit 0
	+ ;;
	+ esac
	+ fi
	+
	+ echo 1>&2 "\
	+WARNING: I can't seem to be able to run \`tar' with the given arguments.
	+ You may want to install GNU tar or Free paxutils, or check the
	+ command line arguments."
	+ exit 1
	+ ;;
	+
	+ *)
	+ echo 1>&2 "\
	+WARNING: \`$1' is needed, and is $msg.
	+ You might have modified some files without having the
	+ proper tools for further handling them. Check the \`README' file,
	+ it often tells you about the needed prerequisites for installing
	+ this package. You may also peek at any GNU archive site, in case
	+ some other package would contain this missing \`$1' program."
	+ exit 1
	+ ;;
	+esac
	+
	+exit 0
	+
	+# Local variables:
	+# eval: (add-hook 'write-file-hooks 'time-stamp)
	+# time-stamp-start: "scriptversion="
	+# time-stamp-format: "%:y-%02m-%02d.%02H"
	+# time-stamp-end: "$"
	+# End:
	diff --git a/tags/xmount-0.7.0/osxdstroot.tar.gz b/tags/xmount-0.7.0/osxdstroot.tar.gz
	new file mode 100644
	index 0000000..6252304
	Binary files /dev/null and b/tags/xmount-0.7.0/osxdstroot.tar.gz differ
	diff --git a/tags/xmount-0.7.0/src/CMakeLists.txt b/tags/xmount-0.7.0/src/CMakeLists.txt
	new file mode 100644
	index 0000000..ee23817
	--- /dev/null
	+++ b/tags/xmount-0.7.0/src/CMakeLists.txt
	@@ -0,0 +1,18 @@
	+if(NOT APPLE)
	+ include_directories(${LIBFUSE_INCLUDE_DIRS})
	+ set(LIBS ${LIBS} ${LIBFUSE_LIBRARIES})
	+else(NOT APPLE)
	+ include_directories(${LIBOSXFUSE_INCLUDE_DIRS})
	+ set(LIBS ${LIBS} ${LIBOSXFUSE_LIBRARIES})
	+endif(NOT APPLE)
	+
	+set(LIBS ${LIBS} "dl")
	+
	+add_definitions(-DXMOUNT_LIBRARY_PATH="${CMAKE_INSTALL_PREFIX}/lib/xmount")
	+
	+add_executable(xmount xmount.c md5.c ../libxmount/libxmount.c)
	+
	+target_link_libraries(xmount ${LIBS})
	+
	+install(TARGETS xmount DESTINATION bin)
	+
	diff --git a/tags/xmount-0.7.0/src/macros.h b/tags/xmount-0.7.0/src/macros.h
	new file mode 100644
	index 0000000..179c3b0
	--- /dev/null
	+++ b/tags/xmount-0.7.0/src/macros.h
	@@ -0,0 +1,69 @@
	+/*******************************************************************************
	+* xmount Copyright (c) 2008-2014 by Gillen Daniel <gillen.dan@pinguin.lu> *
	+* *
	+* This program is free software: you can redistribute it and/or modify it *
	+* under the terms of the GNU General Public License as published by the Free *
	+* Software Foundation, either version 3 of the License, or (at your option) *
	+* any later version. *
	+* *
	+* This program is distributed in the hope that it will be useful, but WITHOUT *
	+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
	+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for *
	+* more details. *
	+* *
	+* You should have received a copy of the GNU General Public License along with *
	+* this program. If not, see <http://www.gnu.org/licenses/>. *
	+*******************************************************************************/
	+
	+#ifndef MACROS_H
	+#define MACROS_H
	+
	+#ifndef __APPLE__
	+ #define FOPEN fopen64
	+#else
	+ // Apple does use fopen for fopen64 too
	+ #define FOPEN fopen
	+#endif
	+
	+/*
	+ * Macros to alloc or realloc memory and check whether it worked or not
	+ */
	+#define XMOUNT_MALLOC(var,var_type,size) { \
	+ (var)=(var_type)malloc(size); \
	+ if((var)==NULL) { \
	+ LOG_ERROR("Couldn't allocate memmory!\n"); \
	+ exit(1); \
	+ } \
	+}
	+#define XMOUNT_REALLOC(var,var_type,size) { \
	+ (var)=(var_type)realloc((var),size); \
	+ if((var)==NULL) { \
	+ LOG_ERROR("Couldn't allocate memmory!\n"); \
	+ exit(1); \
	+ } \
	+}
	+
	+/*
	+ * Macros for some often used string functions
	+ */
	+#define XMOUNT_STRSET(var1,var2) { \
	+ XMOUNT_MALLOC(var1,char*,strlen(var2)+1) \
	+ strcpy(var1,var2); \
	+}
	+#define XMOUNT_STRNSET(var1,var2,size) { \
	+ XMOUNT_MALLOC(var1,char*,(size)+1) \
	+ strncpy(var1,var2,size); \
	+ (var1)[size]='\0'; \
	+}
	+#define XMOUNT_STRAPP(var1,var2) { \
	+ XMOUNT_REALLOC(var1,char*,strlen(var1)+strlen(var2)+1) \
	+ strcpy((var1)+strlen(var1),var2); \
	+}
	+#define XMOUNT_STRNAPP(var1,var2,size) { \
	+ XMOUNT_REALLOC(var1,char*,strlen(var1)+(size)+1) \
	+ (var1)[strlen(var1)+(size)]='\0'; \
	+ strncpy((var1)+strlen(var1),var2,size); \
	+}
	+
	+#endif // MACROS_H
	+
	diff --git a/tags/xmount-0.7.0/src/md5.c b/tags/xmount-0.7.0/src/md5.c
	new file mode 100644
	index 0000000..1c9606e
	--- /dev/null
	+++ b/tags/xmount-0.7.0/src/md5.c
	@@ -0,0 +1,398 @@
	+// This file has been copied 1:1 from the source of the Debian fdupes package into Guymager.
	+// Only have been added this comment and the following include, no other changes.
	+
	+#include <string.h>
	+
	+
	+/*
	+ Copyright (C) 1999 Aladdin Enterprises. All rights reserved.
	+
	+ This software is provided 'as-is', without any express or implied
	+ warranty. In no event will the authors be held liable for any damages
	+ arising from the use of this software.
	+
	+ Permission is granted to anyone to use this software for any purpose,
	+ including commercial applications, and to alter it and redistribute it
	+ freely, subject to the following restrictions:
	+
	+ 1. The origin of this software must not be misrepresented; you must not
	+ claim that you wrote the original software. If you use this software
	+ in a product, an acknowledgment in the product documentation would be
	+ appreciated but is not required.
	+ 2. Altered source versions must be plainly marked as such, and must not be
	+ misrepresented as being the original software.
	+ 3. This notice may not be removed or altered from any source distribution.
	+
	+ L. Peter Deutsch
	+ ghost@aladdin.com
	+
	+ */
	+/$Id: md5.c $ /
	+/*
	+ Independent implementation of MD5 (RFC 1321).
	+
	+ This code implements the MD5 Algorithm defined in RFC 1321.
	+ It is derived directly from the text of the RFC and not from the
	+ reference implementation.
	+
	+ The original and principal author of md5.c is L. Peter Deutsch
	+ <ghost@aladdin.com>. Other authors are noted in the change history
	+ that follows (in reverse chronological order):
	+
	+ 1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
	+ 1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5).
	+ 1999-05-03 lpd Original version.
	+ */
	+
	+#include "md5.h"
	+
	+#ifdef TEST
	+/*
	+ * Compile with -DTEST to create a self-contained executable test program.
	+ * The test program should print out the same values as given in section
	+ * A.5 of RFC 1321, reproduced below.
	+ */
	+#include <string.h>
	+main()
	+{
	+ static const char *const test[7] = {
	+ "", /d41d8cd98f00b204e9800998ecf8427e/
	+ "a", /0cc175b9c0f1b6a831c399e269772661/
	+ "abc", /900150983cd24fb0d6963f7d28e17f72/
	+ "message digest", /f96b697d7cb7938d525a2f31aaf161d0/
	+ "abcdefghijklmnopqrstuvwxyz", /c3fcd3d76192e4007dfb496cca67e13b/
	+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789",
	+ /d174ab98d277d9f5a5611c2c9f419d9f/
	+ "12345678901234567890123456789012345678901234567890123456789012345678901234567890" /57edf4a22be3c955ac49da2e2107b67a/
	+ };
	+ int i;
	+
	+ for (i = 0; i < 7; ++i) {
	+ md5_state_t state;
	+ md5_byte_t digest[16];
	+ int di;
	+
	+ md5_init(&state);
	+ md5_append(&state, (const md5_byte_t *)test[i], strlen(test[i]));
	+ md5_finish(&state, digest);
	+ printf("MD5 (\"%s\") = ", test[i]);
	+ for (di = 0; di < 16; ++di)
	+ printf("%02x", digest[di]);
	+ printf("\n");
	+ }
	+ return 0;
	+}
	+#endif /* TEST */
	+
	+
	+/*
	+ * For reference, here is the program that computed the T values.
	+ */
	+#if 0
	+#include <math.h>
	+main()
	+{
	+ int i;
	+ for (i = 1; i <= 64; ++i) {
	+ unsigned long v = (unsigned long)(4294967296.0 * fabs(sin((double)i)));
	+ printf("#define T%d 0x%08lx\n", i, v);
	+ }
	+ return 0;
	+}
	+#endif
	+/*
	+ * End of T computation program.
	+ */
	+#define T1 0xd76aa478
	+#define T2 0xe8c7b756
	+#define T3 0x242070db
	+#define T4 0xc1bdceee
	+#define T5 0xf57c0faf
	+#define T6 0x4787c62a
	+#define T7 0xa8304613
	+#define T8 0xfd469501
	+#define T9 0x698098d8
	+#define T10 0x8b44f7af
	+#define T11 0xffff5bb1
	+#define T12 0x895cd7be
	+#define T13 0x6b901122
	+#define T14 0xfd987193
	+#define T15 0xa679438e
	+#define T16 0x49b40821
	+#define T17 0xf61e2562
	+#define T18 0xc040b340
	+#define T19 0x265e5a51
	+#define T20 0xe9b6c7aa
	+#define T21 0xd62f105d
	+#define T22 0x02441453
	+#define T23 0xd8a1e681
	+#define T24 0xe7d3fbc8
	+#define T25 0x21e1cde6
	+#define T26 0xc33707d6
	+#define T27 0xf4d50d87
	+#define T28 0x455a14ed
	+#define T29 0xa9e3e905
	+#define T30 0xfcefa3f8
	+#define T31 0x676f02d9
	+#define T32 0x8d2a4c8a
	+#define T33 0xfffa3942
	+#define T34 0x8771f681
	+#define T35 0x6d9d6122
	+#define T36 0xfde5380c
	+#define T37 0xa4beea44
	+#define T38 0x4bdecfa9
	+#define T39 0xf6bb4b60
	+#define T40 0xbebfbc70
	+#define T41 0x289b7ec6
	+#define T42 0xeaa127fa
	+#define T43 0xd4ef3085
	+#define T44 0x04881d05
	+#define T45 0xd9d4d039
	+#define T46 0xe6db99e5
	+#define T47 0x1fa27cf8
	+#define T48 0xc4ac5665
	+#define T49 0xf4292244
	+#define T50 0x432aff97
	+#define T51 0xab9423a7
	+#define T52 0xfc93a039
	+#define T53 0x655b59c3
	+#define T54 0x8f0ccc92
	+#define T55 0xffeff47d
	+#define T56 0x85845dd1
	+#define T57 0x6fa87e4f
	+#define T58 0xfe2ce6e0
	+#define T59 0xa3014314
	+#define T60 0x4e0811a1
	+#define T61 0xf7537e82
	+#define T62 0xbd3af235
	+#define T63 0x2ad7d2bb
	+#define T64 0xeb86d391
	+
	+static void
	+md5_process(md5_state_t pms, const md5_byte_t data /[64]/)
	+{
	+ md5_word_t
	+ a = pms->abcd[0], b = pms->abcd[1],
	+ c = pms->abcd[2], d = pms->abcd[3];
	+ md5_word_t t;
	+
	+#ifndef ARCH_IS_BIG_ENDIAN
	+# define ARCH_IS_BIG_ENDIAN 1 /* slower, default implementation */
	+#endif
	+#if ARCH_IS_BIG_ENDIAN
	+
	+ /*
	+ * On big-endian machines, we must arrange the bytes in the right
	+ * order. (This also works on machines of unknown byte order.)
	+ */
	+ md5_word_t X[16];
	+ const md5_byte_t *xp = data;
	+ int i;
	+
	+ for (i = 0; i < 16; ++i, xp += 4)
	+ X[i] = xp[0] + (xp[1] << 8) + (xp[2] << 16) + (xp[3] << 24);
	+
	+#else /* !ARCH_IS_BIG_ENDIAN */
	+
	+ /*
	+ * On little-endian machines, we can process properly aligned data
	+ * without copying it.
	+ */
	+ md5_word_t xbuf[16];
	+ const md5_word_t *X;
	+
	+ if (!((data - (const md5_byte_t *)0) & 3)) {
	+ /* data are properly aligned */
	+ X = (const md5_word_t *)data;
	+ } else {
	+ /* not aligned */
	+ memcpy(xbuf, data, 64);
	+ X = xbuf;
	+ }
	+#endif
	+
	+#define ROTATE_LEFT(x, n) (((x) << (n)) \| ((x) >> (32 - (n))))
	+
	+ /* Round 1. */
	+ /* Let [abcd k s i] denote the operation
	+ a = b + ((a + F(b,c,d) + X[k] + T[i]) <<< s). */
	+#define F(x, y, z) (((x) & (y)) \| (~(x) & (z)))
	+#define SET(a, b, c, d, k, s, Ti)\
	+ t = a + F(b,c,d) + X[k] + Ti;\
	+ a = ROTATE_LEFT(t, s) + b
	+ /* Do the following 16 operations. */
	+ SET(a, b, c, d, 0, 7, T1);
	+ SET(d, a, b, c, 1, 12, T2);
	+ SET(c, d, a, b, 2, 17, T3);
	+ SET(b, c, d, a, 3, 22, T4);
	+ SET(a, b, c, d, 4, 7, T5);
	+ SET(d, a, b, c, 5, 12, T6);
	+ SET(c, d, a, b, 6, 17, T7);
	+ SET(b, c, d, a, 7, 22, T8);
	+ SET(a, b, c, d, 8, 7, T9);
	+ SET(d, a, b, c, 9, 12, T10);
	+ SET(c, d, a, b, 10, 17, T11);
	+ SET(b, c, d, a, 11, 22, T12);
	+ SET(a, b, c, d, 12, 7, T13);
	+ SET(d, a, b, c, 13, 12, T14);
	+ SET(c, d, a, b, 14, 17, T15);
	+ SET(b, c, d, a, 15, 22, T16);
	+#undef SET
	+
	+ /* Round 2. */
	+ /* Let [abcd k s i] denote the operation
	+ a = b + ((a + G(b,c,d) + X[k] + T[i]) <<< s). */
	+#define G(x, y, z) (((x) & (z)) \| ((y) & ~(z)))
	+#define SET(a, b, c, d, k, s, Ti)\
	+ t = a + G(b,c,d) + X[k] + Ti;\
	+ a = ROTATE_LEFT(t, s) + b
	+ /* Do the following 16 operations. */
	+ SET(a, b, c, d, 1, 5, T17);
	+ SET(d, a, b, c, 6, 9, T18);
	+ SET(c, d, a, b, 11, 14, T19);
	+ SET(b, c, d, a, 0, 20, T20);
	+ SET(a, b, c, d, 5, 5, T21);
	+ SET(d, a, b, c, 10, 9, T22);
	+ SET(c, d, a, b, 15, 14, T23);
	+ SET(b, c, d, a, 4, 20, T24);
	+ SET(a, b, c, d, 9, 5, T25);
	+ SET(d, a, b, c, 14, 9, T26);
	+ SET(c, d, a, b, 3, 14, T27);
	+ SET(b, c, d, a, 8, 20, T28);
	+ SET(a, b, c, d, 13, 5, T29);
	+ SET(d, a, b, c, 2, 9, T30);
	+ SET(c, d, a, b, 7, 14, T31);
	+ SET(b, c, d, a, 12, 20, T32);
	+#undef SET
	+
	+ /* Round 3. */
	+ /* Let [abcd k s t] denote the operation
	+ a = b + ((a + H(b,c,d) + X[k] + T[i]) <<< s). */
	+#define H(x, y, z) ((x) ^ (y) ^ (z))
	+#define SET(a, b, c, d, k, s, Ti)\
	+ t = a + H(b,c,d) + X[k] + Ti;\
	+ a = ROTATE_LEFT(t, s) + b
	+ /* Do the following 16 operations. */
	+ SET(a, b, c, d, 5, 4, T33);
	+ SET(d, a, b, c, 8, 11, T34);
	+ SET(c, d, a, b, 11, 16, T35);
	+ SET(b, c, d, a, 14, 23, T36);
	+ SET(a, b, c, d, 1, 4, T37);
	+ SET(d, a, b, c, 4, 11, T38);
	+ SET(c, d, a, b, 7, 16, T39);
	+ SET(b, c, d, a, 10, 23, T40);
	+ SET(a, b, c, d, 13, 4, T41);
	+ SET(d, a, b, c, 0, 11, T42);
	+ SET(c, d, a, b, 3, 16, T43);
	+ SET(b, c, d, a, 6, 23, T44);
	+ SET(a, b, c, d, 9, 4, T45);
	+ SET(d, a, b, c, 12, 11, T46);
	+ SET(c, d, a, b, 15, 16, T47);
	+ SET(b, c, d, a, 2, 23, T48);
	+#undef SET
	+
	+ /* Round 4. */
	+ /* Let [abcd k s t] denote the operation
	+ a = b + ((a + I(b,c,d) + X[k] + T[i]) <<< s). */
	+#define I(x, y, z) ((y) ^ ((x) \| ~(z)))
	+#define SET(a, b, c, d, k, s, Ti)\
	+ t = a + I(b,c,d) + X[k] + Ti;\
	+ a = ROTATE_LEFT(t, s) + b
	+ /* Do the following 16 operations. */
	+ SET(a, b, c, d, 0, 6, T49);
	+ SET(d, a, b, c, 7, 10, T50);
	+ SET(c, d, a, b, 14, 15, T51);
	+ SET(b, c, d, a, 5, 21, T52);
	+ SET(a, b, c, d, 12, 6, T53);
	+ SET(d, a, b, c, 3, 10, T54);
	+ SET(c, d, a, b, 10, 15, T55);
	+ SET(b, c, d, a, 1, 21, T56);
	+ SET(a, b, c, d, 8, 6, T57);
	+ SET(d, a, b, c, 15, 10, T58);
	+ SET(c, d, a, b, 6, 15, T59);
	+ SET(b, c, d, a, 13, 21, T60);
	+ SET(a, b, c, d, 4, 6, T61);
	+ SET(d, a, b, c, 11, 10, T62);
	+ SET(c, d, a, b, 2, 15, T63);
	+ SET(b, c, d, a, 9, 21, T64);
	+#undef SET
	+
	+ /* Then perform the following additions. (That is increment each
	+ of the four registers by the value it had before this block
	+ was started.) */
	+ pms->abcd[0] += a;
	+ pms->abcd[1] += b;
	+ pms->abcd[2] += c;
	+ pms->abcd[3] += d;
	+}
	+
	+void
	+md5_init(md5_state_t *pms)
	+{
	+ pms->count[0] = pms->count[1] = 0;
	+ pms->abcd[0] = 0x67452301;
	+ pms->abcd[1] = 0xefcdab89;
	+ pms->abcd[2] = 0x98badcfe;
	+ pms->abcd[3] = 0x10325476;
	+}
	+
	+void
	+md5_append(md5_state_t pms, const md5_byte_t data, int nbytes)
	+{
	+ const md5_byte_t *p = data;
	+ int left = nbytes;
	+ int offset = (pms->count[0] >> 3) & 63;
	+ md5_word_t nbits = (md5_word_t)(nbytes << 3);
	+
	+ if (nbytes <= 0)
	+ return;
	+
	+ /* Update the message length. */
	+ pms->count[1] += nbytes >> 29;
	+ pms->count[0] += nbits;
	+ if (pms->count[0] < nbits)
	+ pms->count[1]++;
	+
	+ /* Process an initial partial block. */
	+ if (offset) {
	+ int copy = (offset + nbytes > 64 ? 64 - offset : nbytes);
	+
	+ memcpy(pms->buf + offset, p, copy);
	+ if (offset + copy < 64)
	+ return;
	+ p += copy;
	+ left -= copy;
	+ md5_process(pms, pms->buf);
	+ }
	+
	+ /* Process full blocks. */
	+ for (; left >= 64; p += 64, left -= 64)
	+ md5_process(pms, p);
	+
	+ /* Process a final partial block. */
	+ if (left)
	+ memcpy(pms->buf, p, left);
	+}
	+
	+void
	+md5_finish(md5_state_t *pms, md5_byte_t digest[16])
	+{
	+ static const md5_byte_t pad[64] = {
	+ 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
	+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
	+ };
	+ md5_byte_t data[8];
	+ int i;
	+
	+ /* Save the length before padding. */
	+ for (i = 0; i < 8; ++i)
	+ data[i] = (md5_byte_t)(pms->count[i >> 2] >> ((i & 3) << 3));
	+ /* Pad to 56 bytes mod 64. */
	+ md5_append(pms, pad, ((55 - (pms->count[0] >> 3)) & 63) + 1);
	+ /* Append the length. */
	+ md5_append(pms, data, 8);
	+ for (i = 0; i < 16; ++i)
	+ digest[i] = (md5_byte_t)(pms->abcd[i >> 2] >> ((i & 3) << 3));
	+}
	diff --git a/tags/xmount-0.7.0/src/md5.h b/tags/xmount-0.7.0/src/md5.h
	new file mode 100644
	index 0000000..38a0a2a
	--- /dev/null
	+++ b/tags/xmount-0.7.0/src/md5.h
	@@ -0,0 +1,101 @@
	+// This file has been copied 1:1 from the source of the Debian fdupes package into Guymager.
	+// Only has been added this comment, no other changes.
	+
	+/*
	+ Copyright (C) 1999 Aladdin Enterprises. All rights reserved.
	+
	+ This software is provided 'as-is', without any express or implied
	+ warranty. In no event will the authors be held liable for any damages
	+ arising from the use of this software.
	+
	+ Permission is granted to anyone to use this software for any purpose,
	+ including commercial applications, and to alter it and redistribute it
	+ freely, subject to the following restrictions:
	+
	+ 1. The origin of this software must not be misrepresented; you must not
	+ claim that you wrote the original software. If you use this software
	+ in a product, an acknowledgment in the product documentation would be
	+ appreciated but is not required.
	+ 2. Altered source versions must be plainly marked as such, and must not be
	+ misrepresented as being the original software.
	+ 3. This notice may not be removed or altered from any source distribution.
	+
	+ L. Peter Deutsch
	+ ghost@aladdin.com
	+
	+ */
	+/$Id: md5.h $ /
	+/*
	+ Independent implementation of MD5 (RFC 1321).
	+
	+ This code implements the MD5 Algorithm defined in RFC 1321.
	+ It is derived directly from the text of the RFC and not from the
	+ reference implementation.
	+
	+ The original and principal author of md5.h is L. Peter Deutsch
	+ <ghost@aladdin.com>. Other authors are noted in the change history
	+ that follows (in reverse chronological order):
	+
	+ 1999-11-04 lpd Edited comments slightly for automatic TOC extraction.
	+ 1999-10-18 lpd Fixed typo in header comment (ansi2knr rather than md5);
	+ added conditionalization for C++ compilation from Martin
	+ Purschke <purschke@bnl.gov>.
	+ 1999-05-03 lpd Original version.
	+ */
	+
	+#ifndef md5_INCLUDED
	+# define md5_INCLUDED
	+
	+/*
	+ * This code has some adaptations for the Ghostscript environment, but it
	+ * will compile and run correctly in any environment with 8-bit chars and
	+ * 32-bit ints. Specifically, it assumes that if the following are
	+ * defined, they have the same meaning as in Ghostscript: P1, P2, P3,
	+ * ARCH_IS_BIG_ENDIAN.
	+ */
	+
	+typedef unsigned char md5_byte_t; /* 8-bit byte */
	+typedef unsigned int md5_word_t; /* 32-bit word */
	+
	+/* Define the state of the MD5 Algorithm. */
	+typedef struct md5_state_s {
	+ md5_word_t count[2]; /* message length in bits, lsw first */
	+ md5_word_t abcd[4]; /* digest buffer */
	+ md5_byte_t buf[64]; /* accumulate block */
	+} md5_state_t;
	+
	+#ifdef __cplusplus
	+extern "C"
	+{
	+#endif
	+
	+/* Initialize the algorithm. */
	+#ifdef P1
	+void md5_init(P1(md5_state_t *pms));
	+#else
	+void md5_init(md5_state_t *pms);
	+#endif
	+
	+/* Append a string to the message. */
	+#ifdef P3
	+void md5_append(P3(md5_state_t pms, const md5_byte_t data, int nbytes));
	+#else
	+void md5_append(md5_state_t pms, const md5_byte_t data, int nbytes);
	+#endif
	+
	+/* Finish the message and return the digest. */
	+#ifdef P2
	+void md5_finish(P2(md5_state_t *pms, md5_byte_t digest[16]));
	+#else
	+void md5_finish(md5_state_t *pms, md5_byte_t digest[16]);
	+#endif
	+
	+#ifdef __cplusplus
	+} /* end extern "C" */
	+#endif
	+
	+#endif /* md5_INCLUDED */
	+
	+
	+
	+
	diff --git a/tags/xmount-0.7.0/src/xmount.c b/tags/xmount-0.7.0/src/xmount.c
	new file mode 100755
	index 0000000..a1e87d5
	--- /dev/null
	+++ b/tags/xmount-0.7.0/src/xmount.c
	@@ -0,0 +1,4113 @@
	+/*******************************************************************************
	+* xmount Copyright (c) 2008-2014 by Gillen Daniel <gillen.dan@pinguin.lu> *
	+* *
	+* xmount is a small tool to "fuse mount" various harddisk image formats as dd, *
	+* vdi, vhd or vmdk files and enable virtual write access to them. *
	+* *
	+* This program is free software: you can redistribute it and/or modify it *
	+* under the terms of the GNU General Public License as published by the Free *
	+* Software Foundation, either version 3 of the License, or (at your option) *
	+* any later version. *
	+* *
	+* This program is distributed in the hope that it will be useful, but WITHOUT *
	+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
	+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for *
	+* more details. *
	+* *
	+* You should have received a copy of the GNU General Public License along with *
	+* this program. If not, see <http://www.gnu.org/licenses/>. *
	+*******************************************************************************/
	+
	+#include <config.h>
	+
	+#include <stdio.h>
	+#include <stdlib.h>
	+#include <stdint.h>
	+#include <string.h>
	+#include <inttypes.h> // For PRI*
	+#include <errno.h>
	+#include <dlfcn.h> // For dlopen, dlclose, dlsym
	+#include <dirent.h> // For opendir, readdir, closedir
	+#include <unistd.h>
	+#include <sys/ioctl.h>
	+#include <sys/stat.h> // For fstat
	+#include <sys/types.h>
	+#ifdef HAVE_LINUX_FS_H
	+ #include <linux/fs.h> // For SEEK_* ??
	+#endif
	+#if !defined(__APPLE__) && defined(HAVE_GRP_H) && defined(HAVE_PWD_H)
	+ #include <grp.h> // For getgrnam, struct group
	+ #include <pwd.h> // For getpwuid, struct passwd
	+#endif
	+#include <pthread.h>
	+#include <time.h> // For time
	+
	+#define FUSE_USE_VERSION 26
	+#include <fuse.h>
	+
	+#include "xmount.h"
	+#include "md5.h"
	+#include "macros.h"
	+#include "../libxmount/libxmount.h"
	+
	+#define XMOUNT_COPYRIGHT_NOTICE \
	+ "xmount v%s Copyright (c) 2008-2014 by Gillen Daniel <gillen.dan@pinguin.lu>"
	+
	+#define LOG_WARNING(...) { \
	+ LIBXMOUNT_LOG_WARNING(__VA_ARGS__); \
	+}
	+#define LOG_ERROR(...) { \
	+ LIBXMOUNT_LOG_ERROR(__VA_ARGS__); \
	+}
	+#define LOG_DEBUG(...) { \
	+ LIBXMOUNT_LOG_DEBUG(glob_xmount.debug,__VA_ARGS__); \
	+}
	+
	+/*******************************************************************************
	+ * Global vars
	+ ******************************************************************************/
	+//! Struct that contains various runtime configuration options
	+static ts_XmountData glob_xmount;
	+
	+/*******************************************************************************
	+ * Forward declarations
	+ ******************************************************************************/
	+// Helper functions
	+static void PrintUsage(char*);
	+static void CheckFuseSettings();
	+static int ParseCmdLine(const int, char**);
	+static int ExtractVirtFileNames(char*);
	+static int GetMorphedImageSize(uint64_t*);
	+static int GetVirtImageSize(uint64_t*);
	+static int GetInputImageData(pts_InputImage, char, off_t, size_t, size_t);
	+static int GetMorphedImageData(char, off_t, size_t, size_t);
	+static int GetVirtImageData(char*, off_t, size_t);
	+static int SetVdiFileHeaderData(char*, off_t, size_t);
	+static int SetVhdFileHeaderData(char*, off_t, size_t);
	+static int SetVirtImageData(const char*, off_t, size_t);
	+static int CalculateInputImageHash(uint64_t, uint64_t);
	+static int InitVirtVdiHeader();
	+static int InitVirtVhdHeader();
	+static int InitVirtualVmdkFile();
	+static int InitVirtImageInfoFile();
	+static int InitCacheFile();
	+static int LoadLibs();
	+static int FindInputLib(pts_InputImage);
	+static int FindMorphingLib();
	+static void InitResources();
	+static void FreeResources();
	+static int SplitLibraryParameters(char, uint32_t, pts_LibXmountOptions**);
	+// Functions exported to LibXmount_Morphing
	+static int LibXmount_Morphing_ImageCount(uint64_t*);
	+static int LibXmount_Morphing_Size(uint64_t, uint64_t*);
	+static int LibXmount_Morphing_Read(uint64_t, char, off_t, size_t, size_t);
	+// Functions implementing FUSE functions
	+static int FuseGetAttr(const char, struct stat);
	+static int FuseMkDir(const char*, mode_t);
	+static int FuseMkNod(const char*, mode_t, dev_t);
	+static int FuseReadDir(const char*,
	+ void*,
	+ fuse_fill_dir_t,
	+ off_t,
	+ struct fuse_file_info*);
	+static int FuseOpen(const char, struct fuse_file_info);
	+static int FuseRead(const char, char, size_t, off_t, struct fuse_file_info*);
	+static int FuseRename(const char, const char);
	+static int FuseRmDir(const char*);
	+static int FuseUnlink(const char*);
	+//static int FuseStatFs(const char, struct statvfs);
	+static int FuseWrite(const char *p_path,
	+ const char*,
	+ size_t,
	+ off_t,
	+ struct fuse_file_info*);
	+
	+/*******************************************************************************
	+ * Helper functions
	+ ******************************************************************************/
	+//! Print usage instructions (cmdline options etc..)
	+/*!
	+ * \param p_prog_name Program name (argv[0])
	+ */
	+static void PrintUsage(char *p_prog_name) {
	+ char *p_buf;
	+ int first;
	+ int ret;
	+
	+ printf("\n" XMOUNT_COPYRIGHT_NOTICE "\n",XMOUNT_VERSION);
	+ printf("\nUsage:\n");
	+ printf(" %s [fopts] <xopts> <mntp>\n\n",p_prog_name);
	+ printf("Options:\n");
	+ printf(" fopts:\n");
	+ printf(" -d : Enable FUSE's and xmount's debug mode.\n");
	+ printf(" -h : Display this help message.\n");
	+ printf(" -s : Run single threaded.\n");
	+ printf(" -o no_allow_other : Disable automatic addition of FUSE's "
	+ "allow_other option.\n");
	+ printf(" -o <fopts> : Specify fuse mount options. Will also disable "
	+ "automatic addition of FUSE's allow_other option!\n");
	+ printf("\n");
	+ printf(" xopts:\n");
	+ printf(" --cache <cfile> : Enable virtual write support.\n");
	+ printf(" <cfile> specifies the cache file to use.\n");
	+ printf(" --in <itype> <ifile> : Input image format and source file(s). "
	+ "May be specified multiple times.\n");
	+ printf(" <itype> can be ");
	+
	+ // List supported input formats
	+ first=1;
	+ for(uint32_t i=0;i<glob_xmount.input.libs_count;i++) {
	+ p_buf=glob_xmount.input.pp_libs[i]->p_supported_input_types;
	+ while(*p_buf!='\0') {
	+ if(first==1) {
	+ printf("\"%s\"",p_buf);
	+ first=0;
	+ } else printf(", \"%s\"",p_buf);
	+ p_buf+=(strlen(p_buf)+1);
	+ }
	+ }
	+ printf(".\n");
	+
	+ printf(" <ifile> specifies the source file. If your image is split into "
	+ "multiple files, you have to specify them all!\n");
	+ printf(" --inopts <iopts> : Specify input library specific options.\n");
	+ printf(" <iopts> specifies a comma separated list of key=value options. "
	+ "See below for details.\n");
	+ printf(" --info : Print out infos about used compiler and libraries.\n");
	+ printf(" --morph <mtype> : Morphing function to apply to input image(s). "
	+ "If not specified, defaults to \"combine\".\n");
	+ printf(" <mtype> can be ");
	+
	+ // List supported morphing functions
	+ first=1;
	+ for(uint32_t i=0;i<glob_xmount.morphing.libs_count;i++) {
	+ p_buf=glob_xmount.morphing.pp_libs[i]->p_supported_morphing_types;
	+ while(*p_buf!='\0') {
	+ if(first==1) {
	+ printf("\"%s\"",p_buf);
	+ first=0;
	+ } else printf(", \"%s\"",p_buf);
	+ p_buf+=(strlen(p_buf)+1);
	+ }
	+ }
	+ printf(".\n");
	+
	+ printf(" --morphopts <mopts> : Specify morphing library specific "
	+ "options.\n");
	+ printf(" <mopts> specifies a comma separated list of key=value options. "
	+ "See below for details.\n");
	+ printf(" --offset <off> : Move the output image data start <off> bytes "
	+ "into the input image(s).\n");
	+ printf(" --out <otype> : Output image format. If not specified, "
	+ "defaults to ");
	+#ifdef __APPLE__
	+ printf("\"dmg\".\n");
	+#else
	+ printf("\"raw\".\n");
	+#endif
	+ printf(" <otype> can be ");
	+
	+ // List supported output formats
	+ printf("\"raw\", \"dmg\", \"vdi\", \"vhd\", \"vmdk\", \"vmdks\".\n");
	+
	+ printf(" --owcache <file> : Same as --cache <file> but overwrites "
	+ "existing cache file.\n");
	+ printf(" --sizelimit <size> : The data end of input image(s) is set to no "
	+ "more than <size> bytes after the data start.\n");
	+ printf(" --version : Same as --info.\n");
	+ printf("\n");
	+ printf(" mntp:\n");
	+ printf(" Mount point where output image should be located.\n");
	+ printf("\n");
	+ printf("Infos:\n");
	+ printf(" * One --in option and a mount point are mandatory!\n");
	+ printf(" * If you specify --in multiple times, data from all images is "
	+ "morphed into one output image using the specified morphing "
	+ "function.\n");
	+ printf(" * For VMDK emulation, you have to uncomment \"user_allow_other\" "
	+ "in /etc/fuse.conf or run xmount as root.\n");
	+ printf("\n");
	+ printf("Input / Morphing library specific options:\n");
	+ printf(" Input / Morphing libraries might support an own set of "
	+ "options to configure / tune their behaviour.\n");
	+ printf(" Libraries supporting this feature (if any) and their "
	+ "options are listed below.\n");
	+ printf("\n");
	+
	+ // List input and morphing lib options
	+ for(uint32_t i=0;i<glob_xmount.input.libs_count;i++) {
	+ ret=glob_xmount.input.pp_libs[i]->
	+ lib_functions.OptionsHelp((const char**)&p_buf);
	+ if(ret!=0) {
	+ LOG_ERROR("Unable to get options help for library '%s': %s!\n",
	+ glob_xmount.input.pp_libs[i]->p_name,
	+ glob_xmount.input.pp_libs[i]->
	+ lib_functions.GetErrorMessage(ret));
	+ }
	+ if(p_buf==NULL) continue;
	+ printf(" - %s\n",glob_xmount.input.pp_libs[i]->p_name);
	+ printf("%s",p_buf);
	+ printf("\n");
	+ ret=glob_xmount.input.pp_libs[i]->lib_functions.FreeBuffer(p_buf);
	+ if(ret!=0) {
	+ LOG_ERROR("Unable to free options help text from library '%s': %s!\n",
	+ glob_xmount.input.pp_libs[i]->p_name,
	+ glob_xmount.input.pp_libs[i]->
	+ lib_functions.GetErrorMessage(ret));
	+ }
	+ }
	+ for(uint32_t i=0;i<glob_xmount.morphing.libs_count;i++) {
	+ ret=glob_xmount.morphing.pp_libs[i]->
	+ lib_functions.OptionsHelp((const char**)&p_buf);
	+ if(ret!=0) {
	+ LOG_ERROR("Unable to get options help for library '%s': %s!\n",
	+ glob_xmount.morphing.pp_libs[i]->p_name,
	+ glob_xmount.morphing.pp_libs[i]->
	+ lib_functions.GetErrorMessage(ret));
	+ }
	+ if(p_buf==NULL) continue;
	+ printf(" - %s\n",glob_xmount.morphing.pp_libs[i]->p_name);
	+ printf("%s",p_buf);
	+ printf("\n");
	+ }
	+}
	+
	+//! Check fuse settings
	+/*!
	+ * Check if FUSE allows us to pass the -o allow_other parameter. This only works
	+ * if we are root or user_allow_other is set in /etc/fuse.conf.
	+ *
	+ * In addition, this function also checks if the user is member of the fuse
	+ * group which is generally needed to use fuse at all.
	+ */
	+static void CheckFuseSettings() {
	+#if !defined(__APPLE__) && defined(HAVE_GRP_H) && defined(HAVE_PWD_H)
	+ struct group *p_group;
	+ struct passwd *p_passwd;
	+#endif
	+ int found;
	+ FILE *h_fuse_conf;
	+ char line[256];
	+
	+ glob_xmount.may_set_fuse_allow_other=FALSE;
	+
	+ if(geteuid()==0) {
	+ // Running as root, there should be no problems
	+ glob_xmount.may_set_fuse_allow_other=TRUE;
	+ return;
	+ }
	+
	+#if !defined(__APPLE__) && defined(HAVE_GRP_H) && defined(HAVE_PWD_H)
	+ // Check if a fuse group exists and if so, make sure user is a member of it.
	+ // Makes only sense on Linux because as far as I know osxfuse has no own group
	+ p_group=getgrnam("fuse");
	+ if(p_group!=NULL) {
	+ // Get effective user name
	+ p_passwd=getpwuid(geteuid());
	+ if(p_passwd==NULL) {
	+ printf("\nWARNING: Unable to determine your effective user name. If "
	+ "mounting works, you can ignore this message.\n\n");
	+ return;
	+ }
	+ // Check if user is member of fuse group
	+ found=FALSE;
	+ while(*(p_group->gr_mem)!=NULL) {
	+ if(strcmp(*(p_group->gr_mem),p_passwd->pw_name)==0) {
	+ found=TRUE;
	+ break;
	+ }
	+ p_group->gr_mem++;
	+ }
	+ if(found==FALSE) {
	+ printf("\nWARNING: You are not a member of the \"fuse\" group. This will "
	+ "prevent you from mounting images using xmount. Please add "
	+ "yourself to the \"fuse\" group using the command "
	+ "\"sudo usermod -a -G fuse %s\" and reboot your system or "
	+ "execute xmount as root.\n\n",
	+ p_passwd->pw_name);
	+ return;
	+ }
	+ } else {
	+ printf("\nWARNING: Your system does not seem to have a \"fuse\" group. If "
	+ "mounting works, you can ignore this message.\n\n");
	+ }
	+#endif
	+
	+ // Read FUSE's config file /etc/fuse.conf and check for set user_allow_other
	+ h_fuse_conf=(FILE*)FOPEN("/etc/fuse.conf","r");
	+ if(h_fuse_conf!=NULL) {
	+ // Search conf file for set user_allow_others
	+ found=FALSE;
	+ while(fgets(line,sizeof(line),h_fuse_conf)!=NULL) {
	+ // TODO: This works as long as there is no other parameter beginning with
	+ // "user_allow_other" :)
	+ if(strncmp(line,"user_allow_other",16)==0) {
	+ found=TRUE;
	+ break;
	+ }
	+ }
	+ fclose(h_fuse_conf);
	+ if(found==TRUE) {
	+ glob_xmount.may_set_fuse_allow_other=TRUE;
	+ } else {
	+ printf("\nWARNING: FUSE will not allow other users nor root to access "
	+ "your virtual harddisk image. To change this behavior, please "
	+ "add \"user_allow_other\" to /etc/fuse.conf or execute xmount "
	+ "as root.\n\n");
	+ }
	+ } else {
	+ printf("\nWARNING: Unable to open /etc/fuse.conf. If mounting works, you "
	+ "can ignore this message. If you encounter issues, please create "
	+ "the file and add a single line containing the string "
	+ "\"user_allow_other\" or execute xmount as root.\n\n");
	+ return;
	+ }
	+}
	+
	+//! Parse command line options
	+/*!
	+ * \param argc Number of cmdline params
	+ * \param pp_argv Array containing cmdline params
	+ * \return TRUE on success, FALSE on error
	+ */
	+#define SUPPORT_DEPRECATED_IN 1
	+static int ParseCmdLine(const int argc, char **pp_argv) {
	+ int i=1;
	+ int FuseMinusOControl=TRUE;
	+ int FuseAllowOther=TRUE;
	+ int first;
	+ char *p_buf;
	+ pts_InputImage p_input_image=NULL;
	+ int ret;
	+#ifdef SUPPORT_DEPRECATED_IN
	+ int use_old_in_syntax=FALSE;
	+#endif
	+
	+ // add pp_argv[0] to FUSE's argv
	+ XMOUNT_MALLOC(glob_xmount.pp_fuse_argv,char*,sizeof(char));
	+ XMOUNT_STRSET(glob_xmount.pp_fuse_argv[0],pp_argv[0]);
	+ glob_xmount.fuse_argc=1;
	+
	+ // Parse options
	+ while(i<argc && *pp_argv[i]=='-') {
	+ if(strlen(pp_argv[i])>1 && *(pp_argv[i]+1)!='-') {
	+ // Options beginning with one - are mostly FUSE specific
	+ if(strcmp(pp_argv[i],"-d")==0) {
	+ // Enable FUSE's and xmount's debug mode
	+ XMOUNT_REALLOC(glob_xmount.pp_fuse_argv,
	+ char**,
	+ (glob_xmount.fuse_argc+1)sizeof(char));
	+ XMOUNT_STRSET(glob_xmount.pp_fuse_argv[glob_xmount.fuse_argc],
	+ pp_argv[i])
	+ glob_xmount.fuse_argc++;
	+ glob_xmount.debug=TRUE;
	+ } else if(strcmp(pp_argv[i],"-h")==0) {
	+ // Print help message
	+ PrintUsage(pp_argv[0]);
	+ exit(0);
	+ } else if(strcmp(pp_argv[i],"-o")==0) {
	+ // Next parameter specifies fuse / lib mount options
	+ if((argc+1)>i) {
	+ i++;
	+ // As the user specified the -o option, we assume he knows what he is
	+ // doing. We won't append allow_other automatically. And we allow him
	+ // to disable allow_other by passing a single "-o no_allow_other"
	+ // which won't be passed to FUSE as it is xmount specific.
	+ if(strcmp(pp_argv[i],"no_allow_other")!=0) {
	+ glob_xmount.fuse_argc+=2;
	+ XMOUNT_REALLOC(glob_xmount.pp_fuse_argv,
	+ char**,
	+ glob_xmount.fuse_argcsizeof(char));
	+ XMOUNT_STRSET(glob_xmount.pp_fuse_argv[glob_xmount.fuse_argc-2],
	+ pp_argv[i-1]);
	+ XMOUNT_STRSET(glob_xmount.pp_fuse_argv[glob_xmount.fuse_argc-1],
	+ pp_argv[i]);
	+ FuseMinusOControl=FALSE;
	+ } else FuseAllowOther=FALSE;
	+ } else {
	+ LOG_ERROR("Couldn't parse mount options!\n")
	+ return FALSE;
	+ }
	+ } else if(strcmp(pp_argv[i],"-s")==0) {
	+ // Enable FUSE's single threaded mode
	+ XMOUNT_REALLOC(glob_xmount.pp_fuse_argv,
	+ char**,
	+ (glob_xmount.fuse_argc+1)sizeof(char));
	+ XMOUNT_STRSET(glob_xmount.pp_fuse_argv[glob_xmount.fuse_argc],
	+ pp_argv[i]);
	+ glob_xmount.fuse_argc++;
	+ } else if(strcmp(pp_argv[i],"-V")==0) {
	+ // Display FUSE version info
	+ XMOUNT_REALLOC(glob_xmount.pp_fuse_argv,
	+ char**,
	+ (glob_xmount.fuse_argc+1)sizeof(char));
	+ XMOUNT_STRSET(glob_xmount.pp_fuse_argv[glob_xmount.fuse_argc],
	+ pp_argv[i]);
	+ glob_xmount.fuse_argc++;
	+ } else {
	+ LOG_ERROR("Unknown command line option \"%s\"\n",pp_argv[i]);
	+ return FALSE;
	+ }
	+ } else {
	+ // Options beginning with -- are xmount specific
	+ if(strcmp(pp_argv[i],"--cache")==0 \|\| strcmp(pp_argv[i],"--rw")==0) {
	+ // Emulate writable access to mounted image
	+ // Next parameter must be cache file to read/write changes from/to
	+ if((argc+1)>i) {
	+ i++;
	+ XMOUNT_STRSET(glob_xmount.cache.p_cache_file,pp_argv[i])
	+ glob_xmount.output.writable=TRUE;
	+ } else {
	+ LOG_ERROR("You must specify a cache file!\n")
	+ return FALSE;
	+ }
	+ LOG_DEBUG("Enabling virtual write support using cache file \"%s\"\n",
	+ glob_xmount.cache.p_cache_file)
	+ } else if(strcmp(pp_argv[i],"--in")==0) {
	+ // Specify input image type and source files
	+#ifdef SUPPORT_DEPRECATED_IN
	+ if(use_old_in_syntax==TRUE) {
	+ LOG_ERROR("When using the deprecated --in option syntax, it is not "
	+ "possible to specify --in multiple times!\n");
	+ free(p_input_image->p_type);
	+ free(p_input_image);
	+ return FALSE;
	+ }
	+#endif
	+ if((argc+2)>i) {
	+ i++;
	+ // Alloc and init new ts_InputImage struct
	+ XMOUNT_MALLOC(p_input_image,pts_InputImage,sizeof(ts_InputImage));
	+ XMOUNT_STRSET(p_input_image->p_type,pp_argv[i]);
	+ p_input_image->pp_files=NULL;
	+ p_input_image->p_functions=NULL;
	+ p_input_image->p_handle=NULL;
	+ // Parse input image filename(s) and add to p_input_image->pp_files
	+ i++;
	+ p_input_image->files_count=0;
	+ while(i<(argc-1) && strncmp(pp_argv[i],"--",2)!=0) {
	+ p_input_image->files_count++;
	+ XMOUNT_REALLOC(p_input_image->pp_files,
	+ char**,
	+ p_input_image->files_countsizeof(char));
	+ XMOUNT_STRSET(p_input_image->pp_files[p_input_image->files_count-1],
	+ pp_argv[i]);
	+ i++;
	+ }
	+ i--;
	+ if(p_input_image->files_count==0) {
	+#ifndef SUPPORT_DEPRECATED_IN
	+ LOG_ERROR("No input files specified for \"--in %s\"!\n",
	+ p_input_image->p_type)
	+ free(p_input_image->p_type);
	+ free(p_input_image);
	+ return FALSE;
	+#else
	+ use_old_in_syntax=TRUE;
	+ i++;
	+ continue;
	+#endif
	+ }
	+ // Add input image struct to input image array
	+ glob_xmount.input.images_count++;
	+ XMOUNT_REALLOC(glob_xmount.input.pp_images,
	+ pts_InputImage*,
	+ glob_xmount.input.images_count*
	+ sizeof(pts_InputImage));
	+ glob_xmount.input.pp_images[glob_xmount.input.images_count-1]=
	+ p_input_image;
	+ } else {
	+ LOG_ERROR("You must specify an input image type and source file!\n");
	+ return FALSE;
	+ }
	+ } else if(strcmp(pp_argv[i],"--inopts")==0) {
	+ // Set input lib options
	+ if((argc+1)>i) {
	+ i++;
	+ if(glob_xmount.input.pp_lib_params==NULL) {
	+ if(SplitLibraryParameters(pp_argv[i],
	+ &(glob_xmount.input.lib_params_count),
	+ &(glob_xmount.input.pp_lib_params)
	+ )==FALSE)
	+ {
	+ LOG_ERROR("Unable to parse input library options '%s'!\n",
	+ pp_argv[i]);
	+ return FALSE;
	+ }
	+ } else {
	+ LOG_ERROR("You can only specify --inopts once!")
	+ return FALSE;
	+ }
	+ } else {
	+ LOG_ERROR("You must specify special options!\n");
	+ return FALSE;
	+ }
	+ } else if(strcmp(pp_argv[i],"--morph")==0) {
	+ // Set morphing lib to use
	+ if((argc+1)>i) {
	+ i++;
	+ if(glob_xmount.morphing.p_morph_type==NULL) {
	+ XMOUNT_STRSET(glob_xmount.morphing.p_morph_type,pp_argv[i]);
	+ } else {
	+ LOG_ERROR("You can only specify --morph once!")
	+ return FALSE;
	+ }
	+ } else {
	+ LOG_ERROR("You must specify morphing type!\n");
	+ return FALSE;
	+ }
	+ } else if(strcmp(pp_argv[i],"--morphopts")==0) {
	+ // Set morphing lib options
	+ if((argc+1)>i) {
	+ i++;
	+ if(glob_xmount.morphing.pp_lib_params==NULL) {
	+ if(SplitLibraryParameters(pp_argv[i],
	+ &(glob_xmount.morphing.lib_params_count),
	+ &(glob_xmount.morphing.pp_lib_params)
	+ )==FALSE)
	+ {
	+ LOG_ERROR("Unable to parse morphing library options '%s'!\n",
	+ pp_argv[i]);
	+ return FALSE;
	+ }
	+ } else {
	+ LOG_ERROR("You can only specify --morphopts once!")
	+ return FALSE;
	+ }
	+ } else {
	+ LOG_ERROR("You must specify special morphing lib params!\n");
	+ return FALSE;
	+ }
	+ } else if(strcmp(pp_argv[i],"--offset")==0) {
	+ // Set input image offset
	+ if((argc+1)>i) {
	+ i++;
	+ glob_xmount.input.image_offset=StrToUint64(pp_argv[i],&ret);
	+ if(ret==0) {
	+ LOG_ERROR("Unable to convert '%s' to a number!\n",pp_argv[i])
	+ return FALSE;
	+ }
	+ } else {
	+ LOG_ERROR("You must specify an offset!\n")
	+ return FALSE;
	+ }
	+ LOG_DEBUG("Setting input image offset to \"%" PRIu64 "\"\n",
	+ glob_xmount.input.image_offset)
	+ } else if(strcmp(pp_argv[i],"--out")==0) {
	+ // Specify output image type
	+ // Next parameter must be image type
	+ if((argc+1)>i) {
	+ i++;
	+ if(strcmp(pp_argv[i],"raw")==0) {
	+ glob_xmount.output.VirtImageType=VirtImageType_DD;
	+ LOG_DEBUG("Setting virtual image type to RAW\n")
	+ } else if(strcmp(pp_argv[i],"dd")==0) {
	+ glob_xmount.output.VirtImageType=VirtImageType_DD;
	+ LOG_WARNING("Using '--out dd' is deprecated and will be removed in "
	+ "the next release. "
	+ "Please use '--out raw' instead.\n");
	+ LOG_DEBUG("Setting virtual image type to RAW\n")
	+ } else if(strcmp(pp_argv[i],"dmg")==0) {
	+ glob_xmount.output.VirtImageType=VirtImageType_DMG;
	+ LOG_DEBUG("Setting virtual image type to DMG\n")
	+ } else if(strcmp(pp_argv[i],"vdi")==0) {
	+ glob_xmount.output.VirtImageType=VirtImageType_VDI;
	+ LOG_DEBUG("Setting virtual image type to VDI\n")
	+ } else if(strcmp(pp_argv[i],"vhd")==0) {
	+ glob_xmount.output.VirtImageType=VirtImageType_VHD;
	+ LOG_DEBUG("Setting virtual image type to VHD\n")
	+ } else if(strcmp(pp_argv[i],"vmdk")==0) {
	+ glob_xmount.output.VirtImageType=VirtImageType_VMDK;
	+ LOG_DEBUG("Setting virtual image type to VMDK\n")
	+ } else if(strcmp(pp_argv[i],"vmdks")==0) {
	+ glob_xmount.output.VirtImageType=VirtImageType_VMDKS;
	+ LOG_DEBUG("Setting virtual image type to VMDKS\n")
	+ } else {
	+ LOG_ERROR("Unknown output image type \"%s\"!\n",pp_argv[i])
	+ return FALSE;
	+ }
	+ } else {
	+ LOG_ERROR("You must specify an output image type!\n");
	+ return FALSE;
	+ }
	+ } else if(strcmp(pp_argv[i],"--owcache")==0) {
	+ // Enable writable access to mounted image and overwrite existing cache
	+ // Next parameter must be cache file to read/write changes from/to
	+ if((argc+1)>i) {
	+ i++;
	+ XMOUNT_STRSET(glob_xmount.cache.p_cache_file,pp_argv[i])
	+ glob_xmount.output.writable=TRUE;
	+ glob_xmount.cache.overwrite_cache=TRUE;
	+ } else {
	+ LOG_ERROR("You must specify a cache file!\n")
	+ return FALSE;
	+ }
	+ LOG_DEBUG("Enabling virtual write support overwriting cache file %s\n",
	+ glob_xmount.cache.p_cache_file)
	+ } else if(strcmp(pp_argv[i],"--sizelimit")==0) {
	+ // Set input image size limit
	+ if((argc+1)>i) {
	+ i++;
	+ glob_xmount.input.image_size_limit=StrToUint64(pp_argv[i],&ret);
	+ if(ret==0) {
	+ LOG_ERROR("Unable to convert '%s' to a number!\n",pp_argv[i])
	+ return FALSE;
	+ }
	+ } else {
	+ LOG_ERROR("You must specify a size limit!\n")
	+ return FALSE;
	+ }
	+ LOG_DEBUG("Setting input image size limit to \"%" PRIu64 "\"\n",
	+ glob_xmount.input.image_size_limit)
	+ } else if(strcmp(pp_argv[i],"--version")==0 \|\|
	+ strcmp(pp_argv[i],"--info")==0)
	+ {
	+ // Print xmount info
	+ printf(XMOUNT_COPYRIGHT_NOTICE "\n\n",XMOUNT_VERSION);
	+#ifdef __GNUC__
	+ printf(" compile timestamp: %s %s\n",__DATE__,__TIME__);
	+ printf(" gcc version: %s\n",__VERSION__);
	+#endif
	+ printf(" loaded input libraries:\n");
	+ for(uint32_t ii=0;ii<glob_xmount.input.libs_count;ii++) {
	+ printf(" - %s supporting ",glob_xmount.input.pp_libs[ii]->p_name);
	+ p_buf=glob_xmount.input.pp_libs[ii]->p_supported_input_types;
	+ first=TRUE;
	+ while(*p_buf!='\0') {
	+ if(first) {
	+ printf("\"%s\"",p_buf);
	+ first=FALSE;
	+ } else printf(", \"%s\"",p_buf);
	+ p_buf+=(strlen(p_buf)+1);
	+ }
	+ printf("\n");
	+ }
	+ printf(" loaded morphing libraries:\n");
	+ for(uint32_t ii=0;ii<glob_xmount.morphing.libs_count;ii++) {
	+ printf(" - %s supporting ",
	+ glob_xmount.morphing.pp_libs[ii]->p_name);
	+ p_buf=glob_xmount.morphing.pp_libs[ii]->p_supported_morphing_types;
	+ first=TRUE;
	+ while(*p_buf!='\0') {
	+ if(first) {
	+ printf("\"%s\"",p_buf);
	+ first=FALSE;
	+ } else printf(", \"%s\"",p_buf);
	+ p_buf+=(strlen(p_buf)+1);
	+ }
	+ printf("\n");
	+ }
	+ printf("\n");
	+ exit(0);
	+ } else {
	+ LOG_ERROR("Unknown command line option \"%s\"\n",pp_argv[i]);
	+ return FALSE;
	+ }
	+ }
	+ i++;
	+ }
	+
	+#ifdef SUPPORT_DEPRECATED_IN
	+ if(use_old_in_syntax==TRUE && i<(argc-1)) {
	+ LOG_WARNING("You are using a deprecated --in option syntax which will be "
	+ "removed in the next release. Please see the man page "
	+ "on how to use the new syntax.\n");
	+ while(i<(argc-1)) {
	+ p_input_image->files_count++;
	+ XMOUNT_REALLOC(p_input_image->pp_files,
	+ char**,
	+ p_input_image->files_countsizeof(char));
	+ XMOUNT_STRSET(p_input_image->pp_files[p_input_image->files_count-1],
	+ pp_argv[i]);
	+ i++;
	+ }
	+ // Add input image struct to input image array
	+ glob_xmount.input.images_count++;
	+ XMOUNT_REALLOC(glob_xmount.input.pp_images,
	+ pts_InputImage*,
	+ glob_xmount.input.images_count*sizeof(pts_InputImage));
	+ glob_xmount.input.pp_images[glob_xmount.input.images_count-1]=p_input_image;
	+ } else if(use_old_in_syntax==TRUE) {
	+ free(p_input_image->p_type);
	+ free(p_input_image);
	+ LOG_ERROR("You must specify an input image type and source file!\n");
	+ return FALSE;
	+ }
	+#endif
	+
	+ // Extract mountpoint
	+ if(i==(argc-1)) {
	+ XMOUNT_STRSET(glob_xmount.p_mountpoint,pp_argv[argc-1])
	+ XMOUNT_REALLOC(glob_xmount.pp_fuse_argv,
	+ char**,
	+ (glob_xmount.fuse_argc+1)sizeof(char));
	+ XMOUNT_STRSET(glob_xmount.pp_fuse_argv[glob_xmount.fuse_argc],
	+ glob_xmount.p_mountpoint);
	+ glob_xmount.fuse_argc++;
	+ } else {
	+ LOG_ERROR("No mountpoint specified!\n")
	+ return FALSE;
	+ }
	+
	+ if(FuseMinusOControl==TRUE) {
	+ // We control the -o flag, set subtype, fsname and allow_other options
	+ glob_xmount.fuse_argc+=2;
	+ XMOUNT_REALLOC(glob_xmount.pp_fuse_argv,
	+ char**,
	+ glob_xmount.fuse_argcsizeof(char));
	+ XMOUNT_STRSET(glob_xmount.pp_fuse_argv[glob_xmount.fuse_argc-2],"-o");
	+ XMOUNT_STRSET(glob_xmount.pp_fuse_argv[glob_xmount.fuse_argc-1],
	+ "subtype=xmount");
	+ if(glob_xmount.input.images_count!=0) {
	+ // Set name of first source file as fsname
	+ XMOUNT_STRAPP(glob_xmount.pp_fuse_argv[glob_xmount.fuse_argc-1],
	+ ",fsname=");
	+ XMOUNT_STRAPP(glob_xmount.pp_fuse_argv[glob_xmount.fuse_argc-1],
	+ glob_xmount.input.pp_images[0]->pp_files[0]);
	+ }
	+ if(FuseAllowOther==TRUE) {
	+ // Add "allow_other" option if allowed
	+ if(glob_xmount.may_set_fuse_allow_other) {
	+ XMOUNT_STRAPP(glob_xmount.pp_fuse_argv[glob_xmount.fuse_argc-1],
	+ ",allow_other");
	+ }
	+ }
	+ }
	+
	+ return TRUE;
	+}
	+
	+//! Extract virtual file name from input image name
	+/*!
	+ * \param p_orig_name Name of input image (may include a path)
	+ * \return TRUE on success, FALSE on error
	+ */
	+static int ExtractVirtFileNames(char *p_orig_name) {
	+ char *tmp;
	+
	+ // Truncate any leading path
	+ tmp=strrchr(p_orig_name,'/');
	+ if(tmp!=NULL) p_orig_name=tmp+1;
	+
	+ // Extract file extension
	+ tmp=strrchr(p_orig_name,'.');
	+
	+ // Set leading '/'
	+ XMOUNT_STRSET(glob_xmount.output.p_virtual_image_path,"/");
	+ XMOUNT_STRSET(glob_xmount.output.p_info_path,"/");
	+ if(glob_xmount.output.VirtImageType==VirtImageType_VMDK \|\|
	+ glob_xmount.output.VirtImageType==VirtImageType_VMDKS)
	+ {
	+ XMOUNT_STRSET(glob_xmount.output.vmdk.p_virtual_vmdk_path,"/");
	+ }
	+
	+ // Copy filename
	+ if(tmp==NULL) {
	+ // Input image filename has no extension
	+ XMOUNT_STRAPP(glob_xmount.output.p_virtual_image_path,p_orig_name);
	+ XMOUNT_STRAPP(glob_xmount.output.p_info_path,p_orig_name);
	+ if(glob_xmount.output.VirtImageType==VirtImageType_VMDK \|\|
	+ glob_xmount.output.VirtImageType==VirtImageType_VMDKS)
	+ {
	+ XMOUNT_STRAPP(glob_xmount.output.vmdk.p_virtual_vmdk_path,p_orig_name);
	+ }
	+ XMOUNT_STRAPP(glob_xmount.output.p_info_path,".info");
	+ } else {
	+ XMOUNT_STRNAPP(glob_xmount.output.p_virtual_image_path,p_orig_name,
	+ strlen(p_orig_name)-strlen(tmp));
	+ XMOUNT_STRNAPP(glob_xmount.output.p_info_path,p_orig_name,
	+ strlen(p_orig_name)-strlen(tmp));
	+ if(glob_xmount.output.VirtImageType==VirtImageType_VMDK \|\|
	+ glob_xmount.output.VirtImageType==VirtImageType_VMDKS)
	+ {
	+ XMOUNT_STRNAPP(glob_xmount.output.vmdk.p_virtual_vmdk_path,p_orig_name,
	+ strlen(p_orig_name)-strlen(tmp));
	+ }
	+ XMOUNT_STRAPP(glob_xmount.output.p_info_path,".info");
	+ }
	+
	+ // Add virtual file extensions
	+ switch(glob_xmount.output.VirtImageType) {
	+ case VirtImageType_DD:
	+ XMOUNT_STRAPP(glob_xmount.output.p_virtual_image_path,".dd");
	+ break;
	+ case VirtImageType_DMG:
	+ XMOUNT_STRAPP(glob_xmount.output.p_virtual_image_path,".dmg");
	+ break;
	+ case VirtImageType_VDI:
	+ XMOUNT_STRAPP(glob_xmount.output.p_virtual_image_path,".vdi");
	+ break;
	+ case VirtImageType_VHD:
	+ XMOUNT_STRAPP(glob_xmount.output.p_virtual_image_path,".vhd");
	+ break;
	+ case VirtImageType_VMDK:
	+ case VirtImageType_VMDKS:
	+ XMOUNT_STRAPP(glob_xmount.output.p_virtual_image_path,".dd");
	+ XMOUNT_STRAPP(glob_xmount.output.vmdk.p_virtual_vmdk_path,".vmdk");
	+ break;
	+ default:
	+ LOG_ERROR("Unknown virtual image type!\n")
	+ return FALSE;
	+ }
	+
	+ LOG_DEBUG("Set virtual image name to \"%s\"\n",
	+ glob_xmount.output.p_virtual_image_path);
	+ LOG_DEBUG("Set virtual image info name to \"%s\"\n",
	+ glob_xmount.output.p_info_path);
	+ if(glob_xmount.output.VirtImageType==VirtImageType_VMDK \|\|
	+ glob_xmount.output.VirtImageType==VirtImageType_VMDKS)
	+ {
	+ LOG_DEBUG("Set virtual vmdk name to \"%s\"\n",
	+ glob_xmount.output.vmdk.p_virtual_vmdk_path);
	+ }
	+ return TRUE;
	+}
	+
	+//! Get size of morphed image
	+/*!
	+ * \param p_size Buf to save size to
	+ * \return TRUE on success, FALSE on error
	+ */
	+static int GetMorphedImageSize(uint64_t *p_size) {
	+ int ret;
	+
	+ ret=glob_xmount.morphing.p_functions->Size(glob_xmount.morphing.p_handle,
	+ p_size);
	+ if(ret!=0) {
	+ LOG_ERROR("Unable to get morphed image size: %s!\n",
	+ glob_xmount.morphing.p_functions->GetErrorMessage(ret));
	+ return FALSE;
	+ }
	+
	+ return TRUE;
	+}
	+
	+//! Get size of virtual image
	+/*!
	+ * \param p_size Pointer to an uint64_t to which the size will be written to
	+ * \return TRUE on success, FALSE on error
	+ */
	+static int GetVirtImageSize(uint64_t *p_size) {
	+ if(glob_xmount.output.image_size!=0) {
	+ *p_size=glob_xmount.output.image_size;
	+ return TRUE;
	+ }
	+
	+ switch(glob_xmount.output.VirtImageType) {
	+ case VirtImageType_DD:
	+ case VirtImageType_DMG:
	+ case VirtImageType_VMDK:
	+ case VirtImageType_VMDKS:
	+ // Virtual image is a DD, DMG or VMDK file. Just return the size of the
	+ // original image
	+ if(!GetMorphedImageSize(p_size)) {
	+ LOG_ERROR("Couldn't get size of input image!\n")
	+ return FALSE;
	+ }
	+ break;
	+ case VirtImageType_VDI:
	+ // Virtual image is a VDI file. Get size of original image and add size
	+ // of VDI header etc.
	+ if(!GetMorphedImageSize(p_size)) {
	+ LOG_ERROR("Couldn't get size of input image!\n")
	+ return FALSE;
	+ }
	+ (*p_size)+=(sizeof(ts_VdiFileHeader)+
	+ glob_xmount.output.vdi.vdi_block_map_size);
	+ break;
	+ case VirtImageType_VHD:
	+ // Virtual image is a VHD file. Get size of original image and add size
	+ // of VHD footer.
	+ if(!GetMorphedImageSize(p_size)) {
	+ LOG_ERROR("Couldn't get size of input image!\n")
	+ return FALSE;
	+ }
	+ (*p_size)+=sizeof(ts_VhdFileHeader);
	+ break;
	+ default:
	+ LOG_ERROR("Unsupported image type!\n")
	+ return FALSE;
	+ }
	+
	+ glob_xmount.output.image_size=*p_size;
	+ return TRUE;
	+}
	+
	+//! Read data from input image
	+/*!
	+ * \param p_image Image from which to read data
	+ * \param p_buf Pointer to buffer to write read data to (must be preallocated!)
	+ * \param offset Offset at which data should be read
	+ * \param size Size of data which should be read (size of buffer)
	+ * \param p_read Number of read bytes on success
	+ * \return 0 on success, negated error code on error
	+ */
	+static int GetInputImageData(pts_InputImage p_image,
	+ char *p_buf,
	+ off_t offset,
	+ size_t size,
	+ size_t *p_read)
	+{
	+ int ret;
	+ size_t to_read=0;
	+ int read_errno=0;
	+
	+ LOG_DEBUG("Reading %zu bytes at offset %zu from input image '%s'\n",
	+ size,
	+ offset,
	+ p_image->pp_files[0]);
	+
	+ // Make sure we aren't reading past EOF of image file
	+ if(offset>=p_image->size) {
	+ // Offset is beyond image size
	+ LOG_DEBUG("Offset %zu is at / beyond size of input image '%s'\n",
	+ offset,
	+ p_image->pp_files[0]);
	+ *p_read=0;
	+ return 0;
	+ }
	+ if(offset+size>p_image->size) {
	+ // Attempt to read data past EOF of image file
	+ to_read=p_image->size-offset;
	+ LOG_DEBUG("Attempt to read data past EOF of input image '%s'. "
	+ "Correcting size from %zu to %zu\n",
	+ p_image->pp_files[0],
	+ size,
	+ to_read);
	+ } else to_read=size;
	+
	+ // Read data from image file (adding input image offset if one was specified)
	+ ret=p_image->p_functions->Read(p_image->p_handle,
	+ p_buf,
	+ offset+glob_xmount.input.image_offset,
	+ to_read,
	+ p_read,
	+ &read_errno);
	+ if(ret!=0) {
	+ LOG_ERROR("Couldn't read %zu bytes at offset %zu from input image "
	+ "'%s': %s!\n",
	+ to_read,
	+ offset,
	+ p_image->pp_files[0],
	+ p_image->p_functions->GetErrorMessage(ret));
	+ if(read_errno==0) return -EIO;
	+ else return (read_errno*(-1));
	+ }
	+
	+ return 0;
	+}
	+
	+//! Read data from morphed image
	+/*!
	+ * \param p_buf Pointer to buffer to write read data to (must be preallocated!)
	+ * \param offset Offset at which data should be read
	+ * \param size Size of data which should be read (size of buffer)
	+ * \param p_read Number of read bytes on success
	+ * \return TRUE on success, negated error code on error
	+ */
	+static int GetMorphedImageData(char *p_buf,
	+ off_t offset,
	+ size_t size,
	+ size_t *p_read)
	+{
	+ int ret;
	+ size_t to_read=0;
	+ size_t read;
	+ uint64_t image_size=0;
	+
	+ // Make sure we aren't reading past EOF of image file
	+ if(GetMorphedImageSize(&image_size)!=TRUE) {
	+ LOG_ERROR("Couldn't get size of morphed image!\n");
	+ return -EIO;
	+ }
	+ if(offset>=image_size) {
	+ // Offset is beyond image size
	+ LOG_DEBUG("Offset %zu is at / beyond size of morphed image.\n",offset);
	+ *p_read=0;
	+ return 0;
	+ }
	+ if(offset+size>image_size) {
	+ // Attempt to read data past EOF of morphed image file
	+ to_read=image_size-offset;
	+ LOG_DEBUG("Attempt to read data past EOF of morphed image. Corrected size "
	+ "from %zu to %zu.\n",
	+ size,
	+ to_read);
	+ } else to_read=size;
	+
	+ // Read data from morphed image
	+ ret=glob_xmount.morphing.p_functions->Read(glob_xmount.morphing.p_handle,
	+ p_buf,
	+ offset,
	+ to_read,
	+ &read);
	+ if(ret!=0) {
	+ LOG_ERROR("Couldn't read %zu bytes at offset %zu from morphed image: %s!\n",
	+ to_read,
	+ offset,
	+ glob_xmount.morphing.p_functions->GetErrorMessage(ret));
	+ return -EIO;
	+ }
	+
	+ *p_read=to_read;
	+ return TRUE;
	+}
	+
	+//! Read data from virtual image
	+/*!
	+ * \param p_buf Pointer to buffer to write read data to
	+ * \param offset Offset at which data should be read
	+ * \param size Size of data which should be read
	+ * \return Number of read bytes on success or negated error code on error
	+ */
	+static int GetVirtImageData(char *p_buf, off_t offset, size_t size) {
	+ uint32_t cur_block=0;
	+ uint64_t morphed_image_size, virt_image_size;
	+ size_t read, to_read=0, cur_to_read=0;
	+ off_t file_off=offset, block_off=0;
	+ size_t to_read_later=0;
	+ int ret;
	+
	+ // Get virtual image size
	+ if(GetVirtImageSize(&virt_image_size)!=TRUE) {
	+ LOG_ERROR("Couldn't get size of virtual image!\n")
	+ return -EIO;
	+ }
	+ if(offset>=virt_image_size) {
	+ LOG_DEBUG("Offset %zu is at / beyond size of virtual image.\n",offset);
	+ return 0;
	+ }
	+ if(offset+size>virt_image_size) {
	+ LOG_DEBUG("Attempt to read data past EOF of virtual image. Corrected size "
	+ "from %zu to %zu.\n",
	+ size,
	+ virt_image_size-offset);
	+ size=virt_image_size-offset;
	+ }
	+ to_read=size;
	+
	+ // Get morphed image size
	+ if(GetMorphedImageSize(&morphed_image_size)!=TRUE) {
	+ LOG_ERROR("Couldn't get morphed image size!")
	+ return -EIO;
	+ }
	+
	+ // Read virtual image type specific data preceeding morphed image data
	+ switch(glob_xmount.output.VirtImageType) {
	+ case VirtImageType_DD:
	+ case VirtImageType_DMG:
	+ case VirtImageType_VMDK:
	+ case VirtImageType_VMDKS:
	+ break;
	+ case VirtImageType_VDI:
	+ if(file_off<glob_xmount.output.vdi.vdi_header_size) {
	+ if(file_off+to_read>glob_xmount.output.vdi.vdi_header_size) {
	+ cur_to_read=glob_xmount.output.vdi.vdi_header_size-file_off;
	+ } else {
	+ cur_to_read=to_read;
	+ }
	+ if(glob_xmount.output.writable==TRUE &&
	+ glob_xmount.cache.p_cache_header->VdiFileHeaderCached==TRUE)
	+ {
	+ // VDI header was already cached
	+ if(fseeko(glob_xmount.cache.h_cache_file,
	+ glob_xmount.cache.p_cache_header->pVdiFileHeader+file_off,
	+ SEEK_SET)!=0)
	+ {
	+ LOG_ERROR("Couldn't seek to cached VDI header at offset %"
	+ PRIu64 "\n",
	+ glob_xmount.cache.p_cache_header->pVdiFileHeader+file_off)
	+ return -EIO;
	+ }
	+ if(fread(p_buf,cur_to_read,1,glob_xmount.cache.h_cache_file)!=1) {
	+ LOG_ERROR("Couldn't read %zu bytes from cache file at offset %"
	+ PRIu64 "\n",
	+ cur_to_read,
	+ glob_xmount.cache.p_cache_header->pVdiFileHeader+file_off)
	+ return -EIO;
	+ }
	+ LOG_DEBUG("Read %zd bytes from cached VDI header at offset %"
	+ PRIu64 " at cache file offset %" PRIu64 "\n",
	+ cur_to_read,
	+ file_off,
	+ glob_xmount.cache.p_cache_header->pVdiFileHeader+file_off)
	+ } else {
	+ // VDI header isn't cached
	+ memcpy(p_buf,
	+ ((char*)glob_xmount.output.vdi.p_vdi_header)+file_off,
	+ cur_to_read);
	+ LOG_DEBUG("Read %zd bytes at offset %" PRIu64
	+ " from virtual VDI header\n",cur_to_read,
	+ file_off)
	+ }
	+ if(to_read==cur_to_read) return to_read;
	+ else {
	+ // Adjust values to read from morphed image
	+ to_read-=cur_to_read;
	+ p_buf+=cur_to_read;
	+ file_off=0;
	+ }
	+ } else file_off-=glob_xmount.output.vdi.vdi_header_size;
	+ break;
	+ case VirtImageType_VHD:
	+ // When emulating VHD, make sure the while loop below only reads data
	+ // available in the morphed image. Any VHD footer data must be read
	+ // afterwards.
	+ if(file_off>=morphed_image_size) {
	+ to_read_later=to_read;
	+ to_read=0;
	+ } else if((file_off+to_read)>morphed_image_size) {
	+ to_read_later=(file_off+to_read)-morphed_image_size;
	+ to_read-=to_read_later;
	+ }
	+ break;
	+ }
	+
	+ // Calculate block to read data from
	+ cur_block=file_off/CACHE_BLOCK_SIZE;
	+ block_off=file_off%CACHE_BLOCK_SIZE;
	+
	+ // Read image data
	+ while(to_read!=0) {
	+ // Calculate how many bytes we have to read from this block
	+ if(block_off+to_read>CACHE_BLOCK_SIZE) {
	+ cur_to_read=CACHE_BLOCK_SIZE-block_off;
	+ } else cur_to_read=to_read;
	+ if(glob_xmount.output.writable==TRUE &&
	+ glob_xmount.cache.p_cache_blkidx[cur_block].Assigned==TRUE)
	+ {
	+ // Write support enabled and need to read altered data from cachefile
	+ if(fseeko(glob_xmount.cache.h_cache_file,
	+ glob_xmount.cache.p_cache_blkidx[cur_block].off_data+block_off,
	+ SEEK_SET)!=0)
	+ {
	+ LOG_ERROR("Couldn't seek to offset %" PRIu64
	+ " in cache file\n")
	+ return -EIO;
	+ }
	+ if(fread(p_buf,cur_to_read,1,glob_xmount.cache.h_cache_file)!=1) {
	+ LOG_ERROR("Couldn't read data from cache file!\n")
	+ return -EIO;
	+ }
	+ LOG_DEBUG("Read %zd bytes at offset %" PRIu64
	+ " from cache file\n",cur_to_read,file_off)
	+ } else {
	+ // No write support or data not cached
	+ ret=GetMorphedImageData(p_buf,file_off,cur_to_read,&read);
	+ if(ret!=TRUE \|\| read!=cur_to_read) {
	+ LOG_ERROR("Couldn't read data from virtual image!\n")
	+ return -EIO;
	+ }
	+ LOG_DEBUG("Read %zu bytes at offset %zu from virtual image file\n",
	+ cur_to_read,
	+ file_off);
	+ }
	+ cur_block++;
	+ block_off=0;
	+ p_buf+=cur_to_read;
	+ to_read-=cur_to_read;
	+ file_off+=cur_to_read;
	+ }
	+
	+ if(to_read_later!=0) {
	+ // Read virtual image type specific data following morphed image data
	+ switch(glob_xmount.output.VirtImageType) {
	+ case VirtImageType_DD:
	+ case VirtImageType_DMG:
	+ case VirtImageType_VMDK:
	+ case VirtImageType_VMDKS:
	+ case VirtImageType_VDI:
	+ break;
	+ case VirtImageType_VHD:
	+ // Micro$oft has choosen to use a footer rather then a header.
	+ if(glob_xmount.output.writable==TRUE &&
	+ glob_xmount.cache.p_cache_header->VhdFileHeaderCached==TRUE)
	+ {
	+ // VHD footer was already cached
	+ if(fseeko(glob_xmount.cache.h_cache_file,
	+ glob_xmount.cache.p_cache_header->pVhdFileHeader+
	+ (file_off-morphed_image_size),
	+ SEEK_SET)!=0)
	+ {
	+ LOG_ERROR("Couldn't seek to cached VHD footer at offset %"
	+ PRIu64 "\n",
	+ glob_xmount.cache.p_cache_header->pVhdFileHeader+
	+ (file_off-morphed_image_size))
	+ return -EIO;
	+ }
	+ if(fread(p_buf,to_read_later,1,glob_xmount.cache.h_cache_file)!=1) {
	+ LOG_ERROR("Couldn't read %zu bytes from cache file at offset %"
	+ PRIu64 "\n",
	+ to_read_later,
	+ glob_xmount.cache.p_cache_header->pVhdFileHeader+
	+ (file_off-morphed_image_size))
	+ return -EIO;
	+ }
	+ LOG_DEBUG("Read %zd bytes from cached VHD footer at offset %"
	+ PRIu64 " at cache file offset %" PRIu64 "\n",
	+ to_read_later,
	+ (file_off-morphed_image_size),
	+ glob_xmount.cache.p_cache_header->pVhdFileHeader+
	+ (file_off-morphed_image_size))
	+ } else {
	+ // VHD header isn't cached
	+ memcpy(p_buf,
	+ ((char*)glob_xmount.output.vhd.p_vhd_header)+
	+ (file_off-morphed_image_size),
	+ to_read_later);
	+ LOG_DEBUG("Read %zd bytes at offset %" PRIu64
	+ " from virtual VHD header\n",
	+ to_read_later,
	+ (file_off-morphed_image_size))
	+ }
	+ break;
	+ }
	+ }
	+
	+ return size;
	+}
	+
	+//! Write data to virtual VDI file header
	+/*!
	+ * \param p_buf Buffer containing data to write
	+ * \param offset Offset of changes
	+ * \param size Amount of bytes to write
	+ * \return Number of written bytes on success or "-1" on error
	+ */
	+static int SetVdiFileHeaderData(char *p_buf,off_t offset,size_t size) {
	+ if(offset+size>glob_xmount.output.vdi.vdi_header_size) {
	+ size=glob_xmount.output.vdi.vdi_header_size-offset;
	+ }
	+
	+ LOG_DEBUG("Need to cache %zu bytes at offset %" PRIu64
	+ " from VDI header\n",
	+ size,
	+ offset);
	+
	+ if(glob_xmount.cache.p_cache_header->VdiFileHeaderCached==1) {
	+ // Header was already cached
	+ if(fseeko(glob_xmount.cache.h_cache_file,
	+ glob_xmount.cache.p_cache_header->pVdiFileHeader+offset,
	+ SEEK_SET)!=0)
	+ {
	+ LOG_ERROR("Couldn't seek to cached VDI header at address %" PRIu64 "\n",
	+ glob_xmount.cache.p_cache_header->pVdiFileHeader+offset)
	+ return -1;
	+ }
	+ if(fwrite(p_buf,size,1,glob_xmount.cache.h_cache_file)!=1) {
	+ LOG_ERROR("Couldn't write %zu bytes to cache file at offset %"
	+ PRIu64 "\n",
	+ size,
	+ glob_xmount.cache.p_cache_header->pVdiFileHeader+offset)
	+ return -1;
	+ }
	+
	+ LOG_DEBUG("Wrote %zd bytes at offset %" PRIu64 " to cache file\n",
	+ size,
	+ glob_xmount.cache.p_cache_header->pVdiFileHeader+offset)
	+ } else {
	+ // Header wasn't already cached.
	+ if(fseeko(glob_xmount.cache.h_cache_file,
	+ 0,
	+ SEEK_END)!=0)
	+ {
	+ LOG_ERROR("Couldn't seek to end of cache file!")
	+ return -1;
	+ }
	+ glob_xmount.cache.p_cache_header->pVdiFileHeader=
	+ ftello(glob_xmount.cache.h_cache_file);
	+ LOG_DEBUG("Caching whole VDI header\n")
	+ if(offset>0) {
	+ // Changes do not begin at offset 0, need to prepend with data from
	+ // VDI header
	+ if(fwrite((char*)glob_xmount.output.vdi.p_vdi_header,
	+ offset,
	+ 1,
	+ glob_xmount.cache.h_cache_file)!=1)
	+ {
	+ LOG_ERROR("Error while writing %" PRIu64 " bytes "
	+ "to cache file at offset %" PRIu64 "!\n",
	+ offset,
	+ glob_xmount.cache.p_cache_header->pVdiFileHeader);
	+ return -1;
	+ }
	+ LOG_DEBUG("Prepended changed data with %" PRIu64
	+ " bytes at cache file offset %" PRIu64 "\n",
	+ offset,
	+ glob_xmount.cache.p_cache_header->pVdiFileHeader)
	+ }
	+ // Cache changed data
	+ if(fwrite(p_buf,size,1,glob_xmount.cache.h_cache_file)!=1) {
	+ LOG_ERROR("Couldn't write %zu bytes to cache file at offset %"
	+ PRIu64 "\n",size,
	+ glob_xmount.cache.p_cache_header->pVdiFileHeader+offset)
	+ return -1;
	+ }
	+ LOG_DEBUG("Wrote %zu bytes of changed data to cache file offset %"
	+ PRIu64 "\n",
	+ size,
	+ glob_xmount.cache.p_cache_header->pVdiFileHeader+offset)
	+ if(offset+size!=glob_xmount.output.vdi.vdi_header_size) {
	+ // Need to append data from VDI header to cache whole data struct
	+ if(fwrite(((char*)glob_xmount.output.vdi.p_vdi_header)+offset+size,
	+ glob_xmount.output.vdi.vdi_header_size-(offset+size),
	+ 1,
	+ glob_xmount.cache.h_cache_file)!=1)
	+ {
	+ LOG_ERROR("Couldn't write %zu bytes to cache file at offset %"
	+ PRIu64 "\n",
	+ glob_xmount.output.vdi.vdi_header_size-(offset+size),
	+ (uint64_t)(glob_xmount.cache.p_cache_header->pVdiFileHeader+
	+ offset+size));
	+ return -1;
	+ }
	+ LOG_DEBUG("Appended %" PRIu32
	+ " bytes to changed data at cache file offset %" PRIu64 "\n",
	+ glob_xmount.output.vdi.vdi_header_size-(offset+size),
	+ glob_xmount.cache.p_cache_header->pVdiFileHeader+offset+size)
	+ }
	+ // Mark header as cached and update header in cache file
	+ glob_xmount.cache.p_cache_header->VdiFileHeaderCached=1;
	+ if(fseeko(glob_xmount.cache.h_cache_file,0,SEEK_SET)!=0) {
	+ LOG_ERROR("Couldn't seek to offset 0 of cache file!\n")
	+ return -1;
	+ }
	+ if(fwrite((char*)glob_xmount.cache.p_cache_header,
	+ sizeof(ts_CacheFileHeader),
	+ 1,
	+ glob_xmount.cache.h_cache_file)!=1)
	+ {
	+ LOG_ERROR("Couldn't write changed cache file header!\n")
	+ return -1;
	+ }
	+ }
	+ // All important data has been written, now flush all buffers to make
	+ // sure data is written to cache file
	+ fflush(glob_xmount.cache.h_cache_file);
	+#ifndef __APPLE__
	+ ioctl(fileno(glob_xmount.cache.h_cache_file),BLKFLSBUF,0);
	+#endif
	+ return size;
	+}
	+
	+//! Write data to virtual VHD file footer
	+/*!
	+ * \param p_buf Buffer containing data to write
	+ * \param offset Offset of changes
	+ * \param size Amount of bytes to write
	+ * \return Number of written bytes on success or "-1" on error
	+ */
	+static int SetVhdFileHeaderData(char *p_buf,off_t offset,size_t size) {
	+ LOG_DEBUG("Need to cache %zu bytes at offset %" PRIu64
	+ " from VHD footer\n",size,offset)
	+ if(glob_xmount.cache.p_cache_header->VhdFileHeaderCached==1) {
	+ // Header has already been cached
	+ if(fseeko(glob_xmount.cache.h_cache_file,
	+ glob_xmount.cache.p_cache_header->pVhdFileHeader+offset,
	+ SEEK_SET)!=0)
	+ {
	+ LOG_ERROR("Couldn't seek to cached VHD header at address %" PRIu64 "\n",
	+ glob_xmount.cache.p_cache_header->pVhdFileHeader+offset);
	+ return -1;
	+ }
	+ if(fwrite(p_buf,size,1,glob_xmount.cache.h_cache_file)!=1) {
	+ LOG_ERROR("Couldn't write %zu bytes to cache file at offset %"
	+ PRIu64 "\n",
	+ size,
	+ glob_xmount.cache.p_cache_header->pVhdFileHeader+offset);
	+ return -1;
	+ }
	+ LOG_DEBUG("Wrote %zd bytes at offset %" PRIu64 " to cache file\n",
	+ size,
	+ glob_xmount.cache.p_cache_header->pVhdFileHeader+offset);
	+ } else {
	+ // Header hasn't been cached yet.
	+ if(fseeko(glob_xmount.cache.h_cache_file,
	+ 0,
	+ SEEK_END)!=0)
	+ {
	+ LOG_ERROR("Couldn't seek to end of cache file!")
	+ return -1;
	+ }
	+ glob_xmount.cache.p_cache_header->pVhdFileHeader=
	+ ftello(glob_xmount.cache.h_cache_file);
	+ LOG_DEBUG("Caching whole VHD header\n")
	+ if(offset>0) {
	+ // Changes do not begin at offset 0, need to prepend with data from
	+ // VHD header
	+ if(fwrite((char*)glob_xmount.output.vhd.p_vhd_header,
	+ offset,
	+ 1,
	+ glob_xmount.cache.h_cache_file)!=1)
	+ {
	+ LOG_ERROR("Error while writing %" PRIu64 " bytes "
	+ "to cache file at offset %" PRIu64 "!\n",
	+ offset,
	+ glob_xmount.cache.p_cache_header->pVhdFileHeader);
	+ return -1;
	+ }
	+ LOG_DEBUG("Prepended changed data with %" PRIu64
	+ " bytes at cache file offset %" PRIu64 "\n",
	+ offset,
	+ glob_xmount.cache.p_cache_header->pVhdFileHeader);
	+ }
	+ // Cache changed data
	+ if(fwrite(p_buf,size,1,glob_xmount.cache.h_cache_file)!=1) {
	+ LOG_ERROR("Couldn't write %zu bytes to cache file at offset %"
	+ PRIu64 "\n",
	+ size,
	+ glob_xmount.cache.p_cache_header->pVhdFileHeader+offset);
	+ return -1;
	+ }
	+ LOG_DEBUG("Wrote %zu bytes of changed data to cache file offset %"
	+ PRIu64 "\n",
	+ size,
	+ glob_xmount.cache.p_cache_header->pVhdFileHeader+offset);
	+ if(offset+size!=sizeof(ts_VhdFileHeader)) {
	+ // Need to append data from VHD header to cache whole data struct
	+ if(fwrite(((char*)glob_xmount.output.vhd.p_vhd_header)+offset+size,
	+ sizeof(ts_VhdFileHeader)-(offset+size),
	+ 1,
	+ glob_xmount.cache.h_cache_file)!=1)
	+ {
	+ LOG_ERROR("Couldn't write %zu bytes to cache file at offset %"
	+ PRIu64 "\n",
	+ sizeof(ts_VhdFileHeader)-(offset+size),
	+ (uint64_t)(glob_xmount.cache.p_cache_header->pVhdFileHeader+
	+ offset+size))
	+ return -1;
	+ }
	+ LOG_DEBUG("Appended %" PRIu32
	+ " bytes to changed data at cache file offset %" PRIu64 "\n",
	+ sizeof(ts_VhdFileHeader)-(offset+size),
	+ glob_xmount.cache.p_cache_header->pVhdFileHeader+offset+size);
	+ }
	+ // Mark header as cached and update header in cache file
	+ glob_xmount.cache.p_cache_header->VhdFileHeaderCached=1;
	+ if(fseeko(glob_xmount.cache.h_cache_file,0,SEEK_SET)!=0) {
	+ LOG_ERROR("Couldn't seek to offset 0 of cache file!\n")
	+ return -1;
	+ }
	+ if(fwrite((char*)glob_xmount.cache.p_cache_header,
	+ sizeof(ts_CacheFileHeader),
	+ 1,
	+ glob_xmount.cache.h_cache_file)!=1)
	+ {
	+ LOG_ERROR("Couldn't write changed cache file header!\n")
	+ return -1;
	+ }
	+ }
	+ // All important data has been written, now flush all buffers to make
	+ // sure data is written to cache file
	+ fflush(glob_xmount.cache.h_cache_file);
	+#ifndef __APPLE__
	+ ioctl(fileno(glob_xmount.cache.h_cache_file),BLKFLSBUF,0);
	+#endif
	+ return size;
	+}
	+
	+//! Write data to virtual image
	+/*!
	+ * \param p_buf Buffer containing data to write
	+ * \param offset Offset to start writing at
	+ * \param size Size of data to be written
	+ * \return Number of written bytes on success or "-1" on error
	+ */
	+static int SetVirtImageData(const char *p_buf, off_t offset, size_t size) {
	+ uint64_t cur_block=0;
	+ uint64_t virt_image_size;
	+ uint64_t orig_image_size;
	+ size_t to_write=0;
	+ size_t to_write_later=0;
	+ size_t to_write_now=0;
	+ off_t file_offset=offset;
	+ off_t block_offset=0;
	+ char p_write_buf=(char)p_buf;
	+ char *p_buf2;
	+ int ret;
	+ size_t read;
	+
	+ // Get virtual image size
	+ if(!GetVirtImageSize(&virt_image_size)) {
	+ LOG_ERROR("Couldn't get virtual image size!\n")
	+ return -1;
	+ }
	+
	+ if(offset>=virt_image_size) {
	+ LOG_ERROR("Attempt to write beyond EOF of virtual image file!\n")
	+ return -1;
	+ }
	+
	+ if(offset+size>virt_image_size) {
	+ LOG_DEBUG("Attempt to write past EOF of virtual image file\n")
	+ size=virt_image_size-offset;
	+ }
	+
	+ to_write=size;
	+
	+ // Get original image size
	+ if(!GetMorphedImageSize(&orig_image_size)) {
	+ LOG_ERROR("Couldn't get morphed image size!\n")
	+ return -1;
	+ }
	+
	+ // Cache virtual image type specific data preceeding original image data
	+ switch(glob_xmount.output.VirtImageType) {
	+ case VirtImageType_DD:
	+ case VirtImageType_DMG:
	+ case VirtImageType_VMDK:
	+ case VirtImageType_VMDKS:
	+ break;
	+ case VirtImageType_VDI:
	+ if(file_offset<glob_xmount.output.vdi.vdi_header_size) {
	+ ret=SetVdiFileHeaderData(p_write_buf,file_offset,to_write);
	+ if(ret==-1) {
	+ LOG_ERROR("Couldn't write data to virtual VDI file header!\n")
	+ return -1;
	+ }
	+ if(ret==to_write) return to_write;
	+ else {
	+ to_write-=ret;
	+ p_write_buf+=ret;
	+ file_offset=0;
	+ }
	+ } else file_offset-=glob_xmount.output.vdi.vdi_header_size;
	+ break;
	+ case VirtImageType_VHD:
	+ // When emulating VHD, make sure the while loop below only writes data
	+ // available in the original image. Any VHD footer data must be written
	+ // afterwards.
	+ if(file_offset>=orig_image_size) {
	+ to_write_later=to_write;
	+ to_write=0;
	+ } else if((file_offset+to_write)>orig_image_size) {
	+ to_write_later=(file_offset+to_write)-orig_image_size;
	+ to_write-=to_write_later;
	+ }
	+ break;
	+ }
	+
	+ // Calculate block to write data to
	+ cur_block=file_offset/CACHE_BLOCK_SIZE;
	+ block_offset=file_offset%CACHE_BLOCK_SIZE;
	+
	+ while(to_write!=0) {
	+ // Calculate how many bytes we have to write to this block
	+ if(block_offset+to_write>CACHE_BLOCK_SIZE) {
	+ to_write_now=CACHE_BLOCK_SIZE-block_offset;
	+ } else to_write_now=to_write;
	+ if(glob_xmount.cache.p_cache_blkidx[cur_block].Assigned==1) {
	+ // Block was already cached
	+ // Seek to data offset in cache file
	+ if(fseeko(glob_xmount.cache.h_cache_file,
	+ glob_xmount.cache.p_cache_blkidx[cur_block].off_data+block_offset,
	+ SEEK_SET)!=0)
	+ {
	+ LOG_ERROR("Couldn't seek to cached block at address %" PRIu64 "\n",
	+ glob_xmount.cache.p_cache_blkidx[cur_block].off_data+
	+ block_offset);
	+ return -1;
	+ }
	+ if(fwrite(p_write_buf,to_write_now,1,glob_xmount.cache.h_cache_file)!=1) {
	+ LOG_ERROR("Error while writing %zu bytes "
	+ "to cache file at offset %" PRIu64 "!\n",
	+ to_write_now,
	+ glob_xmount.cache.p_cache_blkidx[cur_block].off_data+
	+ block_offset);
	+ return -1;
	+ }
	+ LOG_DEBUG("Wrote %zd bytes at offset %" PRIu64
	+ " to cache file\n",to_write_now,
	+ glob_xmount.cache.p_cache_blkidx[cur_block].off_data+
	+ block_offset);
	+ } else {
	+ // Uncached block. Need to cache entire new block
	+ // Seek to end of cache file to append new cache block
	+ fseeko(glob_xmount.cache.h_cache_file,0,SEEK_END);
	+ glob_xmount.cache.p_cache_blkidx[cur_block].off_data=
	+ ftello(glob_xmount.cache.h_cache_file);
	+ if(block_offset!=0) {
	+ // Changed data does not begin at block boundry. Need to prepend
	+ // with data from virtual image file
	+ XMOUNT_MALLOC(p_buf2,char,block_offsetsizeof(char));
	+ ret=GetMorphedImageData(p_buf2,
	+ file_offset-block_offset,
	+ block_offset,
	+ &read);
	+ if(ret!=TRUE \|\| read!=block_offset) {
	+ LOG_ERROR("Couldn't read data from morphed image!\n")
	+ return -1;
	+ }
	+ if(fwrite(p_buf2,block_offset,1,glob_xmount.cache.h_cache_file)!=1) {
	+ LOG_ERROR("Couldn't writing %" PRIu64 " bytes "
	+ "to cache file at offset %" PRIu64 "!\n",
	+ block_offset,
	+ glob_xmount.cache.p_cache_blkidx[cur_block].off_data);
	+ return -1;
	+ }
	+ LOG_DEBUG("Prepended changed data with %" PRIu64
	+ " bytes from virtual image file at offset %" PRIu64
	+ "\n",block_offset,file_offset-block_offset)
	+ free(p_buf2);
	+ }
	+ if(fwrite(p_write_buf,to_write_now,1,glob_xmount.cache.h_cache_file)!=1) {
	+ LOG_ERROR("Error while writing %zd bytes "
	+ "to cache file at offset %" PRIu64 "!\n",
	+ to_write_now,
	+ glob_xmount.cache.p_cache_blkidx[cur_block].off_data+
	+ block_offset);
	+ return -1;
	+ }
	+ if(block_offset+to_write_now!=CACHE_BLOCK_SIZE) {
	+ // Changed data does not end at block boundry. Need to append
	+ // with data from virtual image file
	+ XMOUNT_MALLOC(p_buf2,char*,(CACHE_BLOCK_SIZE-
	+ (block_offset+to_write_now))*sizeof(char))
	+ memset(p_buf2,0,CACHE_BLOCK_SIZE-(block_offset+to_write_now));
	+ if((file_offset-block_offset)+CACHE_BLOCK_SIZE>orig_image_size) {
	+ // Original image is smaller than full cache block
	+ ret=GetMorphedImageData(p_buf2,
	+ file_offset+to_write_now,
	+ orig_image_size-(file_offset+to_write_now),
	+ &read);
	+ if(ret!=TRUE \|\| read!=orig_image_size-(file_offset+to_write_now)) {
	+ LOG_ERROR("Couldn't read data from virtual image file!\n")
	+ return -1;
	+ }
	+ } else {
	+ ret=GetMorphedImageData(p_buf2,
	+ file_offset+to_write_now,
	+ CACHE_BLOCK_SIZE-(block_offset+to_write_now),
	+ &read);
	+ if(ret!=TRUE \|\| read!=CACHE_BLOCK_SIZE-(block_offset+to_write_now)) {
	+ LOG_ERROR("Couldn't read data from virtual image file!\n")
	+ return -1;
	+ }
	+ }
	+ if(fwrite(p_buf2,
	+ CACHE_BLOCK_SIZE-(block_offset+to_write_now),
	+ 1,
	+ glob_xmount.cache.h_cache_file)!=1)
	+ {
	+ LOG_ERROR("Error while writing %zd bytes "
	+ "to cache file at offset %" PRIu64 "!\n",
	+ CACHE_BLOCK_SIZE-(block_offset+to_write_now),
	+ glob_xmount.cache.p_cache_blkidx[cur_block].off_data+
	+ block_offset+to_write_now);
	+ return -1;
	+ }
	+ free(p_buf2);
	+ }
	+ // All important data for this cache block has been written,
	+ // flush all buffers and mark cache block as assigned
	+ fflush(glob_xmount.cache.h_cache_file);
	+#ifndef __APPLE__
	+ ioctl(fileno(glob_xmount.cache.h_cache_file),BLKFLSBUF,0);
	+#endif
	+ glob_xmount.cache.p_cache_blkidx[cur_block].Assigned=1;
	+ // Update cache block index entry in cache file
	+ fseeko(glob_xmount.cache.h_cache_file,
	+ sizeof(ts_CacheFileHeader)+
	+ (cur_block*sizeof(ts_CacheFileBlockIndex)),
	+ SEEK_SET);
	+ if(fwrite(&(glob_xmount.cache.p_cache_blkidx[cur_block]),
	+ sizeof(ts_CacheFileBlockIndex),
	+ 1,
	+ glob_xmount.cache.h_cache_file)!=1)
	+ {
	+ LOG_ERROR("Couldn't update cache file block index!\n");
	+ return -1;
	+ }
	+ LOG_DEBUG("Updated cache file block index: Number=%" PRIu64
	+ ", Data offset=%" PRIu64 "\n",
	+ cur_block,
	+ glob_xmount.cache.p_cache_blkidx[cur_block].off_data);
	+ }
	+ // Flush buffers
	+ fflush(glob_xmount.cache.h_cache_file);
	+#ifndef __APPLE__
	+ ioctl(fileno(glob_xmount.cache.h_cache_file),BLKFLSBUF,0);
	+#endif
	+ block_offset=0;
	+ cur_block++;
	+ p_write_buf+=to_write_now;
	+ to_write-=to_write_now;
	+ file_offset+=to_write_now;
	+ }
	+
	+ if(to_write_later!=0) {
	+ // Cache virtual image type specific data preceeding original image data
	+ switch(glob_xmount.output.VirtImageType) {
	+ case VirtImageType_DD:
	+ case VirtImageType_DMG:
	+ case VirtImageType_VMDK:
	+ case VirtImageType_VMDKS:
	+ case VirtImageType_VDI:
	+ break;
	+ case VirtImageType_VHD:
	+ // Micro$oft has choosen to use a footer rather then a header.
	+ ret=SetVhdFileHeaderData(p_write_buf,
	+ file_offset-orig_image_size,
	+ to_write_later);
	+ if(ret==-1) {
	+ LOG_ERROR("Couldn't write data to virtual VHD file footer!\n")
	+ return -1;
	+ }
	+ break;
	+ }
	+ }
	+
	+ return size;
	+}
	+
	+//! Calculates an MD5 hash of the first HASH_AMOUNT bytes of the input image
	+/*!
	+ * \param p_hash_low Pointer to the lower 64 bit of the hash
	+ * \param p_hash_high Pointer to the higher 64 bit of the hash
	+ * \return TRUE on success, FALSE on error
	+ */
	+static int CalculateInputImageHash(uint64_t *p_hash_low,
	+ uint64_t *p_hash_high)
	+{
	+ char hash[16];
	+ md5_state_t md5_state;
	+ char *p_buf;
	+ int ret;
	+ size_t read_data;
	+
	+ XMOUNT_MALLOC(p_buf,char,HASH_AMOUNTsizeof(char));
	+ ret=GetMorphedImageData(p_buf,0,HASH_AMOUNT,&read_data);
	+ if(ret!=TRUE \|\| read_data==0) {
	+ LOG_ERROR("Couldn't read data from morphed image file!\n")
	+ free(p_buf);
	+ return FALSE;
	+ }
	+
	+ // Calculate MD5 hash
	+ md5_init(&md5_state);
	+ md5_append(&md5_state,(const md5_byte_t*)p_buf,read_data);
	+ md5_finish(&md5_state,(md5_byte_t*)hash);
	+ // Convert MD5 hash into two 64bit integers
	+ p_hash_low=((uint64_t*)hash);
	+ p_hash_high=((uint64_t*)(hash+8));
	+ free(p_buf);
	+
	+ return TRUE;
	+}
	+
	+//! Build and init virtual VDI file header
	+/*!
	+ * \return TRUE on success, FALSE on error
	+ */
	+static int InitVirtVdiHeader() {
	+ // See http://forums.virtualbox.org/viewtopic.php?t=8046 for a
	+ // "description" of the various header fields
	+
	+ uint64_t image_size;
	+ off_t offset;
	+ uint32_t i,block_entries;
	+
	+ // Get input image size
	+ if(!GetMorphedImageSize(&image_size)) {
	+ LOG_ERROR("Couldn't get morphed image size!\n")
	+ return FALSE;
	+ }
	+
	+ // Calculate how many VDI blocks we need
	+ block_entries=image_size/VDI_IMAGE_BLOCK_SIZE;
	+ if((image_size%VDI_IMAGE_BLOCK_SIZE)!=0) block_entries++;
	+ glob_xmount.output.vdi.vdi_block_map_size=block_entries*sizeof(uint32_t);
	+ LOG_DEBUG("BlockMap: %d (%08X) entries, %d (%08X) bytes!\n",
	+ block_entries,
	+ block_entries,
	+ glob_xmount.output.vdi.vdi_block_map_size,
	+ glob_xmount.output.vdi.vdi_block_map_size)
	+
	+ // Allocate memory for vdi header and block map
	+ glob_xmount.output.vdi.vdi_header_size=
	+ sizeof(ts_VdiFileHeader)+glob_xmount.output.vdi.vdi_block_map_size;
	+ XMOUNT_MALLOC(glob_xmount.output.vdi.p_vdi_header,
	+ pts_VdiFileHeader,
	+ glob_xmount.output.vdi.vdi_header_size);
	+ memset(glob_xmount.output.vdi.p_vdi_header,
	+ 0,
	+ glob_xmount.output.vdi.vdi_header_size);
	+ glob_xmount.output.vdi.p_vdi_block_map=
	+ ((void*)glob_xmount.output.vdi.p_vdi_header)+sizeof(ts_VdiFileHeader);
	+
	+ // Init header values
	+ strncpy(glob_xmount.output.vdi.p_vdi_header->szFileInfo,
	+ VDI_FILE_COMMENT,
	+ strlen(VDI_FILE_COMMENT)+1);
	+ glob_xmount.output.vdi.p_vdi_header->u32Signature=VDI_IMAGE_SIGNATURE;
	+ glob_xmount.output.vdi.p_vdi_header->u32Version=VDI_IMAGE_VERSION;
	+ // No idea what the following value is for! Testimage had same value
	+ glob_xmount.output.vdi.p_vdi_header->cbHeader=0x00000180;
	+ glob_xmount.output.vdi.p_vdi_header->u32Type=VDI_IMAGE_TYPE_FIXED;
	+ glob_xmount.output.vdi.p_vdi_header->fFlags=VDI_IMAGE_FLAGS;
	+ strncpy(glob_xmount.output.vdi.p_vdi_header->szComment,
	+ VDI_HEADER_COMMENT,
	+ strlen(VDI_HEADER_COMMENT)+1);
	+ glob_xmount.output.vdi.p_vdi_header->offData=
	+ glob_xmount.output.vdi.vdi_header_size;
	+ glob_xmount.output.vdi.p_vdi_header->offBlocks=sizeof(ts_VdiFileHeader);
	+ glob_xmount.output.vdi.p_vdi_header->cCylinders=0; // Legacy info
	+ glob_xmount.output.vdi.p_vdi_header->cHeads=0; // Legacy info
	+ glob_xmount.output.vdi.p_vdi_header->cSectors=0; // Legacy info
	+ glob_xmount.output.vdi.p_vdi_header->cbSector=512; // Legacy info
	+ glob_xmount.output.vdi.p_vdi_header->u32Dummy=0;
	+ glob_xmount.output.vdi.p_vdi_header->cbDisk=image_size;
	+ // Seems as VBox is always using a 1MB blocksize
	+ glob_xmount.output.vdi.p_vdi_header->cbBlock=VDI_IMAGE_BLOCK_SIZE;
	+ glob_xmount.output.vdi.p_vdi_header->cbBlockExtra=0;
	+ glob_xmount.output.vdi.p_vdi_header->cBlocks=block_entries;
	+ glob_xmount.output.vdi.p_vdi_header->cBlocksAllocated=block_entries;
	+ // Use partial MD5 input file hash as creation UUID and generate a random
	+ // modification UUID. VBox won't accept immages where create and modify UUIDS
	+ // aren't set.
	+ glob_xmount.output.vdi.p_vdi_header->uuidCreate_l=
	+ glob_xmount.input.image_hash_lo;
	+ glob_xmount.output.vdi.p_vdi_header->uuidCreate_h=
	+ glob_xmount.input.image_hash_hi;
	+
	+#define rand64(var) { \
	+ ((uint32_t)&(var))=rand(); \
	+ (((uint32_t)&(var))+1)=rand(); \
	+}
	+
	+ rand64(glob_xmount.output.vdi.p_vdi_header->uuidModify_l);
	+ rand64(glob_xmount.output.vdi.p_vdi_header->uuidModify_h);
	+
	+#undef rand64
	+
	+ // Generate block map
	+ i=0;
	+ for(offset=0;offset<glob_xmount.output.vdi.vdi_block_map_size;offset+=4) {
	+ ((uint32_t)(glob_xmount.output.vdi.p_vdi_block_map+offset))=i;
	+ i++;
	+ }
	+
	+ LOG_DEBUG("VDI header size = %u\n",glob_xmount.output.vdi.vdi_header_size);
	+
	+ return TRUE;
	+}
	+
	+//! Build and init virtual VHD file header
	+/*!
	+ * \return TRUE on success, FALSE on error
	+ */
	+static int InitVirtVhdHeader() {
	+ uint64_t orig_image_size=0;
	+ uint16_t i=0;
	+ uint64_t geom_tot_s=0;
	+ uint64_t geom_c_x_h=0;
	+ uint16_t geom_c=0;
	+ uint8_t geom_h=0;
	+ uint8_t geom_s=0;
	+ uint32_t checksum=0;
	+
	+ // Get input image size
	+ if(!GetMorphedImageSize(&orig_image_size)) {
	+ LOG_ERROR("Couldn't get morphed image size!\n")
	+ return FALSE;
	+ }
	+
	+ // Allocate memory for vhd header
	+ XMOUNT_MALLOC(glob_xmount.output.vhd.p_vhd_header,
	+ pts_VhdFileHeader,
	+ sizeof(ts_VhdFileHeader));
	+ memset(glob_xmount.output.vhd.p_vhd_header,0,sizeof(ts_VhdFileHeader));
	+
	+ // Init header values
	+ glob_xmount.output.vhd.p_vhd_header->cookie=VHD_IMAGE_HVAL_COOKIE;
	+ glob_xmount.output.vhd.p_vhd_header->features=VHD_IMAGE_HVAL_FEATURES;
	+ glob_xmount.output.vhd.p_vhd_header->file_format_version=
	+ VHD_IMAGE_HVAL_FILE_FORMAT_VERSION;
	+ glob_xmount.output.vhd.p_vhd_header->data_offset=VHD_IMAGE_HVAL_DATA_OFFSET;
	+ glob_xmount.output.vhd.p_vhd_header->creation_time=
	+ htobe32(time(NULL)-VHD_IMAGE_TIME_CONVERSION_OFFSET);
	+ glob_xmount.output.vhd.p_vhd_header->creator_app=
	+ VHD_IMAGE_HVAL_CREATOR_APPLICATION;
	+ glob_xmount.output.vhd.p_vhd_header->creator_ver=
	+ VHD_IMAGE_HVAL_CREATOR_VERSION;
	+ glob_xmount.output.vhd.p_vhd_header->creator_os=
	+ VHD_IMAGE_HVAL_CREATOR_HOST_OS;
	+ glob_xmount.output.vhd.p_vhd_header->size_original=htobe64(orig_image_size);
	+ glob_xmount.output.vhd.p_vhd_header->size_current=
	+ glob_xmount.output.vhd.p_vhd_header->size_original;
	+
	+ // Convert size to sectors
	+ if(orig_image_size>136899993600) {
	+ // image is larger then CHS values can address.
	+ // Set sectors to max (C65535H16S255).
	+ geom_tot_s=267382800;
	+ } else {
	+ // Calculate actual sectors
	+ geom_tot_s=orig_image_size/512;
	+ if((orig_image_size%512)!=0) geom_tot_s++;
	+ }
	+
	+ // Calculate CHS values. This is done according to the VHD specs
	+ if(geom_tot_s>=66059280) { // C65535 * H16 * S63
	+ geom_s=255;
	+ geom_h=16;
	+ geom_c_x_h=geom_tot_s/geom_s;
	+ } else {
	+ geom_s=17;
	+ geom_c_x_h=geom_tot_s/geom_s;
	+ geom_h=(geom_c_x_h+1023)/1024;
	+ if(geom_h<4) geom_h=4;
	+ if(geom_c_x_h>=(geom_h*1024) \|\| geom_h>16) {
	+ geom_s=31;
	+ geom_h=16;
	+ geom_c_x_h=geom_tot_s/geom_s;
	+ }
	+ if(geom_c_x_h>=(geom_h*1024)) {
	+ geom_s=63;
	+ geom_h=16;
	+ geom_c_x_h=geom_tot_s/geom_s;
	+ }
	+ }
	+ geom_c=geom_c_x_h/geom_h;
	+
	+ glob_xmount.output.vhd.p_vhd_header->disk_geometry_c=htobe16(geom_c);
	+ glob_xmount.output.vhd.p_vhd_header->disk_geometry_h=geom_h;
	+ glob_xmount.output.vhd.p_vhd_header->disk_geometry_s=geom_s;
	+
	+ glob_xmount.output.vhd.p_vhd_header->disk_type=VHD_IMAGE_HVAL_DISK_TYPE;
	+
	+ glob_xmount.output.vhd.p_vhd_header->uuid_l=glob_xmount.input.image_hash_lo;
	+ glob_xmount.output.vhd.p_vhd_header->uuid_h=glob_xmount.input.image_hash_hi;
	+ glob_xmount.output.vhd.p_vhd_header->saved_state=0x00;
	+
	+ // Calculate footer checksum
	+ for(i=0;i<sizeof(ts_VhdFileHeader);i++) {
	+ checksum+=((uint8_t)(glob_xmount.output.vhd.p_vhd_header)+i);
	+ }
	+ glob_xmount.output.vhd.p_vhd_header->checksum=htobe32(~checksum);
	+
	+ LOG_DEBUG("VHD header size = %u\n",sizeof(ts_VhdFileHeader));
	+
	+ return TRUE;
	+}
	+
	+//! Init the virtual VMDK file
	+/*!
	+ * \return TRUE on success, FALSE on error
	+ */
	+static int InitVirtualVmdkFile() {
	+ uint64_t image_size=0;
	+ uint64_t image_blocks=0;
	+ char buf[500];
	+
	+ // Get original image size
	+ if(!GetMorphedImageSize(&image_size)) {
	+ LOG_ERROR("Couldn't get morphed image size!\n")
	+ return FALSE;
	+ }
	+
	+ image_blocks=image_size/512;
	+ if(image_size%512!=0) image_blocks++;
	+
	+#define VMDK_DESC_FILE "# Disk DescriptorFile\n" \
	+ "version=1\n" \
	+ "CID=fffffffe\n" \
	+ "parentCID=ffffffff\n" \
	+ "createType=\"monolithicFlat\"\n\n" \
	+ "# Extent description\n" \
	+ "RW %" PRIu64 " FLAT \"%s\" 0\n\n" \
	+ "# The Disk Data Base\n" \
	+ "#DDB\n" \
	+ "ddb.virtualHWVersion = \"3\"\n" \
	+ "ddb.adapterType = \"%s\"\n" \
	+ "ddb.geometry.cylinders = \"0\"\n" \
	+ "ddb.geometry.heads = \"0\"\n" \
	+ "ddb.geometry.sectors = \"0\"\n"
	+
	+ if(glob_xmount.output.VirtImageType==VirtImageType_VMDK) {
	+ // VMDK with IDE bus
	+ sprintf(buf,
	+ VMDK_DESC_FILE,
	+ image_blocks,
	+ (glob_xmount.output.p_virtual_image_path)+1,
	+ "ide");
	+ } else if(glob_xmount.output.VirtImageType==VirtImageType_VMDKS){
	+ // VMDK with SCSI bus
	+ sprintf(buf,
	+ VMDK_DESC_FILE,
	+ image_blocks,
	+ (glob_xmount.output.p_virtual_image_path)+1,
	+ "scsi");
	+ } else {
	+ LOG_ERROR("Unknown virtual VMDK file format!\n")
	+ return FALSE;
	+ }
	+
	+#undef VMDK_DESC_FILE
	+
	+ // Do not use XMOUNT_STRSET here to avoid adding '\0' to the buffer!
	+ XMOUNT_MALLOC(glob_xmount.output.vmdk.p_vmdk_file,char*,strlen(buf))
	+ strncpy(glob_xmount.output.vmdk.p_vmdk_file,buf,strlen(buf));
	+ glob_xmount.output.vmdk.vmdk_file_size=strlen(buf);
	+
	+ return TRUE;
	+}
	+
	+//! Create virtual image info file
	+/*!
	+ * \return TRUE on success, FALSE on error
	+ */
	+static int InitVirtImageInfoFile() {
	+ int ret;
	+ char *p_buf;
	+
	+ // Start with static input header
	+ XMOUNT_MALLOC(glob_xmount.output.p_info_file,
	+ char*,
	+ strlen(IMAGE_INFO_INPUT_HEADER)+1);
	+ strncpy(glob_xmount.output.p_info_file,
	+ IMAGE_INFO_INPUT_HEADER,
	+ strlen(IMAGE_INFO_INPUT_HEADER)+1);
	+
	+ // Get and add infos from input lib(s)
	+ for(uint64_t i=0;i<glob_xmount.input.images_count;i++) {
	+ ret=glob_xmount.input.pp_images[i]->p_functions->
	+ GetInfofileContent(glob_xmount.input.pp_images[i]->p_handle,(const char**)&p_buf);
	+ if(ret!=0) {
	+ LOG_ERROR("Unable to get info file content for image '%s': %s!\n",
	+ glob_xmount.input.pp_images[i]->pp_files[0],
	+ glob_xmount.input.pp_images[i]->p_functions->
	+ GetErrorMessage(ret));
	+ return FALSE;
	+ }
	+ // Add infos to main buffer and free p_buf
	+ XMOUNT_STRAPP(glob_xmount.output.p_info_file,"\n--> ");
	+ XMOUNT_STRAPP(glob_xmount.output.p_info_file,
	+ glob_xmount.input.pp_images[i]->pp_files[0]);
	+ XMOUNT_STRAPP(glob_xmount.output.p_info_file," <--\n");
	+ if(p_buf!=NULL) {
	+ XMOUNT_STRAPP(glob_xmount.output.p_info_file,p_buf);
	+ glob_xmount.input.pp_images[i]->p_functions->FreeBuffer(p_buf);
	+ } else {
	+ XMOUNT_STRAPP(glob_xmount.output.p_info_file,"None\n");
	+ }
	+ }
	+
	+ // Add static morphing header
	+ XMOUNT_STRAPP(glob_xmount.output.p_info_file,IMAGE_INFO_MORPHING_HEADER);
	+
	+ // Get and add infos from morphing lib
	+ ret=glob_xmount.morphing.p_functions->
	+ GetInfofileContent(glob_xmount.morphing.p_handle,(const char**)&p_buf);
	+ if(ret!=0) {
	+ LOG_ERROR("Unable to get info file content from morphing lib: %s!\n",
	+ glob_xmount.morphing.p_functions->GetErrorMessage(ret));
	+ return FALSE;
	+ }
	+ if(p_buf!=NULL) {
	+ XMOUNT_STRAPP(glob_xmount.output.p_info_file,p_buf);
	+ glob_xmount.morphing.p_functions->FreeBuffer(p_buf);
	+ } else {
	+ XMOUNT_STRAPP(glob_xmount.output.p_info_file,"None\n");
	+ }
	+
	+ return TRUE;
	+}
	+
	+//! Create / load cache file to enable virtual write support
	+/*!
	+ * \return TRUE on success, FALSE on error
	+ */
	+static int InitCacheFile() {
	+ uint64_t image_size=0;
	+ uint64_t blockindex_size=0;
	+ uint64_t cachefile_header_size=0;
	+ uint64_t cachefile_size=0;
	+ uint32_t needed_blocks=0;
	+ uint64_t buf;
	+
	+ if(!glob_xmount.cache.overwrite_cache) {
	+ // Try to open an existing cache file or create a new one
	+ glob_xmount.cache.h_cache_file=(FILE*)FOPEN(glob_xmount.cache.p_cache_file,
	+ "rb+");
	+ if(glob_xmount.cache.h_cache_file==NULL) {
	+ // As the c lib seems to have no possibility to open a file rw wether it
	+ // exists or not (w+ does not work because it truncates an existing file),
	+ // when r+ returns NULL the file could simply not exist
	+ LOG_DEBUG("Cache file does not exist. Creating new one\n")
	+ glob_xmount.cache.h_cache_file=
	+ (FILE*)FOPEN(glob_xmount.cache.p_cache_file,"wb+");
	+ if(glob_xmount.cache.h_cache_file==NULL) {
	+ // There is really a problem opening the file
	+ LOG_ERROR("Couldn't open cache file \"%s\"!\n",
	+ glob_xmount.cache.p_cache_file)
	+ return FALSE;
	+ }
	+ }
	+ } else {
	+ // Overwrite existing cache file or create a new one
	+ glob_xmount.cache.h_cache_file=(FILE*)FOPEN(glob_xmount.cache.p_cache_file,
	+ "wb+");
	+ if(glob_xmount.cache.h_cache_file==NULL) {
	+ LOG_ERROR("Couldn't open cache file \"%s\"!\n",
	+ glob_xmount.cache.p_cache_file)
	+ return FALSE;
	+ }
	+ }
	+
	+ // Get input image size
	+ if(!GetMorphedImageSize(&image_size)) {
	+ LOG_ERROR("Couldn't get morphed image size!\n")
	+ return FALSE;
	+ }
	+
	+ // Calculate how many blocks are needed and how big the buffers must be
	+ // for the actual cache file version
	+ needed_blocks=image_size/CACHE_BLOCK_SIZE;
	+ if((image_size%CACHE_BLOCK_SIZE)!=0) needed_blocks++;
	+ blockindex_size=needed_blocks*sizeof(ts_CacheFileBlockIndex);
	+ cachefile_header_size=sizeof(ts_CacheFileHeader)+blockindex_size;
	+ LOG_DEBUG("Cache blocks: %u (%04X) entries, %zd (%08zX) bytes\n",
	+ needed_blocks,
	+ needed_blocks,
	+ blockindex_size,
	+ blockindex_size)
	+
	+ // Get cache file size
	+ // fseeko64 had massive problems!
	+ if(fseeko(glob_xmount.cache.h_cache_file,0,SEEK_END)!=0) {
	+ LOG_ERROR("Couldn't seek to end of cache file!\n")
	+ return FALSE;
	+ }
	+ // Same here, ftello64 didn't work at all and returned 0 all the times
	+ cachefile_size=ftello(glob_xmount.cache.h_cache_file);
	+ LOG_DEBUG("Cache file has %zd bytes\n",cachefile_size)
	+
	+ if(cachefile_size>0) {
	+ // Cache file isn't empty, parse block header
	+ LOG_DEBUG("Cache file not empty. Parsing block header\n")
	+ if(fseeko(glob_xmount.cache.h_cache_file,0,SEEK_SET)!=0) {
	+ LOG_ERROR("Couldn't seek to beginning of cache file!\n")
	+ return FALSE;
	+ }
	+ // Read and check file signature
	+ if(fread(&buf,8,1,glob_xmount.cache.h_cache_file)!=1 \|\|
	+ buf!=CACHE_FILE_SIGNATURE)
	+ {
	+ LOG_ERROR("Not an xmount cache file or cache file corrupt!\n")
	+ return FALSE;
	+ }
	+ // Now get cache file version (Has only 32bit!)
	+ if(fread(&buf,4,1,glob_xmount.cache.h_cache_file)!=1) {
	+ LOG_ERROR("Not an xmount cache file or cache file corrupt!\n")
	+ return FALSE;
	+ }
	+ switch((uint32_t)buf) {
	+ case 0x00000001:
	+ // Old v1 cache file.
	+ LOG_ERROR("Unsupported cache file version!\n")
	+ LOG_ERROR("Please use xmount-tool to upgrade your cache file.\n")
	+ return FALSE;
	+ case CUR_CACHE_FILE_VERSION:
	+ // Current version
	+ if(fseeko(glob_xmount.cache.h_cache_file,0,SEEK_SET)!=0) {
	+ LOG_ERROR("Couldn't seek to beginning of cache file!\n")
	+ return FALSE;
	+ }
	+ // Alloc memory for header and block index
	+ XMOUNT_MALLOC(glob_xmount.cache.p_cache_header,
	+ pts_CacheFileHeader,
	+ cachefile_header_size);
	+ memset(glob_xmount.cache.p_cache_header,0,cachefile_header_size);
	+ // Read header and block index from file
	+ if(fread(glob_xmount.cache.p_cache_header,
	+ cachefile_header_size,
	+ 1,
	+ glob_xmount.cache.h_cache_file)!=1)
	+ {
	+ // Cache file isn't big enough
	+ LOG_ERROR("Cache file corrupt!\n")
	+ return FALSE;
	+ }
	+ break;
	+ default:
	+ LOG_ERROR("Unknown cache file version!\n")
	+ return FALSE;
	+ }
	+ // Check if cache file has same block size as we do
	+ if(glob_xmount.cache.p_cache_header->BlockSize!=CACHE_BLOCK_SIZE) {
	+ LOG_ERROR("Cache file does not use default cache block size!\n")
	+ return FALSE;
	+ }
	+ // Set pointer to block index
	+ glob_xmount.cache.p_cache_blkidx=
	+ (pts_CacheFileBlockIndex)((void*)glob_xmount.cache.p_cache_header+
	+ glob_xmount.cache.p_cache_header->pBlockIndex);
	+ } else {
	+ // New cache file, generate a new block header
	+ LOG_DEBUG("Cache file is empty. Generating new block header\n");
	+ // Alloc memory for header and block index
	+ XMOUNT_MALLOC(glob_xmount.cache.p_cache_header,
	+ pts_CacheFileHeader,
	+ cachefile_header_size)
	+ memset(glob_xmount.cache.p_cache_header,0,cachefile_header_size);
	+ glob_xmount.cache.p_cache_header->FileSignature=CACHE_FILE_SIGNATURE;
	+ glob_xmount.cache.p_cache_header->CacheFileVersion=CUR_CACHE_FILE_VERSION;
	+ glob_xmount.cache.p_cache_header->BlockSize=CACHE_BLOCK_SIZE;
	+ glob_xmount.cache.p_cache_header->BlockCount=needed_blocks;
	+ //glob_xmount.cache.p_cache_header->UsedBlocks=0;
	+ // The following pointer is only usuable when reading data from cache file
	+ glob_xmount.cache.p_cache_header->pBlockIndex=sizeof(ts_CacheFileHeader);
	+ glob_xmount.cache.p_cache_blkidx=
	+ (pts_CacheFileBlockIndex)((void*)glob_xmount.cache.p_cache_header+
	+ sizeof(ts_CacheFileHeader));
	+ glob_xmount.cache.p_cache_header->VdiFileHeaderCached=FALSE;
	+ glob_xmount.cache.p_cache_header->pVdiFileHeader=0;
	+ glob_xmount.cache.p_cache_header->VmdkFileCached=FALSE;
	+ glob_xmount.cache.p_cache_header->VmdkFileSize=0;
	+ glob_xmount.cache.p_cache_header->pVmdkFile=0;
	+ glob_xmount.cache.p_cache_header->VhdFileHeaderCached=FALSE;
	+ glob_xmount.cache.p_cache_header->pVhdFileHeader=0;
	+ // Write header to file
	+ if(fwrite(glob_xmount.cache.p_cache_header,
	+ cachefile_header_size,
	+ 1,
	+ glob_xmount.cache.h_cache_file)!=1)
	+ {
	+ LOG_ERROR("Couldn't write cache file header to file!\n");
	+ return FALSE;
	+ }
	+ }
	+ return TRUE;
	+}
	+
	+//! Load input / morphing libs
	+/*!
	+ * \return TRUE on success, FALSE on error
	+ */
	+static int LoadLibs() {
	+ DIR *p_dir=NULL;
	+ struct dirent *p_dirent=NULL;
	+ int base_library_path_len=0;
	+ char *p_library_path=NULL;
	+ void *p_libxmount=NULL;
	+ t_LibXmount_Input_GetApiVersion pfun_input_GetApiVersion;
	+ t_LibXmount_Input_GetSupportedFormats pfun_input_GetSupportedFormats;
	+ t_LibXmount_Input_GetFunctions pfun_input_GetFunctions;
	+ t_LibXmount_Morphing_GetApiVersion pfun_morphing_GetApiVersion;
	+ t_LibXmount_Morphing_GetSupportedTypes pfun_morphing_GetSupportedTypes;
	+ t_LibXmount_Morphing_GetFunctions pfun_morphing_GetFunctions;
	+ const char *p_supported_formats=NULL;
	+ const char *p_buf;
	+ uint32_t supported_formats_len=0;
	+ pts_InputLib p_input_lib=NULL;
	+ pts_MorphingLib p_morphing_lib=NULL;
	+
	+ LOG_DEBUG("Searching for xmount libraries in '%s'.\n",
	+ XMOUNT_LIBRARY_PATH);
	+
	+ // Open lib dir
	+ p_dir=opendir(XMOUNT_LIBRARY_PATH);
	+ if(p_dir==NULL) {
	+ LOG_ERROR("Unable to access xmount library directory '%s'!\n",
	+ XMOUNT_LIBRARY_PATH);
	+ return FALSE;
	+ }
	+
	+ // Construct base library path
	+ base_library_path_len=strlen(XMOUNT_LIBRARY_PATH);
	+ XMOUNT_STRSET(p_library_path,XMOUNT_LIBRARY_PATH);
	+ if(XMOUNT_LIBRARY_PATH[base_library_path_len]!='/') {
	+ base_library_path_len++;
	+ XMOUNT_STRAPP(p_library_path,"/");
	+ }
	+
	+#define LIBXMOUNT_LOAD(path) { \
	+ p_libxmount=dlopen(path,RTLD_NOW); \
	+ if(p_libxmount==NULL) { \
	+ LOG_ERROR("Unable to load input library '%s': %s!\n", \
	+ path, \
	+ dlerror()); \
	+ continue; \
	+ } \
	+}
	+#define LIBXMOUNT_LOAD_SYMBOL(name,pfun) { \
	+ if((pfun=dlsym(p_libxmount,name))==NULL) { \
	+ LOG_ERROR("Unable to load symbol '%s' from library '%s'!\n", \
	+ name, \
	+ p_library_path); \
	+ dlclose(p_libxmount); \
	+ p_libxmount=NULL; \
	+ continue; \
	+ } \
	+}
	+
	+ // Loop over lib dir
	+ while((p_dirent=readdir(p_dir))!=NULL) {
	+ LOG_DEBUG("Trying to load '%s'\n",p_dirent->d_name);
	+
	+ // Construct full path to found object
	+ p_library_path=realloc(p_library_path,
	+ base_library_path_len+strlen(p_dirent->d_name)+1);
	+ if(p_library_path==NULL) {
	+ LOG_ERROR("Couldn't allocate memory!\n");
	+ exit(1);
	+ }
	+ strcpy(p_library_path+base_library_path_len,p_dirent->d_name);
	+
	+ if(strncmp(p_dirent->d_name,"libxmount_input_",16)==0) {
	+ // Found possible input lib. Try to load it
	+ LIBXMOUNT_LOAD(p_library_path);
	+
	+ // Load library symbols
	+ LIBXMOUNT_LOAD_SYMBOL("LibXmount_Input_GetApiVersion",
	+ pfun_input_GetApiVersion);
	+
	+ // Check library's API version
	+ if(pfun_input_GetApiVersion()!=LIBXMOUNT_INPUT_API_VERSION) {
	+ LOG_DEBUG("Failed! Wrong API version.\n");
	+ LOG_ERROR("Unable to load input library '%s'. Wrong API version\n",
	+ p_library_path);
	+ dlclose(p_libxmount);
	+ continue;
	+ }
	+
	+ LIBXMOUNT_LOAD_SYMBOL("LibXmount_Input_GetSupportedFormats",
	+ pfun_input_GetSupportedFormats);
	+ LIBXMOUNT_LOAD_SYMBOL("LibXmount_Input_GetFunctions",
	+ pfun_input_GetFunctions);
	+
	+ // Construct new entry for our library list
	+ XMOUNT_MALLOC(p_input_lib,pts_InputLib,sizeof(ts_InputLib));
	+ // Initialize lib_functions structure to NULL
	+ memset(&(p_input_lib->lib_functions),
	+ 0,
	+ sizeof(ts_LibXmountInputFunctions));
	+
	+ // Set name and handle
	+ XMOUNT_STRSET(p_input_lib->p_name,p_dirent->d_name);
	+ p_input_lib->p_lib=p_libxmount;
	+
	+ // Get and set supported formats
	+ p_supported_formats=pfun_input_GetSupportedFormats();
	+ supported_formats_len=0;
	+ p_buf=p_supported_formats;
	+ while(*p_buf!='\0') {
	+ supported_formats_len+=(strlen(p_buf)+1);
	+ p_buf+=(strlen(p_buf)+1);
	+ }
	+ supported_formats_len++;
	+ XMOUNT_MALLOC(p_input_lib->p_supported_input_types,
	+ char*,
	+ supported_formats_len);
	+ memcpy(p_input_lib->p_supported_input_types,
	+ p_supported_formats,
	+ supported_formats_len);
	+
	+ // Get, set and check lib_functions
	+ pfun_input_GetFunctions(&(p_input_lib->lib_functions));
	+ if(p_input_lib->lib_functions.CreateHandle==NULL \|\|
	+ p_input_lib->lib_functions.DestroyHandle==NULL \|\|
	+ p_input_lib->lib_functions.Open==NULL \|\|
	+ p_input_lib->lib_functions.Close==NULL \|\|
	+ p_input_lib->lib_functions.Size==NULL \|\|
	+ p_input_lib->lib_functions.Read==NULL \|\|
	+ p_input_lib->lib_functions.OptionsHelp==NULL \|\|
	+ p_input_lib->lib_functions.OptionsParse==NULL \|\|
	+ p_input_lib->lib_functions.GetInfofileContent==NULL \|\|
	+ p_input_lib->lib_functions.GetErrorMessage==NULL \|\|
	+ p_input_lib->lib_functions.FreeBuffer==NULL)
	+ {
	+ LOG_DEBUG("Missing implemention of one or more functions in lib %s!\n",
	+ p_dirent->d_name);
	+ free(p_input_lib->p_supported_input_types);
	+ free(p_input_lib->p_name);
	+ free(p_input_lib);
	+ dlclose(p_libxmount);
	+ continue;
	+ }
	+
	+ // Add entry to the input library list
	+ XMOUNT_REALLOC(glob_xmount.input.pp_libs,
	+ pts_InputLib*,
	+ sizeof(pts_InputLib)*(glob_xmount.input.libs_count+1));
	+ glob_xmount.input.pp_libs[glob_xmount.input.libs_count++]=p_input_lib;
	+
	+ LOG_DEBUG("Input library '%s' loaded successfully\n",p_dirent->d_name);
	+ } if(strncmp(p_dirent->d_name,"libxmount_morphing_",19)==0) {
	+ // Found possible morphing lib. Try to load it
	+ LIBXMOUNT_LOAD(p_library_path);
	+
	+ // Load library symbols
	+ LIBXMOUNT_LOAD_SYMBOL("LibXmount_Morphing_GetApiVersion",
	+ pfun_morphing_GetApiVersion);
	+
	+ // Check library's API version
	+ if(pfun_morphing_GetApiVersion()!=LIBXMOUNT_MORPHING_API_VERSION) {
	+ LOG_DEBUG("Failed! Wrong API version.\n");
	+ LOG_ERROR("Unable to load morphing library '%s'. Wrong API version\n",
	+ p_library_path);
	+ dlclose(p_libxmount);
	+ continue;
	+ }
	+
	+ LIBXMOUNT_LOAD_SYMBOL("LibXmount_Morphing_GetSupportedTypes",
	+ pfun_morphing_GetSupportedTypes);
	+ LIBXMOUNT_LOAD_SYMBOL("LibXmount_Morphing_GetFunctions",
	+ pfun_morphing_GetFunctions);
	+
	+ // Construct new entry for our library list
	+ XMOUNT_MALLOC(p_morphing_lib,pts_MorphingLib,sizeof(ts_MorphingLib));
	+ // Initialize lib_functions structure to NULL
	+ memset(&(p_morphing_lib->lib_functions),
	+ 0,
	+ sizeof(ts_LibXmountMorphingFunctions));
	+
	+ // Set name and handle
	+ XMOUNT_STRSET(p_morphing_lib->p_name,p_dirent->d_name);
	+ p_morphing_lib->p_lib=p_libxmount;
	+
	+ // Get and set supported types
	+ p_supported_formats=pfun_morphing_GetSupportedTypes();
	+ supported_formats_len=0;
	+ p_buf=p_supported_formats;
	+ while(*p_buf!='\0') {
	+ supported_formats_len+=(strlen(p_buf)+1);
	+ p_buf+=(strlen(p_buf)+1);
	+ }
	+ supported_formats_len++;
	+ XMOUNT_MALLOC(p_morphing_lib->p_supported_morphing_types,
	+ char*,
	+ supported_formats_len);
	+ memcpy(p_morphing_lib->p_supported_morphing_types,
	+ p_supported_formats,
	+ supported_formats_len);
	+
	+ // Get, set and check lib_functions
	+ pfun_morphing_GetFunctions(&(p_morphing_lib->lib_functions));
	+ if(p_morphing_lib->lib_functions.CreateHandle==NULL \|\|
	+ p_morphing_lib->lib_functions.DestroyHandle==NULL \|\|
	+ p_morphing_lib->lib_functions.Morph==NULL \|\|
	+ p_morphing_lib->lib_functions.Size==NULL \|\|
	+ p_morphing_lib->lib_functions.Read==NULL \|\|
	+ p_morphing_lib->lib_functions.OptionsHelp==NULL \|\|
	+ p_morphing_lib->lib_functions.OptionsParse==NULL \|\|
	+ p_morphing_lib->lib_functions.GetInfofileContent==NULL \|\|
	+ p_morphing_lib->lib_functions.GetErrorMessage==NULL \|\|
	+ p_morphing_lib->lib_functions.FreeBuffer==NULL)
	+ {
	+ LOG_DEBUG("Missing implemention of one or more functions in lib %s!\n",
	+ p_dirent->d_name);
	+ free(p_morphing_lib->p_supported_morphing_types);
	+ free(p_morphing_lib->p_name);
	+ free(p_morphing_lib);
	+ dlclose(p_libxmount);
	+ continue;
	+ }
	+
	+ // Add entry to the input library list
	+ XMOUNT_REALLOC(glob_xmount.morphing.pp_libs,
	+ pts_MorphingLib*,
	+ sizeof(pts_MorphingLib)*
	+ (glob_xmount.morphing.libs_count+1));
	+ glob_xmount.morphing.pp_libs[glob_xmount.morphing.libs_count++]=
	+ p_morphing_lib;
	+
	+ LOG_DEBUG("Morphing library '%s' loaded successfully\n",p_dirent->d_name);
	+ } else {
	+ LOG_DEBUG("Ignoring '%s'.\n",p_dirent->d_name);
	+ continue;
	+ }
	+ }
	+
	+#undef LIBXMOUNT_LOAD_SYMBOL
	+#undef LIBXMOUNT_LOAD
	+
	+ LOG_DEBUG("A total of %u input libs and %u morphing libs were loaded.\n",
	+ glob_xmount.input.libs_count,
	+ glob_xmount.morphing.libs_count);
	+
	+ free(p_library_path);
	+ closedir(p_dir);
	+ return ((glob_xmount.input.libs_count>0 &&
	+ glob_xmount.morphing.libs_count>0) ? TRUE : FALSE);
	+}
	+
	+//! Search an appropriate input lib for specified input type
	+/*!
	+ * \param p_input_image Input image to search input lib for
	+ * \return TRUE on success, FALSE on error
	+ */
	+static int FindInputLib(pts_InputImage p_input_image) {
	+ char *p_buf;
	+
	+ LOG_DEBUG("Trying to find suitable library for input type '%s'.\n",
	+ p_input_image->p_type);
	+
	+ // Loop over all loaded libs
	+ for(uint32_t i=0;i<glob_xmount.input.libs_count;i++) {
	+ LOG_DEBUG("Checking input library %s\n",
	+ glob_xmount.input.pp_libs[i]->p_name);
	+ p_buf=glob_xmount.input.pp_libs[i]->p_supported_input_types;
	+ while(*p_buf!='\0') {
	+ if(strcmp(p_buf,p_input_image->p_type)==0) {
	+ // Library supports input type, set lib functions
	+ LOG_DEBUG("Input library '%s' pretends to handle that input type.\n",
	+ glob_xmount.input.pp_libs[i]->p_name);
	+ p_input_image->p_functions=
	+ &(glob_xmount.input.pp_libs[i]->lib_functions);
	+ return TRUE;
	+ }
	+ p_buf+=(strlen(p_buf)+1);
	+ }
	+ }
	+
	+ LOG_DEBUG("Couldn't find any suitable library.\n");
	+
	+ // No library supporting input type found
	+ return FALSE;
	+}
	+
	+//! Search an appropriate morphing lib for the specified morph type
	+/*!
	+ * \return TRUE on success, FALSE on error
	+ */
	+static int FindMorphingLib() {
	+ char *p_buf;
	+
	+ LOG_DEBUG("Trying to find suitable library for morph type '%s'.\n",
	+ glob_xmount.morphing.p_morph_type);
	+
	+ // Loop over all loaded libs
	+ for(uint32_t i=0;i<glob_xmount.morphing.libs_count;i++) {
	+ LOG_DEBUG("Checking morphing library %s\n",
	+ glob_xmount.morphing.pp_libs[i]->p_name);
	+ p_buf=glob_xmount.morphing.pp_libs[i]->p_supported_morphing_types;
	+ while(*p_buf!='\0') {
	+ if(strcmp(p_buf,glob_xmount.morphing.p_morph_type)==0) {
	+ // Library supports morph type, set lib functions
	+ LOG_DEBUG("Morphing library '%s' pretends to handle that morph type.\n",
	+ glob_xmount.morphing.pp_libs[i]->p_name);
	+ glob_xmount.morphing.p_functions=
	+ &(glob_xmount.morphing.pp_libs[i]->lib_functions);
	+ return TRUE;
	+ }
	+ p_buf+=(strlen(p_buf)+1);
	+ }
	+ }
	+
	+ LOG_DEBUG("Couldn't find any suitable library.\n");
	+
	+ // No library supporting input type found
	+ return FALSE;
	+}
	+
	+static void InitResources() {
	+ // Input
	+ glob_xmount.input.libs_count=0;
	+ glob_xmount.input.pp_libs=NULL;
	+ glob_xmount.input.lib_params_count=0;
	+ glob_xmount.input.pp_lib_params=NULL;
	+ glob_xmount.input.images_count=0;
	+ glob_xmount.input.pp_images=NULL;
	+ glob_xmount.input.image_offset=0;
	+ glob_xmount.input.image_size_limit=0;
	+ glob_xmount.input.image_hash_lo=0;
	+ glob_xmount.input.image_hash_hi=0;
	+
	+ // Morphing
	+ glob_xmount.morphing.libs_count=0;
	+ glob_xmount.morphing.pp_libs=NULL;
	+ glob_xmount.morphing.p_morph_type=NULL;
	+ glob_xmount.morphing.lib_params_count=0;
	+ glob_xmount.morphing.pp_lib_params=NULL;
	+ glob_xmount.morphing.p_handle=NULL;
	+ glob_xmount.morphing.p_functions=NULL;
	+ glob_xmount.morphing.input_image_functions.ImageCount=
	+ &LibXmount_Morphing_ImageCount;
	+ glob_xmount.morphing.input_image_functions.Size=&LibXmount_Morphing_Size;
	+ glob_xmount.morphing.input_image_functions.Read=&LibXmount_Morphing_Read;
	+
	+ // Cache
	+ glob_xmount.cache.p_cache_file=NULL;
	+ glob_xmount.cache.h_cache_file=NULL;
	+ glob_xmount.cache.p_cache_header=NULL;
	+ glob_xmount.cache.p_cache_blkidx=NULL;
	+ glob_xmount.cache.overwrite_cache=FALSE;
	+
	+ // Output
	+#ifndef __APPLE__
	+ glob_xmount.output.VirtImageType=VirtImageType_DD;
	+#else
	+ glob_xmount.output.VirtImageType=VirtImageType_DMG;
	+#endif
	+ glob_xmount.output.image_size=0;
	+ glob_xmount.output.writable=FALSE;
	+ glob_xmount.output.p_virtual_image_path=NULL;
	+ glob_xmount.output.p_info_path=NULL;
	+ glob_xmount.output.p_info_file=NULL;
	+ glob_xmount.output.vdi.vdi_header_size=0;
	+ glob_xmount.output.vdi.p_vdi_header=NULL;
	+ glob_xmount.output.vdi.vdi_block_map_size=0;
	+ glob_xmount.output.vdi.p_vdi_block_map=NULL;
	+ glob_xmount.output.vhd.p_vhd_header=NULL;
	+ glob_xmount.output.vmdk.p_virtual_vmdk_path=NULL;
	+ glob_xmount.output.vmdk.p_vmdk_file=NULL;
	+ glob_xmount.output.vmdk.vmdk_file_size=0;
	+ glob_xmount.output.vmdk.p_vmdk_lockdir1=NULL;
	+ glob_xmount.output.vmdk.p_vmdk_lockdir2=NULL;
	+ glob_xmount.output.vmdk.p_vmdk_lockfile_data=NULL;
	+ glob_xmount.output.vmdk.vmdk_lockfile_size=0;
	+ glob_xmount.output.vmdk.p_vmdk_lockfile_name=NULL;
	+
	+ // Misc data
	+ glob_xmount.debug=FALSE;
	+ glob_xmount.may_set_fuse_allow_other=FALSE;
	+ glob_xmount.fuse_argc=0;
	+ glob_xmount.pp_fuse_argv=NULL;
	+ glob_xmount.p_mountpoint=NULL;
	+}
	+
	+/*
	+ * FreeResources
	+ */
	+static void FreeResources() {
	+ int ret;
	+
	+ LOG_DEBUG("Freeing all resources\n");
	+
	+ // Misc
	+ if(glob_xmount.pp_fuse_argv!=NULL) {
	+ for(int i=0;i<glob_xmount.fuse_argc;i++) free(glob_xmount.pp_fuse_argv[i]);
	+ free(glob_xmount.pp_fuse_argv);
	+ }
	+ if(glob_xmount.p_mountpoint!=NULL) free(glob_xmount.p_mountpoint);
	+
	+ // Output
	+ if(glob_xmount.output.vmdk.p_vmdk_lockfile_name!=NULL)
	+ free(glob_xmount.output.vmdk.p_vmdk_lockfile_name);
	+ if(glob_xmount.output.vmdk.p_vmdk_lockfile_data!=NULL)
	+ free(glob_xmount.output.vmdk.p_vmdk_lockfile_data);
	+ if(glob_xmount.output.vmdk.p_vmdk_lockdir2!=NULL)
	+ free(glob_xmount.output.vmdk.p_vmdk_lockdir2);
	+ if(glob_xmount.output.vmdk.p_vmdk_lockdir1!=NULL)
	+ free(glob_xmount.output.vmdk.p_vmdk_lockdir1);
	+ if(glob_xmount.output.vmdk.p_vmdk_file!=NULL)
	+ free(glob_xmount.output.vmdk.p_vmdk_file);
	+ if(glob_xmount.output.vmdk.p_virtual_vmdk_path!=NULL)
	+ free(glob_xmount.output.vmdk.p_virtual_vmdk_path);
	+ if(glob_xmount.output.p_info_path!=NULL)
	+ free(glob_xmount.output.p_info_path);
	+ if(glob_xmount.output.p_info_file!=NULL)
	+ free(glob_xmount.output.p_info_file);
	+ if(glob_xmount.output.vhd.p_vhd_header!=NULL)
	+ free(glob_xmount.output.vhd.p_vhd_header);
	+ if(glob_xmount.output.vdi.p_vdi_block_map!=NULL)
	+ free(glob_xmount.output.vdi.p_vdi_block_map);
	+ if(glob_xmount.output.vdi.p_vdi_header!=NULL)
	+ free(glob_xmount.output.vdi.p_vdi_header);
	+ if(glob_xmount.output.p_virtual_image_path!=NULL)
	+ free(glob_xmount.output.p_virtual_image_path);
	+
	+ // Cache
	+ if(glob_xmount.cache.h_cache_file!=NULL)
	+ fclose(glob_xmount.cache.h_cache_file);
	+ if(glob_xmount.cache.p_cache_header!=NULL)
	+ free(glob_xmount.cache.p_cache_header);
	+ // glob_xmount.cache.p_cache_blkidx is freed by the above call
	+ if(glob_xmount.cache.p_cache_file!=NULL)
	+ free(glob_xmount.cache.p_cache_file);
	+
	+ // Morphing
	+ if(glob_xmount.morphing.p_functions!=NULL) {
	+ if(glob_xmount.morphing.p_handle!=NULL) {
	+ // Destroy morphing handle
	+ ret=glob_xmount.morphing.p_functions->
	+ DestroyHandle(&(glob_xmount.morphing.p_handle));
	+ if(ret!=0) {
	+ LOG_ERROR("Unable to destroy morphing handle: %s!\n",
	+ glob_xmount.morphing.p_functions->GetErrorMessage(ret));
	+ }
	+ }
	+ }
	+ if(glob_xmount.morphing.pp_lib_params!=NULL) {
	+ for(uint32_t i=0;i<glob_xmount.morphing.lib_params_count;i++)
	+ free(glob_xmount.morphing.pp_lib_params[i]);
	+ free(glob_xmount.morphing.pp_lib_params);
	+ }
	+ if(glob_xmount.morphing.p_morph_type!=NULL)
	+ free(glob_xmount.morphing.p_morph_type);
	+ if(glob_xmount.morphing.pp_libs!=NULL) {
	+ // Unload morphing libs
	+ for(uint32_t i=0;i<glob_xmount.morphing.libs_count;i++) {
	+ if(glob_xmount.morphing.pp_libs[i]==NULL) continue;
	+ if(glob_xmount.morphing.pp_libs[i]->p_supported_morphing_types!=NULL)
	+ free(glob_xmount.morphing.pp_libs[i]->p_supported_morphing_types);
	+ if(glob_xmount.morphing.pp_libs[i]->p_lib!=NULL)
	+ dlclose(glob_xmount.morphing.pp_libs[i]->p_lib);
	+ if(glob_xmount.morphing.pp_libs[i]->p_name!=NULL)
	+ free(glob_xmount.morphing.pp_libs[i]->p_name);
	+ free(glob_xmount.morphing.pp_libs[i]);
	+ }
	+ free(glob_xmount.morphing.pp_libs);
	+ }
	+
	+ // Input
	+ if(glob_xmount.input.pp_images!=NULL) {
	+ // Close all input images
	+ for(uint64_t i=0;i<glob_xmount.input.images_count;i++) {
	+ if(glob_xmount.input.pp_images[i]==NULL) continue;
	+ if(glob_xmount.input.pp_images[i]->p_functions!=NULL) {
	+ if(glob_xmount.input.pp_images[i]->p_handle!=NULL) {
	+ ret=glob_xmount.input.pp_images[i]->p_functions->
	+ Close(glob_xmount.input.pp_images[i]->p_handle);
	+ if(ret!=0) {
	+ LOG_ERROR("Unable to close input image: %s\n",
	+ glob_xmount.input.pp_images[i]->p_functions->
	+ GetErrorMessage(ret));
	+ }
	+ ret=glob_xmount.input.pp_images[i]->p_functions->
	+ DestroyHandle(&(glob_xmount.input.pp_images[i]->p_handle));
	+ if(ret!=0) {
	+ LOG_ERROR("Unable to destroy input image handle: %s\n",
	+ glob_xmount.input.pp_images[i]->p_functions->
	+ GetErrorMessage(ret));
	+ }
	+ }
	+ }
	+ if(glob_xmount.input.pp_images[i]->pp_files!=NULL) {
	+ for(uint64_t ii=0;ii<glob_xmount.input.pp_images[i]->files_count;ii++) {
	+ if(glob_xmount.input.pp_images[i]->pp_files[ii]!=NULL)
	+ free(glob_xmount.input.pp_images[i]->pp_files[ii]);
	+ }
	+ free(glob_xmount.input.pp_images[i]->pp_files);
	+ }
	+ if(glob_xmount.input.pp_images[i]->p_type!=NULL)
	+ free(glob_xmount.input.pp_images[i]->p_type);
	+ free(glob_xmount.input.pp_images[i]);
	+ }
	+ free(glob_xmount.input.pp_images);
	+ }
	+ if(glob_xmount.input.pp_lib_params!=NULL) {
	+ for(uint32_t i=0;i<glob_xmount.input.lib_params_count;i++)
	+ free(glob_xmount.input.pp_lib_params[i]);
	+ free(glob_xmount.input.pp_lib_params);
	+ }
	+ if(glob_xmount.input.pp_libs!=NULL) {
	+ // Unload all input libs
	+ for(uint32_t i=0;i<glob_xmount.input.libs_count;i++) {
	+ if(glob_xmount.input.pp_libs[i]->p_supported_input_types!=NULL)
	+ free(glob_xmount.input.pp_libs[i]->p_supported_input_types);
	+ if(glob_xmount.input.pp_libs[i]->p_lib!=NULL)
	+ dlclose(glob_xmount.input.pp_libs[i]->p_lib);
	+ if(glob_xmount.input.pp_libs[i]->p_name!=NULL)
	+ free(glob_xmount.input.pp_libs[i]->p_name);
	+ free(glob_xmount.input.pp_libs[i]);
	+ }
	+ free(glob_xmount.input.pp_libs);
	+ }
	+
	+ // Before we return, initialize everything in case ReleaseResources would be
	+ // called again.
	+ InitResources();
	+}
	+
	+//! Function to split given library options
	+static int SplitLibraryParameters(char *p_params,
	+ uint32_t *p_ret_opts_count,
	+ pts_LibXmountOptions **ppp_ret_opt)
	+{
	+ pts_LibXmountOptions p_opts=NULL;
	+ pts_LibXmountOptions *pp_opts=NULL;
	+ uint32_t params_len;
	+ uint32_t opts_count=0;
	+ uint32_t sep_pos=0;
	+ char *p_buf=p_params;
	+
	+ if(p_params==NULL) return FALSE;
	+
	+ // Get params length
	+ params_len=strlen(p_params);
	+
	+ // Return if no params specified
	+ if(params_len==0) {
	+ *ppp_ret_opt=NULL;
	+ p_ret_opts_count=0;
	+ return TRUE;
	+ }
	+
	+ // Split params
	+ while(*p_buf!='\0') {
	+ XMOUNT_MALLOC(p_opts,pts_LibXmountOptions,sizeof(ts_LibXmountOptions));
	+ p_opts->valid=0;
	+
	+#define FREE_PP_OPTS() { \
	+ if(pp_opts!=NULL) { \
	+ for(uint32_t i=0;i<opts_count;i++) free(pp_opts[i]); \
	+ free(pp_opts); \
	+ } \
	+}
	+
	+ // Search next assignment operator
	+ sep_pos=0;
	+ while(p_buf[sep_pos]!='\0' && p_buf[sep_pos]!='=') sep_pos++;
	+ if(sep_pos==0 \|\| p_buf[sep_pos]=='\0') {
	+ LOG_ERROR("Library parameter '%s' is missing an assignment operator!\n",
	+ p_buf);
	+ free(p_opts);
	+ FREE_PP_OPTS();
	+ return FALSE;
	+ }
	+
	+ // Save option key
	+ XMOUNT_STRNSET(p_opts->p_key,p_buf,sep_pos);
	+ p_buf+=(sep_pos+1);
	+
	+ // Search next separator
	+ sep_pos=0;
	+ while(p_buf[sep_pos]!='\0' && p_buf[sep_pos]!=',') sep_pos++;
	+ if(sep_pos==0) {
	+ LOG_ERROR("Library parameter '%s' is not of format key=value!\n",
	+ p_opts->p_key);
	+ free(p_opts->p_key);
	+ free(p_opts);
	+ FREE_PP_OPTS();
	+ return FALSE;
	+ }
	+
	+ // Save option value
	+ XMOUNT_STRNSET(p_opts->p_value,p_buf,sep_pos);
	+ p_buf+=sep_pos;
	+
	+ LOG_DEBUG("Extracted library option: '%s' = '%s'\n",
	+ p_opts->p_key,
	+ p_opts->p_value);
	+
	+#undef FREE_PP_OPTS
	+
	+ // Add current option to return array
	+ XMOUNT_REALLOC(pp_opts,
	+ pts_LibXmountOptions*,
	+ sizeof(pts_LibXmountOptions)*(opts_count+1));
	+ pp_opts[opts_count++]=p_opts;
	+
	+ // If we're not at the end of p_params, skip over separator for next run
	+ if(*p_buf!='\0') p_buf++;
	+ }
	+
	+ LOG_DEBUG("Extracted a total of %" PRIu32 " library options\n",opts_count);
	+
	+ *p_ret_opts_count=opts_count;
	+ *ppp_ret_opt=pp_opts;
	+ return TRUE;
	+}
	+
	+/*******************************************************************************
	+ * LibXmount_Morphing function implementation
	+ ******************************************************************************/
	+//! Function to get the amount of input images
	+/*!
	+ * \param p_count Count of input images
	+ * \return 0 on success
	+ */
	+static int LibXmount_Morphing_ImageCount(uint64_t *p_count) {
	+ *p_count=glob_xmount.input.images_count;
	+ return 0;
	+}
	+
	+//! Function to get the size of the morphed data
	+/*!
	+ * \param image Image number
	+ * \param p_size Pointer to store input image's size to
	+ * \return 0 on success
	+ */
	+static int LibXmount_Morphing_Size(uint64_t image, uint64_t *p_size) {
	+ if(image>=glob_xmount.input.images_count) return -1;
	+ *p_size=glob_xmount.input.pp_images[image]->size;
	+ return 0;
	+}
	+
	+//! Function to read data from input image
	+/*!
	+ * \param image Image number
	+ * \param p_buf Buffer to store read data to
	+ * \param offset Position at which to start reading
	+ * \param count Amount of bytes to read
	+ * \param p_read Number of read bytes on success
	+ * \return 0 on success or negated error code on error
	+ */
	+static int LibXmount_Morphing_Read(uint64_t image,
	+ char *p_buf,
	+ off_t offset,
	+ size_t count,
	+ size_t *p_read)
	+{
	+ if(image>=glob_xmount.input.images_count) return -EIO;
	+ return GetInputImageData(glob_xmount.input.pp_images[image],
	+ p_buf,
	+ offset,
	+ count,
	+ p_read);
	+}
	+
	+/*******************************************************************************
	+ * FUSE function implementation
	+ ******************************************************************************/
	+//! FUSE access implementation
	+/*!
	+ * \param p_path Path of file to get attributes from
	+ * \param perm Requested permissisons
	+ * \return 0 on success, negated error code on error
	+ */
	+/*
	+static int FuseAccess(const char *path, int perm) {
	+ // TODO: Implement propper file permission handling
	+ // http://www.cs.cf.ac.uk/Dave/C/node20.html
	+ // Values for the second argument to access.
	+ // These may be OR'd together.
	+ //#define R_OK 4 // Test for read permission.
	+ //#define W_OK 2 // Test for write permission.
	+ //#define X_OK 1 // Test for execute permission.
	+ //#define F_OK 0 // Test for existence.
	+ return 0;
	+}
	+*/
	+
	+//! FUSE getattr implementation
	+/*!
	+ * \param p_path Path of file to get attributes from
	+ * \param p_stat Pointer to stat structure to save attributes to
	+ * \return 0 on success, negated error code on error
	+ */
	+static int FuseGetAttr(const char p_path, struct stat p_stat) {
	+ memset(p_stat,0,sizeof(struct stat));
	+ if(strcmp(p_path,"/")==0) {
	+ // Attributes of mountpoint
	+ p_stat->st_mode=S_IFDIR \| 0777;
	+ p_stat->st_nlink=2;
	+ } else if(strcmp(p_path,glob_xmount.output.p_virtual_image_path)==0) {
	+ // Attributes of virtual image
	+ if(!glob_xmount.output.writable) p_stat->st_mode=S_IFREG \| 0444;
	+ else p_stat->st_mode=S_IFREG \| 0666;
	+ p_stat->st_nlink=1;
	+ // Get virtual image file size
	+ if(!GetVirtImageSize((uint64_t*)&(p_stat->st_size))) {
	+ LOG_ERROR("Couldn't get image size!\n");
	+ return -ENOENT;
	+ }
	+ if(glob_xmount.output.VirtImageType==VirtImageType_VHD) {
	+ // Make sure virtual image seems to be fully allocated (not sparse file).
	+ // Without this, Windows won't attach the vhd file!
	+ p_stat->st_blocks=p_stat->st_size/512;
	+ if(p_stat->st_size%512!=0) p_stat->st_blocks++;
	+ }
	+ } else if(strcmp(p_path,glob_xmount.output.p_info_path)==0) {
	+ // Attributes of virtual image info file
	+ p_stat->st_mode=S_IFREG \| 0444;
	+ p_stat->st_nlink=1;
	+ // Get virtual image info file size
	+ if(glob_xmount.output.p_info_file!=NULL) {
	+ p_stat->st_size=strlen(glob_xmount.output.p_info_file);
	+ } else p_stat->st_size=0;
	+ } else if(glob_xmount.output.VirtImageType==VirtImageType_VMDK \|\|
	+ glob_xmount.output.VirtImageType==VirtImageType_VMDKS)
	+ {
	+ // Some special files only present when emulating VMDK files
	+ if(strcmp(p_path,glob_xmount.output.vmdk.p_virtual_vmdk_path)==0) {
	+ // Attributes of virtual vmdk file
	+ if(!glob_xmount.output.writable) p_stat->st_mode=S_IFREG \| 0444;
	+ else p_stat->st_mode=S_IFREG \| 0666;
	+ p_stat->st_nlink=1;
	+ // Get virtual image info file size
	+ if(glob_xmount.output.vmdk.p_vmdk_file!=NULL) {
	+ p_stat->st_size=glob_xmount.output.vmdk.vmdk_file_size;
	+ } else p_stat->st_size=0;
	+ } else if(glob_xmount.output.vmdk.p_vmdk_lockdir1!=NULL &&
	+ strcmp(p_path,glob_xmount.output.vmdk.p_vmdk_lockdir1)==0)
	+ {
	+ p_stat->st_mode=S_IFDIR \| 0777;
	+ p_stat->st_nlink=2;
	+ } else if(glob_xmount.output.vmdk.p_vmdk_lockdir2!=NULL &&
	+ strcmp(p_path,glob_xmount.output.vmdk.p_vmdk_lockdir2)==0)
	+ {
	+ p_stat->st_mode=S_IFDIR \| 0777;
	+ p_stat->st_nlink=2;
	+ } else if(glob_xmount.output.vmdk.p_vmdk_lockfile_name!=NULL &&
	+ strcmp(p_path,glob_xmount.output.vmdk.p_vmdk_lockfile_name)==0)
	+ {
	+ p_stat->st_mode=S_IFREG \| 0666;
	+ if(glob_xmount.output.vmdk.p_vmdk_lockfile_name!=NULL) {
	+ p_stat->st_size=strlen(glob_xmount.output.vmdk.p_vmdk_lockfile_name);
	+ } else p_stat->st_size=0;
	+ } else return -ENOENT;
	+ } else return -ENOENT;
	+ // Set uid and gid of all files to uid and gid of current process
	+ p_stat->st_uid=getuid();
	+ p_stat->st_gid=getgid();
	+ return 0;
	+}
	+
	+//! FUSE mkdir implementation
	+/*!
	+ * \param p_path Directory path
	+ * \param mode Directory permissions
	+ * \return 0 on success, negated error code on error
	+ */
	+static int FuseMkDir(const char *p_path, mode_t mode) {
	+ // Only allow creation of VMWare's lock directories
	+ if(glob_xmount.output.VirtImageType==VirtImageType_VMDK \|\|
	+ glob_xmount.output.VirtImageType==VirtImageType_VMDKS)
	+ {
	+ if(glob_xmount.output.vmdk.p_vmdk_lockdir1==NULL) {
	+ char aVmdkLockDir[strlen(glob_xmount.output.vmdk.p_virtual_vmdk_path)+5];
	+ sprintf(aVmdkLockDir,
	+ "%s.lck",
	+ glob_xmount.output.vmdk.p_virtual_vmdk_path);
	+ if(strcmp(p_path,aVmdkLockDir)==0) {
	+ LOG_DEBUG("Creating virtual directory \"%s\"\n",aVmdkLockDir)
	+ XMOUNT_STRSET(glob_xmount.output.vmdk.p_vmdk_lockdir1,aVmdkLockDir)
	+ return 0;
	+ } else {
	+ LOG_ERROR("Attempt to create illegal directory \"%s\"!\n",p_path)
	+ LOG_DEBUG("Supposed: %s\n",aVmdkLockDir)
	+ return -1;
	+ }
	+ } else if(glob_xmount.output.vmdk.p_vmdk_lockdir2==NULL &&
	+ strncmp(p_path,
	+ glob_xmount.output.vmdk.p_vmdk_lockdir1,
	+ strlen(glob_xmount.output.vmdk.p_vmdk_lockdir1))==0)
	+ {
	+ LOG_DEBUG("Creating virtual directory \"%s\"\n",p_path)
	+ XMOUNT_STRSET(glob_xmount.output.vmdk.p_vmdk_lockdir2,p_path)
	+ return 0;
	+ } else {
	+ LOG_ERROR("Attempt to create illegal directory \"%s\"!\n",p_path)
	+ LOG_DEBUG("Compared to first %u chars of \"%s\"\n",
	+ strlen(glob_xmount.output.vmdk.p_vmdk_lockdir1),
	+ glob_xmount.output.vmdk.p_vmdk_lockdir1)
	+ return -1;
	+ }
	+ }
	+ LOG_ERROR("Attempt to create directory \"%s\" "
	+ "on read-only filesystem!\n",p_path)
	+ return -1;
	+}
	+
	+//! FUSE create implementation.
	+/*!
	+ * Currently only allows to create VMWare's lock file
	+ *
	+ * \param p_path File to create
	+ * \param mode File mode
	+ * \param dev ??? but not used
	+ * \return 0 on success, negated error code on error
	+ */
	+static int FuseMkNod(const char *p_path, mode_t mode, dev_t dev) {
	+ if((glob_xmount.output.VirtImageType==VirtImageType_VMDK \|\|
	+ glob_xmount.output.VirtImageType==VirtImageType_VMDKS) &&
	+ glob_xmount.output.vmdk.p_vmdk_lockdir1!=NULL &&
	+ glob_xmount.output.vmdk.p_vmdk_lockfile_name==NULL)
	+ {
	+ LOG_DEBUG("Creating virtual file \"%s\"\n",p_path)
	+ XMOUNT_STRSET(glob_xmount.output.vmdk.p_vmdk_lockfile_name,p_path);
	+ return 0;
	+ } else {
	+ LOG_ERROR("Attempt to create illegal file \"%s\"\n",p_path)
	+ return -1;
	+ }
	+}
	+
	+//! FUSE readdir implementation
	+/*!
	+ * \param p_path Path from where files should be listed
	+ * \param p_buf Buffer to write file entrys to
	+ * \param filler Function to write dir entrys to buffer
	+ * \param offset ??? but not used
	+ * \param p_fi File info struct
	+ * \return 0 on success, negated error code on error
	+ */
	+static int FuseReadDir(const char *p_path,
	+ void *p_buf,
	+ fuse_fill_dir_t filler,
	+ off_t offset,
	+ struct fuse_file_info *p_fi)
	+{
	+ // Ignore some params
	+ (void)offset;
	+ (void)p_fi;
	+
	+ if(strcmp(p_path,"/")==0) {
	+ // Add std . and .. entrys
	+ filler(p_buf,".",NULL,0);
	+ filler(p_buf,"..",NULL,0);
	+ // Add our virtual files (p+1 to ignore starting "/")
	+ filler(p_buf,glob_xmount.output.p_virtual_image_path+1,NULL,0);
	+ filler(p_buf,glob_xmount.output.p_info_path+1,NULL,0);
	+ if(glob_xmount.output.VirtImageType==VirtImageType_VMDK \|\|
	+ glob_xmount.output.VirtImageType==VirtImageType_VMDKS)
	+ {
	+ // For VMDK's, we use an additional descriptor file
	+ filler(p_buf,glob_xmount.output.vmdk.p_virtual_vmdk_path+1,NULL,0);
	+ // And there could also be a lock directory
	+ if(glob_xmount.output.vmdk.p_vmdk_lockdir1!=NULL) {
	+ filler(p_buf,glob_xmount.output.vmdk.p_vmdk_lockdir1+1,NULL,0);
	+ }
	+ }
	+ } else if(glob_xmount.output.VirtImageType==VirtImageType_VMDK \|\|
	+ glob_xmount.output.VirtImageType==VirtImageType_VMDKS)
	+ {
	+ // For VMDK emulation, there could be a lock directory
	+ if(glob_xmount.output.vmdk.p_vmdk_lockdir1!=NULL &&
	+ strcmp(p_path,glob_xmount.output.vmdk.p_vmdk_lockdir1)==0)
	+ {
	+ filler(p_buf,".",NULL,0);
	+ filler(p_buf,"..",NULL,0);
	+ if(glob_xmount.output.vmdk.p_vmdk_lockfile_name!=NULL) {
	+ filler(p_buf,
	+ glob_xmount.output.vmdk.p_vmdk_lockfile_name+
	+ strlen(glob_xmount.output.vmdk.p_vmdk_lockdir1)+1,
	+ NULL,
	+ 0);
	+ }
	+ } else if(glob_xmount.output.vmdk.p_vmdk_lockdir2!=NULL &&
	+ strcmp(p_path,glob_xmount.output.vmdk.p_vmdk_lockdir2)==0)
	+ {
	+ filler(p_buf,".",NULL,0);
	+ filler(p_buf,"..",NULL,0);
	+ } else return -ENOENT;
	+ } else return -ENOENT;
	+
	+ return 0;
	+}
	+
	+//! FUSE open implementation
	+/*!
	+ * \param p_path Path to file to open
	+ * \param p_fi File info struct
	+ * \return 0 on success, negated error code on error
	+ */
	+static int FuseOpen(const char p_path, struct fuse_file_info p_fi) {
	+
	+#define CHECK_OPEN_PERMS() { \
	+ if(!glob_xmount.output.writable && (p_fi->flags & 3)!=O_RDONLY) { \
	+ LOG_DEBUG("Attempt to open the read-only file \"%s\" for writing.\n", \
	+ p_path) \
	+ return -EACCES; \
	+ } \
	+ return 0; \
	+}
	+
	+ if(strcmp(p_path,glob_xmount.output.p_virtual_image_path)==0 \|\|
	+ strcmp(p_path,glob_xmount.output.p_info_path)==0)
	+ {
	+ CHECK_OPEN_PERMS();
	+ } else if(glob_xmount.output.VirtImageType==VirtImageType_VMDK \|\|
	+ glob_xmount.output.VirtImageType==VirtImageType_VMDKS)
	+ {
	+ if(strcmp(p_path,glob_xmount.output.vmdk.p_virtual_vmdk_path)==0 \|\|
	+ (glob_xmount.output.vmdk.p_vmdk_lockfile_name!=NULL &&
	+ strcmp(p_path,glob_xmount.output.vmdk.p_vmdk_lockfile_name)==0))
	+ {
	+ CHECK_OPEN_PERMS();
	+ }
	+ }
	+
	+#undef CHECK_OPEN_PERMS
	+
	+ LOG_DEBUG("Attempt to open inexistant file \"%s\".\n",p_path);
	+ return -ENOENT;
	+}
	+
	+//! FUSE read implementation
	+/*!
	+ * \param p_path Path (relative to mount folder) of file to read data from
	+ * \param p_buf Pre-allocated buffer where read data should be written to
	+ * \param size Number of bytes to read
	+ * \param offset Offset to start reading at
	+ * \param p_fi: File info struct
	+ * \return Read bytes on success, negated error code on error
	+ */
	+static int FuseRead(const char *p_path,
	+ char *p_buf,
	+ size_t size,
	+ off_t offset,
	+ struct fuse_file_info *p_fi)
	+{
	+ (void)p_fi;
	+
	+ int ret;
	+ uint64_t len;
	+
	+#define READ_MEM_FILE(filebuf,filesize,filetypestr,mutex) { \
	+ len=filesize; \
	+ if(offset<len) { \
	+ if(offset+size>len) { \
	+ LOG_DEBUG("Attempt to read past EOF of virtual " filetypestr " file\n"); \
	+ LOG_DEBUG("Adjusting read size from %u to %u\n",size,len-offset); \
	+ size=len-offset; \
	+ } \
	+ pthread_mutex_lock(&mutex); \
	+ memcpy(p_buf,filebuf+offset,size); \
	+ pthread_mutex_unlock(&mutex); \
	+ LOG_DEBUG("Read %" PRIu64 " bytes at offset %" PRIu64 \
	+ " from virtual " filetypestr " file\n",size,offset); \
	+ ret=size; \
	+ } else { \
	+ LOG_DEBUG("Attempt to read behind EOF of virtual " filetypestr " file\n"); \
	+ ret=0; \
	+ } \
	+}
	+
	+ if(strcmp(p_path,glob_xmount.output.p_virtual_image_path)==0) {
	+ // Read data from virtual output file
	+ // Wait for other threads to end reading/writing data
	+ pthread_mutex_lock(&(glob_xmount.mutex_image_rw));
	+ // Get requested data
	+ if((ret=GetVirtImageData(p_buf,offset,size))<0) {
	+ LOG_ERROR("Couldn't read data from virtual image file!\n")
	+ }
	+ // Allow other threads to read/write data again
	+ pthread_mutex_unlock(&(glob_xmount.mutex_image_rw));
	+ } else if(strcmp(p_path,glob_xmount.output.p_info_path)==0) {
	+ // Read data from virtual info file
	+ READ_MEM_FILE(glob_xmount.output.p_info_file,
	+ strlen(glob_xmount.output.p_info_file),
	+ "info",
	+ glob_xmount.mutex_info_read);
	+ } else if(strcmp(p_path,glob_xmount.output.vmdk.p_virtual_vmdk_path)==0) {
	+ // Read data from virtual vmdk file
	+ READ_MEM_FILE(glob_xmount.output.vmdk.p_vmdk_file,
	+ glob_xmount.output.vmdk.vmdk_file_size,
	+ "vmdk",
	+ glob_xmount.mutex_image_rw);
	+ } else if(glob_xmount.output.vmdk.p_vmdk_lockfile_name!=NULL &&
	+ strcmp(p_path,glob_xmount.output.vmdk.p_vmdk_lockfile_name)==0)
	+ {
	+ // Read data from virtual lock file
	+ READ_MEM_FILE(glob_xmount.output.vmdk.p_vmdk_lockfile_data,
	+ glob_xmount.output.vmdk.vmdk_lockfile_size,
	+ "vmdk lock",
	+ glob_xmount.mutex_image_rw);
	+ } else {
	+ // Attempt to read non existant file
	+ LOG_DEBUG("Attempt to read from non existant file \"%s\"\n",p_path)
	+ ret=-ENOENT;
	+ }
	+
	+#undef READ_MEM_FILE
	+
	+ // TODO: Return size of read data!!!!!
	+ return ret;
	+}
	+
	+//! FUSE rename implementation
	+/*!
	+ * \param p_path File to rename
	+ * \param p_npath New filename
	+ * \return 0 on error, negated error code on error
	+ */
	+static int FuseRename(const char p_path, const char p_npath) {
	+ if(glob_xmount.output.VirtImageType==VirtImageType_VMDK \|\|
	+ glob_xmount.output.VirtImageType==VirtImageType_VMDKS)
	+ {
	+ if(glob_xmount.output.vmdk.p_vmdk_lockfile_name!=NULL &&
	+ strcmp(p_path,glob_xmount.output.vmdk.p_vmdk_lockfile_name)==0)
	+ {
	+ LOG_DEBUG("Renaming virtual lock file from \"%s\" to \"%s\"\n",
	+ glob_xmount.output.vmdk.p_vmdk_lockfile_name,
	+ p_npath)
	+ XMOUNT_REALLOC(glob_xmount.output.vmdk.p_vmdk_lockfile_name,char*,
	+ (strlen(p_npath)+1)*sizeof(char));
	+ strcpy(glob_xmount.output.vmdk.p_vmdk_lockfile_name,p_npath);
	+ return 0;
	+ }
	+ }
	+ return -ENOENT;
	+}
	+
	+//! FUSE rmdir implementation
	+/*!
	+ * \param p_path Directory to delete
	+ * \return 0 on success, negated error code on error
	+ */
	+static int FuseRmDir(const char *p_path) {
	+ // Only VMWare's lock directories can be deleted
	+ if(glob_xmount.output.VirtImageType==VirtImageType_VMDK \|\|
	+ glob_xmount.output.VirtImageType==VirtImageType_VMDKS)
	+ {
	+ if(glob_xmount.output.vmdk.p_vmdk_lockdir1!=NULL &&
	+ strcmp(p_path,glob_xmount.output.vmdk.p_vmdk_lockdir1)==0)
	+ {
	+ LOG_DEBUG("Deleting virtual lock dir \"%s\"\n",
	+ glob_xmount.output.vmdk.p_vmdk_lockdir1)
	+ free(glob_xmount.output.vmdk.p_vmdk_lockdir1);
	+ glob_xmount.output.vmdk.p_vmdk_lockdir1=NULL;
	+ return 0;
	+ } else if(glob_xmount.output.vmdk.p_vmdk_lockdir2!=NULL &&
	+ strcmp(p_path,glob_xmount.output.vmdk.p_vmdk_lockdir2)==0)
	+ {
	+ LOG_DEBUG("Deleting virtual lock dir \"%s\"\n",
	+ glob_xmount.output.vmdk.p_vmdk_lockdir1)
	+ free(glob_xmount.output.vmdk.p_vmdk_lockdir2);
	+ glob_xmount.output.vmdk.p_vmdk_lockdir2=NULL;
	+ return 0;
	+ }
	+ }
	+ return -1;
	+}
	+
	+//! FUSE unlink implementation
	+/*!
	+ * \param p_path File to delete
	+ * \return 0 on success, negated error code on error
	+ */
	+static int FuseUnlink(const char *p_path) {
	+ // Only VMWare's lock file can be deleted
	+ if(glob_xmount.output.VirtImageType==VirtImageType_VMDK \|\|
	+ glob_xmount.output.VirtImageType==VirtImageType_VMDKS)
	+ {
	+ if(glob_xmount.output.vmdk.p_vmdk_lockfile_name!=NULL &&
	+ strcmp(p_path,glob_xmount.output.vmdk.p_vmdk_lockfile_name)==0)
	+ {
	+ LOG_DEBUG("Deleting virtual file \"%s\"\n",
	+ glob_xmount.output.vmdk.p_vmdk_lockfile_name)
	+ free(glob_xmount.output.vmdk.p_vmdk_lockfile_name);
	+ free(glob_xmount.output.vmdk.p_vmdk_lockfile_data);
	+ glob_xmount.output.vmdk.p_vmdk_lockfile_name=NULL;
	+ glob_xmount.output.vmdk.p_vmdk_lockfile_data=NULL;
	+ glob_xmount.output.vmdk.vmdk_lockfile_size=0;
	+ return 0;
	+ }
	+ }
	+ return -1;
	+}
	+
	+//! FUSE statfs implementation
	+/*!
	+ * \param p_path Get stats for fs that the specified file resides in
	+ * \param stats Stats
	+ * \return 0 on success, negated error code on error
	+ */
	+/*
	+static int FuseStatFs(const char p_path, struct statvfs stats) {
	+ struct statvfs CacheFileFsStats;
	+ int ret;
	+
	+ if(glob_xmount.writable==TRUE) {
	+ // If write support is enabled, return stats of fs upon which cache file
	+ // resides in
	+ if((ret=statvfs(glob_xmount.p_cache_file,&CacheFileFsStats))==0) {
	+ memcpy(stats,&CacheFileFsStats,sizeof(struct statvfs));
	+ return 0;
	+ } else {
	+ LOG_ERROR("Couldn't get stats for fs upon which resides \"%s\"\n",
	+ glob_xmount.p_cache_file)
	+ return ret;
	+ }
	+ } else {
	+ // TODO: Return read only
	+ return 0;
	+ }
	+}
	+*/
	+
	+// FUSE write implementation
	+/*!
	+ * \param p_buf Buffer containing data to write
	+ * \param size Number of bytes to write
	+ * \param offset Offset to start writing at
	+ * \param p_fi: File info struct
	+ *
	+ * Returns:
	+ * Written bytes on success, negated error code on error
	+ */
	+static int FuseWrite(const char *p_path,
	+ const char *p_buf,
	+ size_t size,
	+ off_t offset,
	+ struct fuse_file_info *p_fi)
	+{
	+ (void)p_fi;
	+
	+ uint64_t len;
	+
	+ if(strcmp(p_path,glob_xmount.output.p_virtual_image_path)==0) {
	+ // Wait for other threads to end reading/writing data
	+ pthread_mutex_lock(&(glob_xmount.mutex_image_rw));
	+
	+ // Get virtual image file size
	+ if(!GetVirtImageSize(&len)) {
	+ LOG_ERROR("Couldn't get virtual image size!\n")
	+ pthread_mutex_unlock(&(glob_xmount.mutex_image_rw));
	+ return 0;
	+ }
	+ if(offset<len) {
	+ if(offset+size>len) size=len-offset;
	+ if(SetVirtImageData(p_buf,offset,size)!=size) {
	+ LOG_ERROR("Couldn't write data to virtual image file!\n")
	+ pthread_mutex_unlock(&(glob_xmount.mutex_image_rw));
	+ return 0;
	+ }
	+ } else {
	+ LOG_DEBUG("Attempt to write past EOF of virtual image file\n")
	+ pthread_mutex_unlock(&(glob_xmount.mutex_image_rw));
	+ return 0;
	+ }
	+
	+ // Allow other threads to read/write data again
	+ pthread_mutex_unlock(&(glob_xmount.mutex_image_rw));
	+ } else if(strcmp(p_path,glob_xmount.output.vmdk.p_virtual_vmdk_path)==0) {
	+ pthread_mutex_lock(&(glob_xmount.mutex_image_rw));
	+ len=glob_xmount.output.vmdk.vmdk_file_size;
	+ if((offset+size)>len) {
	+ // Enlarge or create buffer if needed
	+ if(len==0) {
	+ len=offset+size;
	+ XMOUNT_MALLOC(glob_xmount.output.vmdk.p_vmdk_file,
	+ char*,
	+ len*sizeof(char));
	+ } else {
	+ len=offset+size;
	+ XMOUNT_REALLOC(glob_xmount.output.vmdk.p_vmdk_file,
	+ char*,
	+ len*sizeof(char));
	+ }
	+ glob_xmount.output.vmdk.vmdk_file_size=offset+size;
	+ }
	+ // Copy data to buffer
	+ memcpy(glob_xmount.output.vmdk.p_vmdk_file+offset,p_buf,size);
	+ pthread_mutex_unlock(&(glob_xmount.mutex_image_rw));
	+ } else if(glob_xmount.output.vmdk.p_vmdk_lockfile_name!=NULL &&
	+ strcmp(p_path,glob_xmount.output.vmdk.p_vmdk_lockfile_name)==0)
	+ {
	+ pthread_mutex_lock(&(glob_xmount.mutex_image_rw));
	+ if((offset+size)>glob_xmount.output.vmdk.vmdk_lockfile_size) {
	+ // Enlarge or create buffer if needed
	+ if(glob_xmount.output.vmdk.vmdk_lockfile_size==0) {
	+ glob_xmount.output.vmdk.vmdk_lockfile_size=offset+size;
	+ XMOUNT_MALLOC(glob_xmount.output.vmdk.p_vmdk_lockfile_data,char*,
	+ glob_xmount.output.vmdk.vmdk_lockfile_size*sizeof(char))
	+ } else {
	+ glob_xmount.output.vmdk.vmdk_lockfile_size=offset+size;
	+ XMOUNT_REALLOC(glob_xmount.output.vmdk.p_vmdk_lockfile_data,char*,
	+ glob_xmount.output.vmdk.vmdk_lockfile_size*sizeof(char))
	+ }
	+ }
	+ // Copy data to buffer
	+ memcpy(glob_xmount.output.vmdk.p_vmdk_lockfile_data+offset,p_buf,size);
	+ pthread_mutex_unlock(&(glob_xmount.mutex_image_rw));
	+ } else if(strcmp(p_path,glob_xmount.output.p_info_path)==0) {
	+ // Attempt to write data to read only image info file
	+ LOG_DEBUG("Attempt to write data to virtual info file\n");
	+ return -ENOENT;
	+ } else {
	+ // Attempt to write to non existant file
	+ LOG_DEBUG("Attempt to write to the non existant file \"%s\"\n",p_path)
	+ return -ENOENT;
	+ }
	+
	+ return size;
	+}
	+
	+/*******************************************************************************
	+ * Main
	+ ******************************************************************************/
	+int main(int argc, char *argv[]) {
	+ struct stat file_stat;
	+ int ret;
	+ int fuse_ret;
	+ char *p_err_msg;
	+
	+ // Set implemented FUSE functions
	+ struct fuse_operations xmount_operations = {
	+ //.access=FuseAccess,
	+ .getattr=FuseGetAttr,
	+ .mkdir=FuseMkDir,
	+ .mknod=FuseMkNod,
	+ .open=FuseOpen,
	+ .readdir=FuseReadDir,
	+ .read=FuseRead,
	+ .rename=FuseRename,
	+ .rmdir=FuseRmDir,
	+ //.statfs=FuseStatFs,
	+ .unlink=FuseUnlink,
	+ .write=FuseWrite
	+ };
	+
	+ // Disable std output / input buffering
	+ setbuf(stdout,NULL);
	+ setbuf(stderr,NULL);
	+
	+ // Init glob_xmount
	+ InitResources();
	+
	+ // Load input and morphing libs
	+ if(!LoadLibs()) {
	+ LOG_ERROR("Unable to load any libraries!\n")
	+ return 1;
	+ }
	+
	+ // Check FUSE settings
	+ CheckFuseSettings();
	+
	+ // Parse command line options
	+ if(ParseCmdLine(argc,argv)!=TRUE) {
	+ PrintUsage(argv[0]);
	+ FreeResources();
	+ return 1;
	+ }
	+
	+ // Check command line options
	+ if(glob_xmount.input.images_count==0) {
	+ LOG_ERROR("No --in command line option specified!\n")
	+ PrintUsage(argv[0]);
	+ FreeResources();
	+ return 1;
	+ }
	+ if(glob_xmount.fuse_argc<2) {
	+ LOG_ERROR("Couldn't parse command line options!\n")
	+ PrintUsage(argv[0]);
	+ FreeResources();
	+ return 1;
	+ }
	+ if(glob_xmount.morphing.p_morph_type==NULL) {
	+ XMOUNT_STRSET(glob_xmount.morphing.p_morph_type,"combine");
	+ }
	+
	+ // Check if mountpoint is a valid dir
	+ if(stat(glob_xmount.p_mountpoint,&file_stat)!=0) {
	+ LOG_ERROR("Unable to stat mount point '%s'!\n",glob_xmount.p_mountpoint);
	+ PrintUsage(argv[0]);
	+ FreeResources();
	+ return 1;
	+ }
	+ if(!S_ISDIR(file_stat.st_mode)) {
	+ LOG_ERROR("Mount point '%s' is not a directory!\n",
	+ glob_xmount.p_mountpoint);
	+ PrintUsage(argv[0]);
	+ FreeResources();
	+ return 1;
	+ }
	+
	+ if(glob_xmount.debug==TRUE) {
	+ LOG_DEBUG("Options passed to FUSE: ")
	+ for(int i=0;i<glob_xmount.fuse_argc;i++) {
	+ printf("%s ",glob_xmount.pp_fuse_argv[i]);
	+ }
	+ printf("\n");
	+ }
	+
	+ // Init mutexes
	+ pthread_mutex_init(&(glob_xmount.mutex_image_rw),NULL);
	+ pthread_mutex_init(&(glob_xmount.mutex_info_read),NULL);
	+
	+ // Load input images
	+ for(uint64_t i=0;i<glob_xmount.input.images_count;i++) {
	+ if(glob_xmount.debug==TRUE) {
	+ if(glob_xmount.input.pp_images[i]->files_count==1) {
	+ LOG_DEBUG("Loading image file \"%s\"...\n",
	+ glob_xmount.input.pp_images[i]->pp_files[0])
	+ } else {
	+ LOG_DEBUG("Loading image files \"%s .. %s\"...\n",
	+ glob_xmount.input.pp_images[i]->pp_files[0],
	+ glob_xmount.input.pp_images[i]->
	+ pp_files[glob_xmount.input.pp_images[i]->files_count-1])
	+ }
	+ }
	+
	+ // Find input lib
	+ if(!FindInputLib(glob_xmount.input.pp_images[i])) {
	+ LOG_ERROR("Unknown input image type '%s' for input image '%s'!\n",
	+ glob_xmount.input.pp_images[i]->p_type,
	+ glob_xmount.input.pp_images[i]->pp_files[0])
	+ PrintUsage(argv[0]);
	+ FreeResources();
	+ return 1;
	+ }
	+
	+ // Init input image handle
	+ ret=glob_xmount.input.pp_images[i]->p_functions->
	+ CreateHandle(&(glob_xmount.input.pp_images[i]->p_handle),
	+ glob_xmount.input.pp_images[i]->p_type,
	+ glob_xmount.debug);
	+ if(ret!=0) {
	+ LOG_ERROR("Unable to init input handle for input image '%s': %s!\n",
	+ glob_xmount.input.pp_images[i]->pp_files[0],
	+ glob_xmount.input.pp_images[i]->p_functions->
	+ GetErrorMessage(ret));
	+ FreeResources();
	+ return 1;
	+ }
	+
	+ // Parse input lib specific options
	+ if(glob_xmount.input.pp_lib_params!=NULL) {
	+ ret=glob_xmount.input.pp_images[i]->p_functions->
	+ OptionsParse(glob_xmount.input.pp_images[i]->p_handle,
	+ glob_xmount.input.lib_params_count,
	+ glob_xmount.input.pp_lib_params,
	+ (const char**)&p_err_msg);
	+ if(ret!=0) {
	+ if(p_err_msg!=NULL) {
	+ LOG_ERROR("Unable to parse input library specific options for image "
	+ "'%s': %s: %s!\n",
	+ glob_xmount.input.pp_images[i]->pp_files[0],
	+ glob_xmount.input.pp_images[i]->p_functions->
	+ GetErrorMessage(ret),
	+ p_err_msg);
	+ glob_xmount.input.pp_images[i]->p_functions->FreeBuffer(p_err_msg);
	+ FreeResources();
	+ return 1;
	+ } else {
	+ LOG_ERROR("Unable to parse input library specific options for image "
	+ "'%s': %s!\n",
	+ glob_xmount.input.pp_images[i]->pp_files[0],
	+ glob_xmount.input.pp_images[i]->p_functions->
	+ GetErrorMessage(ret));
	+ FreeResources();
	+ return 1;
	+ }
	+ }
	+ }
	+
	+ // Open input image
	+ ret=
	+ glob_xmount.input.pp_images[i]->
	+ p_functions->
	+ Open(glob_xmount.input.pp_images[i]->p_handle,
	+ (const char**)(glob_xmount.input.pp_images[i]->pp_files),
	+ glob_xmount.input.pp_images[i]->files_count);
	+ if(ret!=0) {
	+ LOG_ERROR("Unable to open input image file '%s': %s!\n",
	+ glob_xmount.input.pp_images[i]->pp_files[0],
	+ glob_xmount.input.pp_images[i]->p_functions->
	+ GetErrorMessage(ret));
	+ FreeResources();
	+ return 1;
	+ }
	+
	+ // Determine input image size
	+ ret=glob_xmount.input.pp_images[i]->
	+ p_functions->
	+ Size(glob_xmount.input.pp_images[i]->p_handle,
	+ &(glob_xmount.input.pp_images[i]->size));
	+ if(ret!=0) {
	+ LOG_ERROR("Unable to determine size of input image '%s': %s!\n",
	+ glob_xmount.input.pp_images[i]->pp_files[0],
	+ glob_xmount.input.pp_images[i]->
	+ p_functions->GetErrorMessage(ret));
	+ FreeResources();
	+ return 1;
	+ }
	+
	+ // If an offset was specified, check it against offset and change size
	+ if(glob_xmount.input.image_offset!=0) {
	+ if(glob_xmount.input.image_offset>glob_xmount.input.pp_images[i]->size) {
	+ LOG_ERROR("The specified offset is larger than the size of the input "
	+ "image '%s'! (%" PRIu64 " > %" PRIu64 ")\n",
	+ glob_xmount.input.pp_images[i]->pp_files[0],
	+ glob_xmount.input.image_offset,
	+ glob_xmount.input.pp_images[i]->size);
	+ FreeResources();
	+ return 1;
	+ }
	+ glob_xmount.input.pp_images[i]->size-=glob_xmount.input.image_offset;
	+ }
	+
	+ // If a size limit was specified, check it and change size
	+ if(glob_xmount.input.image_size_limit!=0) {
	+ if(glob_xmount.input.pp_images[i]->size<
	+ glob_xmount.input.image_size_limit)
	+ {
	+ LOG_ERROR("The specified size limit is larger than the size of the "
	+ "input image '%s'! (%" PRIu64 " > %" PRIu64 ")\n",
	+ glob_xmount.input.pp_images[i]->pp_files[0],
	+ glob_xmount.input.image_size_limit,
	+ glob_xmount.input.pp_images[i]->size);
	+ FreeResources();
	+ return 1;
	+ }
	+ glob_xmount.input.pp_images[i]->size-=glob_xmount.input.image_size_limit;
	+ }
	+
	+ LOG_DEBUG("Input image loaded successfully\n")
	+ }
	+
	+ // Find morphing lib
	+ if(FindMorphingLib()!=TRUE) {
	+ LOG_ERROR("Unable to find a library supporting the morphing type '%s'!\n",
	+ glob_xmount.morphing.p_morph_type);
	+ FreeResources();
	+ return 1;
	+ }
	+
	+ // Init morphing
	+ ret=glob_xmount.morphing.p_functions->
	+ CreateHandle(&glob_xmount.morphing.p_handle,
	+ glob_xmount.morphing.p_morph_type,
	+ glob_xmount.debug);
	+ if(ret!=0) {
	+ LOG_ERROR("Unable to create morphing handle: %s!\n",
	+ glob_xmount.morphing.p_functions->GetErrorMessage(ret));
	+ FreeResources();
	+ return 1;
	+ }
	+
	+ // Parse morphing lib specific options
	+ if(glob_xmount.morphing.pp_lib_params!=NULL) {
	+ p_err_msg=NULL;
	+ ret=glob_xmount.morphing.p_functions->
	+ OptionsParse(glob_xmount.morphing.p_handle,
	+ glob_xmount.morphing.lib_params_count,
	+ glob_xmount.morphing.pp_lib_params,
	+ (const char**)&p_err_msg);
	+ if(ret!=0) {
	+ if(p_err_msg!=NULL) {
	+ LOG_ERROR("Unable to parse morphing library specific options: %s: %s!\n",
	+ glob_xmount.morphing.p_functions->GetErrorMessage(ret),
	+ p_err_msg);
	+ glob_xmount.morphing.p_functions->FreeBuffer(p_err_msg);
	+ FreeResources();
	+ return 1;
	+ } else {
	+ LOG_ERROR("Unable to parse morphing library specific options: %s!\n",
	+ glob_xmount.morphing.p_functions->GetErrorMessage(ret));
	+ FreeResources();
	+ return 1;
	+ }
	+ }
	+ }
	+
	+ // Morph image
	+ ret=glob_xmount.morphing.p_functions->
	+ Morph(glob_xmount.morphing.p_handle,
	+ &(glob_xmount.morphing.input_image_functions));
	+ if(ret!=0) {
	+ LOG_ERROR("Unable to start morphing: %s!\n",
	+ glob_xmount.morphing.p_functions->GetErrorMessage(ret));
	+ FreeResources();
	+ return 1;
	+ }
	+
	+ // Init random generator
	+ srand(time(NULL));
	+
	+ // Calculate partial MD5 hash of input image file
	+ if(CalculateInputImageHash(&(glob_xmount.input.image_hash_lo),
	+ &(glob_xmount.input.image_hash_hi))==FALSE)
	+ {
	+ LOG_ERROR("Couldn't calculate partial hash of morphed image!\n")
	+ return 1;
	+ }
	+
	+ if(glob_xmount.debug==TRUE) {
	+ LOG_DEBUG("Partial MD5 hash of morphed image: ")
	+ for(int i=0;i<8;i++)
	+ printf("%02hhx",(((char)(&(glob_xmount.input.image_hash_lo)))+i));
	+ for(int i=0;i<8;i++)
	+ printf("%02hhx",(((char)(&(glob_xmount.input.image_hash_hi)))+i));
	+ printf("\n");
	+ }
	+
	+ if(!ExtractVirtFileNames(glob_xmount.input.pp_images[0]->pp_files[0])) {
	+ LOG_ERROR("Couldn't extract virtual file names!\n");
	+ FreeResources();
	+ return 1;
	+ }
	+ LOG_DEBUG("Virtual file names extracted successfully\n")
	+
	+ // Gather infos for info file
	+ if(!InitVirtImageInfoFile()) {
	+ LOG_ERROR("Couldn't gather infos for virtual image info file!\n")
	+ FreeResources();
	+ return 1;
	+ }
	+ LOG_DEBUG("Virtual image info file build successfully\n")
	+
	+ // Do some virtual image type specific initialisations
	+ switch(glob_xmount.output.VirtImageType) {
	+ case VirtImageType_DD:
	+ case VirtImageType_DMG:
	+ break;
	+ case VirtImageType_VDI:
	+ // When mounting as VDI, we need to construct a vdi header
	+ if(!InitVirtVdiHeader()) {
	+ LOG_ERROR("Couldn't initialize virtual VDI file header!\n")
	+ FreeResources();
	+ return 1;
	+ }
	+ LOG_DEBUG("Virtual VDI file header build successfully\n")
	+ break;
	+ case VirtImageType_VHD:
	+ // When mounting as VHD, we need to construct a vhd footer
	+ if(!InitVirtVhdHeader()) {
	+ LOG_ERROR("Couldn't initialize virtual VHD file footer!\n")
	+ FreeResources();
	+ return 1;
	+ }
	+ LOG_DEBUG("Virtual VHD file footer build successfully\n")
	+ break;
	+ case VirtImageType_VMDK:
	+ case VirtImageType_VMDKS:
	+ // When mounting as VMDK, we need to construct the VMDK descriptor file
	+ if(!InitVirtualVmdkFile()) {
	+ LOG_ERROR("Couldn't initialize virtual VMDK file!\n")
	+ FreeResources();
	+ return 1;
	+ }
	+ break;
	+ }
	+
	+ if(glob_xmount.output.writable) {
	+ // Init cache file and cache file block index
	+ if(!InitCacheFile()) {
	+ LOG_ERROR("Couldn't initialize cache file!\n")
	+ FreeResources();
	+ return 1;
	+ }
	+ LOG_DEBUG("Cache file initialized successfully\n")
	+ }
	+
	+ // Call fuse_main to do the fuse magic
	+ fuse_ret=fuse_main(glob_xmount.fuse_argc,
	+ glob_xmount.pp_fuse_argv,
	+ &xmount_operations,
	+ NULL);
	+
	+ // Destroy mutexes
	+ pthread_mutex_destroy(&(glob_xmount.mutex_image_rw));
	+ pthread_mutex_destroy(&(glob_xmount.mutex_info_read));
	+
	+ // Free allocated memory
	+ FreeResources();
	+ return fuse_ret;
	+}
	+
	+/*
	+ ----- Change log -----
	+ 20090131: v0.1.0 released
	+ * Some minor things have still to be done.
	+ * Mounting ewf as dd: Seems to work. Diff didn't complain about
	+ changes between original dd and emulated dd.
	+ * Mounting ewf as vdi: Seems to work too. VBox accepts the emulated
	+ vdi as valid vdi file and I was able to mount the containing fs
	+ under Debian. INFO: Debian freezed when not using mount -r !!
	+ 20090203: v0.1.1 released
	+ * Multiple code improvements. For ex. cleaner vdi header allocation.
	+ * Fixed severe bug in image block calculation. Didn't check for odd
	+ input in conversion from bytes to megabytes.
	+ * Added more debug output
	+ 20090210: v0.1.2 released
	+ * Fixed compilation problem (Typo in image_init_info() function).
	+ * Fixed some problems with the debian scripts to be able to build
	+ packages.
	+ * Added random generator initialisation (Makes it possible to use
	+ more than one image in VBox at a time).
	+ 20090215: * Added function init_cache_blocks which creates / loads a cache
	+ file used to implement virtual write capability.
	+ 20090217: * Implemented the fuse write function. Did already some basic tests
	+ with dd and it seems to work. But there are certainly still some
	+ bugs left as there are also still some TODO's left.
	+ 20090226: * Changed program name from mountewf to xmount.
	+ * Began with massive code cleanups to ease full implementation of
	+ virtual write support and to be able to support multiple input
	+ image formats (DD, EWF and AFF are planned for now).
	+ * Added defines for supported input formats so it should be possible
	+ to compile xmount without supporting all input formats. (DD
	+ input images are always supported as these do not require any
	+ additional libs). Input formats should later be en/disabled
	+ by the configure script in function to which libs it detects.
	+ * GetOrigImageSize function added to get the size of the original
	+ image whatever type it is in.
	+ * GetOrigImageData function added to retrieve data from original
	+ image file whatever type it is in.
	+ * GetVirtImageSize function added to get the size of the virtual
	+ image file.
	+ * Cleaned function mountewf_getattr and renamed it to
	+ GetVirtFileAttr
	+ * Cleaned function mountewf_readdir and renamed it to GetVirtFiles
	+ * Cleaned function mountewf_open and renamed it to OpenVirtFile
	+ 20090227: * Cleaned function init_info_file and renamed it to
	+ InitVirtImageInfoFile
	+ 20090228: * Cleaned function init_cache_blocks and renamed it to
	+ InitCacheFile
	+ * Added LogMessage function to ease error and debug logging (See
	+ also LOG_ERROR and LOG_DEBUG macros in xmount.h)
	+ * Cleaned function init_vdi_header and renamed it to
	+ InitVirtVdiHeader
	+ * Added PrintUsage function to print out xmount usage informations
	+ * Cleaned function parse_cmdline and renamed it to ParseCmdLine
	+ * Cleaned function main
	+ * Added ExtractVirtFileNames function to extract virtual file names
	+ from input image name
	+ * Added function GetVirtImageData to retrieve data from the virtual
	+ image file. This includes reading data from cache file if virtual
	+ write support is enabled.
	+ * Added function ReadVirtFile to replace mountewf_read
	+ 20090229: * Fixed a typo in virtual file name creation
	+ * Added function SetVirtImageData to write data to virtual image
	+ file. This includes writing data to cache file and caching entire
	+ new blocks
	+ * Added function WriteVirtFile to replace mountewf_write
	+ 20090305: * Solved a problem that made it impossible to access offsets >32bit
	+ 20090308: * Added SetVdiFileHeaderData function to handle virtual image type
	+ specific data to be cached. This makes cache files independent
	+ from virtual image type
	+ 20090316: v0.2.0 released
	+ 20090327: v0.2.1 released
	+ * Fixed a bug in virtual write support. Checking whether data is
	+ cached didn't use semaphores. This could corrupt cache files
	+ when running multi-threaded.
	+ * Added IsVdiFileHeaderCached function to check whether VDI file
	+ header was already cached
	+ * Added IsBlockCached function to check whether a block was already
	+ cached
	+ 20090331: v0.2.2 released (Internal release)
	+ * Further changes to semaphores to fix write support bug.
	+ 20090410: v0.2.3 released
	+ * Reverted most of the fixes from v0.2.1 and v0.2.2 as those did not
	+ solve the write support bug.
	+ * Removed all semaphores
	+ * Added two pthread mutexes to protect virtual image and virtual
	+ info file.
	+ 20090508: * Configure script will now exit when needed libraries aren't found
	+ * Added support for newest libewf beta version 20090506 as it seems
	+ to reduce memory usage when working with EWF files by about 1/2.
	+ * Added LIBEWF_BETA define to adept source to new libewf API.
	+ * Added function InitVirtualVmdkFile to build a VmWare virtual disk
	+ descriptor file.
	+ 20090519: * Added function CreateVirtDir implementing FUSE's mkdir to allow
	+ VMWare to create his <iname>.vmdk.lck lock folder. Function does
	+ not allow to create other folders!
	+ * Changed cache file handling as VMDK caching will need new cache
	+ file structure incompatible to the old one.
	+ 20090522: v0.3.0 released
	+ * Added function DeleteVirtFile and DeleteVirtDir so VMWare can
	+ remove his lock directories and files.
	+ * Added function RenameVirtFile because VMWare needs to rename his
	+ lock files.
	+ * VMDK support should work now but descriptor file won't get cached
	+ as I didn't implement it yet.
	+ 20090604: * Added --cache commandline parameter doing the same as --rw.
	+ * Added --owcache commandline parameter doing the same as --rw but
	+ overwrites any existing cache data. This can be handy for
	+ debugging and testing purposes.
	+ * Added "vmdks" output type. Same as "vmdk" but generates a disk
	+ connected to the SCSI bus rather than the IDE bus.
	+ 20090710: v0.3.1 released
	+ 20090721: * Added function CheckFuseAllowOther to check wether FUSE supports
	+ the "-o allow_other" option. It is supported when
	+ "user_allow_other" is set in /etc/fuse.conf or when running
	+ xmount as root.
	+ * Automatic addition of FUSE's "-o allow_other" option if it is
	+ supported.
	+ * Added special "-o no_allow_other" command line parameter to
	+ disable automatic addition of the above option.
	+ * Reorganisation of FUSE's and xmount's command line options
	+ processing.
	+ * Added LogWarnMessage function to output a warning message.
	+ 20090722: * Added function CalculateInputImageHash to calculate an MD5 hash
	+ of the first input image's HASH_AMOUNT bytes of data. This hash is
	+ used as VDI creation UUID and will later be used to match cache
	+ files to input images.
	+ 20090724: v0.3.2 released
	+ 20090725: v0.4.0 released
	+ * Added AFF input image support.
	+ * Due to various problems with libewf and libaff packages (Mainly
	+ in Debian and Ubuntu), I decided to include them into xmount's
	+ source tree and link them in statically. This has the advantage
	+ that I can use whatever version I want.
	+ 20090727: v0.4.1 released
	+ * Added again the ability to compile xmount with shared libs as the
	+ Debian folks don't like the static ones :)
	+ 20090812: * Added TXMountConfData.OrigImageSize and
	+ TXMountConfData.VirtImageSize to save the size of the input and
	+ output image in order to avoid regetting it always from disk.
	+ 20090814: * Replaced all malloc and realloc occurences with the two macros
	+ XMOUNT_MALLOC and XMOUNT_REALLOC.
	+ 20090816: * Replaced where applicable all occurences of str(n)cpy or
	+ alike with their corresponding macros XMOUNT_STRSET, XMOUNT_STRCPY
	+ and XMOUNT_STRNCPY pendants.
	+ 20090907: v0.4.2 released
	+ * Fixed a bug in VMDK lock file access. glob_vmdk_lockfile_size
	+ wasn't reset to 0 when the file was deleted.
	+ * Fixed a bug in VMDK descriptor file access. Had to add
	+ glob_vmdk_file_size to track the size of this file as strlen was
	+ a bad idea :).
	+ 20100324: v0.4.3 released
	+ * Changed all header structs to prevent different sizes on i386 and
	+ amd64. See xmount.h for more details.
	+ 20100810: v0.4.4 released
	+ * Found a bug in InitVirtVdiHeader(). The 64bit values were
	+ addressed incorrectly while filled with rand(). This leads to an
	+ error message when trying to add a VDI file to VirtualBox 3.2.8.
	+ 20110210: * Adding subtype and fsname FUSE options in order to display mounted
	+ source in mount command output.
	+ 20110211: v0.4.5 released
	+ 20111011: * Changes to deal with libewf v2 API (thx to Joachim Metz)
	+ 20111109: v0.4.6 released
	+ * Added support for DMG output type (actually a DD with .dmg file
	+ extension). This type is used as default output type when
	+ using xmount under Mac OS X.
	+ 20120130: v0.4.7 released
	+ * Made InitVirtImageInfoFile less picky about missing EWF infos.
	+ 20120507: * Added support for VHD output image as requested by various people.
	+ * Statically linked libs updated to 20120504 (libewf) and 3.7.0
	+ (afflib).
	+ 20120510: v0.5.0 released
	+ * Added stbuf->st_blocks calculation for VHD images in function
	+ GetVirtFileAttr. This makes Windows not think the emulated
	+ file would be a sparse file. Sparse vhd files are not attachable
	+ in Windows.
	+ 20130726: v0.6.0 released
	+ * Added libaaff to replace libaff (thx to Guy Voncken).
	+ * Added libdd to replace raw dd input file handling and finally
	+ support split dd files (thx to Guy Voncken).
	+ 20140311: * Added libaewf (thx to Guy Voncken).
	+ 20140726: * Added support for dynamically loading of input libs. This should
	+ ease adding support for new input image formats in the future.
	+ * Moved input image functions to their corresponding dynamically
	+ loadable libs.
	+ * Prepended "glob_" to all global vars for better identification.
	+ 20140731: * Added --offset option as requested by HPM.
	+ * Began massive code cleanup.
	+ 20140803: * Added correct return code handling when calling input lib
	+ functions including getting error messages using GetErrorMessage.
	+ * Added input lib specific option parsing.
	+ * Re-implemented InitVirtImageInfoFile() using input lib's
	+ GetInfofileContent() function.
	+ * Further code cleanups.
	+ 20140807: * Further code cleanups.
	+ * Renamed GetVirtFileAttr() to FuseGetAttr()
	+ * Renamed CreateVirtDir() to FuseMkDir()
	+ * Renamed CreateVirtDir() to FuseMkNod()
	+ * Renamed OpenVirtFile() to FuseOpen()
	+ * Renamed GetVirtFiles() to FuseReadDir()
	+ * Renamed ReadVirtFile() to FuseRead()
	+ * Renamed RenameVirtFile() to FuseRename()
	+ * Renamed DeleteVirtDir() to FuseRmDir()
	+ * Renamed DeleteVirtFile() to FuseUnlink()
	+ * Renamed WriteVirtFile() to FuseWrite()
	+ * Fixed bug in CalculateInputImageHash() where always HASH_AMOUNT
	+ bytes were hased even if input image is smaller.
	+ * Fixed a newly introduced bug in FuseRead() and GetVirtImageData()
	+ returning -EIO when trying to read behind EOF. The correct return
	+ value is 0.
	+ 20140811: * Renamed CheckFuseAllowOther() to CheckFuseSettings() and added a
	+ check to see if user is part of the fuse group.
	+ 20140814: * Replaced cuserid() with getpwuid(geteuid()) in CheckFuseSettings()
	+ as it is deprecated on Linux and not available on OSx.
	+ * Only build fuse group checks from CheckFuseSettings() on Linux.
	+ 20140820: * Added libxmount_morphing handling.
	+ * Renamed LoadInputLibs() to LoadLibs() and added code to find and
	+ load morphing libs.
	+ * Added FindMorphingLib() function.
	+ 20140821: * Changed command line syntax to support specification of multiple
	+ input images of different types.
	+ * Added code in main() to initialize and open multiple input images.
	+ * Added GetMorphedImageSize() and GetMorphedImageData().
	+ 20140822: * Removed GetInputImageSize() as it isn't needed anymore.
	+ * Quick test showed morphing using libxmount_morphing_combine seems
	+ to work.
	+ 20140825: * Added InitResources() and FreeResources() functions.
	+*/
	+
	diff --git a/tags/xmount-0.7.0/src/xmount.h b/tags/xmount-0.7.0/src/xmount.h
	new file mode 100755
	index 0000000..20fb68b
	--- /dev/null
	+++ b/tags/xmount-0.7.0/src/xmount.h
	@@ -0,0 +1,490 @@
	+/*******************************************************************************
	+* xmount Copyright (c) 2008-2014 by Gillen Daniel <gillen.dan@pinguin.lu> *
	+* *
	+* xmount is a small tool to "fuse mount" various image formats and enable *
	+* virtual write access. *
	+* *
	+* This program is free software: you can redistribute it and/or modify it *
	+* under the terms of the GNU General Public License as published by the Free *
	+* Software Foundation, either version 3 of the License, or (at your option) *
	+* any later version. *
	+* *
	+* This program is distributed in the hope that it will be useful, but WITHOUT *
	+* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
	+* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for *
	+* more details. *
	+* *
	+* You should have received a copy of the GNU General Public License along with *
	+* this program. If not, see <http://www.gnu.org/licenses/>. *
	+*******************************************************************************/
	+
	+#include "../libxmount_input/libxmount_input.h"
	+#include "../libxmount_morphing/libxmount_morphing.h"
	+
	+#undef FALSE
	+#undef TRUE
	+#define FALSE 0
	+#define TRUE 1
	+
	+/*
	+ * Constants
	+ */
	+#define IMAGE_INFO_INPUT_HEADER \
	+ "------> The following values are supplied by the used input library(ies) " \
	+ "<------\n"
	+#define IMAGE_INFO_MORPHING_HEADER \
	+ "\n------> The following values are supplied by the used morphing library " \
	+ "<------\n\n"
	+
	+/*******************************************************************************
	+ * Structures of output images
	+ ******************************************************************************/
	+
	+#define VDI_FILE_COMMENT "<<< This is a virtual VDI image >>>"
	+#define VDI_HEADER_COMMENT "This VDI was emulated using xmount v" XMOUNT_VERSION
	+#define VDI_IMAGE_SIGNATURE 0xBEDA107F // 1:1 copy from hp
	+#define VDI_IMAGE_VERSION 0x00010001 // Vers 1.1
	+#define VDI_IMAGE_TYPE_FIXED 0x00000002 // Type 2 (fixed size)
	+#define VDI_IMAGE_FLAGS 0
	+#define VDI_IMAGE_BLOCK_SIZE (1024*1024) // 1 Megabyte
	+//! VDI Binary File Header structure
	+typedef struct s_VdiFileHeader {
	+// ----- VDIPREHEADER ------
	+ //! Just text info about image type, for eyes only
	+ char szFileInfo[64];
	+ //! The image signature (VDI_IMAGE_SIGNATURE)
	+ uint32_t u32Signature;
	+ //! The image version (VDI_IMAGE_VERSION)
	+ uint32_t u32Version;
	+ // ----- VDIHEADER1PLUS -----
	+ //! Size of header structure in bytes.
	+ uint32_t cbHeader;
	+ //! The image type (VDI_IMAGE_TYPE_*)
	+ uint32_t u32Type;
	+ //! Image flags (VDI_IMAGE_FLAGS_*)
	+ uint32_t fFlags;
	+ //! Image comment (UTF-8)
	+ char szComment[256];
	+ //! Offset of Blocks array from the begining of image file.
	+ // Should be sector-aligned for HDD access optimization.
	+ uint32_t offBlocks;
	+ //! Offset of image data from the begining of image file.
	+ // Should be sector-aligned for HDD access optimization.
	+ uint32_t offData;
	+ //! Legacy image geometry - Cylinders
	+ uint32_t cCylinders;
	+ //! Legacy image geometry - Heads
	+ uint32_t cHeads;
	+ //! Legacy image geometry - Sectors per track
	+ uint32_t cSectors;
	+ //! Legacy image geometry - Sector size (bytes per sector)
	+ uint32_t cbSector;
	+ //! Was BIOS HDD translation mode, now unused
	+ uint32_t u32Dummy;
	+ //! Size of disk (in bytes)
	+ uint64_t cbDisk;
	+ //! Block size (for instance VDI_IMAGE_BLOCK_SIZE). Must be a power of 2!
	+ uint32_t cbBlock;
	+ //! Size of additional service information of every data block.
	+ // Prepended before block data. May be 0.
	+ // Should be a power of 2 and sector-aligned for optimization reasons.
	+ uint32_t cbBlockExtra;
	+ //! Number of blocks
	+ uint32_t cBlocks;
	+ //! Number of allocated blocks
	+ uint32_t cBlocksAllocated;
	+ //! UUID of image (lower 64 bit)
	+ uint64_t uuidCreate_l;
	+ //! UUID of image (higher 64 bit)
	+ uint64_t uuidCreate_h;
	+ //! UUID of image's last modification (lower 64 bit)
	+ uint64_t uuidModify_l;
	+ //! UUID of image's last modification (higher 64 bit)
	+ uint64_t uuidModify_h;
	+ //! Only for secondary images - UUID of previous image (lower 64 bit)
	+ uint64_t uuidLinkage_l;
	+ //! Only for secondary images - UUID of previous image (higher 64 bit)
	+ uint64_t uuidLinkage_h;
	+ //! Only for secondary images - UUID of prev image's last mod (lower 64 bit)
	+ uint64_t uuidParentModify_l;
	+ //! Only for secondary images - UUID of prev image's last mod (higher 64 bit)
	+ uint64_t uuidParentModify_h;
	+ //! Padding to get 512 byte alignment
	+ char padding[56];
	+} __attribute__ ((packed)) ts_VdiFileHeader, *pts_VdiFileHeader;
	+
	+// /** The way the UUID is declared by the DCE specification. */
	+// struct
	+// {
	+// uint32_t u32TimeLow;
	+// uint16_t u16TimeMid;
	+// uint16_t u16TimeHiAndVersion;
	+// uint8_t u8ClockSeqHiAndReserved;
	+// uint8_t u8ClockSeqLow;
	+// uint8_t au8Node[6];
	+// } Gen;
	+
	+/*
	+ * VHD Binary File footer structure
	+ *
	+ * At the time of writing, the specs could be found here:
	+ * http://www.microsoft.com/downloads/details.aspx?
	+ * FamilyID=C2D03242-2FFB-48EF-A211-F0C44741109E
	+ *
	+ * Warning: All values are big-endian!
	+ */
	+//
	+#ifdef __LP64__
	+ #define VHD_IMAGE_HVAL_COOKIE 0x78697463656E6F63 // "conectix"
	+#else
	+ #define VHD_IMAGE_HVAL_COOKIE 0x78697463656E6F63LL
	+#endif
	+#define VHD_IMAGE_HVAL_FEATURES 0x02000000
	+#define VHD_IMAGE_HVAL_FILE_FORMAT_VERSION 0x00000100
	+#ifdef __LP64__
	+ #define VHD_IMAGE_HVAL_DATA_OFFSET 0xFFFFFFFFFFFFFFFF
	+#else
	+ #define VHD_IMAGE_HVAL_DATA_OFFSET 0xFFFFFFFFFFFFFFFFLL
	+#endif
	+#define VHD_IMAGE_HVAL_CREATOR_APPLICATION 0x746E6D78 // "xmnt"
	+#define VHD_IMAGE_HVAL_CREATOR_VERSION 0x00000500
	+// This one is funny! According to VHD specs, I can only choose between Windows
	+// and Macintosh. I'm going to choose the most common one.
	+#define VHD_IMAGE_HVAL_CREATOR_HOST_OS 0x6B326957 // "Win2k"
	+#define VHD_IMAGE_HVAL_DISK_TYPE 0x02000000
	+// Seconds from January 1st, 1970 to January 1st, 2000
	+#define VHD_IMAGE_TIME_CONVERSION_OFFSET 0x386D97E0
	+typedef struct s_VhdFileHeader {
	+ uint64_t cookie;
	+ uint32_t features;
	+ uint32_t file_format_version;
	+ uint64_t data_offset;
	+ uint32_t creation_time;
	+ uint32_t creator_app;
	+ uint32_t creator_ver;
	+ uint32_t creator_os;
	+ uint64_t size_original;
	+ uint64_t size_current;
	+ uint16_t disk_geometry_c;
	+ uint8_t disk_geometry_h;
	+ uint8_t disk_geometry_s;
	+ uint32_t disk_type;
	+ uint32_t checksum;
	+ uint64_t uuid_l;
	+ uint64_t uuid_h;
	+ uint8_t saved_state;
	+ char reserved[427];
	+} __attribute__ ((packed)) ts_VhdFileHeader, *pts_VhdFileHeader;
	+
	+/*******************************************************************************
	+ * Xmount specific structures
	+ ******************************************************************************/
	+
	+#ifdef __LP64__
	+ #define CACHE_BLOCK_FREE 0xFFFFFFFFFFFFFFFF
	+#else
	+ #define CACHE_BLOCK_FREE 0xFFFFFFFFFFFFFFFFLL
	+#endif
	+//! Cache file block index array element
	+typedef struct s_CacheFileBlockIndex {
	+ //! Set to 1 if block is assigned (this block has data in cache file)
	+ uint32_t Assigned;
	+ //! Offset to data in cache file
	+ uint64_t off_data;
	+} __attribute__ ((packed)) ts_CacheFileBlockIndex, *pts_CacheFileBlockIndex;
	+
	+#define CACHE_BLOCK_SIZE (1024*1024) // 1 megabyte
	+#ifdef __LP64__
	+ #define CACHE_FILE_SIGNATURE 0xFFFF746E756F6D78 // "xmount\xFF\xFF"
	+#else
	+ #define CACHE_FILE_SIGNATURE 0xFFFF746E756F6D78LL
	+#endif
	+#define CUR_CACHE_FILE_VERSION 0x00000002 // Current cache file version
	+#define HASH_AMOUNT (10241024)10 // Amount of data used to construct a
	+ // "unique" hash for every input image
	+ // (10MByte)
	+//! Cache file header structure
	+typedef struct s_CacheFileHeader {
	+ //! Simple signature to identify cache files
	+ uint64_t FileSignature;
	+ //! Cache file version
	+ uint32_t CacheFileVersion;
	+ //! Cache block size
	+ uint64_t BlockSize;
	+ //! Total amount of cache blocks
	+ uint64_t BlockCount;
	+ //! Offset to the first block index array element
	+ uint64_t pBlockIndex;
	+ //! Set to 1 if VDI file header is cached
	+ uint32_t VdiFileHeaderCached;
	+ //! Offset to cached VDI file header
	+ uint64_t pVdiFileHeader;
	+ //! Set to 1 if VMDK file is cached
	+ uint32_t VmdkFileCached;
	+ //! Size of VMDK file
	+ uint64_t VmdkFileSize;
	+ //! Offset to cached VMDK file
	+ uint64_t pVmdkFile;
	+ //! Set to 1 if VHD header is cached
	+ uint32_t VhdFileHeaderCached;
	+ //! Offset to cached VHD header
	+ uint64_t pVhdFileHeader;
	+ //! Padding to get 512 byte alignment and ease further additions
	+ char HeaderPadding[432];
	+} __attribute__ ((packed)) ts_CacheFileHeader, *pts_CacheFileHeader;
	+
	+//! Cache file header structure - Old v1 header
	+typedef struct s_CacheFileHeader_v1 {
	+ //! Simple signature to identify cache files
	+ uint64_t FileSignature;
	+ //! Cache file version
	+ uint32_t CacheFileVersion;
	+ //! Total amount of cache blocks
	+ uint64_t BlockCount;
	+ //! Offset to the first block index array element
	+ uint64_t pBlockIndex;
	+ //! Set to 1 if VDI file header is cached
	+ uint32_t VdiFileHeaderCached;
	+ //! Offset to cached VDI file header
	+ uint64_t pVdiFileHeader;
	+ //! Set to 1 if VMDK file is cached
	+} ts_CacheFileHeader_v1, *pts_CacheFileHeader_v1;
	+
	+//! Virtual image types
	+typedef enum e_VirtImageType {
	+ //! Virtual image is a DD file
	+ VirtImageType_DD,
	+ //! Virtual image is a DMG file
	+ VirtImageType_DMG,
	+ //! Virtual image is a VDI file
	+ VirtImageType_VDI,
	+ //! Virtual image is a VMDK file (IDE bus)
	+ VirtImageType_VMDK,
	+ //! Virtual image is a VMDK file (SCSI bus)
	+ VirtImageType_VMDKS,
	+ //! Virtual image is a VHD file
	+ VirtImageType_VHD
	+} te_VirtImageType;
	+
	+//! Structure containing infos about input libs
	+typedef struct s_InputLib {
	+ //! Filename of lib (without path)
	+ char *p_name;
	+ //! Handle to the loaded lib
	+ void *p_lib;
	+ //! Array of supported input types
	+ char *p_supported_input_types;
	+ //! Struct containing lib functions
	+ ts_LibXmountInputFunctions lib_functions;
	+} ts_InputLib, *pts_InputLib;
	+
	+//! Structure containing infos about input images
	+typedef struct s_InputImage {
	+ //! Image type
	+ char *p_type;
	+ //! Image source file count
	+ uint64_t files_count;
	+ //! Image source files
	+ char **pp_files;
	+ //! Input lib functions for this image
	+ pts_LibXmountInputFunctions p_functions;
	+ //! Image handle
	+ void *p_handle;
	+ //! Image size
	+ uint64_t size;
	+} ts_InputImage, *pts_InputImage;
	+
	+typedef struct s_InputData {
	+ //! Loaded input lib count
	+ uint32_t libs_count;
	+ //! Array containing infos about loaded input libs
	+ pts_InputLib *pp_libs;
	+ //! Amount of input lib params (--inopts)
	+ uint32_t lib_params_count;
	+ //! Input lib params (--inopts)
	+ pts_LibXmountOptions *pp_lib_params;
	+ //! Input image count
	+ uint64_t images_count;
	+ //! Input images
	+ pts_InputImage *pp_images;
	+ //! Input image offset (--offset)
	+ uint64_t image_offset;
	+ //! Input image size limit (--sizelimit)
	+ uint64_t image_size_limit;
	+ //! MD5 hash of partial input image (lower 64 bit) (after morph)
	+ uint64_t image_hash_lo;
	+ //! MD5 hash of partial input image (higher 64 bit) (after morph)
	+ uint64_t image_hash_hi;
	+} ts_InputData;
	+
	+//! Structure containing infos about morphing libs
	+typedef struct s_MorphingLib {
	+ //! Filename of lib (without path)
	+ char *p_name;
	+ //! Handle to the loaded lib
	+ void *p_lib;
	+ //! Array of supported morphing types
	+ char *p_supported_morphing_types;
	+ //! Struct containing lib functions
	+ ts_LibXmountMorphingFunctions lib_functions;
	+} ts_MorphingLib, *pts_MorphingLib;
	+
	+//! Structures and vars needed for morph support
	+typedef struct s_MorphingData {
	+ //! Loaded morphing lib count
	+ uint32_t libs_count;
	+ //! Array containing infos about loaded morphing libs
	+ pts_MorphingLib *pp_libs;
	+ //! Specified morphing type (--morph)
	+ char *p_morph_type;
	+ //! Amount of specified morphing lib params (--morphopts)
	+ uint32_t lib_params_count;
	+ //! Specified morphing lib params (--morphopts)
	+ pts_LibXmountOptions *pp_lib_params;
	+ //! Handle to initialized morphing lib
	+ void *p_handle;
	+ //! Morphing functions of initialized lib
	+ pts_LibXmountMorphingFunctions p_functions;
	+ //! Input image functions passed to morphing lib
	+ ts_LibXmountMorphingInputFunctions input_image_functions;
	+} ts_MorphingData;
	+
	+//! Structures and vars needed for write access
	+typedef struct s_CacheData {
	+ //! Cache file to save changes to
	+ char *p_cache_file;
	+ //! Handle to cache file
	+ FILE *h_cache_file;
	+ //! Overwrite existing cache
	+ uint8_t overwrite_cache;
	+ //! Cache header
	+ pts_CacheFileHeader p_cache_header;
	+ //! Cache block index
	+ pts_CacheFileBlockIndex p_cache_blkidx;
	+} ts_CacheData;
	+
	+//! Structures and vars needed for VDI support
	+typedef struct s_OutputImageVdiData {
	+ //! VDI header size
	+ uint32_t vdi_header_size;
	+ //! VDI header
	+ pts_VdiFileHeader p_vdi_header;
	+ //! VDI blockmap size
	+ uint32_t vdi_block_map_size;
	+ //! VDI block map
	+ char *p_vdi_block_map;
	+} ts_OutputImageVdiData;
	+
	+//! Structures and vars needed for VHD support
	+typedef struct s_OutputImageVhdData {
	+ //! VHD header
	+ ts_VhdFileHeader *p_vhd_header;
	+} ts_OutputImageVhdData;
	+
	+//! Structures and vars needed for VMDK support
	+typedef struct s_OutputImageVmdkData {
	+ //! Path of virtual VMDK file
	+ char *p_virtual_vmdk_path;
	+ //! VMDK content
	+ char *p_vmdk_file;
	+ //! VMDK content size
	+ int vmdk_file_size;
	+ //! Path of 1st lockdir
	+ char *p_vmdk_lockdir1;
	+ //! Path of 2nd lockdir
	+ char *p_vmdk_lockdir2;
	+ //! Lockfile content
	+ char *p_vmdk_lockfile_data;
	+ //! Lockfile content size
	+ int vmdk_lockfile_size;
	+ //! Path of lockfile
	+ char *p_vmdk_lockfile_name;
	+} ts_OutputImageVmdkData;
	+
	+//! Structure containing infos about output image
	+typedef struct s_OutputData {
	+ //! Virtual image type
	+ te_VirtImageType VirtImageType;
	+ //! Size
	+ uint64_t image_size;
	+ //! Writable? (Set to 1 if --cache was specified)
	+ uint8_t writable;
	+ //! Path of virtual image file
	+ char *p_virtual_image_path;
	+ //! Path of virtual image info file
	+ char *p_info_path;
	+ //! Pointer to virtual info file
	+ char *p_info_file;
	+ //! VDI related data
	+ ts_OutputImageVdiData vdi;
	+ //! VHD related data
	+ ts_OutputImageVhdData vhd;
	+ //! VMDK related data
	+ ts_OutputImageVmdkData vmdk;
	+} ts_OutputData;
	+
	+//! Structure containing global xmount runtime infos
	+typedef struct s_XmountData {
	+ //! Input image related data
	+ ts_InputData input;
	+ //! Morphing related data
	+ ts_MorphingData morphing;
	+ //! Cache file related data
	+ ts_CacheData cache;
	+ //! Output image related data
	+ ts_OutputData output;
	+ //! Enable debug output
	+ uint8_t debug;
	+ //! Set if we are allowed to set fuse's allow_other option
	+ uint8_t may_set_fuse_allow_other;
	+ //! Argv for FUSE
	+ int fuse_argc;
	+ //! Argv for FUSE
	+ char **pp_fuse_argv;
	+ //! Mount point
	+ char *p_mountpoint;
	+ //! Mutex to control concurrent read & write access on output image
	+ pthread_mutex_t mutex_image_rw;
	+ //! Mutex to control concurrent read access on info file
	+ pthread_mutex_t mutex_info_read;
	+} ts_XmountData;
	+
	+/*
	+ ----- Change log -----
	+ 20090226: * Added change history information to this file.
	+ * Added TVirtImageType enum to identify virtual image type.
	+ * Added TOrigImageType enum to identify input image type.
	+ * Added TMountimgConfData struct to hold various mountimg runtime
	+ options.
	+ * Renamed VDIFILEHEADER to ts_VdiFileHeader.
	+ 20090228: * Added LOG_ERROR and LOG_DEBUG macros
	+ * Added defines for various static VDI header values
	+ * Added defines for TRUE and FALSE
	+ 20090307: * Added defines for various static cache file header values
	+ * Added VdiFileHeaderCached and pVdiFileHeader values to be able to
	+ cache the VDI file header separatly.
	+ 20090519: * Added new cache file header structure and moved old one to
	+ ts_CacheFileHeader_v1.
	+ * New cache file structure includes VmdkFileCached and pVmdkFile to
	+ cache virtual VMDK file and makes room for further additions so
	+ current cache file version 2 cache files can be easily converted
	+ to newer ones.
	+ 20090814: * Added XMOUNT_MALLOC and XMOUNT_REALLOC macros.
	+ 20090816: * Added XMOUNT_STRSET, XMOUNT_STRNSET, XMOUNT_STRAPP and
	+ XMOUNT_STRNAPP macros.
	+ 20100324: * Added "__attribute__ ((packed))" to all header structs to prevent
	+ different sizes on i386 and amd64.
	+ 20111109: * Added TVirtImageType_DMG type.
	+ 20120130: * Added LOG_WARNING macro.
	+ 20120507: * Added ts_VhdFileHeader structure.
	+ 20120511: * Added endianness conversation macros
	+ 20140809: * Moved endianness macros to separate file
	+ 20140810: * Moved convenience macros to separate file
	+ 20140726: * Added ts_InputLib
	+ 20140821: * Added ts_InputImage and ts_InputData
	+ * Moved data from various places to the above structs.
	+ 20140825: * Added ts_MorphingLib, ts_CacheData, ts_OutputImageVdiData,
	+ ts_OutputImageVhdData, ts_OutputImageVmdkData and ts_OutputData.
	+ * Moved data from various places to the above structs.
	+*/
	+
	diff --git a/tags/xmount-0.7.0/xmount.1 b/tags/xmount-0.7.0/xmount.1
	new file mode 100644
	index 0000000..4b75e80
	--- /dev/null
	+++ b/tags/xmount-0.7.0/xmount.1
	@@ -0,0 +1,85 @@
	+.\"
	+.TH "xmount" "1" "Sep 26, 2014" "Daniel Gillen" "xmount"
	+.SH "NAME"
	+xmount \- Tool to crossmount between multiple input and output harddisk image files
	+
	+.SH "SYNOPSIS"
	+.B xmount
	+[fopts] <xopts> <mntp>
	+.br
	+
	+.SH "DESCRIPTION"
	+.B xmount
	+allows you to convert on-the-fly between multiple input and output
	+harddisk image formats. xmount creates a virtual file system using FUSE
	+(Filesystem in Userspace) that contains a virtual representation of the input
	+image.
	+
	+The virtual representation can be in raw DD, Apple's Disk Image format (DMG),
	+VirtualBox's virtual disk file format (VDI), Microsoft's Virtual Hard Disk
	+Image format (VHD) or in VmWare's VMDK file format.
	+
	+Input images can be raw DD, EWF (Expert Witness Compression Format) or AFF
	+(Advanced Forensic Format) files.
	+
	+In addition, xmount also supports virtual write access to the output files
	+that is redirected to a cache file. This makes it possible to boot acquired
	+harddisk images using QEMU, KVM, VirtualBox, VmWare or alike.
	+.br
	+
	+.SH "OPTIONS"
	+.B
	+fopts: (Options specific to FUSE)
	+ \-d: Enable FUSE's and xmount's debug mode.
	+ \-h: Display this help message.
	+ \-s: Run single threaded.
	+ \-o no_allow_other: Disable automatic addition of FUSE's allow_other option.
	+ \-o <fmopts> :
	+ Specify fuse mount options. Will also disable automatic addition of FUSE's
	+ allow_other option!
	+.br
	+
	+.B
	+xopts: (Options specific to xmount)
	+ \-\-cache <cfile> : Enable virtual write support.
	+ <cfile> specifies the cache file to use.
	+ \-\-in <itype> <ifile> : Input image format and source file(s). May be specified multiple times.
	+ For a list of supported <itype> types, run xmount \-\-info and look under "loaded input libraries".
	+ <ifile> specifies the source file. If your image is split into multiple files, you have to specify them all!
	+ \-\-inopts <iopts> : Specify input library specific options.
	+ <iopts> specifies a comma separated list of key=value options.
	+ \-\-info : Print out infos about used compiler and loaded libraries.
	+ \-\-morph <mtype> : Morphing function to apply to input image(s). If not specified, defaults to "combine".
	+ For a list of supported <mtype> types, run xmount \-\-info and look under "loaded morphing libraries".
	+ \-\-morphopts <mopts> : Specify morphing library specific options.
	+ <mopts> specifies a comma separated list of key=value options.
	+ \-\-offset <off> : Move the output image data start <off> bytes into the input image(s).
	+ \-\-out <otype> : Output image format. If not specified, defaults to "raw".
	+ <otype> can be "raw", "dmg", "vdi", "vhd", "vmdk", "vmdks".
	+ \-\-owcache <file> : Same as \-\-cache <file> but overwrites existing cache file.
	+ \-\-sizelimit <size> : The data end of input image(s) is set to no more than <size> bytes after the data start.
	+ \-\-version : Same as \-\-info.
	+.br
	+
	+.B
	+mntp:
	+ Mount point where virtual files should be located.
	+.br
	+
	+.SH "BUGS"
	+Hopefully none. If you find any, please e\-mail to <bugs@pinguin.lu>.
	+
	+.SH "EXAMPLE"
	+To xmount an EWF image from your acquired disk as a raw DD image under /mnt,
	+use the following command:
	+
	+ xmount \-\-in ewf ./acquired_disk.E?? /mnt
	+
	+To xmount the same ewf image as vdi file, you would use a command like this:
	+
	+ xmount \-\-in ewf ./acquired_disk.E?? \-\-out vdi /mnt
	+
	+And to enable virtual write support on a raw DD input image xmounted as VDI
	+file:
	+
	+ xmount \-\-in raw ./acquired_disk.dd \-\-out vdi --cache ./disk.cache /mnt
	diff --git a/tags/xmount-0.7.0/xmount.pmdoc/01dstroot-contents.xml b/tags/xmount-0.7.0/xmount.pmdoc/01dstroot-contents.xml
	new file mode 100644
	index 0000000..ea21582
	--- /dev/null
	+++ b/tags/xmount-0.7.0/xmount.pmdoc/01dstroot-contents.xml
	@@ -0,0 +1 @@
	+<pkg-contents spec="1.12"><f n="dstroot" o="root" g="wheel" p="16877" pt="OSXDSTROOT" m="false" t="file"><f n="usr" o="root" g="wheel" p="16877"><f n="local" o="root" g="wheel" p="16877"><f n="bin" o="root" g="wheel" p="16877"><f n="xmount" o="root" g="wheel" p="33277"><mod>mode</mod></f></f><f n="share" o="root" g="wheel" p="16877"><f n="man" o="root" g="wheel" p="16877"><f n="man1" o="root" g="wheel" p="16877"><f n="xmount.1" o="root" g="wheel" p="33204"><mod>mode</mod></f></f></f></f></f></f></f></pkg-contents>
	diff --git a/tags/xmount-0.7.0/xmount.pmdoc/01dstroot.xml b/tags/xmount-0.7.0/xmount.pmdoc/01dstroot.xml
	new file mode 100644
	index 0000000..c03fe78
	--- /dev/null
	+++ b/tags/xmount-0.7.0/xmount.pmdoc/01dstroot.xml
	@@ -0,0 +1 @@
	+<pkgref spec="1.12" uuid="602B5E40-A3B9-4044-BF85-7BA882D111BE"><config><identifier>www.pinguin.lu.xmountVERSION.dstroot.pkg</identifier><version>1</version><description></description><post-install type="none"/><requireAuthorization/><installFrom>OSXDSTROOT</installFrom><installTo>/</installTo><flags><followSymbolicLinks/></flags><packageStore type="internal"></packageStore><mod>parent</mod></config><contents><file-list>01dstroot-contents.xml</file-list><filter>/CVS$</filter><filter>/\.svn$</filter><filter>/\.cvsignore$</filter><filter>/\.cvspass$</filter><filter>/\.DS_Store$</filter></contents></pkgref>
	diff --git a/tags/xmount-0.7.0/xmount.pmdoc/index.xml b/tags/xmount-0.7.0/xmount.pmdoc/index.xml
	new file mode 100644
	index 0000000..cb23d2b
	--- /dev/null
	+++ b/tags/xmount-0.7.0/xmount.pmdoc/index.xml
	@@ -0,0 +1,46 @@
	+<pkmkdoc spec="1.12"><properties><title>xmount VERSION_LONG</title><build>CURRENT_PATH/xmount-VERSION_LONG.pkg</build><organization>www.pinguin.lu</organization><userSees ui="easy"/><min-target os="3"/><domain anywhere="true"/></properties><distribution><versions min-spec="1.000000"/><scripts></scripts></distribution><contents><choice title="dstroot" id="choice0" starts_selected="true" starts_enabled="true" starts_hidden="false"><pkgref id="www.pinguin.lu.xmountVERSION.dstroot.pkg"/></choice></contents><resources bg-scale="none" bg-align="topleft"><locale lang="en"><resource mime-type="text/rtf" kind="embedded" type="license"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
	+{\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
	+{\colortbl;\red255\green255\blue255;}
	+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\ql\qnatural\pardirnatural
	+
	+\f0\fs26 \cf0 xmount Copyright (c) 2008-2012 by Gillen Daniel\
	+\
	+This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\
	+\
	+This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\
	+\
	+You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.\
	+\
	+This version of xmount includes the following statically linked libraries:\
	+\
	+==== LIBEWF\
	+ Copyright (c) 2006-2009, Joachim Metz <forensics@hoffmannbv.nl>, Hoffmann Investigations.\
	+\
	+This software is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\
	+\
	+This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\
	+\
	+You should have received a copy of the GNU Lesser General Public License along with this software. If not, see <http://www.gnu.org/licenses/>.\
	+\
	+==== AFFLIB\
	+Copyright (c) 2005, 2006, 2007 Simson L. Garfinkel and Basis Technology Corp. All rights reserved.\
	+\
	+This code is derrived from software contributed by Simson L. Garfinkel\
	+\
	+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:\
	+\
	+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.\
	+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.\
	+3. All advertising materials mentioning features or use of this software must display the following acknowledgement:\
	+This product includes software developed by Simson L. Garfinkel and Basis Technology Corp.\
	+4. Neither the name of Simson L. Garfinkel, Basis Technology, or other contributors to this program may be used to endorse or promote products derived from this software without specific prior written permission.\
	+\
	+THIS SOFTWARE IS PROVIDED BY SIMSON L. GARFINKEL, BASIS TECHNOLOGY, AND CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL SIMSON L. GARFINKEL, BASIS TECHNOLOGY, OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \
	+\
	+AFF and AFFLIB is a trademark of Simson Garfinkel and Basis Technology Corp.}]]></resource><resource mime-type="text/rtf" kind="embedded" type="readme"><![CDATA[{\rtf1\ansi\ansicpg1252\cocoartf949\cocoasubrtf540
	+{\fonttbl\f0\fnil\fcharset0 LucidaGrande;}
	+{\colortbl;\red255\green255\blue255;}
	+\deftab480
	+\pard\tx480\pardeftab480\ql\qnatural\pardirnatural
	+
	+\f0\fs26 \cf0 xmount is a small tool to convert various forensic harddisk image formats on-the-fly to raw DD, DMG, VDI, VHD or VMDK files and enable virtual write access to them.}]]></resource></locale></resources><requirements><requirement id="file" operator="eq" value="true"><file>/Library/Filesystems/osxfusefs.fs/Support/osxfusefs.kext</file><message-title>OSXFUSE missing</message-title><message>Your system does not seem to have MacFUSE installed. Get it from http://osxfuse.github.com/ and install it prior to launching this installer.</message></requirement></requirements><flags/><item type="file">01dstroot.xml</item><mod>properties.systemDomain</mod><mod>properties.title</mod></pkmkdoc>
	diff --git a/tags/xmount-0.7.0/xmount.spec b/tags/xmount-0.7.0/xmount.spec
	new file mode 100644
	index 0000000..0a514ba
	--- /dev/null
	+++ b/tags/xmount-0.7.0/xmount.spec
	@@ -0,0 +1,57 @@
	+%define debug_package %{nil}
	+
	+Name: xmount
	+Summary: Tool to crossmount between multiple input and output harddisk images
	+Version: 0.7.0
	+Release: 1%{?dist}
	+License: GPL
	+Group: Applications/System
	+URL: https://www.pinguin.lu/
	+Source0: %{name}-%{version}.tar.gz
	+Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root
	+Requires: fuse openssl zlib libewf afflib
	+BuildRequires: cmake fuse-devel zlib-devel libewf-devel afflib-devel
	+
	+%description
	+xmount allows you to convert on-the-fly between multiple input and output
	+harddisk image formats. xmount creates a virtual file system using FUSE
	+(Filesystem in Userspace) that contains a virtual representation of the input
	+harddisk image. The virtual representation can be in raw DD, Apple's Disk Image
	+format (DMG), VirtualBox's virtual disk file format (VDI), Microsoft's Virtual
	+Hard Disk Image format (VHD) or in VmWare's VMDK file format. Input images can
	+be raw DD, EWF (Expert Witness Compression Format) or AFF (Advanced Forensic
	+Format) files. In addition, xmount also supports virtual write access to the
	+output files that is redirected to a cache file. This makes it for example
	+possible to boot acquired harddisk images using QEMU, KVM, VirtualBox, VMware
	+or alike.
	+
	+%build
	+%cmake -DCMAKE_INSTALL_PREFIX=%{_prefix} .
	+make %{?_smp_mflags}
	+
	+%install
	+rm -fr %{buildroot}
	+make install DESTDIR=%{buildroot}
	+
	+%makeinstall
	+
	+%clean
	+rm -fr %{buildroot}
	+
	+%post
	+
	+%preun
	+
	+%postun
	+
	+%files
	+%defattr(-,root,root)
	+%{_bindir}/*
	+%{_mandir}/*
	+%doc AUTHORS COPYING INSTALL NEWS README ROADMAP
	+
	+%changelog
	+* Wed Aug 13 2014 Daniel Gillen <gillen.dan@pinguin.lu> 0.7.0-1
	+* Release 0.7.0-1
	+ See ChangeLog for details
	+
	diff --git a/trunk/CMakeLists.txt b/trunk/CMakeLists.txt
	index 3f417cc..b1529d7 100644
	--- a/trunk/CMakeLists.txt
	+++ b/trunk/CMakeLists.txt
	@@ -1,96 +1,99 @@
	cmake_minimum_required(VERSION 2.8)
	project(xmount C)

	include(CheckIncludeFiles)
	#include(CheckCSourceCompiles)

	# Only for internal packaging
	-#set(STATIC_EWF 1)
	-#set(STATIC_AFF 1)
	+#set(STATIC 1)
	+if(STATIC)
	+ set(STATIC_EWF 1)
	+ set(STATIC_AFF 1)
	+endif(STATIC)

	add_definitions(-DXMOUNT_VERSION="0.7.0")

	if(APPLE)
	# On OSx, do not try to find frameworks but only std headers / libraries
	set(CMAKE_FIND_FRAMEWORK "NEVER")
	endif(APPLE)

	# Make sure CMAKE_BUILD_TYPE is set
	if(NOT CMAKE_BUILD_TYPE)
	set(CMAKE_BUILD_TYPE "Release")
	else(NOT CMAKE_BUILD_TYPE)
	if(NOT (CMAKE_BUILD_TYPE STREQUAL "Release" OR
	CMAKE_BUILD_TYPE STREQUAL "Debug"))
	message(FATAL_ERROR "Only build types 'Release' and 'Debug' are supported!")
	endif(NOT (CMAKE_BUILD_TYPE STREQUAL "Release" OR
	CMAKE_BUILD_TYPE STREQUAL "Debug"))
	endif(NOT CMAKE_BUILD_TYPE)

	# Add cmake_modules dir to CMAKE_MODULE_PATH
	set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake_modules/")

	# Check required headers
	check_include_files(stdlib.h HAVE_STDLIB_H)
	check_include_files(stdio.h HAVE_STDIO_H)
	check_include_files(stdint.h HAVE_STDINT_H)
	check_include_files(stdarg.h HAVE_STDARG_H)
	check_include_files(string.h HAVE_STRING_H)
	check_include_files(errno.h HAVE_ERRNO_H)
	check_include_files(fcntl.h HAVE_FCNTL_H)
	check_include_files(dlfcn.h HAVE_DLFCN_H)
	check_include_files(dirent.h HAVE_DIRENT_H)
	check_include_files(unistd.h HAVE_UNISTD_H)
	check_include_files(sys/ioctl.h HAVE_SYS_IOCTL_H)
	check_include_files(sys/stat.h HAVE_SYS_STAT_H)
	check_include_files(sys/types.h HAVE_SYS_TYPES_H)
	check_include_files(linux/fs.h HAVE_LINUX_FS_H)
	check_include_files(grp.h HAVE_GRP_H)
	check_include_files(pwd.h HAVE_PWD_H)
	check_include_files(pthread.h HAVE_PTHREAD_H)
	check_include_files(time.h HAVE_TIME_H)
	check_include_files(inttypes.h HAVE_INTTYPES_H)
	check_include_files(byteswap.h HAVE_BYTESWAP_H)
	check_include_files(endian.h HAVE_ENDIAN_H)
	check_include_files(libkern/OSByteOrder.h HAVE_LIBKERN_OSBYTEORDER_H)

	# Check for required libs
	if(NOT APPLE)
	find_package(LibFUSE REQUIRED)
	else(NOT APPLE)
	# On OSx, search for osxfuse
	find_package(LibOSXFUSE REQUIRED)
	endif(NOT APPLE)

	# Generate config.h and add it's path to the include dirs
	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
	${CMAKE_CURRENT_BINARY_DIR}/config.h)
	include_directories(${CMAKE_CURRENT_BINARY_DIR})

	# Add preprocessor definitions
	add_definitions(-D_LARGEFILE64_SOURCE)
	add_definitions(-D_FILE_OFFSET_BITS=64)
	add_definitions(-D_GNU_SOURCE)
	set(CMAKE_C_FLAGS "-fno-strict-aliasing -std=c99 -Wall")
	set(CMAKE_C_FLAGS_RELEASE "-O2 ${CMAKE_C_FLAGS}")
	set(CMAKE_C_FLAGS_DEBUG "-ggdb -O0 ${CMAKE_C_FLAGS}")

	# Check that off_t can represent 2**63 - 1 correctly.
	# If it can't, we need to set _FILE_OFFSET_BITS=64
	#check_c_source_compiles("
	# #include <sys/types.h>
	# #define LARGE_OFF_T (((off_t) 1 << 62) - 1 + ((off_t) 1 << 62))
	# int off_t_is_large[(LARGE_OFF_T % 2147483629 == 721 && LARGE_OFF_T % 2147483647 == 1) ? 1 : -1];
	# int main() { return 0; }
	#" _OFFT_IS_64BIT)
	#if(NOT ${_OFFT_IS_64BIT})
	# set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} "-D_FILE_OFFSET_BITS=64")
	#endif(NOT ${_OFFT_IS_64BIT})

	# Compile stuff in sub dirs
	add_subdirectory(libxmount_input)
	add_subdirectory(libxmount_morphing)
	add_subdirectory(src)

	# Install man page
	INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/xmount.1 DESTINATION share/man/man1)

	diff --git a/trunk/debian/changelog b/trunk/debian/changelog
	index 7e17636..213f3a1 100644
	--- a/trunk/debian/changelog
	+++ b/trunk/debian/changelog
	@@ -1,112 +1,113 @@
	xmount (0.7.0) stable; urgency=low

	* Changed build system from autoconf / automake to cmake
	* Moved input image support into external libs
	- * Added --offset command line parameter
	+ * Added morphing functionality including combine, raid and unallocated
	+ * Added --offset and --sizelimit command line parameter
	* Massive code cleanup including some small bug fixes

	- -- Gillen Daniel <gillen.dan@pinguin.lu> Wed, 13 Aug 2014 17:00:00 +0200
	+ -- Gillen Daniel <gillen.dan@pinguin.lu> Fri, 26 Sep 2014 11:00:00 +0200

	xmount (0.6.0) stable; urgency=low

	* Added faster aff input support (using libaaff).
	* Added support for split DD input files (using libdd).

	-- Gillen Daniel <gillen.dan@pinguin.lu> Fri, 26 Jul 2013 16:00:00 +0200

	xmount (0.5.0) stable; urgency=low

	* Added support for virtual VHD image file emulation.

	-- Gillen Daniel <gillen.dan@pinguin.lu> Sun, 06 May 2012 12:00:00 +0200

	xmount (0.4.7) stable; urgency=low

	* Made InitVirtImageInfoFile less picky about missing EWF infos.

	-- Gillen Daniel <gillen.dan@pinguin.lu> Mon, 30 Jan 2012 12:00:00 +0100

	xmount (0.4.6) stable; urgency=low

	* Added support for libewf v2

	-- Gillen Daniel <gillen.dan@pinguin.lu> Tue, 11 Oct 2011 20:00:00 +0200

	xmount (0.4.5) stable; urgency=low

	* Added FUSE options to show mounted source in mount command output

	-- Gillen Daniel <gillen.dan@pinguin.lu> Tue, 11 Feb 2011 16:00:00 +0100

	xmount (0.4.4) stable; urgency=critical

	* Fixed a bug in UUID generation

	-- Gillen Daniel <gillen.dan@pinguin.lu> Tue, 10 Aug 2010 15:00:00 +0100

	xmount (0.4.3) stable; urgency=critical

	* Fixed a bug when moving cache files between different hw archtitectures

	-- Gillen Daniel <gillen.dan@pinguin.lu> Wed, 24 Mar 2010 11:30:00 +0100

	xmount (0.3.1) stable; urgency=low

	* Added --cache and --owcache command line options
	* Updated some parts of the documentation

	-- Gillen Daniel <gillen.dan@pinguin.lu> Fri, 10 Jul 2009 10:19:00 +0100

	xmount (0.3.0) stable; urgency=low

	* Added VMDK emulation support

	-- Gillen Daniel <gillen.dan@pinguin.lu> Fri, 22 May 2009 11:00:00 +0100

	xmount (0.2.3) stable; urgency=critical

	* Virtual write support is fixed now

	-- Gillen Daniel <gillen.dan@pinguin.lu> Fri, 10 Apr 2009 17:02:00 +0100

	xmount (0.2.2) stable; urgency=critical

	* Fixed yet another bug in virtual write support

	-- Gillen Daniel <gillen.dan@pinguin.lu> Thu, 31 Mar 2009 15:13:00 +0100

	xmount (0.2.1) stable; urgency=critical

	* Fixed a bug in virtual write support that corrupted cache files

	-- Gillen Daniel <gillen.dan@pinguin.lu> Fri, 27 Mar 2009 12:00:00 +0100

	xmount (0.2.0) stable; urgency=low

	* Changed name from mountewf to xmount
	* Massive code cleanup
	* Added support for multiple input image formats
	* Added support for virtual write access to emulated image files

	-- Gillen Daniel <gillen.dan@pinguin.lu> Mon, 16 Mar 2009 17:00:00 +0100

	mountewf (0.1.2) stable; urgency=low

	* Added random generator initialisation
	* Resolved compilation issue by fixing a typo
	* Fixed some debian specific scripts to be able to build a package

	-- Gillen Daniel <gillen.dan@pinguin.lu> Tue, 10 Feb 2009 16:12:00 +0100

	mountewf (0.1.1) stable; urgency=low

	* Fixed severe bugs in block map calculation.
	* VDI emulation should now work

	-- Gillen Daniel <gillen.dan@pinguin.lu> Thu, 03 Feb 2009 17:12:00 +0100

	mountewf (0.1.0) unstable; urgency=low

	* Initial Release.

	-- Gillen Daniel <gillen.dan@pinguin.lu> Sun, 01 Feb 2009 01:30:50 +0100
	diff --git a/trunk/libxmount/endianness.h b/trunk/libxmount/endianness.h
	index 2043bb4..c69c717 100644
	--- a/trunk/libxmount/endianness.h
	+++ b/trunk/libxmount/endianness.h
	@@ -1,170 +1,178 @@
	/*******************************************************************************
	* Copyright (c) 2008-2014 by Gillen Daniel <gillen.dan@pinguin.lu> *
	* *
	* This program is free software: you can redistribute it and/or modify it *
	* under the terms of the GNU General Public License as published by the Free *
	* Software Foundation, either version 3 of the License, or (at your option) *
	* any later version. *
	* *
	* This program is distributed in the hope that it will be useful, but WITHOUT *
	* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
	* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for *
	* more details. *
	* *
	* You should have received a copy of the GNU General Public License along with *
	* this program. If not, see <http://www.gnu.org/licenses/>. *
	*******************************************************************************/

	/*
	* This file aims at making endianness conversions using the following
	* functions portable.
	*
	* Conversion from big endian to host / from host to big endian
	* be16toh(uint16_t)
	* be32toh(uint32_t)
	* be64toh(uint64_t)
	* htobe16(uint16_t)
	* htobe32(uint32_t)
	* htobe64(uint64_t)
	*
	* Conversion from little endian to host / from host to little endian
	* le16toh(uint16_t)
	* le32toh(uint32_t)
	* le64toh(uint64_t)
	* htole16(uint16_t)
	* htole32(uint32_t)
	* htole64(uint64_t)
	*
	* In addition, including this file will define HOST_BYTEORDER_IS_BE or
	* HOST_BYTEORDER_IS_LE according to the current byte order of the host.
	*/

	#ifndef ENDIANNESS_H
	#define ENDIANNESS_H

	#include <config.h>

	#ifdef HAVE_STDINT_H
	#include <stdint.h>
	#else
	#error "Including this file requires you to have stdint.h"
	#endif

	+#ifdef HAVE_ENDIAN_H
	+ #include <endian.h>
	+#endif
	+
	// First we need to have the bswap functions
	#if defined(HAVE_BYTESWAP_H)
	#include <byteswap.h>
	-#elif defined(HAVE_ENDIAN_H)
	- #include <endian.h>
	#elif defined(__APPLE__) && defined(HAVE_LIBKERN_OSBYTEORDER_H)
	#include <libkern/OSByteOrder.h>
	#define bswap_16 OSSwapInt16
	#define bswap_32 OSSwapInt32
	#define bswap_64 OSSwapInt64
	#else
	#define bswap_16(value) { \
	((((value) & 0xff) << 8) \| ((value) >> 8)) \
	}
	#define bswap_32(value) { \
	(((uint32_t)bswap_16((uint16_t)((value) & 0xffff)) << 16) \| \
	(uint32_t)bswap_16((uint16_t)((value) >> 16))) \
	}
	#define bswap_64(value) { \
	(((uint64_t)bswap_32((uint32_t)((value) & 0xffffffff)) << 32) \| \
	(uint64_t)bswap_32((uint32_t)((value) >> 32))) \
	}
	#endif

	// Next we need to know what endianness is used
	#if defined(__LITTLE_ENDIAN__)
	#define HOST_BYTEORDER_IS_LE
	#elif defined(__BIG_ENDIAN__)
	#define HOST_BYTEORDER_IS_BE
	+#elif defined(__BYTE_ORDER)
	+ #if __BYTE_ORDER == __LITTLE_ENDIAN
	+ #define HOST_BYTEORDER_IS_LE
	+ #else
	+ #define HOST_BYTEORDER_IS_BE
	+ #endif
	#elif defined(__BYTE_ORDER__)
	#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
	#define HOST_BYTEORDER_IS_LE
	#else
	#define HOST_BYTEORDER_IS_BE
	#endif
	#else
	#error "Unable to determine host byteorder"
	#endif

	// And finally we can define the endianness conversion macros
	#ifdef HOST_BYTEORDER_IS_LE
	#ifndef be16toh
	#define be16toh(x) bswap_16(x)
	#endif
	#ifndef htobe16
	#define htobe16(x) bswap_16(x)
	#endif
	#ifndef be32toh
	#define be32toh(x) bswap_32(x)
	#endif
	#ifndef htobe32
	#define htobe32(x) bswap_32(x)
	#endif
	#ifndef be64toh
	#define be64toh(x) bswap_64(x)
	#endif
	#ifndef htobe64
	#define htobe64(x) bswap_64(x)
	#endif
	#ifndef le16toh
	#define le16toh(x) (x)
	#endif
	#ifndef htole16
	#define htole16(x) (x)
	#endif
	#ifndef le32toh
	#define le32toh(x) (x)
	#endif
	#ifndef htole32
	#define htole32(x) (x)
	#endif
	#ifndef le64toh
	#define le64toh(x) (x)
	#endif
	#ifndef htole64
	#define htole64(x) (x)
	#endif
	#else
	#ifndef be16toh
	#define be16toh(x) (x)
	#endif
	#ifndef htobe16
	#define htobe16(x) (x)
	#endif
	#ifndef be32toh
	#define be32toh(x) (x)
	#endif
	#ifndef htobe32
	#define htobe32(x) (x)
	#endif
	#ifndef be64toh
	#define be64toh(x) (x)
	#endif
	#ifndef htobe64
	#define htobe64(x) (x)
	#endif
	#ifndef le16toh
	#define le16toh(x) bswap_16(x)
	#endif
	#ifndef htole16
	#define htole16(x) bswap_16(x)
	#endif
	#ifndef le32toh
	#define le32toh(x) bswap_32(x)
	#endif
	#ifndef htole32
	#define htole32(x) bswap_32(x)
	#endif
	#ifndef le64toh
	#define le64toh(x) bswap_64(x)
	#endif
	#ifndef htole64
	#define htole64(x) bswap_64(x)
	#endif
	#endif

	#endif //ENDIANNESS_H

	diff --git a/trunk/libxmount_input/libxmount_input_aaff/CMakeLists.txt b/trunk/libxmount_input/libxmount_input_aaff/CMakeLists.txt
	index 5b82e5a..bc66c4d 100644
	--- a/trunk/libxmount_input/libxmount_input_aaff/CMakeLists.txt
	+++ b/trunk/libxmount_input/libxmount_input_aaff/CMakeLists.txt
	@@ -1,8 +1,14 @@
	-project(libxmount_input_aaff)
	+if(POLICY CMP0042)
	+ cmake_policy(SET CMP0042 NEW) # CMake 3.0
	+endif(POLICY CMP0042)
	+
	+project(libxmount_input_aaff C)

	add_library(xmount_input_aaff SHARED libxmount_input_aaff.c)
	+
	include_directories(${LIBZ_INCLUDE_DIRS})
	+
	target_link_libraries(xmount_input_aaff ${LIBZ_LIBRARIES})

	install(TARGETS xmount_input_aaff DESTINATION lib/xmount)

	diff --git a/trunk/libxmount_input/libxmount_input_aaff/libxmount_input_aaff.c b/trunk/libxmount_input/libxmount_input_aaff/libxmount_input_aaff.c
	index 272896b..c81c1ef 100644
	--- a/trunk/libxmount_input/libxmount_input_aaff/libxmount_input_aaff.c
	+++ b/trunk/libxmount_input/libxmount_input_aaff/libxmount_input_aaff.c
	@@ -1,1046 +1,1046 @@
	/*******************************************************************************
	* xmount Copyright (c) 2008-2014 by Gillen Daniel <gillen.dan@pinguin.lu> *
	* *
	* This module has been written by Guy Voncken. It contains the functions for *
	* accessing simple AFF images created by Guymager. *
	* *
	* This program is free software: you can redistribute it and/or modify it *
	* under the terms of the GNU General Public License as published by the Free *
	* Software Foundation, either version 3 of the License, or (at your option) *
	* any later version. *
	* *
	* This program is distributed in the hope that it will be useful, but WITHOUT *
	* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
	* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for *
	* more details. *
	* *
	* You should have received a copy of the GNU General Public License along with *
	* this program. If not, see <http://www.gnu.org/licenses/>. *
	*******************************************************************************/

	// Please don't touch source code formatting!

	#ifdef LINTING
	// #define _LARGEFILE_SOURCE
	// #define _FILE_OFFSET_BITS 64
	#define AAFF_STANDALONE
	#endif

	#ifdef AAFF_STANDALONE
	#define LOG_STDOUT TRUE
	#endif

	#include <netinet/in.h>
	#include <string.h>
	#include <stddef.h>
	#include <stdio.h>
	#include <stdlib.h>
	+#include <stdarg.h>
	#include <locale.h>
	#include <limits.h>
	#include <zlib.h>
	#include <time.h>
	#include <errno.h>

	-
	#include "../libxmount_input.h"

	#include "libxmount_input_aaff.h"

	static int AaffClose (void *pHandle);
	static const char* AaffGetErrorMessage (int ErrNum);

	#define AAFF_OPTION_MAXPAGEARRMEM "aaffmaxmem"
	#define AAFF_OPTION_LOG "aafflog"

	// ----------------------------
	// Logging and error handling
	// ----------------------------

	#define LOG_HEADER_LEN 80

	int LogvEntry (const char pLogFileName, uint8_t LogStdout, const char pFileName, const char pFunctionName, int LineNr, const char pFormat, va_list pArguments)
	{
	time_t NowT;
	struct tm *pNowTM;
	FILE *pFile;
	int wr;
	char *pFullLogFileName = NULL;
	const char *pBase;
	char LogLineHeader[1024];
	pid_t OwnPID;

	if (!LogStdout && (pLogFileName==NULL))
	return AAFF_OK;

	time (&NowT);
	pNowTM = localtime (&NowT);
	OwnPID = getpid(); // pthread_self()
	wr = (int) strftime (&LogLineHeader[0] , sizeof(LogLineHeader) , "%a %d.%b.%Y %H:%M:%S ", pNowTM); //lint !e713
	wr += snprintf (&LogLineHeader[wr], sizeof(LogLineHeader)-wr, "%5d ", OwnPID); //lint !e737

	if (pFileName && pFunctionName)
	{
	pBase = strrchr(pFileName, '/');
	if (pBase)
	pFileName = pBase+1;
	wr += snprintf (&LogLineHeader[wr], sizeof(LogLineHeader)-wr, "%s %s %d ", pFileName, pFunctionName, LineNr); //lint !e737
	}

	// while (wr < LOG_HEADER_LEN)
	// LogLineHeader[wr++] = ' ';

	if (pLogFileName)
	{
	wr = asprintf (&pFullLogFileName, "%s_%d", pLogFileName, OwnPID);
	if ((wr <= 0) \|\| (pFullLogFileName == NULL))
	{
	if (LogStdout)
	printf ("\nLog file error: Can't build filename");
	return AAFF_MEMALLOC_FAILED;
	}
	else
	{
	pFile = fopen64 (pFullLogFileName, "a");
	if (pFile == NULL)
	{
	if (LogStdout)
	printf ("\nLog file error: Can't be opened");
	return AAFF_CANNOT_OPEN_LOGFILE;
	}
	else
	{
	fprintf (pFile, "%-*s", LOG_HEADER_LEN, &LogLineHeader[0]);
	vfprintf (pFile, pFormat, pArguments);
	fprintf (pFile, "\n");
	fclose (pFile);
	}
	free (pFullLogFileName);
	}
	}
	if (LogStdout)
	{
	printf ("%s", &LogLineHeader[0]);
	vprintf (pFormat, pArguments);
	printf ("\n");
	}
	return AAFF_OK;
	}

	int LogEntry (const char pLogFileName, uint8_t LogStdout, const char pFileName, const char pFunctionName, int LineNr, const char pFormat, ...)
	{
	va_list VaList;
	int rc;

	if (!LogStdout && (pLogFileName==NULL))
	return AAFF_OK;

	va_start (VaList, pFormat); //lint !e530 Symbol 'VaList' not initialized
	rc = LogvEntry (pLogFileName, LogStdout, pFileName, pFunctionName, LineNr, pFormat, VaList);
	va_end(VaList);
	return rc;
	}

	// CHK requires existance of pAaff handle

	#ifdef AAFF_STANDALONE
	#define LOG_ERRORS_ON_STDOUT TRUE
	#else
	#define LOG_ERRORS_ON_STDOUT pAaff->LogStdout
	#endif

	#define CHK(ChkVal) \
	{ \
	int ChkValRc; \
	if ((ChkValRc=(ChkVal)) != AAFF_OK) \
	{ \
	const char *pErr = AaffGetErrorMessage (ChkValRc); \
	LogEntry (pAaff->pLogFilename, LOG_ERRORS_ON_STDOUT, __FILE__, __FUNCTION__, __LINE__, "Error %d (%s) occured", ChkValRc, pErr); \
	return ChkValRc; \
	} \
	}

	#define LOG(...) \
	LogEntry (pAaff->pLogFilename, pAaff->LogStdout, __FILE__, __FUNCTION__, __LINE__, __VA_ARGS__);


	// AaffCheckError is called before exiting AaffRead. It should not
	// be called elsewehere or else the statistics would become wrong.
	static void AaffCheckError (t_pAaff pAaff, int Ret, int *pErrno)
	{
	*pErrno = 0;
	if (Ret != AAFF_OK)
	{
	if ((Ret >= AAFF_ERROR_ENOMEM_START) && (Ret <= AAFF_ERROR_ENOMEM_END)) *pErrno = ENOMEM;
	else if ((Ret >= AAFF_ERROR_EINVAL_START) && (Ret <= AAFF_ERROR_EINVAL_END)) *pErrno = EINVAL;
	else *pErrno = EIO; // all other errors
	}
	}

	// ------------------------------------
	// Internal functions
	// ------------------------------------

	uint64_t AaffU64 (char *pData)
	{
	uint64_t Val=0;
	int i;

	for (i=4; i<8; i++) Val = (Val << 8) \| pData[i];
	for (i=0; i<4; i++) Val = (Val << 8) \| pData[i];

	return Val;
	}

	static int AaffPageNumberFromSegmentName (char pSegmentName, uint64_t pPageNumber)
	{
	char *pSegmentNamePageNumber;
	char *pTail;

	pSegmentNamePageNumber = &pSegmentName[strlen(AFF_SEGNAME_PAGE)];
	*pPageNumber = strtoull (pSegmentNamePageNumber, &pTail, 10);
	if (*pTail != '\0')
	return AAFF_INVALID_PAGE_NUMBER; // There should be no extra chars after the number

	return AAFF_OK;
	}

	static inline uint64_t AaffGetCurrentSeekPos (t_Aaff *pAaff)
	{
	return ftello (pAaff->pFile);
	}

	static inline uint64_t AaffSetCurrentSeekPos (t_Aaff *pAaff, uint64_t Val, int Whence)
	{
	if (fseeko (pAaff->pFile, Val, Whence) != 0)
	return AAFF_CANNOT_SEEK;
	return AAFF_OK;
	}


	static int AaffReadFile (t_Aaff pAaff, void pData, uint32_t DataLen)
	{
	if (fread (pData, DataLen, 1, pAaff->pFile) != 1)
	return AAFF_CANNOT_READ_DATA;

	return AAFF_OK;
	}

	static int AaffRealloc (void *ppBuff, uint32_t pCurrentLen, uint32_t NewLen)
	{
	if (NewLen > *pCurrentLen)
	{
	ppBuff = realloc (ppBuff, NewLen);
	if (*ppBuff == NULL)
	return AAFF_MEMALLOC_FAILED;
	*pCurrentLen = NewLen;
	}
	return AAFF_OK;
	}

	static int AaffReadSegment (t_pAaff pAaff, char *ppName, uint32_t pArg, char *ppData, uint32_t pDataLen)
	{
	t_AffSegmentHeader Header;
	t_AffSegmentFooter Footer;

	CHK (AaffReadFile (pAaff, &Header, offsetof(t_AffSegmentHeader, Name)))
	if (strcmp (&Header.Magic[0], AFF_SEGMENT_HEADER_MAGIC) != 0)
	return AAFF_INVALID_HEADER;
	Header.NameLen = ntohl (Header.NameLen );
	Header.DataLen = ntohl (Header.DataLen );
	Header.Argument = ntohl (Header.Argument);
	CHK (AaffRealloc ((void**)&pAaff->pNameBuff, &pAaff->NameBuffLen, Header.NameLen+1)) // alloc +1, as is might be a string which can be more
	CHK (AaffRealloc ((void**)&pAaff->pDataBuff, &pAaff->DataBuffLen, Header.DataLen+1)) // easily handled by the calling fn when adding a \0
	CHK (AaffReadFile (pAaff, pAaff->pNameBuff, Header.NameLen))
	if (Header.DataLen)
	CHK (AaffReadFile (pAaff, pAaff->pDataBuff, Header.DataLen))

	pAaff->pNameBuff[Header.NameLen] = '\0';
	pAaff->pDataBuff[Header.DataLen] = '\0';

	if (ppName) *ppName = pAaff->pNameBuff;
	if (pArg ) *pArg = Header.Argument;
	if (ppData) *ppData = pAaff->pDataBuff;
	if (pDataLen) *pDataLen = Header.DataLen;

	// Read footer and position file pointer to next segemnt at the same time
	// ----------------------------------------------------------------------
	CHK (AaffReadFile (pAaff, &Footer, sizeof(Footer)))
	if (strcmp (&Footer.Magic[0], AFF_SEGMENT_FOOTER_MAGIC) != 0)
	return AAFF_INVALID_FOOTER;

	return AAFF_OK;
	}

	static int AaffReadSegmentPage (t_pAaff pAaff, uint64_t SearchPage, uint64_t pFoundPage, char ppData, uint32_t pDataLen)
	{
	t_AffSegmentHeader Header;
	t_AffSegmentFooter Footer;
	char SearchPageStr[128];
	int rc = AAFF_OK;

	*ppData = NULL;
	*pDataLen = 0;
	sprintf (SearchPageStr, "page%" PRIu64, SearchPage);

	CHK (AaffReadFile (pAaff, &Header, offsetof(t_AffSegmentHeader, Name)))
	if (strcmp (&Header.Magic[0], AFF_SEGMENT_HEADER_MAGIC) != 0)
	return AAFF_INVALID_HEADER;
	Header.NameLen = ntohl (Header.NameLen );
	Header.DataLen = ntohl (Header.DataLen );
	Header.Argument = ntohl (Header.Argument);
	CHK (AaffRealloc ((void**)&pAaff->pNameBuff, &pAaff->NameBuffLen, Header.NameLen+1))
	CHK (AaffReadFile (pAaff, pAaff->pNameBuff, Header.NameLen))
	pAaff->pNameBuff[Header.NameLen] = '\0';

	if (strncmp (pAaff->pNameBuff, AFF_SEGNAME_PAGE, strlen(AFF_SEGNAME_PAGE)) != 0)
	return AAFF_WRONG_SEGMENT;

	CHK (AaffPageNumberFromSegmentName (pAaff->pNameBuff, pFoundPage))
	if (*pFoundPage == SearchPage)
	{
	unsigned int Len;
	uLongf ZLen;
	int zrc;

	switch (Header.Argument)
	{
	case AFF_PAGEFLAGS_UNCOMPRESSED:
	CHK (AaffReadFile (pAaff, pAaff->pPageBuff, Header.DataLen))
	pAaff->PageBuffDataLen = Header.DataLen;
	break;
	case AFF_PAGEFLAGS_COMPRESSED_ZERO:
	CHK (AaffReadFile (pAaff, &Len, sizeof(Len)))
	Len = ntohl (Len);
	memset (pAaff->pPageBuff, 0, Len);
	pAaff->PageBuffDataLen = Len;
	break;
	case AFF_PAGEFLAGS_COMPRESSED_ZLIB:
	CHK (AaffRealloc ((void**)&pAaff->pDataBuff, &pAaff->DataBuffLen, Header.DataLen));
	CHK (AaffReadFile (pAaff, pAaff->pDataBuff, Header.DataLen)) // read into pDataBuff
	ZLen = pAaff->PageSize; // size of pPageBuff
	zrc = uncompress ((unsigned char)(pAaff->pPageBuff), &ZLen, (unsigned char)(pAaff->pDataBuff), Header.DataLen); // uncompress into pPageBuff
	pAaff->PageBuffDataLen = ZLen;
	if (zrc != Z_OK)
	return AAFF_UNCOMPRESS_FAILED;
	break;
	default:
	return AAFF_INVALID_PAGE_ARGUMENT;
	}
	*ppData = pAaff->pPageBuff;
	*pDataLen = pAaff->PageBuffDataLen;
	pAaff->CurrentPage = *pFoundPage;
	rc = AAFF_FOUND;
	}
	else
	{
	CHK (AaffSetCurrentSeekPos (pAaff, Header.DataLen, SEEK_CUR))
	}

	// Read footer and position file pointer to next segemnt at the same time
	// ----------------------------------------------------------------------
	CHK (AaffReadFile (pAaff, &Footer, sizeof(Footer)))
	if (strcmp (&Footer.Magic[0], AFF_SEGMENT_FOOTER_MAGIC) != 0)
	return AAFF_INVALID_FOOTER;

	return rc;
	}

	static int AaffReadPage (t_pAaff pAaff, uint64_t Page, char *ppBuffer, uint32_t pLen)
	{
	if (Page >= pAaff->TotalPages)
	return AAFF_READ_BEYOND_LAST_PAGE;

	// Check if it's the current page
	// ------------------------------
	if (Page == pAaff->CurrentPage)
	{
	*ppBuffer = pAaff->pPageBuff;
	*pLen = pAaff->PageBuffDataLen;
	return AAFF_OK;
	}

	// Set the seek position for starting the search
	// ---------------------------------------------
	int MaxHops;

	if ((pAaff->CurrentPage != AAFF_CURRENTPAGE_NOTSET) &&
	(pAaff->CurrentPage+1 == Page)) // The current seek pos already is the correct one
	{
	MaxHops = 1;
	}
	else // Find the closest entry in PageSeekArr
	{
	int64_t Entry;

	Entry = Page / pAaff->Interleave;
	while (pAaff->pPageSeekArr[Entry] == 0)
	{
	Entry--;
	if (Entry<0)
	return AAFF_SEEKARR_CORRUPT;
	}
	AaffSetCurrentSeekPos (pAaff, pAaff->pPageSeekArr[Entry], SEEK_SET);
	MaxHops = Page - (Entry * pAaff->Interleave) +1;
	}

	// Run through segment list until page is found
	// --------------------------------------------
	uint64_t Seek;
	uint64_t FoundPage=0;
	int rc;

	LOG ("Searching for page %" PRIu64 ", MaxHops=%d", Page, MaxHops);
	while (MaxHops--)
	{
	Seek = AaffGetCurrentSeekPos (pAaff);
	rc = AaffReadSegmentPage (pAaff, Page, &FoundPage, ppBuffer, pLen);
	if (rc != AAFF_FOUND)
	CHK (rc)
	LOG (" %" PRIu64 " (%d)", FoundPage, rc);
	if ((FoundPage % pAaff->Interleave) == 0)
	pAaff->pPageSeekArr[FoundPage/pAaff->Interleave] = Seek;
	if (rc == AAFF_FOUND)
	break;
	}
	if (MaxHops < 0)
	return AAFF_PAGE_NOT_FOUND;

	return AAFF_OK;
	}

	// ---------------
	// API functions
	// ---------------

	static int AaffCreateHandle (void *ppHandle, const char pFormat, uint8_t Debug)
	{
	t_pAaff pAaff;

	*ppHandle = NULL;

	pAaff = (t_pAaff) malloc (sizeof(t_Aaff));
	if (pAaff == NULL)
	return AAFF_MEMALLOC_FAILED;

	memset (pAaff, 0, sizeof(t_Aaff));
	pAaff->MaxPageArrMem = AAFF_DEFAULT_MAX_PAGE_ARR_MEM;
	pAaff->LogStdout = Debug;

	ppHandle = (void) pAaff;

	return AAFF_OK;
	}

	static int AaffDestroyHandle (void **ppHandle)
	{
	t_pAaff pAaff = (t_pAaff) *ppHandle;

	if (pAaff->pFilename) free (pAaff->pFilename);
	if (pAaff->pPageSeekArr) free (pAaff->pPageSeekArr);
	if (pAaff->pLibVersion) free (pAaff->pLibVersion);
	if (pAaff->pFileType) free (pAaff->pFileType);
	if (pAaff->pNameBuff) free (pAaff->pNameBuff);
	if (pAaff->pDataBuff) free (pAaff->pDataBuff);
	if (pAaff->pPageBuff) free (pAaff->pPageBuff);
	if (pAaff->pInfoBuffConst) free (pAaff->pInfoBuffConst);
	if (pAaff->pInfoBuff) free (pAaff->pInfoBuff);

	memset (pAaff, 0, sizeof(t_Aaff));
	free (pAaff);
	*ppHandle = NULL;

	return AAFF_OK;
	}


	int AaffOpen (void pHandle, const char *ppFilenameArr, uint64_t FilenameArrLen)
	{
	t_pAaff pAaff = (t_pAaff) pHandle;
	char Signature[strlen(AFF_HEADER)+1];
	uint64_t Seek;

	LOG ("Called - Files=%" PRIu64, FilenameArrLen);

	if (FilenameArrLen != 1)
	CHK (AAFF_SPLIT_IMAGES_NOT_SUPPORTED)

	pAaff->pFilename = strdup (ppFilenameArr[0]);
	pAaff->pFile = fopen (ppFilenameArr[0],"r");
	if(pAaff->pFile==NULL)
	{
	(void) AaffDestroyHandle ((void**) &pAaff);
	CHK (AAFF_FILE_OPEN_FAILED)
	}

	// Check signature
	// ---------------
	CHK (AaffReadFile (pAaff, &Signature, sizeof(Signature)))
	if (memcmp (Signature, AFF_HEADER, sizeof(Signature)) !=0)
	{
	(void)AaffClose((void**)&pAaff);
	CHK (AAFF_INVALID_SIGNATURE)
	}

	// Read header segments
	// --------------------
	char *pName;
	uint32_t Arg;
	char *pData;
	uint32_t DataLen;
	const int MAX_HEADER_SEGMENTS = 100;
	int Seg;
	unsigned int i;
	int wr;
	int Pos = 0;
	const unsigned HexStrLen = 32;
	char HexStr[HexStrLen+1];

	#define REM (AaffInfoBuffLen-Pos)

	pAaff->pInfoBuffConst = (char *) malloc (AaffInfoBuffLen);
	pAaff->pInfoBuff = (char ) malloc (AaffInfoBuffLen2);

	// Search for known segments at the image start
	for (Seg=0; Seg<MAX_HEADER_SEGMENTS; Seg++)
	{
	Seek = AaffGetCurrentSeekPos (pAaff);
	CHK (AaffReadSegment (pAaff, &pName, &Arg, &pData, &DataLen))

	if (strcmp (pName, AFF_SEGNAME_PAGESIZE) == 0 ) pAaff->PageSize = Arg;
	else if (strcmp (pName, AFF_SEGNAME_SECTORSIZE) == 0 ) pAaff->SectorSize = Arg;
	else if (strcmp (pName, AFF_SEGNAME_SECTORS) == 0 ) pAaff->Sectors = AaffU64(pData);
	else if (strcmp (pName, AFF_SEGNAME_IMAGESIZE) == 0 ) pAaff->ImageSize = AaffU64(pData);
	else if (strcmp (pName, AFF_SEGNAME_AFFLIB_VERSION) == 0 ) pAaff->pLibVersion = strdup((char*)pData);
	else if (strcmp (pName, AFF_SEGNAME_FILETYPE) == 0 ) pAaff->pFileType = strdup((char*)pData);
	else if ((strcmp(pName, AFF_SEGNAME_GID) == 0 ) \|\|
	(strcmp(pName, AFF_SEGNAME_BADFLAG) == 0 ))
	{
	wr=0;
	for (i=0; i<GETMIN(DataLen,HexStrLen/2); i++)
	wr += sprintf (&HexStr[wr], "%02X", pData[i]);
	HexStr[i] = '\0';
	Pos += snprintf (&(pAaff->pInfoBuffConst[Pos]), REM,"%-25s %s", pName, HexStr);
	if (i<DataLen)
	Pos += snprintf (&(pAaff->pInfoBuffConst[Pos]), REM,"...");
	Pos += snprintf (&(pAaff->pInfoBuffConst[Pos]), REM,"\n");
	}
	else if (strncmp(pName,AFF_SEGNAME_PAGE,strlen(AFF_SEGNAME_PAGE))==0)
	{
	break;
	}
	else
	{
	if ((Arg == 0) && DataLen)
	Pos += snprintf (&(pAaff->pInfoBuffConst[Pos]), REM,"%-25s %s\n", pName, pData);
	}
	}
	#undef REM

	if (Seg >= MAX_HEADER_SEGMENTS)
	{
	(void) AaffClose ((void**)&pAaff);
	CHK (AAFF_TOO_MANY_HEADER_SEGEMENTS)
	}

	if (strstr (pAaff->pLibVersion, "Guymager") == NULL)
	{
	(void) AaffClose ((void**)&pAaff);
	CHK (AAFF_NOT_CREATED_BY_GUYMAGER)
	}

	// Prepare page seek array
	// -----------------------
	uint64_t MaxEntries;
	int ArrBytes;

	pAaff->TotalPages = pAaff->ImageSize / pAaff->PageSize;
	if (pAaff->ImageSize % pAaff->PageSize)
	pAaff->TotalPages++;

	MaxEntries = (pAaff->MaxPageArrMem10241024) / (sizeof (unsigned long long *) + 1); // +1 in order not to risk a result of 0
	MaxEntries = GETMIN (MaxEntries, pAaff->TotalPages);

	pAaff->Interleave = pAaff->TotalPages / MaxEntries;
	if (pAaff->TotalPages % MaxEntries)
	pAaff->Interleave++;

	pAaff->PageSeekArrLen = pAaff->TotalPages / pAaff->Interleave;
	ArrBytes = pAaff->PageSeekArrLen * sizeof(uint64_t *);
	pAaff->pPageSeekArr = (uint64_t*)malloc (ArrBytes);
	memset (pAaff->pPageSeekArr, 0, ArrBytes);
	CHK (AaffPageNumberFromSegmentName (pName, &pAaff->CurrentPage));
	if (pAaff->CurrentPage != 0)
	{
	(void) AaffClose ((void**)&pAaff);
	CHK (AAFF_UNEXPECTED_PAGE_NUMBER)
	}
	pAaff->pPageSeekArr[0] = Seek;

	// Alloc Buffers
	// -------------
	pAaff->pPageBuff = (char *) malloc (pAaff->PageSize);
	pAaff->CurrentPage = AAFF_CURRENTPAGE_NOTSET;

	LOG ("Ret");
	return AAFF_OK;
	}

	static int AaffClose (void *pHandle)
	{
	t_pAaff pAaff = (t_pAaff) pHandle;
	int rc = AAFF_OK;

	LOG ("Called");

	if (fclose (pAaff->pFile))
	rc = AAFF_CANNOT_CLOSE_FILE;

	LOG ("Ret");
	return rc;
	}

	static int AaffSize (void pHandle, uint64_t pSize)
	{
	t_pAaff pAaff = (t_pAaff) pHandle;

	LOG ("Called");
	*pSize = pAaff->ImageSize;

	LOG ("Ret - Size=%" PRIu64, *pSize);
	return AAFF_OK;
	}

	static int AaffRead (void pHandle, char pBuf, off_t Seek, size_t Count, size_t pRead, int pErrno)
	{
	t_pAaff pAaff = (t_pAaff) pHandle;
	- char *pPageBuffer;
	+ char *pPageBuffer=NULL;
	uint64_t Page;
	uint64_t Seek64;
	uint64_t Remaining;
	- uint32_t PageLen, Ofs, ToCopy;
	+ uint32_t PageLen=0, Ofs, ToCopy;
	int Ret = AAFF_OK;

	LOG ("Called - Seek=%'" PRIu64 ",Count=%'" PRIu64, Seek, Count);
	*pRead = 0;
	*pErrno = 0;

	if (Seek < 0)
	{
	Ret = AAFF_NEGATIVE_SEEK;
	goto Leave;
	}
	Seek64 = Seek;

	if (Seek64 >= pAaff->ImageSize) // If calling function asks
	goto Leave; // for data beyond end of
	if ((Seek64+Count) > pAaff->ImageSize) // image simply return what
	Count = pAaff->ImageSize - Seek64; // is possible.

	Page = Seek64 / pAaff->PageSize;
	Ofs = Seek64 % pAaff->PageSize;
	Remaining = Count;

	while (Count)
	{
	Ret = AaffReadPage (pAaff, Page, &pPageBuffer, &PageLen);
	if (Ret)
	goto Leave;
	if (PageLen == 0)
	{
	Ret = AAFF_PAGE_LENGTH_ZERO;
	goto Leave;
	}
	ToCopy = GETMIN (PageLen-Ofs, Remaining);
	memcpy (pBuf, pPageBuffer+Ofs, ToCopy);
	Remaining -= ToCopy;
	pBuf += ToCopy;
	*pRead += ToCopy;
	Ofs=0;
	Page++;
	}

	Leave:
	AaffCheckError (pAaff, Ret, pErrno);
	LOG ("Ret %d - Read=%" PRIu32, Ret, *pRead);
	return Ret;
	}

	static int AaffOptionsHelp (const char **ppHelp)
	{
	char *pHelp=NULL;
	int wr;

	wr = asprintf (&pHelp, " %-12s : Maximum amount of RAM cache, in MiB, for image seek offsets. Default: %"PRIu64" MiB\n"
	" %-12s : Log file name.\n"
	" Specify full path for %s. The given file name is extended by _<pid>.\n",
	AAFF_OPTION_MAXPAGEARRMEM, AAFF_DEFAULT_MAX_PAGE_ARR_MEM,
	AAFF_OPTION_LOG,
	AAFF_OPTION_LOG);
	if ((pHelp == NULL) \|\| (wr<=0))
	return AAFF_MEMALLOC_FAILED;

	*ppHelp = pHelp;
	return AAFF_OK;
	}

	static int AaffOptionsParse (void pHandle, uint32_t OptionCount, const pts_LibXmountOptions ppOptions, const char **ppError)
	{
	pts_LibXmountOptions pOption;
	t_pAaff pAaff = (t_pAaff) pHandle;
	const char *pError = NULL;
	int rc = AAFF_OK;
	int Ok;

	LOG ("Called - OptionCount=%" PRIu32, OptionCount);
	*ppError = NULL;

	#define TEST_OPTION_UINT64(Opt,DestField) \
	if (strcmp (pOption->p_key, Opt) == 0) \
	{ \
	pAaff->DestField = StrToUint64 (pOption->p_value, &Ok); \
	if (!Ok) \
	{ \
	pError = "Error in option %s: Invalid value"; \
	break; \
	} \
	LOG ("Option %s set to %" PRIu64, Opt, pAaff->DestField) \
	}

	for (uint32_t i=0; i<OptionCount; i++)
	{
	pOption = ppOptions[i];
	if (strcmp (pOption->p_key, AAFF_OPTION_LOG) == 0)
	{
	pAaff->pLogFilename = strdup (pOption->p_value);
	rc = LOG ("Logging for libxmount_input_aaff started")
	if (rc != AAFF_OK)
	{
	pError = "Write test to log file failed";
	break;
	}
	pOption->valid = TRUE;
	LOG ("Option %s set to %s", AAFF_OPTION_LOG, pAaff->pLogFilename);
	}
	else TEST_OPTION_UINT64 (AAFF_OPTION_MAXPAGEARRMEM, MaxPageArrMem)
	}
	#undef TEST_OPTION_UINT64

	if (pError)
	*ppError = strdup (pError);
	LOG ("Ret - rc=%d,Error=%s", rc, *ppError);
	return rc;
	}

	static int AaffGetInfofileContent (void pHandle, const char *ppInfoBuf)
	{
	t_pAaff pAaff = (t_pAaff) pHandle;
	uint64_t i;
	uint64_t Entries = 0;
	int Pos = 0;

	LOG ("Called");

	#define REM (AaffInfoBuffLen-Pos)

	Pos += snprintf (&pAaff->pInfoBuff[Pos], REM, "AFF IMAGE INFORMATION");
	Pos += snprintf (&pAaff->pInfoBuff[Pos], REM, "\n---------------------");
	Pos += snprintf (&pAaff->pInfoBuff[Pos], REM, "\nAFF file %s" , pAaff->pFilename );

	Pos += snprintf (&pAaff->pInfoBuff[Pos], REM, "\nPage size %u" , pAaff->PageSize );
	Pos += snprintf (&pAaff->pInfoBuff[Pos], REM, "\nSector size %d" , pAaff->SectorSize );
	Pos += snprintf (&pAaff->pInfoBuff[Pos], REM, "\nSectors %" PRIu64, pAaff->Sectors);
	Pos += snprintf (&pAaff->pInfoBuff[Pos], REM, "\nImage size %" PRIu64 " (%0.1f GiB)", pAaff->ImageSize, pAaff->ImageSize/(1024.01024.01024.0));
	Pos += snprintf (&pAaff->pInfoBuff[Pos], REM, "\nTotal pages %" PRIu64, pAaff->TotalPages);
	Pos += snprintf (&pAaff->pInfoBuff[Pos], REM, "\n");
	Pos += snprintf (&pAaff->pInfoBuff[Pos], REM, "\n%s", pAaff->pInfoBuffConst);
	Pos += snprintf (&pAaff->pInfoBuff[Pos], REM, "\n");
	Pos += snprintf (&pAaff->pInfoBuff[Pos], REM, "\nCurrent page ");
	if (pAaff->CurrentPage == AAFF_CURRENTPAGE_NOTSET)
	Pos += snprintf (&pAaff->pInfoBuff[Pos], REM, "not set");
	else Pos += snprintf (&pAaff->pInfoBuff[Pos], REM, "%" PRIu64, pAaff->CurrentPage);
	Pos += snprintf (&pAaff->pInfoBuff[Pos], REM, "\nSeek array length %" PRIu64, pAaff->PageSeekArrLen);
	Pos += snprintf (&pAaff->pInfoBuff[Pos], REM, "\nSeek interleave %" PRIu64, pAaff->Interleave);

	for (i=0; i<pAaff->PageSeekArrLen; i++)
	{
	if (pAaff->pPageSeekArr[i])
	Entries++;
	}
	Pos += snprintf (&pAaff->pInfoBuff[Pos], REM, "\nSeek array entries %" PRIu64, Entries);
	Pos += snprintf (&pAaff->pInfoBuff[Pos], REM, "\n");
	#undef REM

	*ppInfoBuf = strdup (pAaff->pInfoBuff);
	if (*ppInfoBuf == NULL)
	CHK (AAFF_MEMALLOC_FAILED)

	LOG ("Ret - %d bytes of info", strlen(*ppInfoBuf)+1);
	return AAFF_OK;
	}

	static const char* AaffGetErrorMessage (int ErrNum)
	{
	const char *pMsg;
	#define ADD_ERR(ErrCode) \
	case ErrCode: pMsg = #ErrCode; \
	break;

	switch (ErrNum)
	{
	ADD_ERR (AAFF_OK)
	ADD_ERR (AAFF_FOUND)
	ADD_ERR (AAFF_MEMALLOC_FAILED)
	ADD_ERR (AAFF_OPTIONS_ERROR)
	ADD_ERR (AAFF_SPLIT_IMAGES_NOT_SUPPORTED)
	ADD_ERR (AAFF_INVALID_SIGNATURE)
	ADD_ERR (AAFF_NOT_CREATED_BY_GUYMAGER)
	ADD_ERR (AAFF_CANNOT_OPEN_LOGFILE)
	ADD_ERR (AAFF_FILE_OPEN_FAILED)
	ADD_ERR (AAFF_CANNOT_READ_DATA)
	ADD_ERR (AAFF_INVALID_HEADER)
	ADD_ERR (AAFF_INVALID_FOOTER)
	ADD_ERR (AAFF_TOO_MANY_HEADER_SEGEMENTS)
	ADD_ERR (AAFF_INVALID_PAGE_NUMBER)
	ADD_ERR (AAFF_UNEXPECTED_PAGE_NUMBER)
	ADD_ERR (AAFF_CANNOT_CLOSE_FILE)
	ADD_ERR (AAFF_CANNOT_SEEK)
	ADD_ERR (AAFF_WRONG_SEGMENT)
	ADD_ERR (AAFF_UNCOMPRESS_FAILED)
	ADD_ERR (AAFF_INVALID_PAGE_ARGUMENT)
	ADD_ERR (AAFF_SEEKARR_CORRUPT)
	ADD_ERR (AAFF_PAGE_NOT_FOUND)
	ADD_ERR (AAFF_READ_BEYOND_IMAGE_LENGTH)
	ADD_ERR (AAFF_READ_BEYOND_LAST_PAGE)
	ADD_ERR (AAFF_PAGE_LENGTH_ZERO)
	ADD_ERR (AAFF_NEGATIVE_SEEK)
	default:
	pMsg = "Unknown error";
	}
	#undef ARR_ERR
	return pMsg;
	}

	static int AaffFreeBuffer (void *pBuf)
	{
	free (pBuf);
	return AAFF_OK;
	}


	// ------------------------------------
	// LibXmount_Input API implementation
	// ------------------------------------

	uint8_t LibXmount_Input_GetApiVersion ()
	{
	return LIBXMOUNT_INPUT_API_VERSION;
	}

	const char* LibXmount_Input_GetSupportedFormats ()
	{
	return "aaff\0\0";
	}

	void LibXmount_Input_GetFunctions(ts_LibXmountInputFunctions *pFunctions)
	{
	pFunctions->CreateHandle = &AaffCreateHandle;
	pFunctions->DestroyHandle = &AaffDestroyHandle;
	pFunctions->Open = &AaffOpen;
	pFunctions->Close = &AaffClose;
	pFunctions->Size = &AaffSize;
	pFunctions->Read = &AaffRead;
	pFunctions->OptionsHelp = &AaffOptionsHelp;
	pFunctions->OptionsParse = &AaffOptionsParse;
	pFunctions->GetInfofileContent = &AaffGetInfofileContent;
	pFunctions->GetErrorMessage = &AaffGetErrorMessage;
	pFunctions->FreeBuffer = &AaffFreeBuffer;
	}

	// -----------------------------------------------------
	// Small main routine for testing
	// It converts an aff file to dd
	// -----------------------------------------------------

	#ifdef AAFF_STANDALONE

	#define PRINT_ERROR_AND_EXIT(...) \
	{ \
	printf (__VA_ARGS__); \
	exit (1); \
	}

	int ParseOptions (t_pAaff pAaff, char *pOptions)
	{
	pts_LibXmountOptions pOptionArr;
	pts_LibXmountOptions *ppOptionArr;
	int OptionCount;
	char *pSep;
	char *pEqual;
	char *pTmp;
	const char *pError;
	char *pOpt;
	int rc;

	if (pOptions == NULL)
	return AAFF_OK;

	if (*pOptions == '\0')
	return AAFF_OK;

	if (*pOptions == ',')
	return AAFF_OPTIONS_ERROR;

	if (pOptions[strlen(pOptions)-1] == ',')
	return AAFF_OPTIONS_ERROR;

	pOpt = strdup (pOptions);

	// Count number of comma separated options
	OptionCount = 1;
	pTmp = pOpt;
	while ((pTmp = strchr (pTmp, ',')) != NULL)
	{
	OptionCount++;
	pTmp++;
	}

	// Create and fill option array
	pOptionArr = (pts_LibXmountOptions) malloc (OptionCount * sizeof(ts_LibXmountOptions));
	if (pOptionArr == NULL)
	PRINT_ERROR_AND_EXIT ("Cannot allocate pOptionArr");
	memset (pOptionArr, 0, OptionCount * sizeof(ts_LibXmountOptions));
	pTmp = pOpt;
	for (int i=0; i<OptionCount; i++)
	{
	pOptionArr[i].p_key = pTmp;
	pSep = strchr (pTmp, ',');
	if (pSep)
	*pSep ='\0';
	pEqual = strchr (pTmp, '=');
	if (pEqual)
	{
	*pEqual = '\0';
	pOptionArr[i].p_value = pEqual+1;
	}
	if (pSep != NULL)
	pTmp = pSep+1;
	}

	// Create pointer array and call parse function
	ppOptionArr = (pts_LibXmountOptions )malloc (OptionCountsizeof (pts_LibXmountOptions));
	if (ppOptionArr == NULL)
	PRINT_ERROR_AND_EXIT ("Cannot allocate ppOptionArr");
	for (int i=0; i<OptionCount; i++)
	ppOptionArr[i] = &pOptionArr[i];

	rc = AaffOptionsParse ((void*) pAaff, OptionCount, ppOptionArr, &pError);
	free (ppOptionArr);
	free ( pOptionArr);
	free ( pOpt);
	if (pError)
	PRINT_ERROR_AND_EXIT ("Error while setting options: %s", pError);
	CHK (rc)

	return AAFF_OK;
	}

	int main(int argc, const char *argv[])
	{
	t_pAaff pAaff;
	const char *pInfoBuff;
	const char *pHelp;
	uint64_t Remaining;
	uint64_t CurrentPos=0;
	int rc;
	int Errno;
	int Percent;
	int PercentOld;
	char *pOptions = NULL;

	setbuf (stdout, NULL);
	setbuf (stderr, NULL);
	setlocale (LC_ALL, "");

	printf ("AFF to DD converter\n");
	if (argc != 3)
	{
	(void) AaffOptionsHelp (&pHelp);
	printf ("Usage: %s <EWF segment file 1> <EWF segment file 2> <...> [-comma_separated_options]\n", argv[0]);
	printf ("Possible options:\n%s\n", pHelp);
	printf ("The output file will be named dd.\n");
	CHK (AaffFreeBuffer ((void*) pHelp))
	exit (1);
	}
	if (argv[argc-1][0] == '-')
	{
	pOptions = strdup (&(argv[argc-1][1]));
	argc--;
	}

	rc = AaffCreateHandle ((void**) &pAaff, "aaff", LOG_STDOUT);
	if (rc != AAFF_OK)
	PRINT_ERROR_AND_EXIT ("Cannot create handle, rc=%d\n", rc)
	if (pOptions)
	CHK (ParseOptions(pAaff, pOptions))

	rc = AaffOpen (pAaff, &argv[1], 1);
	if (rc)
	{
	printf ("Error %d while opening file %s\n", rc, argv[1]);
	exit (2);
	}

	CHK (AaffGetInfofileContent ((void*) pAaff, &pInfoBuff))
	if (pInfoBuff)
	printf ("Contents of info buffer:\n%s\n", pInfoBuff);
	CHK (AaffFreeBuffer ((void*)pInfoBuff))

	// Create destination file and fill it with data from aff
	// ------------------------------------------------------
	FILE *pFile;
	pFile = fopen (argv[2], "w");
	// const unsigned BuffSize = 13; // weird Buffsize for testing
	const unsigned BuffSize = 65536;
	char *pBuff;
	uint64_t ToRead;
	uint64_t Read;

	Remaining = pAaff->ImageSize;

	pBuff = (char *) malloc (BuffSize);
	CurrentPos=0;

	Errno = 0;
	PercentOld = -1;

	while (Remaining)
	{
	ToRead = GETMIN (Remaining, BuffSize);
	rc = AaffRead ((void*) pAaff, pBuff, CurrentPos, ToRead, &Read, &Errno);
	if ((rc != AAFF_OK) \|\| (Errno != 0))
	PRINT_ERROR_AND_EXIT("Error %d while calling AewfRead (Errno %d)\n", rc, Errno);
	if (Read != ToRead)
	PRINT_ERROR_AND_EXIT("Only %" PRIu64 " out of %" PRIu64 " bytes read\n", Read, ToRead);

	if (fwrite (pBuff, Read, 1, pFile) != 1)
	{
	printf ("Could not write to destinationfile\n");
	exit (2);
	}
	CurrentPos += Read;
	Remaining -= Read;
	Percent = (100*CurrentPos) / pAaff->ImageSize;
	if (Percent != PercentOld)
	{
	printf ("\r%d%% done...", Percent);
	PercentOld = Percent;
	}
	}
	free (pBuff);
	fclose (pFile);

	return 0;
	}

	#endif

	diff --git a/trunk/libxmount_input/libxmount_input_aewf/CMakeLists.txt b/trunk/libxmount_input/libxmount_input_aewf/CMakeLists.txt
	index 2b15230..77bcfea 100644
	--- a/trunk/libxmount_input/libxmount_input_aewf/CMakeLists.txt
	+++ b/trunk/libxmount_input/libxmount_input_aewf/CMakeLists.txt
	@@ -1,12 +1,14 @@
	if(POLICY CMP0042)
	cmake_policy(SET CMP0042 NEW) # CMake 3.0
	endif(POLICY CMP0042)

	project(libxmount_input_aewf C)

	add_library(xmount_input_aewf SHARED libxmount_input_aewf.c ../../libxmount/libxmount.c)
	+
	include_directories(${LIBZ_INCLUDE_DIRS})
	+
	target_link_libraries(xmount_input_aewf ${LIBZ_LIBRARIES})

	install(TARGETS xmount_input_aewf DESTINATION lib/xmount)

	diff --git a/trunk/libxmount_input/libxmount_input_aff/CMakeLists.txt b/trunk/libxmount_input/libxmount_input_aff/CMakeLists.txt
	index 1825382..c42978d 100644
	--- a/trunk/libxmount_input/libxmount_input_aff/CMakeLists.txt
	+++ b/trunk/libxmount_input/libxmount_input_aff/CMakeLists.txt
	@@ -1,36 +1,40 @@
	if(POLICY CMP0042)
	cmake_policy(SET CMP0042 NEW) # CMake 3.0
	endif(POLICY CMP0042)

	project(libxmount_input_aff C)

	add_library(xmount_input_aff SHARED libxmount_input_aff.c)

	if(NOT STATIC_AFF)
	include_directories(${LIBAFF_INCLUDE_DIRS})
	include_directories(${OPENSSL_INCLUDE_DIRS})
	set(LIBS ${LIBS} ${LIBAFF_LIBRARIES})
	set(LIBS ${LIBS} ${OPENSSL_LIBRARIES})
	else(NOT STATIC_AFF)
	add_definitions(-DHAVE_LIBAFF_STATIC)
	include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libaff/lib)
	set(LIBS ${LIBS} ${CMAKE_CURRENT_SOURCE_DIR}/libaff/lib/.libs/libafflib.a)
	if(NOT APPLE)
	- set(LIBS ${LIBS} "-lstdc++ -lcrypto -lssl -lrt -lz")
	+ set(LIBS ${LIBS} "/usr/lib/libcrypto.a")
	+ set(LIBS ${LIBS} "/usr/lib/libssl.a")
	+ set(LIBS ${LIBS} "/usr/lib/libexpat.a")
	+ set(LIBS ${LIBS} "/usr/lib/librt.a")
	+ set(LIBS ${LIBS} "-lstdc++ -lz")
	else(NOT APPLE)
	# As most of afflib's deps on OSx come from MacPorts, better link in
	# everything statically
	set(LIBS ${LIBS} "/opt/local/lib/libcrypto.a")
	set(LIBS ${LIBS} "/opt/local/lib/libssl.a")
	set(LIBS ${LIBS} "/opt/local/lib/libexpat.a")
	set(LIBS ${LIBS} "/opt/local/lib/libncurses.a")
	set(LIBS ${LIBS} "/opt/local/lib/libreadline.a")
	set(LIBS ${LIBS} "/opt/local/lib/libz.a")
	set(LIBS ${LIBS} "-lstdc++")
	endif(NOT APPLE)
	endif(NOT STATIC_AFF)

	target_link_libraries(xmount_input_aff ${LIBS})

	install(TARGETS xmount_input_aff DESTINATION lib/xmount)

	diff --git a/trunk/libxmount_input/libxmount_input_ewf/CMakeLists.txt b/trunk/libxmount_input/libxmount_input_ewf/CMakeLists.txt
	index 84fc848..9e12de0 100644
	--- a/trunk/libxmount_input/libxmount_input_ewf/CMakeLists.txt
	+++ b/trunk/libxmount_input/libxmount_input_ewf/CMakeLists.txt
	@@ -1,28 +1,28 @@
	if(POLICY CMP0042)
	cmake_policy(SET CMP0042 NEW) # CMake 3.0
	endif(POLICY CMP0042)

	project(libxmount_input_ewf C)

	add_library(xmount_input_ewf SHARED libxmount_input_ewf.c)

	if(NOT STATIC_EWF)
	include_directories(${LIBEWF_INCLUDE_DIRS})
	set(LIBS ${LIBS} ${LIBEWF_LIBRARIES})
	else(NOT STATIC_EWF)
	add_definitions(-DHAVE_LIBEWF_STATIC)
	include_directories(${CMAKE_CURRENT_SOURCE_DIR}/libewf/include)
	set(LIBS ${LIBS} ${CMAKE_CURRENT_SOURCE_DIR}/libewf/libewf/.libs/libewf.a)
	if(NOT APPLE)
	- set(LIBS ${LIBS} -lz)
	+ set(LIBS ${LIBS} "-lz")
	else(NOT APPLE)
	# As most of libewf's deps on OSx come from MacPorts, better link in
	# everything statically
	set(LIBS ${LIBS} "/opt/local/lib/libz.a")
	endif(NOT APPLE)
	endif(NOT STATIC_EWF)

	target_link_libraries(xmount_input_ewf ${LIBS})

	install(TARGETS xmount_input_ewf DESTINATION lib/xmount)

	diff --git a/trunk/libxmount_morphing/libxmount_morphing_unallocated/fat_functions.c b/trunk/libxmount_morphing/libxmount_morphing_unallocated/fat_functions.c
	index 2259b87..698e1e4 100644
	--- a/trunk/libxmount_morphing/libxmount_morphing_unallocated/fat_functions.c
	+++ b/trunk/libxmount_morphing/libxmount_morphing_unallocated/fat_functions.c
	@@ -1,406 +1,406 @@
	/*******************************************************************************
	* xmount Copyright (c) 2008-2014 by Gillen Daniel <gillen.dan@pinguin.lu> *
	* *
	* This program is free software: you can redistribute it and/or modify it *
	* under the terms of the GNU General Public License as published by the Free *
	* Software Foundation, either version 3 of the License, or (at your option) *
	* any later version. *
	* *
	* This program is distributed in the hope that it will be useful, but WITHOUT *
	* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
	* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for *
	* more details. *
	* *
	* You should have received a copy of the GNU General Public License along with *
	* this program. If not, see <http://www.gnu.org/licenses/>. *
	*******************************************************************************/

	#include "fat_functions.h"
	#include "libxmount_morphing_unallocated_retvalues.h"

	#include <string.h> // For memset

	#define LOG_DEBUG(...) { \
	LIBXMOUNT_LOG_DEBUG(p_fat_handle->debug,__VA_ARGS__); \
	}

	/*
	* ReadFatHeader
	*/
	int ReadFatHeader(pts_FatHandle p_fat_handle,
	pts_LibXmountMorphingInputFunctions p_input_functions,
	uint8_t debug)
	{
	pts_FatVH p_fat_vh;
	int ret;
	size_t bytes_read;
	uint32_t root_dir_sectors;
	uint32_t fat_size;
	uint32_t total_sectors;
	uint32_t data_sectors;
	uint32_t cluster_count;

	// Init FAT handle
	memset(p_fat_handle,0,sizeof(ts_FatHandle));
	p_fat_handle->fat_type=FatType_Unknown;
	p_fat_handle->debug=debug;

	LOG_DEBUG("Trying to read FAT volume header\n");

	// Alloc buffer for header
	p_fat_vh=calloc(1,sizeof(ts_FatVH));
	if(p_fat_vh==NULL) return UNALLOCATED_MEMALLOC_FAILED;

	// Read VH from input image
	ret=p_input_functions->Read(0,
	(char*)(p_fat_vh),
	0,
	sizeof(ts_FatVH),
	&bytes_read);
	if(ret!=0 \|\| bytes_read!=sizeof(ts_FatVH)) {
	free(p_fat_vh);
	return UNALLOCATED_FAT_CANNOT_READ_HEADER;
	}

	// Convert values to host endianness (FAT values are always stored in little
	// endian)
	p_fat_vh->bytes_per_sector=le16toh(p_fat_vh->bytes_per_sector);
	p_fat_vh->reserved_sectors=le16toh(p_fat_vh->reserved_sectors);
	p_fat_vh->root_entry_count=le16toh(p_fat_vh->root_entry_count);
	p_fat_vh->total_sectors_16=le16toh(p_fat_vh->total_sectors_16);
	p_fat_vh->fat16_sectors=le16toh(p_fat_vh->fat16_sectors);
	p_fat_vh->total_sectors_32=le32toh(p_fat_vh->total_sectors_32);
	p_fat_vh->fat32_sectors=le32toh(p_fat_vh->fat32_sectors);

	LOG_DEBUG("FAT VH jump instruction 1: 0x%02X\n",p_fat_vh->jump_inst[0]);
	LOG_DEBUG("FAT bytes per sector: %" PRIu16 "\n",
	p_fat_vh->bytes_per_sector);
	LOG_DEBUG("FAT sectors per cluster: %" PRIu8 "\n",
	p_fat_vh->sectors_per_cluster);
	LOG_DEBUG("FAT reserved sectors: %" PRIu16 "\n",
	p_fat_vh->reserved_sectors);
	LOG_DEBUG("FAT count: %" PRIu8 "\n",p_fat_vh->fat_count);
	LOG_DEBUG("FAT root entry count: %" PRIu16 "\n",
	p_fat_vh->root_entry_count);
	LOG_DEBUG("FAT media type: %02X\n",p_fat_vh->media_type);
	LOG_DEBUG("FAT total sector count (16bit): %" PRIu16 "\n",
	p_fat_vh->total_sectors_16);
	LOG_DEBUG("FAT sectors per FAT (16bit): %" PRIu16 "\n",
	p_fat_vh->fat16_sectors);
	LOG_DEBUG("FAT total sector count (32bit): %" PRIu32 "\n",
	p_fat_vh->total_sectors_32);
	LOG_DEBUG("FAT sectors per FAT (32bit): %" PRIu32 "\n",
	p_fat_vh->fat32_sectors);

	// Check header values
	if((p_fat_vh->jump_inst[0]!=0xEB && p_fat_vh->jump_inst[0]!=0xE9) \|\|
	p_fat_vh->bytes_per_sector==0 \|\|
	p_fat_vh->bytes_per_sector%512!=0 \|\|
	p_fat_vh->sectors_per_cluster==0 \|\|
	p_fat_vh->sectors_per_cluster%2!=0 \|\|
	p_fat_vh->reserved_sectors==0 \|\|
	p_fat_vh->fat_count==0 \|\|
	(p_fat_vh->total_sectors_16==0 && p_fat_vh->total_sectors_32==0) \|\|
	(p_fat_vh->total_sectors_16!=0 && p_fat_vh->total_sectors_32!=0))
	{
	free(p_fat_vh);
	return UNALLOCATED_FAT_INVALID_HEADER;
	}

	LOG_DEBUG("Determining FAT type\n");

	// Determine the count of sectors occupied by the root directory
	root_dir_sectors=((p_fat_vh->root_entry_count*32)+
	(p_fat_vh->bytes_per_sector-1))/p_fat_vh->bytes_per_sector;

	// Determine the count of sectors in the data region
	if(p_fat_vh->fat16_sectors!=0) fat_size=p_fat_vh->fat16_sectors;
	else fat_size=p_fat_vh->fat32_sectors;
	if(p_fat_vh->total_sectors_16!=0) total_sectors=p_fat_vh->total_sectors_16;
	else total_sectors=p_fat_vh->total_sectors_32;
	data_sectors=total_sectors-(p_fat_vh->reserved_sectors+
	(p_fat_vh->fat_count*fat_size)+root_dir_sectors);

	// Determine the count of clusters
	cluster_count=data_sectors/p_fat_vh->sectors_per_cluster;

	// Determine FAT type
	if(cluster_count<4085) {
	LOG_DEBUG("FAT is of unsupported type FAT12\n");
	free(p_fat_vh);
	return UNALLOCATED_FAT_UNSUPPORTED_FS_TYPE;
	} else if(cluster_count<65525) {
	LOG_DEBUG("FAT is of type FAT16\n");
	p_fat_handle->fat_type=FatType_Fat16;
	} else {
	LOG_DEBUG("FAT is of type FAT32\n");
	p_fat_handle->fat_type=FatType_Fat32;
	}
	// TODO: What about newer version of FAT like exFAT etc... ??

	p_fat_handle->p_fat_vh=p_fat_vh;
	return UNALLOCATED_OK;
	}

	/*
	* FreeFatHeader
	*/
	void FreeFatHeader(pts_FatHandle p_fat_handle) {
	if(p_fat_handle==NULL) return;
	if(p_fat_handle->p_fat_vh!=NULL) free(p_fat_handle->p_fat_vh);
	switch(p_fat_handle->fat_type) {
	case FatType_Fat16: {
	- if(p_fat_handle->p_fat16!=NULL) free(p_fat_handle->p_fat16);
	+ if(p_fat_handle->u_fat.p_fat16!=NULL) free(p_fat_handle->u_fat.p_fat16);
	break;
	}
	case FatType_Fat32: {
	- if(p_fat_handle->p_fat32!=NULL) free(p_fat_handle->p_fat32);
	+ if(p_fat_handle->u_fat.p_fat32!=NULL) free(p_fat_handle->u_fat.p_fat32);
	break;
	}
	case FatType_Unknown:
	default:
	break;
	}
	}

	/*
	* ReadFat
	*/
	int ReadFat(pts_FatHandle p_fat_handle,
	pts_LibXmountMorphingInputFunctions p_input_functions)
	{
	pts_FatVH p_fat_vh=p_fat_handle->p_fat_vh;
	int ret;
	size_t fat_size;
	off_t fat_offset;
	size_t bytes_read;

	LOG_DEBUG("Trying to read FAT\n");

	// Determine FAT size
	if(p_fat_vh->fat16_sectors!=0) fat_size=p_fat_vh->fat16_sectors;
	else fat_size=p_fat_vh->fat32_sectors;
	fat_size*=p_fat_vh->bytes_per_sector;

	// Calculate FAT offset
	fat_offset=p_fat_vh->reserved_sectors*p_fat_vh->bytes_per_sector;

	LOG_DEBUG("FAT consists of %zu bytes starting at offset %zu\n",
	fat_size,
	fat_offset);

	// Alloc buffer and Read FAT
	if(p_fat_handle->fat_type==FatType_Fat32) {
	// Alloc buffer
	- p_fat_handle->p_fat32=(uint32_t*)calloc(1,fat_size);
	- if(p_fat_handle->p_fat32==NULL) return UNALLOCATED_MEMALLOC_FAILED;
	+ p_fat_handle->u_fat.p_fat32=(uint32_t*)calloc(1,fat_size);
	+ if(p_fat_handle->u_fat.p_fat32==NULL) return UNALLOCATED_MEMALLOC_FAILED;

	// Read FAT
	ret=p_input_functions->Read(0,
	- (char*)(p_fat_handle->p_fat32),
	+ (char*)(p_fat_handle->u_fat.p_fat32),
	fat_offset,
	fat_size,
	&bytes_read);
	if(ret!=0 \|\| bytes_read!=fat_size) {
	- free(p_fat_handle->p_fat32);
	- p_fat_handle->p_fat32=NULL;
	+ free(p_fat_handle->u_fat.p_fat32);
	+ p_fat_handle->u_fat.p_fat32=NULL;
	return UNALLOCATED_FAT_CANNOT_READ_FAT;
	}

	// Convert FAT to host endianness
	for(uint64_t i=0;i<fat_size/sizeof(uint32_t);i++) {
	- p_fat_handle->p_fat32[i]=le32toh(p_fat_handle->p_fat32[i]);
	+ p_fat_handle->u_fat.p_fat32[i]=le32toh(p_fat_handle->u_fat.p_fat32[i]);
	}
	} else {
	// Alloc buffer
	- p_fat_handle->p_fat16=(uint16_t*)calloc(1,fat_size);
	- if(p_fat_handle->p_fat16==NULL) return UNALLOCATED_MEMALLOC_FAILED;
	+ p_fat_handle->u_fat.p_fat16=(uint16_t*)calloc(1,fat_size);
	+ if(p_fat_handle->u_fat.p_fat16==NULL) return UNALLOCATED_MEMALLOC_FAILED;

	// Read FAT
	ret=p_input_functions->Read(0,
	- (char*)(p_fat_handle->p_fat16),
	+ (char*)(p_fat_handle->u_fat.p_fat16),
	fat_offset,
	fat_size,
	&bytes_read);
	if(ret!=0 \|\| bytes_read!=fat_size) {
	- free(p_fat_handle->p_fat16);
	- p_fat_handle->p_fat16=NULL;
	+ free(p_fat_handle->u_fat.p_fat16);
	+ p_fat_handle->u_fat.p_fat16=NULL;
	return UNALLOCATED_FAT_CANNOT_READ_FAT;
	}

	// Convert FAT to host endianness
	for(uint64_t i=0;i<fat_size/sizeof(uint16_t);i++) {
	- p_fat_handle->p_fat16[i]=le16toh(p_fat_handle->p_fat16[i]);
	+ p_fat_handle->u_fat.p_fat16[i]=le16toh(p_fat_handle->u_fat.p_fat16[i]);
	}
	}

	LOG_DEBUG("FAT read successfully\n");

	return UNALLOCATED_OK;
	}

	/*
	* BuildFatBlockMap
	*/
	int BuildFatBlockMap(pts_FatHandle p_fat_handle,
	uint64_t **pp_free_block_map,
	uint64_t *p_free_block_map_size,
	uint64_t *p_block_size)
	{
	pts_FatVH p_fat_vh=p_fat_handle->p_fat_vh;
	uint64_t data_offset;
	uint64_t total_clusters;
	uint64_t *p_free_block_map=NULL;
	uint64_t free_block_map_size=0;

	LOG_DEBUG("Searching unallocated FAT clusters\n");

	// Calculate offset of first data cluster
	data_offset=p_fat_vh->reserved_sectors+
	(((p_fat_vh->root_entry_count*32)+(p_fat_vh->bytes_per_sector-1))/
	p_fat_vh->bytes_per_sector);
	if(p_fat_vh->fat16_sectors!=0) {
	data_offset+=(p_fat_vh->fat_count*p_fat_vh->fat16_sectors);
	} else {
	data_offset+=(p_fat_vh->fat_count*p_fat_vh->fat32_sectors);
	}
	data_offset*=p_fat_vh->bytes_per_sector;

	// Calculate total amount of data clusters
	if(p_fat_vh->total_sectors_16!=0) total_clusters=p_fat_vh->total_sectors_16;
	else total_clusters=p_fat_vh->total_sectors_32;
	total_clusters-=(data_offset/p_fat_vh->bytes_per_sector);
	total_clusters/=p_fat_vh->sectors_per_cluster;
	// Add 2 clusters as clusters 0 and 1 do not exist
	total_clusters+=2;

	LOG_DEBUG("Filesystem contains a total of %" PRIu64 " (2-%" PRIu64 ") "
	" data clusters starting at offset %" PRIu64 "\n",
	total_clusters-2,
	total_clusters-1,
	data_offset);

	// Save offset of every unallocated cluster in block map
	// Clusters 0 and 1 can not hold data in a FAT fs
	if(p_fat_handle->fat_type==FatType_Fat32) {
	for(uint64_t cur_cluster=2;cur_cluster<total_clusters;cur_cluster++) {
	- if((p_fat_handle->p_fat32[cur_cluster] & 0x0FFFFFFF)==0 \|\|
	- (p_fat_handle->p_fat32[cur_cluster] & 0x0FFFFFFF)==0x0FFFFFF7)
	+ if((p_fat_handle->u_fat.p_fat32[cur_cluster] & 0x0FFFFFFF)==0 \|\|
	+ (p_fat_handle->u_fat.p_fat32[cur_cluster] & 0x0FFFFFFF)==0x0FFFFFF7)
	{
	p_free_block_map=realloc(p_free_block_map,
	(free_block_map_size+1)*sizeof(uint64_t));
	if(p_free_block_map==NULL) return UNALLOCATED_MEMALLOC_FAILED;
	p_free_block_map[free_block_map_size]=data_offset+((cur_cluster-2)*
	p_fat_vh->bytes_per_sector*p_fat_vh->sectors_per_cluster);

	LOG_DEBUG("Cluster %" PRIu64 " is unallocated "
	"(FAT value 0x%04X, Image offset %" PRIu64 ")\n",
	cur_cluster,
	- p_fat_handle->p_fat32[cur_cluster],
	+ p_fat_handle->u_fat.p_fat32[cur_cluster],
	p_free_block_map[free_block_map_size]);

	free_block_map_size++;
	} else {
	LOG_DEBUG("Cluster %" PRIu64 " is allocated (FAT value 0x%08X)\n",
	cur_cluster,
	- p_fat_handle->p_fat32[cur_cluster]);
	+ p_fat_handle->u_fat.p_fat32[cur_cluster]);
	}
	}
	} else {
	for(uint64_t cur_cluster=2;cur_cluster<total_clusters;cur_cluster++) {
	- if((p_fat_handle->p_fat16[cur_cluster] & 0x0FFF)==0 \|\|
	- (p_fat_handle->p_fat16[cur_cluster] & 0x0FFF)==0x0FF7)
	+ if((p_fat_handle->u_fat.p_fat16[cur_cluster] & 0x0FFF)==0 \|\|
	+ (p_fat_handle->u_fat.p_fat16[cur_cluster] & 0x0FFF)==0x0FF7)
	{
	p_free_block_map=realloc(p_free_block_map,
	(free_block_map_size+1)*sizeof(uint64_t));
	if(p_free_block_map==NULL) return UNALLOCATED_MEMALLOC_FAILED;
	p_free_block_map[free_block_map_size]=data_offset+((cur_cluster-2)*
	p_fat_vh->sectors_per_cluster*p_fat_vh->bytes_per_sector);

	LOG_DEBUG("Cluster %" PRIu64 " is unallocated "
	"(FAT value 0x%04X, Image offset %" PRIu64 ")\n",
	cur_cluster,
	- p_fat_handle->p_fat16[cur_cluster],
	+ p_fat_handle->u_fat.p_fat16[cur_cluster],
	p_free_block_map[free_block_map_size]);

	free_block_map_size++;
	} else {
	LOG_DEBUG("Cluster %" PRIu64 " is allocated (FAT value 0x%04X)\n",
	cur_cluster,
	- p_fat_handle->p_fat16[cur_cluster]);
	+ p_fat_handle->u_fat.p_fat16[cur_cluster]);
	}
	}
	}

	LOG_DEBUG("Found %" PRIu64 " unallocated FAT clusters\n",
	free_block_map_size);

	// Free FAT as it is no longer needed
	if(p_fat_handle->fat_type==FatType_Fat32) {
	- free(p_fat_handle->p_fat32);
	- p_fat_handle->p_fat32=NULL;
	+ free(p_fat_handle->u_fat.p_fat32);
	+ p_fat_handle->u_fat.p_fat32=NULL;
	} else {
	- free(p_fat_handle->p_fat16);
	- p_fat_handle->p_fat16=NULL;
	+ free(p_fat_handle->u_fat.p_fat16);
	+ p_fat_handle->u_fat.p_fat16=NULL;
	}

	// TODO: There may be trailing unclustered sectors. Add them?

	*pp_free_block_map=p_free_block_map;
	*p_free_block_map_size=free_block_map_size;
	p_block_size=p_fat_vh->bytes_per_sectorp_fat_vh->sectors_per_cluster;
	return UNALLOCATED_OK;
	}

	/*
	* GetFatInfos
	*/
	int GetFatInfos(pts_FatHandle p_fat_handle, char **pp_buf) {
	pts_FatVH p_fat_vh=p_fat_handle->p_fat_vh;
	int ret;
	char *p_buf=NULL;
	char *p_fat_type;

	switch(p_fat_handle->fat_type) {
	case FatType_Fat16:
	p_fat_type="FAT16";
	break;
	case FatType_Fat32:
	p_fat_type="FAT32";
	break;
	case FatType_Unknown:
	default:
	p_fat_type="Unknown";
	}

	ret=asprintf(&p_buf,
	"FAT filesystem type: %s\n"
	"FAT bytes per sector: %" PRIu16 "\n"
	"FAT sectors per cluster: %" PRIu8 "\n"
	"FAT reserved sectors: %" PRIu16 "\n"
	"FAT count: %" PRIu8 "\n"
	"FAT root entry count: %" PRIu16 "\n"
	"FAT media type: 0x%02X\n"
	"FAT total sector count (16bit): %" PRIu16 "\n"
	"FAT sectors per FAT (16bit): %" PRIu16 "\n"
	"FAT total sector count (32bit): %" PRIu32 "\n"
	"FAT sectors per FAT (32bit): %" PRIu32,
	p_fat_type,
	p_fat_vh->bytes_per_sector,
	p_fat_vh->sectors_per_cluster,
	p_fat_vh->reserved_sectors,
	p_fat_vh->fat_count,
	p_fat_vh->root_entry_count,
	p_fat_vh->media_type,
	p_fat_vh->total_sectors_16,
	p_fat_vh->fat16_sectors,
	p_fat_vh->total_sectors_32,
	p_fat_vh->fat32_sectors);

	// Check if asprintf worked
	if(ret<0 \|\| p_buf==NULL) return UNALLOCATED_MEMALLOC_FAILED;

	*pp_buf=p_buf;
	return UNALLOCATED_OK;
	}

	diff --git a/trunk/libxmount_morphing/libxmount_morphing_unallocated/fat_functions.h b/trunk/libxmount_morphing/libxmount_morphing_unallocated/fat_functions.h
	index b1e9fda..c908268 100644
	--- a/trunk/libxmount_morphing/libxmount_morphing_unallocated/fat_functions.h
	+++ b/trunk/libxmount_morphing/libxmount_morphing_unallocated/fat_functions.h
	@@ -1,72 +1,72 @@
	/*******************************************************************************
	* xmount Copyright (c) 2008-2014 by Gillen Daniel <gillen.dan@pinguin.lu> *
	* *
	* This program is free software: you can redistribute it and/or modify it *
	* under the terms of the GNU General Public License as published by the Free *
	* Software Foundation, either version 3 of the License, or (at your option) *
	* any later version. *
	* *
	* This program is distributed in the hope that it will be useful, but WITHOUT *
	* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
	* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for *
	* more details. *
	* *
	* You should have received a copy of the GNU General Public License along with *
	* this program. If not, see <http://www.gnu.org/licenses/>. *
	*******************************************************************************/

	#ifndef FAT_FUNCTIONS_H
	#define FAT_FUNCTIONS_H

	#include "../libxmount_morphing.h"

	// Supported FAT types
	typedef enum e_FatType {
	FatType_Unknown=0,
	FatType_Fat16,
	FatType_Fat32
	} te_FatType;

	// Needed parts of the FAT volume header
	typedef struct s_FatVH {
	uint8_t jump_inst[3];
	uint8_t oem_name[8];
	uint16_t bytes_per_sector;
	uint8_t sectors_per_cluster;
	uint16_t reserved_sectors;
	uint8_t fat_count;
	uint16_t root_entry_count;
	uint16_t total_sectors_16;
	uint8_t media_type;
	uint16_t fat16_sectors;
	uint64_t unused01;
	uint32_t total_sectors_32;
	// Following value is only valid for FAT32
	uint32_t fat32_sectors;
	} __attribute__ ((packed)) ts_FatVH, *pts_FatVH;

	// FAT handle
	typedef struct s_FatHandle {
	te_FatType fat_type;
	pts_FatVH p_fat_vh;
	union {
	uint16_t *p_fat16;
	uint32_t *p_fat32;
	- };
	+ } u_fat;
	uint8_t debug;
	} ts_FatHandle, *pts_FatHandle;

	int ReadFatHeader(pts_FatHandle p_fat_handle,
	pts_LibXmountMorphingInputFunctions p_input_functions,
	uint8_t debug);
	void FreeFatHeader(pts_FatHandle p_fat_handle);
	int ReadFat(pts_FatHandle p_fat_handle,
	pts_LibXmountMorphingInputFunctions p_input_functions);
	int BuildFatBlockMap(pts_FatHandle p_fat_handle,
	uint64_t **pp_free_block_map,
	uint64_t *p_free_block_map_size,
	uint64_t *p_block_size);
	int GetFatInfos(pts_FatHandle p_fat_handle, char **pp_buf);

	#endif // FAT_FUNCTIONS_H

	diff --git a/trunk/libxmount_morphing/libxmount_morphing_unallocated/libxmount_morphing_unallocated.c b/trunk/libxmount_morphing/libxmount_morphing_unallocated/libxmount_morphing_unallocated.c
	index 2529d4c..35fb6ae 100644
	--- a/trunk/libxmount_morphing/libxmount_morphing_unallocated/libxmount_morphing_unallocated.c
	+++ b/trunk/libxmount_morphing/libxmount_morphing_unallocated/libxmount_morphing_unallocated.c
	@@ -1,511 +1,511 @@
	/*******************************************************************************
	* xmount Copyright (c) 2008-2014 by Gillen Daniel <gillen.dan@pinguin.lu> *
	* *
	* This program is free software: you can redistribute it and/or modify it *
	* under the terms of the GNU General Public License as published by the Free *
	* Software Foundation, either version 3 of the License, or (at your option) *
	* any later version. *
	* *
	* This program is distributed in the hope that it will be useful, but WITHOUT *
	* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
	* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for *
	* more details. *
	* *
	* You should have received a copy of the GNU General Public License along with *
	* this program. If not, see <http://www.gnu.org/licenses/>. *
	*******************************************************************************/

	#include <stdlib.h>
	#include <stdio.h>
	#include <string.h>

	#include "libxmount_morphing_unallocated.h"
	#include "libxmount_morphing_unallocated_retvalues.h"

	#define LOG_DEBUG(...) { \
	LIBXMOUNT_LOG_DEBUG(p_unallocated_handle->debug,__VA_ARGS__); \
	}

	/*******************************************************************************
	* LibXmount_Morphing API implementation
	******************************************************************************/
	/*
	* LibXmount_Morphing_GetApiVersion
	*/
	uint8_t LibXmount_Morphing_GetApiVersion() {
	return LIBXMOUNT_MORPHING_API_VERSION;
	}

	/*
	* LibXmount_Morphing_GetSupportedFormats
	*/
	const char* LibXmount_Morphing_GetSupportedTypes() {
	return "unallocated\0\0";
	}

	/*
	* LibXmount_Morphing_GetFunctions
	*/
	void LibXmount_Morphing_GetFunctions(ts_LibXmountMorphingFunctions *p_functions)
	{
	p_functions->CreateHandle=&UnallocatedCreateHandle;
	p_functions->DestroyHandle=&UnallocatedDestroyHandle;
	p_functions->Morph=&UnallocatedMorph;
	p_functions->Size=&UnallocatedSize;
	p_functions->Read=&UnallocatedRead;
	p_functions->OptionsHelp=&UnallocatedOptionsHelp;
	p_functions->OptionsParse=&UnallocatedOptionsParse;
	p_functions->GetInfofileContent=&UnallocatedGetInfofileContent;
	p_functions->GetErrorMessage=&UnallocatedGetErrorMessage;
	p_functions->FreeBuffer=&UnallocatedFreeBuffer;
	}

	/*******************************************************************************
	* Private
	******************************************************************************/
	/*
	* UnallocatedCreateHandle
	*/
	static int UnallocatedCreateHandle(void **pp_handle,
	const char *p_format,
	uint8_t debug)
	{
	pts_UnallocatedHandle p_unallocated_handle;

	// Alloc new handle. Using calloc in order to set everything to 0x00
	p_unallocated_handle=calloc(1,sizeof(ts_UnallocatedHandle));
	if(p_unallocated_handle==NULL) return UNALLOCATED_MEMALLOC_FAILED;

	// Init handle values
	p_unallocated_handle->debug=debug;
	p_unallocated_handle->fs_type=UnallocatedFsType_Unknown;

	LOG_DEBUG("Created new LibXmount_Morphing_Unallocated handle\n");

	// Return new handle
	*pp_handle=p_unallocated_handle;
	return UNALLOCATED_OK;
	}

	/*
	* UnallocatedDestroyHandle
	*/
	static int UnallocatedDestroyHandle(void **pp_handle) {
	pts_UnallocatedHandle p_unallocated_handle=(pts_UnallocatedHandle)*pp_handle;

	LOG_DEBUG("Destroying LibXmount_Morphing_Unallocated handle\n");

	// TODO: Return if p_unallocated_handle==NULL

	// Free fs handle
	switch(p_unallocated_handle->fs_type) {
	case UnallocatedFsType_Hfs: {
	- FreeHfsHeader(&(p_unallocated_handle->hfs_handle));
	+ FreeHfsHeader(&(p_unallocated_handle->u_fs.hfs_handle));
	break;
	}
	case UnallocatedFsType_Fat: {
	- FreeFatHeader(&(p_unallocated_handle->fat_handle));
	+ FreeFatHeader(&(p_unallocated_handle->u_fs.fat_handle));
	break;
	}
	case UnallocatedFsType_Unknown:
	default:
	break;
	}

	// Free handle values and handle
	if(p_unallocated_handle->p_free_block_map!=NULL)
	free(p_unallocated_handle->p_free_block_map);
	free(p_unallocated_handle);

	*pp_handle=NULL;
	return UNALLOCATED_OK;
	}

	/*
	* UnallocatedMorph
	*/
	static int UnallocatedMorph(
	void *p_handle,
	pts_LibXmountMorphingInputFunctions p_input_functions)
	{
	pts_UnallocatedHandle p_unallocated_handle=(pts_UnallocatedHandle)p_handle;
	uint64_t input_images_count;
	int ret;

	LOG_DEBUG("Initializing LibXmount_Morphing_Unallocated\n");

	// Set input functions and get image count
	p_unallocated_handle->p_input_functions=p_input_functions;
	if(p_unallocated_handle->
	p_input_functions->
	ImageCount(&input_images_count)!=0)
	{
	return UNALLOCATED_CANNOT_GET_IMAGECOUNT;
	}

	// Make sure there is exactly one input image
	if(input_images_count==0 \|\| input_images_count>1) {
	return UNALLOCATED_WRONG_INPUT_IMAGE_COUNT;
	}

	// Read filesystem header
	switch(p_unallocated_handle->fs_type) {
	case UnallocatedFsType_Hfs: {
	// Read HFS VH
	- ret=ReadHfsHeader(&(p_unallocated_handle->hfs_handle),
	+ ret=ReadHfsHeader(&(p_unallocated_handle->u_fs.hfs_handle),
	p_unallocated_handle->p_input_functions,
	p_unallocated_handle->debug);
	if(ret!=UNALLOCATED_OK) return ret;
	break;
	}
	case UnallocatedFsType_Fat: {
	// Read FAT VH
	- ret=ReadFatHeader(&(p_unallocated_handle->fat_handle),
	+ ret=ReadFatHeader(&(p_unallocated_handle->u_fs.fat_handle),
	p_unallocated_handle->p_input_functions,
	p_unallocated_handle->debug);
	if(ret!=UNALLOCATED_OK) return ret;
	break;
	}
	case UnallocatedFsType_Unknown: {
	// Filesystem wasn't specified. Try to autodetect it by reading all
	// available fs headers
	LOG_DEBUG("Autodetecting filesystem\n");
	LOG_DEBUG("Trying HFS\n");
	- ret=ReadHfsHeader(&(p_unallocated_handle->hfs_handle),
	+ ret=ReadHfsHeader(&(p_unallocated_handle->u_fs.hfs_handle),
	p_unallocated_handle->p_input_functions,
	p_unallocated_handle->debug);
	if(ret==UNALLOCATED_OK) {
	LOG_DEBUG("Detected HFS fs\n");
	p_unallocated_handle->fs_type=UnallocatedFsType_Hfs;
	break;
	}
	LOG_DEBUG("Trying FAT\n");
	- ret=ReadFatHeader(&(p_unallocated_handle->fat_handle),
	+ ret=ReadFatHeader(&(p_unallocated_handle->u_fs.fat_handle),
	p_unallocated_handle->p_input_functions,
	p_unallocated_handle->debug);
	if(ret==UNALLOCATED_OK) {
	LOG_DEBUG("Detected FAT fs\n");
	p_unallocated_handle->fs_type=UnallocatedFsType_Fat;
	break;
	}

	LOG_DEBUG("Unable to autodetect fs\n");
	return UNALLOCATED_NO_SUPPORTED_FS_DETECTED;
	}
	default: {
	return UNALLOCATED_INTERNAL_ERROR;
	}
	}

	// Extract unallocated blocks from input image
	switch(p_unallocated_handle->fs_type) {
	case UnallocatedFsType_Hfs: {
	// Read HFS alloc file
	- ret=ReadHfsAllocFile(&(p_unallocated_handle->hfs_handle),
	+ ret=ReadHfsAllocFile(&(p_unallocated_handle->u_fs.hfs_handle),
	p_unallocated_handle->p_input_functions);
	if(ret!=UNALLOCATED_OK) return ret;
	// Build free block map
	- ret=BuildHfsBlockMap(&(p_unallocated_handle->hfs_handle),
	+ ret=BuildHfsBlockMap(&(p_unallocated_handle->u_fs.hfs_handle),
	&(p_unallocated_handle->p_free_block_map),
	&(p_unallocated_handle->free_block_map_size),
	&(p_unallocated_handle->block_size));
	if(ret!=UNALLOCATED_OK) return ret;
	break;
	}
	case UnallocatedFsType_Fat: {
	// Read FAT
	- ret=ReadFat(&(p_unallocated_handle->fat_handle),
	+ ret=ReadFat(&(p_unallocated_handle->u_fs.fat_handle),
	p_unallocated_handle->p_input_functions);
	if(ret!=UNALLOCATED_OK) return ret;
	// Build free block map
	- ret=BuildFatBlockMap(&(p_unallocated_handle->fat_handle),
	+ ret=BuildFatBlockMap(&(p_unallocated_handle->u_fs.fat_handle),
	&(p_unallocated_handle->p_free_block_map),
	&(p_unallocated_handle->free_block_map_size),
	&(p_unallocated_handle->block_size));
	if(ret!=UNALLOCATED_OK) return ret;
	break;
	}
	case UnallocatedFsType_Unknown:
	default:
	return UNALLOCATED_INTERNAL_ERROR;
	}

	// Calculate morphed image size
	p_unallocated_handle->morphed_image_size=p_unallocated_handle->block_size*
	p_unallocated_handle->free_block_map_size;

	LOG_DEBUG("Total size of unallocated blocks is %" PRIu64 " bytes\n",
	p_unallocated_handle->morphed_image_size);

	return UNALLOCATED_OK;
	}

	/*
	* UnallocatedSize
	*/
	static int UnallocatedSize(void p_handle, uint64_t p_size) {
	*p_size=((pts_UnallocatedHandle)(p_handle))->morphed_image_size;
	return UNALLOCATED_OK;
	}

	/*
	* UnallocatedRead
	*/
	static int UnallocatedRead(void *p_handle,
	char *p_buf,
	off_t offset,
	size_t count,
	size_t *p_read)
	{
	pts_UnallocatedHandle p_unallocated_handle=(pts_UnallocatedHandle)p_handle;
	uint64_t cur_block;
	off_t cur_block_offset;
	off_t cur_image_offset;
	size_t cur_count;
	int ret;
	size_t bytes_read;

	LOG_DEBUG("Reading %zu bytes at offset %zu from morphed image\n",
	count,
	offset);

	// Make sure read parameters are within morphed image bounds
	if(offset>=p_unallocated_handle->morphed_image_size \|\|
	offset+count>p_unallocated_handle->morphed_image_size)
	{
	return UNALLOCATED_READ_BEYOND_END_OF_IMAGE;
	}

	// Calculate starting block and block offset
	cur_block=offset/p_unallocated_handle->block_size;
	cur_block_offset=offset-(cur_block*p_unallocated_handle->block_size);

	// Init p_read
	*p_read=0;

	while(count!=0) {
	// Calculate input image offset to read from
	cur_image_offset=
	p_unallocated_handle->p_free_block_map[cur_block]+cur_block_offset;

	// Calculate how many bytes to read from current block
	if(cur_block_offset+count>p_unallocated_handle->block_size) {
	cur_count=p_unallocated_handle->block_size-cur_block_offset;
	} else {
	cur_count=count;
	}

	LOG_DEBUG("Reading %zu bytes at offset %zu (block %" PRIu64 ")\n",
	cur_count,
	cur_image_offset+cur_block_offset,
	cur_block);

	// Read bytes
	ret=p_unallocated_handle->p_input_functions->
	Read(0,
	p_buf,
	cur_image_offset+cur_block_offset,
	cur_count,
	&bytes_read);
	if(ret!=0 \|\| bytes_read!=cur_count) return UNALLOCATED_CANNOT_READ_DATA;

	p_buf+=cur_count;
	cur_block_offset=0;
	count-=cur_count;
	cur_block++;
	(*p_read)+=cur_count;
	}

	return UNALLOCATED_OK;
	}

	/*
	* UnallocatedOptionsHelp
	*/
	static int UnallocatedOptionsHelp(const char **pp_help) {
	int ok;
	char *p_buf;

	ok=asprintf(&p_buf,
	" unallocated_fs : Specify the filesystem to extract "
	"unallocated blocks from. Supported filesystems are: "
	"'hfs', 'fat'. "
	"Default: autodetect.\n");
	if(ok<0 \|\| p_buf==NULL) {
	*pp_help=NULL;
	return UNALLOCATED_MEMALLOC_FAILED;
	}

	*pp_help=p_buf;
	return UNALLOCATED_OK;
	}

	/*
	* UnallocatedOptionsParse
	*/
	static int UnallocatedOptionsParse(void *p_handle,
	uint32_t options_count,
	const pts_LibXmountOptions *pp_options,
	const char **pp_error)
	{
	pts_UnallocatedHandle p_unallocated_handle=(pts_UnallocatedHandle)p_handle;
	int ok;
	char *p_buf;

	for(uint32_t i=0;i<options_count;i++) {
	if(strcmp(pp_options[i]->p_key,"unallocated_fs")==0) {
	if(strcmp(pp_options[i]->p_value,"hfs")==0) {
	p_unallocated_handle->fs_type=UnallocatedFsType_Hfs;
	} else if(strcmp(pp_options[i]->p_value,"fat")==0) {
	p_unallocated_handle->fs_type=UnallocatedFsType_Fat;
	} else {
	ok=asprintf(&p_buf,
	"Unsupported filesystem '%s' specified",
	pp_options[i]->p_value);
	if(ok<0 \|\| p_buf==NULL) {
	*pp_error=NULL;
	return UNALLOCATED_MEMALLOC_FAILED;
	}
	*pp_error=p_buf;
	return UNALLOCATED_UNSUPPORTED_FS_SPECIFIED;
	}

	LOG_DEBUG("Setting fs to %s\n",pp_options[i]->p_value);

	pp_options[i]->valid=1;
	}
	}

	return UNALLOCATED_OK;
	}

	/*
	* UnallocatedGetInfofileContent
	*/
	static int UnallocatedGetInfofileContent(void *p_handle,
	const char **pp_info_buf)
	{
	pts_UnallocatedHandle p_unallocated_handle=(pts_UnallocatedHandle)p_handle;
	int ret=-1;
	char *p_fs_buf=NULL;
	char *p_buf=NULL;

	switch(p_unallocated_handle->fs_type) {
	case UnallocatedFsType_Hfs: {
	- ret=GetHfsInfos(&(p_unallocated_handle->hfs_handle),&p_fs_buf);
	+ ret=GetHfsInfos(&(p_unallocated_handle->u_fs.hfs_handle),&p_fs_buf);
	break;
	}
	case UnallocatedFsType_Fat: {
	- ret=GetFatInfos(&(p_unallocated_handle->fat_handle),&p_fs_buf);
	+ ret=GetFatInfos(&(p_unallocated_handle->u_fs.fat_handle),&p_fs_buf);
	break;
	}
	case UnallocatedFsType_Unknown:
	default:
	return UNALLOCATED_INTERNAL_ERROR;
	}
	if(ret!=UNALLOCATED_OK) return ret;

	if(p_fs_buf!=NULL) {
	ret=asprintf(&p_buf,
	"%s\n"
	"Discovered free blocks: %" PRIu64 "\n"
	"Total unallocated size: %" PRIu64 " bytes (%0.3f GiB)\n",
	p_fs_buf,
	p_unallocated_handle->free_block_map_size,
	p_unallocated_handle->free_block_map_size*
	p_unallocated_handle->block_size,
	(p_unallocated_handle->free_block_map_size*
	p_unallocated_handle->block_size)/(1024.01024.01024.0));
	free(p_fs_buf);
	} else {
	ret=asprintf(&p_buf,
	"Discovered free blocks: %" PRIu64 "\n"
	"Total unallocated size: %" PRIu64 " bytes (%0.3f GiB)\n",
	p_unallocated_handle->free_block_map_size,
	p_unallocated_handle->free_block_map_size*
	p_unallocated_handle->block_size,
	(p_unallocated_handle->free_block_map_size*
	p_unallocated_handle->block_size)/(1024.01024.01024.0));
	}

	// Check if asprintf worked
	if(ret<0 \|\| p_buf==NULL) return UNALLOCATED_MEMALLOC_FAILED;

	*pp_info_buf=p_buf;
	return UNALLOCATED_OK;
	}

	/*
	* UnallocatedGetErrorMessage
	*/
	static const char* UnallocatedGetErrorMessage(int err_num) {
	switch(err_num) {
	case UNALLOCATED_MEMALLOC_FAILED:
	return "Unable to allocate memory";
	break;
	case UNALLOCATED_NO_SUPPORTED_FS_DETECTED:
	return "Unable to detect a supported file system";
	break;
	case UNALLOCATED_UNSUPPORTED_FS_SPECIFIED:
	return "Unsupported fs specified";
	break;
	case UNALLOCATED_INTERNAL_ERROR:
	return "Internal error";
	break;
	case UNALLOCATED_CANNOT_GET_IMAGECOUNT:
	return "Unable to get input image count";
	break;
	case UNALLOCATED_WRONG_INPUT_IMAGE_COUNT:
	return "Only 1 input image is supported";
	break;
	case UNALLOCATED_CANNOT_GET_IMAGESIZE:
	return "Unable to get input image size";
	break;
	case UNALLOCATED_READ_BEYOND_END_OF_IMAGE:
	return "Unable to read data: Attempt to read past EOF";
	break;
	case UNALLOCATED_CANNOT_READ_DATA:
	return "Unable to read data";
	break;
	case UNALLOCATED_CANNOT_PARSE_OPTION:
	return "Unable to parse library option";
	break;
	// HFS errors
	case UNALLOCATED_HFS_CANNOT_READ_HEADER:
	return "Unable to read HFS volume header";
	break;
	case UNALLOCATED_HFS_INVALID_HEADER:
	return "Found invalid HFS volume header";
	break;
	case UNALLOCATED_HFS_CANNOT_READ_ALLOC_FILE:
	return "Unable to read HFS allocation file";
	break;
	case UNALLOCATED_HFS_ALLOC_FILE_HAS_TOO_MUCH_EXTENDS:
	return "HFS allocation file has more than 8 extends. "
	"This is unsupported";
	break;
	// FAT errors
	case UNALLOCATED_FAT_CANNOT_READ_HEADER:
	return "Unable to read FAT volume header";
	break;
	case UNALLOCATED_FAT_INVALID_HEADER:
	return "Found invalid FAT volume header";
	break;
	case UNALLOCATED_FAT_UNSUPPORTED_FS_TYPE:
	return "Found unsupported FAT type";
	break;
	case UNALLOCATED_FAT_CANNOT_READ_FAT:
	return "Unable to read FAT";
	break;
	default:
	return "Unknown error";
	}
	}

	/*
	* UnallocatedFreeBuffer
	*/
	static void UnallocatedFreeBuffer(void *p_buf) {
	free(p_buf);
	}

	diff --git a/trunk/libxmount_morphing/libxmount_morphing_unallocated/libxmount_morphing_unallocated.h b/trunk/libxmount_morphing/libxmount_morphing_unallocated/libxmount_morphing_unallocated.h
	index e84befe..e0dcae5 100644
	--- a/trunk/libxmount_morphing/libxmount_morphing_unallocated/libxmount_morphing_unallocated.h
	+++ b/trunk/libxmount_morphing/libxmount_morphing_unallocated/libxmount_morphing_unallocated.h
	@@ -1,83 +1,83 @@
	/*******************************************************************************
	* xmount Copyright (c) 2008-2014 by Gillen Daniel <gillen.dan@pinguin.lu> *
	* *
	* This program is free software: you can redistribute it and/or modify it *
	* under the terms of the GNU General Public License as published by the Free *
	* Software Foundation, either version 3 of the License, or (at your option) *
	* any later version. *
	* *
	* This program is distributed in the hope that it will be useful, but WITHOUT *
	* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or *
	* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for *
	* more details. *
	* *
	* You should have received a copy of the GNU General Public License along with *
	* this program. If not, see <http://www.gnu.org/licenses/>. *
	*******************************************************************************/

	#ifndef LIBXMOUNT_MORPHING_UNALLOCATED_H
	#define LIBXMOUNT_MORPHING_UNALLOCATED_H

	#include "../libxmount_morphing.h"

	#include "hfs_functions.h"
	#include "fat_functions.h"
	#include "ntfs_functions.h"

	/*******************************************************************************
	* Enums, type defs, etc...
	******************************************************************************/
	// Supported fs types
	typedef enum e_UnallocatedFsType {
	UnallocatedFsType_Unknown=0,
	UnallocatedFsType_Hfs,
	UnallocatedFsType_Fat
	} te_UnallocatedFsType;

	// Handle
	typedef struct s_UnallocatedHandle {
	uint8_t debug;
	te_UnallocatedFsType fs_type;
	pts_LibXmountMorphingInputFunctions p_input_functions;

	uint64_t block_size;
	uint64_t free_block_map_size;
	uint64_t *p_free_block_map;
	uint64_t morphed_image_size;

	union {
	ts_HfsHandle hfs_handle;
	ts_FatHandle fat_handle;
	ts_NtfsHandle ntfs_handle;
	- };
	+ } u_fs;
	} ts_UnallocatedHandle, *pts_UnallocatedHandle;

	/*******************************************************************************
	* Forward declarations
	******************************************************************************/
	static int UnallocatedCreateHandle(void **pp_handle,
	const char *p_format,
	uint8_t debug);
	static int UnallocatedDestroyHandle(void **pp_handle);
	static int UnallocatedMorph(
	void *p_handle,
	pts_LibXmountMorphingInputFunctions p_input_functions);
	static int UnallocatedSize(void *p_handle,
	uint64_t *p_size);
	static int UnallocatedRead(void *p_handle,
	char *p_buf,
	off_t offset,
	size_t count,
	size_t *p_read);
	static int UnallocatedOptionsHelp(const char **pp_help);
	static int UnallocatedOptionsParse(void *p_handle,
	uint32_t options_count,
	const pts_LibXmountOptions *pp_options,
	const char **pp_error);
	static int UnallocatedGetInfofileContent(void *p_handle,
	const char **pp_info_buf);
	static const char* UnallocatedGetErrorMessage(int err_num);
	static void UnallocatedFreeBuffer(void *p_buf);

	#endif // LIBXMOUNT_MORPHING_UNALLOCATED_H

File Metadata

Mime Type: text/x-diff
Expires: Sun, May 11, 6:02 AM (1 d, 6 h)
Storage Engine: local-disk
Storage Format: Raw Data
Storage Handle: 29/66/77a792106170d4b6ee9b9fed34cf
Default Alt Text: (1 MB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions