Promoted branch to tag

COPYRIGHT

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

Makefile.am

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

README

@@ -4,12 +4,13 @@
 libisoburn. By Vreixo Formoso <metalpain2002@yahoo.es> 
             and Thomas Schmitt <scdbackup@gmx.net>
 Integrated sub project of libburnia-project.org.
-Copyright (C) 2006-2008 Vreixo Formoso, Thomas Schmitt.
+http://files.libburnia-project.org/releases/libisoburn-0.3.2.pl00.tar.gz
+Copyright (C) 2006-2009 Vreixo Formoso, Thomas Schmitt.
 Provided under GPL version 2.
 ------------------------------------------------------------------------------
 
 libisoburn is a frontend for libraries libburn and libisofs which enables
-creation and expansion of ISO-9660 filesystems on all CD/DVD media supported
+creation and expansion of ISO-9660 filesystems on all CD/DVD/BD media supported
 by libburn. This includes media like DVD+RW, which do not support multi-session
 management on media level and even plain disk files or block devices.
 
@@ -17,7 +18,8 @@ The price for that is thorough specialization on data files in ISO-9660
 filesystem images. So libisoburn is not suitable for audio (CD-DA) or any
 other CD layout which does not entirely consist of ISO-9660 sessions.
 
-Currently it is only supported on Linux with kernels >= 2.4.
+Currently it is supported on Linux with kernels >= 2.4 and on FreeBSD versions
+with ATAPI/CAM support enabled in the kernel, see atapicam(4).
 
 By using this software you agree to the disclaimer at the end of this text:
 "... without even the implied warranty ..."
@@ -25,18 +27,18 @@ By using this software you agree to the disclaimer at the end of this text:
 
                    Compilation, First Glimpse, Installation
 
-Dynamic library and compile time header requirements for libisoburn-0.1.7 :
-- libburn.so.4  , version libburn-0.4.8 or higher
-- libisofs.so.6 , version libisofs-0.6.4 or higher
+Dynamic library and compile time header requirements for libisoburn-0.3.2 :
+- libburn.so.4  , version libburn-0.6.0 or higher
+- libisofs.so.6 , version libisofs-0.6.12 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.
 
-Obtain libisoburn-0.1.7.tar.gz, take it to a directory of your choice
+Obtain libisoburn-0.3.2.pl00.tar.gz, take it to a directory of your choice
 and do:
 
-    tar xzf libisoburn-0.1.7.tar.gz
-    cd libisoburn-0.1.7
+    tar xzf libisoburn-0.3.2.pl00.tar.gz
+    cd libisoburn-0.3.2
 
 Within that directory execute:
 
@@ -56,16 +58,27 @@ as well as
 
                               xorriso
 
-libisoburn includes a command line and dialog application named xorriso,
+libisoburn comes with a command line and dialog application named xorriso,
 which offers a substantial part of libisoburn features to shell scripts and
 users. Its file xorriso/README describes a standalone tarball as first
-preference for xorriso installation.
+preference for statically linked xorriso installation.
 The libisoburn installation described above produces a dynamically linked
 xorriso binary depending on libburn.so, libisofs.so, libisoburn.so.
 
 After installation documentation is available via
     man xorriso
 
+Several alias links point to the xorriso binary:
+    xorrisofs  starts xorriso with -as mkisofs emulation already enabled
+    xorrecord  starts xorriso with -as cdrecord emulation already enabled
+    osirrox    starts with -osirrox image-to-disk copying already enabled
+
+By default xorriso will depend on libreadline if the readline-dev headers
+are present. This dependcy can be avoided by running
+    ./configure --prefix=/usr --disable-libreadline
+    make clean ; make
+Never omit the "make clean" command after switching libreadline enabling.
+
 
                        Drives and Disk File Objects 
 
@@ -103,7 +116,7 @@ on disk. It uses the normal POSIX filesystem calls, i.e. no libburnia stuff.
 This program is not installed systemwide but stays in the installation
 directory of the xorriso tarball as  test/compare_file . Usually it is
 run as -exec payload of a find command. It demands at least three arguments:
-The path of the first file to compare, the prefix1 to be cut off from path
+The path of the file to compare, the prefix1 to be cut off from path
 and the prefix2 which gets prepended afterwards to obtain the path of the
 second file to compare.
 As further argument there can be -no_ctime which suppresses the comparison
@@ -143,7 +156,7 @@ libburnia-project.org
 By Mario Danic           <mario.danic@gmail.com>,
    Vreixo Formoso        <metalpain2002@yahoo.es>
    Thomas Schmitt        <scdbackup@gmx.net>
-Copyright (C) 2006-2008 Mario Danic, Vreixo Formoso, Thomas Schmitt.
+Copyright (C) 2006-2009 Mario Danic, Vreixo Formoso, Thomas Schmitt.
 
 libburnia-project.org is inspired by and in other components still containing
 parts of old

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([libisoburn], [0.1.7], [http://libburnia-project.org])
+AC_INIT([libisoburn], [0.3.2], [http://libburnia-project.org])
 AC_PREREQ([2.50])
 dnl AC_CONFIG_HEADER([config.h])	
 
@@ -8,20 +8,20 @@ AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([subdir-objects])
 
 dnl Hint: Search list for version code aspects:
-dnl       /AC_INT(
+dnl       /AC_INIT(
 dnl       /ISOBURN_.*_VERSION
 dnl       /LT_.*
 dnl       /LIB.*_REQUIRED
 
-dnl The API version codes are now defined in libisoburn/libisoburn.h
+dnl The API version codes are defined in libisoburn/libisoburn.h
 dnl #define  isoburn_header_version_*
 dnl configure.ac only rules the libtool revision numbering about
 dnl LT_CURREN, LT_AGE, LT_REVISION where SONAME becomes LT_CURRENT - LT_AGE
 dnl 
 dnl These three are only copies to provide libtool with unused LT_RELEASE
 ISOBURN_MAJOR_VERSION=0
-ISOBURN_MINOR_VERSION=1
-ISOBURN_MICRO_VERSION=7
+ISOBURN_MINOR_VERSION=3
+ISOBURN_MICRO_VERSION=2
 dnl ISOBURN_VERSION=$ISOBURN_MAJOR_VERSION.$ISOBURN_MINOR_VERSION.$ISOBURN_MICRO_VERSION
  
 AC_SUBST(ISOBURN_MAJOR_VERSION)
@@ -33,15 +33,16 @@ dnl Libtool versioning
 dnl Generate libisoburn.so.1.x.y
 dnl SONAME will become LT_CURRENT - LT_AGE
 dnl 
-dnl ts A80517
-dnl ### This is the release version 0.1.6 = libisoburn.so.1.5.0
-dnl This is the development version after above stable release
+dnl ts A90105
+dnl This is the release version 0.3.2 = libisoburn.so.1.21.0
+dnl ### This is the development version after above stable release
 dnl LT_CURRENT++, LT_AGE++ have not happened happened yet.
+dnl ### LT_CURRENT++, LT_AGE++ has happened meanwhile.
 dnl
-dnl SONAME = 6 - 5 = 1 . Library name = libburn.so.1.5.0
+dnl SONAME = 22 - 21 = 1 . Library name = libisoburn.so.1.21.0
 LT_RELEASE=$ISOBURN_MAJOR_VERSION.$ISOBURN_MINOR_VERSION
-LT_CURRENT=6
-LT_AGE=5
+LT_CURRENT=22
+LT_AGE=21
 LT_REVISION=0
 LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
 
@@ -85,22 +86,28 @@ AC_SUBST(ARCH)
 AC_SUBST(LIBBURN_ARCH_LIBS)
 
 
+AC_ARG_ENABLE(libreadline,
+[  --enable-libreadline    Enable use of libreadline by xorriso, default=yes],
+               , enable_libreadline=yes)
+if test x$enable_libreadline = xyes; then
 dnl Check whether there is readline-devel and readline-runtime.
 dnl If not, erase this macro which would enable use of readline(),add_history()
-READLINE_DEF="-DXorriso_with_readlinE"
+    READLINE_DEF="-DXorriso_with_readlinE"
 dnl The empty yes case obviously causes -lreadline to be linked
-AC_CHECK_HEADER(readline/readline.h, AC_CHECK_LIB(readline, readline, , READLINE_DEF= ), READLINE_DEF= )
+    AC_CHECK_HEADER(readline/readline.h, AC_CHECK_LIB(readline, readline, , READLINE_DEF= ), READLINE_DEF= )
 dnl The X= in the yes case prevents that -lreadline gets linked twice
-AC_CHECK_HEADER(readline/history.h, AC_CHECK_LIB(readline, add_history, X= , READLINE_DEF= ), READLINE_DEF= )
+    AC_CHECK_HEADER(readline/history.h, AC_CHECK_LIB(readline, add_history, X= , READLINE_DEF= ), READLINE_DEF= )
+else
+    READLINE_DEF=
+fi
 AC_SUBST(READLINE_DEF)
 
-
 AC_CHECK_HEADER(libburn/libburn.h)
 AC_CHECK_HEADER(libisofs/libisofs.h)
 
 dnl Check for proper library versions
-LIBBURN_REQUIRED=0.4.8
-LIBISOFS_REQUIRED=0.6.6
+LIBBURN_REQUIRED=0.6.0
+LIBISOFS_REQUIRED=0.6.12
 PKG_CHECK_MODULES(LIBBURN, libburn-1 >= $LIBBURN_REQUIRED)
 PKG_CHECK_MODULES(LIBISOFS, libisofs-1 >= $LIBISOFS_REQUIRED)
 

doc/comments

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

doc/doxygen.conf.in

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

doc/susp_aaip_0_2.txt

@@ -0,0 +1,328 @@
+
+
+                 Arbitrary Attribute Interchange Protocol
+
+                             Draft version 0.2
+                                Dec 19 2008
+
+                Interchange of Persistent File Attributes
+
+          by Thomas Schmitt    - mailto:scdbackup@gmx.net
+          Libburnia project    - mailto:libburn-hackers@pykix.org
+
+
+AAIP is intended as companion of the Rock Ridge Interchange Protocol RRIP
+which under the general design of System Use Sharing Protocol SUSP extends
+ISO 9660 aka ECMA-119 filesystem semantics to match POSIX needs.
+
+Goal is to have for each file an arbitrary number of attributes which consist
+of two components (Name and Value) of arbitrary length and to have a compact
+representation of ACLs.
+
+This document describes a SUSP field with adjustable name (Signature Word).
+The name is defined in an ER field of which the content form is described here.
+Recommended is to use the name "AA" which collides neither with SUSP 1.12 nor
+with RRIP 1.12.
+The field has been designed to be as similar to the RRIP field SL as possible.
+
+Since the size of a SUSP field is limited to 255, multiple fields may be
+needed to describe one component. The CE mechanism of SUSP shall be used to
+address enough storage if needed.
+
+-------------------------------------------------------------------------------
+
+System Entries Provided by this Specification
+
+* AA (or another name which does not disturb other co-existing SUSP protocols)
+
+Description of the "AA" System Use Entry
+
+The field has exactly the same layout as RRIP field SL. One has to expect
+more data bytes than with SL, though, and any of the 256 possible byte values. 
+The reader shall be prepared to detect and handle oversized data.
+
+One or more AA fields form the Attribute List of a file object with
+a pare number of components. Each two consequtive components form a pair of
+Name and Value. The empty name is reserved for a compact representation of
+ALCs. The meaning of any other name is not specified by this document.
+
+All AA fields except the last one shall have the CONTINUE flag set. An AA
+field with CONTINUE set to 0 indicates the end of the Attribute List.
+
+The format of the "AA" System Use Field is as follows:
+
+  [1] "BP 1 to BP 2 - Signature Word" shall be (41)(41) ("AA") resp. the word
+      that is defined in the ER field. See below.
+
+  [2] "BP 3 - Length" shall specify as an 8-bit number the length in bytes of
+      the "AA" entry recorded according to ISO 9660:7.1.1.
+
+  [3] "BP 4 - System Use Entry Version" shall be 1 as in ISO 9660:7.1.1.
+
+  [4] "BP 5 - Flags" shall contain bit field flags numbered 0 to 7 starting
+      with the least significant bit as follows:
+        0   CONTINUE  This AA field continues in the next AA field.
+      All other bits shall be set to 0.
+
+  [5] "BP 6 to Length - Component Area" shall contain Component Records
+      as described below.
+
+  | 'A' | 'A' | LENGTH | 1 | FLAGS | COMPONENT AREA |
+  
+
+Within "AA" fields each component (Name or Value) shall be recorded as one
+or more component records. If a component does not fit into the remaining
+space of an AA field then it shall be continued in following AA fields.
+
+All Component Records of a component except the last one shall have the
+CONTINUE flag set. A Component Record with CONTINUE set to 0 indicates the end
+of the component. An eventually following Component Record starts the next
+component.
+
+-------------------------------------------------------------------------------
+
+The Component Record format is identical to the one of the SL field.
+The complete form of the following summary can be found in RRIP 1.12 "4.1.3.1".
+In case of discrepancies, RRIP 1.12 is the decisive specification.
+
+Component Records shall be recorded contiguously within each Component Area,
+starting in the first byte of the Component Area. The last Component Record
+in the Component Area of an "AA" System Use Entry may be continued in the
+Component Area of the next recorded "AA" System Use Entry in the same
+System Use Area.
+
+Each Component Record shall have the following format:
+
+  [A] "BP 1 - Component Flags" shall contain bit field flags numbered 0 to 7,
+      starting with the least significant bit, as follows:
+        0   CONTINUE  This Component Record continues in the next
+                      AA Component Record.
+      The following bits are defined but may not be set if the Component
+      Record shall carry payload. (Their use case is unclear yet.)
+        1   CURRENT   This Component Record refers to the current
+                      directory.
+        2   PARENT    This Component Record refers to the parent of
+                      the current directory.
+        3   ROOT      This Component Record refers to root directory.
+
+        all others are RESERVED and shall be 0.
+
+      No more than one of "AA" Component Flag Bits 0-3 shall be set to ONE.
+
+  [B] "BP 2 - Component Length (LEN_CP)" shall specify as an 8-bit number the
+      number of component bytes in the Component Record. This length shall not
+      include the first two bytes of the Component Record.
+      If any of the bit positions 1-3 is set, the value of this field shall be
+      set to ZERO and no Component Content shall be recorded.
+      This field shall be recorded according to ISO 9660 Format section 7.1.1.
+
+  [C] "BP 3 to 2 + LEN_CP - Component Content" shall contain the component
+      bytes in the Component Record.
+
+  | COMPONENT FLAGS | LEN_CP | COMPONENT BYTES |
+
+
+Example: Two pairs of "name"="long...content" and "one"="more" encoded as
+         two AA fields
+
+  Field 1 contains the Component Record of Name and one Component Record of
+  Value :
+  { 'A', 'A', 255,   1,   1,
+      0,   4, 'n', 'a', 'm', 'e',
+      1, 255, 'l', 'o', 'n', 'g', ... 238 more bytes, 13 go to next AA ... }
+  Field 2 contains the rest of "long...content" and the complete second pair.
+  It marks the end of the Attribute List :
+  { 'A', 'A',  38,   1,   0,
+              ... 13 remaining bytes of the Component Record in first field ...
+      0,   7, 'c', 'o', 'n', 't', 'e', 'n', 't',
+      0,   3, 'o', 'n', 'e',
+      0,   4, 'm', 'o', 'r', 'e' }
+
+-------------------------------------------------------------------------------
+
+Specification of binary ACL representation as special Arbitrary Attribute
+
+The Name component of a binary ACL shall be of length 0.
+
+The Value shall be an arbitrary number of ACL Entries:
+
+  [a] "BP 1 - Entry Flags" shall contain bit field flags numbered 0 to 7,
+      starting with the least significant bit, as follows:
+        0   EXEC      indicates that this entry grants execute permission
+        1   WRITE                                      write permission
+        2   READ                                       read permission
+        3   QUALIFIER indicates that one or more Qualifier Records follow
+        4 - 7  TYPE
+               shall contain the tag type of the ACL entry as four bit code:
+                 0  TRANSLATE      entry for a global map of name to numeric id
+                 1  ACL_USER_OBJ   permissions of owning user (as of PX field)
+                 2  ACL_USER       of arbitrary user, with name as qualifier
+                 3  ACL_GROUP_OBJ  permissions of owning group (as of PX field)
+                 4  ACL_GROUP      of arbitrary group, with name as qualifier
+                 5  ACL_MASK       restricts 2, 3, and 4 via logical AND
+                 6  ACL_OTHER      permissions of non-listed, non-owning users
+                 8  SWITCH_MARK    switch from "access" ACL to "default" ACL
+                10  ACL_USER_N     like 2, with numeric user id as qualifier
+                12  ACL_GROUP_N    like 4, with numeric group id as qualifier
+                15  FUTURE_VERSION  will indicate that this document
+                                    does not apply to the entry.
+                The other values are reserved. Readers shall ignore them if
+                they are not aware of updates of this document which would
+                assign a meaning to them.
+
+If any of ACL_USER_OBJ, ACL_GROUP_OBJ, ACL_OTHER are missing then the settings
+from the PX field shall get into effect. If they exist then they shall override
+the PX field.
+
+A numeric qualifier is a binary number of variable length. The Most Significant
+Byte comes first. The number shall be the "POSIX File User ID" resp.
+"POSIX File Group ID" as also used in RRIP PX fields. The ids of owning user
+and owning group shall be taken from the PX field of the file object.
+
+Optional TRANSLATE entries may associate user or group names with numeric
+ids to allow the reading system to remap the numeric ids. See below.
+The writer is not obliged to write them and the reader is not obliged to
+interpret them.
+
+The ACL entries belong to the "access" ACL of a file object. An optional
+SWITCH_MARK entry may direct further entries to the "default" ACL which
+is defined for directory objects. The switching is controlled by the EXEC bit.
+        0  "access" ACL
+        1  "default" ACL
+The bits for WRITE, READ, QUALIFIER shall be 0 with SWITCH_MARK.
+
+The eventually needed qualifier is stored in one or more Qualifier Records.
+
+  [b] "BP 2 - Qualifier Record Head" shall be present only if QUALIFIER is set
+      to 1. It shall give the number of Qualifier Bytes and eventually
+      indicate that the qualifier continues in a Qualifier Record which comes
+      imediately after this record.
+          0 to 127   Q_LENGTH, the qualifier is complete by this record
+        128 to 255   Q_LENGTH+128, the qualifier is continued by next record
+      So a Qualifier Record can contain at most 127 Qualifier Bytes.
+      This field shall be recorded according to ISO 9660 Format section 7.1.1.
+
+  [c] "BP 3 to BP 2 + Q_LENGTH - Qualifier Bytes" shall be present only if
+      QUALIFIER is set to 1 and hold the announced number of bytes of the
+      user or group name.
+
+  | ENTRY FLAGS [ | QUALIFIER HEAD | QUALIFIER BYTES | ]
+
+ 
+Example: From man 5 acl:  u::rw-,u:lisa:rw-,g::r--,g:toolies:rw-,m::r--,o::r--
+  { 'A', 'A',  28,   1,   0,
+      0,   0,
+      0,  19,  0x16,
+               0x2E,   4, 'l', 'i', 's', 'a',
+               0x34,
+               0x4E,   7, 't', 'o', 'o', 'l', 'i', 'e', 's',
+               0x54,
+               0x64 }
+
+Example: An entry with very long qualifier  u:His_Excellency_..._the_Boss:r--
+               0x2C, 255, 'H', 'i', 's', '_', 'E', 'x', 'c', 'e', 'l', 'e',
+                          ... 117 more bytes ...,
+                       8, 't', 'h', 'e', '_', 'B', 'o', 's', 's', 
+
+Example: User number 71 in numerical form gets rwx
+               0xAF,   1,  71,
+         Group number 65534 gets r-x
+               0xCD,   2, 255, 254,
+
+
+-------------------------------------------------------------------------------
+
+About Names and Numeric Identifiers
+         
+It makes an important difference whether qualifiers are represented as names
+or as id numbers. By storing names (and usually wasting space) it is possible
+to control permissions in a way that is portable between uncoordinated
+computers as long as the human readable user/group names are present on both
+sides. POSIX File ID numbers make most sense in backups which shall be read
+by the same system which wrote it.
+Rock Ridge can only record POSIX File Ids but not user or group names.
+
+The entry flag value 0x08 TRANSLATE is not a ACL entry of the hosting object
+but rather a global hint about the relation of roles, names and numeric ids.
+If it is recorded at all, then it shall be recorded with the first Directory
+Entry of the volume's root directory. According to the description of SUSP
+field ER, this has to be "dot" or (00). Other than with ER, a TRANSLATE entry
+may not appear in the root of directory sub trees.
+
+An interested reader shall examine the Arbitrary Attributes of this Directory
+Entry in order to collect a translation table.
+The advised translation is: PX or AA Id number -> name -> local id number.
+
+The Qualifier Bytes of a TRANSLATE entry shall have the following format:
+
+  [i] "BP 0 - Role" shall tell whether it is about a user name (role 0) or
+      a group name (role 1). Other values are not allowed.
+
+ [ii] "BP 1 to BP 8 - Numeric Id" shall hold the 32 bit POSIX Id number of the
+      entry. This field shall be recorded according to ISO 9660:7.3.3.
+
+[iii] "BP 9 to End Of Qualifier - Name" shall hold the name bytes of this
+      entry.
+
+  | ROLE | NUMERIC ID | NAME |
+
+Example: User id number 1001 gets associated with user name "lisa"
+
+               0x08,   13,   0,   233,3,0,0,   0,0,3,233, 'l', 'i', 's', 'a',
+
+
+-------------------------------------------------------------------------------
+
+Specification of the ER System Use Entry Values for AAIP:
+
+The Extension Version number for this version of AAIP shall be 1.
+
+The Extension Identifier field shall be "AAIP_0002" with Identifier Length 9.
+
+The mandatory content form of the Extension Descriptor is 
+"AA PROVIDES VIA AAIP 0.2 SUPPORT FOR ARBITRARY FILE ATTRIBUTES IN ISO 9660 IMAGES"
+with possibly two letters other than "AA" at the start of the string.
+The Description Length is 81.
+
+The reader of AAIP shall take the actual name of the AA field from BP 19 and
+BP 20 of the ER field.
+
+The recommended content of the Extension Source is
+"PLEASE CONTACT THE LIBBURNIA PROJECT VIA LIBBURNIA-PROJECT.ORG".
+The corresponding Source Length is 62.
+
+
+-------------------------------------------------------------------------------
+
+Model Relations:
+
+  Attribute List ------------- [1:0..1] ------------- ACL 
+  [1:0..n]                                            [1:0..n]
+  Arbitrary Attribute ( [1:0..1] ACL )                Entry
+  [1:2..2n]                                           [1:0..1]
+  Component  ( [1..m:1..n] AA Field )                 Qualifier
+  [1:1..n]                                            <<  one of >> 
+  Component Record                                  /       \       \
+  [1..m:1..n]                          Translation Entry , Name , Numeric Id
+  AA Field                                        |          |        |
+                                               [1:1..n]   [1:1..n]   [1:1]
+                                                    \        |       /
+                                                      Qualifier Record
+
+-------------------------------------------------------------------------------
+Revoked drafts:
+
+There was a draft AAIP 0.0 with ER signature "AAIP_2008A". It did not resemble
+the existing field SL and therefore shall not be used by writers of ISO images.
+
+-------------------------------------------------------------------------------
+References:
+
+ECMA-119  http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-119.pdf
+
+SUSP 1.12 ftp://ftp.ymi.com/pub/rockridge/susp112.ps
+
+RRIP 1.12 ftp://ftp.ymi.com/pub/rockridge/rrip112.ps
+(especially field SL)
+
+

libisoburn/burn_wrap.c

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

libisoburn/data_source.c

@@ -1,7 +1,8 @@
 /*
   data source for libisoburn.
 
-  Copyright 2007 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
+  Copyright 2007 - 2009 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
+                    and Thomas Schmitt <scdbackup@gmx.net>
 */
 
 #include <stdlib.h>
@@ -84,6 +85,19 @@ int ds_read_block(IsoDataSource *src, uint32_t lba, uint8_t *buffer)
 
  icd = (struct isoburn_cached_drive *) src->data;
  d = (struct burn_drive*) icd->drive;
+
+ if(d == NULL) {
+   /* This would happen if libisoburn saw output data in the fifo and
+      performed early drive release and afterwards libisofs still tries
+      to read data.
+      That would constitute a bad conceptual problem in libisoburn.
+   */
+   isoburn_msgs_submit(NULL, 0x00060000,
+     "Programming error: Drive released while libisofs still attempts to read",
+     0, "FATAL", 0);
+   return ISO_ASSERT_FAILURE;
+ }
+
  tiles = (struct isoburn_cache_tile *) icd->tiles;
 
  aligned_lba= lba & ~(Libisoburn_tile_blockS - 1);
@@ -133,6 +147,10 @@ int ds_read_block(IsoDataSource *src, uint32_t lba, uint8_t *buffer)
      return 1;
    tiles[oldest].last_error_lba = lba;
 
+#ifdef ISO_DATA_SOURCE_MISHAP
+   ret= ISO_DATA_SOURCE_MISHAP;
+#else
+   /* <<< pre libisofs-0.6.7 */
    /* It is not required by the specs of libisofs but implicitely assumed
       ...
       But it is not possible to ignore FAILURE.
@@ -145,10 +163,12 @@ int ds_read_block(IsoDataSource *src, uint32_t lba, uint8_t *buffer)
       enough to make it appear plausible.
    */
    ret= ISO_FILE_CANT_WRITE;
+#endif
+
    if(ret >= 0)
      ret = -1;
    sprintf(msg, "ds_read_block(%lu) returns %d", (unsigned long) lba, ret);
-   burn_msgs_submit(0x00060000, msg, 0, "DEBUG", NULL);
+   isoburn_msgs_submit(NULL, 0x00060000, msg, 0, "DEBUG", 0);
    return ret; 
  }
 
@@ -188,6 +208,19 @@ static void ds_free_data(IsoDataSource *src)
  src->data= NULL;
 }
 
+
+int isoburn_data_source_shutdown(IsoDataSource *src, int flag)
+{
+ struct isoburn_cached_drive *icd;
+
+ if(src==NULL)
+   return(0);
+ icd= (struct isoburn_cached_drive *) src->data;
+ icd->drive= NULL;
+ return(1);
+}
+
+
 IsoDataSource *isoburn_data_source_new(struct burn_drive *d)
 {
  IsoDataSource *ret;

libisoburn/isoburn.c

@@ -6,7 +6,7 @@
 /*
   Class core of libisoburn.
 
-  Copyright 2007 - 2008 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
+  Copyright 2007 - 2009 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
                         Thomas Schmitt <scdbackup@gmx.net>
 */
 
@@ -37,10 +37,16 @@
 
 #include "isoburn.h"
 
-/* No more: version numbers out of configure.ac
-   major.minor.micro now comes from libisoburn.h
-#include "../version.h"
+
+/* Default values for application provided msgs_submit methods.
+   To be attached to newly aquired drives.
 */
+int (*libisoburn_default_msgs_submit)
+    (void *handle, int error_code, char msg_text[],
+                 int os_errno, char severity[], int flag)= NULL;
+void *libisoburn_default_msgs_submit_handle= NULL;
+int libisoburn_default_msgs_submit_flag= 0;
+
 
 /* ----------------------- isoburn_toc_entry  ---------------------- */
 
@@ -53,9 +59,9 @@ int isoburn_toc_entry_new(struct isoburn_toc_entry **objpt,
  *objpt= o= (struct isoburn_toc_entry *)
             malloc(sizeof(struct isoburn_toc_entry));
  if(o==NULL) {
-   burn_msgs_submit(0x00060000,
-                    "Cannot allocate memory for isoburn toc entry",
-                    0, "FATAL", NULL);
+   isoburn_msgs_submit(NULL, 0x00060000,
+                       "Cannot allocate memory for isoburn toc entry",
+                       0, "FATAL", 0);
    return(-1);
  }
  o->session= 0;
@@ -104,15 +110,16 @@ int isoburn_new(struct isoburn **objpt, int flag)
 
  *objpt= o= (struct isoburn *) malloc(sizeof(struct isoburn));
  if(o==NULL) {
-   burn_msgs_submit(0x00060000,
-                    "Cannot allocate memory for isoburn control object",
-                    0, "FATAL", NULL);
+   isoburn_msgs_submit(NULL, 0x00060000,
+                       "Cannot allocate memory for isoburn control object",
+                       0, "FATAL", 0);
    return(-1);
  }
 
  o->drive= NULL;
  o->emulation_mode= 0;
  o->fabricated_msc1= -1;
+ o->fabricated_msc2= -1;
  o->zero_nwa= Libisoburn_overwriteable_starT;
  o->min_start_byte= o->zero_nwa * 2048;
  o->nwa= o->zero_nwa;
@@ -124,8 +131,12 @@ int isoburn_new(struct isoburn **objpt, int flag)
  for(i=0;i<Libisoburn_target_head_sizE;i++)
    o->target_iso_head[i]= 0;
  o->image= NULL;
+ o->iso_data_source= NULL;
  o->read_pacifier= NULL;
  o->read_pacifier_handle= NULL;
+ o->msgs_submit= NULL;
+ o->msgs_submit_handle= NULL;
+ o->msgs_submit_flag= 0;
  o->prev= NULL;
  o->next= NULL;
  ret= iso_image_new("ISOIMAGE", &o->image);
@@ -166,7 +177,8 @@ int isoburn_destroy(struct isoburn **objpt, int flag)
    isoburn_toc_entry_destroy(&(o->toc), 1); /* all */
  if(o->iso_source!=NULL)
    burn_source_free(o->iso_source);
-
+ if(o->iso_data_source!=NULL)
+   iso_data_source_unref(o->iso_data_source);
  free((char *) o);
  *objpt= NULL;
  return(1);
@@ -300,10 +312,39 @@ int isoburn_find_by_drive(struct isoburn **pt, struct burn_drive *d, int flag)
 }
 
 
+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,
                              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;
@@ -311,7 +352,18 @@ int isoburn_prepare_disc_aux(struct burn_drive *in_d, struct burn_drive *out_d,
  struct isoburn *in_o, *out_o;
  IsoWriteOpts *wopts= NULL;
  enum burn_disc_status state;
- int ret, fifo_chunks, lba, nwa;
+ int ret, fifo_chunks, lba, nwa, i, new_img, early_indev_release;
+ size_t buffer_size= 0, buffer_free= 0;
+ char msg[160];
+
+ new_img= flag&1;
+ early_indev_release= flag&2;
+ if(new_img && early_indev_release) {
+   isoburn_msgs_submit(in_o, 0x00060000,
+      "Programming error: Wrong session setup: new_img && early_indev_release",
+                       0, "FATAL", 0);
+   {ret= -4; goto ex;}
+ }
 
  ret= isoburn_find_emulator(&in_o, in_d, 0);
  if(ret<0 || in_o==NULL)
@@ -325,14 +377,14 @@ int isoburn_prepare_disc_aux(struct burn_drive *in_d, struct burn_drive *out_d,
  state = isoburn_disc_get_status(in_d);
  if (state != BURN_DISC_BLANK && state != BURN_DISC_APPENDABLE &&
      state != BURN_DISC_FULL) {
-   burn_msgs_submit(0x00060000, "Unsuitable source media state",
-                    0, "FAILURE", NULL);
+   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) {
-   burn_msgs_submit(0x00060000, "Unsuitable target media state",
-                    0, "FAILURE", NULL);
+   isoburn_msgs_submit(out_o, 0x00060000, "Unsuitable target media state",
+                    0, "FAILURE", 0);
    {ret= -2; goto ex;}
  }
  
@@ -361,6 +413,9 @@ 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_sort_files(wopts, opts->sort_files);
  iso_write_opts_set_replace_mode(wopts, opts->replace_dir_mode,
                 opts->replace_file_mode, opts->replace_uid, opts->replace_gid);
@@ -370,22 +425,16 @@ int isoburn_prepare_disc_aux(struct burn_drive *in_d, struct burn_drive *out_d,
  iso_write_opts_set_default_gid(wopts, opts->gid);
  iso_write_opts_set_output_charset(wopts, opts->output_charset);
  iso_write_opts_set_fifo_size(wopts, fifo_chunks);
- 
 
  ret = isoburn_disc_track_lba_nwa(out_d, NULL, 0, &lba, &nwa);
+ opts->effective_lba= nwa;
+ ret= isoburn_get_msc2(out_o, NULL, &nwa, 0);
  if (ret != 1) {
-   burn_msgs_submit(0x00060000, "Cannot determine next writeable address", 0,
-                    "FAILURE", NULL);
+   isoburn_msgs_submit(out_o, 0x00060000,
+                   "Cannot determine next writeable address", 0, "FAILURE", 0);
    {ret= -3; goto ex;}
  }
- if (nwa == 0 && state == BURN_DISC_APPENDABLE) {
-   burn_msgs_submit(0x00060000,
-                    "Encountered 0 as next writeable address of appendable",
-                    0, "FAILURE", NULL);
-   {ret= -4; goto ex;}
- }
  iso_write_opts_set_ms_block(wopts, nwa);
- opts->effective_lba= nwa;
  iso_write_opts_set_appendable(wopts, !new_img);
  iso_write_opts_set_overwrite_buf(wopts,
                                   nwa>0 ? out_o->target_iso_head : NULL);
@@ -395,6 +444,30 @@ int isoburn_prepare_disc_aux(struct burn_drive *in_d, struct burn_drive *out_d,
    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);
+ }
  
  /* TODO check return values for failure. propertly clean-up on error */
 
@@ -436,29 +509,34 @@ int isoburn_prepare_new_image(struct burn_drive *d, struct burn_disc **disc,
  ret= isoburn_prepare_disc_aux(d, out_drive, disc, opts, 1);
  if (ret<=0)
    return ret;
-
-#ifdef NIX
- struct isoburn *in_o, *out_o;
-
- /* 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 /* NIX */
-
  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
@@ -544,8 +622,8 @@ int isoburn_ropt_new(struct isoburn_read_opts **new_o, int flag)
 
  o= (*new_o)= calloc(1, sizeof(struct isoburn_read_opts));
  if(o==NULL) {
-   burn_msgs_submit(0x00060000, "Cannot allocate memory for read options",
-                    0, "FATAL", NULL);
+   isoburn_msgs_submit(NULL, 0x00060000,
+                     "Cannot allocate memory for read options", 0, "FATAL", 0);
    return(-1);
  }
  o->norock= 0;
@@ -681,9 +759,9 @@ int isoburn_igopt_new(struct isoburn_imgen_opts **new_o, int flag)
 
  o= (*new_o)= calloc(1, sizeof(struct isoburn_imgen_opts));
  if(o==NULL) {
-   burn_msgs_submit(0x00060000,
-                    "Cannot allocate memory for image generation options",
-                    0, "FATAL", NULL);
+   isoburn_msgs_submit(NULL, 0x00060000,
+                       "Cannot allocate memory for image generation options",
+                       0, "FATAL", 0);
    return(-1);
  }
  o->level= 2;
@@ -698,6 +776,9 @@ 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->sort_files= 0;
  o->replace_dir_mode= 0;
  o->replace_file_mode= 0;
@@ -707,7 +788,7 @@ int isoburn_igopt_new(struct isoburn_imgen_opts **new_o, int flag)
  o->file_mode= 0444;
  o->uid= 0;
  o->gid= 0;
- o->output_charset= 0;
+ o->output_charset= NULL;
  o->fifo_size= 4*1024*1024;
  o->effective_lba= -1;
  return(1);
@@ -764,6 +845,9 @@ 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);
  return(1);
 }
 

libisoburn/isoburn.h

@@ -60,9 +60,17 @@ struct isoburn {
  */
  int fabricated_msc1;
 
+ /* If >= 0, this address is used in isoburn_disc_track_lba_nwa()
+    as reply parameter nwa.
+    (The other nwa parameters below apply only to the effective write address
+     on random access media. msc2 is handed to libisofs but not to libburn.)
+ */
+ int fabricated_msc2;
+ 
+
  /* The nwa to be used for a first session on the present kind of overwriteable
     media (usually Libisoburn_overwriteable_starT, but might be forced to 0)
-  */
+ */
  int zero_nwa;
 
  /* Start address as given by image examination (bytes, not blocks) */
@@ -71,6 +79,7 @@ struct isoburn {
  /* Aligned start address to be used for processing (counted in blocks) */
  int nwa;
 
+
  /* Truncate to .nwa an eventual regular file serving as output drive */
  int truncate;
 
@@ -99,6 +108,10 @@ struct isoburn {
  /* Libisofs image context */
  IsoImage *image;
 
+ /* The block data source from which the existing image is read.
+ */
+ IsoDataSource *iso_data_source;
+
  /* The burn source which transfers data from libisofs to libburn.
     It has its own fifo.
  */
@@ -110,6 +123,12 @@ struct isoburn {
  /* For iso_image_attach_data() */
  void *read_pacifier_handle;
 
+ /* An application provided method to immediately deliver messages */
+ int (*msgs_submit)(void *handle, int error_code, char msg_text[],
+                    int os_errno, char severity[], int flag);
+ void *msgs_submit_handle;  /* specific to application method */
+ int msgs_submit_flag;      /* specific to application method */
+
 };
 
 
@@ -168,6 +187,11 @@ int isoburn_invalidate_iso(struct isoburn *o, int flag);
 int isoburn_find_emulator(struct isoburn **pt,
                           struct burn_drive *drive, int flag);
 
+/* Deliver an event message. Either via a non-NULL o->msgs_submit() method 
+   or via burn_msgs_submit() of libburn.
+*/
+int isoburn_msgs_submit(struct isoburn *o, int error_code, char msg_text[], 
+                        int os_errno, char severity[], int flag);
 
 /** Set the start address for an emulated add-on session. The value will
     be rounded up to the alignment necessary for the media. The aligned
@@ -179,6 +203,19 @@ int isoburn_find_emulator(struct isoburn **pt,
 */
 int isoburn_set_start_byte(struct isoburn *o, off_t value, int flag);
 
+/** Obtains the image address offset to be used with image generation.
+    This is either the (emulated) drive nwa or a value set by
+    isoburn_prepare_blind_grow().
+    In any case this is the address to tell to iso_write_opts_set_ms_block().
+    @param o     The isoburn object to be inquired
+    @param opts  If not NULL: write parameters to be set on drive before query
+    @param msc2  The value to be used with iso_write_opts_set_ms_block()
+    @param flag  unused yet
+    @return <=0 is failure , >0 success
+*/
+int isoburn_get_msc2(struct isoburn *o,
+                     struct burn_write_opts *opts, int *msc2, int flag);
+
 /** Get a data source suitable for read from a drive using burn_read_data()
     function.
     @param d drive to read from. Must be grabbed.
@@ -189,6 +226,19 @@ int isoburn_set_start_byte(struct isoburn *o, off_t value, int flag);
 IsoDataSource *
 isoburn_data_source_new(struct burn_drive *d);
 
+/** Disable read capabilities of a data source which was originally created
+    by isoburn_data_source_new(). After this any attempt to read will yield
+    a FATAL programming error event.
+    This is usually done to allow libburn to release the drive while libisofs
+    still holds a reference to the data source object. libisofs is not supposed
+    to use this object for reading any more, nevertheless. The disabled state
+    of the data source is a safety fence around this daring situation.
+    @param src The data source to be disabled
+    @param flag  unused yet
+    @return <=0 is failure , >0 success
+*/
+int isoburn_data_source_shutdown(IsoDataSource *src, int flag);
+
 
 /**
  * Options for image reading.
@@ -307,6 +357,24 @@ 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;
+
     unsigned int sort_files:1;
                 /**< If files should be sorted based on their weight. */
 
@@ -369,8 +437,10 @@ struct isoburn_imgen_opts {
 
 /* Maximum gap to be bridged during a outer TOC scan. Gaps appear between the
    end of a session and the start of the next session.
+   The longest gap found so far was about 38100 after the first session of a
+   DVD-R.
 */
-#define Libisoburn_toc_scan_max_gaP 8192
+#define Libisoburn_toc_scan_max_gaP 65536
 
 
 /* Creating a chain of image headers which form a TOC:

libisoburn/isofs_wrap.c

@@ -6,7 +6,7 @@
 /*
   libisofs related functions of libisoburn.
 
-  Copyright 2007 - 2008  Vreixo Formoso Lopes <metalpain2002@yahoo.es>
+  Copyright 2007 - 2009  Vreixo Formoso Lopes <metalpain2002@yahoo.es>
                          Thomas Schmitt <scdbackup@gmx.net>
 */
 
@@ -121,18 +121,18 @@ int isoburn_read_image(struct burn_drive *d,
  IsoDataSource *ds= NULL;
  struct isoburn *o= NULL;
 
- if(read_opts==NULL) {
-   burn_msgs_submit(0x00060000,
-                    "Program error: isoburn_read_image: read_opts==NULL",
-                    0, "FATAL", NULL);
-   return(-1);
- }
  if(d != NULL) {
    ret = isoburn_find_emulator(&o, d, 0);
    if (ret < 0 || o == NULL)
      return 0;
    status = isoburn_disc_get_status(d);
  }
+ if(read_opts==NULL) {
+   isoburn_msgs_submit(o, 0x00060000,
+                       "Program error: isoburn_read_image: read_opts==NULL",
+                       0, "FATAL", 0);
+   return(-1);
+ }
  if (d == NULL || status == BURN_DISC_BLANK || read_opts->pretend_blank) {
 create_blank_image:;
    /*
@@ -142,9 +142,9 @@ create_blank_image:;
    if (d == NULL) {
      /* New empty image without relation to a drive */
      if (image==NULL) {
-       burn_msgs_submit(0x00060000,
-                        "Program error: isoburn_read_image: image==NULL",
-                    0, "FATAL", NULL);
+       isoburn_msgs_submit(o, 0x00060000,
+                           "Program error: isoburn_read_image: image==NULL",
+                           0, "FATAL", 0);
        return -1;
      }
      /* create a new image */
@@ -170,9 +170,9 @@ create_blank_image:;
  }
  
  if (status != BURN_DISC_APPENDABLE && status != BURN_DISC_FULL) {
-   burn_msgs_submit(0x00060000,
+   isoburn_msgs_submit(o, 0x00060000,
                     "Program error: isoburn_read_image: incorrect disc status",
-                    0, "FATAL", NULL);
+                    0, "FATAL", 0);
    return -4;	
  }
  
@@ -185,7 +185,7 @@ create_blank_image:;
  ret = isoburn_read_iso_head(d, int_num, &dummy, NULL, 0);
  if (ret <= 0) {
    sprintf(msg, "No ISO 9660 image at LBA %d. Creating blank image.", int_num);
-   burn_msgs_submit(0x00060000, msg, 0, "WARNING", NULL);
+   isoburn_msgs_submit(o, 0x00060000, msg, 0, "WARNING", 0);
    goto create_blank_image;
  }
 
@@ -212,6 +212,9 @@ create_blank_image:;
  */
 
  ds = isoburn_data_source_new(d);
+ if(o->iso_data_source!=NULL)
+   iso_data_source_unref(o->iso_data_source);
+ o->iso_data_source= ds;
  iso_image_attach_data(o->image, o->read_pacifier_handle,
                        isoburn_idle_free_function);
  if(o->read_pacifier_handle==NULL)
@@ -221,7 +224,7 @@ create_blank_image:;
  ret = iso_image_import(o->image, ds, ropts, &features);
  iso_tree_set_report_callback(o->image, NULL);
  iso_read_opts_free(ropts);
- iso_data_source_unref(ds);
+
  if (ret < 0) {
    isoburn_report_iso_error(ret, "Cannot import image", 0, "FAILURE", 0);
    return ret;
@@ -248,15 +251,15 @@ int isoburn_attach_image(struct burn_drive *d, IsoImage *image)
  int ret;
  struct isoburn *o;
 
- if (image == NULL) {
-   burn_msgs_submit(0x00060000,
-                    "Program error: isoburn_attach_image: image==NULL",
-                    0, "FATAL", NULL);
-   return -1;
- }
  ret = isoburn_find_emulator(&o, d, 0);
  if (ret < 0 || o == NULL)
    return 0;
+ if (image == NULL) {
+   isoburn_msgs_submit(o, 0x00060000,
+                       "Program error: isoburn_attach_image: image==NULL",
+                       0, "FATAL", 0);
+   return -1;
+ }
  if(o->image != NULL)
    iso_image_unref(o->image);
  o->image = image;
@@ -277,6 +280,8 @@ int isoburn_activate_session(struct burn_drive *drive)
 
  if (o->emulation_mode != 1)
    return 1; /* don't need to activate session */
+ if (o->fabricated_msc2 >= 0)
+   return 1; /* blind growing: do not alter anything outside the session */
  
  if (!(o->fabricated_disc_status == BURN_DISC_APPENDABLE ||
        (o->fabricated_disc_status == BURN_DISC_BLANK &&
@@ -304,9 +309,9 @@ int isoburn_start_emulation(struct isoburn *o, int flag)
  struct ecma119_pri_vol_desc *pvm;
  
  if(o==NULL) {
-   burn_msgs_submit(0x00060000,
-                    "Program error: isoburn_start_emulation: o==NULL",
-                    0, "FATAL", NULL);
+   isoburn_msgs_submit(NULL, 0x00060000,
+                       "Program error: isoburn_start_emulation: o==NULL",
+                       0, "FATAL", 0);
    return -1;
  }
 

libisoburn/libisoburn.h

@@ -2,7 +2,7 @@
 /*
   API definition of libisoburn.
 
-  Copyright 2007-2008 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
+  Copyright 2007-2009 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
                   and Thomas Schmitt <scdbackup@gmx.net>
 */
 
@@ -75,23 +75,35 @@ job parameters. It rather states its desires which libisoburn tries to
 fulfill, or else will refuse to start the write run.
 
 
-                     Setup for Growing or Modifying
+              Setup for Growing, Modifying or Blind Growing
 
-The connector function family offers two alternative API calls for performing
-the setup for two alternative image generation strategies.
+The connector function family offers alternative API calls for performing
+the setup for several alternative image generation strategies.
 
 Growing:
-If input and output drive is the same, then isoburn_prepare_disc() is to
+If input and output drive are the same, then isoburn_prepare_disc() is to
 be used. It will lead to an add-on session on appendable or overwriteable
 media with existing ISO image. With blank media it will produce a first
 session.
 
 Modifying:
-If the output drive is not the input drive, then it has to bear blank media
-or overwriteable without a valid ISO image. To prepare for such an image
-generation run, use isoburn_prepare_new_image(). The run will copy file data
-from an eventual input drive with valid image, add any newly introduced data
-from the local filesystem, and produce a first session on output media.
+If the output drive is not the input drive, and if it bears blank media
+or overwriteable without a valid ISO image, then one may produce a consolidated
+image with old and new data. This will copy file data from an eventual input
+drive with valid image, add any newly introduced data from the local
+filesystem, and produce a first session on output media.
+To prepare for such an image generation run, use isoburn_prepare_new_image().
+
+Blind Growing:
+This method reads the old image from one drive and writes the add-on session
+to a different drive. That output drive is nevertheless supposed to
+finally lead to the same media from where the session was loaded. Usually it
+will be stdio:/dev/fd/1 (i.e. stdout) being piped into some burn program
+like with this classic gesture:
+  mkisofs -M $dev -C $msc1,$nwa | cdrecord -waiti dev=$dev
+Blind growing is prepared by the call isoburn_prepare_blind_grow().
+The input drive should be released immediately after this call in order
+to allow the consumer of the output stream to access that drive for writing.
 
 After either of these setups, some peripheral libburn drive parameter settings
 like  burn_write_opts_set_simulate(),  burn_write_opts_set_multi(),
@@ -188,15 +200,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  6
+#define isoburn_libisofs_req_micro 12 
 
 /** The minimum version of libburn to be used with this version of libisoburn
     at compile time.
     @since 0.1.0
 */
 #define isoburn_libburn_req_major  0
-#define isoburn_libburn_req_minor  4
-#define isoburn_libburn_req_micro  8
+#define isoburn_libburn_req_minor  6
+#define isoburn_libburn_req_micro  0
 
 
 /** The minimum version of libisofs to be used with this version of libisoburn
@@ -231,8 +243,8 @@ int isoburn_libburn_req(int *major, int *minor, int *micro);
     @since 0.1.0
 */
 #define isoburn_header_version_major  0
-#define isoburn_header_version_minor  1
-#define isoburn_header_version_micro  7
+#define isoburn_header_version_minor  3
+#define isoburn_header_version_micro  2
 /** Note:
     Above version numbers are also recorded in configure.ac because libtool
     wants them as parameters at build time.
@@ -298,6 +310,24 @@ and would leave out the ugly compile time traps.
 */
 
 
+/** Announce to the library an application provided method for immediate
+    delivery of messages. It is used when no drive is affected directly or
+    if the drive has no own msgs_submit() method attached by
+    isoburn_drive_set_msgs_submit.
+    If no method is preset or if the method is set to NULL then libisoburn
+    delivers its messages through the message queue of libburn.
+    @param msgs_submit   The function call which implements the method
+    @param submit_handle Handle to be used as first argument of msgs_submit
+    @param submit_flag   Flag to be used as last argument of msgs_submit
+    @param flag          Unused yet, submit 0
+    @since 0.2.0
+*/
+int isoburn_set_msgs_submit(int (*msgs_submit)(void *handle, int error_code,
+                                                  char msg_text[], int os_errno,
+                                                  char severity[], int flag),
+                               void *submit_handle, int submit_flag, int flag);
+
+
 /** Aquire a target drive by its filesystem path resp. libburn persistent
     address.
     Wrapper for: burn_drive_scan_and_grab()
@@ -306,7 +336,8 @@ and would leave out the ugly compile time traps.
                   (cdrom/burner). Thus use with driveno 0 only. On failure
                   the array has no valid elements at all.
                   The returned array should be freed via burn_drive_info_free()
-                  when the drive is no longer needed.
+                  when the drive is no longer needed. But before this is done
+                  one has to call isoburn_drive_release(drive_infos[0].drive).
     @param adr    The persistent address of the desired drive.
     @param load   1 attempt to load the disc tray. 0 no attempt,rather failure.
     @return       1 = success , 0 = drive not found , <0 = other error
@@ -323,7 +354,8 @@ int isoburn_drive_scan_and_grab(struct burn_drive_info *drive_infos[],
                   (cdrom/burner). Thus use with driveno 0 only. On failure
                   the array has no valid elements at all.
                   The returned array should be freed via burn_drive_info_free()
-                  when the drive is no longer needed.
+                  when the drive is no longer needed. But before this is done
+                  one has to call isoburn_drive_release(drive_infos[0].drive).
     @param adr    The persistent address of the desired drive.
     @param flag   bit0= attempt to load the disc tray.
                         Else: failure if not loaded.
@@ -334,23 +366,43 @@ int isoburn_drive_scan_and_grab(struct burn_drive_info *drive_infos[],
                         table of content by scanning for ISO image headers.
                         (depending on media type and drive this might
                          help or it might make the resulting toc even worse)
+                  bit4= do not emulate table of content on overwriteable media
     @return       1 = success , 0 = drive not found , <0 = other error
 */
 int isoburn_drive_aquire(struct burn_drive_info *drive_infos[],
                                 char* adr, int flag);
 
-
 /** Aquire a drive from the burn_drive_info[] array which was obtained by
     a previous call of burn_drive_scan(). 
     Wrapper for: burn_drive_grab()
     @since 0.1.0
     @param drive The drive to grab. E.g. drive_infos[1].drive .
+                 Call isoburn_drive_release(drive) when it it no longer needed.
     @param load  1 attempt to load the disc tray. 0 no attempt, rather failure.
     @return      1 success, <=0 failure
 */
 int isoburn_drive_grab(struct burn_drive *drive, int load);
 
 
+/** Attach to a drive an application provided method for immediate
+    delivery of messages.
+    If no method is set or if the method is set to NULL then libisoburn
+    delivers messages of the drive through the global msgs_submit() method
+    set by isoburn_set_msgs_submiti() or by the message queue of libburn.
+    @since 0.2.0
+    @param d     The drive to which this function, handle and flag shall apply
+    @param msgs_submit   The function call which implements the method
+    @param submit_handle Handle to be used as first argument of msgs_submit
+    @param submit_flag   Flag to be used as last argument of msgs_submit
+    @param flag          Unused yet, submit 0
+*/
+int isoburn_drive_set_msgs_submit(struct burn_drive *d,
+                            int (*msgs_submit)(void *handle, int error_code,
+                                               char msg_text[], int os_errno,
+                                               char severity[], int flag),
+                            void *submit_handle, int submit_flag, int flag);
+
+
 /** Inquire the media status. Expect the whole spectrum of libburn BURN_DISC_*
     with multi-session media. Emulated states with random access media are
     BURN_DISC_BLANK and BURN_DISC_APPENDABLE.
@@ -385,7 +437,7 @@ int isoburn_disc_erasable(struct burn_drive *d);
 void isoburn_disc_erase(struct burn_drive *drive, int fast);
 
 
-/** Program isoburn_disc_get_msc1() to return a fabricated value.
+/** Set up isoburn_disc_get_msc1() to return a fabricated value.
     This makes only sense between aquiring the drive and reading the
     image. After isoburn_read_image() it will confuse the coordination
     of libisoburn and libisofs.
@@ -401,8 +453,14 @@ void isoburn_disc_erase(struct burn_drive *drive, int fast);
                     3= adr_value itself is the lba to be used
                     4= start lba of last session with volume id
                        given by adr_value
-    @parm adr_value A string describing the value to be eventually used.
-    @param flag Bitfield for control purposes. Unused yet. Submit 0.
+    @param adr_value A string describing the value to be eventually used.
+    @param flag Bitfield for control purposes.
+                bit0= @since 0.2.2
+                      with adr_mode 3: adr_value might be 16 blocks too high
+                      (e.g. -C stemming from growisofs). Probe for ISO head
+                      at adr_value-16 and eventually adjust setting. 
+                bit1= insist in seeing a disc object with at least one session
+                bit2= with adr_mode 4: use adr_value as regular expression
 */
 int isoburn_set_msc1(struct burn_drive *d, int adr_mode, char *adr_value,
                      int flag);
@@ -450,7 +508,8 @@ struct isoburn_toc_disc *isoburn_toc_drive_get_disc(struct burn_drive *d);
 
 
 /** Tell the number of 2048 byte blocks covered by the table of content.
-    Wrapper for: burn_disc_get_sectors()
+    This number includes the eventual gaps between sessions and tracks.
+    So this call is not really a wrapper for burn_disc_get_sectors().
     @since 0.1.6
     @param disc The master handle of the media
     @return number of blocks, <=0 indicates unknown or unreadable state
@@ -501,7 +560,7 @@ struct isoburn_toc_track **isoburn_toc_session_get_tracks(
                                       struct isoburn_toc_session *s, int *num);
 
 
-/** Obtain a copy of the entry which describes a particular itrack.
+/** Obtain a copy of the entry which describes a particular track.
     Wrapper for: burn_track_get_entry()
     @since 0.1.6
     @param s The track handle
@@ -522,7 +581,7 @@ void isoburn_toc_track_get_entry(struct isoburn_toc_track *t,
 void isoburn_toc_disc_free(struct isoburn_toc_disc *disc);
 
 
-/** Try whether at the data at the given address look like a ISO 9660
+/** Try whether the data at the given address look like a ISO 9660
     image header and obtain its alleged size. Depending on the info mode
     one other string of text information can be retrieved too.
     @since 0.1.6
@@ -531,14 +590,50 @@ void isoburn_toc_disc_free(struct isoburn_toc_disc *disc);
     @param image_blocks  The number of 2048 bytes blocks
     @param info  Caller provided memory, enough to take eventual info reply
     @param flag bit0-7: info return mode
-                0= do not return anything in info (do not even touch it)
-                1= return volume id (info needs 33 bytes)
-    @return 1 seems to be a valid ISO image , 0 format not recognized, <0 error
+                 0= do not return anything in info (do not even touch it)
+                 1= copy volume id to info (info needs 33 bytes)
+                 2= @since 0.2.2 :
+                    copy 64 kB header to info (needs 65536 bytes) 
+                bit13= @since 0.2.2:
+                      do not read head from media but use first 64 kB from info
+                bit14= check both half buffers (not only second)
+                       return 2 if found in first block
+                bit15= return-1 on read error
+    @return >0 seems to be a valid ISO image, 0 format not recognized, <0 error
 */
 int isoburn_read_iso_head(struct burn_drive *d, int lba,
                           int *image_blocks, char *info, int flag);
 
 
+/** Try to convert the given entity address into various entity addresses
+    which would describe it.
+    Note: Sessions and tracks are counted beginning with 1, not with 0.
+    @since 0.3.2
+    @param drive The drive where msc1 is to be set
+    @param adr_mode Determines how to interpret the input adr_value.
+                    If adr_value shall represent a number then decimal ASCII
+                    digits are expected.
+                    0= start lba of last session in TOC, ignore adr_value
+                    1= start lba of session number given by adr_value
+                    2= start lba of track given number by adr_value
+                    3= adr_value itself is the lba to be used
+                    4= start lba of last session with volume id
+                       given by adr_value
+    @param adr_value A string describing the value to be eventually used.
+    @param lba       returns the block address of the entity, -1 means invalid
+    @param track     returns the track number of the entity, -1 means invalid
+    @param session   returns the session number of the entity, -1 means invalid
+    @param volid     returns the volume id of the entity if it is a ISO session
+    @param flag      Bitfield for control purposes.
+                     bit2= with adr_mode 4: use adr_value as regular expression
+    @return          <=0 error , 1 ok, ISO session, 2 ok, not an ISO session
+*/
+int isoburn_get_mount_params(struct burn_drive *d,
+                             int adr_mode, char *adr_value,
+                             int *lba, int *track, int *session,
+                             char volid[33], int flag);
+
+
 /* ----------------------------------------------------------------------- */
 /*
 
@@ -781,6 +876,21 @@ 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.
+
     @return 1 success, <=0 failure
 */
 #define isoburn_igopt_omit_version_numbers       1
@@ -791,6 +901,9 @@ 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
 int isoburn_igopt_set_relaxed(struct isoburn_imgen_opts *o, int relax);
 int isoburn_igopt_get_relaxed(struct isoburn_imgen_opts *o, int *relax);
 
@@ -992,9 +1105,13 @@ off_t isoburn_disc_available_space(struct burn_drive *d,
 
 
 /** Obtain the start block number of the most recent session on media. In
-    case of random access media this will always be 0. Succesfull return is
+    case of random access media this will normally be 0. Successfull return is
     not a guarantee that there is a ISO-9660 image at all. The call will fail,
-    nevertheless,if isoburn_disc_get_status() returns not BURN_DISC_APPENDABLE.
+    nevertheless,if isoburn_disc_get_status() returns not BURN_DISC_APPENDABLE
+    or BURN_DISC_FULL.
+    Note: The result of this call may be fabricated by a previous call of
+    isoburn_set_msc1() which can override the rule to load the most recent
+    session.
     Wrapper for: burn_disc_get_msc1()
     @since 0.1.0
     @param d         The drive to inquire
@@ -1032,7 +1149,8 @@ int isoburn_get_min_start_byte(struct burn_drive *d, off_t *start_byte,
                                int flag);
 
 
-/** Create a disc object for writing the new session from the created or loaded
+/** To choose the expansion method of Growing:
+    Create a disc object for writing the new session from the created or loaded
     iso_volset which has been manipulated via libisofs, to the same media from
     where the image was eventually loaded. This struct burn_disc is ready for
     use by a subsequent call to isoburn_disc_write().
@@ -1049,9 +1167,10 @@ int isoburn_prepare_disc(struct burn_drive *drive, struct burn_disc **disc,
                          struct isoburn_imgen_opts *opts);
 
 
-/** Create a disc object for producing a new image from a previous image
+/** To choose the expansion method of Modifying:
+    Create a disc object for producing a new image from a previous image
     plus the changes made by user. The generated burn_disc is suitable
-    to be written to any grabbed libburn drive with blank writeable media.
+    to be written to a grabbed drive with blank writeable media.
     But you must not use the same drive for input and output, because data
     will be read from the source drive while at the same time the target
     drive is already writing.
@@ -1059,15 +1178,11 @@ int isoburn_prepare_disc(struct burn_drive *drive, struct burn_disc **disc,
     is done and the drive is BURN_DRIVE_IDLE again after asynchronous
     burn_disc_write().
     @since 0.1.0
-    @param in_drive The input drive,grabbed with isoburn_drive_scan_and_grab().
+    @param in_drive The input drive, grabbed with isoburn_drive_aquire() or
+                    one of its alternatives.
     @param disc     Returns the newly created burn_disc object.
     @param opts     Options for image generation and data transport to media.
-    @param out_drive The libburn drive which shall be write target.
-                     If the drive was grabbed via libisoburn then it can later
-                     access the libisofs source fifo via
-                     isoburn_get_fifo_status().
-                     Mere libburn drives cannot obtain this info.
-                     In that case out_drive may be NULL, as well.
+    @param out_drive The output drive, from isoburn_drive_aquire() et.al..
     @return <=0 error , 1 = success
 */
 int isoburn_prepare_new_image(struct burn_drive *in_drive,
@@ -1075,11 +1190,55 @@ int isoburn_prepare_new_image(struct burn_drive *in_drive,
                               struct isoburn_imgen_opts *opts,
                               struct burn_drive *out_drive);
 
-/**                                                                @since 0.1.0
-    Revoke isoburn_prepare_new_image() or isoburn_prepare_disc() instead of
-    running isoburn_disc_write().
+
+/** To choose the expansion method of Blind Growing:
+    Create a disc object for writing an add-on session from the created or
+    loaded IsoImage which has been manipulated via libisofs, to a different
+    drive than the one from where it was loaded.
+    Usually output will be stdio:/dev/fd/1 (i.e. stdout) being piped
+    into some burn program like with this classic gesture:
+      mkisofs -M $dev -C $msc1,$nwa | cdrecord -waiti dev=$dev
+    Parameter translation into libisoburn:
+      $dev  is the address by which parameter in_drive of this call was aquired
+      $msc1 was set by isoburn_set_msc1() before image reading
+            or was detected from the in_drive media
+      $nwa  is a parameter of this call
+            or can be used as detected from the in_drive media
+
+    This call waits for libisofs output to become available and then detaches
+    the input drive object from the data source object by which libisofs was
+    reading from the input drive.
+    So, as far as libisofs is concerned, that drive may be released immediately
+    after this call in order to allow the consumer to access the drive for
+    writing.
+    The consumer should wait for input to become available and only then open
+    its burn drive. With cdrecord this is caused by option -waiti.
+  
+    The resulting burn_disc object has to be disposed when all its writing
+    is done and the drive is BURN_DRIVE_IDLE again after asynchronous
+    burn_disc_write().
+    @since 0.2.2
+    @param in_drive The input drive,grabbed with isoburn_drive_scan_and_grab().
+    @param disc     Returns the newly created burn_disc object.
+    @param opts     Options for image generation and data transport to media.
+    @param out_drive The output drive, from isoburn_drive_aquire() et.al..
+                    typically stdio:/dev/fd/1 .
+    @param nwa      The address (2048 byte block count) where the add-on
+                    session will be finally stored on a mountable media
+                    or in a mountable file.
+                    If nwa is -1 then the address is used as determined from
+                    the in_drive media.
+    @return <=0 error , 1 = success
+*/
+int isoburn_prepare_blind_grow(struct burn_drive *d, struct burn_disc **disc,
+                         struct isoburn_imgen_opts *opts,
+                         struct burn_drive *out_drive, int nwa);
+
+
+/**
+    Revoke isoburn_prepare_*() instead of running isoburn_disc_write().
     libisofs reserves resources and maybe already starts generating the
-    image stream when one of above two calls is performed. It is mandatory to
+    image stream when one of above three calls is performed. It is mandatory to
     either run isoburn_disc_write() or to revoke the preparations by the
     call described here.
     @since 0.1.0
@@ -1118,7 +1277,7 @@ void isoburn_disc_write(struct burn_write_opts *o, struct burn_disc *disc);
     Hint: If only burn_write_opts and not burn_drive is known, then the drive
           can be obtained by burn_write_opts_get_drive().
     @since 0.1.0
-    @parm d      The drive to which the track with the fifo gets burned.
+    @param d     The drive to which the track with the fifo gets burned.
     @param size  The total size of the fifo
     @param free_bytes  The current free capacity of the fifo
     @param status_text  Returns a pointer to a constant text, see below
@@ -1157,8 +1316,7 @@ int isoburn_drive_wrote_well(struct burn_drive *d);
 int isoburn_activate_session(struct burn_drive *drive);
 
 
-/**                                                                @since 0.1.0
-    Wait after normal end of operations until libisofs ended all write
+/** Wait after normal end of operations until libisofs ended all write
     threads and freed resource reservations.
     This call is not mandatory. But without it, messages from the ending
     threads might appear after the application ended its write procedure.
@@ -1174,21 +1332,6 @@ int isoburn_sync_after_write(struct burn_drive *input_drive,
                              struct burn_drive *output_drive, int flag);
 
 
-#if 0
-/* >>> NOT YET IMPLEMENTED <<< */
-/** Write a new session to a disc.
-    This is a synchronous call equivalent to isoburn_prepare_disc +
-    isoburn_disc_write + isoburn_activate_session
-    @param pacifier_func If not NULL: a function to produce appeasing messages.
-                         See burn_abort_pacifier() in libburn.h for an example.
-*/
-/* TODO implement this */
-int isoburn_perform_write(struct burn_write_opts *o,
-                          int (*pacifier_func)(void *handle, int patience, 
-                                               int elapsed));
-#endif /* 0 */
-
-
 /** Release an aquired drive.
     Wrapper for: burn_drive_release()
     @since 0.1.0

test/aaip-os-freebsd.c

@@ -0,0 +1,283 @@
+
+/*
+
+ aaip-os-freebsd.c
+ Arbitrary Attribute Interchange Protocol , system adapter for getting and
+ setting of ACLs and XFS-style Extended Attributes.
+
+ To be included by aaip_0_2.c
+*/
+
+#include <ctype.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+#include <sys/acl.h>
+
+
+/* ------------------------------ Getters --------------------------------- */
+
+/* Obtain the ACL of the given file in long text form.
+   @param path          Path to the file
+   @param text          Will hold the result. This is a managed object which
+                        finally has to be freed by a call to this function
+                        with bit15 of flag.
+   @param flag          Bitfield for control purposes
+                        bit0=  obtain default ACL rather than access ACL
+                        bit15= free text and return 1
+   @return              > 0 ok
+                        -1  failure of system ACL service (see errno)
+*/
+int aaip_get_acl_text(char *path, char **text, int flag)
+{
+ acl_t acl= NULL;
+
+ if(flag & (1 << 15)) {
+   if(*text != NULL)
+     acl_free(text);
+   *text= NULL;
+   return(1);
+ }
+ *text= NULL;
+
+ /* Note: no ACL_TYPE_DEFAULT in FreeBSD  */
+ if(flag & 1)
+   return(0);
+
+ acl= acl_get_file(path, ACL_TYPE_ACCESS);
+
+ if(acl == NULL)
+   return(-1);
+ *text= acl_to_text(acl, NULL);
+ acl_free(acl);
+ if(*text == NULL)
+   return(-1);
+ return(1);
+}
+
+
+/* Obtain the Extended Attributes and/or the ACLs of the given file in a form
+   that is ready for aaip_encode().
+
+   Note: There are no Extended Attributes in FreeBSD. So only ACL will be
+         obtained.
+
+   @param path          Path to the file
+   @param num_attrs     Will return the number of name-value pairs
+   @param names         Will return an array of pointers to 0-terminated names
+   @param value_lengths Will return an arry with the lenghts of values
+   @param values        Will return an array of pointers to 8-bit values
+   @param flag          Bitfield for control purposes
+                        bit0=  obtain ACL (access and eventually default)
+                        bit1=  use numeric ACL qualifiers rather than names
+                        bit2=  do not encode attributes other than ACL
+                        bit15= free memory of names, value_lengths, values
+   @return              >0  ok
+                        <=0 error
+*/
+int aaip_get_attr_list(char *path, size_t *num_attrs, char ***names,
+                       size_t **value_lengths, char ***values, int flag)
+{
+ int ret, retry= 0;
+ char *list= NULL;
+ ssize_t list_size= 0, i, num_names, value_ret;
+ size_t a_acl_len= 0, d_acl_len= 0, acl_len= 0;
+ unsigned char *a_acl= NULL, *d_acl= NULL, *acl= NULL;
+ char *acl_text= NULL;
+
+ if(flag & (1 << 15)) { /* Free memory */
+   if(*names != NULL)
+     list= (*names)[0];
+   {ret= 1; goto ex;}
+ }
+
+ *num_attrs= 0;
+ *names= NULL;
+ *value_lengths= NULL;
+ *values= NULL;
+
+ if(flag & 1)
+   num_names++;
+ if(num_names == 0)
+   {ret= 1; goto ex;}
+ (*names)= calloc(num_names, sizeof(char *));
+ (*value_lengths)= calloc(num_names, sizeof(size_t));
+ (*values)= calloc(num_names, sizeof(char *));
+ if(*names == NULL || *value_lengths == NULL || *values == NULL)
+   {ret= -1; goto ex;}
+
+ for(i= *num_attrs; i < num_names; i++)
+   (*names)[i]= NULL;
+ for(i= 0; i < num_names; i++) {
+   (*values)[i]= NULL;
+   (*value_lengths)[i]= 0;
+ }
+
+ if(flag & 1) { /* Obtain ACL */
+   /* access-ACL */
+   ret= aaip_get_acl_text(path, &acl_text, 0);
+   if(ret <= 0)
+     goto ex;
+   ret= aaip_encode_acl(acl_text, &a_acl_len, &a_acl, flag & 2);
+   if(ret <= 0)
+     goto ex;
+   aaip_get_acl_text("", &acl_text, 1 << 15); /* free */
+   
+   /* Note: There are no default-ACL in FreeBSD */
+
+   /* Set as attribute with empty name */;
+   (*names)[*num_attrs]= strdup("");
+   if((*names)[*num_attrs] == NULL)
+     {ret= -1; goto ex;}
+   (*values)[*num_attrs]= (char *) acl;
+   (*value_lengths)[*num_attrs]= acl_len;
+   (*num_attrs)++;
+ }
+
+ ret= 1;
+ex:;
+ if(a_acl != NULL)
+   free(a_acl);
+ if(d_acl != NULL)
+   free(d_acl);
+ if(acl_text != NULL)
+   aaip_get_acl_text("", &acl_text, 1 << 15); /* free */
+
+ if(ret <= 0 || (flag & (1 << 15))) {
+   if(list != NULL)
+     free(list);
+   if(*names != NULL)
+     free(*names);
+   *names= NULL;
+   if(*value_lengths != NULL)
+     free(*value_lengths);
+   *value_lengths= NULL;
+   if(*values != NULL) {
+     for(i= 0; i < *num_attrs; i++)
+       free((*values)[i]);
+     free(*values);
+   }
+   if(acl != NULL)
+     free(acl);
+   *values= NULL;
+   *num_attrs= 0;
+ }
+ return(ret);
+}
+
+
+/* ------------------------------ Setters --------------------------------- */
+
+
+/* Set the ACL of the given file to a given list in long text form.
+   @param path          Path to the file
+   @param text          The input text (0 terminated, ACL long text form)
+   @param flag          Bitfield for control purposes
+                        bit0=  set default ACL rather than access ACL
+   @return              > 0 ok
+                        -1  failure of system ACL service (see errno)
+*/
+int aaip_set_acl_text(char *path, char *text, int flag)
+{
+ int ret;
+ acl_t acl= NULL;
+
+ acl= acl_from_text(text);
+ if(acl == NULL) {
+   ret= -1; goto ex;
+ }
+
+ /* Note: no ACL_TYPE_DEFAULT in FreeBSD */
+ if(flag & 1)
+   {ret= 0; goto ex;}
+
+ ret= acl_set_file(path, ACL_TYPE_ACCESS, acl);
+
+ if(ret == -1)
+   goto ex;
+ ret= 1;
+ex:
+ if(acl != NULL)
+   acl_free(acl);
+ return(ret);
+}
+
+
+/* Bring the given attributes and/or ACLs into effect with the given file.
+
+   Note: There are no Extended Attributes in FreeBSD. So only ACL get set.
+
+   @param flag          Bitfield for control purposes
+                        bit0= decode and set ACLs
+                      ( bit1= first clear all existing attributes of the file )
+                      ( bit2= do not set attributes other than ACLs )
+   @return              1 success
+                       -1 error memory allocation
+                       -2 error with decoding of ACL
+                       -3 error with setting ACL
+                     ( -4 error with setting attribute )
+                     ( -5 error with deleting attribute )
+                       
+*/
+int aaip_set_attr_list(char *path, size_t num_attrs, char **names,
+                       size_t *value_lengths, char **values, int flag)
+{
+ int ret, has_default_acl= 0;
+ size_t i, consumed, acl_text_fill, list_size= 0;
+ char *acl_text= NULL, *list= NULL;
+
+ for(i= 0; i < num_attrs; i++) {
+   if(names[i] == NULL || values[i] == NULL)
+ continue;
+   if(names[i][0] == 0) { /* Decode ACLs */
+     /* access ACL */
+     ret= aaip_decode_acl((unsigned char *) values[i], value_lengths[i],
+                          &consumed, NULL, 0, &acl_text_fill, 1);
+     if(ret <= 0)
+       {ret= -2; goto ex;}
+     acl_text= calloc(acl_text_fill, 1);
+     if(acl_text == NULL)
+       {ret= -1; goto ex;}
+     ret= aaip_decode_acl((unsigned char *) values[i], value_lengths[i],
+                       &consumed, acl_text, acl_text_fill, &acl_text_fill, 0);
+     if(ret <= 0)
+       {ret= -2; goto ex;}
+     has_default_acl= (ret == 2);
+     ret= aaip_set_acl_text(path, acl_text, 0);
+     if(ret <= 0)
+       {ret= -3; goto ex;}
+     if(has_default_acl) {
+       free(acl_text);
+       acl_text= NULL;
+       ret= aaip_decode_acl((unsigned char *) (values[i] + consumed),
+                            value_lengths[i] - consumed, &consumed,
+                            NULL, 0, &acl_text_fill, 1);
+       if(ret <= 0)
+         {ret= -2; goto ex;}
+       acl_text= calloc(acl_text_fill, 1);
+       if(acl_text == NULL)
+         {ret= -1; goto ex;}
+       ret= aaip_decode_acl((unsigned char *) (values[i] + consumed),
+                            value_lengths[i] - consumed, &consumed,
+                            acl_text, acl_text_fill, &acl_text_fill, 0);
+       if(ret <= 0)
+         {ret= -2; goto ex;}
+       ret= aaip_set_acl_text(path, acl_text, 1);
+       if(ret <= 0)
+         {ret= -3; goto ex;}
+     }
+   }
+ }
+ ret= 1;
+ex:;
+ if(acl_text != NULL)
+   free(acl_text);
+ if(list != NULL)
+   free(list);
+ return(ret);
+}
+
+

test/aaip-os-linux.c

@@ -0,0 +1,371 @@
+
+/*
+
+ aaip-os-linux.c
+ Arbitrary Attribute Interchange Protocol , system adapter for getting and
+ setting of ACLs and XFS-style Extended Attributes.
+
+ To be included by aaip_0_2.c
+*/
+
+#include <ctype.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+#include <sys/acl.h>
+#include <attr/xattr.h>
+
+#define Aaip_acl_attrnamE "system.posix_acl_access"
+
+
+/* ------------------------------ Getters --------------------------------- */
+
+/* Obtain the ACL of the given file in long text form.
+   @param path          Path to the file
+   @param text          Will hold the result. This is a managed object which
+                        finally has to be freed by a call to this function
+                        with bit15 of flag.
+   @param flag          Bitfield for control purposes
+                        bit0=  obtain default ACL rather than access ACL
+                        bit15= free text and return 1
+   @return              > 0 ok
+                        -1  failure of system ACL service (see errno)
+*/
+int aaip_get_acl_text(char *path, char **text, int flag)
+{
+ acl_t acl= NULL;
+
+ if(flag & (1 << 15)) {
+   if(*text != NULL)
+     acl_free(text);
+   *text= NULL;
+   return(1);
+ }
+ *text= NULL;
+ acl= acl_get_file(path, (flag & 1) ? ACL_TYPE_DEFAULT : ACL_TYPE_ACCESS);
+ if(acl == NULL)
+   return(-1);
+ *text= acl_to_text(acl, NULL);
+ acl_free(acl);
+ if(*text == NULL)
+   return(-1);
+ return(1);
+}
+
+
+/* Obtain the Extended Attributes and/or the ACLs of the given file in a form
+   that is ready for aaip_encode().
+   @param path          Path to the file
+   @param num_attrs     Will return the number of name-value pairs
+   @param names         Will return an array of pointers to 0-terminated names
+   @param value_lengths Will return an arry with the lenghts of values
+   @param values        Will return an array of pointers to 8-bit values
+   @param flag          Bitfield for control purposes
+                        bit0=  obtain ACL (access and eventually default)
+                        bit1=  use numeric ACL qualifiers rather than names
+                        bit2=  do not obtain attributes other than ACL
+                        bit3=  do not ignore eventual local ACL attribute
+                               (e.g. system.posix_acl_access)
+                        bit15= free memory of names, value_lengths, values
+   @return              >0  ok
+                        <=0 error
+*/
+int aaip_get_attr_list(char *path, size_t *num_attrs, char ***names,
+                       size_t **value_lengths, char ***values, int flag)
+{
+ int ret, retry= 0;
+ char *list= NULL;
+ ssize_t list_size= 0, i, num_names= 0, value_ret;
+ size_t a_acl_len= 0, d_acl_len= 0, acl_len= 0;
+ unsigned char *a_acl= NULL, *d_acl= NULL, *acl= NULL;
+ char *acl_text= NULL;
+
+ if(flag & (1 << 15)) { /* Free memory */
+   if(*names != NULL)
+     list= (*names)[0];
+   {ret= 1; goto ex;}
+ }
+
+ *num_attrs= 0;
+ *names= NULL;
+ *value_lengths= NULL;
+ *values= NULL;
+
+ /* Set up arrays */
+ if(!(flag & 4)) { /* Get xattr names */
+    list_size= listxattr(path, list, 0);
+    if(list_size == -1)
+      {ret= -1; goto ex;}
+    list= calloc(list_size, 1);
+    if(list == NULL)
+      {ret= -1; goto ex;}
+    list_size= listxattr(path, list, list_size);
+    if(list_size == -1)
+      {ret= -1; goto ex;}
+    for(i= 0; i < list_size; i+= strlen(list + i) + 1)
+      num_names++;
+ }
+ if(flag & 1)
+   num_names++;
+ if(num_names == 0)
+   {ret= 1; goto ex;}
+ (*names)= calloc(num_names, sizeof(char *));
+ (*value_lengths)= calloc(num_names, sizeof(size_t));
+ (*values)= calloc(num_names, sizeof(char *));
+ if(*names == NULL || *value_lengths == NULL || *values == NULL)
+   {ret= -1; goto ex;}
+
+ if(!(flag & 4))
+   for(i= 0; i < list_size && num_names > *num_attrs;
+       i+= strlen(list + i) + 1) {
+     if(!(flag & 8))
+       if(strcmp(list + i, Aaip_acl_attrnamE) == 0)
+   continue;
+     (*names)[(*num_attrs)++]= list + i;
+   }
+ for(i= *num_attrs; i < num_names; i++)
+   (*names)[i]= NULL;
+ for(i= 0; i < num_names; i++) {
+   (*values)[i]= NULL;
+   (*value_lengths)[i]= 0;
+ }
+
+ if(!(flag & 4)) { /* Get xattr values */
+   for(i= 0; i < *num_attrs; i++) {
+     if(!(flag & 8))
+       if(strcmp((*names)[i], Aaip_acl_attrnamE) == 0)
+   continue;
+     value_ret= getxattr(path, (*names)[i], NULL, 0);
+     if(value_ret == -1)
+ continue;
+     (*values)[i]= calloc(value_ret + 1, 1);
+     if((*values)[i] == NULL)
+       {ret= -1; goto ex;}
+     (*value_lengths)[i]= getxattr(path, (*names)[i], (*values)[i], value_ret);
+     if(value_ret == -1) { /* there could be a race condition */
+       if(retry++ > 5)
+         {ret= -1; goto ex;}
+       i--;
+ continue;
+     }
+     (*value_lengths)[i]= value_ret;
+     retry= 0;
+   }
+ }
+
+ if(flag & 1) { /* Obtain ACL */
+   /* access-ACL */
+   ret= aaip_get_acl_text(path, &acl_text, 0);
+   if(ret <= 0)
+     goto ex;
+   ret= aaip_encode_acl(acl_text, &a_acl_len, &a_acl, flag & 2);
+   if(ret <= 0)
+     goto ex;
+   aaip_get_acl_text("", &acl_text, 1 << 15); /* free */
+   
+   /* eventually default-ACL */
+   ret= aaip_get_acl_text(path, &acl_text, 1);
+   if(ret > 0) {
+     /* encode and append to a_acl */;
+     ret= aaip_encode_acl(acl_text, &d_acl_len, &d_acl, (flag & 2) | 4);
+     if(ret <= 0)
+       goto ex;
+     acl= calloc(a_acl_len + d_acl_len + 1, 1);
+     if(acl == NULL)
+       {ret= -1; goto ex;}
+     if(a_acl_len)
+       memcpy(acl, a_acl, a_acl_len);
+     if(d_acl_len)
+       memcpy(acl + a_acl_len, d_acl, d_acl_len);
+     acl_len= a_acl_len + d_acl_len;
+   } else {
+     acl= a_acl;
+     a_acl= NULL;
+     acl_len= a_acl_len;
+   }
+
+   /* Set as attribute with empty name */;
+   (*names)[*num_attrs]= strdup("");
+   if((*names)[*num_attrs] == NULL)
+     {ret= -1; goto ex;}
+   (*values)[*num_attrs]= (char *) acl;
+   (*value_lengths)[*num_attrs]= acl_len;
+   (*num_attrs)++;
+ }
+
+ ret= 1;
+ex:;
+ if(a_acl != NULL)
+   free(a_acl);
+ if(d_acl != NULL)
+   free(d_acl);
+ if(acl_text != NULL)
+   aaip_get_acl_text("", &acl_text, 1 << 15); /* free */
+
+ if(ret <= 0 || (flag & (1 << 15))) {
+   if(list != NULL)
+     free(list);
+   if(*names != NULL)
+     free(*names);
+   *names= NULL;
+   if(*value_lengths != NULL)
+     free(*value_lengths);
+   *value_lengths= NULL;
+   if(*values != NULL) {
+     for(i= 0; i < *num_attrs; i++)
+       free((*values)[i]);
+     free(*values);
+   }
+   if(acl != NULL)
+     free(acl);
+   *values= NULL;
+   *num_attrs= 0;
+ }
+ return(ret);
+}
+
+
+/* ------------------------------ Setters --------------------------------- */
+
+
+/* Set the ACL of the given file to a given list in long text form.
+   @param path          Path to the file
+   @param text          The input text (0 terminated, ACL long text form)
+   @param flag          Bitfield for control purposes
+                        bit0=  set default ACL rather than access ACL
+   @return              > 0 ok
+                        -1  failure of system ACL service (see errno)
+*/
+int aaip_set_acl_text(char *path, char *text, int flag)
+{
+ int ret;
+ acl_t acl= NULL;
+
+ acl= acl_from_text(text);
+ if(acl == NULL) {
+   ret= -1; goto ex;
+ }
+ ret= acl_set_file(path, (flag & 1) ? ACL_TYPE_DEFAULT : ACL_TYPE_ACCESS, acl);
+ if(ret == -1)
+   goto ex;
+ ret= 1;
+ex:
+ if(acl != NULL)
+   acl_free(acl);
+ return(ret);
+}
+
+
+/* Bring the given attributes and/or ACLs into effect with the given file.
+   @param flag          Bitfield for control purposes
+                        bit0= decode and set ACLs
+                        bit1= first clear all existing attributes of the file
+                        bit2= do not set attributes other than ACLs
+                        bit3= do not ignore eventual ACL attribute
+                              (e.g. system.posix_acl_access)
+   @return              1 success
+                       -1 error memory allocation
+                       -2 error with decoding of ACL
+                       -3 error with setting ACL
+                       -4 error with setting attribute
+                       -5 error with deleting attributes
+                       
+*/
+int aaip_set_attr_list(char *path, size_t num_attrs, char **names,
+                       size_t *value_lengths, char **values, int flag)
+{
+ int ret, has_default_acl= 0;
+ size_t i, consumed, acl_text_fill, list_size= 0, acl_idx= 0;
+ char *acl_text= NULL, *list= NULL;
+
+ if(flag & 2) /* Delete all file attributes */
+   list_size= listxattr(path, list, 0);
+ if(list_size > 0) { /* Delete all file attributes */
+  list= calloc(list_size, 1);
+  if(list == NULL)
+    {ret= -5; goto ex;}
+  list_size= listxattr(path, list, list_size);
+  if(list_size == -1)
+    {ret= -5; goto ex;}
+  for(i= 0; i < list_size; i+= strlen(list + i) + 1) {
+     if(!(flag & 8))
+       if(strcmp(list + i, Aaip_acl_attrnamE) == 0)
+   continue;
+    ret= removexattr(path, list + i);
+    if(ret == -1)
+      {ret= -5; goto ex;}
+  }
+  free(list); list= NULL;
+ }
+
+ for(i= 0; i < num_attrs; i++) {
+   if(names[i] == NULL || values[i] == NULL)
+ continue;
+   if(names[i][0] == 0) { /* ACLs */
+     if(flag & 1)
+       acl_idx= i + 1;
+ continue;
+   }
+   /* Extended Attribute */
+   if((flag & 1) && !(flag & 8))
+     if(strcmp(names[i], Aaip_acl_attrnamE) == 0)
+ continue;
+   ret= setxattr(path, names[i], values[i], value_lengths[i], 0);
+   if(ret == -1)
+     {ret= -4; goto ex;}
+ }
+
+/* Decode ACLs */
+ if(acl_idx == 0)
+   {ret= 1; goto ex;}
+ i= acl_idx - 1;
+                                                             /* "access" ACL */
+ ret= aaip_decode_acl((unsigned char *) values[i], value_lengths[i],
+                      &consumed, NULL, 0, &acl_text_fill, 1);
+ if(ret <= 0)
+   {ret= -2; goto ex;}
+ acl_text= calloc(acl_text_fill, 1);
+ if(acl_text == NULL)
+   {ret= -1; goto ex;}
+ ret= aaip_decode_acl((unsigned char *) values[i], value_lengths[i],
+                   &consumed, acl_text, acl_text_fill, &acl_text_fill, 0);
+ if(ret <= 0)
+   {ret= -2; goto ex;}
+ has_default_acl= (ret == 2);
+ ret= aaip_set_acl_text(path, acl_text, 0);
+ if(ret <= 0)
+   {ret= -3; goto ex;}
+                                                            /* "default" ACL */
+ if(has_default_acl) {
+   free(acl_text);
+   acl_text= NULL;
+   ret= aaip_decode_acl((unsigned char *) (values[i] + consumed),
+                        value_lengths[i] - consumed, &consumed,
+                        NULL, 0, &acl_text_fill, 1);
+   if(ret <= 0)
+     {ret= -2; goto ex;}
+   acl_text= calloc(acl_text_fill, 1);
+   if(acl_text == NULL)
+     {ret= -1; goto ex;}
+   ret= aaip_decode_acl((unsigned char *) (values[i] + consumed),
+                        value_lengths[i] - consumed, &consumed,
+                        acl_text, acl_text_fill, &acl_text_fill, 0);
+   if(ret <= 0)
+     {ret= -2; goto ex;}
+   ret= aaip_set_acl_text(path, acl_text, 1);
+   if(ret <= 0)
+     {ret= -3; goto ex;}
+ }
+ ret= 1;
+ex:;
+ if(acl_text != NULL)
+   free(acl_text);
+ if(list != NULL)
+   free(list);
+ return(ret);
+}
+
+

test/aaip_0_2.h

@@ -0,0 +1,381 @@
+
+/*
+
+ Arbitrary Attribute Interchange Protocol , AAIP version 0.2
+ Demonstration program for encoding and decoding EA and ACL.
+
+ See http://libburnia-project.org/wiki/AAIP
+ or  doc/susp_aaip_0_2.txt
+
+ test/aaip_0.2.h - Public declarations
+
+*/
+
+#ifndef Aaip_h_is_includeD
+#define Aaip_h_is_includeD yes
+
+
+/* --------------------------------- Encoder ---------------------------- */
+
+/* Convert an array of Arbitrary Attributes into a series of AAIP fields.
+   @param aa_name       The 2 byte SUSP Signature Word of the fields
+   @param num_attrs     Number of attributes
+   @param names         Array of pointers to 0 terminated name strings
+   @param value_lengths Array of byte lengths for each value
+   @param values        Array of pointers to the value bytes
+   @param result_len    Number of bytes in the resulting SUSP field string
+   @param result        *result will point to the start of the result string.
+                        This is malloc() memory which needs to be freed when
+                        no longer needed 
+   @param flag          Bitfield for control purposes
+                        bit0= set CONTINUE bit of last AA field to 1
+   @return              >0 is the number of SUSP fields generated,
+                        0 means error 
+*/
+unsigned int aaip_encode(char aa_name[2],
+                         unsigned int num_attrs, char **names,
+                         size_t *value_lengths, char **values, 
+                         size_t *result_len, unsigned char **result, int flag);
+
+
+/* ------ ACL representation ------ */
+
+/* Convert an ACL from long text form into the value of an Arbitrary
+   Attribute. According to AAIP 0.2 this value is to be stored together with
+   an empty name.
+   @param acl_text      The ACL in long text form
+   @param result_len    Number of bytes in the resulting value
+   @param result        *result will point to the start of the result string.
+                        This is malloc() memory which needs to be freed when
+                        no longer needed
+   @param flag          Bitfield for control purposes
+                        bit0= count only
+                        bit1= use numeric qualifiers rather than names
+   @return              >0 means ok
+                        0 means error
+*/
+int aaip_encode_acl(char *acl_text,
+                    size_t *result_len, unsigned char **result, int flag);
+
+
+/* ------ OS interface ------ */
+
+/* Obtain the ACL of the given file in long text form.
+   @param path          Path to the file
+   @param text          Will hold the result. This is a managed object which
+                        finally has to be freed by a call to this function
+                        with bit15 of flag.
+   @param flag          Bitfield for control purposes
+                        bit0=  obtain default ACL rather than access ACL
+                        bit15= free text and return 1
+   @return              > 0 ok
+                        -1  failure of system ACL service (see errno)
+*/
+int aaip_get_acl_text(char *path, char **text, int flag);
+
+
+/* Obtain the Extended Attributes and/or the ACLs of the given file in a form
+   that is ready for aaip_encode(). The returned data objects finally have
+   to be freed by a call with flag bit 15.
+   @param path          Path to the file
+   @param num_attrs     Will return the number of name-value pairs
+   @param names         Will return an array of pointers to 0-terminated names
+   @param value_lengths Will return an arry with the lenghts of values
+   @param values        Will return an array of pointers to 8-bit values
+   @param flag          Bitfield for control purposes
+                        bit0=  obtain ACLs (access and eventually default) via
+                               system ACL API and encode 
+                        bit1=  use numeric ACL qualifiers rather than names
+                        bit2=  do not obtain attributes other than ACLs
+                        bit3=  do not ignore eventual ACL attribute
+                               (e.g. system.posix_acl_access)
+                        bit15= free memory of names, value_lengths, values
+   @return              >0  ok
+                        <=0 error
+*/
+int aaip_get_attr_list(char *path, size_t *num_attrs, char ***names,
+                       size_t **value_lengths, char ***values, int flag);
+
+
+/* --------------------------------- Decoder ---------------------------- */
+
+/*
+   The AAIP decoder offers several levels of abstraction of which the
+   lower two avoid the use of dynamic memory. It provides a stateful decoding
+   context with a small buffer which delivers results to caller provided
+   memory locations.
+
+   The lowest level is the stream-like Component Level Interface. It allows
+   to decode very many very long attributes.
+ 
+   Next is the Pair Level Interface which delivers to fixly sized storage for
+   name and value. It allows to decode very many attributes. 
+
+   The List Level Interface uses dynamic memory allocation to provide arrays
+   of names, values and value lengths. It is intended for moderately sized
+   attribute lists but may also be used as alternative to Pair Level.
+*/
+
+
+/* The AAIP decoder context.
+*/
+struct aaip_state;
+
+
+/* Obtain the size in bytes of an aaip_state object.
+*/
+size_t aaip_sizeof_aaip_state(void);
+
+
+/* Initialize a AAIP decoder context.
+   This has to be done before the first AA field of a node is processed.
+   The caller has to provide the storage of the struct aaip_state.
+   @param aaip          The AAIP decoder context to be initialized
+   @param aa_name       The Signature Word (advised is "AA")
+   @param flag          Bitfield for control purposes
+                        submit 0
+   @return <=0 error , >0 ok
+*/
+int aaip_init_aaip_state(struct aaip_state *aaip, char aa_name[2], int flag);
+
+
+/* -------------------------  Component Level Interface  ------------------- */
+/* 
+   Provides support for unlimited component size but demands the caller
+   to have a growing storage facility resp. to do own oversize handling.
+
+   This interface expects moderatly sized input pieces and will hand out
+   moderately sized result pieces. The number of transactions is virtually
+   unlimited. 
+*/
+
+/* Submit small data chunk for decoding.
+   The return value will tell whether data are pending for being fetched.
+   @param aaip          The AAIP decoder context
+   @param data          Not more than 2048 bytes input for the decoder
+   @param num_data      Number of bytes in data
+                        0 inquires the buffer status avoiding replies <= 0
+   @param ready_bytes   Number of decoded bytes ready for delivery
+   @param flag          Bitfield for control purposes
+   @return             -1= non-AA field detected
+                           *ready_bytes gives number of consumed bytes in data
+                        0= cannot accept data because buffer full
+                        1= no component record complete, submit more data
+                        2= component record complete, may be delivered
+                        3= component complete, may be delivered
+                        4= no component available, no more data expected, done
+*/
+int aaip_submit_data(struct aaip_state *aaip,
+                     unsigned char *data, size_t num_data,
+                     size_t *ready_bytes, int flag);
+
+
+/* Fetch the available part of current component.
+   The return value will tell whether it belongs to name or to value and
+   whether that name or value is completed now.
+   @param aaip          The AAIP decoder context
+   @param result        Has to point to storage for the component data
+   @param result_size   Gives the amount of provided result storage
+   @param num_result    Will tell the number of fetched result bytes
+   @param flag          Bitfield for control purposes
+                        bit0= discard data rather than copying to result
+   @return -2 = insufficient result_size
+           -1 = no data ready for delivery
+            0 = result holds the final part of a name
+            1 = result holds an intermediate part of a name
+            2 = result holds the final part of a value
+            3 = result holds an intermediate part of a value
+*/
+int aaip_fetch_data(struct aaip_state *aaip,
+                    char *result, size_t result_size, size_t *num_result,
+                    int flag);
+
+
+/* Skip the current component and eventually the following value component.
+   This has to be called if fetching of a component shall be aborted
+   but the next component resp. pair shall be fetchable again.
+   aaip_submit_data() will not indicate readiness for fetching until all
+   bytes of the skipped components are submitted. Those bytes get discarded.
+   @param aaip          The AAIP decoder context
+   @param flag          Bitfield for control purposes
+                        bit0= do not skip value if current component is name
+   @return              <=0 error , 1= now in skip state, 2= not in skip state
+*/
+int aaip_skip_component(struct aaip_state *aaip, int flag);
+
+
+/* -------------------------  Pair Level Interface  ------------------------ */
+/*
+   Provides support for names and values of limited size. The limits are
+   given by the caller who has to provide the storage for name and value.
+
+   This interface expects moderatly sized input pieces.
+   The number of input transcations is virtually unlimited.
+   The number of pair transactions after aaip_init() should be limited
+   to 4 billion.
+*/
+
+
+/* Accept raw input data and collect a pair of name and value.
+   The return value will indicate whether the pair is complete, whether more
+   pairs are complete or whether more data are desired. No input data will be
+   accepted as long as complete pairs are pending. The end of the attribute
+   list will be indicated.
+   @param aaip          The AAIP decoder context
+   @param data          The raw data to decode
+   @param num_data      Number of data bytes provided
+   @param consumed      Returns the number of consumed data bytes
+   @param name          Buffer to build the name string
+   @param name_size     Maximum number of bytes in name
+   @param name_fill     Holds the current buffer fill of name
+   @param value         Buffer to build the value string
+   @param value_size    Maximum number of bytes in value
+   @param value_fill    Holds the current buffer fill of value
+   @param flag          Bitfield for control purposes - submit 0 for now
+   @return <0 error
+            0 data not accepted, first fetch pending pairs with num_data == 0
+            1 name and value are not valid yet, submit more data
+            2 name and value are valid, submit more data
+            3 name and value are valid, pairs pending, fetch with num_data == 0
+            4 name and value are valid, no more data expected
+            5 name and value are not valid, no more data expected
+
+*/
+int aaip_decode_pair(struct aaip_state *aaip,
+                     unsigned char *data, size_t num_data, size_t *consumed,
+                     char *name, size_t name_size, size_t *name_fill,
+                     char *value, size_t value_size, size_t *value_fill,
+                     int flag);
+
+
+/* Inquire the number of pairs which were skipped because being oversized.
+   @param aaip          The AAIP decoder context
+   @param flag          Bitfield for control purposes - submit 0 for now
+   @return The number of pairs skipped since aaip_init()
+*/
+unsigned int aaip_get_pairs_skipped(struct aaip_state *aaip, int flag);
+
+
+/* -------------------------  List Level Interface  ------------------------ */
+/*
+   Provides support for names and values of limited size. The limits are
+   given for total memory consumption and for number of attributes.
+
+   Iterated decoding is supported as long as no single attribute exceeds
+   the memory limit.
+*/
+
+/* Accept raw input data and collect arrays of name pointers, value lengths
+   and value pointers. A handle object will emerge which finally has to be
+   be freed by a call with bit 15.
+   @param handle        The decoding context.
+                        It will be created by this call with flag bit 0 or if
+                        *handle == NULL. This handle has to be the same as long
+                        as decoding goes on and finally has to be freed by a
+                        call with bit15.
+   @param aa_name       The Signature Word (advised is "AA")
+   @param memory_limit  Maximum number of bytes to allocate
+   @param num_attr_limit  Maximum number of name-value pairs to allocate
+   @param data          The raw data to decode
+   @param num_data      Number of data bytes provided
+   @param consumed      Returns the number of consumed data bytes
+   @param flag          Bitfield for control purposes
+                        bit0=  this is the first call for a file object
+                        bit15= end decoding :
+                               Free handle and its intermediate list memory.
+   @return <=0 error
+             1 not complete yet, submit more data
+             2 arrays are complete, call aaip_get_decoded_attrs()
+             3 limit exceeded, not complete yet, call with bit15 and give up
+             4 limit exceeded, call aaip_get_decoded_attrs() and try again
+*/
+int aaip_decode_attrs(struct aaip_state **handle, char aa_name[2],
+                      size_t memory_limit, size_t num_attr_limit,
+                      unsigned char *data, size_t num_data, size_t *consumed, 
+                      int flag);
+
+
+/* Obtain the resulting attributes when aaip_decode_attrs() indicates to
+   be done or to have the maximum possible amount of result ready.
+   The returned data objects get detached from handle making it ready for
+   the next round of decoding with possibly a different input source. The
+   returned data objects finally have to be freed by a call with flag bit 15.
+   @param handle        The decoding context created by aaip_decode_attrs()
+   @param num_attrs     Will return the number of name-value pairs
+   @param names         Will return an array of pointers to 0-terminated names
+   @param value_lengths Will return an arry with the lenghts of values
+   @param values        Will return an array of pointers to 8-bit values
+   @param flag          Bitfield for control purposes
+                        bit15= free memory of names, value_lengths, values
+*/
+int aaip_get_decoded_attrs(struct aaip_state **handle, size_t *num_attrs,
+                         char ***names, size_t **value_lengths, char ***values,
+                         int flag);
+
+
+/* ------ ACL representation ------ */
+
+/* Convert an AAIP 0.2 ACL attribute value into the long text form of ACL.
+   @param data          The raw data to decode
+   @param num_data      Number of data bytes provided
+   @param consumed      Returns the number of consumed data bytes
+   @param acl_text      Will be filled with ACL long text form
+   @param acl_text_size Maximum number of bytes to be written to acl_text
+   @param acl_text_fill Will return the number of bytes in acl_text
+   @param flag          Bitfield for control purposes
+                        bit0= count only, do not really produce bytes:
+                               acl_text will not be touched,
+                               acl_text_size will be ignored,
+                               *acl_text_fill will return the counted number
+                        bit1= expected is a default ACL (see return value 2)
+   @return              1 success
+                        2 success, begin of default/access ACL encountered,
+                          submit data + *consumed for access/default ACL
+                       -1 error with reading of qualifier
+                       -2 error with writing of ACL text line
+                       -3 version mismatch
+                       -4 unknown tag type encountered
+*/
+int aaip_decode_acl(unsigned char *data, size_t num_data, size_t *consumed,
+                    char *acl_text, size_t acl_text_size,
+                    size_t *acl_text_fill, int flag);
+
+
+/* ------ OS interface ------ */
+
+/* Set the ACL of the given file to a given list in long text form.
+   @param path          Path to the file
+   @param text          The input text (0 terminated, ACL long text form)
+   @param flag          Bitfield for control purposes
+                        bit0=  set default ACL rather than access ACL
+   @return              > 0 ok
+                        -1  failure of system ACL service (see errno)
+*/
+int aaip_set_acl_text(char *path, char *text, int flag);
+
+
+/* Bring the given attributes and/or ACLs into effect with the given file.
+   @param path          Path to the file
+   @param num_attrs     Number of attributes
+   @param names         Array of pointers to 0 terminated name strings
+   @param value_lengths Array of byte lengths for each attribute payload
+   @param values        Array of pointers to the attribute payload bytes
+   @param flag          Bitfield for control purposes
+                        bit0= decode and set ACLs
+                        bit1= first clear all existing attributes of the file
+                        bit2= do not set attributes other than ACLs
+                        bit3= do not ignore eventual ACL attribute
+                              (e.g. system.posix_acl_access)
+   @return              1 success
+                       -1 error memory allocation
+                       -2 error with decoding of ACL
+                       -3 error with setting ACL
+                       -4 error with setting attribute
+                       -5 error with deleting attributes
+
+*/
+int aaip_set_attr_list(char *path, size_t num_attrs, char **names,
+                       size_t *value_lengths, char **values, int flag);
+
+#endif /* ! Aaip_h_is_includeD */
+

test/aaip_0_2_test.c

@@ -0,0 +1,443 @@
+
+/*
+   
+ Arbitrary Attribute Interchange Protocol , AAIP version 0.2
+ Demonstration program for encoding and decoding EA and ACL.
+   
+ See http://libburnia-project.org/wiki/AAIP
+
+ test/aaip_0_2_test.c - Main program for test binary
+
+ Compile: 
+   cc -g -Wall -o test/aaip test/aaip_0_2.c test/aaip_0_2_test.c -lacl
+   
+ Usage:            ./aaip name value
+ Long parameters   ./aaip -name"x100" -value"x100"
+
+ >>> ACLs
+
+*/
+
+#include <ctype.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <errno.h>
+
+#include <sys/acl.h>
+
+#include "aaip_0_2.h"
+
+#define Aaip_test_name_sizE 1024
+#define Aaip_test_value_sizE 1024
+
+
+static int print_result(unsigned char *result, size_t result_len, int flag)
+{
+ int i;
+
+ printf(
+     " - - - - - - 0 - - 1 - - 2 - - 3 - - 4 - - 5 - - 6 - - 7 - - 8 - - 9\n");
+ printf("\n");
+ printf("%4u :     ", 0);
+ for(i= 0; i < result_len; i++) {
+   if(result[i] >= 32 && result[i] <= 126)
+     printf("'%c'   ", result[i]);
+   else
+     printf("%3u   ", (unsigned int) ((unsigned char *) result)[i]);
+   if((i % 10) == 9)
+     printf("\n%4u :     ", (unsigned int) (i + 1));
+ }
+ printf("\n\n");
+ printf(
+     " - - - - - - 0 - - 1 - - 2 - - 3 - - 4 - - 5 - - 6 - - 7 - - 8 - - 9\n");
+ printf("\n");
+ return(1);
+}
+
+
+static int print_attrs(size_t num_attrs, char **names, size_t *value_lengths,
+                       char **values, int flag)
+{
+ size_t i, j;
+
+ for(i= 0; i < num_attrs; i++) {
+   printf("name='");
+   for(j= 0; names[i][j] != 0; j++) {
+     if(names[i][j] >= 32 && names[i][j] <= 126 &&
+        names[i][j] != '\\' && names[i][j] != '\'')
+       printf("%c", names[i][j]);
+     else
+       printf("\\%o", (unsigned int) ((unsigned char **) names)[i][j]);
+   }
+   printf("' (%d)\n", (int) j);
+   printf("value='");
+   for(j= 0; j < value_lengths[i]; j++) {
+     if(values[i][j] >= 32 && values[i][j] <= 126 &&
+        values[i][j] != '\\' && values[i][j] != '\'')
+       printf("%c", values[i][j]);
+     else
+       printf("\\%3.3o", (unsigned int) ((unsigned char **) values)[i][j]);
+   }
+   printf("' (%d)\n\n", (int) j);
+ }
+ return(1);
+}
+
+
+static int do_touch(char *path, int flag)
+{
+ FILE *fp;
+
+ fp= fopen(path, "a");
+ if(fp == NULL) {
+   fprintf(stderr, "fopen(\"%s\") failed: %d  %s\n",
+           path, errno, errno != 0 ? strerror(errno) : "");
+   return(0);
+ }
+ fclose(fp);
+ return(1);
+}
+
+
+static int decode_acl(unsigned char *result, size_t result_len,
+                      char *out_path, int flag)
+{
+ int ret;
+ size_t consumed, text_fill;
+ char *text= NULL;
+
+ ret= aaip_decode_acl(result, result_len, &consumed, NULL, 0, &text_fill, 1);
+ if(ret <= 0) {
+   fprintf(stderr, "aaip_decode_acl(,1) failed: ret= %d\n", ret);
+   ret= 0; goto ex;
+ }
+ text= calloc(text_fill, 1);
+ ret= aaip_decode_acl(result, result_len, &consumed, text, text_fill,
+                      &text_fill, 0);
+ if(ret <= 0) {
+   fprintf(stderr, "aaip_decode_acl(,0) failed: ret= %d\n", ret);
+   ret= 0; goto ex;
+ }
+ printf("--- ret= %d , text=\n%s--- end of text\n\n", ret, text);
+
+ if(out_path == NULL)
+   {ret= 1; goto ex;}
+
+ ret= do_touch(out_path, 0);
+ if(ret <= 0)
+   goto ex;
+
+ ret= aaip_set_acl_text(out_path, text, 0);
+ if(ret <= 0) {
+   fprintf(stderr, "aaip_set_acl_text() failed");
+   if(ret == -1)
+     fprintf(stderr, ": %d  %s\n", errno, errno != 0 ? strerror(errno) : "");
+   else
+     fprintf(stderr, "\n");
+   ret= 0; goto ex;
+ }
+ ret= 1;
+ex:
+ if(text != NULL)
+   free(text);
+ return(ret);
+}
+
+
+static int test_acl(char *in_path, char *out_path, int flag)
+{
+ int ret;
+ char *acl_text= NULL;
+ unsigned char *result= NULL;
+ size_t result_len;
+
+ ret= aaip_get_acl_text(in_path, &acl_text, 0);
+ if(ret <= 0) {
+   fprintf(stderr, "aaip_get_acl_text() failed");
+   if(ret == -1)
+     fprintf(stderr, ": %d  %s\n", errno, errno != 0 ? strerror(errno) : "");
+   else
+     fprintf(stderr, "\n");
+   ret= 6; goto ex;
+ }
+ printf("--- ACL:\n%s--- end of ACL\n\n", acl_text);
+
+ ret= aaip_encode_acl(acl_text, &result_len, &result, 0);
+ if(ret <= 0) {
+   fprintf(stderr, "aaip_encode_acl(text) failed: ret= %d\n", ret);
+   ret= 7; goto ex;
+ }
+ print_result(result, result_len, 0);
+ ret= decode_acl(result, result_len, out_path, 0);
+ if(ret <= 0)
+   {ret= 8; goto ex;}
+ free(result); result= NULL;
+
+ ret= aaip_encode_acl(acl_text, &result_len, &result, 2);
+ if(ret <= 0) {
+   fprintf(stderr, "aaip_encode_acl(num) failed: ret= %d\n", ret);
+   ret= 9; goto ex;
+ }
+ print_result(result, result_len, 0);
+ ret= decode_acl(result, result_len, out_path, 0);
+ if(ret <= 0)
+   {ret= 10; goto ex;}
+
+ ret= 0;
+ex:;
+ aaip_get_acl_text("", &acl_text, 1 << 15);
+ if(result != NULL)
+   free(result);
+ return(ret);
+}
+
+
+int synthetic_pairs(char *prog, int argc, char **argv, int flag)
+{
+ int  ret, l, mult= 0, k;
+ size_t result_len, i;
+ unsigned char *result= NULL;
+ char **names= NULL, **values= NULL, *cpt, **param;
+ size_t *value_lengths= NULL;
+
+ struct aaip_state *aaip;
+ size_t consumed= 0;
+ char name[Aaip_test_name_sizE + 1];
+ size_t name_fill;
+ char value[Aaip_test_value_sizE + 1];
+ size_t value_fill;
+ size_t todo;
+ int submit_data, is_done;
+ unsigned char *rpt;
+ unsigned int skipped, was_skipped= 0;
+
+ aaip= (struct aaip_state *) calloc(aaip_sizeof_aaip_state(), 1);
+ names= calloc(sizeof(char *), argc / 2);
+ values= calloc(sizeof(char *), argc / 2);
+ value_lengths= calloc(sizeof(size_t), argc / 2);
+ 
+ for(i= 0; i < argc; i++) {
+   if(i % 2)
+     param= values + i / 2;
+   else
+     param= names + i / 2;
+   (*param)= argv[i];
+   if(argv[i][0] == '-') {
+     cpt= strchr(argv[i], 'x');
+     if(cpt != NULL) {
+       l= cpt - argv[i] - 1;
+       if(l > 0)
+         sscanf(cpt + 1, "%d", &mult);
+       if(l > 0 && mult > 0) {
+         (*param)= calloc(1, l * mult + 1);
+         if((*param) != NULL) {
+           for(k= 0; k < mult; k++)
+             memcpy((*param) + k * l, argv[i] + 1, l);
+           (*param)[mult * l]= 0;
+         } else
+           (*param)= argv[i];
+       }
+     }
+   }
+   if(i % 2)
+     value_lengths[i / 2]= strlen(values[i / 2]);
+ }
+
+ ret= aaip_encode("AA", (unsigned int) (argc / 2), names,
+                  value_lengths, values, 
+                  &result_len, &result, 0);
+ if(ret <= 0) {
+   fprintf(stderr, "%s : aaip_encode failed with ret= %d\n", prog, ret);
+   return(2);
+ }
+ print_result(result, result_len, 0);
+
+ aaip_init_aaip_state(aaip, "AA", 0);
+ rpt= result;
+ submit_data= 1;
+ is_done= 0;
+ while(!is_done) {
+   if(submit_data) {
+     todo= result_len - (rpt - result);
+     if(todo > 2048) 
+       todo= 2048;
+     if(todo == 0) {
+       fprintf(stderr, "%s : Out of data while still prompted to submit\n",
+               prog);
+       return(5);
+     }
+   } else
+     todo= 0;
+   ret= aaip_decode_pair(aaip, rpt, todo, &consumed,
+                         name, Aaip_test_name_sizE, &name_fill,
+                         value, Aaip_test_value_sizE, &value_fill, 0);
+   skipped= aaip_get_pairs_skipped(aaip, 0);
+   if(skipped > was_skipped) {
+     printf("- skipped %d pair%s -\n\n", skipped - was_skipped,
+            skipped - was_skipped > 1 ? "s" : "");
+     was_skipped= skipped;
+   }
+   if(ret < 0) {
+     fprintf(stderr, "%s : aaip_decode_pair failed with ret= %d\n", prog, ret);
+     return(3);
+   }
+   rpt+= todo;
+   if(ret == 0) {
+     rpt-= todo;
+     submit_data= 0;
+ continue;
+   } else if(ret == 1) {
+     submit_data= 1;
+ continue;
+   } else if(ret == 2) {
+     submit_data= 1;
+   } else if(ret == 3) {
+     submit_data= 0;
+   } else if(ret == 4) {
+     is_done= 1;
+   } else if(ret == 5) {
+     is_done= 1;
+ break;
+   } else {
+     fprintf(stderr, "%s : Unknown return %d from aaip_decode_pair()\n",
+             prog, ret);
+     return(4);
+   }
+   name[name_fill]= 0;
+   value[value_fill]= 0;
+   if((name_fill < 1000 && value_fill < 1000)) {
+     printf("name = '%s' (%lu)\n", name, (unsigned long) name_fill);
+     printf("value= '%s' (%lu)\n", value, (unsigned long) value_fill);
+   } else {
+     printf("name = (%lu)\n", (unsigned long) name_fill);
+     printf("value= (%lu)\n", (unsigned long) value_fill);
+   }
+   printf("\n");
+ }
+
+ return(0);
+}
+
+
+/*
+  @param flag bit0= use numeric qualifiers
+*/
+static int copy_all(char *in_path, char *out_path, int flag)
+{
+ int ret;
+ struct aaip_state *aaip= NULL;
+ size_t in_num_attrs, *in_value_lengths= NULL;
+ char **in_names= NULL, **in_values= NULL;
+ int is_done= 0, first_round= 1;
+ unsigned char *result= NULL, *rpt;
+ size_t result_len, todo, consumed;
+ size_t out_num_attrs, *out_value_lengths= NULL;
+ char **out_names= NULL, **out_values= NULL;
+ 
+ ret= aaip_get_attr_list(in_path, &in_num_attrs, &in_names, &in_value_lengths,
+                         &in_values, 1 | ((flag & 1) << 1));
+ if(ret <= 0)
+   {ret= 11; goto ex;}
+ print_attrs(in_num_attrs, in_names, in_value_lengths, in_values, 0);
+
+ ret= aaip_encode("AA", (unsigned int) in_num_attrs, in_names,
+                  in_value_lengths, in_values, &result_len, &result, 0);
+ if(ret == 0)
+   {ret= 12; goto ex;}
+
+ if(result_len <= 0) {
+   fprintf(stderr, "No result\n");
+   ret= 13; goto ex;
+ }
+ print_result(result, result_len, 0);
+
+ rpt= result;
+ while(!is_done) {
+   todo= result_len - (rpt - result);
+   if(todo > 2048) 
+       todo= 2048;
+   if(todo == 0) {
+     fprintf(stderr, "Out of data while still prompted to submit\n");
+     ret= 14; goto ex;
+   }
+   /* Allow 1 million bytes of memory consumption, 100,000 attributes */
+   ret= aaip_decode_attrs(&aaip, "AA", (size_t) 1000000, (size_t) 100000,
+                          rpt, todo, &consumed, first_round);
+   rpt+= consumed;
+   first_round= 0;
+   if(ret == 1)
+ continue;
+   if(ret == 2)
+ break;
+   fprintf(stderr, "aaip_decode_attrs() returns %d\n", ret);
+   ret= 15; goto ex;
+ }
+ if(rpt - result != result_len) {
+   fprintf(stderr, "aaip_decode_attrs() returns 2 but %d bytes are left\n",
+           (int) (result_len - (rpt - result)));
+   ret= 16; goto ex;
+ }
+ ret= aaip_get_decoded_attrs(&aaip, &out_num_attrs, &out_names,
+                             &out_value_lengths, &out_values, 0);
+
+ if(ret != 1) {
+   fprintf(stderr, "aaip_get_decoded_attrs() returns %d\n", ret);
+   ret= 17; goto ex;
+ }
+ print_attrs(out_num_attrs, out_names, out_value_lengths, out_values, 0);
+
+ ret= do_touch(out_path, 0);
+ if(ret <= 0)
+   {ret= 19; goto ex;}
+
+ ret= aaip_set_attr_list(out_path, out_num_attrs, out_names, out_value_lengths,
+                         out_values, 1 | 2);
+ if(ret != 1) {
+   fprintf(stderr, "aaip_set_attr_list() returns %d\n", ret);
+   ret= 18; goto ex;
+ }
+ ret= 0;
+ex:;
+ if(in_names != NULL || in_value_lengths != NULL || in_values != NULL)
+   aaip_get_attr_list(in_path, &in_num_attrs, &in_names, &in_value_lengths,
+                      &in_values, 1 << 15);
+ if(out_names != NULL || out_value_lengths != NULL || out_values != NULL)
+   aaip_get_decoded_attrs(&aaip, &out_num_attrs, &out_names,
+                          &out_value_lengths, &out_values, 15);
+ aaip_decode_attrs(&aaip, "AA", (size_t) 0, (size_t) 0, NULL, (size_t) 0,
+                   &consumed, 1 << 15);
+ return(ret);
+}
+
+
+int main(int argc, char **argv)
+{
+ int ret;
+
+ if(argc < 2) {
+usage:
+   fprintf(stderr, "usage : %s options\n", argv[0]);
+   fprintf(stderr, "  -pairs [-]name[xNNN] [-]value[xNNN] [...]\n");
+   fprintf(stderr, "  -copy_acl source_path target_path\n");
+   fprintf(stderr, "  -copy source_path target_path\n");
+   exit(1);
+ }
+ if(strcmp(argv[1], "-pairs") == 0) {
+   if(argc < 4 || (argc % 2) != 0)
+     goto usage;
+   ret= synthetic_pairs(argv[0], argc - 2, argv + 2, 0);
+ } else if(strcmp(argv[1], "-copy_acl") == 0) {
+   if(argc != 4)
+     goto usage;
+   ret= test_acl(argv[2], argv[3], 0);
+ } else if(strcmp(argv[1], "-copy") == 0) {
+   if(argc != 4)
+     goto usage;
+   ret= copy_all(argv[2], argv[3], 1);
+ } else
+   goto usage;
+ exit(ret);
+}

xorriso/README

@@ -4,8 +4,8 @@
 xorriso. By Thomas Schmitt <scdbackup@gmx.net>
 Integrated sub project of libburnia-project.org but also published via:
 http://scdbackup.sourceforge.net/xorriso_eng.html
-http://scdbackup.sourceforge.net/xorriso-0.1.7.tar.gz
-Copyright (C) 2006-2008 Thomas Schmitt, provided under GPL version 2.
+http://scdbackup.sourceforge.net/xorriso-0.3.2.pl00.tar.gz
+Copyright (C) 2006-2009 Thomas Schmitt, provided under GPL version 2.
 ------------------------------------------------------------------------------
 
 
@@ -14,8 +14,10 @@ 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.
 
-Currently it is only supported on Linux with kernels >= 2.4.
+Currently it is supported on Linux with kernels >= 2.4 and on FreeBSD versions
+with ATAPI/CAM support enabled in the kernel, see atapicam(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
@@ -35,10 +37,10 @@ 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.7.tar.gz, take it to a directory of your choice and do:
+Obtain xorriso-0.3.2.pl00.tar.gz, take it to a directory of your choice and do:
 
-    tar xzf xorriso-0.1.7.tar.gz
-    cd xorriso-0.1.7
+    tar xzf xorriso-0.3.2.pl00.tar.gz
+    cd xorriso-0.3.2
 
 Within that directory execute:
 
@@ -52,8 +54,8 @@ which you may strip to reduce it in size
     strip ./xorriso/xorriso
 
 You may copy or move it to a directory where it can be found by the shell,
-you may execute xorriso at the place where it was built, or you may execute
-as superuser:
+or you may execute xorriso at the place where it was built,
+or you may execute as superuser:
     make install
 
 For general concepts, options and usage examples see
@@ -68,6 +70,20 @@ 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.
+
+If you want xorriso to report a "Build timestamp" with its option -version:
+    make buildstamped
+
 
                        Drives and Disk File Objects 
 
@@ -107,9 +123,13 @@ Better try to unmount an eventually mounted media before a write run.
 
 
 Besides true optical drives, xorriso can also address disk files as input or
-output drives. The addresses of the disk files have to be preceded by "stdio:".
+output drives. By default paths to files under /dev are accepted only if the
+device represents a real optical drive. Other device files may be addressed
+by prepending "stdio:" to the path.
 Like:
-    xorriso -dev stdio:/tmp/pseudo_drive ...more arguments...
+    xorriso -dev stdio:/dev/sdb ...more arguments...
+This rule may be changed by xorriso option -drive_class.
+Prefix "mmc:" causes a path to be accepted only if it is a real optical drive.
 
 
                               Testing
@@ -141,6 +161,26 @@ and vice versa:
    | less
 
 
+                             File Formats
+
+Currently there is only one file format peculiar to xorriso : sector maps
+which describe the valid and invalid blocks on a media or a disk copy of
+a media. xorriso creates and reads these file with its option -check_media.
+
+The file begins with 32 bytes of cleartext of which the last one is a
+newline character. The first 25 say "xorriso sector bitmap v2 ", the
+remaining six characters give the size of the info text as decimal number.
+This number of bytes follows the first 32 and will not be interpreted
+by xorriso. They are rather to inform a human reader about the media type
+and its track layout.
+After the info text there are two 4 byte signed integers, most significant
+byte first. The first one, N, gives the number of bits in the following bitmap
+and the second number S gives the number of 2 KiB blocks governed by a single
+bit in the map. Then come the bits in form of 8-bit bytes.
+Data block M is covered by bit B=M/S in the map, bit number B is stored in
+byte B/8 as bit B%8. A valid readable data block has its bit set to 1.
+
+
                              libisoburn
 
 xorriso is based on libisofs which does ISO 9600 filesystem aspects and on
@@ -160,9 +200,9 @@ and a matching dynamically linked xorriso binary.
 This binary is leaner but depends on properly installed libraries of suitable
 revision.
 
-Dynamic library and compile time header requirements for libisoburn-0.1.7 :
-- libburn.so.4  , version libburn-0.4.8 or higher
-- libisofs.so.6 , version libisofs-0.6.4 or higher
+Dynamic library and compile time header requirements for libisoburn-0.3.2 :
+- libburn.so.4  , version libburn-0.6.0 or higher
+- libisofs.so.6 , version libisofs-0.6.12 or higher
 libisoburn and xorriso will not start with libraries which are older than their
 headers seen at compile time. So compile in the oldest possible installation
 setup unless you have reason to enforce a newer bug fix level.
@@ -191,7 +231,7 @@ libburnia-project.org
 By Mario Danic           <mario.danic@gmail.com>,
    Vreixo Formoso        <metalpain2002@yahoo.es>
    Thomas Schmitt        <scdbackup@gmx.net>
-Copyright (C) 2006-2008 Mario Danic, Vreixo Formoso, Thomas Schmitt.
+Copyright (C) 2006-2009 Mario Danic, Vreixo Formoso, Thomas Schmitt.
 
 libburnia-project.org is inspired by and in other components still containing
 parts of old

xorriso/compile_xorriso.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # compile_xorriso.sh
-# Copyright 2005 - 2008 Thomas Schmitt, scdbackup@gmx.net, GPL
+# Copyright 2005 - 2009 Thomas Schmitt, scdbackup@gmx.net, GPL
 #
 # Not intended for general use in production installations !
 # Rather use:  ./bootstrap ; ./configure ; make
@@ -22,6 +22,8 @@ do_strip=0
 static_opts=
 warn_opts="-Wall"
 nglibisofs=1
+def_libreadline="-DXorriso_with_readlinE"
+link_libreadline="-lreadline"
 
 for i in "$@"
 do
@@ -35,11 +37,16 @@ do
   elif test "$i" = "-g"
   then
     debug_opts="-g -O0"
+  elif test "$i" = "-no_libreadline"
+  then
+    def_libreadline=""
+    link_libreadline=""
   elif test "$i" = "-help" -o "$i" = "--help" -o "$i" = "-h"
   then
     echo \
         "$xorr/compile_xorriso.sh : to be executed above top level directories"
     echo "Options:"
+    echo "  -no_libreadline   do not compile for and link with libreadline."
     echo "  -do_diet          produce capability reduced lean version."
     echo "  -do_strip         apply program strip to compiled programs."
     echo "  -g                produce debuggable programm."
@@ -75,21 +82,23 @@ libisofs="$libisofs $isofs"/tree.o
 libisofs="$libisofs $isofs"/util.o
 libisofs="$libisofs $isofs"/util_htable.o
 libisofs="$libisofs $isofs"/util_rbtree.o
+libisofs="$libisofs $isofs"/system_area.o
+libisofs="$libisofs $isofs"/make_isohybrid_mbr.o
+
 
-timestamp="$(date -u '+%Y.%m.%d.%H%M%S')"
 echo "Version timestamp :  $(sed -e 's/#define Xorriso_timestamP "//' -e 's/"$//' "$xorr"/xorriso_timestamp.h)"
-echo "Build timestamp   :  $timestamp"
+
+date -u '+#define Xorriso_build_timestamP "%Y.%m.%d.%H%M%S"' >"$xorr"/xorriso_buildstamp.h
+echo "Build timestamp   :  $(sed -e 's/#define Xorriso_build_timestamP "//' -e 's/"$//' "$xorr"/xorriso_buildstamp.h)"
 
 echo "compiling program $xorr/xorriso.c $static_opts $debug_opts $def_opts"
-cc -I. -DXorriso_with_maiN -DXorriso_with_regeX -DXorriso_with_readlinE \
+cc -I. -DXorriso_with_maiN $def_libreadline \
   $warn_opts \
   $static_opts \
   $debug_opts \
   $def_opts \
   $largefile_opts \
   \
-  -DXorriso_build_timestamP='"'"$timestamp"'"' \
-  \
   -o "$xorr"/xorriso \
   \
   "$xorr"/xorriso.c \
@@ -130,7 +139,7 @@ cc -I. -DXorriso_with_maiN -DXorriso_with_regeX -DXorriso_with_readlinE \
   \
   $libisofs \
   \
-  -lreadline \
+  $link_libreadline \
   \
   -lpthread
 

xorriso/configure_ac.txt

@@ -1,4 +1,4 @@
-AC_INIT([xorriso], [0.1.7], [http://libburnia-project.org])
+AC_INIT([xorriso], [0.3.2], [http://libburnia-project.org])
 AC_PREREQ([2.50])
 dnl AC_CONFIG_HEADER([config.h])	
 
@@ -8,15 +8,15 @@ AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([subdir-objects])
 
 BURN_MAJOR_VERSION=0
-BURN_MINOR_VERSION=4
-BURN_MICRO_VERSION=9
+BURN_MINOR_VERSION=6
+BURN_MICRO_VERSION=1
 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=6
+LIBISOFS_MICRO_VERSION=12
 AC_SUBST(LIBISOFS_MAJOR_VERSION)
 AC_SUBST(LIBISOFS_MINOR_VERSION)
 AC_SUBST(LIBISOFS_MICRO_VERSION)
@@ -95,14 +95,20 @@ else
     CFLAGS="$CFLAGS -DDEBUG"
 fi
 
-
+AC_ARG_ENABLE(libreadline,
+[  --enable-libreadline    Enable use of libreadline by xorriso, default=yes],
+               , enable_libreadline=yes)
+if test x$enable_libreadline = xyes; then
 dnl Check whether there is readline-devel and readline-runtime.
 dnl If not, erase this macro which would enable use of readline(),add_history()
-READLINE_DEF="-DXorriso_with_readlinE"
+    READLINE_DEF="-DXorriso_with_readlinE"
 dnl The empty yes case obviously causes -lreadline to be linked
-AC_CHECK_HEADER(readline/readline.h, AC_CHECK_LIB(readline, readline, , READLINE_DEF= ), READLINE_DEF= )
+    AC_CHECK_HEADER(readline/readline.h, AC_CHECK_LIB(readline, readline, , READLINE_DEF= ), READLINE_DEF= )
 dnl The X= in the yes case prevents that -lreadline gets linked twice
-AC_CHECK_HEADER(readline/history.h, AC_CHECK_LIB(readline, add_history, X= , READLINE_DEF= ), READLINE_DEF= )
+    AC_CHECK_HEADER(readline/history.h, AC_CHECK_LIB(readline, add_history, X= , READLINE_DEF= ), READLINE_DEF= )
+else
+    READLINE_DEF=
+fi
 AC_SUBST(READLINE_DEF)
 
 

xorriso/convert_man_to_html.sh

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

xorriso/make_xorriso_standalone.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # make_xorriso_standalone.sh
-# Copyright 2008 Thomas Schmitt, scdbackup@gmx.net, GPL
+# Copyright 2008 - 2009 Thomas Schmitt, scdbackup@gmx.net, GPL
 #
 # Not intended for general use in production installations !
 # 
@@ -25,11 +25,11 @@
 current_dir=$(pwd)
 lone_dir="$current_dir"/"xorriso-standalone"
 
-xorriso_rev=0.1.7
+xorriso_rev=0.3.2
 # For unstable uploads:
-xorriso_pl=""
+# xorriso_pl=""
 # For stable releases:
-# xorriso_pl=".pl00"
+xorriso_pl=".pl00"
 
 with_bootstrap_tarball=1
 
@@ -124,12 +124,17 @@ 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
+
 create_dir "$lone_dir"/test
 copy_files \
  test/compare_file.c \

xorriso/xorriso.h

@@ -2,7 +2,7 @@
 /* Command line oriented batch and dialog tool which creates, loads,
    manipulates and burns ISO 9660 filesystem images.
 
-   Copyright 2007-2008 Thomas Schmitt, <scdbackup@gmx.net>
+   Copyright 2007-2009 Thomas Schmitt, <scdbackup@gmx.net>
 
    Provided under GPL version 2.
 
@@ -19,7 +19,17 @@ struct XorrisO;
 /* --------------------- Fundamental Management ------------------- */
 
 /* Create a new xorriso object and tell it the program name to be used
-   with messages.
+   with messages and for decision of special behavior.
+   @param xorriso  returns the newly created XorrisO object 
+   @param progname typically argv[0] of main(). Some leafnames of the progname
+                   path have special meaning and trigger special behavior:
+                    "osirrox"    allows image-to-disk copying: -osirrox "on" 
+                    "xorrisofs"  activates permanent mkisofs emulation
+                    "genisofs"   alias of "xorrisofs"
+                    "mkisofs"    alias of "xorrisofs"
+                    "genisoimage"  alias of "xorrisofs"
+   @parm flag      unused yet, submit 0
+   @return         >0 success , <=0 failure, no object created
 */
 int Xorriso_new(struct XorrisO ** xorriso, char *progname, int flag);
 
@@ -72,6 +82,13 @@ int Xorriso_msgs_submit(struct XorrisO *xorriso,
                         int error_code, char msg_text[], int os_errno,
                         char severity[], int flag);
 
+/** Alternative call interface of Xorriso_msgs_submit with void* instead
+    of struct XorrisO*
+*/
+int Xorriso_msgs_submit_void(void *xorriso,
+                        int error_code, char msg_text[], int os_errno,
+                        char severity[], int flag);
+
 
 /** Evaluate an advise whether to abort or whether to go on with option
     processing. This should be called after any option function was processed.
@@ -133,6 +150,104 @@ int Xorriso_process_msg_queues(struct XorrisO *xorriso, int flag);
 
 
 
+/* The outlist stack allows to redirect the info and result messages from
+   their normal channels into a pair of string lists which can at some
+   later time be retrieved by the application.
+   These redirection caches can be stacked to allow stacked applications.
+   xorriso itself uses them for internal purposes. 
+*/
+
+/* A list item able of forming double chained lists */
+struct Xorriso_lsT;
+
+/** Maximum number of stacked redirections */
+#define Xorriso_max_outlist_stacK 32
+
+/** Enable a new redirection of info and/or result channel. The normal message
+    output and eventual older redirections will not see new messages until
+    the redirection is ended by a call to Xorriso_pull_outlists() with the
+    stack_handle value returned by this call.
+    Redirected output is not written to the files of Xorriso_option_logfile()
+    and the Xorriso_option_pkt_output() protocol will not be applied.
+    @param xorriso      The environment handle
+    @param stack_handle returns an id number which is unique as long as
+                        its redirection is stacked. It may be re-used after
+                        its redirection was pulled from the stack.
+    @param flag         Bitfield for control purposes
+                         bit0= redirect result channel
+                         bit1= redirect info channel
+                        If bit0 and bit1 are 0, both channels get redirected.
+    @return           1 on success, <=0 if failure
+*/
+int Xorriso_push_outlists(struct XorrisO *xorriso, int *stack_handle,
+                          int flag);
+
+
+/** Disable the redirection given by stack_handle. If it was the current
+    receiver of messages then switch output to the next older redirection
+    resp. to the normal channels if no redirections are stacked any more.
+    The messages collected by the disabled redirection are handed out as
+    two lists. Both lists have to be disposed via Xorriso_lst_destroy_all() 
+    when they are no longer needed.
+    The message lists are either NULL or represented by their first
+    Xorriso_lsT item.
+    @param xorriso       The environment handle
+    @param stack_handle  The id number returned by Xorriso_push_outlists()
+    @param result_list   Result and mark messages (usually directed to stdout)
+    @param info_list     Info and mark messages (usually directed to stderr)
+    @param flag          unused yet, submit 0
+    @return              1 on success, <=0 if failure
+*/
+int Xorriso_pull_outlists(struct XorrisO *xorriso, int stack_handle,
+                          struct Xorriso_lsT **result_list,
+                          struct Xorriso_lsT **info_list, int flag);
+
+
+/** Obtain the text message from the current list item.
+    @param entry    The current list item
+    @param flag     unused yet, submit 0
+    @return         Pointer to the text content of the list item.
+                    This pointer does not have to be freed.
+*/
+char *Xorriso_lst_get_text(struct Xorriso_lsT *entry, int flag);
+
+
+/** Obtain the address of the next item in the chain of messages.
+    An iteration over the output of Xorriso_pull_outlists() starts at the
+    returned result_list resp. info_list and ends when this function returns
+    NULL.
+    @param entry    The current list item
+    @param flag     unused yet, submit 0
+    @return         Pointer to the next list item or NULL if end of list.
+                    This pointer does not have to be freed.
+*/
+struct Xorriso_lsT *Xorriso_lst_get_next(struct Xorriso_lsT *entry, int flag);
+
+
+/** Obtain the address of the previous item in the chain of messages.
+    @param entry    The current list item
+    @param flag     unused yet, submit 0
+    @return         Pointer to the previous list item or NULL if start of list.
+                    This pointer does not have to be freed.
+*/
+struct Xorriso_lsT *Xorriso_lst_get_prev(struct Xorriso_lsT *entry, int flag);
+
+
+/** Destroy all list items which are directly or indirectly connected to
+    the given link item.
+    Apply this to each of the two list handles obtained by 
+    Xorriso_pull_outlists() when the lists are no longer needed.
+    @param lstring  *lstring will be freed and set to NULL.
+                    It is not dangerous to submit a pointer to a NULL-pointer.
+    @param flag     unused yet, submit 0
+    @return         -1= lstring was NULL (i.e. wrong use of this call),
+                     0= *lstring was already NULL,
+                     1= item actually disposed
+*/
+int Xorriso_lst_destroy_all(struct Xorriso_lsT **lstring, int flag);
+
+
+
 /* ---------------------------- Options API ------------------------ */
 /*    See man 1 xorriso for explanation of the particular options    */
 /*
@@ -167,6 +282,25 @@ 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 -backslash_codes */
+int Xorriso_option_backslash_codes(struct XorrisO *xorriso, char *mode,
+                                   int flag);
+
 /* Option -ban_stdio_write */
 int Xorriso_option_ban_stdio_write(struct XorrisO *xorriso, int flag);
 
@@ -186,6 +320,20 @@ int Xorriso_option_cdi(struct XorrisO *xorriso, char *iso_rr_path, int flag);
 /* Option -cdx */
 int Xorriso_option_cdx(struct XorrisO *xorriso, char *disk_path, int flag);
 
+/* Option -charset */
+/* @param flag bit0= set in_charset
+               bit1= set out_charset
+*/
+int Xorriso_option_charset(struct XorrisO *xorriso, char *name, int flag);
+
+/* Option -check_media */
+int Xorriso_option_check_media(struct XorrisO *xorriso,
+                               int argc, char **argv, int *idx, int flag);
+
+/* Option -check_media_defaults */
+int Xorriso_option_check_media_defaults(struct XorrisO *xorriso,
+                                    int argc, char **argv, int *idx, int flag);
+
 /* Option -chgrp alias -chgrpi , chgrp_r alias chgrpi */
 /* @param flag bit0=recursive (-chgrp_r)
 */
@@ -233,7 +381,10 @@ 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);
 
-/* Option -cpx */
+/* 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);
 
@@ -280,9 +431,17 @@ int Xorriso_option_errfile_log(struct XorrisO *xorriso,
 int Xorriso_option_error_behavior(struct XorrisO *xorriso, 
                                   char *occasion, char *behavior, int flag);
 
-/* Option -iso_rr_pattern "on"|"ls"|"off" */
-int Xorriso_option_iso_rr_pattern(struct XorrisO *xorriso, char *mode,
-                                  int flag);
+/* 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);
@@ -301,20 +460,32 @@ int Xorriso_option_fs(struct XorrisO *xorriso, char *size, int flag);
 /* Option -gid */
 int Xorriso_option_gid(struct XorrisO *xorriso, char *gid, int flag);
 
+/* Option -grow_blindly */
+int Xorriso_option_grow_blindly(struct XorrisO *xorriso, char *msc2, int flag);
+
 /* Option -help and part of -prog_help */
 int Xorriso_option_help(struct XorrisO *xorriso, int flag);
 
 /* Option -history */
 int Xorriso_option_history(struct XorrisO *xorriso, char *line, int flag);
 
+/* Option -iso_rr_pattern "on"|"ls"|"off" */
+int Xorriso_option_iso_rr_pattern(struct XorrisO *xorriso, char *mode,
+                                  int flag);
+
 /* Option -joliet "on"|"off" */
 int Xorriso_option_joliet(struct XorrisO *xorriso, char *mode, int flag);
 
+/* Option -list_delimiter */
+int Xorriso_option_list_delimiter(struct XorrisO *xorriso, char *text,
+                                  int flag);
+
 /* Option -list_formats */
 int Xorriso_option_list_formats(struct XorrisO *xorriso, int flag);
 
 /* Option -load session|track|sbsector value */
-/* @return <=0 error , 1 success, 2 revoked by -reassure
+/* @param flag bit0= with adr_mode sbsector: adr_value is possibly 16 too high
+   @return <=0 error , 1 success, 2 revoked by -reassure
 */
 int Xorriso_option_load(struct XorrisO *xorriso, char *adr_mode,
                           char *adr_value, int flag);
@@ -350,6 +521,15 @@ int Xorriso_option_lsx(struct XorrisO *xorriso, int argc, char **argv,
 int Xorriso_option_map(struct XorrisO *xorriso, char *disk_path,
                        char *iso_path, int flag);
 
+/* Options -map_l , -compare_l , -update_l , -extract_l */
+/* @param flag bit8-11= mode 0= -map_l
+                             1= -compare_l
+                             2= -update_l
+                             3= -extract_l
+*/
+int Xorriso_option_map_l(struct XorrisO *xorriso, int argc, char **argv,
+                         int *idx, int flag);
+
 /* Option -mark */
 int Xorriso_option_mark(struct XorrisO *xorriso, char *mark, int flag);
 
@@ -357,6 +537,13 @@ int Xorriso_option_mark(struct XorrisO *xorriso, char *mark, int flag);
 int Xorriso_option_mkdiri(struct XorrisO *xorriso, int argc, char **argv,
                           int *idx, int flag);
 
+/* Option -mount */
+/* @param bit0= print mount command to result channel rather than performing it
+*/
+int Xorriso_option_mount(struct XorrisO *xorriso, char *dev, char *adr_mode,
+                         char *adr, char *cmd, int flag);
+
+
 /* Option -mv alias -mvi */
 int Xorriso_option_mvi(struct XorrisO *xorriso, int argc, char **argv,
                       int *idx, int flag);
@@ -367,11 +554,15 @@ int Xorriso_option_no_rc(struct XorrisO *xorriso, int flag);
 /* Option -not_leaf */
 int Xorriso_option_not_leaf(struct XorrisO *xorriso, char *pattern, int flag);
 
+/* Option -not_list , -quoted_not_list */
+/* @param flag bit0= -quoted_not_list */
+int Xorriso_option_not_list(struct XorrisO *xorriso, char *adr, int flag);
+
 /* Option -not_paths */
 int Xorriso_option_not_paths(struct XorrisO *xorriso, int argc, char **argv,
                              int *idx, int flag);
 
-/* Option -options_from_file*/
+/* Option -options_from_file */
 /* @return <=0 error , 1 = success , 3 = request to end program run */
 int Xorriso_option_options_from_file(struct XorrisO *xorriso, char *adr,
                                      int flag);
@@ -382,13 +573,21 @@ int Xorriso_option_osirrox(struct XorrisO *xorriso, char *mode, int flag);
 /* Option -overwrite "on"|"nondir"|"off" */
 int Xorriso_option_overwrite(struct XorrisO *xorriso, char *mode, int flag);
 
+/* Option -pacifier */
+int Xorriso_option_pacifier(struct XorrisO *xorriso, char *style, int flag);
+
 /* Option -padding */
 int Xorriso_option_padding(struct XorrisO *xorriso, char *size, int flag);
 
 /* Option -page */
 int Xorriso_option_page(struct XorrisO *xorriso, int len, int width, int flag);
 
-/* Option -path-list */
+/* Option -paste_in */
+int Xorriso_option_paste_in(struct XorrisO *xorriso, char *iso_rr_path,
+                          char *disk_path, char *start, char *count, int flag);
+
+/* Option -path_list , -quoted_path_list */
+/* @param flag bit0= -quoted_path_list */
 int Xorriso_option_path_list(struct XorrisO *xorriso, char *adr, int flag);
 
 /* Option -pathspecs */
@@ -423,6 +622,10 @@ int Xorriso_option_pwdx(struct XorrisO *xorriso, int flag);
 /* Option -reassure "on"|"tree"|"off" */
 int Xorriso_option_reassure(struct XorrisO *xorriso, char *mode, int flag);
 
+/* Option -relax_compliance */
+int Xorriso_option_relax_compliance(struct XorrisO *xorriso, char *mode,
+                                    int flag);
+
 /* Option -report_about */
 int Xorriso_option_report_about(struct XorrisO *xorriso, char *severity, 
                                 int flag);

xorriso/xorriso_buildstamp.h

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

xorriso/xorriso_buildstamp_none.h

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

xorriso/xorriso_eng.html

@@ -2,7 +2,7 @@
 
 <HEAD>
 <META NAME="description" CONTENT="xorriso, creates, loads, manipulates and writes ISO 9660 filesystem images with Rock Ridge extensions">
-<META NAME="keywords" CONTENT="xorriso, libburn, libburnia, burn, CD, DVD, ISO, ISO 9660, RockRidge, Rock Ridge, linux, recording, burning, CD-R, CD-RW, DVD-R, DVD-RW, DVD+RW, DVD+R, DVD+R DL, BD-RE, scdbackup">
+<META NAME="keywords" CONTENT="xorriso, libburn, libburnia, burn, CD, DVD, ISO, ISO 9660, RockRidge, Rock Ridge, Linux, FreeBSD, recording, burning, CD-R, CD-RW, DVD-R, DVD-RW, DVD+RW, DVD+R, DVD+R DL, BD-RE, BD-R, scdbackup">
 <META NAME="robots" CONTENT="follow">
 <TITLE>xorriso homepage english</TITLE>
 </HEAD>
@@ -14,16 +14,18 @@
 <P><H2> Homepage of </H2>
 <H1> xorriso </H1>
 
-<H2>ISO 9660 Rock Ridge Filesystem Manipulator for Linux</H2>
+<H2>ISO 9660 Rock Ridge Filesystem Manipulator for Linux and FreeBSD</H2>
 </CENTER>
 
 <P>
 <H2>Purpose:</H2>
-xorriso maps file objects from POSIX compliant filesystems
+xorriso copies file objects from POSIX compliant filesystems
 into Rock Ridge enhanced ISO 9660 filesystems and allows
 session-wise manipulation of such filesystems. It can load the management
 information of existing ISO images and it writes the session results to
 optical media or to filesystem objects.
+<BR>
+Vice versa xorriso is able to restore file objects from ISO 9660 filesystems.
 </P>
 <P>
 
@@ -46,6 +48,8 @@ and to MMC-5 for DVD or BD).
 <DT>Linux with kernel 2.4 or higher (and libc, of course) :</DT>
 <DD>With kernel 2.4 an ATA drive has to be under ide-scsi emulation.</DD>
 <DD>With kernel 2.6 the drive should not be under ide-scsi.</DD>
+<DT>or FreeBSD (with libc, of course) :</DT>
+<DD>ATAPI/CAM support has to be enabled in the kernel, see atapicam(4).</DD>
 <DT>libpthread</DT>
 <DD>is supposed to be a standard system component.</DD>
 <DT>libreadline and libreadline-dev</DT>
@@ -58,14 +62,15 @@ and to MMC-5 for DVD or BD).
 GPL software included:<BR>
 </H2>
 <DL>
-<DT>libburn-0.4.9</DT>
-<DD>reads and writes data from and to CD, DVD, BD-RE.</DD>
+<DT>libburn-0.6.1</DT>
+<DD>reads and writes data from and to CD, DVD, BD.</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>
+developed and maintained since August 2006 by
+Thomas Schmitt from team of libburnia-project.org)</DD>
+<DT>libisofs-0.6.12</DT>
+<DD>operates on ISO 9660 filesystem images.</DD>
 <DD>(By Vreixo Formoso and Mario Danic from team of libburnia-project.org)</DD>
-<DT>libisoburn-0.1.6</DT>
+<DT>libisoburn-0.3.2</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>
@@ -76,7 +81,8 @@ cdrecord and mkisofs.</A>
 </P>
 
 <P>
-This program system has been tested on Intel/AMD Linux systems only.<BR>
+This program has been tested on Intel/AMD Linux
+and on FreeBSD systems.<BR>
 For ports to other usable systems <A HREF="#contact">contact us</A>.
 </P>
 
@@ -95,24 +101,32 @@ Operates on an existing ISO image or creates a new one.
 Copies files from filesystem into the ISO image.
 </LI>
 <LI>
-Renames or deletes file objects in the ISO image.
-</LI>
-<LI>
-Changes file properties in the ISO image.
+Changes file properties, renames or deletes file objects in the ISO image.
 </LI>
 <LI>
 Updates ISO subtrees incrementally to match given disk subtrees.
 </LI>
 <LI>
-Can write result as completely new image to optical media or
-filesystem objects.
+Writes result as completely new image or as add-on session
+to optical media or filesystem objects.
 </LI>
 <LI>
-Can write result as add-on session to appendable multi-session media,
-to overwriteable media, to regular files, and to block devices.
+Can activate ISOLINUX boot images by El Torito boot record and by MBR.
 </LI>
 <LI>
-Scans for optical drives, blanks re-useable optical media.
+Can perform multi-session tasks as emulation of mkisofs and cdrecord.
+</LI>
+<LI>
+Can restore single files and whole trees from ISO image to disk filesystem.
+</LI>
+<LI>
+Can issue commands to mount older sessions on Linux or FreeBSD.
+</LI>
+<LI>
+Can check media for damages and copy readable blocks to disk.
+</LI>
+<LI>
+Scans for optical drives, blanks re-useable optical media, formats media.
 </LI>
 <LI>
 Suitable for:
@@ -124,9 +138,6 @@ Reads its instructions from command line arguments, dialog, and batch files.
 <LI>
 Provides navigation commands for interactive ISO image manipulation.
 </LI>
-<LI>
-Adjustable thresholds for abort, exit value, and problem reporting.
-</LI>
 
 </UL>
 </P>
@@ -134,8 +145,14 @@ Adjustable thresholds for abort, exit value, and problem reporting.
 <P>
 <H2>Command Examples:</H2>
 <DL>
+
 <DT>Get an overview of drives and their addresses</DT>
 <DD>#<KBD>&nbsp;xorriso -devices</KBD></DD>
+<DD><KBD>...</KBD></DD>
+<DD><KBD>0  -dev '/dev/sr0'  rwrw-- :  'TSSTcorp' 'CDDVDW SH-S203B'</KBD></DD>
+<DD><KBD>1  -dev '/dev/scd1' rwrw-- :  'PHILIPS ' 'SPD3300L'</KBD></DD>
+<DD><KBD>2  -dev '/dev/hda'  rwrw-- :  'HL-DT-ST' 'DVD-ROM GDR8162B'</KBD></DD>
+<DD><KBD>...</KBD></DD>
 <DT>Being superuser avoids permission problems with /dev/srN resp. /dev/hdX .
 </DT>
 <DT>Ordinary users should then get granted rw access to the /dev files
@@ -164,7 +181,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>Check the result:</DT>
+<DT>Have a look at the result:</DT>
 <DD>$<KBD>&nbsp;xorriso -indev /dev/sr0 -du / -- -toc 2>&amp;1 | less</KBD></DD>
 
 <DT>
@@ -247,18 +264,19 @@ already been done by a previous -commit.</DT>
 <HR>
 </DT>
 
-<DT>The following command can be run on blank media to create a
-copy of the mentioned disk directory trees, and it can be run on appendable
-media to perform a minimal set of change operations which update the
-old ISO copies to match the new disk trees.
-Older states can be retrieved by help of mount option "session=" from CD-R[W],
-by help of "sbsector=" from other media.
-So this constitutes true incremental backup.
+<DT>The following command performs incremental backup.
+It can be run on blank media to create a copy of the mentioned disk
+directory trees, and it can be run on appendable media to perform a
+minimal set of change operations which update the old ISO copies
+to match the new disk trees.
+Older states can be retrieved by help of mount options like "sbsector="
+or by help of xorriso option -mount.
 <BR>
-The copies will be complete, except all file names ending
-with ".o" or ".swp" which are excluded by options -not_leaf.
+Only blank media or media with volume id "PROJECTS_MAIL_..." will be accepted.
+Files with names ending by ".o" or ".swp" are excluded by options -not_leaf.
 </DT>
-<DD>$<KBD>&nbsp;xorriso -dev /dev/sr0 \</KBD></DD>
+<DD>$<KBD>&nbsp;xorriso -assert_volid 'PROJECTS_MAIL_*' FATAL \ \</KBD></DD>
+<DD><KBD>&nbsp;&nbsp; -dev /dev/sr0 \</KBD></DD>
 <DD><KBD>&nbsp;&nbsp; -volid PROJECTS_MAIL_"$(date '+%Y_%m_%d_%H%M%S')" \</KBD></DD>
 <DD><KBD>&nbsp;&nbsp; -not_leaf '*.o' -not_leaf '*.swp' \</KBD></DD>
 <DD><KBD>&nbsp;&nbsp; -update_r /home/thomas/open_source_projects /open_source_projects \</KBD></DD>
@@ -269,11 +287,100 @@ with ".o" or ".swp" which are excluded by options -not_leaf.
 <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 disk:
+</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 -mount /dev/sr0 volid '*_2008_08_14_*' /mnt </KBD></DD>
+<DT>
+To be later unmounted by: <KBD>umount /mnt</KBD>
+</DT>
+
+<DT>
+<HR>
+</DT>
+
+<DT>
+After the user has already created a suitable file tree on disk
+and copied the ISOLINUX files into subdirectory ./boot/isolinux of
+that tree, xorriso can burn an El Torito bootable media:
+</DT>
+<DD>$<KBD>&nbsp;xorriso -outdev /dev/sr0 -blank as_needed \</KBD></DD>
+<DD><KBD>&nbsp;&nbsp; -map /home/me/ISOLINUX_prepared_tree / \</KBD></DD>
+<DD><KBD>&nbsp;&nbsp; -boot_image isolinux dir=/boot/isolinux</KBD></DD>
+<DT>
+An additional MBR is generated if the file isolinux.bin is modern enough
+(syslinux version 3.72) and ready for "isohybrid". An MBR enables booting
+from hard disk or USB stick.
+<HR>
+</DT>
+
+<DT>ISO images may not only be stored on optical media but also in
+regular disk files or block devices for full multi-session operation.
+</DT>
+<DD>$<KBD>&nbsp;xorriso -dev /tmp/regular_file ...other.options...</DD>
+<DT>
+A default setting for safety reasons requires that files below /dev/
+need prefix &quot;stdio:&quot; if they do not lead to MMC burner devices.
+Be cautious not to overwrite your hard disk instead of your USB stick:
+</DT>
+<DD>$<KBD>&nbsp;xorriso -dev stdio:/dev/sdb ...other.options...</DD>
+
+<DT>Other file types are suitable only for writing but not for reading:</DT>
+<DD>$<KBD>&nbsp;xorriso -outdev /tmp/named_pipe ...other.options...</DD>
+
 <DT>In batch mode it is possible to operate xorriso in a pipeline
 with an external consumer of the generated ISO image. Any message
 output will be redirected to stderr in this case.</DT>
 <DD>$<KBD>&nbsp;xorriso -outdev - ...other.options... | consumer</KBD></DD>
 
+
+<DT>
+<HR>
+</DT>
+
+<DT>
+Let xorriso serve underneath growisofs via its alias name "xorrisofs"
+which enables mkisofs emulation:
+</DT>
+<DD>$<KBD>&nbsp;export MKISOFS="xorrisofs"</KBD></DD>
+<DD>$<KBD>&nbsp;growisofs -Z /dev/dvd /some/files</KBD></DD>
+<DD>$<KBD>&nbsp;growisofs -M /dev/dvd /more/files</KBD></DD>
+<DT>
+One may switch from mkisofs emulation to xorriso's own command mode:
+</DT>
+<DD>$<KBD>&nbsp;growisofs -M /dev/dvd -- outdev - -update_r /my/files /files
+</KBD></DD>
+
+<DT>
+<HR>
+</DT>
+
+<DT>If for any reason the reading operating system mishandles the ISO image
+or some files in it, one may enable reverse operation of xorriso and copy
+files or trees to disk:
+<DD>$<KBD>&nbsp;xorriso -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>
@@ -286,10 +393,6 @@ output will be redirected to stderr in this case.</DT>
 <DD>$<KBD>&nbsp;<A HREF="man_1_xorriso.html">man xorriso</A></KBD></DD>
 </DL>
 
-
-Testers wanted who are willing to risk some double layer DVD media or
-are interested in using BD-R media.
-
 </P>
 
 <HR>
@@ -297,8 +400,8 @@ are interested in using BD-R media.
 <P>
 <DL>
 <DT><H3>Download as source code (see README):</H3></DT>
-<DD><A HREF="xorriso-0.1.6.pl00.tar.gz">xorriso-0.1.6.pl00.tar.gz</A>
-(980 KB).
+<DD><A HREF="xorriso-0.3.2.pl00.tar.gz">xorriso-0.3.2.pl00.tar.gz</A>
+(1100 KB).
 </DD>
 </DL>
 </DD>
@@ -322,22 +425,27 @@ an <A HREF="http://www.opensource.org/">Open Source</A> approved license</DD>
 </P>
 
 <HR>
+
 <P>
-Bug fixes towards xorriso-0.1.4.pl00:
+Bug fixes towards xorriso-0.3.0.pl00:
 <UL>
-<LI>-update_r and others did not work properly with relative paths</LI>
+<LI>Options -extract and -extract_single were not disabled with -osirrox off
+<!--
+<LI>- none -</LI>
+-->
+
 </UL>
+
 </P>
+
 <P>
-Enhancements towards previous stable version xorriso-0.1.4.pl00:
+Enhancements towards previous stable version xorriso-0.3.0.pl00:
 <UL>
-<LI>Support for BD-RE</LI>
-<LI>New options -map and -map_single</LI>
-<LI>New options -not_paths, -not_leaf, -not_list, -not_mgt, -as mkisofs -m</LI>
-<LI>Emulated -toc on overwriteable media, new -toc layout with volume id</LI>
-<LI>New option -load makes alternative sessions accessible</LI>
-<LI>New -blank and -format modes 'as_needed'</LI>
-<LI>New option -list_formats and -format mode 'by_index_' </LI>
+<LI>New options -mount, -mount_cmd, -session_string</LI>
+<LI>By using libburn-0.6.1: support for BD-R media</LI>
+<LI>New -format modes by_size_ and fast_by_size_</LI>
+<LI>New option -assert_volid</LI>
+<LI>New option -drive_class for safety management of pseudo-drive access</LI>
 </UL>
 </P>
 
@@ -345,28 +453,27 @@ Enhancements towards previous stable version xorriso-0.1.4.pl00:
 
 <P>
 <DL>
-<DT><H3>Development snapshot, version 0.1.7 :</H3></DT>
-<DD>Bug fixes towards xorriso-0.1.6.pl00:
+<DT><H3>Development snapshot, version 0.3.3 :</H3></DT>
+<DD>Bug fixes towards xorriso-0.3.2.pl00:
 <UL>
-<LI>-indev -outdev modifying to overwriteable target yielded unmountable results</LI>
-<!-- 
+
+</LI>
 <LI>- none yet -</LI>
+<!-- 
  -->
 </UL>
 </DD>
-<DD>Enhancements towards stable version 0.1.6.pl00:
+<DD>Enhancements towards stable version 0.3.2.pl00:
 <UL>
-<LI>New options -osirrox and -cpx</LI>
-<LI>New option -stream_recording</LI>
-<!-- 
 <LI>- none yet -</LI>
+<!-- 
  -->
 </UL>
 </DD>
 <DD>&nbsp;</DD>
-<DD><A HREF="README_xorriso_devel">README 0.1.7</A>
-<DD><A HREF="xorriso_help_devel">xorriso_0.1.7 -help</A></DD>
-<DD><A HREF="man_1_xorriso_devel.html">man xorriso (as of 0.1.7)</A></DD>
+<DD><A HREF="README_xorriso_devel">README 0.3.3</A>
+<DD><A HREF="xorriso_help_devel">xorriso_0.3.3 -help</A></DD>
+<DD><A HREF="man_1_xorriso_devel.html">man xorriso (as of 0.3.3)</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
@@ -376,8 +483,8 @@ libburnia libraries.
 installation see README)
 </DD>
 <DD>
-<A HREF="xorriso-0.1.7.tar.gz">xorriso-0.1.7.tar.gz</A>
-(980 KB).
+<A HREF="xorriso-0.3.3.tar.gz">xorriso-0.3.3.tar.gz</A>
+(1100 KB).
 </DD>
 <DT>A dynamically linked development version of xorriso can be obtained
 from repositories of
@@ -399,13 +506,12 @@ versions for dynamic linking. Only release versions are safe for that.
 </KBD></DD>
 <DD>Install: <KBD><B>cd libisoburn ; ./bootstrap ; ./configure --prefix /usr ; make ; make install</B>
 </KBD></DD>
-<DD>Build of SVN versions needs <A HREF="http://sources.redhat.com/autobook/">
+<DT>Build of SVN versions needs <A HREF="http://sources.redhat.com/autobook/">
 autotools</A> of at least version 1.7 installed.
 But after the run of <KBD>./bootstrap</KBD>, only
-vanilla tools like make and gcc are needed.</DD>
-</DD>
+vanilla tools like make and gcc are needed.
+</DT>
 <DD>&nbsp;</DD>
-
 </DL>
 </P>
 

xorriso/xorriso_makefile_am.txt

@@ -16,10 +16,23 @@ xorriso_xorriso_CPPFLAGS = -I./libburn -I./libisofs -I./libisoburn -I./xorriso
 
 # No readline in the vanilla version because the necessary headers
 # are in a separate readline-development package.
-xorriso_xorriso_CFLAGS = -DXorriso_standalonE -DXorriso_with_maiN -DXorriso_with_regeX $(READLINE_DEF)
+xorriso_xorriso_CFLAGS = -DXorriso_standalonE -DXorriso_with_maiN $(READLINE_DEF)
 
 xorriso_xorriso_LDADD = $(THREAD_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_SOURCES = \
 	\
 	xorriso/xorriso.h \
@@ -28,6 +41,7 @@ xorriso_xorriso_SOURCES = \
 	xorriso/xorrisoburn.h \
 	xorriso/xorrisoburn.c \
 	xorriso/xorriso_timestamp.h \
+	xorriso/xorriso_buildstamp.h \
 	\
 	libisoburn/libisoburn.h \
 	libisoburn/isoburn.h \
@@ -82,6 +96,9 @@ xorriso_xorriso_SOURCES = \
         libisofs/filter.h \
         libisofs/filter.c \
         libisofs/filters/xor_encrypt.c \
+        libisofs/system_area.h \
+        libisofs/system_area.c \
+        libisofs/make_isohybrid_mbr.c \
 	\
 	libburn/async.c \
 	libburn/async.h \
@@ -137,7 +154,6 @@ xorriso_xorriso_SOURCES = \
 	\
 	version.h
 
-
 noinst_PROGRAMS = \
 	test/compare_file
 
@@ -151,6 +167,30 @@ test_compare_file_LDADD =
 test_compare_file_SOURCES = test/compare_file.c
 
 
+# Install symbolic links to the xorriso binary
+#
+install-exec-hook:
+	if test -e "$(DESTDIR)$(bindir)"/xorrisofs ; then rm "$(DESTDIR)$(bindir)"/xorrisofs ; else echo ; fi
+	ln -s xorriso "$(DESTDIR)$(bindir)"/xorrisofs
+	if test -e "$(DESTDIR)$(bindir)"/osirrox ; then rm "$(DESTDIR)$(bindir)"/osirrox ; else echo ; fi
+	ln -s xorriso "$(DESTDIR)$(bindir)"/osirrox
+	if test -e "$(DESTDIR)$(bindir)"/xorrecord ; then rm "$(DESTDIR)$(bindir)"/xorrecord ; else echo ; fi
+	ln -s xorriso "$(DESTDIR)$(bindir)"/xorrecord
+
+
+
+# Alternative to the disabled .PHONY above.
+# Trying to create a build timestamp file semi-manually:  make buildstamped
+#
+buildstamp:
+	date -u '+#define Xorriso_build_timestamP "%Y.%m.%d.%H%M%S"' >xorriso/xorriso_buildstamp.h
+	cat xorriso/xorriso_buildstamp.h
+
+# For now   make buildstamped  has to be performed manually.
+buildstamped: buildstamp
+	make
+
+
 ## ========================================================================= ##
 
 # Indent source files
@@ -184,6 +224,7 @@ EXTRA_DIST = \
 	COPYING \
 	INSTALL \
 	xorriso/changelog.txt \
+	xorriso/xorriso_buildstamp_none.h \
 	$(man_MANS)
 	
 

xorriso/xorriso_private.h

@@ -2,7 +2,7 @@
 /* Command line oriented batch and dialog tool which creates, loads,
    manipulates and burns ISO 9660 filesystem images.
 
-   Copyright 2007-2008 Thomas Schmitt, <scdbackup@gmx.net>
+   Copyright 2007-2009 Thomas Schmitt, <scdbackup@gmx.net>
 
    Provided under GPL version 2.
 
@@ -18,7 +18,7 @@
 #ifndef Xorriso_private_includeD
 #define Xorriso_private_includeD yes
 
-#define Xorriso_program_versioN "0.1.7"
+#define Xorriso_program_versioN "0.3.2"
 
 /** The source code release timestamp */
 #include "xorriso_timestamp.h"
@@ -26,28 +26,27 @@
 #define Xorriso_timestamP "-none-given-"
 #endif
 
-/** The binary build timestamp is to be set externally by the compiler */
+/** The binary build timestamp is to be set externally by the compiler
+    or by a macro definition in xorriso_buildstamp.h.
+*/
+#include "xorriso_buildstamp.h"
 #ifndef Xorriso_build_timestamP
 #define Xorriso_build_timestamP "-none-given-"
 #endif
 
-
-/* Because regex_t is mentioned in struct XorrisO */
-#ifdef Xorriso_with_regeX
 #include <regex.h>
-#endif /* Xorriso_with_regeX */
 
 
 #define Smem_malloC malloc
 #define Smem_freE free
 #define SfileadrL 4096
 
-/* <<< ??? */
-typedef int (*Cleanup_app_handler_T)();
-
 struct LinkiteM;          /* Trace of hops during symbolic link resolution */
 struct ExclusionS;        /* List of -not_* conditions */
 struct PermiteM;          /* Stack of temporarily altered access permissions */
+struct SpotlisT;          /* List of intervals with different read qualities */
+struct CheckmediajoB;     /* Parameters for Xorriso_check_media() */
+struct SectorbitmaP;      /* Distiniction between valid and invalid sectors */
 
 
 /* maximum number of history lines to be reported with -status:long_history */
@@ -62,6 +61,13 @@ struct PermiteM;          /* Stack of temporarily altered access permissions */
 #define Xorriso_rc_nuM 4
 
 
+/* Default setting for the size limit of single data files:
+   100 extents with 4 GB - 2 kB each = 400 GB - 200 kB
+*/
+#define Xorriso_default_file_size_limiT \
+        (((off_t) 400) * ((off_t) 1024*1024*1024) - (off_t) 204800)
+
+
 struct XorrisO { /* the global context of xorriso */
 
  int libs_are_started;
@@ -71,6 +77,13 @@ struct XorrisO { /* the global context of xorriso */
  char initial_wdx[SfileadrL];
  int no_rc;
 
+ /* Command line argument emulations:
+      0=xorriso mode
+      1=mkisofs mode
+      2=cdrecord mode
+ */
+ int argument_emulation;
+
  /** List of startupfiles */
  char rc_filenames[Xorriso_rc_nuM][SfileadrL];
  int rc_filename_count;
@@ -82,9 +95,12 @@ struct XorrisO { /* the global context of xorriso */
  int add_plainly;
  off_t split_size;
 
+ char list_delimiter[81];
+
  /* >>> put libisofs aspects here <<< */
 
  int do_joliet;
+ int relax_compliance;        /* opaque bitfield to be set by xorrisoburn */
  int do_follow_pattern;
  int do_follow_param;
  int do_follow_links;
@@ -104,8 +120,11 @@ struct XorrisO { /* the global context of xorriso */
  char volid[33];
  int volid_default;
  char loaded_volid[33];
+ char assert_volid[SfileadrL];
+ char assert_volid_sev[80];
 
  char publisher[129];
+ char application_id[129];
 
  char session_logfile[SfileadrL];
  int session_lba;
@@ -113,8 +132,14 @@ struct XorrisO { /* the global context of xorriso */
 
  /* >>> put libburn/isoburn aspects here */
 
+ struct Xorriso_lsT *drive_blacklist;
+ struct Xorriso_lsT *drive_greylist;
+ struct Xorriso_lsT *drive_whitelist;
+
  int toc_emulation_flag; /* bit0= bit3 for isoburn_drive_aquire()
                                   scan -ROM profiles for ISO sessions
+                            bit1= bit4 for isoburn_drive_aquire()
+                                  do not emulate TOC on overwriteable media
                          */
 
  int image_start_mode;  /* From what address to load the ISO image
@@ -123,6 +148,8 @@ struct XorrisO { /* the global context of xorriso */
                             1= value is session number
                             2= value is track number
                             3= value is lba
+                           bit16= with mode 3 : value is possibly 16 too high.
+                                  Let isoburn_set_msc1() adjust it.
                            bit30= interference with normal msc1 processing
                                   is enabled. Without this bit,
                                   isoburn_set_msc1() will not be called.
@@ -135,27 +162,55 @@ struct XorrisO { /* the global context of xorriso */
  char indev[SfileadrL];
  void *in_drive_handle;  /* interpreted only by xorrisoburn.c */
  void *in_volset_handle; /* interpreted only by xorrisoburn.c */
+ char *in_charset;       /* The charset to interpret the filename bytes */
 
  int volset_change_pending; /* whether -commit would make sense */
  int no_volset_present;     /* set to 1 on first failure */
 
+ struct CheckmediajoB *check_media_default;
+ struct SectorbitmaP *in_sector_map; /* eventual sector validity bitmap */
+
+
  char outdev[SfileadrL];
  void *out_drive_handle; /* interpreted only by xorrisoburn.c */
+ char *out_charset;      /* The charset to produce the filename bytes for */
  int dev_fd_1; /* The fd which substitutes for /dev/fd/1 and is
                      connected to externaly perveived stdout.
                   */
 
+ int grow_blindly_msc2; /* if >= 0 this causes growing from drive to drive.
+                           The value is used as block address offset for
+                           image generation. Like in: mkisofs -C msc1,msc2
+                         */
+
  int ban_stdio_write;
  int do_dummy;
  int do_close;
  int speed;     /* in libburn units : 1000 bytes/second , 0 = Max, -1 = Min */
  int fs;        /* fifo size in 2048 byte chunks : at most 1 GB */
  int padding;   /* number of bytes to add after ISO 9660 image */
+
+ int alignment; /* if > 0 : image size alignment in 2048 byt blocks */
+                /* <<< not sure whether to keep this after libisofs will have
+                       learned to pad up MBR images to full MB */
+
  int do_stream_recording;
 
  int keep_boot_image;
  int patch_isolinux_image;
+ char boot_image_bin_path[SfileadrL];
+ int boot_image_emul; /* 0=no emulation
+                        (1=emulation as hard disk)
+                        (2=emulation as floppy)
+                      */
+ char boot_image_cat_path[SfileadrL];
+ off_t boot_image_load_size;
+ int boot_image_isohybrid; /* 0=off , 1=auto , 2=on , 3=force */
 
+ /* LBA of boot image after image loading */
+ int loaded_boot_bin_lba;
+ /* Path of the catalog node after image loading */
+ char loaded_boot_cat_path[SfileadrL];
 
  /* XORRISO options */
  int allow_graft_points;
@@ -164,9 +219,24 @@ struct XorrisO { /* the global context of xorriso */
  int do_concat_split;  /* 1= restore complete split file directories as
                              regular files
                         */
+ int do_auto_chmod;    /* 1= eventually temporarily open access permissions
+                             of self-owned directories during restore
+                        */
 
- int dialog;
+ int dialog;  /* 0=off , 1=single-line , 2=multi-line */
 
+ int bsl_interpretation;
+                     /* whether to run input through Sfile_bsl_interpreter():
+                        bit0-1= dialog and quoted file reading
+                          0= no interpretation, leave unchanged
+                          1= only inside double quotes
+                          2= outside single quotes
+                          3= everywhere
+                        bit2-3= reserved as future expansion of bit0-1
+                        bit4= interpretation within program start arguments
+                        bit5= perform backslash encoding with results
+                        bit6= perform backslash encoding with info texts
+                     */
 
  /* Pattern matching facility. It still carries legacy from scdbackup/askme.c
     but is fully functional for xorriso.
@@ -192,6 +262,8 @@ struct XorrisO { /* the global context of xorriso */
 
  int temp_mem_limit;
 
+ off_t file_size_limit;
+
  struct ExclusionS *disk_exclusions;
  int disk_excl_mode; /* bit0= on (else off)
                         bit1= parameter too (else rekursion only)
@@ -206,7 +278,17 @@ struct XorrisO { /* the global context of xorriso */
  char mark_text[SfileadrL]; /* ( stdout+stderr, M: ) */
  int packet_output;
  char logfile[4][SfileadrL];
+ FILE *logfile_fp[4];
+ FILE *pktlog_fp;
+ struct Xorriso_lsT *result_msglists[Xorriso_max_outlist_stacK];
+ struct Xorriso_lsT *info_msglists[Xorriso_max_outlist_stacK];
+ int msglist_flags[Xorriso_max_outlist_stacK]; /* bit0= result is redirected
+                                                  bit1= info is redirected
+                                               */
+ int msglist_stackfill;
+
  int status_history_max; /* for -status long_history */
+ 
 
  char report_about_text[20];
  int report_about_severity;
@@ -221,6 +303,7 @@ struct XorrisO { /* the global context of xorriso */
  FILE *errfile_fp;
 
  int img_read_error_mode; /* 0=best_effort , 1=failure , 2=fatal */
+ int extract_error_mode; /* 0=best_effort , 1=keep , 2=delete */
 
  char return_with_text[20];
  int return_with_severity;
@@ -229,10 +312,8 @@ struct XorrisO { /* the global context of xorriso */
  char eternal_problem_status_text[20];
 
  /* temporary search facilities */
-#ifdef Xorriso_with_regeX
  regex_t *re;
  regmatch_t match[1]; 
-#endif /* Xorriso_with_regeX */
  char **re_constants;
  int re_count;
  int re_fill;
@@ -253,12 +334,14 @@ struct XorrisO { /* the global context of xorriso */
  double error_count; /* double will not roll over */
 
  /* pacifiers */
+ int pacifier_style; /* 0= xorriso, 1=mkisofs 2=cdrecord */
  double pacifier_interval;
  double start_time;
  double last_update_time;
  /* optional global counters for brain reduced callback functions */
  off_t pacifier_count;
  off_t pacifier_total;
+ off_t pacifier_byte_count; /* auxiliary counter for data bytes */
 
  void *pacifier_fifo;
 
@@ -267,7 +350,7 @@ struct XorrisO { /* the global context of xorriso */
  struct PermiteM *perm_stack; /* Temporarily altered dir access permissions */
 
  /* result (stdout, R: ) */
- char result_line[5*SfileadrL];
+ char result_line[10*SfileadrL];
  int result_line_counter;
  int result_page_counter;
  int result_open_line_len;
@@ -418,6 +501,115 @@ int Xorriso_lsx_filev(struct XorrisO *xorriso, char *wd,
 int Xorriso_rmx(struct XorrisO *xorriso, off_t boss_mem, char *path, int flag);
 
 
+int Xorriso_make_tmp_path(struct XorrisO *xorriso, char *orig_path,
+                          char *tmp_path, int *fd, int flag);
+
+/* @param flag bit0= path is a directory
+               bit2= recursion: do not reassure in mode 2 "tree"
+               bit3= this is for overwriting and not for plain removal
+*/
+int Xorriso_reassure_restore(struct XorrisO *xorriso, char *path, int flag);
+
+
+int Xorriso_auto_chmod(struct XorrisO *xorriso, char *disk_path, int flag);
+
+int Xorriso_protect_stdout(struct XorrisO *xorriso, int flag);
+
+
+/* @param flag bit0= mark untested areas as valid
+*/
+int Xorriso_spotlist_to_sectormap(struct XorrisO *xorriso,
+                                  struct SpotlisT *spotlist,
+                                  int read_chunk,
+                                  struct SectorbitmaP **map,
+                                  int flag);
+
+int Xorriso_toc_to_string(struct XorrisO *xorriso, char **toc_text, int flag);
+
+
+/* @param flag bit0+1= what to aquire after giving up outdev
+                       0=none, 1=indev, 2=outdev, 3=both
+*/
+int Xorriso_reaquire_outdev(struct XorrisO *xorriso, int flag);
+
+
+struct Xorriso_lsT {
+  char *text;
+  struct Xorriso_lsT *prev,*next;
+};
+
+/** Create a new list item with arbitrary byte content.
+    @param lstring  The newly created object or NULL on failure
+    @param data     An array of bytes to be copied into the new object
+    @param data_len Number of bytes to be copied
+    @param link     Xorriso_lsT object to which the new object shall be linked
+    @param flag Bitfield for control purposes
+                bit0= insert before link rather than after it
+                bit1= do not copy data (e.g. because *data is invalid)
+    @return <=0 error, 1 ok
+*/
+int Xorriso_lst_new_binary(struct Xorriso_lsT **lstring, char *data,
+                           int data_len, struct Xorriso_lsT *link, int flag);
+
+
+/** Create a new list item with a 0-terminated text as content.
+    @param lstring  The newly created object or NULL on failure
+    @param text     A 0-terminated array of bytes
+    @param link     Xorriso_lsT object to which the new object shall be linked
+    @param flag Bitfield for control purposes
+                bit0= insert before link rather than after it
+    @return <=0 error, 1 ok
+*/
+int Xorriso_lst_new(struct Xorriso_lsT **lstring, char *text,
+                    struct Xorriso_lsT *link, int flag);
+
+
+/** Create a new list item at the end of a given list.
+    @param lstring  Contains as input a pointer to a pointer to any existing
+                    list item. As output this list item pointer will be
+                    changed to the address of the new list item.
+    @param data     An array of bytes to be copied into the new object
+    @param data_len Number of bytes to be copied
+    @param flag     unused yet, submit 0
+    @return <=0 error, 1 ok
+*/
+int Xorriso_lst_append_binary(struct Xorriso_lsT **entry,
+                              char *data, int data_len, int flag);
+
+
+/** Destroy a single list item and connect its eventual list neighbors.
+    @param lstring  pointer to the pointer to be freed and set to NULL
+    @param flag     unused yet, submit 0
+    @return 0= *lstring was alredy NULL, 1= ok
+*/
+int Xorriso_lst_destroy(struct Xorriso_lsT **lstring, int flag);
+
+
+/* Opens the -check_media data copy in for reading and writing
+*/
+int Xorriso_open_job_data_to(struct XorrisO *xorriso,
+                             struct CheckmediajoB *job, int flag);
+
+int Xorriso_no_findjob(struct XorrisO *xorriso, char *cmd, int flag);
+
+
+int Xorriso_make_mount_cmd(struct XorrisO *xorriso, char *cmd,
+                           int lba, int track, int session, char *volid,
+                           char *devadr, char result[SfileadrL], int flag);
+
+
+/* @param flag bit0= use env_path to find the desired program
+*/
+int Xorriso_execv(struct XorrisO *xorriso, char *cmd, char *env_path,
+                  int *status, int flag);
+
+int Xorriso_is_in_patternlist(struct XorrisO *xorriso,
+                        struct Xorriso_lsT *patternlist, char *path, int flag);
+
+char *Xorriso_get_pattern(struct XorrisO *xorriso,
+                         struct Xorriso_lsT *patternlist, int index, int flag);
+
+
 int Sfile_str(char target[SfileadrL], char *source, int flag);
 
 double Sfile_microtime(int flag);
@@ -462,6 +654,15 @@ int Sort_argv(int argc, char **argv, int flag);
 /* @param flag bit0= single letters */
 char *Ftypetxt(mode_t st_mode, int flag);
 
+/* @param flag bit0=with year and seconds
+               bit1=timestamp format YYYY.MM.DD.hhmmss
+*/
+char *Ftimetxt(time_t t, char timetext[40], int flag);
+
+int System_uname(char **sysname, char **release, char **version, 
+                 char **machine, int flag);
+
+
 struct DirseQ;
 
 int Dirseq_new(struct DirseQ **o, char *adr, int flag);
@@ -476,6 +677,12 @@ int Linkitem_reset_stack(struct LinkiteM **o, struct LinkiteM *to, int flag);
 
 struct FindjoB;
 
+
+int Findjob_new(struct FindjoB **o, char *start_path, int flag);
+
+int Findjob_destroy(struct FindjoB **job, int flag);
+
+
 /* @return 0=no match , 1=match , <0 = error
 */
 int Findjob_test(struct FindjoB *job, char *name, 
@@ -514,8 +721,26 @@ int Findjob_set_action_ad(struct FindjoB *o, int type, time_t date, int flag);
 
 int Findjob_set_start_path(struct FindjoB *o, char *start_path, int flag);
 
+int Findjob_set_action_found_path(struct FindjoB *o, int flag);
+
 int Findjob_get_start_path(struct FindjoB *o, char **start_path, int flag);
 
+int Findjob_set_lba_range(struct FindjoB *o, int start_lba, int count,
+                          int flag);
+
+int Findjob_get_lba_damage_filter(struct FindjoB *o, int *start_lba,
+                                  int *end_lba, int *damage_filter, int flag);
+
+int Findjob_get_commit_filter(struct FindjoB *o, int *commit_filter, int flag);
+
+int Findjob_set_wanted_node(struct FindjoB *o, void *wanted_node, int flag);
+
+int Findjob_get_wanted_node(struct FindjoB *o, void **wanted_node, int flag);
+
+int Findjob_set_found_path(struct FindjoB *o, char *path, int flag);
+
+int Findjob_get_found_path(struct FindjoB *o, char **path, int flag);
+
 
 struct SplitparT;
 
@@ -539,33 +764,6 @@ int Splitpart__compose(char *adr, int partno, int total_parts,
 
 int Splitparts_sort(struct SplitparT *o, int count, int flag);
 
-struct LstrinG {
-  char *text;
-  struct LstrinG *prev,*next;
-};
- 
-int Lstring_destroy(struct LstrinG **lstring, int flag);
-
-int Lstring_destroy_all(struct LstrinG **lstring, int flag);
-
-/*
- @param flag Bitfield for control purposes
-        bit0= insert before link rather than after it 
-        bit1= do not copy data (e.g. because *data is invalid)
-*/
-int Lstring_new_binary(struct LstrinG **lstring, char *data, int data_len,
-                       struct LstrinG *link, int flag);
-
-/* 
- @param flag Bitfield for control purposes
-             bit0= insert before link rather than after it
-*/
-int Lstring_new(struct LstrinG **lstring, char *text, struct LstrinG *link,
-                int flag);
-
-int Lstring_append_binary(struct LstrinG **entry, char *data, int data_len,
-                           int flag);
-
 
 int Permstack_push(struct PermiteM **o, char *disk_path, struct stat *stbuf,
                    int flag);
@@ -574,5 +772,69 @@ int Permstack_pop(struct PermiteM **o, struct PermiteM *stopper,
                   struct XorrisO *xorriso, int flag);
 
 
+int Spotlist_new(struct SpotlisT **o, int flag);
+
+int Spotlist_destroy(struct SpotlisT **o, int flag);
+
+int Spotlist_add_item(struct SpotlisT *o, int start_lba, int blocks,
+                      int quality, int flag);
+
+int Spotlist_count(struct SpotlisT *o, int flag);
+
+int Spotlist_block_count(struct SpotlisT *o, int flag);
+
+int Spotlist_sector_size(struct SpotlisT *o, int read_chunk, int flag);
+
+int Spotlist_get_item(struct SpotlisT *o, int idx,
+                      int *start_lba, int *blocks, int *quality, int flag);
+
+char *Spotlist__quality_name(int quality, char name[80], int flag);
+
+
+#define Xorriso_read_quality_gooD         0x7fffffff
+#define Xorriso_read_quality_sloW         0x60000000
+#define Xorriso_read_quality_partiaL      0x50000000
+#define Xorriso_read_quality_valiD        0x40000000
+#define Xorriso_read_quality_untesteD     0x3fffffff
+#define Xorriso_read_quality_invaliD      0x3ffffffe
+#define Xorriso_read_quality_tao_enD      0x28000000
+#define Xorriso_read_quality_off_tracK    0x20000000
+#define Xorriso_read_quality_unreadablE   0x00000000
+
+
+int Checkmediajob_new(struct CheckmediajoB **o, int flag);
+
+int Checkmediajob_destroy(struct CheckmediajoB **o, int flag);
+
+int Checkmediajob_copy(struct CheckmediajoB *from, struct CheckmediajoB *to,
+                       int flag);
+
+int Sectorbitmap_new(struct SectorbitmaP **o, int sectors, int sector_size,
+                     int flag);
+int Sectorbitmap_destroy(struct SectorbitmaP **o, int flag);
+int Sectorbitmap_from_file(struct SectorbitmaP **o, char *path, char *msg,
+                           int *os_errno, int flag);
+int Sectorbitmap_to_file(struct SectorbitmaP *o, char *path, char *info,
+                         char *msg, int *os_errno, int flag);
+int Sectorbitmap_set(struct SectorbitmaP *o, int sector, int flag);
+int Sectorbitmap_set_range(struct SectorbitmaP *o,
+                           int start_sector, int sectors, int flag);
+int Sectorbitmap_is_set(struct SectorbitmaP *o, int sector, int flag);
+int Sectorbitmap_bytes_are_set(struct SectorbitmaP *o,
+                               off_t start_byte, off_t end_byte, int flag);
+
+int Sectorbitmap_get_layout(struct SectorbitmaP *o,
+                           int *sectors, int *sector_size, int flag);
+
+int Sectorbitmap_copy(struct SectorbitmaP *from, struct SectorbitmaP *to,
+                      int flag);
+
+/* bit0= append (text!=NULL) */
+int Sregex_string(char **handle, char *text, int flag);
+
+/* @param flag bit0= only test expression whether compilable
+*/
+int Sregex_match(char *pattern, char *text, int flag);
+
 #endif /* Xorriso_private_includeD */
 

xorriso/xorriso_timestamp.h

@@ -1 +1 @@
-#define Xorriso_timestamP "2008.06.01.145155"
+#define Xorriso_timestamP "2009.01.05.123001"

xorriso/xorrisoburn.h

@@ -4,7 +4,7 @@
    a command line oriented batch and dialog tool which creates, loads,
    manipulates and burns ISO 9660 filesystem images.
 
-   Copyright 2007-2008 Thomas Schmitt, <scdbackup@gmx.net>
+   Copyright 2007-2009 Thomas Schmitt, <scdbackup@gmx.net>
 
    Provided under GPL version 2.
 
@@ -14,14 +14,12 @@
 #ifndef Xorrisoburn_includeD
 #define Xorrisoburn_includeD yes
 
-struct XorrisO;
-struct FindjoB;
 
 /* The minimum version of libisoburn to be used with this version of xorriso
 */
 #define xorriso_libisoburn_req_major  0
-#define xorriso_libisoburn_req_minor  1
-#define xorriso_libisoburn_req_micro  7
+#define xorriso_libisoburn_req_minor  3
+#define xorriso_libisoburn_req_micro  2
 
 int Xorriso_startup_libraries(struct XorrisO *xorriso, int flag);
 
@@ -54,9 +52,16 @@ int Xorriso__text_to_sev(char *severity_name, int *severity_number,int flag);
 
 /* @param flag bit0=report about output drive 
                bit1=short report form
+               bit2=do not try to read ISO heads
+               bit3=report to info channel (else to result channel)
 */
 int Xorriso_toc(struct XorrisO *xorriso, int flag);
 
+/* @param flag bit0= no output if no boot record was found
+               bit3= report to info channel (else to result channel)
+*/
+int Xorriso_show_boot_info(struct XorrisO *xorriso, int flag);
+
 int Xorriso_show_devices(struct XorrisO *xorriso, int flag);
 
 int Xorriso_tell_media_space(struct XorrisO *xorriso,
@@ -69,10 +74,14 @@ int Xorriso_tell_media_space(struct XorrisO *xorriso,
 int Xorriso_blank_media(struct XorrisO *xorriso, int flag);
 
 /* @param flag bit0= try to achieve faster formatting
+               bit1= use parameter size (else use default size)
+               bit2= do not re-aquire drive
+               bit7= by_index mode:
+                     bit8 to bit15 contain the index of the format to use.
    @return 0=failure, did not touch media , -1=failure, altered media
            1=success, altered media       ,  2=success, did not touch media
 */
-int Xorriso_format_media(struct XorrisO *xorriso, int flag);
+int Xorriso_format_media(struct XorrisO *xorriso, off_t size, int flag);
 
 /* @return <=0 error, 1 success
 */
@@ -188,7 +197,13 @@ int Xorriso_iso_lstat(struct XorrisO *xorriso, char *path, struct stat *stbuf,
 */
 int Xorriso_atip(struct XorrisO *xorriso, int flag);
 
-int Xorriso_burn_track(struct XorrisO *xorriso, char *track_source, int flag);
+/* @param write_start_address  is valid if >=0 
+   @param tsize is valid if >0
+   @param flag bit0= grow_overwriteable_iso
+               bit1= do_isosize
+*/
+int Xorriso_burn_track(struct XorrisO *xorriso, off_t write_start_address,
+                       char *track_source, off_t tsize, int flag);
 
 /* @param flag bit1= outdev rather than indev
    @return <=0 = failure , 1= ok , 2= ok, is CD profile
@@ -196,12 +211,20 @@ int Xorriso_burn_track(struct XorrisO *xorriso, char *track_source, int flag);
 int Xorriso_get_profile(struct XorrisO *xorriso, int *profile_number,
                         char profile_name[80], int flag);
 
+#ifdef NIX
+
 /* @param flag bit0= do not mark image as changed */
 int Xorriso_set_publisher(struct XorrisO *xorriso, char *name, int flag);
 
+/* @param flag bit0= do not mark image as changed */
+int Xorriso_set_application_id(struct XorrisO *xorriso, char *name, int flag);
 
+#endif /* NIX */
+
+/* @param flag bit0= node_pt is a valid ISO object handle, ignore pathname
+*/
 int Xorriso_iso_file_open(struct XorrisO *xorriso, char *pathname,
-                          void **stream, int flag);
+                          void *node_pt, void **stream, int flag);
 
 int Xorriso_iso_file_read(struct XorrisO *xorriso, void *stream, char *buf,
                           int count, int flag);
@@ -216,6 +239,9 @@ int Xorriso_copy_properties(struct XorrisO *xorriso,
 int Xorriso_cut_out(struct XorrisO *xorriso, char *disk_path,
                 off_t startbyte, off_t bytecount, char *iso_rr_path, int flag);
 
+int Xorriso_paste_in(struct XorrisO *xorriso, char *disk_path,
+                off_t startbyte, off_t bytecount, char *iso_rr_path, int flag);
+
 struct SplitparT;
 
 /* @param flag bit0= in_node is valid, do not resolve iso_adr
@@ -236,7 +262,7 @@ int Xorriso_is_split(struct XorrisO *xorriso, char *path, void *node,
            >>> 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 cut_out_node
+               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
@@ -244,7 +270,123 @@ int Xorriso_is_split(struct XorrisO *xorriso, char *path, void *node,
                          3 = rejected
 */
 int Xorriso_restore(struct XorrisO *xorriso,
-                    char *img_path, char *disk_path, int flag);
+                    char *img_path, char *disk_path,
+                    off_t offset, off_t cut_size, int flag);
+
+
+/* @param flag bit0= in_node is valid, do not resolve img_path
+*/
+int Xorriso_restore_is_identical(struct XorrisO *xorriso, void *in_node,
+                                 char *img_path, char *disk_path,
+                                 char type_text[5], int flag);
+
+
+/* Return the official libburn address of an address string. This may fail
+   if the string does not constitute a valid drive address.
+   @param official_adr must offer SfileadrL bytes of reply buffer
+   @return 1 = success , 0 = failure , -1 = severe error
+*/
+int Xorriso_libburn_adr(struct XorrisO *xorriso, char *address_string,
+                        char official_adr[], int flag);
+
+
+/* @param flag bit1= obtain info from outdev
+*/
+int Xorriso_msinfo(struct XorrisO *xorriso, int *msc1, int *msc2, int flag);
+
+/*
+   @param flag bit0= obtain iso_lba from indev
+               bit1= head_buffer already contains a valid head
+               bit2= issue message about success
+               bit3= check whether source blocks are banned by in_sector_map
+*/
+int Xorriso_update_iso_lba0(struct XorrisO *xorriso, int iso_lba, int isosize,
+                            char *head_buffer, struct CheckmediajoB *job,
+                            int flag);
+
+int Xorriso_get_local_charset(struct XorrisO *xorriso, char **name, int flag);
+
+int Xorriso_set_local_charset(struct XorrisO *xorriso, char *name, int flag);
+
+
+
+struct CheckmediajoB {
+ int use_dev;        /* 0= use indev , 1= use outdev , 2= use sector map*/
+
+ int min_lba;        /* if >=0 : begin checking at this address */
+ int max_lba;        /* if >=0 : read up to this address, else use mode */
+
+ int min_block_size; /* >>> not yet implemented:
+                            granularity desired by user
+                     */
+ int mode;           /* 0= track by track
+                        1= single sweep over libisoburn media capacity
+                        >>> 2= single sweep over libburn media capacity
+                     */
+ time_t start_time;
+ int time_limit;     /* Number of seconds after which to abort */
+
+ int item_limit;     /* Maximum number of media check list items as result */
+
+ char abort_file_path[SfileadrL];
+
+ char data_to_path[SfileadrL];
+ int data_to_fd;
+ off_t data_to_offset; /* usually 0 with image copy, negative with file copy */
+ off_t data_to_limit;  /* used with file copy */
+ int patch_lba0;
+ int patch_lba0_msc1;
+
+ char sector_map_path[SfileadrL];
+ struct SectorbitmaP *sector_map;
+ int map_with_volid;  /* 0=add quick toc to map file,
+                         1=read ISO heads for toc
+                      */
+
+ int retry;          /* -1= only try full read_chunk, 1=retry with 2k blocks
+                         0= retry with CD, full chunk else
+                      */
+
+ int report_mode;    /* 0= print MCL items
+                        1= print damaged files
+                     */
+
+};
+
+int Xorriso_check_media(struct XorrisO *xorriso, struct SpotlisT **spotlist,
+                        struct CheckmediajoB *job, int flag);
+
+int Xorriso_extract_cut(struct XorrisO *xorriso,
+                        char *img_path, char *disk_path,
+                        off_t img_offset, off_t bytes, int flag);
+
+
+int Xorriso_relax_compliance(struct XorrisO *xorriso, char *mode,
+                                    int flag);
+
+/* @return 1=ok  2=ok, is default setting */
+int Xorriso_get_relax_text(struct XorrisO *xorriso, char mode[1024],
+                           int flag);
+
+
+/**
+    @param flag bit0= print mount command to result channel rather than
+                      performing it 
+*/
+int Xorriso_mount(struct XorrisO *xorriso, char *dev, int adr_mode,
+                  char *adr_value, char *cmd, int flag);
+
+
+
+int Xorriso_auto_driveadr(struct XorrisO *xorriso, char *adr, char *result,
+                          int flag);
+
+
+/* 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 */