Promoted branch to tag

COPYRIGHT

@@ -1,11 +1,11 @@
 Mario Danic <mario.danic@gmail.com>,
 Vreixo Formoso <metalpain2002@yahoo.es> 
 Thomas Schmitt <scdbackup@gmx.net>
-libisoburn is Copyright (C) 2007-2008 Vreixo Formoso, Thomas Schmitt
-xorriso is Copyright (C) 2007-2008 Thomas Schmitt
-libisofs (if included) is Copyright (C) 2007-2008 Vreixo Formoso, Mario Danic
+libisoburn is Copyright (C) 2007-2009 Vreixo Formoso, Thomas Schmitt
+xorriso is Copyright (C) 2007-2009 Thomas Schmitt
+libisofs (if included) is Copyright (C) 2007-2009 Vreixo Formoso, Mario Danic
 libburn (if included) is Copyright (C) 2002-2006 Derek Foreman, Ben Jansens
-                     and Copyright (C) 2006-2008 Mario Danic, Thomas Schmitt
+                     and Copyright (C) 2006-2009 Mario Danic, Thomas Schmitt
 
 
     This program is free software; you can redistribute it and/or modify

Makefile.am

@@ -1,4 +1,8 @@
-pkgconfigdir=$(libdir)/pkgconfig
+
+# ts A90315 : LIBBURNIA_PKGCONFDIR is defined OS specific in acinclude.m4
+# was: pkgconfigdir=$(libdir)/pkgconfig
+pkgconfigdir=$(LIBBURNIA_PKGCONFDIR)
+
 libincludedir=$(includedir)/libisoburn
 
 lib_LTLIBRARIES = libisoburn/libisoburn.la 
@@ -16,9 +20,11 @@ libisoburn_libisoburn_la_SOURCES = \
 	libisoburn/isofs_wrap.c \
 	libisoburn/libisoburn.h \
 	version.h
+
 libisoburn_libisoburn_la_LIBADD = \
 	-lisofs \
-	-lburn 
+	-lburn
+
 libinclude_HEADERS = \
 	libisoburn/libisoburn.h 
 
@@ -30,16 +36,59 @@ libinclude_HEADERS = \
 bin_PROGRAMS = \
 	xorriso/xorriso
 
+# This looks quite ugly with make install: xorriso.c is compiled twice again
+#
+# Trying to create a build timestamp file
+#
+# BUILT_SOURCES = xorriso/xorriso_buildstamp.h
+#
+# phony targets get rebuilt every time
+#
+# .PHONY: xorriso/xorriso_buildstamp.h
+# xorriso/xorriso_buildstamp.h:
+# 	date -u '+#define Xorriso_build_timestamP "%Y.%m.%d.%H%M%S"' >xorriso/xorriso_buildstamp.h
+# 	cat xorriso/xorriso_buildstamp.h
+
 xorriso_xorriso_CPPFLAGS = -Ilibisoburn
-xorriso_xorriso_CFLAGS = -DXorriso_with_maiN -DXorriso_with_regeX $(READLINE_DEF)
-xorriso_xorriso_LDADD = libisoburn/libisoburn.la -lisofs -lburn $(THREAD_LIBS)
+xorriso_xorriso_CFLAGS = -DXorriso_with_maiN \
+                         $(READLINE_DEF) $(LIBACL_DEF) $(XATTR_DEF) \
+                         $(EXTF_DEF) $(EXTF_SUID_DEF) $(ZLIB_DEF)
+
+xorriso_xorriso_LDADD = libisoburn/libisoburn.la -lisofs -lburn \
+		$(THREAD_LIBS) $(LIBBURN_ARCH_LIBS)
+
 xorriso_xorriso_SOURCES = \
 	xorriso/xorriso.h \
 	xorriso/xorriso_private.h \
 	xorriso/xorriso.c \
 	xorriso/xorrisoburn.h \
 	xorriso/xorrisoburn.c \
-	xorriso/xorriso_timestamp.h
+	xorriso/xorriso_timestamp.h \
+	xorriso/xorriso_buildstamp.h
+
+
+# Install symbolic links to the xorriso binary
+#
+install-exec-hook:
+	if test -e "$(DESTDIR)$(bindir)"/xorrisofs ; then rm "$(DESTDIR)$(bindir)"/xorrisofs ; else echo ; fi
+	ln -s xorriso "$(DESTDIR)$(bindir)"/xorrisofs
+	if test -e "$(DESTDIR)$(bindir)"/osirrox ; then rm "$(DESTDIR)$(bindir)"/osirrox ; else echo ; fi
+	ln -s xorriso "$(DESTDIR)$(bindir)"/osirrox
+	if test -e "$(DESTDIR)$(bindir)"/xorrecord ; then rm "$(DESTDIR)$(bindir)"/xorrecord ; else echo ; fi
+	ln -s xorriso "$(DESTDIR)$(bindir)"/xorrecord
+
+
+# Alternative to the disabled .PHONY above.
+# Trying to create a build timestamp file semi-manually:  make buildstamped
+#
+buildstamp:
+	date -u '+#define Xorriso_build_timestamP "%Y.%m.%d.%H%M%S"' >xorriso/xorriso_buildstamp.h
+	cat xorriso/xorriso_buildstamp.h
+
+# For now   make buildstamped  has to be performed explicitely.
+buildstamped: buildstamp
+	make
+
 
 
 ## Build test applications
@@ -55,13 +104,6 @@ test_compare_file_CFLAGS =
 test_compare_file_LDADD =
 test_compare_file_SOURCES = test/compare_file.c
 
-# ts A80110 - A80210 : we need as minimal demo something better than test.c 
-#	test/test
-
-# test_test_CPPFLAGS = -Ilibisofs -Ilibburn -Ilibisoburn
-# test_test_LDADD = $(libisoburn_libisoburn_la_OBJECTS) $(THREAD_LIBS) -lburn -lisofs
-# test_test_SOURCES = test/test.c 
-
 
 ## ========================================================================= ##
 
@@ -119,6 +161,8 @@ man_MANS = xorriso/xorriso.1
 EXTRA_DIST = \
 	libisoburn-1.pc.in \
 	version.h.in \
+	doc/comments \
+	doc/doxygen.conf.in \
 	README \
 	AUTHORS \
 	CONTRIBUTORS \
@@ -126,6 +170,7 @@ EXTRA_DIST = \
 	COPYING \
 	INSTALL \
 	xorriso/changelog.txt \
+	xorriso/xorriso_buildstamp_none.h \
 	xorriso/README \
 	$(man_MANS)
 

README

@@ -4,12 +4,13 @@
 libisoburn. By Vreixo Formoso <metalpain2002@yahoo.es> 
             and Thomas Schmitt <scdbackup@gmx.net>
 Integrated sub project of libburnia-project.org.
-Copyright (C) 2006-2008 Vreixo Formoso, Thomas Schmitt.
+http://files.libburnia-project.org/releases/libisoburn-0.3.8.pl00.tar.gz
+Copyright (C) 2006-2009 Vreixo Formoso, Thomas Schmitt.
 Provided under GPL version 2.
 ------------------------------------------------------------------------------
 
 libisoburn is a frontend for libraries libburn and libisofs which enables
-creation and expansion of ISO-9660 filesystems on all CD/DVD media supported
+creation and expansion of ISO-9660 filesystems on all CD/DVD/BD media supported
 by libburn. This includes media like DVD+RW, which do not support multi-session
 management on media level and even plain disk files or block devices.
 
@@ -17,7 +18,10 @@ The price for that is thorough specialization on data files in ISO-9660
 filesystem images. So libisoburn is not suitable for audio (CD-DA) or any
 other CD layout which does not entirely consist of ISO-9660 sessions.
 
-Currently it is only supported on Linux with kernels >= 2.4.
+Currently it is fully supported on Linux with kernels >= 2.4 and on
+FreeBSD versions with ATAPI/CAM support enabled in the kernel, see atapicam(4).
+On other X/Open compliant systems libburn will only offer POSIX i/o with disk
+file objects, but no direct MMC operation on CD/DVD/BD drives.
 
 By using this software you agree to the disclaimer at the end of this text:
 "... without even the implied warranty ..."
@@ -25,18 +29,18 @@ By using this software you agree to the disclaimer at the end of this text:
 
                    Compilation, First Glimpse, Installation
 
-Dynamic library and compile time header requirements for libisoburn-0.1.5 :
-- libburn.so.4  , version libburn-0.4.4 or higher
-- libisofs.so.6 , version libisofs-0.6.4 or higher
+Dynamic library and compile time header requirements for libisoburn-0.3.8 :
+- libburn.so.4  , version libburn-0.6.4 or higher
+- libisofs.so.6 , version libisofs-0.6.18 or higher
 libisoburn and xorriso will not start with libraries which are older than their
 headers seen at compile time. So compile in the oldest possible installation
-setup unless you have reason to enforce a newer bug fix level.
+setup unless you have reason to enforce a newer level of bug fixes or features.
 
-Obtain libisoburn-0.1.5.tar.gz, take it to a directory of your choice
+Obtain libisoburn-0.3.8.pl00.tar.gz, take it to a directory of your choice
 and do:
 
-    tar xzf libisoburn-0.1.5.tar.gz
-    cd libisoburn-0.1.5
+    tar xzf libisoburn-0.3.8.pl00.tar.gz
+    cd libisoburn-0.3.8
 
 Within that directory execute:
 
@@ -56,16 +60,38 @@ as well as
 
                               xorriso
 
-libisoburn includes a command line and dialog application named xorriso,
+libisoburn comes with a command line and dialog application named xorriso,
 which offers a substantial part of libisoburn features to shell scripts and
-users. Its file xorriso/README describes a standlone tarball as first
-preference for xorriso installation.
-The installation described above produces a dynamically linked xorriso binary
-as described in chapter "libisoburn" at the end of that text.
+users. Its file xorriso/README describes a standalone tarball as first
+preference for statically linked xorriso installation.
+The libisoburn installation described above produces a dynamically linked
+xorriso binary depending on libburn.so, libisofs.so, libisoburn.so.
 
 After installation documentation is available via
     man xorriso
 
+Several alias links point to the xorriso binary:
+    xorrisofs  starts xorriso with -as mkisofs emulation already enabled
+    xorrecord  starts xorriso with -as cdrecord emulation already enabled
+    osirrox    starts with -osirrox image-to-disk copying already enabled
+
+By default xorriso will depend on libreadline if the readline-dev headers
+are present. This dependcy can be avoided by running
+    ./configure --prefix=/usr --disable-libreadline
+    make clean ; make
+Never omit the "make clean" command after switching libreadline enabling.
+Other deliberate dependency reduction options of ./configure are:
+    --disable-libacl   avoid use of ACL functions like acl_to_text()
+    --disable-xattr    avoid use of xattr functions like listxattr()
+    --disable-zlib     avoid use of zlib functions like compress2()
+
+xorriso allows to use external processes as file content filters. This is
+a potential security risk which may be avoided by ./configure option
+    --disable-external-filters
+By default the filter feature is disabled if effective user id and real
+user id differ. This ban can be lifted by
+    --enable-external-filters-setuid
+
 
                        Drives and Disk File Objects 
 
@@ -92,6 +118,9 @@ output drives. The addresses of the disk files have to be preceded by "stdio:".
 Like:
     "stdio:/tmp/pseudo_drive"
 
+Note: xorriso by default prefixes "stdio:" to addresses outside the /dev tree
+      if they do not lead to an optical drive device file.
+
 
                               Testing
 
@@ -103,7 +132,7 @@ on disk. It uses the normal POSIX 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 demands at least three arguments:
-The path of the first file to compare, the prefix1 to be cut off from path
+The path of the 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.
 As further argument there can be -no_ctime which suppresses the comparison
@@ -143,7 +172,7 @@ libburnia-project.org
 By Mario Danic           <mario.danic@gmail.com>,
    Vreixo Formoso        <metalpain2002@yahoo.es>
    Thomas Schmitt        <scdbackup@gmx.net>
-Copyright (C) 2006-2008 Mario Danic, Vreixo Formoso, Thomas Schmitt.
+Copyright (C) 2006-2009 Mario Danic, Vreixo Formoso, Thomas Schmitt.
 
 libburnia-project.org is inspired by and in other components still containing
 parts of old

acinclude.m4

@@ -1,6 +1,7 @@
 AC_DEFUN([TARGET_SHIZZLE],
 [
   ARCH=""
+  LIBBURNIA_PKGCONFDIR="$libdir"/pkgconfig
 
   AC_MSG_CHECKING([target operating system])
 
@@ -12,9 +13,12 @@ AC_DEFUN([TARGET_SHIZZLE],
     *-*-freebsd*)
       ARCH=freebsd
       LIBBURN_ARCH_LIBS=-lcam
+      LIBBURNIA_PKGCONFDIR=$(echo "$libdir" | sed 's/\/lib$/\/libdata/')/pkgconfig
       ;;
     *)
-      AC_ERROR([You are attempting to compile for an unsupported platform])
+      ARCH=
+      LIBBURN_ARCH_LIBS=
+#      AC_ERROR([You are attempting to compile for an unsupported platform])
       ;;
   esac
 

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([libisoburn], [0.1.5], [http://libburnia-project.org])
+AC_INIT([libisoburn], [0.3.8], [http://libburnia-project.org])
 AC_PREREQ([2.50])
 dnl AC_CONFIG_HEADER([config.h])	
 
@@ -8,20 +8,21 @@ AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([subdir-objects])
 
 dnl Hint: Search list for version code aspects:
-dnl       /AC_INT(
+dnl       /AC_INIT(
 dnl       /ISOBURN_.*_VERSION
 dnl       /LT_.*
 dnl       /LIB.*_REQUIRED
 
-dnl The API version codes are now defined in libisoburn/libisoburn.h
+dnl The API version codes are defined in libisoburn/libisoburn.h
 dnl #define  isoburn_header_version_*
 dnl configure.ac only rules the libtool revision numbering about
 dnl LT_CURREN, LT_AGE, LT_REVISION where SONAME becomes LT_CURRENT - LT_AGE
 dnl 
 dnl These three are only copies to provide libtool with unused LT_RELEASE
 ISOBURN_MAJOR_VERSION=0
-ISOBURN_MINOR_VERSION=1
-ISOBURN_MICRO_VERSION=5
+ISOBURN_MINOR_VERSION=3
+ISOBURN_MICRO_VERSION=8
+
 dnl ISOBURN_VERSION=$ISOBURN_MAJOR_VERSION.$ISOBURN_MINOR_VERSION.$ISOBURN_MICRO_VERSION
  
 AC_SUBST(ISOBURN_MAJOR_VERSION)
@@ -33,15 +34,16 @@ dnl Libtool versioning
 dnl Generate libisoburn.so.1.x.y
 dnl SONAME will become LT_CURRENT - LT_AGE
 dnl 
-dnl ts A80512
-dnl ### This was the release version 0.1.4 = libisoburn.so.1.3.0
-dnl This is the development version after stable release libisoburn.so.1.3.0
-dnl LT_CURRENT++, LT_AGE++ have happened happened meanwhile.
+dnl ts A90418
+dnl This is the release version 0.3.8 = libisoburn.so.1.27.0
+dnl ### This is the development version after above stable release
+dnl LT_CURRENT++, LT_AGE++ have not happened happened yet.
+dnl ### LT_CURRENT++, LT_AGE++ has happened meanwhile.
 dnl
-dnl SONAME = 5 - 4 = 1 . Library name = libburn.so.1.4.0
+dnl SONAME = 28 - 27 = 1 . Library name = libisoburn.so.1.27.0
 LT_RELEASE=$ISOBURN_MAJOR_VERSION.$ISOBURN_MINOR_VERSION
-LT_CURRENT=5
-LT_AGE=4
+LT_CURRENT=28
+LT_AGE=27
 LT_REVISION=0
 LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
 
@@ -69,6 +71,10 @@ if test ! $ac_cv_func_fseeko; then
    AC_ERROR([Libburn requires largefile support.])
 fi
 
+dnl If iconv(3) is in an extra lib, then it gets added to variable LIBS.
+dnl If not, then no -liconv will be added.
+AC_CHECK_LIB(iconv, iconv, , )
+
 AC_PROG_LIBTOOL
 AC_SUBST(LIBTOOL_DEPS)
 LIBTOOL="$LIBTOOL --silent"
@@ -82,25 +88,113 @@ AC_SUBST(THREAD_LIBS)
 
 TARGET_SHIZZLE
 AC_SUBST(ARCH)
+AC_SUBST(LIBBURNIA_PKGCONFDIR)
 AC_SUBST(LIBBURN_ARCH_LIBS)
 
 
+AC_ARG_ENABLE(libreadline,
+[  --enable-libreadline    Enable use of libreadline by xorriso, default=yes],
+               , enable_libreadline=yes)
+if test x$enable_libreadline = xyes; then
 dnl Check whether there is readline-devel and readline-runtime.
 dnl If not, erase this macro which would enable use of readline(),add_history()
-READLINE_DEF="-DXorriso_with_readlinE"
+    READLINE_DEF="-DXorriso_with_readlinE"
 dnl The empty yes case obviously causes -lreadline to be linked
-AC_CHECK_HEADER(readline/readline.h, AC_CHECK_LIB(readline, readline, , READLINE_DEF= ), READLINE_DEF= )
+    AC_CHECK_HEADER(readline/readline.h, AC_CHECK_LIB(readline, readline, , READLINE_DEF= ), READLINE_DEF= )
 dnl The X= in the yes case prevents that -lreadline gets linked twice
-AC_CHECK_HEADER(readline/history.h, AC_CHECK_LIB(readline, add_history, X= , READLINE_DEF= ), READLINE_DEF= )
+    AC_CHECK_HEADER(readline/history.h, AC_CHECK_LIB(readline, add_history, X= , READLINE_DEF= ), READLINE_DEF= )
+else
+    READLINE_DEF=
+fi
 AC_SUBST(READLINE_DEF)
 
+dnl ts A90329
+dnl ACL and xattr do not need to be enabled in libisoburn or xorriso source
+dnl but without AC_CHECK_LIB() xorriso will not be linked with -lacl .
+dnl On my Linux this does work with an ACL enabled libisofs but in general
+dnl it seems not be right.
+dnl So for now it seems to be best to do the same configuration for libisoburn
+dnl and xorriso as for libisofs.
+ 
+AC_ARG_ENABLE(libacl,
+[  --enable-libacl    Enable use of libacl by libisofs, default=yes],
+               , enable_libacl=yes)
+if test x$enable_libacl = xyes; then
+dnl Check whether there is libacl-devel and libacl-runtime.
+dnl If not, erase this macro which would enable use of acl_to_text and others
+    LIBACL_DEF="-DLibisofs_with_aaip_acL"
+dnl The empty yes case obviously causes -lacl to be linked
+    AC_CHECK_HEADER(sys/acl.h, AC_CHECK_LIB(acl, acl_to_text, , LIBACL_DEF= ), LIBACL_DEF= )
+else
+    LIBACL_DEF=
+fi
+AC_SUBST(LIBACL_DEF)
+
+
+AC_ARG_ENABLE(xattr,
+[  --enable-xattr     Enable use of xattr by libisofs, default=yes],
+               , enable_xattr=yes)
+if test x$enable_xattr = xyes; then
+dnl Check whether there is the header for Linux xattr. 
+dnl If not, erase this macro which would enable use of listxattr and others
+    XATTR_DEF="-DLibisofs_with_aaip_xattR"
+    AC_CHECK_HEADER(attr/xattr.h, AC_CHECK_LIB(c, listxattr, X= , XATTR_DEF= ), XATTR_DEF= )
+else
+    XATTR_DEF=
+fi
+AC_SUBST(XATTR_DEF)
+
+
+dnl ts A90409
+dnl Same situation as with xattr and ACL: libisoburn does not depend directly
+dnl on zlib. But if it is enabled in libisofs then it seems wise to link it
+dnl with libisoburn apps.
+AC_ARG_ENABLE(zlib,
+[  --enable-zlib     Enable use of zlib by libisofs, default=yes],
+               , enable_zlib=yes)
+if test x$enable_zlib = xyes; then
+dnl Check whether there is the header for zlib. 
+dnl If not, erase this macro which would enable use of compress2() and others.
+dnl The empty parameter after "compress2" causes -lz.
+    ZLIB_DEF="-DLibisofs_with_zliB"
+    AC_CHECK_HEADER(zlib.h, AC_CHECK_LIB(z, compress2, , ZLIB_DEF= ), ZLIB_DEF= )
+else
+    ZLIB_DEF=
+fi
+AC_SUBST(ZLIB_DEF)
+
+
+AC_ARG_ENABLE(external-filters,
+[  --enable-external-filters     Enable use of external filter programs by xorriso, default=yes],
+               , enable_external_filters=yes)
+if test x"$enable_external_filters" = xyes; then
+    EXTF_DEF="-DXorriso_allow_external_filterS"
+    echo "enabled  xorriso external filter programs"
+else
+    EXTF_DEF=
+    echo "disabled xorriso external filter programs"
+fi
+AC_SUBST(EXTF_DEF)
+
+AC_ARG_ENABLE(external-filters-setuid,
+[  --enable-external-filters-setuid     Enable xorriso external filter programs under setuid, default=no],
+               , enable_external_filters_setuid=no)
+if test x$enable_external_filters_setuid = xyes; then
+    EXTF_SUID_DEF="-DXorriso_allow_extf_suiD"
+    echo "enabled  xorriso external filter programs under setuid"
+else
+    EXTF_SUID_DEF=
+    echo "disabled xorriso external filter programs under setuid"
+fi
+AC_SUBST(EXTF_SUID_DEF)
+
 
 AC_CHECK_HEADER(libburn/libburn.h)
 AC_CHECK_HEADER(libisofs/libisofs.h)
 
 dnl Check for proper library versions
-LIBBURN_REQUIRED=0.4.7
-LIBISOFS_REQUIRED=0.6.4
+LIBBURN_REQUIRED=0.6.4
+LIBISOFS_REQUIRED=0.6.18
 PKG_CHECK_MODULES(LIBBURN, libburn-1 >= $LIBBURN_REQUIRED)
 PKG_CHECK_MODULES(LIBISOFS, libisofs-1 >= $LIBISOFS_REQUIRED)
 

doc/comments

@@ -0,0 +1,58 @@
+/**
+   @author Mario Danic, Vreixo Formoso, Thomas Schmitt
+
+   @mainpage Libisoburn Documentation Index
+
+   @section intro Introduction
+
+Libburnia is an open-source project for reading, mastering and writing
+optical discs. This page is about its capability to read, manipulate, and
+write ISO 9660 filesystems with Rock Ridge extensions. Media can be optical
+media or filesystem objects.
+
+Our scope is currently Linux 2.4 and 2.6, or FreeBSD .
+
+libisoburn is an add-on to libburn and libisofs which coordinates both and
+also allows to grow ISO-9660 filesystem images on multi-session media as well
+as on overwriteable media via the same API.
+All media peculiarities are handled automatically.
+
+xorriso is an application of all three libraries which creates, loads,
+manipulates and writes ISO 9660 filesystem images with Rock Ridge extensions.
+Manipulation is not only adding or overwriting of files but also deletion,
+renaming, and attribute changing. An incremental backup feature is provided.
+See xorriso/README for more
+
+SONAME:
+libisoburn.so.1 (since 0.1.0, February 2008).
+
+
+   @section using Using the libraries
+
+Our build system is based on autotools.
+User experience tells us that you will need at least autotools version 1.7.
+
+To build libisoburn go into its toplevel directory and execute
+
+-  ./bootstrap  (needed if you downloaded from SVN)
+
+-  ./configure
+
+-  make
+
+To make the libraries accessible for running resp. developing applications 
+
+-  make install
+
+Read libisoburn/libisoburn.h for a description of the API.
+See also README, xorriso/README, and the man page xorriso/xorriso.1 which
+gives an idea of the capabilities provided by Libburnia.
+
+You will also have to install and understand the two libraries of the 
+Libburnia project which provide fundamental services:
+libburn is the library by which preformatted data get onto optical media.
+See libburn/libburn.h for its API description.
+libisofs is the library to handle ISO 9660 filesystems with Rock Ridge 
+extensions. Its API is described in libisofs/libisofs.h .
+
+*/

doc/doxygen.conf.in

@@ -477,7 +477,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = libburn \
+INPUT                  = libisoburn \
                          doc \
                          test
 
@@ -495,9 +495,7 @@ INPUT_ENCODING         = UTF-8
 # *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx 
 # *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py
 
-FILE_PATTERNS          = libburn.h \
-                         comments \
-                         libburner.c
+FILE_PATTERNS          = 
 
 # The RECURSIVE tag can be used to turn specify whether or not subdirectories 
 # should be searched for input files as well. Possible values are YES and NO. 

libisoburn/burn_wrap.c

@@ -6,7 +6,7 @@
 */
 /* libburn wrappers for libisoburn 
 
-   Copyright 2007 - 2008  Thomas Schmitt, <scdbackup@gmx.net> 
+   Copyright 2007 - 2009  Thomas Schmitt, <scdbackup@gmx.net> 
 */
 
 /* <<< A70929 : hardcoded CD-RW with fabricated -msinfo 
@@ -23,6 +23,8 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <fcntl.h>
+#include <time.h>
+#include <regex.h>
 
 
 #ifndef Xorriso_standalonE
@@ -38,9 +40,6 @@
 
 #endif /* Xorriso_standalonE */
 
-/* <<< remove macro and alternative outdated code */
-#define Libisoburn_on__libburn_after_0_4_2 yes
-
 
 #include "libisoburn.h"
 #include "isoburn.h"
@@ -49,8 +48,18 @@
 /* The global list of isoburn objects. Usually there is only one. */
 extern struct isoburn *isoburn_list_start; /* in isoburn.c */
 
+/* Default values for application provided msgs_submit methods.
+   To be attached to newly aquired drives.
+   Storage location is isoburn.c
+*/
+extern int (*libisoburn_default_msgs_submit)
+    (void *handle, int error_code, char msg_text[],
+                 int os_errno, char severity[], int flag);
+extern void *libisoburn_default_msgs_submit_handle;
+extern int libisoburn_default_msgs_submit_flag;
 
-int isoburn_emulate_toc(struct burn_drive *d, int flag);
+
+static int isoburn_emulate_toc(struct burn_drive *d, int flag);
 
 
 int isoburn_initialize(char msg[1024], int flag)
@@ -74,11 +83,11 @@ int isoburn_initialize(char msg[1024], int flag)
      iso_lib_header_version_minor
      iso_lib_header_version_micro
    If the header is too old then the following code shall cause failure of
-   cdrskin compilation rather than to allow production of a program with
+   libisoburn compilation rather than to allow production of a program with
    unpredictable bugs or memory corruption.
    The compiler messages supposed to appear in this case are:
       error: 'LIBISOFS_MISCONFIGURATION' undeclared (first use in this function)
-      error: 'INTENTIONAL_ABORT_OF_COMPILATION__HEADERFILE_libisofs_dot_h_TOO_OLD__SEE_libisoburn_dot_h_and_burn_wrap_dot_h' undeclared (first use in this function)
+      error: 'INTENTIONAL_ABORT_OF_COMPILATION__HEADERFILE_libisofs_dot_h_TOO_OLD__SEE_libisoburn_dot_h_AND_burn_wrap_dot_h' undeclared (first use in this function)
       error: 'LIBISOFS_MISCONFIGURATION_' undeclared (first use in this function)
 */
 /* The indendation is an advise of man gcc to help old compilers ignoring */
@@ -94,7 +103,7 @@ int isoburn_initialize(char msg[1024], int flag)
 
 #ifdef Isoburn_libisofs_dot_h_too_olD
 LIBISOFS_MISCONFIGURATION = 0;
-INTENTIONAL_ABORT_OF_COMPILATION__HEADERFILE_libisofs_dot_h_TOO_OLD__SEE_libisoburn_dot_h_and_burn_wrap_dot_h = 0;
+INTENTIONAL_ABORT_OF_COMPILATION__HEADERFILE_libisofs_dot_h_TOO_OLD__SEE_libisoburn_dot_h_AND_burn_wrap_dot_h = 0;
 LIBISOFS_MISCONFIGURATION_ = 0;
 #endif
 
@@ -219,6 +228,18 @@ int isoburn_libburn_req(int *major, int *minor, int *micro)
 }
 
 
+int isoburn_set_msgs_submit(int (*msgs_submit)(void *handle, int error_code,
+                                               char msg_text[], int os_errno,
+                                               char severity[], int flag),
+                               void *submit_handle, int submit_flag, int flag)
+{
+ libisoburn_default_msgs_submit= msgs_submit;
+ libisoburn_default_msgs_submit_handle= submit_handle;
+ libisoburn_default_msgs_submit_flag= submit_flag;
+ return(1);
+}
+
+
 int isoburn_is_intermediate_dvd_rw(struct burn_drive *d, int flag)
 {
  int profile, ret= 0, format_status, num_formats;
@@ -243,6 +264,9 @@ int isoburn_is_intermediate_dvd_rw(struct burn_drive *d, int flag)
     @param flag bit0= pretent blank on overwriteable media
                 bit3= if the drive reports a -ROM profile then try to read 
                       table of content by scanning for ISO image headers.
+                bit4= do not emulate TOC on overwriteable media
+                bit5= ignore ACL from external filesystems
+                bit6= ignore POSIX Extended Attributes from external filesystems
 */ 
 static int isoburn_welcome_media(struct isoburn **o, struct burn_drive *d,
                                  int flag)
@@ -265,6 +289,10 @@ static int isoburn_welcome_media(struct isoburn **o, struct burn_drive *d,
  if(ret<=0)
    goto ex;
  (*o)->drive= d;
+ (*o)->msgs_submit= libisoburn_default_msgs_submit;
+ (*o)->msgs_submit_handle= libisoburn_default_msgs_submit_handle;
+ (*o)->msgs_submit_flag= libisoburn_default_msgs_submit_flag;
+ iso_image_set_ignore_aclea((*o)->image, (flag >> 5 ) & 3);
 
 #ifdef Hardcoded_cd_rW
  /* <<< A70929 : hardcoded CD-RW with fabricated -msinfo */
@@ -289,11 +317,13 @@ static int isoburn_welcome_media(struct isoburn **o, struct burn_drive *d,
        (*o)->emulation_mode= -1;
        goto ex;
      }
-     /* try to read emulated toc */
-     ret= isoburn_emulate_toc(d, 0);
-     if(ret<0) {
-       (*o)->emulation_mode= -1;
-       goto ex;
+     if(!(flag & 16)) {
+       /* try to read emulated toc */
+       ret= isoburn_emulate_toc(d, 0);
+       if(ret<0) {
+         (*o)->emulation_mode= -1;
+         goto ex;
+       }
      }
    }
 
@@ -303,9 +333,13 @@ static int isoburn_welcome_media(struct isoburn **o, struct burn_drive *d,
 
    if(readonly) {
      /* This might be overwriteable media in a -ROM drive */
-     ret= isoburn_emulate_toc(d, 1);
-     if(ret<0)
-       goto ex;
+     if((flag & 16)) {
+       ret= 0;
+     } else {
+       ret= isoburn_emulate_toc(d, 1);
+       if(ret<0)
+         goto ex;
+     }
      if(ret==0 && profile !=0x08 && (flag&8)) {
        /* This might also be multi-session media which do not
           get shown with a decent TOC.
@@ -350,29 +384,40 @@ ex:
                       table of content by scanning for ISO image headers.
                       (depending on media type and drive state this might 
                        help or it might make the resulting toc even worse)
+                bit4= do not emulate TOC on overwriteable media
+                bit5= ignore ACL from external filesystems
+                bit6= ignore POSIX Extended Attributes from external filesystems
 */
 int isoburn_drive_aquire(struct burn_drive_info *drive_infos[],
                          char *adr, int flag)
 {
- int ret, conv_ret, drive_grabbed= 0;
- char libburn_drive_adr[BURN_DRIVE_ADR_LEN];
+ int ret, drive_grabbed= 0;
  struct isoburn *o= NULL;
- char msg[BURN_MSGS_MESSAGE_LEN+4096];
+
+#ifndef NIX
+
+/* <<< should be obsolete by new drive addressing of libburn-0.5.2 */
+/* >>> but helps with kernel 2.4 to use /dev/sr */
+
+ int conv_ret;
+ char libburn_drive_adr[BURN_DRIVE_ADR_LEN];
 
  conv_ret= burn_drive_convert_fs_adr(adr, libburn_drive_adr);
- if(conv_ret<=0) {
-   sprintf(msg, "Unsuitable drive address: '%s'\n",adr);
-   msg[BURN_MSGS_MESSAGE_LEN-1]= 0;
-   burn_msgs_submit(0x00060000, msg, 0, "FAILURE", NULL);
-   ret= 0; goto ex;
- }
-
+ if(conv_ret<=0)
+   strcpy(libburn_drive_adr, adr);
  ret= burn_drive_scan_and_grab(drive_infos, libburn_drive_adr, flag&1);
+
+#else
+
+ ret= burn_drive_scan_and_grab(drive_infos, adr, flag & 1);
+
+#endif /* ! NIX */
+
  if(ret<=0)
    goto ex;
  drive_grabbed= 1;
  ret= isoburn_welcome_media(&o, (*drive_infos)[0].drive,
-                            (flag&8) | !!(flag&2));
+                            (flag & (8 | 16 | 32 | 64)) | !!(flag&2));
  if(ret<=0)
    goto ex;
 
@@ -435,8 +480,8 @@ int isoburn_find_emulator(struct isoburn **pt,
  if(ret<=0)
    return(0);
  if((*pt)->emulation_mode==-1) {
-   burn_msgs_submit(0x00060000,
-                    "Unsuitable drive and media state", 0, "FAILURE", NULL);
+   isoburn_msgs_submit(*pt, 0x00060000,
+                    "Unsuitable drive and media state", 0, "FAILURE", 0);
    return(-1);
  }
  if((*pt)->emulation_mode==0)
@@ -554,8 +599,8 @@ int isoburn_disc_get_msc1(struct burn_drive *d, int *start_lba)
 
  if(isoburn_disc_get_status(d)!=BURN_DISC_APPENDABLE &&
     isoburn_disc_get_status(d)!=BURN_DISC_FULL) {
-   burn_msgs_submit(0x00060000,
-                    "Media contains no recognizable data", 0, "SORRY",NULL);
+   isoburn_msgs_submit(NULL, 0x00060000,
+                       "Media contains no recognizable data", 0, "SORRY", 0);
    return(0);
  }
  ret= isoburn_find_emulator(&o, d, 0);
@@ -602,6 +647,23 @@ int isoburn_disc_track_lba_nwa(struct burn_drive *d,
 }
 
 
+int isoburn_get_msc2(struct isoburn *o,
+                     struct burn_write_opts *opts, int *msc2, int flag)
+{
+ int ret, lba, nwa;
+
+ if(o->fabricated_msc2>=0)
+   *msc2= o->fabricated_msc2;
+ else {
+   ret= isoburn_disc_track_lba_nwa(o->drive, opts, 0, &lba, &nwa);
+   if(ret<=0)
+     return(ret);
+   *msc2= nwa;
+ }
+ return(1);
+}
+
+
 void isoburn_disc_write(struct burn_write_opts *opts, struct burn_disc *disc)
 {
  int ret;
@@ -641,10 +703,10 @@ void isoburn_disc_write(struct burn_write_opts *opts, struct burn_disc *disc)
          */
          sprintf(msg,
         "DVD-RW insufficiently formatted. (Intermediate State, size unknown)");
-         burn_msgs_submit(0x00060000, msg, 0, "FAILURE", NULL);
+         isoburn_msgs_submit(o, 0x00060000, msg, 0, "FAILURE", 0);
          sprintf(msg,
                 "It might help to first deformat it and then format it again");
-         burn_msgs_submit(0x00060000, msg, 0, "HINT", NULL);
+         isoburn_msgs_submit(o, 0x00060000, msg, 0, "HINT", 0);
          burn_drive_cancel(drive); /* mark run as failure */
          return;
        }
@@ -658,7 +720,7 @@ void isoburn_disc_write(struct burn_write_opts *opts, struct burn_disc *disc)
  write_type= burn_write_opts_auto_write_type(opts, disc, reasons, 0);
  if (write_type == BURN_WRITE_NONE) {
     sprintf(msg, "Failed to find a suitable write mode:\n%s", reasons);
-    burn_msgs_submit(0x00060000, msg, 0, "FAILURE", NULL);
+    isoburn_msgs_submit(o, 0x00060000, msg, 0, "FAILURE", 0);
     if(o!=NULL)
       o->wrote_well= 0;
     /* To cause a negative reply with burn_drive_wrote_well() */
@@ -670,7 +732,7 @@ void isoburn_disc_write(struct burn_write_opts *opts, struct burn_disc *disc)
  sprintf(msg, "Write_type = %s\n",
               (write_type == BURN_WRITE_SAO ? "SAO" :
               (write_type == BURN_WRITE_TAO ? "TAO" : reasons)));
- burn_msgs_submit(0x00060000, msg, 0, "DEBUG", NULL);
+ isoburn_msgs_submit(o, 0x00060000, msg, 0, "DEBUG", 0);
 
 #ifdef Hardcoded_cd_rW
  /* <<< A70929 : hardcoded CD-RW with fabricated -msinfo */
@@ -748,9 +810,9 @@ int isoburn_set_start_byte(struct isoburn *o, off_t value, int flag)
  if(ret<=0)
    goto ex;
  if(!caps->start_adr) {
-   burn_msgs_submit(0x00060000,
-                    "Cannot set start byte address with this type of media",
-                    0, "FAILURE", NULL);
+   isoburn_msgs_submit(o, 0x00060000,
+                       "Cannot set start byte address with this type of media",
+                       0, "FAILURE", 0);
    {ret= 0; goto ex;}
  }
  o->min_start_byte= value;
@@ -848,34 +910,6 @@ int isoburn_get_fifo_status(struct burn_drive *d, int *size, int *free_bytes,
 }
 
 
-
-/* >>> todo: throw out the copies of libdax_msgs entrails */
-
-#ifndef Libisoburn_on__libburn_after_0_4_2
-
-/* <<< to be replaced by libburn-0.4.3 API call burn_sev_to_text().
-   This is a copy of libdax_msgs__sev_to_text() which is not exposed
-   by the API of of libburn-0.4.2 . As soon as xorriso gets based on
-   libburn-0.4.4 this redundancy is to be removed.
-   It is safe, nevertheless, because the severity codes are eternal.
-*/
-#define LIBDAX_MSGS_SEV_ALL                                          0x00000000
-#define LIBDAX_MSGS_SEV_ERRFILE                                      0x08000000
-#define LIBDAX_MSGS_SEV_DEBUG                                        0x10000000
-#define LIBDAX_MSGS_SEV_UPDATE                                       0x20000000
-#define LIBDAX_MSGS_SEV_NOTE                                         0x30000000
-#define LIBDAX_MSGS_SEV_HINT                                         0x40000000
-#define LIBDAX_MSGS_SEV_WARNING                                      0x50000000
-#define LIBDAX_MSGS_SEV_SORRY                                        0x60000000
-#define LIBDAX_MSGS_SEV_MISHAP                                       0x64000000
-#define LIBDAX_MSGS_SEV_FAILURE                                      0x68000000
-#define LIBDAX_MSGS_SEV_FATAL                                        0x70000000
-#define LIBDAX_MSGS_SEV_ABORT                                        0x71000000
-#define LIBDAX_MSGS_SEV_NEVER                                        0x7fffffff
-
-#endif /* ! Libisoburn_on__libburn_after_0_4_2 */
-
-
 /* @param flag bit0= -reserved-
                bit1= this is a libburn severity
 */
@@ -884,53 +918,11 @@ int isoburn__sev_to_text(int severity, char **severity_name,
 {
  int ret;
    
-  ret= iso_sev_to_text(severity, severity_name);
-  if(ret>0)
-    return(ret);
-#ifdef Libisoburn_on__libburn_after_0_4_2
-  ret= burn_sev_to_text(severity, severity_name, 0);
-  return(ret);
-#else
-
- if(flag&1) {
-   *severity_name= "NEVER\nABORT\nFATAL\nFAILURE\nSORRY\nWARNING\nHINT\nNOTE\nUPDATE\nDEBUG\nERRFILE\nALL";
-   return(1);
- }
- *severity_name= "";
- if(severity>=LIBDAX_MSGS_SEV_NEVER)
-   *severity_name= "NEVER";
- else if(severity>=LIBDAX_MSGS_SEV_ABORT)
-   *severity_name= "ABORT";
- else if(severity>=LIBDAX_MSGS_SEV_FATAL)
-   *severity_name= "FATAL";
- else if(severity>=LIBDAX_MSGS_SEV_FAILURE)
-   *severity_name= "FAILURE";
- else if(severity>=LIBDAX_MSGS_SEV_MISHAP)
-   *severity_name= "MISHAP";
- else if(severity>=LIBDAX_MSGS_SEV_SORRY)
-   *severity_name= "SORRY";
- else if(severity>=LIBDAX_MSGS_SEV_WARNING)
-   *severity_name= "WARNING";
- else if(severity>=LIBDAX_MSGS_SEV_HINT)
-   *severity_name= "HINT";
- else if(severity>=LIBDAX_MSGS_SEV_NOTE)
-   *severity_name= "NOTE";
- else if(severity>=LIBDAX_MSGS_SEV_UPDATE)
-   *severity_name= "UPDATE";
- else if(severity>=LIBDAX_MSGS_SEV_DEBUG)
-   *severity_name= "DEBUG";
- else if(severity>=LIBDAX_MSGS_SEV_ERRFILE)
-   *severity_name= "ERRFILE";
- else if(severity>=LIBDAX_MSGS_SEV_ALL)
-   *severity_name= "ALL";
- else {
-   *severity_name= "";
-   return(0);
- }
- return(1);
-
-#endif /* ! Libisoburn_on__libburn_after_0_4_2 */
-
+ ret= iso_sev_to_text(severity, severity_name);
+ if(ret>0)
+   return(ret);
+ ret= burn_sev_to_text(severity, severity_name, 0);
+ return(ret);
 }
 
 
@@ -938,21 +930,10 @@ int isoburn__text_to_sev(char *severity_name, int *severity_number, int flag)
 {
  int ret= 1;
 
-  ret= iso_text_to_sev(severity_name, severity_number);
-  if(ret>0)
-    return(ret);
-
-#ifndef Libisoburn_on__libburn_after_0_4_2
- if(severity_name[0]==0)
-   *severity_number= 0;
- else if(strcmp(severity_name, "MISHAP")==0)
-   *severity_number= LIBDAX_MSGS_SEV_MISHAP;
- else if(strcmp(severity_name, "ERRFILE")==0)
-   *severity_number= LIBDAX_MSGS_SEV_ERRFILE;
- else
-#endif /* ! Libisoburn_on__libburn_after_0_4_2 */
-
-   ret= burn_text_to_sev(severity_name, severity_number, 0);
+ ret= iso_text_to_sev(severity_name, severity_number);
+ if(ret>0)
+   return(ret);
+ ret= burn_text_to_sev(severity_name, severity_number, 0);
  return(ret);
 }
 
@@ -983,7 +964,8 @@ int isoburn_report_iso_error(int iso_error_code, char msg_text[], int os_errno,
 
 /* @param flag bit0-7: info return mode
                  0= do not return anything in info (do not even touch it)
-                 1= return volume id 
+                 1= copy volume id to info (info needs 33 bytes)
+                 2= do not touch info (caller will copy 64 kB header to it)
                bit14= -reserved -
                bit15= -reserved-
    @return 1 seems to be a valid ISO image , 0 format not recognized, <0 error
@@ -1012,10 +994,12 @@ int isoburn_read_iso_head_parse(struct burn_drive *d, unsigned char *data,
    break;
      else
        info[i]= 0;
+ } else if(info_mode==2) {
+   ;
  } else {
-   burn_msgs_submit(0x00060000,
+   isoburn_msgs_submit(NULL, 0x00060000,
                "Program error: Unknown info mode with isoburn_read_iso_head()",
-               0, "FATAL", NULL);
+               0, "FATAL", 0);
    return(-1);
  }
  return(1);
@@ -1025,7 +1009,9 @@ int isoburn_read_iso_head_parse(struct burn_drive *d, unsigned char *data,
 /* API
    @param flag bit0-7: info return mode
                  0= do not return anything in info (do not even touch it)
-                 1= return volume id 
+                 1= copy volume id to info (info needs 33 bytes)
+                 2= copy 64 kB header to info (needs 65536 bytes)
+               bit13= do not read head from media but use first 64 kB from info
                bit14= check both half buffers (not only second)
                       return 2 if found in first block
                bit15= return-1 on read error
@@ -1036,26 +1022,58 @@ int isoburn_read_iso_head(struct burn_drive *d, int lba,
                           int *image_blocks, char *info, int flag)
 {
  unsigned char buffer[64*1024];
- int ret;
+ int ret, info_mode;
  off_t data_count;
 
+ info_mode= flag&255;
  *image_blocks= 0;
- ret = burn_read_data(d, ((off_t) lba) * (off_t) 2048, (char *) buffer,
+ if(flag&(1<<13)) {
+   memcpy(buffer, info, 64*1024);
+ } else {
+   ret = burn_read_data(d, ((off_t) lba) * (off_t) 2048, (char *) buffer,
                       (off_t) 64*1024, &data_count, 2); /* no error messages */
- if(ret<=0)
-   return(-1*!!(flag&(1<<15)));
+   if(ret<=0)
+     return(-1*!!(flag&(1<<15)));
+   if(info_mode==2)
+     memcpy(info, buffer, 64*1024);
+ }
 
  if(flag&(1<<14)) {
-   ret= isoburn_read_iso_head_parse(d, buffer, image_blocks, info,
-                                    flag&255);
+   ret= isoburn_read_iso_head_parse(d, buffer, image_blocks, info, info_mode);
    if(ret<0)
      return(ret);
    if(ret>0)
      return(2);
  }
  ret= isoburn_read_iso_head_parse(d, buffer+32*1024, image_blocks, info,
-                                  flag&255);
- return(ret);
+                                  info_mode);
+ if(ret<=0)
+   return(ret);
+ return(1);
+}
+
+
+int isoburn_make_toc_entry(struct isoburn *o, int *session_count, int lba,
+                           int track_blocks, int flag)
+{
+ int ret;
+ struct isoburn_toc_entry *item;
+
+ ret= isoburn_toc_entry_new(&item, o->toc, 0);
+ if(ret<=0) {
+   isoburn_msgs_submit(o, 0x00060000,
+                       "Not enough memory for emulated TOC entry object",
+                       0, "FATAL", 0);
+   return(-1);
+ }
+ if(o->toc==NULL)
+   o->toc= item;
+ (*session_count)++;
+ item->session= *session_count;
+ item->track_no= *session_count;
+ item->start_lba= lba;
+ item->track_blocks= track_blocks;
+ return(1);
 }
 
 
@@ -1066,10 +1084,11 @@ int isoburn_read_iso_head(struct burn_drive *d, int lba,
 int isoburn_emulate_toc(struct burn_drive *d, int flag)
 {
  int ret, image_size= 0, lba, track_blocks, session_count= 0, read_flag= 0;
- int scan_start= 0;
+ int scan_start= 0, scan_count= 0, probe_minus_16= 0, growisofs_nwa;
+ int with_enclosure= 0;
  struct isoburn *o;
- struct isoburn_toc_entry *item;
- char msg[160];
+ char msg[160], size_text[80], *sev;
+ time_t start_time, last_pacifier, now;
  
  /* is the media emulated multi-session ? */
  ret= isoburn_find_emulator(&o, d, 0);
@@ -1080,17 +1099,45 @@ int isoburn_emulate_toc(struct burn_drive *d, int flag)
  if(o->emulation_mode<=0 && !(flag&1))
    return(0);
 
+ start_time= last_pacifier= time(NULL);
  lba= 0;
  if(!(flag&2)) {
    ret= isoburn_read_iso_head(d, lba, &image_size, NULL, 0);
    if(ret<=0)
      {ret= 0; goto failure;}
    lba= Libisoburn_overwriteable_starT;
+   with_enclosure= 1;
  }
  while(lba<image_size || (flag&2)) {
+   now= time(NULL);
+   if(now - last_pacifier >= 5) {
+     last_pacifier= now;
+     if(scan_count>=10*512)
+       sprintf(size_text, "%.f MB", ((double) scan_count) / 512.0);
+     else
+       sprintf(size_text, "%.f kB", 2 * (double) scan_count);
+     sprintf(msg, "Found %d ISO sessions by scanning %s in %.f seconds",
+             session_count, size_text, (double) (now - start_time));
+     isoburn_msgs_submit(o, 0x00060000, msg, 0, "UPDATE", 0);
+   }
    read_flag= 0;
    if(flag&2)
-     read_flag= (1<<15)|((session_count>0)<<14);
+     read_flag|= (1<<15)|((session_count>0)<<14);
+   else {
+
+     /* growisofs aligns to 16 rather than 32. Overwriteable TOC emulation
+        relies on not accidentially seeing inter-session trash data.
+        But one can safely access 16 blocks earlier because a xorriso header
+        would have overwritten with the unused 16 blocks at its start.
+        If libisoburn alignment would increase, then this would not be
+        possible any more.
+     */
+
+     if(probe_minus_16)
+       read_flag|= (1<<14);
+     probe_minus_16= 0;
+   }
+
    ret= isoburn_read_iso_head(d, lba, &track_blocks, NULL, read_flag);
    if(ret<=0) {
      if(session_count>0) {
@@ -1098,6 +1145,7 @@ int isoburn_emulate_toc(struct burn_drive *d, int flag)
          if(ret==0) {
            /* try at next 64 k block (check both 32 k halves) */
            lba+= 32;
+           scan_count+= 32;
            if(lba-scan_start <= Libisoburn_toc_scan_max_gaP)
  continue;
          }
@@ -1106,38 +1154,56 @@ int isoburn_emulate_toc(struct burn_drive *d, int flag)
        sprintf(msg,
                "Chain of ISO session headers broken at #%d, LBA %ds",
                session_count+1, lba);
-       burn_msgs_submit(0x00060000, msg, 0, "WARNING", NULL);
+       isoburn_msgs_submit(o, 0x00060000, msg, 0, "WARNING", 0);
+
+       if(with_enclosure) {
+         ret= isoburn_make_toc_entry(o, &session_count, 0, image_size, 0);
+         if(ret<=0)
+           goto failure;
+       }
+ break; /* do not return failure */
+
      }
      {ret= 0; goto failure;}
    }
    if(ret==2) /* ISO header was found in first half block */
      lba-= 16;
-   ret= isoburn_toc_entry_new(&item, o->toc, 0);
-   if(ret<=0) {
-     burn_msgs_submit(0x00060000,
-                      "Not enough memory for emulated TOC entry object",
-                      0, "FATAL", NULL);
-     ret= -1; goto failure;
-   }
-   if(o->toc==NULL)
-     o->toc= item;
-   session_count++;
-   item->session= session_count;
-   item->track_no= session_count;
-   item->start_lba= lba;
-   item->track_blocks= track_blocks;
 
+   ret= isoburn_make_toc_entry(o, &session_count, lba, track_blocks, 0);
+   if(ret<=0)
+     goto failure;
    lba+= track_blocks;
+   scan_count+= 32;
+
+   /* growisofs aligns to 16 rather than 32 */
+   growisofs_nwa= lba;
+   if(growisofs_nwa % 16)
+     growisofs_nwa+= 16 - (growisofs_nwa % 16);
    if(lba % Libisoburn_nwa_alignemenT)
      lba+= Libisoburn_nwa_alignemenT - (lba % Libisoburn_nwa_alignemenT);
    scan_start= lba;
+   if(lba - growisofs_nwa == 16)
+     probe_minus_16= 1;
  }
- sprintf(msg,
-         "Chain of ISO session headers yielded %d sessions", session_count);
- burn_msgs_submit(0x00060000, msg, 0, "DEBUG", NULL);
+ if(last_pacifier != start_time)
+   sev= "UPDATE";
+ else
+   sev= "DEBUG";
+ now= time(NULL);
+ if(scan_count>=10*512)
+   sprintf(size_text, "%.f MB", ((double) scan_count) / 512.0);
+ else
+   sprintf(size_text, "%.f kB", 2 * (double) scan_count);
+ sprintf(msg, "Found %d ISO sessions by scanning %s in %.f seconds",
+         session_count, size_text, (double) (now - start_time));
+ isoburn_msgs_submit(o, 0x00060000, msg, 0, sev, 0);
  return(1);
 failure:;
  isoburn_toc_entry_destroy(&(o->toc), 1);
+ if(with_enclosure && o->emulation_mode == 1) {
+   session_count= 0;
+   ret= isoburn_make_toc_entry(o, &session_count, 0, image_size, 0);
+ }
  return(ret);
 }
 
@@ -1282,15 +1348,31 @@ failure:;
 int isoburn_toc_disc_get_sectors(struct isoburn_toc_disc *disc)
 {
  struct isoburn_toc_entry *t;
- int ret= 0;
+ int ret= 0, num_sessions, num_tracks;
+ struct burn_session **sessions;
+ struct burn_track **tracks;
+ struct burn_toc_entry entry;
 
  if(disc==NULL)
    return(0);
  if(disc->toc!=NULL) {
    for(t= disc->toc; t!=NULL; t= t->next)
      ret= t->start_lba + t->track_blocks;
- } else if(disc->disc!=NULL)
+ } else if(disc->disc!=NULL) {
+   sessions= burn_disc_get_sessions(disc->disc, &num_sessions);
+   if(num_sessions > 0) {
+     tracks = burn_session_get_tracks(sessions[num_sessions - 1],
+                                      &num_tracks);
+     if(num_tracks > 0) {
+       burn_track_get_entry(tracks[num_tracks - 1], &entry);
+       if(entry.extensions_valid & 1)
+         ret= entry.start_lba + entry.track_blocks;
+     }
+   }
+/*
    ret= burn_disc_get_sectors(disc->disc);
+*/
+ }
  return(ret);
 }
 
@@ -1415,11 +1497,34 @@ int isoburn_get_track_lba(struct isoburn_toc_track *track, int *lba, int flag)
 }
 
 
+int isoburn_drive_set_msgs_submit(struct burn_drive *d,
+                            int (*msgs_submit)(void *handle, int error_code, 
+                                               char msg_text[], int os_errno, 
+                                               char severity[], int flag),
+                            void *submit_handle, int submit_flag, int flag)
+{
+ struct isoburn *o;
+ int ret;
+
+ ret= isoburn_find_emulator(&o, d, 0);
+ if(ret<0 || o==NULL)
+   return(-1);
+ o->msgs_submit= msgs_submit;
+ o->msgs_submit_handle= submit_handle;
+ o->msgs_submit_flag= submit_flag;
+ return(1);
+}
+
+ 
+/* @param flag bit0= with adr_mode 3: adr_value might be 16 blocks too high
+               bit1= insist in seeing a disc object with at least one session
+               bit2= with adr_mode 4: use adr_value as regular expression
+*/
 int isoburn_set_msc1(struct burn_drive *d, int adr_mode, char *adr_value,
                      int flag)
 {
  int ret, num_sessions, num_tracks, adr_num, i, j, total_tracks;
- int lba, best_lba, size;
+ int lba, best_lba, size, re_valid= 0;
  char volid[33], msg[160];
  struct isoburn *o;
  struct isoburn_toc_disc *disc= NULL;
@@ -1427,6 +1532,8 @@ int isoburn_set_msc1(struct burn_drive *d, int adr_mode, char *adr_value,
  struct isoburn_toc_track **tracks= NULL;
  static char mode_names[][20]= {"auto", "session", "track", "lba", "volid"};
  static int max_mode_names= 4;
+ regex_t re;
+ regmatch_t match[1];
 
  ret= isoburn_find_emulator(&o, d, 0);
  if(ret<0)
@@ -1435,7 +1542,7 @@ int isoburn_set_msc1(struct burn_drive *d, int adr_mode, char *adr_value,
    return(-1);
 
  adr_num= atoi(adr_value);
- if(adr_mode!=3) {
+ if(adr_mode!=3 || (flag & 2)) {
    disc= isoburn_toc_drive_get_disc(d);
    if(disc==NULL) {
 not_found:;
@@ -1443,7 +1550,7 @@ not_found:;
        goto unknown_mode;
      sprintf(msg, "Failed to find %s %s", mode_names[adr_mode],
                   strlen(adr_value)<=80 ?  adr_value : "-oversized-string-");
-     burn_msgs_submit(0x00060000, msg, 0, "FAILURE", NULL);
+     isoburn_msgs_submit(o, 0x00060000, msg, 0, "FAILURE", 0);
      ret= 0; goto ex;
    }
    sessions= isoburn_toc_disc_get_sessions(disc, &num_sessions);
@@ -1486,9 +1593,21 @@ not_found:;
 
  } else if(adr_mode==3) {
    o->fabricated_msc1= adr_num;
-
+   if((flag & 1) && o->fabricated_msc1 >= 16) {
+     /* adr_num is possibly 16 blocks too high */
+     ret= isoburn_read_iso_head(d, o->fabricated_msc1, &size,volid, 1|(1<<14));
+     if(ret==2)
+       o->fabricated_msc1-= 16;
+   }
  } else if(adr_mode==4) {
    /* search for volume id that is equal to adr_value */
+   if(flag & 4) {
+     ret= regcomp(&re, adr_value, 0);
+     if(ret != 0)
+       flag&= ~4;
+     else
+       re_valid= 1;
+   }
    best_lba= -1;
    for(i=0; i<num_sessions; i++) {
      tracks= isoburn_toc_session_get_tracks(sessions[i], &num_tracks);
@@ -1499,8 +1618,14 @@ not_found:;
        ret= isoburn_read_iso_head(d, lba, &size, volid, 1);
        if(ret<=0)
      continue;
-       if(strcmp(volid, adr_value)!=0)
+       if(flag & 4) {
+         ret= regexec(&re, volid, 1, match, 0);
+         if(ret != 0)
      continue;
+       } else {
+         if(strcmp(volid, adr_value)!=0)
+     continue;
+       }
        best_lba= lba;
      }
    }
@@ -1511,14 +1636,71 @@ not_found:;
  } else {
 unknown_mode:;
    sprintf(msg, "Program error: Unknown msc1 address mode %d", adr_mode);
-   burn_msgs_submit(0x00060000, msg, 0, "FATAL", NULL);
+   isoburn_msgs_submit(o, 0x00060000, msg, 0, "FATAL", 0);
    ret= 0; goto ex;
  }
  ret= 1;
 ex:;
  if(disc!=NULL)
    isoburn_toc_disc_free(disc);
+ if((flag & 4) && re_valid)
+   regfree(&re);
  return(ret);
 }
 
 
+int isoburn_get_mount_params(struct burn_drive *d,
+                             int adr_mode, char *adr_value,
+                             int *lba, int *track, int *session,
+                             char volid[33], int flag)
+{
+ int msc1_mem, ret, total_tracks, num_sessions, num_tracks, i, j, track_lba;
+ int size, is_iso= 0;
+ struct isoburn *o;
+ struct isoburn_toc_disc *disc= NULL;
+ struct isoburn_toc_session **sessions= NULL;
+ struct isoburn_toc_track **tracks= NULL;
+
+ *lba= *track= *session= -1;
+ volid[0]= 0;
+ ret= isoburn_find_emulator(&o, d, 0);
+ if(ret < 0 || o == NULL)
+   return(-1);
+ msc1_mem= o->fabricated_msc1;
+ ret= isoburn_set_msc1(d, adr_mode, adr_value, 2 | (flag & 4));
+ if(ret <= 0)
+   return(ret);
+ *lba= o->fabricated_msc1;
+
+ disc= isoburn_toc_drive_get_disc(d);
+ if(disc==NULL) 
+   {ret= -1; goto ex;} /* cannot happen because checked by isoburn_set_msc1 */
+ sessions= isoburn_toc_disc_get_sessions(disc, &num_sessions);
+ if(sessions==NULL || num_sessions<=0)
+   {ret= -1; goto ex;} /* cannot happen because checked by isoburn_set_msc1 */
+ total_tracks= 0;
+ for(i=0; i<num_sessions && *session < 0; i++) {
+   tracks= isoburn_toc_session_get_tracks(sessions[i], &num_tracks);
+   if(tracks==NULL)
+ continue;
+   for(j= 0; j<num_tracks && *track < 0; j++) {
+     total_tracks++;
+     isoburn_get_track_lba(tracks[j], &track_lba, 0);
+     if(track_lba == *lba) {
+       *track= total_tracks;
+       *session= i + 1;
+     }
+   }
+ }
+ ret= isoburn_read_iso_head(d, *lba, &size, volid, 1);
+ if(ret <= 0)
+   volid[0]= 0;
+ else
+   is_iso= 1;
+
+ex:;
+ o->fabricated_msc1= msc1_mem;
+ return(2 - is_iso); 
+}
+
+

libisoburn/data_source.c

@@ -1,7 +1,8 @@
 /*
   data source for libisoburn.
 
-  Copyright 2007 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
+  Copyright 2007 - 2009 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
+                    and Thomas Schmitt <scdbackup@gmx.net>
 */
 
 #include <stdlib.h>
@@ -27,24 +28,24 @@
 #include "isoburn.h"
 
 
-/* Powers of 2 only ! Less than 16 makes not much sense. */
+/* Cached reading of image tree data */
+/* Multi tile:  32 * 64 kB */
+
+/* The size of a single tile.
+   Powers of 2 only ! Less than 16 makes not much sense.
+*/
 #define Libisoburn_tile_blockS 32
 
-/* Undef to get to older single tile version
+/* The number of tiles in the cache
 */
 #define Libisoburn_cache_tileS 32
 
+
 /* Debugging only: This reports cache loads on stderr.
 #define Libisoburn_read_cache_reporT 1
 */
 
 
-/* Cached reading of image tree data */
-
-#ifdef Libisoburn_cache_tileS
-
-/* Multi tile:  32 * 64 kB */
-
 struct isoburn_cache_tile {
  char cache_data[Libisoburn_tile_blockS * 2048];
  uint32_t cache_lba;
@@ -84,6 +85,19 @@ int ds_read_block(IsoDataSource *src, uint32_t lba, uint8_t *buffer)
 
  icd = (struct isoburn_cached_drive *) src->data;
  d = (struct burn_drive*) icd->drive;
+
+ if(d == NULL) {
+   /* This would happen if libisoburn saw output data in the fifo and
+      performed early drive release and afterwards libisofs still tries
+      to read data.
+      That would constitute a bad conceptual problem in libisoburn.
+   */
+   isoburn_msgs_submit(NULL, 0x00060000,
+     "Programming error: Drive released while libisofs still attempts to read",
+     0, "FATAL", 0);
+   return ISO_ASSERT_FAILURE;
+ }
+
  tiles = (struct isoburn_cache_tile *) icd->tiles;
 
  aligned_lba= lba & ~(Libisoburn_tile_blockS - 1);
@@ -133,6 +147,10 @@ int ds_read_block(IsoDataSource *src, uint32_t lba, uint8_t *buffer)
      return 1;
    tiles[oldest].last_error_lba = lba;
 
+#ifdef ISO_DATA_SOURCE_MISHAP
+   ret= ISO_DATA_SOURCE_MISHAP;
+#else
+   /* <<< pre libisofs-0.6.7 */
    /* It is not required by the specs of libisofs but implicitely assumed
       ...
       But it is not possible to ignore FAILURE.
@@ -145,10 +163,12 @@ int ds_read_block(IsoDataSource *src, uint32_t lba, uint8_t *buffer)
       enough to make it appear plausible.
    */
    ret= ISO_FILE_CANT_WRITE;
+#endif
+
    if(ret >= 0)
      ret = -1;
    sprintf(msg, "ds_read_block(%lu) returns %d", (unsigned long) lba, ret);
-   burn_msgs_submit(0x00060000, msg, 0, "DEBUG", NULL);
+   isoburn_msgs_submit(NULL, 0x00060000, msg, 0, "DEBUG", 0);
    return ret; 
  }
 
@@ -188,6 +208,19 @@ static void ds_free_data(IsoDataSource *src)
  src->data= NULL;
 }
 
+
+int isoburn_data_source_shutdown(IsoDataSource *src, int flag)
+{
+ struct isoburn_cached_drive *icd;
+
+ if(src==NULL)
+   return(0);
+ icd= (struct isoburn_cached_drive *) src->data;
+ icd->drive= NULL;
+ return(1);
+}
+
+
 IsoDataSource *isoburn_data_source_new(struct burn_drive *d)
 {
  IsoDataSource *ret;
@@ -234,139 +267,3 @@ static int ds_inc_age(struct isoburn_cached_drive *icd, int idx, int flag)
 }
 
 
-#else /* Libisoburn_cache_tileS */
-
-
-/* Single tile 128 kB */
-
-
-struct isoburn_cached_drive {
- struct burn_drive *drive;
-
- char cache_data[Libisoburn_tile_blockS * 2048];
- uint32_t cache_lba;
- uint32_t last_error_lba;
- uint32_t last_aligned_error_lba;
- int cache_hits;
-};
-
-
-/* Debugging only: This reports cache loads on stderr.
-#define Libisoburn_read_cache_reporT 1
-*/
-
-int 
-ds_read_block(IsoDataSource *src, uint32_t lba, uint8_t *buffer)
-{
- int ret;
- struct burn_drive *d;
- off_t count;
- uint32_t aligned_lba;
- char msg[80];
-
- struct isoburn_cached_drive *icd;
-
- if(src == NULL || buffer == NULL)
-   return -1;
-
- icd = (struct isoburn_cached_drive *) src->data;
- d = (struct burn_drive*) icd->drive;
-
- aligned_lba= lba & ~(Libisoburn_tile_blockS - 1);
- if(aligned_lba == icd->cache_lba && icd->cache_lba != 0xffffffff) {
-   (icd->cache_hits)++;
-   memcpy(buffer, icd->cache_data + (lba - aligned_lba) * 2048, 2048);
-   count= 2048;
-   return 1;
- } 
-
- icd->cache_lba= 0xffffffff; /* invalidate cache */
- if(icd->last_aligned_error_lba == aligned_lba) {
-   ret = 0;
- } else {
-   ret = burn_read_data(d, (off_t) aligned_lba * (off_t) 2048,
-                        (char *) icd->cache_data,
-                        Libisoburn_tile_blockS * 2048, &count, 0);
- }
- if (ret <= 0 ) {
-   icd->last_aligned_error_lba = aligned_lba;
-
-   /* Read-ahead failure ? Try to read 2048 directly. */
-   if(icd->last_error_lba == lba)
-     ret = 0;
-   else
-     ret = burn_read_data(d, (off_t) lba * (off_t) 2048, (char *) buffer,
-                        2048, &count, 0);
-   if (ret > 0)
-     return 1;
-   icd->last_error_lba = lba;
-   sprintf(msg, "ds_read_block(%lu) returns -1", (unsigned long) lba);
-   burn_msgs_submit(0x00060000, msg, 0, "DEBUG", NULL);
-   return -1;
- }
-
-#ifdef Libisoburn_read_cache_reporT
- fprintf(stderr, "After %3d hits, new load from %8x , count= %d\n",
-         icd->cache_hits, aligned_lba, (int) count);
-#endif
-
- icd->cache_lba= aligned_lba;
- icd->cache_hits= 1;
- memcpy(buffer, icd->cache_data + (lba - aligned_lba) * 2048, 2048);
- count= 2048;
-
- return 1;
-}
-
-
-static int
-ds_open(IsoDataSource *src)
-{
- /* nothing to do, device is always grabbed */
- return 1;
-}
-
-static int
-ds_close(IsoDataSource *src)
-{
- /* nothing to do, device is always grabbed */
- return 1;
-}
-
-static void 
-ds_free_data(IsoDataSource *src)
-{
- /* nothing to do */;
- if(src->data != NULL)
-   free(src->data);
- src->data= NULL;
-}
-
-IsoDataSource *
-isoburn_data_source_new(struct burn_drive *d)
-{
- IsoDataSource *ret;
- struct isoburn_cached_drive *icd= NULL;
-
- if (d==NULL)
-   return NULL;
- ret = malloc(sizeof(IsoDataSource));
- icd = calloc(1,sizeof(struct isoburn_cached_drive));
- if (ret == NULL || icd == NULL)
-   return NULL;
- ret->refcount = 1;
- ret->read_block = ds_read_block;
- ret->open = ds_open;
- ret->close = ds_close;
- ret->free_data = ds_free_data;
- ret->data = icd;
- icd->drive = d;
- icd->cache_lba = 0xffffffff;
- icd->cache_hits = 0;
- icd->last_error_lba = 0xffffffff;
- icd->last_aligned_error_lba = 0xffffffff;
- return ret;
-}
-
-#endif /* ! Libisoburn_cache_tileS */
-

libisoburn/isoburn.c

@@ -6,7 +6,7 @@
 /*
   Class core of libisoburn.
 
-  Copyright 2007 - 2008 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
+  Copyright 2007 - 2009 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
                         Thomas Schmitt <scdbackup@gmx.net>
 */
 
@@ -37,10 +37,16 @@
 
 #include "isoburn.h"
 
-/* No more: version numbers out of configure.ac
-   major.minor.micro now comes from libisoburn.h
-#include "../version.h"
+
+/* Default values for application provided msgs_submit methods.
+   To be attached to newly aquired drives.
 */
+int (*libisoburn_default_msgs_submit)
+    (void *handle, int error_code, char msg_text[],
+                 int os_errno, char severity[], int flag)= NULL;
+void *libisoburn_default_msgs_submit_handle= NULL;
+int libisoburn_default_msgs_submit_flag= 0;
+
 
 /* ----------------------- isoburn_toc_entry  ---------------------- */
 
@@ -53,9 +59,9 @@ int isoburn_toc_entry_new(struct isoburn_toc_entry **objpt,
  *objpt= o= (struct isoburn_toc_entry *)
             malloc(sizeof(struct isoburn_toc_entry));
  if(o==NULL) {
-   burn_msgs_submit(0x00060000,
-                    "Cannot allocate memory for isoburn toc entry",
-                    0, "FATAL", NULL);
+   isoburn_msgs_submit(NULL, 0x00060000,
+                       "Cannot allocate memory for isoburn toc entry",
+                       0, "FATAL", 0);
    return(-1);
  }
  o->session= 0;
@@ -104,15 +110,16 @@ int isoburn_new(struct isoburn **objpt, int flag)
 
  *objpt= o= (struct isoburn *) malloc(sizeof(struct isoburn));
  if(o==NULL) {
-   burn_msgs_submit(0x00060000,
-                    "Cannot allocate memory for isoburn control object",
-                    0, "FATAL", NULL);
+   isoburn_msgs_submit(NULL, 0x00060000,
+                       "Cannot allocate memory for isoburn control object",
+                       0, "FATAL", 0);
    return(-1);
  }
 
  o->drive= NULL;
  o->emulation_mode= 0;
  o->fabricated_msc1= -1;
+ o->fabricated_msc2= -1;
  o->zero_nwa= Libisoburn_overwriteable_starT;
  o->min_start_byte= o->zero_nwa * 2048;
  o->nwa= o->zero_nwa;
@@ -124,8 +131,12 @@ int isoburn_new(struct isoburn **objpt, int flag)
  for(i=0;i<Libisoburn_target_head_sizE;i++)
    o->target_iso_head[i]= 0;
  o->image= NULL;
+ o->iso_data_source= NULL;
  o->read_pacifier= NULL;
  o->read_pacifier_handle= NULL;
+ o->msgs_submit= NULL;
+ o->msgs_submit_handle= NULL;
+ o->msgs_submit_flag= 0;
  o->prev= NULL;
  o->next= NULL;
  ret= iso_image_new("ISOIMAGE", &o->image);
@@ -166,7 +177,8 @@ int isoburn_destroy(struct isoburn **objpt, int flag)
    isoburn_toc_entry_destroy(&(o->toc), 1); /* all */
  if(o->iso_source!=NULL)
    burn_source_free(o->iso_source);
-
+ if(o->iso_data_source!=NULL)
+   iso_data_source_unref(o->iso_data_source);
  free((char *) o);
  *objpt= NULL;
  return(1);
@@ -299,28 +311,81 @@ int isoburn_find_by_drive(struct isoburn **pt, struct burn_drive *d, int flag)
  return(0);
 }
 
+
+int isoburn_msgs_submit(struct isoburn *o, int error_code, char msg_text[],
+                        int os_errno, char severity[], int flag)
+{
+ int ret, use_drive_method= 0;
+
+ if(o!=NULL)
+   if(o->msgs_submit!=NULL)
+     use_drive_method= 1;
+ if(use_drive_method) {
+   ret= o->msgs_submit(o->msgs_submit_handle, error_code, msg_text, os_errno,
+                       severity, o->msgs_submit_flag);
+   return(ret);
+ }
+ if(libisoburn_default_msgs_submit != NULL) {
+   ret= libisoburn_default_msgs_submit(libisoburn_default_msgs_submit_handle,
+                                     error_code, msg_text, os_errno, severity,
+                                     libisoburn_default_msgs_submit_flag);
+   return(ret);
+ }
+ /* Fallback: use message queue of libburn */
+ burn_msgs_submit(error_code, msg_text, os_errno, severity, NULL);
+ return(1);
+}
+
+
+/* @param flag bit0= modifying rather than growing
+               bit1= prepare for early release of input drive:
+                     wait until input and then disable image data source
+*/
 static
-int isoburn_prepare_disc_aux(struct burn_drive *d, struct burn_disc **disc,
-                             struct isoburn_imgen_opts *opts, int new_img)
+int isoburn_prepare_disc_aux(struct burn_drive *in_d, struct burn_drive *out_d,
+                             struct burn_disc **disc,
+                             struct isoburn_imgen_opts *opts, int flag)
 {
  struct burn_source *wsrc;
  struct burn_session *session;
  struct burn_track *track;
- struct isoburn *o;
+ struct isoburn *in_o, *out_o;
  IsoWriteOpts *wopts= NULL;
  enum burn_disc_status state;
- int ret, fifo_chunks;
+ int ret, fifo_chunks, lba, nwa, i, new_img, early_indev_release;
+ uint32_t data_start= -1;
+ size_t buffer_size= 0, buffer_free= 0;
+ char msg[160];
 
- ret= isoburn_find_emulator(&o, d, 0);
- if(ret<0 || o==NULL)
+ new_img= flag&1;
+ early_indev_release= flag&2;
+ if(new_img && early_indev_release) {
+   isoburn_msgs_submit(in_o, 0x00060000,
+      "Programming error: Wrong session setup: new_img && early_indev_release",
+                       0, "FATAL", 0);
+   {ret= -4; goto ex;}
+ }
+
+ ret= isoburn_find_emulator(&in_o, in_d, 0);
+ if(ret<0 || in_o==NULL)
    {ret= -1; goto ex;}
- o->wrote_well= 0; /* early end will be registered as failure */
+ ret= isoburn_find_emulator(&out_o, out_d, 0);
+ if(ret<0 || out_o==NULL)
+   {ret= -1; goto ex;}
+ /* early end will be registered as failure */
+ in_o->wrote_well= out_o->wrote_well= 0;
 
- state = isoburn_disc_get_status(d);
- if (state != BURN_DISC_BLANK && state != BURN_DISC_APPENDABLE
-     && (state != BURN_DISC_FULL || ! new_img)) {
-   /* unsuitable status */
-   burn_msgs_submit(0x00060000, "Unsuitable media state", 0, "FAILURE", NULL);
+ state = isoburn_disc_get_status(in_d);
+ if (state != BURN_DISC_BLANK && state != BURN_DISC_APPENDABLE &&
+     state != BURN_DISC_FULL) {
+   isoburn_msgs_submit(in_o, 0x00060000, "Unsuitable source media state",
+                    0, "FAILURE", 0);
+   {ret= -2; goto ex;}
+ }
+ state = isoburn_disc_get_status(out_d);
+ if (state != BURN_DISC_BLANK && state != BURN_DISC_APPENDABLE) {
+   isoburn_msgs_submit(out_o, 0x00060000, "Unsuitable target media state",
+                    0, "FAILURE", 0);
    {ret= -2; goto ex;}
  }
  
@@ -340,6 +405,7 @@ int isoburn_prepare_disc_aux(struct burn_drive *d, struct burn_disc **disc,
  iso_write_opts_set_rockridge(wopts, opts->rockridge);
  iso_write_opts_set_joliet(wopts, opts->joliet);
  iso_write_opts_set_iso1999(wopts, opts->iso1999);
+ iso_write_opts_set_aaip(wopts, opts->aaip);
  iso_write_opts_set_omit_version_numbers(wopts, opts->omit_version_numbers);
  iso_write_opts_set_allow_deep_paths(wopts, opts->allow_deep_paths);
  iso_write_opts_set_allow_longer_paths(wopts, opts->allow_longer_paths);
@@ -349,6 +415,10 @@ int isoburn_prepare_disc_aux(struct burn_drive *d, struct burn_disc **disc,
  iso_write_opts_set_allow_full_ascii(wopts, opts->allow_full_ascii);
  iso_write_opts_set_relaxed_vol_atts(wopts, 1);
  iso_write_opts_set_joliet_longer_paths(wopts, opts->joliet_longer_paths);
+ iso_write_opts_set_always_gmt(wopts, opts->always_gmt);
+ iso_write_opts_set_rrip_version_1_10(wopts, opts->rrip_version_1_10);
+ iso_write_opts_set_dir_rec_mtime(wopts, opts->dir_rec_mtime);
+ iso_write_opts_set_aaip_susp_1_10(wopts, opts->aaip_susp_1_10);
  iso_write_opts_set_sort_files(wopts, opts->sort_files);
  iso_write_opts_set_replace_mode(wopts, opts->replace_dir_mode,
                 opts->replace_file_mode, opts->replace_uid, opts->replace_gid);
@@ -358,55 +428,71 @@ int isoburn_prepare_disc_aux(struct burn_drive *d, struct burn_disc **disc,
  iso_write_opts_set_default_gid(wopts, opts->gid);
  iso_write_opts_set_output_charset(wopts, opts->output_charset);
  iso_write_opts_set_fifo_size(wopts, fifo_chunks);
- 
- if (new_img) {
-   iso_write_opts_set_ms_block(wopts, 0);
-   opts->effective_lba= 0;
-   iso_write_opts_set_appendable(wopts, 0);
-   iso_write_opts_set_overwrite_buf(wopts, NULL);
- } else {
-   int lba, nwa;
-   ret = isoburn_disc_track_lba_nwa(d, NULL, 0, &lba, &nwa);
-   if (ret != 1) {
-     burn_msgs_submit(0x00060000, "Cannot determine next writeable address", 0,
-                      "FAILURE", NULL);
-     {ret= -3; goto ex;}
-   }
-   if (nwa == 0 && state == BURN_DISC_APPENDABLE) {
-     /* invalid nwa */
-     burn_msgs_submit(0x00060000,
-                      "Encountered 0 as next writeable address of appendable",
-                      0, "FAILURE", NULL);
-     {ret= -4; goto ex;}
-   }
-   iso_write_opts_set_ms_block(wopts, nwa);
-   opts->effective_lba= nwa;
-   iso_write_opts_set_appendable(wopts, 1);
-   iso_write_opts_set_overwrite_buf(wopts, o->target_iso_head);
- }
 
- ret = iso_image_create_burn_source(o->image, wopts, &wsrc);
+ ret = isoburn_disc_track_lba_nwa(out_d, NULL, 0, &lba, &nwa);
+ opts->effective_lba= nwa;
+ ret= isoburn_get_msc2(out_o, NULL, &nwa, 0);
+ if (ret != 1) {
+   isoburn_msgs_submit(out_o, 0x00060000,
+                   "Cannot determine next writeable address", 0, "FAILURE", 0);
+   {ret= -3; goto ex;}
+ }
+ iso_write_opts_set_ms_block(wopts, nwa);
+ iso_write_opts_set_appendable(wopts, !new_img);
+ iso_write_opts_set_overwrite_buf(wopts,
+                                  nwa>0 ? out_o->target_iso_head : NULL);
+
+ ret = iso_image_create_burn_source(in_o->image, wopts, &wsrc);
  if (ret < 0) {
    isoburn_report_iso_error(ret, "Cannot create burn source", 0, "FAILURE", 0);
    {ret= -1; goto ex;}
  }
+ if (early_indev_release) {
+   for(i= 0; i<300; i++) {
+
+     /* <<< ??? */
+     if((i%30) == 0) {
+       sprintf(msg, "Waiting for data in fifo since %d seconds", i/30);
+       isoburn_msgs_submit(in_o, 0x00060000, msg, 0, "DEBUG", 0);
+     }
+
+     usleep(100000);
+     ret= iso_ring_buffer_get_status(wsrc, &buffer_size, &buffer_free);
+     if(ret >0 && buffer_size != buffer_free)
+   break;
+   }
+
+   /* <<< ??? */
+   sprintf(msg,
+           "After %.1f seconds: %d bytes of output available (fifo state=%d)",
+           ((double) i+1) / 10.0, (int) (buffer_size - buffer_free), ret);
+   isoburn_msgs_submit(in_o, 0x00060000, msg, 0, "DEBUG", 0);
+
+   if(in_o->iso_data_source!=NULL)
+     isoburn_data_source_shutdown(in_o->iso_data_source, 0);
+ }
+
+ ret= iso_write_opts_get_data_start(wopts, &data_start, 0);
+ opts->data_start_lba= -1;
+ if(ret > 0 && data_start <= 0x7FFFFFFF)
+   opts->data_start_lba= data_start;
  
  /* TODO check return values for failure. propertly clean-up on error */
 
- o->iso_source= wsrc;
+ out_o->iso_source= wsrc;
 
  *disc = burn_disc_create();
  session = burn_session_create();
  burn_disc_add_session(*disc, session, BURN_POS_END);
  track = burn_track_create();
- burn_track_set_source(track, o->iso_source);
+ burn_track_set_source(track, out_o->iso_source);
  burn_session_add_track(session, track, BURN_POS_END);
 
  /* give up local references */
  burn_track_free(track);
  burn_session_free(session);
 
- o->wrote_well= -1; /* neutral */
+ in_o->wrote_well= out_o->wrote_well= -1; /* neutral */
  ret= 1;
 ex:
  if(wopts!=NULL)
@@ -414,39 +500,51 @@ ex:
  return ret;
 }
 
+
 int isoburn_prepare_disc(struct burn_drive *d, struct burn_disc **disc,
                          struct isoburn_imgen_opts *opts)
 {
-	return isoburn_prepare_disc_aux(d, disc, opts, 0);
+ return isoburn_prepare_disc_aux(d, d, disc, opts, 0);
 }
 
+
 int isoburn_prepare_new_image(struct burn_drive *d, struct burn_disc **disc,
                          struct isoburn_imgen_opts *opts,
                          struct burn_drive *out_drive)
 {
  int ret;
- struct isoburn *in_o, *out_o;
 
- ret= isoburn_prepare_disc_aux(d, disc, opts, 1);
+ ret= isoburn_prepare_disc_aux(d, out_drive, disc, opts, 1);
  if (ret<=0)
    return ret;
- /* Hand over source reference for optional fifo status inquiry */
- if(out_drive==NULL)
-   return 1;
- ret= isoburn_find_emulator(&out_o, out_drive, 0);
- if(ret<0 || out_o==NULL)
-   return 1;
- ret= isoburn_find_emulator(&in_o, d, 0);
- if(ret<0 || in_o==NULL)
-   return 1; /* then without fifo status inquiry */
- if(out_o->iso_source!=NULL)
-   burn_source_free(out_o->iso_source);
- out_o->iso_source= in_o->iso_source;
- in_o->iso_source= NULL;
  return 1; 
 }
 
 
+/* API since 0.2.2 */
+int isoburn_prepare_blind_grow(struct burn_drive *d, struct burn_disc **disc,
+                               struct isoburn_imgen_opts *opts,
+                               struct burn_drive *out_drive, int nwa)
+{  
+ int ret;
+ struct isoburn *o= NULL;
+
+ ret= isoburn_find_emulator(&o, out_drive, 0);
+ if(ret<0 || o==NULL)
+   return(-1);
+ if(nwa >= 0)
+   o->fabricated_msc2= nwa;
+ if(o->nwa == o->zero_nwa)
+   o->nwa= o->zero_nwa= 0;
+ else
+   o->zero_nwa= 0;
+ ret= isoburn_prepare_disc_aux(d, out_drive, disc, opts, 2);
+ if (ret<=0)
+   return ret;
+ return(1);
+}
+
+
 /* API @since 0.1.0
    @param flag bit0= this is a regular end, not an abort
                      give up source reference
@@ -532,13 +630,16 @@ int isoburn_ropt_new(struct isoburn_read_opts **new_o, int flag)
 
  o= (*new_o)= calloc(1, sizeof(struct isoburn_read_opts));
  if(o==NULL) {
-   burn_msgs_submit(0x00060000, "Cannot allocate memory for read options",
-                    0, "FATAL", NULL);
+   isoburn_msgs_submit(NULL, 0x00060000,
+                     "Cannot allocate memory for read options", 0, "FATAL", 0);
    return(-1);
  }
  o->norock= 0;
  o->nojoliet= 0;
  o->noiso1999= 1;
+ o->noaaip= 1;
+ o->noacl= 1;
+ o->noea= 1;
  o->preferjoliet= 0;
  o->uid= geteuid();
  o->gid= getegid();
@@ -572,6 +673,9 @@ int isoburn_ropt_set_extensions(struct isoburn_read_opts *o, int ext)
  o->noiso1999= !!(ext&4);
  o->preferjoliet= !!(ext&8);
  o->pretend_blank= !!(ext&16);
+ o->noaaip= !!(ext & 32);
+ o->noacl= !!(ext & 64);
+ o->noea= !!(ext & 128);
  return(1);
 }
 
@@ -579,7 +683,8 @@ int isoburn_ropt_set_extensions(struct isoburn_read_opts *o, int ext)
 int isoburn_ropt_get_extensions(struct isoburn_read_opts *o, int *ext)
 {
  *ext= (!!o->norock) | ((!!o->nojoliet)<<1) | ((!!o->noiso1999)<<2) |
-       ((!!o->preferjoliet)<<3) | ((!!o->pretend_blank)<<4);
+       ((!!o->preferjoliet)<<3) | ((!!o->pretend_blank)<<4) |
+       ((!!o->noaaip) << 5) | ((!!o->noacl) << 6) | ((!!o->noea) << 7);
  return(1);
 }
 
@@ -638,14 +743,28 @@ int isoburn_ropt_set_input_charset(struct isoburn_read_opts *o,
 }
 
 
-int isoburn_igopt_get_in_charset(struct isoburn_read_opts *o,
-                                 char **input_charset)
+int isoburn_ropt_get_input_charset(struct isoburn_read_opts *o,
+                                   char **input_charset)
 {
  *input_charset= o->input_charset;
  return(1);
 }
 
 
+int isoburn_ropt_set_auto_incharset(struct isoburn_read_opts *o, int mode)
+{
+ o->auto_input_charset= mode & 1;
+ return(1);
+}
+
+
+int isoburn_ropt_get_auto_incharset(struct isoburn_read_opts *o, int *mode)
+{
+ *mode= o->auto_input_charset;
+ return(1);
+}
+
+
 int isoburn_ropt_get_size_what(struct isoburn_read_opts *o,
                                uint32_t *size, int *has_what)
 {
@@ -669,9 +788,9 @@ int isoburn_igopt_new(struct isoburn_imgen_opts **new_o, int flag)
 
  o= (*new_o)= calloc(1, sizeof(struct isoburn_imgen_opts));
  if(o==NULL) {
-   burn_msgs_submit(0x00060000,
-                    "Cannot allocate memory for image generation options",
-                    0, "FATAL", NULL);
+   isoburn_msgs_submit(NULL, 0x00060000,
+                       "Cannot allocate memory for image generation options",
+                       0, "FATAL", 0);
    return(-1);
  }
  o->level= 2;
@@ -686,6 +805,10 @@ int isoburn_igopt_new(struct isoburn_imgen_opts **new_o, int flag)
  o->allow_lowercase= 0;
  o->allow_full_ascii= 0;
  o->joliet_longer_paths= 0;
+ o->always_gmt= 0;
+ o->rrip_version_1_10= 0;
+ o->dir_rec_mtime= 0;
+ o->aaip_susp_1_10= 0;
  o->sort_files= 0;
  o->replace_dir_mode= 0;
  o->replace_file_mode= 0;
@@ -695,9 +818,10 @@ int isoburn_igopt_new(struct isoburn_imgen_opts **new_o, int flag)
  o->file_mode= 0444;
  o->uid= 0;
  o->gid= 0;
- o->output_charset= 0;
+ o->output_charset= NULL;
  o->fifo_size= 4*1024*1024;
  o->effective_lba= -1;
+ o->data_start_lba= -1;
  return(1);
 }
 
@@ -731,13 +855,15 @@ int isoburn_igopt_set_extensions(struct isoburn_imgen_opts *o, int ext)
  o->rockridge= !!(ext&1);
  o->joliet= !!(ext&2);
  o->iso1999= !!(ext&4);
+ o->aaip= !!(ext & 32);
  return(1);
 }
 
 
 int isoburn_igopt_get_extensions(struct isoburn_imgen_opts *o, int *ext)
 {
- *ext= (!!o->rockridge) | ((!!o->joliet)<<1) | ((!!o->iso1999)<<2);
+ *ext= (!!o->rockridge) | ((!!o->joliet)<<1) | ((!!o->iso1999)<<2) |
+       ((!!o->aaip) << 5);
  return(1);
 }
 
@@ -752,6 +878,10 @@ int isoburn_igopt_set_relaxed(struct isoburn_imgen_opts *o, int relax)
  o->allow_lowercase= !!(relax&32);
  o->allow_full_ascii= !!(relax&64);
  o->joliet_longer_paths= !!(relax&128);
+ o->always_gmt= !!(relax & isoburn_igopt_always_gmt);
+ o->rrip_version_1_10= !!(relax & isoburn_igopt_rrip_version_1_10);
+ o->dir_rec_mtime= !!(relax & isoburn_igopt_dir_rec_mtime);
+ o->aaip_susp_1_10= !!(relax & isoburn_igopt_aaip_susp_1_10);
  return(1);
 }
 
@@ -761,7 +891,9 @@ int isoburn_igopt_get_relaxed(struct isoburn_imgen_opts *o, int *relax)
  *relax= (!!o->omit_version_numbers)    | ((!!o->allow_deep_paths)<<1) |
          ((!!o->allow_longer_paths)<<2) | ((!!o->max_37_char_filenames)<<3) |
          ((!!o->no_force_dots)<<4)      | ((!!o->allow_lowercase)<<5) |
-         ((!!o->allow_full_ascii)<<6)   | ((!!o->joliet_longer_paths)<<7);
+         ((!!o->allow_full_ascii)<<6)   | ((!!o->joliet_longer_paths)<<7) |
+         ((!!o->always_gmt)<<8)         | ((!!o->rrip_version_1_10)<<9) |
+         ((!!o->dir_rec_mtime)<<10)     | ((!!o->aaip_susp_1_10)<<11);
  return(1);
 }
 
@@ -864,3 +996,9 @@ int isoburn_igopt_get_effective_lba(struct isoburn_imgen_opts *o, int *lba)
 }
 
 
+int isoburn_igopt_get_data_start(struct isoburn_imgen_opts *o, int *lba)
+{
+ *lba= o->data_start_lba;
+ return(1);
+}
+

libisoburn/isoburn.h

@@ -60,9 +60,17 @@ struct isoburn {
  */
  int fabricated_msc1;
 
+ /* If >= 0, this address is used in isoburn_disc_track_lba_nwa()
+    as reply parameter nwa.
+    (The other nwa parameters below apply only to the effective write address
+     on random access media. msc2 is handed to libisofs but not to libburn.)
+ */
+ int fabricated_msc2;
+ 
+
  /* The nwa to be used for a first session on the present kind of overwriteable
     media (usually Libisoburn_overwriteable_starT, but might be forced to 0)
-  */
+ */
  int zero_nwa;
 
  /* Start address as given by image examination (bytes, not blocks) */
@@ -71,6 +79,7 @@ struct isoburn {
  /* Aligned start address to be used for processing (counted in blocks) */
  int nwa;
 
+
  /* Truncate to .nwa an eventual regular file serving as output drive */
  int truncate;
 
@@ -99,6 +108,10 @@ struct isoburn {
  /* Libisofs image context */
  IsoImage *image;
 
+ /* The block data source from which the existing image is read.
+ */
+ IsoDataSource *iso_data_source;
+
  /* The burn source which transfers data from libisofs to libburn.
     It has its own fifo.
  */
@@ -110,6 +123,12 @@ struct isoburn {
  /* For iso_image_attach_data() */
  void *read_pacifier_handle;
 
+ /* An application provided method to immediately deliver messages */
+ int (*msgs_submit)(void *handle, int error_code, char msg_text[],
+                    int os_errno, char severity[], int flag);
+ void *msgs_submit_handle;  /* specific to application method */
+ int msgs_submit_flag;      /* specific to application method */
+
 };
 
 
@@ -168,6 +187,11 @@ int isoburn_invalidate_iso(struct isoburn *o, int flag);
 int isoburn_find_emulator(struct isoburn **pt,
                           struct burn_drive *drive, int flag);
 
+/* Deliver an event message. Either via a non-NULL o->msgs_submit() method 
+   or via burn_msgs_submit() of libburn.
+*/
+int isoburn_msgs_submit(struct isoburn *o, int error_code, char msg_text[], 
+                        int os_errno, char severity[], int flag);
 
 /** Set the start address for an emulated add-on session. The value will
     be rounded up to the alignment necessary for the media. The aligned
@@ -179,6 +203,19 @@ int isoburn_find_emulator(struct isoburn **pt,
 */
 int isoburn_set_start_byte(struct isoburn *o, off_t value, int flag);
 
+/** Obtains the image address offset to be used with image generation.
+    This is either the (emulated) drive nwa or a value set by
+    isoburn_prepare_blind_grow().
+    In any case this is the address to tell to iso_write_opts_set_ms_block().
+    @param o     The isoburn object to be inquired
+    @param opts  If not NULL: write parameters to be set on drive before query
+    @param msc2  The value to be used with iso_write_opts_set_ms_block()
+    @param flag  unused yet
+    @return <=0 is failure , >0 success
+*/
+int isoburn_get_msc2(struct isoburn *o,
+                     struct burn_write_opts *opts, int *msc2, int flag);
+
 /** Get a data source suitable for read from a drive using burn_read_data()
     function.
     @param d drive to read from. Must be grabbed.
@@ -189,6 +226,19 @@ int isoburn_set_start_byte(struct isoburn *o, off_t value, int flag);
 IsoDataSource *
 isoburn_data_source_new(struct burn_drive *d);
 
+/** Disable read capabilities of a data source which was originally created
+    by isoburn_data_source_new(). After this any attempt to read will yield
+    a FATAL programming error event.
+    This is usually done to allow libburn to release the drive while libisofs
+    still holds a reference to the data source object. libisofs is not supposed
+    to use this object for reading any more, nevertheless. The disabled state
+    of the data source is a safety fence around this daring situation.
+    @param src The data source to be disabled
+    @param flag  unused yet
+    @return <=0 is failure , >0 success
+*/
+int isoburn_data_source_shutdown(IsoDataSource *src, int flag);
+
 
 /**
  * Options for image reading.
@@ -200,6 +250,12 @@ struct isoburn_read_opts {
     unsigned int norock:1; /*< Do not read Rock Ridge extensions */
     unsigned int nojoliet:1; /*< Do not read Joliet extensions */
     unsigned int noiso1999:1; /*< Do not read ISO 9660:1999 enhanced tree */
+
+    /* ts A90121 */
+    unsigned int noaaip:1;   /* Do not read AAIP for ACL and EA */
+    unsigned int noacl:1;    /* Do not read ACL from external file objects */
+    unsigned int noea:1;     /* Do not read XFS-style EA from externals */
+
     unsigned int preferjoliet:1; 
                 /*< When both Joliet and RR extensions are present, the RR
                  *  tree is used. If you prefer using Joliet, set this to 1. */
@@ -214,6 +270,15 @@ struct isoburn_read_opts {
      */
     char *input_charset;
 
+    /**
+     * Enable or disable methods to automatically choose an input charset.
+     * This eventually overrides input_charset.
+     *
+     * bit0= allow to set the input character set automatically from
+     *       attribute "isofs.cs" of root directory
+     */
+    int auto_input_charset;
+
     /* modified by the function isoburn_read_image */
     unsigned int hasRR:1; /*< It will be set to 1 if RR extensions are present,
                              to 0 if not. */
@@ -252,6 +317,9 @@ struct isoburn_imgen_opts {
     unsigned int joliet :1;
     unsigned int iso1999 :1;
 
+    /* ts A90121 */
+    unsigned int aaip:1;   /* Write eventual AAIP info containing ACL and EA */
+
     /* relaxed constraints */
 
     /*
@@ -307,6 +375,31 @@ struct isoburn_imgen_opts {
      */
     unsigned int joliet_longer_paths :1;
 
+    /**
+     * Store timestamps as GMT rather than in local time.
+     */
+    unsigned int always_gmt :1;
+
+    /**
+     * Write Rock Ridge info as of specification RRIP-1.10 rather than
+     * RRIP-1.12: signature "RRIP_1991A" rather than "IEEE_1282",
+     *            field PX without file serial number
+     */
+    unsigned int rrip_version_1_10 :1;
+
+    /**
+     * Store as ECMA-119 Directory Record timestamp the mtime
+     * of the source rather than the image creation time.
+     */
+    unsigned int dir_rec_mtime :1;
+
+    /**
+     * Write AAIP as extension according to SUSP 1.10 rather than SUSP 1.12.
+     * I.e. without announcing it by an ER field and thus without the need
+     * to preceed the RRIP fields by an ES and to preceed the AA field by ES.
+     */
+    unsigned int aaip_susp_1_10 :1;
+
     unsigned int sort_files:1;
                 /**< If files should be sorted based on their weight. */
 
@@ -346,12 +439,19 @@ struct isoburn_imgen_opts {
     int fifo_size;
 
 
-    /** Output value: Block address of session start as evaluatedfrom media
+    /** Output value: Block address of session start as evaluated from media
                       and other options by libisoburn and libburn.
         If <0 : Invalid
         If >=0: Valid block number. Block size is always 2 KiB.
     */
     int effective_lba;
+
+    /** Output value: Block address of data section start as predicted by
+                      libisofs.
+        If < 16: Invalid
+        If >=16: Valid block number. Block size is always 2 KiB.
+    */
+    int data_start_lba;
 };
 
 
@@ -369,8 +469,10 @@ struct isoburn_imgen_opts {
 
 /* Maximum gap to be bridged during a outer TOC scan. Gaps appear between the
    end of a session and the start of the next session.
+   The longest gap found so far was about 38100 after the first session of a
+   DVD-R.
 */
-#define Libisoburn_toc_scan_max_gaP 8192
+#define Libisoburn_toc_scan_max_gaP 65536
 
 
 /* Creating a chain of image headers which form a TOC:

libisoburn/isofs_wrap.c

@@ -6,7 +6,7 @@
 /*
   libisofs related functions of libisoburn.
 
-  Copyright 2007 - 2008  Vreixo Formoso Lopes <metalpain2002@yahoo.es>
+  Copyright 2007 - 2009  Vreixo Formoso Lopes <metalpain2002@yahoo.es>
                          Thomas Schmitt <scdbackup@gmx.net>
 */
 
@@ -27,6 +27,8 @@
 
 #endif /* Xorriso_standalonE */
 
+#define Libisoburn_with_aaiP yes
+
 #include "isoburn.h"
 #include "libisoburn.h"
 
@@ -121,18 +123,18 @@ int isoburn_read_image(struct burn_drive *d,
  IsoDataSource *ds= NULL;
  struct isoburn *o= NULL;
 
- if(read_opts==NULL) {
-   burn_msgs_submit(0x00060000,
-                    "Program error: isoburn_read_image: read_opts==NULL",
-                    0, "FATAL", NULL);
-   return(-1);
- }
  if(d != NULL) {
    ret = isoburn_find_emulator(&o, d, 0);
    if (ret < 0 || o == NULL)
      return 0;
    status = isoburn_disc_get_status(d);
  }
+ if(read_opts==NULL) {
+   isoburn_msgs_submit(o, 0x00060000,
+                       "Program error: isoburn_read_image: read_opts==NULL",
+                       0, "FATAL", 0);
+   return(-1);
+ }
  if (d == NULL || status == BURN_DISC_BLANK || read_opts->pretend_blank) {
 create_blank_image:;
    /*
@@ -142,9 +144,9 @@ create_blank_image:;
    if (d == NULL) {
      /* New empty image without relation to a drive */
      if (image==NULL) {
-       burn_msgs_submit(0x00060000,
-                        "Program error: isoburn_read_image: image==NULL",
-                    0, "FATAL", NULL);
+       isoburn_msgs_submit(o, 0x00060000,
+                           "Program error: isoburn_read_image: image==NULL",
+                           0, "FATAL", 0);
        return -1;
      }
      /* create a new image */
@@ -166,13 +168,15 @@ create_blank_image:;
        iso_image_ref(*image); /*protects object from premature free*/
      }
    }
+   iso_image_set_ignore_aclea(*image,
+                         (!!(read_opts->noacl)) | ((!!read_opts->noea) << 1) );
    return 1;
  }
  
  if (status != BURN_DISC_APPENDABLE && status != BURN_DISC_FULL) {
-   burn_msgs_submit(0x00060000,
+   isoburn_msgs_submit(o, 0x00060000,
                     "Program error: isoburn_read_image: incorrect disc status",
-                    0, "FATAL", NULL);
+                    0, "FATAL", 0);
    return -4;	
  }
  
@@ -185,7 +189,7 @@ create_blank_image:;
  ret = isoburn_read_iso_head(d, int_num, &dummy, NULL, 0);
  if (ret <= 0) {
    sprintf(msg, "No ISO 9660 image at LBA %d. Creating blank image.", int_num);
-   burn_msgs_submit(0x00060000, msg, 0, "WARNING", NULL);
+   isoburn_msgs_submit(o, 0x00060000, msg, 0, "WARNING", 0);
    goto create_blank_image;
  }
 
@@ -198,6 +202,11 @@ create_blank_image:;
  /* Important: do not return until iso_read_opts_free() */
  iso_read_opts_set_start_block(ropts, ms_block);
  iso_read_opts_set_no_rockridge(ropts, read_opts->norock);
+
+#ifdef Libisoburn_with_aaiP
+ iso_read_opts_set_no_aaip(ropts, read_opts->noaaip);
+#endif /* Libisoburn_with_aaiP */
+
  iso_read_opts_set_no_joliet(ropts, read_opts->nojoliet);
  iso_read_opts_set_no_iso1999(ropts, read_opts->noiso1999);
  iso_read_opts_set_preferjoliet(ropts, read_opts->preferjoliet);
@@ -206,12 +215,12 @@ create_blank_image:;
  iso_read_opts_set_default_uid(ropts, read_opts->uid);
  iso_read_opts_set_default_gid(ropts, read_opts->gid);
  iso_read_opts_set_input_charset(ropts, read_opts->input_charset);
-
- /* <<< experimental API call of libisofs
- iso_read_opts_set_error_behavior(ropts, 1);
- */
+ iso_read_opts_auto_input_charset(ropts, read_opts->auto_input_charset);
 
  ds = isoburn_data_source_new(d);
+ if(o->iso_data_source!=NULL)
+   iso_data_source_unref(o->iso_data_source);
+ o->iso_data_source= ds;
  iso_image_attach_data(o->image, o->read_pacifier_handle,
                        isoburn_idle_free_function);
  if(o->read_pacifier_handle==NULL)
@@ -221,7 +230,7 @@ create_blank_image:;
  ret = iso_image_import(o->image, ds, ropts, &features);
  iso_tree_set_report_callback(o->image, NULL);
  iso_read_opts_free(ropts);
- iso_data_source_unref(ds);
+
  if (ret < 0) {
    isoburn_report_iso_error(ret, "Cannot import image", 0, "FAILURE", 0);
    return ret;
@@ -248,15 +257,15 @@ int isoburn_attach_image(struct burn_drive *d, IsoImage *image)
  int ret;
  struct isoburn *o;
 
- if (image == NULL) {
-   burn_msgs_submit(0x00060000,
-                    "Program error: isoburn_attach_image: image==NULL",
-                    0, "FATAL", NULL);
-   return -1;
- }
  ret = isoburn_find_emulator(&o, d, 0);
  if (ret < 0 || o == NULL)
    return 0;
+ if (image == NULL) {
+   isoburn_msgs_submit(o, 0x00060000,
+                       "Program error: isoburn_attach_image: image==NULL",
+                       0, "FATAL", 0);
+   return -1;
+ }
  if(o->image != NULL)
    iso_image_unref(o->image);
  o->image = image;
@@ -277,6 +286,8 @@ int isoburn_activate_session(struct burn_drive *drive)
 
  if (o->emulation_mode != 1)
    return 1; /* don't need to activate session */
+ if (o->fabricated_msc2 >= 0)
+   return 1; /* blind growing: do not alter anything outside the session */
  
  if (!(o->fabricated_disc_status == BURN_DISC_APPENDABLE ||
        (o->fabricated_disc_status == BURN_DISC_BLANK &&
@@ -304,9 +315,9 @@ int isoburn_start_emulation(struct isoburn *o, int flag)
  struct ecma119_pri_vol_desc *pvm;
  
  if(o==NULL) {
-   burn_msgs_submit(0x00060000,
-                    "Program error: isoburn_start_emulation: o==NULL",
-                    0, "FATAL", NULL);
+   isoburn_msgs_submit(NULL, 0x00060000,
+                       "Program error: isoburn_start_emulation: o==NULL",
+                       0, "FATAL", 0);
    return -1;
  }
 

libisoburn/libisoburn.h

@@ -2,7 +2,7 @@
 /*
   API definition of libisoburn.
 
-  Copyright 2007-2008 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
+  Copyright 2007-2009 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
                   and Thomas Schmitt <scdbackup@gmx.net>
 */
 
@@ -75,23 +75,35 @@ job parameters. It rather states its desires which libisoburn tries to
 fulfill, or else will refuse to start the write run.
 
 
-                     Setup for Growing or Modifying
+              Setup for Growing, Modifying or Blind Growing
 
-The connector function family offers two alternative API calls for performing
-the setup for two alternative image generation strategies.
+The connector function family offers alternative API calls for performing
+the setup for several alternative image generation strategies.
 
 Growing:
-If input and output drive is the same, then isoburn_prepare_disc() is to
+If input and output drive are the same, then isoburn_prepare_disc() is to
 be used. It will lead to an add-on session on appendable or overwriteable
 media with existing ISO image. With blank media it will produce a first
 session.
 
 Modifying:
-If the output drive is not the input drive, then it has to bear blank media
-or overwriteable without a valid ISO image. To prepare for such an image
-generation run, use isoburn_prepare_new_image(). The run will copy file data
-from an eventual input drive with valid image, add any newly introduced data
-from the local filesystem, and produce a first session on output media.
+If the output drive is not the input drive, and if it bears blank media
+or overwriteable without a valid ISO image, then one may produce a consolidated
+image with old and new data. This will copy file data from an eventual input
+drive with valid image, add any newly introduced data from the local
+filesystem, and produce a first session on output media.
+To prepare for such an image generation run, use isoburn_prepare_new_image().
+
+Blind Growing:
+This method reads the old image from one drive and writes the add-on session
+to a different drive. That output drive is nevertheless supposed to
+finally lead to the same media from where the session was loaded. Usually it
+will be stdio:/dev/fd/1 (i.e. stdout) being piped into some burn program
+like with this classic gesture:
+  mkisofs -M $dev -C $msc1,$nwa | cdrecord -waiti dev=$dev
+Blind growing is prepared by the call isoburn_prepare_blind_grow().
+The input drive should be released immediately after this call in order
+to allow the consumer of the output stream to access that drive for writing.
 
 After either of these setups, some peripheral libburn drive parameter settings
 like  burn_write_opts_set_simulate(),  burn_write_opts_set_multi(),
@@ -112,6 +124,22 @@ One should inquire isoburn_drive_wrote_well() to learn about overall success.
 Finally one must call isoburn_activate_session() which will complete any
 eventual multi-session emulation.
 
+
+                         Application Constraints
+
+Applications shall include libisofs/libisofs.h , libburn/libburn.h and this
+file itself: libisoburn/libisoburn.h .
+They shall link with -lisofs -lburn -lisoburn or with the .o files emerging
+from building those libraries from their sources.
+
+Applications must use 64 bit off_t, e.g. on 32-bit Linux by defining
+  #define _LARGEFILE_SOURCE
+  #define _FILE_OFFSET_BITS 64
+or take special precautions to interface with the library by 64 bit integers
+where above .h files prescribe off_t. Not to use 64 bit file i/o will keep 
+the application from producing and processing ISO images of more than 2 GB 
+size.
+
 */
 
 
@@ -188,15 +216,15 @@ void isoburn_version(int *major, int *minor, int *micro);
 */
 #define isoburn_libisofs_req_major  0
 #define isoburn_libisofs_req_minor  6
-#define isoburn_libisofs_req_micro  4
+#define isoburn_libisofs_req_micro 18 
 
 /** The minimum version of libburn to be used with this version of libisoburn
     at compile time.
     @since 0.1.0
 */
 #define isoburn_libburn_req_major  0
-#define isoburn_libburn_req_minor  4
-#define isoburn_libburn_req_micro  7
+#define isoburn_libburn_req_minor  6
+#define isoburn_libburn_req_micro  4
 
 
 /** The minimum version of libisofs to be used with this version of libisoburn
@@ -231,8 +259,8 @@ int isoburn_libburn_req(int *major, int *minor, int *micro);
     @since 0.1.0
 */
 #define isoburn_header_version_major  0
-#define isoburn_header_version_minor  1
-#define isoburn_header_version_micro  5
+#define isoburn_header_version_minor  3
+#define isoburn_header_version_micro  8
 /** Note:
     Above version numbers are also recorded in configure.ac because libtool
     wants them as parameters at build time.
@@ -298,6 +326,24 @@ and would leave out the ugly compile time traps.
 */
 
 
+/** Announce to the library an application provided method for immediate
+    delivery of messages. It is used when no drive is affected directly or
+    if the drive has no own msgs_submit() method attached by
+    isoburn_drive_set_msgs_submit.
+    If no method is preset or if the method is set to NULL then libisoburn
+    delivers its messages through the message queue of libburn.
+    @param msgs_submit   The function call which implements the method
+    @param submit_handle Handle to be used as first argument of msgs_submit
+    @param submit_flag   Flag to be used as last argument of msgs_submit
+    @param flag          Unused yet, submit 0
+    @since 0.2.0
+*/
+int isoburn_set_msgs_submit(int (*msgs_submit)(void *handle, int error_code,
+                                                  char msg_text[], int os_errno,
+                                                  char severity[], int flag),
+                               void *submit_handle, int submit_flag, int flag);
+
+
 /** Aquire a target drive by its filesystem path resp. libburn persistent
     address.
     Wrapper for: burn_drive_scan_and_grab()
@@ -306,7 +352,8 @@ and would leave out the ugly compile time traps.
                   (cdrom/burner). Thus use with driveno 0 only. On failure
                   the array has no valid elements at all.
                   The returned array should be freed via burn_drive_info_free()
-                  when the drive is no longer needed.
+                  when the drive is no longer needed. But before this is done
+                  one has to call isoburn_drive_release(drive_infos[0].drive).
     @param adr    The persistent address of the desired drive.
     @param load   1 attempt to load the disc tray. 0 no attempt,rather failure.
     @return       1 = success , 0 = drive not found , <0 = other error
@@ -323,7 +370,8 @@ int isoburn_drive_scan_and_grab(struct burn_drive_info *drive_infos[],
                   (cdrom/burner). Thus use with driveno 0 only. On failure
                   the array has no valid elements at all.
                   The returned array should be freed via burn_drive_info_free()
-                  when the drive is no longer needed.
+                  when the drive is no longer needed. But before this is done
+                  one has to call isoburn_drive_release(drive_infos[0].drive).
     @param adr    The persistent address of the desired drive.
     @param flag   bit0= attempt to load the disc tray.
                         Else: failure if not loaded.
@@ -334,23 +382,46 @@ int isoburn_drive_scan_and_grab(struct burn_drive_info *drive_infos[],
                         table of content by scanning for ISO image headers.
                         (depending on media type and drive this might
                          help or it might make the resulting toc even worse)
+                  bit4= do not emulate table of content on overwriteable media
+                  bit5= ignore ACL from external filesystems
+                  bit6= ignore POSIX Extended Attributes from external
+                        filesystems
     @return       1 = success , 0 = drive not found , <0 = other error
 */
 int isoburn_drive_aquire(struct burn_drive_info *drive_infos[],
                                 char* adr, int flag);
 
-
 /** Aquire a drive from the burn_drive_info[] array which was obtained by
     a previous call of burn_drive_scan(). 
     Wrapper for: burn_drive_grab()
     @since 0.1.0
     @param drive The drive to grab. E.g. drive_infos[1].drive .
+                 Call isoburn_drive_release(drive) when it it no longer needed.
     @param load  1 attempt to load the disc tray. 0 no attempt, rather failure.
     @return      1 success, <=0 failure
 */
 int isoburn_drive_grab(struct burn_drive *drive, int load);
 
 
+/** Attach to a drive an application provided method for immediate
+    delivery of messages.
+    If no method is set or if the method is set to NULL then libisoburn
+    delivers messages of the drive through the global msgs_submit() method
+    set by isoburn_set_msgs_submiti() or by the message queue of libburn.
+    @since 0.2.0
+    @param d     The drive to which this function, handle and flag shall apply
+    @param msgs_submit   The function call which implements the method
+    @param submit_handle Handle to be used as first argument of msgs_submit
+    @param submit_flag   Flag to be used as last argument of msgs_submit
+    @param flag          Unused yet, submit 0
+*/
+int isoburn_drive_set_msgs_submit(struct burn_drive *d,
+                            int (*msgs_submit)(void *handle, int error_code,
+                                               char msg_text[], int os_errno,
+                                               char severity[], int flag),
+                            void *submit_handle, int submit_flag, int flag);
+
+
 /** Inquire the media status. Expect the whole spectrum of libburn BURN_DISC_*
     with multi-session media. Emulated states with random access media are
     BURN_DISC_BLANK and BURN_DISC_APPENDABLE.
@@ -385,7 +456,7 @@ int isoburn_disc_erasable(struct burn_drive *d);
 void isoburn_disc_erase(struct burn_drive *drive, int fast);
 
 
-/** Program isoburn_disc_get_msc1() to return a fabricated value.
+/** Set up isoburn_disc_get_msc1() to return a fabricated value.
     This makes only sense between aquiring the drive and reading the
     image. After isoburn_read_image() it will confuse the coordination
     of libisoburn and libisofs.
@@ -401,8 +472,14 @@ void isoburn_disc_erase(struct burn_drive *drive, int fast);
                     3= adr_value itself is the lba to be used
                     4= start lba of last session with volume id
                        given by adr_value
-    @parm adr_value A string describing the value to be eventually used.
-    @param flag Bitfield for control purposes. Unused yet. Submit 0.
+    @param adr_value A string describing the value to be eventually used.
+    @param flag Bitfield for control purposes.
+                bit0= @since 0.2.2
+                      with adr_mode 3: adr_value might be 16 blocks too high
+                      (e.g. -C stemming from growisofs). Probe for ISO head
+                      at adr_value-16 and eventually adjust setting. 
+                bit1= insist in seeing a disc object with at least one session
+                bit2= with adr_mode 4: use adr_value as regular expression
 */
 int isoburn_set_msc1(struct burn_drive *d, int adr_mode, char *adr_value,
                      int flag);
@@ -450,7 +527,8 @@ struct isoburn_toc_disc *isoburn_toc_drive_get_disc(struct burn_drive *d);
 
 
 /** Tell the number of 2048 byte blocks covered by the table of content.
-    Wrapper for: burn_disc_get_sectors()
+    This number includes the eventual gaps between sessions and tracks.
+    So this call is not really a wrapper for burn_disc_get_sectors().
     @since 0.1.6
     @param disc The master handle of the media
     @return number of blocks, <=0 indicates unknown or unreadable state
@@ -501,7 +579,7 @@ struct isoburn_toc_track **isoburn_toc_session_get_tracks(
                                       struct isoburn_toc_session *s, int *num);
 
 
-/** Obtain a copy of the entry which describes a particular itrack.
+/** Obtain a copy of the entry which describes a particular track.
     Wrapper for: burn_track_get_entry()
     @since 0.1.6
     @param s The track handle
@@ -522,7 +600,7 @@ void isoburn_toc_track_get_entry(struct isoburn_toc_track *t,
 void isoburn_toc_disc_free(struct isoburn_toc_disc *disc);
 
 
-/** Try whether at the data at the given address look like a ISO 9660
+/** Try whether the data at the given address look like a ISO 9660
     image header and obtain its alleged size. Depending on the info mode
     one other string of text information can be retrieved too.
     @since 0.1.6
@@ -531,14 +609,50 @@ void isoburn_toc_disc_free(struct isoburn_toc_disc *disc);
     @param image_blocks  The number of 2048 bytes blocks
     @param info  Caller provided memory, enough to take eventual info reply
     @param flag bit0-7: info return mode
-                0= do not return anything in info (do not even touch it)
-                1= return volume id (info needs 33 bytes)
-    @return 1 seems to be a valid ISO image , 0 format not recognized, <0 error
+                 0= do not return anything in info (do not even touch it)
+                 1= copy volume id to info (info needs 33 bytes)
+                 2= @since 0.2.2 :
+                    copy 64 kB header to info (needs 65536 bytes) 
+                bit13= @since 0.2.2:
+                      do not read head from media but use first 64 kB from info
+                bit14= check both half buffers (not only second)
+                       return 2 if found in first block
+                bit15= return-1 on read error
+    @return >0 seems to be a valid ISO image, 0 format not recognized, <0 error
 */
 int isoburn_read_iso_head(struct burn_drive *d, int lba,
                           int *image_blocks, char *info, int flag);
 
 
+/** Try to convert the given entity address into various entity addresses
+    which would describe it.
+    Note: Sessions and tracks are counted beginning with 1, not with 0.
+    @since 0.3.2
+    @param drive The drive where msc1 is to be set
+    @param adr_mode Determines how to interpret the input adr_value.
+                    If adr_value shall represent a number then decimal ASCII
+                    digits are expected.
+                    0= start lba of last session in TOC, ignore adr_value
+                    1= start lba of session number given by adr_value
+                    2= start lba of track given number by adr_value
+                    3= adr_value itself is the lba to be used
+                    4= start lba of last session with volume id
+                       given by adr_value
+    @param adr_value A string describing the value to be eventually used.
+    @param lba       returns the block address of the entity, -1 means invalid
+    @param track     returns the track number of the entity, -1 means invalid
+    @param session   returns the session number of the entity, -1 means invalid
+    @param volid     returns the volume id of the entity if it is a ISO session
+    @param flag      Bitfield for control purposes.
+                     bit2= with adr_mode 4: use adr_value as regular expression
+    @return          <=0 error , 1 ok, ISO session, 2 ok, not an ISO session
+*/
+int isoburn_get_mount_params(struct burn_drive *d,
+                             int adr_mode, char *adr_value,
+                             int *lba, int *track, int *session,
+                             char volid[33], int flag);
+
+
 /* ----------------------------------------------------------------------- */
 /*
 
@@ -587,6 +701,18 @@ int isoburn_ropt_destroy(struct isoburn_read_opts **o, int flag);
                      tree is used. If you prefer using Joliet, set this to 1.
                bit4= pretend_blank
                      Always create empty image.Ignore any image on input drive.
+               bit5= noaaip
+                     @since 0.3.4
+                     Do not load AAIP information from image. This information
+                     eventually contains ACL or XFS-style Extended Attributes.
+               bit6= noacl
+                     @since 0.3.4
+                     Do not obtain ACL from external filesystem objects (e.g.
+                     local filesystem files).
+               bit7= noea
+                     @since 0.3.4
+                     Do not obtain XFS-style Extended Attributes from external
+                     filesystem objects (e.g.  local filesystem files).
     @return    1 success, <=0 failure
 */
 #define isoburn_ropt_norock         1
@@ -594,6 +720,10 @@ int isoburn_ropt_destroy(struct isoburn_read_opts **o, int flag);
 #define isoburn_ropt_noiso1999      4
 #define isoburn_ropt_preferjoliet   8
 #define isoburn_ropt_pretend_blank 16
+#define isoburn_ropt_noaaip        32
+#define isoburn_ropt_noacl         64
+#define isoburn_ropt_noea         128
+
 int isoburn_ropt_set_extensions(struct isoburn_read_opts *o, int ext);
 int isoburn_ropt_get_extensions(struct isoburn_read_opts *o, int *ext);
 
@@ -634,7 +764,7 @@ int isoburn_ropt_get_default_dirperms(struct isoburn_read_opts *o,
 /** Set the character set for reading RR file names from ISO images.
     @since 0.1.0
     @param o             The option set to work on
-    @param input_charset Set this to NULL to use the default locale charset.
+    @param input_charset Set this to NULL to use the default locale charset
                          For selecting a particular character set, submit its
                          name, e.g. as listed by program iconv -l.
                          Example: "UTF-8". 
@@ -645,6 +775,20 @@ int isoburn_ropt_set_input_charset(struct isoburn_read_opts *o,
 int isoburn_ropt_get_input_charset(struct isoburn_read_opts *o,
                                    char **input_charset);
 
+/**
+    Enable or disable methods to automatically choose an input charset.
+    This eventually overrides the name set via isoburn_ropt_set_input_charset()
+    @since 0.3.8
+ 
+    @param mode   Bitfield for control purposes:
+                  bit0= allow to set the input character set automatically from
+                        attribute "isofs.cs" of root directory.
+                  Submit any other bits with value 0.
+    @return       1 success, <=0 failure
+ */
+int isoburn_ropt_set_auto_incharset(struct isoburn_read_opts *o, int mode);
+int isoburn_ropt_get_auto_incharset(struct isoburn_read_opts *o, int *mode);
+
 
 /** After calling function isoburn_read_image() there are informations
     available in the option set.
@@ -669,6 +813,13 @@ int isoburn_ropt_get_input_charset(struct isoburn_read_opts *o,
 #define isoburn_ropt_has_joliet    2
 #define isoburn_ropt_has_iso1999   4
 #define isoburn_ropt_has_el_torito 8
+
+/* ts A90122 */
+/* >>> to be implemented:
+#define isoburn_ropt_has_acl          64
+#define isoburn_ropt_has_ea          128
+*/
+
 int isoburn_ropt_get_size_what(struct isoburn_read_opts *o,
                                uint32_t *size, int *has_what);
 
@@ -736,11 +887,16 @@ int isoburn_igopt_get_level(struct isoburn_imgen_opts *o, int *level);
                  Weaker than RockRidge, but also readable with Linux.
            bit2= iso1999
                  This is rather exotic. Better do not surprise the readers.
+           bit5= aaip
+                 The libisofs specific SUSP based extension of ECMA-119 which
+                 can encode ACL and XFS-style Extended Attributes.
     @return 1 success, <=0 failure
 */
 #define isoburn_igopt_rockridge 1
 #define isoburn_igopt_joliet    2
 #define isoburn_igopt_iso1999   4
+/* ts A90122 */
+#define isoburn_igopt_aaip     32
 int isoburn_igopt_set_extensions(struct isoburn_imgen_opts *o, int ext);
 int isoburn_igopt_get_extensions(struct isoburn_imgen_opts *o, int *ext);
 
@@ -781,6 +937,27 @@ int isoburn_igopt_get_extensions(struct isoburn_imgen_opts *o, int *ext);
            bit7= joliet_longer_paths
                  Allow paths in the Joliet tree to have more than
                  240 characters.
+           bit8= always_gmt
+                 Write timestamps as GMT although the specs prescribe local
+                 time with eventual non-zero timezone offset. Negative
+                 timezones (west of GMT) can trigger bugs in some operating
+                 systems which typically appear in mounted ISO images as if
+                 the timezone shift from GMT was applied twice
+                 (e.g. in New York 22:36 becomes 17:36).
+           bit9= rrip_version_1_10
+                 Write Rock Ridge info as of specification RRIP-1.10 rather
+                 than RRIP-1.12: signature "RRIP_1991A" rather than
+                 "IEEE_1282", field PX without file serial number.
+          bit10= dir_rec_mtime
+                 Store as ECMA-119 Directory Record timestamp the mtime
+                 of the source rather than the image creation time.
+          bit11= aaip_susp_1_10
+                 Write AAIP fields without announcing AAIP by an ER field and
+                 without distinguishing RRIP fields from the AAIP field by
+                 prefixed ES fields. This saves 5 to 10 bytes per file and
+                 might avoid problems with readers which only accept RRIP.
+                 SUSP-1.10 allows it, SUSP-1.12 frowns on it.
+
     @return 1 success, <=0 failure
 */
 #define isoburn_igopt_omit_version_numbers       1
@@ -791,6 +968,10 @@ int isoburn_igopt_get_extensions(struct isoburn_imgen_opts *o, int *ext);
 #define isoburn_igopt_allow_lowercase           32
 #define isoburn_igopt_allow_full_ascii          64
 #define isoburn_igopt_joliet_longer_paths      128
+#define isoburn_igopt_always_gmt               256
+#define isoburn_igopt_rrip_version_1_10        512
+#define isoburn_igopt_dir_rec_mtime           1024
+#define isoburn_igopt_aaip_susp_1_10          2048
 int isoburn_igopt_set_relaxed(struct isoburn_imgen_opts *o, int relax);
 int isoburn_igopt_get_relaxed(struct isoburn_imgen_opts *o, int *relax);
 
@@ -893,6 +1074,21 @@ int isoburn_igopt_get_fifo_size(struct isoburn_imgen_opts *o, int *fifo_size);
 int isoburn_igopt_get_effective_lba(struct isoburn_imgen_opts *o, int *lba);
 
 
+/** Obtain after image preparation the lowest block address of file content
+    data. Failure can occur if libisofs is too old to provide this information,
+    if the result exceeds 31 bit, or if the call is made before image
+    preparation.
+    This value cannot be set by the application but only be inquired.
+    @since 0.3.6
+    @param o          The option set to work on
+    @param lba        The block number of the session start on media.
+                      <0 means that no address has been determined yet.
+    @return 1 success, <=0 failure
+*/
+int isoburn_igopt_get_data_start(struct isoburn_imgen_opts *o, int *lba);
+
+
+
 /* ----------------------------------------------------------------------- */
 /*                      End of Options for image generation                */
 /* ----------------------------------------------------------------------- */
@@ -992,9 +1188,13 @@ off_t isoburn_disc_available_space(struct burn_drive *d,
 
 
 /** Obtain the start block number of the most recent session on media. In
-    case of random access media this will always be 0. Succesfull return is
+    case of random access media this will normally be 0. Successfull return is
     not a guarantee that there is a ISO-9660 image at all. The call will fail,
-    nevertheless,if isoburn_disc_get_status() returns not BURN_DISC_APPENDABLE.
+    nevertheless,if isoburn_disc_get_status() returns not BURN_DISC_APPENDABLE
+    or BURN_DISC_FULL.
+    Note: The result of this call may be fabricated by a previous call of
+    isoburn_set_msc1() which can override the rule to load the most recent
+    session.
     Wrapper for: burn_disc_get_msc1()
     @since 0.1.0
     @param d         The drive to inquire
@@ -1032,7 +1232,8 @@ int isoburn_get_min_start_byte(struct burn_drive *d, off_t *start_byte,
                                int flag);
 
 
-/** Create a disc object for writing the new session from the created or loaded
+/** To choose the expansion method of Growing:
+    Create a disc object for writing the new session from the created or loaded
     iso_volset which has been manipulated via libisofs, to the same media from
     where the image was eventually loaded. This struct burn_disc is ready for
     use by a subsequent call to isoburn_disc_write().
@@ -1049,9 +1250,10 @@ int isoburn_prepare_disc(struct burn_drive *drive, struct burn_disc **disc,
                          struct isoburn_imgen_opts *opts);
 
 
-/** Create a disc object for producing a new image from a previous image
+/** To choose the expansion method of Modifying:
+    Create a disc object for producing a new image from a previous image
     plus the changes made by user. The generated burn_disc is suitable
-    to be written to any grabbed libburn drive with blank writeable media.
+    to be written to a grabbed drive with blank writeable media.
     But you must not use the same drive for input and output, because data
     will be read from the source drive while at the same time the target
     drive is already writing.
@@ -1059,15 +1261,11 @@ int isoburn_prepare_disc(struct burn_drive *drive, struct burn_disc **disc,
     is done and the drive is BURN_DRIVE_IDLE again after asynchronous
     burn_disc_write().
     @since 0.1.0
-    @param in_drive The input drive,grabbed with isoburn_drive_scan_and_grab().
+    @param in_drive The input drive, grabbed with isoburn_drive_aquire() or
+                    one of its alternatives.
     @param disc     Returns the newly created burn_disc object.
     @param opts     Options for image generation and data transport to media.
-    @param out_drive The libburn drive which shall be write target.
-                     If the drive was grabbed via libisoburn then it can later
-                     access the libisofs source fifo via
-                     isoburn_get_fifo_status().
-                     Mere libburn drives cannot obtain this info.
-                     In that case out_drive may be NULL, as well.
+    @param out_drive The output drive, from isoburn_drive_aquire() et.al..
     @return <=0 error , 1 = success
 */
 int isoburn_prepare_new_image(struct burn_drive *in_drive,
@@ -1075,11 +1273,55 @@ int isoburn_prepare_new_image(struct burn_drive *in_drive,
                               struct isoburn_imgen_opts *opts,
                               struct burn_drive *out_drive);
 
-/**                                                                @since 0.1.0
-    Revoke isoburn_prepare_new_image() or isoburn_prepare_disc() instead of
-    running isoburn_disc_write().
+
+/** To choose the expansion method of Blind Growing:
+    Create a disc object for writing an add-on session from the created or
+    loaded IsoImage which has been manipulated via libisofs, to a different
+    drive than the one from where it was loaded.
+    Usually output will be stdio:/dev/fd/1 (i.e. stdout) being piped
+    into some burn program like with this classic gesture:
+      mkisofs -M $dev -C $msc1,$nwa | cdrecord -waiti dev=$dev
+    Parameter translation into libisoburn:
+      $dev  is the address by which parameter in_drive of this call was aquired
+      $msc1 was set by isoburn_set_msc1() before image reading
+            or was detected from the in_drive media
+      $nwa  is a parameter of this call
+            or can be used as detected from the in_drive media
+
+    This call waits for libisofs output to become available and then detaches
+    the input drive object from the data source object by which libisofs was
+    reading from the input drive.
+    So, as far as libisofs is concerned, that drive may be released immediately
+    after this call in order to allow the consumer to access the drive for
+    writing.
+    The consumer should wait for input to become available and only then open
+    its burn drive. With cdrecord this is caused by option -waiti.
+  
+    The resulting burn_disc object has to be disposed when all its writing
+    is done and the drive is BURN_DRIVE_IDLE again after asynchronous
+    burn_disc_write().
+    @since 0.2.2
+    @param in_drive The input drive,grabbed with isoburn_drive_scan_and_grab().
+    @param disc     Returns the newly created burn_disc object.
+    @param opts     Options for image generation and data transport to media.
+    @param out_drive The output drive, from isoburn_drive_aquire() et.al..
+                    typically stdio:/dev/fd/1 .
+    @param nwa      The address (2048 byte block count) where the add-on
+                    session will be finally stored on a mountable media
+                    or in a mountable file.
+                    If nwa is -1 then the address is used as determined from
+                    the in_drive media.
+    @return <=0 error , 1 = success
+*/
+int isoburn_prepare_blind_grow(struct burn_drive *d, struct burn_disc **disc,
+                         struct isoburn_imgen_opts *opts,
+                         struct burn_drive *out_drive, int nwa);
+
+
+/**
+    Revoke isoburn_prepare_*() instead of running isoburn_disc_write().
     libisofs reserves resources and maybe already starts generating the
-    image stream when one of above two calls is performed. It is mandatory to
+    image stream when one of above three calls is performed. It is mandatory to
     either run isoburn_disc_write() or to revoke the preparations by the
     call described here.
     @since 0.1.0
@@ -1118,7 +1360,7 @@ void isoburn_disc_write(struct burn_write_opts *o, struct burn_disc *disc);
     Hint: If only burn_write_opts and not burn_drive is known, then the drive
           can be obtained by burn_write_opts_get_drive().
     @since 0.1.0
-    @parm d      The drive to which the track with the fifo gets burned.
+    @param d     The drive to which the track with the fifo gets burned.
     @param size  The total size of the fifo
     @param free_bytes  The current free capacity of the fifo
     @param status_text  Returns a pointer to a constant text, see below
@@ -1157,8 +1399,7 @@ int isoburn_drive_wrote_well(struct burn_drive *d);
 int isoburn_activate_session(struct burn_drive *drive);
 
 
-/**                                                                @since 0.1.0
-    Wait after normal end of operations until libisofs ended all write
+/** Wait after normal end of operations until libisofs ended all write
     threads and freed resource reservations.
     This call is not mandatory. But without it, messages from the ending
     threads might appear after the application ended its write procedure.
@@ -1174,21 +1415,6 @@ int isoburn_sync_after_write(struct burn_drive *input_drive,
                              struct burn_drive *output_drive, int flag);
 
 
-#if 0
-/* >>> NOT YET IMPLEMENTED <<< */
-/** Write a new session to a disc.
-    This is a synchronous call equivalent to isoburn_prepare_disc +
-    isoburn_disc_write + isoburn_activate_session
-    @param pacifier_func If not NULL: a function to produce appeasing messages.
-                         See burn_abort_pacifier() in libburn.h for an example.
-*/
-/* TODO implement this */
-int isoburn_perform_write(struct burn_write_opts *o,
-                          int (*pacifier_func)(void *handle, int patience, 
-                                               int elapsed));
-#endif /* 0 */
-
-
 /** Release an aquired drive.
     Wrapper for: burn_drive_release()
     @since 0.1.0

test/compare_file.c

@@ -117,7 +117,9 @@ int Compare_2_files(char *adr1, char *adr2, char *adrc, int flag)
  /* Attributes */
  if(s1.st_mode != s2.st_mode) {
    if((s1.st_mode&~S_IFMT)!=(s2.st_mode&~S_IFMT))
-     printf("%s : st_mode  :  %7.7o  <>  %7.7o\n", a, s1.st_mode, s2.st_mode);
+     printf("%s : st_mode  :  %7.7o  <>  %7.7o\n", a,
+             (unsigned int) (s1.st_mode & ~S_IFMT),
+             (unsigned int) (s2.st_mode & ~S_IFMT));
    if((s1.st_mode&S_IFMT)!=(s2.st_mode&S_IFMT))
      printf("%s : type     :  %s  <>  %s\n",
             a, Ftypetxt(s1.st_mode, 0), Ftypetxt(s2.st_mode, 0));

xorriso/README

@@ -4,8 +4,8 @@
 xorriso. By Thomas Schmitt <scdbackup@gmx.net>
 Integrated sub project of libburnia-project.org but also published via:
 http://scdbackup.sourceforge.net/xorriso_eng.html
-http://scdbackup.sourceforge.net/xorriso-0.1.5.tar.gz
-Copyright (C) 2006-2008 Thomas Schmitt, provided under GPL version 2.
+http://scdbackup.sourceforge.net/xorriso-0.3.8.pl00.tar.gz
+Copyright (C) 2006-2009 Thomas Schmitt, provided under GPL version 2.
 ------------------------------------------------------------------------------
 
 
@@ -14,13 +14,17 @@ filesystems into Rock Ridge enhanced ISO 9660 filesystems and allows
 session-wise manipulation of such filesystems. It can load the management
 information of existing ISO images and it writes the session results to
 optical media or to filesystem objects.
-
-Currently it is only supported on Linux with kernels >= 2.4.
+Vice versa xorriso is able to restore file objects from ISO 9660 filesystems.
 
 A special property of xorriso is that it needs neither an external ISO 9660
 formatter program nor an external burn program for CD or DVD but rather
 incorporates the libraries of libburnia-project.org .
 
+Currently it is fully supported on Linux with kernels >= 2.4 and on
+FreeBSD versions with ATAPI/CAM support enabled in the kernel, see atapicam(4).
+On other X/Open compliant systems there will only be POSIX i/o with disk
+file objects, but no direct MMC operation on CD/DVD/BD drives.
+
 By using this software you agree to the disclaimer at the end of this text:
 "... without even the implied warranty ..."
 
@@ -31,14 +35,21 @@ The most simple way to get xorriso from source code is the xorriso standalone
 tarball.
 
 Prerequisites:
-The tarball contains anything that is needed except libc and libpthread.
-libreadline and the readline-dev headers will make dialog mode more convenient,
-but are not mandatory.
+The tarball contains anything that is needed except the following system
+components:
+   libc, libpthread
+   plus on FreeBSD: libiconv, libcam
+Optional at compile time are:
+   libreadline and the readline-dev headers make dialog mode more convenient.
+   on Linux: libacl and libacl-devel allow getting and setting ACLs.
+   zlib and zlib-devel allow zisofs compression.
+If they were present at compile time, then the optional libraries have to
+be present at runtime, too.
 
-Obtain xorriso-0.1.5.tar.gz, take it to a directory of your choice and do:
+Obtain xorriso-0.3.8.pl00.tar.gz, take it to a directory of your choice and do:
 
-    tar xzf xorriso-0.1.5.tar.gz
-    cd xorriso-0.1.5
+    tar xzf xorriso-0.3.8.pl00.tar.gz
+    cd xorriso-0.3.8
 
 Within that directory execute:
 
@@ -52,8 +63,8 @@ which you may strip to reduce it in size
     strip ./xorriso/xorriso
 
 You may copy or move it to a directory where it can be found by the shell,
-you may execute xorriso at the place where it was built, or you may execute
-as superuser:
+or you may execute xorriso at the place where it was built,
+or you may execute as superuser:
     make install
 
 For general concepts, options and usage examples see
@@ -68,6 +79,32 @@ It gets installed with "make install" but may also be placed manually in the
 ./man1 directory below one of the directories mentioned in environment
 variable $MANPATH.
 
+The installation creates several alias links pointing to the xorriso binary:
+    xorrisofs  starts xorriso with -as mkisofs emulation already enabled
+    xorrecord  starts xorriso with -as cdrecord emulation already enabled
+    osirrox    starts with -osirrox image-to-disk copying already enabled
+
+If you want to avoid dependecy on libreadline although the libreadline
+development package is installed, then rather build xorriso by:
+    ./configure --prefix=/usr --disable-libreadline 
+    make clean ; make
+Never omit the "make clean" command after switching libreadline enabling.
+Other deliberate dependency reduction options of ./configure are:
+    --disable-libacl   avoid use of ACL functions like acl_to_text()
+    --disable-xattr    avoid use of xattr functions like listxattr()
+    --disable-zlib     avoid use of zlib functions like compress2()
+
+xorriso allows to use external processes as file content filters. This is
+a potential security risk which may be avoided by ./configure option
+    --disable-external-filters
+
+By default the filter feature is disabled if effective user id and real
+user id differ. This ban can be lifted by
+    --enable-external-filters-setuid
+
+If you want xorriso to report a "Build timestamp" with its option -version:
+    make buildstamped
+
 
                        Drives and Disk File Objects 
 
@@ -107,9 +144,14 @@ Better try to unmount an eventually mounted media before a write run.
 
 
 Besides true optical drives, xorriso can also address disk files as input or
-output drives. The addresses of the disk files have to be preceded by "stdio:".
+output drives. By default paths to files under /dev are accepted only if the
+device represents a real optical drive. Other device files may be addressed
+by prepending "stdio:" to the path.
 Like:
-    xorriso -dev stdio:/tmp/pseudo_drive ...more arguments...
+    xorriso -dev stdio:/dev/sdb ...more arguments...
+This rule may be changed by xorriso option -drive_class.
+Prefix "mmc:" causes a path to be accepted only if it is a real optical drive
+which is accessible by generic SCSI/MMC commands.
 
 
                               Testing
@@ -141,6 +183,26 @@ and vice versa:
    | less
 
 
+                             File Formats
+
+Currently there is only one file format peculiar to xorriso : sector maps
+which describe the valid and invalid blocks on a media or a disk copy of
+a media. xorriso creates and reads these file with its option -check_media.
+
+The file begins with 32 bytes of cleartext of which the last one is a
+newline character. The first 25 say "xorriso sector bitmap v2 ", the
+remaining six characters give the size of the info text as decimal number.
+This number of bytes follows the first 32 and will not be interpreted
+by xorriso. They are rather to inform a human reader about the media type
+and its track layout.
+After the info text there are two 4 byte signed integers, most significant
+byte first. The first one, N, gives the number of bits in the following bitmap
+and the second number S gives the number of 2 KiB blocks governed by a single
+bit in the map. Then come the bits in form of 8-bit bytes.
+Data block M is covered by bit B=M/S in the map, bit number B is stored in
+byte B/8 as bit B%8. A valid readable data block has its bit set to 1.
+
+
                              libisoburn
 
 xorriso is based on libisofs which does ISO 9600 filesystem aspects and on
@@ -160,9 +222,9 @@ and a matching dynamically linked xorriso binary.
 This binary is leaner but depends on properly installed libraries of suitable
 revision.
 
-Dynamic library and compile time header requirements for libisoburn-0.1.5 :
-- libburn.so.4  , version libburn-0.4.4 or higher
-- libisofs.so.6 , version libisofs-0.6.4 or higher
+Dynamic library and compile time header requirements for libisoburn-0.3.8 :
+- libburn.so.4  , version libburn-0.6.4 or higher
+- libisofs.so.6 , version libisofs-0.6.18 or higher
 libisoburn and xorriso will not start with libraries which are older than their
 headers seen at compile time. So compile in the oldest possible installation
 setup unless you have reason to enforce a newer bug fix level.
@@ -191,7 +253,7 @@ libburnia-project.org
 By Mario Danic           <mario.danic@gmail.com>,
    Vreixo Formoso        <metalpain2002@yahoo.es>
    Thomas Schmitt        <scdbackup@gmx.net>
-Copyright (C) 2006-2008 Mario Danic, Vreixo Formoso, Thomas Schmitt.
+Copyright (C) 2006-2009 Mario Danic, Vreixo Formoso, Thomas Schmitt.
 
 libburnia-project.org is inspired by and in other components still containing
 parts of old

xorriso/compile_xorriso.sh

@@ -1,27 +1,31 @@
 #!/bin/sh
 
 # compile_xorriso.sh
-# Copyright 2005 - 2008 Thomas Schmitt, scdbackup@gmx.net, GPL
+# Copyright 2005 - 2009 Thomas Schmitt, scdbackup@gmx.net, GPL version 2
 #
 # Not intended for general use in production installations !
 # Rather use:  ./bootstrap ; ./configure ; make
 #
-# This is a development tool which expects a special setup of directories.
+# This is a development tool which expects a special setup of directories
+# on a Linux system (e.g. SuSE 10.2).
 # It is to be executed in a common parent of the directories given with
 #   $isofs $isoburn $burn $xorr
 
-isofs=./nglibisofs-develop/libisofs
+isofs=./nglibisofs-develop/libisofs/libisofs_libisofs_la-
+isofs_filter=./nglibisofs-develop/libisofs/filters/libisofs_libisofs_la-
 burn=./libburn-develop/libburn
 isoburn=./libisoburn-develop/libisoburn
 xorr=./libisoburn-develop/xorriso
 
 debug_opts="-O2"
-def_opts=
+def_opts="-DXorriso_allow_external_filterS"
 largefile_opts="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1"
 do_strip=0
 static_opts=
 warn_opts="-Wall"
 nglibisofs=1
+def_libreadline="-DXorriso_with_readlinE"
+link_libreadline="-lreadline"
 
 for i in "$@"
 do
@@ -35,11 +39,16 @@ do
   elif test "$i" = "-g"
   then
     debug_opts="-g -O0"
+  elif test "$i" = "-no_libreadline"
+  then
+    def_libreadline=""
+    link_libreadline=""
   elif test "$i" = "-help" -o "$i" = "--help" -o "$i" = "-h"
   then
     echo \
         "$xorr/compile_xorriso.sh : to be executed above top level directories"
     echo "Options:"
+    echo "  -no_libreadline   do not compile for and link with libreadline."
     echo "  -do_diet          produce capability reduced lean version."
     echo "  -do_strip         apply program strip to compiled programs."
     echo "  -g                produce debuggable programm."
@@ -52,44 +61,50 @@ do
 done
 
 libisofs=
-libisofs="$libisofs $isofs"/buffer.o
-libisofs="$libisofs $isofs"/builder.o
-libisofs="$libisofs $isofs"/data_source.o
-libisofs="$libisofs $isofs"/ecma119.o
-libisofs="$libisofs $isofs"/ecma119_tree.o
-libisofs="$libisofs $isofs"/eltorito.o
-libisofs="$libisofs $isofs"/filesrc.o
-libisofs="$libisofs $isofs"/fs_image.o
-libisofs="$libisofs $isofs"/fs_local.o
-libisofs="$libisofs $isofs"/fsource.o
-libisofs="$libisofs $isofs"/image.o
-libisofs="$libisofs $isofs"/iso1999.o
-libisofs="$libisofs $isofs"/joliet.o
-libisofs="$libisofs $isofs"/libiso_msgs.o
-libisofs="$libisofs $isofs"/messages.o
-libisofs="$libisofs $isofs"/node.o
-libisofs="$libisofs $isofs"/rockridge.o
-libisofs="$libisofs $isofs"/rockridge_read.o
-libisofs="$libisofs $isofs"/stream.o
-libisofs="$libisofs $isofs"/tree.o
-libisofs="$libisofs $isofs"/util.o
-libisofs="$libisofs $isofs"/util_htable.o
-libisofs="$libisofs $isofs"/util_rbtree.o
+libisofs="$libisofs $isofs"buffer.o
+libisofs="$libisofs $isofs"builder.o
+libisofs="$libisofs $isofs"data_source.o
+libisofs="$libisofs $isofs"ecma119.o
+libisofs="$libisofs $isofs"ecma119_tree.o
+libisofs="$libisofs $isofs"eltorito.o
+libisofs="$libisofs $isofs"filesrc.o
+libisofs="$libisofs $isofs"fs_image.o
+libisofs="$libisofs $isofs"fs_local.o
+libisofs="$libisofs $isofs"fsource.o
+libisofs="$libisofs $isofs"image.o
+libisofs="$libisofs $isofs"iso1999.o
+libisofs="$libisofs $isofs"joliet.o
+libisofs="$libisofs $isofs"libiso_msgs.o
+libisofs="$libisofs $isofs"messages.o
+libisofs="$libisofs $isofs"node.o
+libisofs="$libisofs $isofs"rockridge.o
+libisofs="$libisofs $isofs"rockridge_read.o
+libisofs="$libisofs $isofs"stream.o
+libisofs="$libisofs $isofs"tree.o
+libisofs="$libisofs $isofs"util.o
+libisofs="$libisofs $isofs"util_htable.o
+libisofs="$libisofs $isofs"util_rbtree.o
+libisofs="$libisofs $isofs"system_area.o
+libisofs="$libisofs $isofs"make_isohybrid_mbr.o
+libisofs="$libisofs $isofs"aaip_0_2.o
+libisofs="$libisofs $isofs"filter.o
+libisofs="$libisofs $isofs_filter"external.o
+libisofs="$libisofs $isofs_filter"zisofs.o
+libisofs="$libisofs $isofs_filter"gzip.o
 
-timestamp="$(date -u '+%Y.%m.%d.%H%M%S')"
 echo "Version timestamp :  $(sed -e 's/#define Xorriso_timestamP "//' -e 's/"$//' "$xorr"/xorriso_timestamp.h)"
-echo "Build timestamp   :  $timestamp"
+
+date -u '+#define Xorriso_build_timestamP "%Y.%m.%d.%H%M%S"' >"$xorr"/xorriso_buildstamp.h
+echo "Build timestamp   :  $(sed -e 's/#define Xorriso_build_timestamP "//' -e 's/"$//' "$xorr"/xorriso_buildstamp.h)"
 
 echo "compiling program $xorr/xorriso.c $static_opts $debug_opts $def_opts"
-cc -I. -DXorriso_with_maiN -DXorriso_with_regeX -DXorriso_with_readlinE \
+cc -I. -DXorriso_with_maiN $def_libreadline \
   $warn_opts \
   $static_opts \
   $debug_opts \
   $def_opts \
   $largefile_opts \
   \
-  -DXorriso_build_timestamP='"'"$timestamp"'"' \
-  \
   -o "$xorr"/xorriso \
   \
   "$xorr"/xorriso.c \
@@ -130,9 +145,11 @@ cc -I. -DXorriso_with_maiN -DXorriso_with_regeX -DXorriso_with_readlinE \
   \
   $libisofs \
   \
-  -lreadline \
+  $link_libreadline \
   \
-  -lpthread
+  -lpthread \
+  -lacl \
+  -lz
 
   ret=$?
   if test "$ret" = 0

xorriso/configure_ac.txt

@@ -1,4 +1,4 @@
-AC_INIT([xorriso], [0.1.5], [http://libburnia-project.org])
+AC_INIT([xorriso], [0.3.8], [http://libburnia-project.org])
 AC_PREREQ([2.50])
 dnl AC_CONFIG_HEADER([config.h])	
 
@@ -8,15 +8,15 @@ AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([subdir-objects])
 
 BURN_MAJOR_VERSION=0
-BURN_MINOR_VERSION=4
-BURN_MICRO_VERSION=7
+BURN_MINOR_VERSION=6
+BURN_MICRO_VERSION=5
 AC_SUBST(BURN_MAJOR_VERSION)
 AC_SUBST(BURN_MINOR_VERSION)
 AC_SUBST(BURN_MICRO_VERSION)
 
 LIBISOFS_MAJOR_VERSION=0
 LIBISOFS_MINOR_VERSION=6
-LIBISOFS_MICRO_VERSION=4
+LIBISOFS_MICRO_VERSION=19
 AC_SUBST(LIBISOFS_MAJOR_VERSION)
 AC_SUBST(LIBISOFS_MINOR_VERSION)
 AC_SUBST(LIBISOFS_MICRO_VERSION)
@@ -43,6 +43,10 @@ if test ! $ac_cv_func_fseeko; then
    AC_ERROR([Libburn requires largefile support.])
 fi
 
+dnl If iconv(3) is in an extra libiconv, then it gets added to variable LIBS.
+dnl If not, then no -liconv will be added.
+AC_CHECK_LIB(iconv, iconv, , )
+
 AC_PROG_LIBTOOL
 AC_SUBST(LIBTOOL_DEPS)
 LIBTOOL="$LIBTOOL --silent"
@@ -74,8 +78,19 @@ AC_SUBST(THREAD_LIBS)
 
 TARGET_SHIZZLE
 AC_SUBST(ARCH)
+AC_SUBST(LIBBURNIA_PKGCONFDIR)
 AC_SUBST(LIBBURN_ARCH_LIBS)
 
+
+dnl ts A90303
+dnl Check the preconditions for using statvfs() in sg-dummy
+dnl (sg-linux and sg-freebsd use statvfs() unconditionally)
+STATVFS_DEF=-DLibburn_os_has_statvfS
+AC_CHECK_HEADER(sys/statvfs.h, X=, STATVFS_DEF=)
+AC_CHECK_FUNC([statvfs], X=, STATVFS_DEF=)
+CFLAGS="$CFLAGS $STATVFS_DEF"
+
+
 dnl Add compiler-specific flags
 
 dnl See if the user wants aggressive optimizations of the code
@@ -95,17 +110,93 @@ else
     CFLAGS="$CFLAGS -DDEBUG"
 fi
 
-
+AC_ARG_ENABLE(libreadline,
+[  --enable-libreadline    Enable use of libreadline by xorriso, default=yes],
+               , enable_libreadline=yes)
+if test x$enable_libreadline = xyes; then
 dnl Check whether there is readline-devel and readline-runtime.
 dnl If not, erase this macro which would enable use of readline(),add_history()
-READLINE_DEF="-DXorriso_with_readlinE"
+    READLINE_DEF="-DXorriso_with_readlinE"
 dnl The empty yes case obviously causes -lreadline to be linked
-AC_CHECK_HEADER(readline/readline.h, AC_CHECK_LIB(readline, readline, , READLINE_DEF= ), READLINE_DEF= )
+    AC_CHECK_HEADER(readline/readline.h, AC_CHECK_LIB(readline, readline, , READLINE_DEF= ), READLINE_DEF= )
 dnl The X= in the yes case prevents that -lreadline gets linked twice
-AC_CHECK_HEADER(readline/history.h, AC_CHECK_LIB(readline, add_history, X= , READLINE_DEF= ), READLINE_DEF= )
+    AC_CHECK_HEADER(readline/history.h, AC_CHECK_LIB(readline, add_history, X= , READLINE_DEF= ), READLINE_DEF= )
+else
+    READLINE_DEF=
+fi
 AC_SUBST(READLINE_DEF)
 
 
+AC_ARG_ENABLE(libacl,
+[  --enable-libacl    Enable use of libacl by libisofs, default=yes],
+               , enable_libacl=yes)
+if test x$enable_libacl = xyes; then
+dnl Check whether there is libacl-devel and libacl-runtime.
+dnl If not, erase this macro which would enable use of acl_to_text and others
+    LIBACL_DEF="-DLibisofs_with_aaip_acL"
+dnl The empty yes case obviously causes -lacl to be linked
+    AC_CHECK_HEADER(sys/acl.h, AC_CHECK_LIB(acl, acl_to_text, , LIBACL_DEF= ), LIBACL_DEF= )
+else
+    LIBACL_DEF=
+fi
+AC_SUBST(LIBACL_DEF)
+
+
+AC_ARG_ENABLE(xattr,
+[  --enable-xattr     Enable use of xattr by libisofs, default=yes],
+               , enable_xattr=yes)
+if test x$enable_xattr = xyes; then
+dnl Check whether there is the header for Linux xattr.
+dnl If not, erase this macro which would enable use of listxattr and others
+    XATTR_DEF="-DLibisofs_with_aaip_xattR"
+    AC_CHECK_HEADER(attr/xattr.h, AC_CHECK_LIB(c, listxattr, X= , XATTR_DEF= ), XATTR_DEF= )
+else
+    XATTR_DEF=
+fi
+AC_SUBST(XATTR_DEF)
+
+
+AC_ARG_ENABLE(zlib,
+[  --enable-zlib     Enable use of zlib by libisofs, default=yes],
+               , enable_zlib=yes)
+if test x$enable_zlib = xyes; then
+dnl Check whether there is the header for zlib.
+dnl If not, erase this macro which would enable use of compress2() and others.
+dnl The empty parameter after "compress2" causes -lz.
+    ZLIB_DEF="-DLibisofs_with_zliB"
+    AC_CHECK_HEADER(zlib.h, AC_CHECK_LIB(z, compress2, , ZLIB_DEF= ), ZLIB_DEF= )
+else
+    ZLIB_DEF=
+fi
+AC_SUBST(ZLIB_DEF)
+
+
+AC_ARG_ENABLE(external-filters,
+[  --enable-external-filters     Enable use of external filter programs by xorriso, default=yes],
+               , enable_external_filters=yes)
+if test x"$enable_external_filters" = xyes; then
+    EXTF_DEF="-DXorriso_allow_external_filterS"
+    echo "enabled  xorriso external filter programs"
+else
+    EXTF_DEF=
+    echo "disabled xorriso external filter programs"
+fi
+AC_SUBST(EXTF_DEF)
+
+AC_ARG_ENABLE(external-filters-setuid,
+[  --enable-external-filters-setuid     Enable xorriso external filter programs under setuid, default=no],
+               , enable_external_filters_setuid=no)
+if test x$enable_external_filters_setuid = xyes; then
+    EXTF_SUID_DEF="-DXorriso_allow_extf_suiD"
+    echo "enabled  xorriso external filter programs under setuid"
+else
+    EXTF_SUID_DEF=
+    echo "disabled xorriso external filter programs under setuid"
+fi
+AC_SUBST(EXTF_SUID_DEF)
+
+
+
 AC_CONFIG_FILES([
 	Makefile
 	version.h

xorriso/convert_man_to_html.sh

@@ -47,11 +47,11 @@ then
   -e 's/have a look at section EXAMPLES/have a look at section <A HREF="#EXAMPLES">EXAMPLES<\/A>/' \
   -e 's/<b>Session model:<\/b>/\&nbsp;<BR><b>Session model:<\/b>/' \
   -e 's/<b>Media types and states:<\/b>/\&nbsp;<BR><b>Media types and states:<\/b>/' \
-  -e 's/<b>Creating, Growing, Modifying:<\/b>/\&nbsp;<BR><b>Creating, Growing, Modifying:<\/b>/' \
+  -e 's/<b>Creating, Growing, Modifying, Blind/\&nbsp;<BR><b>Creating, Growing, Modifying, Blind/' \
   -e 's/<b>Libburn drives:<\/b>/\&nbsp;<BR><b>Libburn drives:<\/b>/' \
   -e 's/^-dev /\&nbsp;\&nbsp;-dev /' \
   -e 's/^-devices /\&nbsp;\&nbsp;-devices /' \
-  -e 's/<b>Rock Ridge, POSIX, X\/Open:<\/b>/\&nbsp;<BR><b>Rock Ridge, POSIX, X\/Open:<\/b>/' \
+  -e 's/<b>Rock Ridge, POSIX, X\/Open, El Torito, ACL,/\&nbsp;<BR><b>Rock Ridge, POSIX, X\/Open, El Torito, ACL,/' \
   -e 's/<b>Command processing:<\/b>/\&nbsp;<BR><b>Command processing:<\/b>/' \
   -e 's/<b>Dialog, Readline, Result pager:<\/b>/\&nbsp;<BR><b>Dialog, Readline, Result pager:<\/b>/' \
   -e 's/<b>Aquiring source and target drive:<\/b>/\&nbsp;<BR><b>Aquiring source and target drive:<\/b><BR>\&nbsp;<BR>/' \
@@ -65,11 +65,15 @@ then
   -e 's/<b>Settings for result writing:<\/b>/\&nbsp;<BR><b>Settings for result writing:<\/b><BR>\&nbsp;<BR>/' \
   -e 's/^706k = 706kB/\&nbsp;\&nbsp;706k = 706kB/' \
   -e 's/^5540k = 5540kB/\&nbsp;\&nbsp;5540k = 5540kB/' \
+  -e 's/<b>Character sets:<\/b>/\&nbsp;<BR><b>Character sets:<\/b><BR>\&nbsp;<BR>/' \
   -e 's/<b>Exception processing:<\/b>/\&nbsp;<BR><b>Exception processing:<\/b><BR>\&nbsp;<BR>/' \
+  -e 's/<b>El Torito bootable ISO images:<\/b>/\&nbsp;<BR><b>El Torito bootable ISO images:<\/b><BR>\&nbsp;<BR>/' \
   -e 's/<b>Dialog mode control:<\/b>/\&nbsp;<BR><b>Dialog mode control:<\/b><BR>\&nbsp;<BR>/' \
   -e 's/<b>Drive and media related inquiry actions:<\/b>/\&nbsp;<BR><b>Drive and media related inquiry actions:<\/b><BR>\&nbsp;<BR>/' \
   -e 's/<b>Navigation in ISO image/\&nbsp;<BR><b>Navigation in ISO image/' \
   -e 's/^filesystem:<\/b>/filesystem:<\/b><BR>\&nbsp;<BR>/' \
+  -e 's/<b>Evaluation of readability and recovery:<\/b>/\&nbsp;<BR><b>Evaluation of readability and recovery:<\/b><BR>\&nbsp;<BR>/' \
+  -e 's/<b>osirrox restore options:<\/b>/\&nbsp;<BR><b>osirrox restore options:<\/b><BR>\&nbsp;<BR>/' \
   -e 's/<b>Command compatibility emulations:<\/b>/\&nbsp;<BR><b>Command compatibility emulations:<\/b><BR>\&nbsp;<BR>/' \
   -e 's/^<p><b>&minus;as</<p>\&nbsp;<BR><b>\&minus;as</' \
   -e 's/<b>Scripting, dialog and/\&nbsp;<BR><b>Scripting, dialog and/' \

xorriso/make_xorriso_standalone.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # make_xorriso_standalone.sh
-# Copyright 2008 Thomas Schmitt, scdbackup@gmx.net, GPL
+# Copyright 2008 - 2009 Thomas Schmitt, scdbackup@gmx.net, GPL
 #
 # Not intended for general use in production installations !
 # 
@@ -25,11 +25,11 @@
 current_dir=$(pwd)
 lone_dir="$current_dir"/"xorriso-standalone"
 
-xorriso_rev=0.1.5
+xorriso_rev=0.3.8
 # For unstable uploads:
-xorriso_pl=""
+# xorriso_pl=""
 # For stable releases:
-# xorriso_pl=".pl00"
+xorriso_pl=".pl00"
 
 with_bootstrap_tarball=1
 
@@ -124,12 +124,19 @@ copy_files \
  xorriso/xorrisoburn.[ch] \
  xorriso/xorriso.[ch1] \
  xorriso/xorriso_private.h \
+ \
  xorriso/xorriso_timestamp.h \
+ \
  xorriso/changelog.txt \
  xorriso/xorriso_eng.html \
  xorriso/man_1_xorriso.html \
  "$lone_dir"/xorriso
 
+copy_files xorriso/xorriso_buildstamp_none.h \
+           "$lone_dir"/xorriso/xorriso_buildstamp.h
+copy_files xorriso/xorriso_buildstamp_none.h \
+           "$lone_dir"/xorriso/xorriso_buildstamp_none.h
+
 create_dir "$lone_dir"/test
 copy_files \
  test/compare_file.c \
@@ -140,9 +147,12 @@ copy_files \
 
 create_dir "$lone_dir"/libisofs
 create_dir "$lone_dir"/libisofs/filters
+create_dir "$lone_dir"/doc
 goto_dir   "$current_dir"/nglibisofs-develop
 copy_files libisofs/*.[ch] "$lone_dir"/libisofs
 copy_files libisofs/filters/*.[ch] "$lone_dir"/libisofs/filters
+copy_files doc/susp_aaip*.txt "$lone_dir"/doc
+copy_files doc/zisofs_format.txt "$lone_dir"/doc
 copy_files COPYRIGHT "$lone_dir"/libisofs
 
 # To get a common version.h 

xorriso/xorriso.h

@@ -2,7 +2,7 @@
 /* Command line oriented batch and dialog tool which creates, loads,
    manipulates and burns ISO 9660 filesystem images.
 
-   Copyright 2007-2008 Thomas Schmitt, <scdbackup@gmx.net>
+   Copyright 2007-2009 Thomas Schmitt, <scdbackup@gmx.net>
 
    Provided under GPL version 2.
 
@@ -19,7 +19,17 @@ struct XorrisO;
 /* --------------------- Fundamental Management ------------------- */
 
 /* Create a new xorriso object and tell it the program name to be used
-   with messages.
+   with messages and for decision of special behavior.
+   @param xorriso  returns the newly created XorrisO object 
+   @param progname typically argv[0] of main(). Some leafnames of the progname
+                   path have special meaning and trigger special behavior:
+                    "osirrox"    allows image-to-disk copying: -osirrox "on" 
+                    "xorrisofs"  activates permanent mkisofs emulation
+                    "genisofs"   alias of "xorrisofs"
+                    "mkisofs"    alias of "xorrisofs"
+                    "genisoimage"  alias of "xorrisofs"
+   @parm flag      unused yet, submit 0
+   @return         >0 success , <=0 failure, no object created
 */
 int Xorriso_new(struct XorrisO ** xorriso, char *progname, int flag);
 
@@ -72,6 +82,13 @@ int Xorriso_msgs_submit(struct XorrisO *xorriso,
                         int error_code, char msg_text[], int os_errno,
                         char severity[], int flag);
 
+/** Alternative call interface of Xorriso_msgs_submit with void* instead
+    of struct XorrisO*
+*/
+int Xorriso_msgs_submit_void(void *xorriso,
+                        int error_code, char msg_text[], int os_errno,
+                        char severity[], int flag);
+
 
 /** Evaluate an advise whether to abort or whether to go on with option
     processing. This should be called after any option function was processed.
@@ -133,6 +150,104 @@ int Xorriso_process_msg_queues(struct XorrisO *xorriso, int flag);
 
 
 
+/* The outlist stack allows to redirect the info and result messages from
+   their normal channels into a pair of string lists which can at some
+   later time be retrieved by the application.
+   These redirection caches can be stacked to allow stacked applications.
+   xorriso itself uses them for internal purposes. 
+*/
+
+/* A list item able of forming double chained lists */
+struct Xorriso_lsT;
+
+/** Maximum number of stacked redirections */
+#define Xorriso_max_outlist_stacK 32
+
+/** Enable a new redirection of info and/or result channel. The normal message
+    output and eventual older redirections will not see new messages until
+    the redirection is ended by a call to Xorriso_pull_outlists() with the
+    stack_handle value returned by this call.
+    Redirected output is not written to the files of Xorriso_option_logfile()
+    and the Xorriso_option_pkt_output() protocol will not be applied.
+    @param xorriso      The environment handle
+    @param stack_handle returns an id number which is unique as long as
+                        its redirection is stacked. It may be re-used after
+                        its redirection was pulled from the stack.
+    @param flag         Bitfield for control purposes
+                         bit0= redirect result channel
+                         bit1= redirect info channel
+                        If bit0 and bit1 are 0, both channels get redirected.
+    @return           1 on success, <=0 if failure
+*/
+int Xorriso_push_outlists(struct XorrisO *xorriso, int *stack_handle,
+                          int flag);
+
+
+/** Disable the redirection given by stack_handle. If it was the current
+    receiver of messages then switch output to the next older redirection
+    resp. to the normal channels if no redirections are stacked any more.
+    The messages collected by the disabled redirection are handed out as
+    two lists. Both lists have to be disposed via Xorriso_lst_destroy_all() 
+    when they are no longer needed.
+    The message lists are either NULL or represented by their first
+    Xorriso_lsT item.
+    @param xorriso       The environment handle
+    @param stack_handle  The id number returned by Xorriso_push_outlists()
+    @param result_list   Result and mark messages (usually directed to stdout)
+    @param info_list     Info and mark messages (usually directed to stderr)
+    @param flag          unused yet, submit 0
+    @return              1 on success, <=0 if failure
+*/
+int Xorriso_pull_outlists(struct XorrisO *xorriso, int stack_handle,
+                          struct Xorriso_lsT **result_list,
+                          struct Xorriso_lsT **info_list, int flag);
+
+
+/** Obtain the text message from the current list item.
+    @param entry    The current list item
+    @param flag     unused yet, submit 0
+    @return         Pointer to the text content of the list item.
+                    This pointer does not have to be freed.
+*/
+char *Xorriso_lst_get_text(struct Xorriso_lsT *entry, int flag);
+
+
+/** Obtain the address of the next item in the chain of messages.
+    An iteration over the output of Xorriso_pull_outlists() starts at the
+    returned result_list resp. info_list and ends when this function returns
+    NULL.
+    @param entry    The current list item
+    @param flag     unused yet, submit 0
+    @return         Pointer to the next list item or NULL if end of list.
+                    This pointer does not have to be freed.
+*/
+struct Xorriso_lsT *Xorriso_lst_get_next(struct Xorriso_lsT *entry, int flag);
+
+
+/** Obtain the address of the previous item in the chain of messages.
+    @param entry    The current list item
+    @param flag     unused yet, submit 0
+    @return         Pointer to the previous list item or NULL if start of list.
+                    This pointer does not have to be freed.
+*/
+struct Xorriso_lsT *Xorriso_lst_get_prev(struct Xorriso_lsT *entry, int flag);
+
+
+/** Destroy all list items which are directly or indirectly connected to
+    the given link item.
+    Apply this to each of the two list handles obtained by 
+    Xorriso_pull_outlists() when the lists are no longer needed.
+    @param lstring  *lstring will be freed and set to NULL.
+                    It is not dangerous to submit a pointer to a NULL-pointer.
+    @param flag     unused yet, submit 0
+    @return         -1= lstring was NULL (i.e. wrong use of this call),
+                     0= *lstring was already NULL,
+                     1= item actually disposed
+*/
+int Xorriso_lst_destroy_all(struct Xorriso_lsT **lstring, int flag);
+
+
+
 /* ---------------------------- Options API ------------------------ */
 /*    See man 1 xorriso for explanation of the particular options    */
 /*
@@ -148,6 +263,11 @@ int Xorriso_process_msg_queues(struct XorrisO *xorriso, int flag);
 /* Option -abort_on */
 int Xorriso_option_abort_on(struct XorrisO *xorriso, char *severity, int flag);
 
+
+/* Option -acl "on"|"off" */
+int Xorriso_option_acl(struct XorrisO *xorriso, char *mode, int flag);
+
+
 /* Option -add */
 /* @param flag bit0=do not report the added item
                bit1=do not reset pacifier, no final pacifier message
@@ -167,6 +287,28 @@ int Xorriso_option_alter_date(struct XorrisO *xorriso,
                               char *time_type, char *timestring,
                               int argc, char **argv, int *idx, int flag);
 
+/* Option -application_id */
+int Xorriso_option_application_id(struct XorrisO *xorriso, char *name, 
+                                  int flag);
+
+/* Option -as */
+/* @param flag bit0=do not report the added item
+               bit1=do not reset pacifier, no final pacifier message
+*/  
+int Xorriso_option_as(struct XorrisO *xorriso, int argc, char **argv,
+                      int *idx, int flag);
+
+/* Option -assert_volid */
+int Xorriso_option_assert_volid(struct XorrisO *xorriso, char *pattern,
+                                char *severity, int flag);
+
+/* Option -auto_charset "on"|"off" */
+int Xorriso_option_auto_charset(struct XorrisO *xorriso, char *mode, int flag);
+
+/* Option -backslash_codes */
+int Xorriso_option_backslash_codes(struct XorrisO *xorriso, char *mode,
+                                   int flag);
+
 /* Option -ban_stdio_write */
 int Xorriso_option_ban_stdio_write(struct XorrisO *xorriso, int flag);
 
@@ -186,6 +328,20 @@ int Xorriso_option_cdi(struct XorrisO *xorriso, char *iso_rr_path, int flag);
 /* Option -cdx */
 int Xorriso_option_cdx(struct XorrisO *xorriso, char *disk_path, int flag);
 
+/* Option -charset */
+/* @param flag bit0= set in_charset
+               bit1= set out_charset
+*/
+int Xorriso_option_charset(struct XorrisO *xorriso, char *name, int flag);
+
+/* Option -check_media */
+int Xorriso_option_check_media(struct XorrisO *xorriso,
+                               int argc, char **argv, int *idx, int flag);
+
+/* Option -check_media_defaults */
+int Xorriso_option_check_media_defaults(struct XorrisO *xorriso,
+                                    int argc, char **argv, int *idx, int flag);
+
 /* Option -chgrp alias -chgrpi , chgrp_r alias chgrpi */
 /* @param flag bit0=recursive (-chgrp_r)
 */
@@ -233,6 +389,13 @@ int Xorriso_option_compare(struct XorrisO *xorriso, char *disk_path,
 int Xorriso_option_cpri( struct XorrisO *xorriso, int argc, char **argv,
                          int *idx, int flag);
 
+/* Options -cpx , -cpax, -cp_rx , -cp_rax */
+/* @param flag bit0= recursive (-cp_rx, -cp_rax)
+               bit1= full property restore (-cpax, -cp_rax)
+*/
+int Xorriso_option_cpx(struct XorrisO *xorriso, int argc, char **argv,
+                         int *idx, int flag);
+
 /* Option -cut_out */
 int Xorriso_option_cut_out(struct XorrisO *xorriso, char *disk_path,
                 char *start, char *count, char *iso_rr_path, int flag);
@@ -251,9 +414,16 @@ int Xorriso_option_devices(struct XorrisO *xorriso, int flag);
 /* Option -dialog "on"|"off" */
 int Xorriso_option_dialog(struct XorrisO *xorriso, char *mode, int flag);
 
+/* Option -disk_dev_ino "on"|"off" */
+int Xorriso_option_disk_dev_ino(struct XorrisO *xorriso, char *mode, int flag);
+
 /* Option -disk_pattern "on"|"ls"|"off" */
 int Xorriso_option_disk_pattern(struct XorrisO *xorriso, char *mode, int flag);
 
+/* Option -drive_class */
+int Xorriso_option_drive_class(struct XorrisO *xorriso,
+                               char *d_class, char *pattern, int flag);
+
 /* Option -dummy "on"|"off" */
 int Xorriso_option_dummy(struct XorrisO *xorriso, char *mode, int flag);
 
@@ -276,9 +446,21 @@ int Xorriso_option_errfile_log(struct XorrisO *xorriso,
 int Xorriso_option_error_behavior(struct XorrisO *xorriso, 
                                   char *occasion, char *behavior, int flag);
 
-/* Option -iso_rr_pattern "on"|"ls"|"off" */
-int Xorriso_option_iso_rr_pattern(struct XorrisO *xorriso, char *mode,
-                                  int flag);
+/* Option -external_filter */
+int Xorriso_option_external_filter(struct XorrisO *xorriso,
+                                   int argc, char **argv, int *idx, int flag);
+
+/* Options -extract , -extract_single */
+/* @param flag bit0=do not report the restored item
+               bit1=do not reset pacifier, no final pacifier message
+               bit5= -extract_single: eventually do not insert directory tree
+*/
+int Xorriso_option_extract(struct XorrisO *xorriso, char *disk_path,
+                       char *iso_path, int flag);
+
+/* Option -extract_cut */
+int Xorriso_option_extract_cut(struct XorrisO *xorriso, char *iso_rr_path,
+                          char *start, char *count, char *disk_path, int flag);
 
 /* Option -follow */
 int Xorriso_option_follow(struct XorrisO *xorriso, char *mode, int flag);
@@ -294,23 +476,41 @@ int Xorriso_option_find(struct XorrisO *xorriso, int argc, char **argv,
 /* Option -fs */
 int Xorriso_option_fs(struct XorrisO *xorriso, char *size, int flag);
 
+/* Option -getfacl alias -getfacli, -getfacl_r alias -getfacl_ri */
+/* @param flag bit0=recursive -getfacl_r
+*/
+int Xorriso_option_getfacli(struct XorrisO *xorriso,
+                            int argc, char **argv, int *idx, int flag);
+
 /* Option -gid */
 int Xorriso_option_gid(struct XorrisO *xorriso, char *gid, int flag);
 
+/* Option -grow_blindly */
+int Xorriso_option_grow_blindly(struct XorrisO *xorriso, char *msc2, int flag);
+
 /* Option -help and part of -prog_help */
 int Xorriso_option_help(struct XorrisO *xorriso, int flag);
 
 /* Option -history */
 int Xorriso_option_history(struct XorrisO *xorriso, char *line, int flag);
 
+/* Option -iso_rr_pattern "on"|"ls"|"off" */
+int Xorriso_option_iso_rr_pattern(struct XorrisO *xorriso, char *mode,
+                                  int flag);
+
 /* Option -joliet "on"|"off" */
 int Xorriso_option_joliet(struct XorrisO *xorriso, char *mode, int flag);
 
+/* Option -list_delimiter */
+int Xorriso_option_list_delimiter(struct XorrisO *xorriso, char *text,
+                                  int flag);
+
 /* Option -list_formats */
 int Xorriso_option_list_formats(struct XorrisO *xorriso, int flag);
 
 /* Option -load session|track|sbsector value */
-/* @return <=0 error , 1 success, 2 revoked by -reassure
+/* @param flag bit0= with adr_mode sbsector: adr_value is possibly 16 too high
+   @return <=0 error , 1 success, 2 revoked by -reassure
 */
 int Xorriso_option_load(struct XorrisO *xorriso, char *adr_mode,
                           char *adr_value, int flag);
@@ -346,6 +546,15 @@ int Xorriso_option_lsx(struct XorrisO *xorriso, int argc, char **argv,
 int Xorriso_option_map(struct XorrisO *xorriso, char *disk_path,
                        char *iso_path, int flag);
 
+/* Options -map_l , -compare_l , -update_l , -extract_l */
+/* @param flag bit8-11= mode 0= -map_l
+                             1= -compare_l
+                             2= -update_l
+                             3= -extract_l
+*/
+int Xorriso_option_map_l(struct XorrisO *xorriso, int argc, char **argv,
+                         int *idx, int flag);
+
 /* Option -mark */
 int Xorriso_option_mark(struct XorrisO *xorriso, char *mark, int flag);
 
@@ -353,6 +562,13 @@ int Xorriso_option_mark(struct XorrisO *xorriso, char *mark, int flag);
 int Xorriso_option_mkdiri(struct XorrisO *xorriso, int argc, char **argv,
                           int *idx, int flag);
 
+/* Option -mount */
+/* @param bit0= print mount command to result channel rather than performing it
+*/
+int Xorriso_option_mount(struct XorrisO *xorriso, char *dev, char *adr_mode,
+                         char *adr, char *cmd, int flag);
+
+
 /* Option -mv alias -mvi */
 int Xorriso_option_mvi(struct XorrisO *xorriso, int argc, char **argv,
                       int *idx, int flag);
@@ -363,25 +579,40 @@ int Xorriso_option_no_rc(struct XorrisO *xorriso, int flag);
 /* Option -not_leaf */
 int Xorriso_option_not_leaf(struct XorrisO *xorriso, char *pattern, int flag);
 
+/* Option -not_list , -quoted_not_list */
+/* @param flag bit0= -quoted_not_list */
+int Xorriso_option_not_list(struct XorrisO *xorriso, char *adr, int flag);
+
 /* Option -not_paths */
 int Xorriso_option_not_paths(struct XorrisO *xorriso, int argc, char **argv,
                              int *idx, int flag);
 
-/* Option -options_from_file*/
+/* Option -options_from_file */
 /* @return <=0 error , 1 = success , 3 = request to end program run */
 int Xorriso_option_options_from_file(struct XorrisO *xorriso, char *adr,
                                      int flag);
 
+/* Option -osirrox "on"|"off" */
+int Xorriso_option_osirrox(struct XorrisO *xorriso, char *mode, int flag);
+
 /* Option -overwrite "on"|"nondir"|"off" */
 int Xorriso_option_overwrite(struct XorrisO *xorriso, char *mode, int flag);
 
+/* Option -pacifier */
+int Xorriso_option_pacifier(struct XorrisO *xorriso, char *style, int flag);
+
 /* Option -padding */
 int Xorriso_option_padding(struct XorrisO *xorriso, char *size, int flag);
 
 /* Option -page */
 int Xorriso_option_page(struct XorrisO *xorriso, int len, int width, int flag);
 
-/* Option -path-list */
+/* Option -paste_in */
+int Xorriso_option_paste_in(struct XorrisO *xorriso, char *iso_rr_path,
+                          char *disk_path, char *start, char *count, int flag);
+
+/* Option -path_list , -quoted_path_list */
+/* @param flag bit0= -quoted_path_list */
 int Xorriso_option_path_list(struct XorrisO *xorriso, char *adr, int flag);
 
 /* Option -pathspecs */
@@ -416,6 +647,10 @@ int Xorriso_option_pwdx(struct XorrisO *xorriso, int flag);
 /* Option -reassure "on"|"tree"|"off" */
 int Xorriso_option_reassure(struct XorrisO *xorriso, char *mode, int flag);
 
+/* Option -relax_compliance */
+int Xorriso_option_relax_compliance(struct XorrisO *xorriso, char *mode,
+                                    int flag);
+
 /* Option -report_about */
 int Xorriso_option_report_about(struct XorrisO *xorriso, char *severity, 
                                 int flag);
@@ -445,6 +680,32 @@ int Xorriso_option_rom_toc_scan(struct XorrisO *xorriso, char *mode,
 /* Option -session_log */
 int Xorriso_option_session_log(struct XorrisO *xorriso, char *path, int flag);
 
+/* Option -setfacl_list alias -setfacl_listi */
+int Xorriso_option_setfacl_listi(struct XorrisO *xorriso, char *disk_path,
+                                 int flag);
+
+/* Option -setfacl alias -setfacli , -setfacl_r  alias -setfacl_ri */
+/* @param flag bit0=recursive -setfacl_r
+*/
+int Xorriso_option_setfacli(struct XorrisO *xorriso, char *acl_text,
+                            int argc, char **argv, int *idx, int flag);
+
+/* Options -setfattr alias -setfattri, -setfattr_r alias -setfattr_ri */
+/* @param flag   bit0=recursive -setfattr_r
+*/
+int Xorriso_option_setfattri(struct XorrisO *xorriso, char *name, char *value,
+                            int argc, char **argv, int *idx, int flag);
+
+/* Option -setfattr_list alias -setfattr_listi */
+int Xorriso_option_setfattr_listi(struct XorrisO *xorriso, char *path, 
+                                  int flag);
+
+/* Options -set_filter , -set_filter_r */ 
+/* @param flag   bit0=recursive -set_filter_r
+*/
+int Xorriso_option_set_filter(struct XorrisO *xorriso, char *name,
+                              int argc, char **argv, int *idx, int flag);
+
 /* Option -speed */
 int Xorriso_option_speed(struct XorrisO *xorriso, char *speed, int flag);
 
@@ -458,6 +719,10 @@ int Xorriso_option_status(struct XorrisO *xorriso, char *mode, int flag);
 int Xorriso_option_status_history_max(struct XorrisO *xorriso, int num1, 
                                       int flag);
 
+/* Option -stream_recording */
+int Xorriso_option_stream_recording(struct XorrisO *xorriso, char *mode,
+                                    int flag);
+
 /* Option -tell_media_space */
 int Xorriso_option_tell_media_space(struct XorrisO *xorriso, int flag);
 
@@ -471,6 +736,10 @@ int Xorriso_option_toc(struct XorrisO *xorriso, int flag);
 /* Option -uid */
 int Xorriso_option_uid(struct XorrisO *xorriso, char *uid, int flag);
 
+/* Option -unregister_filter */
+int Xorriso_option_unregister_filter(struct XorrisO *xorriso, char *name,
+                                     int flag);
+
 /* Options -update and -update_r
    @param flag bit0= issue summary message
                bit1= do not reset pacifier, no final pacifier message
@@ -489,6 +758,12 @@ int Xorriso_option_version(struct XorrisO *xorriso, int flag);
 /* Option -volid */
 int Xorriso_option_volid(struct XorrisO *xorriso, char *volid, int flag);
 
+/* Option -xattr "on"|"off" */
+int Xorriso_option_xattr(struct XorrisO *xorriso, char *mode, int flag);
+
+/* Option -zisofs */
+int Xorriso_option_zisofs(struct XorrisO *xorriso, char *mode, int flag);
+
 
 #endif /* Xorriso_includeD */
 

xorriso/xorriso_buildstamp.h

@@ -0,0 +1,3 @@
+#ifndef Xorriso_build_timestamP
+#define Xorriso_build_timestamP "-none-given-"
+#endif

xorriso/xorriso_buildstamp_none.h

@@ -0,0 +1,3 @@
+#ifndef Xorriso_build_timestamP
+#define Xorriso_build_timestamP "-none-given-"
+#endif

xorriso/xorriso_eng.html

@@ -2,7 +2,7 @@
 
 <HEAD>
 <META NAME="description" CONTENT="xorriso, creates, loads, manipulates and writes ISO 9660 filesystem images with Rock Ridge extensions">
-<META NAME="keywords" CONTENT="xorriso, libburn, libburnia, burn, CD, DVD, ISO, ISO 9660, RockRidge, Rock Ridge, linux, recording, burning, CD-R, CD-RW, DVD-R, DVD-RW, DVD+RW, DVD+R, DVD+R/DL, scdbackup">
+<META NAME="keywords" CONTENT="xorriso, libburn, libburnia, burn, CD, DVD, ISO, ISO 9660, RockRidge, Rock Ridge, Linux, FreeBSD, recording, burning, CD-R, CD-RW, DVD-R, DVD-RW, DVD+RW, DVD+R, DVD+R DL, BD-RE, BD-R, scdbackup">
 <META NAME="robots" CONTENT="follow">
 <TITLE>xorriso homepage english</TITLE>
 </HEAD>
@@ -14,16 +14,18 @@
 <P><H2> Homepage of </H2>
 <H1> xorriso </H1>
 
-<H2>ISO 9660 Rock Ridge Filesystem Manipulator for Linux</H2>
+<H2>ISO 9660 Rock Ridge Filesystem Manipulator for Linux and FreeBSD</H2>
 </CENTER>
 
 <P>
 <H2>Purpose:</H2>
-xorriso maps file objects from POSIX compliant filesystems
+xorriso copies file objects from POSIX compliant filesystems
 into Rock Ridge enhanced ISO 9660 filesystems and allows
 session-wise manipulation of such filesystems. It can load the management
 information of existing ISO images and it writes the session results to
 optical media or to filesystem objects.
+<BR>
+Vice versa xorriso is able to restore file objects from ISO 9660 filesystems.
 </P>
 <P>
 
@@ -33,50 +35,49 @@ optical media or to filesystem objects.
 
 <P>
 <H2>Hardware requirements:</H2>
-A CD/DVD recorder suitable for 
+A CD/DVD/BD recorder suitable for 
 <A HREF="http://libburnia-project.org">http://libburnia-project.org</A> <BR>
 (SCSI , ATA , USB , or SATA writers compliant to standard MMC-3 for CD
-and to MMC-5 for DVD).
+and to MMC-5 for DVD or BD).
 <BR>
 </P>
 
 <P>
 <H2>Software requirements :</H2>
 <DL>
-<DT>Linux with kernel 2.4 or higher (and libc, of course) :</DT>
+<DT>Linux with kernel 2.4 or higher, libc, libpthread :</DT>
 <DD>With kernel 2.4 an ATA drive has to be under ide-scsi emulation.</DD>
 <DD>With kernel 2.6 the drive should not be under ide-scsi.</DD>
-<DT>libpthread</DT>
-<DD>is supposed to be a standard system component.</DD>
-<DT>libreadline and libreadline-dev</DT>
-<DD>are optional and eventually make dialog more convenient.</DD>
-</DL>
-</P>
-
-<P>
-<H2>
-GPL software included:<BR>
-</H2>
-<DL>
-<DT>libburn-0.4.5</DT>
-<DD>reads and writes data from and to CD and DVD.</DD>
-<DD>(founded by Derek Foreman and Ben Jansens,
-furthered since August 2006 by team of libburnia-project.org)</DD>
-<DT>libisofs-0.6.4</DT>
-<DD>operates ISO 9660 images.</DD>
-<DD>(By Vreixo Formoso and Mario Danic from team of libburnia-project.org)</DD>
-<DT>libisoburn-0.1.4</DT>
-<DD>coordinates libburn and libisofs, emulates multi-session where needed.</DD>
-<DD>(By Vreixo Formoso and Thomas Schmitt
-from team of libburnia-project.org)</DD>
-</DL>
-<DD>The source code of this software is independent of 
-cdrecord and mkisofs.</A>
+<DT>or FreeBSD, libc, libpthread :</DT>
+<DD>ATAPI/CAM support has to be enabled in the kernel, see atapicam(4).</DD>
+<DD>libcam has to be installed.</DD>
+<DD>libiconv has to be installed.</DD>
+<DT>or some other X/Open system, libc, libpthread :</DT>
+<DD>
+There will be no direct operation of optical drives, but only POSIX i/o
+with objects of the local filesystem.
 </DD>
+<DD>
+Might work with DVD-RAM, DVD+RW, BD-RE
+but rather not with CD, DVD-R, DVD+R, BD-R.
+</DD>
+</DL>
+
+<H3>Optional software:</H2>
+<DL>
+<DT>libreadline and libreadline-dev</DT>
+<DD>eventually make dialog more convenient.</DD>
+<DT>libacl and libacl-devel</DT>
+<DD>eventually allow on Linux to get and set ACLs.</DD>
+<!--
+<DT>zlib and zlib-devel</DT>
+<DD>eventually allow zisofs compression.</DD>
+-->
+</DL>
 </P>
 
 <P>
-This program system has been tested on Intel/AMD Linux systems only.<BR>
+This program has been tested on Linux, FreeBSD, and Solaris systems.<BR>
 For ports to other usable systems <A HREF="#contact">contact us</A>.
 </P>
 
@@ -86,36 +87,47 @@ For ports to other usable systems <A HREF="#contact">contact us</A>.
 <H2>Special features:</H2>
 <UL>
 <LI>
-ISO 9660 formatter and burner for CD or DVD are fixely integrated.
+ISO 9660 formatter and burner for CD, DVD, BD are fixely integrated.
 </LI>
 <LI>
 Operates on an existing ISO image or creates a new one.
 </LI>
 <LI>
-Copies files from filesystem into the ISO image.
+Copies files from filesystem into the ISO image and vice versa,
+with ACL and xattr.
 </LI>
 <LI>
-Renames or deletes file objects in the ISO image.
-</LI>
-<LI>
-Changes file properties in the ISO image.
+Changes file properties, renames or deletes file objects in the ISO image.
 </LI>
 <LI>
 Updates ISO subtrees incrementally to match given disk subtrees.
 </LI>
 <LI>
-Can write result as completely new image to optical media or
-filesystem objects.
+File content may get zisofs or gzip compressed or filtered by external
+processes.
 </LI>
 <LI>
-Can write result as add-on session to appendable multi-session media,
-to overwriteable media, to regular files, and to block devices.
+Writes result as completely new image or as add-on session
+to optical media or filesystem objects.
 </LI>
 <LI>
-Scans for optical drives, blanks re-useable optical media.
+Can activate ISOLINUX boot images by El Torito boot record and by MBR.
 </LI>
 <LI>
-Suitable for: CD-R, CD-RW, DVD-R, DVD-RW, DVD+R, DVD+R/DL, DVD+RW, DVD-RAM.
+Can perform multi-session tasks as emulation of mkisofs and cdrecord.
+</LI>
+<LI>
+Can issue commands to mount older sessions on Linux or FreeBSD.
+</LI>
+<LI>
+Can check media for damages and copy readable blocks to disk.
+</LI>
+<LI>
+Scans for optical drives, blanks re-useable optical media, formats media.
+</LI>
+<LI>
+Suitable for:
+CD-R, CD-RW, DVD-R, DVD-RW, DVD+R, DVD+R DL, DVD+RW, DVD-RAM, BD-R, BD-RE.
 </LI>
 <LI>
 Reads its instructions from command line arguments, dialog, and batch files.
@@ -123,9 +135,6 @@ Reads its instructions from command line arguments, dialog, and batch files.
 <LI>
 Provides navigation commands for interactive ISO image manipulation.
 </LI>
-<LI>
-Adjustable thresholds for abort, exit value, and problem reporting.
-</LI>
 
 </UL>
 </P>
@@ -133,8 +142,14 @@ Adjustable thresholds for abort, exit value, and problem reporting.
 <P>
 <H2>Command Examples:</H2>
 <DL>
+
 <DT>Get an overview of drives and their addresses</DT>
 <DD>#<KBD>&nbsp;xorriso -devices</KBD></DD>
+<DD><KBD>...</KBD></DD>
+<DD><KBD>0  -dev '/dev/sr0'  rwrw-- :  'TSSTcorp' 'CDDVDW SH-S203B'</KBD></DD>
+<DD><KBD>1  -dev '/dev/scd1' rwrw-- :  'PHILIPS ' 'SPD3300L'</KBD></DD>
+<DD><KBD>2  -dev '/dev/hda'  rwrw-- :  'HL-DT-ST' 'DVD-ROM GDR8162B'</KBD></DD>
+<DD><KBD>...</KBD></DD>
 <DT>Being superuser avoids permission problems with /dev/srN resp. /dev/hdX .
 </DT>
 <DT>Ordinary users should then get granted rw access to the /dev files
@@ -151,8 +166,9 @@ may accept pathspecs of form target=source as known from program mkisofs.</DT>
 <DT>Get info about a particular drive and loaded media:</DT>
 <DD>$<KBD>&nbsp;xorriso -indev /dev/sr0 -du / -- -toc 2>&amp;1 | less</KBD></DD>
 
-<DT>Make re-usable media writable again, delete any ISO 9660 image:</DT>
-<DD>$<KBD>&nbsp;xorriso -outdev /dev/sr0 -blank fast -eject all</KBD></DD>
+<DT>Make re-usable media writable again, delete any ISO 9660 image,
+eventually prepare yet unused BD-RE:</DT>
+<DD>$<KBD>&nbsp;xorriso -outdev /dev/sr0 -blank as_needed -eject all</KBD></DD>
 
 <DT>
 <HR>
@@ -162,7 +178,7 @@ may accept pathspecs of form target=source as known from program mkisofs.</DT>
 <DD>$<KBD>&nbsp;xorriso -dev /dev/sr0 -add /home/me/sounds /home/me/pictures
 </KBD></DD>
 
-<DT>Check the result:</DT>
+<DT>Have a look at the result:</DT>
 <DD>$<KBD>&nbsp;xorriso -indev /dev/sr0 -du / -- -toc 2>&amp;1 | less</KBD></DD>
 
 <DT>
@@ -174,17 +190,17 @@ adjust permissions to make it publicly read-only,
 write it to media and immediately eject media without
 previously reloading the written image.
 </DT>
-<DD>$<KBD>&nbsp;xorriso -outdev /dev/sr0 -blank fast -pathspecs on \</KBD></DD>
-<DD><KBD>&nbsp;&nbsp;-add /sounds=/home/me/sounds \</KBD></DD>
-<DD><KBD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-/pictures=/home/me/pictures -- \</KBD></DD>
+<DD>$<KBD>&nbsp;cd /home/me</KBD></DD>
+<DD>$<KBD>&nbsp;xorriso -outdev /dev/sr0 -blank as_needed \</KBD></DD>
+<DD><KBD>&nbsp;&nbsp;-map /home/me/sounds /sounds \</KBD></DD>
+<DD><KBD>&nbsp;&nbsp;-map /home/me/pictures /pictures \</KBD></DD>
 <DD><KBD>&nbsp;&nbsp;-rm_r /sounds/indecent '/pictures/*private*' -- \</KBD></DD>
-<DD><KBD>&nbsp;&nbsp;-add /pictures/private/horses=/home/me/pictures/private/horses -- \</KBD></DD>
+<DD><KBD>&nbsp;&nbsp;-cd / \</KBD></DD>
+<DD><KBD>&nbsp;&nbsp;-add pictures/private/horses* -- \</KBD></DD>
 <DD><KBD>&nbsp;&nbsp;-chmod_r a+r,a-w / -- \</KBD></DD>
 <DD><KBD>&nbsp;&nbsp;-find / -type d -exec chmod a+x -- \</KBD></DD>
 <DD><KBD>&nbsp;&nbsp;-volid SOUNDS_PICS_2008_01_16 \</KBD></DD>
 <DD><KBD>&nbsp;&nbsp;-commit_eject all</KBD></DD>
-
 <DT>
 <HR>
 </DT>
@@ -195,15 +211,14 @@ rename /pictures/private/horses,
 add new directory trees /sounds and /movies,
 disallow any access for group and others.
 Finally write as additional session to media and eject:</DT>
-<DD>$<KBD>&nbsp;xorriso -dev /dev/sr0 -pathspecs on \</KBD></DD>
+<DD>$<KBD>&nbsp;xorriso -dev /dev/sr0 \</KBD></DD>
 <DD><KBD>&nbsp;&nbsp;-rm_r /sounds -- \</KBD></DD>
 <DD><KBD>&nbsp;&nbsp;-mv /pictures/private/horses /horse_show -- \</KBD></DD>
-<DD><KBD>&nbsp;&nbsp;-add /sounds=/home/me/prepared_for_dvd/sounds_dummy \</KBD></DD>
-<DD><KBD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; /movies=/home/me/prepared_for_dvd/movies -- \</KBD></DD>
+<DD><KBD>&nbsp;&nbsp;-map /home/me/prepared_for_dvd/sounds_dummy /sounds \</KBD></DD>
+<DD><KBD>&nbsp;&nbsp;-map /home/me/prepared_for_dvd/movies /movies \</KBD></DD>
 <DD><KBD>&nbsp;&nbsp;-chmod_r go-rwx / -- \</KBD></DD>
 <DD><KBD>&nbsp;&nbsp;-volid SOUNDS_PICS_2008_01_17 \</KBD></DD>
 <DD><KBD>&nbsp;&nbsp;-commit_eject all</KBD></DD>
-
 <DT>
 <HR>
 </DT>
@@ -230,9 +245,11 @@ run. It will write eventually pending changes to media, if that has not
 already been done by a previous -commit.</DT>
 <DD>$<KBD>&nbsp;xorriso -dialog on</KBD></DD>
 <DD><KBD>enter option and arguments :</KBD></DD>
-<DD><KBD><B>-dev /dev/sr0 -pathspecs on</B></KBD></DD>
+<DD><KBD><B>-dev /dev/sr0</B></KBD></DD>
 <DD><KBD>enter option and arguments :</KBD></DD>
-<DD><KBD><B>-add /sounds=/home/me/prepared_for_dvd/sounds_dummy /movies=/home/me/prepared_for_dvd/movies</B></KBD></DD>
+<DD><KBD><B>-map /home/me/prepared_for_dvd/sounds_dummy /sounds</B></KBD></DD>
+<DD><KBD>enter option and arguments :</KBD></DD>
+<DD><KBD><B>-map /home/me/prepared_for_dvd/movies /movies</B></KBD></DD>
 <DD>Available navigation commands: -cd, -ls, -du, -find</DD>
 <DD><KBD>enter option and arguments :</KBD></DD>
 <DD><KBD><B>-commit</B></KBD></DD>
@@ -244,40 +261,137 @@ already been done by a previous -commit.</DT>
 <HR>
 </DT>
 
-<DT>The following command can be run on blank media to create a complete
-copy of the mentioned disk directory trees, and it can be run on appendable
-media to perform a minimal set of change operations which update the
-old ISO copies to match the new disk trees. Older states can be retrieved
-by help of mount option "session=" from CD-R[W], by help of "sbsector="
-from  DVD-R[W] and DVD+R.
-So this constitutes true incremental backup.
-On overwriteable media only the newest state is accessible.
-
-<!--
-Older states can be retrieved by help of mount option "session=" from CD-R[W],
-by help of "sbsector=" from other media.
-So this constitutes true incremental backup.
--->
-
+<DT>The following command performs incremental backup.
+It can be run on blank media to create a copy of the mentioned disk
+directory trees, and it can be run on appendable media to perform a
+minimal set of change operations which update the old ISO copies
+to match the new disk trees.
+Older states can be retrieved by help of mount options like "sbsector="
+or by help of xorriso option -mount.
+<BR>
+Eventual ACL or xattr will be recorded. Data reading will be avoided by
+accelerator option -disk_dev_ino.
+Only blank media or media with volume id "PROJECTS_MAIL_..." will be accepted.
+Files with names ending by ".o" or ".swp" are excluded by options -not_leaf.
 </DT>
-<DD>$<KBD>&nbsp;xorriso -dev /dev/sr0 \</KBD></DD>
+<DD>$<KBD>&nbsp;xorriso -acl on -xattr on -disk_dev_ino on \</KBD></DD>
+<DD><KBD>&nbsp;&nbsp; -assert_volid 'PROJECTS_MAIL_*' FATAL \</KBD></DD>
+<DD><KBD>&nbsp;&nbsp; -dev /dev/sr0 \</KBD></DD>
 <DD><KBD>&nbsp;&nbsp; -volid PROJECTS_MAIL_"$(date '+%Y_%m_%d_%H%M%S')" \</KBD></DD>
-<!--
 <DD><KBD>&nbsp;&nbsp; -not_leaf '*.o' -not_leaf '*.swp' \</KBD></DD>
--->
 <DD><KBD>&nbsp;&nbsp; -update_r /home/thomas/open_source_projects /open_source_projects \</KBD></DD>
 <DD><KBD>&nbsp;&nbsp; -update_r /home/thomas/personal_mail /personal_mail \</KBD></DD>
 <DD><KBD>&nbsp;&nbsp; -commit -toc -eject all</KBD></DD>
 
+<DT>
+To apply zisofs compression to those data files which get newly copied from
+the local filesystem, perform immediately before -commit :
+<DD>
+<KBD>&nbsp;&nbsp; -find / -type f -lba_range -1 2000000000 -exec set_filter --zisofs -- \</KBD></DD>
+</DD>
+</DT>
+
 <DT>
 <HR>
 </DT>
 
+<DT>
+Operating systems usually mount the most recent session on media.
+xorriso can issue the appropriate mount commands for older sessions.
+First get an overview of the sessions on the media:
+</DT>
+<DD>$<KBD>&nbsp;xorriso -outdev /dev/sr0 -toc</KBD></DD>
+<PRE>
+TOC layout   : Idx ,  sbsector ,       Size , Volume Id
+ISO session  :   1 ,         0 ,    104719s , PROJECTS_MAIL_2008_08_10_231435
+ISO session  :   2 ,    106928 ,      6785s , PROJECTS_MAIL_2008_08_14_184548
+...
+ISO session  :  76 ,    820384 ,     11035s , PROJECTS_MAIL_2009_01_04_191150
+</PRE>
+
+<DT>
+Then become superuser and let xorriso mount the session of August 14, 2008
+to directory /mnt:
+</DT>
+<DD>#<KBD>
+&nbsp;xorriso -osirrox on -mount /dev/sr0 volid '*_2008_08_14_*' /mnt
+</KBD></DD>
+<DT>
+To be later unmounted by: <KBD>umount /mnt</KBD>
+</DT>
+
+<DT>
+<HR>
+</DT>
+
+<DT>
+After the user has already created a suitable file tree on disk
+and copied the ISOLINUX files into subdirectory ./boot/isolinux of
+that tree, xorriso can burn an El Torito bootable media:
+</DT>
+<DD>$<KBD>&nbsp;xorriso -outdev /dev/sr0 -blank as_needed \</KBD></DD>
+<DD><KBD>&nbsp;&nbsp; -map /home/me/ISOLINUX_prepared_tree / \</KBD></DD>
+<DD><KBD>&nbsp;&nbsp; -boot_image isolinux dir=/boot/isolinux</KBD></DD>
+<DT>
+An additional MBR is generated if the file isolinux.bin is modern enough
+(syslinux version 3.72) and ready for "isohybrid". An MBR enables booting
+from hard disk or USB stick.
+<HR>
+</DT>
+
+<DT>ISO images may not only be stored on optical media but also in
+regular disk files or block devices for full multi-session operation.
+</DT>
+<DD>$<KBD>&nbsp;xorriso -dev /tmp/regular_file ...other.options...</DD>
+<DT>
+A default setting for safety reasons requires that files below /dev/
+need prefix &quot;stdio:&quot; if they do not lead to MMC burner devices.
+Be cautious not to overwrite your hard disk instead of your USB stick:
+</DT>
+<DD>$<KBD>&nbsp;xorriso -dev stdio:/dev/sdb ...other.options...</DD>
+
+<DT>Other file types are suitable only for writing but not for reading:</DT>
+<DD>$<KBD>&nbsp;xorriso -outdev /tmp/named_pipe ...other.options...</DD>
+
 <DT>In batch mode it is possible to operate xorriso in a pipeline
 with an external consumer of the generated ISO image. Any message
 output will be redirected to stderr in this case.</DT>
 <DD>$<KBD>&nbsp;xorriso -outdev - ...other.options... | consumer</KBD></DD>
 
+
+<DT>
+<HR>
+</DT>
+
+<DT>
+Let xorriso serve underneath growisofs via its alias name "xorrisofs"
+which enables mkisofs emulation:
+</DT>
+<DD>$<KBD>&nbsp;export MKISOFS="xorrisofs"</KBD></DD>
+<DD>$<KBD>&nbsp;growisofs -Z /dev/dvd /some/files</KBD></DD>
+<DD>$<KBD>&nbsp;growisofs -M /dev/dvd /more/files</KBD></DD>
+<DT>
+One may switch from mkisofs emulation to xorriso's own command mode:
+</DT>
+<DD>$<KBD>&nbsp;growisofs -M /dev/dvd -- outdev - -update_r /my/files /files
+</KBD></DD>
+
+<DT>
+<HR>
+</DT>
+
+<DT>If for any reason the reading operating system mishandles the ISO image
+or some files in it, one may enable reverse operation of xorriso and copy
+files or trees to disk:
+<DD>$<KBD>&nbsp;xorriso -acl on -xattr on \</KBD></DD>
+<DD><KBD>&nbsp;&nbsp; -indev /dev/sr0 \</KBD></DD>
+<DD><KBD>&nbsp;&nbsp; -osirrox on \</KBD></DD>
+<DD><KBD>&nbsp;&nbsp; -cpx '/pictures/private/horses*/*buttercup*' \</KBD></DD>
+<DD><KBD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; /home/her/buttercup_dir -- \</KBD>
+<DD><KBD>&nbsp;&nbsp; -extract /sounds /home/her/sounds_from_me</KBD></DD>
+</DD>
+<DT>Consider to enter dialog mode and use commands like
+<KBD>-cd , -du , -lsl , -find<KBD>.
 <DT>
 <HR>
 </DT>
@@ -290,9 +404,6 @@ output will be redirected to stderr in this case.</DT>
 <DD>$<KBD>&nbsp;<A HREF="man_1_xorriso.html">man xorriso</A></KBD></DD>
 </DL>
 
-
-Testers wanted who are willing to risk some double layer DVD media.
-
 </P>
 
 <HR>
@@ -300,8 +411,8 @@ Testers wanted who are willing to risk some double layer DVD media.
 <P>
 <DL>
 <DT><H3>Download as source code (see README):</H3></DT>
-<DD><A HREF="xorriso-0.1.4.pl00.tar.gz">xorriso-0.1.4.pl00.tar.gz</A>
-(955 KB).
+<DD><A HREF="xorriso-0.3.8.pl00.tar.gz">xorriso-0.3.8.pl00.tar.gz</A>
+(1220 KB).
 </DD>
 </DL>
 </DD>
@@ -327,50 +438,89 @@ an <A HREF="http://www.opensource.org/">Open Source</A> approved license</DD>
 <HR>
 
 <P>
-Enhancements towards previous stable version xorriso-0.1.2.pl00:
+Bug fixes towards xorriso-0.3.6.pl00:
 <UL>
-<LI>Coordination of -cut_out, -compare and -update</LI>
-<LI>New option -split_size, automated splitting of oversized files</LI>
-<LI>Improved performance with reading directory trees</LI>
-<LI>New option -session_log</LI>
-<LI>Dynamically linkable with release version 0.6.4 of libisofs</LI>
+<LI>- none -</LI>
+<!--
+-->
+
 </UL>
-Bug fixes towards xorriso-0.1.2.pl00:
+
+</P>
+
+<P>
+Enhancements towards previous stable version xorriso-0.3.6.pl00:
 <UL>
-<LI>-as mkisofs -no-pad was misspelled -nopad</LI>
-<LI>Implicite directory attribute copying with -cut_out was wrong</LI>
+<LI>
+New options -set_filter , -set_filter_r, -find -exec set_filter
+</LI>
+<LI>
+New option -zisofs, built-in filters --zisofs , --gzip , --gunzip</LI>
+</LI>
+<LI>
+New options -external_filter , -unregister_filter, -close_filter_list
+</LI>
+<LI>
+New options -show_stream, -show_stream_r
+</LI>
+<LI>
+New -osirrox mode "banned"
+</LI>
+<LI>
+New option -auto_charset based on xattr "isofs.cs"
+</LI>
 </UL>
 </P>
 
 <HR>
 
 <P>
+<H3>
+Library copies included in xorriso tarballs:
+</H3>
 <DL>
-<DT><H3>Development snapshot, version 0.1.5 :</H3></DT>
-<DD>Bug fixes towards xorriso-0.1.4.pl00:
+<DT>libburn-0.6.5</DT>
+<DD>reads and writes data from and to CD, DVD, BD.</DD>
+<DD>(founded by Derek Foreman and Ben Jansens,
+developed and maintained since August 2006 by
+Thomas Schmitt from team of libburnia-project.org)</DD>
+<DT>libisofs-0.6.19</DT>
+<DD>operates on ISO 9660 filesystem images.</DD>
+<DD>(By Vreixo Formoso, Mario Danic and Thomas Schmitt
+from team of libburnia-project.org)</DD>
+<DT>libisoburn-0.3.8</DT>
+<DD>coordinates libburn and libisofs, emulates multi-session where needed.</DD>
+<DD>(By Vreixo Formoso and Thomas Schmitt
+from team of libburnia-project.org)</DD>
+<DD>&nbsp;</DD>
+<DT>The source code of this software is independent of 
+cdrecord and mkisofs.</DT>
+</DL>
+</P>
+
+<HR>
+
+<P>
+<DL>
+<DT><H3>Development snapshot, version 0.3.9 :</H3></DT>
+<DD>Bug fixes towards xorriso-0.3.8.pl00:
 <UL>
 <LI>- none yet -</LI>
-<!-- <LI>- none yet -</LI> -->
+<!-- 
+ -->
 </UL>
 </DD>
-<DD>Enhancements towards stable version 0.1.4.pl00:
+<DD>Enhancements towards stable version 0.3.8.pl00:
 <UL>
-<LI>Support for BD-RE</LI>
-<LI>New options -map and -map_single</LI>
-<LI>New options -not_paths, -not_leaf, -not_list, -not_mgt, -as mkisofs -m</LI>
-<LI>Emulated -toc on overwriteable media, new -toc layout with volume id</LI>
-<LI>New option -rom_toc_scan for read-only drive problems</LI>
-<LI>New option -load makes alternative sessions accessible</LI>
-<LI>New option -error_behavior with a first occasion 'image_loading'</LI>
-<LI>New -blank and -format option 'as_needed'</LI>
-<LI>New option -list_formats</LI>
-<!-- <LI>- none yet -</LI> -->
+<LI>- none yet -</LI>
+<!-- 
+ -->
 </UL>
 </DD>
 <DD>&nbsp;</DD>
-<DD><A HREF="README_xorriso_devel">README 0.1.5</A>
-<DD><A HREF="xorriso_help_devel">xorriso_0.1.5 -help</A></DD>
-<DD><A HREF="man_1_xorriso_devel.html">man xorriso (as of 0.1.5)</A></DD>
+<DD><A HREF="README_xorriso_devel">README 0.3.9</A>
+<DD><A HREF="xorriso_help_devel">xorriso_0.3.9 -help</A></DD>
+<DD><A HREF="man_1_xorriso_devel.html">man xorriso (as of 0.3.9)</A></DD>
 <DD>&nbsp;</DD>
 <DT>If you want to distribute development versions of xorriso, then use
 this tarball which produces static linking between xorriso and the
@@ -380,8 +530,8 @@ libburnia libraries.
 installation see README)
 </DD>
 <DD>
-<A HREF="xorriso-0.1.5.tar.gz">xorriso-0.1.5.tar.gz</A>
-(980 KB).
+<A HREF="xorriso-0.3.9.tar.gz">xorriso-0.3.9.tar.gz</A>
+(1220 KB).
 </DD>
 <DT>A dynamically linked development version of xorriso can be obtained
 from repositories of
@@ -396,20 +546,21 @@ versions for dynamic linking. Only release versions are safe for that.
 </KBD></DD>
 <DD>Install: <KBD><B>cd libburn ; ./bootstrap ; ./configure --prefix /usr ; make ; make install</B>
 </KBD></DD>
-<DD>Download: <KBD><B>bzr branch lp:libisofs</B></KBD></DD>
+<DD>Download:
+<KBD><B>bzr branch lp:~libburnia-team/libisofs/scdbackup</B></KBD>
+</DD>
 <DD>Install: <KBD><B>cd libisofs ; ./bootstrap ; ./configure --prefix /usr ; make ; make install</B>
 </KBD></DD>
 <DD>Download: <KBD><B>svn co http://svn.libburnia-project.org/libisoburn/trunk libisoburn</B>
 </KBD></DD>
 <DD>Install: <KBD><B>cd libisoburn ; ./bootstrap ; ./configure --prefix /usr ; make ; make install</B>
 </KBD></DD>
-<DD>Build of SVN versions needs <A HREF="http://sources.redhat.com/autobook/">
+<DT>Build of SVN versions needs <A HREF="http://sources.redhat.com/autobook/">
 autotools</A> of at least version 1.7 installed.
 But after the run of <KBD>./bootstrap</KBD>, only
-vanilla tools like make and gcc are needed.</DD>
-</DD>
+vanilla tools like make and gcc are needed.
+</DT>
 <DD>&nbsp;</DD>
-
 </DL>
 </P>
 
@@ -423,7 +574,6 @@ Very special thanks to Andy Polyakov whose
 provide the libburnia project with invaluable examples on how to deal
 with DVD media and how to emulate multi-session on overwriteable media.
 </P>
-
 <HR>
 
 
@@ -439,6 +589,11 @@ and by <A HREF="http://sourceforge.net">sourceforge.net</A><BR>
 <A href="http://sourceforge.net">
 <IMG src="sflogo-88-1.png" BORDER="0" ALT="SourceForge Logo"></A>
 <!-- on sourceforge use : <IMG src="http://sourceforge.net/sflogo.php?group_id=16010" width="88" height="31" border="0" alt="SourceForge Logo"></A> -->
+<P>
+Enjoying a FreeBSD shell account with the opportunity to
+build, install and test xorriso at<BR>
+<A HREF="http://www.en.free-shells.com.ar">free-shells.com.ar</A>
+</P>
 </FONT></CENTER>
 <HR>
 <DL>

xorriso/xorriso_makefile_am.txt

@@ -1,4 +1,8 @@
-pkgconfigdir=$(libdir)/pkgconfig
+
+# ts A90315 : LIBBURNIA_PKGCONFDIR is defined OS specific in acinclude.m4
+# was: pkgconfigdir=$(libdir)/pkgconfig
+pkgconfigdir=$(LIBBURNIA_PKGCONFDIR)
+
 libincludedir=
 
 lib_LTLIBRARIES =
@@ -16,9 +20,24 @@ xorriso_xorriso_CPPFLAGS = -I./libburn -I./libisofs -I./libisoburn -I./xorriso
 
 # No readline in the vanilla version because the necessary headers
 # are in a separate readline-development package.
-xorriso_xorriso_CFLAGS = -DXorriso_standalonE -DXorriso_with_maiN -DXorriso_with_regeX $(READLINE_DEF)
+xorriso_xorriso_CFLAGS = -DXorriso_standalonE -DXorriso_with_maiN \
+                         $(READLINE_DEF) $(LIBACL_DEF) $(XATTR_DEF) \
+                         $(EXTF_DEF) $(EXTF_SUID_DEF) $(ZLIB_DEF)
+
+xorriso_xorriso_LDADD = $(THREAD_LIBS) $(LIBBURN_ARCH_LIBS)
+
+
+# This looks quite ugly with make install: xorriso.c is compiled twice again
+#
+# Trying to create a build timestamp file
+#
+# BUILT_SOURCES = xorriso/xorriso_buildstamp.h
+# phony targets get rebuilt every time
+# .PHONY: xorriso/xorriso_buildstamp.h
+# xorriso/xorriso_buildstamp.h:
+# 	date -u '+#define Xorriso_build_timestamP "%Y.%m.%d.%H%M%S"' >xorriso/xorriso_buildstamp.h
+# 	cat xorriso/xorriso_buildstamp.h
 
-xorriso_xorriso_LDADD = $(THREAD_LIBS)
 
 xorriso_xorriso_SOURCES = \
 	\
@@ -28,6 +47,7 @@ xorriso_xorriso_SOURCES = \
 	xorriso/xorrisoburn.h \
 	xorriso/xorrisoburn.c \
 	xorriso/xorriso_timestamp.h \
+	xorriso/xorriso_buildstamp.h \
 	\
 	libisoburn/libisoburn.h \
 	libisoburn/isoburn.h \
@@ -36,9 +56,9 @@ xorriso_xorriso_SOURCES = \
 	libisoburn/burn_wrap.c \
 	libisoburn/data_source.c \
 	\
+	libisofs/libisofs.h \
 	libisofs/builder.h \
 	libisofs/builder.c \
-	libisofs/error.h \
 	libisofs/node.h \
 	libisofs/node.c \
 	libisofs/tree.h \
@@ -50,7 +70,6 @@ xorriso_xorriso_SOURCES = \
 	libisofs/fsource.h \
 	libisofs/fsource.c \
 	libisofs/fs_local.c \
-	libisofs/fs_image.h \
 	libisofs/fs_image.c \
 	libisofs/messages.h \
 	libisofs/messages.c \
@@ -69,6 +88,7 @@ xorriso_xorriso_SOURCES = \
 	libisofs/ecma119_tree.h \
 	libisofs/ecma119_tree.c \
 	libisofs/writer.h \
+	libisofs/buffer.h \
 	libisofs/buffer.c \
 	libisofs/rockridge.h \
 	libisofs/rockridge.c \
@@ -81,7 +101,14 @@ xorriso_xorriso_SOURCES = \
         libisofs/find.c \
         libisofs/filter.h \
         libisofs/filter.c \
-        libisofs/filters/xor_encrypt.c \
+        libisofs/filters/external.c \
+        libisofs/filters/zisofs.c \
+        libisofs/filters/gzip.c \
+        libisofs/system_area.h \
+        libisofs/system_area.c \
+        libisofs/make_isohybrid_mbr.c \
+	libisofs/aaip_0_2.h \
+	libisofs/aaip_0_2.c \
 	\
 	libburn/async.c \
 	libburn/async.h \
@@ -137,7 +164,6 @@ xorriso_xorriso_SOURCES = \
 	\
 	version.h
 
-
 noinst_PROGRAMS = \
 	test/compare_file
 
@@ -151,6 +177,30 @@ test_compare_file_LDADD =
 test_compare_file_SOURCES = test/compare_file.c
 
 
+# Install symbolic links to the xorriso binary
+#
+install-exec-hook:
+	if test -e "$(DESTDIR)$(bindir)"/xorrisofs ; then rm "$(DESTDIR)$(bindir)"/xorrisofs ; else echo ; fi
+	ln -s xorriso "$(DESTDIR)$(bindir)"/xorrisofs
+	if test -e "$(DESTDIR)$(bindir)"/osirrox ; then rm "$(DESTDIR)$(bindir)"/osirrox ; else echo ; fi
+	ln -s xorriso "$(DESTDIR)$(bindir)"/osirrox
+	if test -e "$(DESTDIR)$(bindir)"/xorrecord ; then rm "$(DESTDIR)$(bindir)"/xorrecord ; else echo ; fi
+	ln -s xorriso "$(DESTDIR)$(bindir)"/xorrecord
+
+
+
+# Alternative to the disabled .PHONY above.
+# Trying to create a build timestamp file semi-manually:  make buildstamped
+#
+buildstamp:
+	date -u '+#define Xorriso_build_timestamP "%Y.%m.%d.%H%M%S"' >xorriso/xorriso_buildstamp.h
+	cat xorriso/xorriso_buildstamp.h
+
+# For now   make buildstamped  has to be performed manually.
+buildstamped: buildstamp
+	make
+
+
 ## ========================================================================= ##
 
 # Indent source files
@@ -184,6 +234,17 @@ EXTRA_DIST = \
 	COPYING \
 	INSTALL \
 	xorriso/changelog.txt \
-	$(man_MANS)
-	
-
+	xorriso/xorriso_buildstamp_none.h \
+	$(man_MANS) \
+	doc/susp_aaip_2_0.txt \
+	doc/susp_aaip_isofs_names.txt \
+	doc/zisofs_format.txt \
+	libisofs/aaip-os-dummy.c \
+	libisofs/aaip-os-linux.c \
+	libisofs/aaip-os-freebsd.c \
+	libburn/os-dummy.h \
+	libburn/os-freebsd.h \
+	libburn/os-linux.h \
+	libburn/sg-dummy.c \
+	libburn/sg-freebsd.c \
+	libburn/sg-linux.c

xorriso/xorriso_private.h

@@ -2,7 +2,7 @@
 /* Command line oriented batch and dialog tool which creates, loads,
    manipulates and burns ISO 9660 filesystem images.
 
-   Copyright 2007-2008 Thomas Schmitt, <scdbackup@gmx.net>
+   Copyright 2007-2009 Thomas Schmitt, <scdbackup@gmx.net>
 
    Provided under GPL version 2.
 
@@ -18,7 +18,7 @@
 #ifndef Xorriso_private_includeD
 #define Xorriso_private_includeD yes
 
-#define Xorriso_program_versioN "0.1.5"
+#define Xorriso_program_versioN "0.3.8"
 
 /** The source code release timestamp */
 #include "xorriso_timestamp.h"
@@ -26,27 +26,27 @@
 #define Xorriso_timestamP "-none-given-"
 #endif
 
-/** The binary build timestamp is to be set externally by the compiler */
+/** The binary build timestamp is to be set externally by the compiler
+    or by a macro definition in xorriso_buildstamp.h.
+*/
+#include "xorriso_buildstamp.h"
 #ifndef Xorriso_build_timestamP
 #define Xorriso_build_timestamP "-none-given-"
 #endif
 
-
-/* Because regex_t is mentioned in struct XorrisO */
-#ifdef Xorriso_with_regeX
 #include <regex.h>
-#endif /* Xorriso_with_regeX */
 
 
 #define Smem_malloC malloc
 #define Smem_freE free
 #define SfileadrL 4096
 
-/* <<< ??? */
-typedef int (*Cleanup_app_handler_T)();
-
-struct LinkiteM;
-struct ExclusionS;
+struct LinkiteM;          /* Trace of hops during symbolic link resolution */
+struct ExclusionS;        /* List of -not_* conditions */
+struct PermiteM;          /* Stack of temporarily altered access permissions */
+struct SpotlisT;          /* List of intervals with different read qualities */
+struct CheckmediajoB;     /* Parameters for Xorriso_check_media() */
+struct SectorbitmaP;      /* Distiniction between valid and invalid sectors */
 
 
 /* maximum number of history lines to be reported with -status:long_history */
@@ -61,6 +61,13 @@ struct ExclusionS;
 #define Xorriso_rc_nuM 4
 
 
+/* Default setting for the size limit of single data files:
+   100 extents with 4 GB - 2 kB each = 400 GB - 200 kB
+*/
+#define Xorriso_default_file_size_limiT \
+        (((off_t) 400) * ((off_t) 1024*1024*1024) - (off_t) 204800)
+
+
 struct XorrisO { /* the global context of xorriso */
 
  int libs_are_started;
@@ -70,6 +77,13 @@ struct XorrisO { /* the global context of xorriso */
  char initial_wdx[SfileadrL];
  int no_rc;
 
+ /* Command line argument emulations:
+      0=xorriso mode
+      1=mkisofs mode
+      2=cdrecord mode
+ */
+ int argument_emulation;
+
  /** List of startupfiles */
  char rc_filenames[Xorriso_rc_nuM][SfileadrL];
  int rc_filename_count;
@@ -81,9 +95,25 @@ struct XorrisO { /* the global context of xorriso */
  int add_plainly;
  off_t split_size;
 
+ char list_delimiter[81];
+
  /* >>> put libisofs aspects here <<< */
 
  int do_joliet;
+
+ int do_aaip; /* bit0= ACL in
+                 bit1= ACL out
+                 bit2= EA in
+                 bit3= EA out
+                 bit4= record dev,inode per node, isofs_st_out in root
+                 bit5= check dev,inode,isofs_st_in
+                 bit6= omit content check if bit5 check is conclusive
+                 bit7= omit dev check with bit5
+                 bit8= store output charset in xattr "isofs.cs"
+                 bit9= allow to set input charset from xattr "isofs.cs"
+              */
+
+ int relax_compliance;        /* opaque bitfield to be set by xorrisoburn */
  int do_follow_pattern;
  int do_follow_param;
  int do_follow_links;
@@ -97,14 +127,26 @@ struct XorrisO { /* the global context of xorriso */
  mode_t global_dir_mode;
  mode_t global_file_mode;
 
+ struct Xorriso_lsT *filters;
+ int filter_list_closed;
+
+ int zlib_level;
+ int zlib_level_default;
+ int zisofs_block_size;
+ int zisofs_block_size_default;
+ int zisofs_by_magic;
+
  int do_overwrite; /* 0=off, 1=on, 2=nondir */
  int do_reassure;  /* 0=off, 1=on, 2=tree */
 
  char volid[33];
  int volid_default;
  char loaded_volid[33];
+ char assert_volid[SfileadrL];
+ char assert_volid_sev[80];
 
  char publisher[129];
+ char application_id[129];
 
  char session_logfile[SfileadrL];
  int session_lba;
@@ -112,8 +154,14 @@ struct XorrisO { /* the global context of xorriso */
 
  /* >>> put libburn/isoburn aspects here */
 
+ struct Xorriso_lsT *drive_blacklist;
+ struct Xorriso_lsT *drive_greylist;
+ struct Xorriso_lsT *drive_whitelist;
+
  int toc_emulation_flag; /* bit0= bit3 for isoburn_drive_aquire()
                                   scan -ROM profiles for ISO sessions
+                            bit1= bit4 for isoburn_drive_aquire()
+                                  do not emulate TOC on overwriteable media
                          */
 
  int image_start_mode;  /* From what address to load the ISO image
@@ -122,6 +170,8 @@ struct XorrisO { /* the global context of xorriso */
                             1= value is session number
                             2= value is track number
                             3= value is lba
+                           bit16= with mode 3 : value is possibly 16 too high.
+                                  Let isoburn_set_msc1() adjust it.
                            bit30= interference with normal msc1 processing
                                   is enabled. Without this bit,
                                   isoburn_set_msc1() will not be called.
@@ -134,16 +184,32 @@ struct XorrisO { /* the global context of xorriso */
  char indev[SfileadrL];
  void *in_drive_handle;  /* interpreted only by xorrisoburn.c */
  void *in_volset_handle; /* interpreted only by xorrisoburn.c */
+ char *in_charset;       /* The charset to interpret the filename bytes */
+ time_t isofs_st_out;    /* A time point at least 1 second before image
+                            composition began. To be stored with image as
+                            xattr "isofs.st". */
+ time_t isofs_st_in;     /* That time point as read from "isofs.st" of the
+                            loaded image. */
 
  int volset_change_pending; /* whether -commit would make sense */
  int no_volset_present;     /* set to 1 on first failure */
 
+ struct CheckmediajoB *check_media_default;
+ struct SectorbitmaP *in_sector_map; /* eventual sector validity bitmap */
+
+
  char outdev[SfileadrL];
  void *out_drive_handle; /* interpreted only by xorrisoburn.c */
+ char *out_charset;      /* The charset to produce the filename bytes for */
  int dev_fd_1; /* The fd which substitutes for /dev/fd/1 and is
                      connected to externaly perveived stdout.
                   */
 
+ int grow_blindly_msc2; /* if >= 0 this causes growing from drive to drive.
+                           The value is used as block address offset for
+                           image generation. Like in: mkisofs -C msc1,msc2
+                         */
+
  int ban_stdio_write;
  int do_dummy;
  int do_close;
@@ -151,15 +217,55 @@ struct XorrisO { /* the global context of xorriso */
  int fs;        /* fifo size in 2048 byte chunks : at most 1 GB */
  int padding;   /* number of bytes to add after ISO 9660 image */
 
+ int alignment; /* if > 0 : image size alignment in 2048 byt blocks */
+                /* <<< not sure whether to keep this after libisofs will have
+                       learned to pad up MBR images to full MB */
+
+ int do_stream_recording; /* 0=no, 1=yes, 2=for data, not for dir
+                             >=16 means yes with number as start LBA  */
+
  int keep_boot_image;
  int patch_isolinux_image;
+ char boot_image_bin_path[SfileadrL];
+ int boot_image_emul; /* 0=no emulation
+                        (1=emulation as hard disk)
+                        (2=emulation as floppy)
+                      */
+ char boot_image_cat_path[SfileadrL];
+ off_t boot_image_load_size;
+ int boot_image_isohybrid; /* 0=off , 1=auto , 2=on , 3=force */
 
+ /* LBA of boot image after image loading */
+ int loaded_boot_bin_lba;
+ /* Path of the catalog node after image loading */
+ char loaded_boot_cat_path[SfileadrL];
 
  /* XORRISO options */
  int allow_graft_points;
 
- int dialog;
+ int allow_restore; /* -1=permanently disallowed
+                        0=disallowed, 1=allowed, 2=device files allowed */
+ int do_concat_split;  /* 1= restore complete split file directories as
+                             regular files
+                        */
+ int do_auto_chmod;    /* 1= eventually temporarily open access permissions
+                             of self-owned directories during restore
+                        */
 
+ int dialog;  /* 0=off , 1=single-line , 2=multi-line */
+
+ int bsl_interpretation;
+                     /* whether to run input through Sfile_bsl_interpreter():
+                        bit0-1= dialog and quoted file reading
+                          0= no interpretation, leave unchanged
+                          1= only inside double quotes
+                          2= outside single quotes
+                          3= everywhere
+                        bit2-3= reserved as future expansion of bit0-1
+                        bit4= interpretation within program start arguments
+                        bit5= perform backslash encoding with results
+                        bit6= perform backslash encoding with info texts
+                     */
 
  /* Pattern matching facility. It still carries legacy from scdbackup/askme.c
     but is fully functional for xorriso.
@@ -185,6 +291,8 @@ struct XorrisO { /* the global context of xorriso */
 
  int temp_mem_limit;
 
+ off_t file_size_limit;
+
  struct ExclusionS *disk_exclusions;
  int disk_excl_mode; /* bit0= on (else off)
                         bit1= parameter too (else rekursion only)
@@ -199,7 +307,17 @@ struct XorrisO { /* the global context of xorriso */
  char mark_text[SfileadrL]; /* ( stdout+stderr, M: ) */
  int packet_output;
  char logfile[4][SfileadrL];
+ FILE *logfile_fp[4];
+ FILE *pktlog_fp;
+ struct Xorriso_lsT *result_msglists[Xorriso_max_outlist_stacK];
+ struct Xorriso_lsT *info_msglists[Xorriso_max_outlist_stacK];
+ int msglist_flags[Xorriso_max_outlist_stacK]; /* bit0= result is redirected
+                                                  bit1= info is redirected
+                                               */
+ int msglist_stackfill;
+
  int status_history_max; /* for -status long_history */
+ 
 
  char report_about_text[20];
  int report_about_severity;
@@ -214,6 +332,7 @@ struct XorrisO { /* the global context of xorriso */
  FILE *errfile_fp;
 
  int img_read_error_mode; /* 0=best_effort , 1=failure , 2=fatal */
+ int extract_error_mode; /* 0=best_effort , 1=keep , 2=delete */
 
  char return_with_text[20];
  int return_with_severity;
@@ -222,10 +341,8 @@ struct XorrisO { /* the global context of xorriso */
  char eternal_problem_status_text[20];
 
  /* temporary search facilities */
-#ifdef Xorriso_with_regeX
  regex_t *re;
  regmatch_t match[1]; 
-#endif /* Xorriso_with_regeX */
  char **re_constants;
  int re_count;
  int re_fill;
@@ -246,19 +363,23 @@ struct XorrisO { /* the global context of xorriso */
  double error_count; /* double will not roll over */
 
  /* pacifiers */
+ int pacifier_style; /* 0= xorriso, 1=mkisofs 2=cdrecord */
  double pacifier_interval;
  double start_time;
  double last_update_time;
  /* optional global counters for brain reduced callback functions */
  off_t pacifier_count;
  off_t pacifier_total;
+ off_t pacifier_byte_count; /* auxiliary counter for data bytes */
 
  void *pacifier_fifo;
 
  int find_compare_result; /* 1=everything matches , 0=mismatch , -1=error */ 
 
+ struct PermiteM *perm_stack; /* Temporarily altered dir access permissions */
+
  /* result (stdout, R: ) */
- char result_line[5*SfileadrL];
+ char result_line[10*SfileadrL];
  int result_line_counter;
  int result_page_counter;
  int result_open_line_len;
@@ -291,7 +412,7 @@ int Xorriso_regexec(struct XorrisO *xorriso, char *to_match, int *failed_at,
 int Xorriso_prepare_expansion_pattern(struct XorrisO *xorriso, char *pattern,
                                       int flag);
 
-int Xorriso__mode_to_perms(mode_t st_mode, char perms[10], int flag);
+int Xorriso__mode_to_perms(mode_t st_mode, char perms[11], int flag);
 
 int Xorriso_much_too_long(struct XorrisO *xorriso, int len, int flag);
 
@@ -386,6 +507,97 @@ int Xorriso_update_interpreter(struct XorrisO *xorriso, void *boss_iter,
 
 int Xorriso_path_is_excluded(struct XorrisO *xorriso, char *path, int flag);
 
+/* @param flag bit0= long format
+               bit1= do not print count of nodes
+               bit2= du format
+               bit3= print directories as themselves (ls -d)
+*/
+int Xorriso_lsx_filev(struct XorrisO *xorriso, char *wd,
+                      int filec, char **filev, off_t boss_mem, int flag);
+
+/*
+   @param flag >>> bit0= remove whole sub tree: rm -r
+               bit1= remove empty directory: rmdir
+               bit2= recursion: do not reassure in mode 2 "tree"
+               bit3= this is for overwriting and not for plain removal
+               bit4= count deleted files in xorriso->pacifier_count
+               bit5= with bit0 only remove directory content, not the directory
+   @return   <=0 = error
+               1 = removed leaf file object
+               2 = removed directory or tree
+               3 = did not remove on user revocation
+*/
+int Xorriso_rmx(struct XorrisO *xorriso, off_t boss_mem, char *path, int flag);
+
+
+int Xorriso_make_tmp_path(struct XorrisO *xorriso, char *orig_path,
+                          char *tmp_path, int *fd, int flag);
+
+/* @param flag bit0= path is a directory
+               bit2= recursion: do not reassure in mode 2 "tree"
+               bit3= this is for overwriting and not for plain removal
+*/
+int Xorriso_reassure_restore(struct XorrisO *xorriso, char *path, int flag);
+
+
+int Xorriso_auto_chmod(struct XorrisO *xorriso, char *disk_path, int flag);
+
+int Xorriso_protect_stdout(struct XorrisO *xorriso, int flag);
+
+
+/* @param flag bit0= mark untested areas as valid
+*/
+int Xorriso_spotlist_to_sectormap(struct XorrisO *xorriso,
+                                  struct SpotlisT *spotlist,
+                                  int read_chunk,
+                                  struct SectorbitmaP **map,
+                                  int flag);
+
+int Xorriso_toc_to_string(struct XorrisO *xorriso, char **toc_text, int flag);
+
+
+/* @param flag bit0+1= what to aquire after giving up outdev
+                       0=none, 1=indev, 2=outdev, 3=both
+*/
+int Xorriso_reaquire_outdev(struct XorrisO *xorriso, int flag);
+
+
+/* Opens the -check_media data copy in for reading and writing
+*/
+int Xorriso_open_job_data_to(struct XorrisO *xorriso,
+                             struct CheckmediajoB *job, int flag);
+
+int Xorriso_no_findjob(struct XorrisO *xorriso, char *cmd, int flag);
+
+
+int Xorriso_make_mount_cmd(struct XorrisO *xorriso, char *cmd,
+                           int lba, int track, int session, char *volid,
+                           char *devadr, char result[SfileadrL], int flag);
+
+
+/* @param flag bit0= use env_path to find the desired program
+*/
+int Xorriso_execv(struct XorrisO *xorriso, char *cmd, char *env_path,
+                  int *status, int flag);
+
+int Xorriso_is_in_patternlist(struct XorrisO *xorriso,
+                        struct Xorriso_lsT *patternlist, char *path, int flag);
+
+char *Xorriso_get_pattern(struct XorrisO *xorriso,
+                         struct Xorriso_lsT *patternlist, int index, int flag);
+
+
+/* Normalize ACL and sort apart "access" ACL from "default" ACL.
+ */
+int Xorriso_normalize_acl_text(struct XorrisO *xorriso, char *in_text,
+                    char **access_acl_text, char **default_acl_text, int flag);
+
+int Xorriso_path_setfattr(struct XorrisO *xorriso, void *in_node, char *path,
+                       char *name, size_t value_length, char *value, int flag);
+
+int Xorriso_status_result(struct XorrisO *xorriso, char *filter, FILE *fp,
+                          int flag);
+
 
 int Sfile_str(char target[SfileadrL], char *source, int flag);
 
@@ -403,6 +615,98 @@ int Sfile_destroy_argv(int *argc, char ***argv, int flag);
 */
 int Sfile_count_components(char *path, int flag);
 
+/*
+ @param flag
+ bit0= return -1 if file is missing
+ bit1= return a hardlink with siblings as type 5
+ bit2= evaluate eventual link target rather than the link object itself
+ bit3= return a socket or a char device as types 7 or 8 rather than 0
+ @return
+  0=unknown
+  1=regular
+  2=directory
+  3=symbolic link
+  4=named pipe
+  5=multiple hardlink (with bit1)
+  6=block device
+  7=socket (with bit3)
+  8=character device (with bit3)
+*/
+int Sfile_type(char *filename, int flag);
+
+/* @param flag bit0= only encode inside quotes
+               bit1= encode < 32 outside quotes except 7, 8, 9, 10, 12, 13
+               bit2= encode in any case above 126
+               bit3= encode in any case shellsafe:
+                     <=42 , 59, 60, 62, 63, 92, 94, 96, >=123
+*/
+int Sfile_bsl_encoder(char **result, char *text, size_t text_len, int flag);
+
+
+struct Xorriso_lsT {
+  char *text;
+  struct Xorriso_lsT *prev,*next;
+};
+
+/** Create a new list item with arbitrary byte content.
+    @param lstring  The newly created object or NULL on failure
+    @param data     An array of bytes to be copied into the new object
+    @param data_len Number of bytes to be copied
+    @param link     Xorriso_lsT object to which the new object shall be linked
+    @param flag Bitfield for control purposes
+                bit0= insert before link rather than after it
+                bit1= do not copy data (e.g. because *data is invalid)
+                bit2= attach data directly by pointer rather than by copying
+    @return <=0 error, 1 ok
+*/
+int Xorriso_lst_new_binary(struct Xorriso_lsT **lstring, char *data,
+                           int data_len, struct Xorriso_lsT *link, int flag);
+
+
+/** Create a new list item with a 0-terminated text as content.
+    @param lstring  The newly created object or NULL on failure
+    @param text     A 0-terminated array of bytes
+    @param link     Xorriso_lsT object to which the new object shall be linked
+    @param flag     see Xorriso_lst_new_binary
+    @return <=0 error, 1 ok
+*/
+int Xorriso_lst_new(struct Xorriso_lsT **lstring, char *text,
+                    struct Xorriso_lsT *link, int flag);
+
+
+/** Create a new list item at the end of a given list.
+    @param entry    Contains as input a pointer to a pointer to any existing
+                    list item. As output this list item pointer may be
+                    changed to the address of the new list item:
+                    if ((*entry == 0) || (flag & 1))
+    @param data     An array of bytes to be copied into the new object
+    @param data_len Number of bytes to be copied
+    @param flag     Bitfield for control purposes
+                    bit0= Return new object address in *entry
+                    bit1= do not copy data (e.g. because *data is invalid)
+                    bit2= attach data directly by pointer rather than by copying
+    @return <=0 error, 1 ok
+*/
+int Xorriso_lst_append_binary(struct Xorriso_lsT **entry,
+                              char *data, int data_len, int flag);
+
+
+/** Destroy a single list item and connect its eventual list neighbors.
+    @param lstring  pointer to the pointer to be freed and set to NULL
+    @param flag     unused yet, submit 0
+    @return 0= *lstring was alredy NULL, 1= ok
+*/
+int Xorriso_lst_destroy(struct Xorriso_lsT **lstring, int flag);
+
+
+struct Xorriso_lsT *Xorriso_lst_get_next(struct Xorriso_lsT *entry, int flag);
+
+struct Xorriso_lsT *Xorriso_lst_get_prev(struct Xorriso_lsT *entry, int flag);
+
+char *Xorriso_lst_get_text(struct Xorriso_lsT *entry, int flag);
+
+int Xorriso_lst_detach_text(struct Xorriso_lsT *entry, int flag);
+
 
 char *Text_shellsafe(char *in_text, char *out_text, int flag);
 
@@ -411,6 +715,15 @@ int Sort_argv(int argc, char **argv, int flag);
 /* @param flag bit0= single letters */
 char *Ftypetxt(mode_t st_mode, int flag);
 
+/* @param flag bit0=with year and seconds
+               bit1=timestamp format YYYY.MM.DD.hhmmss
+*/
+char *Ftimetxt(time_t t, char timetext[40], int flag);
+
+int System_uname(char **sysname, char **release, char **version, 
+                 char **machine, int flag);
+
+
 struct DirseQ;
 
 int Dirseq_new(struct DirseQ **o, char *adr, int flag);
@@ -425,6 +738,12 @@ int Linkitem_reset_stack(struct LinkiteM **o, struct LinkiteM *to, int flag);
 
 struct FindjoB;
 
+
+int Findjob_new(struct FindjoB **o, char *start_path, int flag);
+
+int Findjob_destroy(struct FindjoB **job, int flag);
+
+
 /* @return 0=no match , 1=match , <0 = error
 */
 int Findjob_test(struct FindjoB *job, char *name, 
@@ -437,7 +756,7 @@ int Findjob_get_action(struct FindjoB *o, int flag);
 
 /* @return <0 error, >=0 see xorriso.c struct FindjoB.action
 */ 
-int Findjob_get_action_parms(struct FindjoB *o, char **target,
+int Findjob_get_action_parms(struct FindjoB *o, char **target, char **text_2,
                              uid_t *user, gid_t *group,
                              mode_t *mode_and, mode_t *mode_or,
                              int *type, time_t *date, struct FindjoB **subjob,
@@ -463,8 +782,34 @@ int Findjob_set_action_ad(struct FindjoB *o, int type, time_t date, int flag);
 
 int Findjob_set_start_path(struct FindjoB *o, char *start_path, int flag);
 
+int Findjob_set_action_found_path(struct FindjoB *o, int flag);
+
 int Findjob_get_start_path(struct FindjoB *o, char **start_path, int flag);
 
+int Findjob_set_lba_range(struct FindjoB *o, int start_lba, int count,
+                          int flag);
+
+int Findjob_get_lba_damage_filter(struct FindjoB *o, int *start_lba,
+                                  int *end_lba, int *damage_filter, int flag);
+
+int Findjob_get_commit_filter(struct FindjoB *o, int *commit_filter, int flag);
+
+int Findjob_get_acl_filter(struct FindjoB *o, int *acl_filter, int flag);
+
+int Findjob_get_xattr_filter(struct FindjoB *o, int *xattr_filter, int flag);
+
+int Findjob_get_aaip_filter(struct FindjoB *o, int *aaip_filter, int flag);
+
+int Findjob_get_filter_filter(struct FindjoB *o, int *value, int flag);
+
+int Findjob_set_wanted_node(struct FindjoB *o, void *wanted_node, int flag);
+
+int Findjob_get_wanted_node(struct FindjoB *o, void **wanted_node, int flag);
+
+int Findjob_set_found_path(struct FindjoB *o, char *path, int flag);
+
+int Findjob_get_found_path(struct FindjoB *o, char **path, int flag);
+
 
 struct SplitparT;
 
@@ -486,6 +831,79 @@ int Splitpart__parse(char *name, int *partno, int *total_parts,
 int Splitpart__compose(char *adr, int partno, int total_parts,
                        off_t offset, off_t bytes, off_t total_bytes, int flag);
 
+int Splitparts_sort(struct SplitparT *o, int count, int flag);
+
+
+int Permstack_push(struct PermiteM **o, char *disk_path, struct stat *stbuf,
+                   int flag);
+
+int Permstack_pop(struct PermiteM **o, struct PermiteM *stopper,
+                  struct XorrisO *xorriso, int flag);
+
+
+int Spotlist_new(struct SpotlisT **o, int flag);
+
+int Spotlist_destroy(struct SpotlisT **o, int flag);
+
+int Spotlist_add_item(struct SpotlisT *o, int start_lba, int blocks,
+                      int quality, int flag);
+
+int Spotlist_count(struct SpotlisT *o, int flag);
+
+int Spotlist_block_count(struct SpotlisT *o, int flag);
+
+int Spotlist_sector_size(struct SpotlisT *o, int read_chunk, int flag);
+
+int Spotlist_get_item(struct SpotlisT *o, int idx,
+                      int *start_lba, int *blocks, int *quality, int flag);
+
+char *Spotlist__quality_name(int quality, char name[80], int flag);
+
+
+#define Xorriso_read_quality_gooD         0x7fffffff
+#define Xorriso_read_quality_sloW         0x60000000
+#define Xorriso_read_quality_partiaL      0x50000000
+#define Xorriso_read_quality_valiD        0x40000000
+#define Xorriso_read_quality_untesteD     0x3fffffff
+#define Xorriso_read_quality_invaliD      0x3ffffffe
+#define Xorriso_read_quality_tao_enD      0x28000000
+#define Xorriso_read_quality_off_tracK    0x20000000
+#define Xorriso_read_quality_unreadablE   0x00000000
+
+
+int Checkmediajob_new(struct CheckmediajoB **o, int flag);
+
+int Checkmediajob_destroy(struct CheckmediajoB **o, int flag);
+
+int Checkmediajob_copy(struct CheckmediajoB *from, struct CheckmediajoB *to,
+                       int flag);
+
+int Sectorbitmap_new(struct SectorbitmaP **o, int sectors, int sector_size,
+                     int flag);
+int Sectorbitmap_destroy(struct SectorbitmaP **o, int flag);
+int Sectorbitmap_from_file(struct SectorbitmaP **o, char *path, char *msg,
+                           int *os_errno, int flag);
+int Sectorbitmap_to_file(struct SectorbitmaP *o, char *path, char *info,
+                         char *msg, int *os_errno, int flag);
+int Sectorbitmap_set(struct SectorbitmaP *o, int sector, int flag);
+int Sectorbitmap_set_range(struct SectorbitmaP *o,
+                           int start_sector, int sectors, int flag);
+int Sectorbitmap_is_set(struct SectorbitmaP *o, int sector, int flag);
+int Sectorbitmap_bytes_are_set(struct SectorbitmaP *o,
+                               off_t start_byte, off_t end_byte, int flag);
+
+int Sectorbitmap_get_layout(struct SectorbitmaP *o,
+                           int *sectors, int *sector_size, int flag);
+
+int Sectorbitmap_copy(struct SectorbitmaP *from, struct SectorbitmaP *to,
+                      int flag);
+
+/* bit0= append (text!=NULL) */
+int Sregex_string(char **handle, char *text, int flag);
+
+/* @param flag bit0= only test expression whether compilable
+*/
+int Sregex_match(char *pattern, char *text, int flag);
 
 #endif /* Xorriso_private_includeD */
 

xorriso/xorriso_timestamp.h

@@ -1 +1 @@
-#define Xorriso_timestamP "2008.05.15.192118"
+#define Xorriso_timestamP "2009.04.18.120001"

xorriso/xorrisoburn.h

@@ -4,7 +4,7 @@
    a command line oriented batch and dialog tool which creates, loads,
    manipulates and burns ISO 9660 filesystem images.
 
-   Copyright 2007-2008 Thomas Schmitt, <scdbackup@gmx.net>
+   Copyright 2007-2009 Thomas Schmitt, <scdbackup@gmx.net>
 
    Provided under GPL version 2.
 
@@ -14,14 +14,12 @@
 #ifndef Xorrisoburn_includeD
 #define Xorrisoburn_includeD yes
 
-struct XorrisO;
-struct FindjoB;
 
 /* The minimum version of libisoburn to be used with this version of xorriso
 */
 #define xorriso_libisoburn_req_major  0
-#define xorriso_libisoburn_req_minor  1
-#define xorriso_libisoburn_req_micro  5
+#define xorriso_libisoburn_req_minor  3
+#define xorriso_libisoburn_req_micro  8
 
 int Xorriso_startup_libraries(struct XorrisO *xorriso, int flag);
 
@@ -54,9 +52,16 @@ int Xorriso__text_to_sev(char *severity_name, int *severity_number,int flag);
 
 /* @param flag bit0=report about output drive 
                bit1=short report form
+               bit2=do not try to read ISO heads
+               bit3=report to info channel (else to result channel)
 */
 int Xorriso_toc(struct XorrisO *xorriso, int flag);
 
+/* @param flag bit0= no output if no boot record was found
+               bit3= report to info channel (else to result channel)
+*/
+int Xorriso_show_boot_info(struct XorrisO *xorriso, int flag);
+
 int Xorriso_show_devices(struct XorrisO *xorriso, int flag);
 
 int Xorriso_tell_media_space(struct XorrisO *xorriso,
@@ -69,10 +74,14 @@ int Xorriso_tell_media_space(struct XorrisO *xorriso,
 int Xorriso_blank_media(struct XorrisO *xorriso, int flag);
 
 /* @param flag bit0= try to achieve faster formatting
+               bit1= use parameter size (else use default size)
+               bit2= do not re-aquire drive
+               bit7= by_index mode:
+                     bit8 to bit15 contain the index of the format to use.
    @return 0=failure, did not touch media , -1=failure, altered media
            1=success, altered media       ,  2=success, did not touch media
 */
-int Xorriso_format_media(struct XorrisO *xorriso, int flag);
+int Xorriso_format_media(struct XorrisO *xorriso, off_t size, int flag);
 
 /* @return <=0 error, 1 success
 */
@@ -188,7 +197,13 @@ int Xorriso_iso_lstat(struct XorrisO *xorriso, char *path, struct stat *stbuf,
 */
 int Xorriso_atip(struct XorrisO *xorriso, int flag);
 
-int Xorriso_burn_track(struct XorrisO *xorriso, char *track_source, int flag);
+/* @param write_start_address  is valid if >=0 
+   @param tsize is valid if >0
+   @param flag bit0= grow_overwriteable_iso
+               bit1= do_isosize
+*/
+int Xorriso_burn_track(struct XorrisO *xorriso, off_t write_start_address,
+                       char *track_source, off_t tsize, int flag);
 
 /* @param flag bit1= outdev rather than indev
    @return <=0 = failure , 1= ok , 2= ok, is CD profile
@@ -196,12 +211,10 @@ int Xorriso_burn_track(struct XorrisO *xorriso, char *track_source, int flag);
 int Xorriso_get_profile(struct XorrisO *xorriso, int *profile_number,
                         char profile_name[80], int flag);
 
-/* @param flag bit0= do not mark image as changed */
-int Xorriso_set_publisher(struct XorrisO *xorriso, char *name, int flag);
-
-
+/* @param flag bit0= node_pt is a valid ISO object handle, ignore pathname
+*/
 int Xorriso_iso_file_open(struct XorrisO *xorriso, char *pathname,
-                          void **stream, int flag);
+                          void *node_pt, void **stream, int flag);
 
 int Xorriso_iso_file_read(struct XorrisO *xorriso, void *stream, char *buf,
                           int count, int flag);
@@ -216,6 +229,9 @@ int Xorriso_copy_properties(struct XorrisO *xorriso,
 int Xorriso_cut_out(struct XorrisO *xorriso, char *disk_path,
                 off_t startbyte, off_t bytecount, char *iso_rr_path, int flag);
 
+int Xorriso_paste_in(struct XorrisO *xorriso, char *disk_path,
+                off_t startbyte, off_t bytecount, char *iso_rr_path, int flag);
+
 struct SplitparT;
 
 /* @param flag bit0= in_node is valid, do not resolve iso_adr
@@ -225,5 +241,214 @@ int Xorriso_identify_split(struct XorrisO *xorriso, char *iso_adr,
                            struct SplitparT **parts, int *count,
                            struct stat *total_stbuf, int flag);
 
+/* @param flag bit0= node is valid, do not resolve path
+               bit1= insist in complete collection of part files
+*/
+int Xorriso_is_split(struct XorrisO *xorriso, char *path, void *node,
+                     int flag);
+
+
+/* @param flag
+           >>> bit0= mkdir: graft in as empty directory, not as copy from iso
+               bit1= do not report copied files
+               bit2= -follow, -not_*: this is not a command parameter
+               bit3= use offset and cut_size for -paste_in
+               bit4= return 3 on rejection by exclusion or user
+               bit5= if directory then do not add sub tree
+               bit6= this is a copy action: do not fake times and ownership
+   @return <=0 = error , 1 = added leaf file object , 2 = added directory ,
+                         3 = rejected
+*/
+int Xorriso_restore(struct XorrisO *xorriso,
+                    char *img_path, char *disk_path,
+                    off_t offset, off_t cut_size, int flag);
+
+
+/* @param flag bit0= in_node is valid, do not resolve img_path
+*/
+int Xorriso_restore_is_identical(struct XorrisO *xorriso, void *in_node,
+                                 char *img_path, char *disk_path,
+                                 char type_text[5], int flag);
+
+
+/* Return the official libburn address of an address string. This may fail
+   if the string does not constitute a valid drive address.
+   @param official_adr must offer SfileadrL bytes of reply buffer
+   @return 1 = success , 0 = failure , -1 = severe error
+*/
+int Xorriso_libburn_adr(struct XorrisO *xorriso, char *address_string,
+                        char official_adr[], int flag);
+
+
+/* @param flag bit1= obtain info from outdev
+*/
+int Xorriso_msinfo(struct XorrisO *xorriso, int *msc1, int *msc2, int flag);
+
+/*
+   @param flag bit0= obtain iso_lba from indev
+               bit1= head_buffer already contains a valid head
+               bit2= issue message about success
+               bit3= check whether source blocks are banned by in_sector_map
+*/
+int Xorriso_update_iso_lba0(struct XorrisO *xorriso, int iso_lba, int isosize,
+                            char *head_buffer, struct CheckmediajoB *job,
+                            int flag);
+
+int Xorriso_get_local_charset(struct XorrisO *xorriso, char **name, int flag);
+
+int Xorriso_set_local_charset(struct XorrisO *xorriso, char *name, int flag);
+
+
+
+struct CheckmediajoB {
+ int use_dev;        /* 0= use indev , 1= use outdev , 2= use sector map*/
+
+ int min_lba;        /* if >=0 : begin checking at this address */
+ int max_lba;        /* if >=0 : read up to this address, else use mode */
+
+ int min_block_size; /* >>> not yet implemented:
+                            granularity desired by user
+                     */
+ int mode;           /* 0= track by track
+                        1= single sweep over libisoburn media capacity
+                        >>> 2= single sweep over libburn media capacity
+                     */
+ time_t start_time;
+ int time_limit;     /* Number of seconds after which to abort */
+
+ int item_limit;     /* Maximum number of media check list items as result */
+
+ char abort_file_path[SfileadrL];
+
+ char data_to_path[SfileadrL];
+ int data_to_fd;
+ off_t data_to_offset; /* usually 0 with image copy, negative with file copy */
+ off_t data_to_limit;  /* used with file copy */
+ int patch_lba0;
+ int patch_lba0_msc1;
+
+ char sector_map_path[SfileadrL];
+ struct SectorbitmaP *sector_map;
+ int map_with_volid;  /* 0=add quick toc to map file,
+                         1=read ISO heads for toc
+                      */
+
+ int retry;          /* -1= only try full read_chunk, 1=retry with 2k blocks
+                         0= retry with CD, full chunk else
+                      */
+
+ int report_mode;    /* 0= print MCL items
+                        1= print damaged files
+                     */
+
+};
+
+int Xorriso_check_media(struct XorrisO *xorriso, struct SpotlisT **spotlist,
+                        struct CheckmediajoB *job, int flag);
+
+int Xorriso_extract_cut(struct XorrisO *xorriso,
+                        char *img_path, char *disk_path,
+                        off_t img_offset, off_t bytes, int flag);
+
+
+int Xorriso_relax_compliance(struct XorrisO *xorriso, char *mode,
+                                    int flag);
+
+/* @return 1=ok  2=ok, is default setting */
+int Xorriso_get_relax_text(struct XorrisO *xorriso, char mode[1024],
+                           int flag);
+
+
+/**
+    @param flag bit0= print mount command to result channel rather than
+                      performing it 
+*/
+int Xorriso_mount(struct XorrisO *xorriso, char *dev, int adr_mode,
+                  char *adr_value, char *cmd, int flag);
+
+
+
+int Xorriso_auto_driveadr(struct XorrisO *xorriso, char *adr, char *result,
+                          int flag);
+
+
+/* @param node      Opaque handle to IsoNode which is to be inquired instead of
+                    path if it is not NULL.
+   @param path      is used as address if node is NULL.
+   @param acl_text  if acl_text is not NULL, then *acl_text will be set to the
+                    ACL text (without comments) of the file object. In this
+                    case it finally has to be freed by the caller.
+   @param flag      bit0= do not report to result but only retrieve ACL text
+                    bit1= just check for existence of ACL, do not allocate and
+                          set acl_text but return 1 or 2
+   @return          2 ok, no ACL available, eventual *acl_text will be NULL
+                    1 ok, ACL available, eventual *acl_text stems from malloc()
+                  <=0 error
+*/
+int Xorriso_getfacl(struct XorrisO *xorriso, void *node,
+                    char *path, char **acl_text, int flag);
+
+int Xorriso_getfattr(struct XorrisO *xorriso, void *in_node, char *path,
+                     char **attr_text, int flag);
+
+/* Calls iso_image_set_ignore_aclea() according to  xorriso->do_aaip */
+int Xorriso_set_ignore_aclea(struct XorrisO *xorriso, int flag);
+
+
+/* @param node      Opaque handle to IsoNode which is to be manipulated
+                    instead of path if it is not NULL.
+   @param path      is used as address if node is NULL.
+   @param access_text  "access" ACL in long text form
+   @param default_text "default" ACL in long text form
+   @param flag          Unused yet, submit 0
+   @return          >0 success , <=0 failure
+*/
+int Xorriso_setfacl(struct XorrisO *xorriso, void *in_node, char *path,
+                    char *access_text, char *default_text, int flag);
+
+int Xorriso_get_attrs(struct XorrisO *xorriso, void *in_node, char *path,
+                      size_t *num_attrs, char ***names,
+                      size_t **value_lengths, char ***values, int flag);
+
+int Xorriso_setfattr(struct XorrisO *xorriso, void *in_node, char *path,
+                     size_t num_attrs, char **names,
+                     size_t *value_lengths, char **values, int flag);
+
+int Xorriso_record_dev_inode(struct XorrisO *xorriso, char *disk_path,
+                             dev_t dev, ino_t ino,
+                             void *in_node, char *iso_path, int flag);
+
+int Xorriso_local_getfacl(struct XorrisO *xorriso, char *disk_path,
+                          char **text, int flag);
+
+int Xorriso_set_filter(struct XorrisO *xorriso, void *in_node,
+                       char *path, char *filter_name, int flag);
+
+/* @param flag bit0= delete filter with the given name
+*/
+int Xorriso_external_filter(struct XorrisO *xorriso,
+                            char *name, char *options, char *path,
+                            int argc, char **argv, int flag);
+
+int Xorriso_status_extf(struct XorrisO *xorriso, char *filter, FILE *fp,
+                        int flag);
+
+int Xorriso_destroy_all_extf(struct XorrisO *xorriso, int flag);
+
+int Xorriso_show_stream(struct XorrisO *xorriso, void *in_node,
+                        char *path, int flag);
+
+int Xorriso_set_zisofs_params(struct XorrisO *xorriso, int flag);
+
+int Xorriso_status_zisofs(struct XorrisO *xorriso, char *filter, FILE *fp,
+                          int flag);
+
+
+/* A pseudo file type for El-Torito bootsectors as in man 2 stat :
+   For now take the highest possible value.
+*/
+#define Xorriso_IFBOOT S_IFMT
+
+
 #endif /* Xorrisoburn_includeD */