And libisoburn 0.1.4 is out soon!

COPYRIGHT

@@ -1,16 +1,16 @@
 Mario Danic <mario.danic@gmail.com>,
 Vreixo Formoso <metalpain2002@yahoo.es> 
 Thomas Schmitt <scdbackup@gmx.net>
-libisoburn is Copyright (C) 2007-2010 Vreixo Formoso, Thomas Schmitt
+libisoburn is Copyright (C) 2007-2008 Vreixo Formoso, Thomas Schmitt
-xorriso is Copyright (C) 2007-2010 Thomas Schmitt
+xorriso is Copyright (C) 2007-2008 Thomas Schmitt
-libisofs (if included) is Copyright (C) 2007-2010 Vreixo Formoso, Mario Danic
+libisofs (if included) is Copyright (C) 2007-2008 Vreixo Formoso, Mario Danic
 libburn (if included) is Copyright (C) 2002-2006 Derek Foreman, Ben Jansens
-                     and Copyright (C) 2006-2010 Mario Danic, Thomas Schmitt
+                     and Copyright (C) 2006-2008 Mario Danic, Thomas Schmitt
 
 
     This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License version 2
+    it under the terms of the GNU General Public License version 2 as
-    or later as published by the Free Software Foundation.
+    published by the Free Software Foundation.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

Makefile.am

@@ -1,8 +1,4 @@
-
+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 
@@ -20,11 +16,9 @@ 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 
 
@@ -36,60 +30,16 @@ 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 \
+xorriso_xorriso_CFLAGS = -DXorriso_with_maiN -DXorriso_with_regeX $(READLINE_DEF)
-                         $(READLINE_DEF) $(LIBACL_DEF) $(XATTR_DEF) \
+xorriso_xorriso_LDADD = libisoburn/libisoburn.la -lisofs -lburn $(THREAD_LIBS)
-                         $(EXTF_DEF) $(EXTF_SUID_DEF) $(ZLIB_DEF) \
-                         $(XORRISO_DVD_OBS_64K)
-
-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
@@ -105,6 +55,13 @@ 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 
+
 
 ## ========================================================================= ##
 
@@ -162,8 +119,6 @@ man_MANS = xorriso/xorriso.1
 EXTRA_DIST = \
 	libisoburn-1.pc.in \
 	version.h.in \
-	doc/comments \
-	doc/doxygen.conf.in \
 	README \
 	AUTHORS \
 	CONTRIBUTORS \
@@ -171,7 +126,6 @@ EXTRA_DIST = \
 	COPYING \
 	INSTALL \
 	xorriso/changelog.txt \
-	xorriso/xorriso_buildstamp_none.h \
+	xorriso/README \
-	xorriso/README_gnu_xorriso \
 	$(man_MANS)
 

README

@@ -1,16 +1,15 @@
 ------------------------------------------------------------------------------
                          http:libburnia-project.org
 ------------------------------------------------------------------------------
-libisoburn and xorriso. By Vreixo Formoso <metalpain2002@yahoo.es> 
+libisoburn. By Vreixo Formoso <metalpain2002@yahoo.es> 
-                       and Thomas Schmitt <scdbackup@gmx.net>
+            and Thomas Schmitt <scdbackup@gmx.net>
 Integrated sub project of libburnia-project.org.
-http://files.libburnia-project.org/releases/libisoburn-0.5.0.pl00.tar.gz
+Copyright (C) 2006-2008 Vreixo Formoso, Thomas Schmitt.
-Copyright (C) 2006-2010 Vreixo Formoso, Thomas Schmitt.
+Provided under GPL version 2.
-Provided under GPL version 2 or later.
 ------------------------------------------------------------------------------
 
 libisoburn is a frontend for libraries libburn and libisofs which enables
-creation and expansion of ISO-9660 filesystems on all CD/DVD/BD media supported
+creation and expansion of ISO-9660 filesystems on all CD/DVD 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.
 
@@ -18,12 +17,7 @@ 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.
 
-xorriso is a command line application of libisoburn, libisofs, and libburn.
+Currently it is only supported on Linux with kernels >= 2.4.
-
-Currently they are 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 ..."
@@ -31,17 +25,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.5.0 :
+Dynamic library and compile time header requirements for libisoburn-0.1.4 :
-- libburn.so.4  , version libburn-0.7.6 or higher
+- libburn.so.4  , version libburn-0.4.4 or higher
-- libisofs.so.6 , version libisofs-0.6.28 or higher
+- libisofs.so.6 , version libisofs-0.6.4 or higher
 libisoburn and xorriso will not start with libraries which are older than their
-headers seen at compile time.
+headers seen at compile time. So compile in the oldest possible installation
+setup unless you have reason to enforce a newer bug fix level.
 
-Obtain libisoburn-0.5.0.pl00.tar.gz, take it to a directory of your choice
+Obtain libisoburn-0.1.4.pl00.tar.gz, take it to a directory of your choice
 and do:
 
-    tar xzf libisoburn-0.5.0.pl00.tar.gz
+    tar xzf libisoburn-0.1.4.pl00.tar.gz
-    cd libisoburn-0.5.0
+    cd libisoburn-0.1.4
 
 Within that directory execute:
 
@@ -50,7 +45,7 @@ Within that directory execute:
 
 Then become superuser and execute
     make install
-which will make available libisoburn.so.1 and the program xorriso.
+which will make available libisoburn.so.1 and program xorriso.
 
 For the API concepts and calls see
     ./libisoburn/libisoburn.h
@@ -61,49 +56,21 @@ as well as
 
                               xorriso
 
-libisoburn comes with a command line and dialog application named xorriso,
+libisoburn includes 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_gnu_xorriso describes the tarball of the
+users. Its file xorriso/README describes a standlone tarball as first
-derived package GNU xorriso as first preference for a statically linked
+preference for xorriso installation.
-xorriso installation.
+The installation described above produces a dynamically linked xorriso binary
-The libisoburn installation described above produces a dynamically linked
+as described in chapter "libisoburn" at the end of that text.
-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
-
-In some situations Linux may deliver a better write performance to DVD drives 
-if 64 KB rather than 32 KB are transmitted in each write operation.
-64k can be made default at configure time by:
-    --enable-dvd-obs-64k
-
 
                        Drives and Disk File Objects 
 
-The user of libisoburn applications needs rw-permission for the CD/DVD/BD
+The user of libisoburn applications needs rw-permission for the CD/DVD burner
-drives which shall be used, even if only reading is intended.
+devices which shall be used.
 A list of rw-accessible drives can be obtained by
     xorriso -devices
 resp. by libburn API call
@@ -125,9 +92,6 @@ 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
 
@@ -139,7 +103,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 file to compare, the prefix1 to be cut off from path
+The path of the first file to compare, the prefix1 to be cut off from path
 and the prefix2 which gets prepended afterwards to obtain the path of the
 second file to compare.
 As further argument there can be -no_ctime which suppresses the comparison
@@ -161,8 +125,8 @@ and vice versa:
 ------------------------------------------------------------------------------
 
     This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License version 2 or later
+    it under the terms of the GNU General Public License version 2 as
-    as published by the Free Software Foundation.
+    published by the Free Software Foundation.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -179,19 +143,11 @@ libburnia-project.org
 By Mario Danic           <mario.danic@gmail.com>,
    Vreixo Formoso        <metalpain2002@yahoo.es>
    Thomas Schmitt        <scdbackup@gmx.net>
-Copyright (C) 2006-2010 Mario Danic, Vreixo Formoso, Thomas Schmitt.
+Copyright (C) 2006-2008 Mario Danic, Vreixo Formoso, Thomas Schmitt.
-
-We will not raise any legal protest to dynamic linking of our libraries
-with applications that are not under GPL, as long as they fulfill
-the condition of offering the library source code used, whether
-altered or unaltered, under the GPLv2+, along with the application.
-Nevertheless, the safest legal position is not to link libburn with
-non-GPL compatible programs.
 
 libburnia-project.org is inspired by and in other components still containing
 parts of old
 Libburn. By Derek Foreman <derek@signalmarketing.com> and
             Ben Jansens <xor@orodu.net>
 Copyright (C) 2002-2006  Derek Foreman and Ben Jansens
-libisoburn does not stem from their code.
 

acinclude.m4

@@ -1,18 +1,6 @@
-AC_DEFUN([LIBBURNIA_SET_FLAGS],
-[
-case $target_os in
-freebsd*)
-        LDFLAGS="$LDFLAGS -L/usr/local/lib"
-        CPPFLAGS="$CPPFLAGS -I/usr/local/include"
-        ;;
-esac
-])
-
-
 AC_DEFUN([TARGET_SHIZZLE],
 [
   ARCH=""
-  LIBBURNIA_PKGCONFDIR="$libdir"/pkgconfig
 
   AC_MSG_CHECKING([target operating system])
 
@@ -24,108 +12,11 @@ AC_DEFUN([TARGET_SHIZZLE],
     *-*-freebsd*)
       ARCH=freebsd
       LIBBURN_ARCH_LIBS=-lcam
-
-      # This may later be overridden by configure --enable-libdir-pkgconfig
-      LIBBURNIA_PKGCONFDIR=$(echo "$libdir" | sed 's/\/lib$/\/libdata/')/pkgconfig
       ;;
     *)
-      ARCH=
+      AC_ERROR([You are attempting to compile for an unsupported platform])
-      LIBBURN_ARCH_LIBS=
-#      AC_ERROR([You are attempting to compile for an unsupported platform])
       ;;
   esac
 
   AC_MSG_RESULT([$ARCH])
 ])
-
-
-dnl LIBBURNIA_CHECK_ICONV is by Thomas Schmitt, libburnia project
-dnl It is based on gestures from:
-dnl iconv.m4 serial AM7 (gettext-0.18)
-dnl Copyright (C) 2000-2002, 2007-2009 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
-dnl From Bruno Haible.
-dnl
-AC_DEFUN([LIBBURNIA_CHECK_ICONV],
-[
-  dnl Check whether it is allowed to link with -liconv
-  AC_MSG_CHECKING([for separate -liconv ])
-  libburnia_liconv="no"
-  libburnia_save_LIBS="$LIBS"
-  LIBS="$LIBS -liconv"
-  AC_TRY_LINK([#include <stdlib.h>
-#include <iconv.h>],
-    [iconv_t cd = iconv_open("","");
-     iconv(cd,NULL,NULL,NULL,NULL);
-     iconv_close(cd);],
-     [libburnia_liconv="yes"],
-     [LIBS="$libburnia_save_LIBS"]
-  )
-  AC_MSG_RESULT([$libburnia_liconv])
-
-  dnl Check for iconv(..., const char **inbuf, ...)
-  AC_MSG_CHECKING([for const qualifier with iconv() ])
-  AC_TRY_COMPILE([
-#include <stdlib.h>
-#include <iconv.h>
-size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);
-], [], [libburnia_iconv_const=""], [libburnia_iconv_const="const"]
-  )
-  AC_DEFINE_UNQUOTED([ICONV_CONST], [$libburnia_iconv_const])
-  test -z "$libburnia_iconv_const" && libburnia_iconv_const="no"
-  AC_MSG_RESULT([$libburnia_iconv_const])
-])
-
-
-dnl LIBBURNIA_SET_PKGCONFIG determines the install directory for the *.pc file.
-dnl Important: Must be performed _after_ TARGET_SHIZZLE
-dnl
-AC_DEFUN([LIBBURNIA_SET_PKGCONFIG],
-[
-### for testing --enable-libdir-pkgconfig on Linux
-### LIBBURNIA_PKGCONFDIR="$libdir"data/pkgconfig
-
-if test "x$LIBBURNIA_PKGCONFDIR" = "x$libdir"/pkgconfig
-then
-  dummy=dummy
-else
-  AC_ARG_ENABLE(libdir-pkgconfig,
-  [  --enable-libdir-pkgconfig  Install to $libdir/pkgconfig on any OS, default=no],
-   , enable_libdir_pkgconfig="no")
-  AC_MSG_CHECKING([for --enable-libdir-pkgconfig])
-  if test "x$enable_libdir_pkgconfig" = xyes
-  then
-    LIBBURNIA_PKGCONFDIR="$libdir"/pkgconfig
-  fi
-  AC_MSG_RESULT([$enable_libdir_pkgconfig])
-fi
-
-libburnia_pkgconfig_override="no"
-AC_ARG_ENABLE(pkgconfig-path,
-[  --enable-pkgconfig-path=DIR  Absolute path of directory for libisofs-*.pc],
-libburnia_pkgconfig_override="yes" , enable_pkgconfig_path="none")
-AC_MSG_CHECKING([for overridden pkgconfig directory path])
-if test "x$enable_pkgconfig_path" = xno
-then
-  libburnia_pkgconfig_override="no"
-fi
-if test "x$enable_pkgconfig_path" = x -o "x$enable_pkgconfig_path" = xyes
-then
-  libburnia_pkgconfig_override="invalid argument"
-fi
-if test "x$libburnia_pkgconfig_override" = xyes
-then
-  LIBBURNIA_PKGCONFDIR="$enable_pkgconfig_path"
-  AC_MSG_RESULT([$LIBBURNIA_PKGCONFDIR])
-else
-  AC_MSG_RESULT([$libburnia_pkgconfig_override])
-fi
-AC_SUBST(LIBBURNIA_PKGCONFDIR)
-
-dnl For debugging only
-### AC_MSG_RESULT([LIBBURNIA_PKGCONFDIR = $LIBBURNIA_PKGCONFDIR])
- 
-])
-

configure.ac

@@ -1,30 +1,27 @@
-AC_INIT([libisoburn], [0.5.0], [http://libburnia-project.org])
+AC_INIT([libisoburn], [0.1.4], [http://libburnia-project.org])
 AC_PREREQ([2.50])
 dnl AC_CONFIG_HEADER([config.h])	
 
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 
-LIBBURNIA_SET_FLAGS
-
 AM_INIT_AUTOMAKE([subdir-objects])
 
 dnl Hint: Search list for version code aspects:
-dnl       /AC_INIT(
+dnl       /AC_INT(
 dnl       /ISOBURN_.*_VERSION
 dnl       /LT_.*
 dnl       /LIB.*_REQUIRED
 
-dnl The API version codes are defined in libisoburn/libisoburn.h
+dnl The API version codes are now 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=5
+ISOBURN_MINOR_VERSION=1
-ISOBURN_MICRO_VERSION=0
+ISOBURN_MICRO_VERSION=4
-
 dnl ISOBURN_VERSION=$ISOBURN_MAJOR_VERSION.$ISOBURN_MINOR_VERSION.$ISOBURN_MICRO_VERSION
  
 AC_SUBST(ISOBURN_MAJOR_VERSION)
@@ -36,16 +33,15 @@ dnl Libtool versioning
 dnl Generate libisoburn.so.1.x.y
 dnl SONAME will become LT_CURRENT - LT_AGE
 dnl 
-dnl ts B00222
+dnl ts A80428
-dnl ### This is the release version 0.5.0 = libisoburn.so.1.39.0
+dnl This is the release version 0.1.4 = libisoburn.so.1.3.0
-dnl This is the development version after above stable release
+dnl ###This is the development version after stable release libisoburn.so.1.3.0
-dnl LT_CURRENT++, LT_AGE++ have not happened yet.
+dnl ### LT_CURRENT++, LT_AGE++ havae not happened yet.
-dnl ### LT_CURRENT++, LT_AGE++ has happened meanwhile.
 dnl
-dnl SONAME = 40 - 39 = 1 . Library name = libisoburn.so.1.39.0
+dnl SONAME = 4 - 3 = 1 . Library name = libburn.so.1.3.0
 LT_RELEASE=$ISOBURN_MAJOR_VERSION.$ISOBURN_MINOR_VERSION
-LT_CURRENT=40
+LT_CURRENT=4
-LT_AGE=39
+LT_AGE=3
 LT_REVISION=0
 LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
 
@@ -73,12 +69,6 @@ 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, , )
-dnl GNU iconv has no function iconv() but libiconv() and a macro iconv()
-AC_CHECK_LIB(iconv, libiconv, , )
-
 AC_PROG_LIBTOOL
 AC_SUBST(LIBTOOL_DEPS)
 LIBTOOL="$LIBTOOL --silent"
@@ -92,170 +82,28 @@ AC_SUBST(THREAD_LIBS)
 
 TARGET_SHIZZLE
 AC_SUBST(ARCH)
-AC_SUBST(LIBBURNIA_PKGCONFDIR)
 AC_SUBST(LIBBURN_ARCH_LIBS)
 
 
-dnl Determine target directory for libisoburn-*.pc
-dnl Important: Must be performed _after_ TARGET_SHIZZLE
-dnl
-LIBBURNIA_SET_PKGCONFIG
-
-
-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 Linking fails on SuSE 9.0 because zlib has compress2() but lacks  
-dnl compressBound(). So compressBound is the more modern thing to test.
-dnl The empty parameter after "compressBound" causes -lz.
-    ZLIB_DEF="-DLibisofs_with_zliB"
-    AC_CHECK_HEADER(zlib.h, AC_CHECK_LIB(z, compressBound, , ZLIB_DEF= ), ZLIB_DEF= )
-else
-    ZLIB_DEF=
-fi
-AC_SUBST(ZLIB_DEF)
-
-
-dnl ts B00107
-dnl Just for the case that it is necessary to give link option -lcdio not only
-dnl with libburn but also with libburn apps like xorriso.
-dnl On SuSE 10.2 this is not needed. libburn finds libcdio on its own.
-AC_ARG_ENABLE(libcdio,
-[  --enable-libcdio         Enable EXPERIMENTAL use of libcdio as system adapter, default=no],
-               , enable_libcdio=no)
-if test x$enable_libcdio = xyes; then
-dnl Check whether there is libcdio-devel and libcdio-runtime.
-dnl If not, erase this macro
-    LIBCDIO_DEF="-DLibburn_use_libcdiO"
-dnl The empty yes case obviously causes -lcdio to be linked
-    AC_CHECK_HEADER(cdio/cdio.h, AC_CHECK_LIB(cdio, mmc_last_cmd_sense, , LIBCDIO_DEF= ), LIBCDIO_DEF= )
-else
-    LIBCDIO_DEF=
-fi
-AC_SUBST(LIBCDIO_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_ARG_ENABLE(dvd-obs-64k,
-[  --enable-dvd-obs-64k            64 KB default size for xorriso DVD/BD writing, default=no],
-               , enable_fifo_odirect=no)
-if test x$enable_dvd_obs_64k = xyes; then
-    XORRISO_DVD_OBS_64K="-DXorriso_dvd_obs_default_64K"
-    echo "enabled  xorriso write size default 64 KB on DVD and BD"
-else
-    XORRISO_DVD_OBS_64K=
-    echo "disabled xorriso write size default 64 KB on DVD and BD"
-fi
-AC_SUBST(XORRISO_DVD_OBS_64K)
-
 
 AC_CHECK_HEADER(libburn/libburn.h)
 AC_CHECK_HEADER(libisofs/libisofs.h)
 
 dnl Check for proper library versions
-LIBBURN_REQUIRED=0.7.6
+LIBBURN_REQUIRED=0.4.4
-LIBISOFS_REQUIRED=0.6.28
+LIBISOFS_REQUIRED=0.6.4
 PKG_CHECK_MODULES(LIBBURN, libburn-1 >= $LIBBURN_REQUIRED)
 PKG_CHECK_MODULES(LIBISOFS, libisofs-1 >= $LIBISOFS_REQUIRED)
 
-if test x$LIBCDIO_DEF = x
-then
-    if test x$enable_libcdio = xyes
-    then
-      echo "WARNING: could not enable use of libcdio as system adapter"
-    fi
-else
-    echo "enabled  EXPERIMENTAL use of libcdio as system adapter"
-
-dnl For some reason this check may not be done earlier or else pkg-config
-dnl is not found.
-    LIBCDIO_REQUIRED=0.83
-    PKG_CHECK_MODULES(LIBCDIO, libcdio >= $LIBCDIO_REQUIRED)
-fi
-
 dnl Add compiler-specific flags
 
 dnl See if the user wants aggressive optimizations of the code

doc/comments

@@ -1,58 +0,0 @@
-/**
-   @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                  = libisoburn \
+INPUT                  = libburn \
                          doc \
                          test
 
@@ -495,7 +495,9 @@ 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          = 
+FILE_PATTERNS          = libburn.h \
+                         comments \
+                         libburner.c
 
 # 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/data_source.c

@@ -1,9 +1,7 @@
 /*
   data source for libisoburn.
 
-  Copyright 2007 - 2010 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
+  Copyright 2007 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
-                    and Thomas Schmitt <scdbackup@gmx.net>
-  Provided under GPL version 2 or later.
 */
 
 #include <stdlib.h>
@@ -29,24 +27,24 @@
 #include "isoburn.h"
 
 
-/* Cached reading of image tree data */
+/* Powers of 2 only ! Less than 16 makes not much sense. */
-/* 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
 
-/* The number of tiles in the cache
+/* Undef to get to older single tile version
 */
 #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;
@@ -78,27 +76,10 @@ int ds_read_block(IsoDataSource *src, uint32_t lba, uint8_t *buffer)
  struct isoburn_cached_drive *icd;
 
  if(src == NULL || buffer == NULL)
-   /* It is not required by the specs of libisofs but implicitely assumed
+   return -1;
-      by its current implementation that a data source read result <0 is
-      a valid libisofs error code.
-   */
-   return ISO_NULL_POINTER;
 
  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);
@@ -147,30 +128,9 @@ int ds_read_block(IsoDataSource *src, uint32_t lba, uint8_t *buffer)
    if (ret > 0)
      return 1;
    tiles[oldest].last_error_lba = lba;
-
+   sprintf(msg, "ds_read_block(%lu) returns -1", (unsigned long) lba);
-#ifdef ISO_DATA_SOURCE_MISHAP
+   burn_msgs_submit(0x00060000, msg, 0, "DEBUG", NULL);
-   ret= ISO_DATA_SOURCE_MISHAP;
+   return -1;
-#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.
-      libisofs insists in original error codes, i.e. libisoburn cannot
-      change severity FAILURE associated with ISO_FILE_READ_ERROR.
-      So ISO_FILE_READ_ERROR is not an option and libisoburn has to
-      misuse ISO_FILE_CANT_WRITE, which is actually for image generation
-      and not for image reading.
-      This is quite wrong, although the error message text is unclear
-      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);
-   isoburn_msgs_submit(NULL, 0x00060000, msg, 0, "DEBUG", 0);
-   return ret; 
  }
 
 #ifdef Libisoburn_read_cache_reporT
@@ -209,19 +169,6 @@ 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;
@@ -268,3 +215,139 @@ 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,10 +6,8 @@
 /*
   Class core of libisoburn.
 
-  Copyright 2007 - 2010 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
+  Copyright 2007 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
-                        Thomas Schmitt <scdbackup@gmx.net>
+             and Thomas Schmitt <scdbackup@gmx.net>
-
-  Provided under GPL version 2 or later.
 */
 
 /* ( derived from stub generated by CgeN on  Sat, 01 Sep 2007 12:04:36 GMT ) */
@@ -39,64 +37,10 @@
 
 #include "isoburn.h"
 
-
+/* No more: version numbers out of configure.ac
-/* Default values for application provided msgs_submit methods.
+   major.minor.micro now comes from libisoburn.h
-   To be attached to newly aquired drives.
+#include "../version.h"
 */
-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  ---------------------- */
-
-
-int isoburn_toc_entry_new(struct isoburn_toc_entry **objpt,
-                          struct isoburn_toc_entry *boss, int flag)
-{
- struct isoburn_toc_entry *o, *s;
-
- *objpt= o= (struct isoburn_toc_entry *)
-            malloc(sizeof(struct isoburn_toc_entry));
- if(o==NULL) {
-   isoburn_msgs_submit(NULL, 0x00060000,
-                       "Cannot allocate memory for isoburn toc entry",
-                       0, "FATAL", 0);
-   return(-1);
- }
- o->session= 0;
- o->track_no= 0;
- o->start_lba= -1;
- o->track_blocks= 0;
- o->volid= NULL;
- o->next= NULL;
- if(boss!=NULL) {
-   for(s= boss; s->next!=NULL; s= s->next);
-   s->next= o;
- }
- return(1);
-}
-
-
-/* @param flag bit0= delete all subordinates too
-*/
-int isoburn_toc_entry_destroy(struct isoburn_toc_entry **o, int flag)
-{
- if(*o==NULL)
-   return(0);
- if(flag&1)
-   isoburn_toc_entry_destroy(&((*o)->next), flag);
- if((*o)->volid != NULL)
-   free((*o)->volid);
- free((char *) (*o));   
- *o= NULL;
- return(1);
-}
-
-
-/* --------------------- end isoburn_toc_entry  -------------------- */
 
 /* --------------------------  isoburn  ----------------------- */
 
@@ -115,33 +59,31 @@ int isoburn_new(struct isoburn **objpt, int flag)
 
  *objpt= o= (struct isoburn *) malloc(sizeof(struct isoburn));
  if(o==NULL) {
-   isoburn_msgs_submit(NULL, 0x00060000,
+   burn_msgs_submit(0x00060000,
-                       "Cannot allocate memory for isoburn control object",
+                    "Cannot allocate memory for isoburn control object",
-                       0, "FATAL", 0);
+                    0, "FATAL", NULL);
    return(-1);
  }
 
  o->drive= NULL;
  o->emulation_mode= 0;
- o->fabricated_msc1= -1;
+ o->min_start_byte= 0;
- o->fabricated_msc2= -1;
+ o->nwa= 0;
- o->zero_nwa= Libisoburn_overwriteable_starT;
- o->min_start_byte= o->zero_nwa * 2048;
- o->nwa= o->zero_nwa;
  o->truncate= 0;
+
+#ifdef Libisoburn_no_fifO
  o->iso_source= NULL;
- o->fabricated_disc_status= BURN_DISC_UNREADY;
+#else
- o->toc= NULL;
+ o->fifo= NULL;
+#endif
+
  o->wrote_well= -1;
- for(i=0;i<Libisoburn_target_head_sizE;i++)
+ o->fabricated_disc_status= BURN_DISC_UNREADY;
+ for(i=0;i<65536;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);
@@ -178,12 +120,16 @@ int isoburn_destroy(struct isoburn **objpt, int flag)
 
  if(o->image!=NULL)
    iso_image_unref(o->image);
- if(o->toc!=NULL)
+
-   isoburn_toc_entry_destroy(&(o->toc), 1); /* all */
+#ifdef Libisoburn_no_fifO
  if(o->iso_source!=NULL)
    burn_source_free(o->iso_source);
- if(o->iso_data_source!=NULL)
+#else
-   iso_data_source_unref(o->iso_data_source);
+ if(o->fifo!=NULL)
+   burn_source_free(o->fifo);
+#endif /* ! Libisoburn_no_fifO */
+
+
  free((char *) o);
  *objpt= NULL;
  return(1);
@@ -316,82 +262,28 @@ 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 *in_d, struct burn_drive *out_d,
+int isoburn_prepare_disc_aux(struct burn_drive *d, struct burn_disc **disc,
-                             struct burn_disc **disc,
+                             struct isoburn_imgen_opts *opts, int new_img)
-                             struct isoburn_imgen_opts *opts, int flag)
 {
  struct burn_source *wsrc;
  struct burn_session *session;
  struct burn_track *track;
- struct isoburn *in_o, *out_o;
+ struct isoburn *o;
  IsoWriteOpts *wopts= NULL;
  enum burn_disc_status state;
- int ret, fifo_chunks, lba, nwa, i, new_img, early_indev_release;
+ int ret, fifo_chunks;
- uint32_t data_start= -1;
- size_t buffer_size= 0, buffer_free= 0;
- char msg[160];
 
- new_img= flag&1;
+ ret= isoburn_find_emulator(&o, d, 0);
- early_indev_release= flag&2;
+ if(ret<0 || o==NULL)
-
- ret= isoburn_find_emulator(&in_o, in_d, 0);
- if(ret<0 || in_o==NULL)
    {ret= -1; goto ex;}
- ret= isoburn_find_emulator(&out_o, out_d, 0);
+ o->wrote_well= 0; /* early end will be registered as failure */
- 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;
 
- if(new_img && early_indev_release) {
+ state = isoburn_disc_get_status(d);
-   isoburn_msgs_submit(in_o, 0x00060000,
+ if (state != BURN_DISC_BLANK && state != BURN_DISC_APPENDABLE
-      "Programming error: Wrong session setup: new_img && early_indev_release",
+     && (state != BURN_DISC_FULL || ! new_img)) {
-                       0, "FATAL", 0);
+   /* unsuitable status */
-   {ret= -4; goto ex;}
+   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;}
  }
  
@@ -411,17 +303,6 @@ int isoburn_prepare_disc_aux(struct burn_drive *in_d, struct burn_drive *out_d,
  iso_write_opts_set_rockridge(wopts, opts->rockridge);
  iso_write_opts_set_joliet(wopts, opts->joliet);
  iso_write_opts_set_iso1999(wopts, opts->iso1999);
-
- /* <<< #ifdef  shall be removed when libisofs-0.6.20 is released */
-#ifdef Libisofs_hardlink_prooF
-
- iso_write_opts_set_hardlinks(wopts, opts->hardlinks);
- if(opts->hardlinks)
-   iso_write_opts_set_rrip_1_10_px_ino(wopts, 1);
-
-#endif
-
- 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);
@@ -431,16 +312,7 @@ int isoburn_prepare_disc_aux(struct burn_drive *in_d, struct burn_drive *out_d,
  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_record_md5(wopts, opts->session_md5, opts->file_md5 & 3);
- if(opts->scdbackup_tag_name[0] && opts->scdbackup_tag_time[0])
-   iso_write_opts_set_scdbackup_tag(wopts, opts->scdbackup_tag_name,
-                                    opts->scdbackup_tag_time,
-                                    opts->scdbackup_tag_written);
  iso_write_opts_set_replace_mode(wopts, opts->replace_dir_mode,
                 opts->replace_file_mode, opts->replace_uid, opts->replace_gid);
  iso_write_opts_set_default_dir_mode(wopts, opts->dir_mode);
@@ -448,72 +320,72 @@ int isoburn_prepare_disc_aux(struct burn_drive *in_d, struct burn_drive *out_d,
  iso_write_opts_set_default_uid(wopts, opts->uid);
  iso_write_opts_set_default_gid(wopts, opts->gid);
  iso_write_opts_set_output_charset(wopts, opts->output_charset);
+#ifdef Libisoburn_no_fifO
  iso_write_opts_set_fifo_size(wopts, fifo_chunks);
-
+#endif /* Libisoburn_no_fifO */
- ret = isoburn_disc_track_lba_nwa(out_d, NULL, 0, &lba, &nwa);
+ 
- opts->effective_lba= nwa;
+ if (new_img) {
- ret= isoburn_get_msc2(out_o, NULL, &nwa, 0);
+   iso_write_opts_set_ms_block(wopts, 0);
- if (ret != 1) {
+   opts->effective_lba= 0;
-   isoburn_msgs_submit(out_o, 0x00060000,
+   iso_write_opts_set_appendable(wopts, 0);
-                   "Cannot determine next writeable address", 0, "FAILURE", 0);
+   iso_write_opts_set_overwrite_buf(wopts, NULL);
-   {ret= -3; goto ex;}
+ } 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", 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);
  }
- 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);
+ ret = iso_image_create_burn_source(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 */
 
- out_o->iso_source= wsrc;
+#ifdef Libisoburn_no_fifO
+ o->iso_source= wsrc;
+#else
+ o->fifo = burn_fifo_source_new(wsrc, 2048, fifo_chunks, 0);
+ burn_source_free(wsrc);
+ if (o->fifo == NULL) {
+   burn_msgs_submit(0x00060000, "Cannot attach fifo", 0, "FATAL", NULL);
+   {ret= -1; goto ex;}
+ }
+#endif /* ! Libisoburn_no_fifO */
 
  *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, out_o->iso_source);
+
+#ifdef Libisoburn_no_fifO
+ burn_track_set_source(track, o->iso_source);
+#else
+ burn_track_set_source(track, o->fifo);
+#endif /* ! Libisoburn_no_fifO */
+
  burn_session_add_track(session, track, BURN_POS_END);
 
  /* give up local references */
  burn_track_free(track);
  burn_session_free(session);
 
- in_o->wrote_well= out_o->wrote_well= -1; /* neutral */
+ o->wrote_well= -1; /* neutral */
  ret= 1;
 ex:
  if(wopts!=NULL)
@@ -521,51 +393,43 @@ 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, d, disc, opts, 0);
+	return isoburn_prepare_disc_aux(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, out_drive, disc, opts, 1);
+ ret= isoburn_prepare_disc_aux(d, disc, opts, 1);
  if (ret<=0)
    return ret;
+
+#ifdef Libisoburn_no_fifO
+ /* 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;
+#endif /* Libisoburn_no_fifO */
+
  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
@@ -651,18 +515,13 @@ 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) {
-   isoburn_msgs_submit(NULL, 0x00060000,
+   burn_msgs_submit(0x00060000, "Cannot allocate memory for read options",
-                     "Cannot allocate memory for read options", 0, "FATAL", 0);
+                    0, "FATAL", NULL);
    return(-1);
  }
  o->norock= 0;
  o->nojoliet= 0;
  o->noiso1999= 1;
- o->noaaip= 1;
- o->noacl= 1;
- o->noea= 1;
- o->noino= 1;
- o->nomd5= 1;
  o->preferjoliet= 0;
  o->uid= geteuid();
  o->gid= getegid();
@@ -696,11 +555,6 @@ 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);
- o->noino= !!(ext & 256);
- o->nomd5= !!(ext & 512);
  return(1);
 }
 
@@ -708,9 +562,7 @@ 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) |
-       ((!!o->noino) << 8) | ((!!o->nomd5) << 9);
  return(1);
 }
 
@@ -769,28 +621,14 @@ int isoburn_ropt_set_input_charset(struct isoburn_read_opts *o,
 }
 
 
-int isoburn_ropt_get_input_charset(struct isoburn_read_opts *o,
+int isoburn_igopt_get_in_charset(struct isoburn_read_opts *o,
-                                   char **input_charset)
+                                 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)
 {
@@ -814,17 +652,15 @@ 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) {
-   isoburn_msgs_submit(NULL, 0x00060000,
+   burn_msgs_submit(0x00060000,
-                       "Cannot allocate memory for image generation options",
+                    "Cannot allocate memory for image generation options",
-                       0, "FATAL", 0);
+                    0, "FATAL", NULL);
    return(-1);
  }
  o->level= 2;
  o->rockridge= 1;
  o->joliet= 0;
  o->iso1999= 0;
- o->hardlinks= 0;
- o->aaip = 0;
  o->omit_version_numbers= 0;
  o->allow_deep_paths= 1;
  o->allow_longer_paths= 0;
@@ -833,10 +669,6 @@ 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;
@@ -846,10 +678,9 @@ 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= NULL;
+ o->output_charset= 0;
  o->fifo_size= 4*1024*1024;
  o->effective_lba= -1;
- o->data_start_lba= -1;
  return(1);
 }
 
@@ -883,19 +714,13 @@ 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->hardlinks= !!(ext & 8);
- o->aaip= !!(ext & 32);
- o->session_md5= !!(ext & 64);
- o->file_md5= (ext & (128 | 256)) >> 7;
  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->hardlinks) << 3) | ((!!o->aaip) << 5) |
-       ((!!o->session_md5) << 6) | ((o->file_md5 & 3) << 7);
  return(1);
 }
 
@@ -910,10 +735,6 @@ 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);
 }
 
@@ -923,9 +744,7 @@ 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);
 }
 
@@ -1028,36 +847,3 @@ 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);
-}
-
-
-int isoburn_igopt_set_scdbackup_tag(struct isoburn_imgen_opts *o, char *name,
-                                    char *timestamp, char *tag_written)
-{
- strncpy(o->scdbackup_tag_name, name, 80);
- o->scdbackup_tag_name[80]= 0;
- strncpy(o->scdbackup_tag_time, timestamp, 18);
- o->scdbackup_tag_time[18]= 0;
- o->scdbackup_tag_written = tag_written;
- if(tag_written != NULL)
-   tag_written[0]= 0;
- return(1);
-}
-
-
-int isoburn_igopt_get_scdbackup_tag(struct isoburn_imgen_opts *o,
-                                    char name[81], char timestamp[19],
-                                    char **tag_written)
-{
- strncpy(name, o->scdbackup_tag_name, 80);
- name[80]= 0;
- strncpy(timestamp, o->scdbackup_tag_time, 18);
- timestamp[18]= 0;
- *tag_written= o->scdbackup_tag_written;
- return(1);
-}
-

libisoburn/isoburn.h

@@ -2,44 +2,21 @@
 /*
   Class struct of libisoburn.
 
-  Copyright 2007 - 2010 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
+  Copyright 2007 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
-                    and Thomas Schmitt <scdbackup@gmx.net>
+             and Thomas Schmitt <scdbackup@gmx.net>
-  Provided under GPL version 2 or later.
 */
 
 #ifndef Isoburn_includeD
 #define Isoburn_includeD
 
 
+/* <<< transition macro */
+#define Libisoburn_no_fifO 1
+
+
 /* for uint8_t */
 #include <stdint.h>
 
-/* For emulated TOC of overwriteable media.
-   Provides minimal info for faking a struct burn_toc_entry.
-*/
-struct isoburn_toc_entry {
- int session;
- int track_no; /* point */
- int start_lba;
- int track_blocks;
-
- char *volid; /* For caching a volume id from emulated toc on overwriteables */
-
- struct isoburn_toc_entry *next;
-};
-
-int isoburn_toc_entry_new(struct isoburn_toc_entry **objpt,
-                          struct isoburn_toc_entry *boss, int flag);
-
-/* @param flag bit0= delete all subordinates too
-*/
-int isoburn_toc_entry_destroy(struct isoburn_toc_entry **o, int flag);
-
-
-/* Size of target_iso_head which is to be written during
-   isoburn_activate_session()
-*/
-#define Libisoburn_target_head_sizE (32*2048)
 
 struct isoburn {
 
@@ -59,30 +36,12 @@ struct isoburn {
  struct isoburn *next;
 
 
- /* If >= 0, this address is used as reply for isoburn_disc_get_msc1()
- */
- 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) */
  off_t min_start_byte;
 
  /* 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;
 
@@ -92,10 +51,11 @@ struct isoburn {
  */
  enum burn_disc_status fabricated_disc_status;
 
- /* Eventual emulated table of content read from the chain of ISO headers
+#ifndef Libisoburn_no_fifO
-    on overwriteable media.
+ /* The fifo which is installed between track and libisofs burn_source
- */ 
+ */
- struct isoburn_toc_entry *toc;
+ struct burn_source *fifo;
+#endif /* ! Libisoburn_no_fifO */
 
  /* Indicator wether the most recent burn run worked :
     -1 = undetermined, ask libburn , 0 = failure , 1 = success
@@ -106,19 +66,17 @@ struct isoburn {
  
  /* Buffered ISO head from media (should that become part of
     ecma119_read_opts ?) */
- uint8_t target_iso_head[Libisoburn_target_head_sizE];
+ uint8_t target_iso_head[65536];
 
  /* Libisofs image context */
  IsoImage *image;
 
- /* The block data source from which the existing image is read.
+#ifdef Libisoburn_no_fifO
- */
- IsoDataSource *iso_data_source;
-
  /* The burn source which transfers data from libisofs to libburn.
     It has its own fifo.
  */
  struct burn_source *iso_source;
+#endif /* Libisoburn_no_fifO */
 
  /* For iso_tree_set_report_callback() */
  int (*read_pacifier)(IsoImage*, IsoFileSource*);
@@ -126,12 +84,6 @@ 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 */
-
 };
 
 
@@ -190,11 +142,6 @@ 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
@@ -206,19 +153,6 @@ int isoburn_msgs_submit(struct isoburn *o, int error_code, char msg_text[],
 */
 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.
@@ -229,19 +163,6 @@ int isoburn_get_msc2(struct isoburn *o,
 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.
@@ -253,18 +174,6 @@ 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 */
-
-    /* ts A90508 */
-    unsigned int noino:1;    /* Discard eventual PX inode numbers */
-
-    /* ts A90810 */
-    unsigned int nomd5:1;    /* Do not read eventual MD5 array */
-
     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. */
@@ -279,15 +188,6 @@ 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. */
@@ -326,20 +226,6 @@ struct isoburn_imgen_opts {
     unsigned int joliet :1;
     unsigned int iso1999 :1;
 
-    /* Whether to mark suitable IsoNode as hardlinks in RRIP PX */
-    unsigned int hardlinks :1;
-
-    /* Write eventual AAIP info containing ACL and EA */
-    unsigned int aaip :1;
-
-    /* Produce and write a MD5 checksum of the whole session stream. */
-    unsigned int session_md5 :1;
-
-    /* Produce and write MD5 checksums for each single IsoFile.
-       See parameter files of iso_write_opts_set_record_md5().
-     */
-    unsigned int file_md5 :2;
-
     /* relaxed constraints */
 
     /*
@@ -395,31 +281,6 @@ 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. */
 
@@ -459,101 +320,12 @@ struct isoburn_imgen_opts {
     int fifo_size;
 
 
-    /** Output value: Block address of session start as evaluated from media
+    /** Output value: Block address of session start as evaluatedfrom 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;
-
-    /**
-     * If not empty: Parameters "name" and "timestamp" for a scdbackup stream
-     * checksum tag. See scdbackup/README appendix VERIFY.
-     * It makes sense only for single session images which start at LBA 0.
-     * Such a tag may be part of a libisofs checksum tag block after the
-     * session tag line. It then covers the whole session up to its own start
-     * position.
-     * If scdbackup_tag_written is not NULL then it is a pointer to an
-     * application provided array with at least 512 characters. The effectively
-     * written scdbackup tag will be copied to this memory location.
-     */
-    char scdbackup_tag_name[81];
-    char scdbackup_tag_time[19];
-    char *scdbackup_tag_written;
-
-};
-
-
-/* Alignment for session starts on overwriteable media.
-   (Increased from 16 to 32 blocks for aligning to BD-RE clusters.)
-*/
-#define Libisoburn_nwa_alignemenT 32
-
-
-/* Alignment for outer session scanning with -ROM drives.
-   (E.g. my DVD-ROM drive shows any DVD type as 0x10 "DVD-ROM" with
-    more or less false capacity and TOC.)
-*/
-#define Libisoburn_toc_scan_alignemenT 16
-
-/* 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 65536
-
-
-/* Creating a chain of image headers which form a TOC:
-
-   The header of the first session is written after the LBA 0 header.
-   So it persists and can give the end of its session. By help of
-   Libisoburn_nwa_alignemenT it should be possible to predict the start
-   of the next session header.
-   The LBA 0 header is written by isoburn_activate_session() already
-   with the first session. So the media is mountable.
-   A problem arises with DVD-RW in Intermediate State. They cannot be
-   written by random access before they were written sequentially.
-   In this case, no copy of the session  1 header is maintained and no TOC
-   will be possible. Thus writing begins sequentially at LBA 0.
-*/
-#define Libisoburn_overwriteable_starT \
-                                   ((off_t) (Libisoburn_target_head_sizE/2048))
-
-
-/* Wrappers for emulation of TOC on overwriteable media */
-
-struct isoburn_toc_track {
- /* Either track or toc_entry are supposed to be NULL */
- struct burn_track *track;
- struct isoburn_toc_entry *toc_entry;
-};
-
-struct isoburn_toc_session {
- /* Either session or tracks and toc_entry are supposed to be NULL */
- struct burn_session *session;
- struct isoburn_toc_track **track_pointers;
- int track_count;
- struct isoburn_toc_entry *toc_entry;
-};
-
-struct isoburn_toc_disc {
- /* Either disc or sessions and toc are supposed to be NULL */
- struct burn_disc *disc; 
- struct isoburn_toc_session *sessions;           /* storage array */
- struct isoburn_toc_session **session_pointers;  /* storage array */
- struct isoburn_toc_track *tracks;               /* storage array */
- struct isoburn_toc_track **track_pointers;      /* storage array */
- int session_count;
- int track_count;
- struct isoburn_toc_entry *toc;
 };
 
 #endif /* Isoburn_includeD */

libisoburn/isofs_wrap.c

@@ -6,14 +6,12 @@
 /*
   libisofs related functions of libisoburn.
 
-  Copyright 2007 - 2010  Vreixo Formoso Lopes <metalpain2002@yahoo.es>
+  Copyright 2007 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
-                         Thomas Schmitt <scdbackup@gmx.net>
+                 Thomas Schmitt <scdbackup@gmx.net>
-  Provided under GPL version 2 or later.
 */
 
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
 
 #ifndef Xorriso_standalonE
 
@@ -28,6 +26,7 @@
 
 #endif /* Xorriso_standalonE */
 
+
 #include "isoburn.h"
 #include "libisoburn.h"
 
@@ -113,29 +112,29 @@ int isoburn_read_image(struct burn_drive *d,
                        struct isoburn_read_opts *read_opts, 
                        IsoImage **image)
 {
- int ret, int_num, dummy;
+ int ret, int_num;
  IsoReadOpts *ropts= NULL;
  IsoReadImageFeatures *features= NULL;
  uint32_t ms_block;
- char msg[160];
+
  enum burn_disc_status status= BURN_DISC_BLANK;
  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:;
+   
    /*
     * Blank disc, we create a new image without files.
     */
@@ -143,9 +142,9 @@ create_blank_image:;
    if (d == NULL) {
      /* New empty image without relation to a drive */
      if (image==NULL) {
-       isoburn_msgs_submit(o, 0x00060000,
+       burn_msgs_submit(0x00060000,
-                           "Program error: isoburn_read_image: image==NULL",
+                        "Program error: isoburn_read_image: image==NULL",
-                           0, "FATAL", 0);
+                    0, "FATAL", NULL);
        return -1;
      }
      /* create a new image */
@@ -167,15 +166,13 @@ 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) {
-   isoburn_msgs_submit(o, 0x00060000,
+   burn_msgs_submit(0x00060000,
                     "Program error: isoburn_read_image: incorrect disc status",
-                    0, "FATAL", 0);
+                    0, "FATAL", NULL);
    return -4;	
  }
  
@@ -185,12 +182,6 @@ create_blank_image:;
  if (ret <= 0)
    return -2;
  ms_block= int_num;
- 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);
-   isoburn_msgs_submit(o, 0x00060000, msg, 0, "WARNING", 0);
-   goto create_blank_image;
- }
 
  /* create the data source */
  ret = iso_read_opts_new(&ropts, 0);
@@ -201,11 +192,6 @@ 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);
- iso_read_opts_set_no_aaip(ropts, read_opts->noaaip);
- iso_read_opts_set_no_md5(ropts, read_opts->nomd5);
-
- iso_read_opts_set_new_inos(ropts, read_opts->noino);
-
  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);
@@ -214,12 +200,7 @@ 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);
- 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)
@@ -229,7 +210,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;
@@ -244,6 +225,15 @@ create_blank_image:;
  read_opts->hasIso1999 = iso_read_image_features_has_iso1999(features);
  read_opts->hasElTorito = iso_read_image_features_has_eltorito(features);
  read_opts->size = iso_read_image_features_get_size(features);
+ 
+#ifdef NIX 
+ read_opts->hasRR = features->hasRR;
+ read_opts->hasJoliet = features->hasJoliet;
+ read_opts->hasIso1999 = features->hasIso1999;
+ read_opts->hasElTorito = features->hasElTorito;
+ read_opts->size = features->size;
+#endif
+
  iso_read_image_features_destroy(features);
  return 1;
 }
@@ -256,15 +246,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;
@@ -285,16 +275,12 @@ 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 ||
+ if (o->fabricated_disc_status != BURN_DISC_APPENDABLE)
-       (o->fabricated_disc_status == BURN_DISC_BLANK &&
-        o->zero_nwa > 0)))
    return 1;
  
- ret = burn_random_access_write(drive, (off_t) 0, (char*)o->target_iso_head, 
+ ret = burn_random_access_write(drive, 0, (char*)o->target_iso_head, 
-                                Libisoburn_target_head_sizE, 1);
+                                32*2048, 1);
 
  return ret;
 }
@@ -308,53 +294,34 @@ int isoburn_activate_session(struct burn_drive *drive)
 */
 int isoburn_start_emulation(struct isoburn *o, int flag)
 {
- int ret, i, capacity = -1, role;
+ int ret, i;
- off_t data_count, to_read;
+ off_t data_count;
  struct burn_drive *drive;
  struct ecma119_pri_vol_desc *pvm;
  
  if(o==NULL) {
-   isoburn_msgs_submit(NULL, 0x00060000,
+   burn_msgs_submit(0x00060000,
-                       "Program error: isoburn_start_emulation: o==NULL",
+                    "Program error: isoburn_start_emulation: o==NULL",
-                       0, "FATAL", 0);
+                    0, "FATAL", NULL);
    return -1;
  }
 
  drive= o->drive;
 
- /* We can assume 0 as start block for image.
+ /* we can assume 0 as start block for image */
-    The data there point to the most recent session.
+ /* TODO what about ms? where we validate valid iso image in ms disc? */
- */
+ ret = burn_read_data(drive, (off_t) 0, (char*)o->target_iso_head, 
- role = burn_drive_get_drive_role(drive);
+                      sizeof(o->target_iso_head), &data_count, 2);
- ret = burn_get_read_capacity(drive, &capacity, 0);
+
- if (ret <= 0)
+ /* an error means an empty disc */
-   capacity = -1;
+ if (ret <= 0) {
- if (capacity > 0 || role == 2) {
-   /* Might be a block device on a system where libburn cannot determine its
-      size.  Try to read anyway. */
-   memset(o->target_iso_head, 0, Libisoburn_target_head_sizE);
-   to_read = Libisoburn_target_head_sizE;
-   if(capacity > 0 && (off_t) capacity * (off_t) 2048 < to_read)
-     to_read = (off_t) capacity * (off_t) 2048;
-   ret = burn_read_data(drive, (off_t) 0, (char*)o->target_iso_head, 
-                        to_read, &data_count, 2);
-   if (ret <= 0) {
-     /* an error means a disc with no ISO image */
-     if (capacity > 0)
-       o->fabricated_disc_status= BURN_DISC_FULL;
-     else
-        o->fabricated_disc_status= BURN_DISC_BLANK;
-     return 1;
-   }
- } else {
-   /* No read capacity means blank media */
    o->fabricated_disc_status= BURN_DISC_BLANK;
    return 1;
  }
 
  /* check first 64K. If 0's, the disc is treated as a blank disc, and thus
     overwritten without extra check. */
- i = Libisoburn_target_head_sizE;
+ i = sizeof(o->target_iso_head);
  while (i && !o->target_iso_head[i-1]) 
    --i;
 
@@ -384,7 +351,7 @@ int isoburn_start_emulation(struct isoburn *o, int flag)
  } else if (!strncmp((char*)pvm->std_identifier, "CDXX1", 5)) {
 
    /* empty image */
-   isoburn_set_start_byte(o, o->zero_nwa * 2048, 0);
+   isoburn_set_start_byte(o, (off_t) 0, 0);
    o->fabricated_disc_status= BURN_DISC_BLANK;
  } else {
    /* treat any disc in an unknown format as full */

libisoburn/libisoburn.h

@@ -2,9 +2,8 @@
 /*
   API definition of libisoburn.
 
-  Copyright 2007-2010 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
+  Copyright 2007-2008 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
                   and Thomas Schmitt <scdbackup@gmx.net>
-   Provided under GPL version 2 or later.
 */
 
 /**                           Overview
@@ -76,35 +75,23 @@ job parameters. It rather states its desires which libisoburn tries to
 fulfill, or else will refuse to start the write run.
 
 
-              Setup for Growing, Modifying or Blind Growing
+                     Setup for Growing or Modifying
 
-The connector function family offers alternative API calls for performing
+The connector function family offers two alternative API calls for performing
-the setup for several alternative image generation strategies.
+the setup for two alternative image generation strategies.
 
 Growing:
-If input and output drive are the same, then isoburn_prepare_disc() is to
+If input and output drive is 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, and if it bears blank media
+If the output drive is not the input drive, then it has to bear blank media
-or overwriteable without a valid ISO image, then one may produce a consolidated
+or overwriteable without a valid ISO image. To prepare for such an image
-image with old and new data. This will copy file data from an eventual input
+generation run, use isoburn_prepare_new_image(). The run will copy file data
-drive with valid image, add any newly introduced data from the local
+from an eventual input drive with valid image, add any newly introduced data
-filesystem, and produce a first session on output media.
+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(),
@@ -125,22 +112,6 @@ 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 GNU/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.
-
 */
 
 
@@ -217,15 +188,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 28 
+#define isoburn_libisofs_req_micro  4
 
 /** 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  7
+#define isoburn_libburn_req_minor  4
-#define isoburn_libburn_req_micro  6
+#define isoburn_libburn_req_micro  4
 
 
 /** The minimum version of libisofs to be used with this version of libisoburn
@@ -260,8 +231,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  5
+#define isoburn_header_version_minor  1
-#define isoburn_header_version_micro  0
+#define isoburn_header_version_micro  4
 /** Note:
     Above version numbers are also recorded in configure.ac because libtool
     wants them as parameters at build time.
@@ -327,24 +298,6 @@ 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()
@@ -353,8 +306,7 @@ int isoburn_set_msgs_submit(int (*msgs_submit)(void *handle, int error_code,
                   (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. But before this is done
+                  when the drive is no longer needed.
-                  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
@@ -371,59 +323,30 @@ 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. But before this is done
+                  when the drive is no longer needed.
-                  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.
                   bit1= regard overwriteable media as blank
                   bit2= if the drive is a regular disk file: truncate it to
                         the write start address
-                  bit3= if the drive reports a read-only profile try to read
-                        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
-                  bit7= pretend read-only profile and scan for table of content
     @return       1 = success , 0 = drive not found , <0 = other error
 */
 int isoburn_drive_aquire(struct burn_drive_info *drive_infos[],
-                         char* adr, int flag);
+                                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.
@@ -439,7 +362,7 @@ enum burn_disc_status isoburn_disc_get_status(struct burn_drive *drive);
 /** Tells whether the media can be treated by isoburn_disc_erase().
     Wrapper for: burn_disc_erasable()
     @since 0.1.0
-    @param d     The drive to inquire.
+    @param drive The drive to inquire.
     @return      0=not erasable , else erasable
 */
 int isoburn_disc_erasable(struct burn_drive *d);
@@ -458,220 +381,6 @@ int isoburn_disc_erasable(struct burn_drive *d);
 void isoburn_disc_erase(struct burn_drive *drive, int fast);
 
 
-/** 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.
-    Note: Sessions and tracks are counted beginning with 1, not with 0.
-    @since 0.1.6
-    @param d        The drive where msc1 is to be set
-    @param adr_mode Determines how to interpret adr_value and to set msc1.
-                    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 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);
-
-
-/* ----------------------------------------------------------------------- */
-/* 
-
-  Wrappers for emulation of TOC on overwriteable media
-
-  Media which match the overwriteable usage model lack of a history of sessions
-  and tracks. libburn will not even hand out a burn_disc object for them and
-  always declare them blank. libisoburn checks for a valid ISO filesystem
-  header at LBA 0 and eventually declares them appendable.
-  Nevertheless one can only determine an upper limit of the size of the overall
-  image (by isoburn_get_min_start_byte()) but not a list of stored sessions
-  and their LBAs, as it is possible with true multi-session media.
-
-  The following wrappers add the capability to obtain a session and track TOC
-  from emulated multi-session images on overwriteables if the first session
-  was written by libisoburn-0.1.6 or later (i.e. with a header copy at LBA 32).
-
-  Be aware that the structs emitted by these isoburn calls are not compatible
-  with the libburn structs. I.e. you may use them only with isoburn_toc_*
-  calls. 
-  isoburn_toc_disc needs to be freed after use. isoburn_toc_session and
-  isoburn_toc_track vanish together with their isoburn_toc_disc.
-*/
-
-/* Opaque handles to media, session, track */
-struct isoburn_toc_disc;
-struct isoburn_toc_session;
-struct isoburn_toc_track;
-
-
-/** Obtain a master handle for the table of content.
-    This handle governs allocated resources which have to be released by
-    isoburn_toc_disc_free() when no longer needed.
-    Wrapper for: burn_drive_get_disc()
-    @since 0.1.6
-    @param d   The drive with the media to inspect
-    @return    NULL in case there is no content info, else it is a valid handle
-*/
-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.
-    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
-*/
-int isoburn_toc_disc_get_sectors(struct isoburn_toc_disc *disc);
-
-
-/** Get the array of session handles from the table of content.
-    Wrapper for: burn_disc_get_sessions()
-    @since 0.1.6
-    @param disc The master handle of the media
-    @param num returns the number of sessions in the array
-    @return the address of the array of session handles
-*/
-struct isoburn_toc_session **isoburn_toc_disc_get_sessions(
-                                      struct isoburn_toc_disc *disc, int *num);
-
-
-/** Tell the number of 2048 byte blocks covered by a particular session.
-    Wrapper for: burn_session_get_sectors()
-    @since 0.1.6
-    @param s The session handle
-    @return number of blocks, <=0 indicates unknown or unreadable state
-*/
-int isoburn_toc_session_get_sectors(struct isoburn_toc_session *s);
-
-
-/** Obtain a copy of the entry which describes the end of a particular session.
-    Wrapper for: burn_session_get_leadout_entry()
-    @since 0.1.6
-    @param s The session handle
-    @param entry A pointer to memory provided by the caller. It will be filled
-                 with info according to struct burn_toc_entry as defined
-                 in libburn.h
-*/
-void isoburn_toc_session_get_leadout_entry(struct isoburn_toc_session *s,
-                                       struct burn_toc_entry *entry);
-
-
-/** Get the array of track handles from a particular session.
-    Wrapper for: burn_session_get_tracks()
-    @since 0.1.6
-    @param s The session handle
-    @param num returns the number of tracks in the array
-    @return the address of the array of track handles
-*/
-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 track.
-    Wrapper for: burn_track_get_entry()
-    @since 0.1.6
-    @param t The track handle
-    @param entry A pointer to memory provided by the caller. It will be filled
-                 with info according to struct burn_toc_entry as defined
-                 in libburn.h
-*/
-void isoburn_toc_track_get_entry(struct isoburn_toc_track *t,
-                                 struct burn_toc_entry *entry);
-
-
-/** Obtain eventual ISO image parameters of an emulated track. This info was
-    gained with much effort and thus gets cached in the track object.
-    If this call returns 1 then one can save a call of isoburn_read_iso_head()
-    with return mode 1 which could cause an expensive read operation.
-    @since 0.4.0
-    @param t            The track handle
-    @param start_lba    Returns the start address of the ISO session
-    @param image_blocks Returns the number of 2048 bytes blocks
-    @param volid        Caller provided memory for the volume id
-    @param flag         unused yet, submit 0
-    @return             0= not an emulated ISO session , 1= reply is valid
-*/
-int isoburn_toc_track_get_emul(struct isoburn_toc_track *t, int *start_lba,
-                               int *image_blocks, char volid[33], int flag);
-
-
-
-/** Release the memory associated with a master handle of media.
-    The handle is invalid afterwards and may not be used any more.
-    Wrapper for: burn_disc_free()
-    @since 0.1.6
-    @param disc The master handle of the media
-*/
-void isoburn_toc_disc_free(struct isoburn_toc_disc *disc);
-
-
-/** 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
-    @param d     The drive with the media to inspect
-    @param lba   The block number from where to read
-    @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= 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 d        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);
-
-
 /* ----------------------------------------------------------------------- */
 /*
 
@@ -720,30 +429,6 @@ 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).
-               bit8= noino
-                     @since 0.4.0
-                     Do not load eventual inode numbers from RRIP entry PX,
-                     but generate a new unique inode number for each imported
-                     IsoNode object.
-                     PX inode numbers allow to mark families of hardlinks by
-                     giving all family members the same inode number. libisofs
-                     keeps the PX inode numbers unaltered when IsoNode objects
-                     get written into an ISO image.
-               bit9= nomd5
-                     @since 0.4.2
-                     Do not load the eventual MD5 checksum array.
     @return    1 success, <=0 failure
 */
 #define isoburn_ropt_norock         1
@@ -751,12 +436,6 @@ 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
-#define isoburn_ropt_noino        256
-#define isoburn_ropt_nomd5        512
-
 int isoburn_ropt_set_extensions(struct isoburn_read_opts *o, int ext);
 int isoburn_ropt_get_extensions(struct isoburn_read_opts *o, int *ext);
 
@@ -797,7 +476,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". 
@@ -808,20 +487,6 @@ 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 o      The option set to work on
-    @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.
@@ -846,13 +511,6 @@ int isoburn_ropt_get_auto_incharset(struct isoburn_read_opts *o, int *mode);
 #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);
 
@@ -917,41 +575,14 @@ int isoburn_igopt_get_level(struct isoburn_imgen_opts *o, int *level);
                  advisable if the designed audience has Unix style systems.
            bit1= joliet
                  Longer filenames for Windows systems.
-                 Weaker than RockRidge, but also readable with GNU/Linux.
+                 Weaker than RockRidge, but also readable with Linux.
            bit2= iso1999
                  This is rather exotic. Better do not surprise the readers.
-           bit3= hardlinks
-                 Enable hardlink consolidation. IsoNodes which refer to the
-                 same source object and have the same properties will get
-                 the same ISO image inode numbers.
-                 If combined with isoburn_igopt_rrip_version_1_10 below,
-                 then the PX entry layout of RRIP-1.12 will be used within
-                 RRIP-1.10 (mkisofs does this without causing visible trouble).
-           bit5= aaip
-                 The libisofs specific SUSP based extension of ECMA-119 which
-                 can encode ACL and XFS-style Extended Attributes.
-           bit6= session_md5
-                 @since 0.4.2
-                 Produce and write a MD5 checksum of the whole session stream.
-           bit7= file_md5
-                 @since 0.4.2
-                 Produce and write MD5 checksums for each single IsoFile.
-           bit8= file_stability (only together with file_md5)
-                 @since 0.4.2
-                 Compute MD5 of each file before copying it into the image and
-                 compare this with the MD5 of the actual copying. If they do
-                 not match then issue MISHAP event.
-                 See also libisofs.h  iso_write_opts_set_record_md5()
     @return 1 success, <=0 failure
 */
-#define isoburn_igopt_rockridge         1
+#define isoburn_igopt_rockridge 1
-#define isoburn_igopt_joliet            2
+#define isoburn_igopt_joliet    2
-#define isoburn_igopt_iso1999           4
+#define isoburn_igopt_iso1999   4
-#define isoburn_igopt_hardlinks         8
-#define isoburn_igopt_aaip             32
-#define isoburn_igopt_session_md5      64
-#define isoburn_igopt_file_md5        128
-#define isoburn_igopt_file_stability  256
 int isoburn_igopt_set_extensions(struct isoburn_imgen_opts *o, int ext);
 int isoburn_igopt_get_extensions(struct isoburn_imgen_opts *o, int *ext);
 
@@ -992,27 +623,6 @@ 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
@@ -1023,10 +633,6 @@ 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);
 
@@ -1129,44 +735,6 @@ 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);
-
-
-/** Set resp. get parameters "name" and "timestamp" for a scdbackup checksum
-    tag. It will be appended to the libisofs session tag if the image starts at
-    LBA 0. See isoburn_disc_track_lba_nwa. The scdbackup tag can be used
-    to verify the image by command scdbackup_verify <device> -auto_end.
-    See scdbackup/README appendix VERIFY for its inner details.
-    @since 0.4.4
-    @param o          The option set to work on
-    @param name       The tag name. 80 characters max.
-    @param timestamp  A string of up to 13 characters YYMMDD.hhmmss
-                      A9 = 2009, B0 = 2010, B1 = 2011, ... C0 = 2020, ...
-    @param tag_written Either NULL or the address of an array with at least 512
-                      characters. In the latter case the eventually produced
-                      scdbackup tag will be copied to this array when the image
-                      gets written. This call sets scdbackup_tag_written[0] = 0
-                      to mark its preliminary invalidity.
-    @return 1 success, <=0 failure
- */
-int isoburn_igopt_set_scdbackup_tag(struct isoburn_imgen_opts *o, char *name,
-                                    char *timestamp, char *tag_written);
-int isoburn_igopt_get_scdbackup_tag(struct isoburn_imgen_opts *o,
-                                    char name[81], char timestamp[19],
-                                    char **tag_written);
-
-
 /* ----------------------------------------------------------------------- */
 /*                      End of Options for image generation                */
 /* ----------------------------------------------------------------------- */
@@ -1266,13 +834,9 @@ 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 normally be 0. Successfull return is
+    case of random access media this will always be 0. Succesfull 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
@@ -1301,7 +865,7 @@ int isoburn_disc_track_lba_nwa(struct burn_drive *d, struct burn_write_opts *o,
     overwriteable media. This value is supposed to be <= 2048 * nwa as of
     isoburn_disc_track_lba_nwa().
     @since 0.1.0
-    @param d     The drive holding the media.
+    @param drive The drive holding the media.
     @param start_byte The reply value counted in bytes, not in sectors.
     @param flag  Unused yet. Submit 0.
     @return 1=stat_byte is valid, 0=not an emulated appendable, -1=error 
@@ -1310,8 +874,7 @@ int isoburn_get_min_start_byte(struct burn_drive *d, off_t *start_byte,
                                int flag);
 
 
-/** To choose the expansion method of Growing:
+/** Create a disc object for writing the new session from the created or loaded
-    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().
@@ -1328,10 +891,9 @@ int isoburn_prepare_disc(struct burn_drive *drive, struct burn_disc **disc,
                          struct isoburn_imgen_opts *opts);
 
 
-/** To choose the expansion method of Modifying:
+/** Create a disc object for producing a new image from a previous image
-    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 a grabbed drive with blank writeable media.
+    to be written to any grabbed libburn 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.
@@ -1339,11 +901,15 @@ 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_aquire() or
+    @param in_drive The input drive,grabbed with isoburn_drive_scan_and_grab().
-                    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 output drive, from isoburn_drive_aquire() et.al..
+    @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.
     @return <=0 error , 1 = success
 */
 int isoburn_prepare_new_image(struct burn_drive *in_drive,
@@ -1351,56 +917,11 @@ int isoburn_prepare_new_image(struct burn_drive *in_drive,
                               struct isoburn_imgen_opts *opts,
                               struct burn_drive *out_drive);
 
-
+/**                                                                @since 0.1.0
-/** To choose the expansion method of Blind Growing:
+    Revoke isoburn_prepare_new_image() or isoburn_prepare_disc() instead of
-    Create a disc object for writing an add-on session from the created or
+    running isoburn_disc_write().
-    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 *in_drive,
-                               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 three calls is performed. It is mandatory to
+    image stream when one of above two 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
@@ -1439,7 +960,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
-    @param d     The drive to which the track with the fifo gets burned.
+    @parm 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
@@ -1475,10 +996,11 @@ int isoburn_drive_wrote_well(struct burn_drive *d);
     @param d  The output drive to which the session was written
     @return   1 success , <=0 failure
 */
-int isoburn_activate_session(struct burn_drive *d);
+int isoburn_activate_session(struct burn_drive *drive);
 
 
-/** Wait after normal end of operations until libisofs ended all write
+/**                                                                @since 0.1.0
+    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.
@@ -1494,6 +1016,21 @@ 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
@@ -1524,6 +1061,6 @@ void isoburn_finish(void);
             1 is emulated multi-session
            -1 is not suitable for isoburn
 */
-int isoburn_needs_emulation(struct burn_drive *d);
+int isoburn_needs_emulation(struct burn_drive *drive);
  
 

test/compare_file.c

@@ -5,9 +5,9 @@
   To compare tree /media/dvd and /original/dir :
       find /media/dvd -exec compare_file '{}' /media/dvd /original/dir ';'
 
-  Copyright 2008 - 2010 Thomas Schmitt, <scdbackup@gmx.net>
+  Copyright 2008 Thomas Schmitt, <scdbackup@gmx.net>
 
-  Provided under GPL version 2 or later.
+  Provided under GPL version 2.
 
 
   cc -g -o compare_file compare_file.c
@@ -117,9 +117,7 @@ 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,
+     printf("%s : st_mode  :  %7.7o  <>  %7.7o\n", a, s1.st_mode, s2.st_mode);
-             (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/AUTHORS_gnu_xorriso

@@ -1,6 +0,0 @@
-Derek Foreman
-Ben Jansens
-Thomas Schmitt
-Mario Danic
-Vreixo Formoso Lopes
-

xorriso/COPYING_gnu_xorriso

@@ -1,674 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.

xorriso/COPYRIGHT_gnu_xorriso

@@ -1,27 +0,0 @@
-Derek Foreman <derek@signalmarketing.com>
-Ben Jansens <xor@orodu.net>
-Thomas Schmitt <scdbackup@gmx.net>
-Mario Danic <mario.danic@gmail.com>,
-Vreixo Formoso <metalpain2002@yahoo.es> 
-
-GNU xorriso is a compilation of
-xorriso     Copyright (C) 2007-2010 Thomas Schmitt
-libisoburn  Copyright (C) 2007-2010 Vreixo Formoso, Thomas Schmitt
-libisofs    Copyright (C) 2007-2010 Vreixo Formoso, Mario Danic, Thomas Schmitt
-libburn     Copyright (C) 2002-2006 Derek Foreman, Ben Jansens
-                          2006-2010 Mario Danic, Thomas Schmitt
-from libburnia-project.org with a license derived from GPLv2+.
-
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License version 3
-    or later as published by the Free Software Foundation.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

xorriso/README

@@ -0,0 +1,201 @@
+------------------------------------------------------------------------------
+     libburnia-project.org     scdbackup.sourceforge.net/xorriso_eng.html
+------------------------------------------------------------------------------
+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.4.pl00.tar.gz
+Copyright (C) 2006-2008 Thomas Schmitt, provided under GPL version 2.
+------------------------------------------------------------------------------
+
+
+xorriso is a program which maps 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.
+
+Currently it is only supported on Linux with kernels >= 2.4.
+
+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 .
+
+By using this software you agree to the disclaimer at the end of this text:
+"... without even the implied warranty ..."
+
+
+                   Compilation, First Glimpse, Installation
+
+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.
+
+Obtain xorriso-0.1.4.pl00.tar.gz, take it to a directory of your choice and do:
+
+    tar xzf xorriso-0.1.4.pl00.tar.gz
+    cd xorriso-0.1.4
+
+Within that directory execute:
+
+    ./configure --prefix=/usr
+    make
+
+This will produce a binary named
+    ./xorriso/xorriso
+
+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:
+    make install
+
+For general concepts, options and usage examples see
+    man 1 xorriso
+
+This man page is part of the tarball as
+    xorriso/xorriso.1
+You may get a first glimpse by
+    man ./xorriso/xorriso.1
+
+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.
+
+
+                       Drives and Disk File Objects 
+
+The user of xorriso needs rw-permission for the CD burner device.
+A list of rw-accessible drives can be obtained by
+
+    xorriso -devices
+
+CD devices which offer no rw-permission are invisible to normal users.
+The superuser should be able to see any usable drive and then set the
+permissions as needed.
+
+The output of  xorriso -devices  might look like
+
+0  -dev '/dev/sr0' rwrw-- :  'TSSTcorp' 'CDDVDW SH-S203B' 
+1  -dev '/dev/hda' rwrw-- :  'HL-DT-ST' 'DVD-ROM GDR8162B' 
+
+Full and insecure enabling of both for everybody would look like
+    chmod a+rw /dev/sr0 /dev/hda
+This is equivalent to the traditional setup chmod a+x,u+s cdrecord.
+
+I strongly discourage to run xorriso with setuid root or via sudo !
+It is not checked for the necessary degree of hacker safety.
+
+Consider to put all authorized users into group "floppy", to chgrp the
+device file to that group and to disallow w-access to others.
+
+
+A possible source of problems are hald or other automounters. 
+If you can spot a process "hald-addon-storage" with the address of
+your desired drive, then consider to kill it.
+
+If you cannot get rid of the automounter that easily, try whether it helps
+to always load the drive tray manually before starting a write run of
+xorriso. Wait until the drive light is off.
+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:".
+Like:
+    xorriso -dev stdio:/tmp/pseudo_drive ...more arguments...
+
+
+                              Testing
+
+We are quite sure that libisofs produces accurate representations of the disk
+files. This opinion is founded on a lot of test burns and checks by a little
+test program which compares files from the mounted image with the orignals
+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
+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
+of ctime date stamps.
+The exit value is 0 if no difference was detected, non-0 else.
+
+Example: After
+   xorriso ... -pathspecs on -add /=/original/dir -- -commit_eject all
+   mount /media/dvd
+   cd test
+compare tree /media/dvd with tree /original/dir :
+   find /original/dir -exec ./compare_file '{}' /original/dir /media/dvd ';' \
+   | less
+and vice versa:
+   find /media/dvd -exec ./compare_file '{}' /media/dvd /original/dir ';' \
+   | less
+
+
+                             libisoburn
+
+xorriso is based on libisofs which does ISO 9600 filesystem aspects and on
+libburn which does the input and output aspects. Parts of this foundation
+are accessed via libisoburn, which is closely related to xorriso.
+
+libisoburn provides two services:
+- Encapsulation of coordination between libisofs and libburn.
+- Emulation of ISO 9660 multi-session on overwriteable media
+  or random access files.
+
+The sourcecode of all three libraries is included in the xorriso standalone
+tarball. It is compiled with xorriso and linked statically.
+But you may as well get and install releases of libburn and libisofs, in order
+to be able to install a release of libisoburn which produces libisoburn.so.1
+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.4 :
+- libburn.so.4  , version libburn-0.4.4 or higher
+- libisofs.so.6 , version libisofs-0.6.4 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.
+
+Standalone xorriso has less runtime dependencies and can be moved more freely.
+
+
+------------------------------------------------------------------------------
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License version 2 as
+    published by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+------------------------------------------------------------------------------
+Based on and sub project of:
+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.
+
+libburnia-project.org is inspired by and in other components still containing
+parts of old
+Libburn. By Derek Foreman <derek@signalmarketing.com> and
+            Ben Jansens <xor@orodu.net>
+Copyright (C) 2002-2006  Derek Foreman and Ben Jansens
+

xorriso/README_gnu_xorriso

@@ -1,341 +0,0 @@
-------------------------------------------------------------------------------
-      Contribution of libburnia-project.org to the GNU Operating System
-------------------------------------------------------------------------------
-GNU xorriso. By Thomas Schmitt <scdbackup@gmx.net>
-Derived from and supported by libburnia-project.org, published via:
-http://www.gnu.org/software/xorriso/xorriso_eng.html
-ftp://ftp.gnu.org/gnu/xorriso/xorriso-0.5.0.tar.gz
-Provided under GPL version 3 or later. No warranty.
-------------------------------------------------------------------------------
-
-
-xorriso is a program which 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.
-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 GNU/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 ..."
-
-
-                   Compilation, First Glimpse, Installation
-
-The most simple way to get xorriso from source code is the xorriso standalone
-tarball.
-
-Prerequisites:
-The tarball contains everything that is needed except the following system
-components:
-   libc, libpthread
-   plus on FreeBSD: libiconv, libcam, IDE and SATA drives need atapicam
-Optional at compile time are:
-   libreadline and the readline-dev headers make dialog mode more convenient.
-   on GNU/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.5.0.tar.gz, take it to a directory of your choice and do:
-
-    tar xzf xorriso-0.5.0.tar.gz
-    cd xorriso-0.5.0
-
-Within that directory execute:
-
-    ./configure --prefix=/usr
-    make
-
-This will produce a binary named
-    ./xorriso/xorriso
-
-If you want xorriso to report a "Build timestamp" with its option -version :
-    make buildstamped
-
-You may strip the binary 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,
-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
-    man 1 xorriso
-
-This man page is part of the tarball as
-    xorriso/xorriso.1
-You may get a first glimpse by
-    man ./xorriso/xorriso.1
-
-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 brings own system adapters which allow burning optical media on
-GNU/Linux and FreeBSD. Alternatively it can use libcdio-0.83 or later for
-sending commands to optical drives:
-    --enable-libcdio
-
-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
-
-Sometimes xorriso will yield better write performance on GNU/Linux if 64 KB are
-transmitted in each write operation rather than 32 KB. See option -dvd_obs .
-64k can be made default at configure time by:
-    --enable-dvd-obs-64k
-
-For xorriso -as cdrecord emulation only:
-In some situations GNU/Linux may deliver a better write performance to drives
-if the track input is read with O_DIRECT (see man 2 open). The included libburn
-and the cdrecord emulation of xorriso can be told to use this peculiar read
-mode by:
-    --enable-track-src-odirect
-
-
-                       Drives and Disk File Objects 
-
-The user of libisoburn applications needs rw-permission for the CD/DVD/BD
-drives which shall be used, even if only reading is intended.
-A list of rw-accessible drives can be obtained by
-
-    xorriso -devices
-
-CD devices which offer no rw-permission are invisible to normal users.
-The superuser should be able to see any usable drive and then set the
-permissions as needed.
-
-The output of  xorriso -devices  might look like
-
-0  -dev '/dev/sr0' rwrw-- :  'TSSTcorp' 'CDDVDW SH-S203B' 
-1  -dev '/dev/hda' rwrw-- :  'HL-DT-ST' 'DVD-ROM GDR8162B' 
-
-Full and insecure enabling of both for everybody would look like
-    chmod a+rw /dev/sr0 /dev/hda
-This is equivalent to the traditional setup chmod a+x,u+s cdrecord.
-
-I strongly discourage to run xorriso with setuid root or via sudo !
-It is not checked for the necessary degree of hacker safety.
-
-Consider to put all authorized users into group "floppy", to chgrp the
-device file to that group and to disallow w-access to others.
-
-
-A possible source of problems are hald or other automounters. 
-If you can spot a process "hald-addon-storage" with the address of
-your desired drive, then consider to kill it.
-
-If you cannot get rid of the automounter that easily, try whether it helps
-to always load the drive tray manually before starting a write run of
-xorriso. Wait until the drive light is off.
-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. 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:/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
-
-We are quite sure that libisofs produces accurate representations of the disk
-files. This opinion is founded on a lot of test burns and checks by a little
-test program which compares files from the mounted image with the orignals
-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
-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
-of ctime date stamps.
-The exit value is 0 if no difference was detected, non-0 else.
-
-Example: After
-   xorriso ... -pathspecs on -add /=/original/dir -- -commit_eject all
-   mount /media/dvd
-   cd test
-compare tree /media/dvd with tree /original/dir :
-   find /original/dir -exec ./compare_file '{}' /original/dir /media/dvd ';' \
-   | less
-and vice versa:
-   find /media/dvd -exec ./compare_file '{}' /media/dvd /original/dir ';' \
-   | less
-
-
-                             File Formats
-
-                             Sector Maps
-
-Sector maps 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.
-
-                             Checksum Tags
-
-Checksum tags are data blocks inside an ISO 9660 image which do not belong to
-any file but rather tell the MD5 of a certain range of data blocks.
-
-The superblock checksum tag is written after the ECMA-119 volume descriptors.
-The tree checksum tag is written after the ECMA-119 directory entries.
-The session checksum tag is written after all payload including the checksum
-array. (Then follows eventual padding.)
-
-The tags are single lines of printable text, padded by 0 bytes. They have
-the following format:
-
- Tag_id pos=# range_start=# range_size=# [session_start|next=#] md5=# self=#\n
-
-Parameters md5= and self= are 32 digit hex, the others are decimal numbers.
-
-Tag_id distinguishes the following tag types
-  "libisofs_rlsb32_checksum_tag_v1"     Relocated 64 kB superblock tag
-  "libisofs_sb_checksum_tag_v1"         Superblock tag
-  "libisofs_tree_checksum_tag_v1"       Directory tree tag
-  "libisofs_checksum_tag_v1"            Session end tag
-
-A relocated superblock may appear at LBA 0 of an image which was produced for
-being stored in a disk file or on overwriteable media (e.g. DVD+R, BD-RE).
-xorriso records the first session at LBA 32. An eventual follow-up session
-begins at the next block address which is divisible by 32 and higher than the
-address of the previous session's end tag. Normally no session starts after the
-address given by relocated superblock parameter session_start=.
-Session oriented media like CD-R[W], DVD+R, BD-R will have no relocated
-superblock but rather bear a table-of-content on media level.
-
-A tag is valid if pos= tells its own block address and self= tells its own MD5
-up to the last hex digit of md5=. range_start= tells the first block that is
-covered by md5=, range_size= tells the number of blocks covered by md5=.
-Relocated superblocks tell the block address of their session by session_start=.
-Superblock and tree tag tell the block address of the next tag by next=.
-The newline character at the end is mandatory.
-
-
-                             libisoburn
-
-xorriso is based on libisofs which does ISO 9600 filesystem aspects and on
-libburn which does the input and output aspects. Parts of this foundation
-are accessed via libisoburn, which is closely related to xorriso.
-
-libisoburn provides two services:
-- Encapsulation of coordination between libisofs and libburn.
-- Emulation of ISO 9660 multi-session on overwriteable media
-  or random access files.
-
-The sourcecode of all three libraries is included in the xorriso standalone
-tarball. It is compiled with xorriso and linked statically.
-But you may as well get and install releases of libburn and libisofs, in order
-to be able to install a release of libisoburn which produces libisoburn.so.1
-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.5.0 :
-- libburn.so.4  , version libburn-0.7.6 or higher
-- libisofs.so.6 , version libisofs-0.6.28 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.
-
-Standalone xorriso has less runtime dependencies and can be moved more freely.
-
-
-------------------------------------------------------------------------------
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License version 3 or later
-    as published by the Free Software Foundation.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-------------------------------------------------------------------------------
-
-    GNU xorriso is feature-wise equivalent to the dynamic compilation of
-    libburnia libraries and libburnia program xorriso.
-    It restricts itself to a technical form where the legal commitments of the
-    libburnia project and the legal intentions of FSF match completely.
-
-    Libburnia project is committed to provide support for this copy in the same
-    way as for its own software releases. It is further committed to keep its
-    own licenses open for obtaining future copies under GPLv2+.
-
-------------------------------------------------------------------------------
-libburnia program xorriso is based on and sub project of:
-libburnia-project.org
-By Mario Danic           <mario.danic@gmail.com>,  libburn, libisofs
-   Vreixo Formoso        <metalpain2002@yahoo.es>, libisofs, libisoburn
-   Thomas Schmitt        <scdbackup@gmx.net>,      libburn, libisofs,
-                                                   libisoburn, xorriso
-Copyright (C) 2006-2010 Mario Danic, Vreixo Formoso, Thomas Schmitt.
-
-libburnia-project.org is inspired by and in libburn still containing parts
-of old
-Libburn. By Derek Foreman <derek@signalmarketing.com> and
-            Ben Jansens <xor@orodu.net>
-Copyright (C) 2002-2006  Derek Foreman and Ben Jansens
-------------------------------------------------------------------------------
-
-This text itself is
-Copyright (c) 2007 - 2010 Thomas Schmitt <scdbackup@gmx.net>
-and is freely distributable.
-It shall only be modified in sync with the technical properties of xorriso.
-If you make use of the license to derive modified versions of xorriso
-then you are entitled to modify this text under that same license.
-

xorriso/compile_xorriso.sh

@@ -1,32 +1,27 @@
 #!/bin/sh
 
 # compile_xorriso.sh
-# Copyright 2005 - 2010 Thomas Schmitt, scdbackup@gmx.net, GPL version 2
+# Copyright 2005 - 2008 Thomas Schmitt, scdbackup@gmx.net, GPL
 #
 # 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/libisofs_libisofs_la-
+isofs=./nglibisofs-develop/libisofs
-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="-DXorriso_allow_external_filterS"
+def_opts=
 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"
-link_libcdio=
 
 for i in "$@"
 do
@@ -40,24 +35,11 @@ do
   elif test "$i" = "-g"
   then
     debug_opts="-g -O0"
-  elif test "$i" = "-no_libreadline"
-  then
-    def_libreadline=""
-    link_libreadline=""
-  elif test "$i" = "-dvd_obs_64k"
-  then
-    def_opts="$def_opts -DXorriso_dvd_obs_default_64K"
-  elif test "$i" = "-use_libcdio"
-  then
-    link_libcdio="-lcdio"
   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 "  -dvd_obs_64k      64 KB default size for DVD/BD writing."
-    echo "  -no_libreadline   do not compile for and link with libreadline."
-    echo "  -use_libcdio      link with -lcdio because libburn uses it."
     echo "  -do_diet          produce capability reduced lean version."
     echo "  -do_strip         apply program strip to compiled programs."
     echo "  -g                produce debuggable programm."
@@ -70,51 +52,44 @@ do
 done
 
 libisofs=
-libisofs="$libisofs $isofs"buffer.o
+libisofs="$libisofs $isofs"/buffer.o
-libisofs="$libisofs $isofs"builder.o
+libisofs="$libisofs $isofs"/builder.o
-libisofs="$libisofs $isofs"data_source.o
+libisofs="$libisofs $isofs"/data_source.o
-libisofs="$libisofs $isofs"ecma119.o
+libisofs="$libisofs $isofs"/ecma119.o
-libisofs="$libisofs $isofs"ecma119_tree.o
+libisofs="$libisofs $isofs"/ecma119_tree.o
-libisofs="$libisofs $isofs"eltorito.o
+libisofs="$libisofs $isofs"/eltorito.o
-libisofs="$libisofs $isofs"filesrc.o
+libisofs="$libisofs $isofs"/filesrc.o
-libisofs="$libisofs $isofs"fs_image.o
+libisofs="$libisofs $isofs"/fs_image.o
-libisofs="$libisofs $isofs"fs_local.o
+libisofs="$libisofs $isofs"/fs_local.o
-libisofs="$libisofs $isofs"fsource.o
+libisofs="$libisofs $isofs"/fsource.o
-libisofs="$libisofs $isofs"image.o
+libisofs="$libisofs $isofs"/image.o
-libisofs="$libisofs $isofs"iso1999.o
+libisofs="$libisofs $isofs"/iso1999.o
-libisofs="$libisofs $isofs"joliet.o
+libisofs="$libisofs $isofs"/joliet.o
-libisofs="$libisofs $isofs"libiso_msgs.o
+libisofs="$libisofs $isofs"/libiso_msgs.o
-libisofs="$libisofs $isofs"messages.o
+libisofs="$libisofs $isofs"/messages.o
-libisofs="$libisofs $isofs"node.o
+libisofs="$libisofs $isofs"/node.o
-libisofs="$libisofs $isofs"rockridge.o
+libisofs="$libisofs $isofs"/rockridge.o
-libisofs="$libisofs $isofs"rockridge_read.o
+libisofs="$libisofs $isofs"/rockridge_read.o
-libisofs="$libisofs $isofs"stream.o
+libisofs="$libisofs $isofs"/stream.o
-libisofs="$libisofs $isofs"tree.o
+libisofs="$libisofs $isofs"/tree.o
-libisofs="$libisofs $isofs"util.o
+libisofs="$libisofs $isofs"/util.o
-libisofs="$libisofs $isofs"util_htable.o
+libisofs="$libisofs $isofs"/util_htable.o
-libisofs="$libisofs $isofs"util_rbtree.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
-libisofs="$libisofs $isofs"md5.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 "compiling program $xorr/xorriso.c $static_opts $debug_opts $def_opts"
-echo "Build timestamp   :  $(sed -e 's/#define Xorriso_build_timestamP "//' -e 's/"$//' "$xorr"/xorriso_buildstamp.h)"
+cc -I. -DXorriso_with_maiN -DXorriso_with_regeX -DXorriso_with_readlinE \
-
-echo "compiling program $xorr/xorriso.c $static_opts $debug_opts $def_opts $link_libcdio"
-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 \
@@ -146,7 +121,7 @@ cc -I. -DXorriso_with_maiN $def_libreadline \
   "$burn"/toc.o \
   \
   "$burn"/crc.o \
-  "$burn"/ecma130ab.o \
+  "$burn"/lec.o \
   \
   "$isoburn"/isoburn.o \
   "$isoburn"/burn_wrap.o \
@@ -155,12 +130,9 @@ cc -I. -DXorriso_with_maiN $def_libreadline \
   \
   $libisofs \
   \
-  $link_libreadline \
+  -lreadline \
-  $link_libcdio \
   \
-  -lpthread \
+  -lpthread
-  -lacl \
-  -lz
 
   ret=$?
   if test "$ret" = 0

xorriso/configure_ac.txt

@@ -1,29 +1,22 @@
-
+AC_INIT([xorriso], [0.1.4], [http://libburnia-project.org])
-# configure.ac stems from xorriso/configure_ac.txt and leads to ./configure
-# Copyright (c) 2007 - 2010 Thomas Schmitt <scdbackup@gmx.net>
-# Provided under GPL version 2 or later.
-
-AC_INIT([xorriso], [0.5.0], [http://libburnia-project.org])
 AC_PREREQ([2.50])
 dnl AC_CONFIG_HEADER([config.h])	
 
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 
-LIBBURNIA_SET_FLAGS
-
 AM_INIT_AUTOMAKE([subdir-objects])
 
 BURN_MAJOR_VERSION=0
-BURN_MINOR_VERSION=7
+BURN_MINOR_VERSION=4
-BURN_MICRO_VERSION=7
+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=29
+LIBISOFS_MICRO_VERSION=4
 AC_SUBST(LIBISOFS_MAJOR_VERSION)
 AC_SUBST(LIBISOFS_MINOR_VERSION)
 AC_SUBST(LIBISOFS_MICRO_VERSION)
@@ -50,12 +43,6 @@ 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, , )
-dnl GNU iconv has no function iconv() but libiconv() and a macro iconv()
-AC_CHECK_LIB(iconv, libiconv, , )
- 
 AC_PROG_LIBTOOL
 AC_SUBST(LIBTOOL_DEPS)
 LIBTOOL="$LIBTOOL --silent"
@@ -87,19 +74,8 @@ 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
@@ -120,154 +96,19 @@ else
 fi
 
 
-dnl Determine target directory for libisoburn-*.pc
-dnl Important: Must be performed _after_ TARGET_SHIZZLE
-dnl
-LIBBURNIA_SET_PKGCONFIG
-
-
-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 GNU/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 Linking fails on SuSE 9.0 because zlib has compress2() but lacks 
-dnl compressBound(). So compressBound is the more modern thing to test.
-dnl The empty parameter after "compressBound" causes -lz.
-    ZLIB_DEF="-DLibisofs_with_zliB"
-    AC_CHECK_HEADER(zlib.h, AC_CHECK_LIB(z, compressBound, , ZLIB_DEF= ), ZLIB_DEF= )
-else
-    ZLIB_DEF=
-fi
-AC_SUBST(ZLIB_DEF)
-
-
-AC_ARG_ENABLE(libcdio,
-[  --enable-libcdio         Enable EXPERIMENTAL use of libcdio as system adapter, default=no],
-               , enable_libcdio=no)
-if test x$enable_libcdio = xyes; then
-dnl Check whether there is libcdio-devel and libcdio-runtime.
-dnl If not, erase this macro
-    LIBCDIO_DEF="-DLibburn_use_libcdiO"
-dnl The empty yes case obviously causes -lcdio to be linked
-    AC_CHECK_HEADER(cdio/cdio.h, AC_CHECK_LIB(cdio, mmc_last_cmd_sense, , LIBCDIO_DEF= ), LIBCDIO_DEF= )
-else
-    LIBCDIO_DEF=
-fi
-if test x$LIBCDIO_DEF = x
-then
-    if test x$enable_libcdio = xyes
-    then
-      echo "WARNING: could not enable use of libcdio as system adapter"
-    fi
-else
-    echo "enabled  EXPERIMENTAL use of libcdio as system adapter"
-
-    LIBCDIO_REQUIRED=0.83
-    PKG_CHECK_MODULES(LIBCDIO, libcdio >= $LIBCDIO_REQUIRED)
-fi
-AC_SUBST(LIBCDIO_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_ARG_ENABLE(dvd-obs-64k,
-[  --enable-dvd-obs-64k         64 KB default size for DVD/BD writing, default=no],
-               , enable_dvd_obs=no)
-if test x$enable_dvd_obs_64k = xyes; then
-    XORRISO_DVD_OBS_64K="-DXorriso_dvd_obs_default_64K"
-    echo "enabled  xorriso write size default 64 KB on DVD and BD"
-else
-    XORRISO_DVD_OBS_64K=
-    echo "disabled xorriso write size default 64 KB on DVD and BD"
-fi
-AC_SUBST(XORRISO_DVD_OBS_64K)
-
-AC_ARG_ENABLE(track-src-odirect,
-[  --enable-track-src-odirect   Enable use of O_DIRECT with -as cdrskin, default=no],
-               , enable_track_src_odirect=no)
-if test x$enable_track_src_odirect = xyes; then
-    LIBBURN_O_DIRECT_DEF="-DLibburn_read_o_direcT"
-    echo "enabled  use of O_DIRECT with input of -as cdrskin"
-else
-    LIBBURN_O_DIRECT_DEF=
-    echo "disabled use of O_DIRECT with input of -as cdrskin"
-fi
-AC_SUBST(LIBBURN_O_DIRECT_DEF)
-
 AC_CONFIG_FILES([
 	Makefile
 	version.h
+	xorriso.pc
 	])
 AC_OUTPUT
-
-#	xorriso.pc

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, Blind/\&nbsp;<BR><b>Creating, Growing, Modifying, Blind/' \
+  -e 's/<b>Creating, Growing, Modifying:<\/b>/\&nbsp;<BR><b>Creating, Growing, Modifying:<\/b>/' \
   -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, El Torito, ACL,/\&nbsp;<BR><b>Rock Ridge, POSIX, X\/Open, El Torito, ACL,/' \
+  -e 's/<b>Rock Ridge, POSIX, X\/Open:<\/b>/\&nbsp;<BR><b>Rock Ridge, POSIX, X\/Open:<\/b>/' \
   -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,17 +65,11 @@ 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/' \
   -e 's/^features:<\/b>/features:<\/b><BR>\&nbsp;<BR>/' \
   -e 's/<b>Support for frontend/\&nbsp;<BR><b>Support for frontend/' \

xorriso/make_xorriso_standalone.sh

@@ -1,50 +1,35 @@
 #!/bin/sh
 
 # make_xorriso_standalone.sh
-# Copyright 2008 - 2010 Thomas Schmitt, scdbackup@gmx.net, GPLv2+
+# Copyright 2008 Thomas Schmitt, scdbackup@gmx.net, GPL
 #
 # Not intended for general use in production installations !
 # 
 # This is a development tool which expects a special setup of directories.
 # It is to be executed in a common parent of the directories 
 #   nglibisofs-develop libburn-develop libisoburn-develop
-# where tarballs or repository copies have been installed of
-#   libisofs           libburn         libisoburn
-# obtained by following instructions on http://libburnia-project.org.
 #
-# It creates a new directory tree
+# Creates a standalone tree for building xorriso
-#   xorriso-standalone
+# from the contents of a unified libburnia development tree.
-# for building GNU xorriso.
 #
 # The ./bootstrap script gets applied and a source tarball
 # is made.
 #
-# From that tree can be build a binary xorriso/xorriso which at runtime
+# From that tree can be build a binary xorriso/xorriso
-# does not depend on installed libburnia libraries.
+# which at runtime depends only on libc and libpthread.
-# Execute in xorriso-standalone :
+# Execute in $lone_dir :
 #
 #   ./configure && make
 #
 
-# By the variable setting  create_gnu_xorriso="yes"
-# the result will become a GNU xorriso tarball under GPLv3+.
-# Without this setting, the result is technically equivalent but
-# stays under GPLv2+. In that case the files xorriso/*_gnu_xorriso
-# are merely informative.
-# Note that it is not permissible to revert the transition from
-# GPLv2+ to GPLv3+. (Rather derive a new GPLv2+ from libburnia.)
-
-create_gnu_xorriso="yes"
-
-
 current_dir=$(pwd)
 lone_dir="$current_dir"/"xorriso-standalone"
 
-xorriso_rev=0.5.0
+xorriso_rev=0.1.4
-# For unstable uploads and patch level 0 of stable releases:
+# For unstable uploads:
-xorriso_pl=""
+# xorriso_pl=""
-# For higher patch levels of stable releases:
+# For stable releases:
-## xorriso_pl=".pl01"
+xorriso_pl=".pl00"
 
 with_bootstrap_tarball=1
 
@@ -118,7 +103,9 @@ copy_files xorriso/configure_ac.txt         "$lone_dir"/configure.ac
 
 copy_files xorriso/xorriso_makefile_am.txt  "$lone_dir"/Makefile.am
 
-# copy_files xorriso/xorriso_pc_in.txt        "$lone_dir"/xorriso.pc.in
+copy_files xorriso/xorriso_pc_in.txt        "$lone_dir"/xorriso.pc.in
+
+copy_files xorriso/README                   "$lone_dir"/README
 
 # echo "See end of xorriso/changelog.txt" >"$lone_dir"/TODO
 
@@ -137,19 +124,12 @@ 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 \
@@ -160,15 +140,10 @@ 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 doc/checksums.txt "$lone_dir"/doc
 copy_files COPYRIGHT "$lone_dir"/libisofs
-test -e CONTRIBUTORS && cat CONTRIBUTORS >>"$lone_dir"/CONTRIBUTORS
 
 # To get a common version.h 
 cat version.h.in >> "$lone_dir"/version.h.in
@@ -211,43 +186,18 @@ create_dir "$lone_dir"/libburn
 goto_dir   "$current_dir"/libburn-develop
 copy_files libburn/*.[ch] "$lone_dir"/libburn
 copy_files COPYRIGHT "$lone_dir"/libburn
-cat CONTRIBUTORS >>"$lone_dir"/CONTRIBUTORS
-
-# Delete a source module of yet unclear ancestry.
-# The build process will avoid to use it.
-rm "$lone_dir"/libburn/crc.c
 
 
 # To get a common version.h 
 cat version.h.in >> "$lone_dir"/version.h.in
 
-# Decision about legal situation
-goto_dir "$current_dir"/libisoburn-develop
-if test "$create_gnu_xorriso" = "yes"
-then
-  copy_files xorriso/README_gnu_xorriso       "$lone_dir"/README
-  copy_files xorriso/COPYRIGHT_gnu_xorriso    "$lone_dir"/COPYRIGHT
-  copy_files xorriso/COPYING_gnu_xorriso      "$lone_dir"/COPYING
-  copy_files xorriso/AUTHORS_gnu_xorriso      "$lone_dir"/AUTHORS
-
-  # patch xorriso/xorriso.c to be GNU xorriso
-  sed -e's/define Xorriso_libburnia_xorrisO/define Xorriso_GNU_xorrisO/' \
-      -e's/This may be changed to Xorriso_GNU_xorrisO in order to c/C/' \
-      <xorriso/xorriso.c  >"$lone_dir"/xorriso/xorriso.c
-
-else
-
-  copy_files README       "$lone_dir"/README
-
-fi
-
 
 # tarball
 
 if test "$with_bootstrap_tarball" = 1
 then
 
-tarball_dir="$current_dir"/xorriso-"$xorriso_rev""$xorriso_pl"
+tarball_dir="$current_dir"/xorriso-"$xorriso_rev"
 mv "$lone_dir" "$tarball_dir"
 
 goto_dir "$tarball_dir"
@@ -270,17 +220,6 @@ rm -r ./autom4te.cache
  chmod a+rx,go-w,u+w ./configure
 )
 
-if test "$create_gnu_xorriso" = "yes"
-then
-  # ftp-upload@gnu.org dislikes my automake 1.9 and its chmod a+rwx
-  sed -e 's/by automake 1.9.6/by automake 1.11.1/' \
-      -e 's/-perm -777 -exec chmod a+rwx/-perm -755 -exec chmod u+rwx,go+rx/' \
-      < Makefile.in  > new_Makefile.in
-  
-  mv new_Makefile.in Makefile.in
-fi
-
-
 cd "$current_dir"
 tar czf ./xorriso-"$xorriso_rev""$xorriso_pl".tar.gz $(basename "$tarball_dir")
 

xorriso/makefile_libxorriso_am.txt

@@ -1,197 +0,0 @@
-
-# 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 libxorriso/libxorriso.la
-
-## ========================================================================= ##
-
-# Build libraries
-libisoburn_libisoburn_la_LDFLAGS = \
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-libisoburn_libisoburn_la_SOURCES = \
-	libisoburn/burn_wrap.c \
-	libisoburn/data_source.c \
-	libisoburn/isoburn.c \
-	libisoburn/isoburn.h \
-	libisoburn/isofs_wrap.c \
-	libisoburn/libisoburn.h \
-	version.h
-
-libisoburn_libisoburn_la_LIBADD = \
-	-lisofs \
-	-lburn
-
-libxorriso_libxorriso_la_LDFLAGS = \
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-libxorriso_libxorriso_la_SOURCES = \
-	xorriso/xorriso.h \
-	xorriso/xorriso_private.h \
-	xorriso/xorriso.c \
-	xorriso/xorrisoburn.h \
-	xorriso/xorrisoburn.c \
-	xorriso/xorriso_timestamp.h \
-	xorriso/xorriso_buildstamp.h \
-	version.h
-
-libxorriso_libxorriso_la_LIBADD = \
-	-lisofs \
-	-lburn \
-	-lisoburn
-
-libinclude_HEADERS = \
-	libisoburn/libisoburn.h \
-	xorriso/xorriso.h
-
-## ========================================================================= ##
-
-
-# This is the reference application of libisoburn. See man xorriso/xorriso.1
-# 
-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_without_subS \
-                         $(READLINE_DEF) $(LIBACL_DEF) $(XATTR_DEF) \
-                         $(EXTF_DEF) $(EXTF_SUID_DEF) $(ZLIB_DEF) \
-                         $(XORRISO_DVD_OBS_64K)
-
-xorriso_xorriso_LDADD = libisoburn/libisoburn.la -lisofs -lburn \
-                        libxorriso/libxorriso.la \
-                        $(THREAD_LIBS) $(LIBBURN_ARCH_LIBS)
-
-xorriso_xorriso_SOURCES = \
-	xorriso/xorriso.h \
-	xorriso/xorriso_private.h \
-	xorriso/xorriso.c \
-	xorriso/xorrisoburn.h \
-	xorriso/xorriso_timestamp.h \
-	xorriso/xorriso_buildstamp.h
-
-#	xorriso/xorrisoburn.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 explicitely.
-buildstamped: buildstamp
-	make
-
-
-
-## Build test applications
-noinst_PROGRAMS = \
-	test/compare_file
-
-# A program to compare two files in mirrored trees in mounted filesystems
-# To compare tree /media/dvd and /original/dir :
-#   find /media/dvd -exec test/compare_file '{}' /media/dvd /original/dir ';'
-#
-test_compare_file_CPPFLAGS =
-test_compare_file_CFLAGS =
-test_compare_file_LDADD =
-test_compare_file_SOURCES = test/compare_file.c
-
-
-## ========================================================================= ##
-
-## Build documentation (You need Doxygen for this to work)
-webhost = http://libburn-api.pykix.org
-webpath = /
-docdir = $(DESTDIR)$(prefix)/share/doc/$(PACKAGE)-$(VERSION)
-
-doc:	doc/html
-
-doc/html: doc/doxygen.conf
-	if [ -f ./doc/doc.lock ]; then \
-		$(RM) -r doc/html; \
-		doxygen doc/doxygen.conf; \
-	fi
-
-doc-upload: doc/html
-	scp -r $</* $(webhost):$(webpath)
-
-all: doc
-
-install-data-local: 
-	if [ -f ./doc/doc.lock ]; then \
-		$(mkinstalldirs) $(docdir)/html; \
-		$(INSTALL_DATA) doc/html/* $(docdir)/html; \
-	fi
-
-uninstall-local:
-	rm -rf $(docdir)
-
-## ========================================================================= ##
-
-# Indent source files
-indent_files = \
-	$(libisoburn_libisoburn_la_SOURCES)
-	
-
-indent: $(indent_files)
-	indent -bad -bap -nbbb -nbbo -nbc -bli0 -br -bls   \
-		-cdw -ce -cli0 -ncs -nbfda -i8 -l79 -lc79   \
-		-lp -saf -sai -nprs -npsl -saw -sob -ss -ut \
-		-sbi0 -nsc -ts8 -npcs -ncdb -fca            \
-		$^
-
-.PHONY: indent
-
-## ========================================================================= ##
-
-# Extra things
-nodist_pkgconfig_DATA = \
-	libisoburn-1.pc
-
-man_MANS = xorriso/xorriso.1
-
-EXTRA_DIST = \
-	libisoburn-1.pc.in \
-	version.h.in \
-	doc/comments \
-	doc/doxygen.conf.in \
-	README \
-	AUTHORS \
-	CONTRIBUTORS \
-	COPYRIGHT \
-	COPYING \
-	INSTALL \
-	xorriso/changelog.txt \
-	xorriso/xorriso_buildstamp_none.h \
-	xorriso/README \
-	$(man_MANS)
-

xorriso/xorriso.h

@@ -2,9 +2,9 @@
 /* Command line oriented batch and dialog tool which creates, loads,
    manipulates and burns ISO 9660 filesystem images.
 
-   Copyright 2007-2010 Thomas Schmitt, <scdbackup@gmx.net>
+   Copyright 2007-2008 Thomas Schmitt, <scdbackup@gmx.net>
 
-   Provided under GPL version 2 or later.
+   Provided under GPL version 2.
 
    This file contains the public option interface of xorriso.
 */
@@ -16,191 +16,25 @@
 struct XorrisO; 
 
 
-#define Xorriso_program_versioN "0.5.0"
-#define Xorriso_program_patch_leveL ""
-
-
 /* --------------------- Fundamental Management ------------------- */
 
-
+/* Create a new xorriso object and tell it the program name to be used
-/* Get the version text (e.g. "0.4.2") of the program code.
+   with messages.
-   This may differ from Xorriso_program_versioN if xorriso is dynamically
-   linked to an application.
-   @param flag     unused yet, submit 0
-   @return         readonly character string
-*/
-char *Xorriso__get_version_text(int flag);
-
-
-/* Get the patch level text (e.g. "" or ".pl01") of the program code.
-   @param flag     unused yet, submit 0
-   @return         readonly character string
-*/
-char *Xorriso__get_patch_level_text(int flag);
-
-
-/* Mandatory call:
-   Create a new xorriso object and tell it the program name to be used
-   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 -as "mkisofs" emulation from start
-                    "genisofs"   alias of "xorrisofs"
-                    "mkisofs"    alias of "xorrisofs"
-                    "genisoimage"  alias of "xorrisofs"
-                    "xorrecord"  activates -as "cdrecord" emulation from start
-                    "cdrecord"   alias of "xorrecord"
-                    "wodim"      alias of "xorrecord"
-                    "cdrskin"    alias of "xorrecord"
-   @param flag     unused yet, submit 0
-   @return         >0 success , <=0 failure, no object created
 */
 int Xorriso_new(struct XorrisO ** xorriso, char *progname, int flag);
 
 
-/* Interpret certain commands which shall get into effect before the
+/* Make global library initializations.
-   libraries get initialized:
-     -abort_on , -report_about , -return_with , -list_delimiter
-   Some commands get executed only if they are the only command in argv:
-     -prog_help , -help , -no_rc
-   Some get examined for the need to redirect stdout messages
-     -dev , -outdev , -indev , -as 
-   @param xorriso The context object in which to perform the commands.
-   @param argc    Number of arguments.
-   @param argv    The arguments. argv[0] contains the program name.
-                  argv[1] to argv[argc-1] contain commands and parameters.
-   @param idx     Argument cursor. When this function is called, *idx must
-                  be at least 1, argv[*idx] must be to a command.
-                  *idx will iterate over commands and parameters until this
-                  function aborts or until argc is reached.
-   @param flag    bit0= do not interpret argv[1]
-   @return        <0 error
-                   0 end program
-                   1 ok, go on 
-*/
-int Xorriso_prescan_args(struct XorrisO *xorriso, int argc, char **argv,
-                         int flag);
-
-
-/* Mandatory call:
-   It has to be made before calling any function listed below this point.
-
-   Make global library initializations.
    This must be done with the first xorriso object that gets created and
    with the first xorriso object that gets created after Xorriso_destroy(,1).
-   @param xorriso The context object.
-   @param flag    unused yet, submit 0
-   @return        <=0 error , >0 success
 */ 
 int Xorriso_startup_libraries(struct XorrisO *xorriso, int flag);
 
 
-/* Read and interpret commands from eventual startup files as listed in
+/* Destroy xorriso object when it is no longer needed.
-   man xorriso.
+   @param flag bit0= Make global librariy shutdown.
-   @param xorriso The context object in which to perform the commands.
+                     Use only with last xorriso object to be destroyed.
-   @param flag    unused yet, submit 0
+                     
-   @return <=0 = error
-             1 = success
-             3 = end program run (e.g. because command -end was encountered)
-*/
-int Xorriso_read_rc(struct XorrisO *xorriso, int flag);
-
-
-/* Check whether program arguments shall be backslash decoded and eventually
-   replace *argv by a new argument vector. The old one will not be freed
-   by this call. If it is dynamic memory then you need to keep a copy of
-   the pointer and free it yourself after this call.
-   @param xorriso The context object
-   @param argc    Number of arguments.
-   @param argv    The arguments. (*argv)[0] contains the program name.
-                  (*argv)[1] to (*argv)[argc-1] contain commands and parameters
-                  If argv after the call differs from argv before the call,
-                  then one should dispose it later by:
-                    for(i= 0; i < argc; i++)
-                      if(argv[i] != NULL)
-                        free(argv[i]);
-                    free(argv);
-   @param flag    unused yet, submit 0
-   @return        <= 0 error , > 0 success
-*/
-int Xorriso_program_arg_bsl(struct XorrisO *xorriso, int argc, char ***argv,
-                            int flag);
-
-
-/* Interpret argv as xorriso command options and their parameters.
-   (An alternative is to call functions of the options API directly and to
-    perform own error status evaluation. See below: Options API.) 
-   After the first command and its parameters there may be more commands and
-   parameters. All parameters must be given in the same call as their command.
-   @param xorriso The context object in which to perform the commands.
-   @param argc    Number of arguments.
-   @param argv    The arguments. argv[0] contains the program name.
-                  argv[1] to argv[argc-1] contain commands and parameters.
-   @param idx     Argument cursor. When this function is called, *idx must
-                  be at least 1, argv[*idx] must be a command.
-                  *idx will iterate over commands and parameters until this
-                  function aborts or until argc is reached.
-   @param flag    bit0= recursion
-                  bit1= these are the main() program start arguments
-   @return <=0 = error
-             1 = success
-             2 = problem event ignored
-             3 = end program run (e.g. because command -end was encountered)
-*/
-int Xorriso_interpreter(struct XorrisO *xorriso,
-                        int argc, char **argv, int *idx, int flag);
-
-
-/* Parse a command line into words and use them as argv for a call of
-   Xorriso_interpreter(). Put out some info lines about the outcome.
-   @param xorriso The context object in which to perform the commands.
-   @param line    A text of one or more words according to man xorriso
-                  paragraph "Command processing" up to and including
-                  "Backslash Interpretation".
-   @param flag    bit0 to bit15 are forwarded to Xorriso_interpreter()
-                  bit16= no pageing of info lines
-                  bit17= print === bar even if xorriso->found<0
-   @return        see return of Xorriso_interpreter()
-*/
-int Xorriso_execute_option(struct XorrisO *xorriso, char *line, int flag);
-
-
-/* Enter xorriso command line dialog mode, eventually using libreadline.
-   This call returns immediately if not option -dialog "on" was performed
-   before.
-   @param xorriso The context object in which to perform the commands.
-   @param flag    unused yet, submit 0
-   @return        <=0 error, 1= dialog mode ended normally ,
-                  3= dialog mode ended normally,interpreter asks to end program
-*/
-int Xorriso_dialog(struct XorrisO *xorriso, int flag);
-
-
-/* Inquire whether option -commit would make sense.
-   @param xorriso The context object to inquire.
-   @param flag    unused yet, submit 0
-   @return        0= -commit would have nothing to do
-                  1= a new image session would emerge at -commit
-*/
-int Xorriso_change_is_pending(struct XorrisO *xorriso, int flag);
-
-
-/* Compute the exit value from the recorded maximum event severity.
-   @param xorriso The context object to inquire.
-   @param flag    unused yet, submit 0
-   @return        The computed exit value
-*/
-int Xorriso_make_return_value(struct XorrisO *xorriso, int flag);
-
-
-/* Mandatory call:
-   Destroy xorriso object when it is no longer needed.
-   @param xorriso  The context object to destroy. *xorriso will become NULL.
-   @param flag     bit0= Perform global library shutdown.
-                         Use only with last xorriso object to be destroyed.
-   @return         <=0 error, >0 success
 */
 int Xorriso_destroy(struct XorrisO **xorriso, int flag);
 
@@ -238,18 +72,11 @@ 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.
     It updates the problem status by processing the library message queues
-    and then it uses this status and the submitted return value of the
+    and then it uses this status and the submitted return value ot the
     option function to evaluate the situation.
     @param xorriso    The environment handle
     @param ret        The return value of the previously called option function
@@ -278,7 +105,8 @@ int Xorriso_set_problem_status(struct XorrisO *xorriso, char *severity,
 
 
 /* The next two functions are part of Xorriso_eval_problem_status().
-   You may use them to build an own advisor function.
+   You may use them to build an own advisor function or to drain the
+   library message queues more frequently.
 */
 
 /** Obtain the current problem status of the xorriso handle.
@@ -296,10 +124,7 @@ int Xorriso_get_problem_status(struct XorrisO *xorriso, char severity[80],
     the severity of the library events like the severity of a message submitted
     via Xorriso_msgs_submit().
     xorriso sets the message queues of the libraries to queuing "ALL".
-    Many inner functions of xorriso call Xorriso_process_msg_queues() on their
+    So it is essential that they get drained regularly.
-    own because they expect library output pending. Nevertheless, a loop of
-    xorriso option calls should either call Xorriso_eval_problem_status() or
-    Xorriso_process_msg_queues() with each cycle.
     @param xorriso    The environment handle
     @param flag       Unused yet. Submit 0.
     @return           1 on success, <=0 if failure
@@ -307,121 +132,6 @@ int Xorriso_get_problem_status(struct XorrisO *xorriso, char severity[80],
 int Xorriso_process_msg_queues(struct XorrisO *xorriso, int flag);
 
 
-/** Write a message for option -errfile_log. 
-    @param xorriso    The environment handle
-    @param error_code The unique error code of your message.
-                      Submit 0 if you do not have reserved error codes within
-                      the libburnia project.
-    @param msg_text   Not more than 8196 characters of message text.
-    @param os_errno   Eventual errno related to the message. Submit 0 if
-                      the message is not related to a operating system error.
-    @param flag       bit0-7= meaning of msg_text
-                      ( 0= ERRFILE path , for internal use mainly )
-                        1= mark line text (only to be put out if enabled)
-    @return <=0 error , >0 success
-*/
-int Xorriso_process_errfile(struct XorrisO *xorriso,
-                            int error_code, char msg_text[], int os_errno,
-                            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    */
@@ -432,27 +142,12 @@ int Xorriso_lst_destroy_all(struct Xorriso_lsT **lstring, int flag);
    After each call to an option function, there should happen:
    Xorriso_eval_problem_status()
    One should follow its eventual advice to abort.
-
-   Options with a varying number of arguments get them passed like
-   Xorriso_interpreter(). E.g.:
-     int Xorriso_option_add(struct XorrisO *xorriso, int argc, char **argv,
-                            int *idx, int flag);
-   They begin to read the arguments at position *idx and will see the list
-   end either at the next argv which contains the -list_delimiter text or
-   at argv[argc-1]. After the call, *idx will be the index of the first not
-   yet interpreted argv.
-
 */
 
 
 /* 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
@@ -472,28 +167,6 @@ 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);
 
@@ -507,38 +180,12 @@ int Xorriso_option_blank(struct XorrisO *xorriso, char *mode, int flag);
 int Xorriso_option_boot_image(struct XorrisO *xorriso, char *form,
                               char *treatment, int flag);
 
-/* Option -calm_drive */
-int Xorriso_option_calm_drive(struct XorrisO *xorriso, char *which, int flag);
-
 /* Option -cd alias -cdi */
 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);
-
-/* Options -check_md5 and -check_md5_r
-   @param flag bit0= issue summary message
-               bit1= do not reset pacifier, no final pacifier message
-               bit2= do not issue pacifier messages at all
-               bit3= recursive: -check_md5_r
-*/
-int Xorriso_option_check_md5(struct XorrisO *xorriso,
-                             int argc, char **argv, int *idx, 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)
 */
@@ -586,13 +233,6 @@ 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);
@@ -611,22 +251,12 @@ 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);
 
-/* Option -dvd_obs "default"|"32k"|"64k" */
-int Xorriso_option_dvd_obs(struct XorrisO *xorriso, char *obs, int flag);
-
 /* Option -eject */
 /* @param flag bit0=do not report toc of eventually remaining drives
 */
@@ -638,29 +268,9 @@ int Xorriso_option_eject(struct XorrisO *xorriso, char *which, int flag);
 */
 int Xorriso_option_end(struct XorrisO *xorriso, int flag);
 
-/* Option -errfile_log marked|plain  path|-|"" */
+/* Option -iso_rr_pattern "on"|"ls"|"off" */
-int Xorriso_option_errfile_log(struct XorrisO *xorriso,
+int Xorriso_option_iso_rr_pattern(struct XorrisO *xorriso, char *mode,
-                               char *mode, char *path, int flag);
+                                  int flag);
-
-/* Option -error_behavior */
-int Xorriso_option_error_behavior(struct XorrisO *xorriso, 
-                                  char *occasion, char *behavior, 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);
@@ -676,52 +286,18 @@ 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 -hardlinks "on"|"off" */
-int Xorriso_option_hardlinks(struct XorrisO *xorriso, char *mode, 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 -list_profiles */
-int Xorriso_option_list_profiles(struct XorrisO *xorriso, char *which,
-                                 int flag);
-
-/* Option -load session|track|sbsector value */
-/* @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);
-
 /* Option -logfile */
 int Xorriso_option_logfile(struct XorrisO *xorriso, char *channel, 
                                                       char *fileadr, int flag);
@@ -746,43 +322,13 @@ int Xorriso_option_lsi(struct XorrisO *xorriso, int argc, char **argv,
 int Xorriso_option_lsx(struct XorrisO *xorriso, int argc, char **argv,
                       int *idx, int flag);
 
-/* Option -map */
-/* @param flag bit0=do not report the added item
-               bit1=do not reset pacifier, no final pacifier message
-*/
-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);
 
-/* Option -md5 */
-int Xorriso_option_md5(struct XorrisO *xorriso, char *mode, int flag);
-
 /* Option -mkdir alias -mkdiri */
 int Xorriso_option_mkdiri(struct XorrisO *xorriso, int argc, char **argv,
                           int *idx, int flag);
 
-/* Options -mount , -mount_cmd , -session_string */
-/* @param bit0= -mount_cmd: print mount command to result channel rather
-                            than performing it
-          bit1= perform -session_string rather than -mount_cmd
-*/ 
-int Xorriso_option_mount(struct XorrisO *xorriso, char *dev, char *adr_mode,
-                         char *adr, char *cmd, int flag);
-
-/* Option -mount_opts option[:...] */
-int Xorriso_option_mount_opts(struct XorrisO *xorriso, char *mode, int flag);
-
 /* Option -mv alias -mvi */
 int Xorriso_option_mvi(struct XorrisO *xorriso, int argc, char **argv,
                       int *idx, int flag);
@@ -790,43 +336,21 @@ int Xorriso_option_mvi(struct XorrisO *xorriso, int argc, char **argv,
 /* Option -no_rc */
 int Xorriso_option_no_rc(struct XorrisO *xorriso, int flag);
 
-/* Option -not_leaf */
+/* Option -options_from_file*/
-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 */
 /* @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 -paste_in */
+/* Option -path-list */
-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 */
@@ -838,7 +362,7 @@ int Xorriso_option_pkt_output(struct XorrisO *xorriso, char *mode, int flag);
 /* Option -print */
 int Xorriso_option_print(struct XorrisO *xorriso, char *text, int flag);
 
-/* Option -print_size
+/* Option -print-size
    @param flag bit0= report in mkisofs compatible form on real stdout
 */
 int Xorriso_option_print_size(struct XorrisO *xorriso, int flag);
@@ -852,22 +376,12 @@ int Xorriso_option_prog_help(struct XorrisO *xorriso, char *name, int flag);
 /* Option -publisher */
 int Xorriso_option_publisher(struct XorrisO *xorriso, char *name, int flag);
 
-/* Option -pvd_info */
-int Xorriso_option_pvd_info(struct XorrisO *xorriso, int flag);
-
 /* Option -pwd alias -pwdi */
 int Xorriso_option_pwdi(struct XorrisO *xorriso, int flag);
 
 /* Option -pwdx */
 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);
@@ -876,8 +390,8 @@ int Xorriso_option_report_about(struct XorrisO *xorriso, char *severity,
 int Xorriso_option_return_with(struct XorrisO *xorriso, char *severity,
                                int exit_value, int flag);
 
-/* Option -revoke_exclusions */
+/* Option -reassure "on"|"tree"|"off" */
-int Xorriso_option_revoke_exclusions(struct XorrisO *xorriso, int flag);
+int Xorriso_option_reassure(struct XorrisO *xorriso, char *mode, int flag);
 
 /* Options -rm alias -rmi , -rm_r alias -rm_ri , -rmdir alias -rmdiri */
 /* @param flag bit0=recursive , bit2= remove empty directory: rmdir */
@@ -885,50 +399,13 @@ int Xorriso_option_rmi(struct XorrisO *xorriso, int argc, char **argv,
                        int *idx, int flag);
 
 /* Option -rollback */
-/* @param flag bit0= do not -reassure
+/* @return <=0 error , 1 success, 2 revoked by -reassure
-   @return <=0 error , 1 success, 2 revoked by -reassure
 */
 int Xorriso_option_rollback(struct XorrisO *xorriso, int flag);
 
-/* Option -rom_toc_scan */
-int Xorriso_option_rom_toc_scan(struct XorrisO *xorriso, char *mode,
-                                int flag);
-
-/* Option -scdbackup_tag */
-int Xorriso_option_scdbackup_tag(struct XorrisO *xorriso, char *list_path,
-                                 char *record_name, int flag);
-/* Option -scsi_log */
-int Xorriso_option_scsi_log(struct XorrisO *xorriso, char *mode, int flag);
-
 /* 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);
 
@@ -942,16 +419,6 @@ 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 -stdio_sync "on"|"off"|size */
-int Xorriso_option_stdio_sync(struct XorrisO *xorriso, char *rythm, int flag);
-
-/* Option -stream_recording */
-int Xorriso_option_stream_recording(struct XorrisO *xorriso, char *mode,
-                                    int flag);
-
-/* Option -system_id */
-int Xorriso_option_system_id(struct XorrisO *xorriso, char *name, int flag);
-
 /* Option -tell_media_space */
 int Xorriso_option_tell_media_space(struct XorrisO *xorriso, int flag);
 
@@ -965,10 +432,6 @@ 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
@@ -987,15 +450,6 @@ int Xorriso_option_version(struct XorrisO *xorriso, int flag);
 /* Option -volid */
 int Xorriso_option_volid(struct XorrisO *xorriso, char *volid, int flag);
 
-/* Option -volset_id */
-int Xorriso_option_volset_id(struct XorrisO *xorriso, char *name, 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

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

xorriso/xorriso_buildstamp_none.h

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

xorriso/xorriso_eng.html

@@ -1,33 +1,29 @@
 <HTML>
 
 <HEAD>
-<META NAME="description" CONTENT="GNU xorriso, creates, loads, manipulates and writes ISO 9660 filesystem images with Rock Ridge extensions">
+<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, GNU/Linux, 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="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="robots" CONTENT="follow">
-<TITLE>GNU xorriso - GNU Project - Free Software Foundation</TITLE>
+<TITLE>xorriso homepage english</TITLE>
-<LINK rev="made" href="mailto:webmasters@gnu.org">
 </HEAD>
 
-<BODY BGCOLOR="#F5DEB3" TEXT=#000000 LINK=#0000A0 VLINK=#800000 ALINK=#A000A0>
+<BODY BGCOLOR="#F5DEB3" TEXT=#000000 LINK=#0000A0 VLINK=#800000>
 <FONT SIZE=+1>
 
 <CENTER>
-<P>
+<P><H2> Homepage of </H2>
-<H1>GNU xorriso</H1>
+<H1> xorriso </H1>
 
-<H2>ISO 9660 Rock Ridge Filesystem Manipulator for GNU/Linux and FreeBSD</H2>
+<H2>ISO 9660 Rock Ridge Filesystem Manipulator for Linux</H2>
-</P>
 </CENTER>
 
 <P>
 <H2>Purpose:</H2>
-xorriso copies file objects from POSIX compliant filesystems
+xorriso maps 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 copy file objects out of ISO 9660 filesystems.
 </P>
 <P>
 
@@ -37,53 +33,50 @@ Vice versa xorriso is able to copy file objects out of ISO 9660 filesystems.
 
 <P>
 <H2>Hardware requirements:</H2>
-About any CD, DVD, or BD recorder produced in the recent ten years.
+A CD/DVD 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).
 <BR>
-<A HREF="http://libburnia-project.org">libburn</A>
-supports recorders which are compliant to standards MMC-1 for CD and
-MMC-5 for DVD or BD.
-<BR>
-GNU/Linux and FreeBSD allow to access drives connected
-via SCSI, PATA (aka IDE, ATA), USB, or SATA.
-<BR>
-xorriso also operates on ISO images in data files or block devices.
-Images or add-on sessions may be written to about any kind of file object.
 </P>
 
 <P>
 <H2>Software requirements :</H2>
 <DL>
-<DT>GNU/Linux with kernel 2.4 or higher, libc, libpthread :</DT>
+<DT>Linux with kernel 2.4 or higher (and libc, of course) :</DT>
-<DD>With kernel 2.4 a PATA/IDE drive has to be under ide-scsi emulation.</DD>
+<DD>With kernel 2.4 an ATA drive has to be under ide-scsi emulation.</DD>
-<DD>With kernel 2.6 ide-scsi is not needed.</DD>
+<DD>With kernel 2.6 the drive should not be under ide-scsi.</DD>
-<DT>or FreeBSD, libc, libpthread :</DT>
+<DT>libpthread</DT>
-<DD>PATA/IDE and SATA drives need atapicam running.</DD>
+<DD>is supposed to be a standard system component.</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 supporting software:</H2>
-<DL>
 <DT>libreadline and libreadline-dev</DT>
-<DD>eventually make dialog more convenient.</DD>
+<DD>are optional and eventually make dialog more convenient.</DD>
-<DT>libacl and libacl-devel</DT>
-<DD>eventually allow on GNU/Linux to get and set ACLs.</DD>
-<DT>zlib and zlib-devel</DT>
-<DD>eventually allow zisofs and gzip compression.</DD>
 </DL>
 </P>
 
 <P>
-This program has been tested on GNU/Linux, FreeBSD, and Solaris systems.<BR>
+<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>
+</DD>
+</P>
+
+<P>
+This program system has been tested on Intel/AMD Linux systems only.<BR>
 For ports to other usable systems <A HREF="#contact">contact us</A>.
 </P>
 
@@ -93,52 +86,36 @@ 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, DVD, BD are fixely integrated.
+ISO 9660 formatter and burner for CD or DVD 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 and vice versa.
+Copies files from filesystem into the ISO image.
 </LI>
 <LI>
-Changes file properties, renames or deletes file objects in the ISO image.
+Renames or deletes file objects in the ISO image.
+</LI>
+<LI>
+Changes file properties in the ISO image.
 </LI>
 <LI>
 Updates ISO subtrees incrementally to match given disk subtrees.
 </LI>
 <LI>
-Can record and restore hard link relations, ACL, and xattr.
+Can write result as completely new image to optical media or
+filesystem objects.
 </LI>
 <LI>
-Can attach MD5 checksums to each data file and the whole session.
+Can write result as add-on session to appendable multi-session media,
+to overwriteable media, to regular files, and to block devices.
 </LI>
 <LI>
-File content may get zisofs or gzip compressed or filtered by external
+Scans for optical drives, blanks re-useable optical media.
-processes.
 </LI>
 <LI>
-Writes result as completely new image or as add-on session
+Suitable for: CD-R, CD-RW, DVD-R, DVD-RW, DVD+R, DVD+R/DL, DVD+RW, DVD-RAM.
-to optical media or filesystem objects.
-</LI>
-<LI>
-Can activate ISOLINUX boot images by El Torito boot record.
-</LI>
-<LI>
-Can perform multi-session tasks as emulation of mkisofs and cdrecord.
-</LI>
-<LI>
-Can issue commands to mount older sessions on GNU/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.
@@ -146,6 +123,9 @@ 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>
@@ -153,14 +133,8 @@ Provides navigation commands for interactive ISO image manipulation.
 <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
@@ -177,9 +151,8 @@ 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>Make re-usable media writable again, delete any ISO 9660 image:</DT>
-eventually prepare yet unused BD-RE:</DT>
+<DD>$<KBD>&nbsp;xorriso -outdev /dev/sr0 -blank fast -eject all</KBD></DD>
-<DD>$<KBD>&nbsp;xorriso -outdev /dev/sr0 -blank as_needed -eject all</KBD></DD>
 
 <DT>
 <HR>
@@ -189,7 +162,7 @@ eventually prepare yet unused BD-RE:</DT>
 <DD>$<KBD>&nbsp;xorriso -dev /dev/sr0 -add /home/me/sounds /home/me/pictures
 </KBD></DD>
 
-<DT>Have a look at the result:</DT>
+<DT>Check the result:</DT>
 <DD>$<KBD>&nbsp;xorriso -indev /dev/sr0 -du / -- -toc 2>&amp;1 | less</KBD></DD>
 
 <DT>
@@ -201,17 +174,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;cd /home/me</KBD></DD>
+<DD>$<KBD>&nbsp;xorriso -outdev /dev/sr0 -blank fast -pathspecs on \</KBD></DD>
-<DD>$<KBD>&nbsp;xorriso -outdev /dev/sr0 -blank as_needed \</KBD></DD>
+<DD><KBD>&nbsp;&nbsp;-add /sounds=/home/me/sounds \</KBD></DD>
-<DD><KBD>&nbsp;&nbsp;-map /home/me/sounds /sounds \</KBD></DD>
+<DD><KBD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-<DD><KBD>&nbsp;&nbsp;-map /home/me/pictures /pictures \</KBD></DD>
+/pictures=/home/me/pictures -- \</KBD></DD>
 <DD><KBD>&nbsp;&nbsp;-rm_r /sounds/indecent '/pictures/*private*' -- \</KBD></DD>
-<DD><KBD>&nbsp;&nbsp;-cd / \</KBD></DD>
+<DD><KBD>&nbsp;&nbsp;-add /pictures/private/horses=/home/me/pictures/private/horses -- \</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>
@@ -222,14 +195,15 @@ 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 \</KBD></DD>
+<DD>$<KBD>&nbsp;xorriso -dev /dev/sr0 -pathspecs on \</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;-map /home/me/prepared_for_dvd/sounds_dummy /sounds \</KBD></DD>
+<DD><KBD>&nbsp;&nbsp;-add /sounds=/home/me/prepared_for_dvd/sounds_dummy \</KBD></DD>
-<DD><KBD>&nbsp;&nbsp;-map /home/me/prepared_for_dvd/movies /movies \</KBD></DD>
+<DD><KBD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; /movies=/home/me/prepared_for_dvd/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>
@@ -251,21 +225,14 @@ Important: -indev and -outdev have to be different drives.
 </DT>
 
 <DT>Dialog mode accepts one or more options per line. An option and all its
-arguments have to be given in one single line. Backslash may be used to mark
+arguments have to be given in one single line. Command -end stops the program
-a line as incomplete so it gets continued by the next input line.
+run. It will write eventually pending changes to media, if that has not
-<BR>
+already been done by a previous -commit.</DT>
-Command -end stops the program 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</B></KBD></DD>
+<DD><KBD><B>-dev /dev/sr0 -pathspecs on</B></KBD></DD>
 <DD><KBD>enter option and arguments :</KBD></DD>
-<DD><KBD><B>-map /home/me/prepared_for_dvd/sounds_dummy /sounds</B></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>enter option and arguments :</KBD></DD>
-<DD><KBD><B>-map /home/me/prepared_for_dvd/movies \</B></KBD></DD>
-<DD><KBD>Trailing backslash  : Enter rest of line (or @@@ to clear it) :
-</KBD></DD>
-<DD><KBD><B> /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>
@@ -277,145 +244,28 @@ to media, if that has not already been done by a previous -commit.</DT>
 <HR>
 </DT>
 
-<DT>The following command performs incremental backup.
+<DT>The following command can be run on blank media to create a complete
-It can be run on blank media to create a copy of the mentioned disk
+copy of the mentioned disk directory trees, and it can be run on appendable
-directory trees, and it can be run on appendable media to perform a
+media to perform a minimal set of change operations which update the
-minimal set of change operations which update the old ISO copies
+old ISO copies to match the new disk trees. On CD-R[W], DVD-R[W] and DVD+R
-to match the new disk trees.
+older states can be retrieved by help of mount option "session=".
-Older states can be retrieved by help of mount options like "sbsector="
+So this constitutes true incremental backup.
-or by help of xorriso option -mount.
+On overwriteable media only the newest state is accessible.
-<BR>
-Eventual ACL, xattr and hardlink relations will be recorded. MD5 checksums
-will be computed and recorded. Data comparison will be avoided by accelerator
-option -disk_dev_ino. After writing, the new session will be checked
-by its recorded MD5.
-<BR>
-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 -for_backup -disk_dev_ino on \</KBD></DD>
+<DD>$<KBD>&nbsp;xorriso -dev /dev/sr0 \</KBD></DD>
-<DD><KBD>&nbsp;&nbsp; -assert_volid 'PROJECTS_MAIL_*' FATAL \</KBD></DD>
+<DD><KBD>&nbsp;&nbsp; -update_r /home/thomas/open_source_projects /open_source_projects \</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/projects /projects \</KBD></DD>
 <DD><KBD>&nbsp;&nbsp; -update_r /home/thomas/personal_mail /personal_mail \</KBD></DD>
-<DD><KBD>&nbsp;&nbsp; -commit -toc -check_md5 FAILURE -- -eject all</KBD></DD>
+<DD><KBD>&nbsp;&nbsp; -commit_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; -hardlinks perform_update \</KBD></DD>
-<DD>
-<KBD>&nbsp;&nbsp; -find / -type f -pending_data -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.
+output will be redirected to stderr in this case.</DT>
-Examples for consumers are cdrecord or growisofs on operating systems
-where xorriso cannot operate the burner drive directly,
-or a ssh pipe to another system which has the desired drive
-and a suitable burn program.</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>
@@ -428,6 +278,9 @@ files or trees to disk:
 <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>
@@ -435,14 +288,8 @@ files or trees to disk:
 <P>
 <DL>
 <DT><H3>Download as source code (see README):</H3></DT>
-<DD><A HREF="xorriso-0.5.0.tar.gz">xorriso-0.5.0.tar.gz</A>
+<DD><A HREF="xorriso-0.1.4.pl00.tar.gz">xorriso-0.1.4.pl00.tar.gz</A>
-(1370 KB).
+(955 KB).
-<DD>(Released 22 Feb 2010)</DD>
-</DD>
-<DD>
-Also on <A HREF="http://www.gnu.org/prep/ftp.html">
-mirrors of ftp://ftp.gnu.org/gnu/ </A>
-as xorriso/xorriso-0.5.0.tar.gz
 </DD>
 </DL>
 </DD>
@@ -455,14 +302,12 @@ as xorriso/xorriso-0.5.0.tar.gz
 <A NAME="contact"></A>
 <DL><DT>Contact:</DT>
 <DD>Thomas Schmitt, <A HREF="mailto:scdbackup@gmx.net">scdbackup@gmx.net</A></DD>
-<DD>GNU xorriso support mailing list,
+<DD>libburn development mailing list,
-<A HREF="mailto:bug-xorriso@gnu.org">bug-xorriso@gnu.org</A></DD>
-<DD>libburnia development mailing list,
 <A HREF="mailto:libburn-hackers@pykix.org">libburn-hackers@pykix.org</A></DD>
 </DL>
 <DL><DT>License:</DT>
-<DD><A HREF="COPYING_xorriso">GPL version 3 or later.</A>
+<DD><A HREF="COPYING_xorriso">GPL version 2</A>,
-</DD>
+an <A HREF="http://www.opensource.org/">Open Source</A> approved license</DD>
 <DD>&nbsp;</DD>
 </DL>
 </P>
@@ -470,110 +315,42 @@ as xorriso/xorriso-0.5.0.tar.gz
 <HR>
 
 <P>
-Bug fixes towards xorriso-0.4.8.pl00:
+Enhancements towards previous stable version xorriso-0.1.2.pl00:
 <UL>
-<LI>
+<LI>Coordination of -cut_out, -compare and -update</LI>
-Regression in libisofs introduced with xorriso-0.4.2:
+<LI>New option -split_size, automated splitting of oversized files</LI>
--boot_image isolinux patch could lead to SIGSEGV
+<LI>Improved performance with reading directory trees</LI>
-</LI>
+<LI>New option -session_log</LI>
-<LI>
+<LI>Dynamically linkable with release version 0.6.4 of libisofs</LI>
-On FreeBSD: xorriso could leave the drive tray locked
-</LI>
-<LI>
-On FreeBSD: Piped input was falsely attributed a small fixed size
-</LI>
-<LI>
-xorriso -update_r could lead to SIGSEGV if applied to a data file
-</LI>
-<!--
-<LI>- none -</LI>
--->
 </UL>
-</P>
+Bug fixes towards xorriso-0.1.2.pl00:
-
-<!--
-<P>
-Bug fixes towards xorriso-0.4.8.pl00:
 <UL>
-<LI>
+<LI>-as mkisofs -no-pad was misspelled -nopad</LI>
-</LI>
+<LI>Implicite directory attribute copying with -cut_out was wrong</LI>
-</UL>
-</P>
--->
-
-<P>
-Enhancements towards previous stable version xorriso-0.4.8.pl00:
-<UL>
-<LI>Transition of documentation and program messages towards GNU xorriso</LI>
-<LI>
-New option -scsi_log
-</LI>
-<!--
-<LI>- none -</LI>
--->
 </UL>
 </P>
 
 <HR>
 
 <P>
-<H3>
-Libburnia software copies included in GNU xorriso:
-</H3>
 <DL>
-<DT>
+<DT><H3>Development snapshot, version 0.1.5 :</H3></DT>
-GNU xorriso is feature-wise equivalent to the dynamic compilation of
+<DD>Bug fixes towards xorriso-0.1.4.pl00:
-<A HREF="http://libburnia-project.org/"> libburnia </A>
-libraries and libburnia program xorriso.
-It restricts itself to a technical form where the legal commitments of the
-libburnia project and the legal intentions of
-<A HREF="http://www.fsf.org/"> FSF </A> match completely.
-</DT>
-<DD>&nbsp;</DD>
-<DT>libburn-0.7.7</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.29</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.5.0</DT>
-<DD>coordinates libburn and libisofs, emulates multi-session where needed,
-and hosts the original source code of program xorriso.</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.5.1 :</H3></DT>
-<DD>Bug fixes towards xorriso-0.5.0:
 <UL>
 <LI>- none yet -</LI>
-<!-- 
+<!-- <LI>- none yet -</LI> -->
- -->
 </UL>
 </DD>
-<DD>Enhancements towards stable version 0.5.0:
+<DD>Enhancements towards stable version 0.1.4.pl00:
 <UL>
-
 <LI>- none yet -</LI>
-<!-- 
+<!-- <LI>- none yet -</LI> -->
- -->
 </UL>
 </DD>
 <DD>&nbsp;</DD>
-<DD><A HREF="README_xorriso_devel">README 0.5.1</A>
+<DD><A HREF="README_xorriso_devel">README 0.1.5</A>
-<DD><A HREF="xorriso_help_devel">xorriso_0.5.1 -help</A></DD>
+<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.5.1)</A></DD>
+<DD><A HREF="man_1_xorriso_devel.html">man xorriso (as of 0.1.5)</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
@@ -583,8 +360,8 @@ libburnia libraries.
 installation see README)
 </DD>
 <DD>
-<A HREF="xorriso-0.5.1.tar.gz">xorriso-0.5.1.tar.gz</A>
+<A HREF="xorriso-0.1.5.tar.gz">xorriso-0.1.5.tar.gz</A>
-(1370 KB).
+(960 KB).
 </DD>
 <DT>A dynamically linked development version of xorriso can be obtained
 from repositories of
@@ -599,21 +376,20 @@ 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:
+<DD>Download: <KBD><B>bzr branch lp:libisofs</B></KBD></DD>
-<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>
-<DT>Build of SVN versions needs <A HREF="http://sources.redhat.com/autobook/">
+<DD>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.
+vanilla tools like make and gcc are needed.</DD>
-</DT>
+</DD>
 <DD>&nbsp;</DD>
+
 </DL>
 </P>
 
@@ -627,48 +403,39 @@ 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>
 
-<P>
+
 <CENTER><FONT SIZE=+0>
-<FONT SIZE=+0>Enjoying free hosting by<BR>
+<!-- <A NAME="bottom" HREF="main_ger.html#bottom">deutsch (german)</A>
-<A HREF="http://www.gnu.org">www.gnu.org</A><BR>
+<BR><BR>
-<A HREF="http://www.webframe.org">www.webframe.org</A><BR>
+ -->
-<A HREF="http://sourceforge.net">sourceforge.net</A><BR>
+<BR><BR>
-
+<FONT SIZE=+0>Enjoying free Open Source hosting by <A HREF="http://www.webframe.org">www.webframe.org</A><BR>
-Enjoying a FreeBSD shell account with the opportunity to
+<A HREF="http://www.webframe.org">
-build, install and test xorriso at<BR>
+<IMG SRC="msfree.gif" ALT="100 % Microsoft free" BORDER=0></A><BR>
-<A HREF="http://www.en.free-shells.com.ar">free-shells.com.ar</A>
+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> -->
 </FONT></CENTER>
-</P>
-
 <HR>
 <DL>
-<DT>Links to related free software projects of Thomas Schmitt:</DT>
+<DT>Links to my other published software projects :</DT>
 <DD><A HREF=http://scdbackup.webframe.org/cdrskin_eng.html>
 cdrskin, a cdrecord emulator</A></DD>
 <DD><A HREF=http://scdbackup.webframe.org/main_eng.html>
-scdbackup, multi volume CD/DVD/BD backup</A></DD>
+scdbackup, multi volume CD backup</A></DD>
 <DL><DD><A HREF=http://scdbackup.sourceforge.net/main_eng.html> 
 (a second source of above)</A></DD></DL>
+<DD><A HREF=http://stic.sourceforge.net>Some Tools for Image Collectors</A></DD>
+<DD><A HREF=http://scdbackup.webframe.org/pppoem>
+pppoem, a DSL throughput monitor (mainly for Linux kernel 2.4)</A></DD>
 </DL>
-<BR>
-Legal statement: This website does not serve any commercial purpose.
 <BR><BR>
-Copyright &copy; 2008 - 2010 Thomas Schmitt.
+Legal statement: This website does not serve any commercial purpose.<BR>
-<BR>
+<BR><BR>
-This text is freely distributable. It shall only be modified in sync with
-the factual properties of xorriso and its public storage locations.
-If you make use of the license to derive modified versions of xorriso
-then you are entitled to modify this text under that same license.
-<DL>
-<DT>Contact for issues of this web page or the described program:</DT>
-<DD>Thomas Schmitt, <A HREF="mailto:scdbackup@gmx.net">scdbackup@gmx.net</A></DD>
-<DD>GNU xorriso support mailing list,
-<A HREF="mailto:bug-xorriso@gnu.org">bug-xorriso@gnu.org</A></DD>
-<DD>libburnia development mailing list,
-<A HREF="mailto:libburn-hackers@pykix.org">libburn-hackers@pykix.org</A></DD>
-</DL>
 </FONT>
 </BODY>
 </HTML>

xorriso/xorriso_makefile_am.txt

@@ -1,11 +1,4 @@
-
+pkgconfigdir=$(libdir)/pkgconfig
-# Copyright (c) 2007 - 2010 Thomas Schmitt <scdbackup@gmx.net>
-# Provided under GPL version 2 or later.
-
-# ts A90315 : LIBBURNIA_PKGCONFDIR is defined OS specific in acinclude.m4
-# was: pkgconfigdir=$(libdir)/pkgconfig
-pkgconfigdir=$(LIBBURNIA_PKGCONFDIR)
-
 libincludedir=
 
 lib_LTLIBRARIES =
@@ -23,26 +16,9 @@ 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 \
+xorriso_xorriso_CFLAGS = -DXorriso_standalonE -DXorriso_with_maiN -DXorriso_with_regeX $(READLINE_DEF)
-                         $(READLINE_DEF) $(LIBACL_DEF) $(XATTR_DEF) \
-                         $(EXTF_DEF) $(EXTF_SUID_DEF) $(ZLIB_DEF) \
-                         $(LIBCDIO_DEF) \
-                         $(XORRISO_DVD_OBS_64K) $(LIBBURN_O_DIRECT_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 = \
 	\
@@ -52,7 +28,6 @@ xorriso_xorriso_SOURCES = \
 	xorriso/xorrisoburn.h \
 	xorriso/xorrisoburn.c \
 	xorriso/xorriso_timestamp.h \
-	xorriso/xorriso_buildstamp.h \
 	\
 	libisoburn/libisoburn.h \
 	libisoburn/isoburn.h \
@@ -61,9 +36,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 \
@@ -75,6 +50,7 @@ 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 \
@@ -93,7 +69,6 @@ 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 \
@@ -106,34 +81,26 @@ xorriso_xorriso_SOURCES = \
         libisofs/find.c \
         libisofs/filter.h \
         libisofs/filter.c \
-        libisofs/filters/external.c \
+        libisofs/filters/xor_encrypt.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 \
-	libisofs/md5.h \
-	libisofs/md5.c \
 	\
 	libburn/async.c \
 	libburn/async.h \
 	libburn/back_hacks.h \
 	libburn/cleanup.c \
 	libburn/cleanup.h \
+	libburn/crc.c \
 	libburn/crc.h \
 	libburn/debug.c \
 	libburn/debug.h \
 	libburn/drive.c \
 	libburn/drive.h \
-	libburn/ecma130ab.c \
-	libburn/ecma130ab.h \
 	libburn/error.h \
 	libburn/file.c \
 	libburn/file.h \
 	libburn/init.c \
 	libburn/init.h \
+	libburn/lec.c \
+	libburn/lec.h \
 	libburn/libburn.h \
 	libburn/libdax_audioxtr.h \
 	libburn/libdax_audioxtr.c \
@@ -170,8 +137,6 @@ xorriso_xorriso_SOURCES = \
 	\
 	version.h
 
-# Disabled because unneeded and of unclear ancestry
-#	libburn/crc.c 
 
 noinst_PROGRAMS = \
 	test/compare_file
@@ -186,30 +151,6 @@ 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
@@ -228,8 +169,8 @@ indent: $(indent_files)
 ## ========================================================================= ##
 
 # Extra things
-# nodist_pkgconfig_DATA = \
+nodist_pkgconfig_DATA = \
-#	xorriso.pc
+	xorriso.pc
 
 man_MANS = xorriso/xorriso.1
 
@@ -243,19 +184,6 @@ EXTRA_DIST = \
 	COPYING \
 	INSTALL \
 	xorriso/changelog.txt \
-	xorriso/xorriso_buildstamp_none.h \
+	$(man_MANS)
-	$(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-libcdio.h \
-	libburn/os-linux.h \
-	libburn/sg-dummy.c \
-	libburn/sg-freebsd.c \
-	libburn/sg-libcdio.c \
-	libburn/sg-linux.c

xorriso/xorriso_timestamp.h

@@ -1 +1 @@
-#define Xorriso_timestamP "2010.02.22.213001"
+#define Xorriso_timestamP "2008.04.28.120001"

xorriso/xorrisoburn.h

@@ -4,9 +4,9 @@
    a command line oriented batch and dialog tool which creates, loads,
    manipulates and burns ISO 9660 filesystem images.
 
-   Copyright 2007-2010 Thomas Schmitt, <scdbackup@gmx.net>
+   Copyright 2007-2008 Thomas Schmitt, <scdbackup@gmx.net>
 
-   Provided under GPL version 2 or later.
+   Provided under GPL version 2.
 
    This file contains the inner isofs- and burn-library interface of xorriso.
 */
@@ -14,17 +14,14 @@
 #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  5
+#define xorriso_libisoburn_req_minor  1
-#define xorriso_libisoburn_req_micro  0
+#define xorriso_libisoburn_req_micro  4
-
-
-struct SpotlisT;          /* List of intervals with different read qualities */
-struct CheckmediajoB;     /* Parameters for Xorriso_check_media() */
-
 
 int Xorriso_startup_libraries(struct XorrisO *xorriso, int flag);
 
@@ -57,52 +54,17 @@ 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,
                              int *media_space, int *free_space, int flag);
 
-/* @param flag bit0=fast , bit1=deformat
-   @return 0=failure, did not touch media , -1=failure, altered media
-           1=success, altered media       ,  2=success, did not touch media
-*/
 int Xorriso_blank_media(struct XorrisO *xorriso, int flag);
 
-/* @param flag bit0= try to achieve faster formatting
+int Xorriso_format_media(struct XorrisO *xorriso, int flag);
-               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, off_t size, int flag);
-
-/* @return <=0 error, 1 success
-*/
-int Xorriso_list_formats(struct XorrisO *xorriso, int flag);
-
-/* @param flag bit1= obtain outdrive, else indrive
-   @return <=0 error, 1 success
-*/
-int Xorriso_list_profiles(struct XorrisO *xorriso, int flag);
-
-/* @param flag bit2= formatting rather than blanking
-   @return 0=failure, did not touch media , -1=failure, altered media
-           1=success, altered media       ,  2=success, did not touch media
-*/ 
-int Xorriso_blank_as_needed(struct XorrisO *xorriso, int flag);
-
 
 /* @param boss_iter  Opaque internal handle. Use NULL outside xorrisoburn.c :
                If not NULL then this is an iterator suitable for
@@ -187,12 +149,6 @@ int Xorriso_findi(struct XorrisO *xorriso, struct FindjoB *job,
                   void *dir_node_generic, char *dir_path,
                   struct stat *dir_stbuf, int depth, int flag);
 
-/* @param flag bit0= do not dive into trees
-               bit1= do not perform job->action on resulting node array
-*/
-int Xorriso_findi_sorted(struct XorrisO *xorriso, struct FindjoB *job,
-                         off_t boss_mem, int filec, char **filev, int flag);
-
 /* @param flag bit0= do not mark image as changed */
 int Xorriso_set_volid(struct XorrisO *xorriso, char *volid, int flag);
 
@@ -202,9 +158,7 @@ int Xorriso_set_abort_severity(struct XorrisO *xorriso, int flag);
 
 int Xorriso_report_lib_versions(struct XorrisO *xorriso, int flag);
 
-/* @return 0= stbuf content is valid ,
+/* @return 0= stbuf content is valid , -1 = path not found */
-          -1 = path not found , -2 = severe error occured
-*/
 int Xorriso_iso_lstat(struct XorrisO *xorriso, char *path, struct stat *stbuf,
                       int flag);
 
@@ -213,13 +167,7 @@ int Xorriso_iso_lstat(struct XorrisO *xorriso, char *path, struct stat *stbuf,
 */
 int Xorriso_atip(struct XorrisO *xorriso, int flag);
 
-/* @param write_start_address  is valid if >=0 
+int Xorriso_burn_track(struct XorrisO *xorriso, char *track_source, int flag);
-   @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
@@ -227,11 +175,12 @@ int Xorriso_burn_track(struct XorrisO *xorriso, off_t write_start_address,
 int Xorriso_get_profile(struct XorrisO *xorriso, int *profile_number,
                         char profile_name[80], int flag);
 
-/* @param flag bit0= node_pt is a valid ISO object handle, ignore pathname
+/* @param flag bit0= do not mark image as changed */
-               bit1= dig out the most original stream for reading
+int Xorriso_set_publisher(struct XorrisO *xorriso, char *name, int flag);
-*/
+
+
 int Xorriso_iso_file_open(struct XorrisO *xorriso, char *pathname,
-                          void *node_pt, void **stream, int flag);
+                          void **stream, int flag);
 
 int Xorriso_iso_file_read(struct XorrisO *xorriso, void *stream, char *buf,
                           int count, int flag);
@@ -246,9 +195,6 @@ 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
@@ -258,246 +204,5 @@ 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);
-
-int Xorriso_destroy_node_array(struct XorrisO *xorriso, int flag);
-
-int Xorriso_destroy_hln_array(struct XorrisO *xorriso, int flag);
-
-int Xorriso_destroy_di_array(struct XorrisO *xorriso, int flag);
-
-int Xorriso_new_node_array(struct XorrisO *xorriso, off_t mem_limit,
-                           int addon_nodes, int flag);
-
-int Xorriso_sort_node_array(struct XorrisO *xorriso, int flag);
-
-int Xorriso_new_hln_array(struct XorrisO *xorriso, off_t mem_limit, int flag);
-
-/* @param flag bit0= allocate xorriso->node_targets too
-*/
-int Xorriso_restore_node_array(struct XorrisO *xorriso, int flag);
-
-int Xorriso_check_md5(struct XorrisO *xorriso, void *in_node, char *path,
-                      int flag);
-
-int Xorriso_check_session_md5(struct XorrisO *xorriso, char *severity,
-                              int flag);
-
-int Xorriso_image_has_md5(struct XorrisO *xorriso, int flag);
-
-
-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);
-
-/* @param flag bit0= overwrite existing di_array (else return 2)
-*/
-int Xorriso_make_di_array(struct XorrisO *xorriso, int flag);
-
-/* @param flag bit0= overwrite existing hln_array (else return 2)
-*/
-int Xorriso_make_hln_array(struct XorrisO *xorriso, int flag);
-
-/*
-   @param flag      bit2= -follow: this is not a command parameter
-   @return -1= severe error
-            0= not applicable for hard links
-            1= go on with processing
-            2= iso_rr_path is fully updated
-*/
-int Xorriso_hardlink_update(struct XorrisO *xorriso, int *compare_result,
-                            char *disk_path, char *iso_rr_path, int flag);
-
-int Xorriso_finish_hl_update(struct XorrisO *xorriso, int flag);
-
-int Xorriso_get_md5(struct XorrisO *xorriso, void *in_node, char *path,
-                    char md5[16], int flag);
-
-int Xorriso_make_md5(struct XorrisO *xorriso, void *in_node, char *path,
-                     int flag);
-
-int Xorriso_md5_start(struct XorrisO *xorriso, void **ctx, int flag);
-
-int Xorriso_md5_compute(struct XorrisO *xorriso, void *ctx,
-                        char *data, int datalen, int flag);
-
-int Xorriso_md5_end(struct XorrisO *xorriso, void **ctx, char md5[16],
-                    int flag);
-
-/* @param flag bit0=input drive
-               bit1=output drive
-*/
-int Xorriso_drive_snooze(struct XorrisO *xorriso, int flag);
-
-int Xorriso_is_plain_image_file(struct XorrisO *xorriso, void *in_node,
-                                char *path, int flag);
-
-int Xorriso_pvd_info(struct XorrisO *xorriso, int flag);
-
-/* @param flag bit0= do not set hln_change_pending */
-int Xorriso_set_change_pending(struct XorrisO *xorriso, int flag);
-
-/* @param flag bit0= enable SCSI command logging to stderr */
-int Xorriso_scsi_log(struct XorrisO *xorriso, 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 */