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-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
+libisoburn is Copyright (C) 2007-2010 Vreixo Formoso, Thomas Schmitt
+xorriso is Copyright (C) 2007-2010 Thomas Schmitt
+libisofs (if included) is Copyright (C) 2007-2010 Vreixo Formoso, Mario Danic
 libburn (if included) is Copyright (C) 2002-2006 Derek Foreman, Ben Jansens
-                     and Copyright (C) 2006-2009 Mario Danic, Thomas Schmitt
+                     and Copyright (C) 2006-2010 Mario Danic, Thomas Schmitt
 
 
     This program is free software; you can redistribute it and/or modify

Makefile.am

@@ -1,4 +1,8 @@
-pkgconfigdir=$(libdir)/pkgconfig
+
+# ts A90315 : LIBBURNIA_PKGCONFDIR is defined OS specific in acinclude.m4
+# was: pkgconfigdir=$(libdir)/pkgconfig
+pkgconfigdir=$(LIBBURNIA_PKGCONFDIR)
+
 libincludedir=$(includedir)/libisoburn
 
 lib_LTLIBRARIES = libisoburn/libisoburn.la 
@@ -47,7 +51,9 @@ bin_PROGRAMS = \
 
 xorriso_xorriso_CPPFLAGS = -Ilibisoburn
 xorriso_xorriso_CFLAGS = -DXorriso_with_maiN \
-                         $(READLINE_DEF) $(LIBACL_DEF) $(XATTR_DEF)
+                         $(READLINE_DEF) $(LIBACL_DEF) $(XATTR_DEF) \
+                         $(EXTF_DEF) $(EXTF_SUID_DEF) $(ZLIB_DEF) \
+                         $(XORRISO_DVD_OBS_64K)
 
 xorriso_xorriso_LDADD = libisoburn/libisoburn.la -lisofs -lburn \
 		$(THREAD_LIBS) $(LIBBURN_ARCH_LIBS)

README

@@ -4,9 +4,9 @@
 libisoburn. By Vreixo Formoso <metalpain2002@yahoo.es> 
             and Thomas Schmitt <scdbackup@gmx.net>
 Integrated sub project of libburnia-project.org.
-http://files.libburnia-project.org/releases/libisoburn-0.3.4.pl00.tar.gz
-Copyright (C) 2006-2009 Vreixo Formoso, Thomas Schmitt.
-Provided under GPL version 2.
+http://files.libburnia-project.org/releases/libisoburn-0.4.8.pl00.tar.gz
+Copyright (C) 2006-2010 Vreixo Formoso, Thomas Schmitt.
+Provided under GPL version 2 or later.
 ------------------------------------------------------------------------------
 
 libisoburn is a frontend for libraries libburn and libisofs which enables
@@ -18,8 +18,10 @@ The price for that is thorough specialization on data files in ISO-9660
 filesystem images. So libisoburn is not suitable for audio (CD-DA) or any
 other CD layout which does not entirely consist of ISO-9660 sessions.
 
-Currently it is supported on Linux with kernels >= 2.4 and on FreeBSD versions
-with ATAPI/CAM support enabled in the kernel, see atapicam(4).
+Currently it is fully supported on Linux with kernels >= 2.4 and on
+FreeBSD versions with ATAPI/CAM support enabled in the kernel, see atapicam(4).
+On other X/Open compliant systems libburn will only offer POSIX i/o with disk
+file objects, but no direct MMC operation on CD/DVD/BD drives.
 
 By using this software you agree to the disclaimer at the end of this text:
 "... without even the implied warranty ..."
@@ -27,18 +29,17 @@ 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.3.4 :
-- libburn.so.4  , version libburn-0.6.0 or higher
-- libisofs.so.6 , version libisofs-0.6.14 or higher
+Dynamic library and compile time header requirements for libisoburn-0.4.8 :
+- libburn.so.4  , version libburn-0.7.6 or higher
+- libisofs.so.6 , version libisofs-0.6.26 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.
+headers seen at compile time.
 
-Obtain libisoburn-0.3.4.pl00.tar.gz, take it to a directory of your choice
+Obtain libisoburn-0.4.8.pl00.tar.gz, take it to a directory of your choice
 and do:
 
-    tar xzf libisoburn-0.3.4.pl00.tar.gz
-    cd libisoburn-0.3.4
+    tar xzf libisoburn-0.4.8.pl00.tar.gz
+    cd libisoburn-0.4.8
 
 Within that directory execute:
 
@@ -47,7 +48,7 @@ Within that directory execute:
 
 Then become superuser and execute
     make install
-which will make available libisoburn.so.1 and program xorriso.
+which will make available libisoburn.so.1 and the program xorriso.
 
 For the API concepts and calls see
     ./libisoburn/libisoburn.h
@@ -78,12 +79,28 @@ are present. This dependcy can be avoided by running
     ./configure --prefix=/usr --disable-libreadline
     make clean ; make
 Never omit the "make clean" command after switching libreadline enabling.
+Other deliberate dependency reduction options of ./configure are:
+    --disable-libacl   avoid use of ACL functions like acl_to_text()
+    --disable-xattr    avoid use of xattr functions like listxattr()
+    --disable-zlib     avoid use of zlib functions like compress2()
+
+xorriso allows to use external processes as file content filters. This is
+a potential security risk which may be avoided by ./configure option
+    --disable-external-filters
+By default the filter feature is disabled if effective user id and real
+user id differ. This ban can be lifted by
+    --enable-external-filters-setuid
+
+In some situations Linux may deliver a better write performance to DVD drives 
+if 64 KB rather than 32 KB are transmitted in each write operation.
+64k can be made default at configure time by:
+    --enable-dvd-obs-64k
 
 
                        Drives and Disk File Objects 
 
-The user of libisoburn applications needs rw-permission for the CD/DVD burner
-devices which shall be used.
+The user of libisoburn applications needs rw-permission for the CD/DVD/BD
+drives which shall be used, even if only reading is intended.
 A list of rw-accessible drives can be obtained by
     xorriso -devices
 resp. by libburn API call
@@ -105,6 +122,9 @@ output drives. The addresses of the disk files have to be preceded by "stdio:".
 Like:
     "stdio:/tmp/pseudo_drive"
 
+Note: xorriso by default prefixes "stdio:" to addresses outside the /dev tree
+      if they do not lead to an optical drive device file.
+
 
                               Testing
 
@@ -156,11 +176,24 @@ libburnia-project.org
 By Mario Danic           <mario.danic@gmail.com>,
    Vreixo Formoso        <metalpain2002@yahoo.es>
    Thomas Schmitt        <scdbackup@gmx.net>
-Copyright (C) 2006-2009 Mario Danic, Vreixo Formoso, Thomas Schmitt.
+Copyright (C) 2006-2010 Mario Danic, Vreixo Formoso, Thomas Schmitt.
+
+We, the copyright holders, agree on the interpretation that dynamical linking
+of our libraries constitutes "use of" and not "derivation from" our work in
+the sense of GPL, provided those libraries are compiled from our unaltered
+code or from altered code published under GPL.
+
+So we will not raise any legal protest to dynamic linking of our
+libraries with applications not under GPL, as long as they fulfill
+the condition of offering the library source code used, whether
+altered or unaltered, under the GPL, along with the application.
+Nevertheless, the safest legal position is not to link libburn with
+non-GPL compatible programs.
 
 libburnia-project.org is inspired by and in other components still containing
 parts of old
 Libburn. By Derek Foreman <derek@signalmarketing.com> and
             Ben Jansens <xor@orodu.net>
 Copyright (C) 2002-2006  Derek Foreman and Ben Jansens
+libisoburn does not stem from their code.
 

acinclude.m4

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

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([libisoburn], [0.3.5], [http://libburnia-project.org])
+AC_INIT([libisoburn], [0.4.8], [http://libburnia-project.org])
 AC_PREREQ([2.50])
 dnl AC_CONFIG_HEADER([config.h])	
 
@@ -20,8 +20,9 @@ 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=3
-ISOBURN_MICRO_VERSION=5
+ISOBURN_MINOR_VERSION=4
+ISOBURN_MICRO_VERSION=8
+
 dnl ISOBURN_VERSION=$ISOBURN_MAJOR_VERSION.$ISOBURN_MINOR_VERSION.$ISOBURN_MICRO_VERSION
  
 AC_SUBST(ISOBURN_MAJOR_VERSION)
@@ -33,16 +34,16 @@ dnl Libtool versioning
 dnl Generate libisoburn.so.1.x.y
 dnl SONAME will become LT_CURRENT - LT_AGE
 dnl 
-dnl ts A90301
-dnl ### This is the release version 0.3.4 = libisoburn.so.1.23.0
-dnl This is the development version after above stable release
-dnl LT_CURRENT++, LT_AGE++ have not happened happened yet.
+dnl ts B00125
+dnl This is the release version 0.4.8 = libisoburn.so.1.37.0
+dnl ### This is the development version after above stable release
+dnl LT_CURRENT++, LT_AGE++ have not happened yet.
 dnl ### LT_CURRENT++, LT_AGE++ has happened meanwhile.
 dnl
-dnl SONAME = 24 - 23 = 1 . Library name = libisoburn.so.1.23.0
+dnl SONAME = 38 - 37 = 1 . Library name = libisoburn.so.1.37.0
 LT_RELEASE=$ISOBURN_MAJOR_VERSION.$ISOBURN_MINOR_VERSION
-LT_CURRENT=24
-LT_AGE=23
+LT_CURRENT=38
+LT_AGE=37
 LT_REVISION=0
 LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
 
@@ -73,6 +74,8 @@ fi
 dnl If iconv(3) is in an extra lib, then it gets added to variable LIBS.
 dnl If not, then no -liconv will be added.
 AC_CHECK_LIB(iconv, iconv, , )
+dnl GNU iconv has no function iconv() but libiconv() and a macro iconv()
+AC_CHECK_LIB(iconv, libiconv, , )
 
 AC_PROG_LIBTOOL
 AC_SUBST(LIBTOOL_DEPS)
@@ -87,9 +90,16 @@ AC_SUBST(THREAD_LIBS)
 
 TARGET_SHIZZLE
 AC_SUBST(ARCH)
+AC_SUBST(LIBBURNIA_PKGCONFDIR)
 AC_SUBST(LIBBURN_ARCH_LIBS)
 
 
+dnl Determine target directory for libisoburn-*.pc
+dnl Important: Must be performed _after_ TARGET_SHIZZLE
+dnl
+LIBBURNIA_SET_PKGCONFIG
+
+
 AC_ARG_ENABLE(libreadline,
 [  --enable-libreadline    Enable use of libreadline by xorriso, default=yes],
                , enable_libreadline=yes)
@@ -106,9 +116,16 @@ else
 fi
 AC_SUBST(READLINE_DEF)
 
-
+dnl ts A90329
+dnl ACL and xattr do not need to be enabled in libisoburn or xorriso source
+dnl but without AC_CHECK_LIB() xorriso will not be linked with -lacl .
+dnl On my Linux this does work with an ACL enabled libisofs but in general
+dnl it seems not be right.
+dnl So for now it seems to be best to do the same configuration for libisoburn
+dnl and xorriso as for libisofs.
+ 
 AC_ARG_ENABLE(libacl,
-[  --enable-libacl    Enable use of libacl by libisofs, default=yes],
+[  --enable-libacl         Enable use of libacl by libisofs, default=yes],
                , enable_libacl=yes)
 if test x$enable_libacl = xyes; then
 dnl Check whether there is libacl-devel and libacl-runtime.
@@ -123,7 +140,7 @@ AC_SUBST(LIBACL_DEF)
 
 
 AC_ARG_ENABLE(xattr,
-[  --enable-xattr     Enable use of xattr by libisofs, default=yes],
+[  --enable-xattr          Enable use of xattr by libisofs, default=yes],
                , enable_xattr=yes)
 if test x$enable_xattr = xyes; then
 dnl Check whether there is the header for Linux xattr. 
@@ -135,15 +152,108 @@ else
 fi
 AC_SUBST(XATTR_DEF)
 
+
+dnl ts A90409
+dnl Same situation as with xattr and ACL: libisoburn does not depend directly
+dnl on zlib. But if it is enabled in libisofs then it seems wise to link it
+dnl with libisoburn apps.
+AC_ARG_ENABLE(zlib,
+[  --enable-zlib           Enable use of zlib by libisofs, default=yes],
+               , enable_zlib=yes)
+if test x$enable_zlib = xyes; then
+dnl Check whether there is the header for zlib. 
+dnl If not, erase this macro which would enable use of compress2() and others.
+dnl Linking fails on SuSE 9.0 because zlib has compress2() but lacks  
+dnl compressBound(). So compressBound is the more modern thing to test.
+dnl The empty parameter after "compressBound" causes -lz.
+    ZLIB_DEF="-DLibisofs_with_zliB"
+    AC_CHECK_HEADER(zlib.h, AC_CHECK_LIB(z, compressBound, , ZLIB_DEF= ), ZLIB_DEF= )
+else
+    ZLIB_DEF=
+fi
+AC_SUBST(ZLIB_DEF)
+
+
+dnl ts B00107
+dnl Just for the case that it is necessary to give link option -lcdio not only
+dnl with libburn but also with libburn apps like xorriso.
+dnl On SuSE 10.2 this is not needed. libburn finds libcdio on its own.
+AC_ARG_ENABLE(libcdio,
+[  --enable-libcdio         Enable EXPERIMENTAL use of libcdio as system adapter, default=no],
+               , enable_libcdio=no)
+if test x$enable_libcdio = xyes; then
+dnl Check whether there is libcdio-devel and libcdio-runtime.
+dnl If not, erase this macro
+    LIBCDIO_DEF="-DLibburn_use_libcdiO"
+dnl The empty yes case obviously causes -lcdio to be linked
+    AC_CHECK_HEADER(cdio/cdio.h, AC_CHECK_LIB(cdio, mmc_last_cmd_sense, , LIBCDIO_DEF= ), LIBCDIO_DEF= )
+else
+    LIBCDIO_DEF=
+fi
+AC_SUBST(LIBCDIO_DEF)
+
+
+AC_ARG_ENABLE(external-filters,
+[  --enable-external-filters   Enable use of external filter programs by xorriso, default=yes],
+               , enable_external_filters=yes)
+if test x"$enable_external_filters" = xyes; then
+    EXTF_DEF="-DXorriso_allow_external_filterS"
+    echo "enabled  xorriso external filter programs"
+else
+    EXTF_DEF=
+    echo "disabled xorriso external filter programs"
+fi
+AC_SUBST(EXTF_DEF)
+
+AC_ARG_ENABLE(external-filters-setuid,
+[  --enable-external-filters-setuid   Enable xorriso external filter programs under setuid, default=no],
+               , enable_external_filters_setuid=no)
+if test x$enable_external_filters_setuid = xyes; then
+    EXTF_SUID_DEF="-DXorriso_allow_extf_suiD"
+    echo "enabled  xorriso external filter programs under setuid"
+else
+    EXTF_SUID_DEF=
+    echo "disabled xorriso external filter programs under setuid"
+fi
+AC_SUBST(EXTF_SUID_DEF)
+
+AC_ARG_ENABLE(dvd-obs-64k,
+[  --enable-dvd-obs-64k            64 KB default size for xorriso DVD/BD writing, default=no],
+               , enable_fifo_odirect=no)
+if test x$enable_dvd_obs_64k = xyes; then
+    XORRISO_DVD_OBS_64K="-DXorriso_dvd_obs_default_64K"
+    echo "enabled  xorriso write size default 64 KB on DVD and BD"
+else
+    XORRISO_DVD_OBS_64K=
+    echo "disabled xorriso write size default 64 KB on DVD and BD"
+fi
+AC_SUBST(XORRISO_DVD_OBS_64K)
+
+
 AC_CHECK_HEADER(libburn/libburn.h)
 AC_CHECK_HEADER(libisofs/libisofs.h)
 
 dnl Check for proper library versions
-LIBBURN_REQUIRED=0.6.4
-LIBISOFS_REQUIRED=0.6.16
+LIBBURN_REQUIRED=0.7.6
+LIBISOFS_REQUIRED=0.6.26
 PKG_CHECK_MODULES(LIBBURN, libburn-1 >= $LIBBURN_REQUIRED)
 PKG_CHECK_MODULES(LIBISOFS, libisofs-1 >= $LIBISOFS_REQUIRED)
 
+if test x$LIBCDIO_DEF = x
+then
+    if test x$enable_libcdio = xyes
+    then
+      echo "WARNING: could not enable use of libcdio as system adapter"
+    fi
+else
+    echo "enabled  EXPERIMENTAL use of libcdio as system adapter"
+
+dnl For some reason this check may not be done earlier or else pkg-config
+dnl is not found.
+    LIBCDIO_REQUIRED=0.83
+    PKG_CHECK_MODULES(LIBCDIO, libcdio >= $LIBCDIO_REQUIRED)
+fi
+
 dnl Add compiler-specific flags
 
 dnl See if the user wants aggressive optimizations of the code

libisoburn/burn_wrap.c

@@ -6,7 +6,7 @@
 */
 /* libburn wrappers for libisoburn 
 
-   Copyright 2007 - 2009  Thomas Schmitt, <scdbackup@gmx.net> 
+   Copyright 2007 - 2010  Thomas Schmitt, <scdbackup@gmx.net> 
 */
 
 /* <<< A70929 : hardcoded CD-RW with fabricated -msinfo 
@@ -267,6 +267,7 @@ int isoburn_is_intermediate_dvd_rw(struct burn_drive *d, int flag)
                 bit4= do not emulate TOC on overwriteable media
                 bit5= ignore ACL from external filesystems
                 bit6= ignore POSIX Extended Attributes from external filesystems
+                bit7= pretend -ROM and scan for table of content
 */ 
 static int isoburn_welcome_media(struct isoburn **o, struct burn_drive *d,
                                  int flag)
@@ -275,6 +276,11 @@ static int isoburn_welcome_media(struct isoburn **o, struct burn_drive *d,
  struct burn_multi_caps *caps= NULL;
  struct isoburn_toc_entry *t;
  char profile_name[80];
+ struct isoburn_toc_disc *disc= NULL;
+ struct isoburn_toc_session **sessions;
+ struct isoburn_toc_track **tracks;
+ int num_sessions= 0, num_tracks= 0, track_count= 0, session_no= 0;
+ char msg[80];
 
  profile_name[0]= 0;
  ret= burn_disc_get_profile(d, &profile, profile_name);
@@ -283,8 +289,11 @@ static int isoburn_welcome_media(struct isoburn **o, struct burn_drive *d,
  ret= burn_disc_get_multi_caps(d, BURN_WRITE_NONE, &caps, 0);
  if(ret<0) /* == 0 is read-only media, but it is too early to reject it here */
    goto ex;
- if(ret==0)
+ if(ret==0 || (flag & 128))
    readonly= 1;
+ if(flag & 128)
+   flag = (flag & ~ 16) | 8;
+   
  ret= isoburn_new(o, 0);
  if(ret<=0)
    goto ex;
@@ -300,8 +309,9 @@ static int isoburn_welcome_media(struct isoburn **o, struct burn_drive *d,
  (*o)->fabricated_disc_status= BURN_DISC_APPENDABLE;
 #endif
 
- if(caps->start_adr) {         /* set emulation to overwriteable */
+ if(caps->start_adr)
    (*o)->emulation_mode= 1;
+ if(caps->start_adr && !readonly) {       /* set emulation to overwriteable */
    ret= isoburn_is_intermediate_dvd_rw(d, 0);
    if(ret>0) {
      (*o)->min_start_byte= 0;
@@ -317,30 +327,53 @@ static int isoburn_welcome_media(struct isoburn **o, struct burn_drive *d,
        (*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;
-       }
+     /* try to read emulated toc */
+     ret= isoburn_emulate_toc(d, flag & 16);
+     if(ret<0) {
+       (*o)->emulation_mode= -1;
+       goto ex;
      }
    }
-
  } else {
 
     /* >>> recognize unsuitable media (but allow read-only media) */;
 
    if(readonly) {
-     /* This might be overwriteable media in a -ROM drive */
-     if((flag & 16)) {
-       ret= 0;
+     (*o)->fabricated_disc_status= BURN_DISC_FULL;
+     /* This might be overwriteable media in a -ROM drive.
+        Pitfall:
+        Multi-session media which bear a xorriso image for overwriteables
+        in their first session would get a TOC of that first image rather
+        than of the media.
+        It is not possible to distinguish a BD-RE from a single session
+        BD-R with an image for overwriteables. But as soon as the media
+        bears 2 logical tracks it cannot be overwriteable.
+        So count the number of tracks first.
+     */
+     disc= isoburn_toc_drive_get_disc(d);
+     if(disc != NULL) {
+       sessions= isoburn_toc_disc_get_sessions(disc, &num_sessions);
+       for(session_no= 0; session_no < num_sessions; session_no++) {
+         tracks= isoburn_toc_session_get_tracks(sessions[session_no],
+                                                &num_tracks);
+         track_count+= num_tracks;
+       }
+       isoburn_toc_disc_free(disc);
+     }
+
+     sprintf(msg, "ROM media has libburn track count = %d", track_count);
+     isoburn_msgs_submit(*o, 0x00060000, msg, 0, "DEBUG", 0);
+
+     if((flag & 16) || track_count >= 2) {
+       ret= 0; /* toc emulation off, or not overwriteable */
      } else {
        ret= isoburn_emulate_toc(d, 1);
        if(ret<0)
          goto ex;
+       else if(ret > 0)
+         (*o)->emulation_mode= 1;
      }
-     if(ret==0 && profile !=0x08 && (flag&8)) {
+     if(ret == 0 && (profile != 0x08 || (flag & 128)) && (flag & 8)) {
        /* This might also be multi-session media which do not
           get shown with a decent TOC.
           CD-R TOC (profile 0x08) can be trusted. Others not.
@@ -387,6 +420,7 @@ ex:
                 bit4= do not emulate TOC on overwriteable media
                 bit5= ignore ACL from external filesystems
                 bit6= ignore POSIX Extended Attributes from external filesystems
+                bit7= pretend -ROM profile and scan for table of content
 */
 int isoburn_drive_aquire(struct burn_drive_info *drive_infos[],
                          char *adr, int flag)
@@ -417,7 +451,7 @@ int isoburn_drive_aquire(struct burn_drive_info *drive_infos[],
    goto ex;
  drive_grabbed= 1;
  ret= isoburn_welcome_media(&o, (*drive_infos)[0].drive,
-                            (flag & (8 | 16 | 32 | 64)) | !!(flag&2));
+                            (flag & (8 | 16 | 32 | 64 | 128)) | !!(flag&2));
  if(ret<=0)
    goto ex;
 
@@ -528,19 +562,26 @@ int isoburn_disc_erasable(struct burn_drive *d)
 
 void isoburn_disc_erase(struct burn_drive *drive, int fast)
 {
- int ret;
+ int ret, do_pseudo_blank= 0;
  struct isoburn *o;
  enum burn_disc_status s;
  char zero_buffer[Libisoburn_target_head_sizE];
+ struct burn_multi_caps *caps= NULL;
 
  ret= isoburn_find_emulator(&o, drive, 0);
  if(ret>0) {
    if(o->emulation_mode==-1) {
      /* To cause a negative reply with burn_drive_wrote_well() */
      burn_drive_cancel(drive);
-     return;
+     goto ex;
    }
-   if(o->emulation_mode>0) {
+
+   if(o->emulation_mode > 0) { /* might be readonly with emulated sessions */
+     ret= burn_disc_get_multi_caps(drive, BURN_WRITE_NONE, &caps, 0);
+     if(ret > 0 && caps->start_adr)
+       do_pseudo_blank= 1;
+   }
+   if(do_pseudo_blank) {
      s= isoburn_disc_get_status(drive);
      if(s==BURN_DISC_FULL) { /* unknown data format in first 64 kB */
        memset(zero_buffer, 0, Libisoburn_target_head_sizE);
@@ -551,10 +592,13 @@ void isoburn_disc_erase(struct burn_drive *drive, int fast)
      }
      if(ret<=0)
        burn_drive_cancel(drive); /* mark run as failure */
-     return;
+     goto ex;
    }
  }
  burn_disc_erase(drive, fast);
+ex:;
+ if(caps!=NULL)
+   burn_disc_free_multi_caps(&caps);
 }
 
 
@@ -1022,7 +1066,7 @@ 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, info_mode;
+ int ret, info_mode, capacity, role;
  off_t data_count;
 
  info_mode= flag&255;
@@ -1030,8 +1074,19 @@ int isoburn_read_iso_head(struct burn_drive *d, int lba,
  if(flag&(1<<13)) {
    memcpy(buffer, info, 64*1024);
  } else {
-   ret = burn_read_data(d, ((off_t) lba) * (off_t) 2048, (char *) buffer,
+   role = burn_drive_get_drive_role(d);
+   ret = burn_get_read_capacity(d, &capacity, 0);
+   if (ret <= 0 && role == 2) {
+     /* Might be a block device on a system where libburn cannot determine its
+        size.  Try to read anyway. */
+     capacity = 0x7ffffff0;
+     ret = 1;
+   }
+   if(ret > 0 && (off_t) capacity * (off_t) 2048 >= (off_t) (64 * 1024)) {
+     ret = burn_read_data(d, ((off_t) lba) * (off_t) 2048, (char *) buffer,
                       (off_t) 64*1024, &data_count, 2); /* no error messages */
+  } else
+    ret= 0;
    if(ret<=0)
      return(-1*!!(flag&(1<<15)));
    if(info_mode==2)
@@ -1054,13 +1109,14 @@ int isoburn_read_iso_head(struct burn_drive *d, int lba,
 
 
 int isoburn_make_toc_entry(struct isoburn *o, int *session_count, int lba,
-                           int track_blocks, int flag)
+                           int track_blocks, char *volid, int flag)
 {
  int ret;
  struct isoburn_toc_entry *item;
 
  ret= isoburn_toc_entry_new(&item, o->toc, 0);
  if(ret<=0) {
+no_memory:;
    isoburn_msgs_submit(o, 0x00060000,
                        "Not enough memory for emulated TOC entry object",
                        0, "FATAL", 0);
@@ -1073,21 +1129,28 @@ int isoburn_make_toc_entry(struct isoburn *o, int *session_count, int lba,
  item->track_no= *session_count;
  item->start_lba= lba;
  item->track_blocks= track_blocks;
+ if(volid != NULL) {
+   item->volid= strdup(volid);
+   if(item->volid == NULL)
+     goto no_memory;
+ }
  return(1);
 }
 
 
 /* @param flag bit0= allow unemulated media
                bit1= free scanning without enclosing LBA-0-header 
+               bit4= represent emulated media as one single session
+                     (not with bit1)
    @return -1 severe error, 0= no neat header chain, 1= credible chain read
 */
 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, scan_count= 0, probe_minus_16= 0, growisofs_nwa;
- int with_enclosure= 0;
+ int scan_start= 0, scan_count= 0, probe_minus_16= 0, growisofs_nwa, role;
+ int with_enclosure= 0, readable_blocks= -1;
  struct isoburn *o;
- char msg[160], size_text[80], *sev;
+ char msg[160], size_text[80], *sev, volid[33], *volid_pt= NULL;
  time_t start_time, last_pacifier, now;
  
  /* is the media emulated multi-session ? */
@@ -1099,6 +1162,18 @@ int isoburn_emulate_toc(struct burn_drive *d, int flag)
  if(o->emulation_mode<=0 && !(flag&1))
    return(0);
 
+ ret= burn_get_read_capacity(d, &readable_blocks, 0);
+ if(ret <= 0) {
+
+   role = burn_drive_get_drive_role(d);
+   if (role == 2)
+     /* Might be a block device on a system where libburn cannot determine its
+        size.  Try to read anyway. */
+     readable_blocks= 0x7ffffff0; /* try to read anyway */
+   else
+     readable_blocks= -1;
+ }
+
  start_time= last_pacifier= time(NULL);
  lba= 0;
  if(!(flag&2)) {
@@ -1107,6 +1182,10 @@ int isoburn_emulate_toc(struct burn_drive *d, int flag)
      {ret= 0; goto failure;}
    lba= Libisoburn_overwriteable_starT;
    with_enclosure= 1;
+   if((flag & 16) && o->emulation_mode == 1) {
+     ret= 1;
+     goto failure; /* This will represent the media as single session */
+   }
  }
  while(lba<image_size || (flag&2)) {
    now= time(NULL);
@@ -1120,7 +1199,7 @@ int isoburn_emulate_toc(struct burn_drive *d, int flag)
              session_count, size_text, (double) (now - start_time));
      isoburn_msgs_submit(o, 0x00060000, msg, 0, "UPDATE", 0);
    }
-   read_flag= 0;
+   read_flag= 1;
    if(flag&2)
      read_flag|= (1<<15)|((session_count>0)<<14);
    else {
@@ -1138,8 +1217,11 @@ int isoburn_emulate_toc(struct burn_drive *d, int flag)
      probe_minus_16= 0;
    }
 
-   ret= isoburn_read_iso_head(d, lba, &track_blocks, NULL, read_flag);
-   if(ret<=0) {
+   ret= isoburn_read_iso_head(d, lba, &track_blocks, volid, read_flag);
+   if(ret > 0) {
+     volid_pt= volid;
+   } else {
+     volid_pt= NULL;
      if(session_count>0) {
        if(flag&2) {
          if(ret==0) {
@@ -1157,7 +1239,7 @@ int isoburn_emulate_toc(struct burn_drive *d, int flag)
        isoburn_msgs_submit(o, 0x00060000, msg, 0, "WARNING", 0);
 
        if(with_enclosure) {
-         ret= isoburn_make_toc_entry(o, &session_count, 0, image_size, 0);
+         ret= isoburn_make_toc_entry(o, &session_count, 0, image_size, NULL,0);
          if(ret<=0)
            goto failure;
        }
@@ -1169,7 +1251,14 @@ int isoburn_emulate_toc(struct burn_drive *d, int flag)
    if(ret==2) /* ISO header was found in first half block */
      lba-= 16;
 
-   ret= isoburn_make_toc_entry(o, &session_count, lba, track_blocks, 0);
+   if(readable_blocks >= 0 && lba + track_blocks > readable_blocks) {
+     sprintf(msg, "ISO image size %ds larger than readable size %ds",
+                  lba + track_blocks, readable_blocks);
+     isoburn_msgs_submit(o, 0x00060000, msg, 0, "WARNING", 0);
+     track_blocks= readable_blocks - lba;
+   }
+   ret= isoburn_make_toc_entry(o, &session_count, lba, track_blocks, volid_pt,
+                               0);
    if(ret<=0)
      goto failure;
    lba+= track_blocks;
@@ -1201,8 +1290,14 @@ int isoburn_emulate_toc(struct burn_drive *d, int flag)
 failure:;
  isoburn_toc_entry_destroy(&(o->toc), 1);
  if(with_enclosure && o->emulation_mode == 1) {
+   if(readable_blocks >= 0 && image_size > readable_blocks) {
+     sprintf(msg, "ISO image size %ds larger than readable size %ds",
+                  image_size, readable_blocks);
+     isoburn_msgs_submit(o, 0x00060000, msg, 0, "WARNING", 0);
+     image_size= readable_blocks;
+   }
    session_count= 0;
-   ret= isoburn_make_toc_entry(o, &session_count, 0, image_size, 0);
+   ret= isoburn_make_toc_entry(o, &session_count, 0, image_size, NULL, 0);
  }
  return(ret);
 }
@@ -1475,6 +1570,21 @@ void isoburn_toc_track_get_entry(struct isoburn_toc_track *t,
 }
 
 
+int isoburn_toc_track_get_emul(struct isoburn_toc_track *t, int *start_lba,
+                               int *image_blocks, char volid[33], int flag)
+{
+ if(t->toc_entry == NULL)
+   return(0);
+ if(t->toc_entry->volid == NULL)
+   return(0);
+ *start_lba= t->toc_entry->start_lba;
+ *image_blocks= t->toc_entry->track_blocks;
+ strncpy(volid, t->toc_entry->volid, 32);
+ volid[32]= 0;
+ return(1);
+}
+
+
 void isoburn_toc_disc_free(struct isoburn_toc_disc *d)
 {
  if(d->disc!=NULL)
@@ -1524,7 +1634,8 @@ 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, re_valid= 0;
+ int lba, best_lba, size, re_valid= 0, track_count= 0;
+ time_t start_time= 0, last_pacifier= 0, now;
  char volid[33], msg[160];
  struct isoburn *o;
  struct isoburn_toc_disc *disc= NULL;
@@ -1541,6 +1652,7 @@ int isoburn_set_msc1(struct burn_drive *d, int adr_mode, char *adr_value,
  if(o==NULL)
    return(-1);
 
+ start_time= last_pacifier= time(NULL);
  adr_num= atoi(adr_value);
  if(adr_mode!=3 || (flag & 2)) {
    disc= isoburn_toc_drive_get_disc(d);
@@ -1614,10 +1726,24 @@ not_found:;
      if(tracks==NULL)
    continue;
      for(j= 0; j<num_tracks; j++) {
-       isoburn_get_track_lba(tracks[0], &lba, 0);
-       ret= isoburn_read_iso_head(d, lba, &size, volid, 1);
-       if(ret<=0)
+       now= time(NULL);
+       if(now - last_pacifier >= 5 && track_count > 0) {
+         last_pacifier= now;
+         sprintf(msg,
+                 "Scanned %d tracks for matching volid in %.f seconds",
+                 track_count, (double) (now - start_time));
+         isoburn_msgs_submit(o, 0x00060000, msg, 0, "UPDATE", 0);
+       }
+       track_count++;
+       ret= isoburn_toc_track_get_emul(tracks[0], &lba, &size, volid, 0);
+       if(ret < 0)
      continue;
+       if(ret == 0) {
+         isoburn_get_track_lba(tracks[0], &lba, 0);
+         ret= isoburn_read_iso_head(d, lba, &size, volid, 1);
+         if(ret<=0)
+     continue;
+       }
        if(flag & 4) {
          ret= regexec(&re, volid, 1, match, 0);
          if(ret != 0)
@@ -1641,6 +1767,13 @@ unknown_mode:;
  }
  ret= 1;
 ex:;
+ if(start_time != last_pacifier && track_count > 0) {
+   now= time(NULL);
+   sprintf(msg,
+           "Scanned %d tracks for matching volid in %.f seconds",
+           track_count, (double) (now - start_time));
+   isoburn_msgs_submit(o, 0x00060000, msg, 0, "UPDATE", 0);
+ }
  if(disc!=NULL)
    isoburn_toc_disc_free(disc);
  if((flag & 4) && re_valid)

libisoburn/data_source.c

@@ -1,7 +1,7 @@
 /*
   data source for libisoburn.
 
-  Copyright 2007 - 2009 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
+  Copyright 2007 - 2010 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
                     and Thomas Schmitt <scdbackup@gmx.net>
 */
 

libisoburn/isoburn.c

@@ -6,7 +6,7 @@
 /*
   Class core of libisoburn.
 
-  Copyright 2007 - 2009 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
+  Copyright 2007 - 2010 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
                         Thomas Schmitt <scdbackup@gmx.net>
 */
 
@@ -68,6 +68,7 @@ int isoburn_toc_entry_new(struct isoburn_toc_entry **objpt,
  o->track_no= 0;
  o->start_lba= -1;
  o->track_blocks= 0;
+ o->volid= NULL;
  o->next= NULL;
  if(boss!=NULL) {
    for(s= boss; s->next!=NULL; s= s->next);
@@ -85,6 +86,8 @@ int isoburn_toc_entry_destroy(struct isoburn_toc_entry **o, int flag)
    return(0);
  if(flag&1)
    isoburn_toc_entry_destroy(&((*o)->next), flag);
+ if((*o)->volid != NULL)
+   free((*o)->volid);
  free((char *) (*o));   
  *o= NULL;
  return(1);
@@ -359,12 +362,6 @@ int isoburn_prepare_disc_aux(struct burn_drive *in_d, struct burn_drive *out_d,
 
  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)
@@ -375,6 +372,13 @@ int isoburn_prepare_disc_aux(struct burn_drive *in_d, struct burn_drive *out_d,
  /* early end will be registered as failure */
  in_o->wrote_well= out_o->wrote_well= 0;
 
+ 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;}
+ }
+
  state = isoburn_disc_get_status(in_d);
  if (state != BURN_DISC_BLANK && state != BURN_DISC_APPENDABLE &&
      state != BURN_DISC_FULL) {
@@ -405,6 +409,16 @@ int isoburn_prepare_disc_aux(struct burn_drive *in_d, struct burn_drive *out_d,
  iso_write_opts_set_rockridge(wopts, opts->rockridge);
  iso_write_opts_set_joliet(wopts, opts->joliet);
  iso_write_opts_set_iso1999(wopts, opts->iso1999);
+
+ /* <<< #ifdef  shall be removed when libisofs-0.6.20 is released */
+#ifdef Libisofs_hardlink_prooF
+
+ iso_write_opts_set_hardlinks(wopts, opts->hardlinks);
+ if(opts->hardlinks)
+   iso_write_opts_set_rrip_1_10_px_ino(wopts, 1);
+
+#endif
+
  iso_write_opts_set_aaip(wopts, opts->aaip);
  iso_write_opts_set_omit_version_numbers(wopts, opts->omit_version_numbers);
  iso_write_opts_set_allow_deep_paths(wopts, opts->allow_deep_paths);
@@ -420,6 +434,11 @@ int isoburn_prepare_disc_aux(struct burn_drive *in_d, struct burn_drive *out_d,
  iso_write_opts_set_dir_rec_mtime(wopts, opts->dir_rec_mtime);
  iso_write_opts_set_aaip_susp_1_10(wopts, opts->aaip_susp_1_10);
  iso_write_opts_set_sort_files(wopts, opts->sort_files);
+ iso_write_opts_set_record_md5(wopts, opts->session_md5, opts->file_md5 & 3);
+ if(opts->scdbackup_tag_name[0] && opts->scdbackup_tag_time[0])
+   iso_write_opts_set_scdbackup_tag(wopts, opts->scdbackup_tag_name,
+                                    opts->scdbackup_tag_time,
+                                    opts->scdbackup_tag_written);
  iso_write_opts_set_replace_mode(wopts, opts->replace_dir_mode,
                 opts->replace_file_mode, opts->replace_uid, opts->replace_gid);
  iso_write_opts_set_default_dir_mode(wopts, opts->dir_mode);
@@ -640,6 +659,8 @@ int isoburn_ropt_new(struct isoburn_read_opts **new_o, int flag)
  o->noaaip= 1;
  o->noacl= 1;
  o->noea= 1;
+ o->noino= 1;
+ o->nomd5= 1;
  o->preferjoliet= 0;
  o->uid= geteuid();
  o->gid= getegid();
@@ -676,6 +697,8 @@ int isoburn_ropt_set_extensions(struct isoburn_read_opts *o, int ext)
  o->noaaip= !!(ext & 32);
  o->noacl= !!(ext & 64);
  o->noea= !!(ext & 128);
+ o->noino= !!(ext & 256);
+ o->nomd5= !!(ext & 512);
  return(1);
 }
 
@@ -684,7 +707,8 @@ int isoburn_ropt_get_extensions(struct isoburn_read_opts *o, int *ext)
 {
  *ext= (!!o->norock) | ((!!o->nojoliet)<<1) | ((!!o->noiso1999)<<2) |
        ((!!o->preferjoliet)<<3) | ((!!o->pretend_blank)<<4) |
-       ((!!o->noaaip) << 5) | ((!!o->noacl) << 6) | ((!!o->noea) << 7);
+       ((!!o->noaaip) << 5) | ((!!o->noacl) << 6) | ((!!o->noea) << 7) |
+       ((!!o->noino) << 8) | ((!!o->nomd5) << 9);
  return(1);
 }
 
@@ -743,14 +767,28 @@ int isoburn_ropt_set_input_charset(struct isoburn_read_opts *o,
 }
 
 
-int isoburn_igopt_get_in_charset(struct isoburn_read_opts *o,
-                                 char **input_charset)
+int isoburn_ropt_get_input_charset(struct isoburn_read_opts *o,
+                                   char **input_charset)
 {
  *input_charset= o->input_charset;
  return(1);
 }
 
 
+int isoburn_ropt_set_auto_incharset(struct isoburn_read_opts *o, int mode)
+{
+ o->auto_input_charset= mode & 1;
+ return(1);
+}
+
+
+int isoburn_ropt_get_auto_incharset(struct isoburn_read_opts *o, int *mode)
+{
+ *mode= o->auto_input_charset;
+ return(1);
+}
+
+
 int isoburn_ropt_get_size_what(struct isoburn_read_opts *o,
                                uint32_t *size, int *has_what)
 {
@@ -783,6 +821,8 @@ int isoburn_igopt_new(struct isoburn_imgen_opts **new_o, int flag)
  o->rockridge= 1;
  o->joliet= 0;
  o->iso1999= 0;
+ o->hardlinks= 0;
+ o->aaip = 0;
  o->omit_version_numbers= 0;
  o->allow_deep_paths= 1;
  o->allow_longer_paths= 0;
@@ -841,7 +881,10 @@ int isoburn_igopt_set_extensions(struct isoburn_imgen_opts *o, int ext)
  o->rockridge= !!(ext&1);
  o->joliet= !!(ext&2);
  o->iso1999= !!(ext&4);
+ o->hardlinks= !!(ext & 8);
  o->aaip= !!(ext & 32);
+ o->session_md5= !!(ext & 64);
+ o->file_md5= (ext & (128 | 256)) >> 7;
  return(1);
 }
 
@@ -849,7 +892,8 @@ int isoburn_igopt_set_extensions(struct isoburn_imgen_opts *o, int ext)
 int isoburn_igopt_get_extensions(struct isoburn_imgen_opts *o, int *ext)
 {
  *ext= (!!o->rockridge) | ((!!o->joliet)<<1) | ((!!o->iso1999)<<2) |
-       ((!!o->aaip) << 5);
+       ((!!o->hardlinks) << 3) | ((!!o->aaip) << 5) |
+       ((!!o->session_md5) << 6) | ((o->file_md5 & 3) << 7);
  return(1);
 }
 
@@ -988,3 +1032,30 @@ int isoburn_igopt_get_data_start(struct isoburn_imgen_opts *o, int *lba)
  return(1);
 }
 
+
+int isoburn_igopt_set_scdbackup_tag(struct isoburn_imgen_opts *o, char *name,
+                                    char *timestamp, char *tag_written)
+{
+ strncpy(o->scdbackup_tag_name, name, 80);
+ o->scdbackup_tag_name[80]= 0;
+ strncpy(o->scdbackup_tag_time, timestamp, 18);
+ o->scdbackup_tag_time[18]= 0;
+ o->scdbackup_tag_written = tag_written;
+ if(tag_written != NULL)
+   tag_written[0]= 0;
+ return(1);
+}
+
+
+int isoburn_igopt_get_scdbackup_tag(struct isoburn_imgen_opts *o,
+                                    char name[81], char timestamp[19],
+                                    char **tag_written)
+{
+ strncpy(name, o->scdbackup_tag_name, 80);
+ name[80]= 0;
+ strncpy(timestamp, o->scdbackup_tag_time, 18);
+ timestamp[18]= 0;
+ *tag_written= o->scdbackup_tag_written;
+ return(1);
+}
+

libisoburn/isoburn.h

@@ -22,6 +22,8 @@ struct isoburn_toc_entry {
  int start_lba;
  int track_blocks;
 
+ char *volid; /* For caching a volume id from emulated toc on overwriteables */
+
  struct isoburn_toc_entry *next;
 };
 
@@ -256,6 +258,12 @@ struct isoburn_read_opts {
     unsigned int noacl:1;    /* Do not read ACL from external file objects */
     unsigned int noea:1;     /* Do not read XFS-style EA from externals */
 
+    /* ts A90508 */
+    unsigned int noino:1;    /* Discard eventual PX inode numbers */
+
+    /* ts A90810 */
+    unsigned int nomd5:1;    /* Do not read eventual MD5 array */
+
     unsigned int preferjoliet:1; 
                 /*< When both Joliet and RR extensions are present, the RR
                  *  tree is used. If you prefer using Joliet, set this to 1. */
@@ -270,6 +278,15 @@ struct isoburn_read_opts {
      */
     char *input_charset;
 
+    /**
+     * Enable or disable methods to automatically choose an input charset.
+     * This eventually overrides input_charset.
+     *
+     * bit0= allow to set the input character set automatically from
+     *       attribute "isofs.cs" of root directory
+     */
+    int auto_input_charset;
+
     /* modified by the function isoburn_read_image */
     unsigned int hasRR:1; /*< It will be set to 1 if RR extensions are present,
                              to 0 if not. */
@@ -308,8 +325,19 @@ struct isoburn_imgen_opts {
     unsigned int joliet :1;
     unsigned int iso1999 :1;
 
-    /* ts A90121 */
-    unsigned int aaip:1;   /* Write eventual AAIP info containing ACL and EA */
+    /* Whether to mark suitable IsoNode as hardlinks in RRIP PX */
+    unsigned int hardlinks :1;
+
+    /* Write eventual AAIP info containing ACL and EA */
+    unsigned int aaip :1;
+
+    /* Produce and write a MD5 checksum of the whole session stream. */
+    unsigned int session_md5 :1;
+
+    /* Produce and write MD5 checksums for each single IsoFile.
+       See parameter files of iso_write_opts_set_record_md5().
+     */
+    unsigned int file_md5 :2;
 
     /* relaxed constraints */
 
@@ -443,6 +471,22 @@ struct isoburn_imgen_opts {
         If >=16: Valid block number. Block size is always 2 KiB.
     */
     int data_start_lba;
+
+    /**
+     * If not empty: Parameters "name" and "timestamp" for a scdbackup stream
+     * checksum tag. See scdbackup/README appendix VERIFY.
+     * It makes sense only for single session images which start at LBA 0.
+     * Such a tag may be part of a libisofs checksum tag block after the
+     * session tag line. It then covers the whole session up to its own start
+     * position.
+     * If scdbackup_tag_written is not NULL then it is a pointer to an
+     * application provided array with at least 512 characters. The effectively
+     * written scdbackup tag will be copied to this memory location.
+     */
+    char scdbackup_tag_name[81];
+    char scdbackup_tag_time[19];
+    char *scdbackup_tag_written;
+
 };
 
 

libisoburn/isofs_wrap.c

@@ -6,7 +6,7 @@
 /*
   libisofs related functions of libisoburn.
 
-  Copyright 2007 - 2009  Vreixo Formoso Lopes <metalpain2002@yahoo.es>
+  Copyright 2007 - 2010  Vreixo Formoso Lopes <metalpain2002@yahoo.es>
                          Thomas Schmitt <scdbackup@gmx.net>
 */
 
@@ -27,8 +27,6 @@
 
 #endif /* Xorriso_standalonE */
 
-#define Libisoburn_with_aaiP yes
-
 #include "isoburn.h"
 #include "libisoburn.h"
 
@@ -202,10 +200,10 @@ create_blank_image:;
  /* Important: do not return until iso_read_opts_free() */
  iso_read_opts_set_start_block(ropts, ms_block);
  iso_read_opts_set_no_rockridge(ropts, read_opts->norock);
-
-#ifdef Libisoburn_with_aaiP
  iso_read_opts_set_no_aaip(ropts, read_opts->noaaip);
-#endif /* Libisoburn_with_aaiP */
+ iso_read_opts_set_no_md5(ropts, read_opts->nomd5);
+
+ iso_read_opts_set_new_inos(ropts, read_opts->noino);
 
  iso_read_opts_set_no_joliet(ropts, read_opts->nojoliet);
  iso_read_opts_set_no_iso1999(ropts, read_opts->noiso1999);
@@ -215,10 +213,7 @@ create_blank_image:;
  iso_read_opts_set_default_uid(ropts, read_opts->uid);
  iso_read_opts_set_default_gid(ropts, read_opts->gid);
  iso_read_opts_set_input_charset(ropts, read_opts->input_charset);
-
- /* <<< experimental API call of libisofs
- iso_read_opts_set_error_behavior(ropts, 1);
- */
+ iso_read_opts_auto_input_charset(ropts, read_opts->auto_input_charset);
 
  ds = isoburn_data_source_new(d);
  if(o->iso_data_source!=NULL)
@@ -312,8 +307,8 @@ int isoburn_activate_session(struct burn_drive *drive)
 */
 int isoburn_start_emulation(struct isoburn *o, int flag)
 {
- int ret, i;
- off_t data_count;
+ int ret, i, capacity = -1, role;
+ off_t data_count, to_read;
  struct burn_drive *drive;
  struct ecma119_pri_vol_desc *pvm;
  
@@ -326,13 +321,32 @@ int isoburn_start_emulation(struct isoburn *o, int flag)
 
  drive= o->drive;
 
- /* we can assume 0 as start block for image */
- /* TODO what about ms? where we validate valid iso image in ms disc? */
- ret = burn_read_data(drive, (off_t) 0, (char*)o->target_iso_head, 
-                      (off_t) Libisoburn_target_head_sizE, &data_count, 2);
-
- /* an error means an empty disc */
- if (ret <= 0) {
+ /* We can assume 0 as start block for image.
+    The data there point to the most recent session.
+ */
+ role = burn_drive_get_drive_role(drive);
+ ret = burn_get_read_capacity(drive, &capacity, 0);
+ if (ret <= 0)
+   capacity = -1;
+ if (capacity > 0 || role == 2) {
+   /* Might be a block device on a system where libburn cannot determine its
+      size.  Try to read anyway. */
+   memset(o->target_iso_head, 0, Libisoburn_target_head_sizE);
+   to_read = Libisoburn_target_head_sizE;
+   if(capacity > 0 && (off_t) capacity * (off_t) 2048 < to_read)
+     to_read = (off_t) capacity * (off_t) 2048;
+   ret = burn_read_data(drive, (off_t) 0, (char*)o->target_iso_head, 
+                        to_read, &data_count, 2);
+   if (ret <= 0) {
+     /* an error means a disc with no ISO image */
+     if (capacity > 0)
+       o->fabricated_disc_status= BURN_DISC_FULL;
+     else
+        o->fabricated_disc_status= BURN_DISC_BLANK;
+     return 1;
+   }
+ } else {
+   /* No read capacity means blank media */
    o->fabricated_disc_status= BURN_DISC_BLANK;
    return 1;
  }

libisoburn/libisoburn.h

@@ -2,7 +2,7 @@
 /*
   API definition of libisoburn.
 
-  Copyright 2007-2009 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
+  Copyright 2007-2010 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
                   and Thomas Schmitt <scdbackup@gmx.net>
 */
 
@@ -216,15 +216,15 @@ void isoburn_version(int *major, int *minor, int *micro);
 */
 #define isoburn_libisofs_req_major  0
 #define isoburn_libisofs_req_minor  6
-#define isoburn_libisofs_req_micro 16 
+#define isoburn_libisofs_req_micro 26 
 
 /** 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  6
-#define isoburn_libburn_req_micro  4
+#define isoburn_libburn_req_minor  7
+#define isoburn_libburn_req_micro  6
 
 
 /** The minimum version of libisofs to be used with this version of libisoburn
@@ -259,8 +259,8 @@ int isoburn_libburn_req(int *major, int *minor, int *micro);
     @since 0.1.0
 */
 #define isoburn_header_version_major  0
-#define isoburn_header_version_minor  3
-#define isoburn_header_version_micro  5
+#define isoburn_header_version_minor  4
+#define isoburn_header_version_micro  8
 /** Note:
     Above version numbers are also recorded in configure.ac because libtool
     wants them as parameters at build time.
@@ -386,10 +386,11 @@ int isoburn_drive_scan_and_grab(struct burn_drive_info *drive_infos[],
                   bit5= ignore ACL from external filesystems
                   bit6= ignore POSIX Extended Attributes from external
                         filesystems
+                  bit7= pretend read-only profile and scan for table of content
     @return       1 = success , 0 = drive not found , <0 = other error
 */
 int isoburn_drive_aquire(struct burn_drive_info *drive_infos[],
-                                char* adr, int flag);
+                         char* adr, int flag);
 
 /** Aquire a drive from the burn_drive_info[] array which was obtained by
     a previous call of burn_drive_scan(). 
@@ -437,7 +438,7 @@ enum burn_disc_status isoburn_disc_get_status(struct burn_drive *drive);
 /** Tells whether the media can be treated by isoburn_disc_erase().
     Wrapper for: burn_disc_erasable()
     @since 0.1.0
-    @param drive The drive to inquire.
+    @param d     The drive to inquire.
     @return      0=not erasable , else erasable
 */
 int isoburn_disc_erasable(struct burn_drive *d);
@@ -462,7 +463,7 @@ void isoburn_disc_erase(struct burn_drive *drive, int fast);
     of libisoburn and libisofs.
     Note: Sessions and tracks are counted beginning with 1, not with 0.
     @since 0.1.6
-    @param drive The drive where msc1 is to be set
+    @param d        The drive where msc1 is to be set
     @param adr_mode Determines how to interpret adr_value and to set msc1.
                     If adr_value shall represent a number then decimal ASCII
                     digits are expected.
@@ -520,8 +521,8 @@ struct isoburn_toc_track;
     isoburn_toc_disc_free() when no longer needed.
     Wrapper for: burn_drive_get_disc()
     @since 0.1.6
-    @param drive The drive with the media to inspect
-    @return NULL in case there is no content info, else it is a valid handle
+    @param d   The drive with the media to inspect
+    @return    NULL in case there is no content info, else it is a valid handle
 */
 struct isoburn_toc_disc *isoburn_toc_drive_get_disc(struct burn_drive *d);
 
@@ -530,8 +531,8 @@ struct isoburn_toc_disc *isoburn_toc_drive_get_disc(struct burn_drive *d);
     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
+    @param disc  The master handle of the media
+    @return      Number of blocks, <=0 indicates unknown or unreadable state
 */
 int isoburn_toc_disc_get_sectors(struct isoburn_toc_disc *disc);
 
@@ -582,7 +583,7 @@ struct isoburn_toc_track **isoburn_toc_session_get_tracks(
 /** 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
+    @param t The track handle
     @param entry A pointer to memory provided by the caller. It will be filled
                  with info according to struct burn_toc_entry as defined
                  in libburn.h
@@ -591,6 +592,23 @@ void isoburn_toc_track_get_entry(struct isoburn_toc_track *t,
                                  struct burn_toc_entry *entry);
 
 
+/** Obtain eventual ISO image parameters of an emulated track. This info was
+    gained with much effort and thus gets cached in the track object.
+    If this call returns 1 then one can save a call of isoburn_read_iso_head()
+    with return mode 1 which could cause an expensive read operation.
+    @since 0.4.0
+    @param t            The track handle
+    @param start_lba    Returns the start address of the ISO session
+    @param image_blocks Returns the number of 2048 bytes blocks
+    @param volid        Caller provided memory for the volume id
+    @param flag         unused yet, submit 0
+    @return             0= not an emulated ISO session , 1= reply is valid
+*/
+int isoburn_toc_track_get_emul(struct isoburn_toc_track *t, int *start_lba,
+                               int *image_blocks, char volid[33], int flag);
+
+
+
 /** Release the memory associated with a master handle of media.
     The handle is invalid afterwards and may not be used any more.
     Wrapper for: burn_disc_free()
@@ -604,7 +622,7 @@ void isoburn_toc_disc_free(struct isoburn_toc_disc *disc);
     image header and obtain its alleged size. Depending on the info mode
     one other string of text information can be retrieved too.
     @since 0.1.6
-    @param drive The drive with the media to inspect
+    @param d     The drive with the media to inspect
     @param lba   The block number from where to read
     @param image_blocks  The number of 2048 bytes blocks
     @param info  Caller provided memory, enough to take eventual info reply
@@ -617,7 +635,7 @@ void isoburn_toc_disc_free(struct isoburn_toc_disc *disc);
                       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
+                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,
@@ -628,7 +646,7 @@ int isoburn_read_iso_head(struct burn_drive *d, int lba,
     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 d        The drive where msc1 is to be set
     @param adr_mode Determines how to interpret the input adr_value.
                     If adr_value shall represent a number then decimal ASCII
                     digits are expected.
@@ -713,6 +731,18 @@ int isoburn_ropt_destroy(struct isoburn_read_opts **o, int flag);
                      @since 0.3.4
                      Do not obtain XFS-style Extended Attributes from external
                      filesystem objects (e.g.  local filesystem files).
+               bit8= noino
+                     @since 0.4.0
+                     Do not load eventual inode numbers from RRIP entry PX,
+                     but generate a new unique inode number for each imported
+                     IsoNode object.
+                     PX inode numbers allow to mark families of hardlinks by
+                     giving all family members the same inode number. libisofs
+                     keeps the PX inode numbers unaltered when IsoNode objects
+                     get written into an ISO image.
+               bit9= nomd5
+                     @since 0.4.2
+                     Do not load the eventual MD5 checksum array.
     @return    1 success, <=0 failure
 */
 #define isoburn_ropt_norock         1
@@ -723,6 +753,8 @@ int isoburn_ropt_destroy(struct isoburn_read_opts **o, int flag);
 #define isoburn_ropt_noaaip        32
 #define isoburn_ropt_noacl         64
 #define isoburn_ropt_noea         128
+#define isoburn_ropt_noino        256
+#define isoburn_ropt_nomd5        512
 
 int isoburn_ropt_set_extensions(struct isoburn_read_opts *o, int ext);
 int isoburn_ropt_get_extensions(struct isoburn_read_opts *o, int *ext);
@@ -764,7 +796,7 @@ int isoburn_ropt_get_default_dirperms(struct isoburn_read_opts *o,
 /** Set the character set for reading RR file names from ISO images.
     @since 0.1.0
     @param o             The option set to work on
-    @param input_charset Set this to NULL to use the default locale charset.
+    @param input_charset Set this to NULL to use the default locale charset
                          For selecting a particular character set, submit its
                          name, e.g. as listed by program iconv -l.
                          Example: "UTF-8". 
@@ -775,6 +807,20 @@ int isoburn_ropt_set_input_charset(struct isoburn_read_opts *o,
 int isoburn_ropt_get_input_charset(struct isoburn_read_opts *o,
                                    char **input_charset);
 
+/**
+    Enable or disable methods to automatically choose an input charset.
+    This eventually overrides the name set via isoburn_ropt_set_input_charset()
+    @since 0.3.8
+    @param o      The option set to work on
+    @param mode   Bitfield for control purposes:
+                  bit0= allow to set the input character set automatically from
+                        attribute "isofs.cs" of root directory.
+                  Submit any other bits with value 0.
+    @return       1 success, <=0 failure
+ */
+int isoburn_ropt_set_auto_incharset(struct isoburn_read_opts *o, int mode);
+int isoburn_ropt_get_auto_incharset(struct isoburn_read_opts *o, int *mode);
+
 
 /** After calling function isoburn_read_image() there are informations
     available in the option set.
@@ -803,7 +849,7 @@ int isoburn_ropt_get_input_charset(struct isoburn_read_opts *o,
 /* ts A90122 */
 /* >>> to be implemented:
 #define isoburn_ropt_has_acl          64
-#define isoburn_ropt_ihas_ea         128
+#define isoburn_ropt_has_ea          128
 */
 
 int isoburn_ropt_get_size_what(struct isoburn_read_opts *o,
@@ -873,16 +919,38 @@ int isoburn_igopt_get_level(struct isoburn_imgen_opts *o, int *level);
                  Weaker than RockRidge, but also readable with Linux.
            bit2= iso1999
                  This is rather exotic. Better do not surprise the readers.
+           bit3= hardlinks
+                 Enable hardlink consolidation. IsoNodes which refer to the
+                 same source object and have the same properties will get
+                 the same ISO image inode numbers.
+                 If combined with isoburn_igopt_rrip_version_1_10 below,
+                 then the PX entry layout of RRIP-1.12 will be used within
+                 RRIP-1.10 (mkisofs does this without causing visible trouble).
            bit5= aaip
                  The libisofs specific SUSP based extension of ECMA-119 which
                  can encode ACL and XFS-style Extended Attributes.
+           bit6= session_md5
+                 @since 0.4.2
+                 Produce and write a MD5 checksum of the whole session stream.
+           bit7= file_md5
+                 @since 0.4.2
+                 Produce and write MD5 checksums for each single IsoFile.
+           bit8= file_stability (only together with file_md5)
+                 @since 0.4.2
+                 Compute MD5 of each file before copying it into the image and
+                 compare this with the MD5 of the actual copying. If they do
+                 not match then issue MISHAP event.
+                 See also libisofs.h  iso_write_opts_set_record_md5()
     @return 1 success, <=0 failure
 */
-#define isoburn_igopt_rockridge 1
-#define isoburn_igopt_joliet    2
-#define isoburn_igopt_iso1999   4
-/* ts A90122 */
-#define isoburn_igopt_aaip     32
+#define isoburn_igopt_rockridge         1
+#define isoburn_igopt_joliet            2
+#define isoburn_igopt_iso1999           4
+#define isoburn_igopt_hardlinks         8
+#define isoburn_igopt_aaip             32
+#define isoburn_igopt_session_md5      64
+#define isoburn_igopt_file_md5        128
+#define isoburn_igopt_file_stability  256
 int isoburn_igopt_set_extensions(struct isoburn_imgen_opts *o, int ext);
 int isoburn_igopt_get_extensions(struct isoburn_imgen_opts *o, int *ext);
 
@@ -1074,6 +1142,29 @@ int isoburn_igopt_get_effective_lba(struct isoburn_imgen_opts *o, int *lba);
 int isoburn_igopt_get_data_start(struct isoburn_imgen_opts *o, int *lba);
 
 
+/** Set resp. get parameters "name" and "timestamp" for a scdbackup checksum
+    tag. It will be appended to the libisofs session tag if the image starts at
+    LBA 0. See isoburn_disc_track_lba_nwa. The scdbackup tag can be used
+    to verify the image by command scdbackup_verify <device> -auto_end.
+    See scdbackup/README appendix VERIFY for its inner details.
+    @since 0.4.4
+    @param o          The option set to work on
+    @param name       The tag name. 80 characters max.
+    @param timestamp  A string of up to 13 characters YYMMDD.hhmmss
+                      A9 = 2009, B0 = 2010, B1 = 2011, ... C0 = 2020, ...
+    @param tag_written Either NULL or the address of an array with at least 512
+                      characters. In the latter case the eventually produced
+                      scdbackup tag will be copied to this array when the image
+                      gets written. This call sets scdbackup_tag_written[0] = 0
+                      to mark its preliminary invalidity.
+    @return 1 success, <=0 failure
+ */
+int isoburn_igopt_set_scdbackup_tag(struct isoburn_imgen_opts *o, char *name,
+                                    char *timestamp, char *tag_written);
+int isoburn_igopt_get_scdbackup_tag(struct isoburn_imgen_opts *o,
+                                    char name[81], char timestamp[19],
+                                    char **tag_written);
+
 
 /* ----------------------------------------------------------------------- */
 /*                      End of Options for image generation                */
@@ -1209,7 +1300,7 @@ int isoburn_disc_track_lba_nwa(struct burn_drive *d, struct burn_write_opts *o,
     overwriteable media. This value is supposed to be <= 2048 * nwa as of
     isoburn_disc_track_lba_nwa().
     @since 0.1.0
-    @param drive The drive holding the media.
+    @param d     The drive holding the media.
     @param start_byte The reply value counted in bytes, not in sectors.
     @param flag  Unused yet. Submit 0.
     @return 1=stat_byte is valid, 0=not an emulated appendable, -1=error 
@@ -1299,9 +1390,10 @@ int isoburn_prepare_new_image(struct burn_drive *in_drive,
                     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);
+int isoburn_prepare_blind_grow(struct burn_drive *in_drive,
+                               struct burn_disc **disc,
+                               struct isoburn_imgen_opts *opts,
+                               struct burn_drive *out_drive, int nwa);
 
 
 /**
@@ -1382,7 +1474,7 @@ int isoburn_drive_wrote_well(struct burn_drive *d);
     @param d  The output drive to which the session was written
     @return   1 success , <=0 failure
 */
-int isoburn_activate_session(struct burn_drive *drive);
+int isoburn_activate_session(struct burn_drive *d);
 
 
 /** Wait after normal end of operations until libisofs ended all write
@@ -1431,6 +1523,6 @@ void isoburn_finish(void);
             1 is emulated multi-session
            -1 is not suitable for isoburn
 */
-int isoburn_needs_emulation(struct burn_drive *drive);
+int isoburn_needs_emulation(struct burn_drive *d);
  
 

test/compare_file.c

@@ -5,9 +5,9 @@
   To compare tree /media/dvd and /original/dir :
       find /media/dvd -exec compare_file '{}' /media/dvd /original/dir ';'
 
-  Copyright 2008 Thomas Schmitt, <scdbackup@gmx.net>
+  Copyright 2008 - 2010 Thomas Schmitt, <scdbackup@gmx.net>
 
-  Provided under GPL version 2.
+  Provided under GPL version 2 or later.
 
 
   cc -g -o compare_file compare_file.c

xorriso/README

@@ -4,25 +4,27 @@
 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.3.5.tar.gz
-Copyright (C) 2006-2009 Thomas Schmitt, provided under GPL version 2.
+http://scdbackup.sourceforge.net/xorriso-0.4.8.pl00.tar.gz
+Copyright (C) 2006-2010 Thomas Schmitt, provided under GPL version 2 or later.
 ------------------------------------------------------------------------------
 
 
-xorriso is a program which maps file objects from POSIX compliant
+xorriso is a program which copies file objects from POSIX compliant
 filesystems into Rock Ridge enhanced ISO 9660 filesystems and allows
 session-wise manipulation of such filesystems. It can load the management
 information of existing ISO images and it writes the session results to
 optical media or to filesystem objects.
 Vice versa xorriso is able to restore file objects from ISO 9660 filesystems.
 
-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
 incorporates the libraries of libburnia-project.org .
 
+Currently it is fully supported on Linux with kernels >= 2.4 and on
+FreeBSD versions with ATAPI/CAM support enabled in the kernel, see atapicam(4).
+On other X/Open compliant systems there will only be POSIX i/o with disk
+file objects, but no direct MMC operation on CD/DVD/BD drives.
+
 By using this software you agree to the disclaimer at the end of this text:
 "... without even the implied warranty ..."
 
@@ -33,20 +35,21 @@ The most simple way to get xorriso from source code is the xorriso standalone
 tarball.
 
 Prerequisites:
-The tarball contains anything that is needed except the following system
+The tarball contains everything that is needed except the following system
 components:
    libc, libpthread
-   plus on FreeBSD: libiconv, libcam
+   plus on FreeBSD: libiconv, libcam, IDE and SATA drives need atapicam
 Optional at compile time are:
    libreadline and the readline-dev headers make dialog mode more convenient.
    on Linux: libacl and libacl-devel allow getting and setting ACLs.
+   zlib and zlib-devel allow zisofs compression.
 If they were present at compile time, then the optional libraries have to
 be present at runtime, too.
 
-Obtain xorriso-0.3.5.tar.gz, take it to a directory of your choice and do:
+Obtain xorriso-0.4.8.pl00.tar.gz, take it to a directory of your choice and do:
 
-    tar xzf xorriso-0.3.5.tar.gz
-    cd xorriso-0.3.5
+    tar xzf xorriso-0.4.8.pl00.tar.gz
+    cd xorriso-0.4.8
 
 Within that directory execute:
 
@@ -56,7 +59,10 @@ Within that directory execute:
 This will produce a binary named
     ./xorriso/xorriso
 
-which you may strip to reduce it in size
+If you want xorriso to report a "Build timestamp" with its option -version :
+    make buildstamped
+
+You may strip the binary to reduce it in size
     strip ./xorriso/xorriso
 
 You may copy or move it to a directory where it can be found by the shell,
@@ -86,14 +92,41 @@ development package is installed, then rather build xorriso by:
     ./configure --prefix=/usr --disable-libreadline 
     make clean ; make
 Never omit the "make clean" command after switching libreadline enabling.
+Other deliberate dependency reduction options of ./configure are:
+    --disable-libacl   avoid use of ACL functions like acl_to_text()
+    --disable-xattr    avoid use of xattr functions like listxattr()
+    --disable-zlib     avoid use of zlib functions like compress2()
 
-If you want xorriso to report a "Build timestamp" with its option -version:
-    make buildstamped
+xorriso brings own system adapters which allow burning optical media on Linux
+and FreeBSD. Alternatively it can use libcdio-0.83 or later for sending
+commands to optical drives:
+    --enable-libcdio
+
+xorriso allows to use external processes as file content filters. This is
+a potential security risk which may be avoided by ./configure option
+    --disable-external-filters
+
+By default the filter feature is disabled if effective user id and real
+user id differ. This ban can be lifted by
+    --enable-external-filters-setuid
+
+Sometimes xorriso will yield better write performance on Linux if 64 KB are
+transmitted in each write operation rather than 32 KB. See option -dvd_obs .
+64k can be made default at configure time by:
+    --enable-dvd-obs-64k
+
+For xorriso -as cdrecord emulation only:
+In some situations Linux may deliver a better write performance to drives if
+the track input is read with O_DIRECT (see man 2 open). The included libburn
+and the cdrecord emulation of xorriso can be told to use this peculiar read
+mode by:
+    --enable-track-src-odirect
 
 
                        Drives and Disk File Objects 
 
-The user of xorriso needs rw-permission for the CD burner device.
+The user of libisoburn applications needs rw-permission for the CD/DVD/BD
+drives which shall be used, even if only reading is intended.
 A list of rw-accessible drives can be obtained by
 
     xorriso -devices
@@ -135,7 +168,8 @@ by prepending "stdio:" to the path.
 Like:
     xorriso -dev stdio:/dev/sdb ...more arguments...
 This rule may be changed by xorriso option -drive_class.
-Prefix "mmc:" causes a path to be accepted only if it is a real optical drive.
+Prefix "mmc:" causes a path to be accepted only if it is a real optical drive
+which is accessible by generic SCSI/MMC commands.
 
 
                               Testing
@@ -169,8 +203,9 @@ and vice versa:
 
                              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
+                             Sector Maps
+
+Sector maps describe the valid and invalid blocks on a media or a disk copy of
 a media. xorriso creates and reads these file with its option -check_media.
 
 The file begins with 32 bytes of cleartext of which the last one is a
@@ -186,6 +221,45 @@ bit in the map. Then come the bits in form of 8-bit bytes.
 Data block M is covered by bit B=M/S in the map, bit number B is stored in
 byte B/8 as bit B%8. A valid readable data block has its bit set to 1.
 
+                             Checksum Tags
+
+Checksum tags are data blocks inside an ISO 9660 image which do not belong to
+any file but rather tell the MD5 of a certain range of data blocks.
+
+The superblock checksum tag is written after the ECMA-119 volume descriptors.
+The tree checksum tag is written after the ECMA-119 directory entries.
+The session checksum tag is written after all payload including the checksum
+array. (Then follows eventual padding.)
+
+The tags are single lines of printable text, padded by 0 bytes. They have
+the following format:
+
+ Tag_id pos=# range_start=# range_size=# [session_start|next=#] md5=# self=#\n
+
+Parameters md5= and self= are 32 digit hex, the others are decimal numbers.
+
+Tag_id distinguishes the following tag types
+  "libisofs_rlsb32_checksum_tag_v1"     Relocated 64 kB superblock tag
+  "libisofs_sb_checksum_tag_v1"         Superblock tag
+  "libisofs_tree_checksum_tag_v1"       Directory tree tag
+  "libisofs_checksum_tag_v1"            Session end tag
+
+A relocated superblock may appear at LBA 0 of an image which was produced for
+being stored in a disk file or on overwriteable media (e.g. DVD+R, BD-RE).
+xorriso records the first session at LBA 32. An eventual follow-up session
+begins at the next block address which is divisible by 32 and higher than the
+address of the previous session's end tag. Normally no session starts after the
+address given by relocated superblock parameter session_start=.
+Session oriented media like CD-R[W], DVD+R, BD-R will have no relocated
+superblock but rather bear a table-of-content on media level.
+
+A tag is valid if pos= tells its own block address and self= tells its own MD5
+up to the last hex digit of md5=. range_start= tells the first block that is
+covered by md5=, range_size= tells the number of blocks covered by md5=.
+Relocated superblocks tell the block address of their session by session_start=.
+Superblock and tree tag tell the block address of the next tag by next=.
+The newline character at the end is mandatory.
+
 
                              libisoburn
 
@@ -206,9 +280,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.3.5 :
-- libburn.so.4  , version libburn-0.6.0 or higher
-- libisofs.so.6 , version libisofs-0.6.14 or higher
+Dynamic library and compile time header requirements for libisoburn-0.4.8 :
+- libburn.so.4  , version libburn-0.7.6 or higher
+- libisofs.so.6 , version libisofs-0.6.26 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.
@@ -219,8 +293,8 @@ Standalone xorriso has less runtime dependencies and can be moved more freely.
 ------------------------------------------------------------------------------
 
     This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License version 2 as
-    published by the Free Software Foundation.
+    it under the terms of the GNU General Public License version 2 or later
+    as published by the Free Software Foundation.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -237,7 +311,7 @@ libburnia-project.org
 By Mario Danic           <mario.danic@gmail.com>,
    Vreixo Formoso        <metalpain2002@yahoo.es>
    Thomas Schmitt        <scdbackup@gmx.net>
-Copyright (C) 2006-2009 Mario Danic, Vreixo Formoso, Thomas Schmitt.
+Copyright (C) 2006-2010 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,22 +1,24 @@
 #!/bin/sh
 
 # compile_xorriso.sh
-# Copyright 2005 - 2009 Thomas Schmitt, scdbackup@gmx.net, GPL
+# Copyright 2005 - 2010 Thomas Schmitt, scdbackup@gmx.net, GPL version 2
 #
 # Not intended for general use in production installations !
 # Rather use:  ./bootstrap ; ./configure ; make
 #
-# This is a development tool which expects a special setup of directories.
+# This is a development tool which expects a special setup of directories
+# on a Linux system (e.g. SuSE 10.2).
 # It is to be executed in a common parent of the directories given with
 #   $isofs $isoburn $burn $xorr
 
 isofs=./nglibisofs-develop/libisofs/libisofs_libisofs_la-
+isofs_filter=./nglibisofs-develop/libisofs/filters/libisofs_libisofs_la-
 burn=./libburn-develop/libburn
 isoburn=./libisoburn-develop/libisoburn
 xorr=./libisoburn-develop/xorriso
 
 debug_opts="-O2"
-def_opts=
+def_opts="-DXorriso_allow_external_filterS"
 largefile_opts="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1"
 do_strip=0
 static_opts=
@@ -24,6 +26,7 @@ warn_opts="-Wall"
 nglibisofs=1
 def_libreadline="-DXorriso_with_readlinE"
 link_libreadline="-lreadline"
+link_libcdio=
 
 for i in "$@"
 do
@@ -41,12 +44,20 @@ do
   then
     def_libreadline=""
     link_libreadline=""
+  elif test "$i" = "-dvd_obs_64k"
+  then
+    def_opts="$def_opts -DXorriso_dvd_obs_default_64K"
+  elif test "$i" = "-use_libcdio"
+  then
+    link_libcdio="-lcdio"
   elif test "$i" = "-help" -o "$i" = "--help" -o "$i" = "-h"
   then
     echo \
         "$xorr/compile_xorriso.sh : to be executed above top level directories"
     echo "Options:"
+    echo "  -dvd_obs_64k      64 KB default size for DVD/BD writing."
     echo "  -no_libreadline   do not compile for and link with libreadline."
+    echo "  -use_libcdio      link with -lcdio because libburn uses it."
     echo "  -do_diet          produce capability reduced lean version."
     echo "  -do_strip         apply program strip to compiled programs."
     echo "  -g                produce debuggable programm."
@@ -85,13 +96,18 @@ libisofs="$libisofs $isofs"util_rbtree.o
 libisofs="$libisofs $isofs"system_area.o
 libisofs="$libisofs $isofs"make_isohybrid_mbr.o
 libisofs="$libisofs $isofs"aaip_0_2.o
+libisofs="$libisofs $isofs"filter.o
+libisofs="$libisofs $isofs_filter"external.o
+libisofs="$libisofs $isofs_filter"zisofs.o
+libisofs="$libisofs $isofs_filter"gzip.o
+libisofs="$libisofs $isofs"md5.o
 
 echo "Version timestamp :  $(sed -e 's/#define Xorriso_timestamP "//' -e 's/"$//' "$xorr"/xorriso_timestamp.h)"
 
 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"
+echo "compiling program $xorr/xorriso.c $static_opts $debug_opts $def_opts $link_libcdio"
 cc -I. -DXorriso_with_maiN $def_libreadline \
   $warn_opts \
   $static_opts \
@@ -130,7 +146,7 @@ cc -I. -DXorriso_with_maiN $def_libreadline \
   "$burn"/toc.o \
   \
   "$burn"/crc.o \
-  "$burn"/lec.o \
+  "$burn"/ecma130ab.o \
   \
   "$isoburn"/isoburn.o \
   "$isoburn"/burn_wrap.o \
@@ -140,9 +156,11 @@ cc -I. -DXorriso_with_maiN $def_libreadline \
   $libisofs \
   \
   $link_libreadline \
+  $link_libcdio \
   \
   -lpthread \
-  -lacl
+  -lacl \
+  -lz
 
   ret=$?
   if test "$ret" = 0

xorriso/configure_ac.txt

@@ -1,4 +1,4 @@
-AC_INIT([xorriso], [0.3.5], [http://libburnia-project.org])
+AC_INIT([xorriso], [0.4.8], [http://libburnia-project.org])
 AC_PREREQ([2.50])
 dnl AC_CONFIG_HEADER([config.h])	
 
@@ -8,15 +8,15 @@ AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([subdir-objects])
 
 BURN_MAJOR_VERSION=0
-BURN_MINOR_VERSION=6
-BURN_MICRO_VERSION=5
+BURN_MINOR_VERSION=7
+BURN_MICRO_VERSION=7
 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=16
+LIBISOFS_MICRO_VERSION=27
 AC_SUBST(LIBISOFS_MAJOR_VERSION)
 AC_SUBST(LIBISOFS_MINOR_VERSION)
 AC_SUBST(LIBISOFS_MICRO_VERSION)
@@ -46,7 +46,9 @@ fi
 dnl If iconv(3) is in an extra libiconv, then it gets added to variable LIBS.
 dnl If not, then no -liconv will be added.
 AC_CHECK_LIB(iconv, iconv, , )
-
+dnl GNU iconv has no function iconv() but libiconv() and a macro iconv()
+AC_CHECK_LIB(iconv, libiconv, , )
+ 
 AC_PROG_LIBTOOL
 AC_SUBST(LIBTOOL_DEPS)
 LIBTOOL="$LIBTOOL --silent"
@@ -78,6 +80,7 @@ AC_SUBST(THREAD_LIBS)
 
 TARGET_SHIZZLE
 AC_SUBST(ARCH)
+AC_SUBST(LIBBURNIA_PKGCONFDIR)
 AC_SUBST(LIBBURN_ARCH_LIBS)
 
 
@@ -109,6 +112,13 @@ else
     CFLAGS="$CFLAGS -DDEBUG"
 fi
 
+
+dnl Determine target directory for libisoburn-*.pc
+dnl Important: Must be performed _after_ TARGET_SHIZZLE
+dnl
+LIBBURNIA_SET_PKGCONFIG
+
+
 AC_ARG_ENABLE(libreadline,
 [  --enable-libreadline    Enable use of libreadline by xorriso, default=yes],
                , enable_libreadline=yes)
@@ -127,7 +137,7 @@ AC_SUBST(READLINE_DEF)
 
 
 AC_ARG_ENABLE(libacl,
-[  --enable-libacl    Enable use of libacl by libisofs, default=yes],
+[  --enable-libacl         Enable use of libacl by libisofs, default=yes],
                , enable_libacl=yes)
 if test x$enable_libacl = xyes; then
 dnl Check whether there is libacl-devel and libacl-runtime.
@@ -142,7 +152,7 @@ AC_SUBST(LIBACL_DEF)
 
 
 AC_ARG_ENABLE(xattr,
-[  --enable-xattr     Enable use of xattr by libisofs, default=yes],
+[  --enable-xattr          Enable use of xattr by libisofs, default=yes],
                , enable_xattr=yes)
 if test x$enable_xattr = xyes; then
 dnl Check whether there is the header for Linux xattr.
@@ -155,9 +165,102 @@ fi
 AC_SUBST(XATTR_DEF)
 
 
+AC_ARG_ENABLE(zlib,
+[  --enable-zlib           Enable use of zlib by libisofs, default=yes],
+               , enable_zlib=yes)
+if test x$enable_zlib = xyes; then
+dnl Check whether there is the header for zlib.
+dnl If not, erase this macro which would enable use of compress2() and others.
+dnl Linking fails on SuSE 9.0 because zlib has compress2() but lacks 
+dnl compressBound(). So compressBound is the more modern thing to test.
+dnl The empty parameter after "compressBound" causes -lz.
+    ZLIB_DEF="-DLibisofs_with_zliB"
+    AC_CHECK_HEADER(zlib.h, AC_CHECK_LIB(z, compressBound, , ZLIB_DEF= ), ZLIB_DEF= )
+else
+    ZLIB_DEF=
+fi
+AC_SUBST(ZLIB_DEF)
+
+
+AC_ARG_ENABLE(libcdio,
+[  --enable-libcdio         Enable EXPERIMENTAL use of libcdio as system adapter, default=no],
+               , enable_libcdio=no)
+if test x$enable_libcdio = xyes; then
+dnl Check whether there is libcdio-devel and libcdio-runtime.
+dnl If not, erase this macro
+    LIBCDIO_DEF="-DLibburn_use_libcdiO"
+dnl The empty yes case obviously causes -lcdio to be linked
+    AC_CHECK_HEADER(cdio/cdio.h, AC_CHECK_LIB(cdio, mmc_last_cmd_sense, , LIBCDIO_DEF= ), LIBCDIO_DEF= )
+else
+    LIBCDIO_DEF=
+fi
+if test x$LIBCDIO_DEF = x
+then
+    if test x$enable_libcdio = xyes
+    then
+      echo "WARNING: could not enable use of libcdio as system adapter"
+    fi
+else
+    echo "enabled  EXPERIMENTAL use of libcdio as system adapter"
+
+    LIBCDIO_REQUIRED=0.83
+    PKG_CHECK_MODULES(LIBCDIO, libcdio >= $LIBCDIO_REQUIRED)
+fi
+AC_SUBST(LIBCDIO_DEF)
+
+
+AC_ARG_ENABLE(external-filters,
+[  --enable-external-filters   Enable use of external filter programs by xorriso, default=yes],
+               , enable_external_filters=yes)
+if test x"$enable_external_filters" = xyes; then
+    EXTF_DEF="-DXorriso_allow_external_filterS"
+    echo "enabled  xorriso external filter programs"
+else
+    EXTF_DEF=
+    echo "disabled xorriso external filter programs"
+fi
+AC_SUBST(EXTF_DEF)
+
+AC_ARG_ENABLE(external-filters-setuid,
+[  --enable-external-filters-setuid   Enable xorriso external filter programs under setuid, default=no],
+               , enable_external_filters_setuid=no)
+if test x$enable_external_filters_setuid = xyes; then
+    EXTF_SUID_DEF="-DXorriso_allow_extf_suiD"
+    echo "enabled  xorriso external filter programs under setuid"
+else
+    EXTF_SUID_DEF=
+    echo "disabled xorriso external filter programs under setuid"
+fi
+AC_SUBST(EXTF_SUID_DEF)
+
+AC_ARG_ENABLE(dvd-obs-64k,
+[  --enable-dvd-obs-64k         64 KB default size for DVD/BD writing, default=no],
+               , enable_dvd_obs=no)
+if test x$enable_dvd_obs_64k = xyes; then
+    XORRISO_DVD_OBS_64K="-DXorriso_dvd_obs_default_64K"
+    echo "enabled  xorriso write size default 64 KB on DVD and BD"
+else
+    XORRISO_DVD_OBS_64K=
+    echo "disabled xorriso write size default 64 KB on DVD and BD"
+fi
+AC_SUBST(XORRISO_DVD_OBS_64K)
+
+AC_ARG_ENABLE(track-src-odirect,
+[  --enable-track-src-odirect   Enable use of O_DIRECT with -as cdrskin, default=no],
+               , enable_track_src_odirect=no)
+if test x$enable_track_src_odirect = xyes; then
+    LIBBURN_O_DIRECT_DEF="-DLibburn_read_o_direcT"
+    echo "enabled  use of O_DIRECT with input of -as cdrskin"
+else
+    LIBBURN_O_DIRECT_DEF=
+    echo "disabled use of O_DIRECT with input of -as cdrskin"
+fi
+AC_SUBST(LIBBURN_O_DIRECT_DEF)
+
 AC_CONFIG_FILES([
 	Makefile
 	version.h
-	xorriso.pc
 	])
 AC_OUTPUT
+
+#	xorriso.pc

xorriso/make_xorriso_standalone.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # make_xorriso_standalone.sh
-# Copyright 2008 - 2009 Thomas Schmitt, scdbackup@gmx.net, GPL
+# Copyright 2008 - 2010 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.3.5
+xorriso_rev=0.4.8
 # For unstable uploads:
-xorriso_pl=""
+## xorriso_pl=""
 # For stable releases:
-# xorriso_pl=".pl00"
+xorriso_pl=".pl00"
 
 with_bootstrap_tarball=1
 
@@ -103,7 +103,7 @@ copy_files xorriso/configure_ac.txt         "$lone_dir"/configure.ac
 
 copy_files xorriso/xorriso_makefile_am.txt  "$lone_dir"/Makefile.am
 
-copy_files xorriso/xorriso_pc_in.txt        "$lone_dir"/xorriso.pc.in
+# copy_files xorriso/xorriso_pc_in.txt        "$lone_dir"/xorriso.pc.in
 
 copy_files xorriso/README                   "$lone_dir"/README
 
@@ -134,6 +134,8 @@ copy_files \
 
 copy_files xorriso/xorriso_buildstamp_none.h \
            "$lone_dir"/xorriso/xorriso_buildstamp.h
+copy_files xorriso/xorriso_buildstamp_none.h \
+           "$lone_dir"/xorriso/xorriso_buildstamp_none.h
 
 create_dir "$lone_dir"/test
 copy_files \
@@ -150,6 +152,8 @@ goto_dir   "$current_dir"/nglibisofs-develop
 copy_files libisofs/*.[ch] "$lone_dir"/libisofs
 copy_files libisofs/filters/*.[ch] "$lone_dir"/libisofs/filters
 copy_files doc/susp_aaip*.txt "$lone_dir"/doc
+copy_files doc/zisofs_format.txt "$lone_dir"/doc
+copy_files doc/checksums.txt "$lone_dir"/doc
 copy_files COPYRIGHT "$lone_dir"/libisofs
 
 # To get a common version.h 

xorriso/makefile_libxorriso_am.txt

@@ -0,0 +1,197 @@
+
+# ts A90315 : LIBBURNIA_PKGCONFDIR is defined OS specific in acinclude.m4
+# was: pkgconfigdir=$(libdir)/pkgconfig
+pkgconfigdir=$(LIBBURNIA_PKGCONFDIR)
+
+libincludedir=$(includedir)/libisoburn
+
+lib_LTLIBRARIES = libisoburn/libisoburn.la libxorriso/libxorriso.la
+
+## ========================================================================= ##
+
+# Build libraries
+libisoburn_libisoburn_la_LDFLAGS = \
+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+libisoburn_libisoburn_la_SOURCES = \
+	libisoburn/burn_wrap.c \
+	libisoburn/data_source.c \
+	libisoburn/isoburn.c \
+	libisoburn/isoburn.h \
+	libisoburn/isofs_wrap.c \
+	libisoburn/libisoburn.h \
+	version.h
+
+libisoburn_libisoburn_la_LIBADD = \
+	-lisofs \
+	-lburn
+
+libxorriso_libxorriso_la_LDFLAGS = \
+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+libxorriso_libxorriso_la_SOURCES = \
+	xorriso/xorriso.h \
+	xorriso/xorriso_private.h \
+	xorriso/xorriso.c \
+	xorriso/xorrisoburn.h \
+	xorriso/xorrisoburn.c \
+	xorriso/xorriso_timestamp.h \
+	xorriso/xorriso_buildstamp.h \
+	version.h
+
+libxorriso_libxorriso_la_LIBADD = \
+	-lisofs \
+	-lburn \
+	-lisoburn
+
+libinclude_HEADERS = \
+	libisoburn/libisoburn.h \
+	xorriso/xorriso.h
+
+## ========================================================================= ##
+
+
+# This is the reference application of libisoburn. See man xorriso/xorriso.1
+# 
+bin_PROGRAMS = \
+	xorriso/xorriso
+
+# This looks quite ugly with make install: xorriso.c is compiled twice again
+#
+# Trying to create a build timestamp file
+#
+# BUILT_SOURCES = xorriso/xorriso_buildstamp.h
+#
+# phony targets get rebuilt every time
+#
+# .PHONY: xorriso/xorriso_buildstamp.h
+# xorriso/xorriso_buildstamp.h:
+# 	date -u '+#define Xorriso_build_timestamP "%Y.%m.%d.%H%M%S"' >xorriso/xorriso_buildstamp.h
+# 	cat xorriso/xorriso_buildstamp.h
+
+xorriso_xorriso_CPPFLAGS = -Ilibisoburn
+xorriso_xorriso_CFLAGS = -DXorriso_with_maiN -DXorriso_without_subS \
+                         $(READLINE_DEF) $(LIBACL_DEF) $(XATTR_DEF) \
+                         $(EXTF_DEF) $(EXTF_SUID_DEF) $(ZLIB_DEF) \
+                         $(XORRISO_DVD_OBS_64K)
+
+xorriso_xorriso_LDADD = libisoburn/libisoburn.la -lisofs -lburn \
+                        libxorriso/libxorriso.la \
+                        $(THREAD_LIBS) $(LIBBURN_ARCH_LIBS)
+
+xorriso_xorriso_SOURCES = \
+	xorriso/xorriso.h \
+	xorriso/xorriso_private.h \
+	xorriso/xorriso.c \
+	xorriso/xorrisoburn.h \
+	xorriso/xorriso_timestamp.h \
+	xorriso/xorriso_buildstamp.h
+
+#	xorriso/xorrisoburn.c \
+#
+
+# Install symbolic links to the xorriso binary
+#
+install-exec-hook:
+	if test -e "$(DESTDIR)$(bindir)"/xorrisofs ; then rm "$(DESTDIR)$(bindir)"/xorrisofs ; else echo ; fi
+	ln -s xorriso "$(DESTDIR)$(bindir)"/xorrisofs
+	if test -e "$(DESTDIR)$(bindir)"/osirrox ; then rm "$(DESTDIR)$(bindir)"/osirrox ; else echo ; fi
+	ln -s xorriso "$(DESTDIR)$(bindir)"/osirrox
+	if test -e "$(DESTDIR)$(bindir)"/xorrecord ; then rm "$(DESTDIR)$(bindir)"/xorrecord ; else echo ; fi
+	ln -s xorriso "$(DESTDIR)$(bindir)"/xorrecord
+
+
+# Alternative to the disabled .PHONY above.
+# Trying to create a build timestamp file semi-manually:  make buildstamped
+#
+buildstamp:
+	date -u '+#define Xorriso_build_timestamP "%Y.%m.%d.%H%M%S"' >xorriso/xorriso_buildstamp.h
+	cat xorriso/xorriso_buildstamp.h
+
+# For now   make buildstamped  has to be performed explicitely.
+buildstamped: buildstamp
+	make
+
+
+
+## Build test applications
+noinst_PROGRAMS = \
+	test/compare_file
+
+# A program to compare two files in mirrored trees in mounted filesystems
+# To compare tree /media/dvd and /original/dir :
+#   find /media/dvd -exec test/compare_file '{}' /media/dvd /original/dir ';'
+#
+test_compare_file_CPPFLAGS =
+test_compare_file_CFLAGS =
+test_compare_file_LDADD =
+test_compare_file_SOURCES = test/compare_file.c
+
+
+## ========================================================================= ##
+
+## Build documentation (You need Doxygen for this to work)
+webhost = http://libburn-api.pykix.org
+webpath = /
+docdir = $(DESTDIR)$(prefix)/share/doc/$(PACKAGE)-$(VERSION)
+
+doc:	doc/html
+
+doc/html: doc/doxygen.conf
+	if [ -f ./doc/doc.lock ]; then \
+		$(RM) -r doc/html; \
+		doxygen doc/doxygen.conf; \
+	fi
+
+doc-upload: doc/html
+	scp -r $</* $(webhost):$(webpath)
+
+all: doc
+
+install-data-local: 
+	if [ -f ./doc/doc.lock ]; then \
+		$(mkinstalldirs) $(docdir)/html; \
+		$(INSTALL_DATA) doc/html/* $(docdir)/html; \
+	fi
+
+uninstall-local:
+	rm -rf $(docdir)
+
+## ========================================================================= ##
+
+# Indent source files
+indent_files = \
+	$(libisoburn_libisoburn_la_SOURCES)
+	
+
+indent: $(indent_files)
+	indent -bad -bap -nbbb -nbbo -nbc -bli0 -br -bls   \
+		-cdw -ce -cli0 -ncs -nbfda -i8 -l79 -lc79   \
+		-lp -saf -sai -nprs -npsl -saw -sob -ss -ut \
+		-sbi0 -nsc -ts8 -npcs -ncdb -fca            \
+		$^
+
+.PHONY: indent
+
+## ========================================================================= ##
+
+# Extra things
+nodist_pkgconfig_DATA = \
+	libisoburn-1.pc
+
+man_MANS = xorriso/xorriso.1
+
+EXTRA_DIST = \
+	libisoburn-1.pc.in \
+	version.h.in \
+	doc/comments \
+	doc/doxygen.conf.in \
+	README \
+	AUTHORS \
+	CONTRIBUTORS \
+	COPYRIGHT \
+	COPYING \
+	INSTALL \
+	xorriso/changelog.txt \
+	xorriso/xorriso_buildstamp_none.h \
+	xorriso/README \
+	$(man_MANS)
+

xorriso/xorriso.h

@@ -2,9 +2,9 @@
 /* Command line oriented batch and dialog tool which creates, loads,
    manipulates and burns ISO 9660 filesystem images.
 
-   Copyright 2007-2009 Thomas Schmitt, <scdbackup@gmx.net>
+   Copyright 2007-2010 Thomas Schmitt, <scdbackup@gmx.net>
 
-   Provided under GPL version 2.
+   Provided under GPL version 2 or later.
 
    This file contains the public option interface of xorriso.
 */
@@ -16,35 +16,181 @@
 struct XorrisO; 
 
 
+#define Xorriso_program_versioN "0.4.8"
+
+
 /* --------------------- Fundamental Management ------------------- */
 
-/* Create a new xorriso object and tell it the program name to be used
+
+/* Get the version text (e.g. "0.4.2") of the program code.
+   @param flag     unused yet, submit 0
+   @return         readonly character string
+*/
+char *Xorriso__get_version_text(int flag);
+
+
+/* Mandatory call:
+   Create a new xorriso object and tell it the program name to be used
    with messages and for decision of special behavior.
    @param xorriso  returns the newly created XorrisO object 
    @param progname typically argv[0] of main(). Some leafnames of the progname
                    path have special meaning and trigger special behavior:
                     "osirrox"    allows image-to-disk copying: -osirrox "on" 
-                    "xorrisofs"  activates permanent mkisofs emulation
+                    "xorrisofs"  activates -as "mkisofs" emulation from start
                     "genisofs"   alias of "xorrisofs"
                     "mkisofs"    alias of "xorrisofs"
                     "genisoimage"  alias of "xorrisofs"
-   @parm flag      unused yet, submit 0
+                    "xorrecord"  activates -as "cdrecord" emulation from start
+                    "cdrecord"   alias of "xorrecord"
+                    "wodim"      alias of "xorrecord"
+                    "cdrskin"    alias of "xorrecord"
+   @param flag     unused yet, submit 0
    @return         >0 success , <=0 failure, no object created
 */
 int Xorriso_new(struct XorrisO ** xorriso, char *progname, int flag);
 
 
-/* Make global library initializations.
+/* Interpret certain commands which shall get into effect before the
+   libraries get initialized:
+     -abort_on , -report_about , -return_with , -list_delimiter
+   Some commands get executed only if they are the only command in argv:
+     -prog_help , -help , -no_rc
+   Some get examined for the need to redirect stdout messages
+     -dev , -outdev , -indev , -as 
+   @param xorriso The context object in which to perform the commands.
+   @param argc    Number of arguments.
+   @param argv    The arguments. argv[0] contains the program name.
+                  argv[1] to argv[argc-1] contain commands and parameters.
+   @param idx     Argument cursor. When this function is called, *idx must
+                  be at least 1, argv[*idx] must be to a command.
+                  *idx will iterate over commands and parameters until this
+                  function aborts or until argc is reached.
+   @param flag    bit0= do not interpret argv[1]
+   @return        <0 error
+                   0 end program
+                   1 ok, go on 
+*/
+int Xorriso_prescan_args(struct XorrisO *xorriso, int argc, char **argv,
+                         int flag);
+
+
+/* Mandatory call:
+   It has to be made before calling any function listed below this point.
+
+   Make global library initializations.
    This must be done with the first xorriso object that gets created and
    with the first xorriso object that gets created after Xorriso_destroy(,1).
+   @param xorriso The context object.
+   @param flag    unused yet, submit 0
+   @return        <=0 error , >0 success
 */ 
 int Xorriso_startup_libraries(struct XorrisO *xorriso, int flag);
 
 
-/* Destroy xorriso object when it is no longer needed.
-   @param flag bit0= Make global librariy shutdown.
-                     Use only with last xorriso object to be destroyed.
-                     
+/* Read and interpret commands from eventual startup files as listed in
+   man xorriso.
+   @param xorriso The context object in which to perform the commands.
+   @param flag    unused yet, submit 0
+   @return <=0 = error
+             1 = success
+             3 = end program run (e.g. because command -end was encountered)
+*/
+int Xorriso_read_rc(struct XorrisO *xorriso, int flag);
+
+
+/* Check whether program arguments shall be backslash decoded and eventually
+   replace *argv by a new argument vector. The old one will not be freed
+   by this call. If it is dynamic memory then you need to keep a copy of
+   the pointer and free it yourself after this call.
+   @param xorriso The context object
+   @param argc    Number of arguments.
+   @param argv    The arguments. (*argv)[0] contains the program name.
+                  (*argv)[1] to (*argv)[argc-1] contain commands and parameters
+                  If argv after the call differs from argv before the call,
+                  then one should dispose it later by:
+                    for(i= 0; i < argc; i++)
+                      if(argv[i] != NULL)
+                        free(argv[i]);
+                    free(argv);
+   @param flag    unused yet, submit 0
+   @return        <= 0 error , > 0 success
+*/
+int Xorriso_program_arg_bsl(struct XorrisO *xorriso, int argc, char ***argv,
+                            int flag);
+
+
+/* Interpret argv as xorriso command options and their parameters.
+   (An alternative is to call functions of the options API directly and to
+    perform own error status evaluation. See below: Options API.) 
+   After the first command and its parameters there may be more commands and
+   parameters. All parameters must be given in the same call as their command.
+   @param xorriso The context object in which to perform the commands.
+   @param argc    Number of arguments.
+   @param argv    The arguments. argv[0] contains the program name.
+                  argv[1] to argv[argc-1] contain commands and parameters.
+   @param idx     Argument cursor. When this function is called, *idx must
+                  be at least 1, argv[*idx] must be a command.
+                  *idx will iterate over commands and parameters until this
+                  function aborts or until argc is reached.
+   @param flag    bit0= recursion
+                  bit1= these are the main() program start arguments
+   @return <=0 = error
+             1 = success
+             2 = problem event ignored
+             3 = end program run (e.g. because command -end was encountered)
+*/
+int Xorriso_interpreter(struct XorrisO *xorriso,
+                        int argc, char **argv, int *idx, int flag);
+
+
+/* Parse a command line into words and use them as argv for a call of
+   Xorriso_interpreter(). Put out some info lines about the outcome.
+   @param xorriso The context object in which to perform the commands.
+   @param line    A text of one or more words according to man xorriso
+                  paragraph "Command processing" up to and including
+                  "Backslash Interpretation".
+   @param flag    bit0 to bit15 are forwarded to Xorriso_interpreter()
+                  bit16= no pageing of info lines
+                  bit17= print === bar even if xorriso->found<0
+   @return        see return of Xorriso_interpreter()
+*/
+int Xorriso_execute_option(struct XorrisO *xorriso, char *line, int flag);
+
+
+/* Enter xorriso command line dialog mode, eventually using libreadline.
+   This call returns immediately if not option -dialog "on" was performed
+   before.
+   @param xorriso The context object in which to perform the commands.
+   @param flag    unused yet, submit 0
+   @return        <=0 error, 1= dialog mode ended normally ,
+                  3= dialog mode ended normally,interpreter asks to end program
+*/
+int Xorriso_dialog(struct XorrisO *xorriso, int flag);
+
+
+/* Inquire whether option -commit would make sense.
+   @param xorriso The context object to inquire.
+   @param flag    unused yet, submit 0
+   @return        0= -commit would have nothing to do
+                  1= a new image session would emerge at -commit
+*/
+int Xorriso_change_is_pending(struct XorrisO *xorriso, int flag);
+
+
+/* Compute the exit value from the recorded maximum event severity.
+   @param xorriso The context object to inquire.
+   @param flag    unused yet, submit 0
+   @return        The computed exit value
+*/
+int Xorriso_make_return_value(struct XorrisO *xorriso, int flag);
+
+
+/* Mandatory call:
+   Destroy xorriso object when it is no longer needed.
+   @param xorriso  The context object to destroy. *xorriso will become NULL.
+   @param flag     bit0= Perform global library shutdown.
+                         Use only with last xorriso object to be destroyed.
+   @return         <=0 error, >0 success
 */
 int Xorriso_destroy(struct XorrisO **xorriso, int flag);
 
@@ -93,7 +239,7 @@ int Xorriso_msgs_submit_void(void *xorriso,
 /** Evaluate an advise whether to abort or whether to go on with option
     processing. This should be called after any option function was processed.
     It updates the problem status by processing the library message queues
-    and then it uses this status and the submitted return value ot the
+    and then it uses this status and the submitted return value of the
     option function to evaluate the situation.
     @param xorriso    The environment handle
     @param ret        The return value of the previously called option function
@@ -122,8 +268,7 @@ int Xorriso_set_problem_status(struct XorrisO *xorriso, char *severity,
 
 
 /* The next two functions are part of Xorriso_eval_problem_status().
-   You may use them to build an own advisor function or to drain the
-   library message queues more frequently.
+   You may use them to build an own advisor function.
 */
 
 /** Obtain the current problem status of the xorriso handle.
@@ -141,7 +286,10 @@ int Xorriso_get_problem_status(struct XorrisO *xorriso, char severity[80],
     the severity of the library events like the severity of a message submitted
     via Xorriso_msgs_submit().
     xorriso sets the message queues of the libraries to queuing "ALL".
-    So it is essential that they get drained regularly.
+    Many inner functions of xorriso call Xorriso_process_msg_queues() on their
+    own because they expect library output pending. Nevertheless, a loop of
+    xorriso option calls should either call Xorriso_eval_problem_status() or
+    Xorriso_process_msg_queues() with each cycle.
     @param xorriso    The environment handle
     @param flag       Unused yet. Submit 0.
     @return           1 on success, <=0 if failure
@@ -149,6 +297,23 @@ int Xorriso_get_problem_status(struct XorrisO *xorriso, char severity[80],
 int Xorriso_process_msg_queues(struct XorrisO *xorriso, int flag);
 
 
+/** Write a message for option -errfile_log. 
+    @param xorriso    The environment handle
+    @param error_code The unique error code of your message.
+                      Submit 0 if you do not have reserved error codes within
+                      the libburnia project.
+    @param msg_text   Not more than 8196 characters of message text.
+    @param os_errno   Eventual errno related to the message. Submit 0 if
+                      the message is not related to a operating system error.
+    @param flag       bit0-7= meaning of msg_text
+                      ( 0= ERRFILE path , for internal use mainly )
+                        1= mark line text (only to be put out if enabled)
+    @return <=0 error , >0 success
+*/
+int Xorriso_process_errfile(struct XorrisO *xorriso,
+                            int error_code, char msg_text[], int os_errno,
+                            int flag);
+
 
 /* The outlist stack allows to redirect the info and result messages from
    their normal channels into a pair of string lists which can at some
@@ -257,6 +422,16 @@ int Xorriso_lst_destroy_all(struct Xorriso_lsT **lstring, int flag);
    After each call to an option function, there should happen:
    Xorriso_eval_problem_status()
    One should follow its eventual advice to abort.
+
+   Options with a varying number of arguments get them passed like
+   Xorriso_interpreter(). E.g.:
+     int Xorriso_option_add(struct XorrisO *xorriso, int argc, char **argv,
+                            int *idx, int flag);
+   They begin to read the arguments at position *idx and will see the list
+   end either at the next argv which contains the -list_delimiter text or
+   at argv[argc-1]. After the call, *idx will be the index of the first not
+   yet interpreted argv.
+
 */
 
 
@@ -302,6 +477,9 @@ int Xorriso_option_as(struct XorrisO *xorriso, int argc, char **argv,
 int Xorriso_option_assert_volid(struct XorrisO *xorriso, char *pattern,
                                 char *severity, int flag);
 
+/* Option -auto_charset "on"|"off" */
+int Xorriso_option_auto_charset(struct XorrisO *xorriso, char *mode, int flag);
+
 /* Option -backslash_codes */
 int Xorriso_option_backslash_codes(struct XorrisO *xorriso, char *mode,
                                    int flag);
@@ -319,6 +497,9 @@ int Xorriso_option_blank(struct XorrisO *xorriso, char *mode, int flag);
 int Xorriso_option_boot_image(struct XorrisO *xorriso, char *form,
                               char *treatment, int flag);
 
+/* Option -calm_drive */
+int Xorriso_option_calm_drive(struct XorrisO *xorriso, char *which, int flag);
+
 /* Option -cd alias -cdi */
 int Xorriso_option_cdi(struct XorrisO *xorriso, char *iso_rr_path, int flag);
 
@@ -331,6 +512,15 @@ int Xorriso_option_cdx(struct XorrisO *xorriso, char *disk_path, int flag);
 */
 int Xorriso_option_charset(struct XorrisO *xorriso, char *name, int flag);
 
+/* Options -check_md5 and -check_md5_r
+   @param flag bit0= issue summary message
+               bit1= do not reset pacifier, no final pacifier message
+               bit2= do not issue pacifier messages at all
+               bit3= recursive: -check_md5_r
+*/
+int Xorriso_option_check_md5(struct XorrisO *xorriso,
+                             int argc, char **argv, int *idx, int flag);
+
 /* Option -check_media */
 int Xorriso_option_check_media(struct XorrisO *xorriso,
                                int argc, char **argv, int *idx, int flag);
@@ -424,6 +614,9 @@ int Xorriso_option_drive_class(struct XorrisO *xorriso,
 /* Option -dummy "on"|"off" */
 int Xorriso_option_dummy(struct XorrisO *xorriso, char *mode, int flag);
 
+/* Option -dvd_obs "default"|"32k"|"64k" */
+int Xorriso_option_dvd_obs(struct XorrisO *xorriso, char *obs, int flag);
+
 /* Option -eject */
 /* @param flag bit0=do not report toc of eventually remaining drives
 */
@@ -443,6 +636,10 @@ int Xorriso_option_errfile_log(struct XorrisO *xorriso,
 int Xorriso_option_error_behavior(struct XorrisO *xorriso, 
                                   char *occasion, char *behavior, int flag);
 
+/* Option -external_filter */
+int Xorriso_option_external_filter(struct XorrisO *xorriso,
+                                   int argc, char **argv, int *idx, int flag);
+
 /* Options -extract , -extract_single */
 /* @param flag bit0=do not report the restored item
                bit1=do not reset pacifier, no final pacifier message
@@ -481,6 +678,9 @@ int Xorriso_option_gid(struct XorrisO *xorriso, char *gid, int flag);
 /* Option -grow_blindly */
 int Xorriso_option_grow_blindly(struct XorrisO *xorriso, char *msc2, int flag);
 
+/* Option -hardlinks "on"|"off" */
+int Xorriso_option_hardlinks(struct XorrisO *xorriso, char *mode, int flag);
+
 /* Option -help and part of -prog_help */
 int Xorriso_option_help(struct XorrisO *xorriso, int flag);
 
@@ -501,6 +701,10 @@ int Xorriso_option_list_delimiter(struct XorrisO *xorriso, char *text,
 /* Option -list_formats */
 int Xorriso_option_list_formats(struct XorrisO *xorriso, int flag);
 
+/* Option -list_profiles */
+int Xorriso_option_list_profiles(struct XorrisO *xorriso, char *which,
+                                 int flag);
+
 /* Option -load session|track|sbsector value */
 /* @param flag bit0= with adr_mode sbsector: adr_value is possibly 16 too high
    @return <=0 error , 1 success, 2 revoked by -reassure
@@ -551,16 +755,23 @@ int Xorriso_option_map_l(struct XorrisO *xorriso, int argc, char **argv,
 /* Option -mark */
 int Xorriso_option_mark(struct XorrisO *xorriso, char *mark, int flag);
 
+/* Option -md5 */
+int Xorriso_option_md5(struct XorrisO *xorriso, char *mode, int flag);
+
 /* Option -mkdir alias -mkdiri */
 int Xorriso_option_mkdiri(struct XorrisO *xorriso, int argc, char **argv,
                           int *idx, int flag);
 
-/* Option -mount */
-/* @param bit0= print mount command to result channel rather than performing it
-*/
+/* Options -mount , -mount_cmd , -session_string */
+/* @param bit0= -mount_cmd: print mount command to result channel rather
+                            than performing it
+          bit1= perform -session_string rather than -mount_cmd
+*/ 
 int Xorriso_option_mount(struct XorrisO *xorriso, char *dev, char *adr_mode,
                          char *adr, char *cmd, int flag);
 
+/* Option -mount_opts option[:...] */
+int Xorriso_option_mount_opts(struct XorrisO *xorriso, char *mode, int flag);
 
 /* Option -mv alias -mvi */
 int Xorriso_option_mvi(struct XorrisO *xorriso, int argc, char **argv,
@@ -631,6 +842,9 @@ int Xorriso_option_prog_help(struct XorrisO *xorriso, char *name, int flag);
 /* Option -publisher */
 int Xorriso_option_publisher(struct XorrisO *xorriso, char *name, int flag);
 
+/* Option -pvd_info */
+int Xorriso_option_pvd_info(struct XorrisO *xorriso, int flag);
+
 /* Option -pwd alias -pwdi */
 int Xorriso_option_pwdi(struct XorrisO *xorriso, int flag);
 
@@ -670,6 +884,10 @@ int Xorriso_option_rollback(struct XorrisO *xorriso, int flag);
 int Xorriso_option_rom_toc_scan(struct XorrisO *xorriso, char *mode,
                                 int flag);
 
+/* Option -scdbackup_tag */
+int Xorriso_option_scdbackup_tag(struct XorrisO *xorriso, char *list_path,
+                                 char *record_name, int flag);
+
 /* Option -session_log */
 int Xorriso_option_session_log(struct XorrisO *xorriso, char *path, int flag);
 
@@ -693,6 +911,12 @@ int Xorriso_option_setfattri(struct XorrisO *xorriso, char *name, char *value,
 int Xorriso_option_setfattr_listi(struct XorrisO *xorriso, char *path, 
                                   int flag);
 
+/* Options -set_filter , -set_filter_r */ 
+/* @param flag   bit0=recursive -set_filter_r
+*/
+int Xorriso_option_set_filter(struct XorrisO *xorriso, char *name,
+                              int argc, char **argv, int *idx, int flag);
+
 /* Option -speed */
 int Xorriso_option_speed(struct XorrisO *xorriso, char *speed, int flag);
 
@@ -706,10 +930,16 @@ int Xorriso_option_status(struct XorrisO *xorriso, char *mode, int flag);
 int Xorriso_option_status_history_max(struct XorrisO *xorriso, int num1, 
                                       int flag);
 
+/* Option -stdio_sync "on"|"off"|size */
+int Xorriso_option_stdio_sync(struct XorrisO *xorriso, char *rythm, int flag);
+
 /* Option -stream_recording */
 int Xorriso_option_stream_recording(struct XorrisO *xorriso, char *mode,
                                     int flag);
 
+/* Option -system_id */
+int Xorriso_option_system_id(struct XorrisO *xorriso, char *name, int flag);
+
 /* Option -tell_media_space */
 int Xorriso_option_tell_media_space(struct XorrisO *xorriso, int flag);
 
@@ -723,6 +953,10 @@ int Xorriso_option_toc(struct XorrisO *xorriso, int flag);
 /* Option -uid */
 int Xorriso_option_uid(struct XorrisO *xorriso, char *uid, int flag);
 
+/* Option -unregister_filter */
+int Xorriso_option_unregister_filter(struct XorrisO *xorriso, char *name,
+                                     int flag);
+
 /* Options -update and -update_r
    @param flag bit0= issue summary message
                bit1= do not reset pacifier, no final pacifier message
@@ -741,9 +975,16 @@ int Xorriso_option_version(struct XorrisO *xorriso, int flag);
 /* Option -volid */
 int Xorriso_option_volid(struct XorrisO *xorriso, char *volid, int flag);
 
+/* Option -volset_id */
+int Xorriso_option_volset_id(struct XorrisO *xorriso, char *name, int flag);
+
 /* Option -xattr "on"|"off" */
 int Xorriso_option_xattr(struct XorrisO *xorriso, char *mode, int flag);
 
+/* Option -zisofs */
+int Xorriso_option_zisofs(struct XorrisO *xorriso, char *mode, int flag);
+
+
 #endif /* Xorriso_includeD */
 
 

xorriso/xorriso_eng.html

@@ -25,7 +25,7 @@ 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.
+Vice versa xorriso is able to copy file objects out of ISO 9660 filesystems.
 </P>
 <P>
 
@@ -35,59 +35,49 @@ Vice versa xorriso is able to restore file objects from ISO 9660 filesystems.
 
 <P>
 <H2>Hardware requirements:</H2>
-A CD/DVD/BD recorder suitable for 
-<A HREF="http://libburnia-project.org">http://libburnia-project.org</A> <BR>
-(SCSI , ATA , USB , or SATA writers compliant to standard MMC-3 for CD
-and to MMC-5 for DVD or BD).
+About any CD, DVD, or BD recorder produced in the recent ten years.
+<BR>
+<A HREF="http://libburnia-project.org">libburn</A>
+supports recorders which are compliant to standards MMC-1 for CD and
+MMC-5 for DVD or BD. Linux and FreeBSD allow to access drives connected
+via SCSI, PATA (aka IDE, ATA), USB, or SATA.
 <BR>
 </P>
 
 <P>
 <H2>Software requirements :</H2>
 <DL>
-<DT>Linux with kernel 2.4 or higher (and libc, of course) :</DT>
+<DT>Linux with kernel 2.4 or higher, libc, libpthread :</DT>
 <DD>With kernel 2.4 an ATA drive has to be under ide-scsi emulation.</DD>
-<DD>With kernel 2.6 the drive should not be under ide-scsi.</DD>
-<DT>or FreeBSD (with libc, of course) :</DT>
-<DD>ATAPI/CAM support has to be enabled in the kernel, see atapicam(4).</DD>
+<DD>With kernel 2.6 ide-scsi is not needed.</DD>
+<DT>or FreeBSD, libc, libpthread :</DT>
+<DD>PATA/IDE and SATA drives need atapicam running.</DD>
 <DD>libcam has to be installed.</DD>
 <DD>libiconv has to be installed.</DD>
-<DT>libpthread</DT>
-<DD>is supposed to be a standard system component.</DD>
-<DT>libreadline and libreadline-dev</DT>
-<DD>are optional and eventually make dialog more convenient.</DD>
-<DT>libacl and libacl-devel</DT>
-<DD>are optional and eventually allow on Linux to get and set ACLs.</DD>
-</DL>
-</P>
-
-<P>
-<H2>
-GPL software included:<BR>
-</H2>
-<DL>
-<DT>libburn-0.6.3</DT>
-<DD>reads and writes data from and to CD, DVD, BD.</DD>
-<DD>(founded by Derek Foreman and Ben Jansens,
-developed and maintained since August 2006 by
-Thomas Schmitt from team of libburnia-project.org)</DD>
-<DT>libisofs-0.6.15</DT>
-<DD>operates on ISO 9660 filesystem images.</DD>
-<DD>(By Vreixo Formoso, Mario Danic and Thomas Schmitt
-from team of libburnia-project.org)</DD>
-<DT>libisoburn-0.3.4</DT>
-<DD>coordinates libburn and libisofs, emulates multi-session where needed.</DD>
-<DD>(By Vreixo Formoso and Thomas Schmitt
-from team of libburnia-project.org)</DD>
-</DL>
-<DD>The source code of this software is independent of 
-cdrecord and mkisofs.</A>
+<DT>or some other X/Open system, libc, libpthread :</DT>
+<DD>
+There will be no direct operation of optical drives, but only POSIX i/o
+with objects of the local filesystem.
 </DD>
+<DD>
+Might work with DVD-RAM, DVD+RW, BD-RE
+but rather not with CD, DVD-R, DVD+R, BD-R.
+</DD>
+</DL>
+
+<H3>Optional supporting software:</H2>
+<DL>
+<DT>libreadline and libreadline-dev</DT>
+<DD>eventually make dialog more convenient.</DD>
+<DT>libacl and libacl-devel</DT>
+<DD>eventually allow on Linux to get and set ACLs.</DD>
+<DT>zlib and zlib-devel</DT>
+<DD>eventually allow zisofs and gzip compression.</DD>
+</DL>
 </P>
 
 <P>
-This program has been tested on Intel/AMD Linux
-and on FreeBSD systems.<BR>
+This program has been tested on Linux, FreeBSD, and Solaris systems.<BR>
 For ports to other usable systems <A HREF="#contact">contact us</A>.
 </P>
 
@@ -103,7 +93,7 @@ ISO 9660 formatter and burner for CD, DVD, BD are fixely integrated.
 Operates on an existing ISO image or creates a new one.
 </LI>
 <LI>
-Copies files from filesystem into the ISO image.
+Copies files from filesystem into the ISO image and vice versa.
 </LI>
 <LI>
 Changes file properties, renames or deletes file objects in the ISO image.
@@ -112,22 +102,26 @@ Changes file properties, renames or deletes file objects in the ISO image.
 Updates ISO subtrees incrementally to match given disk subtrees.
 </LI>
 <LI>
+Can record and restore hard link relations, ACL, and xattr.
+</LI>
+<LI>
+Can attach MD5 checksums to each data file and the whole session.
+</LI>
+<LI>
+File content may get zisofs or gzip compressed or filtered by external
+processes.
+</LI>
+<LI>
 Writes result as completely new image or as add-on session
 to optical media or filesystem objects.
 </LI>
 <LI>
-Can activate ISOLINUX boot images by El Torito boot record and by MBR.
+Can activate ISOLINUX boot images by El Torito boot record.
 </LI>
 <LI>
 Can perform multi-session tasks as emulation of mkisofs and cdrecord.
 </LI>
 <LI>
-Can restore single files and whole trees from ISO image to disk filesystem.
-</LI>
-<LI>
-Can record and restore ACL and xattr of disk files.
-</LI>
-<LI>
 Can issue commands to mount older sessions on Linux or FreeBSD.
 </LI>
 <LI>
@@ -251,16 +245,21 @@ Important: -indev and -outdev have to be different drives.
 </DT>
 
 <DT>Dialog mode accepts one or more options per line. An option and all its
-arguments have to be given in one single line. Command -end stops the program
-run. It will write eventually pending changes to media, if that has not
-already been done by a previous -commit.</DT>
+arguments have to be given in one single line. Backslash may be used to mark
+a line as incomplete so it gets continued by the next input line.
+<BR>
+Command -end stops the program run. It will write eventually pending changes
+to media, if that has not already been done by a previous -commit.</DT>
 <DD>$<KBD>&nbsp;xorriso -dialog on</KBD></DD>
 <DD><KBD>enter option and arguments :</KBD></DD>
 <DD><KBD><B>-dev /dev/sr0</B></KBD></DD>
 <DD><KBD>enter option and arguments :</KBD></DD>
 <DD><KBD><B>-map /home/me/prepared_for_dvd/sounds_dummy /sounds</B></KBD></DD>
 <DD><KBD>enter option and arguments :</KBD></DD>
-<DD><KBD><B>-map /home/me/prepared_for_dvd/movies /movies</B></KBD></DD>
+<DD><KBD><B>-map /home/me/prepared_for_dvd/movies \</B></KBD></DD>
+<DD><KBD>Trailing backslash  : Enter rest of line (or @@@ to clear it) :
+</KBD></DD>
+<DD><KBD><B> /movies</B></KBD></DD>
 <DD>Available navigation commands: -cd, -ls, -du, -find</DD>
 <DD><KBD>enter option and arguments :</KBD></DD>
 <DD><KBD><B>-commit</B></KBD></DD>
@@ -280,19 +279,31 @@ to match the new disk trees.
 Older states can be retrieved by help of mount options like "sbsector="
 or by help of xorriso option -mount.
 <BR>
-Eventual ACL or xattr will be recorded. Data reading will be avoided by
-accelerator option -disk_dev_ino.
+Eventual ACL, xattr and hardlink relations will be recorded. MD5 checksums
+will be computed and recorded. Data comparison will be avoided by accelerator
+option -disk_dev_ino. After writing, the new session will be checked
+by its recorded MD5.
+<BR>
 Only blank media or media with volume id "PROJECTS_MAIL_..." will be accepted.
 Files with names ending by ".o" or ".swp" are excluded by options -not_leaf.
 </DT>
-<DD>$<KBD>&nbsp;xorriso -acl on -xattr on -disk_dev_ino on \</KBD></DD>
+<DD>$<KBD>&nbsp;xorriso -for_backup -disk_dev_ino on \</KBD></DD>
 <DD><KBD>&nbsp;&nbsp; -assert_volid 'PROJECTS_MAIL_*' FATAL \</KBD></DD>
 <DD><KBD>&nbsp;&nbsp; -dev /dev/sr0 \</KBD></DD>
 <DD><KBD>&nbsp;&nbsp; -volid PROJECTS_MAIL_"$(date '+%Y_%m_%d_%H%M%S')" \</KBD></DD>
 <DD><KBD>&nbsp;&nbsp; -not_leaf '*.o' -not_leaf '*.swp' \</KBD></DD>
 <DD><KBD>&nbsp;&nbsp; -update_r /home/thomas/open_source_projects /open_source_projects \</KBD></DD>
 <DD><KBD>&nbsp;&nbsp; -update_r /home/thomas/personal_mail /personal_mail \</KBD></DD>
-<DD><KBD>&nbsp;&nbsp; -commit -toc -eject all</KBD></DD>
+<DD><KBD>&nbsp;&nbsp; -commit -toc -check_md5 FAILURE -- -eject all</KBD></DD>
+
+<DT>
+To apply zisofs compression to those data files which get newly copied from
+the local filesystem, perform immediately before -commit :
+<DD><KBD>&nbsp;&nbsp; -hardlinks perform_update \</KBD></DD>
+<DD>
+<KBD>&nbsp;&nbsp; -find / -type f -pending_data -exec set_filter --zisofs -- \</KBD></DD>
+</DD>
+</DT>
 
 <DT>
 <HR>
@@ -301,7 +312,7 @@ Files with names ending by ".o" or ".swp" are excluded by options -not_leaf.
 <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:
+First get an overview of the sessions on the media:
 </DT>
 <DD>$<KBD>&nbsp;xorriso -outdev /dev/sr0 -toc</KBD></DD>
 <PRE>
@@ -358,7 +369,11 @@ Be cautious not to overwrite your hard disk instead of your USB stick:
 
 <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>
+output will be redirected to stderr in this case.
+Examples for consumers are cdrecord or growisofs on operating systems
+where xorriso cannot operate the burner drive directly,
+or a ssh pipe to another system which has the desired drive
+and a suitable burn program.</DT>
 <DD>$<KBD>&nbsp;xorriso -outdev - ...other.options... | consumer</KBD></DD>
 
 
@@ -414,9 +429,10 @@ files or trees to disk:
 <P>
 <DL>
 <DT><H3>Download as source code (see README):</H3></DT>
-<DD><A HREF="xorriso-0.3.4.pl00.tar.gz">xorriso-0.3.4.pl00.tar.gz</A>
-(1175 KB).
+<DD><A HREF="xorriso-0.4.8.pl00.tar.gz">xorriso-0.4.8.pl00.tar.gz</A>
+(1360 KB).
 </DD>
+<DD>(Released 25 Jan 2010)</DD>
 </DL>
 </DD>
 </DL>
@@ -432,7 +448,7 @@ files or trees to disk:
 <A HREF="mailto:libburn-hackers@pykix.org">libburn-hackers@pykix.org</A></DD>
 </DL>
 <DL><DT>License:</DT>
-<DD><A HREF="COPYING_xorriso">GPL version 2</A>,
+<DD><A HREF="COPYING_xorriso">GPL version 2 or later</A>,
 an <A HREF="http://www.opensource.org/">Open Source</A> approved license</DD>
 <DD>&nbsp;</DD>
 </DL>
@@ -441,64 +457,105 @@ an <A HREF="http://www.opensource.org/">Open Source</A> approved license</DD>
 <HR>
 
 <P>
-Bug fixes towards xorriso-0.3.2.pl00:
+Bug fixes towards xorriso-0.4.6.pl00:
 <UL>
-<LI>BD-R were not correctly finalized</LI>
+<LI>
+With non-Linux system adapters there were 0 readable bytes on block devices
+which acted as pseudo drives.
+</LI>
+<LI>
+xorriso did not blank CD-RW with images that were prepared on hard disk
+</LI>
+<LI>
+Invalid checksum tags were preserved if the new session produced no checksums
+</LI>
 <!--
 <LI>- none -</LI>
 -->
-
 </UL>
-
 </P>
 
+<!--
 <P>
-Enhancements towards previous stable version xorriso-0.3.2.pl00:
+Bug fixes towards xorriso-0.4.4.pl00:
 <UL>
-<LI>New option -acl controls import and export of ACLs</LI>
-<LI>New options -getfacl, -getfacl_r, -setfacl , -setfacl_r , -setfacl_list</LI>
-<LI>New -find tests -has_acl, -has_no_acl, new -find actions getfacl, setfacl
+</UL>
+</P>
+-->
+
+<P>
+Enhancements towards previous stable version xorriso-0.4.6.pl00:
+<UL>
+<LI>
+New configure option --enable-libcdio for system adapter to libcdio-0.83git
 </LI>
-<LI>New option -xattr controls import and export of Extended Attributes</LI>
-<LI>New options -getfattr, -getfattr_r, -setfattr, -setfattr_r, -setfattr_list
+<LI>
+The checksum buffer for the emerging image gets now marked as invalid if
+image generation is canceled.
 </LI>
-<LI>New -find tests -has_xattr, -has_aaip, new -find actions getfattr, setfattr
+<LI>
+More graceful reaction on filesystems where ACL are not enabled but
+nevertheless requested by the application.
 </LI>
-<LI>New -as mkisofs options --acl and --xattr</LI>
-<LI>New option -disk_dev_ino can substantially accelerate incremental backups
+<LI>
+Made FreeBSD system adapter safe from mutal burn spoiling and drive deadlock.
 </LI>
+<!--
+<LI>- none -</LI>
+-->
 </UL>
 </P>
 
 <HR>
 
 <P>
+<H3>
+Library copies included in xorriso tarballs:
+</H3>
 <DL>
-<DT><H3>Development snapshot, version 0.3.5 :</H3></DT>
-<DD>Bug fixes towards xorriso-0.3.4.pl00:
+<DT>libburn-0.7.7</DT>
+<DD>reads and writes data from and to CD, DVD, BD.</DD>
+<DD>(founded by Derek Foreman and Ben Jansens,
+developed and maintained since August 2006 by
+Thomas Schmitt from team of libburnia-project.org)</DD>
+<DT>libisofs-0.6.27</DT>
+<DD>operates on ISO 9660 filesystem images.</DD>
+<DD>(By Vreixo Formoso, Mario Danic and Thomas Schmitt
+from team of libburnia-project.org)</DD>
+<DT>libisoburn-0.4.6</DT>
+<DD>coordinates libburn and libisofs, emulates multi-session where needed.</DD>
+<DD>(By Vreixo Formoso and Thomas Schmitt
+from team of libburnia-project.org)</DD>
+<DD>&nbsp;</DD>
+<DT>The source code of this software is independent of 
+cdrecord and mkisofs.</DT>
+</DL>
+</P>
+
+<HR>
+
+<P>
+<DL>
+<DT><H3>Development snapshot, version 0.4.9 :</H3></DT>
+<DD>Bug fixes towards xorriso-0.4.8.pl00:
 <UL>
-<LI>Solaris recognized Rock Ridge in ISO images from xorriso
-only if the new AAIP extension hid a bug with -compliance old_rr</LI>
-<LI>Solaris was not able to use the ".." directory entry for navigation
-in xorriso generated ISO images</LI>
-<!-- 
 <LI>- none yet -</LI>
+<!-- 
  -->
 </UL>
 </DD>
-<DD>Enhancements towards stable version 0.3.4.pl00:
+<DD>Enhancements towards stable version 0.4.8.pl00:
 <UL>
-<LI>Dummy MMC adapter for compilation on systems other than Linux, FreeBSD</LI>
-<LI>New -stream_recording mode with start address, "on" is now 32s</LI>
-<!-- 
+
 <LI>- none yet -</LI>
+<!-- 
  -->
 </UL>
 </DD>
 <DD>&nbsp;</DD>
-<DD><A HREF="README_xorriso_devel">README 0.3.5</A>
-<DD><A HREF="xorriso_help_devel">xorriso_0.3.5 -help</A></DD>
-<DD><A HREF="man_1_xorriso_devel.html">man xorriso (as of 0.3.5)</A></DD>
+<DD><A HREF="README_xorriso_devel">README 0.4.9</A>
+<DD><A HREF="xorriso_help_devel">xorriso_0.4.9 -help</A></DD>
+<DD><A HREF="man_1_xorriso_devel.html">man xorriso (as of 0.4.9)</A></DD>
 <DD>&nbsp;</DD>
 <DT>If you want to distribute development versions of xorriso, then use
 this tarball which produces static linking between xorriso and the
@@ -508,8 +565,8 @@ libburnia libraries.
 installation see README)
 </DD>
 <DD>
-<A HREF="xorriso-0.3.5.tar.gz">xorriso-0.3.5.tar.gz</A>
-(1160 KB).
+<A HREF="xorriso-0.4.9.tar.gz">xorriso-0.4.9.tar.gz</A>
+(1360 KB).
 </DD>
 <DT>A dynamically linked development version of xorriso can be obtained
 from repositories of
@@ -524,7 +581,9 @@ versions for dynamic linking. Only release versions are safe for that.
 </KBD></DD>
 <DD>Install: <KBD><B>cd libburn ; ./bootstrap ; ./configure --prefix /usr ; make ; make install</B>
 </KBD></DD>
-<DD>Download: <KBD><B>bzr branch lp:libisofs</B></KBD></DD>
+<DD>Download:
+<KBD><B>bzr branch lp:~libburnia-team/libisofs/scdbackup</B></KBD>
+</DD>
 <DD>Install: <KBD><B>cd libisofs ; ./bootstrap ; ./configure --prefix /usr ; make ; make install</B>
 </KBD></DD>
 <DD>Download: <KBD><B>svn co http://svn.libburnia-project.org/libisoburn/trunk libisoburn</B>
@@ -550,7 +609,6 @@ Very special thanks to Andy Polyakov whose
 provide the libburnia project with invaluable examples on how to deal
 with DVD media and how to emulate multi-session on overwriteable media.
 </P>
-
 <HR>
 
 
@@ -566,6 +624,11 @@ and by <A HREF="http://sourceforge.net">sourceforge.net</A><BR>
 <A href="http://sourceforge.net">
 <IMG src="sflogo-88-1.png" BORDER="0" ALT="SourceForge Logo"></A>
 <!-- on sourceforge use : <IMG src="http://sourceforge.net/sflogo.php?group_id=16010" width="88" height="31" border="0" alt="SourceForge Logo"></A> -->
+<P>
+Enjoying a FreeBSD shell account with the opportunity to
+build, install and test xorriso at<BR>
+<A HREF="http://www.en.free-shells.com.ar">free-shells.com.ar</A>
+</P>
 </FONT></CENTER>
 <HR>
 <DL>

xorriso/xorriso_makefile_am.txt

@@ -1,4 +1,8 @@
-pkgconfigdir=$(libdir)/pkgconfig
+
+# ts A90315 : LIBBURNIA_PKGCONFDIR is defined OS specific in acinclude.m4
+# was: pkgconfigdir=$(libdir)/pkgconfig
+pkgconfigdir=$(LIBBURNIA_PKGCONFDIR)
+
 libincludedir=
 
 lib_LTLIBRARIES =
@@ -17,7 +21,10 @@ 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 \
-                         $(READLINE_DEF) $(LIBACL_DEF) $(XATTR_DEF)
+                         $(READLINE_DEF) $(LIBACL_DEF) $(XATTR_DEF) \
+                         $(EXTF_DEF) $(EXTF_SUID_DEF) $(ZLIB_DEF) \
+                         $(LIBCDIO_DEF) \
+                         $(XORRISO_DVD_OBS_64K) $(LIBBURN_O_DIRECT_DEF)
 
 xorriso_xorriso_LDADD = $(THREAD_LIBS) $(LIBBURN_ARCH_LIBS)
 
@@ -51,9 +58,9 @@ xorriso_xorriso_SOURCES = \
 	libisoburn/burn_wrap.c \
 	libisoburn/data_source.c \
 	\
+	libisofs/libisofs.h \
 	libisofs/builder.h \
 	libisofs/builder.c \
-	libisofs/error.h \
 	libisofs/node.h \
 	libisofs/node.c \
 	libisofs/tree.h \
@@ -65,7 +72,6 @@ xorriso_xorriso_SOURCES = \
 	libisofs/fsource.h \
 	libisofs/fsource.c \
 	libisofs/fs_local.c \
-	libisofs/fs_image.h \
 	libisofs/fs_image.c \
 	libisofs/messages.h \
 	libisofs/messages.c \
@@ -84,6 +90,7 @@ xorriso_xorriso_SOURCES = \
 	libisofs/ecma119_tree.h \
 	libisofs/ecma119_tree.c \
 	libisofs/writer.h \
+	libisofs/buffer.h \
 	libisofs/buffer.c \
 	libisofs/rockridge.h \
 	libisofs/rockridge.c \
@@ -96,12 +103,16 @@ xorriso_xorriso_SOURCES = \
         libisofs/find.c \
         libisofs/filter.h \
         libisofs/filter.c \
-        libisofs/filters/xor_encrypt.c \
+        libisofs/filters/external.c \
+        libisofs/filters/zisofs.c \
+        libisofs/filters/gzip.c \
         libisofs/system_area.h \
         libisofs/system_area.c \
         libisofs/make_isohybrid_mbr.c \
 	libisofs/aaip_0_2.h \
 	libisofs/aaip_0_2.c \
+	libisofs/md5.h \
+	libisofs/md5.c \
 	\
 	libburn/async.c \
 	libburn/async.h \
@@ -114,13 +125,13 @@ xorriso_xorriso_SOURCES = \
 	libburn/debug.h \
 	libburn/drive.c \
 	libburn/drive.h \
+	libburn/ecma130ab.c \
+	libburn/ecma130ab.h \
 	libburn/error.h \
 	libburn/file.c \
 	libburn/file.h \
 	libburn/init.c \
 	libburn/init.h \
-	libburn/lec.c \
-	libburn/lec.h \
 	libburn/libburn.h \
 	libburn/libdax_audioxtr.h \
 	libburn/libdax_audioxtr.c \
@@ -212,8 +223,8 @@ indent: $(indent_files)
 ## ========================================================================= ##
 
 # Extra things
-nodist_pkgconfig_DATA = \
-	xorriso.pc
+# nodist_pkgconfig_DATA = \
+#	xorriso.pc
 
 man_MANS = xorriso/xorriso.1
 
@@ -229,8 +240,17 @@ EXTRA_DIST = \
 	xorriso/changelog.txt \
 	xorriso/xorriso_buildstamp_none.h \
 	$(man_MANS) \
+	doc/susp_aaip_2_0.txt \
+	doc/susp_aaip_isofs_names.txt \
+	doc/zisofs_format.txt \
 	libisofs/aaip-os-dummy.c \
 	libisofs/aaip-os-linux.c \
-	libisofs/aaip-os-freebsd.c
-	
-
+	libisofs/aaip-os-freebsd.c \
+	libburn/os-dummy.h \
+	libburn/os-freebsd.h \
+	libburn/os-libcdio.h \
+	libburn/os-linux.h \
+	libburn/sg-dummy.c \
+	libburn/sg-freebsd.c \
+	libburn/sg-libcdio.c \
+	libburn/sg-linux.c

xorriso/xorriso_private.h

@@ -2,9 +2,9 @@
 /* Command line oriented batch and dialog tool which creates, loads,
    manipulates and burns ISO 9660 filesystem images.
 
-   Copyright 2007-2009 Thomas Schmitt, <scdbackup@gmx.net>
+   Copyright 2007-2010 Thomas Schmitt, <scdbackup@gmx.net>
 
-   Provided under GPL version 2.
+   Provided under GPL version 2 or later.
 
    This file contains inner declarations of xorriso.
    The public interface is in xorriso.h
@@ -18,8 +18,6 @@
 #ifndef Xorriso_private_includeD
 #define Xorriso_private_includeD yes
 
-#define Xorriso_program_versioN "0.3.5"
-
 /** The source code release timestamp */
 #include "xorriso_timestamp.h"
 #ifndef Xorriso_timestamP
@@ -99,14 +97,45 @@ struct XorrisO { /* the global context of xorriso */
 
  /* >>> put libisofs aspects here <<< */
 
+ int ino_behavior; /* bit0= at image load time:
+                            Do not load PX inode numbers but generate new
+                            unique ones for all loaded IsoNode.
+                      bit1= at image generation time:
+                            Do not consolidate suitable nodes to hardlinks.
+                      bit2= at restore-to-disk time:
+                            Do not consolidate suitable nodes to hardlinks.
+                      bit3= with update:
+                            Do not try to detect hardlink splits and joinings.
+                      bit4= with extract:
+                            Do not create or use hln arrays if sort_lba_on
+                    */
+
  int do_joliet;
 
- int do_aaip; /* bit0= ACL in , bit1= ACL out , bit2= EA in , bit3= EA out
-                 bit4= record dev,inode , bit5= check dev,inode
-                 bit6= omit content check if dev,inode check is conclusive
-                 bit7= omit dev check mit bit5
+ int do_aaip; /* bit0= ACL in
+                 bit1= ACL out
+                 bit2= EA in
+                 bit3= EA out
+                 bit4= record dev,inode per node, isofs_st_out in root
+                 bit5= check dev,inode,isofs_st_in
+                 bit6= omit content check if bit5 check is conclusive
+                 bit7= omit dev check with bit5
+                 bit8= store output charset in xattr "isofs.cs"
+                 bit9= allow to set input charset from xattr "isofs.cs"
               */
 
+ int do_md5;  /* bit0= read MD5 array
+                 bit1= write session MD5
+                 bit2= write MD5 for each data file
+                 bit3= make file content stability check by double reading
+                 bit4= use recorded MD5 as proxy of ISO file
+               */
+
+ char scdbackup_tag_name[81];
+ char scdbackup_tag_time[19];
+ char scdbackup_tag_written[512];
+ char scdbackup_tag_listname[SfileadrL];
+
  int relax_compliance;        /* opaque bitfield to be set by xorrisoburn */
  int do_follow_pattern;
  int do_follow_param;
@@ -121,6 +150,15 @@ struct XorrisO { /* the global context of xorriso */
  mode_t global_dir_mode;
  mode_t global_file_mode;
 
+ struct Xorriso_lsT *filters;
+ int filter_list_closed;
+
+ int zlib_level;
+ int zlib_level_default;
+ int zisofs_block_size;
+ int zisofs_block_size_default;
+ int zisofs_by_magic;
+
  int do_overwrite; /* 0=off, 1=on, 2=nondir */
  int do_reassure;  /* 0=off, 1=on, 2=tree */
 
@@ -132,6 +170,8 @@ struct XorrisO { /* the global context of xorriso */
 
  char publisher[129];
  char application_id[129];
+ char system_id[33];
+ char volset_id[129];
 
  char session_logfile[SfileadrL];
  int session_lba;
@@ -147,6 +187,8 @@ struct XorrisO { /* the global context of xorriso */
                                   scan -ROM profiles for ISO sessions
                             bit1= bit4 for isoburn_drive_aquire()
                                   do not emulate TOC on overwriteable media
+                            bit2= bit7 for isoburn_drive_aquire()
+                                  pretend any media to be -ROM
                          */
 
  int image_start_mode;  /* From what address to load the ISO image
@@ -166,15 +208,27 @@ struct XorrisO { /* the global context of xorriso */
                         */
  char image_start_value[81]; /* value according image_start_mode */
 
+ int drives_exclusive;   /* burn_preset_device_open() param exclusive */
+
+ int do_calm_drive;      /* bit0= calm down drive after aquiring it */
+
  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 indev_is_exclusive;
+
+ time_t isofs_st_out;    /* A time point at least 1 second before image
+                            composition began. To be stored with image as
+                            xattr "isofs.st". */
+ time_t isofs_st_in;     /* That time point as read from "isofs.st" of the
+                            loaded image. */
 
  int volset_change_pending; /* whether -commit would make sense */
  int no_volset_present;     /* set to 1 on first failure */
 
  struct CheckmediajoB *check_media_default;
+ int check_media_bad_limit;      /* values defined as Xorriso_read_quality_* */
  struct SectorbitmaP *in_sector_map; /* eventual sector validity bitmap */
 
 
@@ -184,6 +238,7 @@ struct XorrisO { /* the global context of xorriso */
  int dev_fd_1; /* The fd which substitutes for /dev/fd/1 and is
                      connected to externaly perveived stdout.
                   */
+ int outdev_is_exclusive;
 
  int grow_blindly_msc2; /* if >= 0 this causes growing from drive to drive.
                            The value is used as block address offset for
@@ -204,6 +259,9 @@ struct XorrisO { /* the global context of xorriso */
  int do_stream_recording; /* 0=no, 1=yes, 2=for data, not for dir
                              >=16 means yes with number as start LBA  */
 
+ int dvd_obs;                 /* DVD write chunk size: 0, 32k or 64k */
+ int stdio_sync;              /* stdio fsync interval: -1, 0, >=32 */
+
  int keep_boot_image;
  int patch_isolinux_image;
  char boot_image_bin_path[SfileadrL];
@@ -223,13 +281,26 @@ struct XorrisO { /* the global context of xorriso */
  /* XORRISO options */
  int allow_graft_points;
 
- int allow_restore; /* 0= disallowed, 1=allowed, 2=device files allowed */
+ int allow_restore; /* -1=permanently disallowed
+                        0=disallowed, 1=allowed, 2=device files allowed */
  int do_concat_split;  /* 1= restore complete split file directories as
                              regular files
                         */
  int do_auto_chmod;    /* 1= eventually temporarily open access permissions
                              of self-owned directories during restore
                         */
+ int do_restore_sort_lba; /* 1= restore via node_array rather than via
+                                tree traversal. Better read performance,
+                                no directory mtime restore, needs do_auto_chmod
+                           */
+ int mount_opts_flag; /* bit0= "shared" = not "exclusive"
+                               Try to emit non-exclusive mount command.
+                               Do not give up drives.
+                               Linux: use loop device even on block devices
+                               in order to circumvent the ban to mount a
+                               device twice (with different sbsector=)
+                               FreeBSD: ?
+                       */
 
  int dialog;  /* 0=off , 1=single-line , 2=multi-line */
 
@@ -354,6 +425,38 @@ struct XorrisO { /* the global context of xorriso */
  void *pacifier_fifo;
 
  int find_compare_result; /* 1=everything matches , 0=mismatch , -1=error */ 
+ int find_check_md5_result; /* bit0= seen mismatch
+                               bit1= seen error
+                               bit2= seen data file without MD5
+                               bit3= seen match
+                             */
+
+ /* Tree node collection and LBA sorting facility */
+ int node_counter;
+ int node_array_size;
+ void **node_array;
+ struct Xorriso_lsT *node_disk_prefixes;
+ struct Xorriso_lsT *node_img_prefixes;
+
+ /* Hardlink matching at restore time memorizes hardlink target paths.
+    Array of nodes sorted by LBA. */
+ int hln_count;
+ void **hln_array;
+ void **hln_targets;
+ int hln_change_pending; /* whether a change was made since hln creation */
+
+ /* >>> this should count all temp_mem and thus change its name */
+ off_t node_targets_availmem;
+
+ /* Hardlink matching at update time:
+    Array of all nodes in the tree, sorted by disk dev,ino.
+    Bitmap of nodes which possibly got new hardlink siblings.
+    List of involved disk-iso path pairs. */
+ int di_count;
+ void **di_array;
+ char *di_do_widen;
+ struct Xorriso_lsT *di_disk_paths;
+ struct Xorriso_lsT *di_iso_paths;
 
  struct PermiteM *perm_stack; /* Temporarily altered dir access permissions */
 
@@ -378,11 +481,6 @@ int Xorriso_info(struct XorrisO *xorriso, int flag);
 
 int Xorriso_request_confirmation(struct XorrisO *xorriso, int flag);
 
-int Xorriso_prescan_args(struct XorrisO *xorriso, int argc, char **argv,
-                         int flag);
-
-int Xorriso_execute_option(struct XorrisO *xorriso, char *line, int flag);
-
 /* @return 0=match , else no match
 */
 int Xorriso_regexec(struct XorrisO *xorriso, char *to_match, int *failed_at,
@@ -469,6 +567,10 @@ int Xorriso_pacifier_callback(struct XorrisO *xorriso, char *what_done,
                               off_t count, off_t todo, char *current_object,
                               int flag);
 
+int Xorriso_pfx_disk_path(struct XorrisO *xorriso, char *iso_path,
+                          char *iso_prefix, char *disk_prefix,
+                          char disk_path[SfileadrL], int flag);
+
 /* @param boss_iter Opaque handle to be forwarded to actions in ISO image
                     Set to NULL if calling this function from outside ISO world
    @param flag bit0= update rather than compare
@@ -509,6 +611,11 @@ int Xorriso_lsx_filev(struct XorrisO *xorriso, char *wd,
 int Xorriso_rmx(struct XorrisO *xorriso, off_t boss_mem, char *path, int flag);
 
 
+/* @param flag bit7= return 4 if restore fails from denied permission
+                     do not issue error message
+   @return <=0 failure , 1 success ,
+           4 with bit7: permission to create file was denied
+*/ 
 int Xorriso_make_tmp_path(struct XorrisO *xorriso, char *orig_path,
                           char *tmp_path, int *fd, int flag);
 
@@ -519,8 +626,24 @@ int Xorriso_make_tmp_path(struct XorrisO *xorriso, char *orig_path,
 int Xorriso_reassure_restore(struct XorrisO *xorriso, char *path, int flag);
 
 
+/* @param flag bit0= change regardless of xorriso->do_auto_chmod
+               bit1= desired is only rx
+*/
 int Xorriso_auto_chmod(struct XorrisO *xorriso, char *disk_path, int flag);
 
+int Xorriso_make_accessible(struct XorrisO *xorriso, char *disk_path,int flag);
+
+/* @param flag bit0= prefer to find a match after *img_prefixes
+                     (but deliver img_prefixes if no other can be found)
+*/
+int Xorriso_make_restore_path(struct XorrisO *xorriso,
+         struct Xorriso_lsT **img_prefixes, struct Xorriso_lsT **disk_prefixes,
+         char img_path[SfileadrL], char disk_path[SfileadrL], int flag);
+
+int Xorriso_restore_make_hl(struct XorrisO *xorriso,
+                            char *old_path, char *new_path, int flag);
+
+
 int Xorriso_protect_stdout(struct XorrisO *xorriso, int flag);
 
 
@@ -574,6 +697,20 @@ int Xorriso_normalize_acl_text(struct XorrisO *xorriso, char *in_text,
 int Xorriso_path_setfattr(struct XorrisO *xorriso, void *in_node, char *path,
                        char *name, size_t value_length, char *value, int flag);
 
+int Xorriso_status_result(struct XorrisO *xorriso, char *filter, FILE *fp,
+                          int flag);
+
+int Xorriso_compare_2_files(struct XorrisO *xorriso, char *disk_adr,
+                            char *iso_adr, char *adr_common_tail,
+                            int *result, int flag);
+
+int Xorriso_report_md5_outcome(struct XorrisO *xorriso, char *severity, 
+                               int flag);
+
+int Xorriso_append_scdbackup_record(struct XorrisO *xorriso, int flag);
+
+int Xorriso_may_burn(struct XorrisO *xorriso, int flag);
+
 
 int Sfile_str(char target[SfileadrL], char *source, int flag);
 
@@ -618,6 +755,8 @@ int Sfile_type(char *filename, int flag);
 */
 int Sfile_bsl_encoder(char **result, char *text, size_t text_len, int flag);
 
+int Sfile_argv_bsl(int argc, char ***argv, int flag);
+
 
 struct Xorriso_lsT {
   char *text;
@@ -632,6 +771,7 @@ struct Xorriso_lsT {
     @param flag Bitfield for control purposes
                 bit0= insert before link rather than after it
                 bit1= do not copy data (e.g. because *data is invalid)
+                bit2= attach data directly by pointer rather than by copying
     @return <=0 error, 1 ok
 */
 int Xorriso_lst_new_binary(struct Xorriso_lsT **lstring, char *data,
@@ -642,8 +782,7 @@ int Xorriso_lst_new_binary(struct Xorriso_lsT **lstring, char *data,
     @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
+    @param flag     see Xorriso_lst_new_binary
     @return <=0 error, 1 ok
 */
 int Xorriso_lst_new(struct Xorriso_lsT **lstring, char *text,
@@ -651,12 +790,16 @@ int Xorriso_lst_new(struct Xorriso_lsT **lstring, char *text,
 
 
 /** 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 entry    Contains as input a pointer to a pointer to any existing
+                    list item. As output this list item pointer may be
+                    changed to the address of the new list item:
+                    if ((*entry == 0) || (flag & 1))
     @param data     An array of bytes to be copied into the new object
     @param data_len Number of bytes to be copied
-    @param flag     unused yet, submit 0
+    @param flag     Bitfield for control purposes
+                    bit0= Return new object address in *entry
+                    bit1= do not copy data (e.g. because *data is invalid)
+                    bit2= attach data directly by pointer rather than by copying
     @return <=0 error, 1 ok
 */
 int Xorriso_lst_append_binary(struct Xorriso_lsT **entry,
@@ -671,6 +814,15 @@ int Xorriso_lst_append_binary(struct Xorriso_lsT **entry,
 int Xorriso_lst_destroy(struct Xorriso_lsT **lstring, int flag);
 
 
+struct Xorriso_lsT *Xorriso_lst_get_next(struct Xorriso_lsT *entry, int flag);
+
+struct Xorriso_lsT *Xorriso_lst_get_prev(struct Xorriso_lsT *entry, int flag);
+
+char *Xorriso_lst_get_text(struct Xorriso_lsT *entry, int flag);
+
+int Xorriso_lst_detach_text(struct Xorriso_lsT *entry, int flag);
+
+
 char *Text_shellsafe(char *in_text, char *out_text, int flag);
 
 int Sort_argv(int argc, char **argv, int flag);
@@ -699,6 +851,245 @@ int Dirseq_next_adr(struct DirseQ *o, char reply[SfileadrL], int flag);
 int Linkitem_reset_stack(struct LinkiteM **o, struct LinkiteM *to, int flag);
 
 
+
+
+#define Xorriso_findjob_on_expR yes
+
+#ifdef Xorriso_findjob_on_expR
+
+/*
+   A single Testnode.
+*/
+struct ExprtesT {
+
+ struct FindjoB *boss;
+
+ int invert;  /* 0=normal  1=invert result */ 
+
+ /*
+   0= -false (with invert : -true)
+   1= -name char *arg1 (regex_t in *arg2)
+   2= -type char *arg1
+   3= -damaged
+   4= -lba_range int *arg1 int *arg2
+   5= -has_acl
+   6= -has_xattr
+   7= -has_aaip
+   8= -has_filter
+   9= -wanted_node IsoNode *arg1 (for internal use, arg1 not allocated)
+  10= -pending_data
+  11= -decision char *arg1 ("yes", "no")
+  12= -prune
+  13= -wholename char *arg1 (regex_t in *arg2)
+  14= -has_any_xattr
+  15= -has_md5
+ */
+ int test_type;
+
+ void *arg1;
+ void *arg2;
+
+};
+
+
+/* 
+   A computational node.
+   A tree of these nodes forms the expression.
+   Sequences of AND/OR operations form branches, brackets spawn new branches,
+   NOT inverts node's test resp. subtree result.
+*/
+struct ExprnodE {
+
+ struct ExprnodE *up;
+
+ char origin[8];
+
+  /* Operators */
+ int invert;  /* 0=normal  1=invert own result (subtree or test, but not op) */ 
+
+ int assoc; /*
+                0= left : compute own value, combine with left value,
+                          compute right value, combine with current value
+                1= right: compute own value, compute right value, 
+                          combine own and right, combine with left value
+             */
+
+ int use_shortcuts; /* 0= evaluate all tests of -and and -or,
+                       1= evaluate only until the combined result is known
+                     */
+
+ struct ExprnodE *left;
+ int left_op; /* 0=OR , 1=AND */
+  
+ struct ExprnodE *right;
+ int right_op; /* see left_op */
+
+ /* Brackets : a pointer to the first node in a subchain */ 
+ struct ExprnodE *sub; 
+
+ int is_if_then_else;
+ struct ExprnodE *true_branch;
+ struct ExprnodE *false_branch;
+
+ /* elementary test : if sub!=NULL , test is ignored */
+ struct ExprtesT *test;
+
+ /* Result */
+ int own_value;
+ int composed_value;
+
+};
+
+
+struct FindjoB {
+
+ char *start_path;
+
+ struct ExprnodE *test_tree;
+
+ struct ExprnodE *cursor;
+ int invert;  /* 0=normal  1=set invert-property for next new test node */
+ int use_shortcuts;
+
+ /* 0= echo
+    1= rm (also rmdir)
+    2= rm_r
+>>> 3= mv target
+    4= chown user
+    5= chgrp group
+    6= chmod mode_and mode_or
+    7= alter_date type date
+    8= lsdl
+    9= chown_r user
+   10= chgrp_r group
+   11= chmod_r mode_and mode_or
+   12= alter_date_r type date
+   13= find
+   14= compare disk_equivalent_of_start_path
+   15= in_iso iso_rr_equivalent_of_start_path
+   16= not_in_iso iso_rr_equiv
+   17= update disk_equiv
+   18= add_missing iso_rr_equiv
+   19= empty_iso_dir iso_rr_equiv
+   20= is_full_in_iso iso_rr_equiv
+   21= report_damage
+   22= report_lba
+   23= internal: memorize path of last matching node in found_path
+   24= getfacl
+   25= setfacl access_acl default_acl
+   26= getfattr
+   27= setfattr
+   28= set_filter name
+   29= show_stream
+   30= internal: count by xorriso->node_counter
+   31= internal: register in xorriso->node_array
+   32= internal: widen_hardlinks disk_equiv: update nodes marked in di_do_widen
+   33= get_any_xattr
+   34= get_md5
+   35= check_md5
+   36= make_md5
+ */
+ int action;
+ int prune;
+
+ /* action specific parameters */
+ char *target;
+ char *text_2;
+ uid_t user;
+ gid_t group;
+ mode_t mode_and, mode_or;
+ int type; /* see Xorriso_set_time flag */
+ time_t date;
+ char *found_path;
+ struct FindjoB *subjob;
+
+ /* Errors */
+ char errmsg[4096];
+ int errn; /*
+             >0 = UNIX errno
+             -1 = close_bracket: no bracket open 
+             -2 = binary operator or closing bracket expected
+             -3 = unexpected binary operator or closing bracket
+             -4 = unsupported command
+             -5 = -then -elseif -else -endif without -if or at wrong place
+           */
+};
+
+
+int Exprtest_match(struct XorrisO *xorriso, struct ExprtesT *ftest,
+                   void *node_pt, char *name, char *path,
+                   struct stat *boss_stbuf, struct stat *stbuf, int flag);
+
+
+int Exprnode_destroy(struct ExprnodE **fnode, int flag);
+
+int Exprnode_tree_value(struct XorrisO *xorriso, struct ExprnodE *fnode,
+                        int left_value, void *node, char *name, char *path,
+                        struct stat *boss_stbuf, struct stat *stbuf, int flag);
+
+
+int Findjob_new(struct FindjoB **o, char *start_path, int flag);
+
+int Findjob_destroy(struct FindjoB **o, int flag);
+
+int Findjob_set_start_path(struct FindjoB *o, char *start_path, int flag);
+
+int Findjob_get_start_path(struct FindjoB *o, char **start_path, int flag);
+
+int Findjob_set_commit_filter_2(struct FindjoB *o, int flag);
+
+int Findjob_set_lba_range(struct FindjoB *o, int start_lba, int count, 
+                          int flag);
+
+int Findjob_set_wanted_node(struct FindjoB *o, void *wanted_node, int flag);
+
+int Findjob_set_decision(struct FindjoB *o, char *decision, int flag);
+
+int Findjob_open_bracket(struct FindjoB *job, int flag);
+
+int Findjob_close_bracket(struct FindjoB *job, int flag);
+
+int Findjob_not(struct FindjoB *job, int flag);
+
+int Findjob_and(struct FindjoB *job, int flag);
+
+int Findjob_or(struct FindjoB *job, int flag);
+
+int Findjob_if(struct FindjoB *job, int flag);
+
+int Findjob_then(struct FindjoB *job, int flag);
+
+int Findjob_else(struct FindjoB *job, int flag);
+
+int Findjob_elseif(struct FindjoB *job, int flag);
+
+int Findjob_endif(struct FindjoB *job, int flag);
+
+int Findjob_test_2(struct XorrisO *xorriso, struct FindjoB *o, 
+                   void *node, char *name, char *path,
+                   struct stat *boss_stbuf, struct stat *stbuf, int flag);
+
+int Findjob_set_action_found_path(struct FindjoB *o, int flag);
+
+/* @param flag bit0= recursive
+*/
+int Findjob_set_action_target(struct FindjoB *o, int action, char *target,
+                              int flag);
+int Findjob_get_action(struct FindjoB *o, int flag);
+
+int Findjob_get_action_parms(struct FindjoB *o, char **target, char **text_2,
+                             uid_t *user, gid_t *group,
+                             mode_t *mode_and, mode_t *mode_or,
+                             int *type, time_t *date, struct FindjoB **subjob,
+                             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);
+
+#else /* Xorriso_findjob_on_expR */
+
+
 struct FindjoB;
 
 
@@ -763,6 +1154,8 @@ int Findjob_get_xattr_filter(struct FindjoB *o, int *xattr_filter, int flag);
 
 int Findjob_get_aaip_filter(struct FindjoB *o, int *aaip_filter, int flag);
 
+int Findjob_get_filter_filter(struct FindjoB *o, int *value, int flag);
+
 int Findjob_set_wanted_node(struct FindjoB *o, void *wanted_node, int flag);
 
 int Findjob_get_wanted_node(struct FindjoB *o, void **wanted_node, int flag);
@@ -771,6 +1164,8 @@ int Findjob_set_found_path(struct FindjoB *o, char *path, int flag);
 
 int Findjob_get_found_path(struct FindjoB *o, char **path, int flag);
 
+#endif /* ! Xorriso_findjob_on_expR */
+
 
 struct SplitparT;
 
@@ -789,6 +1184,8 @@ int Splitparts_get(struct SplitparT *o, int idx, char **name, int *partno,
 int Splitpart__parse(char *name, int *partno, int *total_parts,
                     off_t *offset, off_t *bytes, off_t *total_bytes, int flag);
 
+int Splitpart__is_part_path(char *path, int flag);
+
 int Splitpart__compose(char *adr, int partno, int total_parts,
                        off_t offset, off_t bytes, off_t total_bytes, int flag);
 
@@ -818,10 +1215,12 @@ 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);
+char *Spotlist__quality_name(int quality, char name[80], int bad_limit,
+                             int flag);
 
 
 #define Xorriso_read_quality_gooD         0x7fffffff
+#define Xorriso_read_quality_md5_matcH    0x70000000
 #define Xorriso_read_quality_sloW         0x60000000
 #define Xorriso_read_quality_partiaL      0x50000000
 #define Xorriso_read_quality_valiD        0x40000000
@@ -829,9 +1228,65 @@ char *Spotlist__quality_name(int quality, char name[80], int flag);
 #define Xorriso_read_quality_invaliD      0x3ffffffe
 #define Xorriso_read_quality_tao_enD      0x28000000
 #define Xorriso_read_quality_off_tracK    0x20000000
+#define Xorriso_read_quality_md5_mismatcH 0x10000000
 #define Xorriso_read_quality_unreadablE   0x00000000
 
 
+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; /* 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
+                     */
+
+ char event_severity[20]; /* If not "ALL": trigger event of given severity
+                             at the end of a check job if bad blocks were
+                             discovered.
+                           */
+
+ double slow_threshold_seq; /* Time limit in seconds for the decision whether
+                               a read operation is considered slow. This does
+                               not apply to thr first read of an interval.
+                             */
+
+ int untested_valid; /* 1= mark untested data blocks as valid when calling
+                           Xorriso_spotlist_to_sectormap()
+                      */
+};
+
 int Checkmediajob_new(struct CheckmediajoB **o, int flag);
 
 int Checkmediajob_destroy(struct CheckmediajoB **o, int flag);

xorriso/xorriso_timestamp.h

@@ -1 +1 @@
-#define Xorriso_timestamP "2009.03.14.115711"
+#define Xorriso_timestamP "2010.01.25.120001"

xorriso/xorrisoburn.h

@@ -4,9 +4,9 @@
    a command line oriented batch and dialog tool which creates, loads,
    manipulates and burns ISO 9660 filesystem images.
 
-   Copyright 2007-2009 Thomas Schmitt, <scdbackup@gmx.net>
+   Copyright 2007-2010 Thomas Schmitt, <scdbackup@gmx.net>
 
-   Provided under GPL version 2.
+   Provided under GPL version 2 or later.
 
    This file contains the inner isofs- and burn-library interface of xorriso.
 */
@@ -18,8 +18,13 @@
 /* The minimum version of libisoburn to be used with this version of xorriso
 */
 #define xorriso_libisoburn_req_major  0
-#define xorriso_libisoburn_req_minor  3
-#define xorriso_libisoburn_req_micro  5
+#define xorriso_libisoburn_req_minor  4
+#define xorriso_libisoburn_req_micro  8
+
+
+struct SpotlisT;          /* List of intervals with different read qualities */
+struct CheckmediajoB;     /* Parameters for Xorriso_check_media() */
+
 
 int Xorriso_startup_libraries(struct XorrisO *xorriso, int flag);
 
@@ -87,6 +92,11 @@ int Xorriso_format_media(struct XorrisO *xorriso, off_t size, int flag);
 */
 int Xorriso_list_formats(struct XorrisO *xorriso, int flag);
 
+/* @param flag bit1= obtain outdrive, else indrive
+   @return <=0 error, 1 success
+*/
+int Xorriso_list_profiles(struct XorrisO *xorriso, int flag);
+
 /* @param flag bit2= formatting rather than blanking
    @return 0=failure, did not touch media , -1=failure, altered media
            1=success, altered media       ,  2=success, did not touch media
@@ -177,6 +187,12 @@ int Xorriso_findi(struct XorrisO *xorriso, struct FindjoB *job,
                   void *dir_node_generic, char *dir_path,
                   struct stat *dir_stbuf, int depth, int flag);
 
+/* @param flag bit0= do not dive into trees
+               bit1= do not perform job->action on resulting node array
+*/
+int Xorriso_findi_sorted(struct XorrisO *xorriso, struct FindjoB *job,
+                         off_t boss_mem, int filec, char **filev, int flag);
+
 /* @param flag bit0= do not mark image as changed */
 int Xorriso_set_volid(struct XorrisO *xorriso, char *volid, int flag);
 
@@ -211,17 +227,8 @@ int Xorriso_burn_track(struct XorrisO *xorriso, off_t write_start_address,
 int Xorriso_get_profile(struct XorrisO *xorriso, int *profile_number,
                         char profile_name[80], int flag);
 
-#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
+               bit1= dig out the most original stream for reading
 */
 int Xorriso_iso_file_open(struct XorrisO *xorriso, char *pathname,
                           void *node_pt, void **stream, int flag);
@@ -308,50 +315,31 @@ int Xorriso_get_local_charset(struct XorrisO *xorriso, char **name, int flag);
 
 int Xorriso_set_local_charset(struct XorrisO *xorriso, char *name, int flag);
 
+int Xorriso_destroy_node_array(struct XorrisO *xorriso, int flag);
 
+int Xorriso_destroy_hln_array(struct XorrisO *xorriso, int flag);
 
-struct CheckmediajoB {
- int use_dev;        /* 0= use indev , 1= use outdev , 2= use sector map*/
+int Xorriso_destroy_di_array(struct XorrisO *xorriso, int flag);
 
- int min_lba;        /* if >=0 : begin checking at this address */
- int max_lba;        /* if >=0 : read up to this address, else use mode */
+int Xorriso_new_node_array(struct XorrisO *xorriso, off_t mem_limit,
+                           int addon_nodes, int flag);
 
- 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 Xorriso_sort_node_array(struct XorrisO *xorriso, int flag);
 
- int item_limit;     /* Maximum number of media check list items as result */
+int Xorriso_new_hln_array(struct XorrisO *xorriso, off_t mem_limit, int flag);
 
- char abort_file_path[SfileadrL];
+/* @param flag bit0= allocate xorriso->node_targets too
+*/
+int Xorriso_restore_node_array(struct XorrisO *xorriso, int flag);
 
- 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;
+int Xorriso_check_md5(struct XorrisO *xorriso, void *in_node, char *path,
+                      int flag);
 
- 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 Xorriso_check_session_md5(struct XorrisO *xorriso, char *severity,
+                              int flag);
 
- int retry;          /* -1= only try full read_chunk, 1=retry with 2k blocks
-                         0= retry with CD, full chunk else
-                      */
+int Xorriso_image_has_md5(struct XorrisO *xorriso, int flag);
 
- 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);
@@ -431,6 +419,75 @@ int Xorriso_record_dev_inode(struct XorrisO *xorriso, char *disk_path,
 int Xorriso_local_getfacl(struct XorrisO *xorriso, char *disk_path,
                           char **text, int flag);
 
+int Xorriso_set_filter(struct XorrisO *xorriso, void *in_node,
+                       char *path, char *filter_name, int flag);
+
+/* @param flag bit0= delete filter with the given name
+*/
+int Xorriso_external_filter(struct XorrisO *xorriso,
+                            char *name, char *options, char *path,
+                            int argc, char **argv, int flag);
+
+int Xorriso_status_extf(struct XorrisO *xorriso, char *filter, FILE *fp,
+                        int flag);
+
+int Xorriso_destroy_all_extf(struct XorrisO *xorriso, int flag);
+
+int Xorriso_show_stream(struct XorrisO *xorriso, void *in_node,
+                        char *path, int flag);
+
+int Xorriso_set_zisofs_params(struct XorrisO *xorriso, int flag);
+
+int Xorriso_status_zisofs(struct XorrisO *xorriso, char *filter, FILE *fp,
+                          int flag);
+
+/* @param flag bit0= overwrite existing di_array (else return 2)
+*/
+int Xorriso_make_di_array(struct XorrisO *xorriso, int flag);
+
+/* @param flag bit0= overwrite existing hln_array (else return 2)
+*/
+int Xorriso_make_hln_array(struct XorrisO *xorriso, int flag);
+
+/*
+   @param flag      bit2= -follow: this is not a command parameter
+   @return -1= severe error
+            0= not applicable for hard links
+            1= go on with processing
+            2= iso_rr_path is fully updated
+*/
+int Xorriso_hardlink_update(struct XorrisO *xorriso, int *compare_result,
+                            char *disk_path, char *iso_rr_path, int flag);
+
+int Xorriso_finish_hl_update(struct XorrisO *xorriso, int flag);
+
+int Xorriso_get_md5(struct XorrisO *xorriso, void *in_node, char *path,
+                    char md5[16], int flag);
+
+int Xorriso_make_md5(struct XorrisO *xorriso, void *in_node, char *path,
+                     int flag);
+
+int Xorriso_md5_start(struct XorrisO *xorriso, void **ctx, int flag);
+
+int Xorriso_md5_compute(struct XorrisO *xorriso, void *ctx,
+                        char *data, int datalen, int flag);
+
+int Xorriso_md5_end(struct XorrisO *xorriso, void **ctx, char md5[16],
+                    int flag);
+
+/* @param flag bit0=input drive
+               bit1=output drive
+*/
+int Xorriso_drive_snooze(struct XorrisO *xorriso, int flag);
+
+int Xorriso_is_plain_image_file(struct XorrisO *xorriso, void *in_node,
+                                char *path, int flag);
+
+int Xorriso_pvd_info(struct XorrisO *xorriso, int flag);
+
+/* @param flag bit0= do not set hln_change_pending */
+int Xorriso_set_change_pending(struct XorrisO *xorriso, int flag);
+
 
 /* A pseudo file type for El-Torito bootsectors as in man 2 stat :
    For now take the highest possible value.