Documented changes and release timestamp

COPYRIGHT

@@ -1,7 +1,7 @@
 Derek Foreman <derek@signalmarketing.com> and Ben Jansens <xor@orodu.net>
 Copyright (C) 2002-2006  Derek Foreman and Ben Jansens
 Mario Danic <mario.danic@gmail.com>, Thomas Schmitt <scdbackup@gmx.net>
-Copyright (C) 2006-2008 Mario Danic, Thomas Schmitt
+Copyright (C) 2006-2009 Mario Danic, Thomas Schmitt
 
 
     This program is free software; you can redistribute it and/or modify

Makefile.am

@@ -1,4 +1,8 @@
-pkgconfigdir=$(libdir)/pkgconfig
+
+# ts A90315 : LIBBURNIA_PKGCONFDIR is defined OS specific in acinclude.m4
+# was: pkgconfigdir=$(libdir)/pkgconfig
+pkgconfigdir=$(LIBBURNIA_PKGCONFDIR)
+
 libincludedir=$(includedir)/libburn
 
 lib_LTLIBRARIES = libburn/libburn.la 
@@ -82,32 +86,34 @@ noinst_PROGRAMS = \
 bin_PROGRAMS = \
 	cdrskin/cdrskin
 
+LIBBURN_EXTRALIBS = $(LIBBURN_ARCH_LIBS) $(THREAD_LIBS)
+
 test_libburner_CPPFLAGS = -Ilibburn
-test_libburner_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS)
+test_libburner_LDADD = $(libburn_libburn_la_OBJECTS) $(LIBBURN_EXTRALIBS)
 test_libburner_SOURCES = test/libburner.c
 test_telltoc_CPPFLAGS = -Ilibburn
-test_telltoc_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS)
+test_telltoc_LDADD = $(libburn_libburn_la_OBJECTS) $(LIBBURN_EXTRALIBS)
 test_telltoc_SOURCES = test/telltoc.c
 test_dewav_CPPFLAGS = -Ilibburn
-test_dewav_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS)
+test_dewav_LDADD = $(libburn_libburn_la_OBJECTS) $(LIBBURN_EXTRALIBS)
 test_dewav_SOURCES = test/dewav.c
 test_fake_au_CPPFLAGS = 
 test_fake_au_LDADD =
 test_fake_au_SOURCES = test/fake_au.c
 test_poll_CPPFLAGS = -Ilibburn
-test_poll_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS)
+test_poll_LDADD = $(libburn_libburn_la_OBJECTS) $(LIBBURN_EXTRALIBS)
 test_poll_SOURCES = test/poll.c
 test_structest_CPPFLAGS = -Ilibburn
-test_structest_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS)
+test_structest_LDADD = $(libburn_libburn_la_OBJECTS) $(LIBBURN_EXTRALIBS)
 test_structest_SOURCES = test/structest.c
 
-##  cdrskin construction site - ts A60816 - A80716
+##  cdrskin construction site - ts A60816 - A90507
 cdrskin_cdrskin_CPPFLAGS = -Ilibburn
-cdrskin_cdrskin_CFLAGS = -DCdrskin_libburn_0_5_0
+cdrskin_cdrskin_CFLAGS = -DCdrskin_libburn_0_6_8
 
-# cdrskin_cdrskin_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS)
+# cdrskin_cdrskin_LDADD = $(libburn_libburn_la_OBJECTS) $(LIBBURN_EXTRALIBS)
 # ts A80123, change proposed by Simon Huggins to cause dynamic libburn linking
-cdrskin_cdrskin_LDADD = libburn/libburn.la $(THREAD_LIBS)
+cdrskin_cdrskin_LDADD = libburn/libburn.la $(LIBBURN_EXTRALIBS)
 
 cdrskin_cdrskin_SOURCES = cdrskin/cdrskin.c cdrskin/cdrfifo.c cdrskin/cdrfifo.h cdrskin/cdrskin_timestamp.h
 ##

README

@@ -4,49 +4,60 @@
 This all is under GPL.
 (See GPL reference, our clarification and commitment at the end of this text)
 ------------------------------------------------------------------------------
-libburnia-project.org
+libburn-project.org
 By Mario Danic <mario.danic@gmail.com> and Thomas Schmitt <scdbackup@gmx.net>
-Copyright (C) 2006-2008 Mario Danic, Thomas Schmitt
-
-Still containing parts of
-Libburn. By Derek Foreman <derek@signalmarketing.com> and
-            Ben Jansens <xor@orodu.net>
+Copyright (C) 2006-2009 Mario Danic, Thomas Schmitt
+Still containing parts of Libburn. By Derek Foreman <derek@signalmarketing.com>
+and Ben Jansens <xor@orodu.net>
 Copyright (C) 2002-2006  Derek Foreman and Ben Jansens
-These parts are to be replaced by own code of above libburnia-project.org
-copyright holders and then libburnia-project.org is to be their sole copyright.
-This is done to achieve the right to issue the clarification and the
-commitment as written at the end of this text.
-The rights and merits of the Libburn-copyright holders Derek Foreman and
-Ben Jansens will be duely respected. 
 
-This libburnia-project.org toplevel README (C) 2006-2008 Thomas Schmitt 
+     http://files.libburnia-project.org/releases/libburn-0.6.8.pl00.tar.gz
+
 ------------------------------------------------------------------------------
 
                            Build and Installation
 
-Our build system is based on autotools. For preparing the build of a SVN 
-snapshot you will need autotools of at least version 1.7. 
-Check out from SVN by
-   svn co http://svn.libburnia-project.org/libburn/trunk libburn
-go into directory libburn and apply autotools by
-   ./bootstrap
+                                From tarball
 
-Alternatively you may unpack a release tarball for which you do not need
-autotools installed.
+Obtain libburn-0.6.8.pl00.tar.gz, take it to a directory of your choice and do:
 
-To build a libburnia-project.org subproject it should be sufficient to go
-into its toplevel directory (here: "libburn") and execute
+   tar xzf libburn-0.6.8.pl00.tar.gz
+   cd libburn-0.6.8
    ./configure --prefix=/usr
    make
 
 To make libburn accessible for running resp. application development,
-and to install the cdrecord compatibility binary cdrskin, do:
+and to install the cdrecord compatibility binary cdrskin, do
+(as Superuser):
+
    make install
 
-
-Above procedure installs cdrskin depending on libburn.so.4 .
+This procedure installs libburn.so.4 and cdrskin depending on it.
 For a standalone cdrskin binary, see cdrskin/README.
 
+A behavioral conflict is known between any burn software and demons like hald
+which probe CD drives. This can spoil burn runs for CD-R or CD-RW.
+You may have to keep your hald away from the drive. See for example
+   http://www.freebsd.org/gnome/docs/halfaq.html
+
+
+                                  From SVN
+
+Our build system is based on autotools. For preparing the build of a SVN 
+snapshot you will need autotools of at least version 1.7. 
+Do in a directory of your choice:
+
+   svn co http://svn.libburnia-project.org/libburn/trunk libburn-0.6.3
+   cd libburn-0.6.3
+   ./bootstrap
+   ./configure --prefix=/usr
+   make
+   make install
+
+Warning: The trunk might contain experimental features which might not
+         persist until next release. 
+
+------------------------------------------------------------------------------
 
 An important part of the project, libisofs, is hosted in a bzr repository at
 launchpad.net :
@@ -57,7 +68,6 @@ Another part the project, libisoburn, is hosted in the libburnia SVN, too:
 
 See README files there.
 
-
 ------------------------------------------------------------------------------
 
 
@@ -65,24 +75,27 @@ See README files there.
 
 libburnia-project.org is an open-source software project for reading, mastering
 and writing optical discs.
-For now this means only CD media and all single layer DVD media except DVD+R.
+For now this means CD media, all DVD media except DVD-R DL, all BD media.
 
 The project comprises of several more or less interdependent parts which
 together strive to be a usable foundation for application development.
 These are libraries, language bindings, and middleware binaries which emulate
 classical (and valuable) Linux tools.
+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).
+On other X/Open compliant systems there will only be pseudo drives, but no
+direct MMC operation on real CD/DVD/BD drives.
 
-Our scope is currently Linux 2.4 and 2.6 only. For ports to other systems
-we would need : login on a development machine resp. a live OS on CD or DVD,
-advise from a system person about the equivalent of Linux sg or FreeBSD CAM,
-volunteers for testing of realistic use cases.
+For full ports to other systems we would need : login on a development machine
+resp. a live OS on CD or DVD, advise from a system person about the equivalent
+of Linux sg or FreeBSD CAM, volunteers for testing of realistic use cases.
 
-We have a well tested code base for burning data and audio CDs and many DVD
-types. The burn API is quite comprehensively documented and can be used to
-build a presentable application.
-We have a functional binary which emulates the core use cases of cdrecord in
-order to prove that usability, and in order to allow you to explore libburn's
-scope by help of existing cdrecord frontends.
+We have a well tested code base for burning data and audio CDs, DVDs and BDs.
+The burn API is quite comprehensively documented and can be used to build a
+presentable application.
+We have a functional application which emulates the core use cases of cdrecord
+in order to prove that usability, and in order to allow you to explore
+libburn's scope by help of existing cdrecord frontends.
 
 ISO 9660 filesystems with Rock Ridge and Joliet extensions can be created
 and manipulated quite freely. This capability together with our burn capability
@@ -122,8 +135,9 @@ The project components (list subject to growth, hopefully):
 - xorriso  is an application of all three libraries which creates, loads,
            manipulates and writes ISO 9660 filesystem images with
            Rock Ridge extensions. Manipulation is not only adding or
-           overwriting of files but also deletion, renaming, and attribute
-           changing.
+           overwriting of files but also deleting, renaming, attribute
+           changing, incremental backups, activating boot images, and
+           extracting of files from ISO images to disk.
            See xorriso/README for more.
 
 - "test"   is a collection of application gestures and examples given by the
@@ -142,10 +156,17 @@ any way and even may revoke such new features before the next release of
 x.y.*[02468]. As soon as it is released, a feature is promised to persist.
 
 SONAMES:
-libburn.so.4 (since 0.3.4, March 2007),
-libisofs.so.6 (since 0.6.2, February 2008),
+libburn.so.4    (since 0.3.4, March    2007),
+libisofs.so.6   (since 0.6.2, February 2008),
 libisoburn.so.1 (since 0.1.0, February 2008).
 
+Applications must use 64 bit off_t. E.g. by defining
+#define _LARGEFILE_SOURCE
+#define _FILE_OFFSET_BITS 64
+or take special precautions to interface with the libraries by 64 bit integers
+where the .h files prescribe off_t. Not to use 64 bit file i/o will keep the
+application from producing and processing ISO images of more than 2 GB size.
+
 
 ------------------------------------------------------------------------------
 Project history as far as known to me:
@@ -173,7 +194,7 @@ Project history as far as known to me:
   discontent.
   The situation first caused me to publically regret it and then - after i
   got the opportunity to move in with cdrskin - gave me true reason to
-  personally apologize to Derek Foreman, Ben Jansens and the contibutors at 
+  personally apologize to Derek Foreman, Ben Jansens and the contributors at 
   icculus.org/burn. Posted to both projects:
     http://lists.freedesktop.org/archives/libburn/2006-August/000446.html
     http://mailman-mail1.webfaction.com/pipermail/libburn-hackers/2006-August/000024.html
@@ -277,7 +298,7 @@ Project history as far as known to me:
   image tree nodes. It now depends on libisofs-0.6.4 and libburn-0.4.4.
   xorriso makes use of new libisofs features by performing incremental
   updates of directory trees and by cutting oversized data files into
-  pieces. A primitive single session emulation of cdrcord and mkisofs is
+  pieces. A primitive single session emulation of cdrecord and mkisofs is
   provided.
 
 - 10th May 2008 libburn-0.4.6 supports formatting and writing of BD-RE,
@@ -300,6 +321,98 @@ Project history as far as known to me:
 - 16th Jul 2008 libburn-0.5.0 handles systems with no /dev/sr* but only
   /dev/scd*.
 
+- 19th Jul 2008 libisoburn/xorriso-0.2.2 can do multi-session in mkisofs
+  and cdrecord style. xorriso now can serve underneath growisofs.
+
+- 20th Aug 2008 libburn-0.5.2 revokes the necessity that a drive must be
+  enumerable in order to be adressable. Enumeration is enhanced by examining
+  /proc/sys/dev/cdrom/info.
+  
+- 24th Aug 2008 libisoburn/xorriso-0.2.4 introduces a media readability check
+  with data retrieval option.
+
+- 18th Sep 2008 libisofs-0.6.8 supports ISO 9660 Level 3 which allows very
+  large data files in the image.
+
+- 20th Sep 2008 libisoburn/xorriso-0.2.6 takes into respect the new Level 3
+  capabilities of libisofs. 
+
+- 6th Oct 2008 libburn-0.5.4 adjusts the changes of 0.5.2 to the needs of
+  Linux kernel 2.4 and introduces human readable SCSI error messages.
+
+- 6th Oct 2008 libisofs-0.6.10 fixes two bugs which prevented adding and
+  manipulation of ISOLINUX boot images.
+
+- 15th Oct 2008 libisoburn/xorriso-0.2.8 can activate and maintain an
+  ISOLINUX boot image by an EL Torito boot record.
+
+- 12th Nov 2008 libburn-0.5.6 fixes usage of freed memory by the fifo thread
+  of an aborted burn run.
+
+- 26th Nov 2008 libisofs-0.6.12 can produce a ISOLINUX isohybrid MBR on the fly
+  and allows to produce ISO images which resemble old mkisofs images.
+
+- 2nd Dec 2008 libisoburn-0.3.0. xorriso now is ready for exotic character
+  sets, for legacy FreeBSD systems which expect an outdated Rock Ridge
+  signature, and for producing ISO images with MBR which boot from hard disk
+  or USB stick. Three minor bugs were fixed.
+
+- 7th Dec 2008 libburn-0.5.8 prevents a SIGSEGV with wierd CD table-of-content
+  and improves BD-RE formatting.
+
+- 9th Dec 2008 Our project received a donation from Thomas Weber.
+
+- 2nd Jan 2009 libburn-0.6.0 allows to format BD-R and to write to either
+  formatted or unformatted BD-R.
+
+- 6th Jan 2009 libisoburn-0.3.2. xorriso can produce and execute commands for
+  mounting older sessions from all kinds of media. Pseudo-drives outside the
+  /dev/ tree can be addressed without prefix "stdio:". 
+
+- 20th Feb 2009 libburn-0.6.2 source release now compiles out of the box
+  on FreeBSD.
+
+- 28 Feb 2009 libisofs-0.6.14 can record ACLs and Extended Attributes xattr
+  in its ISO images. 
+
+- 01 Mar 2009 libisoburn-0.3.4. xorriso makes use of the ACL and xattr
+  capabilities provided by libisofs for xorriso backup features.
+
+- 11 Mar 2009 libisofs-0.6.16 of libisofs fixes two bugs which on Solaris
+  prevented to navigate the ISO images by ".." and to recognize the Rock Ridge
+  extensions of ISO images. The ban to build libisofs on operating systems
+  other than Linux and FreeBSD has been lifted.
+
+- 13 Mar 2009 libburn-0.6.4 got a dummy adapter for SCSI/MMC command transport.
+  It will show no drives and thus libburn will only be able to perform
+  operations on "stdio:" pseudo drives. Nevertheless this allowed to lift the
+  ban to build libburn on operating systems other than Linux and FreeBSD.
+
+- 16 Mar 2009 libisoburn-0.3.6: xorriso uses RRIP version 1.10 as default 
+  in order to be mountable where mkisofs images are mountable.
+
+- 17 Apr 2009 libisofs-0.6.18 introduces content filtering of data files.
+  Built-in filters allow compression to formats gzip and zisofs. External
+  filter processes allow arbitrary data conversions like encryption.
+
+- 19 Apr 2009 libisoburn-0.3.8 makes use of the new libisofs capability to
+  perform content filtering of data files.
+
+- 08 May 2009 libburn-0.6.6 fixes a bug with aborting on broken output pipe
+  and a bug with device scan on FreeBSD.
+
+- 31 May 2009 libisofs-0.6.20 can record hard link relations in ISO images
+  and offers support with restoring them to disk. Current Linux kernels will
+  mount images with such hard links but will attribute a unique inode number
+  to each file.
+
+- 28 Jun 2009 libisoburn-0.4.0: xorriso can record and restore hard link
+  relations of files. Performance of data reading has been improved. Option
+  -find now supports logical operators with its tests.
+
+- 14 Jul 2009 libburn-0.6.8 fixes bugs and shortcommings with old MMC-1 drives
+  and with large SCSI bus numbers as handed out by Linux for USB drives.
+
 
 ------------------------------------------------------------------------------
 

acinclude.m4

@@ -1,9 +1,11 @@
 AC_DEFUN([TARGET_SHIZZLE],
 [
   ARCH=""
+  LIBBURNIA_PKGCONFDIR="$libdir"/pkgconfig
 
   AC_MSG_CHECKING([target operating system])
 
+  
   case $target in
     *-*-linux*)
       ARCH=linux
@@ -12,11 +14,66 @@ AC_DEFUN([TARGET_SHIZZLE],
     *-*-freebsd*)
       ARCH=freebsd
       LIBBURN_ARCH_LIBS=-lcam
+      LIBBURNIA_PKGCONFDIR=$(echo "$libdir" | sed 's/\/lib$/\/libdata/')/pkgconfig
       ;;
     *)
-      AC_ERROR([You are attempting to compile for an unsupported platform])
+      ARCH=
+      LIBBURN_ARCH_LIBS=
+#      AC_ERROR([You are attempting to compile for an unsupported platform])
       ;;
   esac
 
   AC_MSG_RESULT([$ARCH])
 ])
+
+
+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])
+
+])
+

cdrskin/README

@@ -4,15 +4,19 @@
 cdrskin. By Thomas Schmitt <scdbackup@gmx.net>
 Integrated sub project of libburnia-project.org but also published via:
 http://scdbackup.sourceforge.net/cdrskin_eng.html
-http://scdbackup.sourceforge.net/cdrskin-0.5.0.pl00.tar.gz
-Copyright (C) 2006-2008 Thomas Schmitt, provided under GPL version 2.
+http://scdbackup.sourceforge.net/cdrskin-0.6.8.pl00.tar.gz
+
+Copyright (C) 2006-2009 Thomas Schmitt, provided under GPL version 2.
 ------------------------------------------------------------------------------
 
 
 cdrskin is a limited cdrecord compatibility wrapper which allows to use
 most of the libburn features from the command line.
 
-Currently it is only supported on Linux with kernels >= 2.4.
+Currently it is supported on Linux with kernels >= 2.4 and on FreeBSD versions 
+with ATAPI/CAM support enabled in the kernel, see atapicam(4).
+On other X/Open compliant systems there will only be emulated drives, but no
+direct MMC operation on real CD/DVD/BD drives.
 
 By using this software you agree to the disclaimer at the end of this text
 "This software is provided as is. There is no warranty implied and ..."
@@ -20,10 +24,10 @@ By using this software you agree to the disclaimer at the end of this text
 
                    Compilation, First Glimpse, Installation
 
-Obtain cdrskin-0.5.0.pl00.tar.gz, take it to a directory of your choice and do:
+Obtain cdrskin-0.6.8.pl00.tar.gz, take it to a directory of your choice and do:
 
-    tar xzf cdrskin-0.5.0.pl00.tar.gz
-    cd cdrskin-0.5.0
+    tar xzf cdrskin-0.6.8.pl00.tar.gz
+    cd cdrskin-0.6.8
 
 Within that directory execute:
 
@@ -118,6 +122,11 @@ as listed device files. This addressing via e.g. /dev/sr0 or /dev/scd1 is
 compatible with generic read programs like dd and with write program growisofs.
 For finding /dev/sg1 from /dev/sr0, the program needs rw-access to both files.
 
+A behavioral conflict is known between any burn software and demons like hald
+which probe CD drives. This can spoil burn runs for CD-R or CD-RW.
+You may have to keep your hald away from the drive. See for example
+   http://www.freebsd.org/gnome/docs/halfaq.html
+
 
                                 Usage examples 
 
@@ -273,13 +282,16 @@ behavior.
 BD-RE media need formatting before first use. cdrskin option "blank=as_needed"
 recognizes unformatted BD-RE and applies a lengthy formatting run.
 
-During write operations DVD-RAM and BD-RE automatically apply defect
-management. This usually slows them down to half nominal speed. If drive
+During write operations DVD-RAM and BD-RE automatically apply Defect
+Management. This usually slows them down to half nominal speed. If drive
 and media produce flawless results anyway, then one can try to reach full
 nominal speed by option "stream_recording=on".
 In this case bad blocks are not detected during write and not even previously
 known bad blocks are avoided. So you have to make your own readability tests
 and go back to half speed as soon as the first read errors show up.
+Instead of "on" one may also set a start address for stream recording.
+Like "stream_recording=100m". This will write slowly to the first 100 MB of
+the media and accelerate when writing to higher addresses.
 
 Option --grow_overwriteable_iso allows -multi (although unneeded), enables
 -msinfo and -toc, and makes blank=fast an invalidator for ISO filesystems
@@ -349,14 +361,24 @@ Incremental Streaming afterwards. So blank=fast will do full blanking.
 blank=deformat_sequential_quickest   is faster but might yield DAO-only media.
 
 
-                             DVD+R and DVD+R DL 
+                           DVD+R , DVD+R DL , BD-R
 
 From the view of cdrskin they behave much like DVD-R. Each track gets wrapped
 into an own session, though.
+
 DVD+R DL appear as extra large DVD+R. cdrskin does not allow to set the address
 of the layer break where a reading drive might show some delay while switching
 between both media layers.
 
+BD-R are sold unformatted blank. If used without initial formatting then the
+drive is supposed to format them to maximum payload size with no Defect
+Management (see also above with BD-RE).
+If Defect Management is desired then BD-R need to be formatted before the
+first attempt to write a session to them.
+blank=format_if_needed    will detect the situation and eventually apply
+                          default sized Defect Management formatting.
+blank=format_defectmgt_*  will apply non-default parameters to formatting.
+
 
                               Emulated Drives
 
@@ -407,7 +429,7 @@ are the cause. Any mistake of the burn program is supposed to be caught
 by the drive's firmware and to lead to mere misburns.
 The worst mishaps which hit the author imposed the need to reboot the
 system because of drives gnawing endlessly on ill media. Permanent hardware
-damage did not occur in 2.5 years of development. But one never knows ...
+damage did not occur in 3.5 years of development. But one never knows ...
 
 ------------------------------------------------------------------------------
 
@@ -435,7 +457,7 @@ contributions in a due way.
 Based on and sub project of:
 libburnia-project.org
 By Mario Danic <mario.danic@gmail.com> and Thomas Schmitt <scdbackup@gmx.net>
-Copyright (C) 2006-2008 Mario Danic, Thomas Schmitt
+Copyright (C) 2006-2009 Mario Danic, Thomas Schmitt
 
 libburnia-project.org is inspired by and in other components still containing
 parts of

cdrskin/add_ts_changes_to_libburn_0_6_8

@@ -38,7 +38,7 @@ original="./libburn_svn_release.tgz"
 # My changes are in $changes , mainly in $changes/cdrskin
 changes="./libburn-release"
 
-skin_release="0.5.0"
+skin_release="0.6.8"
 patch_level=".pl00"
 skin_rev="$skin_release""$patch_level"
 

cdrskin/add_ts_changes_to_libburn_0_6_9

@@ -38,7 +38,7 @@ original="./libburn_svn.tgz"
 # My changes are in $changes , mainly in $changes/cdrskin
 changes="./libburn-develop"
 
-skin_release="0.5.1"
+skin_release="0.6.9"
 patch_level=""
 skin_rev="$skin_release""$patch_level"
 

cdrskin/cdrskin.1

@@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH CDRSKIN 1 "May 17, 2008"
+.TH CDRSKIN 1 "May 07, 2009"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -16,7 +16,7 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-cdrskin \- burns preformatted data to CD, DVD, and BD-RE via libburn.
+cdrskin \- burns preformatted data to CD, DVD, and BD via libburn.
 .SH SYNOPSIS
 .B cdrskin
 .RI [ options | track_source_addresses ]
@@ -28,14 +28,14 @@ cdrskin \- burns preformatted data to CD, DVD, and BD-RE via libburn.
 .\" respectively.
 .PP 
 \fBcdrskin\fP is a program that provides some of cdrecord's options
-in a compatible way for CD media. With DVD and BD-RE it has its own ways.
+in a compatible way for CD media. With DVD and BD it has its own ways.
 You do not need to be superuser for its daily usage.
 .SS
 .B Overview of features:
 .br
 Blanking of CD-RW and DVD-RW.
 .br
-Formatting of DVD-RW, DVD+RW, DVD-RAM, BD-RE.
+Formatting of DVD-RW, DVD+RW, DVD-RAM, BD.
 .br
 Burning of data or audio tracks to CD,
 .br
@@ -45,7 +45,7 @@ or in Session at Once mode for seamless tracks.
 .br
 Multi session on CD (follow-up sessions in TAO only)
 .br
-or on DVD-R[W] (in Incremental mode) or on DVD+R[/DL].
+or on DVD-R[W] (in Incremental mode) or DVD+R[/DL] or BD-R.
 .br
 Single session on DVD-RW or DVD-R (Disk-at-once).
 .br
@@ -67,7 +67,7 @@ Write mode selection
 .br
 Recordable CD Media
 .br
-Sequentially Recordable DVD Media
+Sequentially Recordable DVD or BD Media
 .br
 Overwriteable DVD or BD Media
 .br
@@ -108,8 +108,9 @@ While audio tracks just contain a given time span of acoustic vibrations,
 data tracks may have an arbitray meaning. Nevertheless, ISO-9660 filesystems
 are established as a format which can represent a tree of directories and
 files on all major operating systems. Such filesystem images can be
-produced by programs mkisofs or genisoimage. They can also be extended by
-follow-up tracks if prepared properly. See the man pages of said programs.
+produced by programs mkisofs or genisoimage or xorriso.
+They can also be extended by follow-up tracks if prepared properly.
+See the man pages of said programs.
 cdrskin is able to fulfill the needs about their option -C.
 .br
 Another type of data track content are archive formats which originally
@@ -160,14 +161,16 @@ round of overwriting. Usually
 is the appropriate option.
 Blanking damages the previous content but does not
 make it completely unreadable. It is no effective privacy precaution.
-Multiple cycles of blanking and overwriting with random numbers might be.
+Multiple cycles of blanking and overwriting with random numbers might be
+needed.
 .SS
-.B Sequentially Recordable DVD Media:
+.B Sequentially Recordable DVD or BD Media:
 .br
-Currently DVD-RW, DVD-R and DVD+R[/DL] can be used for the Sequential recording
-model.
+Currently DVD-RW, DVD-R , DVD+R[/DL], and BD-R can be used for the Sequential
+recording model. It resembles the model of CD media. Only DVD-RW can be
+blanked and re-used from scratch.
 .br
-This applies to DVD-RW only if they are in state "Sequential Recording".
+DVD-RW are sequential media if they are in state "Sequential Recording".
 The media must be either blank or appendable.
 Newly purchased DVD-RW and DVD-R media are in this state.
 Used DVD-RW get into blank sequential state by option
@@ -199,14 +202,18 @@ unpredicted length and to keep media appendable by option
 The only restriction towards CD-R[W] is the lack of support for -audio tracks.
 Multiple tracks per session are permissible.
 .br
-The write modes for DVD+R[/DL] resemble those with DVD-R except that with +R
-each track gets wrapped in an own session. There is no -dummy writing with
-DVD+R[/DL].
+The write modes for DVD+R[/DL] and BD-R resemble those with DVD-R except that
+each track gets wrapped in an own session. There is no -dummy writing
+with DVD+R[/DL] or BD-R.
 .br
 Quite deliberately write mode -sao insists in the tradition of a predicted
 track size and blank media, whereas -tao writes the tracks open ended and
 allows appendable media.
 .br
+BD-R may be formatted before first use to enable the Defect Management which
+might catch and repair some bad spots at the expense of slow speed
+even with flawless media.
+.br
 .B Note:
 Option -multi might make DVD media unreadable in some DVD-ROM drives.
 Best reader compatibility is achieved without it
@@ -247,7 +254,7 @@ that it has to be formatted again. If in doubt, just give it a try.
 .SS
 .B Drive preparation and addressing:
 .br
-The drives, either CD burners or DVD burners, are accessed via addresses which
+The drives, CD, DVD, or BD burners, are accessed via addresses which
 are specific to libburn and the operating system. Those addresses get listed
 by a run of \fBcdrskin --devices\fP.
 .br
@@ -351,7 +358,7 @@ audio track. Same is done for suffix ".au" and SUN Audio.
 Option -audio may be used only with CD media and not with DVD or BD.
 .TP 
 .BI blank= type
-Blank a CD-RW, DVD-RW, or format a DVD-RW, DVD+RW, DVD-RAM, BD-RE.
+Blank a CD-RW, DVD-RW, or format a DVD-RW, DVD+RW, DVD-RAM, BD.
 This is combinable with burning in the same run of cdrskin.
 The type given with blank= selects the particular behavior:
 .RS
@@ -363,7 +370,7 @@ It is a reason to abort if the media cannot assume thoroughly writeable state,
 e.g. if it is non-blank write-once.
 .br
 This leaves unformatted DVD-RW in unformatted blank state. To format DVD-RW use
-blank=format_overwriteable.
+blank=format_overwriteable. Blank unformatted BD-R stay unformatted.
 .br
 (Note: blank=as_needed is not an original cdrecord option.)
 .TP
@@ -392,10 +399,11 @@ This is faster than full blanking but may yield media incapable of
 Incremental Streaming (-tao).
 .TP
 format_if_needed
-Format a media if it is not overwriteably formatted yet, 
+Format a media if it is not formatted yet, 
 and if cdrskin supports formatting for the media type,
 and if formatting will not happen automatically during write.
-This currently applies to unformatted DVD-RW, DVD-RAM and BD-RE.
+This currently applies to unformatted DVD-RW, DVD-RAM, BD-RE,
+and blank unformatted BD-R.
 Eventually the appropriate default formatting is chosen.
 If other media or states are encountered then nothing happens.
 .br
@@ -425,7 +433,7 @@ For DVD+RW this is the only supported explicit formatting type. It provides
 complete "de-icing" so no reader slips on unwritten data areas.
 .TP
 format_defectmgt
-Format DVD-RAM or BD-RE to reserve the default amount of spare blocks for
+Format DVD-RAM or BD to reserve the default amount of spare blocks for
 defect management.
 .br
 The following format_defectmgt_* allow to submit user wishes which
@@ -449,25 +457,25 @@ Whether there happens certification at all depends much on the media state
 and the actually selected format descriptor.
 .TP
 format_defectmgt_max
-Format DVD-RAM or BD-RE to reserve a maximum number of spare blocks.
+Format DVD-RAM or BD to reserve a maximum number of spare blocks.
 .TP
 format_defectmgt_min
-Format DVD-RAM or BD-RE to reserve a minimum number of spare blocks.
+Format DVD-RAM or BD to reserve a minimum number of spare blocks.
 It might be necessary to format format_defectmgt_none first in order to get
 offered the most minmal spare blocks sizes for format_defectmgt_min.
 .TP
 format_defectmgt_none
 Format DVD-RAM or BD-RE to the largest available payload in the hope to disable
-defect management at all. This seems not to have a speed increasing effect,
-though.
+defect management at all. This may or may not have a speed increasing effect.
+Unformatted blank BD-R will be left unformatted.
 .TP
 format_defectmgt_payload_<size>
-Format DVD-RAM or BD-RE. The text after "format_defectmgt_payload_" gives a
+Format DVD-RAM or BD. The text after "format_defectmgt_payload_" gives a
 number of bytes, eventually with suffixes "s", "k", "m". The largest number
 of spare blocks will be chosen which allows at least the given payload size.
 .TP
 format_by_index_<number>
-Format DVD-RW, DVD+RW, DVD-RAM or BD-RE.
+Format DVD-RW, DVD+RW, DVD-RAM or BD.
 The number after "format_by_index_" is used as index to the list of available
 format descriptors. This list can be obtained by option --list_formats.
 The numbers after text "Format idx" are the ones to be used with
@@ -617,7 +625,8 @@ Note: msifile=path is actually an option of wodim and not of cdrecord.
 .TP
 .BI \-msinfo
 Retrieve multi-session info for preparing a follow-up session by option -C
-of programs mkisofs or genisoimage. Print result to standard output.
+of programs mkisofs, genisoimage, or xorriso -as mkisofs.
+Print result to standard output.
 This option redirects to stderr all message output except the one of option
 --tell_media_space and its own result string, which consists of two numbers.
 The result string shall be used as argument of option -C with said programs.
@@ -629,8 +638,8 @@ To have a chance for working on overwriteable media, this option has to be
 accompanied by option --grow_overwriteable_iso.
 .TP
 .BI \-multi
-This option keeps the CD or unformatted DVD-R[W] appendable after the current
-session has been written.
+This option keeps CD, unformatted DVD-R[W], DVD+R, or BD-R appendable
+after the current session has been written.
 Without it the disc gets closed and may not be written any more  - unless it
 is a -RW and gets blanked which causes loss of its content.
 .br
@@ -678,8 +687,8 @@ then behave strange or even go bad for the next few attempts to burn a CD.
 One should use it only if inavoidable.
 .TP
 .BI \-sao
-Write CD in Session At Once mode, a sequential DVD-R[W] in Disc-at-once
-(DAO) mode, or a DVD+R[/DL].
+Write CD in Session At Once mode or sequential DVD-R[W] in Disc-at-once
+(DAO) mode.
 .br
 With CD this mode is able to put several audio tracks on media without
 producing audible gaps between them.
@@ -687,7 +696,7 @@ producing audible gaps between them.
 With DVD-R[W] this mode can only write a single track.
 No -multi is allowed with DVD-R[W] -sao.
 .br
--sao is permissible with overwriteable DVD, BD or DVD+R[/DL] but actually
+-sao is permissible with overwriteable DVD, or DVD+R[/DL], or BD but actually
 only imposes restrictions without providing known advantages. 
 .br
 -sao can only be used for tracks of fixely predicted size. This implies that
@@ -1080,8 +1089,9 @@ Linux specific: Do not ask the operating system to prevent opening busy drives.
 Wether this leads to senseful behavior depends on operating system and kernel.
 .TP
 .BI drive_scsi_dev_family= sr | scd | sg
-Linux specific: Select a SCSI device file family to be used for drive command
-transactions. Normally this is /dev/sgN on kernel versions < 2.6 and /dev/srN
+Linux specific: Select a SCSI device file family to be scanned for by
+options --devices and -scanbus.
+Normally this is /dev/sgN on kernel versions < 2.6 and /dev/srN
 on kernels >= 2.6 . This option allows to explicitely override that default
 in order to meet other programs at a common device file for each drive.
 On kernel 2.4 families sr and scd will find no drives.
@@ -1176,13 +1186,15 @@ Use and report literal Bus,Target,Lun addresses rather than real SCSI and
 pseudo ATA addresses. This method is outdated and was never compatible with
 original cdrecord.
 .TP
-.BI stream_recording="on"|"off"
+.BI stream_recording="on"|"off"|number
 By setting "on" request that compliance to the desired speed setting is
-preferred over management of write errors. With DVD-RAM and BD-RE this can
+preferred over management of write errors. With DVD-RAM and BD this can
 bring effective write speed near to the nominal write speed of the media.
 But it will also disable the automatic use of replacement blocks
 if write errors occur. It might as well be disliked or ignored by the drive.
 .br
+If a number is given, then error management stays enabled for all byte
+addresses below that number. Any number below 16s is the same as "off".
 .SH EXAMPLES
 .SS
 .B Get an overview of drives and their addresses:
@@ -1227,15 +1239,15 @@ cdrskin -v dev=0,1,0 fs=32m speed=8 \\
 .br
 blank=as_needed padsize=300k -
 .SS
-.B Write multi-session to the same CD, DVD-R[W] or DVD+R[/DL]:
+.B Write multi-session to the same CD, DVD-R[W], DVD+R[/DL], or BD-R:
 .br
-cdrskin dev=/dev/hdc -v padsize=300k -multi 1.iso
+cdrskin dev=/dev/sr0 -v padsize=300k -multi 1.iso
 .br
-cdrskin dev=/dev/hdc -v padsize=300k -multi 2.iso
+cdrskin dev=/dev/sr0 -v padsize=300k -multi 2.iso
 .br
-cdrskin dev=/dev/hdc -v padsize=300k -multi 3.iso
+cdrskin dev=/dev/sr0 -v padsize=300k -multi 3.iso
 .br
-cdrskin dev=/dev/hdc -v padsize=300k 4.iso
+cdrskin dev=/dev/sr0 -v padsize=300k 4.iso
 .SS
 .B Get multi-session info for option -C of program mkisofs:
 .br

cdrskin/cdrskin.c

@@ -1,6 +1,6 @@
 
 /*
- cdrskin.c , Copyright 2006-2008 Thomas Schmitt <scdbackup@gmx.net>
+ cdrskin.c , Copyright 2006-2009 Thomas Schmitt <scdbackup@gmx.net>
 Provided under GPL version 2. See future commitment below.
 
 A cdrecord compatible command line interface for libburn.
@@ -88,7 +88,7 @@ or
 
 /** The official program version */
 #ifndef Cdrskin_prog_versioN
-#define Cdrskin_prog_versioN "0.5.0"
+#define Cdrskin_prog_versioN "0.6.8"
 #endif
 
 /** The official libburn interface revision to use.
@@ -98,10 +98,10 @@ or
 #define Cdrskin_libburn_majoR 0
 #endif
 #ifndef Cdrskin_libburn_minoR
-#define Cdrskin_libburn_minoR 5
+#define Cdrskin_libburn_minoR 6
 #endif
 #ifndef Cdrskin_libburn_micrO
-#define Cdrskin_libburn_micrO 0
+#define Cdrskin_libburn_micrO 8
 #endif
 
 
@@ -135,44 +135,44 @@ or
 #endif /* Cdrskin_libburn_cvs_A60220_tS */
 
 
-#ifdef Cdrskin_libburn_0_5_0
-#define Cdrskin_libburn_versioN "0.5.0"
+#ifdef Cdrskin_libburn_0_6_8
+#define Cdrskin_libburn_versioN "0.6.8"
 #define Cdrskin_libburn_from_pykix_svN 1
-#endif /* Cdrskin_libburn_0_5_0 */
+#endif /* Cdrskin_libburn_0_6_8 */
 
-#ifdef Cdrskin_libburn_0_5_1
-#define Cdrskin_libburn_versioN "0.5.1"
+#ifdef Cdrskin_libburn_0_6_9
+#define Cdrskin_libburn_versioN "0.6.9"
 #define Cdrskin_libburn_from_pykix_svN 1
 
 /* Place novelty switch macros here. 
    Move them down to Cdrskin_libburn_from_pykix_svN on version leap
 */
 
-/* there are no libburn novelties in 0.5.1 yet */
+/* there are no libburn novelties yet */
 
-#endif /* Cdrskin_libburn_0_5_1 */
+#endif /* Cdrskin_libburn_0_6_9 */
 
 #ifndef Cdrskin_libburn_versioN
-#define Cdrskin_libburn_0_5_0
-#define Cdrskin_libburn_versioN "0.5.0"
+#define Cdrskin_libburn_0_6_8
+#define Cdrskin_libburn_versioN "0.6.8"
 #define Cdrskin_libburn_from_pykix_svN 1
 #endif
 
-#ifdef Cdrskin_libburn_0_5_0
+#ifdef Cdrskin_libburn_0_6_8
 #undef Cdrskin_libburn_majoR
 #undef Cdrskin_libburn_minoR
 #undef Cdrskin_libburn_micrO
 #define Cdrskin_libburn_majoR 0
-#define Cdrskin_libburn_minoR 5
-#define Cdrskin_libburn_micrO 0
+#define Cdrskin_libburn_minoR 6
+#define Cdrskin_libburn_micrO 8
 #endif
-#ifdef Cdrskin_libburn_0_5_1
+#ifdef Cdrskin_libburn_0_6_9
 #undef Cdrskin_libburn_majoR
 #undef Cdrskin_libburn_minoR
 #undef Cdrskin_libburn_micrO
 #define Cdrskin_libburn_majoR 0
-#define Cdrskin_libburn_minoR 5
-#define Cdrskin_libburn_micrO 1
+#define Cdrskin_libburn_minoR 6
+#define Cdrskin_libburn_micrO 9
 #endif
 
 
@@ -251,9 +251,15 @@ or
 /* 0.4.8 */
 /* Bug fix release for  write_start_address=... on DVD-RAM and BD-RE */
 
-/* 0.5.0 */
+/* 0.5.0 , 0.5.2 , 0.5.4 , 0.5.6 , 0.5.8 , 0.6.0 , 0.6.2 */
 /* novel libburn features are transparent to cdrskin */
 
+/* 0.6.4 */
+/* Ended to mark novelties by macros.
+   libburnia libburn and cdrskin are fixely in sync now.
+   icculus libburn did not move for 30 months.
+*/
+
 
 #ifdef Cdrskin_new_api_tesT
 
@@ -2414,11 +2420,11 @@ return:
      fprintf(stderr,
           "\tformat_overwrite_full\t\tfull-size format a DVD-RW or DVD+RW\n");
      fprintf(stderr,
-          "\tformat_defectmgt[_max|_min|_none]\tformat DVD-RAM or BD-RE\n");
+          "\tformat_defectmgt[_max|_min|_none]\tformat DVD-RAM or BD-R[E]\n");
      fprintf(stderr,
          "\tformat_defectmgt[_cert_on|_cert_off]\tcertification slow|quick\n");
      fprintf(stderr,
-          "\tformat_defectmgt_payload_<size>\tformat DVD-RAM or BD-RE\n");
+          "\tformat_defectmgt_payload_<size>\tformat DVD-RAM or BD-R[E]\n");
      fprintf(stderr,
         "\tformat_by_index_<number>\t\tformat by index from --list_formats\n");
 
@@ -2692,10 +2698,13 @@ set_dev:;
           " --single_track     accept only last argument as source_address\n");
 
 #ifdef Cdrskin_libburn_has_stream_recordinG
+     printf(" stream_recording=\"on\"|\"off\"|number\n");
      printf(
-        " stream_recording=\"on\"|\"off\"  \"on\" requests to prefer speed\n");
+         "                    \"on\" requests to prefer speed over write\n");
      printf(
-        "                                  over write error management.\n");
+         "                    error management. A number prevents this with\n");
+     printf(
+         "                    byte addresses below that number.\n");
 #endif
 
 #ifdef Cdrskin_allow_libburn_taO
@@ -2892,7 +2901,7 @@ set_severities:;
      int major, minor, micro;
 
      printf(
-"Cdrecord 2.01-Emulation Copyright (C) 2006-2008, see libburnia-project.org\n");
+"Cdrecord 2.01-Emulation Copyright (C) 2006-2009, see libburnia-project.org\n");
      printf("libburn interface :  %d.%d.%d\n",
             burn_header_version_major, burn_header_version_minor,
             burn_header_version_micro);
@@ -3120,7 +3129,7 @@ struct CdrskiN {
  int gracetime;
  int dummy_mode;
  int force_is_set;
- int stream_recording_is_set;
+ int stream_recording_is_set; /* see burn_write_opts_set_stream_recording() */
  int single_track;
  int prodvd_cli_compatible;
 
@@ -3150,12 +3159,12 @@ struct CdrskiN {
                                bit10= format to maximum available size
                                bit11= - reserved -
                                bit12= - reserved -
-                               bit13= - reserved -
+                               bit13= try to disable eventual defect management
                                bit14= - reserved -
                                bit15= format by index
                            2=deformat_sequential (blank_fast might matter)
                            3=format (= format_overwrite restricted to DVD+RW)
-                           4=format_defectmgt for DVD-RAM, BD-RE
+                           4=format_defectmgt for DVD-RAM, BD-R[E]
                              bit8-15: bit0-7 of burn_disc_format(flag)
                                bit8 = write zeros after formatting
                                bit9+10: size mode
@@ -4399,13 +4408,15 @@ int Cdrskin_report_disc_status(struct CdrskiN *skin, enum burn_disc_status s,
 int Cdrskin_scanbus(struct CdrskiN *skin, int flag)
 {
  int ret,i,busno,first_on_bus,pseudo_transport_group= 0,skipped_devices= 0;
- int busmax= 16;
+ int busmax= 16, busidx;
  char shellsafe[5*Cdrskin_strleN+2],perms[40],btldev[Cdrskin_adrleN];
  char adr[Cdrskin_adrleN],*raw_dev,*drives_shown= NULL;
+ int *drives_busses= NULL;
  struct stat stbuf;
 
  drives_shown= malloc(skin->n_drives+1);
- if(drives_shown==NULL)
+ drives_busses= malloc((skin->n_drives+1) * sizeof(int));
+ if(drives_shown == NULL || drives_busses == NULL)
    {ret= -1; goto ex;}
  for(i=0;i<skin->n_drives;i++)
    drives_shown[i]= 0;
@@ -4463,7 +4474,28 @@ int Cdrskin_scanbus(struct CdrskiN *skin, int flag)
    if(skin->preskin->old_pseudo_scsi_adr)
      printf("cdrskin: NOTE : The printed addresses are not cdrecord compatible !\n");
 
-   for(busno= 0;busno<=busmax;busno++) {
+   for(i=0;i<skin->n_drives;i++) {
+     drives_busses[i]= -1;
+     ret= Cdrskin_driveno_to_btldev(skin,i,btldev,1);
+     if(ret >= pseudo_transport_group &&
+        ret < pseudo_transport_group + 1000000) {
+       drives_busses[i]= ret - pseudo_transport_group;
+       if(ret > pseudo_transport_group + busmax)
+         busmax= 1 + ret - pseudo_transport_group;
+     }
+   }
+   for(busidx= 0; busidx < skin->n_drives + 1; busidx++) {
+     if(busidx < skin->n_drives)
+       busno= drives_busses[busidx];
+     else
+       busno= busmax;
+     if(busno < 0)
+   continue;
+     for(i= 0; i < busidx; i++)
+       if(drives_busses[i] == busno)
+     break;
+     if(i < busidx)
+   continue;
      first_on_bus= 1;
      for(i=0;i<skin->n_drives;i++) {
        ret= Cdrskin_driveno_to_btldev(skin,i,btldev,1);
@@ -4501,6 +4533,8 @@ int Cdrskin_scanbus(struct CdrskiN *skin, int flag)
 ex:;
  if(drives_shown!=NULL)
    free((char *) drives_shown);
+ if(drives_busses!=NULL)
+   free((char *) drives_busses);
  return(ret);
 }
 
@@ -5148,10 +5182,12 @@ int Cdrskin_blank(struct CdrskiN *skin, int flag)
      skin->blank_format_type= 1|(1<<8);
      skin->blank_format_size= 128*1024*1024;
    } else if(profile_number == 0x12 ||
-             profile_number == 0x43) { /* DVD-RAM , BD-RE */;
+             profile_number == 0x43 ||
+            (profile_number == 0x41 && do_format==6)) {
+                                               /* DVD-RAM , BD-RE , BD-R SRM */
 #ifdef Cdrskin_libburn_has_burn_disc_formaT
      ret= burn_disc_get_formats(drive, &status, &size, &dummy, &num_formats);
-     if(ret>0 && status!=BURN_FORMAT_IS_FORMATTED) {
+     if((ret>0 && status!=BURN_FORMAT_IS_FORMATTED)) {
        do_format= 4;
        skin->blank_format_type= 4|(3<<9);  /* default payload size */
        skin->blank_format_size= 0;
@@ -5228,9 +5264,10 @@ int Cdrskin_blank(struct CdrskiN *skin, int flag)
 
  } else if(do_format==4) {
    /* Formatting and influencing defect management of DVD-RAM , BD-RE */
-   if(!(profile_number == 0x12 || profile_number == 0x43)) {
+   if(!(profile_number == 0x12 || profile_number == 0x41 ||
+        profile_number == 0x43)) {
      fprintf(stderr,
-            "cdrskin: SORRY : blank=%s for now does DVD-RAM and BD-RE only\n",
+            "cdrskin: SORRY : blank=%s for now does DVD-RAM and BD only\n",
             fmt_text);
      {ret= 0; goto ex;}
    }
@@ -5508,7 +5545,7 @@ thank_you_for_patience:;
        if(skin->is_writing)
          fprintf(stderr,"\n");
        fprintf(stderr,
- "\rcdrskin: thank you for being patient since %.f seconds                   ",
+ "\rcdrskin: thank you for being patient for %.f seconds                     ",
            elapsed_total_time);
      }
      advance_interval= 1;
@@ -5839,10 +5876,12 @@ int Cdrskin_activate_write_mode(struct CdrskiN *skin, enum burn_disc_status s,
               profile_number==0x12 ||
               profile_number==0x11 || profile_number==0x14 ||
               profile_number==0x15 ||
-              profile_number==0x1b || profile_number==0x2b)
+              profile_number==0x1b || profile_number==0x2b ||
+              profile_number==0x41 || profile_number==0x43)
              && might_do_tao) {
      /* DVD+RW, DVD-RW Restricted Overwrite, DVD-RAM,
-        DVD-R[W][/DL] Sequential Recording, DVD+R[/DL] */
+        DVD-R[W][/DL] Sequential Recording, DVD+R[/DL],
+        BD-R SRM , BD-RE */
      strcpy(skin->preskin->write_mode_name,"TAO");
    } else {
      strcpy(skin->preskin->write_mode_name,"SAO");
@@ -6461,7 +6500,7 @@ burn_failed:;
  burn_write_opts_set_force(o, !!skin->force_is_set);
 #endif
 #ifdef Cdrskin_libburn_has_stream_recordinG
- burn_write_opts_set_stream_recording(o, !!skin->stream_recording_is_set);
+ burn_write_opts_set_stream_recording(o, skin->stream_recording_is_set);
 #endif
 
  if(skin->dummy_mode) {
@@ -6983,7 +7022,7 @@ sorry_failed_to_eject:;
 int Cdrskin_setup(struct CdrskiN *skin, int argc, char **argv, int flag)
 {
  int i,k,l,ret,source_has_size=0, idx= -1;
- double value,grab_and_wait_value= -1.0;
+ double value,grab_and_wait_value= -1.0, num;
  char *cpt,*value_pt,adr[Cdrskin_adrleN],*blank_mode= "";
  struct stat stbuf;
 
@@ -7720,9 +7759,15 @@ set_speed:;
 set_stream_recording:;
      if(strcmp(value_pt, "on")==0)
        skin->stream_recording_is_set= 1;
-     else
+     else if(value_pt[0] >= '0' && value_pt[0] <= '9') {
+       num= Scanf_io_size(value_pt, 0);
+       num/= 2048.0;
+       if(num >= 16 && num <= 0x7FFFFFFF)
+         skin->stream_recording_is_set= num;
+       else
+         skin->stream_recording_is_set= 0;
+     } else
        skin->stream_recording_is_set= 0;
-
    } else if(strcmp(argv[i],"-swab")==0) {
      skin->swap_audio_bytes= 0;
 

cdrskin/cdrskin_eng.html

@@ -2,7 +2,7 @@
 
 <HEAD>
 <META NAME="description" CONTENT="cdrskin, a limited cdrecord compatibility wrapper for libburn">
-<META NAME="keywords" CONTENT="cdrskin, libburn, libburnia, burn, CD, DVD, linux, recording, burning, CD-R, CD-RW, DVD-R, DVD-RW, DVD+RW, DVD+R, DVD+R/DL, DVD-RAM, BD-RE, cdrecord, compatible, scdbackup">
+<META NAME="keywords" CONTENT="cdrskin, libburn, libburnia, burn, CD, DVD, linux, recording, burning, CD-R, CD-RW, DVD-R, DVD-RW, DVD+RW, DVD+R, DVD+R/DL, DVD-RAM, BD-RE, BD-R, cdrecord, compatible, scdbackup">
 <META NAME="robots" CONTENT="follow">
 <TITLE>cdrskin homepage english</TITLE>
 </HEAD>
@@ -24,7 +24,7 @@
 <P>
 <H2>Purpose:</H2>
 Burns preformatted data to CD, DVD, and BD media:<BR>
-CD-R, DVD-R, DVD+R, DVD+R/DL, CD-RW, DVD-RW, DVD-RAM, DVD+RW, BD-RE
+CD-R, DVD-R, DVD+R, DVD+R/DL, BD-R, CD-RW, DVD-RW, DVD-RAM, DVD+RW, BD-RE
 </P>
 <P>
 
@@ -47,6 +47,8 @@ and to MMC-5 for DVD or BD).
 <DT>Linux with kernel 2.4 or higher (and libc, of course) :</DT>
 <DD>With kernel 2.4 an ATA drive has to be under ide-scsi emulation.</DD>
 <DD>With kernel 2.6 the drive should not be under ide-scsi.</DD>
+<DT>or FreeBSD (with libc, of course) :</DT>
+<DD>ATAPI/CAM support has to be enabled in the kernel, see atapicam(4).</DD>
 <DT>libpthread</DT>
 <DD>is supposed to be a standard system component.</DD>
 </DL>
@@ -57,15 +59,18 @@ and to MMC-5 for DVD or BD).
 GPL software included:<BR>
 </H2>
 <DL>
-<DT>libburn-0.5.0</DT>
+<DT>libburn-0.6.8</DT>
 <DD>(founded by Derek Foreman and Ben Jansens,
-furthered since August 2006 by Thomas Schmitt from team of libburnia-project.org)</DD>
-<DD>transfers data to CD, DVD, BD-RE</DD>
+developed and maintained since August 2006 by
+Thomas Schmitt from team of libburnia-project.org)
+</DD>
+<DD>transfers data to CD, DVD, BD</DD>
 </DL>
 </P>
 
 <P>
-This program system has been tested on Intel/AMD Linux systems only.<BR>
+This program system has been tested on Intel/AMD Linux and FreeBSD systems
+only.<BR>
 Ports to other usable systems are appreciated. Reports are welcome.
 </P>
 
@@ -88,7 +93,7 @@ are provided in a compatible way.<BR>
 On all DVD media except DVD-R DL, cdrskin is able to perform any recording job
 which is possible with cdrecord.
 Other than with cdrecord, option -multi is supported with many DVD types and
-write mode -tao works with anything but quickly blanked DVD-RW.
+BD-R. Write mode -tao works with anything but quickly blanked DVD-RW.
 </DT>
 <BR><BR>
 <DT>Get an overview of drives and their addresses</DT>
@@ -143,6 +148,9 @@ as listed by option --devices.</DT>
 <DD><KBD>&nbsp;&nbsp;--tell_media_space 2>/dev/null)</KBD></DD>
 <DD>$<KBD>&nbsp;echo "Available: $x blocks of 2048 data bytes"</KBD></DD>
 
+<DT>Accelerate BD-RE writing to full nominal speed after the first 250 MB</DT>
+<DD>$<KBD>&nbsp;cdrskin ... stream_recording=250m ...</KBD>
+
 <DT>Write audio tracks to CD:</DT>
 <DD>$<KBD>&nbsp;cdrskin -v dev=ATA:1,0,0 speed=48 -sao \</KBD></DD>
 <DD><KBD>&nbsp;&nbsp;track1.wav track2.au -audio -swab track3.raw</KBD></DD>
@@ -169,14 +177,11 @@ man cdrecord</A></KBD></DD>
 <DL>
 <DT>Learn to know a more versatile way to burn ISO 9660 formatted data</DT>
 <DD>
-Standalone ISO 9660 multi-session CD/DVD tool
+Standalone ISO 9660 multi-session CD/DVD/BD tool
 <A HREF="http://scdbackup.sourceforge.net/xorriso_eng.html">xorriso</A>.
 </DD>
 </DL>
 
-Testers wanted who are willing to risk some DVD-R DL media
-or to do experiments on BD-R media.
-
 </P>
 
 <HR>
@@ -186,8 +191,8 @@ or to do experiments on BD-R media.
 <P>
 <DL>
 <DT>Download as source code (see README):</DT>
-<DD><A HREF="cdrskin-0.5.0.pl00.tar.gz">cdrskin-0.5.0.pl00.tar.gz</A>
-(730 KB).
+<DD><A HREF="cdrskin-0.6.8.pl00.tar.gz">cdrskin-0.6.8.pl00.tar.gz</A>
+(750 KB).
 </DD>
 <DD>
 The cdrskin tarballs are source code identical with libburn releases
@@ -236,39 +241,49 @@ cdrskin_0.4.2.pl00-x86-suse9_0-static.tar.gz</A>, (310 KB), -static compiled,
 <HR>
 
 <P>
-Enhancements towards previous stable version cdrskin-0.4.8.pl00:
+Enhancements towards previous stable version cdrskin-0.6.6.pl00:
 <UL>
-<LI>Ability to use /dev/scdN as fallback if /dev/srN does not exist</LI>
+<LI>Made -scanbus work with high SCSI bus numbers</LI>
 <!--
 <LI>none</LI>
 -->
 </UL>
 
-Bug fixes towards cdrskin-0.4.8.pl00:
+Bug fixes towards cdrskin-0.6.6.pl00:
 <UL>
-<LI>Option drive_scsi_dev_family=scd lead to buffer overflow</LI>
+<LI>Old MMC-1 drives were rejected</LI>
+<!--
+<LI>none</LI>
+-->
 </UL>
 
-</P>
-
 <HR>
 
 <P>
 <DL>
-<DT><H3>Development snapshot, version 0.5.1 :</H3></DT>
-<DD>Enhancements towards current stable version 0.5.0.pl00:
+<DT><H3>Development snapshot, version 0.6.9 :</H3></DT>
+<DD>Enhancements towards current stable version 0.6.8.pl00:
 <UL>
+<LI>none yet</LI>
 <!--
 -->
-<LI>none yet</LI>
 
 </UL>
 </DD>
+
+<DD>Bug fixes towards cdrskin-0.6.8.pl00:
+<UL>
+<LI>none yet</LI>
+<!--
+-->
+</UL>
+</DD>
+
 <DD>&nbsp;</DD>
-<DD><A HREF="README_cdrskin_devel">README 0.5.1</A>
-<DD><A HREF="cdrskin__help_devel">cdrskin_0.5.1 --help</A></DD>
-<DD><A HREF="cdrskin_help_devel">cdrskin_0.5.1 -help</A></DD>
-<DD><A HREF="man_1_cdrskin_devel.html">man cdrskin (as of 0.5.1)</A></DD>
+<DD><A HREF="README_cdrskin_devel">README 0.6.9</A>
+<DD><A HREF="cdrskin__help_devel">cdrskin_0.6.9 --help</A></DD>
+<DD><A HREF="cdrskin_help_devel">cdrskin_0.6.9 -help</A></DD>
+<DD><A HREF="man_1_cdrskin_devel.html">man cdrskin (as of 0.6.9)</A></DD>
 <DD>&nbsp;</DD>
 <DT>Maintainers of cdrskin unstable packages please use SVN of
 <A HREF="http://libburnia-project.org"> libburnia-project.org</A></DT>
@@ -288,8 +303,8 @@ admins with full system souvereignty.</DT>
 <A HREF="README_cdrskin_devel">upcoming README</A> ):
 </DD>
 <DD>
-<A HREF="cdrskin-0.5.1.tar.gz">cdrskin-0.5.1.tar.gz</A>
-(730 KB).
+<A HREF="cdrskin-0.6.9.tar.gz">cdrskin-0.6.9.tar.gz</A>
+(750 KB).
 </DD>
 
 <!-- This is not offered any more since spring 2008
@@ -322,7 +337,7 @@ Historic versions based on Derek's and Ben's
 <BR>
 Very special thanks to Andy Polyakov whose 
 <A HREF="http://fy.chalmers.se/~appro/linux/DVD+RW/tools">dvd+rw-tools</A>
-provide libburn with invaluable examples on how to deal with DVD media.
+provide libburn with invaluable examples on how to deal with DVD and BD media.
 </P>
 
 <HR>
@@ -484,12 +499,17 @@ 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 and install cdrskin at<BR>
+<A HREF="http://www.en.free-shells.com.ar">free-shells.com.ar</A>
+</P>
 </FONT></CENTER>
 <HR>
 <DL>
 <DT>Links to my other published software projects :
 <DD><A HREF="http://scdbackup.webframe.org/xorriso_eng.html">
-xorriso, a standalone ISO 9660 multi-session CD/DVD burn tool.
+xorriso, a standalone ISO 9660 multi-session CD/DVD/BD burn tool.
 No mkisofs needed.
 <DL>
 <DD>

cdrskin/cdrskin_timestamp.h

@@ -1 +1 @@
-#define Cdrskin_timestamP "2008.07.16.070001"
+#define Cdrskin_timestamP "2009.07.14.100001"

cdrskin/compile_cdrskin.sh

@@ -1,13 +1,13 @@
 #!/bin/sh
 
 # compile_cdrskin.sh  
-# Copyright 2005 - 2008 Thomas Schmitt, scdbackup@gmx.net, GPL version 2
+# Copyright 2005 - 2009 Thomas Schmitt, scdbackup@gmx.net, GPL version 2
 # to be executed within  ./libburn-*  resp ./cdrskin-*
 
 debug_opts="-O2"
 def_opts=
 largefile_opts="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1"
-libvers="-DCdrskin_libburn_0_5_0"
+libvers="-DCdrskin_libburn_0_6_8"
 cleanup_src_or_obj="libburn/cleanup.o"
 libdax_msgs_o="libburn/libdax_msgs.o"
 libdax_audioxtr_o="libburn/libdax_audioxtr.o"
@@ -33,15 +33,15 @@ do
     libdax_audioxtr_o=
     libdax_msgs_o="libburn/message.o"
     cleanup_src_or_obj="-DCleanup_has_no_libburn_os_H cdrskin/cleanup.c"
-  elif test "$i" = "-libburn_0_5_0"
+  elif test "$i" = "-libburn_0_6_8"
   then
-    libvers="-DCdrskin_libburn_0_5_0"
+    libvers="-DCdrskin_libburn_0_6_8"
     libdax_audioxtr_o="libburn/libdax_audioxtr.o"
     libdax_msgs_o="libburn/libdax_msgs.o"
     cleanup_src_or_obj="libburn/cleanup.o"
   elif test "$i" = "-libburn_svn"
   then
-    libvers="-DCdrskin_libburn_0_5_1"
+    libvers="-DCdrskin_libburn_0_6_9"
     libdax_audioxtr_o="libburn/libdax_audioxtr.o"
     libdax_msgs_o="libburn/libdax_msgs.o"
     cleanup_src_or_obj="libburn/cleanup.o"
@@ -75,10 +75,8 @@ do
     echo "Options:"
     echo "  -compile_cdrfifo  compile program cdrskin/cdrfifo."
     echo "  -compile_dewav    compile program test/dewav without libburn."
-    echo "  -cvs_A60220       set macro to match libburn-CVS of 20 Feb 2006."
-    echo "  -libburn_0_5_0    set macro to match libburn-0.5.0"
+    echo "  -libburn_0_6_8    set macro to match libburn-0.6.8"
     echo "  -libburn_svn      set macro to match current libburn-SVN."
-    echo "  -no_largefile     do not use 64 bit off_t (must match libburn)."
     echo "  -do_not_compile_cdrskin  omit compilation of cdrskin/cdrskin."
     echo "  -experimental     use newly introduced libburn features."
     echo "  -oldfashioned     use pre-0.2.2 libburn features only."

cdrskin/wiki_plain.txt

@@ -10,8 +10,8 @@ Schilling's cdrtools. cdrskin strives to be a second source for the services
 traditionally provided by cdrecord. Currently it does CD-R and CD-RW this way.
 Overwriteable media DVD-RAM, DVD+RW, DVD-RW, and BD-RE are handled differently
 than with cdrecord-ProDVD in order to offer TAO-like single track recording.
-Sequential DVD-R[W], DVD+R, DVD+R DL are handled like CD-R[W] with TAO and
-multi-session. Additionally cdrskin offers cdrecord-ProDVD-like mode DAO
+Sequential DVD-R[W], DVD+R, DVD+R DL, BD-R are handled like CD-R[W] with TAO
+and multi-session. Additionally cdrskin offers cdrecord-ProDVD-like mode DAO
 with DVD-R[W].
 
 cdrskin does not contain any bytes copied from cdrecord's sources.

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([libburn], [0.5.0], [http://libburnia-project.org])
+AC_INIT([libburn], [0.6.8], [http://libburnia-project.org])
 AC_PREREQ([2.50])
 dnl AC_CONFIG_HEADER([config.h])	
 
@@ -7,7 +7,7 @@ AC_CANONICAL_TARGET
 
 AM_INIT_AUTOMAKE([subdir-objects])
 
-dnl Notes by ts A71207 - A80126 :
+dnl Notes by ts A71207 - A90714 :
 dnl
 dnl Regrettably the meaning of the various version types was misunderstood
 dnl before version 0.4.1.
@@ -42,7 +42,8 @@ dnl    So this is a superspace of the SONAME version space. To avoid
 dnl    ill SONAME, the value of  CURRENT must be larger than AGE.
 dnl    See also http://www.gnu.org/software/libtool/manual.html#Interfaces
 dnl
-dnl The name of the dynamic library will be libburn.so.$SONAME.$AGE.$REV .
+dnl On Linux the name of the dynamic library will be
+dnl    libburn.so.$SONAME.$AGE.$REV
 dnl In the terminology of this file:
 dnl    CURRENT = LT_CURRENT
 dnl    AGE     = LT_AGE
@@ -63,6 +64,15 @@ dnl    0.4.4 = libburn.so.4.9.0
 dnl    0.4.6 = libburn.so.4.11.0
 dnl    0.4.8 = libburn.so.4.13.0
 dnl    0.5.0 = libburn.so.4.15.0
+dnl    0.5.2 = libburn.so.4.17.0
+dnl    0.5.4 = libburn.so.4.19.0
+dnl    0.5.6 = libburn.so.4.21.0
+dnl    0.5.8 = libburn.so.4.23.0
+dnl    0.6.0 = libburn.so.4.25.0
+dnl    0.6.2 = libburn.so.4.27.0
+dnl    0.6.4 = libburn.so.4.29.0
+dnl    0.6.6 = libburn.so.4.31.0
+dnl    0.6.8 = libburn.so.4.33.0
 dnl
 dnl So LT_CURRENT, LT_REVISION and LT_AGE get set directly here.
 dnl SONAME of the emerging library is  LT_CURRENT - LT_AGE.
@@ -87,8 +97,8 @@ dnl If BURN_*_VERSION changes, be sure to change AC_INIT above to match.
 dnl
 dnl As said: Only copies. Original in libburn/libburn.h : burn_header_version_*
 BURN_MAJOR_VERSION=0
-BURN_MINOR_VERSION=5
-BURN_MICRO_VERSION=0
+BURN_MINOR_VERSION=6
+BURN_MICRO_VERSION=8
 BURN_VERSION=$BURN_MAJOR_VERSION.$BURN_MINOR_VERSION.$BURN_MICRO_VERSION
 
 AC_SUBST(BURN_MAJOR_VERSION)
@@ -99,15 +109,15 @@ AC_SUBST(BURN_VERSION)
 dnl Libtool versioning
 LT_RELEASE=$BURN_MAJOR_VERSION.$BURN_MINOR_VERSION.$BURN_MICRO_VERSION
 dnl
-dnl ts A80717
-dnl This is the release version libburn-0.5.0 = libburn.so.4.15.0
+dnl ts A90714
+dnl This is the release version libburn-0.6.8 = libburn.so.4.33.0
 dnl ### This is the development version after above release version
 dnl LT_CURRENT++, LT_AGE++ has not yet happened.
 dnl ### LT_CURRENT++, LT_AGE++ has happened meanwhile.
 dnl
-dnl SONAME = 19 - 15 = 4 . Library name = libburn.so.4.15.0
-LT_CURRENT=19
-LT_AGE=15
+dnl SONAME = 37 - 33 = 4 . Linux library name = libburn.so.4.33.0
+LT_CURRENT=37
+LT_AGE=33
 LT_REVISION=0
 LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
 
@@ -154,8 +164,19 @@ AC_SUBST(THREAD_LIBS)
 
 TARGET_SHIZZLE
 AC_SUBST(ARCH)
+AC_SUBST(LIBBURNIA_PKGCONFDIR)
 AC_SUBST(LIBBURN_ARCH_LIBS)
 
+dnl ts A90303
+dnl Check the preconditions for using statvfs() in sg-dummy
+dnl (sg-linux and sg-freebsd use statvfs() unconditionally)
+STATVFS_DEF=-DLibburn_os_has_statvfS
+AC_CHECK_HEADER(sys/statvfs.h, X=, STATVFS_DEF=)
+AC_CHECK_FUNC([statvfs], X=, STATVFS_DEF=)
+dnl If this would be done more specifically in Makefile.am
+dnl via libburn_libburn_la_CFLAGS then undesired .o file names would emerge
+CFLAGS="$CFLAGS $STATVFS_DEF"
+
 dnl Add compiler-specific flags
 
 dnl See if the user wants aggressive optimizations of the code
@@ -175,6 +196,13 @@ else
     CFLAGS="$CFLAGS -DDEBUG"
 fi
 
+
+dnl Determine target directory for libburn-*.pc
+dnl Important: Must be performed _after_ TARGET_SHIZZLE
+dnl
+LIBBURNIA_SET_PKGCONFIG
+
+
 AC_CONFIG_FILES([
 	Makefile
 	doc/doxygen.conf

doc/comments

@@ -1,106 +1,51 @@
 /**
    @author Mario Danic, Thomas Schmitt
 
-   @mainpage Libburnia Documentation Index
+   @mainpage Libburn Documentation Index
 
    @section intro Introduction
 
 Libburnia is an open-source project for reading, mastering and writing
-optical discs.
+optical discs. This page is about its capability to handle optical media.
 For now this means CD-R, CD-RW, DVD-RAM, DVD+RW, DVD+R, DVD+R/DL, DVD-RW,
-DVD-R, BD-RE.
+DVD-R, BD-R, BD-RE.
 
-Not supported yet are DVD-R/DL, HD-DVD, BD-R (blue ray). Testers for
-DVD-R/DL are wanted, though. BD-R programming efforts would be made
-if an interested tester contacts us.
+Not supported yet are DVD-R/DL. Testers wanted.
 
-The project comprises of several more or less interdependent parts which
-together strive to be a usable foundation for application development.
-These are libraries, language bindings, and middleware binaries which emulate
-classical (and valuable) Linux tools.
+Our scope is currently Linux 2.4 and 2.6, or FreeBSD . For ports to other
+systems we would need : login on a development machine resp. a live OS on CD
+or DVD, advise from a system person about the equivalent of Linux sg or FreeBSD
+CAM, volunteers for testing of realistic use cases.
 
-Our scope is currently Linux 2.4 and 2.6 only. For ports to other systems
-we would need : login on a development machine resp. a live OS on CD or DVD,
-advise from a system person about the equivalent of Linux sg or FreeBSD CAM,
-volunteers for testing of realistic use cases.
+libburn is the library by which preformatted data get onto optical media.
+Its code is independent of cdrecord. Its DVD capabilities are learned from
+studying the code of dvd+rw-tools and MMC-5 specs. No code but only the pure
+SCSI knowledge has been taken from dvd+rw-tools, though.
 
-We have a well tested code base for burning data and audio CDs and many DVD
-types. The burn API is quite comprehensively documented and can be used to
-build a presentable application.
-We have a functional binary which emulates the core use cases of cdrecord in
-order to prove that usability, and in order to allow you to explore libburn's
-scope by help of existing cdrecord frontends.
+cdrskin is a limited cdrecord compatibility wrapper for libburn.
+cdrecord is a powerful GPL'ed burn program included in Joerg Schilling's
+cdrtools. cdrskin strives to be a second source for the services traditionally
+provided by cdrecord. Additionally it provides libburn's DVD/BD capabilities,
+where only -sao is compatible with cdrecord.
+cdrskin does not contain any bytes copied from cdrecord's sources.
+Many bytes have been copied from the message output of cdrecord runs, though.
+See cdrskin/README for more.
 
-ISO 9660 filesystems with Rock Ridge and Joliet extensions can be created
-and manipulated quite freely. This capability together with our burn capability
-makes possible a single binary application which covers all steps of image
-composition, updating and writing. Quite unique in the Linux world.
+The burn API example of libburn is named test/libburner.c . The API for media
+information inquiry is demonstrated in test/telltoc.c .
+Explore these examples if you look for inspiration.
 
-@subsection components The project components (list subject to growth, hopefully):
-
-- libburn  is the library by which preformatted data get onto optical media.
-           It uses either /dev/sgN (e.g. on kernel 2.4 with ide-scsi) or
-           /dev/srM or /dev/hdX (e.g. on kernel 2.6).
-           libburn is the foundation of our cdrecord emulation. Its code is
-           independent of cdrecord. Its DVD capabilities are learned from
-           studying the code of dvd+rw-tools and MMC-5 specs. No code but only
-           the pure SCSI knowledge has been taken from dvd+rw-tools, though.
-
-- libisofs is the library to pack up hard disk files and directories into a
-           ISO 9660 disk image. This may then be brought to CD via libburn.
-           libisofs is to be the foundation of our upcoming mkisofs emulation.
-
-- libisoburn is an add-on to libburn and libisofs which coordinates both and
-           also allows to grow ISO-9660 filesystem images on multi-session
-           media as well as on overwriteable media via the same API.
-           All media peculiarities are handled automatically.
-
-- cdrskin  is a limited cdrecord compatibility wrapper for libburn.
-           cdrecord is a powerful GPL'ed burn program included in Joerg
-           Schilling's cdrtools. cdrskin strives to be a second source for
-           the services traditionally provided by cdrecord. Additionally it
-           provides libburn's DVD/BD capabilities, where only -sao is
-           compatible with cdrecord.
-           cdrskin does not contain any bytes copied from cdrecord's sources.
-           Many bytes have been copied from the message output of cdrecord
-           runs, though.
-           See cdrskin/README for more.
-
-- xorriso  is an application of all three libraries which creates, loads,
-           manipulates and writes ISO 9660 filesystem images with
-           Rock Ridge extensions. Manipulation is not only adding or
-           overwriting of files but also deletion, renaming, and attribute
-           changing. An incremental backup feature is provided.
-           See xorriso/README for more
-
-- "test"   is a collection of application gestures and examples given by the
-           authors of the library features. The burn API example of libburn
-           is named test/libburner.c . The API for media information inquiry is
-           demonstrated in test/telltoc.c .
-           Explore these examples if you look for inspiration.
-
-We strive to be a responsive upstream.
-
-Our libraries are committed to maintain older feature sets in newer versions.
-This applies to source code headers (API) as well as to linkable objects (ABI).
-The only exception from this rule is about non-release versions x.y.*[13579]
-which are allowed to introduce new features, change those new features in
-any way and even may revoke such new features before the next release of
-x.y.*[02468]. As soon as it is released, a feature is promised to persist.
-
-SONAMES:
+SONAME:
 libburn.so.4 (since 0.3.4, March 2007),
-libisofs.so.6 (since 0.6.2, February 2008),
-libisoburn.so.1 (since 0.1.0, February 2008).
 
 
-   @section using Using the libraries
+   @section using Using libburn
 
 Our build system is based on autotools.
 User experience tells us that you will need at least autotools version 1.7.
 
-To build libburn and its subprojects it should be sufficient to go into
-its toplevel directory and execute
+To build libburn and its companion applications go into its toplevel directory
+and execute
 
 -  ./bootstrap  (needed if you downloaded from SVN)
 
@@ -112,29 +57,24 @@ To make the libraries accessible for running resp. developing applications
 
 -  make install
 
-Both libraries are written in C language and get built by autotools.
-Thus we expect them to be useable by a wide range of Linux-implemented
-languages and development tools.
-
 
 @section libburner Libburner
 
 libburner is a minimal demo application for the library libburn 
 (see: libburn/libburn.h) as provided on  http://libburnia-project.org .
-It can list the available devices, can blank a CD-RW or DVD-RW and
-can burn to recordable CD and recordable single layer DVD.
+It can list the available devices, can burn to recordable CD, DVD, or BD,
+can blank a CD-RW or DVD-RW, and can format unformatted DVD-RW, BD-R, or BD-RE. 
 
 It's main purpose, nevertheless, is to show you how to use libburn and also
 to serve the libburnia team as reference application. libburner does indeed
-define the standard way how above three gestures can be implemented and
-stay upward compatible for a good while.
+define the standard way how above gestures can be implemented and stay upward
+compatible for a good while.
 
    @subsection libburner-help Libburner --help
 <pre>
 Usage: test/libburner
        [--drive <address>|<driveno>|"-"]  [--audio]
-       [--blank_fast|--blank_full|--format_overwrite]
-       [--try_to_simulate]
+       [--blank_fast|--blank_full|--format]  [--try_to_simulate]
        [--multi]  [<one or more imagefiles>|"-"]
 Examples
 A bus scan (needs rw-permissions to see a drive):
@@ -147,8 +87,8 @@ Blank a used CD-RW (is combinable with burning in one run):
   test/libburner --drive /dev/hdc --blank_fast
 Blank a used DVD-RW (is combinable with burning in one run):
   test/libburner --drive /dev/hdc --blank_full
-Format a DVD-RW to avoid need for blanking before re-use:
-  test/libburner --drive /dev/hdc --format_overwrite
+Format a DVD-RW, BD-RE or BD-R:
+  test/libburner --drive /dev/hdc --format
 Burn two audio tracks (to CD only):
   lame --decode -t /path/to/track1.mp3 track1.cd
   test/dewav /path/to/track2.wav -o track2.cd

doc/cookbook.txt

@@ -1,4 +1,4 @@
-libburnia-project.org Optical Media Rotisserie Recipes as of April 2008
+libburnia-project.org Optical Media Rotisserie Recipes as of January 2009
 
 Content:
 - TAO Multi-Session CD Cookbook (CD-R, CD-RW)
@@ -6,6 +6,7 @@ Content:
 - Overwriteable DVD Cookbook (DVD-RAM, DVD+RW, DVD-RW, BD-RE)
 - Sequential DVD-R[W] Cookbook
 - DVD+R[/DL] Cookbook
+- BD-R Cookbook
 
 -------------------------------------------------------------------------------
                          TAO Multi-Session CD Cookbook
@@ -404,7 +405,7 @@ correctness of Pre-gap and Post-gap would become evident.
 Inspired by Andy Polyakov's http://fy.chalmers.se/~appro/linux/DVD+RW/tools ,
 backed by reading mmc5r03c.pdf from http://www.t10.org/ftp/t10/drafts/mmc5/
 by own experiments with drives NEC ND-4570A, LG GSA-4082B, PHILIPS SPD3300L,
-and by BD-RE experiments done by Giulio Orsero on LG BE06LU10.
+LG GGW H20L, and by BD-RE experiments done by Giulio Orsero on LG BE06LU10.
 
 For libburnia-project.org by Thomas Schmitt <scdbackup@gmx.net>
 
@@ -432,6 +433,10 @@ The recipes described here are depending on formatting state:
 - DVD-RAM and BD-RE formatting
 - DVD-RAM and BD-RE speed tuning
 
+Slightly off topic are
+- ISO 9660 multi-session emulation on overwriteable media
+- ISO 9660 based TOC emulation on overwriteable media
+
 -------------------------------------------------------------------------------
 Overwriting in general :
 
@@ -522,7 +527,7 @@ with Close Function 010b despite there is no session open in this scenario.)
 
 
 -------------------------------------------------------------------------------
-Unformatted DVD+RW
+Unformatted DVD+RW :
 
 This is the state of previously unused DVD+RW media.
 
@@ -693,9 +698,14 @@ managment. There is no way to increase payload capacity by format 01h.
 (mmc5r03c.pdf 6.5.4.2.2.1)
 
 With BD-RE there are three format types : 00h, 30h and 31h.
-00h offers the default size format.
+00h offers the default size format. This may be the only fast formatting
+mode that is offered by the drive.
+Feature 0023h tells whether format 31h and certain 30h subtypes are available.
+(mmc5r03c.pdf 5.3.13)
 30h offers several sizes with defect management. Usually there are three
-size to choose: #1: default size, #2: maximum spare area, #3: minimal spare.
+sizes given: #1: default size, #2: maximum spare area, #3: minimal spare.
+One may demand any spare size between maximum and minimum. There may be quick
+certification and full certification. See feature 0023h.
 31h offers a single size and disables defect management. This has the side
 effect to speed up writing to nominal speed.
 (mmc5r03c.pdf 6.5.4.2.15, 6.24.3.3, Table 472)
@@ -734,7 +744,7 @@ DVD-RAM and BD-RE tuning :
 
 A special aspect of DVD-RAM and BD-RE is their low speed with write operations,
 which usually is only half than the nominal speed of media and drive.
-This is blamed to the automatic checkreading which happens ifor managing
+This is blamed to the automatic checkreading which happens for managing
 eventual defects. 
 
 Defect management of BD-RE can be disabled by format type 31h. See above.
@@ -745,7 +755,7 @@ The only known way to get full speed from DVD-RAM or BD-RE with enabled defect
 management is the use of AAh WRITE12 with Streaming Bit set to 1.
 (mmc5r03c.pdf 6.45)
 With some DVD-RAM drives this fails if a write buffer is not full 32 kB.
-With the tested BD-RE ione has to write write full 64 kB buffers.
+With the tested BD-RE one has to write full 64 kB buffers.
 
 Although it seems not optimal, this is specified not only to disable the
 cumbersome checkread but also to ignore known defects and to write data
@@ -756,10 +766,80 @@ incorrectable errors.
 
 Caveat:
 MMC-5 does not guarantee AAh WRITE12 to work on DVD-RAM or BD-RE at all.
-None of the features of profiles 0012h and 0043 promises the existence of
+None of the features of profiles 0012h and 0043h promises the existence of
 AAh WRITE12.
-Nevertheless it worked on all tested drives is proper alignment was observed.
 (mmc5r03c.pdf 5.4.13, 6.45)
+Nevertheless it worked on all tested drives if proper alignment was observed.
+
+
+-------------------------------------------------------------------------------
+ISO 9660 multi-session emulation on overwriteable media :
+
+Overwriteable media provide a single overwriteable track which may grow up to
+the full media capacity. There is no builtin table-of-content which records
+the history of write sessions.
+mount -t iso9660 will use sbsector=0 as default.
+The term "superblock" shall depict the first 64 KiB after the sbsector address.
+
+ISO 9660 multi-session depends on typical TOC information in two ways:
+It needs the superblock address MSC1 of the most recently recorded session and
+it needs the Next Writeable Address NWA for which to prepare the adress offset.
+
+The following is learned from growisofs and from ECMA-119:
+http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-119.pdf
+
+ISO 9660 filesystems provide information about the number of sectors which
+is also the lowest unused block address and thus a suitable NWA.
+This block address is stored in the Primary Volume Descriptor which is supposed
+to be stored in block 16 (eventually relative to MSC1).
+The bytes 0 to 5 of a PVD block are 
+   0x01 'C' 'D' '0' '0' '1'
+The sector count can then be read from byte 80 to 83
+   sectors= pvd[80] | (pvd[81] << 8) | (pvd[82] << 16) | (pvd[83] << 24);
+(Ecma-119.pdf 8.4)
+To support CD, DVD and BD media alike, it is advisable to round the NWA
+to the next multiple of 32 (= 64 KiB).
+
+So one can use 0 as MSC1 and prepare a new ISO session for the computed NWA.
+After writing the session it is necessary to patch the PVD at LBA 16.
+The minimal change would be to update the number of image sectors.
+It is stored in both notations LSB and MSB:
+   for(i= 0; i < 4; i++)
+     pvd[87 - i]= pvd[80 + i]= (sectors >> (8 * i)) & 0xff;
+
+cdrskin --grow_overwriteable_iso not only patches the sector fields of the
+PVD block but also the blocks up to LBA 31 which begin with
+   0xff 'C' 'D' '0' '0' '1'
+libisoburn submits 64 KiB data buffer to libisofs before image generation and
+afterwards writes these 64 KiB as new superblock to LBA 0.
+
+
+-------------------------------------------------------------------------------
+ISO 9660 based TOC emulation on overwriteable media :
+
+Above method of multi-session emulation yields a single session image after
+each add-on session. No reliable session history can be read because the
+sector size of the existing session gets overwritten by the new one.
+A TOC with session history is nevertheless desirable with incremental backups
+in order to access older backup states by mounting older superblocks at the
+start addresses of older sessions.
+
+All usual ISO 9660 formatter programs write a complete superblock to the
+start of each session.
+With a uniform NWA rounding rule it is possible to compute the address of
+superblock N+1 as the NWA after session N. The only problem is N=1
+because it gets overwritten by later sessions.
+
+libisoburn preserves the information of session 1 by writing the first session
+to LBA 32 rather than LBA 0. Afterwards it writes the overall superblock to
+LBA 0 (up to 31).
+So with all further add-on sessions the superblock at LBA 0 will enclose the
+overall image, while the superblocks of the sessions form a chain beginning
+at LBA 32. Each session superblock points to the next one by its sector count
+rounded up to 32. The chain end is marked by the overall image size.
+This chain gives the start addresses of sessions. The sector count minus start
+address gives the size of a particular session. ECMA-119 explains how to
+retrieve more info from the PVD (e.g. the volume id).
 
 
 -------------------------------------------------------------------------------
@@ -1199,3 +1279,118 @@ in http://libburnia-project.org/ticket/13 .
 
 -------------------------------------------------------------------------------
 
+-------------------------------------------------------------------------------
+                              BD-R Cookbook
+-------------------------------------------------------------------------------
+Inspired by reading mmc5r03c.pdf from http://www.t10.org/ftp/t10/drafts/mmc5/
+backed by experiments iwith drive LG GGW H20L.
+
+For libburnia-project.org by Thomas Schmitt <scdbackup@gmx.net>
+
+-------------------------------------------------------------------------------
+Media type can be recognized by Current Profile from 46h GET CONFIGURATION.
+(mmc5r03c.pdf 6.6.2.1)
+BD-R                           0042h
+
+There are two basic recording modes defined: Sequential Recording Mode SRM and
+Random Recording Mode RRM. The latter is optional and for now not topic of this
+text.
+(mmc5r03c.pdf 4.5.3.5)
+
+
+- SRM Formatting
+- Writing a session in SRM-POW
+(- Pseudo-OverWrite SRM+POW)
+
+
+-------------------------------------------------------------------------------
+SRM Formatting:
+
+Despite being write-once media BD-R can optionally carry some formatting.
+
+SRM has a disc structure model with tracks and sessions.
+Several tracks may be open at the same time, each having its own NWA.
+(mmc5r03c.pdf 4.5.3.5.2.2)
+This structure is formatted onto blank media automatically as soon as the
+first serious write attempt occurs.
+(mmc5r03c.pdf 4.5.3.5)
+Before such a write attempt, blank media may be explicitely formatted with
+spares, which provide defect management.
+(mmc5r03c.pdf 4.5.3.5.3)
+Tracks get created from other tracks via RESERVE TRACK splitting.
+(mmc5r03c.pdf 4.5.3.5.2.5)
+
+On top of defect management there may be Pseudo-OverWrite SRM+POW, a costly
+way to write several times to the same LBA. See below.
+Fully sequential states are called SRM-POW.
+(mmc5r03c.pdf 4.5.3.5.4)
+
+Explicite formatting is done by 04h FORMAT UNIT. Its data payload consists
+of a Format List Header and a Format Descriptor. It is advisable to set
+the Immed bit and the FOV bit in header byte number 1. The descriptor should
+be a copy of a descriptor from 23h READ FORMAT CAPACITIES but the size may be
+adjusted within a certain range.
+(mmc5r03c.pdf 6.5, 6.5.3.2, 6.5.3.3)
+
+Format type 00h creates SRM layouts with a default number of spares (or
+eventually RRM) chosen by the format sub-type:
+  00b = SRM with support for POW
+  01b = SRM without POW (but with some spares for defect management)
+  10b = (RRM)
+(mmc5r03c.pdf 6.5.4.2.1.6)
+
+Format type 32h uses the same sub-types but allows to allocate non-default
+amounts of spares. Similar to BD-RE format 31h, three format descriptors are
+offered: #1: default size, #2: maximum spare area, #3: minimal spare.
+The size may be chosen within that range.
+
+The sense behind the Type Dependent Parameters is obscure
+to me. Best will be to set ISA_V and TDMA_V to 0.
+(mmc5r03c.pdf 6.5.4.2.1.17)
+
+
+-------------------------------------------------------------------------------
+Writing a session in SRM:
+
+The procedure and constraints for writing BD-R SRM-POW are very similar to
+DVD+R. libburn flatly re-uses its DVD+R code except the Close Function for
+finalizing a disc.
+
+In short:
+If all written sessions are closed, then there is exactly one NWA.
+In the beginning there is an empty session and track. A new track can be
+written either with pre-announced size (by RESERVE TRACK) or open-end by
+simply starting to write to the NWA. When done the track gets closed by
+close function 001b. Then either session or disc gets closed depending on
+the Close Function used:
+- Close Function 010b closes the session and keeps the media appendable
+  (same as with DVD+R)
+- Close Function 110b finalizes the media and makes it read-only.
+  (differs from libburn DVD+R procedure which uses 101b)
+
+-------------------------------------------------------------------------------
+Pseudo-OverWrite POW: (no used yet by libburn)
+
+This enhancement of SRM emulates overwriting of existing data blocks.
+(mmc5r03c.pdf 4.5.3.5.4)
+
+POW establishes a virtual vLBA space on top of the real address space rLBA.
+All read and write commands deal with vLBA. It seems that track NWAs are
+assumed to be identical in vLBA space and in rLBA space.
+It is not clear whether one may write to vLBA blocks which are neither written
+yet nor at one of the track NWAs. Probably not, or else one could make NWAs run
+into vLBAs which are associated with older rLBAs.
+
+Replacing invalidated blocks consumes addresses in rLBA space at the NWA of
+some track. I.e. no spares are consumed by POW. Nevertheless it is costly by
+a special map called Orphanage. It covers rLBA which have been consumed
+by differing vLBAs. It never shrinks and can grow with each write to remapped
+addresses.
+To avoid heavy Orphanage growth it is advised to write mostly to vLBA which
+still coincide with their rLBA. E.g. those addresses which have neither been
+written as rLBA nor as vLBA yet. So one should begin the vLBA of new sessions
+at the NWA of a sufficiently sized track.
+(mmc5r03c.pdf 4.5.3.5.4.2 , 4.5.3.6.9)
+
+-------------------------------------------------------------------------------
+

doc/doxygen.conf.in

@@ -38,7 +38,7 @@ PROJECT_NUMBER         = @PACKAGE_VERSION@
 # If a relative path is entered, it will be relative to the location 
 # where doxygen was started. If left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = 
+OUTPUT_DIRECTORY       = @abs_top_builddir@
 
 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
 # 4096 sub-directories (in 2 levels) under the output directory of each output 
@@ -104,7 +104,7 @@ INLINE_INHERITED_MEMB  = NO
 # path before files name in the file list and in the header files. If set 
 # to NO the shortest path that makes the file name unique will be used.
 
-FULL_PATH_NAMES        = YES
+FULL_PATH_NAMES        = NO
 
 # If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
 # can be used to strip a user-defined part of the path. Stripping is 
@@ -113,7 +113,7 @@ FULL_PATH_NAMES        = YES
 # If left blank the directory from which doxygen is run is used as the 
 # path to strip.
 
-STRIP_FROM_PATH        = @top_srcdir@
+STRIP_FROM_PATH        = 
 
 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
 # the path mentioned in the documentation of a class, which tells 

libburn/async.c

@@ -25,9 +25,9 @@
 #include "drive.h"
 #include "write.h"
 #include "options.h"
+#include "file.h"
 #include "async.h"
 #include "init.h"
-#include "file.h"
 #include "back_hacks.h"
 
 #include <pthread.h>
@@ -376,7 +376,7 @@ static void *format_worker_func(struct w_list *w)
 void burn_disc_format(struct burn_drive *drive, off_t size, int flag)
 {
 	struct format_opts o;
-	int ok = 0;
+	int ok = 0, ret;
 	char msg[160];
 
 	if ((SCAN_GOING()) || find_worker(drive) != NULL) {
@@ -409,8 +409,82 @@ void burn_disc_format(struct burn_drive *drive, off_t size, int flag)
 		flag |= 4;      /* format up to maximum size */
 	} else if (drive->current_profile == 0x12) {
 		ok = 1; /* DVD-RAM */
+
+	} else if (drive->current_profile == 0x41) {
+		/* BD-R SRM */
+		ok= 1;
+		ret = drive->read_format_capacities(drive, 0x00);
+		if (ret > 0 &&
+		    drive->format_descr_type == BURN_FORMAT_IS_FORMATTED)
+			ok = 0;
+		if (drive->status != BURN_DISC_BLANK)
+			ok = 0;
+		if (!ok) {
+			libdax_msgs_submit(libdax_messenger,
+				drive->global_index, 0x00020162,
+				LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
+			 "BD-R not unformatted blank any more. Cannot format.",
+				0, 0);
+			drive->cancel = 1;
+			return;
+		}
+		if (flag & 32) {
+			libdax_msgs_submit(libdax_messenger,
+				drive->global_index, 0x00020163,
+				LIBDAX_MSGS_SEV_NOTE, LIBDAX_MSGS_PRIO_HIGH,
+			"Blank BD-R left unformatted for zero spare capacity.",
+				0, 0);
+			return;
+		}
 	} else if (drive->current_profile == 0x43) {
 		ok = 1; /* BD-RE */
+
+		if ((flag & 32) && !(drive->current_feat23h_byte4 & 8)) {
+			libdax_msgs_submit(libdax_messenger,
+				drive->global_index, 0x00020164,
+				LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
+				"Drive does not format BD-RE without spares.",
+				0, 0);
+			drive->cancel = 1;
+			return;
+
+		} 
+		if ((flag & 6) != 6 || (flag & 128)) {
+		    if ((flag & 64) && !(drive->current_feat23h_byte4 & 2)) {
+			if (drive->current_feat23h_byte4 & 1) {
+				libdax_msgs_submit(libdax_messenger,
+					drive->global_index, 0x00020165,
+				   	LIBDAX_MSGS_SEV_WARNING,
+					LIBDAX_MSGS_PRIO_HIGH,
+				      "Drive does not support fast formatting",
+					0, 0);
+				flag &= ~64;
+			} else {
+no_non_default_bd_re:;
+				libdax_msgs_submit(libdax_messenger,
+					drive->global_index, 0x00020167,
+				   	LIBDAX_MSGS_SEV_SORRY,
+					LIBDAX_MSGS_PRIO_HIGH,
+				"Drive does not support non-default formatting",
+					0, 0);
+				drive->cancel = 1;
+				return;
+			}
+		    }
+		    if ((!(flag & 64)) && !(drive->current_feat23h_byte4 & 1)){
+			if (drive->current_feat23h_byte4 & 2) {
+				libdax_msgs_submit(libdax_messenger,
+					drive->global_index, 0x00020166,
+				   	LIBDAX_MSGS_SEV_WARNING,
+					LIBDAX_MSGS_PRIO_HIGH,
+				      "Drive does not support full formatting",
+					0, 0);
+				flag |= 64;
+			} else
+				goto no_non_default_bd_re;
+		    }
+		}
+
 	}
 
 	if (!ok) {
@@ -453,12 +527,15 @@ void burn_disc_write(struct burn_write_opts *opts, struct burn_disc *disc)
 {
 	struct write_opts o;
 	char reasons[BURN_REASONS_LEN+80];
+	struct burn_drive *d;
+
+	d = opts->drive;
 
 	/* ts A61006 */
 	/* a ssert(!SCAN_GOING()); */
 	/* a ssert(!find_worker(opts->drive)); */
 	if ((SCAN_GOING()) || find_worker(opts->drive) != NULL) {
-		libdax_msgs_submit(libdax_messenger, opts->drive->global_index,
+		libdax_msgs_submit(libdax_messenger, d->global_index,
 			0x00020102,
 			LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
 			"A drive operation is still going on (want to write)",
@@ -467,14 +544,14 @@ void burn_disc_write(struct burn_write_opts *opts, struct burn_disc *disc)
 	}
 
 	/* For the next lines any return indicates failure */
-	opts->drive->cancel = 1;
+	d->cancel = 1;
 
 	/* ts A70203 : people have been warned in API specs */
 	if (opts->write_type == BURN_WRITE_NONE)
 		return;
 
-	if (opts->drive->drive_role == 0) {
-		libdax_msgs_submit(libdax_messenger, opts->drive->global_index,
+	if (d->drive_role == 0) {
+		libdax_msgs_submit(libdax_messenger, d->global_index,
 			0x00020146,
 			LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
 			"Drive is a virtual placeholder (null-drive)", 0, 0);
@@ -482,9 +559,9 @@ void burn_disc_write(struct burn_write_opts *opts, struct burn_disc *disc)
 	}
 
 	/* ts A61007 : obsolete Assert in spc_select_write_params() */
-	if (opts->drive->drive_role == 1 && !opts->drive->mdata->valid) {
+	if (d->drive_role == 1 && d->mdata->valid <= 0) {
 		libdax_msgs_submit(libdax_messenger,
-				opts->drive->global_index, 0x00020113,
+				d->global_index, 0x00020113,
 				LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
 				"Drive capabilities not inquired yet", 0, 0);
 		return;
@@ -495,29 +572,47 @@ void burn_disc_write(struct burn_write_opts *opts, struct burn_disc *disc)
 	*/
 	strcpy(reasons, "Write job parameters are unsuitable:\n");
 	if (burn_precheck_write(opts, disc, reasons + strlen(reasons), 1)
-	     == BURN_WRITE_NONE) {
+	     <= 0) {
 		libdax_msgs_submit(libdax_messenger,
-				opts->drive->global_index, 0x00020139,
+				d->global_index, 0x00020139,
 				LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
 				reasons, 0, 0);
 		return;
 	}
 
-	opts->drive->cancel = 0; /* End of the return = failure area */
+	/* ts A90106 : early catching of unformatted BD-RE */
+	if (d->current_profile == 0x43) 
+		if (d->read_format_capacities(d, 0x00) > 0 &&
+		    d->format_descr_type != BURN_FORMAT_IS_FORMATTED) {
+			libdax_msgs_submit(libdax_messenger,
+				d->global_index, 0x00020168,
+				LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
+				"Media not properly formatted. Cannot write.",
+				0, 0);
+			return;
+		}
 
-	o.drive = opts->drive;
+	d->cancel = 0; /* End of the return = failure area */
+
+	o.drive = d;
 	o.opts = opts;
 	o.disc = disc;
 
 	opts->refcount++;
 
-	add_worker(Burnworker_type_writE, opts->drive,
+	add_worker(Burnworker_type_writE, d,
 			(WorkerFunc) write_disc_worker_func, &o);
 }
 
 
 static void *fifo_worker_func(struct w_list *w)
 {
+	int old;
+
+	pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &old);
+	pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, &old);
+		/* Note: Only burn_fifo_abort() shall cancel the fifo thread */
+
 	burn_fifo_source_shoveller(w->u.fifo.source, w->u.fifo.flag);
 	remove_worker(pthread_self());
 	return NULL;
@@ -547,6 +642,27 @@ int burn_fifo_start(struct burn_source *source, int flag)
 }
 
 
+int burn_fifo_abort(struct burn_source_fifo *fs, int flag)
+{
+	int ret;
+	pthread_t pt;
+
+	if (fs->thread_is_valid <= 0 || fs->thread_handle == NULL)
+		return(2);
+
+#ifdef NIX
+	libdax_msgs_submit(libdax_messenger, -1, 0x00000002,
+			LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
+			"Aborting running burn_source_fifo thread", 0, 0);
+#endif /* NIX */
+
+	pt= *((pthread_t *) fs->thread_handle);
+	remove_worker(pt);
+	ret = pthread_cancel(pt);
+	return (ret == 0);
+}
+
+
 #ifdef Libburn_has_burn_async_join_alL
 
 /* ts A71019 : never used */

libburn/async.h

@@ -10,5 +10,9 @@ struct burn_write_opts;
 /* To be called when the first read() call comes to a fifo */
 int burn_fifo_start(struct burn_source *source, int flag);
 
+/* ts A81108 */
+/* To abort a running fifo thread before the fifo object gets deleted */
+int burn_fifo_abort(struct burn_source_fifo *fs, int flag);
+
 
 #endif /* BURN__ASYNC_H */

libburn/cleanup.c

@@ -97,8 +97,8 @@ static int Cleanup_handler_exit(int exit_value, int signum, int flag)
        return(2);
    }
  if(cleanup_exiting) {
-   fprintf(stderr,"cleanup: ABORT : repeat by pid=%d, signum=%d\n",
-           getpid(),signum);
+   fprintf(stderr,"cleanup: ABORT : repeat by pid=%.f, signum=%d\n",
+           (double) getpid(), signum);
    return(0);
  }
  cleanup_exiting= 1;

libburn/drive.c

@@ -62,6 +62,7 @@ int burn_setup_drive(struct burn_drive *d, char *fname)
 	d->stdio_fd = -1;
 	d->status = BURN_DISC_UNREADY;
 	d->do_stream_recording = 0;
+        d->stream_recording_start= 0;
 	return 1;
 }
 
@@ -196,6 +197,31 @@ unsigned int burn_drive_count(void)
 }
 
 
+/* ts A80801 */
+int burn_drive_is_listed(char *path, struct burn_drive **found, int flag)
+{
+	int i, ret;
+	char drive_adr[BURN_DRIVE_ADR_LEN], off_adr[BURN_DRIVE_ADR_LEN];
+
+	ret = burn_drive_convert_fs_adr(path, off_adr);
+	if (ret <= 0)
+		strcpy(off_adr, path);
+	for (i = 0; i <= drivetop; i++) {
+		if (drive_array[i].global_index < 0)
+	continue;
+		ret = burn_drive_d_get_adr(&(drive_array[i]), drive_adr);
+		if (ret <= 0)
+	continue;
+		if(strcmp(off_adr, drive_adr) == 0) {
+			if (found != NULL)
+				*found= &(drive_array[i]);
+			return 1;
+		}
+	}
+	return 0;
+}
+
+
 /* ts A61125 : media status aspects of burn_drive_grab() */
 int burn_drive_inquire_media(struct burn_drive *d)
 {
@@ -206,7 +232,7 @@ int burn_drive_inquire_media(struct burn_drive *d)
 	/* ts A61020 : d->status was set to BURN_DISC_BLANK as pure guess */
 
         /* ts A71128 : run read_disc_info() for any recognizeable profile */
-	if (d->current_profile > 0 || 
+	if (d->current_profile > 0 || d->current_is_guessed_profile ||
 	    d->mdata->cdr_write || d->mdata->cdrw_write ||
 	    d->mdata->dvdr_write || d->mdata->dvdram_write) {
 
@@ -392,6 +418,9 @@ int burn_drive_unregister(struct burn_drive *d)
 struct burn_drive *burn_drive_finish_enum(struct burn_drive *d)
 {
 	struct burn_drive *t;
+	char msg[BURN_DRIVE_ADR_LEN + 160];
+	int ret;
+
 	/* ts A60821
    	<<< debug: for tracing calls which might use open drive fds */
 	int mmc_function_spy(struct burn_drive *d, char * text);
@@ -404,13 +433,19 @@ struct burn_drive *burn_drive_finish_enum(struct burn_drive *d)
 	mmc_function_spy(NULL, "enumerate_common : -------- doing grab");
 
 	/* try to get the drive info */
-	if (t->grab(t)) {
+	ret = t->grab(t);
+	if (ret) {
 	        burn_print(2, "getting drive info\n");
 	        t->getcaps(t);
 	        t->unlock(t);
 	        t->released = 1;
 	} else {
-	        burn_print(2, "unable to grab new located drive\n");
+		/* ts A90602 */
+		d->mdata->valid = -1;
+                sprintf(msg, "Unable to grab scanned drive %s", d->devname);
+                libdax_msgs_submit(libdax_messenger, d->global_index,
+                                0x0002016f, LIBDAX_MSGS_SEV_DEBUG,
+                                LIBDAX_MSGS_PRIO_LOW, msg, 0, 0);
 	        burn_drive_unregister(t);
 		t = NULL;
 	}
@@ -599,7 +634,7 @@ void burn_disc_format_sync(struct burn_drive *d, off_t size, int flag)
 	int ret, buf_secs, err, i, stages = 1, pbase, pfill, pseudo_sector;
 	off_t num_bufs;
 	char msg[80];
-	struct buffer buf;
+	struct buffer buf, *buf_mem = d->buffer;
 
 	/* reset the progress */
 	d->progress.session = 0;
@@ -681,7 +716,7 @@ void burn_disc_format_sync(struct burn_drive *d, off_t size, int flag)
 ex:;
 	d->progress.sector = 0x10000;
 	d->busy = BURN_DRIVE_IDLE;
-	d->buffer = NULL;
+	d->buffer = buf_mem;
 }
 
 
@@ -767,6 +802,18 @@ enum burn_drive_status burn_drive_get_status(struct burn_drive *d,
 	return d->busy;
 }
 
+int burn_drive_set_stream_recording(struct burn_drive *d, int recmode,
+                                    int start, int flag)
+{
+
+	if (recmode == 1)
+		d->do_stream_recording = 1;
+	else if (recmode == -1)
+		d->do_stream_recording = 0;
+	d->stream_recording_start = start;
+	return(1);
+}
+
 void burn_drive_cancel(struct burn_drive *d)
 {
 	pthread_mutex_lock(&d->access_lock);
@@ -817,7 +864,7 @@ static int drive_getcaps(struct burn_drive *d, struct burn_drive_info *out)
 	a ssert(d->mdata);
 #endif
 
-	if (!d->idata->valid || !d->mdata->valid)
+	if(d->idata->valid <= 0 || d->mdata->valid <= 0)
 		return 0;
 
 	id = (struct burn_scsi_inquiry_data *)d->idata;
@@ -883,7 +930,7 @@ int burn_drive_scan_sync(struct burn_drive_info *drives[],
 	*/
 	unsigned char scanned[32];
 	unsigned count = 0;
-	int i;
+	int i, ret;
 
 	/* ts A61007 : moved up to burn_drive_scan() */
 	/* a ssert(burn_running); */
@@ -940,13 +987,22 @@ int burn_drive_scan_sync(struct burn_drive_info *drives[],
 		if (drive_array[i].global_index < 0)
 	continue;		/* invalid device */
 
-		while (!drive_getcaps(&drive_array[i],
-				      &(*drives)[*n_drives])) {
+		/* ts A90602 : This old loop is not plausible. See A70907.
+		  while (!drive_getcaps(&drive_array[i],
+		         &(*drives)[*n_drives])) {
 			sleep(1);
-		}
-		(*n_drives)++;
+		  }
+		*/
+		/* ts A90602 : A single call shall do (rather than a loop) */
+		ret = drive_getcaps(&drive_array[i], &(*drives)[*n_drives]);
+		if (ret > 0)
+			(*n_drives)++;
 		scanned[i / 8] |= 1 << (i % 8);
 	}
+	if (*drives != NULL && *n_drives == 0) {
+		free ((char *) *drives);
+		*drives = NULL;
+	}
 
 	return(1);
 }
@@ -1102,14 +1158,14 @@ void burn_sectors_to_msf(int sectors, int *m, int *s, int *f)
 
 int burn_drive_get_read_speed(struct burn_drive *d)
 {
-	if(!d->mdata->valid)
+	if(d->mdata->valid <= 0)
 		return 0;
 	return d->mdata->max_read_speed;
 }
 
 int burn_drive_get_write_speed(struct burn_drive *d)
 {
-	if(!d->mdata->valid)
+	if(d->mdata->valid <= 0)
 		return 0;
 	return d->mdata->max_write_speed;
 }
@@ -1117,7 +1173,7 @@ int burn_drive_get_write_speed(struct burn_drive *d)
 /* ts A61021 : New API function */
 int burn_drive_get_min_write_speed(struct burn_drive *d)
 {
-	if(!d->mdata->valid)
+	if(d->mdata->valid <= 0)
 		return 0;
 	return d->mdata->min_write_speed;
 }
@@ -1166,6 +1222,20 @@ int burn_drive_is_banned(char *device_address)
 }
 
 
+/* ts A80731 */
+int burn_drive_whitelist_count(void)
+{
+	return enumeration_whitelist_top + 1;
+}
+
+char *burn_drive_whitelist_item(int idx, int flag)
+{
+	if (idx < 0 || idx > enumeration_whitelist_top)
+		return NULL;
+	return enumeration_whitelist[idx];
+}
+
+
 /* ts A70924 */
 int burn_drive__fd_from_special_adr(char *adr)
 {
@@ -1690,6 +1760,10 @@ int burn_abort(int patience,
 	unsigned long wait_grain= 100000;
 	time_t start_time, current_time, pacifier_time, end_time;
 
+#ifndef NIX
+	time_t stdio_patience = 3;
+#endif
+
 	current_time = start_time = pacifier_time = time(0);
 	end_time = start_time + patience;
 
@@ -1705,10 +1779,38 @@ int burn_abort(int patience,
 			occup = burn_drive_is_occupied(&(drive_array[i]));
 			if(occup == -2)
 		continue;
+
 			if(drive_array[i].drive_role != 1) {
+
+#ifdef NIX
+
+				/* ts A90302
+				   <<< this causes a race condition with drive
+				       usage and drive disposal.
+			  	*/
 				drive_array[i].busy = BURN_DRIVE_IDLE;
 				burn_drive_forget(&(drive_array[i]), 1);
-			} else if(occup <= 10) {
+		continue;
+
+#else /* NIX */
+
+				/* ts A90318
+				   >>> but if a pipe breaks then the drive
+				       never gets idle.
+				   So for now with a short patience timespan
+				   and eventually a deliberate memory leak.
+			  	*/
+				if (current_time - start_time >
+				    stdio_patience) {
+					drive_array[i].global_index = -1;
+		continue;
+				}
+
+#endif /* ! NIX */
+
+			}
+
+			if(occup <= 10) {
 				burn_drive_forget(&(drive_array[i]), 1);
 			} else if(occup <= 100) {
 				if(first_round)
@@ -1998,7 +2100,7 @@ int burn_drive_get_speedlist(struct burn_drive *d,
 	struct burn_speed_descriptor *sd, *csd = NULL;
 
 	(*speed_list) = NULL;
-	if(!d->mdata->valid)
+	if(d->mdata->valid <= 0)
 		return 0;
 	for (sd = d->mdata->speed_descriptors; sd != NULL; sd = sd->next) {
 		ret = burn_speed_descriptor_new(&csd, NULL, csd, 0);
@@ -2023,7 +2125,7 @@ int burn_drive_get_best_speed(struct burn_drive *d, int speed_goal,
 	if (speed_goal < 0)
 		best_speed = 2000000000;
 	*best_descr = NULL;
-	if(!d->mdata->valid)
+	if(d->mdata->valid <= 0)
 		return 0;
 	for (sd = d->mdata->speed_descriptors; sd != NULL; sd = sd->next) {
 		if (flag & 1)
@@ -2207,8 +2309,9 @@ int burn_disc_get_multi_caps(struct burn_drive *d, enum burn_write_types wt,
 		o->might_do_sao = 4;
 		o->might_do_tao = 2;
 		o->advised_write_mode = BURN_WRITE_TAO;
-	} else if (d->current_profile == 0x1b || d->current_profile == 0x2b) {
-		/* DVD+R , DVD+R/DL */
+	} else if (d->current_profile == 0x1b || d->current_profile == 0x2b ||
+		   d->current_profile == 0x41) {
+		/* DVD+R , DVD+R/DL , BD-R SRM */
 		o->multi_session = o->multi_track = 1;
 		o->might_do_tao = 2;
 		o->might_do_sao = 1;
@@ -2467,3 +2570,10 @@ int burn_drive_set_media_capacity_remaining(struct burn_drive *d, off_t value)
 	return 1;
 }
 
+/* ts A81215 : API */
+int burn_get_read_capacity(struct burn_drive *d, int *capacity, int flag)
+{
+	*capacity = d->media_read_capacity;
+	return (d->media_read_capacity != 0x7fffffff);
+}
+

libburn/drive.h

@@ -125,4 +125,14 @@ int burn_drive__fd_from_special_adr(char *adr);
 int burn_drive_find_by_thread_pid(struct burn_drive **d, pid_t pid);
 
 
+/* ts A51221 - A80731 : Whitelist inquiry functions */
+int burn_drive_is_banned(char *device_address);
+int burn_drive_whitelist_count(void);
+char *burn_drive_whitelist_item(int idx, int flag);
+
+
+/* ts A80801 */
+int burn_drive_is_listed(char *path, struct burn_drive **found, int flag);
+
+
 #endif /* __DRIVE */

libburn/file.c

@@ -9,6 +9,8 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <time.h>
+#include <pthread.h>
+
 #include "source.h"
 #include "libburn.h"
 #include "file.h"
@@ -307,6 +309,7 @@ static void fifo_free(struct burn_source *source)
 {
 	struct burn_source_fifo *fs = source->data;
 
+	burn_fifo_abort(fs, 0);
 	if (fs->inp != NULL)
 		burn_source_free(fs->inp);
 	if (fs->buf != NULL)
@@ -320,9 +323,12 @@ int burn_fifo_source_shoveller(struct burn_source *source, int flag)
 	struct burn_source_fifo *fs = source->data;
 	int ret, bufsize, diff, wpos, rpos, trans_end, free_bytes;
 	char *bufpt;
+	pthread_t thread_handle_storage;
 
+	fs->thread_handle= &thread_handle_storage;
+	*((pthread_t *) fs->thread_handle)= pthread_self();
 	fs->thread_pid = getpid();
-	fs->thread_pid_valid = 1;
+	fs->thread_is_valid = 1;
 
 	bufsize = fs->chunksize * fs->chunks;
 	while (!fs->end_of_consumption) {
@@ -430,6 +436,8 @@ int burn_fifo_source_shoveller(struct burn_source *source, int flag)
 	free(fs->buf); /* Give up fifo buffer. Next fifo might start soon. */
 	fs->buf = NULL;
 
+	fs->thread_handle= NULL;
+	fs->thread_is_valid = 0;
 	return (fs->input_error == 0);
 }
 
@@ -465,8 +473,9 @@ struct burn_source *burn_fifo_source_new(struct burn_source *inp,
 	if (fs == NULL)
 		return NULL;
 	fs->is_started = 0;
+	fs->thread_handle = NULL;
 	fs->thread_pid = 0;
-	fs->thread_pid_valid = 0;
+	fs->thread_is_valid = 0;
 	fs->inp = NULL; /* set later */
 	fs->chunksize = chunksize;
 	fs->chunks = chunks;

libburn/file.h

@@ -29,8 +29,9 @@ struct burn_source_fifo {
 	*/
 	int is_started;
 
+	void *thread_handle; /* actually a pointer to a thread_t */
 	int thread_pid;
-	int thread_pid_valid;
+	int thread_is_valid;
 
 	/* the burn_source for which this fifo is acting as proxy */
 	struct burn_source *inp;

libburn/libburn.h

@@ -3,11 +3,15 @@
 #ifndef LIBBURN_H
 #define LIBBURN_H
 
-/* Needed for  off_t  which is the (POSIX-ly) appropriate type for
-   expressing a file or stream size.
+/* 
+
+Applications must use 64 bit off_t. E.g. by defining
+  #define _LARGEFILE_SOURCE
+  #define _FILE_OFFSET_BITS 64
+or take special precautions to interface with the library by 64 bit integers
+where this .h files prescribe off_t. Not to use 64 bit file i/o will keep the
+application from producing and processing ISO images of more than 2 GB size.
 
-   XXX we should enforce 64-bitness for off_t
-   ts A61101 : this is usually done by the build system (if it is not broken)
 */
 #include <sys/types.h>
 
@@ -183,18 +187,41 @@ enum burn_block_types
 	BURN_BLOCK_SAO = 16384
 };
 
-/** Possible status' of the drive in regard to the disc in it. */
+/** Possible status of the drive in regard to the disc in it. */
 enum burn_disc_status
 {
 	/** The current status is not yet known */
 	BURN_DISC_UNREADY,
-	/** The drive holds a blank disc */
+
+	/** The drive holds a blank disc. It is ready for writing from scratch.
+	    Unused multi-session media:
+	      CD-R, CD-RW, DVD-R, DVD-RW, DVD+R, BD-R
+	    Blanked multi-session media (i.e. treated by burn_disc_erase())
+	      CD-RW, DVD-RW
+	    Overwriteable media with or without valid data
+	      DVD-RAM, DVD+RW, formatted DVD-RW, BD-RE
+	*/
 	BURN_DISC_BLANK,
+
 	/** There is no disc at all in the drive */
 	BURN_DISC_EMPTY,
-	/** There is an incomplete disc in the drive */
+
+	/** There is an incomplete disc in the drive. It is ready for appending
+	    another session.
+	    Written but not yet closed multi-session media
+	      CD-R, CD-RW, DVD-R, DVD-RW, DVD+R, BD-R
+	*/
 	BURN_DISC_APPENDABLE,
-	/** There is a disc with data on it in the drive */
+
+	/** There is a disc with data on it in the drive. It is usable only for
+	    reading.
+	    Written and closed multi-session media
+	      CD-R, CD-RW, DVD-R, DVD-RW, DVD+R, BD-R
+	    Read-Only media
+	      CD-ROM, DVD-ROM, BD-ROM
+	    Note that many DVD-ROM drives report any written media
+	    as Read-Only media and not by their real media types.
+	*/
 	BURN_DISC_FULL,
 
 	/* ts A61007 */
@@ -204,7 +231,7 @@ enum burn_disc_status
 
 	/* ts A61020 */
         /* @since 0.2.6 */
-	/** The media seems not to be suitable for burning */
+	/** The media seems to be unsuitable for reading and for writing */
 	BURN_DISC_UNSUITABLE
 };
 
@@ -306,7 +333,8 @@ struct burn_toc_entry
 
 	/* Indicates whether extension data are valid and eventually override
 	   older elements in this structure:
-	     bit0= DVD extension is valid
+	     bit0= DVD extension is valid @since 0.3.2
+                   @since 0.5.2 : DVD extensions are made valid for CD too
 	*/
 	unsigned char extensions_valid;  
 
@@ -383,6 +411,13 @@ struct burn_source {
 	    The size of a sector depends on BURN_MODE_*. The known range is
 	    2048 to 2352.
 
+            If this call is reading from a pipe then it will learn
+            about the end of data only when that pipe gets closed on the
+            feeder side. So if the track size is not fixed or if the pipe
+            delivers less than the predicted amount or if the size is not
+            block aligned, then burning will halt until the input process
+            closes the pipe.
+
 	    IMPORTANT:
 	    If this function pointer is NULL, then the struct burn_source is of
 	    version >= 1 and the job of .(*read)() is done by .(*read_xt)().
@@ -812,7 +847,8 @@ void burn_allow_untested_profiles(int yes);
     If the path does not exist in the filesystem yet, it is attempted to create
     it as a regular file as soon as write operations are started.
 
-    The capabilities of role 3 resemble a blank DVD-R.
+    The capabilities of role 3 resemble a blank DVD-R. Nevertheless each
+    burn_disc_write() run may only write a single track.
 
     One may distinguish pseudo-drives from MMC drives by call
     burn_drive_get_drive_role().
@@ -1128,7 +1164,8 @@ off_t burn_disc_available_space(struct burn_drive *d,
       0x11 "DVD-R sequential recording",    0x12 "DVD-RAM",
       0x13 "DVD-RW restricted overwrite",   0x14 "DVD-RW sequential recording",
       0x1a "DVD+RW",                        0x1b "DVD+R",
-      0x2b "DVD+R/DL",                      0x43 "BD-RE",
+      0x2b "DVD+R/DL",
+      0x41 "BD-R sequential recording",     0x43 "BD-RE",
       0xffff "stdio file"
     Note: 0xffff is not a MMC profile but a libburn invention.
     If enabled by burn_allow_untested_profiles() it also writes to profiles
@@ -1136,8 +1173,8 @@ off_t burn_disc_available_space(struct burn_drive *d,
     Read-only are the profiles
       0x08 "CD-ROM",                        0x10 "DVD-ROM",
       0x40 "BD-ROM",
-    For now read-only are BD-R profiles (testers wanted)
-      0x41 "BD-R sequential recording",     0x42 "BD-R random recording"
+    For now read-only is BD-R profile (testers wanted)
+      0x42 "BD-R random recording"
     @param d The drive where the media is inserted.
     @param pno Profile Number. See also mmc5r03c.pdf, table 89
     @param name Profile Name (see above list, unknown profiles have empty name)
@@ -1160,8 +1197,8 @@ int burn_disc_erasable(struct burn_drive *d);
 enum burn_drive_status burn_drive_get_status(struct burn_drive *drive,
 					     struct burn_progress *p);
 
-/** Creates a write_opts struct for burning to the specified drive
-    must be freed with burn_write_opts_free
+/** Creates a write_opts struct for burning to the specified drive.
+    The returned object must later be freed with burn_write_opts_free().
     @param drive The drive to write with
     @return The write_opts, NULL on error
 */
@@ -1211,7 +1248,8 @@ void burn_disc_erase(struct burn_drive *drive, int fast);
 /** Format media for use with libburn. This currently applies to DVD-RW
     in state "Sequential Recording" (profile 0014h) which get formatted to
     state "Restricted Overwrite" (profile 0013h). DVD+RW can be "de-iced"
-    by setting bit2 of flag. Other media cannot be formatted yet. 
+    by setting bit2 of flag. DVD-RAM and BD-RE may get formatted initially
+    or re-formatted to adjust their Defect Managment.
     This function usually returns while the drive is still in the process
     of formatting. The formatting is done, when burn_drive_get_status()
     returns BURN_DRIVE_IDLE. This may be immediately after return or may
@@ -1226,7 +1264,8 @@ void burn_disc_erase(struct burn_drive *drive, int fast);
                 bit1+2: size mode
                    0 = use parameter size as far as it makes sense
                    1 = insist in size 0 even if there is a better default known
-                       (on DVD-RAM or BD-RE identical to size mode 0)
+                       (on DVD-RAM or BD-R identical to size mode 0,
+                        i.e. they never get formatted with payload size 0)
                    2 = without bit7: format to maximum available size
                        with bit7   : take size from indexed format descriptor
                    3 = without bit7: format to default size
@@ -1235,13 +1274,16 @@ void burn_disc_erase(struct burn_drive *drive, int fast);
                 bit4= enforce re-format of (partly) formatted media
                 bit5= try to disable eventual defect management
 		bit6= try to avoid lengthy media certification
-                bit7= MMC expert application mode (else libburn tries to
-                      choose a suitable format type):
-                      bit8 to bit15 contain the index of the format to use. See
-                      burn_disc_get_formats(), burn_disc_get_format_descr().
+                bit7, bit8 to bit15 =
+                      bit7 enables MMC expert application mode (else libburn
+                      tries to choose a suitable format type):
+                      If it is set then bit8 to bit15 contain the index of
+                      the format to use. See burn_disc_get_formats(),
+                      burn_disc_get_format_descr().
                       Acceptable types are: 0x00, 0x01, 0x10, 0x11, 0x13,
-                      0x15, 0x26, 0x30, 0x31.
-                      If bit7 is set, bit4 is set automatically.
+                      0x15, 0x26, 0x30, 0x31, 0x32.
+                      If bit7 is set, then bit4 is set automatically.
+               bit16= enable POW on blank BD-R
     @since 0.3.0
 */
 void burn_disc_format(struct burn_drive *drive, off_t size, int flag);
@@ -1346,6 +1388,28 @@ int burn_precheck_write(struct burn_write_opts *o, struct burn_disc *disc,
 */
 void burn_disc_write(struct burn_write_opts *o, struct burn_disc *disc);
 
+
+/* ts A90227 */
+/** Control stream recording during the write run and eventually set the start
+    LBA for stream recording.
+    Stream recording is set from struct burn_write_opts when the write run
+    gets started. See burn_write_opts_set_stream_recording().
+    The call described here can be used later to override this setting and
+    to program automatic switching at a given LBA. It also affects subsequent
+    calls to burn_random_access_write().
+    @param drive    The drive which performs the write operation.
+    @param recmode  -1= disable stream recording
+                     0= leave setting as is
+                     1= enable stream recording
+    @param start    The LBA where actual stream recording shall start.
+                    (0 means unconditional stream recording)
+    @param flag     Bitfield for control purposes (unused yet, submit 0).
+    @return         1=success , <=0 failure
+    @since 0.6.4
+*/
+int burn_drive_set_stream_recording(struct burn_drive *drive, int recmode,
+                                    int start, int flag);
+
 /** Cancel an operation on a drive.
     This will only work when the drive's busy state is BURN_DRIVE_READING or
     BURN_DRIVE_WRITING.
@@ -1864,12 +1928,15 @@ void burn_write_opts_set_force(struct burn_write_opts *opts, int use_force);
 
 /* ts A80412 */
 /** Eventually makes use of the more modern write command AAh WRITE12 and
-    sets the Streaming bit. With DVD-RAM this can override the traditional
-    slowdown to half nominal speed. But if it speeds up writing then it also
-    disables error management and correction. Weigh your priorities.
-    This only affects the write operations of burn_disc_write().
+    sets the Streaming bit. With DVD-RAM and BD this can override the
+    traditional slowdown to half nominal speed. But if it speeds up writing
+    then it also disables error management and correction. Weigh your
+    priorities. This affects the write operations of burn_disc_write()
+    and subsequent calls of burn_random_access_write().
     @param opts The write opts to change
     @param value  0=use 2Ah WRITE10, 1=use AAh WRITE12 with Streaming bit
+                  @since 0.6.4:
+                  >=16 use WRITE12 but not before the LBA given by value
     @since 0.4.6
 */
 void burn_write_opts_set_stream_recording(struct burn_write_opts *opts, 
@@ -2192,8 +2259,8 @@ void burn_version(int *major, int *minor, int *micro);
 
 */
 #define burn_header_version_major  0
-#define burn_header_version_minor  5
-#define burn_header_version_micro  0
+#define burn_header_version_minor  6
+#define burn_header_version_micro  8
 /** Note:
     Above version numbers are also recorded in configure.ac because libtool
     wants them as parameters at build time.
@@ -2402,6 +2469,21 @@ int burn_random_access_write(struct burn_drive *d, off_t byte_address,
                              char *data, off_t data_count, int flag);
 
 
+/* ts A81215 */
+/** Inquire the maximum amount of readable data.
+    It is supposed that all LBAs in the range from 0 to media_read_acpacity-1
+    can be read via burn_read_data() although some of them may never have been
+    recorded. If tracks are recognizable then it is better to only read
+    LBAs which are part of some track.
+    @param d            The drive from which to read
+    @param capacity     Will return the result if valid
+    @param flag         Bitfield for control purposes: Unused yet, submit 0.
+    @return 1=sucessful , <=0 an error occured
+    @since 0.6.0
+*/
+int burn_get_read_capacity(struct burn_drive *d, int *capacity, int flag);
+
+
 /* ts A70812 */
 /** Read data in random access mode.
     The drive must be grabbed successfully before calling this function.
@@ -2411,7 +2493,7 @@ int burn_random_access_write(struct burn_drive *d, off_t byte_address,
     This is a synchronous call which returns only after the full read job
     has ended (sucessfully or not). So it is wise not to read giant amounts
     of data in a single call.
-    @param d            The drive to which to write
+    @param d            The drive from which to read
     @param byte_address The start address of the read in byte (aligned to 2048)
     @param data         A memory buffer capable of taking data_size bytes
     @param data_size    The amount of data to be read. This does not have to
@@ -2420,6 +2502,8 @@ int burn_random_access_write(struct burn_drive *d, off_t byte_address,
     @param flag         Bitfield for control purposes:
                         bit0= - reserved -
                         bit1= do not submit error message if read error
+                        bit2= on error do not try to read a second time
+                              with single block steps. @since 0.5.2 
     @return 1=sucessful , <=0 an error occured
     @since 0.4.0
 */

libburn/libdax_msgs.c

@@ -1,7 +1,7 @@
 
 /* libdax_msgs
    Message handling facility of libdax.
-   Copyright (C) 2006 - 2008 Thomas Schmitt <scdbackup@gmx.net>,
+   Copyright (C) 2006 - 2009 Thomas Schmitt <scdbackup@gmx.net>,
    provided under GPL version 2
 */
 

libburn/libdax_msgs.h

@@ -1,7 +1,7 @@
 
 /* libdax_msgs
    Message handling facility of libdax.
-   Copyright (C) 2006-2008 Thomas Schmitt <scdbackup@gmx.net>,
+   Copyright (C) 2006-2009 Thomas Schmitt <scdbackup@gmx.net>,
    provided under GPL version 2
 */
 
@@ -432,6 +432,8 @@ Range "scdbackup"          :  0x00020000 to 0x0002ffff
  0x00020007 (NOTE,HIGH)    = Closed O_EXCL scsi siblings
  0x00020008 (SORRY,HIGH)   = Device busy. Failed to fcntl-lock
  0x00020009 (SORRY,HIGH)   = Neither stdio-path nor its directory exist
+ 0x0002000a (FAILURE,HIGH) = Cannot accept '...' as SG_IO CDROM drive
+ 0x0002000b (FAILURE,HIGH) = File object '...' not found
            
  General library operations:
 
@@ -529,6 +531,25 @@ Range "scdbackup"          :  0x00020000 to 0x0002ffff
  0x0002015c (FAILURE,HIGH) = Fifo size is smaller than desired peek buffer
  0x0002015d (FAILURE,HIGH) = Fifo input ended short of desired peek buffer size
  0x0002015e (FATAL,HIGH)   = Fifo is already under consumption when peeking
+ 0x0002015f (MISHAP,HIGH)  = Damaged CD table-of-content detected and truncated
+ 0x00020160 (WARNING,HIGH) = Session without leadout encountered
+ 0x00020161 (WARNING,HIGH) = Empty session deleted
+ 0x00020162 (SORRY,HIGH)   = BD-R not unformatted blank any more. Cannot format
+ 0x00020163 (NOTE,HIGH)    = Blank BD-R left unformatted for zero spare capacity
+ 0x00020164 (SORRY,HIGH)   = Drive does not format BD-RE without spares
+ 0x00020165 (WARNING,HIGH) = Drive does not support fast formatting
+ 0x00020166 (WARNING,HIGH) = Drive does not support full formatting
+ 0x00020167 (SORRY,HIGH)   = Drive does not support non-default formatting
+ 0x00020168 (FAILURE,HIGH) = Media not properly formatted. Cannot write.
+ 0x00020169 (WARNING,HIGH) = Last session on media is still open
+ 0x0002016a (FAILURE,HIGH) = No MMC transport adapter is present
+ 0x0002016b (WARNING,HIGH) = No MMC transport adapter is present
+ 0x0002016c (DEBUG,HIGH)   = No MMC transport adapter is present
+ 0x0002016e (DEBUG,HIGH)   = MODE SENSE page 2A too short
+ 0x0002016f (DEBUG,HIGH)   = Unable to grab scanned drive
+ 0x00020170 (NOTE,HIGH)    = Closing open session before writing new one
+ 0x00020171 (NOTE,HIGH)    = Closing BD-R with accidently open session
+ 
 
  libdax_audioxtr:
  0x00020200 (SORRY,HIGH)   = Cannot open audio source file

libburn/mmc.c

@@ -55,14 +55,17 @@ extern struct libdax_msgs *libdax_messenger;
 /* ts A70306 */
 #define Libburn_support_dvd_plus_R 1
 
-/* ts A70509 : handling 0x41 and 0x42 as read-only types */
+/* ts A70509 : handling 0x41 as read-only type */
 #define Libburn_support_bd_r_readonlY 1
 
+/* ts A81208 */
+#define Libburn_support_bd_plus_r_srM 1
+
 
 /* ts A80410 : <<< Dangerous experiment: Pretend that DVD-RAM is BD-RE
  # define Libburn_dvd_ram_as_bd_rE yes
 */
-/* ts A80509 : <<< Experiment: pretend that DVD-COM and CD-ROM are other media
+/* ts A80509 : <<< Experiment: pretend that DVD-ROM and CD-ROM are other media
                    like BD-ROM (0x40), BD-R seq (0x41), BD-R random (0x42)
  # define Libburn_rom_as_profilE 0x40
 */
@@ -74,6 +77,12 @@ extern struct libdax_msgs *libdax_messenger;
  # define Libburn_do_not_format_dvd_ram_or_bd_rE 1
 */
 
+
+/* ts A90603 : Simulate the command restrictions of an old MMC-1 drive
+ # define Libisofs_simulate_old_mmc1_drivE 1
+*/
+
+
 /* DVD/BD progress report:
    ts A61219 : It seems to work with a used (i.e. thoroughly formatted) DVD+RW.
                Error messages of class DEBUG appear because of inability to
@@ -119,6 +128,9 @@ extern struct libdax_msgs *libdax_messenger;
                drive->do_stream_recording it does full nominal speed.
    ts A80506 : Giulio Orsero reports success with BD-RE formatting.
                BD-RE is now an officially supported profile.
+   ts A81209 : The first two sessions have been written to BD-R SRM
+               (auto formatted without Defect Management).
+   ts A90107 : BD-R is now supported media type
 */
 
 /* ts A70519 : With MMC commands of data direction FROM_DRIVE:
@@ -198,6 +210,10 @@ static unsigned char MMC_RESERVE_TRACK[] =
 static unsigned char MMC_READ_10[] =
 	{ 0x28, 0, 0, 0, 0, 0, 0, 0, 0, 0};
 
+/* ts A81210 : Determine the upper limit of readable data size */
+static unsigned char MMC_READ_CAPACITY[] =
+	{ 0x25, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+
 
 static int mmc_function_spy_do_tell = 0;
 
@@ -735,7 +751,7 @@ int mmc_write(struct burn_drive *d, int start, struct buffer *buf)
 		mmc_wait_for_buffer_free(d, buf);
 
 	/* ts A80412 */
-	if(d->do_stream_recording > 0)  {
+	if(d->do_stream_recording > 0 && start >= d->stream_recording_start) {
 
 		/* >>> ??? is WRITE12 available ?  */
 			/* >>> ??? inquire feature 107h Stream Writing bit ? */
@@ -773,11 +789,24 @@ int mmc_write(struct burn_drive *d, int start, struct buffer *buf)
 
 		/* >>> make this scsi_notify_error() when liberated */
 		if (c.sense[2]!=0) {
+
+#ifdef NIX
 			char msg[160];
 			sprintf(msg,
 		"SCSI error on write(%d,%d): key=%X asc=%2.2Xh ascq=%2.2Xh",
 				start, len,
 				c.sense[2],c.sense[12],c.sense[13]);
+#else /* NIX */
+			char msg[256];
+			int key, asc, ascq;
+
+			sprintf(msg, "SCSI error on write(%d,%d): ",
+					start, len);
+			scsi_error_msg(d, c.sense, 14, msg + strlen(msg), 
+					&key, &asc, &ascq);
+
+#endif /* !NIX */
+
 			libdax_msgs_submit(libdax_messenger, d->global_index,
 				0x0002011d,
 				LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
@@ -1130,8 +1159,9 @@ static int mmc_read_toc_al(struct burn_drive *d, int *alloc_len)
 	struct buffer buf;
 	struct command c;
 	int dlen;
-	int i, bpl= 12, old_alloc_len;
+	int i, bpl= 12, old_alloc_len, t_idx;
 	unsigned char *tdata;
+	char msg[321];
 
 	if (*alloc_len < 4)
 		return 0;
@@ -1207,7 +1237,9 @@ static int mmc_read_toc_al(struct burn_drive *d, int *alloc_len)
 	ts A61007 : if re-enabled then not via Assert.
 	a ssert(((dlen - 2) % 11) == 0);
 */
-	d->toc_entry = calloc(d->toc_entries, sizeof(struct burn_toc_entry));
+	/* ts A81202: plus number of sessions as reserve for leadout default */
+	d->toc_entry = calloc(d->toc_entries + (unsigned char) c.page->data[3],
+				 sizeof(struct burn_toc_entry));
 	if(d->toc_entry == NULL) /* ts A70825 */
 		return 0;
 	tdata = c.page->data + 4;
@@ -1293,6 +1325,46 @@ static int mmc_read_toc_al(struct burn_drive *d, int *alloc_len)
 	if (d->status == BURN_DISC_UNREADY)
 		d->status = BURN_DISC_FULL;
 	toc_find_modes(d);
+
+	/* ts A81202 ticket 146 : a drive reported a session with no leadout */
+	for (i = 0; i < d->disc->sessions; i++) {
+		if (d->disc->session[i]->leadout_entry != NULL)
+	continue;
+		sprintf(msg, "Session %d of %d encountered without leadout",
+			i + 1, d->disc->sessions);
+		libdax_msgs_submit(libdax_messenger, d->global_index,
+				0x00020160,
+				LIBDAX_MSGS_SEV_WARNING, LIBDAX_MSGS_PRIO_HIGH,
+				msg, 0, 0);
+
+		/* Produce default leadout entry from last track of session
+		   which will thus get its size set to 0 */;
+		if (d->disc->session[i]->track != NULL &&
+		    d->disc->session[i]->tracks > 0) {
+			t_idx = d->toc_entries++;
+			memcpy(d->toc_entry + t_idx,
+				d->disc->session[i]->track[
+				       d->disc->session[i]->tracks - 1]->entry,
+				sizeof(struct burn_toc_entry));
+			d->toc_entry[t_idx].point = 0xA2;
+			d->disc->session[i]->leadout_entry =
+							 d->toc_entry + t_idx;
+		} else {
+			burn_disc_remove_session(d->disc, d->disc->session[i]);
+			sprintf(msg,
+				"Empty session %d deleted. Now %d sessions.",
+				i + 1, d->disc->sessions);
+			libdax_msgs_submit(libdax_messenger, d->global_index,
+				0x00020161,
+				LIBDAX_MSGS_SEV_WARNING, LIBDAX_MSGS_PRIO_HIGH,
+				msg, 0, 0);
+			i--;
+		}
+	}
+
+	/* A80808 */
+	burn_disc_cd_toc_extensions(d->disc, 0);
+
 	return 1;
 }
 
@@ -1394,6 +1466,75 @@ inquire_drive:;
 }
 
 
+/* ts A61201 */
+static char *mmc_obtain_profile_name(int profile_number)
+{
+	static char *texts[0x53] = {NULL};
+	int i, max_pno = 0x53;
+	
+	if (texts[0] == NULL) {
+		for (i = 0; i<max_pno; i++)
+			texts[i] = "";
+		/* mmc5r03c.pdf , Table 89, Spelling: guessed cdrecord style */
+		texts[0x01] = "Non-removable disk";
+		texts[0x02] = "Removable disk";
+		texts[0x03] = "MO erasable";
+		texts[0x04] = "Optical write once";
+		texts[0x05] = "AS-MO";
+		texts[0x08] = "CD-ROM";
+		texts[0x09] = "CD-R";
+		texts[0x0a] = "CD-RW";
+		texts[0x10] = "DVD-ROM";
+		texts[0x11] = "DVD-R sequential recording";
+		texts[0x12] = "DVD-RAM";
+		texts[0x13] = "DVD-RW restricted overwrite";
+		texts[0x14] = "DVD-RW sequential recording";
+		texts[0x15] = "DVD-R/DL sequential recording";
+		texts[0x16] = "DVD-R/DL layer jump recording";
+		texts[0x1a] = "DVD+RW";
+		texts[0x1b] = "DVD+R";
+		texts[0x2a] = "DVD+RW/DL";
+		texts[0x2b] = "DVD+R/DL";
+		texts[0x40] = "BD-ROM";
+		texts[0x41] = "BD-R sequential recording";
+		texts[0x42] = "BD-R random recording";
+		texts[0x43] = "BD-RE";
+		texts[0x50] = "HD-DVD-ROM";
+		texts[0x51] = "HD-DVD-R";
+		texts[0x52] = "HD-DVD-RAM";
+	}
+	if (profile_number<0 || profile_number>=max_pno)
+		return "";
+	return texts[profile_number];
+}
+
+
+/* ts A90603 : to be used if the drive knows no GET CONFIGURATION
+*/
+static int mmc_guess_profile(struct burn_drive *d, int flag)
+{
+	int cp;
+
+	cp = 0;
+	if (d->status == BURN_DISC_BLANK ||
+	    d->status == BURN_DISC_APPENDABLE) {
+		cp = 0x09;
+	} else if (d->status == BURN_DISC_FULL) {
+		cp = 0x08;
+	}
+	if (cp)
+		if (d->erasable)
+			cp = 0x0a;
+	d->current_profile = cp;
+	if (cp == 0)
+		return 0;
+	d->current_is_cd_profile = 1;
+	d->current_is_supported_profile = 1;
+	strcpy(d->current_profile_text, mmc_obtain_profile_name(cp));
+	return 1;
+}
+
+
 static int mmc_read_disc_info_al(struct burn_drive *d, int *alloc_len)
 {
 	struct buffer buf;
@@ -1401,7 +1542,8 @@ static int mmc_read_disc_info_al(struct burn_drive *d, int *alloc_len)
 	struct command c;
 	char msg[160];
 	/* ts A70131 : had to move mmc_read_toc() to end of function */
-	int do_read_toc = 0, session_state, disc_status, len, old_alloc_len;
+	int do_read_toc = 0, disc_status, len, old_alloc_len;
+	int ret, number_of_sessions = -1;
 
 	/* ts A61020 */
 	d->start_lba = d->end_lba = -2000000000;
@@ -1412,6 +1554,9 @@ static int mmc_read_disc_info_al(struct burn_drive *d, int *alloc_len)
 	d->media_capacity_remaining = 0;
 	d->media_lba_limit = 0;
 
+	/* ts A81210 */
+	d->media_read_capacity = 0x7fffffff;
+
 	/* ts A61202 */
 	d->toc_entries = 0;
 	if (d->status == BURN_DISC_EMPTY)
@@ -1457,6 +1602,9 @@ static int mmc_read_disc_info_al(struct burn_drive *d, int *alloc_len)
 	d->erasable = !!(data[2] & 16);
 
  	disc_status = data[2] & 3;
+	d->state_of_last_session = (data[2] >> 2) & 3;
+	number_of_sessions = (data[9] << 8) | data[4];
+
 	if (d->current_profile == 0x10 || d->current_profile == 0x40) {
 							 /* DVD-ROM , BD-ROM */
 		disc_status = 2; /* always full and finalized */
@@ -1472,8 +1620,15 @@ static int mmc_read_disc_info_al(struct burn_drive *d, int *alloc_len)
 #ifdef Libburn_support_bd_r_readonlY
 	/* <<< For now: declaring BD-R read-only
 	*/
-	if (d->current_profile == 0x41 || d->current_profile == 0x42) {
-						 /* BD-R seq, BD-R rnd */
+#ifndef Libburn_support_bd_plus_r_srM
+	if (d->current_profile == 0x41) {
+					/* BD-R seq as readonly dummy */
+		disc_status = 2; /* always full and finalized */
+		d->erasable = 0; /* never erasable */
+	}
+#endif
+	if (d->current_profile == 0x42) {
+						 /* BD-R rnd */
 		disc_status = 2; /* always full and finalized */
 		d->erasable = 0; /* never erasable */
 	}
@@ -1481,6 +1636,7 @@ static int mmc_read_disc_info_al(struct burn_drive *d, int *alloc_len)
 
 	switch (disc_status) {
 	case 0:
+regard_as_blank:;
 		d->toc_entries = 0;
 		d->start_lba = burn_msf_to_lba(data[17], data[18], data[19]);
 		d->end_lba = burn_msf_to_lba(data[21], data[22], data[23]);
@@ -1495,27 +1651,43 @@ static int mmc_read_disc_info_al(struct burn_drive *d, int *alloc_len)
 		break;
 	case 1:
 		d->status = BURN_DISC_APPENDABLE;
+
 	case 2:
 		if (disc_status == 2)
 			d->status = BURN_DISC_FULL;
+
+		/* ts A81210 */
+		ret = mmc_read_capacity(d);
+		/* Freshly formatted, unwritten BD-R pretend to be appendable
+		   but in our model they need to be regarded as blank.
+		   Criterion: BD-R seq, read capacity known and 0,
+		              declared appendable, single empty session
+		*/
+		if (d->current_profile == 0x41 &&
+		    d->status == BURN_DISC_APPENDABLE &&
+		    ret > 0 && d->media_read_capacity == 0 &&
+		    d->state_of_last_session == 0 && number_of_sessions == 1)
+			goto regard_as_blank;
+
+		if (d->current_profile == 0x41 &&
+		    d->status == BURN_DISC_APPENDABLE &&
+		    d->state_of_last_session == 1) {
+
+			/* ??? apply this test to other media types ? */
+
+			libdax_msgs_submit(libdax_messenger, d->global_index,
+				 0x00020169,
+				 LIBDAX_MSGS_SEV_WARNING, LIBDAX_MSGS_PRIO_HIGH,
+				 "Last session on media is still open.", 0, 0);
+		}
+
 		do_read_toc = 1;
 		break;
 	}
 
-
-#ifdef NIX
-        /* <<< on its way out. DVD-R DL are current_is_supported_profile
-               unconditionally. Writeability is handled above now.
-        */
-	/* ts A80207 : DVD - R DL can normally be read but not be written */
-	if(d->current_profile == 0x15 && !d->current_is_supported_profile) {
-		if(d->status == BURN_DISC_APPENDABLE)
-			d->status = BURN_DISC_FULL;
-		d->erasable = 0; /* never erasable */
-		d->current_is_supported_profile = 1;
-	}
-#endif /* NIX */
-
+	/* ts A90603 : An MMC-1 drive might not know the media type yet */
+	if (d->current_is_guessed_profile && d->current_profile == 0)
+		mmc_guess_profile(d, 0);
 
 	if ((d->current_profile != 0 || d->status != BURN_DISC_UNREADY) 
 		&& ! d->current_is_supported_profile) {
@@ -1532,7 +1704,7 @@ static int mmc_read_disc_info_al(struct burn_drive *d, int *alloc_len)
 		return 0;
 	}
 
-	/* >>> ts A61217 : Note for future
+	/* ts A61217 : Note for future
 	   growisofs performs OPC if (data[0]<<8)|data[1]<=32
 	   which indicates no OPC entries are attached to the
 	   reply from the drive.
@@ -1560,10 +1732,9 @@ static int mmc_read_disc_info_al(struct burn_drive *d, int *alloc_len)
 		d->complete_sessions = 0;
 	} else {
 		/* ts A70131 : number of non-empty sessions */
-		d->complete_sessions = (data[9] << 8) | data[4];
-		session_state = (data[2] >> 2) & 3;
+		d->complete_sessions = number_of_sessions;
 		/* mmc5r03c.pdf 6.22.3.1.3 State of Last Session: 3=complete */
-		if (session_state != 3 && d->complete_sessions >= 1)
+		if (d->state_of_last_session != 3 && d->complete_sessions >= 1)
 			d->complete_sessions--;
 
 		/* ts A70129 : mmc5r03c.pdf 6.22.3.1.7
@@ -1920,8 +2091,9 @@ int mmc_set_streaming(struct burn_drive *d,
 	struct buffer buf;
 	struct command c;
 	int b, eff_end_lba;
-	char msg[160];
+	char msg[256];
 	unsigned char *pd;
+	int key, asc, ascq;
 
 	if (mmc_function_spy(d, "mmc_set_streaming") <= 0)
 		return 0;
@@ -1984,6 +2156,8 @@ int mmc_set_streaming(struct burn_drive *d,
 	d->issue_command(d, &c);
 	if (c.error) {
 		if (c.sense[2]!=0 && !d->silent_on_scsi_error) {
+
+#ifdef NIX
 			sprintf(msg,
 	"SCSI error on set_streaming(%d): key=%X asc=%2.2Xh ascq=%2.2Xh",
 				w_speed,
@@ -1993,6 +2167,15 @@ int mmc_set_streaming(struct burn_drive *d,
 				0x00020124,
 				LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
 				msg, 0, 0);
+#else /* NIX */
+
+			sprintf(msg,
+				"SCSI error on set_streaming(%d): ", w_speed);
+			scsi_error_msg(d, c.sense, 14, msg + strlen(msg), 
+					&key, &asc, &ascq);
+
+#endif /* !NIX */
+
 		}
 		return 0;
 	}
@@ -2061,49 +2244,6 @@ void mmc_set_speed(struct burn_drive *d, int r, int w)
 }
 
 
-/* ts A61201 */
-static char *mmc_obtain_profile_name(int profile_number)
-{
-	static char *texts[0x53] = {NULL};
-	int i, max_pno = 0x53;
-	
-	if (texts[0] == NULL) {
-		for (i = 0; i<max_pno; i++)
-			texts[i] = "";
-		/* mmc5r03c.pdf , Table 89, Spelling: guessed cdrecord style */
-		texts[0x01] = "Non-removable disk";
-		texts[0x02] = "Removable disk";
-		texts[0x03] = "MO erasable";
-		texts[0x04] = "Optical write once";
-		texts[0x05] = "AS-MO";
-		texts[0x08] = "CD-ROM";
-		texts[0x09] = "CD-R";
-		texts[0x0a] = "CD-RW";
-		texts[0x10] = "DVD-ROM";
-		texts[0x11] = "DVD-R sequential recording";
-		texts[0x12] = "DVD-RAM";
-		texts[0x13] = "DVD-RW restricted overwrite";
-		texts[0x14] = "DVD-RW sequential recording";
-		texts[0x15] = "DVD-R/DL sequential recording";
-		texts[0x16] = "DVD-R/DL layer jump recording";
-		texts[0x1a] = "DVD+RW";
-		texts[0x1b] = "DVD+R";
-		texts[0x2a] = "DVD+RW/DL";
-		texts[0x2b] = "DVD+R/DL";
-		texts[0x40] = "BD-ROM";
-		texts[0x41] = "BD-R sequential recording";
-		texts[0x42] = "BD-R random recording";
-		texts[0x43] = "BD-RE";
-		texts[0x50] = "HD-DVD-ROM";
-		texts[0x51] = "HD-DVD-R";
-		texts[0x52] = "HD-DVD-RAM";
-	}
-	if (profile_number<0 || profile_number>=max_pno)
-		return "";
-	return texts[profile_number];
-}
-
-
 /* ts A61201 : found in unfunctional state
  */
 static int mmc_get_configuration_al(struct burn_drive *d, int *alloc_len)
@@ -2123,8 +2263,11 @@ static int mmc_get_configuration_al(struct burn_drive *d, int *alloc_len)
         d->current_profile_text[0] = 0;
 	d->current_is_cd_profile = 0;
 	d->current_is_supported_profile = 0;
+        d->current_is_guessed_profile = 0;
 	d->current_has_feat21h = 0;
 	d->current_feat21h_link_size = -1;
+	d->current_feat23h_byte4 = 0;
+	d->current_feat23h_byte8 = 0;
 	d->current_feat2fh_byte4 = -1;
 
 	scsi_init_command(&c, MMC_GET_CONFIGURATION,
@@ -2143,8 +2286,24 @@ static int mmc_get_configuration_al(struct burn_drive *d, int *alloc_len)
 	c.dir = FROM_DRIVE;
 	d->issue_command(d, &c);
 
-	if (c.error)
+#ifdef Libisofs_simulate_old_mmc1_drivE
+	c.error = 1;
+	c.sense[2] = 0x5;
+	c.sense[12] = 0x20;
+	c.sense[13] = 0x0;
+#endif /* Libisofs_simulate_old_mmc1_drivE */
+
+	if (c.error) {
+		/* ts A90603 : MMC-1 drive do not know 46h GET CONFIGURATION */
+		if (c.sense[2] == 0x5 && c.sense[12] == 0x20 &&
+		    c.sense[13] == 0x0) {
+			d->current_is_guessed_profile = 1;
+			/* Will yield a non-zero profile only after
+			   mmc_read_disc_info_al() was called */
+			mmc_guess_profile(d, 0);
+		}
 		return 0;
+	}
 	old_alloc_len = *alloc_len;
 	*alloc_len = len = mmc_four_char_to_int(c.page->data);
 	if (len > old_alloc_len)
@@ -2171,7 +2330,11 @@ static int mmc_get_configuration_al(struct burn_drive *d, int *alloc_len)
 		d->current_is_supported_profile = 1;
 
 #ifdef Libburn_support_bd_r_readonlY
-	if (cp == 0x41 || cp == 0x42) /* BD-R sequential, BD-R random */
+#ifndef Libburn_support_bd_plus_r_srM
+	if (cp == 0x41) /* BD-R sequential (here as read-only dummy) */
+		d->current_is_supported_profile = 1;
+#endif
+	if (cp == 0x42) /* BD-R random recording */
 		d->current_is_supported_profile = 1;
 #endif
 
@@ -2212,6 +2375,10 @@ static int mmc_get_configuration_al(struct burn_drive *d, int *alloc_len)
 	if (cp == 0x1b || cp == 0x2b) /* DVD+R , DVD+R/DL */
 		d->current_is_supported_profile = 1;
 #endif
+#ifdef Libburn_support_bd_plus_r_srM
+	if (cp == 0x41) /* BD-R SRM */
+		d->current_is_supported_profile = 1;
+#endif
 
 /* Enable this to get loud and repeated reports about the feature set :
 #define Libburn_print_feature_descriptorS 1
@@ -2278,6 +2445,20 @@ static int mmc_get_configuration_al(struct burn_drive *d, int *alloc_len)
 
 			}
 
+		} else if (feature_code == 0x23) {
+			d->current_feat23h_byte4 = descr[4];
+			d->current_feat23h_byte8 = descr[8];
+#ifdef Libburn_print_feature_descriptorS
+			if (cp >= 0x41 && cp <= 0x43) 
+				fprintf(stderr,
+			"LIBBURN_EXPERIMENTAL : BD formats: %s%s%s%s%s\n",
+					descr[4] & 1 ? " Cert" : "",
+					descr[4] & 2 ? " QCert" : "",
+					descr[4] & 4 ? " Expand" : "",
+					descr[4] & 8 ? " RENoSA" : "",
+					descr[8] & 1 ? " RRM" : "");
+#endif /* Libburn_print_feature_descriptorS */
+
 		} else if (feature_code == 0x2F) {
 			if (descr[2] & 1)
 				d->current_feat2fh_byte4 = descr[4];
@@ -2685,6 +2866,7 @@ int mmc_read_buffer_capacity(struct burn_drive *d)
                bit6= try to avoid lengthy media certification
                bit7= bit8 to bit15 contain the index of the format to use
                bit8-bit15 = see bit7
+              bit16= enable POW on blank BD-R
 */
 int mmc_format_unit(struct burn_drive *d, off_t size, int flag)
 {
@@ -2694,7 +2876,9 @@ int mmc_format_unit(struct burn_drive *d, off_t size, int flag)
 	int index, format_sub_type = 0, format_00_index, size_mode;
 	int accept_count = 0;
 	off_t num_of_blocks = 0, diff, format_size, i_size, format_00_max_size;
-	char msg[160],descr[80];
+	off_t min_size = -1, max_size = -1;
+	char msg[256],descr[80];
+	int key, asc, ascq;
 	int full_format_type = 0x00; /* Full Format (or 0x10 for DVD-RW ?) */
 
 	if (mmc_function_spy(d, "mmc_format_unit") <= 0)
@@ -2739,7 +2923,8 @@ selected_not_suitable:;
 			d->current_profile == 0x14 ||
 			d->current_profile == 0x1a ||
 			d->current_profile == 0x12 ||
-			 d->current_profile == 0x43))
+			d->current_profile == 0x41 ||
+			d->current_profile == 0x43))
 			goto unsuitable_media;
 		      
 		format_type = d->format_descriptors[index].type;
@@ -2747,7 +2932,8 @@ selected_not_suitable:;
 		      format_type == 0x10 ||
 		      format_type == 0x11 || format_type == 0x13 ||
 		      format_type == 0x15 || format_type == 0x26 ||
- 		      format_type == 0x30 || format_type == 0x31 ))
+ 		      format_type == 0x30 || format_type == 0x31 ||
+		      format_type == 0x32))
 			goto selected_not_suitable;
 		if (flag & 4) {
 			num_of_blocks =
@@ -2759,7 +2945,8 @@ selected_not_suitable:;
 				 c.page->data[9 + i] =
 					( d->format_descriptors[index].tdp >>
 					  (16 - 8 * i)) & 0xff;
-		if (format_type == 0x30 || format_type == 0x31) {
+		if (format_type == 0x30 || format_type == 0x31 ||
+		    format_type == 0x32) {
 			if (flag & 64)
 				format_sub_type = 3; /* Quick certification */
 			else
@@ -2975,6 +3162,116 @@ no_suitable_formatting_type:;
 			c.opcode[1] |= 0x08;
 		}
 
+	} else if (d->current_profile == 0x41) {
+		/* BD-R SRM */
+
+		index = -1;
+		format_size = -1;
+		if (d->num_format_descr <= 0)
+			goto no_suitable_formatting_type;
+		if (d->format_descriptors[0].type != 0)
+			goto no_suitable_formatting_type;
+		for (i = 0; i < d->num_format_descr; i++) {
+			format_type = d->format_descriptors[i].type;
+			i_size = d->format_descriptors[i].size;
+			if (format_type != 0x00 && format_type != 0x32)
+		continue;
+			if (flag & 32) { /* No defect mgt */
+				/* ts A81211 : MMC-5 6.5.4.2.17.1
+				   When formatted with Format Type 32h,
+				   the BD-R disc is required to allocate
+				   a non-zero number of spares.
+				*/
+				goto no_suitable_formatting_type;
+
+			} else if(size_mode == 2) { /* max payload size */
+				/* search largest 0x32 format descriptor */
+				if(format_type != 0x32)
+		continue;
+			} else if(size_mode == 3) { /* default payload size */
+				if (format_type == 0x00) {
+					index = i;
+		break;
+				}
+		continue;
+			} else { /* defect managed format with size wish */
+
+#ifdef Libburn_bd_r_format_olD
+
+				/* search for smallest 0x32 >= size */
+				if(format_type != 0x32)
+		continue;
+				if (i_size < size)
+		continue;
+				if (format_size >= 0 && i_size >= format_size)
+		continue;
+				index = i;
+				format_size = i_size;
+		continue;
+
+#else /* Libburn_bd_r_format_olD */
+
+				/* search largest and smallest 0x32 */
+				if(format_type != 0x32)
+		continue;
+				if (i_size < min_size || min_size < 0)
+					min_size = i_size;
+				if (i_size > max_size)
+					max_size = i_size;
+
+#endif /* ! Libburn_bd_r_format_olD */
+
+			}
+			/* common for all cases which search largest
+			   descriptors */
+			if (i_size > format_size) {
+				format_size = i_size;
+				index = i;
+			}
+		}
+		if (size_mode == 2 && index < 0 && !(flag & 32))
+			index = 0;
+		if (index < 0)
+			goto no_suitable_formatting_type;
+		format_type = d->format_descriptors[index].type;
+		if (flag & (1 << 16))
+			format_sub_type = 0; /* SRM + POW  */
+		else
+			format_sub_type = 1; /* SRM  (- POW) */
+
+#ifdef Libburn_bd_r_format_olD
+		if (0) {
+#else
+		if (size_mode == 0 || size_mode == 1) {
+#endif /* ! Libburn_bd_r_format_olD */
+
+			if (min_size < 0 || max_size < 0)
+				goto no_suitable_formatting_type;
+			if (size <= 0)
+				size = min_size;
+			if (size % 0x10000)
+				size += 0x10000 - (size % 0x10000);
+			if (size < min_size)
+				goto no_suitable_formatting_type;
+			else if(size > max_size)
+				goto no_suitable_formatting_type;
+			num_of_blocks = size / 2048;
+			mmc_int_to_four_char(c.page->data + 4, num_of_blocks);
+			for (i = 0; i < 3; i++)
+				 c.page->data[9 + i] = 0;
+		} else {
+			num_of_blocks = 
+				d->format_descriptors[index].size / 2048;
+			mmc_int_to_four_char(c.page->data + 4, num_of_blocks);
+			for (i = 0; i < 3; i++)
+				 c.page->data[9 + i] =
+					( d->format_descriptors[index].tdp >>
+						  (16 - 8 * i)) & 0xff;
+		}
+		sprintf(descr, "%s", d->current_profile_text);
+		return_immediately = 1; /* caller must do the waiting */
+		c.page->data[1] |= 0x80;  /* FOV = this flag vector is valid */
+
 	} else if (d->current_profile == 0x43) {
 		/* BD-RE */
 		index = -1;
@@ -3000,6 +3297,17 @@ no_suitable_formatting_type:;
 			} else if(size_mode == 3) { /* default payload size */
 				if (accept_count < 1)
 					index = 0; /* this cannot certify */
+
+				/* ts A81129
+				   LG GGW-H20L YL03 refuses on 0x30 with 
+				   "Quick certification". dvd+rw-format
+				   does 0x00 by default and succeeds quickly.
+				*/
+				if ((flag & 64) && format_type == 0x00) {
+					index = i;
+		break;
+				}
+
 				if(format_type != 0x30)
 		continue;
 				accept_count++;
@@ -3007,6 +3315,9 @@ no_suitable_formatting_type:;
 					index = i;
 		continue;
 			} else { /* defect managed format with size wish */
+
+#ifdef Libburn_bd_re_format_olD
+
 				/* search for smallest 0x30 >= size */
 				if(format_type != 0x30)
 		continue;
@@ -3017,6 +3328,19 @@ no_suitable_formatting_type:;
 				index = i;
 				format_size = i_size;
 		continue;
+
+#else /* Libburn_bd_re_format_olD */
+
+				/* search largest and smallest 0x30 */
+				if(format_type != 0x30)
+		continue;
+				if (i_size < min_size || min_size < 0)
+					min_size = i_size;
+				if (i_size > max_size)
+					max_size = i_size;
+
+#endif /* ! Libburn_bd_re_format_olD */
+
 			}
 			/* common for all cases which search largest
 			   descriptors */
@@ -3025,6 +3349,7 @@ no_suitable_formatting_type:;
 				index = i;
 			}
 		}
+
 		if (size_mode == 2 && index < 0 && !(flag & 32))
 			index = 0;
 		if (index < 0)
@@ -3036,12 +3361,36 @@ no_suitable_formatting_type:;
 			else
 				format_sub_type = 2; /* Full certification */
 		}
-		num_of_blocks = d->format_descriptors[index].size / 2048;
-		mmc_int_to_four_char(c.page->data + 4, num_of_blocks);
-		for (i = 0; i < 3; i++)
-			 c.page->data[9 + i] =
-				( d->format_descriptors[index].tdp >>
-					  (16 - 8 * i)) & 0xff;
+
+#ifdef Libburn_bd_re_format_olD
+		if (0) {
+#else
+		if (size_mode == 0 || size_mode == 1) {
+#endif /* ! Libburn_bd_re_format_olD */
+
+			if (min_size < 0 || max_size < 0)
+				goto no_suitable_formatting_type;
+			if (size <= 0)
+				size = min_size;
+			if (size % 0x10000)
+				size += 0x10000 - (size % 0x10000);
+			if (size < min_size)
+				goto no_suitable_formatting_type;
+			else if(size > max_size)
+				goto no_suitable_formatting_type;
+			num_of_blocks = size / 2048;
+			mmc_int_to_four_char(c.page->data + 4, num_of_blocks);
+			for (i = 0; i < 3; i++)
+				 c.page->data[9 + i] = 0;
+		} else {
+			num_of_blocks = 
+				d->format_descriptors[index].size / 2048;
+			mmc_int_to_four_char(c.page->data + 4, num_of_blocks);
+			for (i = 0; i < 3; i++)
+				 c.page->data[9 + i] =
+					( d->format_descriptors[index].tdp >>
+						  (16 - 8 * i)) & 0xff;
+		}
 		sprintf(descr, "%s", d->current_profile_text);
 		return_immediately = 1; /* caller must do the waiting */
 		c.page->data[1] |= 0x80;  /* FOV = this flag vector is valid */
@@ -3096,6 +3445,8 @@ unsuitable_media:;
 	d->issue_command(d, &c);
 	if (c.error && !tolerate_failure) {
 		if (c.sense[2]!=0) {
+
+#ifdef NIX
 			sprintf(msg,
 		"SCSI error on format_unit(%s): key=%X asc=%2.2Xh ascq=%2.2Xh",
 				descr,
@@ -3104,6 +3455,13 @@ unsuitable_media:;
 				0x00020122,
 				LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
 				msg, 0, 0);
+#else /* NIX */
+			sprintf(msg, "SCSI error on format_unit(%s): ", descr);
+			scsi_error_msg(d, c.sense, 14, msg + strlen(msg), 
+					&key, &asc, &ascq);
+
+#endif /* !NIX */
+
 		}
 		return 0;
 	} else if ((!c.error) && (format_type == 0x13 || format_type == 0x15))
@@ -3170,6 +3528,14 @@ static int mmc_get_write_performance_al(struct burn_drive *d,
 	c.page->bytes = 0;
 	c.dir = FROM_DRIVE;
 	d->issue_command(d, &c);
+
+#ifdef Libisofs_simulate_old_mmc1_drivE
+	c.error = 1;
+	c.sense[2] = 0x5;
+	c.sense[12] = 0x20;
+	c.sense[13] = 0x0;
+#endif /* Libisofs_simulate_old_mmc1_drivE */	
+
 	if (c.error)
 		return 0;
         len = mmc_four_char_to_int(c.page->data);
@@ -3351,8 +3717,9 @@ int mmc_compose_mode_page_5(struct burn_drive *d,
 
 	} else if (d->current_profile == 0x1a || d->current_profile == 0x1b ||
 	           d->current_profile == 0x2b || d->current_profile == 0x12 ||
+		   d->current_profile == 0x41 || d->current_profile == 0x42 ||
 		   d->current_profile == 0x43) {
-		/* not with DVD+R[W][/DL] or DVD-RAM or BD-RE */;
+		/* not with DVD+R[W][/DL] or DVD-RAM or BD-R[E] */;
 		return 0;
 	} else {
 		/* Traditional setup for CD */
@@ -3405,11 +3772,24 @@ int mmc_read_10(struct burn_drive *d, int start,int amount, struct buffer *buf)
 	c.dir = FROM_DRIVE;
 	d->issue_command(d, &c);
 	if (c.error) {
+
+#ifdef NIX
 		char msg[160];
+
 		sprintf(msg,
 		"SCSI error on read_10(%d,%d): key=%X asc=%2.2Xh ascq=%2.2Xh",
 			start, amount,
 			c.sense[2],c.sense[12],c.sense[13]);
+#else /* NIX */
+		char msg[256];
+		int key, asc, ascq;
+
+		sprintf(msg, "SCSI error on read_10(%d,%d): ", start, amount);
+		scsi_error_msg(d, c.sense, 14, msg + strlen(msg), 
+				&key, &asc, &ascq);
+
+#endif /* !NIX */
+
 		if(!d->silent_on_scsi_error)
 			libdax_msgs_submit(libdax_messenger, d->global_index,
 				0x00020144,
@@ -3424,6 +3804,34 @@ int mmc_read_10(struct burn_drive *d, int start,int amount, struct buffer *buf)
 }
 
 
+/* ts A81210 : Determine the upper limit of readable data size */
+int mmc_read_capacity(struct burn_drive *d)
+{
+	struct buffer buf;
+	struct command c;
+	int alloc_len= 8;
+
+	d->media_read_capacity = 0x7fffffff;
+	if (mmc_function_spy(d, "mmc_read_capacity") <= 0)
+		return 0;
+
+	scsi_init_command(&c, MMC_READ_CAPACITY, sizeof(MMC_READ_CAPACITY));
+	c.dxfer_len = alloc_len;
+	c.retry = 1;
+	c.page = &buf;
+	c.page->bytes = 0;
+	c.page->sectors = 0;
+	c.dir = FROM_DRIVE;
+	d->issue_command(d, &c);
+	d->media_read_capacity = mmc_four_char_to_int(c.page->data);
+	if (d->media_read_capacity < 0) {
+		d->media_read_capacity = 0x7fffffff;
+		return 0;
+	}
+	return 1;
+}
+
+
 /* ts A61021 : the mmc specific part of sg.c:enumerate_common()
 */
 int mmc_setup_drive(struct burn_drive *d)
@@ -3463,17 +3871,22 @@ int mmc_setup_drive(struct burn_drive *d)
 	d->current_profile_text[0] = 0;
 	d->current_is_cd_profile = 0;
 	d->current_is_supported_profile = 0;
+	d->current_is_guessed_profile = 0;
 	d->current_has_feat21h = 0;
 	d->current_feat21h_link_size = -1;
+	d->current_feat23h_byte4 = 0;
+	d->current_feat23h_byte8 = 0;
 	d->current_feat2fh_byte4 = -1;
 	d->needs_close_session = 0;
 	d->needs_sync_cache = 0;
 	d->bg_format_status = -1;
 	d->num_format_descr = 0;
 	d->complete_sessions = 0;
+	d->state_of_last_session = -1;
 	d->last_track_no = 1;
 	d->media_capacity_remaining = 0;
 	d->media_lba_limit = 0;
+	d->media_read_capacity = 0x7fffffff;
 	d->pessimistic_buffer_free = 0;
 	d->pbf_altered = 0;
 	d->wait_for_buffer_free = Libburn_wait_for_buffer_freE;

libburn/mmc.h

@@ -72,6 +72,8 @@ int mmc_compose_mode_page_5(struct burn_drive *d,
 int mmc_read_10(struct burn_drive *d, int start, int amount,
                 struct buffer *buf);
 
+/* ts A81210 : Determine the upper limit of readable data size */
+int mmc_read_capacity(struct burn_drive *d);
 
 
 /* mmc5r03c.pdf 4.3.4.4.1 d) "The maximum number of RZones is 2 302." */

libburn/options.c

@@ -143,7 +143,7 @@ int burn_write_opts_set_simulate(struct burn_write_opts *opts, int sim)
 int burn_write_opts_set_underrun_proof(struct burn_write_opts *opts,
 				       int underrun_proof)
 {
-	if (!opts->drive->mdata->valid)
+	if (opts->drive->mdata->valid <= 0)
 		return 0;
 	if (opts->drive->mdata->underrun_proof) {
 		opts->underrun_proof = underrun_proof;
@@ -385,7 +385,7 @@ void burn_write_opts_set_force(struct burn_write_opts *opts, int use_force)
 void burn_write_opts_set_stream_recording(struct burn_write_opts *opts,
 					 int value)
 {
-	opts->do_stream_recording = !!value;
+	opts->do_stream_recording = value;
 }
 
 

libburn/os-dummy.h

@@ -0,0 +1,63 @@
+
+/* os-dummy.h
+   Operating system specific libburn definitions and declarations. Included
+   by os.h in case of compilation for
+           Unknown POSIX like systems
+           with the dummy MMC transport adapter sg-dummy.c
+
+   Copyright (C) 2009 Thomas Schmitt <scdbackup@gmx.net>, provided under GPL
+*/
+
+
+/** List of all signals which shall be caught by signal handlers and trigger
+    a graceful abort of libburn. (See man 7 signal.)
+*/
+/* Once as system defined macros */
+#define BURN_OS_SIGNAL_MACRO_LIST \
+ SIGHUP, SIGINT, SIGQUIT, SIGILL, SIGABRT, \
+ SIGFPE, SIGSEGV, SIGPIPE, SIGALRM, SIGTERM, \
+ SIGUSR1, SIGUSR2, SIGXCPU, SIGTSTP, SIGTTIN, \
+ SIGTTOU
+
+/* Once as text 1:1 list of strings for messages and interpreters */
+#define BURN_OS_SIGNAL_NAME_LIST \
+ "SIGHUP", "SIGINT", "SIGQUIT", "SIGILL", "SIGABRT", \
+ "SIGFPE", "SIGSEGV", "SIGPIPE", "SIGALRM", "SIGTERM", \
+ "SIGUSR1", "SIGUSR2", "SIGXCPU", "SIGTSTP", "SIGTTIN", \
+ "SIGTTOU"
+
+/* The number of above list items */
+#define BURN_OS_SIGNAL_COUNT 16
+
+/** To list all signals which shall surely not be caught */
+#define BURN_OS_NON_SIGNAL_MACRO_LIST \
+SIGKILL, SIGCHLD, SIGSTOP
+
+/* The number of above list items */
+#define BURN_OS_NON_SIGNAL_COUNT 3
+
+
+/* The maximum size for a (SCSI) i/o transaction */
+/* Important : MUST be at least 32768 ! */
+#define BURN_OS_TRANSPORT_BUFFER_SIZE 65536
+
+
+/* To hold the position of the most recently delivered address from
+   device enumeration.
+*/
+struct burn_drive_enumerator_struct {
+	int pos;
+	int info_count;
+	char **info_list;
+};
+
+#define BURN_OS_DEFINE_DRIVE_ENUMERATOR_T \
+typedef struct burn_drive_enumerator_struct burn_drive_enumerator_t;
+
+
+/* The list of operating system dependent elements in struct burn_drive.
+   Usually they are initialized in  sg-*.c:enumerate_common().
+*/
+#define BURN_OS_TRANSPORT_DRIVE_ELEMENTS \
+	int just_a_dummy;
+

libburn/os-linux.h

@@ -51,11 +51,17 @@ SIGKILL, SIGCHLD, SIGSTOP, SIGURG, SIGWINCH
 #define BURN_OS_TRANSPORT_BUFFER_SIZE 65536
 
 
-/* To hold the index number of the most recently delivered address from
+/* To hold the position of the most recently delivered address from
    device enumeration.
 */
+struct burn_drive_enumerator_struct {
+	int pos;
+	int info_count;
+	char **info_list;
+};
+
 #define BURN_OS_DEFINE_DRIVE_ENUMERATOR_T \
-typedef int burn_drive_enumerator_t;
+typedef struct burn_drive_enumerator_struct burn_drive_enumerator_t;
 
 
 /* Parameters for sibling list. See sibling_fds, sibling_fnames */

libburn/os.h

@@ -3,7 +3,7 @@
    Operating system specific libburn definitions and declarations.
    The macros defined here are used by libburn modules in order to
    avoid own system dependent case distinctions.
-   Copyright (C) 2006 Thomas Schmitt <scdbackup@gmx.net>, provided under GPL
+   Copyright (C) 2009 Thomas Schmitt <scdbackup@gmx.net>, provided under GPL
 */
 
 #ifndef BURN_OS_H_INCLUDED
@@ -20,14 +20,23 @@
 #include "os-freebsd.h"
 
 
-#else  /* operating system case distinction */
+#else
+#ifdef __linux
 
 
 /* --------- Linux kernels 2.4 and 2.6 with Linux SCSI Generic (sg) -------- */
 #include "os-linux.h"
 
 
-#endif /* End of operating system case distinction */
+#else
+
+
+/* --------- Any other system. With dummy MMC transport sg-dummy.c --------- */
+#include "os-dummy.h"
+
+
+#endif /* ! __linux */
+#endif /* ! __FreeBSD__ */
 
 
 #endif /* ! BURN_OS_H_INCLUDED */

libburn/read.c

@@ -323,7 +323,7 @@ int burn_read_data(struct burn_drive *d, off_t byte_address,
 	int alignment = 2048, start, upto, chunksize = 1, err, cpy_size, i;
 	int sose_mem = 0, fd = -1, ret;
 	char msg[81], *wpt;
-	struct buffer buf;
+	struct buffer buf, *buffer_mem = d->buffer;
 
 /*
 #define Libburn_read_data_adr_logginG 1
@@ -443,7 +443,8 @@ int burn_read_data(struct burn_drive *d, off_t byte_address,
 			d->silent_on_scsi_error = sose_mem;
 		if (err == BE_CANCELLED) {
 			/* Try to read a smaller part of the chunk */
-			for (i = 0; i < chunksize - 1; i++) {
+			if(!(flag & 4))
+			  for (i = 0; i < chunksize - 1; i++) {
 				if (flag & 2)
 					d->silent_on_scsi_error = 1;
 				if (d->drive_role == 1) {
@@ -484,7 +485,7 @@ ex:;
 	if (fd != -1)
 		close(fd);
 */
-	d->buffer = NULL;
+	d->buffer = buffer_mem;
 	d->busy = BURN_DRIVE_IDLE;
 	return ret;
 }

libburn/sg-dummy.c

@@ -0,0 +1,229 @@
+/* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */
+
+/*
+
+This is the main operating system dependent SCSI part of libburn. It implements
+the transport level aspects of SCSI control and command i/o.
+
+Present implementation: default dummy which enables libburn only to work
+                        with stdio: pseudo drive addresses.
+                        For real implementations see sg-linux.c or sg-freebsd.c
+
+*/
+
+
+#include <unistd.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <string.h>
+
+#ifdef Libburn_os_has_statvfS
+#include <sys/statvfs.h>
+#endif /* Libburn_os_has_stavtfS */
+
+#include "transport.h"
+#include "drive.h"
+#include "sg.h"
+#include "spc.h"
+#include "mmc.h"
+#include "sbc.h"
+#include "debug.h"
+#include "toc.h"
+#include "util.h"
+
+#include "libdax_msgs.h"
+extern struct libdax_msgs *libdax_messenger;
+
+
+/** Returns the next index number and the next enumerated drive address.
+    The enumeration has to cover all available and accessible drives. It is
+    allowed to return addresses of drives which are not available but under
+    some (even exotic) circumstances could be available. It is on the other
+    hand allowed, only to hand out addresses which can really be used right
+    in the moment of this call. (This implementation chooses the former.)
+    @param idx An opaque handle. Make no own theories about it.
+    @param adr Takes the reply
+    @param adr_size Gives maximum size of reply including final 0
+    @param initialize  1 = start new,
+                       0 = continue, use no other values for now
+                      -1 = finish
+    @return 1 = reply is a valid address , 0 = no further address available
+           -1 = severe error (e.g. adr_size too small)
+*/
+int sg_give_next_adr(burn_drive_enumerator_t *idx,
+		     char adr[], int adr_size, int initialize)
+{
+	return 0;
+}
+
+
+/** Brings all available, not-whitelist-banned, and accessible drives into
+    libburn's list of drives.
+*/
+/* ts A61115: replacing call to sg-implementation internals from drive.c */
+int scsi_enumerate_drives(void)
+{
+	libdax_msgs_submit(libdax_messenger, -1, 0x0002016b,
+		LIBDAX_MSGS_SEV_WARNING, LIBDAX_MSGS_PRIO_HIGH,
+		"No MMC transport adapter is present. Running on sg-dummy.c.",
+		0, 0);
+	return 1;
+}
+
+
+/** Tells wether libburn has the given drive in use or exclusively reserved.
+    If it is "open" then libburn will eventually call sg_release() on it when
+    it is time to give up usage resp. reservation.
+*/
+/** Published as burn_drive.drive_is_open() */
+int sg_drive_is_open(struct burn_drive * d)
+{
+	return 0;
+}
+
+
+/** Opens the drive for SCSI commands and - if burn activities are prone
+    to external interference on your system - obtains an exclusive access lock
+    on the drive. (Note: this is not physical tray locking.)
+    A drive that has been opened with sg_grab() will eventually be handed
+    over to sg_release() for closing and unreserving.
+*/
+int sg_grab(struct burn_drive *d)
+{
+	libdax_msgs_submit(libdax_messenger, d->global_index, 0x0002016a,
+		LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
+		"No MMC transport adapter is present. Running on sg-dummy.c.",
+		0, 0);
+	return 0;
+}
+
+
+/** Gives up the drive for SCSI commands and releases eventual access locks.
+    (Note: this is not physical tray locking.)
+*/
+int sg_release(struct burn_drive *d)
+{
+	return 0;
+}
+
+
+/** Sends a SCSI command to the drive, receives reply and evaluates wether
+    the command succeeded or shall be retried or finally failed.
+    Returned SCSI errors shall not lead to a return value indicating failure.
+    The callers get notified by c->error. An SCSI failure which leads not to
+    a retry shall be notified via scsi_notify_error().
+    The Libburn_log_sg_commandS facility might be of help when problems with
+    a drive have to be examined. It shall stay disabled for normal use.
+    @return: 1 success , <=0 failure
+*/
+int sg_issue_command(struct burn_drive *d, struct command *c)
+{
+	libdax_msgs_submit(libdax_messenger, d->global_index, 0x0002016a,
+		LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
+		"No MMC transport adapter is present. Running on sg-dummy.c.",
+		0, 0);
+	return -1;
+}
+
+
+/** Tries to obtain SCSI address parameters.
+    @return  1 is success , 0 is failure
+*/
+int sg_obtain_scsi_adr(char *path, int *bus_no, int *host_no, int *channel_no,
+                       int *target_no, int *lun_no)
+{
+        libdax_msgs_submit(libdax_messenger, -1, 0x0002016c,
+                LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
+                "No MMC transport adapter is present. Running on sg-dummy.c.",
+                0, 0);
+	return 0;
+}
+
+
+/** Tells wether a text is a persistent address as listed by the enumeration
+    functions.
+*/
+int sg_is_enumerable_adr(char *adr)
+{
+	return(0);
+}
+
+
+/** Estimate the potential payload capacity of a file address.
+    @param path  The address of the file to be examined. If it does not
+                 exist yet, then the directory will be inquired.
+    @param bytes The pointed value gets modified, but only if an estimation is
+                 possible.
+    @return      -2 = cannot perform necessary operations on file object
+                 -1 = neither path nor dirname of path exist
+                  0 = could not estimate size capacity of file object
+                  1 = estimation has been made, bytes was set
+*/
+int burn_os_stdio_capacity(char *path, off_t *bytes)
+{
+	struct stat stbuf;
+
+#ifdef Libburn_os_has_statvfS
+	struct statvfs vfsbuf;
+#endif
+
+	char testpath[4096], *cpt;
+	long blocks;
+	off_t add_size = 0;
+
+	testpath[0] = 0;
+	blocks = *bytes / 512;
+	if (stat(path, &stbuf) == -1) {
+		strcpy(testpath, path);
+		cpt = strrchr(testpath, '/');
+		if(cpt == NULL)
+			strcpy(testpath, ".");
+		else if(cpt == testpath)
+			testpath[1] = 0;
+		else
+			*cpt = 0;
+		if (stat(testpath, &stbuf) == -1)
+			return -1;
+
+#ifdef Libburn_if_this_was_linuX
+
+	} else if(S_ISBLK(stbuf.st_mode)) {
+		fd = open(path, open_mode);
+		if (fd == -1)
+			return -2;
+		ret = ioctl(fd, BLKGETSIZE, &blocks);
+		close(fd);
+		if (ret == -1)
+			return -2;
+		*bytes = ((off_t) blocks) * (off_t) 512;
+
+#endif /* Libburn_if_this_was_linuX */
+
+	} else if(S_ISREG(stbuf.st_mode)) {
+		add_size = stbuf.st_blocks * (off_t) 512;
+		strcpy(testpath, path);
+	} else
+		return 0;
+
+	if (testpath[0]) {	
+
+#ifdef Libburn_os_has_statvfS
+
+		if (statvfs(testpath, &vfsbuf) == -1)
+			return -2;
+		*bytes = add_size + ((off_t) vfsbuf.f_bsize) *
+						(off_t) vfsbuf.f_bavail;
+
+#else /* Libburn_os_has_statvfS */
+
+		return 0;
+
+#endif /* ! Libburn_os_has_stavtfS */
+
+	}
+	return 1;
+}
+

libburn/sg-freebsd-port.c

@@ -76,7 +76,7 @@ Send feedback to libburn-hackers@pykix.org .
 #include <err.h> /* XXX */
 
 
-/* ts A70909 : >>> untestet yet wether this compiles */
+/* ts A70909 */
 #include <sys/statvfs.h>
 
 

libburn/sg-freebsd.c

@@ -1,6 +1,5 @@
 /* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */
 
-#include <assert.h>
 #include <errno.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -18,7 +17,7 @@
 #include <err.h> /* XXX */
 
 
-/* ts A70909 : >>> untestet yet wether this compiles */
+/* ts A70909 */
 #include <sys/statvfs.h>
 
 
@@ -553,11 +552,26 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 	if (c->page) {
 		ccb->csio.data_ptr  = c->page->data;
 		if (c->dir == FROM_DRIVE) {
-			ccb->csio.dxfer_len = BUFFER_SIZE;
+
+			/* ts A90430 : Ticket 148 , by jwehle :
+			   "On ... FreeBSD 6.4 which has a usb memory reader in
+			    addition to a ATAPI DVD burner sg_issue_command
+			    will hang while the SCSI bus is being scanned"
+			*/
+			if (c->dxfer_len >= 0)
+				ccb->csio.dxfer_len = c->dxfer_len;
+			else
+				ccb->csio.dxfer_len = BUFFER_SIZE;
+
 /* touch page so we can use valgrind */
 			memset(c->page->data, 0, BUFFER_SIZE);
 		} else {
-			assert(c->page->bytes > 0);
+			/* ts A90430 */
+			/* a ssert(c->page->bytes > 0); */
+			if (c->page->bytes <= 0) {
+				c->error = 1;
+				return 0;
+			}
 			ccb->csio.dxfer_len = c->page->bytes;
 		}
 	} else {
@@ -622,7 +636,6 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
 	struct statvfs vfsbuf;
 	char testpath[4096], *cpt;
 	long blocks;
-	int open_mode = O_RDWR, fd, ret;
 	off_t add_size = 0;
 
 	testpath[0] = 0;
@@ -642,6 +655,8 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
 #ifdef Libburn_if_this_was_linuX
 
 	} else if(S_ISBLK(stbuf.st_mode)) {
+		int open_mode = O_RDWR, fd, ret;
+
 		if(burn_sg_open_o_excl)
 			open_mode |= O_EXCL;
 		fd = open(path, open_mode);

libburn/sg-linux.c

@@ -470,7 +470,7 @@ static int sg_fcntl_lock(int *fd, char *fd_name, int l_type, int verbous)
 /* ts A60926 */
 static int sg_open_drive_fd(char *fname, int scan_mode)
 {
-	int open_mode = O_RDWR, fd;
+	int open_mode = O_RDWR, fd, tries= 0;
 	char msg[81];
 
 	/* ts A70409 : DDLP-B */
@@ -502,7 +502,8 @@ static int sg_open_drive_fd(char *fname, int scan_mode)
 		"libburn: experimental: O_EXCL= %d , O_NDELAY= %d\n",
 		!!(open_mode&O_EXCL),!!(open_mode&O_NDELAY));
 */
-          
+
+try_open:;
 	fd = open(fname, open_mode);
 	if (fd == -1) {
 /* <<< debugging
@@ -511,6 +512,17 @@ static int sg_open_drive_fd(char *fname, int scan_mode)
 			fname,errno);
 */
 		if (errno == EBUSY) {
+			tries++;
+
+/* <<< debugging
+			fprintf(stderr,
+				"\nlibburn_DEBUG: EBUSY , tries= %d\n", tries);
+*/
+
+			if (tries < 4) {
+				usleep(2000000);
+				goto try_open;
+			}
 			sg_handle_busy_device(fname, errno);
 			return -1;
 			
@@ -644,12 +656,193 @@ failed:;
 }
 
 
+#define Libburn_drive_new_deaL 1
+
+#ifdef Libburn_drive_new_deaL
+
+/* ts A80731 */
+static int is_ata_drive(char *fname)
+{
+	int fd;
+	struct hd_driveid tm;
+
+	fd = sg_open_drive_fd(fname, 1);
+	if (fd == -1) {
+		if (linux_ata_enumerate_verbous)
+			fprintf(stderr,"open failed, errno=%d  '%s'\n",
+				errno, strerror(errno));
+		return 0;
+	}
+
+	memset(&tm, 0, sizeof(tm));
+	ioctl(fd, HDIO_GET_IDENTITY, &tm);
+
+		/* not atapi */
+	if (!(tm.config & 0x8000) || (tm.config & 0x4000)) {
+		if (linux_ata_enumerate_verbous)
+			fprintf(stderr, "not marked as ATAPI\n");
+		sg_close_drive_fd(fname, -1, &fd, 0);
+		return 0;
+	}
+
+	/* if SG_IO fails on an atapi device, we should stop trying to 
+	   use hd* devices */
+	if (sgio_test(fd) == -1) {
+		if (linux_ata_enumerate_verbous)
+		  fprintf(stderr,
+			 "FATAL: sgio_test() failed: errno=%d  '%s'\n",
+			 errno, strerror(errno));
+		sg_close_drive_fd(fname, -1, &fd, 0);
+		return 0;
+	}
+	if (sg_close_drive_fd(fname, -1, &fd, 1) <= 0) {
+		if (linux_ata_enumerate_verbous)
+			fprintf(stderr,
+				"cannot close properly, errno=%d  '%s'\n",
+				errno, strerror(errno));
+		return 0;
+	}
+	return 1;
+}
+
+
+static int is_scsi_drive(char *fname, int *bus_no, int *host_no,
+			 int *channel_no, int *target_no, int *lun_no)
+{
+	int fd, sid_ret = 0, ret;
+	struct sg_scsi_id sid;
+	int sibling_fds[BURN_OS_SG_MAX_SIBLINGS], sibling_count= 0;
+	char sibling_fnames[BURN_OS_SG_MAX_SIBLINGS][BURN_OS_SG_MAX_NAMELEN];
+
+	fd = sg_open_drive_fd(fname, 1);
+	if (fd == -1) {
+		if (linux_sg_enumerate_debug)
+			fprintf(stderr, "open failed, errno=%d  '%s'\n",
+				errno, strerror(errno));
+		return 0;
+	}
+
+	sid_ret = ioctl(fd, SG_GET_SCSI_ID, &sid);
+	if (sid_ret == -1) {
+		sid.scsi_id = -1; /* mark SCSI address as invalid */
+		if(linux_sg_enumerate_debug) 
+			fprintf(stderr,
+			"ioctl(SG_GET_SCSI_ID) failed, errno=%d  '%s' , ",
+			errno, strerror(errno));
+
+		if (sgio_test(fd) == -1) {
+			if (linux_sg_enumerate_debug)
+		  		fprintf(stderr,
+				 "FATAL: sgio_test() failed: errno=%d  '%s'",
+				errno, strerror(errno));
+
+			sg_close_drive_fd(fname, -1, &fd, 0);
+			return 0;
+		}
+
+#ifdef CDROM_DRIVE_STATUS
+		/* http://developer.osdl.org/dev/robustmutexes/
+			  src/fusyn.hg/Documentation/ioctl/cdrom.txt */
+		sid_ret = ioctl(fd, CDROM_DRIVE_STATUS, 0);
+		if(linux_sg_enumerate_debug)
+			  fprintf(stderr,
+				"ioctl(CDROM_DRIVE_STATUS) = %d , ",
+				sid_ret);
+		if (sid_ret != -1 && sid_ret != CDS_NO_INFO)
+			sid.scsi_type = TYPE_ROM;
+		else
+			sid_ret = -1;
+#endif /* CDROM_DRIVE_STATUS */
+
+	}
+
+#ifdef SCSI_IOCTL_GET_BUS_NUMBER
+	/* Hearsay A61005 */
+	if (ioctl(fd, SCSI_IOCTL_GET_BUS_NUMBER, bus_no) == -1)
+		*bus_no = -1;
+#endif
+
+	if (sg_close_drive_fd(fname, -1, &fd, 
+					sid.scsi_type == TYPE_ROM ) <= 0) {
+		if (linux_sg_enumerate_debug)
+			fprintf(stderr,
+				"cannot close properly, errno=%d  '%s'\n",
+				errno, strerror(errno)); 
+		return 0;
+	}
+	if ( (sid_ret == -1 || sid.scsi_type != TYPE_ROM)
+	     && !linux_sg_accept_any_type) {
+		if (linux_sg_enumerate_debug)
+			fprintf(stderr, "sid.scsi_type = %d (!= TYPE_ROM)\n",
+				sid.scsi_type); 
+		return 0;
+	}
+
+	if (sid_ret == -1 || sid.scsi_id < 0) {
+		/* ts A61211 : employ a more general ioctl */
+		ret = sg_obtain_scsi_adr(fname, bus_no, host_no,
+					   channel_no, target_no, lun_no);
+		if (ret>0) {
+			sid.host_no = *host_no;
+			sid.channel = *channel_no;
+			sid.scsi_id = *target_no;
+			sid.lun = *lun_no;
+		} else {
+			if (linux_sg_enumerate_debug)
+				fprintf(stderr,
+					"sg_obtain_scsi_adr() failed\n");
+			return 0;
+		}
+	}
+
+	/* ts A60927 : trying to do locking with growisofs */
+	if(burn_sg_open_o_excl>1) {
+		ret = sg_open_scsi_siblings(
+				fname, -1, sibling_fds, sibling_fnames,
+				&sibling_count,
+				sid.host_no, sid.channel,
+				sid.scsi_id, sid.lun);
+		if (ret<=0) {
+			if (linux_sg_enumerate_debug)
+				fprintf(stderr, "cannot lock siblings\n"); 
+			sg_handle_busy_device(fname, 0);
+			return 0;
+		}
+		/* the final occupation will be done in sg_grab() */
+		sg_release_siblings(sibling_fds, sibling_fnames,
+							&sibling_count);
+	}
+#ifdef SCSI_IOCTL_GET_BUS_NUMBER
+	if(*bus_no == -1)
+		*bus_no = 1000 * (sid.host_no + 1) + sid.channel;
+#else
+	*bus_no = sid.host_no;
+#endif
+	*host_no= sid.host_no;
+	*channel_no= sid.channel;
+	*target_no= sid.scsi_id;
+	*lun_no= sid.lun;
+	return 1;
+}	
+
+#endif /* Libburn_drive_new_deaL */
+
+
 /** Speciality of Linux: detect non-SCSI ATAPI (EIDE) which will from
    then on used used via generic SCSI as is done with (emulated) SCSI drives */ 
 static void ata_enumerate(void)
 {
+
+#ifdef Libburn_drive_new_deaL
+
+	int ret;
+
+#else 
 	struct hd_driveid tm;
-	int i, fd;
+	int fd;
+#endif
+
+	int i;
 	char fname[10];
 
 	if (linux_ata_enumerate_verbous)
@@ -670,6 +863,17 @@ static void ata_enumerate(void)
 				fprintf(stderr, "not in whitelist\n");
 	continue;
 		}
+
+#ifdef Libburn_drive_new_deaL
+
+		ret = is_ata_drive(fname);
+		if (ret < 0)
+	break;
+		if (ret == 0)
+	continue;
+
+#else /* Libburn_drive_new_deaL */
+
 		fd = sg_open_drive_fd(fname, 1);
 		if (fd == -1) {
 			if (linux_ata_enumerate_verbous)
@@ -706,6 +910,10 @@ static void ata_enumerate(void)
 				errno, strerror(errno));
 	continue;
 		}
+
+#endif /* Libburn_drive_new_deaL */
+
+
 		if (linux_ata_enumerate_verbous)
 		  fprintf(stderr, "accepting as drive without SCSI address\n");
 		enumerate_common(fname, -1, -1, -1, -1, -1);
@@ -716,12 +924,18 @@ static void ata_enumerate(void)
 /** Detects (probably emulated) SCSI drives */
 static void sg_enumerate(void)
 {
+#ifdef Libburn_drive_new_deaL
+
+#else 
 	struct sg_scsi_id sid;
-	int i, fd, sibling_fds[BURN_OS_SG_MAX_SIBLINGS], sibling_count= 0, ret;
+	int fd, sibling_fds[BURN_OS_SG_MAX_SIBLINGS], sibling_count= 0;
+	char sibling_fnames[BURN_OS_SG_MAX_SIBLINGS][BURN_OS_SG_MAX_NAMELEN];
 	int sid_ret = 0;
+#endif
+
+	int i, ret;
 	int bus_no= -1, host_no= -1, channel_no= -1, target_no= -1, lun_no= -1;
 	char fname[17];
-	char sibling_fnames[BURN_OS_SG_MAX_SIBLINGS][BURN_OS_SG_MAX_NAMELEN];
 
         sg_select_device_family();
 
@@ -748,6 +962,23 @@ static void sg_enumerate(void)
 	continue;
 		}
 
+
+#ifdef Libburn_drive_new_deaL
+
+		ret = is_scsi_drive(fname, &bus_no, &host_no, &channel_no,
+							&target_no, &lun_no);
+		if (ret < 0)
+	break;
+		if (ret == 0)
+	continue;
+		if (linux_sg_enumerate_debug)
+		  fprintf(stderr, "accepting as SCSI %d,%d,%d,%d bus=%d\n",
+			  host_no, channel_no, target_no, lun_no, bus_no);
+		enumerate_common(fname, bus_no, host_no, channel_no, 
+				target_no, lun_no);
+
+#else /* Libburn_drive_new_deaL */
+
 		/* ts A60927 */
 		fd = sg_open_drive_fd(fname, 1);
 		if (fd == -1) {
@@ -857,16 +1088,223 @@ static void sg_enumerate(void)
 #else
 		bus_no = sid.host_no;
 #endif
+
 		if (linux_sg_enumerate_debug)
 		  fprintf(stderr, "accepting as SCSI %d,%d,%d,%d bus=%d\n",
 			  sid.host_no, sid.channel, sid.scsi_id, sid.lun,
 			  bus_no);
 		enumerate_common(fname, bus_no, sid.host_no, sid.channel, 
 				 sid.scsi_id, sid.lun);
+#endif /* Libburn_drive_new_deaL */
+
 	}
 }
 
 
+#ifdef Libburn_drive_new_deaL
+
+
+/* ts A80805 : eventually produce the other official name of a device file */
+static int fname_other_name(char *fname, char other_name[80], int flag)
+{
+	if(strncmp(fname, "/dev/sr", 7) == 0 &&
+	   (fname[7] >= '0' && fname[7] <= '9') &&
+           (fname[8] == 0 ||
+	    (fname[8] >= '0' && fname[8] <= '9' && fname[9] == 0))) {
+		sprintf(other_name, "/dev/scd%s", fname + 7);
+		return 1;
+	}
+	if(strncmp(fname, "/dev/scd", 8) == 0 &&
+	   (fname[8] >= '0' && fname[8] <= '9') &&
+           (fname[9] == 0 ||
+	    (fname[9] >= '0' && fname[9] <= '9' && fname[10] == 0))) {
+		sprintf(other_name, "/dev/sr%s", fname + 8);
+		return 1;
+	}
+	return 0;
+}
+
+
+/* ts A80805 */
+static int fname_drive_is_listed(char *fname, int flag)
+{
+	char other_fname[80];
+
+	if (burn_drive_is_listed(fname, NULL, 0))
+		return 1;
+	if (fname_other_name(fname, other_fname, 0) > 0)
+		if (burn_drive_is_listed(other_fname, NULL, 0))
+			return 2;
+	return 0;
+}
+
+
+/* ts A80731 : Directly open the given address.
+   @param flag bit0= do not complain about missing file
+               bit1= do not check whether drive is already listed
+*/
+static int fname_enumerate(char *fname, int flag)
+{
+	int is_ata= 0, is_scsi= 0;
+	int bus_no= -1, host_no= -1, channel_no= -1, target_no= -1, lun_no= -1;
+	char msg[BURN_DRIVE_ADR_LEN + 80];
+	struct stat stbuf;
+
+	if (!(flag & 2))
+		if (fname_drive_is_listed(fname, 0))
+			return 2;
+	if (stat(fname, &stbuf) == -1) {
+		sprintf(msg, "File object '%s' not found", fname);
+		if (!(flag & 1))
+			libdax_msgs_submit(libdax_messenger, -1, 0x0002000b,
+			  LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
+			  msg, 0, 0);
+		return -1;
+	}
+	
+	is_ata = is_ata_drive(fname);
+	if (is_ata < 0)
+		return -1;
+	if (!is_ata)
+		is_scsi = is_scsi_drive(fname, &bus_no, &host_no, &channel_no,
+					&target_no, &lun_no);
+	if (is_scsi < 0)
+		return -1;
+	if (is_ata == 0 && is_scsi == 0)
+		return 0;
+
+	if (linux_sg_enumerate_debug)
+		  fprintf(stderr,
+			"(single) accepting as SCSI %d,%d,%d,%d bus=%d\n",
+			host_no, channel_no, target_no, lun_no, bus_no);
+	enumerate_common(fname, bus_no, host_no, channel_no, 
+				target_no, lun_no);
+	return 1;
+}
+
+
+/* ts A80731 : Directly open the given address from a single-item whitlist */
+static int single_enumerate(int flag)
+{
+	int ret, wl_count;
+	char *fname, msg[BURN_DRIVE_ADR_LEN + 80];
+
+        wl_count= burn_drive_whitelist_count();
+	if (wl_count != 1)
+		return 0;
+	fname= burn_drive_whitelist_item(0, 0);
+	if (fname == NULL)
+		return 0;
+	ret = fname_enumerate(fname, 2);
+	if (ret <= 0) {
+		sprintf(msg, "Cannot access '%s' as SG_IO CDROM drive", fname);
+		libdax_msgs_submit(libdax_messenger, -1, 0x0002000a,
+			LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
+			msg, 0, 0);
+		ret = -1;
+	}
+	return ret;
+}
+
+
+/* ts A80801 : looking up drives listed in /proc/sys/dev/cdrom/info line like:
+                drive name:             sr1     hdc     hda     sr0
+   @parm flag bit0= release list memory and exit
+*/
+static int proc_sys_dev_cdrom_info(char ***list, int *count, int flag)
+{
+	FILE *fp;
+	char line[1024], fname[1024 + 5], *cpt, *retpt, *list_data;
+	int maxl= 0, pass, i;
+
+	if (*list != NULL) {
+		if ((*list)[0] != NULL)
+			free((*list)[0]);
+		free(*list);
+		*list = NULL;
+		*count = 0;
+	}
+	if (flag & 1) 
+		return 1;
+
+	*count = 0;
+	sg_evaluate_kernel();
+	if (sg_kernel_age < 2) /* addresses are not suitable for kernel 2.4 */
+		return 1;
+	fp = fopen("/proc/sys/dev/cdrom/info", "r");
+	if (fp == NULL)
+		return 0;
+	while (1) {
+		retpt = fgets(line, sizeof(line), fp);
+		if (retpt == NULL)
+	break;
+		if(strncmp(line, "drive name:", 11) == 0)
+	break;
+	}
+	fclose(fp);
+	if (retpt == NULL)
+		return 0;
+	strcpy(fname, "/dev/");
+	for(pass = 0; pass < 2; pass++) {
+		*count = 0;
+		cpt = line + 11;
+		while (*cpt != 0) {
+			for(; *cpt == ' ' || *cpt == '\t'; cpt++);
+			if (*cpt == 0 || *cpt == '\n')
+		break;
+			sscanf(cpt, "%s", fname + 5);
+			if (strlen(fname) > maxl)
+				maxl = strlen(fname);
+			if (pass == 1)
+				strcpy((*list)[*count], fname);
+			(*count)++;
+			for(cpt++; *cpt != ' ' && *cpt != '\t'
+					 && *cpt != 0 && *cpt != '\n'; cpt++);
+		}
+		if (pass == 0) {
+			list_data = calloc(*count + 1, maxl+1);
+			*list = calloc(*count + 1, sizeof(char *));
+			if(list_data == NULL || *list == NULL) {
+				libdax_msgs_submit(libdax_messenger, -1,
+				0x00000003,
+				LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
+				"Out of virtual memory", 0, 0);
+				if (list_data != NULL)
+					free(list_data);
+				if (*list != NULL)
+					free((char *) *list);
+				return -1;
+			}
+			for (i = 0; i <= *count; i++)
+				(*list)[i] = list_data + i * (maxl + 1);
+		}
+	}
+	return 1;
+}
+
+
+static int add_proc_info_drives(int flag)
+{
+	int ret, list_count, count = 0, i;
+	char **list= NULL;
+
+	ret = proc_sys_dev_cdrom_info(&list, &list_count, 0);
+	if (ret <= 0)
+		return ret;
+	for (i = 0; i < list_count; i++) {
+		if (burn_drive_is_banned(list[i]))
+	continue;
+		ret = fname_enumerate(list[i], 1);
+		if (ret == 1)
+			count++;
+	}
+	proc_sys_dev_cdrom_info(&list, &list_count, 1); /* free memory */
+	return 1 + count;
+}
+
+#endif /* Libburn_drive_new_deaL */
+
+
 /* ts A61115 */
 /* ----------------------------------------------------------------------- */
 /* PORTING: Private functions which contain publicly needed functionality. */
@@ -951,10 +1389,14 @@ int sg_give_next_adr(burn_drive_enumerator_t *idx,
 {
 	/* os-linux.h : typedef int burn_drive_enumerator_t; */
 	static int sg_limit = 32, ata_limit = 26;
-	int baseno = 0;
+	int baseno = 0, i;
+	char other_name[80];
 
-	if (initialize == -1)
+	if (initialize == -1) {
+		proc_sys_dev_cdrom_info(&(idx->info_list), &(idx->info_count),
+					1);
 		return 0;
+	}
 
         sg_select_device_family();
 	if (linux_sg_device_family[0] == 0)
@@ -962,30 +1404,56 @@ int sg_give_next_adr(burn_drive_enumerator_t *idx,
 	if (linux_ata_device_family[0] == 0)
 		ata_limit = 0;
 
-	if (initialize  == 1)
-		*idx = -1;
-	(*idx)++;
-	if (*idx >= sg_limit)
+	if (initialize  == 1) {
+		idx->pos = -1;
+		idx->info_count= 0;
+		idx->info_list= NULL;
+		proc_sys_dev_cdrom_info(&(idx->info_list), &(idx->info_count),
+					0);
+	}
+	(idx->pos)++;
+	if (idx->pos >= sg_limit)
 		goto next_ata;
-	if (adr_size < 10)
+	if (adr_size < 11)
 		return -1;
-	sprintf(adr, linux_sg_device_family, *idx);
+	sprintf(adr, linux_sg_device_family, idx->pos);
 
-	/* ts A80702 */
 	sg_exchange_scd_for_sr(adr, 0);
+	goto return_1_pre_proc;
 
-	return 1;
 next_ata:;
 	baseno += sg_limit;
-	if (*idx - baseno >= ata_limit)
-		goto next_nothing;
+	if (idx->pos - baseno >= ata_limit)
+		goto next_proc_info;
 	if (adr_size < 9)
 		return -1;
-	sprintf(adr, linux_ata_device_family, 'a' + (*idx - baseno));
-	return 1;
-next_nothing:;
+	sprintf(adr, linux_ata_device_family, 'a' + (idx->pos - baseno));
+	goto return_1_pre_proc;
+
+next_proc_info:;
 	baseno += ata_limit;
+	for (i = 0; i < idx->info_count; i++) {
+		if ((idx->info_list)[i][0] == 0)
+	continue;
+		if (baseno == idx->pos) {
+			if (adr_size < strlen((idx->info_list)[i]) + 1)
+				return -1;
+			strcpy(adr, (idx->info_list)[i]);
+			return 1;
+		}
+		baseno++;
+	}
 	return 0;
+
+return_1_pre_proc:;
+	for (i = 0; i < idx->info_count; i++) {
+		if (strcmp((idx->info_list)[i], adr) == 0)
+			(idx->info_list)[i][0] = 0;
+	        if (fname_other_name(adr, other_name, 0) > 0)
+			if (strcmp((idx->info_list)[i], other_name) == 0)
+				(idx->info_list)[i][0] = 0;
+	}
+	return 1;
 }
 
 
@@ -1007,8 +1475,27 @@ next_nothing:;
 /* ts A61115: replacing call to sg-implementation internals from drive.c */
 int scsi_enumerate_drives(void)
 {
+
+#ifdef Libburn_drive_new_deaL
+	int ret;
+#endif
+
+#ifdef Libburn_drive_new_deaL
+	/* Direct examination of eventually single whitelisted name */
+	ret = single_enumerate(0);
+	if (ret < 0)
+		return -1;
+	if (ret > 0)
+		return 1;
+#endif /* Libburn_drive_new_deaL */
+
 	sg_enumerate();
 	ata_enumerate();
+
+#ifdef Libburn_drive_new_deaL
+	add_proc_info_drives(0);
+#endif /* Libburn_drive_new_deaL */
+
 	return 1;
 }
 
@@ -1460,7 +1947,8 @@ int sg_is_enumerable_adr(char *adr)
 			return 1;
 		}
 	}
-	sg_give_next_adr(&idx, fname, sizeof(fname), -1);
+	if (first == 0)
+		sg_give_next_adr(&idx, fname, sizeof(fname), -1);
 	return(0);
 }
 

libburn/sg.c

@@ -1,7 +1,7 @@
 
 /* sg.c
    Switcher for operating system dependent transport level modules of libburn.
-   Copyright (C) 2006 Thomas Schmitt <scdbackup@gmx.net>, provided under GPL
+   Copyright (C) 2009 Thomas Schmitt <scdbackup@gmx.net>, provided under GPL
 */
 
 
@@ -10,8 +10,32 @@
 #include "sg-freebsd.c"
 
 #else
+#ifdef __linux
 
 #include "sg-linux.c"
 
-#endif
+#else
+
+/* The dummy adapter formally fulfills the expectations of libburn towards
+   its SCSI command transport. It will show no drives and perform no SCSI
+   commands.
+   libburn will then be restricted to using its stdio pseudo drives.
+*/
+static int intentional_compiler_warning(void)
+{
+ int INTENTIONAL_COMPILER_WARNING_;
+ int Cannot_recognize_Linux_nor_FreeBSD_;
+ int Have_to_use_dummy_MMC_transport_adapter_;
+ int This_libburn_will_not_be_able_to_operate_on_real_CD_drives;
+ int Have_to_use_dummy_MMC_transport_adapter;
+ int Cannot_recognize_Linux_nor_FreeBSD;
+ int INTENTIONAL_COMPILER_WARNING;
+
+ return(0);
+}
+
+#include "sg-dummy.c"
+
+#endif /* ! __linux */
+#endif /* ! __FreeBSD__ */
 

libburn/spc.c

@@ -104,7 +104,9 @@ int spc_wait_unit_attention(struct burn_drive *d, int max_sec, char *cmd_text,
 				int flag)
 {
 	int i, ret = 1, key = 0, asc = 0, ascq = 0;
-	char msg[160];
+	char msg[320];
+	unsigned char sense[14];
+	enum response resp;
 
 	if (!(flag & 1))
 		usleep(100000);
@@ -117,9 +119,9 @@ int spc_wait_unit_attention(struct burn_drive *d, int max_sec, char *cmd_text,
 		i, ret, (unsigned) key, (unsigned) asc, (unsigned) ascq);
 */
 
-		if(ret > 0) /* ready */
+		if (ret > 0) /* ready */
 	break;
-		if(key!=0x2 || asc!=0x4) {
+		if (key!=0x2 || asc!=0x4) {
 			if (key == 0x2 && asc == 0x3A) {
 				ret = 1; /* medium not present = ok */
 /* <<<
@@ -138,10 +140,24 @@ int spc_wait_unit_attention(struct burn_drive *d, int max_sec, char *cmd_text,
 				/* media change notice = try again */
 				goto slumber;
 
+#ifdef NIX
 			sprintf(msg,
 		"Asynchromous SCSI error on %s: key=%X asc=%2.2Xh ascq=%2.2Xh",
 			 	cmd_text, (unsigned) key, (unsigned) asc,
 				(unsigned) ascq);
+#else
+
+			/* ts A90213 */
+			sprintf(msg,
+				"Asynchromous SCSI error on %s: ", cmd_text);
+			sense[2] = key;
+			sense[12] = asc;
+			sense[13] = ascq;
+			resp = scsi_error_msg(d, sense, 14, msg + strlen(msg),
+						 &key, &asc, &ascq);
+
+#endif /* ! NIX */
+
 			libdax_msgs_submit(libdax_messenger, d->global_index,
 				0x0002014d,
 				LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
@@ -275,7 +291,7 @@ void spc_allow(struct burn_drive *d)
 }
 
 /*
-ts A70518 : Do not call with *alloc_len < 8
+ts A70518 - A90603 : Do not call with *alloc_len < 10
 */
 /** flag&1= do only inquire alloc_len */
 static int spc_sense_caps_al(struct burn_drive *d, int *alloc_len, int flag)
@@ -287,13 +303,19 @@ static int spc_sense_caps_al(struct burn_drive *d, int *alloc_len, int flag)
 	unsigned char *page;
 	struct command c;
 	struct burn_speed_descriptor *sd;
+	char msg[BURN_DRIVE_ADR_LEN + 160];
 
 	/* ts A61225 : 1 = report about post-MMC-1 speed descriptors */
 	static int speed_debug = 0;
 
-	if (*alloc_len < 8)
+	if (*alloc_len < 10)
 		return 0;
 
+	/* ts A90602 : Clearing mdata before command execution */
+	m = d->mdata;
+	m->valid = 0;
+	burn_mdata_free_subs(m);
+
 	memset(&buf, 0, sizeof(buf));
 	scsi_init_command(&c, SPC_MODE_SENSE, sizeof(SPC_MODE_SENSE));
 /*
@@ -312,12 +334,11 @@ static int spc_sense_caps_al(struct burn_drive *d, int *alloc_len, int flag)
 	d->issue_command(d, &c);
 	if (c.error) {
 		memset(&buf, 0, sizeof(buf));
-		d->mdata->valid = -1;
+		m->valid = -1;
 		was_error = 1;
 	}
 
 	size = c.page->data[0] * 256 + c.page->data[1];
-	m = d->mdata;
 	page = c.page->data + 8;
 
 	/* ts A61225 :
@@ -326,18 +347,28 @@ static int spc_sense_caps_al(struct burn_drive *d, int *alloc_len, int flag)
 	   in MMC-3 6.3.11 there are at least 28 bytes plus a variable length
 	   set of speed descriptors. In MMC-5 E.11 it is declared "legacy".
 	*/
+	/* ts A90603 :
+	   SPC-1 8.3.3 enumerates mode page format bytes from 0 to n and
+	   defines Page Length as (n-1).
+	*/
 	page_length = page[1];
 	old_alloc_len = *alloc_len;
-	*alloc_len = page_length + 8;
+	*alloc_len = page_length + 10;
 	if (flag & 1)
 		return !was_error;
-	if (page_length + 8 > old_alloc_len)
-		page_length = old_alloc_len - 8;
-	if (page_length < 22)
-		return 0;
+	if (page_length + 10 > old_alloc_len)
+		page_length = old_alloc_len - 10;
 
-	m->valid = 0;
-	burn_mdata_free_subs(m);
+	/* ts A90602 : 20 asserts page[21]. (see SPC-1 8.3.3) */
+	if (page_length < 20) {
+		m->valid = -1;
+		sprintf(msg, "MODE SENSE page 2A too short: %s : %d",
+			d->devname, page_length);
+		libdax_msgs_submit(libdax_messenger, d->global_index,
+				0x0002016e, LIBDAX_MSGS_SEV_DEBUG,
+				LIBDAX_MSGS_PRIO_LOW, msg, 0, 0);
+		return 0;
+	}
 
 	m->buffer_size = page[12] * 256 + page[13];
 	m->dvdram_read = page[2] & 32;
@@ -368,12 +399,13 @@ static int spc_sense_caps_al(struct burn_drive *d, int *alloc_len, int flag)
 	m->min_end_lba = 0x7fffffff;
 	m->max_end_lba = 0;
 
-	m->valid = 1;
+	if (!was_error)
+		m->valid = 1;
 
 	mmc_get_configuration(d);
 
 	/* ts A61225 : end of MMC-1 , begin of MMC-3 */
-	if (page_length < 32) /* no write speed descriptors ? */
+	if (page_length < 30) /* no write speed descriptors ? */
 		goto try_mmc_get_performance;
 
 	m->cur_write_speed = page[28] * 256 + page[29];
@@ -397,12 +429,12 @@ static int spc_sense_caps_al(struct burn_drive *d, int *alloc_len, int flag)
 	}
 
 	for (i = 0; i < num_write_speeds; i++) {
-		speed = page[32 + 4*i + 2] * 256 + page[32 + 4*i + 3];
+		speed = page[32 + 4 * i + 2] * 256 + page[32 + 4 * i + 3];
 
 		if (speed_debug) 
 		fprintf(stderr,
 			"LIBBURN_DEBUG: write speed #%d = %d kB/s  (rc %d)\n",
-			i, speed, page[32 + 4*i +1] & 7);
+			i, speed, page[32 + 4 * i + 1] & 7);
 
 		/* ts A61226 */
 		ret = burn_speed_descriptor_new(&(d->mdata->speed_descriptors),
@@ -415,7 +447,7 @@ static int spc_sense_caps_al(struct burn_drive *d, int *alloc_len, int flag)
 				strcpy(sd->profile_name,
 					d->current_profile_text);
 			}
-			sd->wrc = (( page[32 + 4*i +1] & 7 ) == 1 );
+			sd->wrc = (( page[32 + 4 * i + 1] & 7 ) == 1 );
 			sd->write_speed = speed;
 		}
 
@@ -443,7 +475,7 @@ try_mmc_get_performance:;
 
 void spc_sense_caps(struct burn_drive *d)
 {
-	int alloc_len, start_len = 22, ret;
+	int alloc_len, start_len = 30, ret;
 
 	if (mmc_function_spy(d, "sense_caps") <= 0)
 		return;
@@ -568,7 +600,7 @@ void spc_sense_write_params(struct burn_drive *d)
 
 	/* ts A71128 : do not interpret reply if error */
 	m = d->mdata;
-	if(!c.error) {
+	if (!c.error) {
 		size = c.page->data[0] * 256 + c.page->data[1];
 		page = c.page->data + 8;
 		burn_print(1, "write page length 0x%x\n", page[1]);
@@ -845,7 +877,7 @@ int burn_scsi_setup_drive(struct burn_drive *d, int bus_no, int host_no,
 	d->mdata = calloc(1, sizeof(struct scsi_mode_data));
 
 	/* ts A61007 : obsolete Assert in drive_getcaps() */
-	if(d->idata == NULL || d->mdata == NULL) {
+	if (d->idata == NULL || d->mdata == NULL) {
 	        libdax_msgs_submit(libdax_messenger, -1, 0x00020108,
 	                LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
 	                "Could not allocate new drive object", 0, 0);
@@ -854,7 +886,7 @@ int burn_scsi_setup_drive(struct burn_drive *d, int bus_no, int host_no,
 	d->idata->valid = 0;
 	d->mdata->valid = 0;
 	d->mdata->speed_descriptors = NULL;
-	if(!(flag & 1)) {
+	if (!(flag & 1)) {
 		ret = spc_setup_drive(d);
 		if (ret<=0)
 			return ret;
@@ -869,11 +901,14 @@ int burn_scsi_setup_drive(struct burn_drive *d, int bus_no, int host_no,
 }
 
 
-/* ts A61122  */
+/* ts A61122 - A80829 */
 enum response scsi_error_msg(struct burn_drive *d, unsigned char *sense,
-			     int senselen, char msg[161],
+			     int senselen, char msg_data[161],
 			     int *key, int *asc, int *ascq)
 {
+	char *msg;
+
+	msg= msg_data;
 	*key= *asc= *ascq= -1;
 
 	if (senselen<=0 || senselen>2)
@@ -883,50 +918,270 @@ enum response scsi_error_msg(struct burn_drive *d, unsigned char *sense,
 	if (senselen<=0 || senselen>13)
 		*ascq = sense[13];
 
+	sprintf(msg, "[%X %2.2X %2.2X]  ", *key, *asc, *ascq);
+	msg= msg + strlen(msg);
+
 	burn_print(12, "CONDITION: 0x%x 0x%x 0x%x on %s %s\n",
 		   *key, *asc, *ascq, d->idata->vendor, d->idata->product);
 
 	switch (*asc) {
-	case 0:
-		sprintf(msg, "(no error reported by SCSI transaction)");
+	case 0x00:
+		sprintf(msg, "(No error reported by SCSI transaction)");
 		return RETRY;
 
-	case 2:
-		sprintf(msg, "not ready");
+	case 0x02:
+		sprintf(msg, "Not ready");
 		return RETRY;
-	case 4:
+	case 0x04:
 		sprintf(msg,
-			"logical unit is in the process of becoming ready");
+			"Logical unit is in the process of becoming ready");
 		return RETRY;
+	case 0x08:
+		if (*key != 4)
+			break;
+		if (*ascq == 0)
+			sprintf(msg, "Logical unit communication failure");
+		else if (*ascq == 1)
+			sprintf(msg, "Logical unit communication timeout");
+		else if (*ascq == 2)
+			sprintf(msg, "Logical unit communication parity error");
+		else if (*ascq == 3)
+			sprintf(msg, "Logical unit communication crc error");
+		return RETRY;
+	case 0x09:
+		if (*key != 4)
+			break;
+		if (*ascq == 0)
+			sprintf(msg, "Track following error");
+		else if (*ascq == 1)
+			sprintf(msg, "Tracking servo failure");
+		else if (*ascq == 2)
+			sprintf(msg, "Focus servo failure");
+		else if (*ascq == 3)
+			sprintf(msg, "Spindle servo failure");
+		else if (*ascq == 4)
+			sprintf(msg, "Head select fault");
+		else
+			break;
+		return FAIL;
+	case 0x0C:
+		if (*key == 2 && *ascq == 7)
+			sprintf(msg, "Write error, recovery needed"); 
+		else if (*key == 2 && *ascq == 0x0f)
+			sprintf(msg, "Defects in error window"); 
+		else if (*key == 3 && *ascq == 2)
+			sprintf(msg, "Write error, auto reallocation failed");
+		else if (*key == 3 && *ascq == 9)
+			sprintf(msg, "Write error, loss of streaming");
+		else if (*key == 3)
+			sprintf(msg, "Write error");
+		else
+			break;
+		return FAIL;
+	case 0x11:
+		if (*key != 3)
+			break;
+		if (*ascq == 0)
+			sprintf(msg, "Unrecovered read error");
+		else if (*ascq == 1)
+			sprintf(msg, "Read retries exhausted");
+		else if (*ascq == 2)
+			sprintf(msg, "Error too long to correct");
+		else if (*ascq == 5)
+			sprintf(msg, "L-EC uncorrectable error");
+		else if (*ascq == 6)
+			sprintf(msg, "CIRC uncorrectable error");
+		else
+			break;
+		return FAIL;
+	case 0x15:
+		if (*key != 3 && *key != 4)
+			break;
+		sprintf(msg, "Random positioning error");
+		return FAIL;
+	case 0x1a:
+		if (*key != 5)
+			break;
+		sprintf(msg, "Parameter list length error");
+		return FAIL;
+	case 0x1b:
+		if (*key != 4)
+			break;
+		sprintf(msg, "Synchronous data transfer error");
+		return FAIL;
 	case 0x20:
-		if (*key == 5)
-			sprintf(msg, "bad opcode");
+		if (*key != 5)
+			break;
+		sprintf(msg, "Invalid command operation code");
 		return FAIL;
 	case 0x21:
-		sprintf(msg, "invalid address");
+		if (*key != 5)
+			break;
+		if (*ascq == 0)
+			sprintf(msg, "Lba out of range");
+		else if (*ascq == 3)
+			sprintf(msg, "Invalid write crossing layer jump");
+		else
+			sprintf(msg, "Invalid address");
 		return FAIL;
 	case 0x24:
-		if (*key == 5)
-			sprintf(msg, "invalid field in cdb");
-		else
+		if (*key != 5)
 			break;
+		sprintf(msg, "Invalid field in cdb");
 		return FAIL;
 	case 0x26:
-		if (*key == 5 )
-			sprintf(msg, "invalid field in parameter list" );
+		if (*key != 5)
+			break;
+		if (*ascq == 1)
+			sprintf(msg, "Parameter not supported");
+		else if (*ascq == 2)
+			sprintf(msg, "Parameter value invalid");
+		else
+			sprintf(msg, "Invalid field in parameter list");
+		return FAIL;
+	case 0x27:
+		if (*key != 7)
+			break;
+		sprintf(msg, "Write protected");
 		return FAIL;
 	case 0x28:
-		if (*key == 6)
+		if (*key != 6)
+			break;
+		if (*ascq == 0)
 			sprintf(msg, "Medium may have changed");
+		else if (*ascq == 2)
+			sprintf(msg, "Format layer may have changed");
 		else
 			break;
 		return RETRY;
+	case 0x29:
+		if (*key != 6)
+			break;
+		if (*ascq == 0)
+			sprintf(msg,
+                               "Power on, reset, or bus device reset occured");
+		else if (*ascq == 1)
+			sprintf(msg, "Power on occured");
+		else if (*ascq == 2)
+			sprintf(msg, "Bus reset occured");
+		else if (*ascq == 3)
+			sprintf(msg, "Bus device reset function occured");
+		else if (*ascq == 4)
+			sprintf(msg, "Device internal reset");
+		else
+			break;
+		return RETRY;
+	case 0x2c:
+		if (*key != 5)
+			break;
+		if (*ascq == 0)
+			sprintf(msg, "Command sequence error");
+		else 
+			break;
+		return FAIL;
+	case 0x2e:
+		if (*key != 6)
+			break;
+		if (*ascq == 0)
+			sprintf(msg,
+                               "Insufficient time for operation");
+		else 
+			break;
+		return FAIL;
+	case 0x30:
+		if (*key != 2 && *key != 5)
+			break;
+		if (*ascq == 1)
+			sprintf(msg, "Cannot read medium, unknown format");
+		else if (*ascq == 2)
+			sprintf(msg,
+				"Cannot read medium, incompatible format");
+		else if (*ascq == 4)
+			sprintf(msg, "Cannot write medium, unknown format");
+		else if (*ascq == 5)
+			sprintf(msg,
+				"Cannot write medium, incompatible format");
+		else if (*ascq == 6)
+			sprintf(msg,
+				"Cannot format medium, incompatible medium");
+		else if (*ascq == 7)
+			sprintf(msg, "Cleaning failure");
+		else
+			sprintf(msg, "Incompatible medium installed");
+		return FAIL;
+	case 0x31:
+		if (*key != 3)
+			break;
+		if (*ascq == 0)
+			sprintf(msg, "Medium unformatted or format corrupted");
+		else if (*ascq == 1)
+			sprintf(msg, "Format command failed");
+		return FAIL;
 	case 0x3A:
-		sprintf(msg, "Medium not present");
+		if (*key != 2)
+			break;
+		if (*ascq == 1)
+			sprintf(msg, "Medium not present, tray closed");
+		else if (*ascq == 2)
+			sprintf(msg, "Medium not present, tray open");
+		else if (*ascq == 3)
+			sprintf(msg, "Medium not present, loadable");
+		else
+			sprintf(msg, "Medium not present");
 		d->status = BURN_DISC_EMPTY;
 		return FAIL;
+	case 0x63:
+		if (*key != 5)
+			break;
+		if (*ascq == 0)
+			sprintf(msg,
+				"End of user area encountered on this track");
+		else if (*ascq == 1)
+			sprintf(msg, "Packet does not fit in available space");
+		else
+			break;
+		return FAIL;
+	case 0x64:
+		if (*key != 5)
+			break;
+		if (*ascq == 0)
+			sprintf(msg, "Illegal mode for this track");
+		else if (*ascq == 1)
+			sprintf(msg, "Invalid packet size");
+		else
+			break;
+		return FAIL;
+	case 0x72:
+		if (*key == 3)
+			sprintf(msg, "Session fixation error");
+		else if (*key == 5 && *ascq == 3)
+			sprintf(msg,
+			"Session fixation error, incomplete track in session");
+		else if (*key == 5 && *ascq == 4)
+			sprintf(msg,
+			"Empty or partially written reserved track");
+		else if (*key == 5 && *ascq == 5)
+			sprintf(msg,
+			"No more track reservations allowed");
+		else
+			break;
+		return FAIL;
+	case 0x73:
+		if (*key == 3 && *ascq == 0)
+			sprintf(msg, "CD control error");
+		else if (*key == 3 && *ascq == 2)
+			sprintf(msg, "Power calibration area is full");
+		else if (*key == 3 && *ascq == 3)
+			sprintf(msg, "Power calibration area error");
+		else if (*key == 3 && *ascq == 4)
+			sprintf(msg, "Program memory area update failure");
+		else if (*key == 3 && *ascq == 5)
+			sprintf(msg, "Program memory area is full");
+		else
+			break;
+		return FAIL;
 	}
-	sprintf(msg,
+	sprintf(msg_data,
 		"Failure. See mmc3r10g.pdf: Sense Key %X ASC %2.2X ASCQ %2.2X",
 		*key, *asc, *ascq);
 	return FAIL;
@@ -951,6 +1206,68 @@ enum response scsi_error(struct burn_drive *d, unsigned char *sense,
 }
 
 
+static char *scsi_command_name(unsigned int c, int flag)
+{
+	switch (c) {
+        case 0x00:
+		return "TEST UNIT READY";
+        case 0x03:
+		return "REQUEST SENSE";
+        case 0x04:
+		return "FORMAT UNIT";
+        case 0x1b:
+		return "START/STOP UNIT";
+	case 0x1e:
+		return "PREVENT/ALLOW MEDIA REMOVAL";
+        case 0x23:
+		return "READ FORMAT CAPACITIES";
+        case 0x28:
+		return "READ(10)";
+        case 0x2a:
+		return "WRITE(10)";
+        case 0x35:
+		return "SYNCHRONIZE CACHE";
+        case 0x43:
+		return "READ TOC/PMA/ATIP";
+        case 0x46:
+		return "GET CONFIGURATION";
+        case 0x4a:
+		return "GET EVENT STATUS NOTIFICATION";
+        case 0x51:
+		return "READ DISC INFORMATION";
+        case 0x52:
+		return "READ TRACK INFORMATION";
+        case 0x53:
+		return "RESERVE TRACK";
+        case 0x54:
+		return "SEND OPC INFORMATION";
+        case 0x55:
+		return "MODE SELECT";
+	case 0x5a:
+		return "SEND OPC INFORMATION";
+        case 0x5b:
+		return "CLOSE TRACK/SESSION";
+        case 0x5c:
+		return "READ BUFFER CAPACITY";
+        case 0x5d:
+		return "SEND CUE SHEET";
+        case 0xa1:
+		return "BLANK";
+        case 0xaa:
+		return "WRITE(12)";
+        case 0xac:
+		return "GET PERFORMANCE";
+        case 0xb6:
+		return "SET STREAMING";
+        case 0xbb:
+		return "SET CD SPEED";
+        case 0xbe:
+		return "READ CD";
+	}
+	return "(NOT IN COMMAND LIST)";
+}
+
+
 /* ts A61030 - A61115 */
 /* @param flag bit0=do report conditions which are considered not an error */
 int scsi_notify_error(struct burn_drive *d, struct command *c,
@@ -962,12 +1279,9 @@ int scsi_notify_error(struct burn_drive *d, struct command *c,
 	if (d->silent_on_scsi_error)
 		return 1;
 
-	strcpy(scsi_msg, "    \"");
-	scsi_error_msg(d, sense, senselen, scsi_msg + strlen(scsi_msg),
-			 &key, &asc, &ascq);
-	strcat(scsi_msg, "\"");
+	scsi_error_msg(d, sense, senselen, scsi_msg, &key, &asc, &ascq);
 
-	if(!(flag & 1)) {
+	if (!(flag & 1)) {
 		/* SPC : TEST UNIT READY command */
 		if (c->opcode[0] == 0)
 			return 1;
@@ -978,7 +1292,11 @@ int scsi_notify_error(struct burn_drive *d, struct command *c,
 				return 1;
 	}
 
-	sprintf(msg,"SCSI error condition on command %2.2Xh :", c->opcode[0]);
+	sprintf(msg, "SCSI error condition on command %2.2Xh %s: ",
+		c->opcode[0],
+		scsi_command_name((unsigned int) c->opcode[0], 0));
+
+#ifdef NIX
 	if (key>=0)
 		sprintf(msg+strlen(msg), " key=%Xh", key);
 	if (asc>=0)
@@ -992,6 +1310,13 @@ int scsi_notify_error(struct burn_drive *d, struct command *c,
 	ret = libdax_msgs_submit(libdax_messenger, d->global_index, 0x0002010f,
 			LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
 			scsi_msg,0,0);
+#else
+	strcat(msg, scsi_msg);
+	ret = libdax_msgs_submit(libdax_messenger, d->global_index, 0x0002010f,
+			LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH, msg,0,0);
+
+#endif /* NIX */
+
 	return ret;
 }
 

libburn/structure.c

@@ -104,6 +104,30 @@ int burn_disc_add_session(struct burn_disc *d, struct burn_session *s,
 	return 1;
 }
 
+
+/* ts A81202: this function was in the API but not implemented.
+*/
+int burn_disc_remove_session(struct burn_disc *d, struct burn_session *s)
+{
+	int i, skip = 0;
+
+	if (d->session == NULL)
+		return 0;
+	for (i = 0; i < d->sessions; i++) {
+		if (s == d->session[i]) {
+			skip++;
+	continue;
+		}
+		d->session[i - skip] = d->session[i];
+	}
+	if (!skip)
+		return 0;
+	burn_session_free(s);
+	d->sessions--;
+	return 1;
+}
+
+
 struct burn_track *burn_track_create(void)
 {
 	struct burn_track *t;
@@ -330,11 +354,19 @@ void burn_track_clear_isrc(struct burn_track *t)
 int burn_track_get_sectors(struct burn_track *t)
 {
 	/* ts A70125 : was int */
-	off_t size;
+	off_t size = 0;
 	int sectors, seclen;
 
 	seclen = burn_sector_length(t->mode);
-	size = t->offset + t->source->get_size(t->source) + t->tail;
+	if (t->source != NULL)                /* ts A80808 : mending sigsegv */
+		size = t->offset + t->source->get_size(t->source) + t->tail;
+	else if(t->entry != NULL) {
+		/* ts A80808 : all burn_toc_entry of track starts should now
+			have (extensions_valid & 1), even those from CD.
+		*/
+		if (t->entry->extensions_valid & 1)
+			size = ((off_t) t->entry->track_blocks) * (off_t) 2048;
+	}
 	sectors = size / seclen;
 	if (size % seclen)
 		sectors++;
@@ -468,6 +500,7 @@ int burn_session_get_sectors(struct burn_session *s)
 	return sectors;
 }
 
+
 int burn_disc_get_sectors(struct burn_disc *d)
 {
 	int sectors = 0, i;
@@ -515,3 +548,84 @@ int burn_session_get_hidefirst(struct burn_session *session)
 {
 	return session->hidefirst;
 }
+
+
+/* ts A80808 : Enhance CD toc to DVD toc */
+int burn_disc_cd_toc_extensions(struct burn_disc *d, int flag)
+{
+	int sidx= 0, tidx= 0;
+	struct burn_toc_entry *entry, *prev_entry= NULL;
+	/* ts A81126 : ticket 146 : There was a SIGSEGV in here */
+	char msg_data[321], *msg;
+
+	strcpy(msg_data,
+		"Damaged CD table-of-content detected and truncated.");
+	strcat(msg_data, " In burn_disc_cd_toc_extensions: ");
+        msg = msg_data + strlen(msg_data);
+	if (d->session == NULL) {
+		strcpy(msg, "d->session == NULL");
+		goto failure;
+	}
+	for (sidx = 0; sidx < d->sessions; sidx++) {
+		if (d->session[sidx] == NULL) {
+			sprintf(msg, "d->session[%d of %d] == NULL",
+				sidx, d->sessions);
+			goto failure;
+		}
+		if (d->session[sidx]->track == NULL) {
+			sprintf(msg, "d->session[%d of %d]->track == NULL",
+				sidx, d->sessions);
+			goto failure;
+		}
+		if (d->session[sidx]->leadout_entry == NULL) {
+			sprintf(msg,
+				" Session %d of %d: Leadout entry missing.",
+			  	sidx, d->sessions);
+			goto failure;
+		}
+		for (tidx = 0; tidx < d->session[sidx]->tracks + 1; tidx++) {
+			if (tidx < d->session[sidx]->tracks) {
+				if (d->session[sidx]->track[tidx] == NULL) {
+					sprintf(msg,
+			  "d->session[%d of %d]->track[%d of %d] == NULL",
+			   sidx, d->sessions, tidx,  d->session[sidx]->tracks);
+					goto failure;
+				}
+				entry = d->session[sidx]->track[tidx]->entry;
+				if (entry == NULL) {
+					sprintf(msg,
+			  "session %d of %d, track %d of %d, entry == NULL",
+			  			sidx, d->sessions, tidx,
+						d->session[sidx]->tracks);
+					goto failure;
+				}
+			} else
+				entry = d->session[sidx]->leadout_entry;
+			entry->session_msb = 0;
+			entry->point_msb = 0;
+			entry->start_lba = burn_msf_to_lba(entry->pmin,
+						entry->psec, entry->pframe);
+			if (tidx > 0) {
+				prev_entry->track_blocks =
+					entry->start_lba
+					- prev_entry->start_lba;
+				prev_entry->extensions_valid |= 1;
+			}
+			if (tidx == d->session[sidx]->tracks) {
+				entry->session_msb = 0;
+				entry->point_msb = 0;
+				entry->track_blocks = 0;
+				entry->extensions_valid |= 1;
+			}
+			prev_entry = entry;
+		}
+	}
+	return 1;
+failure:
+	libdax_msgs_submit(libdax_messenger, -1, 0x0002015f,
+		LIBDAX_MSGS_SEV_MISHAP, LIBDAX_MSGS_PRIO_HIGH, msg_data, 0, 0);
+	d->sessions= sidx;
+	return 0;
+}
+
+

libburn/structure.h

@@ -109,4 +109,8 @@ int burn_track_apply_fillup(struct burn_track *t, off_t max_size, int flag);
 off_t burn_track_get_default_size(struct burn_track *t);
 
 
+/* ts A80808 : Enhance CD toc to DVD toc */
+int burn_disc_cd_toc_extensions(struct burn_disc *d, int flag);
+
+
 #endif /* BURN__STRUCTURE_H */

libburn/transport.h

@@ -161,6 +161,8 @@ struct burn_drive
 	char current_profile_text[80];
 	int current_is_cd_profile;
 	int current_is_supported_profile;
+	/* ts A90603 */
+	int current_is_guessed_profile;
 
 	/* ts A70128 : MMC-to-MMC feature info from 46h for DVD-RW.
            Quite internal. Regard as opaque :)
@@ -171,6 +173,19 @@ struct burn_drive
 	/* Link Size item number 0 from feature 0021h descriptor */
 	int current_feat21h_link_size;
 
+	/* Flags from feature 0023h for formatting BD mmc5r03c.pdf 5.3.13 
+           Byte 4 BD-RE:
+             bit0= Cert   format 30h sub-type 10b
+             bit1= QCert  format 30h sub-type 11b
+             bit2= Expand format 01h
+             bit3= RENoSA format 31h
+           Byte 8 BD-R:
+             bit0= RRM    format 32h sub-type 10b
+        */
+	int current_feat23h_byte4;
+	int current_feat23h_byte8;
+
+
 	/* Flags from feature 002Fh feature descriptor mmc5r03c.pdf 5.3.25 :
 	     bit1= DVD-RW supported
 	     bit2= Test Write available
@@ -192,6 +207,11 @@ struct burn_drive
 	               with BD-RE */
 	int do_stream_recording;
 
+        /* ts A90227 : the LBA where stream recording shall start.
+                       Writing to lower LBA will be done without streaming.
+        */
+        int stream_recording_start;
+
 	/* ts A61218 from 51h READ DISC INFORMATION */
 	int bg_format_status; /* 0=needs format start, 1=needs format restart*/
 
@@ -223,6 +243,9 @@ struct burn_drive
 
 	/* ts A70131 : from 51h READ DISC INFORMATION Number of Sessions (-1)*/
 	int complete_sessions;
+	/* ts A90107 */
+	int state_of_last_session;
+
 	/* ts A70129 :
 	   from 51h READ DISC INFORMATION Last Track Number in Last Session */
 	int last_track_no;
@@ -235,6 +258,9 @@ struct burn_drive
 	/* ts A70215 : if > 0 : first lba on media that is too high for write*/
 	int media_lba_limit;
 
+	/* ts A81210 : Upper limit of readable data size,
+	               0x7fffffff = unknown */
+	int media_read_capacity;
 
 	int toc_temp;
 	struct burn_disc *disc;	/* disc structure */

libburn/util.c

@@ -4,7 +4,11 @@
 /* #include <a ssert.h> */
 
 #include <stdlib.h>
-#include "../version.h"
+
+/* ts A80914 : This is unneeded. Version info comes from libburn.h.
+#include "v ersion.h"
+*/
+
 #include "util.h"
 #include "libburn.h"
 
@@ -48,13 +52,7 @@ char *burn_strndup(char *s, int n)
 void burn_version(int *major, int *minor, int *micro)
 {
 /* ts A80408 : switched from configure.ac versioning to libburn.h versioning */
-#ifdef burn_header_version_major
-    *major = burn_header_version_major;
-    *minor = burn_header_version_minor;
-    *micro = burn_header_version_micro;
-#else
-    *major = BURN_MAJOR_VERSION;
-    *minor = BURN_MINOR_VERSION;
-    *micro = BURN_MICRO_VERSION;
-#endif
+	*major = burn_header_version_major;
+	*minor = burn_header_version_minor;
+	*micro = burn_header_version_micro;
 }

libburn/write.c

@@ -1005,8 +1005,10 @@ int burn_precheck_write(struct burn_write_opts *o, struct burn_disc *disc,
 	} else if (d->drive_role == 3 ||
 		   d->current_profile == 0x11 || d->current_profile == 0x14 ||
 	           d->current_profile == 0x15 ||
-	           d->current_profile == 0x1b || d->current_profile == 0x2b ) {
-		/* DVD-R* Sequential , DVD+R[/DL] , sequential stdio "drive" */
+	           d->current_profile == 0x1b || d->current_profile == 0x2b ||
+		   d->current_profile == 0x41) {
+		/* DVD-R* Sequential , DVD+R[/DL] , BD-R,
+		   sequential stdio "drive" */
 		if (o->start_byte >= 0)
 			strcat(reasons, "write start address not supported, ");
 	} else {
@@ -1106,6 +1108,10 @@ int burn_disc_open_track_dvd_plus_r(struct burn_write_opts *o,
 	if (o->write_type == BURN_WRITE_SAO &&
 	    ! burn_track_is_open_ended(s->track[tnum])) {
  		/* Round track size up to 32 KiB and reserve track */
+
+		/* ts A81208 */
+		/* >>> ??? round to 64 KiB for BD-R ? (It is not mandatory) */
+
 		size = ((off_t) burn_track_get_sectors(s->track[tnum]))
 			 * (off_t) 2048;
 		size = (size + (off_t) 0x7fff) & ~((off_t) 0x7fff);
@@ -1153,19 +1159,29 @@ int burn_disc_close_track_dvd_minus_r(struct burn_write_opts *o,
 int burn_disc_finalize_dvd_plus_r(struct burn_write_opts *o)
 {
 	struct burn_drive *d = o->drive;
+	char msg[80];
 
+	sprintf(msg, "Finalizing %s ...",
+		d->current_profile_text);
 	libdax_msgs_submit(libdax_messenger, d->global_index,
 			0x00000002,
 			LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_ZERO,
-			"Finalizing DVD+R ...", 0, 0);
+			msg, 0, 0);
 
-	/* CLOSE SESSION, 101b, Finalize with minimal radius */
-	d->close_track_session(d, 2, 1);  /* (2<<1)|1 = 5 */
+	if(d->current_profile == 0x41) { /* BD-R */
+		/* CLOSE SESSION, 110b, Finalize Disc */
+		d->close_track_session(d, 3, 0);  /* (3<<1)|0 = 6 */
+	} else {
+		/* CLOSE SESSION, 101b, Finalize with minimal radius */
+		d->close_track_session(d, 2, 1);  /* (2<<1)|1 = 5 */
+	}
 
+	sprintf(msg, "... finalizing %s done               ",
+		d->current_profile_text);
 	libdax_msgs_submit(libdax_messenger, d->global_index,
 			0x00000002,
 			LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_ZERO,
-			"... finalizing DVD+R done               ", 0, 0);
+			msg, 0, 0);
 
 	return 1;
 }
@@ -1200,7 +1216,7 @@ int burn_disc_close_track_dvd_plus_r(struct burn_write_opts *o,
 }
 
 
-/* ts A61218 - A70129 */
+/* ts A61218 - A81208 */
 int burn_dvd_write_track(struct burn_write_opts *o,
 			struct burn_session *s, int tnum, int is_last_track)
 {
@@ -1224,6 +1240,11 @@ int burn_dvd_write_track(struct burn_write_opts *o,
 		ret = burn_disc_open_track_dvd_plus_r(o, s, tnum);
 		if (ret <= 0)
 			goto ex;
+	} else if (d->current_profile == 0x41) {
+		/* BD-R SRM */
+		ret = burn_disc_open_track_dvd_plus_r(o, s, tnum);
+		if (ret <= 0)
+			goto ex;
 	}
 
 	sectors = burn_track_get_sectors(t);
@@ -1292,6 +1313,12 @@ int burn_dvd_write_track(struct burn_write_opts *o,
 							 is_last_track);
 		if (ret <= 0)
 			goto ex;
+	} else if (d->current_profile == 0x41) {
+		/* BD-R SRM */
+		ret = burn_disc_close_track_dvd_plus_r(o, s, tnum,
+							 is_last_track);
+		if (ret <= 0)
+			goto ex;
 	}
 	ret = 1;
 ex:;
@@ -1372,10 +1399,70 @@ int burn_disc_close_session_dvd_minus_r(struct burn_write_opts *o,
 int burn_dvd_write_session(struct burn_write_opts *o,
 				struct burn_session *s, int is_last_session)
 {
-	int i,ret;
+	int i, ret, multi_mem;
         struct burn_drive *d = o->drive;
 
-	/* >>> open_session ? */
+	/* ts A90108 */
+	if (d->current_profile == 0x41 && d->status == BURN_DISC_APPENDABLE &&
+	    d->state_of_last_session == 1) {
+		/* last session on BD-R is still open */;
+
+		/* BR-R were not closed by libburn-0.6.0.pl00 if o->multi==0.
+		   This leads to an unreadable, but recoverable) media state.
+		   Technically they are appendable although the last session
+		   is not readable.
+
+		   By default the open session gets closed here before the new
+		   session is written. E.g. after writing a small dummy seesion
+		   number 2 one can read session 1 and write session 3 which
+		   points to data of session 1.
+
+		   For the case that no media with 3 sessions is desired it is
+		   possible to activate the following coarse single-session
+		   closing code:
+		   No new session will be written but calling programs will
+		   report success. Quite misleading.
+		   Activate only if really needed by
+		   # define Libburn_bug_A90108_close_disC yes
+		*/
+
+
+#ifdef Libburn_bug_A90108_close_disC
+
+		/* Close open session and media. 
+		   That was the goal of the failed run which led to the
+		   unreadable (but recoverable) media state.
+
+		   It is not easy to implement a general close function for
+		   all media types. Therefore this pseudo write code is under
+		   control of #ifdef.
+		*/
+		libdax_msgs_submit(libdax_messenger, d->global_index,
+				0x00020171,
+				LIBDAX_MSGS_SEV_NOTE, LIBDAX_MSGS_PRIO_HIGH,
+				"Closing BD-R with accidently open session",
+				0, 0);
+ 		d->close_track_session(d, 3, 0); /* CLOSE SESSION, 110b */
+		d->state_of_last_session = 3; /* mark as complete session */
+		d->status = BURN_DISC_FULL;
+		sleep(3); /* The caller might need time to arrange itself */
+		return 1;
+
+#else /* Libburn_bug_A90108_close_disC */
+
+		/* This is the default mode.
+		*/
+		libdax_msgs_submit(libdax_messenger, d->global_index,
+				0x00020170,
+				LIBDAX_MSGS_SEV_NOTE, LIBDAX_MSGS_PRIO_HIGH,
+				"Closing open session before writing new one",
+				0, 0);
+ 		d->close_track_session(d, 1, 0); /* CLOSE SESSION, 010b */
+		d->state_of_last_session = 3; /* mark as complete session */
+
+#endif /* ! Libburn_bug_A90108_close_disC */
+
+	}
 
 	for (i = 0; i < s->tracks; i++) {
 		ret = burn_dvd_write_track(o, s, i,
@@ -1386,7 +1473,11 @@ int burn_dvd_write_session(struct burn_write_opts *o,
 	if (d->current_profile == 0x11 || d->current_profile == 0x14 ||
 	    d->current_profile == 0x15) {
 		/* DVD-R , DVD-RW Sequential, DVD-R/DL Sequential */
+		multi_mem = o->multi;
+		if (!is_last_session)
+			o->multi = 1;
 		ret = burn_disc_close_session_dvd_minus_r(o, s);
+		o->multi = multi_mem;
 		if (ret <= 0)
 			return 0;
 	} else if (d->current_profile == 0x12 || d->current_profile == 0x43) {
@@ -1408,6 +1499,8 @@ int burn_dvd_write_session(struct burn_write_opts *o,
 		}
 	} else if (d->current_profile == 0x1b || d->current_profile == 0x2b) {
 		/* DVD+R , DVD+R/DL do each track as an own session */;
+	} else if (d->current_profile == 0x41) {
+		/* BD-R SRM do each track as an own session */;
 	}
 	return 1;
 }
@@ -1611,8 +1704,12 @@ int burn_dvd_write_sync(struct burn_write_opts *o,
 		/* ??? padding needed ??? cowardly doing it for now */
 		o->obs_pad = 1; /* fill-up track's last 32k buffer */
 		
-	} else if (d->current_profile == 0x1b || d->current_profile == 0x2b) {
-		/* DVD+R , DVD+R/DL */
+	} else if (d->current_profile == 0x1b || d->current_profile == 0x2b ||
+		   d->current_profile == 0x41) {
+		/* DVD+R , DVD+R/DL , BD-R SRM */
+
+		/* >>> ts A81208 : with BD-R set o->obs to 64 kB ? */
+
 		t = disc->session[0]->track[0];
 		o_end = ( burn_track_is_open_ended(t) && !o->fill_up_media );
 		default_size = burn_track_get_default_size(t);
@@ -1627,8 +1724,8 @@ int burn_dvd_write_sync(struct burn_write_opts *o,
 		}
 		ret = burn_disc_setup_dvd_plus_r(o, disc);
 		if (ret <= 0) {
-			sprintf(msg,
-			  "Write preparation setup failed for DVD+R");
+			sprintf(msg, "Write preparation setup failed for %s",
+			   	d->current_profile == 0x41 ? "BD-R" : "DVD+R");
 			libdax_msgs_submit(libdax_messenger, d->global_index,
 				0x00020121,
 				LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
@@ -1748,6 +1845,13 @@ int burn_stdio_read_source(struct burn_source *source, char *buf, int bufsize,
 int burn_stdio_write(int fd, char *buf, int count, struct burn_drive *d, 
 			 int flag)
 {
+	if (d->cancel)
+		return 0;
+/*
+fprintf(stderr, "libburn_DEBUG: write(%d, %lX, %d)\n",
+                fd, (unsigned long) buf, count);
+*/
+
 	if (write(fd, buf, count) != count) {
 		libdax_msgs_submit(libdax_messenger, d->global_index,
 			0x00020148,
@@ -1996,9 +2100,9 @@ void burn_disc_write_sync(struct burn_write_opts *o, struct burn_disc *disc)
 {
 	struct cue_sheet *sheet;
 	struct burn_drive *d = o->drive;
-	struct buffer buf;
+	struct buffer *buffer_mem = o->drive->buffer;
 	struct burn_track *lt, *t;
-	int first = 1, i, ret, lba, nwa = 0;
+	int first = 1, i, ret, lba, nwa = 0, multi_mem;
 	off_t default_size;
 	char msg[80];
 
@@ -2009,11 +2113,40 @@ void burn_disc_write_sync(struct burn_write_opts *o, struct burn_disc *disc)
 	/* ts A61224 */
 	burn_disc_init_write_status(o, disc); /* must be done very early */
 
-	/* ts A80412 */
-	d->do_stream_recording = o->do_stream_recording;
+	/* ts A80412 , A90227 */
+	d->do_stream_recording = !!o->do_stream_recording;
+	if (o->do_stream_recording >= 16)
+		d->stream_recording_start = o->do_stream_recording;
+	else
+		d->stream_recording_start = 0;
+
+	d->buffer = calloc(sizeof(struct buffer), 1);
+	if (d->buffer == NULL)
+		goto fail_wo_sync;
+
+
+/* >>> ts A90321
 
-	d->buffer = &buf;
 	memset(d->buffer, 0, sizeof(struct buffer));
+
+fprintf(stderr, "libburn_DEBUG: d->buffer = %lX , size = %d\n",
+                (unsigned long) d->buffer, (int) sizeof(struct buffer));
+
+calloc() seems not to have the desired effect. valgrind warns:
+==18251== Syscall param write(buf) points to uninitialised byte(s)
+==18251==    at 0x5071DEB: (within /lib64/libpthread-2.5.so)
+==18251==    by 0x4723FA: burn_stdio_write (write.c:1850)
+==18251==    by 0x4725DC: burn_stdio_mmc_write (write.c:1894)
+==18251==    by 0x483B7A: get_sector (sector.c:229)
+==18251==    by 0x484F11: sector_data (sector.c:639)
+==18251==    by 0x4729FE: burn_stdio_write_track (write.c:2012)
+==18251==    by 0x472CF4: burn_stdio_write_sync (write.c:2072)
+==18251==    by 0x472E8D: burn_disc_write_sync (write.c:2125) <<< we are here
+==18251==    by 0x460254: write_disc_worker_func (async.c:514)
+==18251==    by 0x506B09D: start_thread (in /lib64/libpthread-2.5.so)
+==18251==    by 0x55484CC: clone (in /lib64/libc-2.5.so)
+*/
+
 	d->rlba = -150;
 	d->toc_temp = 9;
 
@@ -2148,7 +2281,12 @@ return crap.  so we send the command, then ignore the result.
 				d->alba += 4500;
 			}
 		}
-		if (!burn_write_session(o, disc->session[i]))
+		multi_mem = o->multi;
+		if(i < disc->sessions - 1)
+			o->multi = 1;
+		ret = burn_write_session(o, disc->session[i]);
+		o->multi = multi_mem;
+		if (!ret)
 			goto fail;
 
 		lt = disc->session[i]->track[disc->session[i]->tracks - 1];
@@ -2206,6 +2344,9 @@ fail_wo_sync:;
 	d->busy = BURN_DRIVE_IDLE;
 ex:;
 	d->do_stream_recording = 0;
+	if (d->buffer != NULL)
+		free((char *) d->buffer);
+	d->buffer = buffer_mem;
 	return;
 }
 
@@ -2215,7 +2356,7 @@ int burn_random_access_write(struct burn_drive *d, off_t byte_address,
 {
 	int alignment = 0, start, upto, chunksize, err, fd = -1, ret;
 	char msg[81], *rpt;
-	struct buffer buf;
+	struct buffer buf, *buffer_mem = d->buffer;
 
 	if (d->released) {
 		libdax_msgs_submit(libdax_messenger,
@@ -2326,7 +2467,7 @@ int burn_random_access_write(struct burn_drive *d, off_t byte_address,
 		
 	if(fd >= 0)
 		close(fd);
-	d->buffer = NULL;
+	d->buffer = buffer_mem;
 	d->busy = BURN_DRIVE_IDLE;
 	return 1;
 }

test/libburner.c

@@ -1,6 +1,6 @@
 
 /* test/libburner.c , API illustration of burning data or audio tracks to CD */
-/* Copyright (C) 2005 - 2007 Thomas Schmitt <scdbackup@gmx.net> */
+/* Copyright (C) 2005 - 2009 Thomas Schmitt <scdbackup@gmx.net> */
 /* Provided under GPLv2,see also "License and copyright aspects" at file end */
 
 
@@ -8,9 +8,9 @@
   
   libburner is a minimal demo application for the library libburn as provided
   on  http://libburnia-project.org . It can list the available devices, can
-  blank a CD-RW or DVD-RW, can format DVD-RW and BD-RE, can burn to CD-R,
-  CD-RW, DVD-R, DVD+R, DVD+R/DL, DVD+RW, DVD-RW, DVD-RAM, BD-RE. 
-  Not supported yet: DVD-R/DL, BD-R.
+  blank a CD-RW or DVD-RW, can format DVD-RW and BD, can burn to CD-R,
+  CD-RW, DVD-R, DVD+R, DVD+R/DL, DVD+RW, DVD-RW, DVD-RAM, BD-R, BD-RE. 
+  Not supported yet: DVD-R/DL.
 
   It's main purpose, nevertheless, is to show you how to use libburn and also
   to serve the libburnia team as reference application. libburner.c does indeed
@@ -29,9 +29,9 @@
   With that aquired drive you can blank a CD-RW
      libburner_blank_disc()
   or you can format a DVD-RW to profile "Restricted Overwrite" (needed once)
-  or an unused BD-RE to default size
-     libburner_format_owrt()
-  With the aquired drive you can burn to CD or DVD
+  or an unused BD to default size with spare blocks
+     libburner_format()
+  With the aquired drive you can burn to CD, DVD, BD
      libburner_payload()
   When everything is done, main() releases the drive and shuts down libburn:
      burn_drive_release();
@@ -106,7 +106,7 @@ int libburner_aquire_drive(char *drive_adr, int *driveno)
 		ret = libburner_aquire_by_adr(drive_adr);
 	else
 		ret = libburner_aquire_by_driveno(driveno);
-	if (ret <= 0)
+	if (ret <= 0 || *driveno <= 0)
 		return ret;
 	burn_disc_get_profile(drive_list[0].drive, &current_profile,
 				 current_profile_name);
@@ -260,7 +260,8 @@ int libburner_aquire_by_driveno(int *driveno)
 }
 
 
-/** Makes a previously used CD-RW ready for thorough re-usal.
+/** Makes a previously used CD-RW or unformatted DVD-RW ready for thorough
+    re-usal.
 
     To our knowledge it is hardly possible to abort an ongoing blank operation
     because after start it is entirely handled by the drive.
@@ -322,24 +323,35 @@ int libburner_blank_disc(struct burn_drive *drive, int blank_fast)
     Formats unformatted BD-RE to default size. This will allocate some
     reserve space, test for bad blocks and make the media ready for writing.
     Expect a very long run time.
+
+    Formats unformatted blank BD-R to hold a default amount of spare blocks
+    for eventual mishaps during writing. If BD-R get written without being
+    formatted, then they get no such reserve and will burn at full speed.
 */
-int libburner_format_owrt(struct burn_drive *drive)
+int libburner_format(struct burn_drive *drive)
 {
 	struct burn_progress p;
 	double percent = 1.0;
 	int ret, status, num_formats, format_flag= 0;
 	off_t size = 0;
 	unsigned dummy;
+	enum burn_disc_status disc_state;
 
 	if (current_profile == 0x13) {
 		fprintf(stderr, "IDLE: DVD-RW media is already formatted\n");
 		return 2;
-	} else if (current_profile == 0x43) {
+	} else if (current_profile == 0x41 || current_profile == 0x43) {
+		disc_state = burn_disc_get_status(drive);
+		if (disc_state != BURN_DISC_BLANK && current_profile == 0x41) {
+			fprintf(stderr,
+				"FATAL: BD-R is not blank. Cannot format.\n");
+			return 0;
+		}
 		ret = burn_disc_get_formats(drive, &status, &size, &dummy,
 								&num_formats);
-		if (ret > 0 && status == BURN_FORMAT_IS_FORMATTED) {
+		if (ret > 0 && status != BURN_FORMAT_IS_UNFORMATTED) {
 			fprintf(stderr,
-				"IDLE: BD-RE media is already formatted\n");
+				"IDLE: BD media is already formatted\n");
 			return 2;
 		}
 		size = 0;           /* does not really matter */
@@ -348,7 +360,7 @@ int libburner_format_owrt(struct burn_drive *drive)
 		size = 128 * 1024 * 1024;
 		format_flag = 1; /* write initial 128 MiB */
 	} else {
-		fprintf(stderr, "FATAL: Can only format DVD-RW or BD-RE\n");
+		fprintf(stderr, "FATAL: Can only format DVD-RW or BD\n");
 		return 0;
 	}
 
@@ -476,7 +488,7 @@ int libburner_payload(struct burn_drive *drive,
 	  /* Give up local reference to the data burn_source object */
 	  burn_source_free(data_src);
 	  
-        } /* trackno loop end */
+	} /* trackno loop end */
 
 	/* Evaluate drive and media */
 	disc_state = burn_disc_get_status(drive);
@@ -614,7 +626,8 @@ int libburner_setup(int argc, char **argv)
                 }
                 strcpy(drive_adr, argv[i]);
             }
-        } else if (!strcmp(argv[i], "--format_overwrite")) {
+        } else if ((!strcmp(argv[i], "--format_overwrite")) ||
+		   (!strcmp(argv[i], "--format"))) {
             do_blank = 101;
 
         } else if (!strcmp(argv[i], "--multi")) {
@@ -655,8 +668,7 @@ int libburner_setup(int argc, char **argv)
     if (print_help || insuffient_parameters ) {
         printf("Usage: %s\n", argv[0]);
         printf("       [--drive <address>|<driveno>|\"-\"]  [--audio]\n");
-        printf("       [--blank_fast|--blank_full|--format_overwrite]\n");
-	printf("       [--try_to_simulate]\n");
+        printf("       [--blank_fast|--blank_full|--format]  [--try_to_simulate]\n");
         printf("       [--multi]  [<one or more imagefiles>|\"-\"]\n");
         printf("Examples\n");
         printf("A bus scan (needs rw-permissions to see a drive):\n");
@@ -669,8 +681,8 @@ int libburner_setup(int argc, char **argv)
         printf("  %s --drive /dev/hdc --blank_fast\n",argv[0]);
         printf("Blank a used DVD-RW (is combinable with burning in one run):\n");
         printf("  %s --drive /dev/hdc --blank_full\n",argv[0]);
-        printf("Format a DVD-RW to avoid need for blanking before re-use:\n");
-        printf("  %s --drive /dev/hdc --format_overwrite\n", argv[0]);
+        printf("Format a DVD-RW, BD-RE or BD-R:\n");
+        printf("  %s --drive /dev/hdc --format\n", argv[0]);
         printf("Burn two audio tracks (to CD only):\n");
         printf("  lame --decode -t /path/to/track1.mp3 track1.cd\n");
         printf("  test/dewav /path/to/track2.wav -o track2.cd\n");
@@ -720,7 +732,7 @@ int main(int argc, char **argv)
 		{ ret = 0; goto release_drive; }
 	if (do_blank) {
 		if (do_blank > 100)
-			ret = libburner_format_owrt(drive_list[driveno].drive);
+			ret = libburner_format(drive_list[driveno].drive);
 		else
 			ret = libburner_blank_disc(drive_list[driveno].drive,
 							do_blank == 1);