Bug fix: Compilation warning for unsupported systems mutated into an error

we would be better off building on the given OS/arch instead of playing with preprocessor directives;
all releng tests are gathered in libisoburn tree

ChangeLog

@@ -1,6 +1,135 @@
-SVN trunk (to become libburn-1.0.8.pl00.tar.gz)
+libburn-1.3.6.tar.gz Tue Mar 04 2013
 ===============================================================================
-- no novelties yet
+* New system adapter for NetBSD
+
+libburn-1.3.4.tar.gz Thu Dec 12 2013
+===============================================================================
+* Bug fix: Drive error reports were ignored during blanking and formatting
+* Bug fix: Drive LG BH16NS40 stalls on inspection of unformatted DVD+RW
+* New API call burn_disc_pretend_full_uncond()
+
+libburn-1.3.2.tar.gz Wed Aug 07 2013
+===============================================================================
+* Bug fix: cdrskin -msinfo on DVD and BD reported
+           old session start = next writable address.
+           Regression introduced by version 1.2.8 (rev 4956).
+* Bug fix: The signal handler aborted on SIGCONT, SIGTSTP, SIGTTIN, SIGTTOU
+* New API call burn_make_input_sheet_v07t()
+* API call burn_session_input_sheet_v07t(): read multiple blocks from same file
+* New API calls burn_drive_extract_audio(), burn_drive_extract_audio_track()
+* New cdrskin option textfile_to_v07t=
+* New cdrskin options cdtext_to_textfile= and cdtext_to_v07t=
+* New cdrskin options extract_audio_to= , extract_tracks= , extract_basename= ,
+  --extract_dap
+* New cdrskin option --pacifier_with_newline
+* Improved granularity of SCSI log time measurement, now with timestamp
+* Optional "make doc" now demands doxygen 1.8.4
+
+libburn-1.3.0.pl01.tar.gz Fri May 31 2013
+===============================================================================
+* Bug fix: cdrskin -msinfo on DVD and BD reported
+           old session start = next writable address.
+           Regression introduced by version 1.2.8.
+
+libburn-1.3.0.tar.gz Fri May 17 2013
+===============================================================================
+* Bug fix: Full formatting of BD-RE used certification regardless of drive
+           capabilities
+* Bug fix: DVD+R with damaged TOC were reported by -minfo with wrong end
+           address
+
+libburn-1.2.8.tar.gz Mon Mar 18 2013
+===============================================================================
+* Bug fix: All CD tracks were reported with the sizes of the tracks in the 
+           first session. Regression introduced with version 1.2.0 (rev 4552).
+* Bug fix: On some drives the request for minimum speed yielded maximum speed
+* New cdrskin option --list_speeds
+* -toc and -minfo now report about tracks in the incomplete session
+* New API call burn_disc_get_incomplete_sessions()
+* New burn_toc_entry component .track_status_bits
+
+libburn-1.2.6.tar.gz Tue Jan 08 2013
+===============================================================================
+* Bug fix: Speed setting had no effect on BD media
+* New cdrskin option --no_load
+* New API call burn_read_audio()
+* New API call burn_list_sev_texts()
+
+libburn-1.2.4.tar.gz Fri Jul 20 2012
+===============================================================================
+* Bug fix: CD SAO sessions with data tracks started by an audio pause
+* Bug fix: CD tracks were perceived 2 sectors too short.
+           Nice with TAO, bad with SAO.
+* Bug fix: cdrskin SIGSEGV if track source was added when no drive was available
+* New API call burn_write_opts_set_obs_pad(), ./configure --enable-dvd-obs-pad
+* New cdrskin option --obs_pad
+
+libburn-1.2.2.tar.gz Mon Apr 02 2012
+===============================================================================
+* Small internal refinements
+
+libburn-1.2.0.tar.gz Sat Jan 28 2012
+===============================================================================
+* Bug fix: cdrskin produced a memory fault if interupted before writing began
+* Bug fix: Solaris adapter mishandled write commands which failed on first try
+* Bug fix: Interrupting libburn while drive tray is loading led to endless loop
+* Bug fix: Progress report with blanking and formatting could be bogus
+* New API calls burn_disc_get_leadin_text(), burn_write_opts_set_leadin_text()
+* New API calls for composing CD-TEXT, see doc/cdtext.txt
+* New API call burn_session_by_cue_file() for reading CDRWIN .cue files
+* New API call burn_track_set_isrc_string()
+* New API calls burn_track_set_index(), burn_track_clear_indice()
+* New API calls burn_session_set_start_tno(), burn_session_get_start_tno()
+* New API calls burn_track_set_pregap_size(), burn_track_set_postgap_size()
+* Implemented cdrskin option textfile=
+* Implemented cdrskin option combination -vv -toc for cdtext.dat production
+* Implemented cdrskin options mcn= and isrc=
+* Implemented cdrskin options -scms -copy -nocopy -preemp -nopreemp
+* Implemented cdrskin option index=
+* Partly implemented cdrskin options cuefile= and -text
+* New cdrskin option input_sheet_v07t= for CD-TEXT definition
+* New cdrskin options --cdtext_dummy and --cdtext_verbose
+* New cdrskin options --four_channel --two_channel
+* New cdrskin option cd_start_tno= 
+* New cdrskin options sao_pregap=, sao_postgap=
+
+libburn-1.1.8.tar.gz Mon Nov 21 2011
+===============================================================================
+* Bug fix: Misinterpreted mode page 2A if block descriptors are present
+* Enabled recognition of QEMU DVD-ROM 0.12
+* Avoiding to intermediately close and open drive device file
+* New API call burn_drive_re_assess()
+
+libburn-1.1.6.tar.gz Tue Sep 27 2011
+===============================================================================
+* Bug fix: stdio sizes > 4 TB - 32 kB caused integer rollover
+* Worked around a collision with Linux udev which lets links vanish
+
+libburn-1.1.4.tar.gz Sun Aug 07 2011
+===============================================================================
+* Bug fix: Some drives return -150 as NWA of blank CD, rather than 0.
+           libburn forwarded this misleading information to the application.
+* Bug fix: Some drives returned wrong CD sizes after having burned DVD-R
+* Bug fix: Empty ROM drive was mistaken to hold an unsuitable disc
+* Bug fix: Avoiding to load speed descriptor list twice
+* New API call burn_lookup_device_link()
+* New API call burn_disc_get_phys_format_info()
+* New cdrskin option --device_links
+
+Release 1.1.2 was skipped to get back in sync with libisoburn.
+
+libburn-1.1.0.pl01.tar.gz Mon Jun 20 2011
+===============================================================================
+* Bug fix: libburn-1.1.0 compiled only on Linux, FreeBSD, and Solaris
+
+libburn-1.1.0.tar.gz Sat Jun 18 2011
+===============================================================================
+* Bug fix: burn_disc_format() on DVD-RW issued wrong block size with type 00h
+* New API call burn_disc_next_track_is_damaged()
+* New API call burn_disc_close_damaged()
+* Dropped suffix .plXY from tarball name
+
+Release 1.0.8 was skipped to get back in sync with libisofs and libisoburn.
 
 libburn-1.0.6.pl00.tar.gz Sat Apr 9 2011
 ===============================================================================

Makefile.am

@@ -21,6 +21,7 @@ libburn_libburn_la_SOURCES = \
 	libburn/async.c \
 	libburn/async.h \
 	libburn/back_hacks.h \
+	libburn/cdtext.c \
 	libburn/cleanup.c \
 	libburn/cleanup.h \
 	libburn/crc.c \
@@ -68,8 +69,7 @@ libburn_libburn_la_SOURCES = \
 	libburn/util.c \
 	libburn/util.h \
 	libburn/write.c \
-	libburn/write.h \
-	version.h
+	libburn/write.h
 
 ##	libburn/sg-@ARCH@.c \
 
@@ -118,9 +118,9 @@ test_structest_CPPFLAGS = -Ilibburn
 test_structest_LDADD = $(libburn_libburn_la_OBJECTS) $(LIBBURN_EXTRALIBS)
 test_structest_SOURCES = test/structest.c
 
-##  cdrskin construction site - ts A60816 - B10409
+##  cdrskin construction site - ts A60816 - B40304
 cdrskin_cdrskin_CPPFLAGS = -Ilibburn
-cdrskin_cdrskin_CFLAGS = -DCdrskin_libburn_1_0_7
+cdrskin_cdrskin_CFLAGS = -DCdrskin_libburn_1_3_6
 
 # cdrskin_cdrskin_LDADD = $(libburn_libburn_la_OBJECTS) $(LIBBURN_EXTRALIBS)
 # ts A80123, change proposed by Simon Huggins to cause dynamic libburn linking
@@ -131,6 +131,11 @@ cdrskin_cdrskin_SOURCES = cdrskin/cdrskin.c cdrskin/cdrfifo.c cdrskin/cdrfifo.h
 ## Open questions: how to compute $timestamp and express -DX="$timestamp"
 ##                 
 
+# "make clean" shall remove a few stubborn .libs directories
+# which George Danchev reported Dec 03 2011.
+# Learned from: http://www.gnu.org/software/automake/manual/automake.html#Clean
+clean-local:
+	-rm -rf cdrskin/.libs test/.libs
 
 
 ## ========================================================================= ##
@@ -193,12 +198,14 @@ nodist_pkgconfig_DATA = \
 man_MANS = cdrskin/cdrskin.1
 
 EXTRA_DIST = \
+	bootstrap \
 	libburn-1.pc.in \
 	version.h.in \
 	doc/comments \
 	doc/doxygen.conf.in \
 	doc/cookbook.txt \
 	doc/mediainfo.txt \
+	doc/cdtext.txt \
 	README \
 	AUTHORS \
 	CONTRIBUTORS \
@@ -218,11 +225,13 @@ EXTRA_DIST = \
 	libburn/os-linux.h \
 	libburn/os-libcdio.h \
 	libburn/os-solaris.h \
+	libburn/os-netbsd.h \
 	libburn/sg-dummy.c \
 	libburn/sg-freebsd.c \
 	libburn/sg-linux.c \
 	libburn/sg-libcdio.c \
 	libburn/sg-solaris.c \
+	libburn/sg-netbsd.c \
 	COPYING \
 	NEWS \
 	ChangeLog \

README

@@ -4,14 +4,14 @@
 This all is under GPL.
 (See GPL reference, our clarification and commitment at the end of this text)
 ------------------------------------------------------------------------------
-libburn-project.org
+libburnia-project.org
 By Mario Danic <mario.danic@gmail.com> and Thomas Schmitt <scdbackup@gmx.net>
-Copyright (C) 2006-2011 Mario Danic, Thomas Schmitt
+Copyright (C) 2006-2014 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
 
-     http://files.libburnia-project.org/releases/libburn-1.0.6.pl00.tar.gz
+     http://files.libburnia-project.org/releases/libburn-1.3.6.tar.gz
 
 ------------------------------------------------------------------------------
 
@@ -19,10 +19,10 @@ Copyright (C) 2002-2006  Derek Foreman and Ben Jansens
 
                                 From tarball
 
-Obtain libburn-1.0.6.pl00.tar.gz, take it to a directory of your choice and do:
+Obtain libburn-1.3.6.tar.gz, take it to a directory of your choice and do:
 
-   tar xzf libburn-1.0.6.pl00.tar.gz
-   cd libburn-1.0.6
+   tar xzf libburn-1.3.6.tar.gz
+   cd libburn-1.3.6
    ./configure --prefix=/usr
    make
 
@@ -77,6 +77,10 @@ configure time by:
     --enable-dvd-obs-64k
 This may be combined with above --enable-track-src-odirect .
 
+If it is desired that DVD DAO writing and stdio: writing get padded up to
+a full write chunk of 32k resp. 64k, then use ./configure option:
+    --enable-dvd-obs-pad
+
 Alternatively the transport of SCSI commands can be done via libcdio-0.83.
 You may install it and re-run libburn's ./configure with option
     --enable-libcdio
@@ -92,6 +96,21 @@ Make sure to re-compile all source files after running ./configure
    make install
 
 
+Linux only:
+
+libburn tries to avoid a collision with udev's drive examination by waiting
+0.1 seconds before opening the device file for a longer time, after udev
+might have been alarmed by drive scanning activities.
+The waiting time can be set at ./configure time with microsecond granularity.
+E.g. 2 seconds:
+  CFLAGS="$CFLAGS -DLibburn_udev_wait_useC=2000000"
+  ./configure ...options...
+Waiting can be disabled by zero waiting time:
+  CFLAGS="$CFLAGS -DLibburn_udev_wait_useC=0"
+Alternatively, libburn can try to be nice by opening the device file,
+closing it immediately, waiting, and only then opening it for real:
+  CFLAGS="$CFLAGS -DLibburn_udev_extra_open_cyclE -DLibburn_udev_wait_useC=500000"
+
 ------------------------------------------------------------------------------
 
 An important part of the project, libisofs, is hosted in a bzr repository at
@@ -110,7 +129,7 @@ See README files there.
 
 libburnia-project.org is an open-source software project for reading, mastering
 and writing optical discs.
-For now this means CD media, all DVD media except DVD-R DL, all BD media.
+For now this means CD media, all DVD media, all BD media.
 
 The project comprises of several more or less interdependent parts which
 together strive to be a usable foundation for application development.
@@ -118,7 +137,8 @@ These are libraries, language bindings, and middleware binaries which emulate
 classical (and valuable) Linux tools.
 Currently it is supported on GNU/Linux with kernels >= 2.4,
 on FreeBSD with ATAPI/CAM enabled in the kernel (see man atapicam),
-and on OpenSolaris (tested with kernel 5.11).
+on OpenSolaris (tested with kernel 5.11),
+on NetBSD (tested with 6.1.3).
 On other X/Open compliant systems there will only be pseudo drives, but no
 direct MMC operation on real CD/DVD/BD drives.
 
@@ -180,7 +200,8 @@ The project components (list subject to growth, hopefully):
            sparse emulation of cdrecord and a more laborate one of mkisofs.
            All features of xorriso are also available via a C language API
            of libisoburn.
-           See xorriso/README for more.
+           A static compilation of xorriso and the libraries is dedicated
+           to the GNU Operating System. See xorriso/README_gnu_xorriso .
 
 - "test"   is a collection of application gestures and examples given by the
            authors of the library features. The burn API example of libburn
@@ -613,6 +634,98 @@ Project history as far as known to me:
   up to 103 characters. xorriso fixes two bugs and makes use of the library
   improvements.
 
+- Thu Apr 14 2011 release libisoburn-1.0.8:
+  A bug in the mkisofs emulation of xorriso could cause options to be ignored.
+  The problem was freshly introduced with libisoburn-1.0.6. 
+
+- Fri May 13 2011 release libisofs-1.0.8:
+  Fixes a few rarely occurring bugs that have been found during the last month.
+
+- Sat Jun 18 2011 release 1.1.0:
+  The consumption of stack memory was reduced. Statical program analysis found
+  some rarely occuring memory leaks. Several small bugs were fixed.
+  The suffix .plXY was dropped from tarball names of libburn and libisoburn.
+
+- Mon Jun 20 2011 patch release libburn-1.1.0.pl01:
+  libburn-1.1.0 compiled only on Linux, FreeBSD, and Solaris, but not on
+  other X/Open compliant systems.
+
+- Fri Jul 08 2011 release libisofs-1.1.2 and libisoburn-1.1.2:
+  A severe regression was fixed in libisoburn and xorriso, which was introduced
+  with version 1.0.6. It caused ISO 9660 images to be unreadable if they were
+  written to a write-only random-access file. E.g. by: xorrisofs ... >image.iso
+  
+- Mon Aug 08 2011 release 1.1.4:
+  Several bugs were fixed in libburn. The most severe of them prevented xorriso
+  on some drives from burning mountable ISO 9660 images to CD media.
+  New means to list drives by their udev symbolic links help to deal with
+  the non-persistent drive addresses on modern GNU/Linux.
+
+- Tue Sep 27 2011 release 1.1.6:
+  libisoburn now comes with a test suite. See releng/README. Bugs were fixed
+  in several rarely used features. Processing of ACL and extattr was enabled
+  on FreeBSD. Workarounds try to cope with vanishing udev links on GNU/Linux.
+
+- Mon Nov 21 2011 release libburn-1.1.8 and libisoburn-1.1.8:
+  libburn avoids to close and open drive device files while operating on them.
+  xorriso emulation mode xorrecord now has an own manual. libburn and xorriso
+  were prepared to operate on qemu virtio-blk-pci devices.
+
+- Sat Jan 28 2012 release 1.2.0:
+  libburn has learned to read and write CD-TEXT with CD SAO audio sessions.
+  It can now read CDRWIN .cue files which define pure audio or pure data
+  sessions. libisofs and libisoburn improved timestamp handling. Several
+  minor bugs were fixed.
+
+- Mon Apr 02 2012 release 1.2.2:
+  The handling of intentional deviations from ECMA-119 specifications has
+  been improved in libisofs. libisoburn and xorriso now make use of these
+  improvements. Some rarely occuring bugs have been fixed.  
+
+- Fri Jul 20 2012 release 1.2.4:
+  libburn and libisofs got some rarely occuring bugs fixed. libisofs learned
+  to produce HFS+ metadata and Apple Partition Map. The capabilities of
+  isohybrid options --efi and --mac have been implemented (GPT and APM).
+
+- Tue Jan 08 2013 release 1.2.6:
+  Small improvements were made in libburn. Minor bugs were fixed in the
+  libraries. xorriso improved its capabilities to serve the needs of frontend
+  programs. A proof of concept for a GUI frontend has been implemented:
+  xorriso-tcltk
+
+- Mon Mar 18 2013 release 1.2.8:
+  Some rarely occuring bugs were fixed in libisofs and libburn. libburn's
+  handling of incomplete sessions has been improved. xorriso's mkisofs
+  emulation learned to set El Torito section id strings.
+
+- Fri May 17 2013 release 1.3.0:
+  Several bugs were fixed in the libraries and in xorriso. The recently
+  introduced new boot preparation capabilities have been tested. New
+  boot preparation options for GRUB2 were added.
+
+- Fri May 31 2013 patch release libburn-1.3.0.pl01:
+  cdrskin -msinfo on DVD and BD reported as old session start the same
+  number as the next writable address.
+  Regression introduced by version 1.2.8.
+
+- Fri Aug 07 2013 release 1.3.2:
+  cdrskin has aquired the capability to copy audio tracks to .wav files.
+  It can extract CD-TEXT in a form that is readable for humans and for
+  cdrskin itself. Several small bugs were fixed in xorriso. Its capabilities
+  to serve frontend programs in dialog mode have been improved.
+
+- Thu Dec 12 2013 release 1.3.4:
+  A long standing hidden bug was fixed, which affected inspection of
+  unformatted DVD+RW.
+  xorriso now by default puts EL Torito boot images to low block addresses.
+  It can report and set read speeds. Several rarely occuring bugs were fixed.
+
+- Tue Mar 04 2014 release 1.3.6
+  libburn learned to operate optical drives and media on NetBSD. libisofs got
+  a bug fix about HFS+ and enhancements about character set conversion.
+  Minor bugs were fixed in libisoburn. xorriso can now find files with names
+  which cannot be represented unchanged in ECMA-119, Joliet, or HFS+. 
+
 
 ------------------------------------------------------------------------------
 

acinclude.m4

@@ -1,7 +1,7 @@
 AC_DEFUN([LIBBURNIA_SET_FLAGS],
 [
 case $target_os in
-freebsd*)
+freebsd* | netbsd*)
         LDFLAGS="$LDFLAGS -L/usr/local/lib"
         CPPFLAGS="$CPPFLAGS -I/usr/local/include"
         ;;

cdrskin/README

@@ -4,17 +4,17 @@
 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-1.0.7.tar.gz
+http://scdbackup.sourceforge.net/cdrskin-1.3.6.tar.gz
 
-Copyright (C) 2006-2011 Thomas Schmitt, provided under GPL version 2 or later.
+Copyright (C) 2006-2014 Thomas Schmitt, provided under GPL version 2 or later.
 ------------------------------------------------------------------------------
 
 
 cdrskin is a limited cdrecord compatibility wrapper which allows to use
 most of the libburn features from the command line.
 
-Currently it is supported on GNU/Linux with kernels >= 2.4,
-on FreeBSD and on OpenSolaris.
+Currently it is fully supported on GNU/Linux with kernels >= 2.4, on FreeBSD,
+on OpenSolaris, and on NetBSD.
 IDE drives under Linux 2.4. need kernel module ide-scsi.
 ATA and SATA drives under FreeBSD need kernel module atapicam.
 On other X/Open compliant systems there will only be emulated drives, but no
@@ -26,10 +26,10 @@ By using this software you agree to the disclaimer at the end of this text
 
                    Compilation, First Glimpse, Installation
 
-Obtain cdrskin-1.0.7.tar.gz, take it to a directory of your choice and do:
+Obtain cdrskin-1.3.6.tar.gz, take it to a directory of your choice and do:
 
-    tar xzf cdrskin-1.0.7.tar.gz
-    cd cdrskin-1.0.7
+    tar xzf cdrskin-1.3.6.tar.gz
+    cd cdrskin-1.3.6
 
 Within that directory execute:
 
@@ -108,8 +108,9 @@ On Linux, full and insecure enabling of both for everybody would look like
     chmod a+rw /dev/sr0 /dev/hda
 This is equivalent to the traditional setup chmod a+x,u+s cdrecord.
 
-On FreeBSD, device permissions are to be set in /etc/devfs.rules.
+On FreeBSD, device rw-permissions are to be set in /etc/devfs.rules.
 On Solaris, pfexec privileges may be restricted to "basic,sys_devices".
+On NetBSD, rw-permission may be granted by chmod a+rw /dev/rcd?d.
 See below "System Dependend Drive Permission Examples".
 
 I strongly discourage to run cdrskin with setuid root or via sudo !
@@ -191,6 +192,11 @@ See below "Audio CD" for specifications.
     cdrskin -v dev=0,1,0 blank=fast -eject speed=48 -sao \
            -audio -swab track0[1-5].cd /path/to/track6.wav
 
+Extract audio tracks and CD-TEXT from CD into directory /home/me/my_cd:
+    mkdir /home/me/my_cd
+    cdrskin -v dev=/dev/sr0 extract_audio_to=/home/me/my_cd \
+            cdtext_to_v07t=/home/me/my_cd/cdtext.v07t
+
 
                                 Restrictions
 
@@ -438,12 +444,28 @@ It will not read startup files, will abort on option  dev_translation= ,
 will not have a fifo buffer, and will not be able to put out help texts or
 debugging messages.
 
+
+Linux only:
+
+libburn tries to avoid a collision with udev's drive examination by waiting
+0.1 seconds before opening the device file for a longer time, after udev
+might have been alarmed by drive scanning activities.
+The waiting time can be set at ./configure time with microsecond granularity.
+E.g. 2 seconds:
+  CFLAGS="$CFLAGS -DLibburn_udev_wait_useC=2000000"
+  ./configure ...options...
+Waiting can be disabled by zero waiting time:
+  CFLAGS="$CFLAGS -DLibburn_udev_wait_useC=0"
+Alternatively, libburn can try to be nice by opening the device file,
+closing it immediately, waiting, and only then opening it for real:
+  CFLAGS="$CFLAGS -DLibburn_udev_extra_open_cyclE -DLibburn_udev_wait_useC=500000"
+
 ------------------------------------------------------------------------------
 
                   System Dependend Drive Permission Examples
 
 Accessing the optical drives requires privileges which usually are granted
-only to the superuser. Linux, FreeBSD and Solaris offer quite different
+only to the superuser. Linux, FreeBSD, Solaris, NetBSD, offer quite different
 approaches for avoiding the need for unrestricted privileges.
 
 First check whether some friendly system setting already allows you to
@@ -454,9 +476,9 @@ Those drives of which you see address and type strings are already usable.
 If there remain drives invisible which the superuser can see by the same
 command, then the following examples might help:
 
---------------------- 
-On all three systems:
---------------------- 
+--------------- 
+On all systems:
+--------------- 
 Add the authorized users of CD drives to group "floppy" in /etc/group.
 If missing: create this group.
 Changes to /etc/group often only affect new login sessions. So log out and in
@@ -516,6 +538,12 @@ Then allow the group r-access to the drives
 The last two commands have to be executed after each boot. I do not know
 the relevant device configuration files yet.
 
+----------
+On NetBSD:
+----------
+Allow rw-access to the drives
+  chgrp floppy /dev/rcd[01]d
+  chmod g+rw   /dev/rcd[01]d
 
 ------------------------------------------------------------------------------
                       Project aspects and legal stuff
@@ -560,7 +588,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-2010 Mario Danic, Thomas Schmitt
+Copyright (C) 2006-2013 Mario Danic, Thomas Schmitt
 
 libburnia-project.org is inspired by and in other components still containing
 parts of

cdrskin/add_ts_changes_to_libburn_1_3_6

@@ -38,8 +38,9 @@ original="./libburn_svn_release.tgz"
 # My changes are in $changes , mainly in $changes/cdrskin
 changes="./libburn-release"
 
-skin_release="1.0.6"
-patch_level=".pl00"
+skin_release="1.3.6"
+patch_level=""
+# patch_level=".pl00"
 skin_rev="$skin_release""$patch_level"
 
 # The result directory and the name of the result tarballs

cdrskin/add_ts_changes_to_libburn_1_3_7

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

cdrskin/cdrfifo.c

@@ -634,7 +634,7 @@ return: <0 = error , 0 = idle , 1 = did some work
 */
 {
  double buffer_space;
- int can_read,can_write= 0,ret,did_work= 0,idx,sod,eop_is_near,eop_idx;
+ int can_read,can_write= 0,ret,did_work= 0,idx,sod, eop_idx;
 
  buffer_space= Cdrfifo_tell_buffer_space(o,0);
  if(o->dest_fd>=0) if(FD_ISSET((o->dest_fd),wts)) {
@@ -644,7 +644,7 @@ return: <0 = error , 0 = idle , 1 = did some work
    if(o->read_idx+can_write > o->buffer_size)
      can_write= o->buffer_size - o->read_idx;
    if(o->follow_up_fd_idx>=0) {
-     eop_is_near= Cdrfifo_eop_adjust(o,&can_write,&eop_idx,0);
+     Cdrfifo_eop_adjust(o,&can_write,&eop_idx,0);
      if(can_write<=0)
        goto after_write;
    }
@@ -1039,9 +1039,9 @@ int Test_mixed_bs(char **paths, int path_count,
  bit0= debugging verbousity
 */
 {
- int fd_in[100],fd_out[100],ret,pipe_fds[100][2],real_out[100];
+ int fd_in[100],fd_out[100],ret,pipe_fds[100][2];
  int i,iv,stall_counter= 0,cycle_counter= 0.0;
- char buf[10240], target_path[80];
+ char target_path[80];
  double in_counter, out_counter, prev_in= -1.0, prev_out= -1.0;
  struct CdrfifO *ff_in= NULL, *ff_out= NULL;
 
@@ -1109,9 +1109,8 @@ int Test_multi(int fs_size, double speed_limit, double interval, int flag)
  bit0= debugging verbousity
 */
 {
- int fd_in[4],fd_out[4],ret,pipe_fds[4][2],real_out[4],pipe_idx;
+ int fd_in[4],fd_out[4],ret,pipe_fds[4][2];
  int i,iv;
- char buf[10240];
  struct CdrfifO *ff1= NULL,*ff2= NULL;
 
  /* open four pairs of fds */

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 "Jan 09, 2011"
+.TH CDRSKIN 1 "Version 1.3.6, Mar 04, 2014"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -37,7 +37,7 @@ Blanking of CD-RW and DVD-RW.
 .br
 Formatting of DVD-RW, DVD+RW, DVD-RAM, BD.
 .br
-Burning of data or audio tracks to CD,
+Burning of data tracks or audio tracks with CD-TEXT to CD,
 .br
 either in versatile Track at Once mode (TAO)
 .br
@@ -55,6 +55,8 @@ on overwriteable DVD+RW, DVD-RW, DVD-RAM, BD-RE
 .br
 or on data file or block device.
 .br
+Extraction of audio tracks and CD-TEXT to hard disk files.
+.br
 Bus scan, burnfree, speed options, retrieving media info, padding, fifo.
 .br
 See section EXAMPLES at the end of this text.
@@ -80,15 +82,19 @@ Emulated drives
 The input-output entities which get processed are called tracks.
 A \fBtrack\fP stores a stream of bytes.
 .br
-Each track is initiated by one track source address argument, which may either
-be "-" for standard input or the address of a readable file. If no write mode
-is given explicitly then one will be chosen which matches the peculiarities
-of track sources and the state of the output media.
-.PP
 More than one track can be burned by a single run of cdrskin. 
 In the terms of the MMC standard all tracks written by the same run constitute
 a \fBsession\fP.
 .br
+Normally, each track is initiated by one track source address argument,
+which may either be "-" for standard input or the address of a readable file.
+Alternatively, option cuefile= may be used to read a session description
+from a text file and to read the session content from a single data file.
+.br
+If no write mode
+is given explicitly then one will be chosen which matches the peculiarities
+of track sources and the state of the output media.
+.PP
 Some media types can be kept appendable so that further tracks can
 be written to them in subsequent runs of cdrskin (see option -multi).
 Info about the addresses of burned tracks is kept in a table of
@@ -130,8 +136,8 @@ eventual multi-session capabilities.
 A more restrictive mode
 .B -sao
 (alias -dao) which usually demands a predictable track size and is not
-necessarily capable of multi-session. It may have advantages for some
-readers resp. players of the recorded tracks.
+necessarily capable of multi-session. It can be used to write CD-TEXT and
+it is the only one that works with option cuefile=. 
 .br
 If none of the options -dao, -tao or -sao is given then the program will
 try to choose a write mode which matches the defined recording job,
@@ -256,7 +262,7 @@ that it has to be formatted again. If in doubt, just give it a try.
 .br
 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.
+by a run of \fBcdrskin --devices\fP or \fBcdrskin --device_links\fP.
 .br
 On Linux, they are device files which traditionally do not offer
 w-permissions for normal users. Because libburn needs rw-permission,
@@ -494,6 +500,27 @@ Print this list of blanking types.
 Retrieve some info about the addressed drive and then exit.
 Exits with non-zero value if the drive cannot be found and opened.
 .TP
+.BI \-copy
+Create the subsequent tracks with permission for an unlimited number of copies.
+.TP
+.BI cuefile= path
+Read a session description from a cue sheet file in CDRWIN format.
+Base the tracks on a single file which is given in the sheet by command FILE.
+To enable CD-TEXT from the cue sheet file, cdrskin option -text has to be
+present.
+.br
+cdrskin currently supports TRACK datatypes AUDIO and MODE1/2048 which may
+not be mixed.
+Data source may be of FILE type BINARY, MOTOROLA, or WAVE.
+.br
+Non-CDRWIN commands ARRANGER, COMPOSER, MESSAGE are supported.
+.br
+Cue sheet file commands CATALOG and ISRC may be overridden by option mcn=
+and by input_sheet_v07t= purpose specifiers "UPC / EAN" and "ISRC".
+This does not affect their appearance in CD-TEXT, but only on Q sub-channel.
+.br
+The track numbers may be overridden by option cd_start_tno=.
+.TP
 .BI \-dao
 Alias for option -sao. Write CD in Session at Once mode
 or DVD-R[W] in Disc-at-once mode.
@@ -512,7 +539,7 @@ cdrskin will not write CD-ROM XA but rather strip the header bytes and write as
 .TP
 .BI dev= target
 Set the address of the drive to use. Valid are at least the
-addresses listed with option --devices, 
+addresses listed with options --devices or --device_links,
 X,Y,Z addresses listed with option -scanbus,
 ATA:X,Y,Z addresses listed with options dev=ATA -scanbus,
 and volatile libburn drive numbers (numbering starts at "0").
@@ -592,6 +619,20 @@ long running drive commands asynchronous and thus eases the load on some
 wiring hardware types. Regardless of option -immed, cdrskin uses asynchronous
 commands where possible and appropriate. 
 .TP
+.BI index= list
+Set a comma separated list of index start address numbers for the next track.
+This applies to CD SAO sessions only.
+.br
+The addresses count sectors from the start of the next track. The first number
+is for index 1 and must be 0. The following numbers have to be larger than
+their respective predecessors. Up to 99 numbers are allowed.
+.br
+Sector numbers are computed from Min:Sec:Frame addresses by
+.br
+ Sector = ((Min*60)+Sec)*75+Frame
+.br
+E.g.: "0,7512,20408" sets index 2 to 01:40:12 and index 3 to 04:32:08.
+.TP
 .BI -inq
 Print the identification of the drive and then exit.
 .TP
@@ -611,6 +652,16 @@ This option can be performed on track sources which are regular files or block
 devices. For the first track of the session it can be performed on any type
 of source if there is a fifo of at least 64 kiB. See option fs= .
 .TP
+.BI isrc= text
+Set the ISRC for the next track source to the given text, which must be exactly
+13 characters long. It must comply to the format CCOOOYYSSSSS.
+.br
+CC is the country code. OOO is the owner code. Both may consist of capital
+letters A to Z and of decimal digits 0 to 9. YY depicts the year (00 to 99).
+SSSSS is the serial number (00000 to 99999).
+.br
+This option does not affect CD-TEXT but only the Q sub-channel.
+.TP
 .BI -load
 Load the media and exit. Exit value is 0 if any kind of media was found, non
 zero else. Note: Option -eject will unload the media even if -load is given.
@@ -623,6 +674,12 @@ Use program "eject" or cdrskin -eject to get the tray out of the drive.
 Runs of programs like cdrecord, growisofs, wodim, cdrskin will not be hampered
 and normally enable the drive's eject button when they are done.
 .TP
+.BI mcn= text
+Set the CD Media Catalog Number to text, which must be exactly 13 characters
+long and should consist of decimal digits.
+.br
+This option does not affect CD-TEXT but only the Q sub-channel.
+.TP
 .BI minbuf= percentage
 Equivalent to:
 .br
@@ -684,11 +741,19 @@ for lifting the ban on -multi.
 .br
 Note: -multi might make DVD media unreadable in some DVD-ROM drives.
 .TP
+.BI \-nocopy
+Create subsequent tracks with permission for a single level of copies.
+I.e. those copies would then be marked by -scms as offering no permission
+for further copies.
+.TP
 .BI \-nopad
 Do not add trailing zeros to the data stream. Nevertheless, since there seems
 to be no use for audio tracks with incomplete last sector, this option applies
 only to data tracks. There it is default.
 .TP
+.BI \-nopreemp
+Indicate for subsequent tracks that they were mastered without pre-emphasis.
+.TP
 .BI \-pad
 Add 30 kiB of trailing zeros to each data track. (This is not sufficient to
 avoid problems with various CD-ROM read drivers.)
@@ -698,6 +763,9 @@ Add the given amount of trailing zeros to the next data track. This option
 gets reset to padsize=0 after that next track is written. It may be set
 again before the next track argument. About size specifiers, see option fs=.
 .TP
+.BI \-preemp
+Indicate for subsequent tracks that they were mastered with pre-emphasis.
+.TP
 .BI \-sao
 Write CD in Session At Once mode or sequential DVD-R[W] in Disc-at-once
 (DAO) mode.
@@ -730,6 +798,14 @@ The useful fields in a result line are:
 .br
 Bus,Target,Lun Number) 'Vendor' 'Mode' 'Revision'
 .TP
+.BI \-scms
+Create subsequent tracks without permission for being copied. This is usually
+done for tracks which are copies of tracks that were marked with -nocopy
+(but not yet with -scms). So copies of copies are prohibited.
+.br
+This option gets reset by option -copy. Thus the combination -copy -nocopy
+means -nocopy surely without -scms.
+.TP
 .BI speed= number
 Set speed of drive. With data CD, 1x speed corresponds to a throughput of
 150,000 bytes/second. With DVD, 1x = 1,385,000 bytes/second.
@@ -760,12 +836,57 @@ the only mode which allows -multi.
 .br
 Mode -tao is not usable for minimally blanked DVD-RW and for DVD-R DL.
 .TP
+.BI \-text
+Enable writing of CD-TEXT attributes read by option cuefile=.
+Without option -text, cue sheet file command CDTEXTFILE will be ignored and
+no CD-TEXT attributes will be read from the file. Nevertheless, CATALOG and
+ISRC will have the same effect as options mcn= and isrc=.
+.TP
+.BI textfile= path
+Read CD-TEXT packs from the file depicted by path and put them into the
+Lead-in of the emerging session. This session has to be done by Session At Once
+(SAO) mode and may only contain audio tracks.
+.br
+path must lead to a regular file, which consists of an optional header of four
+bytes and one or more text packs of 18 bytes each. Suitable would be the
+file 'cdtext.dat' which gets extracted from CD media by options -vv -toc
+and shown in human readable form by -vvv -toc.
+.br
+The header, if present, must tell the file size minus 2, encoded as big-endian
+16 bit word. The other two bytes must be 0.
+.br
+If there is no 4-byte header, then a trailing 0-byte, as of Sony specification,
+is tolerated and ignored.
+.br
+A text pack consists of a pack type byte, a track number byte, a counter byte,
+a Block Number and Character Indicator byte, 12 text characters or data bytes,
+two optional CRC bytes. For details see libburn documentation file
+doc/cdtext.txt.
+.br
+By default, the input file is checked for correct CRC bytes. If all CRC bytes
+are 0, then the correct values get silently inserted. If there are non-zero
+CRC bytes, then a mismatch causes the abort of the burn run.
+This check can be disabled by option -force.
+.br
+Note that this option overrides option input_sheet_v07t= .
+.TP
 .BI \-toc
 Print the table of content (TOC) which describes the tracks recorded on disc.
 The output contains all info from option -atip plus lines which begin with
 "track:", the track number, the word "lba:" and a number which gives the
 start address of the track. Addresses are counted in CD sectors which with
 SAO or TAO data tracks hold 2048 bytes each.
+.br
+If verbosity is set to level 2 (-v -v) then the CD-TEXT packs from the lead-in
+of an audio CD get extracted and written into file 'cdtext.dat', if that file
+does not yet exist. Prepended is a 4 byte header, followed by one or more
+packs of 18 bytes each.
+.br
+Verbosity level 3 causes the CD-TEXT packs to be printed as hex numbers to
+standard output. Bytes 4 to 15 of certain pack types are printed as ASCII
+characters if they have values in the range of 32 to 126.
+.br
+See option textfile= for more information about the text pack format.
 .RS
 .TP
 Example. Retrieve an afio archive from track number 2:
@@ -798,7 +919,7 @@ then the track on media gets truncated to the predicted size and cdrskin exits
 with non-zero value.
 .TP
 .BI \-v
-Increment verbose level by one. Startlevel is 0 with only few messages.
+Increment verbosity level by one. Startlevel is 0 with only few messages.
 Level 1 prints progress report with long running operations and also causes
 some extra lines to be put out with info retrieval options. 
 Level 2 additionally reports about option settings derived from arguments or
@@ -865,6 +986,35 @@ taken as plain block number with block size 2048 byte.
 (E.g ...=1000 or ...=1000s means block 1000, ...=1m means block
 512, ...=4096b means block number 2)
 .TP
+.BI cd_start_tno= number
+Set the number which shall be written as CD track number with the first
+track of the session. The following tracks will then get written with
+consecutive CD track numbers. The resulting number of the last track
+must not exceed 99. The lowest possible start number is 1, which is also
+the default.
+.br
+This setting applies only to CD SAO writing. It overrides the track number
+settings caused by options cuefile= or input_sheet_v07t=.
+.TP
+.BI cdtext_to_textfile= path
+Extract the CD-TEXT packs from the lead-in of an audio CD and write them to
+the file with the given path. If CD-TEXT can be retrieved, then this file
+will be suitable for option textfile=.
+.br
+Not all drives can read CD-TEXT and not all audio CDs bear CD-TEXT.
+It is not considered an error if no CD-TEXT is available.
+.TP
+.BI cdtext_to_v07t= path
+Extract the CD-TEXT packs from the lead-in of an audio CD and write them
+as human readable Sony Input Sheet Version 0.7T to the file with the
+given path. If CD-TEXT can be retrieved, then this file 
+will be suitable for option input_sheet_v07t=.
+.br
+If the given path is "-", then the result is printed to standard output.
+.br
+Not all drives can read CD-TEXT and not all audio CDs bear CD-TEXT.
+It is not considered an error if no CD-TEXT is available.
+.TP
 .BI \--demand_a_drive
 Exit with a nonzero value if no drive can be found during a bus scan.
 .TP
@@ -881,6 +1031,17 @@ Number dev='Devicefile' rw-Permissions : 'Vendor' 'Model'
 Number and Devicefile can both be used with option dev=, but number is
 volatile (numbering changes if drives become busy).
 .TP
+.BI \--device_links
+Like --devices, but presenting the drives with addresses of symbolic links
+which point to the actual device files.
+.br
+Modern GNU/Linux systems may shuffle drive addresses from boot to boot.
+The udev daemon is supposed to create links which always point to the
+same drive, regardless of its system address.
+Option --device_links shows the addresses of such links if they begin
+by "/dev/dvd" or "/dev/cd".
+Precedence is: "dvdrw", "cdrw", "dvd", "cdrom", "cd".
+.TP
 .BI direct_write_amount= size
 Do not write a session with tracks but rather make an appropriate number of
 direct write operations with no preparations. Flushing the drive buffer will
@@ -909,13 +1070,39 @@ media dependend transaction size. With DVD-RAM, BD-RE, DVD+RW this is 2k, with
 overwriteable DVD-RW it is 32k.
 .TP
 .BI dvd_obs= default|32k|64k
-Linux specific:
 Set the number of bytes to be transmitted with each write operation to DVD
-or BD media. Tracks get padded up to the next multiple of this write
-size. A number of 64 KB may improve throughput with bus systems which
-show latency problems. The default depends on media type, option
+or BD media. With most write types, tracks get padded up to the next multiple
+of this write size (see option --obs_pad).
+A number of 64 KB may improve throughput with systems
+which show latency problems. The default depends on media type, option
 stream_recording=, and on compile time options.
 .TP
+.BI extract_audio_to= directory_path
+Extract tracks from an audio CD as separate WAVE audio files into the
+given directory.
+This directory has to already exist, but none of the track files may exist.
+This option will rather fail than overwrite an existing file.
+.br
+By default all tracks of the CD are extracted to files with names
+trackNN.wav, where NN is the track number from 01 to at most 99.
+.TP
+.BI extract_basename= name
+Set a filename which shall be used by extract_audio_to= instead of the default
+name "track".
+.TP
+.BI --extract_dap
+Enable Digital Audio Play flaw obscuring mechanisms
+like audio data mute and interpolate.
+.TP
+.BI extract_tracks= number[,number[,...]]
+Set a list of track numbers to define which tracks shall be extracted
+by extract_audio_to=.
+If no extract_tracks= is given, then all audio tracks get extracted.
+It is permissible to have more than one extract_tracks= option in order
+to split a long list into shorter pieces.
+.br
+The lowest permissible track number is 1, the highest is 99.
+.TP
 .BI fallback_program= command
 Set a command name to be executed if cdrskin encounters a known cdrecord
 option which it does not yet support. If a non-empty command is given with
@@ -942,6 +1129,9 @@ implies fallback_program=cdrecord
 .br
 .B codim
 implies fallback_program=wodim
+.TP 
+.BI --four_channel
+Indicate for subsequent tracks that they were mastered with four channels.
 .TP
 .BI fifo_start_at= size
 Do not wait for full fifo but start burning as soon as the given number
@@ -993,6 +1183,105 @@ With multi-session DVD, blank=fast will act like dvd+rw-format -blank=full .
 .br
 growisofs -dvd-compat is roughly equivalent to cdrskin without option -multi.
 .TP
+.BI input_sheet_v07t= path
+Read CD-TEXT definitions from a Sony Input Sheet version 0.7T. Up to eight
+or seven such sheets can be read by multiple input_sheet_v07t= options.
+Each will define one CD-TEXT language block.
+.br
+The first line of a sheet file decides whether more than one sheet
+may be defined by the file. If it is
+.br
+  Input Sheet Version = 0.7T
+.br
+then each further line with that text switches to the next sheet for the next block.
+If it is not, then all definitions apply to a single block.
+.br
+The information in such a sheet is given by text lines of the following form:
+.br
+  purpose specifier [whitespace] = [whitespace] content text
+.br
+[whitespace] is zero or more ASCII 32 (space) or ASCII 9 (tab) characters.
+The purpose specifier tells the meaning of the content text.
+Empty content text does not cause a CD-TEXT attribute to be attached.
+.br
+The following purpose specifiers apply to the session as a whole:
+.br
+  Purpose specifier   | Content example
+.br
+  -------------------------------------------------------------
+.br
+  Text Code           = 8859
+.br
+  Language Code       = English
+.br
+  Album Title         = Joyful Nights
+.br
+  Artist Name         = United Cat Orchestra
+.br
+  Songwriter          = Various Songwriters
+.br
+  Composer            = Various Composers
+.br
+  Arranger            = Tom Cat
+.br
+  Album Message       = For all our fans
+.br
+  Catalog Number      = 1234567890
+.br
+  Genre Code          = Classical
+.br
+  Genre Information   = Feline classic music
+.br
+  Closed Information  = This is not to be shown by CD players
+.br
+  UPC / EAN           = 1234567890123
+.br
+  Text Data Copy Protection = OFF
+.br
+  First Track Number  = 1
+.br
+  Last Track Number   = 3
+.br
+The following purpose specifiers apply to particular tracks:
+.br
+  Purpose specifier   | Content example
+.br
+  -------------------------------------------------------------
+.br
+  Track 01 Title      = Song of Joy
+.br
+  Track 01 Artist     = Felix and The Purrs
+.br
+  Track 01 Songwriter = Friedrich Schiller
+.br
+  Track 01 Composer   = Ludwig van Beethoven
+.br
+  Track 01 Arranger   = Tom Cat
+.br
+  Track 01 Message    = Fritz and Louie once were punks
+.br
+  ISRC 01             = XYCRR1101234
+.br
+Track numbers are decimal despite the leading 0. There should be as many track
+definitions as there are track source files given.
+.br
+See libburn's doc/cdtext.txt for a detailed definition of 0.7T and the
+possible values for Text Code, Language Code, Genre Code, Text Data Copy
+Protection.
+.br
+The Q sub-channel settings by "UPC / EAN" and "ISRC" may be overridden by
+options mcn= and isrc=.  This will not affect their appearance as CD-TEXT.
+They may override cuefile= commands CATALOG and ISRC in the same way.
+.br
+If options -text cuefile= are given and if the cue sheet file defines CD-TEXT,
+then only seven input_sheet_v07t= options may be given. They will then be
+used as CD-TEXT language blocks 1 to 7.
+.br
+This option will get into effect only if no option textfile= is given.
+The write mode must be SAO on CD. All tracks must be -audio tracks.
+.br
+The track numbers may be overridden by option cd_start_tno=.
+.TP
 .BI \--list_formats
 List the available format descriptors as reported by the drive for the
 loaded media. Each descriptor line begins with "Format idx" and the
@@ -1008,14 +1297,45 @@ List all ignored cdrecord options. The "-" options cannot be used as addresses
 of track sources. No track source address may begin with a text equal to an
 option which ends by "=". The list is ended by an empty line.
 .TP
+.BI \--list_speeds
+Put out a list of speed values as reported by the output drive with
+the loaded medium. This does not necessarily mean that the medium is writable
+or that these speeds are actually achievable. Especially the
+lists reported with empty drive or with ROM media obviously advertise
+speeds for other media.
+.br
+It is not mandatory to use speed values out of the listed range.
+The drive is supposed to choose a safe speed that is as near to the desired
+speed as possible.
+.br
+At the end of the list, "Write speed L" and "Write speed H"
+are the best guesses for lower and upper speed limit.
+"Write speed l" and "Write speed h" may appear only with CD
+and eventually override the list of other speed offers.
+.br
+Only if the drive reports contradicting speed information there will appear
+"Write speed 0" or "Write speed-1", which tell the outcome of speed selection
+by options speed=0 resp. speed=-1, if it deviates from "Write speed L"
+resp. "Write speed H".
+.TP
 .BI \--long_toc
 Like option -toc but marking each session start by a line "first: X last: Y"
 and each session end by "track:lout ...".
 .TP
+.BI \--no_load
+When aquiring the optical drive, do not try to load its tray. This yields the
+same behavior for desktop drives with tray loader as is shown by laptop drives
+which usually lack a motorized tray loader.
+.TP
 .BI \--no_rc
 Only if used as first command line argument this option prevents reading and
 interpretation of eventual startup files. See section FILES below.
 .TP
+.BI \--pacifier_with_newline
+Adds a newline character to each pacifier line that would elsewise be
+overwritten by the next pacifier line. Such lines are emitted during a
+run of writing, formatting, or blanking if option -v is given. 
+.TP
 .BI \--prodvd_cli_compatible
 Activates behavior modifications with some DVD situations which bring cdrskin
 nearer to the behavior of cdrecord-ProDVD:
@@ -1078,6 +1398,20 @@ is possible with the given options.
 This option redirects to stderr all message output except its own result
 string and eventual output of -msinfo.
 .TP 
+.BI textfile_to_v07t= path
+Read a CD-TEXT pack file (e.g. cdtext.dat from a run with -v -v -toc)
+and print its content in the human readable format that is described
+with option input_sheet_v07t=.
+.br
+The program run ends immediately thereafter.
+No drive scan will happen and no drive will be aquired.
+.br
+To avoid the cdrskin start message in the output, run:
+  cdrskin textfile_to_v07t=cdtext.dat | grep -v '^cdrskin'
+.TP 
+.BI --two_channel
+Indicate for subsequent tracks that they were mastered with two channels.
+.TP 
 .BI write_start_address= byte_offset
 Set the address on media where to start writing the track. With DVD+RW, DVD-RAM 
 or BD-RE byte_offset must be aligned to 2 kiB blocks, but better is 32 kiB.
@@ -1102,6 +1436,20 @@ under test reservation.
 (If you really test experimental media, then please report the outcome on
 libburn-hackers@pykix.org)
 .TP
+.BI \--cdtext_dummy
+Prepare a burn run, report the effective array of CD-TEXT packs to stdout,
+and then end the program run without starting to burn the session.
+A blank CD-R or CD-RW has to be present in the drive, nevertheless.
+.br
+The output is formatted in lines which describe 18 bytes as 2-digit hex
+numbers or as single printable characters.
+See libburn document doc/cdtext.txt about the format of these records.
+.TP
+.BI \--cdtext_verbose
+Like --cdtext_dummy but without preventing the burn run. Combinable with
+option -dummy to exercise a CD burn run with no persistent impact on the
+medium.
+.TP
 .BI dev_translation= <sep><from><sep><to>
 Set drive address alias. This was necessary before cdrskin-0.2.4 to manually
 translate cdrecord addresses into cdrskin addresses.
@@ -1136,7 +1484,7 @@ 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 scanned for by
-options --devices and -scanbus.
+options --devices, --device_links and -scanbus.
 Normally this is /dev/sgN on kernel versions < 2.6 and /dev/srN
 on kernels >= 2.6 . This option allows to explicitly override that default
 in order to meet other programs at a common device file for each drive.
@@ -1226,11 +1574,42 @@ Such opening is needed for Bus,Target,Lun addresses unless option
 addresses which are not listed with cdrskin --devices but nevertheless point
 to a usable drive. (Like /dev/sg0 using the same SCSI address as /dev/sr0.)
 .TP
+.BI \--obs_pad
+Pad the data of last write operation of a DVD-R[W] DAO session or
+stdio: pseudo-drive up to the full size of an output chunk.
+This padding has to be applied automatically to the other DVD and BD media
+types, where it causes e.g. ISO images to have trailing unclaimed blocks.
+.br
+Use this option if there is the suspicion that DAO sessions abort with
+your kernel and/or DVD drive, if their size is not a multiple of 16 blocks.
+.br
+This option may also get enabled at compile time of libburn.
+.TP
 .BI \--old_pseudo_scsi_adr
 Linux specific:
 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 sao_postgap= off|number
+Define whether a post-gap shall be written at the end of the track and
+how many sectors this gap shall have. A post-gap occupies the range of
+an additional index of the track. It contains zeros. No bytes from the
+track source will be read for writing the post-gap.
+.br
+This setting affects only CD SAO write runs.
+.TP
+.BI sao_pregap= off|number
+Define whether a pre-gap shall be written before the track and how many
+sectors this pre-gap shall have. A pre-gap is written in the range of track
+index 0 and contains zeros resp. silence. No bytes from the track source
+will be read for writing the pre-gap.
+.br
+This setting affects only CD SAO write runs.
+.br
+The first track automatically gets a pre-gap of at least 150 sectors. Its
+size can only be enlarged by this call.
+.TP
 .BI --xa1-ignore
 Silently interpret option -xa1 as -data. This may be necessary if a frontent
 does not prepare -xa1 block headers but insists in using option -xa1.
@@ -1242,7 +1621,7 @@ cdrskin -scanbus
 .br
 cdrskin dev=ATA -scanbus
 .br
-cdrskin --devices
+cdrskin --device_links
 .SS
 .B Get info about a particular drive or loaded media:
 .br
@@ -1268,7 +1647,7 @@ cdrskin -v dev=/dev/sr0 blank=deformat_sequential
 .br
 cdrskin -v dev=/dev/hdc speed=12 fs=8m \\
 .br
-blank=as_needed -eject padsize=300k my_image.iso
+  blank=as_needed -eject padsize=300k my_image.iso
 .SS
 .B Write compressed afio archive on-the-fly (not possible with minimally blanked DVD-RW or DVD-R DL):
 .br
@@ -1276,7 +1655,7 @@ find . | afio -oZ - | \\
 .br
 cdrskin -v dev=0,1,0 fs=32m speed=8 \\
 .br
-blank=as_needed padsize=300k -
+  blank=as_needed padsize=300k -
 .SS
 .B Write multi-session to the same CD, DVD-R[W], DVD+R[/DL], or BD-R:
 .br
@@ -1298,16 +1677,25 @@ mkisofs ... -C "$c_values" ...
 .br
 x=$(cdrskin dev=/dev/sr0 -multi \\
 .br
---tell_media_space 2>/dev/null)
+  --tell_media_space 2>/dev/null)
 .br
 echo "Available: $x blocks of 2048 data bytes"
 .SS
-.B Write audio tracks to CD:
+.B Write audio tracks and CD-TEXT to CD:
 .br
 cdrskin -v dev=ATA:1,0,0 speed=48 -sao \\
 .br
-track1.wav track2.au -audio -swab track3.raw
+  input_sheet_v07t=cdtext.v07t \\
 .br
+  track1.wav track2.au -audio -swab track3.raw
+.SS
+.B Extract audio tracks and CD-TEXT from CD into directory /home/me/my_cd:
+.br
+mkdir /home/me/my_cd
+.br
+cdrskin -v dev=/dev/sr0 extract_audio_to=/home/me/my_cd \\
+.br
+  cdtext_to_v07t=/home/me/my_cd/cdtext.v07t
 .SH FILES
 .SS
 Startup files:

cdrskin/cdrskin_eng.html

@@ -39,7 +39,7 @@ About any CD, DVD, or BD recorder produced in the recent ten years.
 <BR>
 <A HREF="http://libburnia-project.org">libburn</A>
 supports recorders which are compliant to standards MMC-1 for CD and
-MMC-5 for DVD or BD. Linux, FreeBSD, and Solaris allow to access drives
+MMC-5 for DVD or BD. Linux, FreeBSD, Solaris, and NetBSD allow to access drives
 connected via SCSI, PATA (aka IDE, ATA), USB, or SATA.
 <BR>
 </P>
@@ -49,12 +49,14 @@ connected via SCSI, PATA (aka IDE, ATA), USB, or SATA.
 <DL>
 <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>
+<DD>With kernel 2.6 or higher the drive should not be under ide-scsi.</DD>
 <DT>or FreeBSD (with libc, of course) :</DT>
 <DD>ATA and SATA drives need atapicam running.</DD>
 <DD>libcam has to be installed.</DD>
 <DT>or Solaris (with libc, of course) :</DT>
 <DD>Tested on kernel 5.11, hopefully suitable for older ones too.</DD>
+<DT>or NetBSD (with libc, of course) :</DT>
+<DD>Tested on 6.1.2 and 6.1.3</DD>
 <DT>libpthread</DT>
 <DD>is supposed to be a standard system component.</DD>
 </DL>
@@ -65,7 +67,7 @@ connected via SCSI, PATA (aka IDE, ATA), USB, or SATA.
 GPL software included:<BR>
 </H2>
 <DL>
-<DT>libburn-1.0.6</DT>
+<DT>libburn-1.3.6</DT>
 <DD>(founded by Derek Foreman and Ben Jansens,
 developed and maintained since August 2006 by
 Thomas Schmitt from team of libburnia-project.org)
@@ -76,7 +78,7 @@ Thomas Schmitt from team of libburnia-project.org)
 
 <P>
 This program system has been tested on Intel/AMD with Linux, FreeBSD,
-and OpenSolaris based operating systems.<BR>
+OpenSolaris, and NetBSD based operating systems.<BR>
 Ports to other usable systems are appreciated. Reports are welcome.
 </P>
 
@@ -110,7 +112,7 @@ DVD-R DL, which both support no -multi.
 <DT>Being superuser avoids permission problems with /dev/srN resp. /dev/hdX .
 </DT>
 <DT>Ordinary users should then get granted access to the /dev files
-as listed by option --devices. Linux and FreeBSD demand rw-permission.
+as listed by option --devices. Linux, FreeBSD, and NetBSD demand rw-permission.
 On Solaris it is r-permission and privileges "basic,sys_devices".</DT>
 <DT>&nbsp;</DT>
 
@@ -200,8 +202,15 @@ Standalone ISO 9660 multi-session CD/DVD/BD tool
 <P>
 <DL>
 <DT>Download as source code (see README):</DT>
-<DD><A HREF="cdrskin-1.0.6.pl00.tar.gz">cdrskin-1.0.6.pl00.tar.gz</A>
-(870 KB).
+<DD><A HREF="cdrskin-1.3.6.tar.gz">cdrskin-1.3.6.tar.gz</A>
+(965 KB).
+</DD>
+<DD><A HREF="cdrskin-1.3.6.tar.gz.sig">cdrskin-1.3.6.tar.gz.sig</A></DD>
+<DD>
+(detached GPG signature for verification by
+<KBD>gpg --verify cdrskin-1.3.6.tar.gz.sig cdrskin-1.3.6.tar.gz</KBD>
+<BR>
+after <KBD>gpg --keyserver keys.gnupg.net --recv-keys ABC0A854</KBD>).
 </DD>
 <DD>
 The cdrskin tarballs are source code identical with libburn releases
@@ -250,16 +259,15 @@ cdrskin_0.4.2.pl00-x86-suse9_0-static.tar.gz</A>, (310 KB), -static compiled,
 <HR>
 
 <P>
-Enhancements towards previous stable version cdrskin-1.0.4.pl00:
+Enhancements towards previous stable version cdrskin-1.3.4:
 <UL>
-<LI>Burning DVD-R DAO with 2 kB size granularity rather than 32 kB</LI>
-</LI>
+<LI>New system adapter for NetBSD</LI>
 <!--
 <LI>none</LI>
 -->
 </UL>
 
-Bug fixes towards cdrskin-1.0.4.pl00:
+Bug fixes towards cdrskin-1.3.4:
 <UL>
 <LI>none</LI>
 <!--
@@ -267,12 +275,22 @@ Bug fixes towards cdrskin-1.0.4.pl00:
 -->
 </UL>
 
+<!--
+Bug fixes of cdrskin-1.3.2.pl01 towards cdrskin-1.3.2:
+<UL>
+<LI>
+cdrskin-1.3.2.tar.gz contained the outdated source code of cdrskin-1.3.0,
+including the -msinfo bug.
+</LI>
+</UL>
+-->
+
 <HR>
 
 <P>
 <DL>
-<DT><H3>Development snapshot, version 1.0.7 :</H3></DT>
-<DD>Enhancements towards current stable version 1.0.6.pl00:
+<DT><H3>Development snapshot, version 1.3.7 :</H3></DT>
+<DD>Enhancements towards current stable version 1.3.6:
 <UL>
 <LI>none yet</LI>
 <!--
@@ -282,7 +300,7 @@ Bug fixes towards cdrskin-1.0.4.pl00:
 </UL>
 </DD>
 
-<DD>Bug fixes towards cdrskin-1.0.6.pl00:
+<DD>Bug fixes towards cdrskin-1.3.6:
 <UL>
 <LI>none yet</LI>
 <!--
@@ -292,10 +310,10 @@ Bug fixes towards cdrskin-1.0.4.pl00:
 </DD>
 
 <DD>&nbsp;</DD>
-<DD><A HREF="README_cdrskin_devel">README 1.0.7</A>
-<DD><A HREF="cdrskin__help_devel">cdrskin-1.0.7 --help</A></DD>
-<DD><A HREF="cdrskin_help_devel">cdrskin-1.0.7 -help</A></DD>
-<DD><A HREF="man_1_cdrskin_devel.html">man cdrskin (as of 1.0.7)</A></DD>
+<DD><A HREF="README_cdrskin_devel">README 1.3.7</A>
+<DD><A HREF="cdrskin__help_devel">cdrskin-1.3.7 --help</A></DD>
+<DD><A HREF="cdrskin_help_devel">cdrskin-1.3.7 -help</A></DD>
+<DD><A HREF="man_1_cdrskin_devel.html">man cdrskin (as of 1.3.7)</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>
@@ -310,13 +328,13 @@ vanilla tools like make and gcc are needed.</DD>
 </DD>
 <DD>&nbsp;</DD>
 <DT>The following download is intended for adventurous end users or
-admins with full system souvereignty.</DT>
+admins with full system sovereignty.</DT>
 <DD>Source (./bootstrap is already applied, build tested, for more see
 <A HREF="README_cdrskin_devel">upcoming README</A> ):
 </DD>
 <DD>
-<A HREF="cdrskin-1.0.7.tar.gz">cdrskin-1.0.7.tar.gz</A>
-(870 KB).
+<A HREF="cdrskin-1.3.7.tar.gz">cdrskin-1.3.7.tar.gz</A>
+(965 KB).
 </DD>
 
 <!-- This is not offered any more since spring 2008
@@ -465,10 +483,11 @@ First of all: this relationship is single sided, as cdrskin has to be aware of
 cdrecord but not vice versa.
 <BR>
 <BR>
-I am a long time user of cdrecord and it works fine for me. 
+I was a long time user of cdrecord and it worked fine for me. 
 Especially i do appreciate its write mode -tao which allows to pipe arbitrary
 data on CD and CD-RW via stdin. cdrecord is reliable, versatile and well
-maintained. So for me - there would be no problem with it.
+maintained. So for me - there would be no problem with using it for
+burning CDs.
 <BR>
 But the author of cdrecord and the Linux kernel people foster a very hostile 
 relationship. Ok, that's their business, not mine (or ours if you are with me).
@@ -511,11 +530,15 @@ 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>

cdrskin/cdrskin_timestamp.h

@@ -1 +1 @@
-#define Cdrskin_timestamP "2011.06.14.152832"
+#define Cdrskin_timestamP "2014.03.04.110001"

cdrskin/cleanup.c

@@ -200,9 +200,10 @@ main()
  Cleanup_set_handlers(&demoapp,(Cleanup_app_handler_T) Demo_app_handler,0);
 
  if(1) { /* change to 0 in order to wait for external signals */
-   char *cpt= NULL,c;
+   char *cpt= NULL, c= ' ';
    printf("Intentionally provoking SIGSEGV ...\n");
    c= *cpt;
+   printf("Strange: The system ignored a SIGSEGV: c= %u\n", (unsigned int) c);
  } else {
    printf("killme: %d\n",getpid());
    sleep(3600);

cdrskin/compile_cdrskin.sh

@@ -1,14 +1,14 @@
 #!/bin/sh
 
 # compile_cdrskin.sh  
-# Copyright 2005 - 2011 Thomas Schmitt, scdbackup@gmx.net, GPL
+# Copyright 2005 - 2014 Thomas Schmitt, scdbackup@gmx.net, GPL v2 or later
 # to be executed within  ./libburn-*  resp ./cdrskin-*
 
 debug_opts="-O2"
 def_opts=
 largefile_opts="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1"
 fifo_opts=""
-libvers="-DCdrskin_libburn_1_0_7"
+libvers="-DCdrskin_libburn_1_3_6"
 
 # To be used if Makefile.am uses libburn_libburn_la_CFLAGS
 # burn="libburn/libburn_libburn_la-"
@@ -19,7 +19,7 @@ libdax_msgs_o="$burn"libdax_msgs.o
 libdax_audioxtr_o="$burn"libdax_audioxtr.o
 do_strip=0
 static_opts=
-warn_opts="-Wall"
+warn_opts="-Wall -Wextra -Wno-unused-parameter"
 libcdio=
 fifo_source="cdrskin/cdrfifo.c"
 compile_cdrskin=1
@@ -41,31 +41,21 @@ do
   elif test "$i" = "-compile_dewav"
   then
     compile_dewav=1
-  elif test "$i" = "-cvs_A60220"
+  elif test "$i" = "-libburn_1_3_6"
   then
-    libvers="-DCdrskin_libburn_cvs_A60220_tS"
-    libdax_audioxtr_o=
-    libdax_msgs_o="$burn"message.o
-    cleanup_src_or_obj="-DCleanup_has_no_libburn_os_H cdrskin/cleanup.c"
-  elif test "$i" = "-libburn_1_0_6"
-  then
-    libvers="-DCdrskin_libburn_1_0_6"
+    libvers="-DCdrskin_libburn_1_3_6"
     libdax_audioxtr_o="$burn"libdax_audioxtr.o
     libdax_msgs_o="$burn"libdax_msgs.o
     cleanup_src_or_obj="$burn"cleanup.o
   elif test "$i" = "-libburn_svn"
   then
-    libvers="-DCdrskin_libburn_1_0_7"
+    libvers="-DCdrskin_libburn_1_3_7"
     libdax_audioxtr_o="$burn"libdax_audioxtr.o
     libdax_msgs_o="$burn"libdax_msgs.o
     cleanup_src_or_obj="$burn"cleanup.o
   elif test "$i" = "-newapi" -o "$i" = "-experimental"
   then
     def_opts="$def_opts -DCdrskin_new_api_tesT"
-  elif test "$i" = "-oldfashioned"
-  then
-    def_opts="$def_opts -DCdrskin_oldfashioned_api_usE"
-    cleanup_src_or_obj="-DCleanup_has_no_libburn_os_H cdrskin/cleanup.c"
   elif test "$i" = "-no_largefile"
   then
     largefile_opts=	
@@ -109,7 +99,7 @@ do
     echo "Options:"
     echo "  -compile_cdrfifo  compile program cdrskin/cdrfifo."
     echo "  -compile_dewav    compile program test/dewav without libburn."
-    echo "  -libburn_1_0_6    set macro to match libburn-1.0.6"
+    echo "  -libburn_1_3_6    set macro to match libburn-1.3.6"
     echo "  -libburn_svn      set macro to match current libburn-SVN."
     echo "  -dvd_obs_64k      64 KB default size for DVD/BD writing."
     echo "  -use_libcdio      link with -lcdio because libburn uses it."
@@ -117,7 +107,6 @@ do
     echo "  -use_no_libburn_fifo  use cdrfifo even for single track non-CD"
     echo "  -use_no_cdrfifo   always use fifo of libburn and never cdrfifo"
     echo "  -experimental     use newly introduced libburn features."
-    echo "  -oldfashioned     use pre-0.2.2 libburn features only."
     echo "  -do_diet          produce capability reduced lean version."
     echo "  -do_strip         apply program strip to compiled programs."
     echo "  -g                produce debuggable programm."
@@ -156,6 +145,7 @@ then
     $cleanup_src_or_obj \
     \
     "$burn"async.o \
+    "$burn"cdtext.o \
     "$burn"debug.o \
     "$burn"drive.o \
     "$burn"file.o \

cdrskin/convert_man_to_html.sh

@@ -59,6 +59,7 @@ then
   -e 's/<\/body>/<BR><HR><FONT SIZE=-1><CENTER>(HTML generated from '"$manpage"'.1 on '"$(date)"' by '$(basename "$0")' )<\/CENTER><\/FONT><\/body>/' \
   -e 's/See section FILES/See section <A HREF="#FILES">FILES<\/A>/' \
   -e 's/See section EXAMPLES/See section <A HREF="#EXAMPLES">EXAMPLES<\/A>/' \
+  -e 's/&minus;/-/g' \
   <"$2" >"$htmlpage"
 
   set +x

cdrskin/wiki_plain.txt

@@ -19,7 +19,7 @@ Many bytes have been copied from the message output of cdrecord
 runs, though. The most comprehensive technical overview of cdrskin
 can be found in [http://libburnia-project.org/browser/libburn/trunk/cdrskin/README?format=txt cdrskin/README].
 
-About libburn API for burning CD and DVD: http://api.libburnia-project.org
+About libburn API for burning CD, DVD, and BD: http://api.libburnia-project.org
 
 --------------------------------------------------------------------------
 
@@ -279,23 +279,7 @@ for an illustrated example with K3b 0.10 .
 
 --------------------------------------------------------------------------
 
-DVD advise:
-
-For burning of DVD/BD media other than DVD-RAM, DVD+RW, DVD+R, DVD+R DL,
-DVD-RW, DVD-R, BD-RE, the cdrskin project currently advises to use
-Andy Polyakov's dvd+rw-tools which despite their historic name are
-capable of all the media above and more, including BD discs. 
-
-http://fy.chalmers.se/~appro/linux/DVD+RW/tools
-
-They are not compatible or related to cdrecord resp. cdrecord-ProDVD
-(now obsoleted by original source cdrtools cdrecord with identical
-capabilities besides the license key).
-
-
---------------------------------------------------------------------------
-
-Advanced multi-session use cases:
+Advanced multi-session use cases as of dvd+rw-tools:
 
 A special feature of dvd+rw-tools is growing of ISO-9660 filesystems on
 overwriteable media. This is not the same as multi-session writing of cdrskin

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([libburn], [1.0.7], [http://libburnia-project.org])
+AC_INIT([libburn], [1.3.6], [http://libburnia-project.org])
 AC_PREREQ([2.50])
 dnl AC_CONFIG_HEADER([config.h])	
 
@@ -10,7 +10,7 @@ LIBBURNIA_SET_FLAGS
 AM_INIT_AUTOMAKE([subdir-objects])
 AC_CONFIG_MACRO_DIR([./])
 
-dnl Notes by ts A71207 - B10409 :
+dnl Notes about version numbers and .so numbers:
 dnl
 dnl Regrettably the meaning of the various version types was misunderstood
 dnl before version 0.4.1.
@@ -91,6 +91,19 @@ dnl    1.0.0 = libburn.so.4.57.0
 dnl    1.0.2 = libburn.so.4.59.0
 dnl    1.0.4 = libburn.so.4.61.0
 dnl    1.0.6 = libburn.so.4.63.0
+dnl    1.1.0 = libburn.so.4.65.0
+dnl    1.1.4 = libburn.so.4.67.0
+dnl    1.1.6 = libburn.so.4.69.0
+dnl    1.1.8 = libburn.so.4.71.0
+dnl    1.2.0 = libburn.so.4.73.0
+dnl    1.2.2 = libburn.so.4.75.0
+dnl    1.2.4 = libburn.so.4.77.0
+dnl    1.2.6 = libburn.so.4.79.0
+dnl    1.2.8 = libburn.so.4.81.0
+dnl    1.3.0 = libburn.so.4.83.0
+dnl    1.3.2 = libburn.so.4.85.0
+dnl    1.3.4 = libburn.so.4.87.0
+dnl    1.3.6 = libburn.so.4.89.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.
@@ -115,8 +128,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=1
-BURN_MINOR_VERSION=0
-BURN_MICRO_VERSION=7
+BURN_MINOR_VERSION=3
+BURN_MICRO_VERSION=6
 BURN_VERSION=$BURN_MAJOR_VERSION.$BURN_MINOR_VERSION.$BURN_MICRO_VERSION
 
 AC_SUBST(BURN_MAJOR_VERSION)
@@ -127,14 +140,14 @@ AC_SUBST(BURN_VERSION)
 dnl Libtool versioning
 LT_RELEASE=$BURN_MAJOR_VERSION.$BURN_MINOR_VERSION.$BURN_MICRO_VERSION
 dnl
-dnl ### This is the release version libburn-1.0.6
-dnl This is the development version after above release version
+dnl This is the release version libburn-1.3.6
+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 = 67 - 63 = 4 . Linux library name = libburn.so.4.63.0
-LT_CURRENT=67
-LT_AGE=63
+dnl SONAME = 93 - 89 = 4 . Linux library name = libburn.so.4.89.0
+LT_CURRENT=93
+LT_AGE=89
 LT_REVISION=0
 LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
 
@@ -211,21 +224,48 @@ CFLAGS="$LIBBURN_O_DIRECT_DEF $CFLAGS"
 
 dnl ts A91116
 AC_ARG_ENABLE(dvd-obs-64k,
-[  --enable-dvd-obs-64k    64 KB default size for DVD/BD writing, default=no],
+[  --enable-dvd-obs-64k    64 KB default size for DVD writing, default=no],
                , enable_dvd_obs_64k=no)
 if test x$enable_dvd_obs_64k = xyes; then
     LIBBURN_DVD_OBS_64K="-DLibburn_dvd_obs_default_64K"
-    echo "enabled  write size default 64 KB on DVD and BD"
+    echo "enabled  write size default 64 KB on DVD"
 else
     LIBBURN_DVD_OBS_64K=
-    echo "disabled write size default 64 KB on DVD and BD"
+    echo "disabled write size default 64 KB on DVD"
 fi
 CFLAGS="$LIBBURN_DVD_OBS_64K $CFLAGS"
 
-dnl ts A91218
+dnl ts B20413
+AC_ARG_ENABLE(dvd-obs-pad,
+[  --enable-dvd-obs-pad    pad DVD DAO sessions to 32 resp. 64 KB, default=no],
+               , enable_dvd_obs_pad=no)
+if test x$enable_dvd_obs_pad = xyes; then
+    LIBBURN_DVD_OBS_PAD="-DLibburn_dvd_always_obs_paD"
+    echo "enabled  padding of DVD DAO sessions to 32 resp. 64 KB"
+else
+    LIBBURN_DVD_OBS_64K=
+    echo "disabled padding of DVD DAO sessions to 32 resp. 64 KB"
+fi
+CFLAGS="$LIBBURN_DVD_OBS_PAD $CFLAGS"
+
+dnl ts A91218 - B21002
+case $host_os in
+    cygwin*|mingw*)
+        default_libcdio=yes
+        ;;
+    *)
+        default_libcdio=no
+        ;;
+esac
+# Check for proper library versions if this is desired.
+# (It fails too often on too many systems.)
+AC_ARG_ENABLE(pkg-check-modules,
+[  --enable-pkg-check-modules      Enable pkg-config check for libcdio , default=no],
+               , enable_pkg_check_modules=no)
 AC_ARG_ENABLE(libcdio,
-[  --enable-libcdio        Enable EXPERIMENTAL use of libcdio as system adapter, default=no],
-               , enable_libcdio=no)
+[  --enable-libcdio        Enable use of libcdio as system adapter, default=no (except on MSWindows)],
+               , enable_libcdio=$default_libcdio)
+PKG_PROG_PKG_CONFIG
 if test x$enable_libcdio = xyes; then
 dnl Check whether there is libcdio-devel and libcdio-runtime.
 dnl If not, erase this macro
@@ -242,12 +282,15 @@ then
       echo "WARNING: could not enable use of libcdio as system adapter"
     fi
 else
-    echo "enabled  EXPERIMENTAL use of libcdio as system adapter"
+    echo "enabled  use of libcdio as system adapter"
     CFLAGS="$LIBCDIO_DEF $CFLAGS"
 
-    LIBCDIO_REQUIRED=0.83
-    PKG_CHECK_MODULES(LIBCDIO, libcdio >= $LIBCDIO_REQUIRED)
-
+    if test x$enable_pkg_check_modules = xyes; then
+        LIBCDIO_REQUIRED=0.83
+        PKG_CHECK_MODULES(LIBCDIO, libcdio >= $LIBCDIO_REQUIRED)
+    else
+        echo "checking for LIBCDIO... skipped, no --enable-pkg-check-modules"
+    fi
 fi
 
 dnl ts B00704
@@ -297,7 +340,7 @@ if test x$enable_debug != xyes; then
     CFLAGS="-DNDEBUG $CFLAGS"
 else
     if test x$GCC = xyes; then
-        CFLAGS="-g -pedantic -Wall -Wextra -Wno-unused-parameter $CFLAGS"
+        CFLAGS="-g -pedantic -Wall -Wextra -Wno-unused-parameter -Wno-char-subscripts $CFLAGS"
     fi
     CFLAGS="-DDEBUG $CFLAGS"
 fi

doc/cdtext.txt

@@ -0,0 +1,736 @@
+
+                          Description of CD-TEXT
+
+Guided by Leon Merten Lohse       via  libcdio-devel@gnu.org
+by reading           mmc3r10g.pdf from http://www.t10.org/ftp/t10/drafts/mmc3/
+by docs and results of cdtext.zip from http://www.sonydadc.com/file/
+by reading                             http://digitalx.org/cue-sheet/syntax
+by reading source of      libcdio from http://www.gnu.org/s/libcdio
+  which quotes source of cdrecord from ftp://ftp.berlios.de/pub/cdrecord/alpha
+by reading             cdrecord.1 from ftp://ftp.berlios.de/pub/cdrecord/alpha
+
+Language codes were learned from http://tech.ebu.ch/docs/tech/tech3264.pdf
+Genre codes were learned from libcdio and confirmed by
+http://helpdesk.audiofile-engineering.com/index.php?pg=kb.page&id=123
+
+For libburnia-project.org by Thomas Schmitt <scdbackup@gmx.net>
+
+Content:
+- CD-TEXT from the view of the user
+- Content specifications of particular pack types
+- Format of a CD-TEXT packs array
+- Overview of libburn API calls for CD-TEXT
+- Sony Text File Format (Input Sheet Version 0.7T)
+- CDRWIN cue sheet files
+
+
+-------------------------------------------------------------------------------
+CD-TEXT from the view of the user:
+
+CD-TEXT records attributes of disc and tracks on audio CD.
+
+The attributes are grouped into blocks which represent particular languages.
+Up to 8 blocks are possible.
+
+There are 13 defined attribute categories, which are called Pack Types and are
+identified by a single-byte code:
+  0x80 = Title
+  0x81 = Names of Performers
+  0x82 = Names of Songwriters 
+  0x83 = Names of Composers
+  0x84 = Names of Arrangers 
+  0x85 = Messages
+  0x86 = text-and-binary: Disc Identification
+  0x87 = text-and-binary: Genre Identification
+  0x88 = binary: Table of Content information
+  0x89 = binary: Second Table of Content information
+  (0x8a to 0x8c are reserved.)
+  0x8d = Closed Information
+  0x8e = UPC/EAN code of the album and ISRC code of each track
+  0x8f = binary: Size Information of the Block
+
+Some of these categories apply to the whole disc only:
+  0x86, 0x87, 0x88, 0x89, 0x8d
+Some have to be additionally attributed to each track, if they are present for
+the whole disc:
+  0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x8e  
+One describes the overall content of a block and in part of all other blocks:
+  0x8f
+
+The total size of a block's attribute set is restricted by the fact that it
+has to be stored in at most 253 records with 12 bytes of payload. These records
+are called Text Packs.
+A shortcut for repeated identical track texts is provided, so that a text
+that is identical to the one of the previous track occupies only 2 or 4 bytes.
+
+
+-------------------------------------------------------------------------------
+Content specification of particular pack types:
+
+Pack types 0x80 to 0x85 and 0x8e contain 0-terminated cleartext. If double byte
+characters are used, then two 0-bytes terminate the cleartext.
+The meaning of 0x80 to 0x85 should be clear by above list. They are encoded
+according to the Character Code of their block. Either as ISO-8859-1 single
+byte characters, or as 7-bit ASCII single byte characters, or as MS-JIS double
+byte characters.
+More info to 0x8e is given below.
+
+Pack type 0x86 (Disc Identification) is documented by Sony as "Catalog Number:
+(use ASCII Code) Catalog Number of the album". So it is not really binary
+but might be non-printable, and should contain only bytes with bit7 = 0.
+
+Pack type 0x87 contains 2 binary bytes, followed by 0-terminated cleartext.
+The two binary bytes form a big-endian index to the following list.
+  0x0000 = "Not Used" (Sony prescribes to use this if no genre applies)
+  0x0001 = "Not Defined"
+  0x0002 = "Adult Contemporary"
+  0x0003 = "Alternative Rock"
+  0x0004 = "Childrens Music"
+  0x0005 = "Classical"
+  0x0006 = "Contemporary Christian"
+  0x0007 = "Country"
+  0x0008 = "Dance"
+  0x0009 = "Easy Listening"
+  0x000a = "Erotic"
+  0x000b = "Folk"
+  0x000c = "Gospel"
+  0x000d = "Hip Hop"
+  0x000e = "Jazz"
+  0x000f = "Latin"
+  0x0010 = "Musical"
+  0x0011 = "New Age"
+  0x0012 = "Opera"
+  0x0013 = "Operetta"
+  0x0014 = "Pop Music"
+  0x0015 = "Rap"
+  0x0016 = "Reggae"
+  0x0017 = "Rock Music"
+  0x0018 = "Rhythm & Blues"
+  0x0019 = "Sound Effects"
+  0x001a = "Spoken Word"
+  0x001b = "World Music"
+Sony documents the cleartext part as "Genre information that would supplement
+the Genre Code, such as 'USA Rock music in the 60s'". Always ASCII encoded.
+
+Pack type 0x88 records information from the CD's Table of Content, as of
+READ PMA/TOC/ATIP Format 0010b (mmc3r10g.pdf, table 237 TOC Track Descriptor
+Format, Q Sub-channel).
+See below, Format of a CD-TEXT packs array, for more details about the content
+of pack type 0x88.
+
+Pack type 0x89 is yet quite unclear. It might be a representation of Playback
+Skip Interval, Mode-5 Q sub-channel, POINT 01 to 40 (mmc3r10g.pdf 4.2.3.6.3).
+If so, then this seems not to apply to write type SAO, because the CUE SHEET
+format offers no way to express Mode-5 Q.
+See below, Format of a CD-TEXT packs array, for an example of this pack type.
+
+Pack type 0x8d is documented by Sony as "Closed Information: (use 8859-1 Code)
+Any information can be recorded on disc as memorandum. Information in this
+field will not be read by CD TEXT players available to the public."
+Always ISO-8859-1 encoded.
+
+Pack type 0x8e is documented by Sony as "UPC/EAN Code (POS Code) of the album.
+This field typically consists of 13 characters." Always ASCII encoded.
+It applies to tracks as "ISRC code [which] typically consists of 12 characters"
+and is always ISO-8859-1 encoded.
+MMC calls these information entities Media Catalog Number and ISRC.
+The catalog number consists of 13 decimal digits.
+ISRC consists of 12 characters: 2 country code [0-9A-Z], 3 owner code [0-9A-Z],
+2 year digits (00 to 99), 5 serial number digits (00000 to 99999).
+
+Pack type 0x8f summarizes the whole list of text packs of a block.
+See below, Format of a CD-TEXT packs array, for details.
+
+
+-------------------------------------------------------------------------------
+Format of a CD-TEXT packs array:
+
+The attributes are represented on CD as Text Packs in the sub-channel of
+the Lead-in of the disc. See doc/cookbook.txt for a description how to write
+the readily formatted CD-TEXT pack array to CD, and how to read CD-TEXT packs
+from CD.
+
+The format is explained in part in MMC-3 (mmc3r10g.pdf, Annex J) and in part by
+the documentation in Sony's cdtext.zip :
+
+Each pack consists of a 4-byte header, 12 bytes of payload, and 2 bytes of CRC.
+
+The first byte of each pack tells the pack type. See above for a list of types.
+
+The second byte tells the track number to which the first text piece in
+a pack is associated. Number 0 means the whole album. Higher numbers are
+valid for types 0x80 to 0x85, and 0x8e. With these types, there should be
+one text for the disc and one for each track.
+With types 0x88 and 0x89, the second byte bears a track number, too.
+With type 0x8f, the second byte counts the record parts from 0 to 2.
+
+The third byte is a sequential counter.
+
+The fourth byte is the Block Number and Character Position Indicator.
+It consists of three bit fields:
+  bit7   = Double Bytes Character Code (0= single byte characters)
+  bit4-6 = Block Number (groups text packs in language blocks)
+  bit0-3 = Character position. Either the number of characters which
+           the current text inherited from the previous pack, or
+           15 if the current text started before the previous pack.
+
+The 12 payload bytes contain pieces of 0-terminated texts or binary data.
+A text may span over several packs. Unused characters in a pack are used for
+the next text of the same pack type. If no text of the same type follows,
+then the remaining text bytes are set to 0.
+
+The CRC algorithm uses divisor 0x11021. The resulting 16-bit residue of the
+polynomial division gets inverted and written as big-endian number to bytes
+16 and 17 of the pack. 
+
+
+The text packs are grouped in up to 8 blocks of at most 256 packs. Each block
+is in charge for one language. Sequence numbers of each block are counted
+separately. All packs of block 0 come before the packs of block 1.
+
+The limitation of block number and sequence numbers imply that there are at
+most 2048 text packs possible. (READ TOC/PMA/ATIP could retrieve 3640 packs,
+as it is limited to 64 kB - 2.)
+
+
+If a text of a track (pack types 0x80 to 0x85 and 0x8e) repeats identically
+for the next track, then it may be represented by a TAB character (ASCII 9)
+for single byte texts, resp. two TAB characters for double byte texts.
+(This should be used because 256 * 12 bytes is few space for 99 tracks.)
+
+The two binary bytes of pack type 0x87 are written to the first 0x87 pack of
+a block. They may or may not be repeated at the start of the follow-up packs
+of type 0x87.
+
+The first pack of type 0x88 in a block records in its payload bytes:
+   0 : PMIN of POINT A1 = First Track Number
+   1 : PMIN of POINT A2 = Last Track Number
+   2 : unknown, 0 in Sony example
+   3 : PMIN of POINT A2 = Start position of Lead-Out
+   4 : PSEC of POINT A2 = Start position of Lead-Out
+   5 : PFRAME of POINT A2 = Start position of Lead-Out
+   6 to 11 : unknown, 0 in Sony example
+The following packs record PMIN, PSEC, PFRAME of the POINTs between the
+lowest track number (min 01h) and the highest track number (max 63h).
+The payload of the last pack is padded by 0s.
+The Sony .TOC example:
+  A0 01
+  A1 14
+  A2 63:02:18
+  01 00:02:00
+  02 04:11:25
+  03 08:02:50
+  04 11:47:62
+  ...
+  13 53:24:25
+  14 57:03:25
+yields
+  88 00 23 00 01 0e 00 3f 02 12 00 00 00 00 00 00 12 00
+  88 01 24 00 00 02 00 04 0b 19 08 02 32 0b 2f 3e 67 2d
+  ...
+  88 0d 27 00 35 18 19 39 03 19 00 00 00 00 00 00 ea af
+
+Pack type 0x89 is yet quite unclear. Especially what the information shall
+mean to the user of the CD. The time points in the Sony example are in the
+time range of the tracks numbers that are given before the time points:
+  01 02:41:48 01 02:52:58
+  06 23:14:25 06 23:29:60
+  07 28:30:39 07 28:42:30
+  13 55:13:26 13 55:31:50
+yields
+  89 01 28 00 01 04 00 00 00 00 02 29 30 02 34 3a f3 0c
+  89 06 29 00 02 04 00 00 00 00 17 0e 19 17 1d 3c 73 92
+  89 07 2a 00 03 04 00 00 00 00 1c 1e 27 1c 2a 1e 72 20
+  89 0d 2b 00 04 04 00 00 00 00 37 0d 1a 37 1f 32 0b 62
+The track numbers are stored in the track number byte of the packs. The two
+time points are stored in byte 6 to 11 of the payload. Byte 0 of the payload
+seems to be a sequential counter. Byte 1 always 4 ? Byte 2 to 5 always 0 ?
+
+Pack type 0x8f summarizes the whole list of text packs of a block.
+So there is one group of three 0x8f packs per block.
+Nevertheless each 0x8f group tells the highest sequence number and the
+language code of all blocks.
+The payload bytes of three 0x8f packs form a 36 byte record. The track number
+bytes of the three packs have the values 0, 1, 2.
+    Byte :
+       0 : Character code for pack types 0x80 to 0x85:
+           0x00 = ISO-8859-1
+           0x01 = 7 bit ASCII
+           0x80 = MS-JIS (japanese Kanji, double byte characters)
+       1 : Number of first track
+       2 : Number of last track
+       3 : libcdio source states: "cd-text information copyright byte"
+           Probably 3 means "copyrighted", 0 means "not copyrighted".
+  4 - 19 : Pack count of the various types 0x80 to 0x8f.
+           Byte number N tells the count of packs of type 0x80 + (N - 4).
+           I.e. the first byte in this field of 16 counts packs of type 0x80.
+ 20 - 27 : Highest sequence byte number of blocks 0 to 7.
+ 28 - 36 : Language code for blocks 0 to 7 (tech3264.pdf appendix 3)
+           Not all of these Codes have ever been seen with CD-TEXT, though.
+           0x00 = Unknown
+           0x01 = Albanian
+           0x02 = Breton
+           0x03 = Catalan
+           0x04 = Croatian
+           0x05 = Welsh
+           0x06 = Czech
+           0x07 = Danish
+           0x08 = German
+           0x09 = English
+           0x0a = Spanish
+           0x0b = Esperanto
+           0x0c = Estonian
+           0x0d = Basque
+           0x0e = Faroese
+           0x0f = French 
+           0x10 = Frisian
+           0x11 = Irish
+           0x12 = Gaelic
+           0x13 = Galician
+           0x14 = Icelandic
+           0x15 = Italian
+           0x16 = Lappish
+           0x17 = Latin
+           0x18 = Latvian
+           0x19 = Luxembourgian
+           0x1a = Lithuanian
+           0x1b = Hungarian
+           0x1c = Maltese        
+           0x1d = Dutch
+           0x1e = Norwegian
+           0x1f = Occitan
+           0x20 = Polish
+           0x21 = Portuguese
+           0x22 = Romanian
+           0x23 = Romansh
+           0x24 = Serbian
+           0x25 = Slovak
+           0x26 = Slovenian
+           0x27 = Finnish
+           0x28 = Swedish
+           0x29 = Turkish
+           0x2a = Flemish
+           0x2b = Wallon
+           0x45 = Zulu
+           0x46 = Vietnamese
+           0x47 = Uzbek
+           0x48 = Urdu
+           0x49 = Ukrainian
+           0x4a = Thai
+           0x4b = Telugu
+           0x4c = Tatar
+           0x4d = Tamil
+           0x4e = Tadzhik
+           0x4f = Swahili
+           0x50 = Sranan Tongo
+           0x51 = Somali
+           0x52 = Sinhalese
+           0x53 = Shona
+           0x54 = Serbo-croat
+           0x55 = Ruthenian
+           0x56 = Russian
+           0x57 = Quechua
+           0x58 = Pushtu
+           0x59 = Punjabi
+           0x5a = Persian
+           0x5b = Papamiento
+           0x5c = Oriya
+           0x5d = Nepali
+           0x5e = Ndebele
+           0x5f = Marathi
+           0x60 = Moldavian
+           0x61 = Malaysian
+           0x62 = Malagasay
+           0x63 = Macedonian
+           0x64 = Laotian
+           0x65 = Korean
+           0x66 = Khmer
+           0x67 = Kazakh
+           0x68 = Kannada
+           0x69 = Japanese
+           0x6a = Indonesian
+           0x6b = Hindi
+           0x6c = Hebrew
+           0x6d = Hausa
+           0x6e = Gurani
+           0x6f = Gujurati
+           0x70 = Greek
+           0x71 = Georgian
+           0x72 = Fulani
+           0x73 = Dari
+           0x74 = Churash
+           0x75 = Chinese
+           0x76 = Burmese
+           0x77 = Bulgarian
+           0x78 = Bengali
+           0x79 = Bielorussian
+           0x7a = Bambora
+           0x7b = Azerbaijani
+           0x7c = Assamese
+           0x7d = Armenian
+           0x7e = Arabic
+           0x7f = Amharic
+E.g. these three packs
+  42 : 8f 00 2a 00 01 01 03 00 06 05 04 05 07 06 01 02 48 65
+  43 : 8f 01 2b 00 00 00 00 00 00 00 06 03 2c 00 00 00 c0 20
+  44 : 8f 02 2c 00 00 00 00 00 09 00 00 00 00 00 00 00 11 45
+decode to
+Byte :Value Meaning
+   0 : 01 = ASCII 7-bit
+   1 : 01 = first track is 1
+   2 : 03 = last track is 3
+   3 : 00 = copyright (0 = public domain, 3 = copyrighted ?)
+   4 : 06 = 6 packs of type 0x80
+   5 : 05 = 5 packs of type 0x81
+   6 : 04 = 4 packs of type 0x82
+   7 : 05 = 5 packs of type 0x83
+   8 : 07 = 7 packs of type 0x84
+   9 : 06 = 6 packs of type 0x85
+  10 : 01 = 1 pack  of type 0x86
+  11 : 02 = 2 packs of type 0x87
+  12 : 00 = 0 packs of type 0x88
+  13 : 00 = 0 packs of type 0x89
+  14 : 00 00 00 00 = 0 packs of types 0x8a to 0x8d
+  18 : 06 = 6 packs of type 0x8e
+  19 : 03 = 3 packs of type 0x8f
+  20 : 2c = last sequence for block 0
+            This matches the sequence number of the last text pack (0x2c = 44)
+  21 : 00 00 00 00 00 00 00 = last sequence numbers for block 1..7 (none)
+  28 : 09 = language code for block 0: English
+  29 : 00 00 00 00 00 00 00 = language codes for block 1..7 (none)
+
+
+-------------------------------------------------------------------------------
+Overview of libburn API calls for CD-TEXT (see libburn/libburn.h for details):
+
+libburn can retrieve the array of text packs from a CD:
+
+  int burn_disc_get_leadin_text(struct burn_drive *d,
+                                unsigned char **text_packs, int *num_packs,
+                                int flag);
+
+
+It can write a text pack set with a CD SAO session.
+
+This set may be attached as array of readily formatted text packs by:
+
+  int burn_write_opts_set_leadin_text(struct burn_write_opts *opts,
+                                      unsigned char *text_packs,
+                                      int num_packs, int flag);
+
+The array of text packs may be read from a file by
+
+  int burn_cdtext_from_packfile(char *path, unsigned char **text_packs,
+                                int *num_packs, int flag);
+
+
+Alternatively the pack set may be defined by attaching CD-TEXT attributes
+to burn_session and burn_track:
+
+  int burn_session_set_cdtext_par(struct burn_session *s,
+                                  int char_codes[8], int copyrights[8],
+                                  int languages[8], int flag);
+
+  int burn_session_set_cdtext(struct burn_session *s, int block,
+                              int pack_type, char *pack_type_name,
+                              unsigned char *payload, int length, int flag);
+
+  int burn_track_set_cdtext(struct burn_track *t, int block,
+                            int pack_type, char *pack_type_name,
+                            unsigned char *payload, int length, int flag);
+
+Macros list the texts for genre and language codes:
+
+  BURN_CDTEXT_LANGUAGES_0X00
+  BURN_CDTEXT_FILLER
+  BURN_CDTEXT_LANGUAGES_0X45
+
+  BURN_CDTEXT_GENRE_LIST
+  BURN_CDTEXT_NUM_GENRES
+
+There is a reader for Sony Input Sheet Version 0.7T:
+
+  int burn_session_input_sheet_v07t(struct burn_session *session,
+                                    char *path, int block, int flag);
+
+and a writer which converts an array of text packs to such a Sony Input Sheet:
+
+  int burn_make_input_sheet_v07t(unsigned char *text_packs, int num_packs,
+                                 int start_tno, int track_count,
+                                 char **result, int *char_code, int flag);
+
+CD-TEXT can be read from a CDRWIN cue sheet file which defines the tracks
+of a session
+
+  int burn_session_by_cue_file(struct burn_session *session,
+                        char *path, int fifo_size, struct burn_source **fifo,
+                        unsigned char **text_packs, int *num_packs, int flag);
+
+
+The session and track attributes can then be converted into an array of
+text packs by:
+
+  int burn_cdtext_from_session(struct burn_session *s,
+                               unsigned char **text_packs, int *num_packs, 
+                               int flag);
+
+or they can be written as array of text packs to CD when burning begins and
+no array of pre-formatted packs was attached to the write options by
+burn_write_opts_set_leadin_text().
+
+There are calls for inspecting the attached attributes:
+
+  int burn_session_get_cdtext_par(struct burn_session *s,
+                                  int char_codes[8], int copyrights[8],
+                                  int block_languages[8], int flag);
+
+  int burn_session_get_cdtext(struct burn_session *s, int block,
+                              int pack_type, char *pack_type_name,
+                              unsigned char **payload, int *length, int flag);
+
+  int burn_track_get_cdtext(struct burn_track *t, int block,
+                            int pack_type, char *pack_type_name,
+                            unsigned char **payload, int *length, int flag);
+
+and for removing attached attributes:
+
+  int burn_session_dispose_cdtext(struct burn_session *s, int block);
+
+  int burn_track_dispose_cdtext(struct burn_track *t, int block);
+
+
+UPC/EAN and ISRC not only affect CD-TEXT but also information that is written
+along with the tracks in Q sub-channel. These can be influenced by
+burn_session_input_sheet_v07t(), burn_session_by_cue_file() and by
+
+  void burn_write_opts_set_mediacatalog(struct burn_write_opts *opts,
+                                      unsigned char mediacatalog[13]);
+
+  void burn_write_opts_set_has_mediacatalog(struct burn_write_opts *opts,
+                                          int has_mediacatalog);
+
+  void burn_track_set_isrc(struct burn_track *t, char *country, char *owner,
+                           unsigned char year, unsigned int serial);
+
+  int burn_track_set_isrc_string(struct burn_track *t, char isrc[13],
+                                 int flag);
+
+
+-------------------------------------------------------------------------------
+Sony Text File Format (Input Sheet Version 0.7T):
+
+This text file format provides comprehensive means to define the text
+attributes of session and tracks for a single block. More than one
+such file has to be read to form an attribute set with multiple blocks.
+
+The information is given by text lines of the following form:
+  purpose specifier [whitespace] = [whitespace] content text
+[whitespace] is zero or more ASCII 32 (space) or ASCII 9 (tab) characters.
+The purpose specifier tells the meaning of the content text.
+Empty content text does not cause a CD-TEXT attribute to be attached.
+
+The following purpose specifiers apply to the session as a whole:
+  Specifier           =  Meaning
+  -------------------------------------------------------------------------
+  Text Code           =  Character code for pack type 0x8f
+                         "ASCII", "8859"
+  Language Code       =  One of the language names for pack type 0x8f
+  Album Title         =  Content of pack type 0x80
+  Artist Name         =  Content of pack type 0x81
+  Songwriter          =  Content of pack type 0x82
+  Composer            =  Content of pack type 0x83
+  Arranger            =  Content of pack type 0x84
+  Album Message       =  Content of pack type 0x85
+  Catalog Number      =  Content of pack type 0x86
+  Genre Code          =  One of the genre names for pack type 0x87
+  Genre Information   =  Cleartext part of pack type 0x87
+  Closed Information  =  Content of pack type 0x8d
+  UPC / EAN           =  Content of pack type 0x8e
+  Text Data Copy Protection = Copyright value for pack type 0x8f
+                              "ON" = 0x03, "OFF" = 0x00
+  First Track Number  =  The lowest track number used in the file
+  Last Track Number   =  The highest track number used in the file
+
+The following purpose specifiers apply to particular tracks:
+  Track NN Title      =  Content of pack type 0x80
+  Track NN Artist     =  Content of pack type 0x81
+  Track NN Songwriter =  Content of pack type 0x82
+  Track NN Composer   =  Content of pack type 0x83
+  Track NN Arranger   =  Content of pack type 0x84
+  Track NN Message    =  Content of pack type 0x85
+  ISRC NN             =  Content of pack type 0x8e
+
+The following purpose specifiers have no effect on CD-TEXT:
+  Remarks             =  Comments with no influence on CD-TEXT
+  Disc Information NN =  Supplementary information for use by record companies.
+                         ISO-8859-1 encoded. NN ranges from 01 to 04.
+  Input Sheet Version =  "0.7T"
+
+
+libburn peculiarties:
+
+libburn may read files of the described format by
+  burn_session_input_sheet_v07t()
+after the burn_session has been establiched and all burn_track objects have
+been added. It can convert an array of CD-TEXT packs into this format by
+  burn_make_input_sheet_v07t() 
+
+The following purpose specifiers accept byte values of the form 0xXY.
+  Text Code , Language Code , Genre Code , Text Data Copy Protection
+E.g. to indicate MS-JIS character code (of which the exact name is unknown):
+  Text Code           = 0x80
+Genre Code is settable by 0xXY or 0xXYZT or 0xXY 0xZT.
+  Genre Code          = 0x001b
+
+Purpose specifiers which have the meaning "Content of pack type 0xXY"
+may be replaced by the pack type codes.  E.g.:
+  0x80                =  Session content of pack type 0x80
+  Track 02 0x80       =  Track content of pack type 0x80 for track 2.
+Applicable are pack types 0x80 to 0x86, 0x8d, 0x8e.
+
+Text Code may be specified only once. It gets speficied to "ISO-8850-1"
+automatically as soon as content is defined which depends on the text
+encoding of the block. I.e with pack types 0x80 to 0x85.
+
+If a track attribute is set, but the corresponding session attribute is not
+defined or defined with empty text, then the session attribute gets attached
+as empty test. (Normally empty content is ignored.)
+
+
+Example cdrskin run with three tracks:
+
+  $ cdrskin dev=/dev/sr0 -v input_sheet_v07t=NIGHTCATS.TXT \
+            -audio -swab track_source_1 track_source_2 track_source_3
+
+----------------------------------------------------------
+Content of file NIGHTCATS.TXT                            :
+----------------------------------------------------------
+Input Sheet Version = 0.7T
+Text Code           = 8859
+Language Code       = English
+Album Title         = Joyful Nights
+Artist Name         = United Cat Orchestra
+Songwriter          = Various Songwriters
+Composer            = Various Composers
+Arranger            = Tom Cat
+Album Message       = For all our fans
+Catalog Number      = 1234567890
+Genre Code          = Classical
+Genre Information   = Feline classic music
+Closed Information  = This is not to be shown by CD players
+UPC / EAN           = 1234567890123
+Text Data Copy Protection = OFF
+First Track Number  = 1
+Last Track Number   = 3
+Track 01 Title      =  Song of Joy
+Track 01 Artist     =  Felix and The Purrs
+Track 01 Songwriter =  Friedrich Schiller
+Track 01 Composer   =  Ludwig van Beethoven
+Track 01 Arranger   =  Tom Cat
+Track 01 Message    =  Fritz and Louie once were punks
+ISRC 01             =  XYBLG1101234
+Track 02 Title      =  Humpty Dumpty
+Track 02 Artist     =  Catwalk Beauties
+Track 02 Songwriter =  Mother Goose
+Track 02 Composer   =  unknown
+Track 02 Arranger   =  Tom Cat
+Track 02 Message    =  Pluck the goose
+ISRC 02             =  XYBLG1100005
+Track 03 Title      =  Mee Owwww
+Track 03 Artist     =  Mia Kitten
+Track 03 Songwriter =  Mia Kitten
+Track 03 Composer   =  Mia Kitten
+Track 03 Arranger   =  Mia Kitten
+Track 03 Message    =  
+ISRC 03             =  XYBLG1100006
+----------------------------------------------------------
+
+
+-------------------------------------------------------------------------------
+CDRWIN cue sheet files:
+
+A CDRWIN cue sheet file defines the track data source (FILE), various text
+attributes (CATALOG, TITLE, PERFORMER, SONGWRITER, ISRC), track block types
+(TRACK), track start addresses (INDEX).
+The rules for CDRWIN cue sheet files are described at
+  http://digitalx.org/cue-sheet/syntax/
+There are three more text attributes mentioned in man cdrecord for defining
+the corresponding CD-TEXT attributes: ARRANGER, COMPOSER, MESSAGE.
+
+
+--------------------------------------------------------
+Example of a CDRWIN cue sheet file named NIGHTCATS.CUE :
+--------------------------------------------------------
+
+CATALOG 1234567890123
+FILE "audiodata.bin" BINARY
+TITLE "Joyful Nights"
+  TRACK 01 AUDIO
+    FLAGS DCP
+    TITLE "Song of Joy"
+    PERFORMER "Felix and The Purrs"
+    SONGWRITER "Friedrich Schiller"
+    ISRC XYBLG1101234
+    INDEX 01 00:00:00
+  TRACK 02 AUDIO
+    FLAGS DCP
+    TITLE "Humpty Dumpty"
+    PERFORMER "Catwalk Beauties"
+    SONGWRITER "Mother Goose"
+    ISRC XYBLG1100005
+    INDEX 01 08:20:12
+  TRACK 03 AUDIO
+    FLAGS DCP
+    TITLE "Mee Owwww"
+    PERFORMER "Mia Kitten"
+    SONGWRITER "Mia Kitten"
+    ISRC XYBLG1100006
+    INDEX 01 13:20:33
+
+By 
+
+  $ cdrskin -v dev=/dev/sr0 -text cuefile=NIGHTCATS.CUE
+
+this yields as text packs:
+
+   0 : 80 00 00 00  J  o  y  f  u  l     N  i  g  h  t f0 f7
+   1 : 80 00 01 0c  s 00  S  o  n  g     o  f     J  o 43 1c
+   2 : 80 01 02 0a  y 00  H  u  m  p  t  y     D  u  m 43 f9
+   3 : 80 02 03 0a  p  t  y 00  M  e  e     O  w  w  w 24 72
+   4 : 80 03 04 08  w 00 00 00 00 00 00 00 00 00 00 00 6e af
+   5 : 81 00 05 00 00  F  e  l  i  x     a  n  d     T 4d 51
+   6 : 81 01 06 0b  h  e     P  u  r  r  s 00  C  a  t a7 40
+   7 : 81 02 07 03  w  a  l  k     B  e  a  u  t  i  e 59 80
+   8 : 81 02 08 0f  s 00  M  i  a     K  i  t  t  e  n 30 c9
+   9 : 81 03 09 0a 00 00 00 00 00 00 00 00 00 00 00 00 ad 19
+  10 : 82 00 0a 00 00  F  r  i  e  d  r  i  c  h     S 70 8f
+  11 : 82 01 0b 0b  c  h  i  l  l  e  r 00  M  o  t  h 33 43
+  12 : 82 02 0c 04  e  r     G  o  o  s  e 00  M  i  a d6 f5
+  13 : 82 03 0d 03     K  i  t  t  e  n 00 00 00 00 00 f5 83
+  14 : 8e 00 0e 00  1  2  3  4  5  6  7  8  9  0  1  2 92 3e
+  15 : 8e 00 0f 0c  3 00  X  Y  B  L  G  1  1  0  1  2 c0 2b
+  16 : 8e 01 10 0a  3  4 00  X  Y  B  L  G  1  1  0  0 bb b3
+  17 : 8e 02 11 09  0  0  5 00  X  Y  B  L  G  1  1  0 f3 bf
+  18 : 8e 03 12 08  0  0  0  6 00 00 00 00 00 00 00 00 5b 5c
+  19 : 8f 00 13 00 00 01 03 00 05 05 04 00 00 00 00 00 9b fe
+  20 : 8f 01 14 00 00 00 00 00 00 00 05 03 15 00 00 00 11 0b
+  21 : 8f 02 15 00 00 00 00 00 09 00 00 00 00 00 00 00 da 77
+
+--------------------------------------
+
+Some restrictions apply in the libburn call burn_session_by_cue_file():
+
+Only FILE types BINARY, MOTOROLA, WAVE are allowed.
+Only TRACK datatypes AUDIO, MODE1/2048 are allowed. They may not be mixed in
+the same session.
+
+On the other hand, ARRANGER, COMPOSER, MESSAGE are supported unconditionally.
+
+
+-------------------------------------------------------------------------------
+This text is copyright 2011 - 2012 Thomas Schmitt <scdbackup@gmx.net>.
+Permission is granted to copy, modify, and distribute it, as long as the
+references to the original information sources are maintained.
+There is NO WARRANTY, to the extent permitted by law.
+-------------------------------------------------------------------------------
+

doc/comments

@@ -10,9 +10,9 @@ 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, DVD-R/DL, BD-R, BD-RE.
 
-Our scope is currently Linux 2.4 and 2.6, or FreeBSD, or Solaris . For ports
-to other systems we would need : login on a development machine resp.
-an OS ithat is installable on an AMD 64-bit PC, advise from a system person
+Our scope is currently Linux 2.4 and 2.6, FreeBSD, OpenSolaris, or NetBSD.
+For ports to other systems we would need : login on a development machine resp.
+an OS that is installable on an AMD 64-bit PC, advise from a system person
 about the equivalent of Linux sg or FreeBSD CAM, volunteers for testing of
 realistic use cases.
 

doc/cookbook.txt

@@ -4,7 +4,7 @@ Note: This is about how libburn operates optical drives. Not about how to
       operate libburn. The libburn API is described in libburn/libburn.h
 -------------------------------------------------------------------------------
 
-libburnia-project.org Optical Media Rotisserie Recipes as of January 2010
+libburnia-project.org Optical Media Rotisserie Recipes as of December 2011
 
 Content:
 - TAO Multi-Session CD Cookbook (CD-R, CD-RW)
@@ -94,10 +94,15 @@ parameters:
  Write Type       Packet/TAO/SAO/RAW              01h = TAO
  Multi-session    Whether to keep appendable      00b = finalize
                                                   11b = keep appendable
+ Copy             Whether to deny copying         1 = deny by SCMS , 0 = allow
  Track Mode       Describes frame type            4 for data , 0 for audio
  Data Block Type  Layout of payload blocks        8 for 2048 byte data blocks
                                                   0 for 2352 byte audio blocks
  Audio Pause Length                               150 = 2 seconds
+ Media Catalog Number  A property of the disc     0x80 if valid
+                                                  13 decimal digits as ASCII
+ ISRC             A property of the track         0x80 if valid
+                                                  12 letters and digits, ASCII
 Any other parameters may be set to 0.
 Mode page data as of MMC-5 table 644 are preceded by a Mode Parameter Header
 as of SPC-3 table 240. This 8-byte header may be filled with zeros.
@@ -193,7 +198,9 @@ If POINT is >= 1 and <= 99 (63h) then the descriptor is about the track of
 which POINT tells the number.
 The start address of this track can be read from PMIN, PSEC, PFRAME where
 it is encoded in MSF format:
-blocks = frames - 150, 75 frames = 1 sec , 60 sec = 1 min.
+If M is smaller than 90:  LBA = (M * 60 + S) * 75 + F - 150
+Else                   :  LBA = (M * 60 + S) * 75 + F - 450150
+
 The length of the track is given by MIN,SEC,FRAME in the same format.
 
 If POINT = A0h then the descriptor tells in PMIN the first track number of its
@@ -220,10 +227,12 @@ sync. libburn uses the info provided by 52h READ TRACK INFORMATION.
 -------------------------------------------------------------------------------
                                  SAO CD Cookbook
 -------------------------------------------------------------------------------
-Guided by reading libburn/*    from http://icculus.org/burn
-backed by reading mmc5r03c.pdf from http://www.t10.org/ftp/t10/drafts/mmc5/
-and by experiments with drives NEC ND-4570A, LG GSA-4082B, LITE-ON LTR48125S
-which used in part code from http://icculus.org/burn.
+Guided by reading     libburn/* from http://icculus.org/burn
+backed by reading  mmc5r03c.pdf from http://www.t10.org/ftp/t10/drafts/mmc5/
+backed by reading     scms.html from
+                     http://www.barrel-of-monkeys.com/graphics/prod/dvdplayers/
+and by experiments with drives  NEC ND-4570A, LG GSA-4082B, LITE-ON LTR48125S,
+                                Optiarc BD RW BD-5300S, LG BDDVDRW GGC-H20L
 
 For libburnia-project.org by Thomas Schmitt <scdbackup@gmx.net>
 
@@ -260,46 +269,96 @@ Each entry of the sheet is of 8 bytes size. Its fields are named
 CTL|ADR, TNO, INDEX, DATA FORM, SCMS, MIN, SEC, FRAME .
 (mmc5r03c.pdf 6.33)
 
-CTL is 40h for data and 00h for audio.
+CTL is comprised of four bits:
+  bit4 = Pre-emphasis (audio only)
+  bit5 = Digital copy permission:
+         0 = prohibited (one-time copy is permitted if SCMS is 00h)
+         1 = permitted (unlimited)                         
+  bit6 = Data track indicator (bit4 and bit7 shall be 0)
+  bit7 = 4-channel audio
+Usually CTL is 40h for data and 00h for audio.
 (mmc5r03c.pdf 6.33.3.4)
-ADR is always 01h.
-TNO is the track number (1 to 99).
-INDEX is a subaddress within tracks. This recipe uses only INDEX 01h within
-tracks.
+ADR is 01h for entries which define time points. It is 02h for media catalog
+entries and it is 03h for track ISRC entries.
+The bits of CTL and ADR are combined in the CTL|ADR byte.
+
+TNO is the track number. The TNO of the first track may be chosen in the range
+of 1 to 99. The TNO of following tracks must be the TNO of their predecessor
+plus 1. The last track must not have a TNO larger than 99.
+
+INDEX is a subaddress within tracks. INDEX 1 is mandatory and marks the start
+of the payload area of a track. The range between INDEX 0 and 1 is called
+pre-gap. It should contain zeros if it exists. Further cue sheet entries with
+consecutive INDEX numbers mark ranges within the track. The range of the last
+index may contain a post-gap with zeros.
 (mmc5r03c.pdf 4.2.3.5.2)
-DATA FORM is 00h for audio payload , 10h for data. (01h for audio pause is not
-used in libburn). 
+A pre-gap of 2 seconds is mandatory only for the first track. Pre-gap and
+post-gap may be needed with further tracks if they have neighbors with
+different DATA FORM values. (Such mixing is not yet supported by libburn.)
+
+DATA FORM is 00h for audio payload, 01h for audio pause (Lead-in and Lead-out),
+10h for data, 14h for data pause (Lead-in and Lead-out).
+This shall be ored with 40h for CD-TEXT in Lead-in. 
 (mmc5r03c.pdf 6.33.3.11 CD-DA Data Form, 6.33.3.12 CD-ROM mode 1 Form)
-SCMS is always 00h.
+
+SCMS value 80h in conjunction with bit5 of CTL is an indicator for exhausted
+one-time-copy permission. If this permission is still intact, then SCMS is 00h.
+
 MIN, SEC, FRAME give the MSF address where the described data entity starts.
 LBA = frames - 150, 75 frames = 1 sec , 60 sec = 1 min.
 This address must increase from entry to entry (or at least stay equal).
 
 
-The first entry describes the Lead-in. Its content is 
-(CTL|ADR ,00h,00h,01h,00h,00h,00h,00h)
+The first two entries in a Cue Sheet may describe the Media Catalog Number,
+a string of 13 characters, also known with CD-TEXT as "UPC/EAN".
+(02h, catalog characters 1 to 7)
+(02h, catalog characters 8 to 13, 00h)
+These two entries shall be omitted if no catalog number is given.
+
+The next entry (eventually being the first one) describes the Lead-in.
+Its content is 
+(CTL|ADR ,00h,00h, DATA FORM ,00h,00h,00h,00h)
 With the CTL|ADR for the first track: 41h for data, 01h for audio.
+DATA FORM is pause (audio=01h, data=14h). Ored with 40h if CD-TEXT shall
+be stored in Lean-in.
 
 The LBA for the first write is negative: -150. This corresponds to MSF address
 00h:00h:00h. All addresses are to be given in MSF format.
-The first information track on disc is preceded by a pause encoding of 2 sec:
+
+Each track may be preceded by two entries describing an ISRC string of 12
+characters.
+(CTL | 03h, TNO, characters 1 to 6)
+(CTL | 03h, TNO, characters 7 to 12)
+These entries shall be omitted if no ISRC is given for the track.
+CTL shall be the same as with the track.
+
+The first information track on disc is preceded by a pause encoding or pre-gap
+of at least 2 seconds:
 (CTL|ADR,01h,00h, DATA FORM ,00h,00h,00h,00h) 
 with DATA FORM = 00h for audio and 10h for data. By those 2 seconds the MSF
-address increases to 00h:02h:00h = LBA 0.
+address increases to 00h:02h:00h = LBA 0. Optional further sectors may occupy
+addresses larger than 0. This entry has to come after ISRC, if ISRC is given
+for the track. INDEX has to be 0.
 
-Each track is represented by an entry
+Each track is represented by one or more entries, with increasing index number.
+At least the entry for INDEX 1 has to exist:
 (CTL|ADR, TNO ,01h,DATA FORM,00h, MIN , SEC , FRAME)
 TNO gives the track number. MIN, SEC, FRAME give the MSF address which becomes
 the start address of the track. The MSF address is then increased by the size
 of the track (to be used with next track or with lead-out).
+There may be more entries with INDEX 2 to 99. Their MSF address tells the
+sector where their range starts. This range ends at the MSF of the next entry
+in the cue sheet. INDEX information is stored in the sub-channel of the sectors
+but not in the Table-of-Content of the disc.
 
 A track must at least contain 300 payload blocks: 4 seconds of audio or
 600 KiB of data.
 (mmc5r03c.pdf 6.33.3.6)
 
 At the end of the session there is a lead-out entry
-(CTL|ADR,AAh,01h,01h,00h,MIN,SEC,FRAME)
+(CTL|ADR,AAh,01h,DATA FORM,00h,MIN,SEC,FRAME)
 marking the end of the last track. (With libburn CTL is as of the last track.)
+DATA FORM is 01h for audio, 14h for data.
 
 
 -------------------------------------------------------------------------------
@@ -312,6 +371,12 @@ next lower possible value by the drive. So it is helpful to add a few
 kbytes/sec just in case the drive has rounding problems.
 (mmc5r03c.pdf 6.37)
 
+If CD-TEXT shall be written into Lead-in, then it is necessary to obtain the
+Start Time of Lead-in by 43h READ TOC/PMA/ATIP Format 0100b. It is an MFS
+address which varies from media manufacturer to media manufacturer.
+Minute will be >= 90. Therefore this conversion applies:
+  LBA = (M * 60 + S) * 75 + F - 450150
+
 A Write Parameters mode page 05h has to be composed and transmitted via
 55h MODE SELECT. This page describes the following parameters:
  BUFE             Buffer Underrun protection      0=off, 1=on
@@ -322,6 +387,10 @@ A Write Parameters mode page 05h has to be composed and transmitted via
  Track Mode       Describes frame type            0 (is ignored)
  Data Block Type  Layout of payload blocks        0 (is ignored)
  Audio Pause Length                               150 = 2 seconds (ignored ?)
+ Media Catalog Number                             0x80 if valid
+                  See also Cue Sheet ADR 02h      13 decimal digits as ASCII
+ (With SAO, ISRC is transmitted only by the Cue Sheet.)
+
 Any other parameters may be set to 0.
 Mode page data as of MMC-5 table 644 are preceded by a Mode Parameter Header
 as of SPC-3 table 240. This 8-byte header may be filled with zeros.
@@ -338,15 +407,32 @@ blocks written. I.e the Transfer Length of the previous 2Ah WRITE has to be
 added to the Logical Block Address for the next 2Ah WRITE. Only full blocks
 can be written.
 (mmc5r03c.pdf, 6.44)
-Writing begins at LBA -150 which is to be transmitted as 4-byte, Big-endian,
-two's-complement. E.g:  -150 = FFh FFh FFh 6Ah. This is the natural form found
-with about any 32-bit processor, so only the endianness has to be taken into
-respect when converting a 32-bit integer into a LBA for command 2Ah WRITE.
+Block addresses may be negative for areas before the normally readable
+data. Data representation of addresses is 4-byte, big-endian, two's-complement.
+E.g:  -150 = FFh FFh FFh 6Ah.
+This is the natural form found with about any 32-bit processor, so only
+the endianness has to be taken into respect when converting a 32-bit
+integer into a LBA for command 2Ah WRITE.
 
+If CD-TEXT shall be written into Lead-in, then writing begins at the start
+address of Lead-in, which was obtained above.
+The 18 bytes of each text pack have to be split up to 24 bytes with only the
+lowest six bits used in each byte. E.g. text pack
+   8F 00 2A     00 01 01     03 00 06     05 04 05     07 06 01     02 48 65
+becomes
+  23 30 00 2A  00 00 04 01  00 30 00 06  01 10 10 05  01 30 18 01  00 24 21 25
+4 of these 24 byte packs form a block of DATA FORM 41h. I.e. only 96 bytes
+payload per block. The whole range from Lead-in start to LBA -150 has to be
+filled with blocks of this form. Therefore it is necessary to write the
+list of given packs in repeated cycles.
+A typical Lead-in start address is -11635 = FFh FFh D2h 8Dh.
+A description of the CD-TEXT pack format is given in file  doc/cdtext.txt .
 
-At first the mandatory pause preceding the first track has to be written as
-150 blocks of the matching sector size: 2048 for data, 2352 for audio.
-By this, the LBA increases from -150 to 0.
+Writing without CD-TEXT begins at LBA -150 = FFh FFh FFh 6Ah.
+
+In both cases, the mandatory pause preceding the first track has to be
+written as 150 blocks of the matching sector size: 2048 for data,
+2352 for audio. By this, the LBA increases from -150 to 0.
 
 Next the tracks' payload is sent. For each track exactly the number of blocks
 has to be transmitted as is announced in the Cue Sheet by the difference
@@ -370,6 +456,21 @@ to media by 35h SYNCHRONIZE CACHE.
 No further finalization is necessary. (I.e. no 5Bh CLOSE TRACK SESSION.)
 
 
+-------------------------------------------------------------------------------
+Obtaining CD-TEXT from Lead-in :
+
+Audio CDs may contain CD-TEXT information in their Lead-in. It is gained by
+43h READ TOC/PMA/ATIP, Format 0101b. The reply consists of 4 bytes header,
+of which the first two bytes give the number of following bytes as big-endian
+16 bit number. The other two bytes are 0.
+Following are text packs of 18 bytes each.
+(mmc5r03c.pdf 6.26.3.7.1 table 495)
+
+
+A description of CD-TEXT packs and of the applicable libburn API calls is
+given in file doc/cdtext.txt .
+
+
 ----------------------------------------------------------------------------
 What is known about mixed mode sessions :
 
@@ -812,7 +913,8 @@ 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.
+After writing the session it is necessary to copy the PVD from session start
+plus 16 to LBA 16 and to adjust it to its new location.
 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++)
@@ -873,7 +975,7 @@ Media type can be recognized by Current Profile from 46h GET CONFIGURATION.
 DVD-R                          0011h
 DVD-RW Restricted Overwrite    0013h
 DVD-RW Sequential Recording    0014h
-(DVD-R/DL Sequential Recording 0015h untested, might be single-session only)
+DVD-R/DL Sequential Recording  0015h (can only do single-session)
 
 There are two approaches for writing to sequential DVD-R[W]: DAO and
 Incremental. Not all media and drives offer Incremental which allows 
@@ -1155,11 +1257,13 @@ track of the session.
 -------------------------------------------------------------------------------
 Hearsay about DVD-R/DL (Dual Layer) :
 
+Meanwhile confirmed by one user:
+
 DVD-R/DL can assume profile 0015h DVD-R Dual Layer Sequential which is supposed
 to behave like DVD-R or 0016h DVD-R Dual Layer Jump which has no counterpart
 with DVD-R.
 
-A half-sentence in mmc5r03c.pdf 6.3.3.3.3 might indicate that closing a session
+A half-sentence in mmc5r03c.pdf 6.3.3.3.3 indicates that closing a session
 by 5Bh CLOSE TRACK SESSION Close Function 010b overrides the multi-session bits
 in mode page 05h.
 growisofs applies this function in case of not DAO, though. A comment in
@@ -1405,5 +1509,11 @@ 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)
 
+
+-------------------------------------------------------------------------------
+This text is copyright 2011 - 2012 Thomas Schmitt <scdbackup@gmx.net>.
+Permission is granted to copy, modify, and distribute it, as long as the
+references to the original information sources are maintained.
+There is NO WARRANTY, to the extent permitted by law.
 -------------------------------------------------------------------------------
 

doc/mediainfo.txt

@@ -1186,6 +1186,9 @@ TYG11               TAIYO YUDEN  DVD-R DL 8x
 TYG-BD      Y01     TAIYO YUDEN Co., Ltd.  1-2X LTH   [Blu]
 TYG-BD      Y03     TAIYO YUDEN Co., Ltd.   1-4X LTH   [Blu]
 
+"UmeDisc Ltd. HK"
+UMEDISC     DL1     Elite DVD+R DL [User report feb 2012]
+
 "Unifino Inc."
 UTJR001001          UNIFINO  4X   [Hij]
 

libburn/async.c

@@ -1,7 +1,7 @@
 /* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */
 
 /* Copyright (c) 2004 - 2006 Derek Foreman, Ben Jansens
-   Copyright (c) 2006 - 2010 Thomas Schmitt <scdbackup@gmx.net>
+   Copyright (c) 2006 - 2012 Thomas Schmitt <scdbackup@gmx.net>
    Provided under GPL version 2 or later.
 */
 
@@ -183,11 +183,6 @@ static void remove_worker(pthread_t th)
 {
 	struct w_list *a, *l = NULL;
 
-#ifdef Libburn_detach_done_workeR
-	int ret;
-	char msg[80];
-#endif
-
 	for (a = workers; a; l = a, a = a->next)
 		if (a->thread == th) {
 			if (l)
@@ -200,8 +195,12 @@ static void remove_worker(pthread_t th)
 			/* Alternative : threads get detached and thus should
 					dispose themselves.
 			*/
-			ret = pthread_detach(th);
+			pthread_detach(th);
 /*
+			int ret;
+			char msg[80];
+
+			ret = pthread_detach(th);
 			sprintf(msg,
 			 "remove_workers(): pid= %lu  pthread_detach(%lu)= %d",
 			 (unsigned long) getpid(), (unsigned long) th, ret);
@@ -354,7 +353,7 @@ void burn_disc_erase(struct burn_drive *drive, int fast)
 	/* a ssert(!SCAN_GOING()); */
 	/* a ssert(!find_worker(drive)); */
 
-	if((drive == NULL)) {
+	if(drive == NULL) {
 		libdax_msgs_submit(libdax_messenger, -1,
 			0x00020104,
 			LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
@@ -396,11 +395,16 @@ void burn_disc_erase(struct burn_drive *drive, int fast)
 	    ||
 	    (drive->drive_role != 1 && drive->drive_role != 5)
 	   ) {
+		char msg[160];
+
+		sprintf(msg, "Drive and media state unsuitable for blanking. (role= %d , profile= 0x%x , status= %d)",
+			drive->drive_role,
+			(unsigned int) drive->current_profile,
+			drive->status);
 		libdax_msgs_submit(libdax_messenger, drive->global_index,
 			0x00020130,
 			LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
-			"Drive and media state unsuitable for blanking",
-			0, 0);
+			msg, 0, 0);
 		return;
 	}
 
@@ -585,10 +589,10 @@ static void *write_disc_worker_func(struct w_list *w)
 
 void burn_disc_write(struct burn_write_opts *opts, struct burn_disc *disc)
 {
-	int ret;
 	struct write_opts o;
 	char *reasons= NULL;
 	struct burn_drive *d;
+	int mvalid;
 
 	d = opts->drive;
 
@@ -636,19 +640,24 @@ void burn_disc_write(struct burn_write_opts *opts, struct burn_disc *disc)
 	}
 
 	/* ts A61007 : obsolete Assert in spc_select_write_params() */
-	if (d->drive_role == 1 && d->mdata->valid <= 0) {
-		libdax_msgs_submit(libdax_messenger,
+	if (d->drive_role == 1) {
+		mvalid = 0;
+		if (d->mdata != NULL)
+			mvalid = 1;
+		if (!mvalid) {
+			libdax_msgs_submit(libdax_messenger,
 				d->global_index, 0x00020113,
 				LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
 				"Drive capabilities not inquired yet", 0, 0);
-		return;
+			return;
+		}
 	}
 
 	/* ts A70219 : intended to replace all further tests here and many
 	               tests in burn_*_write_sync()
 	*/
 
-        BURN_ALLOC_MEM(reasons, char, BURN_REASONS_LEN + 80);
+        BURN_ALLOC_MEM_VOID(reasons, char, BURN_REASONS_LEN + 80);
 	strcpy(reasons, "Write job parameters are unsuitable:\n");
 	if (burn_precheck_write(opts, disc, reasons + strlen(reasons), 1)
 	     <= 0) {

libburn/cleanup.c

@@ -1,5 +1,5 @@
 /*
- cleanup.c , Copyright 2006 Thomas Schmitt <scdbackup@gmx.net>
+ cleanup.c , Copyright 2006 - 2011 Thomas Schmitt <scdbackup@gmx.net>
 
  A signal handler which cleans up an application and exits.
 
@@ -133,15 +133,27 @@ static void Cleanup_handler_generic(int signum)
 }
 
 
+static char *Cleanup_signo_to_name(int signo)
+{
+ int i;
+ for(i= 0; i < signal_list_count; i++)
+   if(signal_list[i] == signo)
+     return(signal_name_list[i]);
+ return("");
+}
+
+
 int Cleanup_set_handlers(void *handle, Cleanup_app_handler_T handler, int flag)
 /*
  bit0= set to default handlers
  bit1= set to ignore
  bit2= set cleanup_perform_app_handler_first
  bit3= set SIGABRT to handler (makes sense with bits 0 or 1)
+ bit8= set SIGPIPE to SIGIGN
 */
 {
  int i,j,max_sig= -1,min_sig= 0x7fffffff;
+ char *sig_name;
  sighandler_t sig_handler;
 
  cleanup_msg[0]= 0;
@@ -172,8 +184,17 @@ int Cleanup_set_handlers(void *handle, Cleanup_app_handler_T handler, int flag)
      if(i==non_signal_list[j])
    break;
    if(j>=non_signal_list_count) {
-     if(i==SIGABRT && (flag&8))
+     /* Avoid to use particular SIG macros which might not be defined.
+        If they are defined, then their names are in the name list.
+     */
+     if(flag & (8 | 256))
+       sig_name= Cleanup_signo_to_name(i);
+     else
+       sig_name= "";
+     if((flag & 8) && strcmp(sig_name, "SIGABRT") == 0)
        signal(i,Cleanup_handler_generic);
+     else if((flag & 256) && strcmp(sig_name, "SIGPIPE") == 0)
+       signal(i, SIG_IGN);
      else
        signal(i,sig_handler);
    }
@@ -205,9 +226,10 @@ main()
  Cleanup_set_handlers(&demoapp,(Cleanup_app_handler_T) Demo_app_handler,0);
 
  if(1) { /* change to 0 in order to wait for external signals */
-   char *cpt= NULL,c;
+   char *cpt= NULL, c= ' ';
    printf("Intentionally provoking SIGSEGV ...\n");
    c= *cpt;
+   printf("Strange: The system ignored a SIGSEGV: c= %u\n", (unsigned int) c);
  } else {
    printf("killme: %d\n",getpid());
    sleep(3600);

libburn/crc.c

@@ -1,47 +1,568 @@
 /* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */
 
+/* Copyright (c) 2012 Thomas Schmitt <scdbackup@gmx.net>
+   Provided under GPL version 2 or later.
+
+   Containing disabled code pieces from other GPL programs.
+   They are just quotes for reference.
+
+   The activated code uses plain polynomial division and other primitve
+   algorithms to build tables of pre-computed CRC values. It then computes
+   the CRCs by algorithms which are derived from mathematical considerations
+   and from analysing the mathematical meaning of the disabled code pieces.
+
+   The comments here are quite detailed in order to prove my own understanding
+   of the topic.
+*/
+
+
 #ifdef HAVE_CONFIG_H
 #include "../config.h"
 #endif
 
 #include "crc.h"
 
-static unsigned short ccitt_table[256] = {
-	0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50A5, 0x60C6, 0x70E7,
-	0x8108, 0x9129, 0xA14A, 0xB16B, 0xC18C, 0xD1AD, 0xE1CE, 0xF1EF,
-	0x1231, 0x0210, 0x3273, 0x2252, 0x52B5, 0x4294, 0x72F7, 0x62D6,
-	0x9339, 0x8318, 0xB37B, 0xA35A, 0xD3BD, 0xC39C, 0xF3FF, 0xE3DE,
-	0x2462, 0x3443, 0x0420, 0x1401, 0x64E6, 0x74C7, 0x44A4, 0x5485,
-	0xA56A, 0xB54B, 0x8528, 0x9509, 0xE5EE, 0xF5CF, 0xC5AC, 0xD58D,
-	0x3653, 0x2672, 0x1611, 0x0630, 0x76D7, 0x66F6, 0x5695, 0x46B4,
-	0xB75B, 0xA77A, 0x9719, 0x8738, 0xF7DF, 0xE7FE, 0xD79D, 0xC7BC,
-	0x48C4, 0x58E5, 0x6886, 0x78A7, 0x0840, 0x1861, 0x2802, 0x3823,
-	0xC9CC, 0xD9ED, 0xE98E, 0xF9AF, 0x8948, 0x9969, 0xA90A, 0xB92B,
-	0x5AF5, 0x4AD4, 0x7AB7, 0x6A96, 0x1A71, 0x0A50, 0x3A33, 0x2A12,
-	0xDBFD, 0xCBDC, 0xFBBF, 0xEB9E, 0x9B79, 0x8B58, 0xBB3B, 0xAB1A,
-	0x6CA6, 0x7C87, 0x4CE4, 0x5CC5, 0x2C22, 0x3C03, 0x0C60, 0x1C41,
-	0xEDAE, 0xFD8F, 0xCDEC, 0xDDCD, 0xAD2A, 0xBD0B, 0x8D68, 0x9D49,
-	0x7E97, 0x6EB6, 0x5ED5, 0x4EF4, 0x3E13, 0x2E32, 0x1E51, 0x0E70,
-	0xFF9F, 0xEFBE, 0xDFDD, 0xCFFC, 0xBF1B, 0xAF3A, 0x9F59, 0x8F78,
-	0x9188, 0x81A9, 0xB1CA, 0xA1EB, 0xD10C, 0xC12D, 0xF14E, 0xE16F,
-	0x1080, 0x00A1, 0x30C2, 0x20E3, 0x5004, 0x4025, 0x7046, 0x6067,
-	0x83B9, 0x9398, 0xA3FB, 0xB3DA, 0xC33D, 0xD31C, 0xE37F, 0xF35E,
-	0x02B1, 0x1290, 0x22F3, 0x32D2, 0x4235, 0x5214, 0x6277, 0x7256,
-	0xB5EA, 0xA5CB, 0x95A8, 0x8589, 0xF56E, 0xE54F, 0xD52C, 0xC50D,
-	0x34E2, 0x24C3, 0x14A0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405,
-	0xA7DB, 0xB7FA, 0x8799, 0x97B8, 0xE75F, 0xF77E, 0xC71D, 0xD73C,
-	0x26D3, 0x36F2, 0x0691, 0x16B0, 0x6657, 0x7676, 0x4615, 0x5634,
-	0xD94C, 0xC96D, 0xF90E, 0xE92F, 0x99C8, 0x89E9, 0xB98A, 0xA9AB,
-	0x5844, 0x4865, 0x7806, 0x6827, 0x18C0, 0x08E1, 0x3882, 0x28A3,
-	0xCB7D, 0xDB5C, 0xEB3F, 0xFB1E, 0x8BF9, 0x9BD8, 0xABBB, 0xBB9A,
-	0x4A75, 0x5A54, 0x6A37, 0x7A16, 0x0AF1, 0x1AD0, 0x2AB3, 0x3A92,
-	0xFD2E, 0xED0F, 0xDD6C, 0xCD4D, 0xBDAA, 0xAD8B, 0x9DE8, 0x8DC9,
-	0x7C26, 0x6C07, 0x5C64, 0x4C45, 0x3CA2, 0x2C83, 0x1CE0, 0x0CC1,
-	0xEF1F, 0xFF3E, 0xCF5D, 0xDF7C, 0xAF9B, 0xBFBA, 0x8FD9, 0x9FF8,
-	0x6E17, 0x7E36, 0x4E55, 0x5E74, 0x2E93, 0x3EB2, 0x0ED1, 0x1EF0
-};
 
-unsigned long crc32_table[256] = {
+/* Exploration ts B00214 :
+   ECMA-130, 22.3.6 "CRC field"
+   "This field contains the inverted parity bits. The CRC code word must be
+    divisible by the check polynomial. [...]
+    The generating polynomial shall be
+       G(x) = x^16 + x^12 + x^5 + 1
+   "
+   Also known as CRC-16-CCITT, CRC-CCITT 
+
+   Used in libburn for raw write modes in sector.c.
+   There is also disabled code in read.c which would use it.
+
+   ts B11222:
+   The same algorithm is prescribed for CD-TEXT in MMC-3 Annex J.
+   "CRC Field consists of 2 bytes. Initiator system may use these bytes
+    to check errors in the Pack. The polynomial is x^16 + x^12 + x^5 + 1.
+    All bits shall be inverted."
+   
+   libburn/cdtext.c uses a simple bit shifting function : crc_11021()
+
+
+   ts B20211:
+   Discussion why both are equivalent in respect to their result:
+
+   Both map the bits of the given bytes to a polynomial over the finite field
+   of two elements "GF(2)". If bytes 0 .. M are given, then bit n of byte m
+   is mapped to the coefficient of x exponent (n + ((M - m) * 8) + 16).
+   I.e. they translate the bits into a polynomial with the highest bit
+   becomming the coefficient of the highest power of x. Then this polynomial
+   is multiplied by (x exp 16).
+
+   The set of all such polynomials forms a commutative ring. Its addition
+   corresponds to bitwise exclusive or. Addition and subtraction are identical.
+   Multiplication with polynomials of only one single non-zero coefficient
+   corresponds to leftward bit shifting by the exponent of that coefficient.
+   The same rules apply as with elementary school arithmetics on integer
+   numbers, but with surprising results due to the finite nature of the
+   coefficient number space.
+   Note that multiplication is _not_ an iteration of addition here.
+
+   Function crc_11021() performs a division with residue by the euclidian
+   algorithm. I.e. it splits polynomial d into quotient q(d) and residue r(d)
+   in respect to the polynomial p = x exp 16 + x exp 12 + x exp 5 + x exp 0
+      d = p * q(d) + r(d)
+   where r(d) is of a polynomial degree lower than p, i.e. only x exp 15
+   or lower have non-zero coefficients.
+   The checksum crc(D) is derived by reverse mapping (r(d) * (x exp 16)).
+   I.e. by mapping the coefficient of (x exp n) to bit n of the 16 bit word
+   crc(D).
+   The function result is the bit-wise complement of crc(D).
+
+   Function crc_ccitt uses a table ccitt_table of r(d) values for the
+   polynomials d which represent the single byte values 0x00 to 0xff.
+   It computes r(d) by computing the residues of an iteratively expanded
+   polynomial. The expansion of the processed byte string A by the next byte B
+   from the input byte string happens by shifting the string 8 bits to the
+   left, and by oring B onto bits 0 to 7.
+   In the space of polynomials, the already processed polynomial "a" (image of
+   byte string A) gets expanded by polynomial b (the image of byte B) like this
+      a * X + b
+   where X is (x exp 8), i.e. the single coefficient polynomial of degree 8.
+
+   The following argumentation uses algebra with commutative, associative
+   and distributive laws.
+   Valid especially with polynomials is this rule:
+     (1):  r(a + b) = r(a) + r(b)
+   because r(a) and r(b) are of degree lower than degree(p) and
+   degree(a + b) <= max(degree(a), degree(b))
+   Further valid are:
+     (2):  r(a) = r(r(a))
+     (3):  r(p * a) = 0
+
+   The residue of this expanded polynomial can be expressed by means of the
+   residue r(a) which is known from the previous iteration step, and the
+   residue r(b) which may be looked up in ccitt_table.
+      r(a * X + b)
+    = r(p * q(a) * X + r(a) * X + p * q(b) + r(b))
+
+   Applying rule (1):
+    = r(p * q(a) * X) + r(r(a) * X) + r(p * q(b)) + r(r(b))
+
+   Rule (3) and rule (2):
+    = r(r(a) * X) + r(b)
+
+   Be h(a) and l(a) chosen so that:  r(a) = h(a) * X + l(a),
+   and l(a) has zero coefficients above (x exp 7), and h(a) * X has zero
+   coefficients below (x exp 8). (They correspond to the high and low byte
+   of the 16 bit word crc(A).)
+   So the previous statement can be written as:
+    = r(h(a) * X * X)  + r(l(a) * X) + r(b)
+
+   Since the degree of l(a) is lower than 8, the degree of l(a) * X is lower
+   than 16. Thus it cannot be divisible by p which has degree 16.
+   So: r(l(a) * X) =  l(a) * X
+   This yields
+    = l(a) * X + r(h(a) * X * X + b)
+
+   h(a) * X * X is the polynomial representation of the high byte of 16 bit
+   word crc(A).
+   So in the world of bit patterns the iteration step is:
+
+      crc(byte string A expanded by byte B)
+    = (low_byte(crc(A)) << 8) ^ crc(high_byte(crc(A)) ^ B)
+
+   And this is what function crc_ccitt() does, modulo swapping the exor
+   operants and the final bit inversion which is prescribed by ECMA-130
+   and MMC-3 Annex J.
+
+   The start value of the table driven byte shifting algorithm may be
+   different from the start value of an equivalent bit shifting algorithm.
+   This is because the final flushing by zero bits is already pre-computed
+   in the table. So the start value of the table driven algorithm must be
+   the CRC of the 0-polynomial under the start value of the bit shifting
+   algorithm.
+   This fact is not of much importance here, because the start value of
+   the bit shifter is 0x0000 which leads to CRC 0x0000 and thus to start
+   value 0x0000 with the table driven byte shifter.
+*/
+
+
+/* Plain implementation of polynomial division on a Galois field, where
+   addition and subtraction both are binary exor. Euclidian algorithm.
+   Divisor is x^16 + x^12 + x^5 + 1 = 0x11021.
+
+   This is about ten times slower than the table driven algorithm.
+*/
+static int crc_11021(unsigned char *data, int count, int flag)
+{
+        int acc = 0, i;
+
+        for (i = 0; i < count * 8 + 16; i++) {
+                acc = (acc << 1);
+                if (i < count * 8)
+                        acc |= ((data[i / 8] >> (7 - (i % 8))) & 1);
+                if (acc & 0x10000)
+                        acc ^= 0x11021; 
+        }
+        return acc;
+}
+
+
+/* This is my own table driven implementation for which i claim copyright.
+
+   Copyright (c) 2012 Thomas Schmitt <scdbackup@gmx.net>
+*/
+unsigned short crc_ccitt(unsigned char *data, int count)
+{
+	static unsigned short crc_tab[256], tab_initialized = 0;
+	unsigned short acc = 0;
+	unsigned char b[1];
+	int i;
+
+	if (!tab_initialized) {
+		/* Create table of byte residues */
+		for (i = 0; i < 256; i++) {
+			b[0] = i;
+			crc_tab[i] = crc_11021(b, 1, 0);
+		}
+		tab_initialized = 1;
+	}
+	/* There seems to be a speed advantage on amd64 if (acc << 8) is the
+	   second operant of exor, and *(data++) seems faster than data[i].
+	*/
+	for (i = 0; i < count; i++)
+		acc = crc_tab[(acc >> 8) ^ *(data++)] ^ (acc << 8);
+
+	/* ECMA-130 22.3.6 and MMC-3 Annex J (CD-TEXT) want the result with
+	   inverted bits
+	*/
+	return ~acc;
+}
+
+
+/* 
+   This was the function inherited with libburn-0.2.
+
+   static unsigned short ccitt_table[256] = {
+   	0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50A5, 0x60C6, 0x70E7,
+   	0x8108, 0x9129, 0xA14A, 0xB16B, 0xC18C, 0xD1AD, 0xE1CE, 0xF1EF,
+   	0x1231, 0x0210, 0x3273, 0x2252, 0x52B5, 0x4294, 0x72F7, 0x62D6,
+   	0x9339, 0x8318, 0xB37B, 0xA35A, 0xD3BD, 0xC39C, 0xF3FF, 0xE3DE,
+   	0x2462, 0x3443, 0x0420, 0x1401, 0x64E6, 0x74C7, 0x44A4, 0x5485,
+   	0xA56A, 0xB54B, 0x8528, 0x9509, 0xE5EE, 0xF5CF, 0xC5AC, 0xD58D,
+   	0x3653, 0x2672, 0x1611, 0x0630, 0x76D7, 0x66F6, 0x5695, 0x46B4,
+   	0xB75B, 0xA77A, 0x9719, 0x8738, 0xF7DF, 0xE7FE, 0xD79D, 0xC7BC,
+   	0x48C4, 0x58E5, 0x6886, 0x78A7, 0x0840, 0x1861, 0x2802, 0x3823,
+   	0xC9CC, 0xD9ED, 0xE98E, 0xF9AF, 0x8948, 0x9969, 0xA90A, 0xB92B,
+   	0x5AF5, 0x4AD4, 0x7AB7, 0x6A96, 0x1A71, 0x0A50, 0x3A33, 0x2A12,
+   	0xDBFD, 0xCBDC, 0xFBBF, 0xEB9E, 0x9B79, 0x8B58, 0xBB3B, 0xAB1A,
+   	0x6CA6, 0x7C87, 0x4CE4, 0x5CC5, 0x2C22, 0x3C03, 0x0C60, 0x1C41,
+   	0xEDAE, 0xFD8F, 0xCDEC, 0xDDCD, 0xAD2A, 0xBD0B, 0x8D68, 0x9D49,
+   	0x7E97, 0x6EB6, 0x5ED5, 0x4EF4, 0x3E13, 0x2E32, 0x1E51, 0x0E70,
+   	0xFF9F, 0xEFBE, 0xDFDD, 0xCFFC, 0xBF1B, 0xAF3A, 0x9F59, 0x8F78,
+   	0x9188, 0x81A9, 0xB1CA, 0xA1EB, 0xD10C, 0xC12D, 0xF14E, 0xE16F,
+   	0x1080, 0x00A1, 0x30C2, 0x20E3, 0x5004, 0x4025, 0x7046, 0x6067,
+   	0x83B9, 0x9398, 0xA3FB, 0xB3DA, 0xC33D, 0xD31C, 0xE37F, 0xF35E,
+   	0x02B1, 0x1290, 0x22F3, 0x32D2, 0x4235, 0x5214, 0x6277, 0x7256,
+   	0xB5EA, 0xA5CB, 0x95A8, 0x8589, 0xF56E, 0xE54F, 0xD52C, 0xC50D,
+   	0x34E2, 0x24C3, 0x14A0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405,
+   	0xA7DB, 0xB7FA, 0x8799, 0x97B8, 0xE75F, 0xF77E, 0xC71D, 0xD73C,
+   	0x26D3, 0x36F2, 0x0691, 0x16B0, 0x6657, 0x7676, 0x4615, 0x5634,
+   	0xD94C, 0xC96D, 0xF90E, 0xE92F, 0x99C8, 0x89E9, 0xB98A, 0xA9AB,
+   	0x5844, 0x4865, 0x7806, 0x6827, 0x18C0, 0x08E1, 0x3882, 0x28A3,
+   	0xCB7D, 0xDB5C, 0xEB3F, 0xFB1E, 0x8BF9, 0x9BD8, 0xABBB, 0xBB9A,
+   	0x4A75, 0x5A54, 0x6A37, 0x7A16, 0x0AF1, 0x1AD0, 0x2AB3, 0x3A92,
+   	0xFD2E, 0xED0F, 0xDD6C, 0xCD4D, 0xBDAA, 0xAD8B, 0x9DE8, 0x8DC9,
+   	0x7C26, 0x6C07, 0x5C64, 0x4C45, 0x3CA2, 0x2C83, 0x1CE0, 0x0CC1,
+   	0xEF1F, 0xFF3E, 0xCF5D, 0xDF7C, 0xAF9B, 0xBFBA, 0x8FD9, 0x9FF8,
+   	0x6E17, 0x7E36, 0x4E55, 0x5E74, 0x2E93, 0x3EB2, 0x0ED1, 0x1EF0
+   };
+   
+   unsigned short crc_ccitt(unsigned char *q, int len)
+   {
+   	unsigned short crc = 0;
+   
+   	while (len-- > 0)
+   		crc = ccitt_table[(crc >> 8 ^ *q++) & 0xff] ^ (crc << 8);
+   	return ~crc;
+   }
+
+*/
+
+
+/* Exploration ts B00214 :
+   ECMA-130, 14.3 "EDC field"
+   "The EDC field shall consist of 4 bytes recorded in positions 2064 to 2067.
+    The error detection code shall be a 32-bit CRC applied on bytes 0 to 2063.
+    The least significant bit of a data byte is used first. The EDC codeword
+    must be divisible by the check polynomial:
+       P(x) = (x^16 + x^15 + x^2 + 1) . (x^16 + x^2 + x + 1)   
+    The least significant parity bit (x^0) is stored in the most significant
+    bit position of byte 2067.
+   "
+
+   Used for raw writing in sector.c
+
+   
+   ts B20211:
+   Discussion why function crc_32() implements above prescription of ECMA-130.
+   See end of this file for the ofunction inherited with libburn-0.2.
+
+   The mentioned polynomial product 
+     (x^16 + x^15 + x^2 + 1) . (x^16 + x^2 + x + 1)
+   yields this sum of x exponents
+       32 31    18    16
+                18 17           4     2
+                   17 16           3     1
+                      16 15           2     0
+       ======================================
+       32 31          16 15     4  3     1  0
+   (The number of x^18 and x^17 is divisible by two and thus 0 in GF(2).)
+   This yields as 33 bit number:
+      0x18001801b
+
+   If above prescription gets implemented straight forward by function
+   crc_18001801b(), then its results match the ones of crc_32() with all test
+   strings which i could invent.
+
+   The function consists of a conventional polynomial division with reverse
+   input order of bits per byte.
+
+   Further it swaps the bits in the resulting 32 bit word. That is because
+   sector.c:sector_headers writes the 4 bytes of crc_32() as little endian.
+   The ECMA-130 prescription rather demands big endianness and bit swapping
+   towards the normal bit order in bytes:
+    "The EDC field shall consist of 4 bytes recorded in positions 2064 to 2067.
+     [...]
+     The least significant parity bit (x^0) is stored in the most
+     significant bit position of byte 2067."
+
+   -----------------------------------------------------------------------
+*/
+
+
+/* Overall bit mirroring of a 32 bit word */ 
+unsigned int rfl32(unsigned int acc)
+{
+	unsigned int inv_acc;
+	int i;
+
+	inv_acc = 0; 
+	for (i = 0; i < 32; i++)
+		if (acc & (1 << i))
+			inv_acc |= 1 << (31 - i);
+	return inv_acc;
+}
+
+
+/* Plain implementation of polynomial division on a Galois field, where
+   addition and subtraction both are binary exor. Euclidian algorithm.
+   Divisor is (x^16 + x^15 + x^2 + 1) * (x^16 + x^2 + x + 1).
+
+   This is about ten times slower than the table driven algorithm.
+
+   @param flag bit0= do not mirror bits in input bytes and result word
+                     (Useful for building the byte indexed CRC table)
+*/
+static unsigned int crc_18001801b(unsigned char *data, int count, int flag)
+{
+	unsigned int acc = 0, top;
+	long int i;
+	unsigned int inv_acc;
+
+	for (i = 0; i < count * 8 + 32; i++) {
+		top = acc & 0x80000000;
+		acc = (acc << 1);
+		if (i < count * 8) {
+			if (flag & 1)
+				/* Normal bit sequence of input bytes */
+				acc |= ((data[i / 8] >> (7 - (i % 8))) & 1);
+			else
+				/* Bit sequence of input bytes mirrored */
+				acc |= ((data[i / 8] >> (i % 8)) & 1);
+		}
+		if (top)
+			acc ^= 0x8001801b;
+	}
+
+	if (flag & 1)
+		return (unsigned int) (acc & 0xffffffff);
+
+	/* The bits of the whole 32 bit result are mirrored for ECMA-130
+	   output compliance and for sector.c habit to store CRC little endian
+	   although ECMA-130 prescribes it big endian.
+	*/
+	inv_acc = rfl32((unsigned int) acc);
+	return inv_acc;
+}
+
+
+/*
+   -----------------------------------------------------------------------
+
+   Above discussion why crc_ccitt() and crc_11021() yield identical results
+   can be changed from 16 bit to 32 bit by chosing h(a) and l(a) so that:
+     r(a) = h(a) * X * X * X + l(a)
+   h(a) corresponds to the highest byte of crc(A), whereas l(a) corresponds
+   to the lower three bytes of crc(A).
+
+   This yields
+      r(a * X + b)
+    = l(a) * X + r(h(a) * X * X * X * X + b)
+
+   h(a) * X * X * X * X is the polynomial representation of the high byte of
+   32 bit word crc(A).
+   So in the world of bit patterns we have:
+
+      crc(byte string A expanded by byte B)
+    = (lowest_three_bytes(crc(A)) << 8) ^ crc(high_byte(crc(A)) ^ B)
+
+
+   Regrettably this does not yet account for the byte-internal mirroring of
+   bits during the conversion from bit pattern to polynomial, and during
+   conversion from polynomial residue to bit pattern.
+   
+   Be rfl8(D) the result of byte-internal mirroring of bit pattern D,
+   and mirr8(d) its corresponding polynom.
+
+   Be now h(a) and l(a) chosen so that: r(mirr8(a)) = h(a) * X * X * X + l(a)
+   This corresponds to highest byte and lower three bytes of crc(A).
+
+      r(mirr8(a) * X + mirr8(b))
+    = r(h(a) * X * X * X * X) + r(l(a) * X) + r(mirr8(b))
+    = l(a)) * X + r(h(a) * X * X * X * X + mirr8(b))
+
+   The corresponding bit pattern operation is
+
+      crc(mirrored byte string A expanded by mirrored byte B)
+    = (lowest_three_bytes(crc(A)) << 8) ^ crc(high_byte(crc(A)) ^ rfl8(B))
+
+   This demands a final result mirroring to meet the ECMA-130 prescription.
+
+   rfl8() can be implemented as lookup table.
+
+   The start value of the bit shifting iteration is 0x00000000, which leads
+   to the same start value for the table driven byte shifting.
+
+   The following function crc32_by_tab() yields the same results as functions
+   crc_18001801b() and crc_32():
+
+   -----------------------------------------------------------------------
+*/
+
+
+/* Byte-internal bit mirroring function.
+*/
+unsigned int rfl8(unsigned int acc)
+{
+	unsigned int inv_acc;
+	int i, j;
+
+	inv_acc = 0;
+	for (j = 0; j < 4; j++)
+		for (i = 0; i < 8; i++)
+			if (acc & (1 << (i + 8 * j)))
+				inv_acc |= 1 << ((7 - i) + 8 * j);
+	return inv_acc;
+}
+
+
+#ifdef Libburn_with_crc_illustratioN
+/* Not needed for libburn. The new implementation of function crc_32() is the
+   one that is used.
+*/ 
+
+unsigned int crc32_by_tab(unsigned char *data, int count, int flag)
+{
+	static unsigned int crc_tab[256], tab_initialized = 0;
+	static unsigned char mirr_tab[256];
+	unsigned int acc, inv_acc;
+	unsigned char b[1];
+	int i;
+
+	if (!tab_initialized) {
+		for (i = 0; i < 256; i++) {
+			b[0] = i;
+			/* Create table of non-mirrored 0x18001801b residues */
+			crc_tab[i] = crc_18001801b(b, 1, 1);
+			/* Create table of mirrored byte values */
+			mirr_tab[i] = rfl8(i);
+		}
+		tab_initialized = 1;
+	}
+
+	acc = 0;
+	for (i = 0; i < count; i++)
+		acc = (acc << 8) ^ crc_tab[(acc >> 24) ^ mirr_tab[data[i]]];
+
+	/* The bits of the whole 32 bit result are mirrored for ECMA-130
+	   output compliance and for sector.c habit to store CRC little endian
+	   although ECMA-130 prescribes it big endian.
+	*/
+	inv_acc = rfl32((unsigned int) acc);
+	return inv_acc;
+}
+
+#endif /* Libburn_with_crc_illustratioN */
+
+
+/*
+   -----------------------------------------------------------------------
+
+   Above function yields sufficient performance, nevertheless the old function
+   crc_32() (see below) is faster by avoiding the additional mirror table
+   lookup.
+   A test with 10 times 650 MB on 3000 MHz amd64:
+     crc_18001801b  :  187 s
+     crc32_by_tab   :   27 s
+     crc_32         :   16 s
+
+   So how does crc_32() avoid the application of bit mirroring to B ?.
+
+   Inherited crc_32() performs
+		crc = crc32_table[(crc ^ *data++) & 0xffL] ^ (crc >> 8);
+
+   Above function crc32_by_tab() would be
+		crc = crc_tab[(crc >> 24) ^ mirr_tab[*data++]] ^ (crc << 8);
+
+   The shortcut does not change the polynomial representation of the algorithm
+   or the mapping from and to bit patterns. It only mirrors the bit direction
+   in the bytes and in the 32-bit words which are involved in the bit pattern
+   computation. This affects input (which is desired), intermediate state
+   (which is as good as unmirrored), and final output (which would be slightly
+   undesirable if libburn could not use the mirrored result anyway).
+   
+   Instead of the high byte (crc >> 24), the abbreviated algorithm uses
+   the low byte of the mirrored intermediate checksum (crc & 0xffL).
+   Instead of shifting the other three intermediate bytes to the left
+   (crc << 8), the abbreviated algorithm shifts them to the right (crc >> 8).
+   In both cases they overwrite the single byte that was used for computing
+   the table index.
+
+   The byte indexed table of CRC values needs to hold mirrored 32 bit values.
+   The byte index [(crc ^ *data++) & 0xffL] would need to be mirrored, which
+   would eat up the gain of not mirroring the input bytes. But this mirroring
+   can be pre-computed into the table by exchanging each value with the value
+   of its mirrored index.
+   
+   So this relation exists between the CRC table crc_tab[] of crc32_by_tab()
+   and the table crc32_table[] of the abbreviated algorithm crc_32():
+
+     crc_tab[i] == rfl32(crc32_table[rfl8(i)])
+
+   for i={0..255}. 
+
+   I compared the generated table in crc32_by_tab() by this test
+                for (i = 0; i < 256; i++) {
+                        if (rfl32(crc_tab[rfl8(i)]) != crc32_table[i] ||
+                            crc_tab[i] != rfl32(crc32_table[rfl8(i)])) {
+                                printf("DEVIATION : i = %d\n", i);
+                                exit(1);
+                        }
+                }
+   No screaming abort happened.
+
+   -----------------------------------------------------------------------
+*/
+
+/* This is my own mirrored table implementation for which i claim copyright.
+   With gcc -O2 it shows the same efficiency as the inherited implementation
+   below. With -O3, -O1, or -O0 it is only slightly slower.
+
+   Copyright (c) 2012 Thomas Schmitt <scdbackup@gmx.net>
+*/
+unsigned int crc_32(unsigned char *data, int count)
+{
+	static unsigned int crc_tab[256], tab_initialized = 0;
+	unsigned int acc = 0;
+	unsigned char b[1];
+	int i;
+
+	if (!tab_initialized) {
+		/* Create table of mirrored 0x18001801b residues in
+		   bit-mirrored index positions.
+		*/
+		for (i = 0; i < 256; i++) {
+			b[0] = i;
+			crc_tab[rfl8(i)] = rfl32(crc_18001801b(b, 1, 1));
+		}
+		tab_initialized = 1;
+	}
+	for (i = 0; i < count; i++)
+		acc = (acc >> 8) ^ crc_tab[(acc & 0xff) ^ data[i]];
+
+	/* The bits of the whole 32 bit result stay mirrored for ECMA-130
+	   output 8-bit mirroring and for sector.c habit to store the CRC
+	   little endian although ECMA-130 prescribes it big endian.
+	*/
+	return acc;
+}
+
+
+/*
+   -----------------------------------------------------------------------
+
+   This was the function inherited with libburn-0.2 which implements the
+   abbreviated algorithm. Its obscure existence led me to above insights.
+   My compliments to the (unknown) people who invented this.
+
+   unsigned long crc32_table[256] = {
 	0x00000000L, 0x90910101L, 0x91210201L, 0x01B00300L,
 	0x92410401L, 0x02D00500L, 0x03600600L, 0x93F10701L,
 	0x94810801L, 0x04100900L, 0x05A00A00L, 0x95310B01L,
@@ -106,44 +627,16 @@ unsigned long crc32_table[256] = {
 	0xE541F401L, 0x75D0F500L, 0x7460F600L, 0xE4F1F701L,
 	0xE381F801L, 0x7310F900L, 0x72A0FA00L, 0xE231FB01L,
 	0x71C0FC00L, 0xE151FD01L, 0xE0E1FE01L, 0x7070FF00L
-};
+   };
 
-
-/* Exploration ts B00214 :
-   ECMA-130, 22.3.6 "CRC field"
-   Generating polynomial: x^16 + x^12 + x^5 + 1
-   Also known as CRC-16-CCITT, CRC-CCITT 
-
-   Use in libburn for raw write modes in sector.c.
-   There is also disabled code in read.c which would use it.
-*/
-unsigned short crc_ccitt(unsigned char *q, int len)
-{
-	unsigned short crc = 0;
-
-	while (len-- > 0)
-		crc = ccitt_table[(crc >> 8 ^ *q++) & 0xff] ^ (crc << 8);
-	return ~crc;
-}
-
-
-/* Exploration ts B00214 :
-   ECMA-130, 14.3 "EDC field"
-   "The EDC codeword must be divisible by the check polynomial:
-    P(x) = (x^16 + x^15 + x^2 + 1) . (x^16 + x^2 + x + 1)   
-   "
-
-   >>> Test whether this coincides with CRC-32 IEEE 802.3
-   x^32 + x^26 + x^23 + x^22 + x^16 + x^12 + x^11 + x^10
-   + x^8 + x^7 + x^5 + x^4 + x^2 + x + 1
-
-   Used for raw writing in sector.c
-*/
-unsigned int crc_32(unsigned char *data, int len)
-{
+   unsigned int crc_32(unsigned char *data, int len)
+   {
 	unsigned int crc = 0;
 
 	while (len-- > 0)
 		crc = crc32_table[(crc ^ *data++) & 0xffL] ^ (crc >> 8);
 	return crc;
-}
+   }
+*/ 
+
+

libburn/crc.h

@@ -1,11 +1,21 @@
 /* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */
 
+/* Copyright (c) 2004 - 2006 Derek Foreman, Ben Jansens
+   Copyright (c) 2012 Thomas Schmitt <scdbackup@gmx.net>
+   Provided under GPL version 2 or later.
+*/
 #ifndef BURN__CRC_H
 #define BURN__CRC_H
 
 
 #ifdef Xorriso_standalonE
 /* Source module crc.c of yet unclear ancestry is excluded from GNU xorriso */
+/* ts B20219 : The functions have been re-implemented from scratch after
+               studying texts about CRC computation and understanding the
+               meaning of the underlying ECMA-130 specs.
+               Nevertheless, there is no need to include them into xorriso
+               because it does neither CD-TEXT nor raw CD writing.
+*/
 #ifndef Libburn_no_crc_C
 #define Libburn_no_crc_C 1
 #endif

libburn/debug.c

@@ -25,20 +25,4 @@ void burn_set_verbosity(int v)
 	burn_verbosity = v;
 }
 
-void burn_print(int level, const char *a, ...)
-{
-#ifdef WIN32
-	char debug_string_data[256];
-#endif
-	va_list vl;
 
-	if (level <= burn_verbosity) {
-		va_start(vl, a);
-#ifdef WIN32
-		vsprintf(debug_string_data, a, vl);
-		OutputDebugString(debug_string_data);
-#else
-		vfprintf(stderr, a, vl);
-#endif
-	}
-}

libburn/drive.h

@@ -1,7 +1,7 @@
 /* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */
 
 /* Copyright (c) 2004 - 2006 Derek Foreman, Ben Jansens
-   Copyright (c) 2006 - 2010 Thomas Schmitt <scdbackup@gmx.net>
+   Copyright (c) 2006 - 2014 Thomas Schmitt <scdbackup@gmx.net>
    Provided under GPL version 2 or later.
 */
 
@@ -19,6 +19,7 @@ struct command;
 struct mempage;
 struct scsi_mode_data;
 struct burn_speed_descriptor;
+struct burn_feature_descr;
 
 #define LEAD_IN 1
 #define GAP 2
@@ -85,7 +86,7 @@ struct burn_drive *burn_drive_finish_enum(struct burn_drive *d);
 int burn_drive_inquire_media(struct burn_drive *d);
 
 /* ts A61125 : model aspects of burn_drive_release */
-int burn_drive_mark_unready(struct burn_drive *d);
+int burn_drive_mark_unready(struct burn_drive *d, int flag);
 
 
 /* ts A61226 */
@@ -151,4 +152,22 @@ int burn_abort_5(int patience,
                int (*pacifier_func)(void *handle, int patience, int elapsed),
                void *handle, int elapsed, int flag);
 
+/* ts B10730 */
+/* Send a default mode page 05 to CD and DVD-R-oids */
+int burn_drive_send_default_page_05(struct burn_drive *d, int flag);
+
+
+/* ts B40106 */
+int burn_feature_descr_new(struct burn_feature_descr **new,
+                           unsigned char *descr, int descr_len, int flag);
+
+/* ts B40106 */
+int burn_feature_descr_free(struct burn_feature_descr **new, int flag);
+
+/* ts B40107 */
+int burn_drive_has_feature(struct burn_drive *d, int feature_code,
+                           struct burn_feature_descr **descr, int flag);
+
+int burn_drive_grab_stdio(struct burn_drive *d, int flag);
+
 #endif /* __DRIVE */

libburn/file.c

@@ -26,6 +26,8 @@
 #include "libburn.h"
 #include "file.h"
 #include "async.h"
+#include "init.h"
+#include "util.h"
 
 #include "libdax_msgs.h"
 extern struct libdax_msgs *libdax_messenger;
@@ -175,7 +177,7 @@ struct burn_source *burn_fd_source_new(int datafd, int subfd, off_t size)
 
 	if (datafd == -1)
 		return NULL;
-	fs = calloc(1, sizeof(struct burn_source_file));
+	fs = burn_alloc_mem(sizeof(struct burn_source_file), 1, 0);
 	if (fs == NULL) /* ts A70825 */
 		return NULL;
 	fs->datafd = datafd;
@@ -510,7 +512,7 @@ struct burn_source *burn_fifo_source_new(struct burn_source *inp,
 				"Desired fifo buffer too small", 0, 0);
 		return NULL;
 	}
-	fs = calloc(1, sizeof(struct burn_source_fifo));
+	fs = burn_alloc_mem(sizeof(struct burn_source_fifo), 1, 0);
 	if (fs == NULL)
 		return NULL;
 	fs->is_started = 0;
@@ -625,7 +627,9 @@ void burn_fifo_next_interval(struct burn_source *source,
 
 	*interval_min_fill = fs->interval_min_fill;
 	ret = burn_fifo_inquire_status(source,
-					 &size, &free_bytes, &status_text);	
+					 &size, &free_bytes, &status_text);
+	if (ret < 0)
+		return;
 	fs->interval_min_fill = size - free_bytes - 1;
 }
 
@@ -755,9 +759,12 @@ int burn_fifo_fill(struct burn_source *source, int bufsize, int flag)
 
 static void offst_free(struct burn_source *source);
 
-static struct burn_source_offst *offst_auth(struct burn_source *source)
+/* @param flag bit0 = do not check for burn_source_offst, do not return NULL
+*/
+static struct burn_source_offst *offst_auth(struct burn_source *source,
+								int flag)
 {
-	if (source->free_data != offst_free) {
+	if (source->free_data != offst_free && !(flag & 1)) {
 		libdax_msgs_submit(libdax_messenger, -1, 0x0002017a,
 			LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
  			"Expected offset source object as parameter",
@@ -771,18 +778,21 @@ static off_t offst_get_size(struct burn_source *source)
 {
         struct burn_source_offst *fs;
 
-	if ((fs = offst_auth(source)) == NULL)
+	if ((fs = offst_auth(source, 0)) == NULL)
 		return (off_t) 0;
-        return fs->size;
+        return fs->nominal_size;
 }
 
 static int offst_set_size(struct burn_source *source, off_t size)
 {
 	struct burn_source_offst *fs;
 
-	if ((fs = offst_auth(source)) == NULL)
+	if ((fs = offst_auth(source, 0)) == NULL)
 		return 0;
-	fs->size = size;
+
+	fs->nominal_size = size;
+	if (fs->size <= 0 || fs->size_adjustable)
+		fs->size = size;
 	return 1;
 }
 
@@ -790,12 +800,12 @@ static void offst_free(struct burn_source *source)
 {
 	struct burn_source_offst *fs;
 
-	if ((fs = offst_auth(source)) == NULL)
+	if ((fs = offst_auth(source, 0)) == NULL)
 		return;
 	if (fs->prev != NULL)
-		offst_auth(fs->prev)->next = fs->next;
+		offst_auth(fs->prev, 1)->next = fs->next;
 	if (fs->next != NULL)
-		offst_auth(fs->next)->prev = fs->prev;
+		offst_auth(fs->next, 1)->prev = fs->prev;
 	if (fs->inp != NULL)
 		burn_source_free(fs->inp); /* i.e. decrement refcount */
 	free(source->data);
@@ -807,13 +817,13 @@ static int offst_read(struct burn_source *source, unsigned char *buffer,
 	int ret, to_read, todo;
 	struct burn_source_offst *fs;
 
-	if ((fs = offst_auth(source)) == NULL)
+	if ((fs = offst_auth(source, 0)) == NULL)
 		return -1;
 
 	/* Eventually skip bytes up to start position */;
 	if (!fs->running) {
 		if (fs->prev != NULL)
-			fs->pos = offst_auth(fs->prev)->pos;
+			fs->pos = offst_auth(fs->prev, 1)->pos;
 		fs->running= 1;
 	}
 	if(fs->pos < fs->start) {
@@ -848,7 +858,7 @@ static int offst_cancel(struct burn_source *source)
 	int ret;
 	struct burn_source_offst *fs;
 
-	if ((fs = offst_auth(source)) == NULL)
+	if ((fs = offst_auth(source, 0)) == NULL)
 		return -1;
 	ret = burn_source_cancel(fs->inp);
 	return ret;
@@ -862,7 +872,7 @@ struct burn_source *burn_offst_source_new(
 	struct burn_source_offst *fs, *prev_fs = NULL;
 
 	if (prev != NULL)
-		if ((prev_fs = offst_auth(prev)) == NULL)
+		if ((prev_fs = offst_auth(prev, 0)) == NULL)
 			return NULL; /* Not type burn_source_offst */
 
 	fs = calloc(1, sizeof(struct burn_source_offst));
@@ -887,7 +897,7 @@ struct burn_source *burn_offst_source_new(
 	fs->next = NULL;
 	if (prev != NULL) {
 		if (prev_fs->next != NULL) {
-			offst_auth(prev_fs->next)->prev = src;
+			offst_auth(prev_fs->next, 1)->prev = src;
 			fs->next = prev_fs->next;
 		}
 		prev_fs->next = src;
@@ -901,6 +911,8 @@ struct burn_source *burn_offst_source_new(
 	}
 	fs->start = start;
 	fs->size = size;
+	fs->size_adjustable = !(flag & 1);
+	fs->nominal_size = size;
 	fs->running = 0;
 	fs->pos = 0;
         inp->refcount++; /* make sure inp lives longer than src */
@@ -908,3 +920,159 @@ struct burn_source *burn_offst_source_new(
         return src;
 }
 
+
+/* -------------------- WAVE file extractor ------------------- */
+
+
+/* ts B30522 */
+/* API
+    @param flag         Bitfield for control purposes:
+                        bit0= Report about progress by UPDATE message
+                        bit3= Enable DAP : "flaw obscuring mechanisms like
+                                            audio data mute and interpolate"
+
+*/
+int burn_drive_extract_audio(struct burn_drive *drive,
+                             int start_sector, int sector_count,
+                             char *target_path, int flag)
+{
+	int fd = -1, ret, todo, sector_no, val, min, sec, fr;
+	int sectors_done= 0;
+	off_t data_size, data_count = 0;
+	time_t last_pacified = 0, now;
+	char *msg = NULL, *buf = NULL;
+
+	BURN_ALLOC_MEM(msg, char, 4096);
+	BURN_ALLOC_MEM(buf, char, 24 * 2352);
+
+	fd = open(target_path, O_WRONLY | O_CREAT,
+                  S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
+	if (fd == -1) {
+		sprintf(msg, "Cannot open disk file for writing: %.4000s",
+				target_path);
+		libdax_msgs_submit(libdax_messenger, -1, 0x000201a1,
+				LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
+				msg, errno, 0);
+		ret = 0; goto ex;
+	}
+
+	/* WAV header */
+	strcpy(buf, "RIFF");
+	val = 4 + 8 + 16 + 8 + sector_count * 2352; /* ChunkSize */
+	burn_int_to_lsb(val, buf + 4);
+	strcpy(buf + 8, "WAVE");
+	strcpy(buf + 12, "fmt ");
+	burn_int_to_lsb(16, buf + 16);     /* Subchunk1Size */
+	buf[20] = 1;                       /* AudioFormat */
+	buf[21] = 0;
+	buf[22] = 2;                       /* NumChannels */
+	buf[23] = 0;
+	burn_int_to_lsb(44100, buf + 24);  /* SampleRate */
+	burn_int_to_lsb(176400, buf + 28); /* ByteRate */
+	buf[32] = 4;                       /* BlockAlign */
+	buf[33] = 0;
+	buf[34] = 16;                      /* BitsPerSample */
+	buf[35] = 0;
+	strcpy(buf + 36, "data");
+	burn_int_to_lsb(sector_count * 2352, buf + 40); /* Subchunk2Size */
+
+	ret = write(fd, buf, 44);
+	if (ret == -1)
+		goto write_error;
+
+	/* Audio data */
+	todo = sector_count;
+	sector_no = start_sector;
+	while (todo > 0) {
+		if (todo > 24)
+			data_size = 24 * 2352;
+		else
+			data_size = todo * 2352;
+		ret = burn_read_audio(drive, sector_no, buf, data_size,
+						&data_count, flag & 8);
+		if (ret <= 0) {
+			sprintf(msg, "Failure to read audio sectors");
+			libdax_msgs_submit(libdax_messenger, -1, 0x000201a4,
+				LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
+				msg, 0, 0);
+			goto ex;
+		}
+		ret = write(fd, buf, data_count);
+		if (ret == -1) {
+write_error:;
+			sprintf(msg,
+				"Error while writing to disk file: %.4000s",
+				target_path);
+			libdax_msgs_submit(libdax_messenger, -1, 0x000201a2,
+						LIBDAX_MSGS_SEV_FAILURE,
+						LIBDAX_MSGS_PRIO_HIGH,
+						msg, errno, 0);
+			ret = 0; goto ex;
+		}
+		todo -= data_count / 2352;
+		sectors_done += data_count / 2352;
+		sector_no += data_count / 2352;
+		if ((flag & 1) && (now = time(NULL)) - last_pacified >= 1) {
+			last_pacified = now;
+			burn_lba_to_msf(sectors_done, &min, &sec, &fr);
+			sprintf(msg,
+		   "Minutes:seconds of audio data read: %2d:%2.2d  (%6.2f MB)",
+			   min, sec,
+			   ((double) sectors_done) * 2352.0 / 1048576.0);
+			libdax_msgs_submit(libdax_messenger, -1, 0x000201a3,
+						LIBDAX_MSGS_SEV_UPDATE,
+						LIBDAX_MSGS_PRIO_HIGH,
+						msg, 0, 1);
+		}
+	}
+	if ((flag & 1)) {
+		burn_lba_to_msf(sectors_done, &min, &sec, &fr);
+		sprintf(msg,
+		  "Minutes:seconds of audio data read: %2d:%2.2d  (%6.2f MB)",
+		   min, sec, ((double) sectors_done) * 2352.0 / 1048576.0);
+		libdax_msgs_submit(libdax_messenger, -1, 0x000201a3,
+					LIBDAX_MSGS_SEV_UPDATE,
+					LIBDAX_MSGS_PRIO_HIGH,
+					msg, 0, 0);
+	}
+	ret = 1;
+ex:;
+	BURN_FREE_MEM(buf);
+	BURN_FREE_MEM(msg);
+	if (fd != -1)
+		close(fd);
+	return ret;
+}
+
+
+/* ts B30522 */
+/* API
+    @param flag         Bitfield for control purposes:
+                        bit0= Report about progress by UPDATE message
+                        bit3= Enable DAP : "flaw obscuring mechanisms like
+                                            audio data mute and interpolate"
+*/
+int burn_drive_extract_audio_track(struct burn_drive *drive,
+                                   struct burn_track *track,
+                                   char *target_path, int flag)
+{
+	int ret;
+	struct burn_toc_entry toc_entry;
+
+	burn_track_get_entry(track, &toc_entry);
+	if (!(toc_entry.extensions_valid & 1)) {
+		/* Can only happen if burn_disc_cd_toc_extensions() is skipped
+		   in mmc_read_toc_al().
+		*/
+		libdax_msgs_submit(libdax_messenger, -1, 0x00000004,
+				LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
+	  "Internal libburn error: Outdated burn_toc_entry format encountered",
+				errno, 0);
+		return -1;
+	}
+	ret = burn_drive_extract_audio(drive, toc_entry.start_lba,
+					toc_entry.track_blocks,
+					target_path, flag & (1 | 8));
+	return ret;
+}
+

libburn/file.h

@@ -82,6 +82,10 @@ struct burn_source_offst {
 	struct burn_source *prev;
 	off_t start;
 	off_t size;
+	int size_adjustable;
+
+	/* for set_size/get_size */
+	int nominal_size;
 
 	/* To help offst_free() */
 	struct burn_source *next;

libburn/init.c

@@ -1,7 +1,7 @@
 /* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */
 
 /* Copyright (c) 2004 - 2006 Derek Foreman, Ben Jansens
-   Copyright (c) 2006 - 2011 Thomas Schmitt <scdbackup@gmx.net>
+   Copyright (c) 2006 - 2013 Thomas Schmitt <scdbackup@gmx.net>
    Provided under GPL version 2 or later.
 */
 
@@ -31,6 +31,7 @@
 #include "libburn.h"
 #include "drive.h"
 #include "transport.h"
+#include "util.h"
 
 /* ts A60825 : The storage location for back_hacks.h variables. */
 #define BURN_BACK_HACKS_INIT 1
@@ -43,6 +44,9 @@ struct libdax_msgs *libdax_messenger= NULL;
 
 int burn_running = 0;
 
+double lib_start_time;
+
+
 /* ts A60813 : GNU/Linux: whether to use O_EXCL on open() of device files
    ts B00212 : FreeBSD:   whether to use flock(LOCK_EX) after open()
 */
@@ -136,6 +140,8 @@ int burn_initialize(void)
 
 	if (burn_running)
 		return 1;
+
+	lib_start_time = burn_get_time(0);
 	burn_support_untested_profiles = 0;
 	ret = burn_msgs_initialize();
 	if (ret <= 0)
@@ -347,6 +353,17 @@ int burn_sev_to_text(int severity_number, char **severity_name, int flag)
 	return ret;
 }
 
+
+/* ts B21214 API */
+char *burn_list_sev_texts(int flag)
+{
+ char *sev_list;
+
+ libdax_msgs__sev_to_text(0, &sev_list, 1);
+ return sev_list;
+}
+
+
 /* ts B00224 */
 char *burn_util_thread_id(pid_t pid, pthread_t tid, char text[80])
 {
@@ -362,6 +379,23 @@ char *burn_util_thread_id(pid_t pid, pthread_t tid, char text[80])
 	return text;
 }
 
+
+/* ts B20122 */
+/* @param value 0=return rather than exit(value)
+*/
+int burn_abort_exit(int value)
+{
+	burn_abort(4440, burn_abort_pacifier, abort_message_prefix);
+	fprintf(stderr,
+	"\n%sABORT : Program done. Even if you do not see a shell prompt.\n\n",
+		abort_message_prefix);
+	if (value)
+		exit(value);
+	burn_global_abort_level = -2;
+	return(1);
+}
+
+
 int burn_builtin_abort_handler(void *handle, int signum, int flag)
 {
 
@@ -476,13 +510,9 @@ int burn_builtin_abort_handler(void *handle, int signum, int flag)
 		"%sABORT : Wait the normal burning time before any kill -9\n",
 		abort_message_prefix);
 	close(0); /* somehow stdin as input blocks abort until EOF */
-	burn_abort(4440, burn_abort_pacifier, abort_message_prefix);
 
-	fprintf(stderr,
-	"\n%sABORT : Program done. Even if you do not see a shell prompt.\n\n",
-		abort_message_prefix);
-	burn_global_abort_level = -2;
-	return(1);
+	burn_abort_exit(0);
+	return (1);
 }
 
 
@@ -519,7 +549,7 @@ void burn_set_signal_handling(void *handle, burn_abort_handler_t handler,
 	if(burn_builtin_signal_action == 0)
 		burn_builtin_signal_action = 1;
 	Cleanup_set_handlers(handle, (Cleanup_app_handler_T) handler,
-				 (mode & 15) | 4);
+				 (mode & 15) | 4 | (mode & 256));
 	burn_global_signal_handle = handle;
 	burn_global_signal_handler = handler;
 }
@@ -550,6 +580,41 @@ int burn_init_catch_on_abort(int flag)
 }
 
 
+/* B20122 */
+/* Temporarily disable builtin actions 0,1,2 to avoid that burn_abort()
+   waits for its own thread to end grabbing.
+*/
+int burn_grab_prepare_sig_action(int *signal_action_mem, int flag)
+{
+	*signal_action_mem = -1;
+	if (burn_global_signal_handler == burn_builtin_abort_handler &&
+	    burn_builtin_signal_action >= 0 &&
+	    burn_builtin_signal_action <= 2) {
+		*signal_action_mem = burn_builtin_signal_action;
+		burn_builtin_signal_action = 3;
+	}
+	return 1;
+}
+
+
+/* B20122 */
+/* Re-enable builtin actions 0,1,2 and perform delayed signal reactions
+*/
+int burn_grab_restore_sig_action(int signal_action_mem, int flag)
+{
+	if (signal_action_mem >= 0)
+		burn_builtin_signal_action = signal_action_mem;
+	if (burn_is_aborting(0) && signal_action_mem >= 0) {
+		if (signal_action_mem == 0 || signal_action_mem == 1) {
+			burn_abort_exit(1); /* Never comes back */
+		} else if (signal_action_mem == 2) {
+			burn_builtin_triggered_action = signal_action_mem;
+		}
+	}
+	return 1;
+}
+
+
 /* ts A70223 : API */
 void burn_allow_untested_profiles(int yes)
 {
@@ -589,7 +654,7 @@ void *burn_alloc_mem(size_t size, size_t count, int flag)
 {
 	void *pt;
 
-	pt = calloc(size, count);
+	pt = calloc(count, size);
 	if(pt == NULL)
 		libdax_msgs_submit(libdax_messenger, -1, 0x00000003,
 				LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,

libburn/init.h

@@ -1,10 +1,17 @@
 /* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */
 
+/* Copyright (c) 2004 - 2006 Derek Foreman, Ben Jansens
+   Copyright (c) 2006 - 2013 Thomas Schmitt <scdbackup@gmx.net>
+   Provided under GPL version 2 or later.
+*/
+
 #ifndef BURN__INIT_H
 #define BURN__INIT_H
 
 extern int burn_running;
 
+extern double lib_start_time;
+
 /** Indicator for burn_drive_get_status() wether a signal hit parts of the
     thread team. 
     0= all works well ,
@@ -36,10 +43,21 @@ void *burn_alloc_mem(size_t size, size_t count, int flag);
 		ret= -1; goto ex; \
 	} }
 
+#define BURN_ALLOC_MEM_VOID(pt, typ, count) { \
+	pt= (typ *) burn_alloc_mem(sizeof(typ), (size_t) (count), 0); \
+	if(pt == NULL) { \
+		goto ex; \
+	} }
+
 #define BURN_FREE_MEM(pt) { \
 	if(pt != NULL) \
 		free((char *) pt); \
 	}
 
 
+/* B20122 */
+int burn_grab_prepare_sig_action(int *signal_action_mem, int flag);
+int burn_grab_restore_sig_action(int signal_action_mem, int flag);
+
+
 #endif /* BURN__INIT_H */

libburn/libburn.ver

@@ -4,6 +4,8 @@ burn_abort;
 burn_abort_pacifier;
 burn_allow_drive_role_4;
 burn_allow_untested_profiles;
+burn_cdtext_from_session;
+burn_cdtext_from_packfile;
 burn_disc_add_session;
 burn_disc_available_space;
 burn_disc_close_damaged;
@@ -17,9 +19,12 @@ burn_disc_get_bd_spare_info;
 burn_disc_get_cd_info;
 burn_disc_get_format_descr;
 burn_disc_get_formats;
+burn_disc_get_incomplete_sessions;
+burn_disc_get_leadin_text;
 burn_disc_get_media_id;
 burn_disc_get_msc1;
 burn_disc_get_multi_caps;
+burn_disc_get_phys_format_info;
 burn_disc_get_profile;
 burn_disc_get_sectors;
 burn_disc_get_sessions;
@@ -27,6 +32,7 @@ burn_disc_get_status;
 burn_disc_next_track_is_damaged;
 burn_disc_pretend_blank;
 burn_disc_pretend_full;
+burn_disc_pretend_full_uncond;
 burn_disc_read;
 burn_disc_read_atip;
 burn_disc_remove_session;
@@ -39,6 +45,8 @@ burn_drive_convert_fs_adr;
 burn_drive_convert_scsi_adr;
 burn_drive_d_get_adr;
 burn_drive_equals_adr;
+burn_drive_extract_audio;
+burn_drive_extract_audio_track;
 burn_drive_free_speedlist;
 burn_drive_get_adr;
 burn_drive_get_all_profiles;
@@ -58,6 +66,7 @@ burn_drive_is_enumerable_adr;
 burn_drive_leave_locked;
 burn_drive_obtain_scsi_adr;
 burn_drive_probe_cd_write_modes;
+burn_drive_re_assess;
 burn_drive_release;
 burn_drive_scan;
 burn_drive_scan_and_grab;
@@ -65,6 +74,7 @@ burn_drive_set_buffer_waiting;
 burn_drive_set_speed;
 burn_drive_set_stream_recording;
 burn_drive_snooze;
+burn_drive_was_feat21_failure;
 burn_drive_wrote_well;
 burn_fd_source_new;
 burn_fifo_fill;
@@ -81,6 +91,9 @@ burn_guess_manufacturer;
 burn_initialize;
 burn_is_aborting;
 burn_lba_to_msf;
+burn_list_sev_texts;
+burn_lookup_device_link;
+burn_make_input_sheet_v07t;
 burn_msf_to_lba;
 burn_msf_to_sectors;
 burn_msgs_obtain;
@@ -94,6 +107,7 @@ burn_os_open_track_src;
 burn_precheck_write;
 burn_preset_device_open;
 burn_random_access_write;
+burn_read_audio;
 burn_read_data;
 burn_read_opts_free;
 burn_read_opts_new;
@@ -108,14 +122,23 @@ burn_read_opts_transfer_damaged_blocks;
 burn_scsi_transport_id;
 burn_sectors_to_msf;
 burn_session_add_track;
+burn_session_by_cue_file;
 burn_session_create;
+burn_session_dispose_cdtext;
 burn_session_free;
+burn_session_get_cdtext;
+burn_session_get_cdtext_par;
 burn_session_get_hidefirst;
 burn_session_get_leadout_entry;
 burn_session_get_sectors;
+burn_session_get_start_tno;
 burn_session_get_tracks;
 burn_session_hide_first_track;
+burn_session_input_sheet_v07t;
 burn_session_remove_track;
+burn_session_set_cdtext;
+burn_session_set_cdtext_par;
+burn_session_set_start_tno;
 burn_set_messenger;
 burn_set_scsi_logging;
 burn_set_signal_handling;
@@ -126,18 +149,26 @@ burn_structure_print_disc;
 burn_structure_print_session;
 burn_structure_print_track;
 burn_text_to_sev;
+burn_track_clear_indice;
 burn_track_clear_isrc;
 burn_track_create;
 burn_track_define_data;
+burn_track_dispose_cdtext;
 burn_track_free;
+burn_track_get_cdtext;
 burn_track_get_counters;
 burn_track_get_entry;
 burn_track_get_mode;
 burn_track_get_sectors;
 burn_track_set_byte_swap;
 burn_track_set_cdxa_conv;
+burn_track_set_cdtext;
 burn_track_set_default_size;
+burn_track_set_index;
 burn_track_set_isrc;
+burn_track_set_isrc_string;
+burn_track_set_postgap_size;
+burn_track_set_pregap_size;
 burn_track_set_size;
 burn_track_set_source;
 burn_version;
@@ -146,12 +177,15 @@ burn_write_opts_free;
 burn_write_opts_get_drive;
 burn_write_opts_new;
 burn_write_opts_set_dvd_obs;
+burn_write_opts_set_fail21h_sev;
 burn_write_opts_set_fillup;
 burn_write_opts_set_force;
 burn_write_opts_set_format;
 burn_write_opts_set_has_mediacatalog;
+burn_write_opts_set_leadin_text;
 burn_write_opts_set_mediacatalog;
 burn_write_opts_set_multi;
+burn_write_opts_set_obs_pad;
 burn_write_opts_set_perform_opc;
 burn_write_opts_set_simulate;
 burn_write_opts_set_start_byte;

libburn/libdax_msgs.c

@@ -289,7 +289,7 @@ int libdax_msgs__sev_to_text(int severity, char **severity_name,
                              int flag)
 {
  if(flag&1) {
-   *severity_name= "NEVER\nABORT\nFATAL\nFAILURE\nMISHAP\nSORRY\nWARNING\nHINT\nNOTE\nUPDATE\nDEBUG\nERRFILE\nALL";
+   *severity_name= "ALL ERRFILE DEBUG UPDATE NOTE HINT WARNING SORRY MISHAP FAILURE FATAL ABORT NEVER";
    return(1);
  }
  *severity_name= "";
@@ -327,6 +327,11 @@ int libdax_msgs__sev_to_text(int severity, char **severity_name,
 }
 
 
+/*
+    @param flag Bitfield for control purposes
+                    bit0= If direct output to stderr:
+                          CarriageReturn rather than LineFeed
+*/
 int libdax_msgs_submit(struct libdax_msgs *m, int origin, int error_code,
                        int severity, int priority, char *msg_text,
                        int os_errno, int flag)
@@ -345,7 +350,8 @@ int libdax_msgs_submit(struct libdax_msgs *m, int origin, int error_code,
    if(ret>0)
      sprintf(sev_text,"%s : ",sev_name);
 
-   fprintf(stderr,"%s%s%s\n",m->print_id,sev_text,textpt);
+   fprintf(stderr, "%s%s%s%c", m->print_id, sev_text, textpt,
+                               (flag & 1) ? '\r' : '\n');
    if(os_errno!=0) {
      ret= libdax_msgs_lock(m,0);
      if(ret<=0)

libburn/libdax_msgs.h

@@ -1,6 +1,6 @@
 
 /* libdax_msgs
-   Message handling facility of libdax.
+   Message handling facility of libburn and libisofs.
    Copyright (C) 2006-2011 Thomas Schmitt <scdbackup@gmx.net>,
    provided under GPL version 2 or later.
 */
@@ -302,7 +302,9 @@ int libdax_msgs_refer(struct libdax_msgs **pt, struct libdax_msgs *o, int flag);
     @param priority The LIBDAX_MSGS_PRIO_* number of the event.
     @param msg_text Printable and human readable message text.
     @param os_errno Eventual error code from operating system (0 if none)
-    @param flag Bitfield for control purposes (unused yet, submit 0)
+    @param flag Bitfield for control purposes
+                    bit0= If direct output to stderr:
+                          CarriageReturn rather than LineFeed
     @return 1 on success, 0 on rejection, <0 for severe errors
 */
 int libdax_msgs_submit(struct libdax_msgs *m, int origin, int error_code,
@@ -316,7 +318,7 @@ int libdax_msgs_submit(struct libdax_msgs *m, int origin, int error_code,
 
 /** Convert a registered severity number into a severity name
     @param flag Bitfield for control purposes:
-      bit0= list all severity names in a newline separated string
+      bit0= list all severity names in a blank separated string
     @return >0 success, <=0 failure
 */
 int libdax_msgs__sev_to_text(int severity, char **severity_name,
@@ -411,6 +413,7 @@ Range "libdax_msgs"        :  0x00000000 to 0x0000ffff
  0x00000001 (DEBUG,ZERO)   = Test error message
  0x00000002 (DEBUG,ZERO)   = Debugging message
  0x00000003 (FATAL,HIGH)   = Out of virtual memory
+ 0x00000004 (FATAL,HIGH)   = Generic fatal error
 
 
 ------------------------------------------------------------------------------
@@ -436,6 +439,7 @@ Range "scdbackup"          :  0x00020000 to 0x0002ffff
  0x0002000b (FAILURE,HIGH) = File object '...' not found
  0x0002000c (FAILURE,HIGH) = Cannot start device file enumeration
  0x0002000d (FAILURE,HIGH) = Cannot enumerate next device
+ 0x0002000e (NOTE,HIGH)    = Failed to open device during 
            
  General library operations:
 
@@ -473,7 +477,7 @@ Range "scdbackup"          :  0x00020000 to 0x0002ffff
  0x0002011f (SORRY,HIGH)   = Burning is restricted to a single track
  0x00020120 (NOTE,HIGH)    = FORMAT UNIT ignored
  0x00020121 (FATAL,HIGH)   = Write preparation setup failed
- 0x00020122 (FATAL,HIGH)   = SCSI error on format_unit
+ 0x00020122 (FAILURE,HIGH) = SCSI error on format_unit
  0x00020123 (SORRY,HIGH)   = DVD Media are unsuitable for desired track type
  0x00020124 (SORRY,HIGH)   = SCSI error on set_streaming
  0x00020125 (SORRY,HIGH)   = Write start address not supported
@@ -516,8 +520,8 @@ Range "scdbackup"          :  0x00020000 to 0x0002ffff
  0x0002014a (SORRY,HIGH)   = Cannot read desired amount of data
  0x0002014b (SORRY,HIGH)   = Drive is already registered resp. scanned
  0x0002014c (FATAL,HIGH)   = Emulated drive caught in SCSI function
- 0x0002014d (SORRY,HIGH)   = Asynchromous SCSI error
- 0x0002014f (SORRY,HIGH)   = Timeout with asynchromous SCSI command
+ 0x0002014d (SORRY,HIGH)   = Asynchronous SCSI error
+ 0x0002014f (SORRY,HIGH)   = Timeout with asynchronous SCSI command
  0x00020150 (DEBUG,LOW)    = Reporting asynchronous waiting time
  0x00020151 (FAILURE,HIGH) = Read attempt on write-only drive
  0x00020152 (FATAL,HIGH)   = Cannot start fifo thread
@@ -574,6 +578,39 @@ Range "scdbackup"          :  0x00020000 to 0x0002ffff
  0x00020186 (WARNING,HIGH) = Track damaged and not closed
  0x00020187 (NOTE,HIGH)    = Track not marked as damaged. No action taken.
  0x00020188 (FAILURE,HIGH) = Cannot close damaged track on given media type
+ 0x00020189 (FATAL,HIGH)   = Drive is already grabbed by libburn
+ 0x0002018a (SORRY,HIGH)   = Timeout exceeded. Retry cancled.
+ 0x0002018b (FAILURE,HIGH) = Too many CD-TEXT packs
+ 0x0002018c (FAILURE,HIGH) = CD-TEXT pack type out of range
+ 0x0002018d (FAILURE,HIGH) = CD-TEXT block number out of range
+ 0x0002018e (FAILURE,HIGH) = Too many CD-TEXT packs in block
+ 0x0002018f (FAILURE,HIGH) = CD-TEXT pack CRC mismatch
+ 0x00020190 (WARNING,HIGH) = CD-TEXT pack CRC mismatch had to be corrected
+ 0x00020191 (FAILURE,HIGH) = Unknown parameter in text input file
+ 0x00020192 (FAILURE,HIGH) = Text input file sequence error
+ 0x00020193 (FAILURE,HIGH) = Text input file readability problem
+ 0x00020194 (FAILURE,HIGH) = Text input file syntax error or specs violation
+ 0x00020195 (WARNING,HIGH) = Text input file warning
+ 0x00020196 (FAILURE,HIGH) = Session has already defined tracks
+ 0x00020197 (FAILURE,HIGH) = Unsupported text input file feature
+ 0x00020198 (FAILURE,HIGH) = CD-TEXT pack file readability problem
+ 0x00020199 (SORRY,HIGH)   = Text input file reading aborted
+ 0x0002019a (SORRY,HIGH)   = Bad track index number
+ 0x0002019b (SORRY,HIGH)   = CD track number exceeds range of 1 to 99
+ 0x0002019c (SORRY,HIGH)   = Session has no defined tracks
+ 0x0002019d (SORRY,HIGH)   = Audio read size not properly aligned
+ 0x0002019e (NOTE,HIGH)    = Drive does not support media certification
+ 0x0002019f (FAILURE,HIGH) = CD-TEXT binary pack array faulty
+ 0x000201a0 (WARNING,HIGH) = Maximum number of CD-TEXT blocks exceeded
+ 0x000201a1 (FAILURE,HIGH) = Cannot open disk file for writing
+ 0x000201a2 (FAILURE,HIGH) = Error while writing to disk file
+ 0x000201a3 (UPDATE,HIGH)  = Progress message of burn_drive_extract_audio()
+ 0x000201a4 (FAILURE,HIGH) = Failure to read audio sectors
+ 0x000201a5 (FAILURE,HIGH) = Asynchronous SCSI error
+ 0x000201a6 (FATAL,HIGH)   = Lost connection to drive
+ 0x000201a7 (FAILURE,HIGH) = SCSI command yielded host problem
+ 0x000201a8 (FAILURE,HIGH) = SCSI command yielded driver problem
+
 
  libdax_audioxtr:
  0x00020200 (SORRY,HIGH)   = Cannot open audio source file

libburn/mmc.h

@@ -1,7 +1,7 @@
 /* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */
 
 /* Copyright (c) 2004 - 2006 Derek Foreman, Ben Jansens
-   Copyright (c) 2006 - 2010 Thomas Schmitt <scdbackup@gmx.net>
+   Copyright (c) 2006 - 2014 Thomas Schmitt <scdbackup@gmx.net>
    Provided under GPL version 2 or later.
 */
 
@@ -36,9 +36,9 @@ void mmc_erase(struct burn_drive *, int);
 void mmc_read_toc(struct burn_drive *);
 void mmc_read_disc_info(struct burn_drive *);
 void mmc_read_atip(struct burn_drive *);
-void mmc_read_sectors(struct burn_drive *,
-		      int,
-		      int, const struct burn_read_opts *, struct buffer *);
+int mmc_read_cd(struct burn_drive *d, int start, int len,
+                int sec_type, int main_ch,
+                const struct burn_read_opts *o, struct buffer *buf, int flag);
 void mmc_set_speed(struct burn_drive *, int, int);
 void mmc_read_lead_in(struct burn_drive *, struct buffer *);
 void mmc_perform_opc(struct burn_drive *);
@@ -48,7 +48,8 @@ void mmc_get_configuration(struct burn_drive *);
    @return 1=nwa is valid , 0=nwa is not valid , -1=error */
 int mmc_get_nwa(struct burn_drive *d, int trackno, int *lba, int *nwa);
 
-void mmc_send_cue_sheet(struct burn_drive *, struct cue_sheet *);
+/* ts B11228 : changed from void to int */ 
+int mmc_send_cue_sheet(struct burn_drive *, struct cue_sheet *);
 
 /* ts A61023 : get size and free space of drive buffer */
 int mmc_read_buffer_capacity(struct burn_drive *d);
@@ -71,12 +72,19 @@ int mmc_get_write_performance(struct burn_drive *d);
          is the eventual duty of the caller.
 */
 int mmc_compose_mode_page_5(struct burn_drive *d,
+                            struct burn_session *s, int tno,
                             const struct burn_write_opts *o,
                             unsigned char *pd);
 
 /* ts A70201 */
 int mmc_four_char_to_int(unsigned char *data);
 
+/* ts A70201 :
+   Common track info fetcher for mmc_get_nwa() and mmc_fake_toc()
+*/
+int mmc_read_track_info(struct burn_drive *d, int trackno, struct buffer *buf,
+                        int alloc_len);
+
 /* ts A70812 : return 0 = ok , return BE_CANCELLED = error occured */
 int mmc_read_10(struct burn_drive *d, int start, int amount,
                 struct buffer *buf);
@@ -110,4 +118,24 @@ int mmc_start_if_needed(struct burn_drive *d, int flag);
 int mmc_get_bd_spare_info(struct burn_drive *d,
                                 int *alloc_blocks, int *free_blocks, int flag);
 
+/* ts B10801 */
+int mmc_get_phys_format_info(struct burn_drive *d, int *disk_category,
+                        char **book_name, int *part_version, int *num_layers,
+                        int *num_blocks, int flag);
+
+/* ts B11201 */
+int mmc_get_leadin_text(struct burn_drive *d,
+                        unsigned char **text_packs, int *num_packs, int flag);
+
+/* ts B40107 */
+int mmc_get_performance(struct burn_drive *d, int descr_type, int flag);
+
+
+#ifdef Libburn_develop_quality_scaN
+/* B21108 ts */
+int mmc_nec_optiarc_f3(struct burn_drive *d, int sub_op,
+                       int start_lba, int rate_period,
+                       int *eba, int *error_rate1, int *error_rate2);
+#endif
+
 #endif /*__MMC*/

libburn/options.c

@@ -1,6 +1,6 @@
 
 /* Copyright (c) 2004 - 2006 Derek Foreman, Ben Jansens
-   Copyright (c) 2006 - 2010 Thomas Schmitt <scdbackup@gmx.net>
+   Copyright (c) 2006 - 2012 Thomas Schmitt <scdbackup@gmx.net>
    Provided under GPL version 2 or later.
 */
 
@@ -12,12 +12,15 @@
 #include "options.h"
 #include "drive.h"
 #include "transport.h"
+#include "init.h"
+#include "write.h"
 
 /* ts A61007 */
 /* #include <a ssert.h> */
 
 #include <stdlib.h>
 #include <string.h>
+#include <stdio.h>
 
 #include "libdax_msgs.h"
 extern struct libdax_msgs *libdax_messenger;
@@ -41,16 +44,26 @@ struct burn_write_opts *burn_write_opts_new(struct burn_drive *drive)
 	opts->toc_entry = NULL;
 	opts->toc_entries = 0;
 	opts->simulate = 0;
-	opts->underrun_proof = drive->mdata->underrun_proof;
+	opts->underrun_proof = drive->mdata->p2a_valid > 0 &&
+	                       drive->mdata->underrun_proof;
 	opts->perform_opc = 1;
 	opts->obs = -1;
+
+#ifdef Libburn_dvd_always_obs_paD
+	opts->obs_pad = 1;
+#else
 	opts->obs_pad = 0;
+#endif
+
 	opts->start_byte = -1;
 	opts->fill_up_media = 0;
 	opts->force_is_set = 0;
 	opts->do_stream_recording = 0;
 	opts->dvd_obs_override = 0;
 	opts->stdio_fsync_size = Libburn_stdio_fsync_limiT;
+	opts->text_packs = NULL;
+	opts->num_text_packs = 0;
+	opts->no_text_pack_crc_check = 0;
 	opts->has_mediacatalog = 0;
 	opts->format = BURN_CDROM;
 	opts->multi = 0;
@@ -60,8 +73,30 @@ struct burn_write_opts *burn_write_opts_new(struct burn_drive *drive)
 
 void burn_write_opts_free(struct burn_write_opts *opts)
 {
-	if (--opts->refcount <= 0)
-		free(opts);
+	if (--opts->refcount > 0)
+		return;
+	if (opts->text_packs != NULL)
+		free(opts->text_packs);
+	free(opts);
+}
+
+int burn_write_opts_clone(struct burn_write_opts *from,
+                          struct burn_write_opts **to, int flag)
+{
+	if (*to != NULL)
+		burn_write_opts_free(*to);
+	if (from == NULL)
+		return 1;
+	*to = calloc(1, sizeof(struct burn_write_opts));
+	if (*to == NULL) {
+		libdax_msgs_submit(libdax_messenger, -1, 0x00000003,
+				LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
+				"Out of virtual memory", 0, 0);
+		return -1;
+	}
+	memcpy(*to, from, sizeof(struct burn_write_opts));
+	(*to)->refcount= 1;
+	return 1;
 }
 
 struct burn_read_opts *burn_read_opts_new(struct burn_drive *drive)
@@ -79,6 +114,7 @@ struct burn_read_opts *burn_read_opts_new(struct burn_drive *drive)
 	opts->report_recovered_errors = 0;
 	opts->transfer_damaged_blocks = 0;
 	opts->hardware_error_retries = 3;
+	opts->dap_bit = 0;
 
 	return opts;
 }
@@ -137,17 +173,6 @@ void burn_write_opts_set_format(struct burn_write_opts *opts, int format)
 
 int burn_write_opts_set_simulate(struct burn_write_opts *opts, int sim)
 {
-/* <<< ts A70529 :
-       One cannot predict the ability to simulate from page 05h
-       information alone. This check is now done later in 
-       function  burn_write_opts_auto_write_type().
-
-	if (opts->drive->mdata->simulate) {
-		opts->simulate = sim;
-		return 1;
-	}
-	return 0;
-*/
 	opts->simulate = !!sim;
 	return 1;
 }
@@ -155,9 +180,8 @@ 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 <= 0)
-		return 0;
-	if (opts->drive->mdata->underrun_proof) {
+	if (opts->drive->mdata->p2a_valid <= 0 ||
+	    opts->drive->mdata->underrun_proof) {
 		opts->underrun_proof = underrun_proof;
 		return 1;
 	}
@@ -178,7 +202,7 @@ void burn_write_opts_set_has_mediacatalog(struct burn_write_opts *opts,
 void burn_write_opts_set_mediacatalog(struct burn_write_opts *opts,
 				      unsigned char mediacatalog[13])
 {
-	memcpy(opts->mediacatalog, &mediacatalog, 13);
+	memcpy(opts->mediacatalog, mediacatalog, 13);
 }
 
 
@@ -189,6 +213,79 @@ void burn_write_opts_set_multi(struct burn_write_opts *opts, int multi)
 }
 
 
+/* ts B31024 */
+/* API */
+void burn_write_opts_set_fail21h_sev(struct burn_write_opts *opts,
+                                     char *severity)
+{
+	int ret, sevno;
+
+	ret = libdax_msgs__text_to_sev(severity, &sevno, 0);
+	if (ret <= 0)
+		opts->feat21h_fail_sev = 0;
+	else
+		opts->feat21h_fail_sev = sevno;
+}
+
+
+/* ts B11204 */
+/* @param flag bit0=do not verify checksums
+               bit1= repair mismatching checksums
+               bit2= repair checksums if they are 00 00 with each pack
+*/
+int burn_write_opts_set_leadin_text(struct burn_write_opts *opts,
+                                    unsigned char *text_packs,
+                                    int num_packs, int flag)
+{
+	int ret;
+	unsigned char *pack_buffer = NULL;
+
+	if (num_packs > Libburn_leadin_cdtext_packs_maX ) {
+		libdax_msgs_submit(libdax_messenger, opts->drive->global_index,
+				0x0002018b,
+				LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
+				"Too many CD-TEXT packs", 0, 0);
+		ret= 0; goto ex;
+	}
+
+	if (num_packs > 0)
+		BURN_ALLOC_MEM(pack_buffer, unsigned char, num_packs * 18);
+	
+	if (opts->text_packs != NULL) {
+		free(opts->text_packs);
+		opts->text_packs = NULL;
+	}
+
+	if (flag & 1) {
+		opts->no_text_pack_crc_check = 1;
+	} else {
+		opts->no_text_pack_crc_check = 0;
+		ret = burn_cdtext_crc_mismatches(text_packs, num_packs,
+							(flag >> 1) & 3);
+		if (ret > 0) {
+			libdax_msgs_submit(libdax_messenger, -1, 0x0002018f,
+				LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
+				"CD-TEXT pack CRC mismatch", 0, 0);
+			ret = 0; goto ex;
+		} else if (ret < 0) {
+			libdax_msgs_submit(libdax_messenger, -1, 0x00020190,
+				LIBDAX_MSGS_SEV_WARNING, LIBDAX_MSGS_PRIO_HIGH,
+			    "CD-TEXT pack CRC mismatch had to be corrected",
+				0, 0);
+		}
+	}
+
+	if (num_packs > 0) {
+		memcpy(pack_buffer, text_packs, num_packs * 18);
+		opts->text_packs = pack_buffer;
+	}
+	opts->num_text_packs = num_packs;
+	ret = 1;
+ex:;
+	return ret;
+}
+
+
 /* ts A61222 */
 void burn_write_opts_set_start_byte(struct burn_write_opts *opts, off_t value)
 {
@@ -296,6 +393,10 @@ do_sao:;
 	{wt = BURN_WRITE_SAO; goto ex;}
 no_sao:;
 try_tao:;
+	if (opts->num_text_packs > 0) {
+		strcat(reasons, "CD-TEXT: write type SAO required, ");
+		{wt = BURN_WRITE_NONE; goto ex;}
+	}
 	if ((flag & 1) && opts->write_type != BURN_WRITE_TAO)
 		goto try_raw;
 	reason_pt = reasons + strlen(reasons);
@@ -410,6 +511,13 @@ void burn_write_opts_set_dvd_obs(struct burn_write_opts *opts, int obs)
 }
 
 
+/* ts B20406: API */
+void burn_write_opts_set_obs_pad(struct burn_write_opts *opts, int pad)
+{
+	opts->obs_pad = 2 * !!pad;
+}
+
+
 /* ts A91115: API */
 void burn_write_opts_set_stdio_fsync(struct burn_write_opts *opts, int rythm)
 {

libburn/options.h

@@ -1,6 +1,6 @@
 
 /* Copyright (c) 2004 - 2006 Derek Foreman, Ben Jansens
-   Copyright (c) 2006 - 2010 Thomas Schmitt <scdbackup@gmx.net>
+   Copyright (c) 2006 - 2013 Thomas Schmitt <scdbackup@gmx.net>
    Provided under GPL version 2 or later.
 */
 
@@ -42,7 +42,9 @@ struct burn_write_opts
 	/* ts A61219 : Output block size to trigger buffer flush if hit.
 			 -1 with CD, 32 kB with DVD */
 	int obs;
-	int obs_pad; /* 1=pad up last block to obs */
+	int obs_pad; /* >0 pad up last block to obs, 0 do not
+	                2 indicates burn_write_opts_set_obs_pad(,1)
+	             */
 
 	/* ts A61222 : Start address for media which allow a choice */
 	off_t start_byte;
@@ -69,21 +71,42 @@ struct burn_write_opts
 	   Values 0 or >= 32 counted in 2 KB blocks. */
 	int stdio_fsync_size;
 
+	/* ts B11203 : CD-TEXT */
+	unsigned char *text_packs;
+	int num_text_packs;
+	int no_text_pack_crc_check;
 
 	/** A disc can have a media catalog number */
 	int has_mediacatalog;
 	unsigned char mediacatalog[13];
 	/** Session format */
 	int format;
+
 	/* internal use only */
 	unsigned char control;
+
+	/* Whether to keep medium appendable */
 	unsigned char multi;
+
+	/* ts B31024 */
+	/* The severity to be attributed to error messages about failed
+	   write attempt with blank DVD-RW, possibly due to falsely reported
+	   feature 21h Incremental Streaming Writable
+	*/
+	int feat21h_fail_sev;
 };
 
 /* Default value for burn_write_opts.stdio_flush_size
 */
 #define Libburn_stdio_fsync_limiT 8192
 
+/* Maximum number of Lead-in text packs.
+   READ TOC/PMA/ATIP can at most return 3640.7 packs.
+   The sequence counters of the packs have 8 bits. There are 8 blocks at most.
+   Thus max 2048 packs. 
+ */
+#define Libburn_leadin_cdtext_packs_maX 2048
+
 
 /** Options for disc reading operations. This should be created with
     burn_read_opts_new() and freed with burn_read_opts_free(). */
@@ -116,6 +139,19 @@ struct burn_read_opts
 	/** The number of retries the hardware should make to correct
 	    errors. */
 	unsigned char hardware_error_retries;
+
+	/* ts B21119 */
+	/* >>> Needs API access */
+	/** Whether to set DAP bit which allows drive to apply
+	    "flaw obscuring mechanisms like audio data mute and interpolate"
+	*/
+	unsigned int dap_bit;
+
 };
 
+
+int burn_write_opts_clone(struct burn_write_opts *from,
+                          struct burn_write_opts **to, int flag);
+
+
 #endif /* BURN__OPTIONS_H */

libburn/os-dummy.h

@@ -5,7 +5,8 @@
            Unknown POSIX like systems
            with the dummy MMC transport adapter sg-dummy.c
 
-   Copyright (C) 2009 Thomas Schmitt <scdbackup@gmx.net>, provided under GPLv2+
+   Copyright (C) 2009 - 2013 Thomas Schmitt <scdbackup@gmx.net>
+   Provided under GPLv2+
 */
 
 
@@ -16,18 +17,16 @@
 #define BURN_OS_SIGNAL_MACRO_LIST \
  SIGHUP, SIGINT, SIGQUIT, SIGILL, SIGABRT, \
  SIGFPE, SIGSEGV, SIGPIPE, SIGALRM, SIGTERM, \
- SIGUSR1, SIGUSR2, SIGXCPU, SIGTSTP, SIGTTIN, \
- SIGTTOU
+ SIGUSR1, SIGUSR2, SIGXCPU
 
 /* 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"
+ "SIGUSR1", "SIGUSR2", "SIGXCPU"
 
 /* The number of above list items */
-#define BURN_OS_SIGNAL_COUNT 16
+#define BURN_OS_SIGNAL_COUNT 13
 
 /** The list of all signals which shall surely not be caught.
     It depends on the particular signal whether it can be ignored or whether
@@ -55,11 +54,12 @@
 /** The combined list of all signals which shall not be caught.
  */
 #define BURN_OS_NON_SIGNAL_MACRO_LIST \
-SIGKILL, SIGCHLD, SIGSTOP BURN_OS_SIG_WINCH BURN_OS_SIG_URG
+SIGKILL, SIGCHLD, SIGSTOP, SIGTSTP, SIGCONT, SIGTTIN, SIGTTOU \
+BURN_OS_SIG_WINCH BURN_OS_SIG_URG
 
 /* The number of above list items */
 #define BURN_OS_NON_SIGNAL_COUNT \
-( 3 + BURN_OS_SIG_WINCH_CNT + BURN_OS_SIG_URG_CNT )
+( 7 + BURN_OS_SIG_WINCH_CNT + BURN_OS_SIG_URG_CNT )
 
 
 /* The maximum size for a (SCSI) i/o transaction */

libburn/os-freebsd.h

@@ -4,8 +4,8 @@
    by os.h in case of compilation for
                                   FreeBSD with CAM
 
-   Copyright (C) 2006 - 2010 Thomas Schmitt <scdbackup@gmx.net>,
-   provided under GPLv2+
+   Copyright (C) 2006 - 2013 Thomas Schmitt <scdbackup@gmx.net>,
+   Provided under GPLv2+
 */
 
 /** List of all signals which shall be caught by signal handlers and trigger
@@ -15,29 +15,25 @@
 #define BURN_OS_SIGNAL_MACRO_LIST \
  SIGHUP, SIGINT, SIGQUIT, SIGILL, SIGABRT, \
  SIGFPE, SIGSEGV, SIGPIPE, SIGALRM, SIGTERM, \
- SIGUSR1, SIGUSR2, SIGXCPU, SIGTSTP, SIGTTIN, \
- SIGTTOU, \
- SIGBUS, SIGPROF, SIGSYS, SIGTRAP, \
- SIGVTALRM, SIGXCPU, SIGXFSZ 
+ SIGUSR1, SIGUSR2, SIGXCPU, SIGBUS, SIGPROF, \
+ SIGSYS, SIGTRAP, SIGVTALRM, SIGXCPU, SIGXFSZ 
 
 /* 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", \
- "SIGBUS", "SIGPROF", "SIGSYS", "SIGTRAP", \
- "SIGVTALRM", "SIGXCPU", "SIGXFSZ"
+ "SIGUSR1", "SIGUSR2", "SIGXCPU", "SIGBUS", "SIGPROF", \
+ "SIGSYS", "SIGTRAP", "SIGVTALRM", "SIGXCPU", "SIGXFSZ"
 
 /* The number of above list items */
-#define BURN_OS_SIGNAL_COUNT 23
+#define BURN_OS_SIGNAL_COUNT 20
 
 /** To list all signals which shall surely not be caught */
 #define BURN_OS_NON_SIGNAL_MACRO_LIST \
-SIGKILL, SIGCHLD, SIGSTOP, SIGURG, SIGWINCH
+SIGKILL, SIGCHLD, SIGSTOP, SIGTSTP, SIGCONT, SIGTTIN, SIGTTOU, SIGURG, SIGWINCH
 
 /* The number of above list items */
-#define BURN_OS_NON_SIGNAL_COUNT 5
+#define BURN_OS_NON_SIGNAL_COUNT 9
 
 
 /* The maximum size for a (SCSI) i/o transaction */

libburn/os-libcdio.h

@@ -5,7 +5,8 @@
            Unknown X/Open-like systems
            with GNU libcdio MMC transport adapter sg-libcdio.c
 
-   Copyright (C) 2009 Thomas Schmitt <scdbackup@gmx.net>, provided under GPLv2+
+   Copyright (C) 2009 - 2013 Thomas Schmitt <scdbackup@gmx.net>
+   Provided under GPLv2+
 */
 
 
@@ -16,18 +17,16 @@
 #define BURN_OS_SIGNAL_MACRO_LIST \
  SIGHUP, SIGINT, SIGQUIT, SIGILL, SIGABRT, \
  SIGFPE, SIGSEGV, SIGPIPE, SIGALRM, SIGTERM, \
- SIGUSR1, SIGUSR2, SIGXCPU, SIGTSTP, SIGTTIN, \
- SIGTTOU
+ SIGUSR1, SIGUSR2, SIGXCPU
 
 /* 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"
+ "SIGUSR1", "SIGUSR2", "SIGXCPU"
 
 /* The number of above list items */
-#define BURN_OS_SIGNAL_COUNT 16
+#define BURN_OS_SIGNAL_COUNT 13
 
 
 /** The list of all signals which shall surely not be caught.
@@ -56,11 +55,12 @@
 /** The combined list of all signals which shall not be caught.
  */
 #define BURN_OS_NON_SIGNAL_MACRO_LIST \
-SIGKILL, SIGCHLD, SIGSTOP BURN_OS_SIG_WINCH BURN_OS_SIG_URG
+SIGKILL, SIGCHLD, SIGSTOP, SIGTSTP, SIGCONT, SIGTTIN, SIGTTOU \
+BURN_OS_SIG_WINCH BURN_OS_SIG_URG
 
 /* The number of above list items */
 #define BURN_OS_NON_SIGNAL_COUNT \
-( 3 + BURN_OS_SIG_WINCH_CNT + BURN_OS_SIG_URG_CNT )
+( 7 + BURN_OS_SIG_WINCH_CNT + BURN_OS_SIG_URG_CNT )
 
 
 /* The maximum size for a (SCSI) i/o transaction */

libburn/os-linux.h

@@ -4,7 +4,7 @@
    by os.h in case of compilation for
            Linux kernels 2.4 and 2.6, GNU/Linux SCSI Generic (sg)
 
-   Copyright (C) 2006 - 2010 Thomas Schmitt <scdbackup@gmx.net>
+   Copyright (C) 2006 - 2013 Thomas Schmitt <scdbackup@gmx.net>
    Provided under GPL version 2 or later.
 */
 
@@ -16,29 +16,27 @@
 #define BURN_OS_SIGNAL_MACRO_LIST \
  SIGHUP, SIGINT, SIGQUIT, SIGILL, SIGABRT, \
  SIGFPE, SIGSEGV, SIGPIPE, SIGALRM, SIGTERM, \
- SIGUSR1, SIGUSR2, SIGXCPU, SIGTSTP, SIGTTIN, \
- SIGTTOU, \
- SIGBUS, SIGPOLL, SIGPROF, SIGSYS, SIGTRAP, \
- SIGVTALRM, SIGXCPU, SIGXFSZ
+ SIGUSR1, SIGUSR2, SIGXCPU, SIGBUS, SIGPOLL, \
+ SIGPROF, SIGSYS, SIGTRAP, SIGVTALRM, SIGXCPU, \
+ SIGXFSZ
 
 /* 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", \
- "SIGBUS", "SIGPOLL", "SIGPROF", "SIGSYS", "SIGTRAP", \
- "SIGVTALRM", "SIGXCPU", "SIGXFSZ"
+ "SIGUSR1", "SIGUSR2", "SIGXCPU", "SIGBUS", "SIGPOLL", \
+ "SIGPROF", "SIGSYS", "SIGTRAP", "SIGVTALRM", "SIGXCPU", \
+ "SIGXFSZ"
 
 /* The number of above list items */
-#define BURN_OS_SIGNAL_COUNT 24
+#define BURN_OS_SIGNAL_COUNT 21
 
 /** To list all signals which shall surely not be caught */
 #define BURN_OS_NON_SIGNAL_MACRO_LIST \
-SIGKILL, SIGCHLD, SIGSTOP, SIGURG, SIGWINCH
+SIGKILL, SIGCHLD, SIGSTOP, SIGTSTP, SIGCONT, SIGURG, SIGWINCH, SIGTTIN, SIGTTOU
 
 /* The number of above list items */
-#define BURN_OS_NON_SIGNAL_COUNT 5
+#define BURN_OS_NON_SIGNAL_COUNT 9
 
 
 /* The maximum size for a (SCSI) i/o transaction */

libburn/os-netbsd.h

@@ -0,0 +1,71 @@
+
+/* os-netbsd.h
+   Operating system specific libburn definitions and declarations. Included
+   by os.h in case of compilation for
+           NetBSD 6
+           with  MMC transport adapter sg-netbsd.c
+           >>> for OpenBSD too ?
+
+   Copyright (C) 2010 - 2014 Thomas Schmitt <scdbackup@gmx.net>
+   provided under GPLv2+
+
+   Derived 2014 from libburn/os-solaris.c
+*/
+
+
+/** List of all signals which shall be caught by signal handlers and trigger
+    a graceful abort of libburn. (See man signal.h)
+*/
+/* Once as system defined macros */
+#define BURN_OS_SIGNAL_MACRO_LIST \
+ SIGHUP, SIGINT, SIGQUIT, SIGILL, SIGTRAP, \
+ SIGABRT, SIGEMT, SIGFPE, SIGBUS, SIGSEGV, \
+ SIGSYS, SIGPIPE, SIGALRM, SIGTERM, SIGXCPU, \
+ SIGXFSZ, SIGVTALRM, SIGPROF, SIGUSR1, SIGUSR2
+
+/* Once as text 1:1 list of strings for messages and interpreters */
+#define BURN_OS_SIGNAL_NAME_LIST \
+ "SIGHUP", "SIGINT", "SIGQUIT", "SIGILL", "SIGTRAP", \
+ "SIGABRT", "SIGEMT", "SIGFPE", "SIGBUS", "SIGSEGV", \
+ "SIGSYS", "SIGPIPE", "SIGALRM", "SIGTERM", "SIGXCPU", \
+ "SIGXFSZ", "SIGVTALRM", "SIGPROF", "SIGUSR1", "SIGUSR2"
+
+/* The number of above list items */
+#define BURN_OS_SIGNAL_COUNT 20
+
+/** To list all signals which shall surely not be caught */
+#define BURN_OS_NON_SIGNAL_MACRO_LIST \
+ SIGKILL, SIGURG, SIGSTOP, SIGTSTP, SIGCONT, \
+ SIGCHLD, SIGTTIN, SIGTTOU, SIGIO, SIGWINCH, \
+ SIGINFO, SIGPWR
+
+/* The number of above list items */
+#define BURN_OS_NON_SIGNAL_COUNT 12
+
+
+/* The maximum size for a (SCSI) i/o transaction */
+/* Important : MUST be at least 32768 ! */
+/* My Blu-ray burner LG GGW-H20 writes junk if stream recording is combined
+   with buffer size 32 kB. So stream recording is allowed only with size 64k.
+*/
+/* >>> ??? Does it do 64 kB ? */
+#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 cdno;
+};
+
+#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 fd;
+

libburn/os-solaris.h

@@ -5,7 +5,8 @@
            Solaris based systems, e.g. SunOS 5.11
            with Solaris uscsi MMC transport adapter sg-solaris.c
 
-   Copyright (C) 2010 Thomas Schmitt <scdbackup@gmx.net>, provided under GPLv2+
+   Copyright (C) 2010 - 2013 Thomas Schmitt <scdbackup@gmx.net>
+   provided under GPLv2+
 */
 
 
@@ -16,25 +17,23 @@
 #define BURN_OS_SIGNAL_MACRO_LIST \
  SIGHUP, SIGINT, SIGQUIT, SIGILL, SIGABRT, \
  SIGFPE, SIGSEGV, SIGPIPE, SIGALRM, SIGTERM, \
- SIGUSR1, SIGUSR2, SIGXCPU, SIGTSTP, SIGTTIN, \
- SIGTTOU
+ SIGUSR1, SIGUSR2, SIGXCPU
 
 /* 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"
+ "SIGUSR1", "SIGUSR2", "SIGXCPU"
 
 /* The number of above list items */
-#define BURN_OS_SIGNAL_COUNT 16
+#define BURN_OS_SIGNAL_COUNT 13
 
 /** To list all signals which shall surely not be caught */
 #define BURN_OS_NON_SIGNAL_MACRO_LIST \
-SIGKILL, SIGCHLD, SIGSTOP, SIGURG, SIGWINCH
+SIGKILL, SIGCHLD, SIGSTOP, SIGTSTP, SIGCONT, SIGTTIN, SIGTTOU, SIGURG, SIGWINCH
 
 /* The number of above list items */
-#define BURN_OS_NON_SIGNAL_COUNT 5
+#define BURN_OS_NON_SIGNAL_COUNT 9
 
 
 /* The maximum size for a (SCSI) i/o transaction */

libburn/os.h

@@ -3,7 +3,8 @@
    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) 2009 Thomas Schmitt <scdbackup@gmx.net>, provided under GPLv2+
+   Copyright (C) 2009 - 2014 Thomas Schmitt <scdbackup@gmx.net>,
+   provided under GPLv2+
 */
 
 #ifndef BURN_OS_H_INCLUDED
@@ -14,6 +15,12 @@
 */
 
 
+/* <<< Until it is known whether this adapter would work on OpenBSD too */
+#ifdef __NetBSD__
+#define Libburn_use_sg_netbsD
+#endif
+
+
 #ifdef Libburn_use_sg_dummY
 
 
@@ -29,6 +36,15 @@
 #include "os-libcdio.h"
 
 
+#else
+#ifdef Libburn_use_sg_netbsD
+/* To become: # ifdef __NetBSD__ */
+
+
+/* -------------------------- NetBSD with SCIOCCOMMAND --------------------- */
+#include "os-netbsd.h"
+
+
 #else
 #ifdef __FreeBSD__
 
@@ -72,6 +88,7 @@
 #endif /* ! __linux */
 #endif /* ! __FreeBSD__kernel__ */
 #endif /* ! __FreeBSD__ */
+#endif /* ! Libburn_use_sg_netbsD */
 #endif /* ! Libburn_use_libcdiO */
 #endif /* ! Libburn_use_sg_dummY */
 

libburn/read.c

@@ -1,7 +1,7 @@
 /* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */
 
 /* Copyright (c) 2004 - 2006 Derek Foreman, Ben Jansens
-   Copyright (c) 2006 - 2011 Thomas Schmitt <scdbackup@gmx.net>
+   Copyright (c) 2006 - 2012 Thomas Schmitt <scdbackup@gmx.net>
    Provided under GPL version 2 or later.
 */
 
@@ -36,6 +36,7 @@
 #include "init.h"
 #include "toc.h"
 #include "util.h"
+#include "mmc.h"
 #include "sg.h"
 #include "read.h"
 #include "options.h"
@@ -115,7 +116,6 @@ drive, or only store a subset of the _opts structs in drives */
 	while (1) {
 		seclen = burn_sector_length_read(d, o);
 
-		burn_print(12, "received %d blocks\n", page.sectors);
 		for (i = 0; i < page.sectors; i++) {
 			burn_packet_process(d, page.data + seclen * i, o);
 			d->track_end--;
@@ -123,7 +123,6 @@ drive, or only store a subset of the _opts structs in drives */
 		}
 
 		if ((d->cancel) || (drive_lba == LAST_SESSION_END(d))) {
-			burn_print(1, "finished or cancelled\n");
 			d->busy = BURN_DRIVE_IDLE;
 			if (!d->cancel)
 				d->toc->complete = 1;
@@ -137,16 +136,14 @@ drive, or only store a subset of the _opts structs in drives */
 			if (d->currtrack >
 			    d->toc->session[d->currsession].lasttrack) {
 				d->currsession++;
-				burn_print(12, "session switch to %d\n",
-					   d->currsession);
-				burn_print(12, "skipping a lead out\n");
+				/* session switch to d->currsession */
+				/* skipping a lead out */
 				drive_lba = CURRENT_SESSION_START(d);
-				burn_print(12, "new lba %d\n", drive_lba);
 /* XXX more of the same
 				end = burn_track_end(d, d->currsession,
 							d->currtrack);
-*/ }
-			burn_print(12, "track switch to %d\n", d->currtrack);
+*/
+			}
 		}
 
 		page.sectors = 0;
@@ -162,6 +159,8 @@ drive, or only store a subset of the _opts structs in drives */
 		       drive_lba);
 
 		/* >>> ts A61009 : ensure page.sectors >= 0 before calling */
+  		/* >>> ts B21123 :  Would now be d->read_cd() with
+                                    with sectype = 0 , mainch = 0xf8 */
 		d->r ead_sectors(d, drive_lba, page.sectors, o, &page);
 
 		printf("Read %d\n", page.sectors);
@@ -201,23 +200,21 @@ static int bitcount(unsigned char *data, int n)
 	return count;
 }
 
+
 void burn_packet_process(struct burn_drive *d, unsigned char *data,
 			 const struct burn_read_opts *o)
 {
 	unsigned char sub[96];
-	unsigned short crc;
 	int ptr = 2352, i, j, code, fb;
 	int audio = 1;
+#ifndef Libburn_no_crc_C
+	unsigned short crc;
+#endif
 
 	if (o->c2errors) {
 		fb = bitcount(data + ptr, 294);
 		if (fb) {
-			burn_print(1, "%d damaged bits\n",
-				   bitcount(data + ptr, 294));
-			burn_print(1, "sending error on %s %s\n",
-				   d->idata->vendor, d->idata->product);
-			/* XXX send a burn_message! burn_message_error(d,
-			   something); */
+			/* bitcount(data + ptr, 294) damaged bits */;
 		}
 		ptr += 294;
 	}
@@ -253,16 +250,17 @@ void burn_packet_process(struct burn_drive *d, unsigned char *data,
 				}
 			}
 		}
-		crc = (*(sub + 22) << 8) + *(sub + 23);
 
 #ifndef Libburn_no_crc_C
+		crc = (*(sub + 22) << 8) + *(sub + 23);
 		if (crc != crc_ccitt(sub + 12, 10)) {
+/*
 			burn_print(1, "sending error on %s %s\n",
 				   d->idata->vendor, d->idata->product);
-/*			e = burn_error();
+			e = burn_error();
 			e->drive = d;
-*/
 			burn_print(1, "crc mismatch in Q\n");
+*/;
 		}
 #endif
 
@@ -470,13 +468,18 @@ int burn_read_data(struct burn_drive *d, off_t byte_address,
 	wpt = data;
 	for (; start < upto; start += chunksize) {
 		chunksize = upto - start;
-		if (chunksize > 16) {
-			chunksize = 16;
-			cpy_size = 16 * 2048;
+		if (chunksize > (BUFFER_SIZE / 2048)) {
+			chunksize = (BUFFER_SIZE / 2048);
+			cpy_size = BUFFER_SIZE;
 		} else
 			cpy_size = data_size - *data_count;
 		if (flag & 2)
 			d->silent_on_scsi_error = 1;
+		if (flag & 16) {
+			d->had_particular_error &= ~1;
+			if (!d->silent_on_scsi_error)
+				d->silent_on_scsi_error = 2;
+		}
 		if (d->drive_role == 1) {
 			err = d->read_10(d, start, chunksize, d->buffer);
 		} else {
@@ -486,9 +489,11 @@ int burn_read_data(struct burn_drive *d, off_t byte_address,
 			if (ret <= 0)
 				err = BE_CANCELLED;
 		}
-		if (flag & 2) 
+		if (flag & (2 | 16))
 			d->silent_on_scsi_error = sose_mem;
 		if (err == BE_CANCELLED) {
+			if ((flag & 16) && (d->had_particular_error & 1))
+				{ret = -3; goto ex;}
 			/* Try to read a smaller part of the chunk */
 			if(!(flag & 4))
 			  for (i = 0; i < chunksize - 1; i++) {
@@ -533,3 +538,144 @@ ex:;
 	d->busy = BURN_DRIVE_IDLE;
 	return ret;
 }
+
+
+/* ts B21119 : API function*/
+int burn_read_audio(struct burn_drive *d, int sector_no,
+                    char data[], off_t data_size, off_t *data_count, int flag)
+{
+	int alignment = 2352, start, upto, chunksize = 1, err, cpy_size, i;
+	int sose_mem = 0, ret;
+	char msg[81], *wpt;
+	struct buffer *buf = NULL, *buffer_mem = d->buffer;
+
+	BURN_ALLOC_MEM(buf, struct buffer, 1);
+	*data_count = 0;
+	sose_mem = d->silent_on_scsi_error;
+
+	if (d->released) {
+		libdax_msgs_submit(libdax_messenger,
+			d->global_index, 0x00020142,
+			LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
+			"Drive is not grabbed on random access read", 0, 0);
+		{ret = 0; goto ex;}
+	}
+	if (d->drive_role != 1) {
+		libdax_msgs_submit(libdax_messenger, d->global_index,
+			0x00020146,
+			LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
+		"Drive is a virtual placeholder (stdio-drive or null-drive)",
+			 0, 0);
+		{ret = 0; goto ex;} 
+	}
+	if ((data_size % alignment) != 0) {
+		sprintf(msg,
+			"Audio read size not properly aligned (%d bytes)",
+			alignment);
+		libdax_msgs_submit(libdax_messenger, d->global_index,
+			0x0002019d,
+			LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
+			msg, 0, 0);
+		{ret = 0; goto ex;}
+	}
+	if (d->busy != BURN_DRIVE_IDLE) {
+		libdax_msgs_submit(libdax_messenger,
+			d->global_index, 0x00020145,
+			LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
+			"Drive is busy on attempt to read audio", 0, 0);
+		{ret = 0; goto ex;}
+	}
+
+        d->busy = BURN_DRIVE_READING_SYNC;
+        d->buffer = buf;
+
+	start = sector_no;
+	upto = start + data_size / alignment;
+	wpt = data;
+	for (; start < upto; start += chunksize) {
+		chunksize = upto - start;
+		if (chunksize > (BUFFER_SIZE / alignment))
+			chunksize = (BUFFER_SIZE / alignment);
+		cpy_size = chunksize * alignment;
+		if (flag & 2)
+			d->silent_on_scsi_error = 1;
+		if (flag & 16) {
+			d->had_particular_error &= ~1;
+			if (!d->silent_on_scsi_error)
+				d->silent_on_scsi_error = 2;
+		}
+		err = d->read_cd(d, start, chunksize, 1, 0x10, NULL, d->buffer,
+				 (flag & 8) >> 3);
+		if (flag & (2 | 16))
+			d->silent_on_scsi_error = sose_mem;
+		if (err == BE_CANCELLED) {
+			if ((flag & 16) && (d->had_particular_error & 1))
+				{ret = -3; goto ex;}
+			if(!(flag & 4))
+			  for (i = 0; i < chunksize - 1; i++) {
+				if (flag & 2)
+					d->silent_on_scsi_error = 1;
+				err = d->read_cd(d, start + i, 1, 1, 0x10,
+				             NULL, d->buffer, (flag & 8) >> 3);
+				if (flag & 2)
+					d->silent_on_scsi_error = sose_mem;
+				if (err == BE_CANCELLED)
+			  break;
+				memcpy(wpt, d->buffer->data, alignment);
+				wpt += alignment;
+				*data_count += alignment;
+			  }
+
+			ret = 0; goto ex;
+		}
+                memcpy(wpt, d->buffer->data, cpy_size);
+                wpt += cpy_size;
+                *data_count += cpy_size;
+        }
+
+	ret = 1;
+ex:
+	BURN_FREE_MEM(buf);
+	d->buffer = buffer_mem;
+	d->busy = BURN_DRIVE_IDLE;
+	return ret;
+}
+
+
+#ifdef Libburn_develop_quality_scaN
+
+/* B21108 ts */
+int burn_nec_optiarc_rep_err_rate(struct burn_drive *d,
+                                  int start_lba, int rate_period, int flag)
+{
+	int ret, lba = 0, error_rate1 = 0, error_rate2 = 0, enabled = 0, dret;
+
+	/* Sub Operation Code 1 : Enable Error Rate reporting function */
+	ret = mmc_nec_optiarc_f3(d, 1, start_lba, rate_period,
+	                         &lba, &error_rate1, &error_rate2);
+	if (ret <= 0)
+		goto ex;
+	enabled = 1;
+
+	/* >>> Sub Operation Code 2 : Seek to starting address
+               start_lba , rate_period
+	*/;
+
+	/* >>> Loop with Sub Operation Code 3 : Send Error Rate information
+               reply: 4-byte LBA , 2-byte C1/PIE , 2-byte C2/PIF
+	*/;
+
+	ret = 1;
+ex:;
+	if (enabled) {
+		/* Code F : Disable Error Rate reporting function */
+		dret = mmc_nec_optiarc_f3(d, 0xf, 0, 0,
+					&lba, &error_rate1, &error_rate2);
+		if (dret < ret)
+			ret = dret;
+	}
+	return ret;
+}
+
+#endif /* Libburn_develop_quality_scaN */
+

libburn/sbc.c

@@ -67,6 +67,7 @@ void sbc_load(struct burn_drive *d)
 	/* c->opcode[1] |= 1; / * ts A70918 : Immed */
 
 	c->dir = NO_TRANSFER;
+	c->timeout = Libburn_mmc_load_timeouT;
 	d->issue_command(d, c);
 	if (c->error)
 		return;

libburn/sector.c

@@ -185,13 +185,18 @@ static void get_bytes(struct burn_track *track, int count, unsigned char *data)
 	if (track->end_on_premature_eoi && shortage >= count &&
 	    !track->open_ended) {
 		char msg[80];
-		/* Memorize that premature end of input happened */
+		off_t missing, inp_block_size, track_blocks;
+
+		inp_block_size = burn_sector_length(track->mode);
+		track_blocks = burn_track_get_sectors_2(track, 1);
+		missing = track_blocks * inp_block_size - track->sourcecount;
 		sprintf(msg,
-		    "Premature end of input encountered. Missing: %d bytes",
-		    shortage);
+		      "Premature end of input encountered. Missing: %.f bytes",
+		      (double) missing);
 		libdax_msgs_submit(libdax_messenger, -1, 0x00020180,
 				LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
 				msg, 0,0);
+		/* Memorize that premature end of input happened */
 		track->end_on_premature_eoi = 2;
 	}
 	if (track->open_ended || track->end_on_premature_eoi)
@@ -223,6 +228,43 @@ ex:;
 	}
 }
 
+
+/* ts B20113 : outsourced from get_sector() */
+int sector_write_buffer(struct burn_drive *d, 
+			struct burn_track *track, int flag)
+{
+	int err, i;
+	struct buffer *out;
+
+	out = d->buffer;
+	if (out->sectors <= 0)
+		return 2;
+	err = d->write(d, d->nwa, out);
+	if (err == BE_CANCELLED)
+		return 0;
+
+	/* ts A61101 */
+	if(track != NULL) {
+		track->writecount += out->bytes;
+		track->written_sectors += out->sectors;
+
+		/* Determine current index */
+		for (i = d->progress.index; i + 1 < track->indices; i++) {
+			if (track->index[i + 1] > d->nwa + out->sectors)
+		break;
+			d->progress.index = i + 1;
+		}
+	}
+	/* ts A61119 */
+	d->progress.buffered_bytes += out->bytes;
+
+	d->nwa += out->sectors;
+	out->bytes = 0;
+	out->sectors = 0;
+	return 1;
+}
+
+
 /* ts A61009 : seems to hand out sector start pointer in opts->drive->buffer
 		and to count hand outs as well as reserved bytes */
 /* ts A61101 : added parameter track for counting written bytes */
@@ -231,7 +273,7 @@ static unsigned char *get_sector(struct burn_write_opts *opts,
 {
 	struct burn_drive *d = opts->drive;
 	struct buffer *out = d->buffer;
-	int outmode, seclen;
+	int outmode, seclen, write_ret;
 	unsigned char *ret;
 
 	outmode = get_outmode(opts);
@@ -250,22 +292,9 @@ static unsigned char *get_sector(struct burn_write_opts *opts,
 	/* (there is enough buffer size reserve for track->cdxa_conversion) */
 	if (out->bytes + seclen > BUFFER_SIZE ||
 	    (opts->obs > 0 && out->bytes + seclen > opts->obs)) {
-		int err;
-		err = d->write(d, d->nwa, out);
-		if (err == BE_CANCELLED)
+		write_ret = sector_write_buffer(d, track, 0);
+		if (write_ret <= 0)
 			return NULL;
-
-		/* ts A61101 */
-		if(track != NULL) {
-			track->writecount += out->bytes;
-			track->written_sectors += out->sectors;
-		}
-		/* ts A61119 */
-		d->progress.buffered_bytes += out->bytes;
-
-		d->nwa += out->sectors;
-		out->bytes = 0;
-		out->sectors = 0;
 	}
 	ret = out->data + out->bytes;
 	out->bytes += seclen;

libburn/sector.h

@@ -24,6 +24,10 @@ int sector_postgap(struct burn_write_opts *, unsigned char tno,
 int sector_lout(struct burn_write_opts *, unsigned char control, int mode);
 int sector_data(struct burn_write_opts *, struct burn_track *t, int psub);
 
+/* ts B20113 */
+int sector_write_buffer(struct burn_drive *d,
+			struct burn_track *track, int flag);
+
 /* ts A61009 */
 int sector_headers_is_ok(struct burn_write_opts *o, int mode);
 

libburn/sg-dummy.c

@@ -1,7 +1,7 @@
 /* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */
 
 /* 
-   Copyright (c) 2009 - 2010 Thomas Schmitt <scdbackup@gmx.net>
+   Copyright (c) 2009 - 2011 Thomas Schmitt <scdbackup@gmx.net>
    Provided under GPL version 2 or later.
 */
 
@@ -44,6 +44,7 @@ Present implementation: default dummy which enables libburn only to work
 #include "debug.h"
 #include "toc.h"
 #include "util.h"
+#include "init.h"
 
 #include "libdax_msgs.h"
 extern struct libdax_msgs *libdax_messenger;
@@ -252,14 +253,12 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
 #endif
 
 	char *testpath = NULL, *cpt;
-	long blocks;
 	off_t add_size = 0;
 	int ret;
 
 	BURN_ALLOC_MEM(testpath, char, 4096);
 
 	testpath[0] = 0;
-	blocks = *bytes / 512;
 	if (stat(path, &stbuf) == -1) {
 		strcpy(testpath, path);
 		cpt = strrchr(testpath, '/');
@@ -275,6 +274,9 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
 #ifdef Libburn_if_this_was_linuX
 
 	} else if(S_ISBLK(stbuf.st_mode)) {
+		long blocks;
+
+		blocks = *bytes / 512;
 		fd = open(path, open_mode);
 		if (fd == -1)
 			{ret = -2; goto ex;}

libburn/sg-freebsd-port.c

@@ -1,11 +1,14 @@
 /* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */
 
 /*
-   Copyright (c) 2006 - 2010 Thomas Schmitt <scdbackup@gmx.net>
+   Copyright (c) 2006 - 2011 Thomas Schmitt <scdbackup@gmx.net>
    Provided under GPL version 2 or later.
 */
 
 
+                  /* THIS CODE IS NOT FUNCTIONAL YET !!! */
+
+
 /*
 
 This is the main operating system dependent SCSI part of libburn. It implements
@@ -490,10 +493,8 @@ int sg_grab(struct burn_drive *d)
 */
 int sg_release(struct burn_drive *d)
 {
-	if (d->cam == NULL) {
-		burn_print(1, "release an ungrabbed drive.  die\n");
+	if (d->cam == NULL)
 		return 0;
-	}
 	sg_close_drive(d);
 	return 0;
 }
@@ -547,8 +548,6 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 	ccb->csio.cdb_len = c->oplen;
 	memcpy(&ccb->csio.cdb_io.cdb_bytes, &c->opcode, c->oplen);
 	
-	memset(&ccb->csio.sense_data, 0, sizeof (ccb->csio.sense_data));
-
 	if (c->page) {
 		ccb->csio.data_ptr  = c->page->data;
 		if (c->dir == FROM_DRIVE) {
@@ -569,6 +568,7 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 	}
 
 	do {
+		memset(&ccb->csio.sense_data, 0, sizeof(ccb->csio.sense_data));
 		err = cam_send_ccb(d->cam, ccb);
 		if (err == -1) {
 			libdax_msgs_submit(libdax_messenger,
@@ -721,13 +721,11 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
 	struct stat stbuf;
 	struct statvfs vfsbuf;
 	char *testpath = NULL, *cpt;
-	long blocks;
 	off_t add_size = 0;
 	int fd, ret;
 
 	BURN_ALLOC_MEM(testpath, char, 4096);
 	testpath[0] = 0;
-	blocks = *bytes / 512;
 	if (stat(path, &stbuf) == -1) {
 		strcpy(testpath, path);
 		cpt = strrchr(testpath, '/');
@@ -744,7 +742,9 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
 
 	} else if(S_ISBLK(stbuf.st_mode)) {
 		int open_mode = O_RDWR, fd, ret;
+		long blocks;
 
+		blocks = *bytes / 512;
 		if(burn_sg_open_o_excl)
 			open_mode |= O_EXCL;
 		fd = open(path, open_mode);

libburn/sg-freebsd.c

@@ -1,8 +1,9 @@
 /* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */
 
 /* 
-   Copyright (c) 2006 - 2011 Thomas Schmitt <scdbackup@gmx.net>
-   Provided under GPL version 2 or later.
+   Copyright (c) 2006 - 2013 Thomas Schmitt <scdbackup@gmx.net>
+   Provided under GPL version 2 or later
+        and under FreeBSD license revised, i.e. without advertising clause.
 */
 
 #ifdef HAVE_CONFIG_H
@@ -447,7 +448,7 @@ static void enumerate_common(char *fname, int bus_no, int host_no,
 	out.channel = channel_no;
 	out.lun = lun_no;
 
-	out.devname = burn_strdup(fname);
+	out.devname = strdup(fname);
 
 	out.cam = NULL;
 	out.lock_fd = -1;
@@ -476,7 +477,7 @@ static void enumerate_common(char *fname, int bus_no, int host_no,
 	out.read_toc = mmc_read_toc;
 	out.write = mmc_write;
 	out.erase = mmc_erase;
-	out.read_sectors = mmc_read_sectors;
+	out.read_cd = mmc_read_cd;
 	out.perform_opc = mmc_perform_opc;
 	out.set_speed = mmc_set_speed;
 	out.send_parameters = spc_select_error_params;
@@ -491,13 +492,13 @@ static void enumerate_common(char *fname, int bus_no, int host_no,
 	out.idata = calloc(1, sizeof(struct burn_scsi_inquiry_data));
 	out.idata->valid = 0;
 	out.mdata = calloc(1, sizeof(struct scsi_mode_data));
-	out.mdata->valid = 0;
 	if (out.idata == NULL || out.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);
 		return;
 	}
+	out.mdata->p2a_valid = 0;
 	memset(&out.params, 0, sizeof(struct params));
 	t = burn_drive_register(&out);
 
@@ -507,12 +508,9 @@ static void enumerate_common(char *fname, int bus_no, int host_no,
 
 /* try to get the drive info */
 	if (t->grab(t)) {
-		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 A60821
@@ -750,10 +748,8 @@ int sg_release(struct burn_drive *d)
 	if (mmc_function_spy(d, "sg_release") <= 0)
 		return 0;
 
-	if (d->cam == NULL) {
-		burn_print(1, "release an ungrabbed drive.  die\n");
+	if (d->cam == NULL)
 		return 0;
-	}
 
 	mmc_function_spy(NULL, "sg_release ----------- closing.");
 
@@ -764,7 +760,7 @@ int sg_release(struct burn_drive *d)
 
 int sg_issue_command(struct burn_drive *d, struct command *c)
 {
-	int done = 0, err, sense_len = 0, ret, ignore_error, no_retry = 0, i;
+	int done = 0, err, sense_len = 0, ret, ignore_error, i;
 	int cam_pass_err_recover = 0, key, asc, ascq, timeout_ms;
 	union ccb *ccb;
 	static FILE *fp = NULL;
@@ -772,10 +768,11 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 
 	mmc_function_spy(NULL, "sg_issue_command");
 
-	if (d->cam == NULL) {
-		c->error = 0;
+	c->error = 0;
+	memset(c->sense, 0, sizeof(c->sense));
+
+	if (d->cam == NULL)
 		return 0;
-	}
 	if (burn_sg_log_scsi & 1) {
 		if (fp == NULL) {
 			fp= fopen("/tmp/libburn_sg_command_log", "a");
@@ -787,6 +784,10 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 		scsi_log_cmd(c,fp,0);
 
 	c->error = 0;
+	if (c->timeout > 0)
+		timeout_ms = c->timeout;
+	else
+		timeout_ms = 200000;
 
 	ccb = cam_getccb(d->cam);
 	cam_fill_csio(&ccb->csio,
@@ -798,7 +799,7 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 				  0,                              /* dxfer_len */
 				  sizeof (ccb->csio.sense_data),  /* sense_len */
 				  0,                              /* cdb_len */
-				  30*1000);                       /* timeout */
+				  timeout_ms);                    /* timeout */
 	switch (c->dir) {
 	case TO_DRIVE:
 		ccb->csio.ccb_h.flags |= CAM_DIR_OUT;
@@ -831,8 +832,6 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 	ccb->csio.cdb_len = c->oplen;
 	memcpy(&ccb->csio.cdb_io.cdb_bytes, &c->opcode, c->oplen);
 	
-	memset(&ccb->csio.sense_data, 0, sizeof (ccb->csio.sense_data));
-
 	if (c->page) {
 		ccb->csio.data_ptr  = c->page->data;
 		if (c->dir == FROM_DRIVE) {
@@ -858,11 +857,15 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 	}
 
 	start_time = time(NULL);
-	timeout_ms = 200000;
 	for (i = 0; !done; i++) {
+
+		memset(&ccb->csio.sense_data, 0, sizeof(ccb->csio.sense_data));
 		memset(c->sense, 0, sizeof(c->sense));
+		c->start_time = burn_get_time(0);
+
 		err = cam_send_ccb(d->cam, ccb);
 
+		c->end_time = burn_get_time(0);
 		ignore_error = sense_len = 0;
 		/* ts B00325 : CAM_AUTOSNS_VALID advised by Alexander Motin */
 		if (ccb->ccb_h.status & CAM_AUTOSNS_VALID) {
@@ -957,19 +960,14 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 				c->sense[2] = 0x02;
 				c->sense[12] = 0x04;
 				c->sense[13] = 0x00;
-				no_retry = 1;
+				done = 1;
 			}
-
-			/* >>> Need own duration time measurement.
-			       Then remove bit1 from flag.
-			*/
-			done = scsi_eval_cmd_outcome(d, c, fp, c->sense,
-						sense_len, 0, start_time,
-						timeout_ms, i,
-						2 | !!ignore_error);
-		} else {
-			done = 1;
 		}
+		done = scsi_eval_cmd_outcome(d, c, fp, c->sense,
+						sense_len, start_time,
+						timeout_ms, i, !!ignore_error);
+		if (d->cancel)
+			done = 1;
 	} while (!done);
 	ret = 1;
 ex:;
@@ -985,12 +983,13 @@ ex:;
 int burn_os_is_2k_seekrw(char *path, int flag)
 {
         struct stat stbuf;
+#ifdef Libburn_DIOCGMEDIASIZE_ISBLK
+	int fd, ret;
+	off_t add_size;
+#else
 	char *spt;
 	int i, e;
-#ifdef Libburn_DIOCGMEDIASIZE_ISBLK
-	int fd;
-	off_t add_size;
-#endif
+#endif /* ! Libburn_DIOCGMEDIASIZE_ISBLK */
 
         if (stat(path, &stbuf) == -1)
                 return 0;
@@ -1010,7 +1009,7 @@ int burn_os_is_2k_seekrw(char *path, int flag)
 	ret = ioctl(fd, DIOCGMEDIASIZE, &add_size);
 	close(fd);
 
-	return 1;
+	return (ret != -1);
 
 #else /* Libburn_DIOCGMEDIASIZE_ISBLK */
 
@@ -1057,13 +1056,11 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
 	struct stat stbuf;
 	struct statvfs vfsbuf;
 	char *testpath = NULL, *cpt;
-	long blocks;
 	off_t add_size = 0;
 	int fd, ret;
 
 	BURN_ALLOC_MEM(testpath, char, 4096);
 	testpath[0] = 0;
-	blocks = *bytes / 512;
 	if (stat(path, &stbuf) == -1) {
 		strcpy(testpath, path);
 		cpt = strrchr(testpath, '/');
@@ -1080,7 +1077,9 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
 
 	} else if(S_ISBLK(stbuf.st_mode)) {
 		int open_mode = O_RDWR, fd, ret;
+		long blocks;
 
+		blocks = *bytes / 512;
 		if(burn_sg_open_o_excl)
 			open_mode |= O_EXCL;
 		fd = open(path, open_mode);

libburn/sg-libcdio.c

@@ -1,7 +1,7 @@
 /* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */
 
 /*
-   Copyright (c) 2009 - 2011 Thomas Schmitt <scdbackup@gmx.net>
+   Copyright (c) 2009 - 2013 Thomas Schmitt <scdbackup@gmx.net>
    Provided under GPL version 2 or later.
 */
 
@@ -142,6 +142,9 @@ Send feedback to libburn-hackers@pykix.org .
 #define Libburn_is_on_solariS 1
 #endif
 
+/* Proposal by Rocky Bernstein to avoid macro clashes with cdio_config.h */
+#define __CDIO_CONFIG_H__ 1
+
 #include <cdio/cdio.h>
 #include <cdio/logging.h>
 #include <cdio/mmc.h>
@@ -259,7 +262,7 @@ try_next:;
 	}
 #endif
 
-	if (strlen(*(idx->pos)) >= adr_size)
+	if ((ssize_t) strlen(*(idx->pos)) >= adr_size)
 		return -1;
 	strcpy(adr, *(idx->pos));
 	(idx->pos)++;
@@ -440,7 +443,7 @@ int sg_give_next_adr(burn_drive_enumerator_t *idx,
 	ret = sg_give_next_adr_raw(idx, adr, adr_size, initialize);
 	if (ret <= 0)
 		goto ex;
-	if (strlen(adr) >= path_size)
+	if ((ssize_t) strlen(adr) >= path_size)
 		goto ex;
 
 #ifdef Libburn_is_on_solariS
@@ -453,8 +456,8 @@ int sg_give_next_adr(burn_drive_enumerator_t *idx,
 #endif /* Libburn_is_on_solariS */
 
 	ret = burn_drive_resolve_link(adr, path, &recursion_count, 2);
-        if(ret > 0 && strlen(path) < adr_size)
-		strcpy(path, adr);
+        if(ret > 0 && (ssize_t) strlen(path) < adr_size)
+		strcpy(adr, path);
 	ret = (ret >= 0);
 ex:
 	BURN_FREE_MEM(path);
@@ -594,10 +597,8 @@ ex:;
 */
 int sg_release(struct burn_drive *d)
 {
-	if (d->p_cdio == NULL) {
-		burn_print(1, "release an ungrabbed drive.  die\n");
+	if (d->p_cdio == NULL)
 		return 0;
-	}
 	sg_close_drive(d);
 	return 0;
 }
@@ -614,7 +615,7 @@ int sg_release(struct burn_drive *d)
 */
 int sg_issue_command(struct burn_drive *d, struct command *c)
 {
-	int sense_valid = 0, i, timeout_ms, no_retry = 0;
+	int sense_valid = 0, i, timeout_ms, sense_len;
 	int key = 0, asc = 0, ascq = 0, done = 0;
 	time_t start_time;
         driver_return_code_t i_status;
@@ -623,9 +624,11 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 	mmc_cdb_t cdb = {{0, }};
 	cdio_mmc_direction_t e_direction;
 	CdIo_t *p_cdio;
-	unsigned char *sense_pt = NULL;
+	cdio_mmc_request_sense_t *sense_pt = NULL;
 
 	c->error = 0;
+	memset(c->sense, 0, sizeof(c->sense));
+
 	if (d->p_cdio == NULL) {
 		return 0;
 	}
@@ -659,16 +662,24 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 		
 	/* retry-loop */
 	start_time = time(NULL);
-	timeout_ms = 200000;
+	if (c->timeout > 0)
+		timeout_ms = c->timeout;
+	else
+		timeout_ms = 200000;
 	for(i = 0; !done; i++) {
 
+		memset(c->sense, 0, sizeof(c->sense));
+		c->start_time = burn_get_time(0);
+
 		i_status = mmc_run_cmd(p_cdio, timeout_ms, &cdb, e_direction,
 				 	dxfer_len, c->page->data);
+
+		c->end_time = burn_get_time(0);
 		sense_valid = mmc_last_cmd_sense(p_cdio, &sense_pt);
 		if (sense_valid >= 18) {
-			memcpy(c->sense, sense_pt,
-				sense_valid >= sizeof(c->sense) ?
-				sizeof(c->sense) : sense_valid );
+			memcpy(c->sense, (unsigned char *) sense_pt,
+				(size_t) sense_valid >= sizeof(c->sense) ?
+				sizeof(c->sense) : (size_t) sense_valid );
 			spc_decode_sense(c->sense, 0, &key, &asc, &ascq);
 		} else
 			key = asc = ascq = 0;
@@ -701,13 +712,16 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 				c->sense[0] = 0x70; /*Fixed format sense data*/
 				c->sense[2] = 0x02;
 				c->sense[12] = 0x04;
-				no_retry = 1;
+				done = 1;
 			}
 		} 
-		if (i_status != 0 || (key || asc || ascq)) {
-			done = scsi_eval_cmd_outcome(d, c, fp,  c->sense, 18,
-					0, start_time, timeout_ms, i, 2);
-		} else
+		if (key || asc || ascq)
+			sense_len = 18;
+		else
+			sense_len = 0;
+		done = scsi_eval_cmd_outcome(d, c, fp,  c->sense, sense_len,
+					     start_time, timeout_ms, i, 0);
+		if (d->cancel)
 			done = 1;
 
 	} /* end of retry-loop */
@@ -860,13 +874,11 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
 #endif
 
 	char *testpath = NULL, *cpt;
-	long blocks;
 	off_t add_size = 0;
 	int ret;
 
 	BURN_ALLOC_MEM(testpath, char, 4096);
 	testpath[0] = 0;
-	blocks = *bytes / 512;
 	if (stat(path, &stbuf) == -1) {
 		strcpy(testpath, path);
 		cpt = strrchr(testpath, '/');
@@ -883,8 +895,10 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
 
 	/* GNU/Linux specific determination of block device size */
 	} else if(S_ISBLK(stbuf.st_mode)) {
-		int open_mode = O_RDONLY, fd, ret;
+		int open_mode = O_RDONLY, fd;
+		long blocks;
 
+		blocks = *bytes / 512;
 		fd = open(path, open_mode);
 		if (fd == -1)
 			{ret = -2; goto ex;}
@@ -899,7 +913,7 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
 #ifdef Libburn_is_on_freebsD
 
 	} else if(S_ISCHR(stbuf.st_mode)) {
-		int fd, ret;
+		int fd;
 
 		fd = open(path, O_RDONLY);
 		if (fd == -1)

libburn/sg-linux.c

@@ -1,7 +1,7 @@
 /* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */
 
 /* Copyright (c) 2004 - 2006 Derek Foreman, Ben Jansens
-   Copyright (c) 2006 - 2011 Thomas Schmitt <scdbackup@gmx.net>
+   Copyright (c) 2006 - 2014 Thomas Schmitt <scdbackup@gmx.net>
    Provided under GPL version 2 or later.
 */
 
@@ -185,6 +185,8 @@ static int linux_sg_enumerate_debug = 0;
    E.g.: "/dev/sg%d"
    sr%d is supposed to map only CD-ROM style devices. Additionally a test
    with ioctl(CDROM_DRIVE_STATUS) is made to assert that it is such a drive,
+   If no such assertion is made, then this adapter performs INQUIRE and
+   looks for first reply byte 0x05.
 
    This initial setting may be overridden in sg_select_device_family() by 
    settings made via burn_preset_device_open().
@@ -252,9 +254,13 @@ int burn_drive_is_banned(char *device_address);
 /* ------------------------------------------------------------------------ */
 
 
-static void enumerate_common(char *fname, int bus_no, int host_no,
+static void enumerate_common(char *fname, int fd_in, int bus_no, int host_no,
 			     int channel_no, int target_no, int lun_no);
 
+static int sg_obtain_scsi_adr_fd(char *path, int fd_in,
+				 int *bus_no, int *host_no, int *channel_no,
+				 int *target_no, int *lun_no);
+
 
 /* ts A60813 : storage objects are in libburn/init.c
    whether to use O_EXCL with open(2) of devices
@@ -372,10 +378,49 @@ static int sg_exchange_scd_for_sr(char *fname, int flag)
 }
 
 
+/* ts B11110 */
+/* This is an early stage version of scsi_log_cmd.
+   >>> It will become obsolete when the /tmp file handler is moved into
+   >>> scsi_log_command().
+*/
+static int sgio_log_cmd(unsigned char *cmd, int cmd_len, FILE *fp_in, int flag)
+{
+	FILE *fp = fp_in;
+	int ret;
+
+	/* >>> ts B11110 : move this into scsi_log_command() */
+	if (fp == NULL && (burn_sg_log_scsi & 1)) {
+		fp= fopen("/tmp/libburn_sg_command_log", "a");
+		fprintf(fp, "\n=========================================\n");
+	}
+
+	ret = scsi_log_command(cmd, cmd_len, NO_TRANSFER, NULL, 0, fp, flag);
+	if (fp_in == NULL && fp != NULL)
+		fclose(fp);
+	return ret;
+}
+
+
+/* ts B11110 */
+static int sgio_log_reply(unsigned char *opcode, int data_dir,
+                          unsigned char *data, int dxfer_len,
+                          void *fp_in, unsigned char sense[18], int sense_len,
+                          double duration, int flag)
+{
+	int ret;
+
+	ret = scsi_log_reply(opcode, data_dir, data, dxfer_len, fp_in,
+	                   sense, sense_len, duration, flag);
+	return ret;
+}
+
+
 static int sgio_test(int fd)
 {
 	unsigned char test_ops[] = { 0, 0, 0, 0, 0, 0 };
 	sg_io_hdr_t s;
+	int ret;
+	double c_start_time, c_end_time;
 
 	memset(&s, 0, sizeof(sg_io_hdr_t));
 	s.interface_id = 'S';
@@ -383,7 +428,99 @@ static int sgio_test(int fd)
 	s.cmd_len = 6;
 	s.cmdp = test_ops;
 	s.timeout = 12345;
-	return ioctl(fd, SG_IO, &s);
+
+	sgio_log_cmd(s.cmdp, s.cmd_len, NULL, 0);
+
+	c_start_time = burn_get_time(0);
+	ret= ioctl(fd, SG_IO, &s);
+	c_end_time = burn_get_time(0);
+
+	sgio_log_reply(s.cmdp, NO_TRANSFER, NULL, 0, NULL,
+	               (unsigned char *) (s.sbp),
+	               s.sb_len_wr, c_end_time - c_start_time, 0);
+	return ret;
+}
+
+
+static int sgio_inquiry_cd_drive(int fd, char *fname)
+{
+	unsigned char test_ops[] = { 0x12, 0, 0, 0, 36, 0 };
+	sg_io_hdr_t s;
+	struct buffer *buf = NULL;
+	unsigned char *sense = NULL;
+	char *msg = NULL, *msg_pt;
+	int ret = 0, i;
+	double c_start_time, c_end_time;
+
+	BURN_ALLOC_MEM(buf, struct buffer, 1);
+	BURN_ALLOC_MEM(sense, unsigned char, 128);
+	BURN_ALLOC_MEM(msg, char, strlen(fname) + 1024);
+
+	memset(&s, 0, sizeof(sg_io_hdr_t));
+	s.interface_id = 'S';
+	s.dxfer_direction = SG_DXFER_FROM_DEV;
+	s.cmd_len = 6;
+	s.cmdp = test_ops;
+	s.mx_sb_len = 32;
+	s.sbp = sense;
+	s.timeout = 30000;
+	s.dxferp = buf;
+	s.dxfer_len = 36;
+	s.usr_ptr = NULL;
+
+	sgio_log_cmd(s.cmdp, s.cmd_len, NULL, 0);
+
+	c_start_time = burn_get_time(0);
+	ret = ioctl(fd, SG_IO, &s);
+	c_end_time = burn_get_time(0);
+	if (ret == -1) {
+		sprintf(msg,
+			 "INQUIRY on '%s' : ioctl(SG_IO) failed , errno= %d",
+			 fname, errno);
+		libdax_msgs_submit(libdax_messenger, -1, 0x00000002,
+			LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
+			msg, 0, 0);
+		goto ex;
+	}
+
+	sgio_log_reply(s.cmdp, FROM_DRIVE, buf->data, s.dxfer_len, NULL,
+	               (unsigned char *) (s.sbp),
+	               s.sb_len_wr, c_end_time - c_start_time, 0);
+
+	if (s.sb_len_wr > 0 || s.host_status != Libburn_sg_host_oK ||
+	    s.driver_status != Libburn_sg_driver_oK) {
+		sprintf(msg, "INQUIRY failed on '%s' : host_status= %hd , driver_status= %hd", fname, s.host_status, s.driver_status);
+		if (s.sb_len_wr > 0) {
+			sprintf(msg + strlen(msg), " , sense data=");
+			msg_pt = msg + strlen(msg);
+			for (i = 0 ; i < s.sb_len_wr; i++)
+				sprintf(msg_pt + i * 3, " %2.2X",
+				        ((unsigned char *) (s.sbp))[i]);
+		}
+		libdax_msgs_submit(libdax_messenger, -1, 0x00000002,
+			LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
+			msg, 0, 0);
+		ret = -1;
+		goto ex;
+	}
+	ret = 0;
+	if (buf->data[0] == 0x5) {
+		/* Peripheral qualifier 0, device type 0x5 = CD/DVD device.
+		   SPC-3 tables 82 and 83  */
+		ret = 1;
+	} else {
+		sprintf(msg, "INQUIRY on '%s' : byte 0 = 0x%2.2X",
+			 fname, buf->data[0]);
+		libdax_msgs_submit(libdax_messenger, -1, 0x00000002,
+			LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
+			msg, 0, 0);
+	}
+
+ex:;
+	BURN_FREE_MEM(msg);
+	BURN_FREE_MEM(sense);
+	BURN_FREE_MEM(buf);
+	return ret;
 }
 
 
@@ -558,10 +695,15 @@ static int sg_fcntl_lock(int *fd, char *fd_name, int l_type, int verbous)
 
 
 /* ts A60926 */
+/* @param scan_mode  0= open for drivce aquiration
+                     1= open for scanning with guessed names
+                     2= open for scanning with /proc/sys/dev/cdrom/info names
+*/
 static int sg_open_drive_fd(char *fname, int scan_mode)
 {
-	int open_mode = O_RDWR, fd, tries= 0;
+	int open_mode = O_RDWR, fd, tries= 0, is_std_adr, report_as_note = 0;
 	char msg[81];
+	struct stat stbuf;
 
 	/* ts A70409 : DDLP-B */
 	/* >>> obtain single lock on fname */
@@ -576,6 +718,7 @@ static int sg_open_drive_fd(char *fname, int scan_mode)
 	   O_NONBLOCK was already hardcoded in ata_ but not in sg_.
 	   There must be some reason for this. So O_NONBLOCK is
 	   default mode for both now. Disable on own risk.
+           ts B10904: O_NONBLOCK is prescribed by <linux/cdrom.h>
 	   ts A70411
            Switched to O_NDELAY for LKML statement 2007/4/11/141 by Alan Cox:
 	   "open() has side effects. The CD layer allows you to open
@@ -617,12 +760,26 @@ try_open:;
 			return -1;
 			
 		}
-		if (scan_mode)
-			return -1;
 		sprintf(msg, "Failed to open device '%s'",fname);
-		libdax_msgs_submit(libdax_messenger, -1, 0x00020005,
+		if (scan_mode) {
+			is_std_adr = (strncmp(fname, "/dev/sr", 7) == 0 ||
+			              strncmp(fname, "/dev/scd", 8) == 0);
+			if(scan_mode == 1 && is_std_adr &&
+			   stat(fname, &stbuf) != -1)
+				report_as_note = 1;
+			else if(scan_mode == 2 && (!is_std_adr) &&
+			        stat(fname, &stbuf) != -1)
+				report_as_note = 1;
+			if (report_as_note)
+				libdax_msgs_submit(libdax_messenger, -1,
+				   0x0002000e,
+				   LIBDAX_MSGS_SEV_NOTE, LIBDAX_MSGS_PRIO_HIGH,
+				   msg, errno, 0);
+		} else {
+			libdax_msgs_submit(libdax_messenger, -1, 0x00020005,
 				LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
 				msg, errno, 0);
+		}
 		return -1;
 	}
 	sg_fcntl_lock(&fd, fname, F_WRLCK, 1);
@@ -756,12 +913,15 @@ failed:;
 
 
 /* ts A80731 */
-static int is_ata_drive(char *fname)
+static int is_ata_drive(char *fname, int fd_in)
 {
 	int fd;
 	struct hd_driveid tm;
 
-	fd = sg_open_drive_fd(fname, 1);
+	if (fd_in >= 0)
+		fd = fd_in;
+	else
+		fd = sg_open_drive_fd(fname, 1);
 	if (fd == -1) {
 		if (linux_ata_enumerate_verbous)
 			fprintf(stderr,"open failed, errno=%d  '%s'\n",
@@ -776,7 +936,8 @@ static int is_ata_drive(char *fname)
 	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);
+		if (fd_in < 0)
+			sg_close_drive_fd(fname, -1, &fd, 0);
 		return 0;
 	}
 
@@ -787,9 +948,12 @@ static int is_ata_drive(char *fname)
 		  fprintf(stderr,
 			 "FATAL: sgio_test() failed: errno=%d  '%s'\n",
 			 errno, strerror(errno));
-		sg_close_drive_fd(fname, -1, &fd, 0);
+		if (fd_in < 0)
+			sg_close_drive_fd(fname, -1, &fd, 0);
 		return 0;
 	}
+	if (fd_in >= 0)
+		return 1;
 	if (sg_close_drive_fd(fname, -1, &fd, 1) <= 0) {
 		if (linux_ata_enumerate_verbous)
 			fprintf(stderr,
@@ -801,10 +965,10 @@ static int is_ata_drive(char *fname)
 }
 
 
-static int is_scsi_drive(char *fname, int *bus_no, int *host_no,
+static int is_scsi_drive(char *fname, int fd_in, int *bus_no, int *host_no,
 			 int *channel_no, int *target_no, int *lun_no)
 {
-	int fd, sid_ret = 0, ret;
+	int fd = -1, sid_ret = 0, ret, fail_sev_sorry = 0;
 	struct sg_scsi_id sid;
 	int *sibling_fds = NULL, sibling_count= 0;
 	typedef char burn_sg_sibling_fname[BURN_OS_SG_MAX_NAMELEN];
@@ -814,14 +978,16 @@ static int is_scsi_drive(char *fname, int *bus_no, int *host_no,
 	BURN_ALLOC_MEM(sibling_fnames, burn_sg_sibling_fname,
 			BURN_OS_SG_MAX_SIBLINGS);
 
-	fd = sg_open_drive_fd(fname, 1);
+	if (fd_in >= 0)
+		fd = fd_in;
+	else
+		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));
 		{ret = 0; goto ex;}
 	}
-
 	sid_ret = ioctl(fd, SG_GET_SCSI_ID, &sid);
 	if (sid_ret == -1) {
 		sid.scsi_id = -1; /* mark SCSI address as invalid */
@@ -836,7 +1002,6 @@ static int is_scsi_drive(char *fname, int *bus_no, int *host_no,
 				 "FATAL: sgio_test() failed: errno=%d  '%s'",
 				errno, strerror(errno));
 
-			sg_close_drive_fd(fname, -1, &fd, 0);
 			{ret = 0; goto ex;}
 		}
 
@@ -856,20 +1021,22 @@ static int is_scsi_drive(char *fname, int *bus_no, int *host_no,
 
 	}
 
+	if (sid_ret == -1) {
+		/* ts B11109 : Try device type from INQUIRY byte 0 */
+		if (sgio_inquiry_cd_drive(fd, fname) == 1) {
+			sid_ret = 0;
+			sid.scsi_type = TYPE_ROM;
+		}
+	}
+
+
 #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)); 
-		{ret = 0; goto ex;}
-	}
+	fail_sev_sorry = (sid.scsi_type == TYPE_ROM);
 	if ( (sid_ret == -1 || sid.scsi_type != TYPE_ROM)
 	     && !linux_sg_accept_any_type) {
 		if (linux_sg_enumerate_debug)
@@ -880,7 +1047,8 @@ static int is_scsi_drive(char *fname, int *bus_no, int *host_no,
 
 	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,
+		/* ts B11001 : re-use fd */
+		ret = sg_obtain_scsi_adr_fd(fname, fd, bus_no, host_no,
 					   channel_no, target_no, lun_no);
 		if (ret>0) {
 			sid.host_no = *host_no;
@@ -890,7 +1058,7 @@ static int is_scsi_drive(char *fname, int *bus_no, int *host_no,
 		} else {
 			if (linux_sg_enumerate_debug)
 				fprintf(stderr,
-					"sg_obtain_scsi_adr() failed\n");
+					"sg_obtain_scsi_adr_fd() failed\n");
 			{ret = 0; goto ex;}
 		}
 	}
@@ -924,18 +1092,43 @@ static int is_scsi_drive(char *fname, int *bus_no, int *host_no,
 	*lun_no= sid.lun;
 	ret = 1;
 ex:;
+	if (fd_in < 0 && fd >= 0) {
+		if (sg_close_drive_fd(fname, -1, &fd, fail_sev_sorry) <= 0) {
+			if (linux_sg_enumerate_debug)
+				fprintf(stderr,
+				"cannot close properly, errno=%d  '%s'\n",
+				errno, strerror(errno)); 
+			if (ret > 0)
+				ret = 0;
+		}
+	}
 	BURN_FREE_MEM(sibling_fds);
 	BURN_FREE_MEM(sibling_fnames);
 	return ret;
 }	
 
 
+/* @param flag bit0= do not complain about failure to open /dev/sr /dev/scd */
+static int sg_open_for_enumeration(char *fname, int flag)
+{
+	int fd;
+
+	fd = sg_open_drive_fd(fname, 1 + (flag & 1));
+	if (fd < 0) {
+		if (linux_sg_enumerate_debug || linux_ata_enumerate_verbous)
+			fprintf(stderr, "open failed, errno=%d  '%s'\n",
+				errno, strerror(errno));
+		return -1;
+	}
+	return fd;
+}
+
+
 /** Speciality of GNU/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)
 {
-	int ret;
-	int i;
+	int ret, i, fd = -1;
 	char fname[10];
 
 	if (linux_ata_enumerate_verbous)
@@ -956,14 +1149,17 @@ static void ata_enumerate(void)
 				fprintf(stderr, "not in whitelist\n");
 	continue;
 		}
-		ret = is_ata_drive(fname);
+		fd = sg_open_for_enumeration(fname, 0);
+		if (fd < 0)
+	continue;
+		ret = is_ata_drive(fname, fd);
 		if (ret < 0)
 	break;
 		if (ret == 0)
 	continue;
 		if (linux_ata_enumerate_verbous)
 		  fprintf(stderr, "accepting as drive without SCSI address\n");
-		enumerate_common(fname, -1, -1, -1, -1, -1);
+		enumerate_common(fname, fd, -1, -1, -1, -1, -1);
 	}
 }
 
@@ -971,7 +1167,7 @@ static void ata_enumerate(void)
 /** Detects (probably emulated) SCSI drives */
 static void sg_enumerate(void)
 {
-	int i, ret;
+	int i, ret, fd = -1;
 	int bus_no= -1, host_no= -1, channel_no= -1, target_no= -1, lun_no= -1;
 	char fname[17];
 
@@ -999,8 +1195,11 @@ static void sg_enumerate(void)
 			  fprintf(stderr, "not in whitelist\n"); 
 	continue;
 		}
+		fd = sg_open_for_enumeration(fname, 0);
+		if (fd < 0)
+	continue;
 
-		ret = is_scsi_drive(fname, &bus_no, &host_no, &channel_no,
+		ret = is_scsi_drive(fname, fd, &bus_no, &host_no, &channel_no,
 							&target_no, &lun_no);
 		if (ret < 0)
 	break;
@@ -1009,7 +1208,7 @@ static void sg_enumerate(void)
 		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, 
+		enumerate_common(fname, fd, bus_no, host_no, channel_no, 
 				target_no, lun_no);
 
 	}
@@ -1055,10 +1254,11 @@ static int fname_drive_is_listed(char *fname, int flag)
 /* 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
+               bit2= do not complain about failure to open /dev/sr /dev/scd
 */
 static int fname_enumerate(char *fname, int flag)
 {
-	int is_ata= 0, is_scsi= 0, ret;
+	int is_ata= 0, is_scsi= 0, ret, fd = -1;
 	int bus_no= -1, host_no= -1, channel_no= -1, target_no= -1, lun_no= -1;
 	char *msg = NULL;
 	struct stat stbuf;
@@ -1076,13 +1276,16 @@ static int fname_enumerate(char *fname, int flag)
 			  msg, 0, 0);
 		{ret = -1; goto ex;}
 	}
-	
-	is_ata = is_ata_drive(fname);
+
+	fd = sg_open_for_enumeration(fname, !!(flag & 4));
+	if (fd < 0)
+		{ret = 0; goto ex;}
+	is_ata = is_ata_drive(fname, fd);
 	if (is_ata < 0)
 		{ret = -1; goto ex;}
 	if (!is_ata)
-		is_scsi = is_scsi_drive(fname, &bus_no, &host_no, &channel_no,
-					&target_no, &lun_no);
+		is_scsi = is_scsi_drive(fname, fd, &bus_no, &host_no,
+					&channel_no, &target_no, &lun_no);
 	if (is_scsi < 0)
 		{ret = -1; goto ex;}
 	if (is_ata == 0 && is_scsi == 0)
@@ -1092,7 +1295,8 @@ static int fname_enumerate(char *fname, int flag)
 		  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, 
+
+	enumerate_common(fname, fd, bus_no, host_no, channel_no, 
 				target_no, lun_no);
 	ret = 1;
 ex:;
@@ -1216,13 +1420,16 @@ static int add_proc_info_drives(int flag)
 	int ret, list_count, count = 0, i;
 	char **list= NULL;
 
+	if (burn_sg_use_family != 0)
+		return(1); /* Looking only for sr resp. scd resp. sg */
+
 	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);
+		ret = fname_enumerate(list[i], 1 | 4);
 		if (ret == 1)
 			count++;
 	}
@@ -1245,7 +1452,7 @@ static int add_proc_info_drives(int flag)
 */
 /* ts A60923 - A61005 : introduced new SCSI parameters */
 /* ts A61021 : moved non os-specific code to spc,sbc,mmc,drive */
-static void enumerate_common(char *fname, int bus_no, int host_no,
+static void enumerate_common(char *fname, int fd_in, int bus_no, int host_no,
 			     int channel_no, int target_no, int lun_no)
 {
 	int ret, i;
@@ -1277,8 +1484,12 @@ static void enumerate_common(char *fname, int bus_no, int host_no,
 	out.release = sg_release;
 	out.drive_is_open= sg_drive_is_open;
 	out.issue_command = sg_issue_command;
+	if (fd_in >= 0)
+		out.fd = fd_in;
 
-	/* Finally register drive and inquire drive information */
+	/* Finally register drive and inquire drive information.
+	   out is an invalid copy afterwards. Do not use it for anything.
+	 */
 	burn_drive_finish_enum(&out);
 }
 
@@ -1530,6 +1741,39 @@ int sg_grab(struct burn_drive *d)
 	   relase of drive. Unclear why not the official error return
 	   value -1 of open(2) war used. */
 	if(! burn_drive_is_open(d)) {
+		char msg[120];
+
+/* >>> SINGLE_OPEN : This case should be impossible now, since enumeration
+                     transfers the fd from scanning to drive.
+                     So if close-wait-open is desired, then it has to
+                     be done unconditionally.
+*/
+
+#ifndef Libburn_udev_wait_useC
+#define Libburn_udev_wait_useC 100000
+#endif
+
+#ifndef Libburn_udev_extra_open_cyclE
+
+	if (Libburn_udev_wait_useC > 0) {
+		/* ts B10921 : workaround for udev which might get
+				a kernel event from open() and might
+				remove links if it cannot inspect the
+				drive. This waiting period shall allow udev
+				to act after it was woken up by the drive scan
+				activities.
+		*/
+		sprintf(msg,
+	    "To avoid collision with udev: Waiting %lu usec before grabbing",
+				(unsigned long) Libburn_udev_wait_useC);
+		libdax_msgs_submit(libdax_messenger, -1, 0x00000002,
+				LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
+				msg, 0, 0);
+		usleep(Libburn_udev_wait_useC);
+	}
+
+#endif /* Libburn_udev_extra_open_cyclE */
+
 
 try_open:;
 		/* ts A60821
@@ -1549,9 +1793,36 @@ try_open:;
 			if(ret <= 0)
 				goto drive_is_in_use;
 		}
-
 		fd = open(d->devname, open_mode);
 		os_errno = errno;
+
+#ifdef Libburn_udev_extra_open_cyclE
+
+		/* ts B10920 : workaround for udev which might get
+				a kernel event from open() and might
+				remove links if it cannot inspect the
+				drive.
+		   ts B10921 : this is more obtrusive than above waiting
+				before open(). The drive scan already has
+				opened and closed the drive several times.
+				So it seems to be merely about giving an
+				opportunity to udev, before long term grabbing
+				happens.
+		*/
+		if (fd >= 0 && Libburn_udev_wait_useC > 0) {
+			close(fd);
+			sprintf(msg,
+	    "To avoid collision with udev: Waiting %lu usec before re-opening",
+				(unsigned long) Libburn_udev_wait_useC);
+			libdax_msgs_submit(libdax_messenger, -1, 0x00000002,
+				LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
+				msg, 0, 0);
+			usleep(Libburn_udev_wait_useC);
+			fd = open(d->devname, open_mode);
+			os_errno = errno;
+		}
+#endif /* Libburn_udev_extra_open_cyclE */
+
 		if (fd >= 0) {
 			sg_fcntl_lock(&fd, d->devname, F_WRLCK, 1);
 			if (fd < 0)
@@ -1575,6 +1846,10 @@ try_open:;
 drive_is_in_use:;
 	tries++;
 	if (tries < max_tries) {
+		libdax_msgs_submit(libdax_messenger, -1, 0x00000002,
+				LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
+			"Drive is in use. Waiting 2 seconds before re-try", 
+				0, 0);
 		usleep(2000000);
 		goto try_open;
 	}
@@ -1601,10 +1876,8 @@ int sg_release(struct burn_drive *d)
 	if (mmc_function_spy(d, "sg_release") <= 0)
 		return 0;
 
-	if (d->fd < 1) {
-		burn_print(1, "release an ungrabbed drive.  die\n");
+	if (d->fd < 1)
 		return 0;
-	}
 
 	/* ts A60821
    	<<< debug: for tracing calls which might use open drive fds */
@@ -1614,6 +1887,167 @@ int sg_release(struct burn_drive *d)
 	return 0;
 }
 
+/* @return -1= transport failed, give up drive
+            0= transport failed, do not retry
+            1= transport succeeded
+            2- transport failed, please retry
+*/
+static int evaluate_transport_success(struct burn_drive *d, struct command *c,
+                                      FILE *fp,
+                                      unsigned short host_status,
+                                      unsigned short driver_status)
+{
+	int ret, do_retry= 0, give_up_drive= 0, sev;
+	char *msg = NULL, *host_problem, *driver_problem, *driver_sugg;
+
+	BURN_ALLOC_MEM(msg, char, 161);
+
+	if ((host_status == Libburn_sg_host_oK &&
+             (driver_status & 0xf7) == Libburn_sg_driver_oK) || c->error)
+		{ret = 1; goto ex;} /* No transport problems */
+
+	/* See http://www.tldp.org/HOWTO/SCSI-Generic-HOWTO/x291.html */
+
+	switch(host_status) {
+	case 0x00:
+		host_problem =
+		"SG_ERR_DID_OK (No error)";
+	break; case 0x01:
+		host_problem =
+		"SG_ERR_DID_NO_CONNECT (Could not connect before timeout period)";
+		give_up_drive= 1;
+	break; case 0x02:
+		host_problem =
+		"SG_ERR_DID_BUS_BUSY (Bus stayed busy through time out period)";
+	break; case 0x03:
+		host_problem =
+		"SG_ERR_DID_TIME_OUT (Timed out for miscellaneous reasons)";
+	break; case 0x04:
+		host_problem =
+		"SG_ERR_DID_BAD_TARGET (Bad target, device not responding ?)";
+		give_up_drive= 1;
+	break; case 0x05:
+		host_problem =
+		"SG_ERR_DID_ABORT (Told to abort)";
+	break; case 0x06:
+		host_problem =
+		"SG_ERR_DID_PARITY (Parity error)";
+	break; case 0x07:
+		host_problem =
+		"SG_ERR_DID_ERROR (Internal error detected in the host adapter)";
+		give_up_drive= 1;
+	break; case 0x08:
+		host_problem =
+		"SG_ERR_DID_RESET (The SCSI bus or the device have been reset)";
+		give_up_drive= 1;
+	break; case 0x09:
+		host_problem =
+		"SG_ERR_DID_BAD_INTR (Got an unexpected interrupt)";
+	break; case 0x0a:
+		host_problem =
+		"SG_ERR_DID_PASSTHROUGH (Force command past mid-layer)";
+	break; case 0x0b:
+		host_problem =
+		"SG_ERR_DID_SOFT_ERROR (The low level driver wants a retry)";
+		do_retry = 1;
+	break; default:
+		host_problem =
+		"? (unknown host_status code)";
+	}
+	if (host_status != Libburn_sg_host_oK) {
+		sprintf(msg, "SCSI command %2.2Xh yielded host problem: ",
+			(unsigned int) c->opcode[0]);
+		sprintf(msg+strlen(msg), "0x%x %s",
+			(unsigned int) host_status, host_problem);
+		sev = LIBDAX_MSGS_SEV_FAILURE;
+		if (do_retry && !give_up_drive)
+			sev = LIBDAX_MSGS_SEV_DEBUG;
+		libdax_msgs_submit(libdax_messenger, d->global_index,
+			0x000201a7, sev, LIBDAX_MSGS_PRIO_HIGH, msg, 0, 0);
+		sprintf(msg, "--- SG_IO: host_status= 0x%x %s",
+			(unsigned int) host_status, host_problem);
+		scsi_log_message(d, fp, msg, 0);
+	}
+
+	switch (driver_status & 0x07) {
+	case 0:
+		driver_problem = "SG_ERR_DRIVER_OK";
+	break; case 1:
+		driver_problem = "SG_ERR_DRIVER_BUSY";
+	break; case 2:
+		driver_problem = "SG_ERR_DRIVER_SOFT";
+	break; case 3:
+		driver_problem = "SG_ERR_DRIVER_MEDIA";
+	break; case 4:
+		driver_problem = "SG_ERR_DRIVER_ERROR";
+	break; case 5:
+		driver_problem = "SG_ERR_DRIVER_INVALID";
+	break; case 6:
+		driver_problem = "SG_ERR_DRIVER_TIMEOUT";
+	break; case 7:
+		driver_problem = "SG_ERR_DRIVER_HARD";
+	break; default:
+		driver_problem = "(unknown driver_status code)";
+	}
+	switch (driver_status & 0xf0) {
+	case 0:
+		driver_sugg = "(no suggestion)";
+	break; case 0x10:
+		driver_sugg = "SG_ERR_SUGGEST_RETRY";
+		do_retry = 1;
+	break; case 0x20:
+		driver_sugg = "SG_ERR_SUGGEST_ABORT";
+		give_up_drive= 1;
+	break; case 0x30:
+		driver_sugg = "SG_ERR_SUGGEST_REMAP";
+		give_up_drive= 1;
+	break; case 0x40:
+		driver_sugg = "SG_ERR_SUGGEST_DIE";
+		give_up_drive= 1;
+	break; case 0x80:
+		driver_sugg = "SG_ERR_SUGGEST_SENSE";
+	default:
+		driver_sugg = "(unknown driver_status suggestion)";
+	}
+	if ((driver_status & 0xf7) != Libburn_sg_driver_oK) {
+		sprintf(msg, "SCSI command %2.2Xh yielded driver problem: ",
+			(unsigned int) c->opcode[0]);
+		sprintf(msg+strlen(msg), "driver_status= 0x%x %s / %s",
+			(unsigned int) driver_status,
+			driver_problem, driver_sugg);
+		sev = LIBDAX_MSGS_SEV_FAILURE;
+		if (do_retry && !give_up_drive)
+			sev = LIBDAX_MSGS_SEV_DEBUG;
+		libdax_msgs_submit(libdax_messenger, d->global_index,
+			0x000201a8, sev, LIBDAX_MSGS_PRIO_HIGH, msg, 0, 0);
+		sprintf(msg, "--- SG_IO: driver_status= 0x%x %s / %s",
+			(unsigned int) driver_status,
+			driver_problem, driver_sugg);
+		scsi_log_message(d, fp, msg, 0);
+	}
+
+	if (! do_retry)
+		c->error = 1;
+	ret = give_up_drive ? -1 : do_retry ? 2 : 0;
+ex:;
+	BURN_FREE_MEM(msg);
+	return ret;
+}
+
+static void react_on_drive_loss(struct burn_drive *d, struct command *c,
+                                FILE *fp)
+{
+	sg_close_drive(d);
+	d->released = 1;
+	d->busy = BURN_DRIVE_IDLE;
+	d->cancel = 1;
+	c->error = 1;
+	libdax_msgs_submit(libdax_messenger,
+				 d->global_index, 0x000201a6,
+				 LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
+				 "Lost connection to drive", 0, 0);
+	scsi_log_message(d, fp, "--- SG_IO: Gave up connection to drive", 0);
+}
 
 /** Sends a SCSI command to the drive, receives reply and evaluates wether
     the command succeeded or shall be retried or finally failed.
@@ -1634,12 +2068,17 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 
 	BURN_ALLOC_MEM(msg, char, 161);
 
+	c->error = 0;
+	memset(c->sense, 0, sizeof(c->sense));
+
 	/* <<< ts A60821
 	   debug: for tracing calls which might use open drive fds */
 	sprintf(msg, "sg_issue_command   d->fd= %d  d->released= %d\n",
 		d->fd, d->released);
 	mmc_function_spy(NULL, msg);
 
+	/* >>> ts B11110 : move this into scsi_log_cmd() together with the
+	                    static fp */
 	/* ts A61030 */
 	if (burn_sg_log_scsi & 1) {
 		if (fp == NULL) {
@@ -1648,8 +2087,6 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 			    "\n-----------------------------------------\n");
 		}
 	}
-	if (burn_sg_log_scsi & 3)
-		scsi_log_cmd(c,fp,0);
 
 	/* ts A61010 : with no fd there is no chance to send an ioctl */
 	if (d->fd < 0) {
@@ -1657,8 +2094,11 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 		{ret = 0; goto ex;}
 	}
 
+
 	c->error = 0;
 	memset(&s, 0, sizeof(sg_io_hdr_t));
+	if (burn_sg_log_scsi & 3)
+		scsi_log_cmd(c,fp,0);
 
 	s.interface_id = 'S';
 
@@ -1684,8 +2124,10 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 	s.cmdp = c->opcode;
 	s.mx_sb_len = 32;
 	s.sbp = c->sense;
-	memset(c->sense, 0, sizeof(c->sense));
-	s.timeout = 200000;
+	if (c->timeout > 0)
+		s.timeout = c->timeout;
+	else
+		s.timeout = Libburn_scsi_default_timeouT;
 	if (c->page && !no_c_page) {
 		s.dxferp = c->page->data;
 		if (c->dir == FROM_DRIVE) {
@@ -1719,8 +2161,14 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 
 	start_time = time(NULL);
 	for(i = 0; !done; i++) {
+
+		memset(c->sense, 0, sizeof(c->sense));
+		c->start_time = burn_get_time(0);
+
 		err = ioctl(d->fd, SG_IO, &s);
 
+		c->end_time = burn_get_time(0);
+
 		/* ts A61010 */
 		/* a ssert(err != -1); */
 		if (err == -1) {
@@ -1729,30 +2177,33 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 				 LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
 				 "Failed to transfer command to drive",
 				 errno, 0);
-			sg_close_drive(d);
-			d->released = 1;
-			d->busy = BURN_DRIVE_IDLE;
-			c->error = 1;
+			sprintf(msg, "--- SG_IO: return= -1 , ");
+		        sprintf(msg + strlen(msg), "errno= %d , ", errno);
+		        sprintf(msg + strlen(msg),
+			        "host_status= 0x%x , driver_status= 0x%x",
+			        (unsigned int) s.host_status,
+			        (unsigned int) s.driver_status);
+			scsi_log_message(d, fp, msg, 0);
+			react_on_drive_loss(d, c, fp);
 			{ret = -1; goto ex;}
 		}
-                done = scsi_eval_cmd_outcome(d, c, fp, s.sbp, s.sb_len_wr,
-				s.duration, start_time, s.timeout, i, 0);
+                done = scsi_eval_cmd_outcome(d, c, fp,
+		                             (unsigned char *) (s.sbp),
+		                             s.sb_len_wr,
+				             start_time, s.timeout, i, 0);
+		if (d->cancel)
+	break;
+		ret = evaluate_transport_success(d, c, fp,
+		                               s.host_status, s.driver_status);
+		if (ret == -1)
+			react_on_drive_loss(d, c, fp);
+		if (ret <= 0)
+			{ret = -1; goto ex;}
+		if (d->cancel)
+	break;
+		/* if ! done : loop for retry */;
 	}
 
-	if (s.host_status != Libburn_sg_host_oK || 
-	    (s.driver_status != Libburn_sg_driver_oK && !c->error)) {
-		sprintf(msg,
-			"SCSI command %2.2Xh indicates host or driver error:",
-			(unsigned int) c->opcode[0]);
-		sprintf(msg+strlen(msg),
-			" host_status= %xh , driver_status= %xh",
-			(unsigned int) s.host_status,
-			(unsigned int) s.driver_status);
-		libdax_msgs_submit(libdax_messenger, d->global_index,
-				0x0002013b,
-				LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
-				msg, 0, 0);
-	}
 	ret = 1;
 ex:;
 	BURN_FREE_MEM(msg);
@@ -1760,12 +2211,13 @@ ex:;
 }
 
 
-/* ts A60922 */
+/* ts B11001 : outsourced from non-static sg_obtain_scsi_adr() */
 /** 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)
+static int sg_obtain_scsi_adr_fd(char *path, int fd_in,
+				 int *bus_no, int *host_no, int *channel_no,
+				 int *target_no, int *lun_no)
 {
 	int fd, ret, l, open_mode = O_RDONLY;
 	struct my_scsi_idlun {
@@ -1775,7 +2227,8 @@ int sg_obtain_scsi_adr(char *path, int *bus_no, int *host_no, int *channel_no,
  	struct my_scsi_idlun idlun;
 
 	/* valgrind called idlun unitialized because it is blind for ioctl */
-	memset(&idlun, 0, sizeof(struct my_scsi_idlun));
+	idlun.x = 0;
+	idlun.host_unique_id = 0;
 
 	l = strlen(linux_ata_device_family) - 2;
 	if (l > 0 && strncmp(path, linux_ata_device_family, l) == 0 
@@ -1792,7 +2245,10 @@ int sg_obtain_scsi_adr(char *path, int *bus_no, int *host_no, int *channel_no,
 		   SuSE 9.0 (kernel 2.4) and SuSE 9.3 (kernel 2.6) */
 		/* so skip it for now */;
 	}
-	fd = open(path, open_mode);
+	if (fd_in >= 0)
+		fd = fd_in;
+	else
+		fd = open(path, open_mode);
 	if(fd < 0)
 		return 0;
 	sg_fcntl_lock(&fd, path, F_RDLCK, 0);
@@ -1808,7 +2264,8 @@ int sg_obtain_scsi_adr(char *path, int *bus_no, int *host_no, int *channel_no,
 	/* http://www.tldp.org/HOWTO/SCSI-Generic-HOWTO/scsi_g_idlun.html */
 	ret = ioctl(fd, SCSI_IOCTL_GET_IDLUN, &idlun);
 
-	sg_close_drive_fd(path, -1, &fd, 0);
+	if (fd_in < 0)
+		sg_close_drive_fd(path, -1, &fd, 0);
 	if (ret == -1)
 		return(0);
 	*host_no= (idlun.x>>24)&255;
@@ -1825,6 +2282,18 @@ int sg_obtain_scsi_adr(char *path, int *bus_no, int *host_no, int *channel_no,
 }
 
 
+/* ts A60922 */
+/** 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)
+{
+	return sg_obtain_scsi_adr_fd(path, -1, bus_no, host_no, channel_no,
+					 target_no, lun_no);
+}
+
+
 /* ts A60922 ticket 33 : called from drive.c */
 /** Tells wether a text is a persistent address as listed by the enumeration
     functions.
@@ -1928,6 +2397,19 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
 		*bytes = add_size + ((off_t) vfsbuf.f_frsize) *
 						(off_t) vfsbuf.f_bavail;
 	}
+
+#ifdef NIX
+/* <<< */
+	fprintf(stderr, "libburn_DEBUG: Faking 4.5 TB of disk space\n");
+	*bytes = ((off_t) 2415919104) * (off_t) 2048;
+	if (*bytes / (off_t) 2048 > (off_t) 0x7ffffff0) {
+		*bytes = ((off_t) 0x7ffffff0) * (off_t) 2048;
+		fprintf(stderr, "libburn_DEBUG: Reducing disk space to 4 TB - 2 kB\n");
+	}
+/* <<< */
+#endif
+
+
 	ret = 1;
 ex:;
 	BURN_FREE_MEM(testpath);

libburn/sg-netbsd.c

@@ -0,0 +1,895 @@
+/* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */
+
+/*
+   Copyright (c) 2010 - 2014 Thomas Schmitt <scdbackup@gmx.net>
+   Provided under GPL version 2 or later.
+
+   Derived 2014 from libburn/sg-solaris.c with information learned from
+   dvd+rw-tools, http://fxr.watson.org/fxr/source/sys/scsiio.h?v=NETBSD,
+   http://netbsd.gw.com/cgi-bin/man-cgi?scsi+4+NetBSD-current, 
+   and experiments made by Freddy Fisker.
+*/
+
+
+/*
+
+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: NetBSD 6, ioctl SCIOCCOMMAND
+                        >>> ??? for OpenBSD too ?
+
+PORTING:
+
+Porting libburn typically will consist of adding a new operating system case
+to the following switcher files:
+  os.h    Operating system specific libburn definitions and declarations.
+  sg.c    Operating system dependent transport level modules.
+and of deriving the following system specific files from existing examples:
+  os-*.h  Included by os.h. You will need some general system knowledge
+          about signals and knowledge about the storage object needs of your
+          transport level module sg-*.c.
+
+  sg-*.c  This source module. You will need special system knowledge about
+          how to detect all potentially available drives, how to open them,
+          eventually how to exclusively reserve them, how to perform
+          SCSI transactions, how to inquire the (pseudo-)SCSI driver.
+          You will not need to care about CD burning, MMC or other high-level
+          SCSI aspects.
+
+Said sg-*.c operations are defined by a public function interface, which has
+to be implemented in a way that provides libburn with the desired services:
+
+sg_id_string()          returns an id string of the SCSI transport adapter.
+                        It may be called before initialization but then may
+                        return only a preliminary id.
+
+sg_initialize()         performs global initialization of the SCSI transport
+                        adapter and eventually needed operating system
+                        facilities. Checks for compatibility of supporting
+                        software components.
+
+sg_shutdown()           performs global finalizations and releases golbally
+                        aquired resources.
+
+sg_give_next_adr()      iterates over the set of potentially useful drive 
+                        address strings.
+
+scsi_enumerate_drives() brings all available, not-whitelist-banned, and
+                        accessible drives into libburn's list of drives.
+
+sg_dispose_drive()      finalizes adapter specifics of struct burn_drive
+                        on destruction. Releases resources which were aquired
+                        underneath scsi_enumerate_drives().
+ 
+sg_drive_is_open()      tells wether libburn has the given drive in use.
+
+sg_grab()               opens the drive for SCSI commands and ensures
+                        undisturbed access.
+
+sg_release()            closes a drive opened by sg_grab()
+
+sg_issue_command()      sends a SCSI command to the drive, receives reply,
+                        and evaluates wether the command succeeded or shall
+                        be retried or finally failed.
+
+sg_obtain_scsi_adr()    tries to obtain SCSI address parameters.
+
+
+burn_os_is_2k_seekrw()  tells whether the given path leads to a file object
+                        that can be used in 2 kB granularity by lseek(2),
+                        read(2), and possibly write(2) if not read-only..
+                        E.g. a USB stick or a hard disk.
+
+burn_os_stdio_capacity()  estimates the emulated media space of stdio-drives.
+
+burn_os_open_track_src()  opens a disk file in a way that allows best
+                        throughput with file reading and/or SCSI write command
+                        transmission.
+
+burn_os_alloc_buffer()  allocates a memory area that is suitable for file
+                        descriptors issued by burn_os_open_track_src().
+                        The buffer size may be rounded up for alignment
+                        reasons.
+
+burn_os_free_buffer()   delete a buffer obtained by burn_os_alloc_buffer().
+
+Porting hints are marked by the text "PORTING:".
+Send feedback to libburn-hackers@pykix.org .
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
+
+/** PORTING : ------- OS dependent headers and definitions ------ */
+
+#include <unistd.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <string.h>
+#include <stdlib.h>
+
+#ifdef Libburn_os_has_statvfS
+#include <sys/statvfs.h>
+#endif /* Libburn_os_has_stavtfS */
+
+#include <sys/ioctl.h>
+#include <sys/scsiio.h>
+
+
+/** PORTING : ------ libburn portable headers and definitions ----- */
+
+#include "transport.h"
+#include "drive.h"
+#include "sg.h"
+#include "spc.h"
+#include "sbc.h"
+#include "debug.h"
+#include "toc.h"
+#include "util.h"
+#include "init.h"
+
+#include "libdax_msgs.h"
+extern struct libdax_msgs *libdax_messenger;
+
+
+/* is in portable part of libburn */
+int burn_drive_is_banned(char *device_address);
+int burn_drive_resolve_link(char *path, char adr[],
+			 int *recursion_count, int flag); /* drive.c */
+
+/* Whether to log SCSI commands:
+   bit0= log in /tmp/libburn_sg_command_log
+   bit1= log to stderr
+   bit2= flush every line
+*/
+extern int burn_sg_log_scsi;
+
+
+/* ------------------------------------------------------------------------ */
+/* PORTING:   Private definitions. Port only if needed by public functions. */
+/*            (Public functions are listed below)                           */
+/* ------------------------------------------------------------------------ */
+
+
+/* Storage object is in libburn/init.c
+   whether to strive for exclusive access to the drive
+*/
+extern int burn_sg_open_o_excl;
+
+
+/* ------------------------------------------------------------------------ */
+/* PORTING: Private functions. Port only if needed by public functions      */
+/*          (Public functions are listed below)                             */
+/* ------------------------------------------------------------------------ */
+
+static int sg_close_drive(struct burn_drive * d)
+{
+	if (d->fd != -1) {
+		close(d->fd);
+		d->fd = -1;
+		return 1;
+	}
+	return 0;
+}
+
+
+/* ----------------------------------------------------------------------- */
+/* PORTING: Private functions which contain publicly needed functionality. */
+/*          Their portable part must be performed. So it is probably best  */
+/*          to replace the non-portable part and to call these functions   */
+/*          in your port, too.                                             */
+/* ----------------------------------------------------------------------- */
+
+
+/** Wraps a detected drive into libburn structures and hands it over to
+    libburn drive list.
+*/
+static void enumerate_common(char *fname,
+				int bus_no, int host_no,
+				int channel_no, int target_no, int lun_no)
+{
+	int ret;
+	struct burn_drive out;
+
+	/* General libburn drive setup */
+	burn_setup_drive(&out, fname);
+
+	/* This transport adapter uses SCSI-family commands and models
+	   (seems the adapter would know better than its boss, if ever) */
+	ret = burn_scsi_setup_drive(&out, bus_no, host_no, channel_no,
+                                 target_no, lun_no, 0);
+        if (ret <= 0)
+                return;
+
+	/* PORTING: ------------------- non portable part --------------- */
+
+	/* Transport adapter is NetBSD SCIOCCOMMAND */
+	/* Adapter specific handles and data */
+
+	out.fd = -1;
+
+	/* PORTING: ---------------- end of non portable part ------------ */
+
+	/* Adapter specific functions with standardized names */
+	out.grab = sg_grab;
+	out.release = sg_release;
+	out.drive_is_open = sg_drive_is_open;
+	out.issue_command = sg_issue_command;
+	/* Finally register drive and inquire drive information */
+	burn_drive_finish_enum(&out);
+}
+
+
+static int start_enum_rcdNx(burn_drive_enumerator_t *idx, int flag)
+{
+	idx->cdno = -1;
+	return 1;
+}
+
+
+/* Trying /dev/rcd[0..63][dc] */
+#define Libburn_netbsd_max_cdnuM 63
+
+static int next_enum_rcdNx(burn_drive_enumerator_t *idx,
+                           char adr[], int adr_size, int flag)
+{
+	static char suffix[2] = {'d', 'c'};
+	struct stat stbuf;
+	int i, stat_ret;
+	char path[16];
+
+	while (idx->cdno < Libburn_netbsd_max_cdnuM) {
+		idx->cdno++;
+		for (i = 0; i < 2; i++) {
+			sprintf(path, "/dev/rcd%d%c", idx->cdno, suffix[i]);
+			stat_ret = stat(path, &stbuf);
+			if (stat_ret == -1)
+		continue;
+			if (!S_ISCHR(stbuf.st_mode))
+		continue;
+			if ((int) strlen(path) >= adr_size)
+		continue;
+			strcpy(adr, path);
+			return 1;
+		}
+	}
+	return 0;
+}
+
+
+/* Searching the first byte address that cannot be lseeked and read
+*/
+static int guess_size_by_seek_set(int fd, off_t *bytes, int flag)
+{
+	static off_t abs_limit = ((off_t) 1024) * 1024 * 1024 * 1024 * 1024;
+	off_t i, step = ((off_t) 1024) * 1024 * 1024 * 1024, ret;
+	char buf[1];
+
+	*bytes = 0;
+	for (i = step; i < abs_limit; i += step) {
+		ret = lseek(fd, i, SEEK_SET);
+		if (ret == -1) {
+			i -= step;
+			step = step >> 1;
+			if (step > 0)
+	continue;
+			return 1;
+		}
+		ret = read(fd, buf, 1);
+		if (ret == -1) {
+			i -= step;
+			step = step >> 1;
+			if (step > 0)
+	continue;
+			return 1;
+		}
+		*bytes = i + 1;
+	}
+	return 0;
+}
+
+
+/* ------------------------------------------------------------------------ */
+/* PORTING:           Public functions. These MUST be ported.               */
+/* ------------------------------------------------------------------------ */
+
+
+/** Returns the id string  of the SCSI transport adapter and eventually
+    needed operating system facilities.
+    This call is usable even if sg_initialize() was not called yet. In that
+    case a preliminary constant message might be issued if detailed info is
+    not available yet.
+    @param msg   returns id string
+    @param flag  unused yet, submit 0
+    @return      1 = success, <=0 = failure
+*/
+int sg_id_string(char msg[1024], int flag)
+{
+	sprintf(msg, "internal NetBSD SCIOCCOMMAND adapter sg-netbsd");
+	return 1;
+}
+
+
+/** Performs global initialization of the SCSI transport adapter and eventually
+    needed operating system facilities. Checks for compatibility of supporting
+    software components.
+    @param msg   returns ids and/or error messages of eventual helpers
+    @param flag  unused yet, submit 0
+    @return      1 = success, <=0 = failure
+*/ 
+int sg_initialize(char msg[1024], int flag)
+{
+	return sg_id_string(msg, 0);
+}
+
+
+/** Performs global finalization of the SCSI transport adapter and eventually
+    needed operating system facilities. Releases globally aquired resources.
+    @param flag  unused yet, submit 0
+    @return      1 = success, <=0 = failure
+*/ 
+int sg_shutdown(int flag)
+{
+	return 1;
+}
+
+
+/** Finalizes BURN_OS_TRANSPORT_DRIVE_ELEMENTS, the components of
+    struct burn_drive which are defined in os-*.h.
+    The eventual initialization of those components was made underneath
+    scsi_enumerate_drives().
+    This will be called when a burn_drive gets disposed.
+    @param d     the drive to be finalized
+    @param flag  unused yet, submit 0
+    @return      1 = success, <=0 = failure
+*/
+int sg_dispose_drive(struct burn_drive *d, int flag)
+{
+	return 1;
+}
+
+
+/** 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)
+{
+	int ret;
+
+	if (initialize == 1) {
+		ret = start_enum_rcdNx(idx, 0);
+		if (ret <= 0)
+			return ret;
+	} else if (initialize == -1) {
+		return 0;
+	}
+	ret = next_enum_rcdNx(idx, adr, adr_size, 0);
+	return ret;
+}
+
+
+/** Brings all available, not-whitelist-banned, and accessible drives into
+    libburn's list of drives.
+*/
+int scsi_enumerate_drives(void)
+{
+	burn_drive_enumerator_t idx;
+	int initialize = 1, ret, i_bus_no = -1, buf_size = 4096;
+        int i_host_no = -1, i_channel_no = -1, i_target_no = -1, i_lun_no = -1;
+	char *buf = NULL;
+
+	BURN_ALLOC_MEM(buf, char, buf_size);
+
+	while(1) {
+		ret = sg_give_next_adr(&idx, buf, buf_size, initialize);
+		initialize = 0;
+		if (ret <= 0)
+	break;
+		if (burn_drive_is_banned(buf))
+	continue; 
+		sg_obtain_scsi_adr(buf, &i_bus_no, &i_host_no,
+				&i_channel_no, &i_target_no, &i_lun_no);
+		enumerate_common(buf,
+				i_bus_no, i_host_no, i_channel_no,
+				i_target_no, i_lun_no);
+	}
+	sg_give_next_adr(&idx, buf, buf_size, -1);
+	ret = 1;
+ex:;
+	BURN_FREE_MEM(buf);
+	return ret;
+}
+
+
+/** Tells whether 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 (d->fd != -1);
+}
+
+
+/** 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)
+{
+	char *msg = NULL;
+	int os_errno, ret;
+
+	BURN_ALLOC_MEM(msg, char, 4096);
+
+	if (d->fd != -1) {
+		d->released = 0;
+		{ret = 1; goto ex;}
+	}
+	d->fd = open(d->devname, O_RDWR | O_NDELAY);
+	if (d->fd == -1) {
+		os_errno = errno;
+		sprintf(msg, "Could not grab drive '%s'", d->devname);
+		/* (errno == ENXIO is a device file with no drive attached) */
+		libdax_msgs_submit(libdax_messenger, d->global_index,
+			0x00020003,
+			errno == ENXIO ? LIBDAX_MSGS_SEV_DEBUG :
+			                 LIBDAX_MSGS_SEV_SORRY,
+			LIBDAX_MSGS_PRIO_HIGH,
+			msg, os_errno, 0);
+		{ret = 0; goto ex;}
+	}
+
+	d->released = 0;
+
+	/* Make sure by INQUIRY that this is really a MMC drive */
+	ret = spc_confirm_cd_drive(d, 0);
+	if (ret <= 0)
+		goto revoke;
+
+/* # define Libburn_sg_netbsd_scsi_debuG */
+#ifdef Libburn_sg_netbsd_scsi_debuG
+	{
+		static int sc_db = SC_DB_CMDS | SC_DB_FLOW;
+
+		ret = ioctl(d->fd, SCIOCDEBUG, &sc_db);
+		if (ret == -1)
+			fprintf(stderr,
+      "libburn_DEBUG: ioctl(%d, SCIOCDEBUG, &(0x%X)) returns %d, errno = %d\n",
+			 d->fd, (unsigned int) sc_db, ret, errno);
+	}
+#endif
+
+
+	{ret = 1; goto ex;}
+
+revoke:;
+	sprintf(msg, "Could not grab drive '%s'.", d->devname);
+	libdax_msgs_submit(libdax_messenger, d->global_index,
+			0x00020003,
+			LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
+			msg, 0, 0);
+	if (d->fd >= 0) {
+		close(d->fd);
+		d->fd = -1;
+		d->released = 1;
+	}
+	ret = 0;
+ex:;
+	BURN_FREE_MEM(msg);
+	return ret;
+}
+
+
+/** PORTING: Is mainly about the call to sg_close_drive() and whether it
+             implements the demanded functionality.
+*/
+/** 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)
+{
+	if (d->fd < 0)
+		return 0;
+	sg_close_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)
+{
+	int i, timeout_ms, ret, key, asc, ascq, done = 0, sense_len, max_sl;
+	time_t start_time;
+	scsireq_t req;
+	char msg[160];
+        static FILE *fp = NULL;
+
+	c->error = 0;
+
+	if (d->fd == -1)
+		return 0;
+
+	if (burn_sg_log_scsi & 1) {
+		if (fp == NULL) {
+			fp= fopen("/tmp/libburn_sg_command_log", "a");
+			fprintf(fp,
+			    "\n-----------------------------------------\n");
+		}
+	}
+	if (burn_sg_log_scsi & 3)
+		scsi_log_cmd(c,fp,0);
+
+	if (c->timeout > 0)
+		timeout_ms = c->timeout;
+	else
+		timeout_ms = 200000;
+
+	memset (&req, 0, sizeof(req));
+	memcpy(req.cmd, c->opcode, c->oplen);
+	req.cmdlen = c->oplen;
+	req.databuf = (caddr_t) c->page->data;
+	req.flags = SCCMD_ESCAPE; /* probably to make req.cmdlen significant */
+	req.timeout = timeout_ms;
+	max_sl = sizeof(c->sense) > SENSEBUFLEN ?
+	                                        SENSEBUFLEN : sizeof(c->sense);
+	req.senselen = max_sl;
+	if (c->dir == TO_DRIVE) {
+		req.datalen = c->page->bytes;
+		req.flags |= SCCMD_WRITE;
+	} else if (c->dir == FROM_DRIVE) {
+		req.flags |= SCCMD_READ;
+		if (c->dxfer_len >= 0)
+			req.datalen = c->dxfer_len;
+		else
+			req.datalen = BUFFER_SIZE;
+		/* touch page so we can use valgrind */
+		memset(c->page->data, 0, BUFFER_SIZE);
+	} else {
+		req.flags |= SCCMD_READ;
+		req.datalen = 0;
+	}
+
+	/* retry-loop */
+	start_time = time(NULL);
+	for(i = 0; !done; i++) {
+		memset(c->sense, 0, sizeof(c->sense));
+		c->start_time = burn_get_time(0);
+
+		ret = ioctl(d->fd, SCIOCCOMMAND, &req);
+
+/* <<< Fault mock-up
+if (c->opcode[0] == 0x28) {
+	ret = -1;
+	errno = 9;
+}
+*/
+
+		c->end_time = burn_get_time(0);
+
+/* #define Libburn_debug_sg_netbsD */
+#ifdef Libburn_debug_sg_netbsD
+		fprintf(stderr, "libburn_DEBUG: ret= %d, retsts = 0x%X, senselen_used = %d, status = 0x%X, error= 0x%X\n", ret, (unsigned int) req.retsts, (int) req.senselen_used, (unsigned int) req.status, req.error);
+		fprintf(stderr, "libburn_DEBUG: datalen_used = %u\n",
+			(unsigned int) req.datalen_used);
+#endif
+
+		if (ret != 0 ||
+		    (req.retsts != SCCMD_SENSE && req.retsts != SCCMD_OK)) {
+			sprintf(msg, "Failed to transfer command to drive. (ioctl(%d, SCIOCCOMMAND) = %d, scsireq_t.retsts = 0x%X, errno= %d)",
+				d->fd, ret, (unsigned int) req.retsts, errno);
+			if (burn_sg_log_scsi & 3)
+				scsi_log_message(d, fp, msg, 0);
+			libdax_msgs_submit(libdax_messenger,
+				d->global_index, 0x0002010c,
+				LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
+				msg, errno, 0);
+			sg_close_drive(d);
+			d->released = 1;
+			d->busy = BURN_DRIVE_IDLE;
+			c->error = 1;
+			return -1;
+		}
+
+		sense_len = 0;
+		if (req.retsts == SCCMD_SENSE) {
+			memcpy(c->sense, req.sense, max_sl);
+			sense_len = req.senselen > max_sl ?
+			                                 max_sl : req.senselen;
+		}
+		spc_decode_sense(c->sense, sense_len, &key, &asc, &ascq);
+		if (key || asc || ascq)
+			sense_len = req.senselen;
+		else
+			sense_len = 0;
+
+/* <<< Fault mock-up
+if (c->opcode[0] == 0x5a) {
+	req.datalen_used = 0;
+	memset(c->page->data, 0, BUFFER_SIZE);
+}
+*/
+
+		if (c->dir == FROM_DRIVE && sense_len == 0 &&
+		    req.datalen > 0 && req.datalen_used < req.datalen) {
+			sprintf(msg, "Short reply from SCSI command %2.2X: expected: %d, got: %d, req.retsts: 0x%X",
+				(unsigned int) c->opcode[0],
+				(int) req.datalen, (int) req.datalen_used,
+				(unsigned int) req.retsts);
+			if (burn_sg_log_scsi & 3)
+				scsi_log_message(d, fp, msg, 0);
+			libdax_msgs_submit(libdax_messenger,
+				d->global_index, 0x00000002,
+				LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
+				msg, 0, 0);
+			if (req.datalen_used == 0)
+				c->error = 1;
+			c->dxfer_len = req.datalen_used;
+		}
+
+		done = scsi_eval_cmd_outcome(d, c, fp, c->sense, sense_len,
+						start_time, timeout_ms, i, 0);
+		if (d->cancel)
+			done = 1;
+	} /* end of retry-loop */
+
+	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)
+{
+	int ret, fd = -1;
+	struct scsi_addr addr;
+
+	fd = open(path, O_RDWR | O_NDELAY);
+	if (fd == -1)
+		return 0;
+	*bus_no = *host_no = *channel_no = *target_no = *lun_no = 0;
+	memset(&addr, 0, sizeof(addr));
+	ret = ioctl(fd, SCIOCIDENTIFY, &addr);
+	if (ret != 0)
+		{ret = 0; goto ex;}
+	if (addr.type != TYPE_SCSI)
+		{ret = 0; goto ex;}
+	*bus_no = *host_no = addr.addr.scsi.scbus;
+	*channel_no = 0;
+	*target_no = addr.addr.scsi.target;
+	*lun_no = addr.addr.scsi.lun;
+	ret = 1;
+ex:;
+	if (fd != -1)
+		close(fd);
+	return (0);
+}
+
+
+/** Tells wether a text is a persistent address as listed by the enumeration
+    functions.
+*/
+int sg_is_enumerable_adr(char* adr)
+{
+	burn_drive_enumerator_t idx;
+	int initialize = 1, ret;
+	char buf[64];
+
+	while(1) {
+		ret = sg_give_next_adr(&idx, buf, sizeof(buf), initialize);
+		initialize = 0;
+		if (ret <= 0)
+	break;
+		if (strcmp(adr, buf) == 0) {
+			sg_give_next_adr(&idx, buf, sizeof(buf), -1);
+			return 1;
+		}
+	}
+	sg_give_next_adr(&idx, buf, sizeof(buf), -1);
+	return (0);
+}
+
+
+/* Return 1 if the given path leads to a regular file or a device that can be
+   seeked, read, and possibly written with 2 kB granularity. 
+*/
+int burn_os_is_2k_seekrw(char *path, int flag)
+{
+	struct stat stbuf;
+	int l, i, dev, tl;
+	char try[16], *cpt;
+
+	/* >>> ??? Is this a comprehensive list of lseek()-capable devices ? */
+	/* http://www.netbsd.org/docs/guide/en/chap-rmmedia.html */
+	static char dev_names[][4] = {
+				 "fd", "rfd", "sd" , "cd", "rcd", "wd", ""};
+
+	if (path[0] == 0)
+		return 0;
+	if (stat(path, &stbuf) == -1)
+		return 0;
+	if (S_ISREG(stbuf.st_mode))
+		return 1;
+	if (S_ISBLK(stbuf.st_mode))
+		return 1;
+
+	/* Look for known device names which promise the desired capabilities */
+	if (strncmp(path, "/dev/", 5) != 0)
+		return 0;
+	l = strlen(path);
+	for (dev = 0; dev_names[dev][0] != 0; dev++) {
+		sprintf(try, "/dev/%s", dev_names[dev]);
+		tl = strlen(try);
+		if (strncmp(path, try, tl) != 0)
+	continue;
+		cpt = path + tl;
+		l -= tl;
+		for (i = 0; i < Libburn_netbsd_max_cdnuM; i++) {
+			sprintf(try + tl, "%d", i);
+			if (strncmp(path, try, strlen(try)) == 0)
+		break;
+		}
+		if (i >= Libburn_netbsd_max_cdnuM)
+	continue;
+		tl += strlen(try + tl);
+		if (l == tl)
+			return 1;
+		if (l > tl + 1)
+	continue;
+		if (path[l - 1] >= 'a' && path[l - 1] <= 'z')
+			return 1;
+	}
+
+	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;
+	int ret;
+
+#ifdef Libburn_os_has_statvfS
+	struct statvfs vfsbuf;
+#endif
+
+	char *testpath = NULL, *cpt;
+	off_t add_size = 0;
+
+	BURN_ALLOC_MEM(testpath, char, 4096);
+
+	testpath[0] = 0;
+	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)
+			{ret = -1; goto ex;}
+
+	} else if(S_ISBLK(stbuf.st_mode)) {
+		int open_mode = O_RDONLY, fd;
+
+		fd = open(path, open_mode);
+		if (fd == -1)
+			{ret = -2; goto ex;}
+		*bytes = lseek(fd, 0, SEEK_END);
+		if (*bytes <= 0)
+			guess_size_by_seek_set(fd, bytes, 0);
+		close(fd);
+		if (*bytes == -1) {
+			*bytes = 0;
+			{ret = 0; goto ex;}
+		}
+
+	} else if(S_ISREG(stbuf.st_mode)) {
+		add_size = stbuf.st_blocks * (off_t) 512;
+		strcpy(testpath, path);
+	} else
+		{ret = 0; goto ex;}
+
+	if (testpath[0]) {	
+
+#ifdef Libburn_os_has_statvfS
+
+		if (statvfs(testpath, &vfsbuf) == -1)
+			{ret = -2; goto ex;}
+		*bytes = add_size + ((off_t) vfsbuf.f_frsize) *
+						(off_t) vfsbuf.f_bavail;
+
+#else /* Libburn_os_has_statvfS */
+
+		{ret = 0; goto ex;}
+
+#endif /* ! Libburn_os_has_stavtfS */
+
+	}
+	ret = 1;
+ex:;
+	BURN_FREE_MEM(testpath);
+	return ret;
+}
+
+
+/* ts A91122 : an interface to open(O_DIRECT) or similar OS tricks. */
+
+#ifdef Libburn_read_o_direcT
+
+	/* No special O_DIRECT-like precautions are implemented here */
+
+#endif /* Libburn_read_o_direcT */
+
+
+int burn_os_open_track_src(char *path, int open_flags, int flag)
+{
+	int fd;
+
+	fd = open(path, open_flags);
+	return fd;
+}
+
+
+void *burn_os_alloc_buffer(size_t amount, int flag)
+{
+	void *buf = NULL;
+
+	buf = calloc(1, amount);
+	return buf;
+}
+
+
+int burn_os_free_buffer(void *buffer, size_t amount, int flag)
+{
+	if (buffer == NULL)
+		return 0;
+	free(buffer);
+	return 1;
+}
+

libburn/sg-solaris.c

@@ -1,7 +1,7 @@
 /* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */
 
 /*
-   Copyright (c) 2010 - 2011 Thomas Schmitt <scdbackup@gmx.net>
+   Copyright (c) 2010 - 2013 Thomas Schmitt <scdbackup@gmx.net>
    Provided under GPL version 2 or later.
 */
 
@@ -561,10 +561,8 @@ ex:;
 */
 int sg_release(struct burn_drive *d)
 {
-	if (d->fd < 0) {
-		burn_print(1, "release an ungrabbed drive.  die\n");
+	if (d->fd < 0)
 		return 0;
-	}
 	sg_close_drive(d);
 	return 0;
 }
@@ -581,7 +579,7 @@ int sg_release(struct burn_drive *d)
 */
 int sg_issue_command(struct burn_drive *d, struct command *c)
 {
-	int i, timeout_ms, ret, key, asc, ascq, done = 0;
+	int i, timeout_ms, ret, key, asc, ascq, done = 0, sense_len;
 	time_t start_time;
 	struct uscsi_cmd cgc;
 	char msg[80];
@@ -589,6 +587,7 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 
 	c->error = 0;
 	memset(c->sense, 0, sizeof(c->sense));
+
 	if (d->fd == -1)
 		return 0;
 
@@ -602,13 +601,17 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 	if (burn_sg_log_scsi & 3)
 		scsi_log_cmd(c,fp,0);
 
+	if (c->timeout > 0)
+		timeout_ms = c->timeout;
+	else
+		timeout_ms = 200000;
 	memset (&cgc, 0, sizeof (struct uscsi_cmd));
 	/* No error messages, no retries,
            do not execute with other commands, request sense data
 	*/
 	cgc.uscsi_flags = USCSI_SILENT | USCSI_DIAGNOSE | USCSI_ISOLATE
 				| USCSI_RQENABLE;
-	cgc.uscsi_timeout = 200;
+	cgc.uscsi_timeout = timeout_ms / 1000;
 	cgc.uscsi_cdb = (caddr_t) c->opcode;
 	cgc.uscsi_bufaddr = (caddr_t) c->page->data;
 	if (c->dir == TO_DRIVE) {
@@ -631,11 +634,15 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 
 	/* retry-loop */
 	start_time = time(NULL);
-	timeout_ms = 200000;
 	for(i = 0; !done; i++) {
 
+		memset(c->sense, 0, sizeof(c->sense));
+		c->start_time = burn_get_time(0);
+
 		ret = ioctl(d->fd, USCSICMD, &cgc);
 
+		c->end_time = burn_get_time(0);
+
 		/* For cgc.uscsi_status see SAM-3 5.3.1, Table 22
 		   0 = GOOD , 2 = CHECK CONDITION : Sense Data are delivered
 		   8 = BUSY
@@ -662,10 +669,13 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 		/* >>> valid sense:  cgc.uscsi_rqlen - cgc.uscsi_rqresid */;
 
 		spc_decode_sense(c->sense, 0, &key, &asc, &ascq);
-		if (key || asc || ascq) {
-			done = scsi_eval_cmd_outcome(d, c, fp, c->sense, 18, 0,
-						start_time, timeout_ms, i, 2);
-		} else
+		if (key || asc || ascq)
+			sense_len = 18;
+		else
+			sense_len = 0;
+		done = scsi_eval_cmd_outcome(d, c, fp, c->sense, sense_len,
+						start_time, timeout_ms, i, 0);
+		if (d->cancel)
 			done = 1;
 					
 	} /* end of retry-loop */
@@ -785,13 +795,11 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
 #endif
 
 	char *testpath = NULL, *cpt;
-	long blocks;
 	off_t add_size = 0;
 
 	BURN_ALLOC_MEM(testpath, char, 4096);
 
 	testpath[0] = 0;
-	blocks = *bytes / 512;
 	if (stat(path, &stbuf) == -1) {
 		strcpy(testpath, path);
 		cpt = strrchr(testpath, '/');

libburn/sg.c

@@ -1,7 +1,7 @@
 
 /* sg.c
    Switcher for operating system dependent transport level modules of libburn.
-   Copyright (C) 2009 - 2010 Thomas Schmitt <scdbackup@gmx.net>, 
+   Copyright (C) 2009 - 2014 Thomas Schmitt <scdbackup@gmx.net>, 
    provided under GPLv2+
 */
 
@@ -11,6 +11,12 @@
 #endif
 
 
+/* <<< Until it is known whether this adapter would work on OpenBSD too */
+#ifdef __NetBSD__
+#define Libburn_use_sg_netbsD
+#endif
+
+
 #ifdef Libburn_use_sg_dummY
 
 #include "sg-dummy.c"
@@ -20,15 +26,29 @@
 
 #include "sg-libcdio.c"
 
+#else
+#ifdef Libburn_use_sg_netbsD
+/* To become: # ifdef __NetBSD__ */
+
+#include "sg-netbsd.c"
+
 #else
 #ifdef __FreeBSD__
 
+#ifdef Libburn_use_sg_freebsd_porT
+#include "sg-freebsd-port.c"
+#else
 #include "sg-freebsd.c"
+#endif
 
 #else
 #ifdef __FreeBSD_kernel__
 
+#ifdef Libburn_use_sg_freebsd_porT
+#include "sg-freebsd-port.c"
+#else
 #include "sg-freebsd.c"
+#endif
 
 #else
 #ifdef __linux
@@ -50,11 +70,11 @@
 static int intentional_compiler_warning(void)
 {
  int INTENTIONAL_COMPILER_WARNING_;
- int Cannot_recognize_GNU_Linux_nor_FreeBSD_;
+ int Cannot_recognize_GNU_Linux_nor_FreeBSD_nor_Solaris_nor_NetBSD_;
  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_GNU_Linux_nor_FreeBSD;
+ int Cannot_recognize_GNU_Linux_nor_FreeBSD_nor_Solaris_nor_NetBSD;
  int INTENTIONAL_COMPILER_WARNING;
 
  return(0);
@@ -66,6 +86,7 @@ static int intentional_compiler_warning(void)
 #endif /* ! __linux */
 #endif /* ! __FreeBSD_kernel__ */
 #endif /* ! __FreeBSD__ */
+#endif /* ! Libburn_use_sg_netbsD */
 #endif /* ! Libburn_use_libcdiO */
 #endif /* ! Libburn_use_sg_dummY */
 

libburn/source.c

@@ -15,6 +15,7 @@
 #include "libburn.h"
 #include "source.h"
 #include "structure.h"
+#include "init.h"
 
 void burn_source_free(struct burn_source *src)
 {
@@ -41,12 +42,10 @@ struct burn_source *burn_source_new(void)
 {
 	struct burn_source *out;
 
-	out = calloc(1, sizeof(struct burn_source));
-
-	/* ts A70825 */
+	/* ts A70825 , B11219 */
+	out = burn_alloc_mem(sizeof(struct burn_source), 1, 0);
 	if (out == NULL)
 		return NULL;
-	memset((char *) out, 0, sizeof(struct burn_source));
 
 	out->refcount = 1;
 	return out;

libburn/spc.h

@@ -1,7 +1,7 @@
 /* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */
 
 /* Copyright (c) 2004 - 2006 Derek Foreman, Ben Jansens
-   Copyright (c) 2006 - 2010 Thomas Schmitt <scdbackup@gmx.net>
+   Copyright (c) 2006 - 2014 Thomas Schmitt <scdbackup@gmx.net>
    Provided under GPL version 2 or later.
 */
 
@@ -21,6 +21,7 @@ void spc_select_error_params(struct burn_drive *,
 void spc_getcaps(struct burn_drive *d);
 void spc_sense_write_params(struct burn_drive *);
 void spc_select_write_params(struct burn_drive *,
+			     struct burn_session *, int,
 			     const struct burn_write_opts *);
 void spc_probe_write_modes(struct burn_drive *);
 void spc_request_sense(struct burn_drive *d, struct buffer *buf);
@@ -28,7 +29,8 @@ int spc_block_type(enum burn_block_types b);
 int spc_get_erase_progress(struct burn_drive *d);
 
 /* ts A70315 : test_unit_ready with result parameters */
-int spc_test_unit_ready_r(struct burn_drive *d, int *key, int *asc, int *ascq);
+int spc_test_unit_ready_r(struct burn_drive *d, int *key, int *asc, int *ascq,
+				int *progress);
 
 int spc_test_unit_ready(struct burn_drive *d);
 
@@ -68,17 +70,36 @@ int scsi_init_command(struct command *c, unsigned char *opcode, int oplen);
 /* ts A91106 */
 int scsi_show_cmd_text(struct command *c, void *fp, int flag);
 
-/* ts A91106 */
-int scsi_show_cmd_reply(struct command *c, void *fp, int flag);
+/* ts B11110 */
+/** Logs command (before execution). */
+int scsi_log_command(unsigned char *opcode, int oplen, int data_dir,
+                     unsigned char *data, int bytes,
+                     void *fp_in, int flag);
 
 /* ts A91218 (former sg_log_cmd ts A70518) */
-/** Logs command (before execution) */
+/** Legacy frontend to scsi_log_command() */
 int scsi_log_cmd(struct command *c, void *fp, int flag);
 
+/* ts B11110 */
+/** Logs outcome of a sg command.
+    @param flag  bit0 causes an error message 
+                 bit1 do not print duration
+*/
+int scsi_log_reply(unsigned char *opcode, int data_dir, unsigned char *data,
+                   int dxfer_len, void *fp_in, unsigned char sense[18],
+                   int sense_len, double duration, int flag);
+
 /* ts A91221 (former sg_log_err ts A91108) */
-/** Logs outcome of a sg command. */
-int scsi_log_err(struct command *c, void *fp, unsigned char sense[18], 
-                 int sense_len, int duration, int flag);
+/** Legacy frontend to scsi_log_reply().
+    @param flag  bit0 causes an error message
+                 bit1 do not print duration
+*/
+int scsi_log_err(struct burn_drive *d, struct command *c,
+                 void *fp, unsigned char sense[18], 
+                 int sense_len, int flag);
+
+/* ts B31112 */
+int scsi_log_message(struct burn_drive *d, void *fp, char * msg, int flag);
 
 /* ts B00728 */
 int spc_decode_sense(unsigned char *sense, int senselen,
@@ -92,15 +113,53 @@ int spc_decode_sense(unsigned char *sense, int senselen,
 */
 int scsi_eval_cmd_outcome(struct burn_drive *d, struct command *c, void *fp_in,
                         unsigned char *sense, int sense_len,
-                        int duration, time_t start_time, int timeout_ms,
+                        time_t start_time, int timeout_ms,
 			int loop_count, int flag);
 
+/* ts B40204 */
+/* Verify by INQUIRY that the drive is indeed a MMC device.
+*/
+int spc_confirm_cd_drive(struct burn_drive *d, int flag);
+
+
 /* The waiting time before eventually retrying a failed SCSI command.
    Before each retry wait Libburn_scsi_retry_incR longer than with
-   the previous one.
+   the previous one. At most wait for Libburn_scsi_retry_umaX microseconds.
 */
 #define Libburn_scsi_retry_usleeP 100000
 #define Libburn_scsi_retry_incR   100000
+#define Libburn_scsi_retry_umaX   500000
 
+/* The retry waiting time for commands WRITE(10) and WRITE(12).
+*/
+#define Libburn_scsi_write_retry_usleeP     0
+#define Libburn_scsi_write_retry_incR    2000
+#define Libburn_scsi_write_retry_umaX   25000
+
+
+/* ts B11124 */
+/* Millisecond timeout for quickly responding SPC, SBC, and MMC commands */
+#define Libburn_scsi_default_timeouT          30000
+
+/* WRITE(10) and WRITE(12) */
+#define Libburn_scsi_write_timeouT           200000
+
+/* RESERVE TRACK */
+#define Libburn_mmc_reserve_timeouT          200000
+
+/* CLOSE TRACK/SESSION (with Immed bit) */
+#define Libburn_mmc_close_timeouT            200000
+
+/* BLANK , FORMAT UNIT (with Immed bit) */
+#define Libburn_mmc_blank_timeouT            200000
+
+/* SEND OPC INFORMATION */
+#define Libburn_mmc_opc_timeouT              200000
+
+/* MMC_SYNC_CACHE */
+#define Libburn_mmc_sync_timeouT             200000
+
+/* START STOP UNIT with Start bit and Load bit set */
+#define Libburn_mmc_load_timeouT             300000
 
 #endif /*__SPC*/

libburn/structure.h

@@ -16,13 +16,32 @@ struct isrc
 	unsigned int serial;	/* must be 0-99999 */
 };
 
+/* ts B11206 */
+#define Libburn_pack_type_basE  0x80
+#define Libburn_pack_num_typeS  0x10
+#define Libburn_pack_type_nameS \
+	"TITLE", "PERFORMER", "SONGWRITER", "COMPOSER", \
+	"ARRANGER", "MESSAGE", "DISCID", "GENRE", \
+	"TOC", "TOC2",  "", "", \
+	"", "CLOSED", "UPC_ISRC", "BLOCKSIZE"
+
+struct burn_cdtext
+{
+	unsigned char *(payload[Libburn_pack_num_typeS]);
+	int length[Libburn_pack_num_typeS];
+	int flags;                   /* bit0 - bit15= double byte characters */
+};
+
 struct burn_track
 {
 	int refcnt;
 	struct burn_toc_entry *entry;
 	unsigned char indices;
-	/* lba address of the index */
-	unsigned int index[99];
+	/* lba address of the index. CD only. 0x7fffffff means undefined index.
+	   To be programmed relative to track source start before burning,
+           but to hold absolute addresses after burning or reading.
+	*/
+	int index[100];
 	/** number of 0 bytes to write before data */
 	int offset;
 	/** how much offset has been used */
@@ -71,8 +90,18 @@ struct burn_track
 	int pregap1;
 	/** The track contains interval two of a pregap */
 	int pregap2;
+
+	/* ts B20110 */
+	/** The number of sectors in pre-gap 2, if .pregap2 is set */
+	int pregap2_size;
+
 	/** The track contains a postgap */
 	int postgap;
+
+	/* ts B20111 */
+	/** The number of sectors in post-gap, if .postgap is set */
+	int postgap_size;
+
 	struct isrc isrc;
 
 	/* ts A61024 */
@@ -82,6 +111,9 @@ struct burn_track
 	/* ts A90910 : conversions from CD XA prepared input */
 	int cdxa_conversion; /* 0=none, 1=remove -xa1 headers (first 8 bytes)*/
 
+	/* ts B11206 */
+	struct burn_cdtext *cdtext[8];
+
 };
 
 struct burn_session
@@ -97,12 +129,26 @@ struct burn_session
 	int tracks;
 	struct burn_track **track;
 	int refcnt;
+
+	/* ts B11206 */
+	struct burn_cdtext *cdtext[8];
+	unsigned char cdtext_char_code[8];
+	unsigned char cdtext_copyright[8];
+	unsigned char cdtext_language[8];
+
+	/* ts B11226 */
+	unsigned char mediacatalog[14]; /* overrideable by burn_write_opts */
 };
 
 struct burn_disc
 {
 	int sessions;
 	struct burn_session **session;
+
+#ifdef Libburn_disc_with_incomplete_sessioN
+        int incomplete_sessions;
+#endif
+
 	int refcnt;
 };
 
@@ -128,7 +174,17 @@ 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);
+int burn_disc_cd_toc_extensions(struct burn_drive *drive, int flag);
+
+
+/* ts B11206 */
+struct burn_cdtext *burn_cdtext_create(void);
+void burn_cdtext_free(struct burn_cdtext **cdtext);
+
+/* ts B20119 */
+/* @param flag bit0= do not add post-gap
+*/
+int burn_track_get_sectors_2(struct burn_track *t, int flag);
 
 
 #endif /* BURN__STRUCTURE_H */

libburn/toc.c

@@ -105,16 +105,14 @@ static void write_clonecd2(volatile struct toc *toc, int f)
 
 void toc_find_modes(struct burn_drive *d)
 {
-	struct burn_read_opts o;
-	int lba;
-	int i, j, ret;
+	int i, j;
 	struct buffer *mem = NULL;
 	struct burn_toc_entry *e;
 
-	BURN_ALLOC_MEM(mem, struct buffer, 1);
+/* ts A70519 : the code which needs this does not work with GNU/Linux 2.4 USB
+	int lba;
+	struct burn_read_opts o;
 
-	mem->bytes = 0;
-	mem->sectors = 1;
 	o.raw = 1;
 	o.c2errors = 0;
 	o.subcodes_audio = 1;
@@ -123,17 +121,18 @@ void toc_find_modes(struct burn_drive *d)
 	o.report_recovered_errors = 0;
 	o.transfer_damaged_blocks = 1;
 	o.hardware_error_retries = 1;
+*/
+
+	BURN_ALLOC_MEM_VOID(mem, struct buffer, 1);
+
+	mem->bytes = 0;
+	mem->sectors = 1;
 
 	for (i = 0; i < d->disc->sessions; i++)
 		for (j = 0; j < d->disc->session[i]->tracks; j++) {
 			struct burn_track *t = d->disc->session[i]->track[j];
 
 			e = t->entry;
-			if (!e)
-				lba = 0;
-			else
-				lba = burn_msf_to_lba(e->pmin, e->psec,
-						      e->pframe);
 /* XXX | in the subcodes if appropriate! */
 			if (e && !(e->control & 4)) {
 				t->mode = BURN_AUDIO;
@@ -142,8 +141,17 @@ void toc_find_modes(struct burn_drive *d)
 				t->mode = BURN_MODE1;
 /* ts A70519 : this does not work with GNU/Linux 2.4 USB because one cannot
                predict the exact dxfer_size without knowing the sector type.
+				if (!e)
+					lba = 0;
+				else
+					lba = burn_msf_to_lba(e->pmin, e->psec,
+							      e->pframe);
 				mem->sectors = 1;
+
+				ts B21119 : Would now be d->read_cd() with
+					    with sectype = 0 , mainch = 0xf8
 				d->read_sectors(d, lba, mem.sectors, &o, mem);
+
 				t->mode = sector_identify(mem->data);
 */
 			}

libburn/transport.h

@@ -1,7 +1,7 @@
 /* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */
 
 /* Copyright (c) 2004 - 2006 Derek Foreman, Ben Jansens
-   Copyright (c) 2006 - 2010 Thomas Schmitt <scdbackup@gmx.net>
+   Copyright (c) 2006 - 2014 Thomas Schmitt <scdbackup@gmx.net>
    Provided under GPL version 2 or later.
 */
 
@@ -64,19 +64,32 @@ struct command
 	int error;
 	int retry;
 	struct buffer *page;
+	int timeout; /* milliseconds */
+
+	double start_time;
+	double end_time;
+
 };
 
 struct burn_scsi_inquiry_data
 {
+	char peripheral; /* bit0-4: device type should be 5
+	                    bit5-7: qualifier must be 0 */
+
+	char version;    /* should be 3 (SPC-1) to 5 (SPC-3) (or higher ?)
+	                    but is often 0. */
+
 	char vendor[9];
 	char product[17];
 	char revision[5];
+
 	int valid;
 };
 
 
 struct scsi_mode_data
 {
+	int p2a_valid;
 	int buffer_size;
 	int dvdram_read;
 	int dvdram_write;
@@ -88,8 +101,13 @@ struct scsi_mode_data
 	int cdr_read;
 	int cdr_write;
 	int simulate;
+	int c2_pointers;
+	int underrun_proof;
+
 	int max_read_speed;
+	int cur_read_speed;
 	int max_write_speed;
+	int cur_write_speed;
 
 	/* ts A61021 */
 	int min_write_speed;
@@ -100,15 +118,10 @@ struct scsi_mode_data
 	int max_end_lba;
 	struct burn_speed_descriptor *speed_descriptors;
 
-	int cur_read_speed;
-	int cur_write_speed;
 	int retry_page_length;
 	int retry_page_valid;
 	int write_page_length;
 	int write_page_valid;
-	int c2_pointers;
-	int valid;
-	int underrun_proof;
 };
 
 
@@ -126,6 +139,26 @@ struct burn_format_descr {
 };
 
 
+/* ts B40106 : represents a Feature Descriptor as of mmc5r03c.pdf 5.2.2
+               There can be many of them. Thus a linked list.
+*/
+struct burn_feature_descr {
+	unsigned short feature_code;
+
+	unsigned char  flags; /* bit0= current
+                                 bit1= persistent
+                                 bit2-5= version
+                              */
+
+        unsigned char  data_lenght;
+
+	/* Additional bytes after the first 4 bytes of the descriptor */
+        unsigned char *data;
+
+        struct burn_feature_descr *next;
+};
+
+
 /** Gets initialized in enumerate_common() and burn_drive_register() */
 struct burn_drive
 {
@@ -177,12 +210,24 @@ struct burn_drive
 	unsigned char all_profiles[256];
 	int num_profiles;
 
+	/* ts B40106 : All feature descriptors as read from drive */
+	struct burn_feature_descr *features;
+
 	/* ts A70128 : MMC-to-MMC feature info from 46h for DVD-RW.
            Quite internal. Regard as opaque :)
 	*/
 	/* 1 = incremental recording available, 0 = not available */
 	int current_has_feat21h;
 
+	/* Some drives announce feature 21h on fast-blanked DVD-RW
+	   although they cannot write them in Incremental mode.
+	   0= does not look like the recent write run failed due to
+	      Incremental on fast blanked DVD-RW
+	   1= it seems to have happened
+	   2= it seems to have happened with write address 0
+	*/
+	int was_feat21h_failure;
+
 	/* Link Size item number 0 from feature 0021h descriptor */
 	int current_feat21h_link_size;
 
@@ -260,8 +305,18 @@ struct burn_drive
 	volatile int released;
 
 	/* ts A61106 */
+	/* 0= report errors
+	   1= do not report errors
+	   2= do not report errors which the libburn function indicates in
+	      member .had_particular_error
+	*/
 	int silent_on_scsi_error;
 
+	/* ts B21023 */
+	/* bit0= 5 64 00 occured with READ10 in mmc_read_10()
+	*/
+	int had_particular_error;
+
 	int stdio_fd;
 
 	int nwa;		/* next writeable address */
@@ -276,9 +331,19 @@ struct burn_drive
 	/* ts A90107 */
 	int state_of_last_session;
 
+#ifdef Libburn_disc_with_incomplete_sessioN
+	/* ts B30112 */
+	int incomplete_sessions;
+#endif
+
+
 	/* ts A70129 :
 	   from 51h READ DISC INFORMATION Last Track Number in Last Session */
 	int last_track_no;
+
+	/* ts B10730 : whether a default mode page 05 was already sent.
+	*/
+	int sent_default_page_05;
 	/* ts A70212 : from various sources : free space on media (in bytes)
 	               With CD this might change after particular write
 	               parameters have been set and nwa has been inquired.
@@ -289,7 +354,9 @@ struct burn_drive
 	int media_lba_limit;
 
 	/* ts A81210 : Upper limit of readable data size,
-	               0x7fffffff = unknown */
+	               0x7fffffff = unknown
+	               0x7ffffff0 = 32 bit overflow, or unknown stdio size
+	 */
 	int media_read_capacity;
 
 	/* ts B10314 : Next Writeable Adress for drive_role == 5 */
@@ -329,6 +396,13 @@ struct burn_drive
 	volatile int cancel;
 	volatile enum burn_drive_status busy;
 
+	/* During write runs, this points to a copy of the applied
+	   struct burn_write_opts. Only read this underneath
+	   burn_disc_write_sync() which removes the copy when done.
+	   Especially do not read it from outside the write thread.
+	*/
+	struct burn_write_opts *write_opts;
+
 	/* ts A70929 */
 	pid_t thread_pid;
 	int thread_pid_valid;
@@ -365,17 +439,18 @@ struct burn_drive
 	int is_stopped;
 
 	void (*read_disc_info) (struct burn_drive *);
-	void (*read_sectors) (struct burn_drive *,
-			      int start,
-			      int len,
-			      const struct burn_read_opts *, struct buffer *);
+	int (*read_cd) (struct burn_drive *, int start, int len,
+	                int sec_type, int main_ch,
+	                const struct burn_read_opts *, struct buffer *,
+	                int flag);
 	void (*perform_opc) (struct burn_drive *);
 	void (*set_speed) (struct burn_drive *, int, int);
 	void (*send_parameters) (struct burn_drive *,
 				 const struct burn_read_opts *);
 	void (*send_write_parameters) (struct burn_drive *,
+				       struct burn_session *, int tno,
 				       const struct burn_write_opts *);
-	void (*send_cue_sheet) (struct burn_drive *, struct cue_sheet *);
+	int (*send_cue_sheet) (struct burn_drive *, struct cue_sheet *);
 
 	/* ts A70205 : Announce size of a DVD-R[W] DAO session. */
 	int (*reserve_track) (struct burn_drive *d, off_t size);

libburn/util.c

@@ -1,6 +1,6 @@
 
 /* Copyright (c) 2004 - 2006 Derek Foreman, Ben Jansens
-   Copyright (c) 2006 - 2010 Thomas Schmitt <scdbackup@gmx.net>
+   Copyright (c) 2006 - 2013 Thomas Schmitt <scdbackup@gmx.net>
    Provided under GPL version 2 or later.
 */
 
@@ -15,6 +15,10 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <time.h>
+#include <sys/time.h>
+#include <unistd.h>
+
 
 /* ts A80914 : This is unneeded. Version info comes from libburn.h.
 #include "v ersion.h"
@@ -23,42 +27,6 @@
 #include "util.h"
 #include "libburn.h"
 
-char *burn_strdup(char *s)
-{
-	char *ret;
-	int l;
-
-	/* ts A61008 */
-	/* a ssert(s); */
-	if (s == NULL)
-		return NULL;
-
-	l = strlen(s) + 1;
-	ret = calloc(1, l);
-	memcpy(ret, s, l);
-
-	return ret;
-}
-
-char *burn_strndup(char *s, int n)
-{
-	char *ret;
-	int l;
-
-	/* ts A61008 */
-	/* a ssert(s); */
-	/* a ssert(n > 0); */
-	if (s == NULL || n <= 0)
-		return NULL;
-
-	l = strlen(s);
-	ret = calloc(1, l < n ? l : n);
-
-	memcpy(ret, s, l < n - 1 ? l : n - 1);
-	ret[n - 1] = '\0';
-
-	return ret;
-}
 
 void burn_version(int *major, int *minor, int *micro)
 {
@@ -74,9 +42,6 @@ struct cd_mid_record {
 	int m_li;
 	int s_li;
 	int f_li;
-	int m_lo;
-	int s_lo;
-	int f_lo;
 	char *other_brands;
 };
 typedef struct cd_mid_record cd_mid_record_t;
@@ -91,51 +56,51 @@ char *burn_guess_cd_manufacturer(int m_li, int s_li, int f_li,
                                  int m_lo, int s_lo, int f_lo, int flag)
 {
 	static cd_mid_record_t mid_list[]= {
-	{"SKC",                                 96, 40,  0,  0, 0, 0, ""},
-	{"Ritek Corp"                         , 96, 43, 30,  0, 0, 0, ""},
-	{"TDK / Ritek"                        , 97, 10,  0,  0, 0, 0, "TRAXDATA"},
-	{"TDK Corporation"                    , 97, 15,  0,  0, 0, 0, ""},
-	{"Ritek Corp"                         , 97, 15, 10,  0, 0, 0, "7-plus, Aopen, PONY, Power Source, TDK, TRAXDATA, HiCO, PHILIPS, Primdisc, Victor.JVC, OPTI STORAGE, Samsung"},
-	{"Mitsubishi Chemical Corporation"    , 97, 15, 20,  0, 0, 0, ""},
-	{"Nan-Ya Plastics Corporation"        , 97, 15, 30,  0, 0, 0, "Hatron, MMore, Acer, LITEON"},
-	{"Delphi"                             , 97, 15, 50,  0, 0, 0, ""},
-	{"Shenzhen SG&SAST"                   , 97, 16, 20,  0, 0, 0, ""},
-	{"Moser Baer India Limited"           , 97, 17,  0,  0, 0, 0, "EMTEC, Intenso, YAKUMO, PLATINUM, Silver Circle"},
-	{"SKY media Manufacturing SA"         , 97, 17, 10,  0, 0, 0, ""},
-	{"Wing"                               , 97, 18, 10,  0, 0, 0, ""},
-	{"DDT"                                , 97, 18, 20,  0, 0, 0, ""},
-	{"Daxon Technology Inc. / Acer"       , 97, 22, 60,  0, 0, 0, "Maxmax, Diamond Data, BenQ, gold, SONY"},
-	{"Taiyo Yuden Company Limited"        , 97, 24,  0,  0, 0, 0, "Maxell, FUJIFILM, SONY"},
-	{"Sony Corporation"                   , 97, 24, 10,  0, 0, 0, "LeadData, Imation"},
-	{"Computer Support Italcard s.r.l"    , 97, 24, 20,  0, 0, 0, ""},
-	{"Unitech Japan Inc."                 , 97, 24, 30,  0, 0, 0, ""},
-	{"MPO, France"                        , 97, 25,  0,  0, 0, 0, "TDK"},
-	{"Hitachi Maxell Ltd."                , 97, 25, 20,  0, 0, 0, ""},
-	{"Infodisc Technology Co,Ltd."        , 97, 25, 30,  0, 0, 0, "MEMOREX, SPEEDA, Lead data"},
-	{"Xcitec"                             , 97, 25, 60,  0, 0, 0, ""},
-	{"Fornet International Pte Ltd"       , 97, 26,  0,  0, 0, 0, "COMPUSA, Cdhouse"},
-	{"Postech Corporation"                , 97, 26, 10,  0, 0, 0, "Mr.Platinum"},
-	{"SKC Co Ltd."                        , 97, 26, 20,  0, 0, 0, "Infinite"},
-	{"Fuji Photo Film Co,Ltd."            , 97, 26, 40,  0, 0, 0, ""},
-	{"Lead Data Inc."                     , 97, 26, 50,  0, 0, 0, "SONY, Gigastorage, MIRAGE"},
-	{"CMC Magnetics Corporation"          , 97, 26, 60,  0, 0, 0, "Daxon, Verbatim, Memorex, Bi-Winner, PLEXTOR, YAMAHA, Melody, Office DEPOT, Philips, eMARK, imation, HyperMedia, Samsung, Shintaro, Techworks"},
-	{"Ricoh Company Limited"              , 97, 27,  0,  0, 0, 0, "Sony, Digital Storage, Csita"},
-	{"Plasmon Data Systems Ltd"           , 97, 27, 10,  0, 0, 0, "Ritek, TDK, EMTEC, ALPHAPET, MANIA"},
-	{"Princo Corporation"                 , 97, 27, 20,  0, 0, 0, ""},
-	{"Pioneer"                            , 97, 27, 30,  0, 0, 0, ""},
-	{"Eastman Kodak Company"              , 97, 27, 40,  0, 0, 0, ""},
-	{"Mitsui Chemicals Inc."              , 97, 27, 50,  0, 0, 0, "MAM-A, TDK"},
-	{"Ricoh Company Limited"              , 97, 27, 60,  0, 0, 0, "Ritek"},
-	{"Gigastorage Corporation"            , 97, 28, 10,  0, 0, 0, "MaxMax, Nan-Ya"},
-	{"Multi Media Masters&Machinary SA"   , 97, 28, 20,  0, 0, 0, "King, Mmirex"},
-	{"Ritek Corp"                         , 97, 31,  0,  0, 0, 0, "TDK"},
-	{"Grand Advance Technology Sdn. Bhd." , 97, 31, 30,  0, 0, 0, ""},
-	{"TDK Corporation"                    , 97, 32, 00,  0, 0, 0, ""},
-	{"Prodisc Technology Inc."            , 97, 32, 10,  0, 0, 0, "Smartbuy, Mitsubishi, Digmaster, LG, Media Market"},
-	{"Mitsubishi Chemical Corporation"    , 97, 34, 20,  0, 0, 0, "YAMAHA, Verbatim"},
-	{"Mitsui Chemicals Inc."              , 97, 48, 50, 0, 0, 0, ""},
-	{"TDK Corporation"                    , 97, 49,  0, 0, 0, 0, ""},
-	{"", 0, 0, 0, 0, 0, 0, ""}
+	{"SKC",                                 96, 40,  0,  ""},
+	{"Ritek Corp"                         , 96, 43, 30,  ""},
+	{"TDK / Ritek"                        , 97, 10,  0,  "TRAXDATA"},
+	{"TDK Corporation"                    , 97, 15,  0,  ""},
+	{"Ritek Corp"                         , 97, 15, 10,  "7-plus, Aopen, PONY, Power Source, TDK, TRAXDATA, HiCO, PHILIPS, Primdisc, Victor.JVC, OPTI STORAGE, Samsung"},
+	{"Mitsubishi Chemical Corporation"    , 97, 15, 20,  ""},
+	{"Nan-Ya Plastics Corporation"        , 97, 15, 30,  "Hatron, MMore, Acer, LITEON"},
+	{"Delphi"                             , 97, 15, 50,  ""},
+	{"Shenzhen SG&SAST"                   , 97, 16, 20,  ""},
+	{"Moser Baer India Limited"           , 97, 17,  0,  "EMTEC, Intenso, YAKUMO, PLATINUM, Silver Circle"},
+	{"SKY media Manufacturing SA"         , 97, 17, 10,  ""},
+	{"Wing"                               , 97, 18, 10,  ""},
+	{"DDT"                                , 97, 18, 20,  ""},
+	{"Daxon Technology Inc. / Acer"       , 97, 22, 60,  "Maxmax, Diamond Data, BenQ, gold, SONY"},
+	{"Taiyo Yuden Company Limited"        , 97, 24,  0,  "Maxell, FUJIFILM, SONY"},
+	{"Sony Corporation"                   , 97, 24, 10,  "LeadData, Imation"},
+	{"Computer Support Italcard s.r.l"    , 97, 24, 20,  ""},
+	{"Unitech Japan Inc."                 , 97, 24, 30,  ""},
+	{"MPO, France"                        , 97, 25,  0,  "TDK"},
+	{"Hitachi Maxell Ltd."                , 97, 25, 20,  ""},
+	{"Infodisc Technology Co,Ltd."        , 97, 25, 30,  "MEMOREX, SPEEDA, Lead data"},
+	{"Xcitec"                             , 97, 25, 60,  ""},
+	{"Fornet International Pte Ltd"       , 97, 26,  0,  "COMPUSA, Cdhouse"},
+	{"Postech Corporation"                , 97, 26, 10,  "Mr.Platinum"},
+	{"SKC Co Ltd."                        , 97, 26, 20,  "Infinite"},
+	{"Fuji Photo Film Co,Ltd."            , 97, 26, 40,  ""},
+	{"Lead Data Inc."                     , 97, 26, 50,  "SONY, Gigastorage, MIRAGE"},
+	{"CMC Magnetics Corporation"          , 97, 26, 60,  "Daxon, Verbatim, Memorex, Bi-Winner, PLEXTOR, YAMAHA, Melody, Office DEPOT, Philips, eMARK, imation, HyperMedia, Samsung, Shintaro, Techworks"},
+	{"Ricoh Company Limited"              , 97, 27,  0,  "Sony, Digital Storage, Csita"},
+	{"Plasmon Data Systems Ltd"           , 97, 27, 10,  "Ritek, TDK, EMTEC, ALPHAPET, MANIA"},
+	{"Princo Corporation"                 , 97, 27, 20,  ""},
+	{"Pioneer"                            , 97, 27, 30,  ""},
+	{"Eastman Kodak Company"              , 97, 27, 40,  ""},
+	{"Mitsui Chemicals Inc."              , 97, 27, 50,  "MAM-A, TDK"},
+	{"Ricoh Company Limited"              , 97, 27, 60,  "Ritek"},
+	{"Gigastorage Corporation"            , 97, 28, 10,  "MaxMax, Nan-Ya"},
+	{"Multi Media Masters&Machinary SA"   , 97, 28, 20,  "King, Mmirex"},
+	{"Ritek Corp"                         , 97, 31,  0,  "TDK"},
+	{"Grand Advance Technology Sdn. Bhd." , 97, 31, 30,  ""},
+	{"TDK Corporation"                    , 97, 32, 00,  ""},
+	{"Prodisc Technology Inc."            , 97, 32, 10,  "Smartbuy, Mitsubishi, Digmaster, LG, Media Market"},
+	{"Mitsubishi Chemical Corporation"    , 97, 34, 20,  "YAMAHA, Verbatim"},
+	{"Mitsui Chemicals Inc."              , 97, 48, 50, ""},
+	{"TDK Corporation"                    , 97, 49,  0, ""},
+	{"", 0, 0, 0, ""}
 	};
 
 	int i, f_li_0;
@@ -173,7 +138,6 @@ char *burn_guess_cd_manufacturer(int m_li, int s_li, int f_li,
 /* ts A90904 */
 struct dvd_mid_record {
 	char *mc1;
-	char *mc2;
 	int mc1_sig_len;
 	char *manufacturer;
 };
@@ -192,49 +156,50 @@ char *burn_guess_manufacturer(int prf,
 	                   Especially: ' ' -> '_' , {"_%/" unprintables -> %XY)
 	*/
 	static dvd_mid_record_t mid_list[]= {
-	{"AML",      "",    8, "UML"},
-	{"BeAll",    "",    5, "BeAll Developers, Inc."},
-	{"CMC",      "",    3, "CMC Magnetics Corporation"},
-	{"DAXON",    "",    5, "Daxon Technology Inc. / Acer"},
-	{"Daxon",    "",    5, "Daxon Technology Inc. / Acer"},
-	{"FUJI",     "",    4, "Fujifilm Holdings Corporation"},
-	{"INFODISC", "",    8, "New Star Digital Co., Ltd."},
-	{"INFOME",   "",    6, "InfoMedia Inc."},
-	{"ISMMBD",   "",    6, "Info Source Multi Media Ltd."},
-	{"JVC",      "",    3, "JVC Limited"},
-	{"KIC01RG",  "",    7, "AMC"},
-	{"LD",       "",    8, "Lead Data Inc."},
-	{"LGE",      "",    3, "LG Electronics"},
-	{"MAM",      "",    8, "Mitsui Advanced Media, Inc. Europe"},
-	{"MAXELL",   "",    6, "Hitachi Maxell Ltd."},
-	{"MBI",      "",    3, "Moser Baer India Limited"},
-	{"MCC",      "",    8, "Mitsubishi Chemical Corporation"},
-	{"MCI",      "",    8, "Mitsui Chemicals Inc."},
-	{"MEI",      "",    3, "Panasonic Corporation"},
-	{"MKM",      "",    3, "Mitsubishi Kagaku Media Co."},
-	{"MMC",      "",    8, "Mitsubishi Kagaku Media Co."},
-	{"MXL",      "",    8, "Hitachi Maxell Ltd."},
-	{"NANYA",    "",    5, "Nan-Ya Plastics Corporation"},
-	{"NSD",      "",    8, "NESA International Inc."},
-	{"OPTODISC", "",    8, "Optodisc Technology Corporation"},
-	{"OTCBDR",   "",    8, "Optodisc Technology Corporation"},
-	{"PHILIP",   "",    8, "Moser Baer India Limited"},
-	{"PHILIPS",  "",    8, "Philips"},
-	{"PRINCO",   "",    6, "Princo Corporation"},
-	{"PRODISC",  "",    7, "Prodisc Technology Inc."},
-	{"Prodisc",  "",    7, "Prodisc Technology Inc."},
-	{"PVC",      "",    3, "Pioneer"},
-	{"RICOHJPN", "",    8, "Ricoh Company Limited"},
-	{"RITEK",    "",    5, "Ritek Corp"},
-	{"SONY",     "",    4, "Sony Corporation"},
-	{"TDK",      "",    3, "TDK Corporation"},
-	{"TT",       "",    8, "TDK Corporation"},
-	{"TY",       "",    8, "Taiyo Yuden Company Limited"},
-	{"TYG",      "",    3, "Taiyo Yuden Company Limited"},
-	{"UTJR001",  "",    7, "Unifino Inc."},
-	{"VERBAT",   "",    5, "Mitsubishi Kagaku Media Co."},
-	{"YUDEN",    "",    5, "Taiyo Yuden Company Limited"},
-	{"", "", 0, ""}
+	{"AML",         8, "UML"},
+	{"BeAll",       5, "BeAll Developers, Inc."},
+	{"CMC",         3, "CMC Magnetics Corporation"},
+	{"DAXON",       5, "Daxon Technology Inc. / Acer"},
+	{"Daxon",       5, "Daxon Technology Inc. / Acer"},
+	{"FUJI",        4, "Fujifilm Holdings Corporation"},
+	{"INFODISC",    8, "New Star Digital Co., Ltd."},
+	{"INFOME",      6, "InfoMedia Inc."},
+	{"ISMMBD",      6, "Info Source Multi Media Ltd."},
+	{"JVC",         3, "JVC Limited"},
+	{"KIC01RG",     7, "AMC"},
+	{"LD",          8, "Lead Data Inc."},
+	{"LGE",         3, "LG Electronics"},
+	{"MAM",         8, "Mitsui Advanced Media, Inc. Europe"},
+	{"MAXELL",      6, "Hitachi Maxell Ltd."},
+	{"MBI",         3, "Moser Baer India Limited"},
+	{"MCC",         8, "Mitsubishi Chemical Corporation"},
+	{"MCI",         8, "Mitsui Chemicals Inc."},
+	{"MEI",         3, "Panasonic Corporation"},
+	{"MKM",         3, "Mitsubishi Kagaku Media Co."},
+	{"MMC",         8, "Mitsubishi Kagaku Media Co."},
+	{"MXL",         8, "Hitachi Maxell Ltd."},
+	{"NANYA",       5, "Nan-Ya Plastics Corporation"},
+	{"NSD",         8, "NESA International Inc."},
+	{"OPTODISC",    8, "Optodisc Technology Corporation"},
+	{"OTCBDR",      8, "Optodisc Technology Corporation"},
+	{"PHILIP",      8, "Moser Baer India Limited"},
+	{"PHILIPS",     8, "Philips"},
+	{"PRINCO",      6, "Princo Corporation"},
+	{"PRODISC",     7, "Prodisc Technology Inc."},
+	{"Prodisc",     7, "Prodisc Technology Inc."},
+	{"PVC",         3, "Pioneer"},
+	{"RICOHJPN",    8, "Ricoh Company Limited"},
+	{"RITEK",       5, "Ritek Corp"},
+	{"SONY",        4, "Sony Corporation"},
+	{"TDK",         3, "TDK Corporation"},
+	{"TT",          8, "TDK Corporation"},
+	{"TY",          8, "Taiyo Yuden Company Limited"},
+	{"TYG",         3, "Taiyo Yuden Company Limited"},
+	{"UME",         3, "UmeDisc Limited"},
+	{"UTJR001",     7, "Unifino Inc."},
+	{"VERBAT",      5, "Mitsubishi Kagaku Media Co."},
+	{"YUDEN",       5, "Taiyo Yuden Company Limited"},
+	{"", 0, ""}
 	};
 
 	if (media_code2 != NULL &&
@@ -332,3 +297,84 @@ ex:
 	return ret;
 }
 
+
+/* ts B11216 */
+/** Read a line from fp and strip LF or CRLF */
+char *burn_sfile_fgets(char *line, int maxl, FILE *fp)
+{
+	int l;
+	char *ret;
+
+	ret = fgets(line, maxl, fp);
+	if (ret == NULL)
+		return NULL;
+	l = strlen(line);
+	if (l > 0)
+		if (line[l - 1] == '\r')
+			line[--l] = 0;
+	if (l > 0)
+		if (line[l - 1] == '\n')
+			line[--l] = 0;
+	if(l > 0)
+		if(line[l - 1] == '\r')
+			line[--l] = 0;
+	return ret;
+}
+
+
+char *burn_printify(char *msg)
+{
+	char *cpt;
+
+	for (cpt = msg; *cpt != 0; cpt++)
+		if (*cpt < 32 || *cpt > 126)
+			*cpt = '#';
+	return msg;
+}
+
+
+/* ts B30521 */
+void burn_int_to_lsb(int val, char *target)
+{
+	unsigned char *buf;
+
+	buf = (unsigned char *) target;
+	buf[0] = val & 0xff;
+	buf[1] = (val >> 8) & 0xff;
+	buf[2] = (val >> 16) & 0xff;
+	buf[3] = (val >> 24) & 0xff;
+}
+
+
+/* ts B30609 */
+double burn_get_time(int flag)
+{
+	int ret;
+	struct timeval tv;
+
+#ifdef Libburn_use_clock_gettime_monotoniC
+#ifdef _POSIX_TIMERS
+#ifdef _POSIX_MONOTONIC_CLOCK
+
+	/* Enable by
+	     export CFLAGS=-DLibburn_use_clock_gettime_monotoniC
+	     export LIBS=-lrt
+	     ./configure ... && make clean && make
+	*/
+
+	struct timespec tp;
+	ret = clock_gettime(CLOCK_MONOTONIC, &tp);
+	if (ret == 0)
+		return ((double) tp.tv_sec) + ((double) tp.tv_nsec) * 1.0e-9;
+
+#endif /* _POSIX_MONOTONIC_CLOCK */
+#endif /* _POSIX_TIMERS */
+#endif /* Xorriso_use_clock_gettime_monotoniC */
+
+	ret = gettimeofday(&tv, NULL);
+	if (ret == 0)
+		return ((double) tv.tv_sec) + ((double) tv.tv_usec) * 1.0e-6;
+	return (double) time(NULL);
+}
+
+

libburn/util.h

@@ -1,11 +1,17 @@
 #ifndef __UTIL
 #define __UTIL
 
-char *burn_strdup(char *s);
-
-char *burn_strndup(char *s, int n);
-
 /* ts A90905 */
 int burn_util_make_printable_word(char **text, int flag);
 
+/* ts B11216 */
+char *burn_sfile_fgets(char *line, int maxl, FILE *fp);
+char *burn_printify(char *msg);
+
+/* ts B30521 */
+void burn_int_to_lsb(int val, char *target);
+
+/* ts B30609 */
+double burn_get_time(int flag);
+
 #endif

libburn/write.h

@@ -39,6 +39,13 @@ int burn_write_close_track(struct burn_write_opts *o, struct burn_session *s,
                            int tnum);
 int burn_write_close_session(struct burn_write_opts *o);
 
+/* @param flag bit0= repair checksum   
+               bit1= repair checksum if all pack CRCs are 0
+   @return 0= no mismatch , >0 number of unrepaired mismatches
+                            <0 number of repaired mismatches
+*/
+int burn_cdtext_crc_mismatches(unsigned char *packs, int num_packs, int flag);
+
 
 
 /* mmc5r03c.pdf 6.3.3.3.3: DVD-R DL: Close Function 010b: Close Session

test/poll.c

@@ -20,8 +20,6 @@ static void catch_int ()
 
 static void poll_drive(int d)
 {
-	enum burn_disc_status s;
-
 	fprintf(stderr, "polling disc in %s - %s:\n",
 		drives[d].vendor, drives[d].product);
 
@@ -33,8 +31,7 @@ static void poll_drive(int d)
 	while (burn_drive_get_status(drives[d].drive, NULL))
 		usleep(1000);
 
-	while ((s = burn_disc_get_status(drives[d].drive))
-	       == BURN_DISC_UNREADY)
+	while (burn_disc_get_status(drives[d].drive) == BURN_DISC_UNREADY)
 		usleep(1000);
 	
 	while (NEXT == 0) {

test/structest.c

@@ -12,6 +12,9 @@ int main(int argc, char **argv)
 	struct burn_session *session;
 	struct burn_source *src;
 
+	burn_initialize();
+	burn_msgs_set_severities("NEVER", "ALL", "structest: ");
+
 	disc = burn_disc_create();
 	session = burn_session_create();
 	burn_disc_add_session(disc, session, BURN_POS_END);

test/telltoc.c

@@ -7,8 +7,9 @@
   
   telltoc is a minimal demo application for the library libburn as provided
   on  http://libburnia-project.org . It can list the available devices, can
-  display some drive properties, the type of media, eventual table of content
-  and multisession info for mkisofs option -C . 
+  display some drive properties, the type of media, eventual table of content,
+  multisession info for mkisofs option -C, and can read audio or data tracks. 
+
   It's main purpose, nevertheless, is to show you how to use libburn and also
   to serve the libburn team as reference application. telltoc.c does indeed
   define the standard way how above gestures can be implemented and stay upward
@@ -25,8 +26,9 @@
      telltoc_media()   prints some information about the media in a drive
      telltoc_toc()     prints a table of content (if there is content)
      telltoc_msinfo()  prints parameters for mkisofs option -C
-     telltoc_read_and_print()  reads from data CD or from DVD and prints 7-bit 
-                       to stdout (encodings 0,2) or 8-bit to file (encoding 1)
+     telltoc_read_and_print()  reads from audio or data CD or from DVD or BD
+                       and prints 7-bit to stdout (encodings 0,2) or 8-bit to
+                       file (encoding 1)
   When everything is done, main() releases the drive and shuts down libburn:
      burn_drive_release();
      burn_finish()
@@ -75,9 +77,10 @@ int telltoc_aquire_by_adr(char *drive_adr);
 int telltoc_aquire_by_driveno(int *drive_no, int silent);
 
 
-/* A message from --toc to --read_and_print (CD tracksize is a bit tricky) */
+/* Messages from --toc to --read_and_print (CD tracksize is a bit tricky) */
 static int last_track_start = 0, last_track_size = -1;
-static int media_is_cd_profile = 0;
+static int medium_is_cd_profile = 0;  /* 0 = undecided , -1 = no , 1 = yes */
+static int cd_is_audio = 0;           /* 0 = undecided , -1 = no , 1 = yes */
 
 
 /* ------------------------------- API gestures ---------------------------- */
@@ -116,10 +119,6 @@ int telltoc_aquire_by_adr(char *drive_adr)
 	int ret;
 	char libburn_drive_adr[BURN_DRIVE_ADR_LEN];
 
-	/* <<< ts A70907 FOR TESTING ONLY !
-	struct burn_drive_info *test_drive_list;
-	*/
-
 	/* This tries to resolve links or alternative device files */
 	ret = burn_drive_convert_fs_adr(drive_adr, libburn_drive_adr);	
 	if (ret<=0) {
@@ -128,10 +127,6 @@ int telltoc_aquire_by_adr(char *drive_adr)
 		return 0;
 	}
 
-	/* <<< ts A70907 FOR TESTING ONLY ! 
-	ret = burn_drive_scan_and_grab(&test_drive_list, "/dev/sg2", 1);
-	*/
-
 	fprintf(stderr,"Aquiring drive '%s' ...\n", libburn_drive_adr);
 	ret = burn_drive_scan_and_grab(&drive_list, libburn_drive_adr, 1);
 
@@ -143,10 +138,6 @@ int telltoc_aquire_by_adr(char *drive_adr)
 		drive_is_grabbed = 1;
 	}
 
-	/* <<< ts A70907 FOR TESTING ONLY !
-	burn_drive_info_free(test_drive_list);
-	*/
-
 	return ret;
 }
 
@@ -464,12 +455,25 @@ int telltoc_formatlist(struct burn_drive *drive)
 }
 
 
+void telltoc_detect_cd(struct burn_drive *drive)
+{
+	int pno;
+	char profile_name[80];
+
+	if (burn_disc_get_profile(drive, &pno, profile_name) > 0) {
+		if (pno >= 0x08 && pno <= 0x0a)
+			medium_is_cd_profile = 1;
+		else
+			medium_is_cd_profile = -1;
+	}
+}
+
+
 int telltoc_toc(struct burn_drive *drive)
 {
 	int num_sessions = 0 , num_tracks = 0 , lba = 0, pmin, psec, pframe;
-	int track_count = 0, pno;
+	int track_count = 0, track_is_audio;
 	int session_no, track_no;
-	char profile_name[80];
 	struct burn_disc *disc= NULL;
 	struct burn_session **sessions;
 	struct burn_track **tracks;
@@ -499,10 +503,20 @@ int telltoc_toc(struct burn_drive *drive)
 				pframe = toc_entry.pframe;
 				lba= burn_msf_to_lba(pmin, psec, pframe);
 			}
+
+			if ((toc_entry.control & 7) < 4) {
+				if (cd_is_audio == 0)
+					cd_is_audio = 1;
+				track_is_audio = 1;
+			} else {
+				track_is_audio = 0;
+				cd_is_audio = -1;
+			}
+
 			printf("Media content: session %2d  ", session_no+1);
 			printf("track    %2d %s  lba: %9d  %4.2d:%2.2d:%2.2d\n",
 				track_count,
-				((toc_entry.control&7)<4?"audio":"data "),
+				(track_is_audio ? "audio" : "data "),
 				lba, pmin, psec, pframe);
 			last_track_start = lba;
 		}
@@ -521,10 +535,7 @@ int telltoc_toc(struct burn_drive *drive)
 		printf("leadout            lba: %9d  %4.2d:%2.2d:%2.2d\n",
 			lba, pmin, psec, pframe);
 		last_track_size = lba - last_track_start;
-		if (burn_disc_get_profile(drive, &pno, profile_name) > 0)
-			if (pno == 0x09 || pno == 0x0a)
-				media_is_cd_profile = 1;
-			
+		telltoc_detect_cd(drive);
 	}
 	if (disc!=NULL)
 		burn_disc_free(disc);
@@ -597,27 +608,26 @@ int telltoc_read_and_print(struct burn_drive *drive,
 	int start_sector, int sector_count, char *raw_file, int encoding)
 {
 	int j, i, request = 16, done, lbas = 0, final_cd_try = -1, todo;
-	int ret = 0;
+	int ret = 0, sector_size, chunk_size, read_audio = 0;
 	char buf[16 * 2048], line[81];
 	off_t data_count, total_count= 0, last_reported_count= 0;
 	struct stat stbuf;
 	FILE *raw_fp = NULL;
 
+	if (medium_is_cd_profile == 0)
+		telltoc_detect_cd(drive);
 	if (start_sector == -1)
 		start_sector = last_track_start;
 	if (sector_count == -1) {
 		sector_count = last_track_start + last_track_size
 				- start_sector;
-		if (media_is_cd_profile)  /* In case it is a TAO track */
+		if (medium_is_cd_profile > 0)  /* In case it is a TAO track */
 			final_cd_try = 0; /* allow it (-1 is denial) */
 	}
-	if (start_sector < 0)
-		start_sector = 0;
+
 	if (sector_count <= 0)
 		sector_count = 2147483632;
 
-	if (sector_count <= 0)
-		return -1;
 	if (encoding == 1) {
                 if (stat(raw_file,&stbuf) != -1) {
 			if (!(S_ISCHR(stbuf.st_mode) || S_ISFIFO(stbuf.st_mode)
@@ -640,16 +650,45 @@ int telltoc_read_and_print(struct burn_drive *drive,
 		printf(
 		"Data         : start=%ds , count=%ds , read=0 , encoding=%d\n",
 		start_sector, sector_count, encoding);
+
+	/* Whether to read audio or data */
+	if (cd_is_audio > 0) {
+		read_audio = 1;
+	} else if (medium_is_cd_profile > 0 && cd_is_audio == 0) {
+		/* Try whether the start sector is audio */
+		ret = burn_read_audio(drive, start_sector,
+					buf, (off_t) 2352, &data_count, 2 | 4);
+		if (ret > 0)
+			read_audio = 1;
+	}
+	if (read_audio) {
+		sector_size = 2352;
+		chunk_size = 12;
+	} else {
+		sector_size = 2048;
+		chunk_size = 16;
+		if (start_sector < 0)
+			start_sector = 0;
+	}
+
 	todo = sector_count - 2*(final_cd_try > -1);
 	for (done = 0; done < todo && final_cd_try != 1; done += request) {
-		if (todo - done > 16)
-			request = 16;
+		if (todo - done > chunk_size)
+			request = chunk_size;
 		else
 			request = todo - done;
-		ret = burn_read_data(drive,
-			((off_t) start_sector + done) * (off_t) 2048,
-			buf, (off_t) (request * 2048), &data_count, 1);
-			
+
+		if (read_audio) {
+			ret = burn_read_audio(drive, start_sector + done,
+					buf, (off_t) (request * sector_size),
+					&data_count, 0);
+		} else {
+			ret = burn_read_data(drive,
+					((off_t) start_sector + done) *
+							(off_t) sector_size,
+					buf, (off_t) (request * sector_size),
+					&data_count, 1);
+		}
 print_result:;
 		total_count += data_count;
 		if (encoding == 1) {
@@ -658,8 +697,8 @@ print_result:;
 		} else for (i = 0; i < data_count; i += 16) {
 			if (encoding == 0) {
 				sprintf(line, "%8ds + %4d : ",
-					start_sector + done + i / 2048,
-					i % 2048);
+					start_sector + done + i / sector_size,
+					i % sector_size);
 				lbas = strlen(line);
 			}
 			for (j = 0; j < 16 && i + j < data_count; j++) {
@@ -675,11 +714,11 @@ print_result:;
 			printf("%s\n",line);
 		}
 		if (encoding == 1 &&
-		    total_count - last_reported_count >= 1000 * 2048) {
+		    total_count - last_reported_count >= 1000 * sector_size) {
 			fprintf(stderr, 
 	     		 "\rReading data : start=%ds , count=%ds , read=%ds  ",
 			 start_sector, sector_count,
-			  (int) (total_count / (off_t) 2048));
+			  (int) (total_count / (off_t) sector_size));
 			last_reported_count = total_count;
 		}
 		if (ret <= 0) {
@@ -687,13 +726,21 @@ print_result:;
 	break;
 		}
 	}
-	if (ret > 0 && media_is_cd_profile && final_cd_try == 0) {
+	if (ret > 0 && medium_is_cd_profile > 0 && final_cd_try == 0) {
 		/* In a SAO track the last 2 frames should be data too */
 		final_cd_try = 1;
-		burn_read_data(drive,
-			((off_t) start_sector + todo) * (off_t) 2048,
-			buf, (off_t) (2 * 2048), &data_count, 2);
-		if (data_count < 2 * 2048)
+		if (read_audio) {
+			ret = burn_read_audio(drive, start_sector + todo,
+					buf, (off_t) (2 * sector_size),
+					&data_count, 2);
+		} else {
+			burn_read_data(drive,
+					((off_t) start_sector + todo) *
+							(off_t) sector_size,
+					buf, (off_t) (2 * sector_size),
+					&data_count, 2);
+		}
+		if (data_count < 2 * sector_size)
 			fprintf(stderr, "\rNOTE : Last two frames of CD track unreadable. This is normal if TAO track.\n");
 		if (data_count > 0)
 			goto print_result;	
@@ -702,7 +749,8 @@ print_result:;
 		fprintf(stderr,
 "\r                                                                       \r");
 	printf("End Of Data  : start=%ds , count=%ds , read=%ds\n",
-		start_sector, sector_count,(int) (total_count / (off_t) 2048));
+		start_sector, sector_count,
+	        (int) (total_count / (off_t) sector_size));
 
 	return ret;
 }
@@ -808,10 +856,10 @@ int telltoc_setup(int argc, char **argv)
         printf("  mkisofs ... -C \"$msinfo\" ...\n");
 	printf("Obtain what is available about drive 0 and its media\n");
 	printf("  %s --drive 0\n",argv[0]);
-	printf("View blocks 16 to 19 of data CD or DVD in human readable form\n");
+	printf("View blocks 16 to 19 of audio or data CD or DVD or BD in human readable form\n");
 	printf("  %s --drive /dev/sr1 --read_and_print 16 4 0 | less\n",
 		argv[0]);
-        printf("Copy last data track from CD to file /tmp/data\n");
+        printf("Copy last track from CD to file /tmp/data\n");
         printf("  %s --drive /dev/sr1 --toc --read_and_print -1 -1 raw:/tmp/data\n",
                 argv[0]);
     }
@@ -891,7 +939,7 @@ int main(int argc, char **argv)
 		if (ret<=0)
 			{ret = 38; goto release_drive; }
 	}
-	if (read_start >= -1 && (read_count > 0 || read_count == -1)) {
+	if (read_start != -2 && (read_count > 0 || read_count == -1)) {
 		ret = telltoc_read_and_print(drive_list[driveno].drive,
 				read_start, read_count, print_raw_file,
 				print_encoding);