From 1e098c5f608cf3152085e2a6a193a2ba158335c6 Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Fri, 8 Feb 2008 10:22:08 +0000
Subject: [PATCH] Added test/compare_file.c to xorriso-standalone tarball

---
 libisoburn/trunk/xorriso/README               | 22 +++++++++++++++++++
 libisoburn/trunk/xorriso/configure_ac.txt     |  2 +-
 .../trunk/xorriso/make_xorriso_standalone.sh  |  5 +++++
 .../trunk/xorriso/xorriso_makefile_am.txt     | 15 +++++++++++--
 libisoburn/trunk/xorriso/xorriso_timestamp.h  |  2 +-
 5 files changed, 42 insertions(+), 4 deletions(-)

diff --git a/libisoburn/trunk/xorriso/README b/libisoburn/trunk/xorriso/README
index eab874f1..12617aaf 100644
--- a/libisoburn/trunk/xorriso/README
+++ b/libisoburn/trunk/xorriso/README
@@ -111,6 +111,28 @@ Like:
     xorriso -dev stdio:/tmp/pseudo_drive ...more arguments...
 
 
+                              Testing
+
+We are quite sure that libisofs produces accurate representations of the disk
+files. This opinion is founded on a lot of tests burns and checks by a little
+test program which compares files from the mounted image with the orignals
+on disk. It uses the normal Linux filesystem calls, i.e. no libburnia stuff.
+
+This program is not installed systemwide but stays in the installation
+directory of the xorriso tarball as  test/compare_file . Usually it is
+run as -exec payload of a find command. It takes three arguments:
+The file path of the first file to compare, the prefix1 to be cut off from path
+and the prefix2 which gets prepended afterwards to obtain the path of the
+second file to compare.
+
+To compare tree /media/dvd and /original/dir :
+   find /original/dir -exec compare_file '{}' /original/dir /media/dvd ';' \
+   | less
+and:
+   find /media/dvd -exec compare_file '{}' /media/dvd /original/dir ';' | less
+
+
+
                              libisoburn
 
 xorriso is based on libisofs which does ISO 9600 filesystem aspects and on
diff --git a/libisoburn/trunk/xorriso/configure_ac.txt b/libisoburn/trunk/xorriso/configure_ac.txt
index b40e364c..2ec52f8f 100644
--- a/libisoburn/trunk/xorriso/configure_ac.txt
+++ b/libisoburn/trunk/xorriso/configure_ac.txt
@@ -16,7 +16,7 @@ AC_SUBST(BURN_MICRO_VERSION)
 
 LIBISOFS_MAJOR_VERSION=0
 LIBISOFS_MINOR_VERSION=6
-LIBISOFS_MICRO_VERSION=1
+LIBISOFS_MICRO_VERSION=2
 AC_SUBST(LIBISOFS_MAJOR_VERSION)
 AC_SUBST(LIBISOFS_MINOR_VERSION)
 AC_SUBST(LIBISOFS_MICRO_VERSION)
diff --git a/libisoburn/trunk/xorriso/make_xorriso_standalone.sh b/libisoburn/trunk/xorriso/make_xorriso_standalone.sh
index b845f9d6..b95fdc53 100755
--- a/libisoburn/trunk/xorriso/make_xorriso_standalone.sh
+++ b/libisoburn/trunk/xorriso/make_xorriso_standalone.sh
@@ -121,6 +121,11 @@ copy_files \
  xorriso/man_1_xorriso.html \
  "$lone_dir"/xorriso
 
+create_dir "$lone_dir"/test
+copy_files \
+ test/compare_file.c \
+ "$lone_dir"/test/compare_file.c
+
 
 # >>> create compile_xorriso.sh for standalone
 
diff --git a/libisoburn/trunk/xorriso/xorriso_makefile_am.txt b/libisoburn/trunk/xorriso/xorriso_makefile_am.txt
index 1f391bfd..d5666651 100644
--- a/libisoburn/trunk/xorriso/xorriso_makefile_am.txt
+++ b/libisoburn/trunk/xorriso/xorriso_makefile_am.txt
@@ -9,8 +9,6 @@ libinclude_HEADERS =
 
 ## ========================================================================= ##
 
-noinst_PROGRAMS =
-
 bin_PROGRAMS = \
 	xorriso/xorriso
 
@@ -136,6 +134,19 @@ xorriso_xorriso_SOURCES = \
 	version.h
 
 
+noinst_PROGRAMS = \
+	test/compare_file
+
+# A program to compare two trees of files in mounted filesystems
+# To compare tree /media/dvd and /original/dir :
+#   find /media/dvd -exec test/compare_file '{}' /media/dvd /original/dir ';'
+#
+test_compare_file_CPPFLAGS =
+test_compare_file_CFLAGS =
+test_compare_file_LDADD =
+test_compare_file_SOURCES = test/compare_file.c
+
+
 ## ========================================================================= ##
 
 # Indent source files
diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h
index d039690d..8e6b9fb3 100644
--- a/libisoburn/trunk/xorriso/xorriso_timestamp.h
+++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2008.02.07.211424"
+#define Xorriso_timestamP "2008.02.08.102122"