Bug fix: Possible wrong result on Linux when translating /dev/sr address to /dev/sg

COPYRIGHT

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

ChangeLog

@@ -1,8 +1,173 @@
-SVN trunk (to become libburn-1.2.4 or higher)
+git clone git@dev.lovelyhq.com:libburnia/libburn.git
+(to become libburn-1.5.8 or higher)
 ===============================================================================
-- no novelties yet
+- no novelties yet -
 
 
+libburn-1.5.6.tar.gz Wed Jun 07 2023
+===============================================================================
+* Bug fix: Overburning with cdrskin option -force ended by a libburn error
+* New API call burn_write_opts_set_bdr_obs_exempt()
+* New cdrskin option --bdr_obs_exempt
+* Officially enabled overburning with burn_write_opts_set_force(,1)
+
+libburn-1.5.4.tar.gz Sat Jan 30 2021
+===============================================================================
+* Bug fix: Early SCSI commands from sg-linux.c were not logged
+* New API call burn_drive_set_speed_exact()
+* New API call burn_nominal_slowdown()
+
+libburn-1.5.2.pl01.tar.gz Mon Nov 25 2019
+===============================================================================
+* Bug fix: cdrskin multi-track burning was slow and stalled after track 1.
+           Regression introduced in version 1.5.0 by commit 84fad99, 2018.02.05
+           O_DIRECT is now disabled for track sources.
+
+libburn-1.5.2.tar.gz Sat Oct 26 2019
+===============================================================================
+* Bug fix: No lock was obtained for setting up a fifo object
+* Bug fix: Stream recording was applied regardless whether the drive offers it.
+           This caused Xfburn failures with some MATSHITA laptop drives.
+* Bug fix: TDK Corporation was not recognized as manufacturer of DVD-R "TTH02"
+* Made libburn ready for building out-of-source.  Thanks Ross Burton.
+* New API calls burn_drive_get_feature_codes(), burn_drive_get_feature()
+* New cdrskin option --list_features
+
+libburn-1.5.0.tar.gz Sat Sep 15 2018
+===============================================================================
+* Bug fix: cdrskin threw errno 22 on data file input if libburn is
+           configured with --enable-track-src-odirect
+* Bug fix: SIGSEGV could happen if a track ended by reaching its fixed size
+           while the track source still was willing to deliver bytes.
+           Thanks to user swordragon.
+* Bug fix: Device file comparison parameters were recorded wrong with Linux sg
+
+libburn-1.4.8.tar.gz Tue Sep 12 2017
+===============================================================================
+* Bug fix: Option -dummy did not affect writing by direct_write_amount=
+* New API call burn_drive_reset_simulate()
+* New API call burn_drive_get_bd_r_pow()
+* Refusing to write to BD-R if formatted to Pseudo Overwrite
+
+libburn-1.4.6.tar.gz Fri Sep 16 2016
+===============================================================================
+* Bug fix: SAO CD could be perceived 2 blocks to short.
+           Regression in 1.4.4 by rev 5672.
+* Now operating optical drives on OpenBSD. Thanks to SASANO Takayoshi.
+* New API call burn_drive_set_immed()
+* New cdrskin option use_immed_bit=
+
+libburn-1.4.4.tar.gz Fri Jul 01 2016
+===============================================================================
+* Bug fix: Option drive_scsi_dev_family=sg did not convert /dev/sr* to /dev/sg*
+* Bug fix: burn_make_input_sheet_v07t() falsly recognized double byte encoding.
+           Affected cdrskin option: cdtext_to_v07t=
+* Bug fix: Double free at end of run if burn_write_opts_set_leadin_text() is
+           used. Affected cdrskin option: textfile=
+* Bug fix: DVD book type of DVD+RW DL and DVD+R DL was reported wrong.
+           Thanks to Etienne Bergeron.
+
+libburn-1.4.2.pl01.tar.gz Fri Jan 29 2016
+===============================================================================
+* Bug fix: cdrskin "failed to attach fifo" when burning from stdin. 
+           Regression of 1.4.2, rev 5522.
+
+libburn-1.4.2.tar.gz Sat Nov 28 2015
+===============================================================================
+* Bug fix: burn_disc_get_media_id() returned BD identifiers 2 chars too long
+* Bug fix: burn_disc_get_multi_caps() returned 2048 bytes too many in
+           caps.start_range_high
+* Bug fix: Media summary session count of blank and closed media was short by 1
+* Bug fix: Endless loop if transport error occurs while waiting for drive ready
+* New API calls burn_drive_get_serial_no() and burn_drive_get_media_sno()
+* Result of a Coverity audit: 40+ code changes, but no easy-to-trigger bugs
+
+libburn-1.4.0.tar.gz Sun May 17 2015
+===============================================================================
+* Bug fix: Double free with cdrskin -vvv.
+           Introduced with rev 5065, version 1.3.1
+* Bug fix: Wrong read access to memory. Reported by valgrind of lian jianfei.
+
+libburn-1.3.8.tar.gz Sat Jun 28 2014
+===============================================================================
+* Bug fix: Wrong stack usage caused SIGBUS on sparc when compiled by gcc -O2
+* Bug fix: Minimum drive buffer fill was measured by cdrskin before the buffer
+           could get full
+* Bug fix: A failed MMC BLANK command did not cause error indication by libburn
+* Bug fix: A final fsync(2) was performed with stdio drives, even if not
+           desired
+
+libburn-1.3.6.pl01.tar.gz Tue Mar 18 2013
+===============================================================================
+* Bug fix: CD TAO with multiple tracks could cause a buffer overrun
+* Bug fix: Compilation warning for unsupported systems mutated into an error
+
+libburn-1.3.6.tar.gz Tue Mar 04 2013
+===============================================================================
+* 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

Makefile.am

@@ -12,7 +12,7 @@ ACLOCAL_AMFLAGS = -I ./
 
 # Build libraries
 libburn_libburn_la_LDFLAGS = \
-	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) $(LIBLDFLAGS)
 # This causes undesired .o names
 # configure.ac appends -D options to variable CFLAG
 ### libburn_libburn_la_CFLAGS = $(LIBBURN_DVD_OBS_64K)
@@ -77,7 +77,7 @@ libinclude_HEADERS = \
 	libburn/libburn.h 
 
 install-exec-hook:
-	$(LIBBURNIA_LDCONFIG_CMD) "$(DESTDIR)$(libdir)" || echo 'NOTE: Explicite dynamic library configuration failed. If needed, configure manually for:' "$(DESTDIR)$(libdir)"
+	$(LIBBURNIA_LDCONFIG_CMD) "$(DESTDIR)$(libdir)" || echo 'NOTE: Explicit dynamic library configuration failed. If needed, configure manually for:' "$(DESTDIR)$(libdir)"
 
 ## ========================================================================= ##
 
@@ -88,8 +88,7 @@ noinst_PROGRAMS = \
 	test/telltoc \
 	test/dewav \
 	test/fake_au \
-	test/poll \
-	test/structest
+	test/poll
 
 bin_PROGRAMS = \
 	cdrskin/cdrskin
@@ -114,13 +113,10 @@ test_fake_au_SOURCES = test/fake_au.c
 test_poll_CPPFLAGS = -Ilibburn
 test_poll_LDADD = $(libburn_libburn_la_OBJECTS) $(LIBBURN_EXTRALIBS)
 test_poll_SOURCES = test/poll.c
-test_structest_CPPFLAGS = -Ilibburn
-test_structest_LDADD = $(libburn_libburn_la_OBJECTS) $(LIBBURN_EXTRALIBS)
-test_structest_SOURCES = test/structest.c
 
-##  cdrskin construction site - ts A60816 - B20402
+##  cdrskin construction site - ts A60816 - C30607
 cdrskin_cdrskin_CPPFLAGS = -Ilibburn
-cdrskin_cdrskin_CFLAGS = -DCdrskin_libburn_1_2_3
+cdrskin_cdrskin_CFLAGS = -DCdrskin_libburn_1_5_7
 
 # cdrskin_cdrskin_LDADD = $(libburn_libburn_la_OBJECTS) $(LIBBURN_EXTRALIBS)
 # ts A80123, change proposed by Simon Huggins to cause dynamic libburn linking
@@ -175,8 +171,7 @@ uninstall-local:
 # Indent source files
 indent_files = \
 	$(libburn_libburn_la_SOURCES) \
-	$(test_poll_SOURCES) \
-	$(test_structest_SOURCES)
+	$(test_poll_SOURCES)
 	
 
 indent: $(indent_files)
@@ -206,6 +201,7 @@ EXTRA_DIST = \
 	doc/cookbook.txt \
 	doc/mediainfo.txt \
 	doc/cdtext.txt \
+	doc/waveformat.txt \
 	README \
 	AUTHORS \
 	CONTRIBUTORS \
@@ -225,11 +221,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

@@ -6,12 +6,12 @@ This all is under GPL.
 ------------------------------------------------------------------------------
 libburnia-project.org
 By Mario Danic <mario.danic@gmail.com> and Thomas Schmitt <scdbackup@gmx.net>
-Copyright (C) 2006-2012 Mario Danic, Thomas Schmitt
+Copyright (C) 2006-2023 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.2.2.tar.gz
+     http://files.libburnia-project.org/releases/libburn-1.5.6.tar.gz
 
 ------------------------------------------------------------------------------
 
@@ -19,14 +19,14 @@ Copyright (C) 2002-2006  Derek Foreman and Ben Jansens
 
                                 From tarball
 
-Obtain libburn-1.2.2.tar.gz, take it to a directory of your choice and do:
+Obtain libburn-1.5.6.tar.gz, take it to a directory of your choice and do:
 
-   tar xzf libburn-1.2.2.tar.gz
-   cd libburn-1.2.2
+   tar xzf libburn-1.5.6.tar.gz
+   cd libburn-1.5.6
    ./configure --prefix=/usr
    make
 
-To make libburn accessible for running resp. application development,
+To make libburn accessible for running and application development,
 and to install the cdrecord compatibility binary cdrskin, do
 (as Superuser):
 
@@ -41,21 +41,21 @@ You may have to keep your hald away from the drive. See for example
    http://www.freebsd.org/gnome/docs/halfaq.html
 
 
-                                  From SVN
+                                  From git
 
-Our build system is based on autotools. For preparing the build of a SVN 
+Our build system is based on autotools. For preparing the build of a git
 snapshot you will need autotools of at least version 1.7. 
 Do in a directory of your choice:
 
-   svn co http://svn.libburnia-project.org/libburn/trunk libburn-svn
-   cd libburn-svn
+   git clone https://dev.lovelyhq.com/libburnia/libburn.git libburn-git
+   cd libburn-git
    ./bootstrap
    ./configure --prefix=/usr
    make
    make install
 
-Warning: The trunk might contain experimental features which might not
-         persist until next release. 
+Warning: The master branch might contain experimental features which might
+         not persist until next release. 
 
 
                         Special ./configure options
@@ -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 or 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
@@ -109,12 +113,11 @@ closing it immediately, waiting, and only then opening it for real:
 
 ------------------------------------------------------------------------------
 
-An important part of the project, libisofs, is hosted in a bzr repository at
-launchpad.net :
-   bzr branch lp:libisofs
+The other parts of the the libburnia project are hosted as neighbors of
+libburn:
 
-Another part the project, libisoburn, is hosted in the libburnia SVN, too:
-   svn co http://svn.libburnia-project.org/libisoburn/trunk libisoburn
+  git clone https://dev.lovelyhq.com/libburnia/libisofs.git
+  git clone https://dev.lovelyhq.com/libburnia/libisoburn.git
 
 See README files there.
 
@@ -133,12 +136,13 @@ 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.
 
 For full ports to other systems we would need : login on a development machine
-resp. a live OS on CD or DVD, advise from a system person about the equivalent
+or a live OS on CD or DVD, advise from a system person about the equivalent
 of Linux sg or FreeBSD CAM, volunteers for testing of realistic use cases.
 
 We have a well tested code base for burning data and audio CDs, DVDs and BDs.
@@ -169,8 +173,8 @@ The project components (list subject to growth, hopefully):
            content.
 
 - libisoburn is an add-on to libburn and libisofs which coordinates both and
-           also allows to grow ISO-9660 filesystem images on multi-session
-           media as well as on overwriteable media via the same API.
+           also can grow ISO-9660 filesystem images on multi-session media
+           as well as on overwriteable media via the same API.
            All media peculiarities are handled automatically.
            It also contains the methods of command oriented application
            xorriso and offers them via a C language API.
@@ -250,7 +254,7 @@ Project history as far as known to me:
   which by about nearly everybody else was perceived as unfriendly fork.
   Derek Foreman four days later posted a message which expressed his
   discontent.
-  The situation first caused me to publically regret it and then - after i
+  The situation first caused me to publicly regret it and then - after i
   got the opportunity to move in with cdrskin - gave me true reason to
   personally apologize to Derek Foreman, Ben Jansens and the contributors at 
   icculus.org/burn. Posted to both projects:
@@ -324,7 +328,7 @@ Project history as far as known to me:
   and write modes, and better protection against typical user mishaps.
 
 - 24th October 2007 version 0.4.0 is the foundation of new library libisoburn
-  and an upcomming integrated application for manipulating and writing
+  and an upcoming integrated application for manipulating and writing
   ISO 9660 + Rock Ridge images. cdrskin-0.4.0 got capabilities like growisofs
   by these enhancements: growing of overwriteable media and disk files.
   Taking again a bow towards Andy Polyakov.
@@ -350,7 +354,7 @@ Project history as far as known to me:
 - 27th Apr 2008 libisofs-0.6.4 can now read data file content from images
   and can map pieces of disk files onto image files. Image directory iteration
   has been enhanced. Input data streams and extended information have been
-  exposed in the API to allow future development.
+  exposed in the API to enable future development.
 
 - 29th Apr 2008 libisoburn-0.1.4 was made more efficient with reading of
   image tree nodes. It now depends on libisofs-0.6.4 and libburn-0.4.4.
@@ -364,7 +368,8 @@ Project history as far as known to me:
   type with automatic media state recognition.
 
 - 17th May 2008 an old bug with DVD-RAM and now with BD-RE is fixed by
-  libburn-0.4.8 to allow libisoburn emulation of multisession on those media.
+  libburn-0.4.8. So libisoburn can now perform emulation of multisession
+  on those media.
 
 - 19th May 2008 libisoburn-0.1.6 brings better table-of-content emulation
   on overwriteble media and disk files.
@@ -383,14 +388,14 @@ Project history as far as known to me:
   and cdrecord style. xorriso now can serve underneath growisofs.
 
 - 20th Aug 2008 libburn-0.5.2 revokes the necessity that a drive must be
-  enumerable in order to be adressable. Enumeration is enhanced by examining
+  enumerable in order to be addressable. Enumeration is enhanced by examining
   /proc/sys/dev/cdrom/info.
   
 - 24th Aug 2008 libisoburn/xorriso-0.2.4 introduces a media readability check
   with data retrieval option.
 
-- 18th Sep 2008 libisofs-0.6.8 supports ISO 9660 Level 3 which allows very
-  large data files in the image.
+- 18th Sep 2008 libisofs-0.6.8 supports ISO 9660 Level 3 which can represent
+  very large data files in the image.
 
 - 20th Sep 2008 libisoburn/xorriso-0.2.6 takes into respect the new Level 3
   capabilities of libisofs. 
@@ -408,19 +413,19 @@ Project history as far as known to me:
   of an aborted burn run.
 
 - 26th Nov 2008 libisofs-0.6.12 can produce a ISOLINUX isohybrid MBR on the fly
-  and allows to produce ISO images which resemble old mkisofs images.
+  and can produce ISO images which resemble old mkisofs images.
 
 - 2nd Dec 2008 libisoburn-0.3.0. xorriso now is ready for exotic character
   sets, for legacy FreeBSD systems which expect an outdated Rock Ridge
   signature, and for producing ISO images with MBR which boot from hard disk
   or USB stick. Three minor bugs were fixed.
 
-- 7th Dec 2008 libburn-0.5.8 prevents a SIGSEGV with wierd CD table-of-content
+- 7th Dec 2008 libburn-0.5.8 prevents a SIGSEGV with weird CD table-of-content
   and improves BD-RE formatting.
 
 - 9th Dec 2008 Our project received a donation from Thomas Weber.
 
-- 2nd Jan 2009 libburn-0.6.0 allows to format BD-R and to write to either
+- 2nd Jan 2009 libburn-0.6.0 learned to format BD-R and write to either
   formatted or unformatted BD-R.
 
 - 6th Jan 2009 libisoburn-0.3.2. xorriso can produce and execute commands for
@@ -443,15 +448,16 @@ Project history as far as known to me:
 
 - 13 Mar 2009 libburn-0.6.4 got a dummy adapter for SCSI/MMC command transport.
   It will show no drives and thus libburn will only be able to perform
-  operations on "stdio:" pseudo drives. Nevertheless this allowed to lift the
-  ban to build libburn on operating systems other than Linux and FreeBSD.
+  operations on "stdio:" pseudo drives. Nevertheless this was precondition
+  to lift the ban to build libburn on operating systems other than Linux
+  and FreeBSD.
 
 - 16 Mar 2009 libisoburn-0.3.6: xorriso uses RRIP version 1.10 as default 
   in order to be mountable where mkisofs images are mountable.
 
 - 17 Apr 2009 libisofs-0.6.18 introduces content filtering of data files.
-  Built-in filters allow compression to formats gzip and zisofs. External
-  filter processes allow arbitrary data conversions like encryption.
+  Built-in filters implement compression to formats gzip and zisofs. External
+  filter processes can perform arbitrary data conversions like encryption.
 
 - 19 Apr 2009 libisoburn-0.3.8 makes use of the new libisofs capability to
   perform content filtering of data files.
@@ -476,10 +482,10 @@ Project history as far as known to me:
   Affected are releases since libisoburn-0.3.2 in january 2009.
 
 - 25 Aug 2009 libisofs-0.6.22 can record MD5 checksums for the whole session
-  and for each single data file. Checksum tags allow to verify superblock and
-  directory tree before importing them.
+  and for each single data file. Checksum tags can be used to verify superblock
+  and directory tree before importing them.
 
-- 27 Aug 2009 libburn-0.7.0 allows to calm down a drive and to inquire its
+- 27 Aug 2009 libburn-0.7.0 learned to calm down a drive and to inquire its
   supported profiles. It works around some pitfalls with U3 enhanced memory
   sticks which emulate a CD-ROM.
 
@@ -513,7 +519,7 @@ Project history as far as known to me:
   provides throughput enhancements with hampered busses on Linux, and new
   API calls to log SCSI commands and to control the libburn fifo.
 
-- 09 Dec 2009 libisoburn-0.4.6 allows performance tuning of output to DVD
+- 09 Dec 2009 libisoburn-0.4.6 now offers performance tuning of output to DVD
   drives or disk files.
 
 - 26 Dec 2009 libburn-0.7.4.pl01 fixes the release tarball which was lacking
@@ -526,7 +532,7 @@ Project history as far as known to me:
   portability.
 
 - 22 Jan 2010 libburn-0.7.6 has an improved system adapter for FreeBSD,
-  fixes bugs about the generic X/Open system adapter, and allows to use
+  fixes bugs about the generic X/Open system adapter, and can use
   libcdio >= 0.83 as SCSI transport facility.
 
 - 10 Feb 2010 libisofs-0.6.28 fixes a regression about bootable images which
@@ -548,7 +554,8 @@ Project history as far as known to me:
 
 - 03 May 2010 Version 0.6.32 of libisofs is able to create ISO images with
   multiple boot images. All boot catalog parameters described in El-Torito
-  specs can be set and inquired. This allows to use GRUB boot images for EFI. 
+  specs can be set and inquired. This was needed to use GRUB boot images
+  for EFI. 
 
 - 04 May 2010 Release 0.5.6.pl00 of libisoburn makes use of the new libisofs
   capabilities about boot images.
@@ -602,11 +609,11 @@ Project history as far as known to me:
 - Mon Jan 17 2011 we go for release 1.0.0. This does not indicate a
   technological overhaul but shall emphasize the maturity of the software.
   libisofs-1.0.0 fixes a bug about the length of ECMA-119 directory names and
-  is ready to allow untranslated ECMA-119 names (violating the specs).
-  libburn-1.0.0.pl00 allows umask to create stdio-drive files with
-  rw-permissions for all. cdrskin now refuses to burn if the foreseeable size
-  exceeds media capacity
-  libisoburn-1.0.0.pl00 allows to create an ISO 9660:1999 directory tree,
+  is ready to store untranslated ECMA-119 names (violating the specs).
+  libburn-1.0.0.pl00 is now willing to create stdio-drive files with
+  rw-permissions for all, if umask really asks for it. cdrskin now refuses
+  to burn if the foreseeable size exceeds media capacity
+  libisoburn-1.0.0.pl00 can now create an ISO 9660:1999 directory tree,
   improved the emulation fidelity of command -as mkisofs, lowered the default
   abort threshold for xorriso batch mode, and increased that threshold for
   xorriso dialog mode.
@@ -638,7 +645,7 @@ Project history as far as known to me:
 
 - 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.
+  some rarely occurring 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:
@@ -675,8 +682,144 @@ Project history as far as known to me:
 - 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.  
+  improvements. Some rarely occurring bugs have been fixed.  
 
+- Fri Jul 20 2012 release 1.2.4:
+  libburn and libisofs got some rarely occurring 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 occurring 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 acquired 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 occurring 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+. 
+
+- Sat Jun 28 2014 release 1.3.8:
+  libburn got several bugs fixed. libisofs offers new API calls for inspection
+  of boot sectors in ISO 9660 filesystems. xorriso improved its support for
+  NetBSD, offers new features with command -find, and a command to extract
+  ISO 9660 file content onto standard output or into filter processes.
+
+- Sun May 17 2015 release 1.4.0:
+  This release is mainly about bug fixes and a new feature of xorriso to
+  propose commands or as_mkisofs options which can reproduce the boot
+  equipment of the loaded ISO filesystem.
+
+- Sat Nov 28 2015 release 1.4.2:
+  libburn got some bugs fixed and learned to inquire the drive serial number.
+  libisofs now sorts data file content by ECMA-119 file names for better
+  reproducability of ISO content. Rock Ridge filenames may be restricted to
+  lengths between 64 and 255 bytes. If needed, a qualified truncation happens.
+  xorriso now can replay boot settings when modifying ISO filesystems.
+  In order to avoid clogging of concurrent Linux SG_IO, xorriso got command
+  -modesty_on_drive to enable an old workaround from IDE master/slave days. 
+  The source code underwent a scan by Coverity. About 150 code changes
+  resulted, but no easy-to-trigger bugs were found.
+  
+- Fri Jan 29 2016 patch release libburn-1.4.2.pl01:
+  cdrskin did not work with "-" (stdin) as input.
+  Regression introduced by version 1.4.2.
+
+- Fri Jul 01 2016 release 1.4.4:
+  The capability to use Linux /dev/sg was revived in order to circumvent the
+  sr_mutex lock which hampers concurrent use of optical drives via SG_IO.
+  libisofs now can use appended partitions by El Torito, avoiding the need
+  for duplicate EFI System Partition images.
+  Several bugs have been fixed.
+
+- Fri Sep 16 2016 release 1.4.6:
+  libburn now operates optical drives on OpenBSD. libisofs makes pseudo-random
+  id generation reproducible by relating it to the volume date.
+  xorriso interprets environment variable SOURCE_DATE_EPOCH of
+  reproducible-builds.org to prepare a default setting which leads to identical
+  ISO images on identical input and identical constant options.
+  Several moderately embarrassing bugs have been fixed.
+
+- Tue Sep 12 2017 release 1.4.8:
+  libburn now refuses to write to SRM+POW formatted BD-R, because it would
+  spoil them. libisofs got several bugs fixed and offers new API calls to
+  support new xorriso features. libisoburn and xorriso offer more detail
+  control with particular boot sector types. New bugs and a regression from
+  version 1.4.4 were fixed.
+
+- Sat Sep 15 2018 release 1.5.0
+  libisofs now can record all xattr namespaces, user defined padding was moved
+  after appended partitions. libisoburn and xorriso make use of the new xattr
+  capability of libisofs.
+  All three libraries got some rarely triggered bugs fixed.
+
+- Sat Oct 26 2019 release 1.5.2
+  The libraries are now ready for building out-of-source. libisofs got minor
+  API extensions. libburn got a bug fixed which spoiled burn runs on
+  some MATSHITA laptop drives. It is now able to list all features which
+  the drive announces. xorriso can now set GPT type GUIDs with appended
+  partitions and the ISO partition.
+  All three libraries got some rarely triggered bugs fixed.
+
+- Mon Nov 25 2019 patch release 1.5.2.pl01
+  cdrskin did not properly burn multiple tracks. Track 1 was slow and burning
+  stalled before track 2. Regression introduced by 1.5.0.
+
+- Sat Jan 30 2021 , 07 Feb 2021 release 1.5.4
+  libburn offers new opportunities to influence drive speed. 
+  libisofs got a bug fixed which under medium rare circumstances spoiled 
+  zisofs production. libisofs switched to usage of libjte-2.0.0. Further it 
+  can now write and read zisofs2 format, which enables compression of files 
+  >= 4 GiB. When reading Joliet file trees, the names get stripped of their 
+  version numbers by default. After loading metadata, libisofs can now tell 
+  which directory tree was loaded and whether Rock Ridge is used. 
+  libisoburn and xorriso make use of these new features.
+  xorriso can put out the data stream of -check_media to standard output. It
+  can restore files with many zero bytes as sparse files and it is able to
+  extract recognized boot images into data files on hard disk.
+  A new script xorriso-dd-target helps to put an ISO image onto an USB stick
+  without endangering valuable hard disk content.
+  Several rarely triggered bugs were fixed.
+
+- Wed Jun 07 2023 release 1.5.6
+  libburn can overburn CD media, i.e. write more data than the drive announced
+  as medium capacity.
+  libisofs can assess many of the features which were in effect when a
+  given ISO 9660 filesystem was created. A safety limit was introduced not
+  to exceed the limit of Linux which is imposed on the number of SUSP CE
+  entries which is good for about 60 KiB of AAIP data. Some rarely occuring
+  bugs were fixed in libisofs.
+  libisoburn and xorriso expose the new library features to the user and
+  got some minor improvements. Many minor bugs were fixed.
 
 ------------------------------------------------------------------------------
 

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"
         ;;
@@ -16,22 +16,28 @@ AC_DEFUN([TARGET_SHIZZLE],
 
   AC_MSG_CHECKING([target operating system])
 
+  libburn_check_libcam=
   LIBBURNIA_LDCONFIG_CMD="echo 'No ldconfig run performed. If needed, configure manually for:'"
   
-  case $target_os in
-    linux*)
+  case $target in
+    *-*-linux*)
       ARCH=linux
       LIBBURN_ARCH_LIBS=
       LIBBURNIA_LDCONFIG_CMD=ldconfig
       ;;
-    freebsd*)
+    *-*-freebsd*)
       ARCH=freebsd
       LIBBURN_ARCH_LIBS=-lcam
       LIBBURNIA_PKGCONFDIR=$(echo "$libdir" | sed 's/\/lib$/\/libdata/')/pkgconfig
       ;;
-    kfreebsd*-gnu)
+    *-kfreebsd*-gnu*)
       ARCH=freebsd
       LIBBURN_ARCH_LIBS=-lcam
+      libburn_check_libcam=yes
+      ;;
+    *-solaris*)
+      ARCH=solaris
+      LIBBURN_ARCH_LIBS=-lvolmgt
       ;;
     *)
       ARCH=
@@ -39,8 +45,12 @@ AC_DEFUN([TARGET_SHIZZLE],
 #      AC_ERROR([You are attempting to compile for an unsupported platform])
       ;;
   esac
-
   AC_MSG_RESULT([$ARCH])
+
+  if test x"$libburn_check_libcam" = xyes
+  then
+    LIBBURNIA_CHECK_LIBCAM
+  fi
 ])
 
 
@@ -49,15 +59,17 @@ dnl It tests whether -Wl,--version-script=... works with the compiler
 AC_DEFUN([LIBBURN_ASSERT_VERS_LIBS],
 [
     libburnia_save_LDFLAGS="$LDFLAGS"
-    LDFLAGS="$LDFLAGS -Wl,--version-script=libburn/libburn.ver"
+    LDFLAGS="$LDFLAGS -Wl,--version-script=$srcdir/libburn/libburn.ver"
     AC_TRY_LINK([#include <stdio.h>], [printf("Hello\n");],
                 [vers_libs_test="yes"], [vers_libs_test="no"])
-    if test x$vers_libs_test = xno
+    if test x$vers_libs_test = xyes
     then
-        LDFLAGS="$libburnia_save_LDFLAGS"
+        LIBLDFLAGS="-Wl,--version-script=$srcdir/libburn/libburn.ver"
     fi
+    LDFLAGS="$libburnia_save_LDFLAGS"
+    AC_SUBST(LIBLDFLAGS)
 ])
-  
+ 
 
 dnl LIBBURNIA_SET_PKGCONFIG determines the install directory for the *.pc file.
 dnl Important: Must be performed _after_ TARGET_SHIZZLE
@@ -109,3 +121,121 @@ dnl For debugging only
 
 ])
 
+dnl LIBBURNIA_CHECK_ARCH_LIBS is by Thomas Schmitt, libburnia project
+dnl It tests whether the OS dependent libraries are available.
+dnl With libisoburn they are needed only for the case that indirect linking
+dnl does not work. So it is worth a try to omit them.
+dnl $1 = "mandatory" or "optional" define the action if test linking fails.
+dnl      "silent" is like "optional" but without message.
+AC_DEFUN([LIBBURNIA_CHECK_ARCH_LIBS],
+[
+    libburnia_save_LIBS="$LIBS"
+    if test "x$LIBBURN_ARCH_LIBS" = x
+    then
+      dummy=dummy
+    else
+      LIBS="$LIBS $LIBBURN_ARCH_LIBS"
+      AC_TRY_LINK([#include <stdio.h>], [printf("Hello\n");],
+                  [archlibs_test="yes"], [archlibs_test="no"])
+      LIBS="$libburnia_save_LIBS"
+      if test x$archlibs_test = xno
+      then
+        if test x"$1" = xmandatory
+        then
+          echo >&2
+          echo "FATAL: Test linking with mandatory library options failed: $LIBBURN_ARCH_LIBS" >&2
+          echo >&2
+          (exit 1); exit 1;
+        else
+          if test x"$1" = xoptional
+          then
+            echo "disabled linking with $LIBBURN_ARCH_LIBS (because not found)"
+          fi
+          LIBBURN_ARCH_LIBS=""
+        fi
+      else
+        if test x"$1" = xsilent
+        then
+          dummy=dummy
+        else
+          echo "enabled  linking with $LIBBURN_ARCH_LIBS"
+        fi
+      fi
+    fi
+])
+
+
+dnl LIBBURNIA_CHECK_LINUX_SCSI is by Thomas Schmitt, libburnia project
+dnl
+AC_DEFUN([LIBBURNIA_CHECK_LINUX_SCSI],
+[
+  dnl Check whether it is a Linux without scsi/scsi.h
+  libburn_scsi_disabled=
+  if test x"$ARCH" = xlinux
+  then
+    AH_TEMPLATE([Libburn_use_sg_dummY],
+                [Define to compile without OS specific SCSI features])
+    AC_MSG_CHECKING([for missing scsi/scsi.h on Linux])
+    AC_TRY_COMPILE([
+#ifdef __linux
+#include <scsi/scsi.h>
+#endif
+       ],
+       [;],
+       [AC_MSG_RESULT([no])],
+       [AC_DEFINE([Libburn_use_sg_dummY], [yes])
+        libburn_scsi_disabled=yes
+        AC_MSG_RESULT([yes])]
+    )
+  fi
+  if test x"$libburn_scsi_disabled" = xyes
+  then
+    echo "disabled operation of optical drives via SCSI"
+  fi
+])
+
+
+dnl LIBBURNIA_CHECK_LIBCAM is by Thomas Schmitt, libburnia project
+dnl
+AC_DEFUN([LIBBURNIA_CHECK_LIBCAM],
+[
+  dnl Check whether libcam is requested for FreeBSD kernel but missing
+  libburn_scsi_disabled=
+  if test x"$LIBBURN_ARCH_LIBS" = x"-lcam"
+  then
+    AH_TEMPLATE([Libburn_use_sg_dummY],
+                [Define to compile without OS specific SCSI features])
+    AC_MSG_CHECKING([for missing libcam for SCSI on FreeBSD kernel])
+    dnl If libcam is not available, LIBBURN_ARCH_LIBS will be made empty
+    LIBBURNIA_CHECK_ARCH_LIBS(silent)
+    if test x"$LIBBURN_ARCH_LIBS" = x
+    then
+      AC_DEFINE([Libburn_use_sg_dummY], [yes])
+      libburn_scsi_disabled=yes
+      AC_MSG_RESULT([yes])
+    else
+      AC_MSG_RESULT([no])
+    fi
+  fi
+  if test x"$LIBBURN_ARCH_LIBS" = x"-lcam"
+  then
+    AC_MSG_CHECKING([for missing libcam headers])
+    AC_TRY_COMPILE([
+#include <stdio.h>
+#include <camlib.h>
+#include <cam/scsi/scsi_message.h>
+#include <cam/scsi/scsi_pass.h>
+         ],
+         [;],
+         [AC_MSG_RESULT([no])],
+         [AC_DEFINE([Libburn_use_sg_dummY], [yes])
+         libburn_scsi_disabled=yes
+         AC_MSG_RESULT([yes])]
+    )
+  fi
+  if test x"$libburn_scsi_disabled" = xyes
+  then
+    echo "disabled operation of optical drives via SCSI"
+  fi
+])
+

cdrskin/README

@@ -4,18 +4,18 @@
 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.2.3.tar.gz
+http://scdbackup.sourceforge.net/cdrskin-1.5.7.tar.gz
 
-Copyright (C) 2006-2012 Thomas Schmitt, provided under GPL version 2 or later.
+Copyright (C) 2006-2023 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.
-IDE drives under Linux 2.4. need kernel module ide-scsi.
+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
 direct MMC operation on real CD/DVD/BD drives.
@@ -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.2.3.tar.gz, take it to a directory of your choice and do:
+Obtain cdrskin-1.5.7.tar.gz, take it to a directory of your choice and do:
 
-    tar xzf cdrskin-1.2.3.tar.gz
-    cd cdrskin-1.2.3
+    tar xzf cdrskin-1.5.7.tar.gz
+    cd cdrskin-1.5.7
 
 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
 
@@ -200,7 +206,7 @@ See output of command
 If you have use cases for them, please report your wishes and expectations.
 
 On the other hand, the capability of multi-session and of writing streams
-of unpredicted lenght surpass the current DVD capabilities of cdrecord.
+of unpredicted length surpass the current DVD capabilities of cdrecord.
 
 
                            Inspiration and Standard
@@ -351,7 +357,7 @@ but leaves the media in "intermediate" state. In the first session of writing
 one may only write sequentially to such a DVD. After that, it gets random
 addressable by cdrskin. DVD-ROM drives might show ill behavior with them.
 
-blank=format_overwrite_full  uses preferrably "Full Format" (type 00h).
+blank=format_overwrite_full  uses preferably "Full Format" (type 00h).
 This formatting lasts as long as writing a full DVD. It includes writing of
 lead-out which is said to be good for DVD ROM compatibility. 
 
@@ -422,6 +428,9 @@ It can also be enabled at configure time by
 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
+Add option
+    -use_libcdio
+to your run of cdrskin/compile_cdrskin.sh .
 
 You may get a (super fat) statically linked binary by :
     cdrskin/compile_cdrskin.sh -static
@@ -459,7 +468,7 @@ closing it immediately, waiting, and only then opening it for real:
                   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
@@ -470,9 +479,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
@@ -517,7 +526,7 @@ Run cdrskin by
 The following settings will make pfexec keep original UID and EUID and prevent
 most superuser powers. Be aware that you still can manipulate all device files
 if you have the file permissions for that.
-Full root privileges for cdrskin can then be aquired only by command su.
+Full root privileges for cdrskin can then be acquired only by command su.
 
 Edit /etc/security/exec_attr and add this line to the other "Media Backup"
 lines:
@@ -532,6 +541,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
@@ -548,7 +563,7 @@ are the cause. Any mistake of the burn program is supposed to be caught
 by the drive's firmware and to lead to mere misburns.
 The worst mishaps which hit the author imposed the need to reboot the
 system because of drives gnawing endlessly on ill media. Permanent hardware
-damage did not occur in 3.5 years of development. But one never knows ...
+damage did not occur in 13 years of development. But one never knows ...
 
 ------------------------------------------------------------------------------
 
@@ -576,7 +591,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-2012 Mario Danic, Thomas Schmitt
+Copyright (C) 2006-2023 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_5_6

@@ -18,7 +18,7 @@ set -x
 # Both binaries are static in respect to libburn.
 #
 # The script is to be run in the directory above the toplevel
-# directory of libburn resp. cdrskin development.
+# directory of libburn (or cdrskin) development.
 #
 
 # The top level directory in the SVN snapshot is named
@@ -38,7 +38,7 @@ original="./libburn_svn_release.tgz"
 # My changes are in $changes , mainly in $changes/cdrskin
 changes="./libburn-release"
 
-skin_release="1.2.2"
+skin_release="1.5.6"
 patch_level=""
 # patch_level=".pl00"
 skin_rev="$skin_release""$patch_level"
@@ -60,7 +60,8 @@ man_to_html_cmd="./cdrskin/convert_man_to_html.sh"
 man_page_html="cdrskin/man_1_cdrskin.html"
 
 # bintarget_dynamic="cdrskin_${skin_rev}-x86-suse9_0"
-bintarget_dynamic="cdrskin_${skin_rev}-amd64-suse10_2"
+# bintarget_dynamic="cdrskin_${skin_rev}-amd64-suse10_2"
+bintarget_dynamic="cdrskin_${skin_rev}-amd64-debian8_0"
 bintarget_static="$bintarget_dynamic"-static
 
 if test -d "$changes"
@@ -228,6 +229,7 @@ tar czf "$cdrskin_tarball" "$target"
    "$compile_cmd" $compile_static_opts -O2 -do_strip
    cp "$compile_result" "../$bintarget_static"
  fi
+ ( cd cdrskin ; cc -g -Wall -o unite_html_b_line unite_html_b_line.c )
  "$man_to_html_cmd"
  mv "$man_page_html" ..
 )

cdrskin/add_ts_changes_to_libburn_1_5_7

@@ -18,7 +18,7 @@ set -x
 # Both binaries are static in respect to libburn.
 #
 # The script is to be run in the directory above the toplevel
-# directory of libburn resp. cdrskin development.
+# directory of libburn (or cdrskin) development.
 #
 
 # The top level directory in the SVN snapshot is named
@@ -38,7 +38,7 @@ original="./libburn_svn.tgz"
 # My changes are in $changes , mainly in $changes/cdrskin
 changes="./libburn-develop"
 
-skin_release="1.2.3"
+skin_release="1.5.7"
 patch_level=""
 skin_rev="$skin_release""$patch_level"
 
@@ -58,7 +58,8 @@ compile_result="cdrskin/cdrskin"
 man_to_html_cmd="./cdrskin/convert_man_to_html.sh"
 man_page_html="cdrskin/man_1_cdrskin.html"
 
-bintarget_dynamic="cdrskin_${skin_rev}-amd64-suse10_2"
+# bintarget_dynamic="cdrskin_${skin_rev}-amd64-suse10_2"
+bintarget_dynamic="cdrskin_${skin_rev}-amd64-debian8_0"
 bintarget_static="$bintarget_dynamic"-static
 
 if test -d "$changes"
@@ -228,6 +229,8 @@ tar czf "$cdrskin_tarball" "$target"
  fi
 #  "$compile_cmd" -libburn_svn -O2 -do_diet -do_strip
 #  cp "$compile_result" "../$bintarget_dynamic"_diet
+
+ ( cd cdrskin ; cc -g -Wall -o unite_html_b_line unite_html_b_line.c )
  "$man_to_html_cmd"
  mv "$man_page_html" ..
 )

cdrskin/cdrfifo.c

@@ -1,5 +1,5 @@
 /*
- cdrfifo.c , Copyright 2006 Thomas Schmitt <scdbackup@gmx.net>
+ cdrfifo.c , Copyright 2006 - 2016 Thomas Schmitt <scdbackup@gmx.net>
 
  A fd-to-fd or fd-to-memory fifo to be used within cdrskin or independently.
  By chaining of fifo objects, several fifos can be run simultaneously
@@ -26,8 +26,22 @@
 #include <sys/select.h>
 
 #ifndef Cdrfifo_standalonE
-/* <<< until release of 0.7.4 : for Libburn_has_open_trac_srC */
+/* for burn_os_alloc_buffer() */
 #include "../libburn/libburn.h"
+
+/* ts B91124:
+   DISABLED, because this spoils multi-track burning by slowing down first
+   track and stalling before the second track begins. Obviously a problem
+   with chained input and waiting for full O_DRIECT suitable read chunks.
+   DO NOT ENABLE before the wait code in this source file is fixed.
+   That long, ./configure option --enable-track-src-odirect must not
+   get into effect in libburn. NO -DLibburn_read_o_direcT either.
+
+   For extra safety, O_DIRECT has been banned in libburn/sg-linux.c too.
+
+  # def ine Libburn_has_open_trac_srC 1
+*/
+
 #endif
 
 #include "cdrfifo.h"
@@ -107,6 +121,9 @@ struct CdrfifO {
  /* index of currently active (i.e. reading) follow-up */
  int follow_up_fd_idx;
 
+ /* short read encountered, take subsequent errno 22 with O_DIRECT as EOF */
+ int o_direct_was_short;
+
 
  /* (simultaneous) peer chaining */
  struct CdrfifO *next;
@@ -177,6 +194,7 @@ int Cdrfifo_new(struct CdrfifO **ff, int source_fd, int dest_fd,
  }
  o->follow_up_fd_counter= 0;
  o->follow_up_fd_idx= -1;
+ o->o_direct_was_short= 0;
  o->next= o->prev= NULL;
  o->chain_idx= 0;
 
@@ -696,8 +714,17 @@ after_write:;
    else if(can_read < Cdrfifo_o_direct_chunK)
      can_read= -1;
    ret= 0;
-   if(can_read>0)
+   if(can_read>0) {
      ret= read(o->source_fd,o->buffer+o->write_idx,can_read);
+     if(ret > 0) {
+       if(ret < can_read) {
+         /* Probably EOF. Prepare for errno = 22 in the next read. */
+         o->o_direct_was_short= 1;
+       } else {
+         o->o_direct_was_short= 0;
+       }
+     }
+   }
    if(can_read < 0) {
      /* waiting for a full Cdrfifo_o_direct_chunK to fit */
      if(can_write <= 0 && o->dest_fd >= 0) {
@@ -731,6 +758,8 @@ after_write:;
 #endif /* ! Libburn_has_open_trac_srC */
 
    if(ret==-1) {
+     if(o->o_direct_was_short && errno == 22)
+       goto have_eof;
 
      /* >>> handle input error */;
      fprintf(stderr,"\ncdrfifo %d: on read: errno=%d , \"%s\"\n",
@@ -739,6 +768,7 @@ after_write:;
 
      o->source_fd= -1;
    } else if(ret==0) { /* eof */
+have_eof:;
      /* activate eventual follow-up source fd */
      if(Cdrfifo_debuG || (flag&1))
        fprintf(stderr,"\ncdrfifo %d: on read(%d,buffer,%d): eof\n",
@@ -799,7 +829,7 @@ ex:;
 /** Check for pending data at the fifo's source file descriptor and wether the
     fifo is ready to take them. Simultaneously check the buffer for existing
     data and the destination fd for readiness to accept some. If so, a small
-    chunk of data is transfered to and/or from the fifo.
+    chunk of data is transferred to and/or from the fifo.
     This is done for the given fifo object and all members of its next-chain.
     The check and transactions are repeated until a given timespan has elapsed.
     libburn applications call this function in the burn loop instead of sleep().

cdrskin/cdrfifo.h

@@ -1,6 +1,6 @@
 
 /*
- cdrfifo.c , Copyright 2006 Thomas Schmitt <scdbackup@gmx.net>
+ cdrfifo.c , Copyright 2006 - 2016 Thomas Schmitt <scdbackup@gmx.net>
 
  A fd-to-fd or fd-to-memory fifo to be used within cdrskin or independently.
  By chaining of fifo objects, several fifos can be run simultaneously
@@ -118,7 +118,7 @@ int Cdrfifo_get_cdr_counters(struct CdrfifO *o,
                              int flag);
 
 /** Inquire the eventually detected size of an eventual ISO-9660 file system
-    @return 0=no ISO resp. size detected, 1=size_in_bytes is valid
+    @return 0=no ISO size detected, 1=size_in_bytes is valid
 */
 int Cdrfifo_get_iso_fs_size(struct CdrfifO *o, double *size_in_bytes,int flag);
 
@@ -136,7 +136,7 @@ int Cdrfifo_adopt_iso_fs_descr(struct CdrfifO *o, char **pt, int flag);
 /** Check for pending data at the fifo's source file descriptor and wether the
     fifo is ready to take them. Simultaneously check the buffer for existing
     data and the destination fd for readiness to accept some. If so, a small
-    chunk of data is transfered to and/or from the fifo.
+    chunk of data is transferred to and/or from the fifo.
     This is done for the given fifo object and all members of its next-chain.
     The check and transactions are repeated until a given timespan has elapsed.
     libburn applications call this function in the burn loop instead of sleep().

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 "Version 1.2.3, Jan 13, 2012"
+.TH CDRSKIN 1 "Version 1.5.7, Jun 07, 2023"
 .\" 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.
@@ -101,15 +103,15 @@ This information is also used by the operating systems' CD-ROM read drivers.
 .PP
 In general there are two types of tracks: data and audio. They differ in
 sector size, throughput and readability via the systems' CD-ROM drivers
-resp. by music CD players. With DVD and BD there is only type data.
+and by music CD players. With DVD and BD there is only type data.
 .br
 If not explicitly option -audio is given, then any track is burned as type
 data, unless the track source is a file with suffix ".wav" or ".au" and has a
-header part which identifies it as MS-WAVE resp. SUN Audio with suitable
+header part which identifies it as MS-WAVE or SUN Audio with suitable
 parameters. Such files are burned as audio tracks by default.
 .PP
 While audio tracks just contain a given time span of acoustic vibrations,
-data tracks may have an arbitray meaning. Nevertheless, ISO-9660 filesystems
+data tracks may have an arbitrary meaning. Nevertheless, ISO-9660 filesystems
 are established as a format which can represent a tree of directories and
 files on all major operating systems. Such filesystem images can be
 produced by programs mkisofs or genisoimage or xorriso.
@@ -126,10 +128,10 @@ the archivers afio and star. Not suitable seems GNU tar.
 .br
 In general there are two approaches for writing media:
 .br
-A permissive mode depicted by option
+A permissive mode selected by option
 .B -tao
-which needs no predicted track size and allows to make use of
-eventual multi-session capabilities.
+which needs no predicted track size and can use
+multi-session capabilities if offered by drive and medium.
 .br
 A more restrictive mode
 .B -sao
@@ -154,8 +156,8 @@ read-only. Closing is done automatically unless option
 is given which keeps the media appendable.
 .br
 Write mode
--tao allows to use track sources of unpredictable length (like stdin) and
-allows to write further sessions to appendable media.
+-tao is able to use track sources of unpredictable length (like stdin) and
+to write further sessions to appendable media.
 -sao produces audio sessions with seamless tracks but needs predicted track
 sizes and cannot append sessions to media.
 .br
@@ -183,7 +185,8 @@ Used DVD-RW get into blank sequential state by option
 With DVD-R[W] two write modes may be available:
 .br
 Mode DAO has many restrictions. It does not work with
-appendable media, allows no -multi and only a single track. The size of the
+appendable media, cannot do -multi and writes only a single track.
+The size of the
 track needs to be known in advance. So either its source has to be a disk file
 of recognizable size or the size has to be announced explicitly by options
 .B tsize= 
@@ -200,8 +203,8 @@ The other mode, Incremental Streaming, is the default write mode if
 it is available and if the restrictions of DAO would prevent the job.
 Incremental Streaming may be selected explicitly by option
 .B -tao
-as it resembles much CD TAO by allowing track sources of
-unpredicted length and to keep media appendable by option
+as it resembles much CD TAO by accepting track sources of
+unpredicted length and being able to keep media appendable by option
 .B -multi . It does not work with DVD-R DL and minimally blanked DVD-RW.
 The only restriction towards CD-R[W] is the lack of support for -audio tracks.
 Multiple tracks per session are permissible.
@@ -212,7 +215,7 @@ with DVD+R[/DL] or BD-R.
 .br
 Quite deliberately write mode -sao insists in the tradition of a predicted
 track size and blank media, whereas -tao writes the tracks open ended and
-allows appendable media.
+can be applied to appendable media.
 .br
 BD-R may be formatted before first use to enable the Defect Management which
 might catch and repair some bad spots at the expense of slow speed
@@ -235,7 +238,7 @@ of option
 .B --grow_overwriteable_iso .
 Without this option or without an ISO-9660 filesystem image present
 on media, -toc does not return information about the media content and
-media get treated as blank regardless wether they hold data or not.
+media get treated as blank regardless whether they hold data or not.
 .br
 Currently there is no difference between -sao and -tao. If ever, then -tao
 will be the mode which preserves the current behavior.
@@ -317,7 +320,7 @@ redirected to stderr and the stream data of a burn run will appear on stdout.
 .br
 Not good for terminals ! Redirect it.
 .br
-Pseudo-drives allow -dummy. Their reply with --tell_media_space can be utopic.
+Pseudo-drives support -dummy. Their reply with --tell_media_space can be utopic.
 -dummy burn runs touch the file but do not modify its data content.
 .br
 Note: --allow_emulated_drives is restricted to stdio:/dev/null if cdrskin
@@ -358,7 +361,7 @@ Announces that the subsequent tracks are to be burned as audio.
 The source is supposed to be uncompressed headerless PCM, 44100 Hz, 16 bit,
 stereo. For little-endian byte order (which is usual on PCs) use option
 -swab. Unless marked explicitly by option -data, input files with suffix
-".wav" are examined wether they have a header in MS-WAVE format confirming
+".wav" are examined whether they have a header in MS-WAVE format confirming
 those parameters and eventually raw audio data get extracted and burned as
 audio track. Same is done for suffix ".au" and SUN Audio.
 .br
@@ -424,7 +427,7 @@ Format a DVD-RW to "Restricted Overwrite". The user should bring some patience.
 .TP
 format_overwrite_quickest
 Like format_overwrite without creating a 128 MiB trailblazer session.
-Leads to "intermediate" state which only allows sequential write
+Leads to "intermediate" state which only supports sequential write
 beginning from address 0.
 The "intermediate" state ends after the first session of writing data.
 .TP
@@ -443,7 +446,7 @@ format_defectmgt
 Format DVD-RAM or BD to reserve the default amount of spare blocks for
 defect management.
 .br
-The following format_defectmgt_* allow to submit user wishes which
+The following format_defectmgt_* enable the user to submit wishes which
 nevertheless have to match one of the available formats. These formats are
 offered by the drive after examining the media.
 .TP
@@ -479,7 +482,7 @@ Unformatted blank BD-R will be left unformatted.
 format_defectmgt_payload_<size>
 Format DVD-RAM or BD. The text after "format_defectmgt_payload_" gives a
 number of bytes, eventually with suffixes "s", "k", "m". The largest number
-of spare blocks will be chosen which allows at least the given payload size.
+of spare blocks will be chosen which enables at least the given payload size.
 .TP
 format_by_index_<number>
 Format DVD-RW, DVD+RW, DVD-RAM or BD.
@@ -529,6 +532,7 @@ to mark the end of the range of an eventual option -audio or -xa1.
 .br
 Options -mode2, -xa, and -xa2 get mapped to -data, not using the desired CD
 sector formats and thus not taking advantage of eventual higher payload.
+.TP
 .BI \-xa1
 Subsequent tracks are data tracks with input suitable for CD-ROM XA mode 2
 form 1. This differs from -data input by 8 additional header bytes per block.
@@ -569,9 +573,14 @@ Eject the disc after work is done.
 .TP
 .BI \-force
 Assume that the user knows better in situations when cdrskin or libburn are
-insecure about drive or media state. This includes the attempt to blank
+refusing because of concerns about drive or media state.
+.br
+.B Caution:
+Use option -force only when in urgent need. 
+.br
+This option enables the attempt to blank
 media which are classified as unknown or unsuitable, and the attempt to use
-write modes which libburn believes they are not supported by the drive.
+write modes of which libburn believes they are not supported by the drive.
 .br
 Another application is to enforce blanking or re-formatting of media
 which appear to be in the desired blank or format state already.
@@ -580,10 +589,22 @@ This option enables a burn run with option -dummy even if libburn believes
 that drive and media will not simulate the write mode but will write for real.
 .br
 It enables a burn run where cdrskin expects to exceed the available media
-capacity.
+capacity. This is known as "overburn" and might succeed on CD media with
+write type SAO.
+.B Too much overburning
+might be
+.B harmful to the medium
+and might
+.B make the drive unusable
+(hopefully only until it gets powered off and on). The man page of cdrecord
+mentions 88 seconds = 6600 blocks as halfways safe amount over the official
+medium capacity. The assessment of track sizes by libburn will be wrong if
+the written size reaches or exceeds 90 minutes = 405000 sectors. The overall
+medium size assessment by the Linux kernel is supposed to yield roughly the
+written size, but you should test this yourself with every overburnt medium.
 .br
-.B Caution:
-Use this only when in urgent need.
+First consider to use a medium with more capacity rather than trying to
+overburn a CD.
 .TP
 .BI \-format
 Same as blank=format_overwrite_full -force but restricted to DVD+RW.
@@ -615,7 +636,8 @@ modesty_on_drive=1:min_percent=75:max_percent=95
 The name of this cdrecord option stems from the "Immed" bit which can make some
 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. 
+commands where possible and appropriate. To really disable asynchronous command
+execution, use option use_immed_bit=off .
 .TP
 .BI index= list
 Set a comma separated list of index start address numbers for the next track.
@@ -806,7 +828,7 @@ 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.
+153,600 bytes/second. With DVD, 1x = 1,385,000 bytes/second.
 With BD 1x = 4,495,625 bytes/second.
 It is not an error to set a speed higher than is suitable for drive
 and media. One should stay within a realistic speed range, though.
@@ -830,7 +852,7 @@ This mode also applies pro-forma to overwriteable media
 Mode -tao can be used with track sources of unpredictable size, like standard
 input or named pipes. It is also the only mode that can be used for writing
 to appendable media which already hold data. With unformatted DVD-R[W] it is
-the only mode which allows -multi.
+the only mode which can keep media appendable by option -multi.
 .br
 Mode -tao is not usable for minimally blanked DVD-RW and for DVD-R DL.
 .TP
@@ -925,9 +947,9 @@ startup files. Level 3 is for debugging and useful mainly in conjunction with
 somebody who had a look into the program sourcecode.
 .TP
 .BI \-V
-Enable logging of SCSI commands to stderr. This allows expert examination
-of the interaction between libburn and the drive. The commands are specified
-in SCSI-3 standards SPC, SBC, MMC.
+Enable logging of SCSI commands to stderr. This is helpful for expert
+examination of the interaction between libburn and the drive.
+The commands are specified in SCSI-3 standards SPC, SBC, MMC.
 .TP
 .BI \-waiti
 Wait until input data is available at stdin or EOF occurs at stdin.
@@ -994,6 +1016,25 @@ the default.
 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
@@ -1045,11 +1086,10 @@ padded up to the necessary size by zeros. Size -1 revokes direct writing
 and switches back to normal session oriented writing.
 .br
 Both, write_start_address and direct_write_amount size must be aligned to a
-media dependend transaction size. With DVD-RAM, BD-RE, DVD+RW this is 2k, with
+media dependent 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. With most write types, tracks get padded up to the next multiple
 of this write size (see option --obs_pad).
@@ -1057,6 +1097,32 @@ 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
+NN.wav, where NN is the track number from 01 to at most 99.
+.TP
+.BI extract_basename= name
+Set a filename prefix which shall be used by extract_audio_to= instead of the
+empty default name prefix.
+.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
@@ -1093,7 +1159,7 @@ of bytes is read. This option may be helpful to bring the average throughput
 near to the maximum throughput of a drive. A large fs= and a small 
 fifo_start_at= combine a quick burn start and a large savings buffer to
 compensate for temporary lack of source data. At the beginning of burning,
-the software protection against buffer underun is as weak as the size of
+the software protection against buffer underrun is as weak as the size of
 fifo_start_at= . So it is best if the drive offers hardware protection which
 is enabled automatically if not driveropts=noburnfree is given.
 .TP
@@ -1140,7 +1206,15 @@ growisofs -dvd-compat is roughly equivalent to cdrskin without option -multi.
 .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 a CD-TEXT language block.
+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
@@ -1243,14 +1317,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 or speed=-1, if it deviates from "Write speed L"
+or "Write speed H", respectively.
+.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:
@@ -1287,8 +1392,8 @@ source cannot deliver a size prediction and no tsize= was specified and an
 exact track size prediction is demanded by the write mode.
 .br
 This was the fallback from bad old times when cdrskin was unable to burn
-in mode -tao . It came back with minimally blanked DVD-RW which allow no
-Incremental Streaming (-tao) resp. with explicitly selected write mode -sao
+in mode -tao . It came back with minimally blanked DVD-RW, which cannot do
+Incremental Streaming (-tao), and with explicitly selected write mode -sao
 for best DVD-ROM compatibility.
 .br
 If the track source delivers less bytes than announced then the missing ones
@@ -1298,7 +1403,7 @@ will be filled with zeros.
 Prepare a recording session, do not perform it but rather inquire the
 maximum number of 2048 byte data blocks which may be written in
 the current state of media with the prepared setup. So this option disables
-recording of data. It does allow blanking, though, and will measure space
+recording of data. It does not disable blanking, though, and will measure space
 afterwards.
 .br
 It is not mandatory to give track sources but their nature may influence
@@ -1313,6 +1418,17 @@ 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 acquired.
+.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 
@@ -1322,6 +1438,52 @@ or BD-RE byte_offset must be aligned to 2 kiB blocks, but better is 32 kiB.
 With DVD-RW 32 kiB alignment is mandatory.
 .br
 Other media are not suitable for this option yet.
+.TP
+.BI modesty_on_drive= <mode>[:parameter=<value>[:parameter=<value>...]]
+Mode 1 keeps the program from trying to write to the burner drive while its
+buffer is in danger to be filled by more than parameter "max_percent".
+If this filling is exceeded then the program will wait until the filling
+is at most the value of parameter "min_percent".
+.br
+Percentages are permissible in the range of 25 to 100.
+.br
+This can ease the load on operating system and drive controller and thus help
+with achieving better input bandwidth if disk and burner are not on independent
+controllers (like hda and hdb). Unsufficient input bandwidth is indicated by
+output "(fifo  xy%)" of option -v if xy is lower than 90 for some time.
+modesty_on_drive= might hamper output bandwidth and cause buffer underruns.
+.br
+A new use case is to work around the poor simultaneous performance of multiple
+burn runs on Linux kernel 3.16 and alike. Here it is not about giving the
+hard disk enough time to fill the fifo, but about keeping ioctl(SG_IO) from
+blocking for a longer time and thus blocking all other burn runs.
+.br
+To have max_percent larger than the burner's best actual
+buffer fill has the same effect as min_percent==max_percent. Some burners
+do not use their full buffer with all media types. Watch output "[buf xy%]"
+of option -v to get an impression of the actual buffer usage. Some burners
+are not suitable because they report buffer fill with granularity too large
+in size or time, or because they go to full speed only when their buffer is
+full.
+.br
+If a write attempt is delayed, the program will wait for a number of
+microseconds which is given by parameter "min_usec" before inquiring the buffer
+again. If more retries occur, this waiting time between inquiries increases
+up to the value of parameter "max_usec".
+.br
+If the delay lasts longer than the number of seconds given by parameter
+"timeout_sec", then mode 1 is set 0 and normal burning goes on.
+.br
+Mode 0 disables this feature. Mode -1 keeps it unchanged. Default is:
+.br
+  0:min_percent=65:max_percent=95:timeout_sec=120:
+  min_usec=10000:max_usec=100000
+.br
+The defaults of cdrskin are good for IDE problems. With concurrent Linux SG_IO
+problems on modern hardware, higher min_percent and lower usec might yield
+better buffer fills while still avoiding the problem:
+.br
+  min_percent=90:max_percent=95:min_usec=5000:max_usec=25000
 .PP
 Alphabetical list of options which are only intended for very special
 situations and not for  normal use:
@@ -1384,13 +1546,13 @@ fcntl(2).
 .TP
 .BI \--drive_not_o_excl
 Linux specific: Do not ask the operating system to prevent opening busy drives.
-Wether this leads to senseful behavior depends on operating system and kernel.
+Whether 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, --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
+on kernels >= 2.6 . This option explicitly overrides that default
 in order to meet other programs at a common device file for each drive.
 On kernel 2.4 families sr and scd will find no drives.
 .br
@@ -1401,7 +1563,7 @@ Linux specific:
 Try to exclusively reserve device files /dev/srN, /dev/scdM, /dev/sgK of drives.
 This would be helpful to protect against collisions with program growisofs.
 Regrettably on Linux kernel 2.4 with ide-scsi emulation this seems not to
-work. Wether it becomes helpful with new Linux systems has to be evaluated.
+work. Whether it becomes helpful with new Linux systems has to be evaluated.
 .TP
 .BI \--fifo_disable
 Disable fifo despite any fs=.
@@ -1436,29 +1598,45 @@ Try to ignore any signals rather than to abort the program. This is not a
 very good idea. You might end up waiting a very long time for cdrskin
 to finish.
 .TP
-.BI modesty_on_drive= <mode>[:min_percent=<num>][:max_percent=<num>]
-Mode 1 keeps the program from trying to write to the burner drive while its
-buffer is in danger to be filled by more than max_percent. If this filling is
-exceeded then the program will wait until the filling is at most min_percent.
+.BI \--list_features
+List the SCSI/MMC features which were obtained from the drive when it was
+last acquired or re-assessed. Although this is better readable than the
+raw reply to SCSI command GET CONFIGURATION, the MMC specification text
+is still needed for interpreting it.
 .br
-This can ease the load on operating system and drive controller and thus help
-with achieving better input bandwidth if disk and burner are not on independent
-controllers (like hda and hdb). Unsufficient input bandwidth is indicated by
-output "(fifo  xy%)" of option -v if xy is lower than 90 for some time.
-modesty_on_drive= might hamper output bandwidth and cause buffer underruns.
+The list consists of line groups of the form
 .br
-To have max_percent larger than the burner's best actual
-buffer fill has the same effect as min_percent==max_percent. Some burners
-do not use their full buffer with all media types. Watch output "[buf xy%]"
-of option -v to get an impression of the actual buffer usage. Some burners
-are not suitable because they report buffer fill with granularity too large
-in size or time. 
+  Code +/- : Name : Version,P/N
 .br
-Mode 0 disables this feature. Mode -1 keeps it unchanged. Default is:
+             Raw feature data bytes as hex numbers
 .br
-modesty_on_drive=0:min_percent=65:max_percent=95
+             Parsed info as Name=Value pairs
 .br
-Percentages are permissible in the range of 25 to 100.
+The headline is the only one which has no blank at its start.
+Code is given as 16 bit hex number.
+.br
+"+" marks a currently offered feature. "-" marks those which may be offered
+under different circumstances.
+.br
+Name is the feature name as listed in MMC specs.
+.br
+"P" marks persistent features. "N" marks non-persistent features.
+.br
+The Raw data can occupy more than one line. No "=" occurs in such lines.
+If no raw data are present, one line with some blanks is listed instead.
+.br
+The Parsed info shows some extracted field values with names which resemble
+the names used in the MMC description of the particular feature. Parsed info
+lines contain at least one Name=Value pair. More than one line is possible.
+If no parsed info is produced, one line with some blanks is listed instead.
+.br
+Example:
+.br
+  0107 - : Real Time Streaming : 4,N 
+.br
+           1f 00 00 00 
+.br
+           RBCB=1 , SCS=1 , MP2A=1 , WSPD=1 , SW=1
 .TP
 .BI \--no_abort_handler
 On signals exit even if the drive is in busy state. This is not a very good
@@ -1479,16 +1657,27 @@ 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.
+Pad the data of the last write operation of a DVD-R[W] DAO session, or BD-R
+session, or stdio: pseudo-drive session 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.
+Whether it is applied automatically to BD-R depends on option
+--bdr_obs_exempt.
 .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.
+Use this option if there is the suspicion that DVD-R[W] DAO or BD-R 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 \--bdr_obs_exempt
+Exempt BD-R media from automatic unconditional transaction end padding,
+provided that this padding is not requested by --obs_pad and that
+no stream_recording is requested.
+.br
+This is a new feature introduced with version 1.5.6. It might become default
+in later versions.
+.TP
 .BI \--old_pseudo_scsi_adr
 Linux specific:
 Use and report literal Bus,Target,Lun addresses rather than real SCSI and
@@ -1506,16 +1695,26 @@ This setting affects only CD SAO write runs.
 .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
+index 0 and contains zeros. 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 use_immed_bit= on|off|default
+Control whether several long lasting SCSI commands shall be executed with the
+Immed bit, which makes the commands end early while the drive operation is
+still going on. cdrskin then inquires progress indication until the drive
+reports to be ready again. If this feature is turned off, then blanking and
+formatting will show no progress indication.
+.br
+It may depend on the operating system whether use_immed_bit= is set to "off"
+by default.
 .TP
 .BI --xa1-ignore
-Silently interpret option -xa1 as -data. This may be necessary if a frontent
+Silently interpret option -xa1 as -data. This may be necessary if a frontend
 does not prepare -xa1 block headers but insists in using option -xa1.
 .SH EXAMPLES
 .SS
@@ -1551,7 +1750,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
@@ -1559,7 +1758,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
@@ -1581,16 +1780,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,8 +39,8 @@ 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
-connected via SCSI, PATA (aka IDE, ATA), USB, or SATA.
+MMC-5 for DVD or BD. Linux, FreeBSD, Solaris, and NetBSD can communicate
+with 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.2.2</DT>
+<DT>libburn-1.5.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>
 
@@ -107,10 +109,10 @@ DVD-R DL, which both support no -multi.
 <DD>#<KBD>&nbsp;cdrskin -scanbus</KBD></DD>
 <DD>#<KBD>&nbsp;cdrskin dev=ATA -scanbus</KBD></DD>
 <DD>#<KBD>&nbsp;cdrskin --devices</KBD></DD>
-<DT>Being superuser avoids permission problems with /dev/srN resp. /dev/hdX .
+<DT>Being superuser avoids permission problems with /dev/srN and /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,15 +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.2.2.tar.gz">cdrskin-1.2.2.tar.gz</A>
-(930 KB).
+<DD><A HREF="cdrskin-1.5.6.tar.gz">cdrskin-1.5.6.tar.gz</A>
+(1075 KB).
 </DD>
-<DD><A HREF="cdrskin-1.2.2.tar.gz.sig">cdrskin-1.2.2.tar.gz.sig</A></DD>
+<DD><A HREF="cdrskin-1.5.6.tar.gz.sig">cdrskin-1.5.6.tar.gz.sig</A></DD>
 <DD>
 (detached GPG signature for verification by
-<KBD>gpg --verify cdrskin-1.2.2.tar.gz.sig cdrskin-1.2.2.tar.gz</KBD>
+<KBD>gpg --verify cdrskin-1.5.6.tar.gz.sig cdrskin-1.5.6.tar.gz</KBD>
 <BR>
-after <KBD>gpg --keyserver keys.gnupg.net --recv-keys ABC0A854</KBD>).
+after <KBD>gpg --keyserver keyserver.ubuntu.com --recv-keys ABC0A854</KBD>).
 </DD>
 <DD>
 The cdrskin tarballs are source code identical with libburn releases
@@ -245,8 +247,8 @@ cdrskin_0.4.2.pl00-x86-suse9_0-static.tar.gz</A>, (310 KB), -static compiled,
 </DL>
 <DL><DT>Contact:</DT>
 <DD>Thomas Schmitt, <A HREF="mailto:scdbackup@gmx.net">scdbackup@gmx.net</A></DD>
-<DD>libburn development mailing list,
-<A HREF="mailto:libburn-hackers@pykix.org">libburn-hackers@pykix.org</A></DD>
+<DD>GNU xorriso mailing list, where cdrskin and libburn are on topic, too:
+<A HREF="mailto:bug-xorriso@gnu.org">bug-xorriso@gnu.org</A></DD>
 </DL>
 <DL><DT>License:</DT>
 <DD><A HREF="COPYING_cdrskin">GPL</A>, an <A HREF="http://www.opensource.org/">Open Source</A> approved license</DD>
@@ -257,54 +259,53 @@ 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.2.0:
+Enhancements towards previous stable version cdrskin-1.5.4:
 <UL>
-<LI>Small internal refinements</LI>
+<LI>New cdrskin option --bdr_obs_exempt</LI>
+<LI>Officially enabled overburning on CD media</LI>
 <!--
 <LI>none</LI>
 -->
 </UL>
 
-Bug fixes towards cdrskin-1.2.0:
+Bug fixes towards cdrskin-1.5.4:
 <UL>
-<LI>none</LI>
-<!--
-<LI>none</LI>
--->
+<LI>Overburning with cdrskin option -force ended by a libburn error</LI>
 </UL>
+<!--
+-->
 
 <HR>
 
 <P>
 <DL>
-<DT><H3>Development snapshot, version 1.2.3 :</H3></DT>
-<DD>Enhancements towards current stable version 1.2.2:
+<DT><H3>Development snapshot, version 1.5.7 :</H3></DT>
+<DD>Enhancements towards current stable version 1.5.6:
 <UL>
 <LI>none yet</LI>
 <!--
 <LI>none yet</LI>
 -->
-
 </UL>
-</DD>
-
-<DD>Bug fixes towards cdrskin-1.2.0:
+Bug fixes towards cdrskin-1.5.6:
 <UL>
 <LI>none yet</LI>
 <!--
+<LI>none yet</LI>
 -->
 </UL>
 </DD>
 
 <DD>&nbsp;</DD>
-<DD><A HREF="README_cdrskin_devel">README 1.2.2</A>
-<DD><A HREF="cdrskin__help_devel">cdrskin-1.2.2 --help</A></DD>
-<DD><A HREF="cdrskin_help_devel">cdrskin-1.2.2 -help</A></DD>
-<DD><A HREF="man_1_cdrskin_devel.html">man cdrskin (as of 1.2.2)</A></DD>
+<DD><A HREF="README_cdrskin_devel">README 1.5.7</A>
+<DD><A HREF="cdrskin__help_devel">cdrskin-1.5.7 --help</A></DD>
+<DD><A HREF="cdrskin_help_devel">cdrskin-1.5.7 -help</A></DD>
+<DD><A HREF="man_1_cdrskin_devel.html">man cdrskin (as of 1.5.7)</A></DD>
 <DD>&nbsp;</DD>
-<DT>Maintainers of cdrskin unstable packages please use SVN of
+<DT>Maintainers of cdrskin unstable packages please use git of
 <A HREF="http://libburnia-project.org"> libburnia-project.org</A></DT>
-<DD>Download: <KBD><B>svn co http://svn.libburnia-project.org/libburn/trunk libburn</B>
+<DD>Download: <KBD>
+<B>git clone https://dev.lovelyhq.com/libburnia/libburn.git</B>
 </KBD></DD>
 <DD>Build: <KBD><B>cd libburn ; ./bootstrap ; ./configure --prefix /usr ; make ; cdrskin/compile_cdrskin.sh</B>
 </KBD></DD>
@@ -315,13 +316,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.2.3.tar.gz">cdrskin-1.2.3.tar.gz</A>
-(930 KB).
+<A HREF="cdrskin-1.5.7.tar.gz">cdrskin-1.5.7.tar.gz</A>
+(1075 KB).
 </DD>
 
 <!-- This is not offered any more since spring 2008
@@ -471,7 +472,7 @@ cdrecord but not vice versa.
 <BR>
 <BR>
 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
+Especially i do appreciate its write mode -tao which can 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 using it for
 burning CDs.
@@ -496,7 +497,7 @@ opportunity is the goal of a cdrecord compatibility wrapper.
 <BR>
 <BR>
 It is very important to me that this project is not perceived as hostile
-towards Joerg Schilling and his ongoing work.
+towards Joerg Schilling and his work.
 I owe him much. For cdrecord, for mkisofs, for star. Chapeau.
 <BR>
 </P>
@@ -517,11 +518,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 "2012.07.08.103007"
+#define Cdrskin_timestamP "2024.04.27.162735"

cdrskin/compile_cdrskin.sh

@@ -1,14 +1,14 @@
 #!/bin/sh
 
 # compile_cdrskin.sh  
-# Copyright 2005 - 2012 Thomas Schmitt, scdbackup@gmx.net, GPL
-# to be executed within  ./libburn-*  resp ./cdrskin-*
+# Copyright 2005 - 2023 Thomas Schmitt, scdbackup@gmx.net, GPL v2 or later
+# to be executed within  ./libburn-*  or./cdrskin-*
 
 debug_opts="-O2"
 def_opts=
 largefile_opts="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1"
 fifo_opts=""
-libvers="-DCdrskin_libburn_1_2_3"
+libvers="-DCdrskin_libburn_1_5_6"
 
 # To be used if Makefile.am uses libburn_libburn_la_CFLAGS
 # burn="libburn/libburn_libburn_la-"
@@ -41,15 +41,15 @@ do
   elif test "$i" = "-compile_dewav"
   then
     compile_dewav=1
-  elif test "$i" = "-libburn_1_2_2"
+  elif test "$i" = "-libburn_1_5_6"
   then
-    libvers="-DCdrskin_libburn_1_2_2"
+    libvers="-DCdrskin_libburn_1_5_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_2_3"
+    libvers="-DCdrskin_libburn_1_5_7"
     libdax_audioxtr_o="$burn"libdax_audioxtr.o
     libdax_msgs_o="$burn"libdax_msgs.o
     cleanup_src_or_obj="$burn"cleanup.o
@@ -99,8 +99,8 @@ do
     echo "Options:"
     echo "  -compile_cdrfifo  compile program cdrskin/cdrfifo."
     echo "  -compile_dewav    compile program test/dewav without libburn."
-    echo "  -libburn_1_2_2    set macro to match libburn-1.2.2"
-    echo "  -libburn_svn      set macro to match current libburn-SVN."
+    echo "  -libburn_1_5_6    set macro to match libburn-1.5.6"
+    echo "  -libburn_svn      set macro to match current libburn git."
     echo "  -dvd_obs_64k      64 KB default size for DVD/BD writing."
     echo "  -use_libcdio      link with -lcdio because libburn uses it."
     echo "  -do_not_compile_cdrskin  omit compilation of cdrskin/cdrskin."

cdrskin/convert_man_to_html.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# convert_man_to_html.sh - ts A61214
+# convert_man_to_html.sh - ts A61214 , B50802
 #
 # Generates a HTML version of man page cdrskin.1
 #
@@ -38,24 +38,25 @@ then
 
   sed \
   -e 's/<meta name="generator" content="groff -Thtml, see www.gnu.org">/<meta name="generator" content="groff -Thtml, via man -H, via cdrskin\/convert_man_to_html.sh">/' \
-  -e 's/<meta name="Content-Style" content="text\/css">/<meta name="Content-Style" content="text\/css"><META NAME="description" CONTENT="man page of cdrskin"><META NAME="keywords" CONTENT="man cdrskin, manual, cdrskin, CD, CD-RW, CD-R, burning, cdrecord, compatible"><META NAME="robots" CONTENT="follow">/' \
+  -e 's/<meta name="Content-Style" content="text\/css">/<meta name="Content-Style" content="text\/css"><META NAME="description" CONTENT="man page of cdrskin"><META NAME="keywords" CONTENT="man cdrskin, manual, cdrskin, CD-RW, CD-R, DVD-R, DVD-RW, DVD+R, DVD+RW, BD-R, BD-RE, burning, cdrecord, compatible"><META NAME="robots" CONTENT="follow">/' \
   -e 's/<title>CDRSKIN<\/title>/<title>man 1 cdrskin<\/title>/' \
   -e 's/<h1 align=center>CDRSKIN<\/h1>/<h1 align=center>man 1 cdrskin<\/h1>/' \
   -e 's/<body>/<body BGCOLOR="#F5DEB3" TEXT=#000000 LINK=#0000A0 VLINK=#800000>/' \
-  -e 's/<b>Overview of features:<\/b>/\&nbsp;<BR><b>Overview of features:<\/b>/' \
-  -e 's/<b>General information paragraphs:<\/b>/\&nbsp;<BR><b>General information paragraphs:<\/b>/' \
-  -e 's/<b>Track recording model:<\/b>/\&nbsp;<BR><b>Track recording model:<\/b>/' \
+  -e 's/<b>Overview of features:<\/b>/<b>Overview of features:<\/b><BR>/' \
+  -e 's/<b>General information paragraphs:<\/b>/<b>General information paragraphs:<\/b><BR>/' \
+  -e 's/<b>Track recording model:<\/b>/\&nbsp;<BR><b>Track recording model:<\/b><BR>/' \
   -e 's/^In general there are two types of tracks: data and audio./\&nbsp;<BR>In general there are two types of tracks: data and audio./' \
   -e 's/^While audio tracks just contain a given/\&nbsp;<BR>While audio tracks just contain a given/' \
-  -e 's/<b>Write mode selection:<\/b>/\&nbsp;<BR><b>Write mode selection:<\/b>/' \
-  -e 's/<b>Recordable CD Media:<\/b>/\&nbsp;<BR><b>Recordable CD Media:<\/b>/' \
-  -e 's/<b>Overwriteable DVD Media:<\/b>/\&nbsp;<BR><b>Overwriteable DVD Media:<\/b>/' \
-  -e 's/<b>Sequentially Recordable DVD Media:<\/b>/\&nbsp;<BR><b>Sequentially Recordable DVD Media:<\/b>/' \
+  -e 's/<b>Write mode selection:<\/b>/<b>Write mode selection:<\/b><BR>/' \
+  -e 's/<b>Recordable CD Media:<\/b>/<b>Recordable CD Media:<\/b><BR>/' \
+  -e 's/<b>Overwriteable DVD or BD Media:<\/b>/<b>Overwriteable DVD or BD Media:<\/b><BR>/' \
+  -e 's/<b>Sequentially Recordable DVD or BD Media:<\/b>/<b>Sequentially Recordable DVD or BD Media:<\/b><BR>/' \
   -e 's/^The write modes for DVD+R/\&nbsp;<BR>The write modes for DVD+R/' \
-  -e 's/<b>Drive preparation and addressing:<\/b>/\&nbsp;<BR><b>Drive preparation and addressing:<\/b>/' \
+  -e 's/<b>Drive preparation and addressing:<\/b>/<b>Drive preparation and addressing:<\/b><BR>/' \
   -e 's/^If you only got one CD capable drive/\&nbsp;<BR>If you only got one CD capable drive/' \
-  -e 's/<b>Emulated drives:<\/b>/\&nbsp;<BR><b>Emulated drives:<\/b>/' \
-  -e 's/^Alphabetical list of options/\&nbsp;<BR>Alphabetical list of options/' \
+  -e 's/<b>Emulated drives:<\/b>/<b>Emulated drives:<\/b><BR>/' \
+  -e 's/for normal use: <b><br>/for normal use: <b><br><BR>/' \
+  -e 's/original cdrecord by Joerg Schilling:<\/p>/original cdrecord by Joerg Schilling:<\/p><BR>/' \
   -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>/' \
@@ -70,8 +71,10 @@ then
 
 else
 
-  export BROWSER='cp "%s" '"$raw_html"
+#  export BROWSER='cp "%s" '"$raw_html"
+  export BROWSER=$(pwd)/'cdrskin/unite_html_b_line "%s" '"$raw_html"
   man -H "$manpage"
+#  cp "$raw_html" /tmp/x.html
   "$0" -work_as_filter "$raw_html"
   rm "$raw_html"
   rm "$man_dir"/man1

cdrskin/make_timestamp.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Create version timestamp cdrskin/cdrskin_timestamp.h
-# to be executed within  ./libburn-*  resp ./cdrskin-*
+# to be executed within  ./libburn-*  or ./cdrskin-*
 
 timestamp="$(date -u '+%Y.%m.%d.%H%M%S')"
 echo "Version timestamp :  $timestamp"

cdrskin/unite_html_b_line.c

@@ -0,0 +1,124 @@
+
+/*
+  ( cd cdrskin ; cc -g -Wall -o unite_html_b_line unite_html_b_line.c )
+*/
+/*
+   Specialized converter for the output of man -H,
+   which unites lines where the line end is between <b> and </b>.
+
+   Copyright 2015 Thomas Schmitt, <scdbackup@gmx.net>
+
+   Provided under GPL version 2 or later.
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+#include <ctype.h>
+#include <errno.h>
+
+
+int unite_lines(char *buffer, int *b_open, int *b_state, int flag)
+{
+ char *cpt;
+ int last_was_nl= 0;
+
+ for(cpt= buffer; *cpt != 0; cpt++) {
+   if(*b_open) {
+     if(*b_state == 0 && *cpt == '<') {
+       *b_state= 1;
+     } else if(*b_state == 1) {
+       if(*cpt == '/')
+         *b_state= 2;
+       else
+         *b_state= 0;
+     } else if(*b_state == 2) {
+       if(*cpt == 'b' || *cpt == 'B')
+         *b_state= 3;
+       else
+         *b_state= 0;
+     } else if(*b_state == 3) {
+       if(*cpt == '>')
+         *b_open= 0;
+       *b_state= 0;
+     }
+   } else {
+     if(*b_state == 0 && *cpt == '<') {
+       *b_state= 1;
+     } else if(*b_state == 1) {
+       if(*cpt == 'b' || *cpt == 'B')
+         *b_state= 2;
+       else
+         *b_state= 0;
+     } else if(*b_state == 2) {
+       if(*cpt == '>')
+         *b_open= 1;
+       *b_state= 0;
+     }
+   }
+   last_was_nl= (*cpt == '\n');
+ }
+ if(*b_open && last_was_nl) {
+   /* replace newline */
+   *(cpt - 1)= ' ';
+ }
+ return(1);
+}
+
+
+int main(int argc, char **argv)
+{
+ FILE *fpin, *fpout;
+ char buffer[4096], *respt;
+ int ret, b_open= 0, b_state= 0;
+
+ if(argc != 3) {
+   fprintf(stderr, "usage: %s input_path output_path\n", argv[0]);
+   return(1); 
+ }
+ if(strcmp(argv[1], "-") == 0) {
+   fpin= stdin;
+ } else {
+   fpin= fopen(argv[1], "rb");
+   if(fpin == 0) {
+     fprintf(stderr, "Error with input file '%s' : %s\n",
+                      argv[1], strerror(errno));
+     return(2);
+   }
+ }
+ if(strcmp(argv[2], "-") == 0) {
+   fpout= stdout;
+ } else {
+   fpout= fopen(argv[2], "wb");
+   if(fpout == 0) {
+     fprintf(stderr, "Error with output file '%s' : %s\n",
+                      argv[2], strerror(errno));
+     return(3);
+   }
+ }
+ while(1) {
+   respt= fgets(buffer, sizeof(buffer), fpin);
+   if(respt == NULL)
+ break;
+   ret= unite_lines(buffer, &b_open, &b_state, 0);
+   if(ret <= 0)
+ break;
+   ret= fputs(buffer, fpout);
+   if(ret < 0) {
+     fprintf(stderr, "Error writing to output file '%s' : %s\n",
+                      argv[2], strerror(errno));
+     return(4);
+   }
+ }
+ if(fpin != stdin)
+   fclose(fpin);
+ if(fpout != stdout)
+   fclose(stdout);
+ return(0);
+}
+

cdrskin/wiki_plain.txt

@@ -23,11 +23,6 @@ About libburn API for burning CD, DVD, and BD: http://api.libburnia-project.org
 
 --------------------------------------------------------------------------
 
-For yet unsupported media types see the advice to use dvd+rw-tools at
-the end of this text.
-
---------------------------------------------------------------------------
-
 About the command line options of cdrskin:
 
 They are described in detail in [http://scdbackup.sourceforge.net/man_1_cdrskin_devel.html#OPTIONS section OPTIONS] of
@@ -61,7 +56,7 @@ Some are of general user interest, though:
 
 --------------------------------------------------------------------------
 
---devices allows the sysadmin to scan the system for possible drives
+--devices can be used by the sysadmin to scan the system for possible drives
 and displays their detected properties.
 The drives are listed one per line, with fields:
 libburn-drive-number, sysadmin-device-file, permissions, vendor, type
@@ -90,7 +85,7 @@ Option blank= offers several specialized blanking and formatting types,
 which one may use for particular purposes on DVD-RW, DVD-RAM and BD-RE.
 (See also below: blank=format_overwrite)
 The drive offers a list of possible formats by cdrskin option --list_formats.
-One should aquire MMC background information before making use of them.
+One should acquire MMC background information before making use of them.
 
 --------------------------------------------------------------------------
 
@@ -172,7 +167,7 @@ media with a single session and track on it. blank= invalidates ISO images.
 
 --------------------------------------------------------------------------
 
-assert_write_lba=<lba> allows to ensure that the start block address which
+assert_write_lba=<lba> ensures that the start block address which
 was used with the formatter program (e.g. mkisofs -C) matches the start block
 address which will be used by the upcoming burn.
 
@@ -220,7 +215,7 @@ With a very fat fs=# buffer (128 MB for 12x CD is not unrealistic) this
 can cause a big delay until burning finally starts and takes its due time.
 
 fifo_start_at=<num> makes cdrskin start burning after the given number of bytes
-is read rather than waiting for the FIFO to be completely full resp. the data
+is read rather than waiting for the FIFO to be completely full or the data
 stream to end. It risks a few drive buffer underruns at the beginning of burn
 - but modern drives stand this.
 
@@ -268,7 +263,7 @@ would be the appropriate translation:
 {{{
 dev_translation=+0,0,0+/dev/hdc
 }}}
-The "+" character is a separator to be choosen by you.
+The "+" character is a separator to be chosen by you.
 Currently i am not aware of the need to choose any other than "+"
 unless you get playful with custom translations like
 {{{

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([libburn], [1.2.3], [http://libburnia-project.org])
+AC_INIT([libburn], [1.5.7], [http://libburnia-project.org])
 AC_PREREQ([2.50])
 dnl AC_CONFIG_HEADER([config.h])	
 
@@ -97,6 +97,23 @@ 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    1.3.8 = libburn.so.4.91.0
+dnl    1.4.0 = libburn.so.4.93.0
+dnl    1.4.2 = libburn.so.4.95.0
+dnl    1.4.4 = libburn.so.4.97.0
+dnl    1.4.6 = libburn.so.4.99.0
+dnl    1.4.8 = libburn.so.4.101.0
+dnl    1.5.0 = libburn.so.4.103.0
+dnl    1.5.2 = libburn.so.4.105.0
+dnl    1.5.4 = libburn.so.4.107.0
+dnl    1.5.6 = libburn.so.4.109.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.
@@ -121,8 +138,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=2
-BURN_MICRO_VERSION=3
+BURN_MINOR_VERSION=5
+BURN_MICRO_VERSION=7
 BURN_VERSION=$BURN_MAJOR_VERSION.$BURN_MINOR_VERSION.$BURN_MICRO_VERSION
 
 AC_SUBST(BURN_MAJOR_VERSION)
@@ -133,14 +150,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.2.2
+dnl ### This is the release version libburn-1.5.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 ### LT_CURRENT++, LT_AGE++ has not yet happened.
+dnl LT_CURRENT++, LT_AGE++ has happened meanwhile.
 dnl
-dnl SONAME = 79 - 75 = 4 . Linux library name = libburn.so.4.75.0
-LT_CURRENT=79
-LT_AGE=75
+dnl SONAME = 114 - 110 = 4 . Linux library name = libburn.so.4.110.0
+LT_CURRENT=114
+LT_AGE=110
 LT_REVISION=0
 LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
 
@@ -159,12 +176,12 @@ AC_SUBST(BURN_BINARY_AGE)
 AC_PREFIX_DEFAULT([/usr/local])
 test "$prefix" = "NONE" && prefix=$ac_default_prefix
 
-AM_MAINTAINER_MODE
+dnl ts B90405 : Disabled on advise of Ross Burton
+dnl AM_MAINTAINER_MODE
 
 AM_PROG_CC_C_O
 AC_C_CONST
 AC_C_INLINE
-AC_C_BIGENDIAN
 
 dnl Large file support
 AC_SYS_LARGEFILE
@@ -176,7 +193,7 @@ fi
 
 AC_PROG_LIBTOOL
 AC_SUBST(LIBTOOL_DEPS)
-LIBTOOL="$LIBTOOL --silent"
+# LIBTOOL="$LIBTOOL --silent"
 
 AC_PROG_INSTALL
 
@@ -202,11 +219,12 @@ CFLAGS="$STATVFS_DEF $CFLAGS"
 
 dnl ts A91122
 AC_ARG_ENABLE(track-src-odirect,
-[  --enable-track-src-odirect Enable use of O_DIRECT with track input, default=no],
+[  --enable-track-src-odirect   Banned for now: (Enable use of O_DIRECT with track input, default=no)],
                , enable_track_src_odirect=no)
 if test x$enable_track_src_odirect = xyes; then
-    LIBBURN_O_DIRECT_DEF="-DLibburn_read_o_direcT"
-    echo "enabled  use of O_DIRECT with track input"
+#    LIBBURN_O_DIRECT_DEF="-DLibburn_read_o_direcT"
+#    echo "enabled  use of O_DIRECT with track input"
+    echo "REFUSED  to enable use of O_DIRECT with track input because of cdrskin multi-track bug"
 else
     LIBBURN_O_DIRECT_DEF=
     echo "disabled use of O_DIRECT with track input"
@@ -217,34 +235,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 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    pad DVD DAO sessions to 32 or 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"
+    echo "enabled  padding of DVD DAO sessions to 32 or 64 KB"
 else
     LIBBURN_DVD_OBS_64K=
-    echo "disabled padding of DVD DAO sessions to 32 resp. 64 KB"
+    echo "disabled padding of DVD DAO sessions to 32 or 64 KB"
 fi
 CFLAGS="$LIBBURN_DVD_OBS_PAD $CFLAGS"
 
-dnl ts A91218
+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
@@ -261,14 +293,21 @@ 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 B70127
+# There are Linuxes with no public generic SCSI interface
+LIBBURNIA_CHECK_LINUX_SCSI
+
 dnl ts B00704
 # Library versioning normally serves a complex purpose.
 # Since libburn obeys strict ABI backward compatibility, it needs only the
@@ -290,6 +329,9 @@ else
     echo "disabled strict symbol encapsulation"
 fi
 
+# Check for system dependent mandatory libraries (LIBBURN_ARCH_LIBS)
+LIBBURNIA_CHECK_ARCH_LIBS(mandatory)
+
 AC_ARG_ENABLE(ldconfig-at-install,
 [  --enable-ldconfig-at-install    On GNU/Linux run ldconfig, default=yes],
                , ldconfig_at_install=yes)
@@ -316,7 +358,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

@@ -180,7 +180,7 @@ 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 get inverted and written as big-endian number to bytes
+polynomial division gets inverted and written as big-endian number to bytes
 16 and 17 of the pack. 
 
 
@@ -195,7 +195,7 @@ 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.
+for single byte texts, and 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
@@ -403,7 +403,7 @@ Byte :Value Meaning
 -------------------------------------------------------------------------------
 Overview of libburn API calls for CD-TEXT (see libburn/libburn.h for details):
 
-libburn can retrieve the set of text packs from a CD:
+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,
@@ -418,7 +418,7 @@ This set may be attached as array of readily formatted text packs by:
                                       unsigned char *text_packs,
                                       int num_packs, int flag);
 
-The array may be read from a file by
+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);
@@ -453,6 +453,12 @@ 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
 
@@ -566,7 +572,8 @@ 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.
+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
@@ -593,7 +600,7 @@ 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 track_source_1 track_source_2 track_source_3
+            -audio -swab track_source_1 track_source_2 track_source_3
 
 ----------------------------------------------------------
 Content of file NIGHTCATS.TXT                            :

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 or
+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.
 
@@ -52,7 +52,7 @@ and execute
 
 -  make
 
-To make the libraries accessible for running resp. developing applications 
+To make the libraries accessible for running and developing applications 
 
 -  make install
 

doc/cookbook.txt

@@ -618,7 +618,7 @@ BG Format 3 indicates fully formatted media.
 
 DVD-RW reaches this state either by Format Type 00h (or 10h) with maximum
 size given as Number Of Blocks, or by writing sequentially until the disc is
-completely full into an intermediate session opened by format 15h resp. 13h.
+completely full into an intermediate session opened by format 15h or 13h.
 (mmc5r03c.pdf, 6.5 FORMAT UNIT, 6.5.4.2.1, 6.5.4.2.10, 6.5.4.2.8)
 A fully formatted DVD-RW can be recognized by 23h READ FORMAT CAPACITIES. The
 Descriptor Type of the Current/Maximum Capacity Descriptor is 10b ("Formatted
@@ -647,7 +647,7 @@ In the reply, BG Format 0 indicates unformatted media (or unsuitable media).
 (mmc5r03c.pdf 6.22.3.1.13)
 
 Formatting has to be started by command 04h FORMAT UNIT, Format Type 26h.
-Different from other format types, 26h allows to send a fantasy size of
+Different from other format types, 26h is allowed to send a fantasy size of
 0xffffffff blocks and does not require the caller to know the exact maximum
 size offered with that format.
 (mmc5r03c.pdf, 6.5 FORMAT UNIT, 6.5.4.2.14 Format Type = 26h)
@@ -744,7 +744,7 @@ Elsewise the media is in Intermediate state. See below.
 A partly formatted DVD-RW can be recognized by 23h READ FORMAT CAPACITIES. The
 Descriptor Type of the Current/Maximum Capacity Descriptor is 10b ("Formatted
 Media") and the Number Of Blocks with formats 00h, 10h or 15h is larger than the
-currently formatted size, resp. more than 0 blocks are offered with Format
+currently formatted size, or more than 0 blocks are offered with Format
 Types 13h or 11h.
 (mmc5r03c.pdf, 6.24.3.2.1, 6.24.3.3)
 
@@ -753,7 +753,7 @@ be unnecessary to do any further formatting.
 But in order to make the DVD-RW surely accept its maximum number of bytes,
 partial formatting may be expanded by command 04h FORMAT UNIT, Format Type 13h,
 which is supposed to be offered by the drive in this state. This brings the
-session again into Intermediate state and thus allows expansion by sequential
+session again into Intermediate state and thus enables expansion by sequential
 writing. As with Format Type 15h it is ok to set Number Of Blocks to 0, so that
 no fixed size formatting work is done and writing can begin soon after.
 (mmc5r03c.pdf, 6.5.4.2.8 Format Type = 13h)
@@ -803,8 +803,8 @@ Two format types are relevant for DVD-RAM : 00h and 01h.
 00h offers the default size format and usually a maximum payload size format.
 Even with that maximum size payload there is hardware defect management.
 (mmc5r03c.pdf 6.5.4.2.1.2)
-01h allows to convert payload capacity into spare blocks for defect
-managment. There is no way to increase payload capacity by format 01h.
+01h can convert payload capacity into spare blocks for defect management.
+There is no way to increase payload capacity by format 01h.
 (mmc5r03c.pdf 6.5.4.2.2.1)
 
 With BD-RE there are three format types : 00h, 30h and 31h.
@@ -895,7 +895,8 @@ The term "superblock" shall depict the first 64 KiB after the sbsector address.
 
 ISO 9660 multi-session depends on typical TOC information in two ways:
 It needs the superblock address MSC1 of the most recently recorded session and
-it needs the Next Writeable Address NWA for which to prepare the adress offset.
+it needs the Next Writeable Address NWA for which to prepare the address
+offset.
 
 The following is learned from growisofs and from ECMA-119:
 http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-119.pdf
@@ -913,7 +914,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++)
@@ -977,10 +979,10 @@ DVD-RW Sequential Recording    0014h
 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 
+Incremental. Not all media and drives offer Incremental which can do 
 multi-session as with CD media and does not demand a predicted track size.
-DAO seems to be the older method. It allows only one single session and
-track and it demands an exactly predicted track size.
+DAO seems to be the older method. It can only write one single session and
+track, and it demands an exactly predicted track size.
 
 - About overwriteable, blank, appendable and finalized DVD-R[W] media
 - Incremental writing
@@ -1024,7 +1026,7 @@ brings back this feature.
 -------------------------------------------------------------------------------
 Incremental writing :
 
-Incremental writing allows to produce multi-session DVDs. It is indicated
+Incremental writing can produce multi-session DVDs. It is indicated
 by feature 0021h being marked current in the reply of 46h GET CONFIGURATION.
 growisofs inquires 0021h by setting Starting Feature Number to 0x21 and
 Allocation Length to 16 in order to get only this one. The feature descriptor
@@ -1041,8 +1043,8 @@ which are returned by ACh.
 
 growisofs fetches a mode page 05h template by MODE SENSE and inserts its own
 parameters.  It sets Multi-session to 11b, unless dvd_compat is nonzero.
-libburn composes its mode page 05h from zero and allows control of
-Multi-Session by the application.
+libburn composes its mode page 05h from zero and enables the application
+to control Multi-Session.
  BUFE             Buffer Underrun protection      0=off, 1=on
  LS_V             Link size valid                 1=true
  Test Write       -dummy mode for writing         0=off, 1=on
@@ -1455,7 +1457,7 @@ eventually RRM) chosen by the format sub-type:
   10b = (RRM)
 (mmc5r03c.pdf 6.5.4.2.1.6)
 
-Format type 32h uses the same sub-types but allows to allocate non-default
+Format type 32h uses the same sub-types but can allocate non-default
 amounts of spares. Similar to BD-RE format 31h, three format descriptors are
 offered: #1: default size, #2: maximum spare area, #3: minimal spare.
 The size may be chosen within that range.

doc/ddlp.txt

@@ -280,7 +280,7 @@ There are two classes of device specific suffixes:
 If a lockfile does not exist and cannot be created then this shall not keep
 a program from working on a device. But if a lockfile exists and if permissions
 or locking state do not allow to obtain a lock of the appropirate type, then
-this shall prevent any opening of device file in question resp. shall cause
+this shall prevent any opening of device file in question and shall cause
 immediate close(2) of an already opened device file.
 
 The vulnerable programs shall not start their operation before they locked a
@@ -346,7 +346,7 @@ which keeps it from being the solution to all known legitimate use cases.
 The attempt has failed to compose a waterproof locking mechanism from means of
 POSIX, FHS and from hardly documented Linux open(O_EXCL) on device files.
 The resulting mechanisms would need about 1000 lines of code and still do
-not close all gaps resp. cover the well motivated use cases.
+not close all gaps and cover the well motivated use cases.
 This attempt you see above: DDLP-A and DDLP-B.
 
 

doc/mediainfo.txt

@@ -34,7 +34,7 @@ CD-ROM media (0x08) cannot be inquired by command 43h READ TOC/PMA/ATIP.
 in 6.26.3.6 Response Format 0100b: ATIP.
 The minute, second, and frame number of lead-in can be read from byte 4 to 6
 of the ATIP descriptor. The lead-out bytes are at position 8 to 10. The ATIP
-descriptor is preceeded by a four byte header.
+descriptor is preceded by a four byte header.
 
 I could not find out yet whether (lead-in,lead-out) is mandatorily unique for
 each particular media product.
@@ -176,7 +176,7 @@ BD-R and BD-RE:
         printf (" Media ID:              %6.6s/%-3.3s\n",di+4+100,di+4+106);
  = MMC-5 6.23.3.3.1 Format Code 00h: Disc Information (DI)
    Table 288 says that Media Type Code (byte 1 of CDB) for BD media is 1.
-   Table 446 says that Disc Information is preceeded by 4 bytes of header.
+   Table 446 says that Disc Information is preceded by 4 bytes of header.
    Table 448 says that bytes 0   to   1 are Disc Information Identifier "DI".
                   that bytes 8   to  10 are Disc Type Identifier
                                             BDO for BD-ROM, BDW for BD-RE,
@@ -190,7 +190,7 @@ Via libburn these manufacturer and media ids can be retrieved by API call
 burn_disc_get_media_id() as a single printable word product_id and as two
 printable words media_code1, media_code2. The latter can be translated into
 a manufacturer company name by API call burn_guess_manufacturer().
-(Both calls work for CD, too. burn_get_media_product_id() eventually calls
+(Both calls work for CD, too. burn_disc_get_media_id() eventually calls
  burn_disc_read_atip().) 
 
 
@@ -1036,6 +1036,9 @@ MEI         T02     Panasonic Corporation 1-4X HTL 12cm  [Blu]
 MEI 00V001          MATSUSHITA EI  2X   [Hij]
 MEI 00V002          MATSUSHITA EI  4X   [Hij]
 
+"Millenniata Inc."
+MILLENMR    MR1     Verbatim M-DISC 4x 25 GB (user reported)
+
 "Mitsubishi Kagaku Media Co."
 MKM         001     MKM  6X   [Hij]
 MKM         003     MKM  8X   [Hij]
@@ -1077,6 +1080,7 @@ OTCBRE      001     Optodisc Technology Corporation 1-2X HTL 25GB (12cm)  [Blu]
 "Moser Baer India Limited"
 PHILIP      R02     Moser Baer India Ltd 1-2X HTL 25GB  [Blu]
 PHILIP      R04     Moser Baer India Ltd 1-4X HTL 25GB  [Blu]
+PHILIPR0    R04     TDK 4x 25 GB  (own buy)
 PHILIP      W02     Moser Baer India Ltd 1-2X HTL 25GB  [Blu]
 
 "Philips"
@@ -1186,7 +1190,7 @@ 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 Limited"
 UMEDISC     DL1     Elite DVD+R DL [User report feb 2012]
 
 "Unifino Inc."

doc/waveformat.txt

@@ -0,0 +1,84 @@
+
+        Sound extraction for CD-DA burning from .WAV audio file format
+
+Using information and text snippets
+from https://ccrma.stanford.edu/courses/422/projects/WaveFormat/
+     in may 2013. The link is now dead. An apparent copy of the page
+     is 2017 at: http://soundfile.sapp.org/doc/WaveFormat/
+from https://en.wikipedia.org/wiki/WAV
+
+For libburnia-project.org by Thomas Schmitt <scdbackup@gmx.net>
+December 2017
+
+
+The WAVE file format is an application of the Microsoft RIFF container format
+for multimedia files. A RIFF file consists of Chunks which contain Subchunks.
+The Chunks form a linked list within the file, the Subchunks form a linked
+list inside their Chunk.
+All numbers are stored in little-endian byte order.
+
+A .WAV file consists at least of one Chunk with id "RIFF", which contains
+one Subchunk with id "fmt " and one with id "data":
+
+Offset  Size  Name             Description
+
+ 0        4   ChunkID          Contains the letters "RIFF"
+ 4        4   ChunkSize        The size of the rest of the chunk following
+                               this field. I.e. the two fields ChunkID and
+                               ChunkSize are not included in this count.
+ 8        4   Format           Contains the letters "WAVE"
+
+
+The "fmt " subchunk describes the sound data's format:
+
+Offset  Size  Name             Description
+
+ 0        4   Subchunk1ID      Contains the letters "fmt "
+
+ 4        4   Subchunk1Size    The size of the rest of the Subchunk following
+                               this field. I.e. Subchunk1ID and Subchunk1Size
+                               are not included in this count.
+ 8        2   AudioFormat      PCM = 1 (i.e. Linear quantization)
+                               Values other than 1 indicate some 
+                               form of compression.
+10        2   NumChannels      Mono = 1, Stereo = 2, etc.
+12        4   SampleRate       8000, 44100, etc.
+16        4   ByteRate         == SampleRate * NumChannels * BitsPerSample/8
+20        2   BlockAlign       == NumChannels * BitsPerSample/8
+                               The number of bytes for one sample including
+                               all channels.
+22        2   BitsPerSample    8 bits = 8, 16 bits = 16, etc.
+More data may follow in this Subchunk if AudioFormat is not PCM.
+
+
+The "data" subchunk contains the size of the data and the actual sound:
+
+Offset  Size  Name             Description
+
+ 0        4   Subchunk2ID      Contains the letters "data"
+
+ 4        4   Subchunk2Size    == NumSamples * NumChannels * BitsPerSample/8
+                               The number of audio data bytes.
+ 8        *   Data             The audio data bytes.
+
+
+CD-DA prescribes these "fmt " parameters:
+  AudioFormat == 1
+  SampleRate == 44100
+  BitsPerSample == 16
+  NumChannels == 2 (stereo)
+  (little-endian byte order)
+
+If matching parameters are given in the .WAV file, one can directly use the
+data bytes of Subchunk "data" as payload for burning a CD-DA track.
+
+
+Above simple form can be expanded by other Chunks or Subchunks of Chunk "RIFF".
+A .wav file appeared which beared a Subchunk "LIST" inside Chunk "RIFF".
+Wikipedia mentions Chunks "INFO", "CSET", "JUNK", "PAD ".
+
+Therefore one should expect such Chunks before Chunk "RIFF" and Subchunks
+other than "fmt " and "data" inside the "RIFF" Chunk.
+Multiple Chunks "RIFF" and Subchunks "fmt " or "data" per file have not been
+seen yet. They would make extraction more cumbersome.
+

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 - 2012 Thomas Schmitt <scdbackup@gmx.net>
+   Copyright (c) 2006 - 2024 Thomas Schmitt <scdbackup@gmx.net>
    Provided under GPL version 2 or later.
 */
 
@@ -98,6 +98,14 @@ struct fifo_opts
 	int flag;
 };
 
+union w_list_data
+{
+	struct scan_opts scan;
+	struct erase_opts erase;
+	struct format_opts format;
+	struct write_opts write;
+	struct fifo_opts fifo;
+};
 
 struct w_list
 {
@@ -109,18 +117,49 @@ struct w_list
 
 	struct w_list *next;
 
-	union w_list_data
-	{
-		struct scan_opts scan;
-		struct erase_opts erase;
-		struct format_opts format;
-		struct write_opts write;
-		struct fifo_opts fifo;
-	} u;
+	union w_list_data u;
 };
 
 static struct w_list *workers = NULL;
 
+static void *fifo_worker_func(struct w_list *w);
+
+
+int burn_async_manage_lock(int mode)
+{
+	int ret;
+
+	static pthread_mutex_t access_lock;
+	static int mutex_initialized = 0;
+	static int mutex_locked = 0;
+
+	if (mode == BURN_ASYNC_LOCK_INIT) {
+		if (mutex_initialized)
+			return 2;
+		ret = pthread_mutex_init(&access_lock, NULL);
+		if (ret != 0)
+			return 0;
+		mutex_initialized = 1;
+		return 1;
+	}
+	if (!mutex_initialized)
+		return 0;
+	if (mode == BURN_ASYNC_LOCK_OBTAIN) {
+		ret = pthread_mutex_lock(&access_lock);
+		if (ret != 0)
+			return 0;
+		mutex_locked = 1;
+	} else if (mode == BURN_ASYNC_LOCK_RELEASE) {
+		if (!mutex_locked)
+			return 2;
+		ret = pthread_mutex_unlock(&access_lock);
+		if (ret != 0)
+			return 0;
+		mutex_locked = 0;
+	}
+	return 1;
+}
+
 
 static struct w_list *find_worker(struct burn_drive *d)
 {
@@ -133,7 +172,7 @@ static struct w_list *find_worker(struct burn_drive *d)
 }
 
 static void add_worker(int w_type, struct burn_drive *d,
-			WorkerFunc f, void *data)
+			WorkerFunc f, union w_list_data *data)
 {
 	struct w_list *a;
 	struct w_list *tmp;
@@ -146,7 +185,10 @@ static void add_worker(int w_type, struct burn_drive *d,
 	a = calloc(1, sizeof(struct w_list));
 	a->w_type = w_type;
 	a->drive = d;
-	a->u = *(union w_list_data *)data;
+
+	a->u = *data;
+
+	burn_async_manage_lock(BURN_ASYNC_LOCK_INIT);
 
 	/* insert at front of the list */
 	a->next = workers;
@@ -157,6 +199,7 @@ static void add_worker(int w_type, struct burn_drive *d,
 		d->busy = BURN_DRIVE_SPAWNING;
 
 #ifdef Libburn_create_detached_threadS
+
 	/* ts A71019 :
 	   Trying to start the threads detached to get rid of the zombies
 	   which do neither react on pthread_join() nor on pthread_detach().
@@ -164,12 +207,12 @@ static void add_worker(int w_type, struct burn_drive *d,
 	pthread_attr_init(&attr);
 	pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED);
 	attr_pt= &attr;
-/*
-	libdax_msgs_submit(libdax_messenger, -1, 0x00020158,
-			LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_LOW,
-			"add_worker(): Creating detached thread.", 0, 0);
-*/
-#endif
+
+#endif /* Libburn_create_detached_threadS */
+
+	/* Worker specific locks are to be released early by the worker */
+	if (f == (WorkerFunc) fifo_worker_func)
+		burn_async_manage_lock(BURN_ASYNC_LOCK_OBTAIN);
 
 	if (pthread_create(&a->thread, attr_pt, f, a)) {
 		free(a);
@@ -236,7 +279,7 @@ static void *scan_worker_func(struct w_list *w)
 }
 
 static void reset_progress(struct burn_drive *d, int sessions, int tracks,
-				int indices, int sectors, int flag)
+				int indices, off_t sectors, int flag)
 {
 	/* reset the progress indicator */
 	d->progress.session = 0;
@@ -253,7 +296,7 @@ static void reset_progress(struct burn_drive *d, int sessions, int tracks,
 
 int burn_drive_scan(struct burn_drive_info *drives[], unsigned int *n_drives)
 {
-	struct scan_opts o;
+	union w_list_data o;
 	int ret = 0;
 
 	/* ts A61006 : moved up from burn_drive_scan_sync , former Assert */
@@ -266,7 +309,7 @@ int burn_drive_scan(struct burn_drive_info *drives[], unsigned int *n_drives)
 		return -1;
 	}
 
-	/* cant be anything working! */
+	/* cannot be anything working! */
 
 	/* ts A61006 */
 	/* a ssert(!(workers && workers->drive)); */
@@ -292,9 +335,9 @@ drive_is_active:;
 		*drives = NULL;
 		*n_drives = 0;
 
-		o.drives = drives;
-		o.n_drives = n_drives;
-		o.done = 0;
+		o.scan.drives = drives;
+		o.scan.n_drives = n_drives;
+		o.scan.done = 0;
 		add_worker(Burnworker_type_scaN, NULL,
 				 (WorkerFunc) scan_worker_func, &o);
 	} else if (workers->u.scan.done) {
@@ -346,14 +389,14 @@ static void *erase_worker_func(struct w_list *w)
 
 void burn_disc_erase(struct burn_drive *drive, int fast)
 {
-	struct erase_opts o;
+	union w_list_data o;
 
 	/* ts A61006 */
 	/* a ssert(drive); */
 	/* 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,
@@ -369,14 +412,14 @@ void burn_disc_erase(struct burn_drive *drive, int fast)
 		return;
 	}
 
-	reset_progress(drive, 1, 1, 1, 0x10000, 0);
+	reset_progress(drive, 1, 1, 1, (off_t) 0x10000, 0);
 
 	/* A70103 : will be set to 0 by burn_disc_erase_sync() */
 	drive->cancel = 1;
 
 	/* ts A70103 moved up from burn_disc_erase_sync() */
 	/* ts A60825 : allow on parole to blank appendable CDs */
-	/* ts A70131 : allow blanking of overwriteable DVD-RW (profile 0x13) */
+	/* ts A70131 : allow blanking of overwritable DVD-RW (profile 0x13) */
 	/* ts A70216 : allow blanking of CD-RW or DVD-RW in any regular state
 	               and of any kind of full media */
 	/* ts A70909 : the willingness to burn any BURN_DISC_FULL media is
@@ -395,16 +438,21 @@ 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;
 	}
 
-	o.drive = drive;
-	o.fast = fast;
+	o.erase.drive = drive;
+	o.erase.fast = fast;
 	add_worker(Burnworker_type_erasE, drive,
 			(WorkerFunc) erase_worker_func, &o);
 }
@@ -442,11 +490,11 @@ static void *format_worker_func(struct w_list *w)
 /* ts A61230 */
 void burn_disc_format(struct burn_drive *drive, off_t size, int flag)
 {
-	struct format_opts o;
+	union w_list_data o;
 	int ok = 0, ret;
 	char msg[40];
 
-	reset_progress(drive, 1, 1, 1, 0x10000, 0);
+	reset_progress(drive, 1, 1, 1, (off_t) 0x10000, 0);
 
 	if ((SCAN_GOING()) || find_worker(drive) != NULL) {
 		libdax_msgs_submit(libdax_messenger, drive->global_index,
@@ -530,9 +578,9 @@ void burn_disc_format(struct burn_drive *drive, off_t size, int flag)
 		drive->cancel = 1;
 		return;
 	}
-	o.drive = drive;
-	o.size = size;
-	o.flag = flag;
+	o.format.drive = drive;
+	o.format.size = size;
+	o.format.flag = flag;
 	add_worker(Burnworker_type_formaT, drive,
 			(WorkerFunc) format_worker_func, &o);
 }
@@ -584,7 +632,7 @@ static void *write_disc_worker_func(struct w_list *w)
 
 void burn_disc_write(struct burn_write_opts *opts, struct burn_disc *disc)
 {
-	struct write_opts o;
+	union w_list_data o;
 	char *reasons= NULL;
 	struct burn_drive *d;
 	int mvalid;
@@ -604,7 +652,7 @@ void burn_disc_write(struct burn_write_opts *opts, struct burn_disc *disc)
 	}
 
 	reset_progress(d, disc->sessions, disc->session[0]->tracks,
-			 disc->session[0]->track[0]->indices, 0, 0);
+			 disc->session[0]->track[0]->indices, (off_t) 0, 0);
 
 	/* For the next lines any return indicates failure */
 	d->cancel = 1;
@@ -638,8 +686,7 @@ void burn_disc_write(struct burn_write_opts *opts, struct burn_disc *disc)
 	if (d->drive_role == 1) {
 		mvalid = 0;
 		if (d->mdata != NULL)
-			if (d->mdata->valid > 0)
-				mvalid = 1;
+			mvalid = 1;
 		if (!mvalid) {
 			libdax_msgs_submit(libdax_messenger,
 				d->global_index, 0x00020113,
@@ -679,9 +726,9 @@ void burn_disc_write(struct burn_write_opts *opts, struct burn_disc *disc)
 
 	d->cancel = 0; /* End of the return = failure area */
 
-	o.drive = d;
-	o.opts = opts;
-	o.disc = disc;
+	o.write.drive = d;
+	o.write.opts = opts;
+	o.write.disc = disc;
 
 	opts->refcount++;
 
@@ -695,7 +742,6 @@ ex:;
 
 static void *fifo_worker_func(struct w_list *w)
 {
-	int old;
 
 #define Libburn_protect_fifo_threaD 1
 
@@ -709,10 +755,6 @@ static void *fifo_worker_func(struct w_list *w)
 	pthread_sigmask(SIG_SETMASK, &sigset, &oldset);
 #endif /* Libburn_protect_fifo_threaD */
 
-	pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &old);
-	pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, &old);
-		/* Note: Only burn_fifo_abort() shall cancel the fifo thread */
-
 	burn_fifo_source_shoveller(w->u.fifo.source, w->u.fifo.flag);
 	remove_worker(pthread_self());
 
@@ -727,7 +769,7 @@ static void *fifo_worker_func(struct w_list *w)
 
 int burn_fifo_start(struct burn_source *source, int flag)
 {
-	struct fifo_opts o;
+	union w_list_data o;
 	struct burn_source_fifo *fs = source->data;
 
 	fs->is_started = -1;
@@ -740,8 +782,8 @@ int burn_fifo_start(struct burn_source *source, int flag)
 		return -1;
 	}
 
-	o.source = source;
-	o.flag = flag;
+	o.fifo.source = source;
+	o.fifo.flag = flag;
 	add_worker(Burnworker_type_fifO, NULL,
 			(WorkerFunc) fifo_worker_func, &o);
 	fs->is_started = 1;
@@ -755,18 +797,19 @@ int burn_fifo_abort(struct burn_source_fifo *fs, int flag)
 	int ret;
 	pthread_t pt;
 
-	if (fs->thread_is_valid <= 0 || fs->thread_handle == NULL)
-		return(2);
+	burn_async_manage_lock(BURN_ASYNC_LOCK_OBTAIN);
 
-#ifdef NIX
-	libdax_msgs_submit(libdax_messenger, -1, 0x00000002,
-			LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
-			"Aborting running burn_source_fifo thread", 0, 0);
-#endif /* NIX */
+	if (fs->thread_is_valid <= 0 || fs->thread_handle == NULL) {
+		burn_async_manage_lock(BURN_ASYNC_LOCK_RELEASE);
+		return 2;
+	}
+	pt = *((pthread_t *) fs->thread_handle);
+
+	burn_async_manage_lock(BURN_ASYNC_LOCK_RELEASE);
+
+	fs->do_abort = 1;
+	ret = pthread_join(pt, NULL);
 
-	pt= *((pthread_t *) fs->thread_handle);
-	remove_worker(pt);
-	ret = pthread_cancel(pt);
 	return (ret == 0);
 }
 

libburn/async.h

@@ -1,5 +1,10 @@
 /* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */
 
+/* Copyright (c) 2004 - 2006 Derek Foreman, Ben Jansens
+   Copyright (c) 2006 - 2017 Thomas Schmitt <scdbackup@gmx.net>
+   Provided under GPL version 2 or later.
+*/
+
 #ifndef BURN__ASYNC_H
 #define BURN__ASYNC_H
 
@@ -14,5 +19,10 @@ int burn_fifo_start(struct burn_source *source, int flag);
 /* To abort a running fifo thread before the fifo object gets deleted */
 int burn_fifo_abort(struct burn_source_fifo *fs, int flag);
 
+/* ts B70126 */
+#define BURN_ASYNC_LOCK_RELEASE 0
+#define BURN_ASYNC_LOCK_OBTAIN  1
+#define BURN_ASYNC_LOCK_INIT    2
+int burn_async_manage_lock(int mode);
 
 #endif /* BURN__ASYNC_H */

libburn/cdtext.c

@@ -1,5 +1,5 @@
 
-/* Copyright (c) 2011 Thomas Schmitt <scdbackup@gmx.net>
+/* Copyright (c) 2011 - 2016 Thomas Schmitt <scdbackup@gmx.net>
    Provided under GPL version 2 or later.
 */
 
@@ -77,7 +77,7 @@ int burn_create_new_pack(int pack_type, int track_no, int double_byte,
 
 
 /* Plain implementation of polynomial division on a Galois field, where
-   addition and subtraction both are binary exor. Euclidian algorithm.
+   addition and subtraction both are binary exor. Euclidean algorithm.
    Divisor is x^16 + x^12 + x^5 + 1 = 0x11021.
 */
 static int crc_11021(unsigned char *data, int count, int flag)
@@ -615,17 +615,65 @@ static int v07t_cdtext_to_track(struct burn_track *track, int block,
 }
 
 
+static int v07t_apply_to_session(struct burn_session *session, int block,
+                     int char_codes[8], int copyrights[8], int languages[8],
+                     int session_attr_seen[16], int track_attr_seen[16],
+                     int genre_code, char *genre_text, int flag)
+{
+	int i, ret, length;
+	char *line = NULL;
+
+	BURN_ALLOC_MEM(line, char, 4096);
+
+	for (i= 0x80; i <= 0x8e; i++) {
+		if (i > 0x85 && i != 0x8e)
+	continue;
+		if (session_attr_seen[i - 0x80] || !track_attr_seen[i - 0x80])
+	continue;
+		ret = v07t_cdtext_to_session(session, block, "",
+					char_codes + block, i, NULL, 0);
+		if (ret <= 0)
+			goto ex;
+	}
+	if (genre_code >= 0 && genre_text[0]) {
+		line[0] = (genre_code >> 8) & 0xff;
+		line[1] = genre_code & 0xff;
+		strcpy(line + 2, genre_text);
+		length = 2 + strlen(line + 2) + 1;
+		ret = burn_session_set_cdtext(session, block, 0, "GENRE",
+					(unsigned char *) line, length, 0);
+		if (ret <= 0)
+			goto ex;
+	}
+	ret = burn_session_set_cdtext_par(session, char_codes, copyrights,
+								languages, 0);
+	if (ret <= 0)
+		goto ex;
+	for (i = 0; i < 8; i++)
+		char_codes[i] = copyrights[i] = languages[i]= -1;
+	for (i = 0; i < 16; i++)
+		session_attr_seen[i] = track_attr_seen[i] = 0;
+	genre_text[0] = 0;
+	ret = 1;
+ex:
+	BURN_FREE_MEM(line);
+	return ret;
+}
+
+
 /* ts B11215 API */
-/* @param flag bit1= do not attach CATALOG to session or ISRC to track for
+/* @param flag bit0= permission to read multiple blocks from the same sheet
+               bit1= do not attach CATALOG to session or ISRC to track for
                      writing to Q sub-channel
 */
 int burn_session_input_sheet_v07t(struct burn_session *session,
 					char *path, int block, int flag)
 {
 	int ret = 0, num_tracks, char_codes[8], copyrights[8], languages[8], i;
-	int genre_code = -1, track_offset = 1, length, pack_type, tno, tnum;
+	int genre_code = -1, track_offset = 1, pack_type, tno, tnum;
 	int session_attr_seen[16], track_attr_seen[16];
 	int int0x00 = 0x00, int0x01 = 0x01;
+	int additional_blocks = -1, line_count = 0, enable_multi_block = 0;
 	struct stat stbuf;
 	FILE *fp = NULL;
 	char *line = NULL, *eq_pos, *payload, *genre_text = NULL, track_txt[3];
@@ -678,6 +726,7 @@ cannot_open:;
 				burn_printify(msg), 0, 0);
 			ret = 0; goto ex;
 		}
+		line_count++;
 		if (strlen(line) == 0)
 	continue;
 		eq_pos = strchr(line, '=');
@@ -822,6 +871,31 @@ cannot_open:;
 					burn_printify(msg), 0, 0);
 				ret = 0; goto ex;
 			}
+			if (flag & 1)
+				if (line_count == 1)
+					enable_multi_block = 1;
+			if (enable_multi_block) {
+				if (additional_blocks >= 0) {
+					if (block == 7) {
+						libdax_msgs_submit(
+				libdax_messenger, -1, 0x000201a0,
+				LIBDAX_MSGS_SEV_WARNING, LIBDAX_MSGS_PRIO_HIGH,
+				"Maximum number of CD-TEXT blocks exceeded",
+						0, 0);
+	break;
+					}
+					ret = v07t_apply_to_session(
+						session, block, char_codes,
+						copyrights, languages,
+						session_attr_seen,
+						track_attr_seen,
+						genre_code, genre_text, 0);
+					if (ret <= 0)
+						goto ex;
+					block++;
+				}
+				additional_blocks++;
+			}
 
 		} else if (strcmp(line, "Remarks") == 0) {
 			;
@@ -979,33 +1053,16 @@ bad_track_no:;
 			ret = 0; goto ex;
 		}
 	}
-
-	for (i= 0x80; i <= 0x8e; i++) {
-		if (i > 0x85 && i != 0x8e)
-	continue;
-		if (session_attr_seen[i - 0x80] || !track_attr_seen[i - 0x80])
-	continue;
-		ret = v07t_cdtext_to_session(session, block, "",
-					char_codes + block, i, NULL, 0);
-		if (ret <= 0)
-			goto ex;
-	}
-	if (genre_code >= 0 && genre_text[0]) {
-		line[0] = (genre_code >> 8) & 0xff;
-		line[1] = genre_code & 0xff;
-		strcpy(line + 2, genre_text);
-		length = 2 + strlen(line + 2) + 1;
-		ret = burn_session_set_cdtext(session, block, 0, "GENRE",
-					(unsigned char *) line, length, 0);
-		if (ret <= 0)
-			goto ex;
-	}
-	ret = burn_session_set_cdtext_par(session, char_codes, copyrights,
-								languages, 0);
+	ret = v07t_apply_to_session(session, block,
+	                            char_codes, copyrights, languages,
+	                            session_attr_seen, track_attr_seen,
+	                            genre_code, genre_text, 0);
 	if (ret <= 0)
 		goto ex;
 
 	ret = 1;
+	if (additional_blocks > 0)
+		ret += additional_blocks;;
 ex:;
 	if(fp != NULL)
 		fclose(fp);
@@ -1028,6 +1085,7 @@ int burn_cdtext_from_packfile(char *path, unsigned char **text_packs,
 
 	BURN_ALLOC_MEM(msg, char, 4096);
 
+	*text_packs = NULL;
 	if (stat(path, &stbuf) == -1) {
 cannot_open:;
 		sprintf(msg, "Cannot open CD-TEXT pack file '%.4000s'", path);
@@ -1079,7 +1137,14 @@ cannot_read:;
 			path);
 		libdax_msgs_submit(libdax_messenger, -1, 0x0002018b,
 				LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
-				burn_printify(msg), errno, 0);
+				burn_printify(msg), 0, 0);
+		ret = 0; goto ex;
+	} if (*num_packs <= 0) {
+		strcpy(msg,
+			"CD-Text pack file contains no complete text pack");
+		libdax_msgs_submit(libdax_messenger, -1, 0x000201aa,
+				LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
+				burn_printify(msg), 0, 0);
 		ret = 0; goto ex;
 	}
 
@@ -1109,3 +1174,564 @@ ex:;
 }
 
 
+/* --------------------------------- make_v07t -------------------------- */
+
+
+static int search_pack(unsigned char *text_packs, int num_packs,
+                       int start_no, int pack_type, int block,
+                       unsigned char **found_pack, int *found_no, int flag)
+{
+	int i;
+
+	for (i = start_no; i < num_packs; i++) {
+		if (pack_type >= 0)
+			if (text_packs[i * 18] != pack_type)
+	continue;
+		if (block >= 0)
+			if (((text_packs[i * 18 + 3] >> 4) & 7) != block)
+	continue;
+		*found_pack = text_packs + i * 18;
+		*found_no = i;
+		return 1;
+	}
+	*found_pack = NULL;
+	*found_no = num_packs;
+	return 0;
+}
+
+
+static void write_v07t_line(char **respt, char *spec, char *value, int vlen,
+                            int *result_len, int flag)
+{
+	int len;
+
+	if (vlen == -1)
+		vlen = strlen(value);
+	len = strlen(spec);
+	if (len < 19)
+		len = 19;
+	len += 3 + vlen + 1;
+	if(flag & 1) {
+		*result_len += len;
+		return;
+	}
+	sprintf(*respt, "%-19s = ", spec);
+	if (vlen > 0)
+		memcpy(*respt + strlen(*respt), value, vlen);
+	(*respt)[len - 1] = '\n';
+	(*respt)[len] = 0;
+	*respt+= len;
+}
+
+
+/*
+    @return            -1 error
+                        0 no pack of block,pack_type found
+                        1 packs found, delimiter is single 0-byte
+                        2 packs found, delimiter is double 0-byte
+*/
+static int collect_payload(unsigned char *text_packs, int num_packs,
+                           int pack_type, int block,
+                           unsigned char **payload, int *payload_count,
+                           int flag)
+{
+	unsigned char *pack;
+	int pack_no, ret, double_byte = 0;
+
+	*payload_count = 0;
+	for (pack_no = 0; ; pack_no++) {
+		ret = search_pack(text_packs, num_packs, pack_no, pack_type,
+		                  block, &pack, &pack_no, 0);
+		if (ret <= 0)
+	break;
+		*payload_count += 12;
+	}
+	if (*payload_count == 0)
+		return 0;
+	*payload = burn_alloc_mem(*payload_count + 1, 1, 0);
+	if (*payload == NULL)
+		return -1;
+	*payload_count = 0;
+	for (pack_no = 0; ; pack_no++) {
+		ret = search_pack(text_packs, num_packs, pack_no, pack_type,
+		                  block, &pack, &pack_no, 0);
+		if (ret <= 0)
+	break;
+		memcpy(*payload + *payload_count, pack + 4, 12);
+		*payload_count += 12;
+		if (pack[3] & 128)
+			double_byte = 1;
+	}
+	(*payload)[*payload_count] = 0;
+	return 1 + double_byte;
+}
+
+
+/*
+    @param flag        bit0= use double 0 as delimiter
+*/
+static int is_payload_text_end(unsigned char *payload, int payload_count,
+                               int i, int flag)
+{
+	if (i >= payload_count)
+		return 1;
+	if (payload[i])
+		return 0;
+	if (!(flag & 1))
+		return 1;
+	if (i + 1 >= payload_count)
+		return 1;
+	if (payload[i + 1] == 0)
+		return 1;
+	return 0;
+}
+
+
+/*
+    @param flag        Bitfield for control purposes.
+                       bit0= use double 0 as delimiter
+                       bit1= replace TAB resp. TAB TAB by text of previous tno
+*/
+static int pick_payload_text(unsigned char *payload, int payload_count,
+                             int tno,
+                             unsigned char **text_start, int *text_len,
+                             int flag)
+{
+	int i, skipped = 0, end_found = 0;
+
+again:;
+	if (tno <= 0) {
+		*text_start = payload;
+		*text_len = 0;
+		for (i = 0; i < payload_count; i += 1 + (flag & 1)) {
+			end_found = is_payload_text_end(payload, payload_count,
+		                                        i, flag & 1);
+			if (end_found) {
+				*text_len = i;
+		break;
+			}
+		}
+		return 1;
+	}
+	*text_start = NULL;
+	*text_len = 0;
+	for (i = 0; i < payload_count; i += 1 + (flag & 1)) {
+		end_found = is_payload_text_end(payload, payload_count,
+		                                i, flag & 1);
+		if (end_found) {
+			skipped++;
+			if (skipped == tno) {
+				*text_start = payload + (i + 1 + (flag & 1));
+			} else if (skipped == tno + 1) {
+				*text_len = i - (*text_start - payload);
+				goto found;
+			}
+		}
+	}
+	if (*text_start == NULL)
+		return 0;
+	*text_len = payload_count - (*text_start - payload);
+
+found:;
+	if (flag & 2) {
+		/* If TAB resp. TAB TAB, then look back */
+		if (flag & 1) {
+			if (*text_len == 2) {
+				if ((*text_start)[0] == '\t' &&
+				    (*text_start)[1] == '\t') {
+					skipped = 0;
+					tno--;
+					goto again;
+				}
+			}
+		} else if (*text_len == 1) {
+			if ((*text_start)[0] == '\t') {
+				skipped = 0;
+				tno--;
+				goto again;
+			}
+		}
+	}
+	return 1;
+}
+
+
+static int write_v07t_textline(unsigned char *text_packs, int num_packs,
+                               int pack_type, int block,
+                               int tno, int first_tno, char *spec,
+                               char **respt, int *result_len, int flag)
+{
+	unsigned char *payload = NULL, *text_start;
+	int ret, payload_count = 0, text_len, tab_flag = 0;
+	char msg[80];
+
+	if ((pack_type >= 0x80 && pack_type <= 0x85) || pack_type == 0x8e)
+		tab_flag = 2;
+	ret = collect_payload(text_packs, num_packs, pack_type, block, 
+                              &payload, &payload_count, 0);
+	if(ret > 0) {
+		ret = pick_payload_text(payload, payload_count, tno,
+		                        &text_start, &text_len,
+		                        (ret == 2) | tab_flag);
+		if (ret > 0) {
+			if (tno > 0 && strcmp(spec, "ISRC") == 0)
+				sprintf(msg, "%s %-2.2d",
+				              spec, tno + first_tno - 1);
+			else if (tno > 0)
+				sprintf(msg, "Track %-2.2d %s",
+				              tno + first_tno - 1, spec);
+			else
+				strcpy(msg, spec);
+			write_v07t_line(respt, msg,
+			                (char *) text_start, text_len,
+			                result_len, flag & 1);
+			ret = 1;
+		}
+	}
+	BURN_FREE_MEM(payload);
+	return ret;
+}
+
+
+static int report_track(unsigned char *text_packs, int num_packs, 
+                        int block, int tno, int first_tno,
+                        char **respt, int *result_len, int flag)
+{
+	int ret, i;
+	static char *track_specs[6] = {
+		"Title", "Artist", "Songwriter", "Composer",
+		"Arranger", "Message"
+	};
+
+	for (i = 0; i < 6; i++) {
+		ret = write_v07t_textline(text_packs, num_packs, 0x80 + i,
+		                          block, tno, first_tno,
+		                          track_specs[i], respt, result_len,
+	                                  flag & 1);
+		if (ret < 0)
+			return -1;
+	}
+	ret = write_v07t_textline(text_packs, num_packs, 0x8e, block,
+	                          tno, first_tno,
+	                          "ISRC", respt, result_len, flag & 1);
+	if (ret < 0)
+		return -1;
+	return 1;
+}
+
+
+/*
+    @param flag        Bitfield for control purposes.
+                       bit0= Do not store text in result but only determine
+                             the minimum size for the result array.
+                             It is permissible to submit result == NULL.
+                             Submit the already occupied size as result_size.
+    @return            > 0 tells the number of valid text bytes in result resp.
+                           with flag bit0 the prediction of that number.
+                           This does not include the trailing 0-byte.
+                       = 0 indicates that the block is not present
+                       < 0 indicates failure.
+*/
+static int report_block(unsigned char *text_packs, int num_packs, 
+                        int block, int first_tno, int last_tno, int char_code,
+                        char *result, int result_size, int flag)
+{
+	char *respt = NULL;
+	unsigned char *pack, *payload = NULL;
+	int result_len = 0, pack_no, ret, i, lang, payload_count = 0, genre;
+	char msg[80];
+	static char *languages[] = {
+		BURN_CDTEXT_LANGUAGES_0X00,
+		BURN_CDTEXT_FILLER,
+		BURN_CDTEXT_LANGUAGES_0X45
+	};
+	static char *volume_specs[7] = {
+		"Album Title", "Artist Name", "Songwriter", "Composer",
+		"Arranger", "Album Message", "Catalog Number",
+	};
+	static char *genres[BURN_CDTEXT_NUM_GENRES] = {
+		BURN_CDTEXT_GENRE_LIST
+	};
+
+	/* Search for any pack of the block. But do not accept 0x8f as first.*/
+	ret = search_pack(text_packs, num_packs, 0, -1, block, 
+                          &pack, &pack_no, 0);
+	if (ret <= 0)
+		return 0;
+	if (pack[0] == 0x8f)
+		return 0;
+	
+	if (flag & 1) {
+		result_len = result_size;
+	} else {
+		respt = result + result_size;
+	}
+	write_v07t_line(&respt, "Input Sheet Version", "0.7T", -1, &result_len,
+	                flag & 1);
+	sprintf(msg, "Libburn report of CD-TEXT Block %d", block);
+	write_v07t_line(&respt, "Remarks            ", msg, -1, &result_len,
+	                flag & 1);
+	write_v07t_line(&respt, "Text Code          ",
+	      char_code == 0 ? "8859" : char_code == 0x01 ? "ASCII" : "MS-JIS",
+	                -1, &result_len, flag & 1);
+
+	pack_no = 0;
+	for (i = 0; i < 3; i++) {
+		ret = search_pack(text_packs, num_packs, pack_no, 0x8f, -1, 
+                                  &pack, &pack_no, 0);
+		if (ret <= 0) {
+			libdax_msgs_submit(libdax_messenger, -1, 0x0002019f,
+			    LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
+	    	  "No third CD-TEXT pack 0x8f found. No language code defined",
+			    0, 0);
+			goto failure;
+		}
+		pack_no++;
+	}
+	lang = pack[8 + block];
+	if (lang > 127) {
+		sprintf(msg, "CD-TEXT with unknown language code %2.2x",
+		             (unsigned int) lang);
+		libdax_msgs_submit(libdax_messenger, -1, 0x0002019f,
+				LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
+				msg, 0, 0);
+		goto failure;
+	}
+	write_v07t_line(&respt, "Language Code", languages[lang], -1,
+	                &result_len, flag & 1);
+
+	for (i = 0; i < 7; i++) {
+		ret = write_v07t_textline(text_packs, num_packs, 0x80 + i,
+		                          block, 0, 0, volume_specs[i],
+	                                  &respt, &result_len,
+	                                  flag & 1);
+		if (ret < 0)
+			goto failure;
+	}
+
+	ret = collect_payload(text_packs, num_packs, 0x87, block, 
+                              &payload, &payload_count, 0);
+	if(ret > 0) {
+		genre = (payload[0] << 8) | payload[1];
+		if (genre < BURN_CDTEXT_NUM_GENRES) 
+			strcpy(msg, genres[genre]);
+		else
+			sprintf(msg, "0x%-4.4x", (unsigned int) genre);
+		write_v07t_line(&respt, "Genre Code", msg,
+				-1, &result_len, flag & 1);
+		write_v07t_line(&respt, "Genre Information",
+		                (char *) payload + 2,
+				-1, &result_len, flag & 1);
+		BURN_FREE_MEM(payload); payload = NULL;
+	}
+	ret = collect_payload(text_packs, num_packs, 0x8d, block, 
+                              &payload, &payload_count, 0);
+	if(ret > 0) {
+		write_v07t_line(&respt, "Closed Information", (char *) payload,
+		                -1, &result_len, flag & 1);
+		BURN_FREE_MEM(payload); payload = NULL;
+	}
+	ret = write_v07t_textline(text_packs, num_packs, 0x8e, block, 0, 0,
+	                          "UPC / EAN", &respt, &result_len, flag & 1);
+	if (ret < 0)
+		goto failure;
+	ret = search_pack(text_packs, num_packs, 0, 0x8f, -1, 
+	                  &pack, &pack_no, 0);
+	if (ret < 0)
+		goto failure;
+	if (pack[7] == 0x00)
+		strcpy(msg, "OFF");
+	else if (pack[7] == 0x03)
+		strcpy(msg, "ON");
+	else
+		sprintf(msg, "0x%2.2x", (unsigned int) pack[7]);
+	write_v07t_line(&respt, "Text Data Copy Protection", msg,
+				-1, &result_len, flag & 1);
+	sprintf(msg, "%d", first_tno);
+	write_v07t_line(&respt, "First Track Number", msg,
+		                -1, &result_len, flag & 1);
+	sprintf(msg, "%d", last_tno);
+	write_v07t_line(&respt, "Last Track Number", msg,
+		                -1, &result_len, flag & 1);
+	
+	for (i = 0; i < last_tno - first_tno + 1; i++) {
+		ret = report_track(text_packs, num_packs, block,
+		                   i + 1, first_tno,
+                                   &respt, &result_len, flag & 1);
+		if (ret < 0)
+			goto failure;
+	}
+
+	if (flag & 1)
+		return result_len;
+	return respt - result;
+
+failure:;
+	BURN_FREE_MEM(payload);
+	return -1;
+}
+
+
+/*
+    @param result      A byte buffer of sufficient size.
+                       It will be filled by the text for the v07t sheet file
+                       plus a trailing 0-byte. (Be aware that double-byte
+                       characters might contain 0-bytes, too.)
+    @param result_size The number of bytes in result.
+                       To be determined by a run with flag bit0 set.
+    @param flag        Bitfield for control purposes.
+                       bit0= Do not store text in result but only determine
+                             the minimum size for the result array.
+                             It is permissible to submit result == NULL and
+                             result_size == 0.
+    @return            > 0 tells the number of valid text bytes in result resp.
+                           with flag bit0 the prediction of that number.
+                           This does not include the trailing 0-byte.
+                       <= 0 indicates failure.
+*/
+static int burn_make_v07t(unsigned char *text_packs, int num_packs,
+                          int first_tno, int track_count,
+                          char *result, int result_size,
+                          int *char_code, int flag)
+{
+	int pack_no = 0, ret, block, last_tno = 0;
+	unsigned char *pack;
+	char msg[80];
+
+	/* >>> ??? Verify checksums ? */;
+
+	/* Check character code, reject unknown ones */
+	ret = search_pack(text_packs, num_packs, 0, 0x8f, -1, 
+                          &pack, &pack_no, 0);
+	if (ret <= 0) {
+		libdax_msgs_submit(libdax_messenger, -1, 0x0002019f,
+		    LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
+		    "No CD-TEXT pack 0x8f found. No character code defined",
+		    0, 0);
+		return 0;
+	}
+	*char_code = pack[4];
+	if (*char_code != 0x00 && *char_code != 0x01 && *char_code != 0x80) {
+		sprintf(msg, "CD-TEXT with unknown character code %2.2x",
+			    (unsigned int) *char_code);
+		libdax_msgs_submit(libdax_messenger, -1, 0x0002019f,
+				LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
+				msg, 0, 0);
+		return 0;
+	}
+
+	/* Obtain first_tno and last_tno from type 0x8f if present. */
+	if (first_tno <= 0) {
+		if (pack[5] > 0 &&  pack[5] + pack[6] < 100 &&
+		    pack[5] <= pack[6]) {
+			first_tno = pack[5];
+			last_tno = pack[6];
+		} else {
+			sprintf(msg,
+			        "CD-TEXT with illegal track range %d to %d",
+			        (int) pack[5], (int) pack[6]);
+			libdax_msgs_submit(libdax_messenger, -1, 0x0002019f,
+				LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
+				msg, 0, 0);
+			return 0;
+		}
+	}
+	if (last_tno <= 0) {
+		if (track_count > 0) {
+			last_tno = first_tno + track_count - 1;
+		} else {
+			last_tno = 99;
+		}
+	}
+
+	/* Report content */
+	result_size = 0;
+	for (block = 0; block < 8; block++) {
+		/* Obtain character code, reject unknown ones */
+		ret = search_pack(text_packs, num_packs, 0, 0x8f, block, 
+                          	&pack, &pack_no, 0);
+		if (ret > 0)
+			*char_code = pack[4];
+		if (*char_code != 0x00 && *char_code != 0x01 &&
+		    *char_code != 0x80) {
+			sprintf(msg,
+			  "CD-TEXT block %d with unknown character code %2.2x",
+			  block, (unsigned int) *char_code);
+			libdax_msgs_submit(libdax_messenger, -1, 0x0002019f,
+					LIBDAX_MSGS_SEV_FAILURE,
+					LIBDAX_MSGS_PRIO_HIGH, msg, 0, 0);
+			return 0;
+		}
+		ret = report_block(text_packs, num_packs, block, 
+		                   first_tno, last_tno, *char_code,
+		                   result, result_size, flag & 1);
+		if (ret < 0)
+			return ret;
+		if (ret == 0)
+	continue;
+		result_size = ret;
+	}
+	return result_size;
+}
+
+
+/*  Convert an array of CD-TEXT packs into the text format of
+    Sony CD-TEXT Input Sheet Version 0.7T .
+
+    @param text_packs  Array of bytes which form CD-TEXT packs of 18 bytes
+                       each. For a description of the format of the array,
+                       see file doc/cdtext.txt.
+                       No header of 4 bytes must be prepended which would
+                       tell the number of pack bytes + 2.
+                       This parameter may be NULL if the currently attached
+                       array of packs shall be removed.
+    @param num_packs   The number of 18 byte packs in text_packs.
+    @param start_tno   The start number of track counting, if known from
+                       CD table-of-content or orther sources.
+                       Submit 0 to enable the attempt to read it and the
+                       track_count from pack type 0x8f.
+    @param track_count The number of tracks, if known from CD table-of-content
+                       or orther sources.
+    @param result      Will return the buffer with Sheet text.
+                       Dispose by free() when no longer needed.
+                       It will be filled by the text for the v07t sheet file
+                       plus a trailing 0-byte. (Be aware that double-byte
+                       characters might contain 0-bytes, too.)
+                       Each CD-TEXT language block starts by the line
+                         "Input Sheet Version = 0.7T"
+                       and a "Remarks" line that tells the block number.
+    @param char_code   Returns the character code of the pack array:
+                         0x00 = ISO-8859-1
+                         0x01 = 7 bit ASCII
+                         0x80 = MS-JIS (japanese Kanji, double byte characters)
+                       The presence of a code value that is not in this list
+                       will cause this function to fail.
+    @param flag        Bitfield for control purposes. Unused yet. Submit 0.
+    @return            > 0 tells the number of valid text bytes in result.
+                           This does not include the trailing 0-byte.
+                       <= 0 indicates failure.
+*/
+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)
+{
+	int ret, result_size = 0;
+
+	ret = burn_make_v07t(text_packs, num_packs, start_tno, track_count,
+	                     NULL, 0, char_code, 1);
+	if (ret <= 0)
+		return ret;
+	result_size = ret + 1;
+	*result = burn_alloc_mem(result_size, 1, 0);
+	if (*result == NULL)
+		return -1;
+	ret = burn_make_v07t(text_packs, num_packs, start_tno, track_count,
+                             *result, result_size, char_code, 0);
+	if (ret <= 0) {
+		free(*result);
+		return ret;
+	}
+	return result_size - 1;
+}
+
+

libburn/cleanup.c

@@ -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);
    }

libburn/crc.c

@@ -51,7 +51,7 @@
    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
+   becoming 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

libburn/ddlpa.c

@@ -12,7 +12,7 @@
         -DDDLPA_C_STANDALONE -o ddlpa ddlpa.c
 
    The system macros enable 64-bit off_t and open(2) flag O_LARGEFILE, which
-   are not absolutely necessary but explicitely take into respect that
+   are not absolutely necessary but explicitly take into respect that
    our devices can offer more than 2 GB of addressable data. 
 
    Run test program:
@@ -50,7 +50,9 @@ static int ddlpa_debug_mode = 1;
 #ifndef O_LARGEFILE
 #define O_LARGEFILE 0
 #endif
-
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
 
 /* ----------------------- private -------------------- */
 
@@ -173,7 +175,7 @@ static int ddlpa_occupy(struct ddlpa_lock *o, char *path, int *fd,
 	int ret, o_flags, o_rw, l_type;
 	char *o_rwtext;
 
-	o_flags = o->o_flags | O_NDELAY;
+	o_flags = o->o_flags | O_NDELAY | O_BINARY;
 	if(!no_o_excl)
 		o_flags |= O_EXCL;
 	o_rw = (o_flags) & (O_RDONLY | O_WRONLY | O_RDWR);
@@ -216,7 +218,7 @@ static int ddlpa_occupy(struct ddlpa_lock *o, char *path, int *fd,
 static int ddlpa_obtain_scsi_adr(struct ddlpa_lock *o, char *path,
 			int *bus, int *host, int *channel, int *id, int *lun)
 {
-	int fd, ret, open_mode = O_RDONLY | O_NDELAY;
+	int fd, ret, open_mode = O_RDONLY | O_NDELAY | O_BINARY;
 	struct my_scsi_idlun {
 		int x;
 		int host_unique_id;
@@ -550,7 +552,8 @@ usage:;
 	} else {
 		/*
 		   This substitutes for:
-			fd = open(my_path, O_RDWR | O_EXCL | O_LARGEFILE);
+			fd = open(my_path,
+			          O_RDWR | O_EXCL | O_LARGEFILE | O_BINARY);
 
 		*/
 

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 - 2011 Thomas Schmitt <scdbackup@gmx.net>
+   Copyright (c) 2006 - 2024 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
@@ -155,4 +156,26 @@ int burn_abort_5(int patience,
 /* 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);
+
+/* ts C10213 */
+/* The size of limitless or oversized devices as pseudo drives */
+/* Do not lightheartedly change this value because of its meaning to
+   burn_drive.media_read_capacity in libburn/transport.h
+   64 TiB = 2 exp 46 = 2 exp 35 blocks
+*/
+#define BURN_DRIVE_MAX_BYTES ((off_t) (0x800000000) * (off_t) 2048)
+
 #endif /* __DRIVE */

libburn/ecma130ab.c

@@ -30,7 +30,7 @@
    -------------------------------------------------------------------------
 
 
-                            RSPC resp. P- and Q-Parity
+                            RSPC , P- and Q-Parity
 
    ECMA-130 Annex A prescribes to compute the parity bytes for P-columns and
    Q-diagonals by RSPC based on a Galois Field GF(2^8) with enumerating
@@ -75,12 +75,12 @@
    >>> See correctness reservation below.
 
    Algebra on Galois fields is the same as on Rational Numbers.
-   But arithmetics is defined by operations on polynomials rather than the
-   usual integer arithmetics on binary numbers.
+   But arithmetics on its polynomials differ from usual integer arithmetics
+   on binary numbers.
    Addition and subtraction are identical with the binary exor operator.
    Multiplication and division would demand polynomial division, e.g. by the
-   euclidian algorithm. The computing path over logarithms and powers follows
-   algebra and allows to reduce the arithmetic task to table lookups, additions
+   euclidean algorithm. The computing path over logarithms and powers follows
+   algebra and reduces the arithmetic task to table lookups, additions
    modulo 255, and exor operations. Note that the logarithms are natural
    numbers, not polynomials. They get added or subtracted by the usual addition
    (not by exor) and their polynomial power depends on their value modulo 255.
@@ -245,7 +245,7 @@ static unsigned char gflog[256] = {
 #ifdef Libburn_use_h_matriceS
 
 /* On my AMD 2x64 bit 3000 MHz processor h[i] costs about 7 % more time
-   than using gfpow[25-i] resp. gfpow[44-1]. I blame this on the more
+   than using gfpow[25-i] and gfpow[44-1]. I blame this on the more
    condensed data representation which slightly increases the rate of cache
    hits.
    Nevertheless this effect is very likely depending on the exact cache

libburn/file.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 - 2017 Thomas Schmitt <scdbackup@gmx.net>
    Provided under GPL version 2 or later.
 */
 
@@ -22,11 +22,17 @@
 #include <time.h>
 #include <pthread.h>
 
+/* ts B41126 : O_BINARY is needed for Cygwin but undefined elsewhere */
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
+
 #include "source.h"
 #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;
@@ -37,7 +43,7 @@ an unreadable disc */
 
 
 /* This is a generic OS oriented function wrapper which compensates
-   shortcommings of read() in respect to a guaranteed amount of return data.
+   shortcomings of read() in respect to a guaranteed amount of return data.
    See  man 2 read , paragraph "RETURN VALUE".
 */
 static int read_full_buffer(int fd, unsigned char *buffer, int size)
@@ -120,11 +126,11 @@ struct burn_source *burn_file_source_new(const char *path, const char *subpath)
 
 	if (!path)
 		return NULL;
-	fd1 = open(path, O_RDONLY);
+	fd1 = open(path, O_RDONLY | O_BINARY);
 	if (fd1 == -1)
 		return NULL;
 	if (subpath != NULL) {
-		fd2 = open(subpath, O_RDONLY);
+		fd2 = open(subpath, O_RDONLY | O_BINARY);
 		if (fd2 == -1) {
 			close(fd1);
 			return NULL;
@@ -325,8 +331,31 @@ static int fifo_set_size(struct burn_source *source, off_t size)
 static void fifo_free(struct burn_source *source)
 {
 	struct burn_source_fifo *fs = source->data;
+	int wait_count;
+	static int wait_max = 30, wait_usleep = 100000;
 
 	burn_fifo_abort(fs, 0);
+	for (wait_count = 0; wait_count <= wait_max; wait_count++) {
+		if (fs->thread_is_valid <= 0)
+	break;
+		if (wait_count < wait_max)
+			usleep(wait_usleep);
+	}
+	if (wait_count > wait_max) {
+		/* The shoveler thread might still be active. If so, it would
+		   use invalid or inappropriate memory if the fifo would be
+		   disposed now. A memory and resource leak is the better
+		   option here.
+		*/
+		libdax_msgs_submit(libdax_messenger, -1,
+				   0x000201ab,
+				   LIBDAX_MSGS_SEV_WARNING,
+				   LIBDAX_MSGS_PRIO_HIGH,
+				   "Leaving burn_source_fifo object undisposed because it is possibly stuck but alive",
+				   0, 0);
+		return;
+	}
+
 	if (fs->inp != NULL)
 		burn_source_free(fs->inp);
 
@@ -350,13 +379,20 @@ int burn_fifo_source_shoveller(struct burn_source *source, int flag)
 	fs->thread_pid = getpid();
 	fs->thread_is_valid = 1;
 
+	/* Lock was obtained by async.c:add_worker() */
+	burn_async_manage_lock(BURN_ASYNC_LOCK_RELEASE);
+
 	bufsize = fs->chunksize * fs->chunks;
 	while (!fs->end_of_consumption) {
+		if (fs->do_abort)
+			goto emergency_exit;
 
 		/* wait for enough buffer space available */
 		wpos = fs->buf_writepos;
 		counted = 0;
 		while (1) {
+			if (fs->do_abort)
+				goto emergency_exit;
 			rpos = fs->buf_readpos;
 			diff = rpos - wpos;
 			trans_end = 0;
@@ -399,6 +435,8 @@ int burn_fifo_source_shoveller(struct burn_source *source, int flag)
 		}
 
 		/* Obtain next chunk */
+		if (fs->do_abort)
+			goto emergency_exit;
 		if (fs->inp->read != NULL)
 			ret = fs->inp->read(fs->inp,
 				 (unsigned char *) bufpt, fs->inp_read_size);
@@ -424,6 +462,8 @@ int burn_fifo_source_shoveller(struct burn_source *source, int flag)
 		fs->put_counter++;
 
 		/* activate read chunk */
+		if (fs->do_abort)
+			goto emergency_exit;
 		if (ret > fs->inp_read_size)
 					/* beware of ill custom burn_source */
 			ret = fs->inp_read_size;
@@ -457,8 +497,11 @@ int burn_fifo_source_shoveller(struct burn_source *source, int flag)
 		fs->end_of_input = 1;
 
 	/* wait for end of reading by consumer */;
-	while (fs->buf_readpos != fs->buf_writepos && !fs->end_of_consumption)
-			fifo_sleep(0);
+	while (fs->buf_readpos != fs->buf_writepos && !fs->end_of_consumption) {
+		if (fs->do_abort)
+			goto emergency_exit;
+		fifo_sleep(0);
+	}
 
 	/* destroy ring buffer */;
 	if (!fs->end_of_consumption)
@@ -475,8 +518,11 @@ int burn_fifo_source_shoveller(struct burn_source *source, int flag)
 			((size_t) fs->chunksize) * (size_t) fs->chunks, 0);
 	fs->buf = NULL;
 
+emergency_exit:;
+	burn_async_manage_lock(BURN_ASYNC_LOCK_OBTAIN);
 	fs->thread_handle= NULL;
 	fs->thread_is_valid = 0;
+	burn_async_manage_lock(BURN_ASYNC_LOCK_RELEASE);
 	return (fs->input_error == 0);
 }
 
@@ -518,6 +564,7 @@ struct burn_source *burn_fifo_source_new(struct burn_source *inp,
 	fs->thread_handle = NULL;
 	fs->thread_pid = 0;
 	fs->thread_is_valid = 0;
+	fs->do_abort = 0;
 	fs->inp = NULL; /* set later */
 	if (flag & 1)
 		fs->inp_read_size = 32 * 1024;
@@ -919,3 +966,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 | O_BINARY,
+                  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

@@ -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 - 2017 Thomas Schmitt <scdbackup@gmx.net>
    Provided under GPL version 2 or later.
 */
 
@@ -27,8 +27,8 @@ struct burn_source_fifo {
 	/* The fifo stays inactive and unequipped with eventual resources
 	   until its read() method is called for the first time.
 	   Only then burn_fifo_start() gets called, allocates the complete
-           resources, starts a thread with burn_fifo_source_shuffler()
-	   which shuffles data and finally destroys the resources.
+	   resources, starts a thread with burn_fifo_source_shoveller()
+	   which shovels data and finally destroys the resources.
 	   This late start is to stay modest in case of multiple tracks
 	   in one disc.
 	*/
@@ -38,6 +38,9 @@ struct burn_source_fifo {
 	int thread_pid;
 	int thread_is_valid;
 
+	/* The shoveller aborts if this is 1. Resource leaks are possible. */
+	volatile int do_abort;
+
 	/* the burn_source for which this fifo is acting as proxy */
 	struct burn_source *inp;
 	int inp_read_size;
@@ -85,7 +88,7 @@ struct burn_source_offst {
 	int size_adjustable;
 
 	/* for set_size/get_size */
-	int nominal_size;
+	off_t 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 - 2012 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,12 +44,15 @@ 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()
 */
 int burn_sg_open_o_excl = 1;
 
-/* ts A70403 : GNU/Linux: wether to use fcntl(,F_SETLK,)
+/* ts A70403 : GNU/Linux: whether to use fcntl(,F_SETLK,)
                       after open() of device files  */
 int burn_sg_fcntl_f_setlk = 1;
 
@@ -67,7 +71,7 @@ int burn_sg_use_family = 0;
    has been thoroughly tested. */
 int burn_sg_open_o_nonblock = 1;
 
-/* wether to take a busy drive as an error */
+/* whether to take a busy drive as an error */
 /* Caution: this is implemented by a rough hack and eventually leads
 	    to unconditional abort of the process  */
 int burn_sg_open_abort_busy = 0;
@@ -94,7 +98,7 @@ int burn_builtin_signal_action = 0;            /* burn_set_signal_handling() */
 volatile int burn_builtin_triggered_action = 0;       /*  burn_is_aborting() */
 
 
-/* ts A70223 : wether implemented untested profiles are supported */
+/* ts A70223 : whether implemented untested profiles are supported */
 int burn_support_untested_profiles = 0;
 
 /* ts A91111 :
@@ -108,7 +112,7 @@ int burn_sg_log_scsi = 0;
 
 /* ts B10312 :
    Whether to map random-access readonly files to drive role 4.
-   Else it is role 2 overwriteable drive
+   Else it is role 2 overwritable drive
 */
 int burn_drive_role_4_allowed = 0;
 
@@ -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])
 {
@@ -532,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;
 }

libburn/init.h

@@ -1,11 +1,18 @@
 /* -*- 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;
 
-/** Indicator for burn_drive_get_status() wether a signal hit parts of the
+extern double lib_start_time;
+
+/** Indicator for burn_drive_get_status() whether a signal hit parts of the
     thread team. 
     0= all works well ,
     1 to 5 = waiting for eventual signal on control thread

libburn/libburn.ver

@@ -19,6 +19,7 @@ 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;
@@ -31,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;
@@ -43,14 +45,22 @@ 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;
+burn_drive_get_bd_r_pow;
 burn_drive_get_best_speed;
 burn_drive_get_disc;
 burn_drive_get_drive_role;
+burn_drive_get_feature;
+burn_drive_get_feature_codes;
+burn_drive_get_immed;
+burn_drive_get_media_sno;
 burn_drive_get_min_write_speed;
 burn_drive_get_read_speed;
+burn_drive_get_serial_no;
 burn_drive_get_speedlist;
 burn_drive_get_start_end_lba;
 burn_drive_get_status;
@@ -64,12 +74,16 @@ burn_drive_obtain_scsi_adr;
 burn_drive_probe_cd_write_modes;
 burn_drive_re_assess;
 burn_drive_release;
+burn_drive_reset_simulate;
 burn_drive_scan;
 burn_drive_scan_and_grab;
 burn_drive_set_buffer_waiting;
+burn_drive_set_immed;
 burn_drive_set_speed;
+burn_drive_set_speed_exact;
 burn_drive_set_stream_recording;
 burn_drive_snooze;
+burn_drive_was_feat21_failure;
 burn_drive_wrote_well;
 burn_fd_source_new;
 burn_fifo_fill;
@@ -86,12 +100,15 @@ 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;
 burn_msgs_set_severities;
 burn_msgs_submit;
+burn_nominal_slowdown;
 burn_obtain_profile_name;
 burn_offst_source_new;
 burn_os_alloc_buffer;
@@ -100,6 +117,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;
@@ -168,7 +186,9 @@ burn_write_opts_auto_write_type;
 burn_write_opts_free;
 burn_write_opts_get_drive;
 burn_write_opts_new;
+burn_write_opts_set_bdr_obs_exempt;
 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;
@@ -193,3 +213,13 @@ libdax_audioxtr_new;
 libdax_audioxtr_read;
 local: *;
 };
+
+LIBBURN4_1.5.8 {
+burn_disc_get_sectors_v2;
+burn_disc_track_lba_nwa_v2;
+burn_drive_get_status_v2;
+burn_get_read_capacity_v2;
+burn_session_get_sectors_v2;
+burn_track_get_sectors_v2;
+} LIBBURN4;
+

libburn/libdax_audioxtr.c

@@ -17,6 +17,10 @@
 #include <stdlib.h>
 #include <errno.h>
 
+/* ts B41126 : O_BINARY is needed for Cygwin but undefined elsewhere */
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
 
 #include "libdax_msgs.h"
 extern struct libdax_msgs *libdax_messenger;
@@ -51,6 +55,7 @@ int libdax_audioxtr_new(struct libdax_audioxtr **xtr, char *path, int flag)
  o->bits_per_sample= 0;
  o->msb_first= 0;
 
+ o->wav_data_location= 44;
  o->wav_subchunk2_size= 0;
 
  o->au_data_location= 0;
@@ -90,7 +95,7 @@ static int libdax_audioxtr_open(struct libdax_audioxtr *o, int flag)
  if(strcmp(o->path,"-")==0)
    o->fd= 0;
  else
-   o->fd= open(o->path, O_RDONLY);
+   o->fd= open(o->path, O_RDONLY | O_BINARY);
  if(o->fd<0) {
    sprintf(msg,"Cannot open audio source file : %s",o->path);
    libdax_msgs_submit(libdax_messenger,-1,0x00020200,
@@ -117,47 +122,123 @@ static int libdax_audioxtr_open(struct libdax_audioxtr *o, int flag)
  return(1);
 }
 
+/* @param flag: bit0= sequential file, skip by reading data
+*/
+static int libdax_audioxtr_skip(struct libdax_audioxtr *o,
+                                off_t *old_pos,
+                                off_t pos, int flag)
+{
+ int ret;
+ size_t to_read;
+ static char buf[256]; /* Thread safe because the content does not matter */
+
+ if((flag & 1) || o->fd == 0) { /* stdin */
+   while(pos - *old_pos > 0) {
+     to_read= pos - *old_pos;
+     if(to_read > sizeof(buf))
+       to_read= sizeof(buf);
+     ret= read(o->fd, buf, to_read);
+     if(ret < (int) to_read)
+       return(0);
+     *old_pos+= to_read;
+   }
+ } else {
+   ret= lseek(o->fd, pos, SEEK_SET);
+   if(ret == -1)
+     return(0);
+   *old_pos= pos;
+ }
+ return(1);
+}
 
 static int libdax_audioxtr_identify_wav(struct libdax_audioxtr *o, int flag)
 {
- int ret;
- char buf[45];
+ int ret, fmt_seen= 0, data_seen= 0;
+ off_t pos= 0, old_pos= 0, riff_end= 0;
+ char buf[16];
+ unsigned char *ubuf;
 
- /* check wether this is a MS WAVE file .wav */
- /* info used: http://ccrma.stanford.edu/courses/422/projects/WaveFormat/ */
+ /* check whether this is a MS WAVE file .wav */
+ /* info used: http://ccrma.stanford.edu/courses/422/projects/WaveFormat/
+               https://en.wikipedia.org/wiki/WAV
+    see summary in: doc/waveformat.txt
+ */
+ ubuf= (unsigned char *) buf;
 
- if(o->fd!=0) {
-   ret= lseek(o->fd,0,SEEK_SET);
-   if(ret==-1)
+ /* Look for ChunkID "RIFF" , tolerate other known chunks */
+ while(1) {
+   ret= libdax_audioxtr_skip(o, &old_pos, pos, 0);
+   if(ret <= 0)
      return(0);
+   ret= read(o->fd, buf, 8);
+   if(ret < 8)
+     return(0);
+   old_pos+= 8;
+   pos= old_pos + libdax_audioxtr_to_int(o, ubuf + 4, 4, 0);
+   if(pos > 0xffffffff || pos - old_pos < 4) /* Too large or no Format word */
+     return(0);
+   if(strncmp(buf, "RIFF", 4) == 0)
+ break;
+   /* Wikipedia mentions these known ChunkId values */
+   if(strncmp(buf, "INFO", 4) == 0 ||
+      strncmp(buf, "CSET", 4) == 0 ||
+      strncmp(buf, "JUNK", 4) == 0 ||
+      strncmp(buf, "PAD ", 4) == 0)
+ continue;
+   return(0);
  }
- ret= read(o->fd, buf, 44);
- if(ret<44)
-   return(0);
- buf[44]= 0; /* as stopper for any string operations */
 
- if(strncmp(buf,"RIFF",4)!=0)                                     /* ChunkID */
+ /* Read RIFF Format header */
+ ret= read(o->fd, buf, 4);
+ if(ret < 4)
    return(0);
- if(strncmp(buf+8,"WAVE",4)!=0)                                    /* Format */ 
-   return(0);
- if(strncmp(buf+12,"fmt ",4)!=0)                              /* Subchunk1ID */
-   return(0);
- if(buf[16]!=16 || buf[17]!=0 || buf[18]!=0 || buf[19]!=0)  /* Subchunk1Size */
-   return(0);
- if(buf[20]!=1 || buf[21]!=0)  /* AudioFormat must be 1 (Linear quantization) */
+ old_pos+= 4;
+ if(strncmp(buf, "WAVE", 4) != 0) /* Format */
    return(0);
+ riff_end= pos;
 
- strcpy(o->fmt,".wav");
- o->msb_first= 0;
- o->num_channels=  libdax_audioxtr_to_int(o,(unsigned char *) buf+22,2,0);
- o->sample_rate= libdax_audioxtr_to_int(o,(unsigned char *) buf+24,4,0);
- o->bits_per_sample= libdax_audioxtr_to_int(o,(unsigned char *)buf+34,2,0);
- sprintf(o->fmt_info,
-         ".wav , num_channels=%d , sample_rate=%d , bits_per_sample=%d",
-         o->num_channels,o->sample_rate,o->bits_per_sample);
- o->wav_subchunk2_size= libdax_audioxtr_to_int(o,(unsigned char *)buf+40,4,0);
- o->data_size= o->wav_subchunk2_size;
- return(1);
+ /* Look for SubchunkID "fmt " and "data" */
+ pos= old_pos;
+ while(old_pos < riff_end) {
+   ret= libdax_audioxtr_skip(o, &old_pos, pos, 0);
+   if(ret <= 0)
+     return(0);
+   ret= read(o->fd, buf, 8);
+   if(ret < 8)
+     return(0);
+   old_pos= pos + 8;
+   pos= old_pos + libdax_audioxtr_to_int(o, ubuf + 4, 4, 0); /* SubchunkSize */
+
+   if(strncmp(buf,"fmt ", 4) == 0) {
+     if(pos - old_pos < 16)
+       return(0);
+     ret= read(o->fd, buf, 16);
+     if(ret < 16)
+       return(0);
+     old_pos+= 16;
+     if(buf[0]!=1 || buf[1]!=0) /* AudioFormat (1 = Linear quantization) */
+       return(0);
+     o->msb_first= 0;
+     o->num_channels= libdax_audioxtr_to_int(o, ubuf + 2 , 2, 0);
+     o->sample_rate= libdax_audioxtr_to_int(o, ubuf + 4, 4, 0);
+     o->bits_per_sample= libdax_audioxtr_to_int(o, ubuf + 14, 2, 0);
+     sprintf(o->fmt_info,
+             ".wav , num_channels=%d , sample_rate=%d , bits_per_sample=%d",
+             o->num_channels, o->sample_rate, o->bits_per_sample);
+     fmt_seen= 1;
+
+   } else if(strncmp(buf,"data", 4) == 0) {
+     o->wav_data_location= old_pos;
+     o->wav_subchunk2_size= pos - old_pos;
+     o->data_size= o->wav_subchunk2_size;
+     data_seen= 1;
+   }
+   if(fmt_seen && data_seen) {
+     strcpy(o->fmt,".wav");
+     return(1);
+   }
+ }
+ return(0);
 }
 
 
@@ -166,7 +247,7 @@ static int libdax_audioxtr_identify_au(struct libdax_audioxtr *o, int flag)
  int ret,encoding;
  char buf[24];
 
- /* Check wether this is a Sun Audio, .au file */
+ /* Check whether this is a Sun Audio, .au file */
  /* info used: http://ccrma.stanford.edu/courses/422/projects/WaveFormat/ */
 
  if(o->fd!=0) {
@@ -204,10 +285,6 @@ static int libdax_audioxtr_identify_au(struct libdax_audioxtr *o, int flag)
  sprintf(o->fmt_info,
          ".au , num_channels=%d , sample_rate=%d , bits_per_sample=%d",
          o->num_channels,o->sample_rate,o->bits_per_sample);
-
- /* <<< for testing only */; 
- return(1);
-
  return(o->bits_per_sample>0); /* Audio format must be linear PCM */
 }
 
@@ -256,7 +333,7 @@ static int libdax_audioxtr_init_reading(struct libdax_audioxtr *o, int flag)
 
  o->extract_count= 0;
  if(strcmp(o->fmt,".wav")==0)
-   ret= lseek(o->fd,44,SEEK_SET);
+   ret= lseek(o->fd, o->wav_data_location, SEEK_SET);
  else if(strcmp(o->fmt,".au")==0)
    ret= lseek(o->fd,o->au_data_location,SEEK_SET);
  else

libburn/libdax_audioxtr.h

@@ -38,7 +38,7 @@ struct libdax_audioxtr;
      /* Calls from applications (to be forwarded by libdax/libburn) */
 
 
-/** Open an audio file, check wether suitable, create extractor object.
+/** Open an audio file, check whether suitable, create extractor object.
     @param xtr Opaque handle to extractor. Gets attached extractor object.
     @param path Address of the audio file to extract. "-" is stdin (but might
                 be not suitable for all futurely supported formats).
@@ -176,7 +176,10 @@ struct libdax_audioxtr {
  /* Format dependent parameters */
 
  /* MS WAVE Format */
- /* info used: http://ccrma.stanford.edu/courses/422/projects/WaveFormat/ */
+ /* see description in: doc/waveformat.txt */
+
+ /* Offset to "data" subchunk */
+ unsigned int wav_data_location;
 
  /* == NumSamples * NumChannels * BitsPerSample/8
     This is the number of bytes in the data. */

libburn/libdax_msgs.c

@@ -1,7 +1,7 @@
 
 /* libdax_msgs
    Message handling facility of libdax.
-   Copyright (C) 2006 - 2010 Thomas Schmitt <scdbackup@gmx.net>,
+   Copyright (C) 2006 - 2016 Thomas Schmitt <scdbackup@gmx.net>,
    provided under GPL version 2 or later.
 */
 
@@ -34,14 +34,13 @@ static int libdax_msgs_item_new(struct libdax_msgs_item **item,
  int ret;
  struct libdax_msgs_item *o;
  struct timeval tv;
- struct timezone tz;
 
  (*item)= o= 
         (struct libdax_msgs_item *) calloc(1, sizeof(struct libdax_msgs_item));
  if(o==NULL)
    return(-1);
  o->timestamp= 0.0;
- ret= gettimeofday(&tv,&tz);
+ ret= gettimeofday(&tv, NULL);
  if(ret==0)
    o->timestamp= tv.tv_sec+0.000001*tv.tv_usec;
  o->process_id= getpid();
@@ -289,7 +288,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 +326,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 +349,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,7 +1,7 @@
 
 /* libdax_msgs
    Message handling facility of libburn and libisofs.
-   Copyright (C) 2006-2011 Thomas Schmitt <scdbackup@gmx.net>,
+   Copyright (C) 2006-2021 Thomas Schmitt <scdbackup@gmx.net>,
    provided under GPL version 2 or later.
 */
 
@@ -266,8 +266,9 @@ int libdax_msgs_new(struct libdax_msgs **m, int flag);
 
 /** Destroy a message handling facility and all its eventual messages.
     The submitted pointer gets set to NULL.
-    Actually only the last destroy call of all offical references to the object
-    will really dispose it. All others just decrement the reference counter.
+    Actually only the last destroy call of all official references to the
+    object will really dispose it. All others just decrement the reference
+    counter.
     Call this function only with official reference pointers obtained by
     libdax_msgs_new() or libdax_msgs_refer(), and only once per such pointer.
     @param flag Bitfield for control purposes (unused yet, submit 0)
@@ -302,7 +303,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 +319,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,
@@ -422,7 +425,7 @@ Range "elmom"              :  0x00010000 to 0x0001ffff
 ------------------------------------------------------------------------------
 Range "scdbackup"          :  0x00020000 to 0x0002ffff
 
- Acessing and defending drives:
+ Accessing and defending drives:
 
  0x00020001 (SORRY,LOW)    = Cannot open busy device
  0x00020002 (SORRY,HIGH)   = Encountered error when closing drive
@@ -475,7 +478,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
@@ -518,7 +521,7 @@ 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
+ 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
@@ -552,7 +555,7 @@ Range "scdbackup"          :  0x00020000 to 0x0002ffff
  0x0002016e (DEBUG,HIGH)   = MODE SENSE page 2A too short
  0x0002016f (DEBUG,HIGH)   = Unable to grab scanned drive
  0x00020170 (NOTE,HIGH)    = Closing open session before writing new one
- 0x00020171 (NOTE,HIGH)    = Closing BD-R with accidently open session
+ 0x00020171 (NOTE,HIGH)    = Closing BD-R with accidentally open session
  0x00020172 (SORRY,HIGH)   = Read start address larger than number of readable blocks
  0x00020173 (FAILURE,HIGH) = Drive tells NWA smaller than last written address
  0x00020174 (SORRY,HIGH)   = Fifo alignment does not allow desired read size
@@ -577,7 +580,7 @@ Range "scdbackup"          :  0x00020000 to 0x0002ffff
  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.
+ 0x0002018a (SORRY,HIGH)   = Timeout exceeded. Retry canceled.
  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
@@ -596,6 +599,24 @@ Range "scdbackup"          :  0x00020000 to 0x0002ffff
  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
+ 0x000201a9 (FAILURE,HIGH) = Implausible length from GET CONFIGURATION
+ 0x000201aa (FAILURE,HIGH) = No CD-TEXT packs in file
+ 0x000201ab (WARN,HIGH)    = Leaving burn_source_fifo object undisposed
+ 0x000201ac (NOTE,HIGH)    = Drive currently does not offer Stream Recording
+ 0x000201ad (NOTE,HIGH)    = WRITE commands have been repeated
+ 0x000201ae (FAILURE,HIGH) = Track size exceeds 4 TiB - 32 KiB
 
 
  libdax_audioxtr:
@@ -626,11 +647,11 @@ Range "vreixo"              :  0x00030000 to 0x0003ffff
  0x0003ffbc (FAILURE,HIGH) = Image already bootable
  0x0003ffbb (FAILURE,HIGH) = Trying to use an invalid file as boot image
  0x0003ff80 (FAILURE,HIGH) = Error on file operation
- 0x0003ff7f (FAILURE,HIGH) = Trying to open an already openned file
+ 0x0003ff7f (FAILURE,HIGH) = Trying to open an already opened file
  0x0003ff7e (FAILURE,HIGH) = Access to file is not allowed
  0x0003ff7d (FAILURE,HIGH) = Incorrect path to file
  0x0003ff7c (FAILURE,HIGH) = The file does not exist in the filesystem
- 0x0003ff7b (FAILURE,HIGH) = Trying to read or close a file not openned
+ 0x0003ff7b (FAILURE,HIGH) = Trying to read or close a file not opened
  0x0003ff7a (FAILURE,HIGH) = Directory used where no dir is expected
  0x0003ff79 (FAILURE,HIGH) = File read error
  0x0003ff78 (FAILURE,HIGH) = Not dir used where a dir is expected
@@ -681,7 +702,7 @@ X 0x00030203 (HINT,MEDIUM)   = Unsupported El-Torito feature
 X 0x00030204 (SORRY,HIGH)    = Invalid file to be an El-Torito image
 X 0x00030205 (WARNING,MEDIUM)= Cannot properly patch isolinux image
 X 0x00030206 (WARNING,MEDIUM)= Copying El-Torito from a previous image without
-X                              enought info about it
+X                              enough info about it
 X 0x00030301 (NOTE,MEDIUM)   = Unsupported file type for Joliet tree
 
 

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 - 2024 Thomas Schmitt <scdbackup@gmx.net>
    Provided under GPL version 2 or later.
 */
 
@@ -27,7 +27,7 @@ void mmc_close_disc(struct burn_write_opts *o);
 
 void mmc_close(struct burn_drive *, int session, int track);
 void mmc_get_event(struct burn_drive *);
-int mmc_write(struct burn_drive *, int start, struct buffer *buf);
+int mmc_write(struct burn_drive *, off_t start, struct buffer *buf);
 void mmc_write_12(struct burn_drive *d, int start, struct buffer *buf);
 void mmc_sync_cache(struct burn_drive *);
 void mmc_load(struct burn_drive *);
@@ -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 *);
@@ -78,6 +78,8 @@ int mmc_compose_mode_page_5(struct burn_drive *d,
 
 /* ts A70201 */
 int mmc_four_char_to_int(unsigned char *data);
+/* ts C40226 */
+unsigned int mmc_four_char_to_uint(unsigned char *data);
 
 /* ts A70201 :
    Common track info fetcher for mmc_get_nwa() and mmc_fake_toc()
@@ -85,7 +87,7 @@ int mmc_four_char_to_int(unsigned char *data);
 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 */
+/* ts A70812 : return 0 = ok , return BE_CANCELLED = error occurred */
 int mmc_read_10(struct burn_drive *d, int start, int amount,
                 struct buffer *buf);
 
@@ -127,5 +129,21 @@ int mmc_get_phys_format_info(struct burn_drive *d, int *disk_category,
 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);
+
+/* ts B90414 */
+int burn_make_feature_text(struct burn_drive *d, unsigned int feature_code,
+                           unsigned char flags,
+                           unsigned char additional_length,
+                           unsigned char *feature_data,
+                           char **text, 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 - 2012 Thomas Schmitt <scdbackup@gmx.net>
+   Copyright (c) 2006 - 2017 Thomas Schmitt <scdbackup@gmx.net>
    Provided under GPL version 2 or later.
 */
 
@@ -20,6 +20,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <stdio.h>
 
 #include "libdax_msgs.h"
 extern struct libdax_msgs *libdax_messenger;
@@ -43,7 +44,8 @@ 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;
 
@@ -53,6 +55,7 @@ struct burn_write_opts *burn_write_opts_new(struct burn_drive *drive)
 	opts->obs_pad = 0;
 #endif
 
+	opts->bdr_obs_exempt = 0;
 	opts->start_byte = -1;
 	opts->fill_up_media = 0;
 	opts->force_is_set = 0;
@@ -78,6 +81,35 @@ void burn_write_opts_free(struct burn_write_opts *opts)
 	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) {
+out_of_mem:;
+		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)->text_packs = NULL;
+	(*to)->num_text_packs = 0;
+	if (from->text_packs != NULL && from->num_text_packs > 0) {
+		(*to)->text_packs = calloc(1, from->num_text_packs * 18);
+		if ((*to)->text_packs == NULL)
+			goto out_of_mem;
+		memcpy((*to)->text_packs, from->text_packs,
+		       from->num_text_packs * 18);
+	}
+	(*to)->refcount= 1;
+	return 1;
+}
+
 struct burn_read_opts *burn_read_opts_new(struct burn_drive *drive)
 {
 	struct burn_read_opts *opts;
@@ -93,6 +125,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;
 }
@@ -151,17 +184,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;
 }
@@ -169,9 +191,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;
 	}
@@ -203,6 +224,21 @@ 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
@@ -253,10 +289,12 @@ int burn_write_opts_set_leadin_text(struct burn_write_opts *opts,
 	if (num_packs > 0) {
 		memcpy(pack_buffer, text_packs, num_packs * 18);
 		opts->text_packs = pack_buffer;
+		pack_buffer = NULL;
 	}
 	opts->num_text_packs = num_packs;
 	ret = 1;
 ex:;
+	BURN_FREE_MEM(pack_buffer);
 	return ret;
 }
 
@@ -286,6 +324,11 @@ enum burn_write_types burn_write_opts_auto_write_type(
 
 	reasons[0] = 0;
 
+	if (burn_drive_get_bd_r_pow(d)) {
+		strcat(reasons,
+		       "MEDIA: unsuitable BD-R Pseudo Overwrite formatting, ");
+		return BURN_WRITE_NONE;
+	}
 	if (d->status != BURN_DISC_BLANK &&
 	    d->status != BURN_DISC_APPENDABLE){
 		if (d->status == BURN_DISC_FULL)
@@ -493,15 +536,25 @@ void burn_write_opts_set_obs_pad(struct burn_write_opts *opts, int pad)
 }
 
 
-/* ts A91115: API */
-void burn_write_opts_set_stdio_fsync(struct burn_write_opts *opts, int rythm)
+/* ts C10909: API */
+void burn_write_opts_set_bdr_obs_exempt(struct burn_write_opts *opts,
+					int value)
 {
-	if (rythm == -1)
-		opts->stdio_fsync_size = 0;
-	else if (rythm == 0)
+	opts->bdr_obs_exempt = !!value;
+}
+
+
+/* ts A91115: API */
+void burn_write_opts_set_stdio_fsync(struct burn_write_opts *opts, int rhythm)
+{
+	if (rhythm == -1)
+		opts->stdio_fsync_size = -1; /* never */
+	else if (rhythm == 0)
 		opts->stdio_fsync_size = Libburn_stdio_fsync_limiT;
-	else if (rythm >= 32)
-		opts->stdio_fsync_size = rythm;
+	else if (rhythm == 1)
+		opts->stdio_fsync_size = 0; /* only at end of writing */
+	else if (rhythm >= 32)
+		opts->stdio_fsync_size = rhythm;
 }
 
 

libburn/options.h

@@ -1,6 +1,6 @@
 
 /* Copyright (c) 2004 - 2006 Derek Foreman, Ben Jansens
-   Copyright (c) 2006 - 2012 Thomas Schmitt <scdbackup@gmx.net>
+   Copyright (c) 2006 - 2013 Thomas Schmitt <scdbackup@gmx.net>
    Provided under GPL version 2 or later.
 */
 
@@ -46,14 +46,17 @@ struct burn_write_opts
 	                2 indicates burn_write_opts_set_obs_pad(,1)
 	             */
 
-	/* ts A61222 : Start address for media which allow a choice */
+	/* 1= do not apply obs_pad=1 to BD-R if not stream recording. */
+	int bdr_obs_exempt;
+
+	/* ts A61222 : Start address for media which offer a choice */
 	off_t start_byte;
 
-	/* ts A70213 : Wether to fill up the available space on media */
+	/* ts A70213 : Whether to fill up the available space on media */
 	int fill_up_media;
 
-	/* ts A70303 : Wether to override conformance checks:
-	   - the check wether CD write+block type is supported by the drive 
+	/* ts A70303 : Whether to override conformance checks:
+	   - the check whether CD write+block type is supported by the drive 
 	*/
 	int force_is_set;
 
@@ -81,9 +84,19 @@ struct burn_write_opts
 	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
@@ -129,6 +142,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 the 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,99 @@
+
+/* os-netbsd.h
+   Operating system specific libburn definitions and declarations. Included
+   by os.h in case of compilation for
+           NetBSD 6 or OpenBSD 5.9
+           with  MMC transport adapter sg-netbsd.c
+
+   Copyright (C) 2010 - 2016 Thomas Schmitt <scdbackup@gmx.net>
+   provided under GPLv2+
+
+   Derived 2014 from libburn/os-solaris.c
+   Adapted 2016 to OpenBSD by help of SASANO Takayoshi <uaa@mx5.nisiq.net>
+*/
+
+
+/** 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
+
+#ifdef __OpenBSD__
+
+/** 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
+
+/* The number of above list items */
+#define BURN_OS_NON_SIGNAL_COUNT 11
+
+/* ts B60730 */
+/* Either OpenBSD or SASANO Takayoshi's LG BH14NS48 throw 2,0,0
+   on Immed bit with BLANK and SYNCHRONIZE CACHE.
+   Until it is clear that the drive is to blame, the OpenBSD default is
+   not to use Immed.
+
+   This may be overridden at ./configure time by
+     export CFLAGS
+     CFLAGS="$CFLAGS -DLibburn_do_no_immed_defaulT=0"
+*/
+#ifndef Libburn_do_no_immed_defaulT
+#define Libburn_do_no_immed_defaulT 1
+#endif
+
+#else /* __OpenBSD__ */
+
+/** 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
+
+#endif /* ! __OpenBSD__ */
+
+/* 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 - 2016 Thomas Schmitt <scdbackup@gmx.net>,
+   provided under GPLv2+
 */
 
 #ifndef BURN_OS_H_INCLUDED
@@ -13,7 +14,6 @@
    Operating system case distinction
 */
 
-
 #ifdef Libburn_use_sg_dummY
 
 
@@ -29,6 +29,22 @@
 #include "os-libcdio.h"
 
 
+#else
+#ifdef __NetBSD__
+
+
+/* -------------------------- NetBSD with SCIOCCOMMAND --------------------- */
+#include "os-netbsd.h"
+
+
+#else
+#ifdef __OpenBSD__
+
+
+/* -------------------------- OpenBSD with SCIOCCOMMAND -------------------- */
+#include "os-netbsd.h"
+
+
 #else
 #ifdef __FreeBSD__
 
@@ -72,6 +88,8 @@
 #endif /* ! __linux */
 #endif /* ! __FreeBSD__kernel__ */
 #endif /* ! __FreeBSD__ */
+#endif /* ! __OpenBSD__ */
+#endif /* ! __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 - 2024 Thomas Schmitt <scdbackup@gmx.net>
    Provided under GPL version 2 or later.
 */
 
@@ -22,6 +22,11 @@
 #include <fcntl.h>
 #include <errno.h>
 
+/* ts B41126 : O_BINARY is needed for Cygwin but undefined elsewhere */
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
+
 #include "sector.h"
 #include "libburn.h"
 #include "drive.h"
@@ -36,6 +41,7 @@
 #include "init.h"
 #include "toc.h"
 #include "util.h"
+#include "mmc.h"
 #include "sg.h"
 #include "read.h"
 #include "options.h"
@@ -158,6 +164,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);
@@ -278,7 +286,7 @@ void burn_packet_process(struct burn_drive *d, unsigned char *data,
 *//* write(o->datafd, data, 2352); */
 }
 
-/*  so yeah, when you uncomment these, make them write zeros insted of crap
+/*  so yeah, when you uncomment these, make them write zeros instead of crap
 static void write_empty_sector(int fd)
 {
 	static char sec[2352], initialized = 0;
@@ -306,8 +314,33 @@ static void flipq(unsigned char *sub)
 */
 
 
+/** @param flag bit1= be silent on failure
+                bit5= report failure with severity DEBUG
+*/
+static int burn_stdio_seek(int fd, off_t byte_address, struct burn_drive *d,
+                           int flag)
+{
+	char msg[80];
+
+	if (lseek(fd, byte_address, SEEK_SET) != -1)
+		return 1;
+	if (!(flag & 2)) {
+		sprintf(msg, "Cannot address start byte %.f",
+				(double) byte_address);
+				libdax_msgs_submit(libdax_messenger,
+			 	d->global_index, 0x00020147,
+				(flag & 32) ?
+				 LIBDAX_MSGS_SEV_DEBUG : LIBDAX_MSGS_SEV_SORRY,
+				LIBDAX_MSGS_PRIO_HIGH, msg, errno, 0);
+	}
+	return 0;
+}
+
+
 /* ts A70904 */
-/** @param flag bit0=be silent on data shortage */
+/** @param flag bit0= be silent on data shortage
+                bit5= report data shortage with severity DEBUG
+*/
 int burn_stdio_read(int fd, char *buf, int bufsize, struct burn_drive *d,
 			int flag)
 {
@@ -322,7 +355,9 @@ int burn_stdio_read(int fd, char *buf, int bufsize, struct burn_drive *d,
 	if(todo > 0 && !(flag & 1)) {
 		libdax_msgs_submit(libdax_messenger, d->global_index,
 			0x0002014a,
-			LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
+			(flag & 32) ?
+			  LIBDAX_MSGS_SEV_DEBUG : LIBDAX_MSGS_SEV_SORRY,
+			 LIBDAX_MSGS_PRIO_HIGH,
 			"Cannot read desired amount of data", errno, 0);
 	}
 	if (count < 0)
@@ -331,11 +366,82 @@ int burn_stdio_read(int fd, char *buf, int bufsize, struct burn_drive *d,
 }
 
 
+/* With DVD and BD media, the minimum ECC entity is read instead of single
+   blocks.
+   @param flag see burn_read_data() in libburn.h
+*/
+static int retry_mmc_read(struct burn_drive *d, int chunksize, int sose_mem,
+                          int start, char **wpt, off_t *data_count,
+                          int flag)
+{
+	int i, err, todo;
+	int retry_at, retry_size;
+
+	retry_at = start;
+	retry_size = chunksize;
+	todo = chunksize;
+	retry_size = 16;                               /* DVD ECC block size */
+	if (d->current_is_cd_profile) {
+		retry_size = 1;                             /* CD block size */
+	} else if (d->current_profile >= 0x40 && d->current_profile <= 0x43) {
+		retry_size = 32;                          /* BD cluster size */
+	}
+	for (i = 0; todo > 0; i++) {
+		if (flag & 2)
+			d->silent_on_scsi_error = 1;
+		else if (flag & 32)
+			d->silent_on_scsi_error = 3;
+		retry_at = start + i * retry_size;
+		if (retry_size > todo)
+			retry_size = todo;
+		err = d->read_10(d, retry_at, retry_size, d->buffer);
+		if (flag & (2 | 32)) 
+			d->silent_on_scsi_error = sose_mem;
+		if (err == BE_CANCELLED)
+			return 0;
+		memcpy(*wpt, d->buffer->data, retry_size * 2048);
+		*wpt += retry_size * 2048;
+		*data_count += retry_size * 2048;
+		todo -= retry_size;
+	}
+	return 1;
+}
+
+
+/* @param flag see burn_read_data() in libburn.h
+*/
+static int retry_stdio_read(struct burn_drive *d, int fd, int chunksize,
+                            int start, char **wpt, off_t *data_count,
+                            int flag)
+{
+	int i, ret, to_read, todo;
+
+	ret = burn_stdio_seek(fd, ((off_t) start) * 2048, d, flag & 2);
+	if (ret <= 0)
+		return ret;
+	todo = chunksize * 2048;
+	for (i = 0; todo > 0; i += 2048) {
+		to_read = todo;
+		if (to_read > 2048)
+			to_read = 2048;
+		ret = burn_stdio_read(fd, (char *) d->buffer->data, to_read,
+					d, 1);
+		if (ret <= 0)
+			return 0;
+		memcpy(*wpt, d->buffer->data, to_read);
+		*wpt += to_read;
+		*data_count += to_read;
+		todo -= to_read;
+	}
+	return 1;
+}
+
+
 /* ts A70812 : API function */
 int burn_read_data(struct burn_drive *d, off_t byte_address,
                    char data[], off_t data_size, off_t *data_count, int flag)
 {
-	int alignment = 2048, start, upto, chunksize = 1, err, cpy_size, i;
+	int alignment = 2048, start, upto, chunksize = 1, err, cpy_size;
 	int sose_mem = 0, fd = -1, ret;
 	char msg[81], *wpt;
 	struct buffer *buf = NULL, *buffer_mem = d->buffer;
@@ -386,17 +492,17 @@ int burn_read_data(struct burn_drive *d, off_t byte_address,
 			msg, 0, 0);
 		{ret = 0; goto ex;}
 	}
-	if (d->media_read_capacity != 0x7fffffff && byte_address >=
-		((off_t) d->media_read_capacity + (off_t) 1) * (off_t) 2048) {
+	if (d->media_read_capacity != 0x7fffffffffffffff &&
+	    byte_address >= (d->media_read_capacity + 1) * (off_t) 2048) {
 		if (!(flag & 2)) {
 			sprintf(msg,
-			  "Read start address %ds larger than number of readable blocks %d",
-			  (int) (byte_address / 2048 + !!(byte_address % 2048)),
-			  d->media_read_capacity);
+			  "Read start address %.fs larger than number of readable blocks %.f",
+			  (double) (byte_address / 2048 + !!(byte_address % 2048)),
+			  (double) (d->media_read_capacity + 1));
 			libdax_msgs_submit(libdax_messenger, d->global_index,
-				0x00020172,
-				LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
-				msg, 0, 0);
+				0x00020172, (flag & 32) ?
+				LIBDAX_MSGS_SEV_DEBUG : LIBDAX_MSGS_SEV_SORRY,
+				LIBDAX_MSGS_PRIO_HIGH, msg, 0, 0);
 		}
 		{ret = 0; goto ex;}
 	}
@@ -420,7 +526,8 @@ int burn_read_data(struct burn_drive *d, off_t byte_address,
 		fd = d->stdio_fd;
 		if (fd < 0)
 			d->stdio_fd = fd =
-				open(d->devname, O_RDONLY | O_LARGEFILE);
+				open(d->devname,
+				     O_RDONLY | O_LARGEFILE | O_BINARY);
 		if (fd == -1) {
 			if (errno == EACCES && (flag & 2)) {
 				if (!(flag & 8))
@@ -430,29 +537,23 @@ int burn_read_data(struct burn_drive *d, off_t byte_address,
 					  LIBDAX_MSGS_PRIO_HIGH,
 			  "Failed to open device (a pseudo-drive) for reading",
 					  errno, 0);
-			} else if (errno!= ENOENT || !(flag & 2))
+			} else if (errno != ENOENT || !(flag & 2))
 				libdax_msgs_submit(libdax_messenger,
-				  d->global_index, 0x00020005,
-				  LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
+					d->global_index, 0x00020005,
+					(flag & 32) && errno == ENOENT ?
+				   		LIBDAX_MSGS_SEV_DEBUG :
+						LIBDAX_MSGS_SEV_SORRY,
+					LIBDAX_MSGS_PRIO_HIGH,
 			  "Failed to open device (a pseudo-drive) for reading",
-				   errno, 0);
+					errno, 0);
 			ret = 0;
 			if (errno == EACCES && (flag & 8))
 				ret= -2;
 			goto ex;
 		}
-		if (lseek(fd, byte_address, SEEK_SET) == -1) {
-			if (!(flag & 2)) {
-				sprintf(msg, "Cannot address start byte %.f",
-					(double) byte_address);
-				libdax_msgs_submit(libdax_messenger,
-				  d->global_index,
-				  0x00020147,
-				  LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
-				  msg, errno, 0);
-			}
-			ret = 0; goto ex;
-		}
+		ret = burn_stdio_seek(fd, byte_address, d, flag & (2 | 32));
+		if (ret <= 0)
+			goto ex;
 	}
 
 	d->busy = BURN_DRIVE_READING_SYNC;
@@ -472,53 +573,47 @@ int burn_read_data(struct burn_drive *d, off_t byte_address,
 			cpy_size = data_size - *data_count;
 		if (flag & 2)
 			d->silent_on_scsi_error = 1;
+		else if (flag & 32)
+			d->silent_on_scsi_error = 3;
+		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 {
 			ret = burn_stdio_read(fd, (char *) d->buffer->data,
-						 cpy_size, d, !!(flag & 2));
+					      cpy_size, d,
+					      (flag & 32) | !!(flag & 2));
 			err = 0;
 			if (ret <= 0)
 				err = BE_CANCELLED;
 		}
-		if (flag & 2) 
+		if (flag & (2 | 16 | 32))
 			d->silent_on_scsi_error = sose_mem;
 		if (err == BE_CANCELLED) {
-			/* Try to read a smaller part of the chunk */
-			if(!(flag & 4))
-			  for (i = 0; i < chunksize - 1; i++) {
-				if (flag & 2)
-					d->silent_on_scsi_error = 1;
-				if (d->drive_role == 1) {
-					err = d->read_10(d, start + i, 1,
-							 d->buffer);
-				} else {
-					ret = burn_stdio_read(fd,
-						(char *) d->buffer->data,
-						2048, d, 1);
-					if (ret <= 0)
-						err = BE_CANCELLED;
-				}
-				if (flag & 2) 
-					d->silent_on_scsi_error = sose_mem;
-				if (err == BE_CANCELLED)
-			break;
-				memcpy(wpt, d->buffer->data, 2048);
-				wpt += 2048;
-				*data_count += 2048;
+			if ((flag & 16) && (d->had_particular_error & 1))
+				{ret = -3; goto ex;}
+			/* Retry: with CD read by single blocks
+			          with other media: retry in full chunks
+			*/
+			if(flag & 4)
+				goto bad_read;
+			if (d->drive_role == 1) {
+				ret = retry_mmc_read(d, chunksize, sose_mem,
+						start, &wpt, data_count, flag);
+			} else {
+				ret = retry_stdio_read(d, fd, chunksize, 
+						start, &wpt, data_count, flag);
 			}
-			if (!(flag & 2))
-				libdax_msgs_submit(libdax_messenger,
-				  d->global_index,
-				  0x00020000,
-				  LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
-				  "burn_read_data() returns 0",
-				  0, 0);
-			ret = 0; goto ex;
+			if (ret <= 0)
+				goto bad_read;
+		} else {
+			memcpy(wpt, d->buffer->data, cpy_size);
+			wpt += cpy_size;
+			*data_count += cpy_size;
 		}
-		memcpy(wpt, d->buffer->data, cpy_size);
-		wpt += cpy_size;
-		*data_count += cpy_size;
 	}
 
 	ret = 1;
@@ -527,4 +622,157 @@ ex:;
 	d->buffer = buffer_mem;
 	d->busy = BURN_DRIVE_IDLE;
 	return ret;
+
+bad_read:;
+	if (!(flag & 2))
+		libdax_msgs_submit(libdax_messenger, d->global_index,
+				0x00020000,
+				LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
+				"burn_read_data() returns 0", 0, 0);
+	ret = 0; goto ex;
 }
+
+
+/* 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;
+		else if (flag & 32)
+			d->silent_on_scsi_error = 3;
+		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 | 32))
+			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;
+				else if (flag & 32)
+					d->silent_on_scsi_error = 3;
+				err = d->read_cd(d, start + i, 1, 1, 0x10,
+				             NULL, d->buffer, (flag & 8) >> 3);
+				if (flag & (2 | 32))
+					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

@@ -114,12 +114,15 @@ int sbc_start_unit_flag(struct burn_drive *d, int flag)
 
 	scsi_init_command(c, SBC_START_UNIT, sizeof(SBC_START_UNIT));
 	c->retry = 1;
-	c->opcode[1] |= (flag & 1); /* ts A70918 : Immed */
+	if (d->do_no_immed && (flag & 1))
+		c->timeout = 1800 * 1000;
+	else
+		c->opcode[1] |= (flag & 1); /* ts A70918 : Immed */
 	c->dir = NO_TRANSFER;
 	d->issue_command(d, c);
 	if (c->error)
 		return 0;
-	if (!(flag & 1))
+	if (d->do_no_immed || !(flag & 1))
 		return 1;
 	/* ts A70918 : asynchronous */
 	ret = spc_wait_unit_attention(d, 1800, "START UNIT", 0);

libburn/sector.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 - 2021 Thomas Schmitt <scdbackup@gmx.net>
    Provided under GPL version 2 or later.
 */
 
@@ -40,6 +40,10 @@ extern struct libdax_msgs *libdax_messenger;
 #include <fcntl.h>
 #endif /* Libburn_log_in_and_out_streaM */
 
+/* ts B41126 : O_BINARY is needed for Cygwin but undefined elsewhere */
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
 
 /*static unsigned char isrc[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ";*/
 
@@ -109,7 +113,8 @@ static void get_bytes(struct burn_track *track, int count, unsigned char *data)
         static int tee_fd= -1;
         if(tee_fd==-1)
                 tee_fd= open("/tmp/libburn_sg_readin",
-                                O_WRONLY|O_CREAT|O_TRUNC,S_IRUSR|S_IWUSR);
+				O_WRONLY | O_CREAT | O_TRUNC | O_BINARY,
+				S_IRUSR | S_IWUSR);
 #endif /* Libburn_log_in_and_out_streaM */
 
 
@@ -188,7 +193,9 @@ static void get_bytes(struct burn_track *track, int count, unsigned char *data)
 		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);
+		track_blocks = burn_track_get_sectors_2_v2(track, 1);
+		if (track_blocks < 0)
+			track_blocks = 0;
 		missing = track_blocks * inp_block_size - track->sourcecount;
 		sprintf(msg,
 		      "Premature end of input encountered. Missing: %.f bytes",
@@ -348,7 +355,7 @@ static int convert_data(struct burn_write_opts *o, struct burn_track *track,
 
 	/* ts A61010 */
 	/* a ssert(outlen >= inlen); */
-	if (outlen < inlen)
+	if (outlen < inlen || outlen < 0 || inlen < 0)
 		return 0;
 
 	if ((outmode & BURN_MODE_BITS) == (inmode & BURN_MODE_BITS)) {
@@ -907,7 +914,7 @@ void process_q(struct burn_drive *d, unsigned char *q)
 		}
 		break;
 	case 2:
-		/* XXX dont ignore these */
+		/* XXX do not ignore these */
 		break;
 	case 3:
 /*              burn_print(12, "ISRC data in mode 3 q\n");*/
@@ -918,7 +925,7 @@ void process_q(struct burn_drive *d, unsigned char *q)
 		break;
 	default:
 
-		/* ts A61009 : if reactivated then witout Assert */
+		/* ts A61009 : if reactivated then without Assert */
 		a ssert(0);
 	}
 }
@@ -926,7 +933,7 @@ void process_q(struct burn_drive *d, unsigned char *q)
 
 /* this needs more info.  subs in the data? control/adr? */
 
-/* ts A61119 : One should not use inofficial compiler extensions.
+/* ts A61119 : One should not use unofficial compiler extensions.
    >>> Some day this function needs to be implemented. At least for now
        the result does not match the "mode" of cdrecord -toc.
  */

libburn/sg-dummy.c

@@ -35,6 +35,11 @@ Present implementation: default dummy which enables libburn only to work
 #include <sys/statvfs.h>
 #endif /* Libburn_os_has_stavtfS */
 
+/* ts B41126 : O_BINARY is needed for Cygwin but undefined elsewhere */
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
+
 #include "transport.h"
 #include "drive.h"
 #include "sg.h"
@@ -80,7 +85,7 @@ int sg_initialize(char msg[1024], int flag)
 
 
 /** Performs global finalization of the SCSI transport adapter and eventually
-    needed operating system facilities. Releases globally aquired resources.
+    needed operating system facilities. Releases globally acquired resources.
     @param flag  unused yet, submit 0
     @return      1 = success, <=0 = failure
 */  
@@ -139,9 +144,9 @@ int scsi_enumerate_drives(void)
 }
 
 
-/** Tells wether libburn has the given drive in use or exclusively reserved.
+/** 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.
+    it is time to give up usage and reservation.
 */
 /** Published as burn_drive.drive_is_open() */
 int sg_drive_is_open(struct burn_drive * d)
@@ -175,7 +180,7 @@ int sg_release(struct burn_drive *d)
 }
 
 
-/** Sends a SCSI command to the drive, receives reply and evaluates wether
+/** Sends a SCSI command to the drive, receives reply and evaluates whether
     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
@@ -208,7 +213,7 @@ int sg_obtain_scsi_adr(char *path, int *bus_no, int *host_no, int *channel_no,
 }
 
 
-/** Tells wether a text is a persistent address as listed by the enumeration
+/** Tells whether a text is a persistent address as listed by the enumeration
     functions.
 */
 int sg_is_enumerable_adr(char *adr)
@@ -218,7 +223,7 @@ int sg_is_enumerable_adr(char *adr)
 
 
 /* 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. 
+   fseeked, read, and possibly written with 2 kB granularity. 
 */
 int burn_os_is_2k_seekrw(char *path, int flag)
 {
@@ -244,7 +249,7 @@ int burn_os_is_2k_seekrw(char *path, int flag)
                   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)
+int burn_os_stdio_capacity(char *path, off_t write_start, off_t *bytes)
 {
 	struct stat stbuf;
 
@@ -277,7 +282,7 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
 		long blocks;
 
 		blocks = *bytes / 512;
-		fd = open(path, open_mode);
+		fd = open(path, open_mode | O_BINARY);
 		if (fd == -1)
 			{ret = -2; goto ex;}
 		ret = ioctl(fd, BLKGETSIZE, &blocks);
@@ -289,7 +294,7 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
 #endif /* Libburn_if_this_was_linuX */
 
 	} else if(S_ISREG(stbuf.st_mode)) {
-		add_size = stbuf.st_blocks * (off_t) 512;
+		add_size = burn_sparse_file_addsize(write_start, &stbuf);
 		strcpy(testpath, path);
 	} else
 		{ret = 0; goto ex;}
@@ -330,7 +335,7 @@ int burn_os_open_track_src(char *path, int open_flags, int flag)
 {
 	int fd;
 
-	fd = open(path, open_flags);
+	fd = open(path, open_flags | O_BINARY);
 	return fd;
 }
 

libburn/sg-freebsd-port.c

@@ -47,8 +47,8 @@ sg_initialize()         performs global initialization of the SCSI transport
                         facilities. Checks for compatibility of supporting
                         software components.
 
-sg_shutdown()           performs global finalizations and releases golbally
-                        aquired resources.
+sg_shutdown()           performs global finalizations and releases globally
+                        acquired resources.
 
 sg_give_next_adr()      iterates over the set of potentially useful drive 
                         address strings.
@@ -57,10 +57,10 @@ 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
+                        on destruction. Releases resources which were acquired
                         underneath scsi_enumerate_drives().
 
-sg_drive_is_open()      tells wether libburn has the given drive in use.
+sg_drive_is_open()      tells whether libburn has the given drive in use.
 
 sg_grab()               opens the drive for SCSI commands and ensures
                         undisturbed access.
@@ -68,7 +68,7 @@ sg_grab()               opens the drive for SCSI commands and ensures
 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
+                        and evaluates whether the command succeeded or shall
                         be retried or finally failed.
 
 sg_obtain_scsi_adr()    tries to obtain SCSI address parameters.
@@ -81,7 +81,7 @@ burn_os_is_2k_seekrw()  tells whether the given path leads to a file object
 
 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
+burn_os_open_track_src()  opens a disk file in a way that offers best
                         throughput with file reading and/or SCSI write command
                         transmission.
 
@@ -307,7 +307,7 @@ int sg_initialize(char msg[1024], int flag)
 
 
 /** Performs global finalization of the SCSI transport adapter and eventually
-    needed operating system facilities. Releases globally aquired resources.
+    needed operating system facilities. Releases globally acquired resources.
     @param flag  unused yet, submit 0
     @return      1 = success, <=0 = failure
 */  
@@ -444,9 +444,9 @@ int scsi_enumerate_drives(void)
 }
 
 
-/** Tells wether libburn has the given drive in use or exclusively reserved.
+/** 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.
+    it is time to give up usage and reservation.
 */
 /** Published as burn_drive.drive_is_open() */
 int sg_drive_is_open(struct burn_drive * d)
@@ -485,7 +485,7 @@ int sg_grab(struct burn_drive *d)
 }
 
 
-/** PORTING: Is mainly about the call to sg_close_drive() and wether it
+/** 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.
@@ -500,7 +500,7 @@ int sg_release(struct burn_drive *d)
 }
 
 
-/** Sends a SCSI command to the drive, receives reply and evaluates wether
+/** Sends a SCSI command to the drive, receives reply and evaluates whether
     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
@@ -567,6 +567,9 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 		ccb->csio.dxfer_len = 0;
 	}
 
+	/* ts B90523 : Record effective transfer length request for debugging*/
+	c->dxfer_len = ccb->csio.dxfer_len;
+
 	do {
 		memset(&ccb->csio.sense_data, 0, sizeof(ccb->csio.sense_data));
 		err = cam_send_ccb(d->cam, ccb);
@@ -585,6 +588,7 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 		}
 		/* XXX */
 		memcpy(c->sense, &ccb->csio.sense_data, ccb->csio.sense_len);
+		c->sense_len = ccb->csio.sense_len;
 		if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
 			if (!c->retry) {
 				c->error = 1;
@@ -603,6 +607,8 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 		} else {
 			done = 1;
 		}
+		if (!done)
+			spc_register_retry(c);
 	} while (!done);
 	cam_freeccb(ccb);
 	return 1;
@@ -641,7 +647,7 @@ int sg_obtain_scsi_adr(char *path, int *bus_no, int *host_no, int *channel_no,
 }
 
 
-/** Tells wether a text is a persistent address as listed by the enumeration
+/** Tells whether a text is a persistent address as listed by the enumeration
     functions.
 */
 int sg_is_enumerable_adr(char* adr)
@@ -716,7 +722,7 @@ int burn_os_is_2k_seekrw(char *path, int flag)
                   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)
+int burn_os_stdio_capacity(char *path, off_t write_start, off_t *bytes)
 {
 	struct stat stbuf;
 	struct statvfs vfsbuf;
@@ -769,7 +775,7 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
 			{ret = -2; goto ex;}
 		*bytes = add_size;
 	} else if(S_ISREG(stbuf.st_mode)) {
-		add_size = stbuf.st_blocks * (off_t) 512;
+		add_size = burn_sparse_file_addsize(write_start, &stbuf);
 		strcpy(testpath, path);
 	} else
 		{ret = 0; goto ex;}

libburn/sg-freebsd.c

@@ -1,7 +1,7 @@
 /* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */
 
 /* 
-   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
         and under FreeBSD license revised, i.e. without advertising clause.
 */
@@ -128,7 +128,7 @@ int sg_initialize(char msg[1024], int flag)
 
 /* ts A91227 */
 /** Performs global finalization of the SCSI transport adapter and eventually
-    needed operating system facilities. Releases globally aquired resources.
+    needed operating system facilities. Releases globally acquired resources.
     @param flag  unused yet, submit 0
     @return      1 = success, <=0 = failure
 */  
@@ -441,6 +441,11 @@ static void enumerate_common(char *fname, int bus_no, int host_no,
 	struct burn_drive *t;
 	struct burn_drive out;
 
+	/* Initialize pointers to managed memory */
+	out.devname = NULL;
+	out.idata = NULL;
+	out.mdata = NULL;
+
 	/* ts A60923 */
 	out.bus_no = bus_no;
 	out.host = host_no;
@@ -448,7 +453,9 @@ 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);
+	if (out.devname == NULL)
+		goto could_not_allocate;
 
 	out.cam = NULL;
 	out.lock_fd = -1;
@@ -477,7 +484,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;
@@ -492,13 +499,23 @@ 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) {
+could_not_allocate:;
 		libdax_msgs_submit(libdax_messenger, -1, 0x00020108,
 			LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
 			"Could not allocate new drive object", 0, 0);
+		if (out.devname != NULL)
+			free(out.devname);
+		out.devname = NULL;
+		if (out.idata != NULL)
+			free(out.idata);
+		out.idata = NULL;
+		if (out.mdata != NULL)
+			free(out.mdata);
+		out.mdata = NULL;
 		return;
 	}
+	out.mdata->p2a_valid = 0;
 	memset(&out.params, 0, sizeof(struct params));
 	t = burn_drive_register(&out);
 
@@ -856,13 +873,19 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 		ccb->csio.dxfer_len = 0;
 	}
 
+	/* ts B90523 : Record effective transfer length request for debugging*/
+	c->dxfer_len = ccb->csio.dxfer_len;
+
 	start_time = time(NULL);
 	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) {
@@ -959,19 +982,14 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 				c->sense[13] = 0x00;
 				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);
-			if (d->cancel)
-				done = 1;
-		} 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;
+		if (!done)
+			spc_register_retry(c);
 	} while (!done);
 	ret = 1;
 ex:;
@@ -982,7 +1000,7 @@ ex:;
 
 /* ts B00115 */
 /* Return 1 if the given path leads to a regular file or a device that can be
-   seeked, read and eventually written with 2 kB granularity.
+   fseeked, read and eventually written with 2 kB granularity.
 */
 int burn_os_is_2k_seekrw(char *path, int flag)
 {
@@ -1055,7 +1073,7 @@ int burn_os_is_2k_seekrw(char *path, int flag)
                   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)
+int burn_os_stdio_capacity(char *path, off_t write_start, off_t *bytes)
 {
 	struct stat stbuf;
 	struct statvfs vfsbuf;
@@ -1108,7 +1126,7 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
 			{ret = -2; goto ex;}
 		*bytes = add_size;
 	} else if(S_ISREG(stbuf.st_mode)) {
-		add_size = stbuf.st_blocks * (off_t) 512;
+		add_size = burn_sparse_file_addsize(write_start, &stbuf);
 		strcpy(testpath, path);
 	} else
 		{ret = 0; goto ex;}

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 - 2016 Thomas Schmitt <scdbackup@gmx.net>
    Provided under GPL version 2 or later.
 */
 
@@ -44,8 +44,8 @@ sg_initialize()         performs global initialization of the SCSI transport
                         facilities. Checks for compatibility of supporting
                         software components.
 
-sg_shutdown()           performs global finalizations and releases golbally
-                        aquired resources.
+sg_shutdown()           performs global finalizations and releases globally
+                        acquired resources.
 
 sg_give_next_adr()      iterates over the set of potentially useful drive 
                         address strings.
@@ -54,10 +54,10 @@ 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
+                        on destruction. Releases resources which were acquired
                         underneath scsi_enumerate_drives().
  
-sg_drive_is_open()      tells wether libburn has the given drive in use.
+sg_drive_is_open()      tells whether libburn has the given drive in use.
 
 sg_grab()               opens the drive for SCSI commands and ensures
                         undisturbed access.
@@ -65,7 +65,7 @@ sg_grab()               opens the drive for SCSI commands and ensures
 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
+                        and evaluates whether the command succeeded or shall
                         be retried or finally failed.
 
 sg_obtain_scsi_adr()    tries to obtain SCSI address parameters.
@@ -78,7 +78,7 @@ burn_os_is_2k_seekrw()  tells whether the given path leads to a file object
 
 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
+burn_os_open_track_src()  opens a disk file in a way that offers best
                         throughput with file reading and/or SCSI write command
                         transmission.
 
@@ -149,6 +149,11 @@ Send feedback to libburn-hackers@pykix.org .
 #include <cdio/logging.h>
 #include <cdio/mmc.h>
 
+/* ts B41126 : O_BINARY is needed for Cygwin but undefined elsewhere */
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
+
 
 /* The waiting time before eventually retrying a failed SCSI command.
    Before each retry wait Libburn_sg_linux_retry_incR longer than with
@@ -390,7 +395,7 @@ int sg_initialize(char msg[1024], int flag)
 
 
 /** Performs global finalization of the SCSI transport adapter and eventually
-    needed operating system facilities. Releases globally aquired resources.
+    needed operating system facilities. Releases globally acquired resources.
     @param flag  unused yet, submit 0
     @return      1 = success, <=0 = failure
 */ 
@@ -524,7 +529,7 @@ ex:;
 
 /** 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.
+    it is time to give up usage and reservation.
 */
 /** Published as burn_drive.drive_is_open() */
 int sg_drive_is_open(struct burn_drive * d)
@@ -604,7 +609,7 @@ int sg_release(struct burn_drive *d)
 }
 
 
-/** Sends a SCSI command to the drive, receives reply and evaluates wether
+/** Sends a SCSI command to the drive, receives reply and evaluates whether
     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
@@ -660,6 +665,9 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 		e_direction = SCSI_MMC_DATA_NONE;
 	}
 		
+	/* ts B90523 : Record effective transfer length request for debugging*/
+	c->dxfer_len = dxfer_len;
+
 	/* retry-loop */
 	start_time = time(NULL);
 	if (c->timeout > 0)
@@ -669,9 +677,12 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 	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, (unsigned char *) sense_pt,
@@ -717,9 +728,11 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 		else
 			sense_len = 0;
 		done = scsi_eval_cmd_outcome(d, c, fp,  c->sense, sense_len,
-					0, start_time, timeout_ms, i, 2);
+					     start_time, timeout_ms, i, 0);
 		if (d->cancel)
 			done = 1;
+		if (!done)
+			spc_register_retry(c);
 
 	} /* end of retry-loop */
 
@@ -755,7 +768,7 @@ int sg_obtain_scsi_adr(char *path, int *bus_no, int *host_no, int *channel_no,
 }
 
 
-/** Tells wether a text is a persistent address as listed by the enumeration
+/** Tells whether a text is a persistent address as listed by the enumeration
     functions.
 */
 int sg_is_enumerable_adr(char* adr)
@@ -832,7 +845,7 @@ static int freebsd_is_2k_seekrw(char *path, int flag)
 
 
 /* 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. 
+   fseeked, read, and possibly written with 2 kB granularity. 
 */
 int burn_os_is_2k_seekrw(char *path, int flag)
 {
@@ -862,7 +875,7 @@ int burn_os_is_2k_seekrw(char *path, int flag)
                   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)
+int burn_os_stdio_capacity(char *path, off_t write_start, off_t *bytes)
 {
 	struct stat stbuf;
 
@@ -892,7 +905,7 @@ 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;
+		int open_mode = O_RDONLY | O_BINARY, fd;
 		long blocks;
 
 		blocks = *bytes / 512;
@@ -912,7 +925,7 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
 	} else if(S_ISCHR(stbuf.st_mode)) {
 		int fd;
 
-		fd = open(path, O_RDONLY);
+		fd = open(path, O_RDONLY | O_BINARY);
 		if (fd == -1)
 			{ret = -2; goto ex;}
 		ret = ioctl(fd, DIOCGMEDIASIZE, &add_size);
@@ -926,7 +939,7 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
 #ifdef Libburn_is_on_solariS
 
 	} else if(S_ISBLK(stbuf.st_mode)) {
-		int open_mode = O_RDONLY, fd;
+		int open_mode = O_RDONLY | O_BINARY, fd;
 		
 		fd = open(path, open_mode);
 		if (fd == -1)
@@ -941,7 +954,7 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
 #endif /* Libburn_is_on_solariS */
 
 	} else if(S_ISREG(stbuf.st_mode)) {
-		add_size = stbuf.st_blocks * (off_t) 512;
+		add_size = burn_sparse_file_addsize(write_start, &stbuf);
 		strcpy(testpath, path);
 	} else
 		{ret = 0; goto ex;}
@@ -982,7 +995,7 @@ int burn_os_open_track_src(char *path, int open_flags, int flag)
 {
 	int fd;
 
-	fd = open(path, open_flags);
+	fd = open(path, open_flags | O_BINARY);
 	return fd;
 }
 

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 - 2020 Thomas Schmitt <scdbackup@gmx.net>
    Provided under GPL version 2 or later.
 */
 
@@ -50,8 +50,8 @@ sg_initialize()         performs global initialization of the SCSI transport
                         facilities. Checks for compatibility of supporting
                         software components.
 
-sg_shutdown()           performs global finalizations and releases golbally
-                        aquired resources.
+sg_shutdown()           performs global finalizations and releases globally
+                        acquired resources.
 
 sg_give_next_adr()      iterates over the set of potentially useful drive 
                         address strings.
@@ -60,10 +60,10 @@ 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
+                        on destruction. Releases resources which were acquired
                         underneath scsi_enumerate_drives().
 
-sg_drive_is_open()      tells wether libburn has the given drive in use.
+sg_drive_is_open()      tells whether libburn has the given drive in use.
 
 sg_grab()               opens the drive for SCSI commands and ensures
                         undisturbed access.
@@ -71,7 +71,7 @@ sg_grab()               opens the drive for SCSI commands and ensures
 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
+                        and evaluates whether the command succeeded or shall
                         be retried or finally failed.
 
 sg_obtain_scsi_adr()    tries to obtain SCSI address parameters.
@@ -84,7 +84,7 @@ burn_os_is_2k_seekrw()  tells whether the given path leads to a file object
 
 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
+burn_os_open_track_src()  opens a disk file in a way that offers best
                         throughput with file reading and/or SCSI write command
                         transmission.
 
@@ -111,6 +111,15 @@ Hint: You should also look into sg-freebsd-port.c, which is a younger and
 
 /** PORTING : ------- OS dependent headers and definitions ------ */
 
+#ifdef Libburn_read_o_direcT
+/* ts B91124:
+   DISABLED, because this spoils multi-track burning of cdrskin by a hard to
+   fix bug in cdrskin/cdrfifo.c
+   DO NOT ENABLE before the wait code in that source file is fixed.
+*/
+#undef Libburn_read_o_direcT
+#endif
+
 
 #ifdef Libburn_read_o_direcT
 # ifndef _GNU_SOURCE
@@ -201,7 +210,7 @@ static int linux_sg_auto_family = 1;
 
 /* Set this to 1 in order to accept any TYPE_* (see scsi/scsi.h) */
 /* But try with 0 first. There is hope via CDROM_DRIVE_STATUS. */
-/* !!! DO NOT SET TO 1 UNLESS YOU PROTECTED ALL INDISPENSIBLE DEVICES
+/* !!! DO NOT SET TO 1 UNLESS YOU PROTECTED ALL INDISPENSABLE DEVICES
        chmod -rw !!! */
 static int linux_sg_accept_any_type = 0;
 
@@ -216,15 +225,7 @@ static char linux_ata_device_family[80] = {"/dev/hd%c"};
 
 /* Set this to 1 in order to get on stderr messages from ata_enumerate()
 */
-static int linux_ata_enumerate_verbous = 0;
-
-
-/* The waiting time before eventually retrying a failed SCSI command.
-   Before each retry wait Libburn_sg_linux_retry_incR longer than with
-   the previous one.
-*/
-#define Libburn_sg_linux_retry_usleeP 100000
-#define Libburn_sg_linux_retry_incR   100000
+static int linux_ata_enumerate_verbose = 0;
 
 
 /** PORTING : ------ libburn portable headers and definitions ----- */
@@ -295,7 +296,7 @@ int mmc_function_spy(struct burn_drive *d, char * text);
 /* ------------------------------------------------------------------------ */
 
 /* ts A70413 */
-/* This finds out wether the software is running on kernel >= 2.6
+/* This finds out whether the software is running on kernel >= 2.6
 */
 static void sg_evaluate_kernel(void)
 {
@@ -313,7 +314,7 @@ static void sg_evaluate_kernel(void)
 
 
 /* ts A70314 */
-/* This installs the device file family if one was chosen explicitely
+/* This installs the device file family if one was chosen explicitly
    by burn_preset_device_open()
 */
 static void sg_select_device_family(void)
@@ -382,21 +383,33 @@ static int sg_exchange_scd_for_sr(char *fname, int flag)
 /* 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().
+   @param flag  bit0= data direction is FROM_DRIVE
 */
 static int sgio_log_cmd(unsigned char *cmd, int cmd_len, FILE *fp_in, int flag)
 {
 	FILE *fp = fp_in;
-	int ret;
+	int ret = 0;
+	int data_dir = NO_TRANSFER;
+
+	if (flag & 1)
+		data_dir = FROM_DRIVE;
 
 	/* >>> 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");
+		if (fp != NULL)
+			fprintf(fp,
+			    "\n=========================================\n");
 	}
 
-	ret = scsi_log_command(cmd, cmd_len, NO_TRANSFER, NULL, 0, fp, flag);
+	if (fp != NULL)
+		ret = scsi_log_command(cmd, cmd_len, data_dir, NULL, 0,
+					fp, flag);
 	if (fp_in == NULL && fp != NULL)
 		fclose(fp);
+	if (fp == stderr || !(burn_sg_log_scsi & 2))
+		return ret;
+	ret = scsi_log_command(cmd, cmd_len, data_dir, NULL, 0, stderr, 0);
 	return ret;
 }
 
@@ -404,13 +417,13 @@ static int sgio_log_cmd(unsigned char *cmd, int cmd_len, FILE *fp_in, int flag)
 /* 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, int duration, int flag)
+                          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);
+	                   sense, sense_len, duration, flag);
 	return ret;
 }
 
@@ -420,6 +433,7 @@ 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';
@@ -430,10 +444,13 @@ static int sgio_test(int fd)
 
 	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, s.sbp, s.sb_len_wr, s.duration, 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;
 }
 
@@ -446,6 +463,7 @@ static int sgio_inquiry_cd_drive(int fd, char *fname)
 	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);
@@ -463,9 +481,11 @@ static int sgio_inquiry_cd_drive(int fd, char *fname)
 	s.dxfer_len = 36;
 	s.usr_ptr = NULL;
 
-	sgio_log_cmd(s.cmdp, s.cmd_len, NULL, 0);
+	sgio_log_cmd(s.cmdp, s.cmd_len, NULL, 1);
 
+	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",
@@ -476,8 +496,9 @@ static int sgio_inquiry_cd_drive(int fd, char *fname)
 		goto ex;
 	}
 
-	sgio_log_reply(s.cmdp, FROM_DRIVE, buf->data, s.dxfer_len,
-                       NULL, s.sbp, s.sb_len_wr, s.duration, 0);
+	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) {
@@ -486,7 +507,8 @@ static int sgio_inquiry_cd_drive(int fd, char *fname)
 			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", s.sbp[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,
@@ -645,7 +667,7 @@ ex:;
    So libburn will by default use open(O_EXCL) first and afterwards
    as second assertion will use fcntl(F_SETLK). One lock more should not harm.
 */
-static int sg_fcntl_lock(int *fd, char *fd_name, int l_type, int verbous)
+static int sg_fcntl_lock(int *fd, char *fd_name, int l_type, int verbose)
 {
 	struct flock lockthing;
 	char msg[81];
@@ -666,7 +688,7 @@ static int sg_fcntl_lock(int *fd, char *fd_name, int l_type, int verbous)
 
 	ret = fcntl(*fd, F_SETLK, &lockthing);
 	if (ret == -1) {
-		if (verbous) {
+		if (verbose) {
 			sprintf(msg, "Device busy. Failed to fcntl-lock '%s'",
 					fd_name);
 			libdax_msgs_submit(libdax_messenger, -1, 0x00020008,
@@ -798,6 +820,88 @@ static int sg_release_siblings(int sibling_fds[],
 }
 
 
+/* ts C00806 */
+/** Urges the operating system to re-assess drive and medium state
+*/
+static int sg_os_revalidate_disc(struct burn_drive *d)
+{
+
+#ifdef Libburn_use_linux_ioctl_simul_changE
+
+/* <<< only for compiler tests */
+#ifndef CDROM_SIMUL_CHANGE
+/* # def ine CDROM_SIMUL_CHANGE 0x5332 */
+#endif
+
+#ifdef CDROM_SIMUL_CHANGE
+
+	int fd, ret;
+	long old_blocks, new_blocks;
+	char *msg = NULL;
+
+	BURN_ALLOC_MEM(msg, char, 161);
+
+	ret = ioctl(d->fd, BLKGETSIZE, &old_blocks);
+	if (ret == -1)
+		old_blocks = -1;
+
+	/* Schedule a simulated medium change event.
+	   Although the implemented ioctl cannot fail, the kernel might be too
+	   old to know it and then throw errors like ENOTTY.
+	 */
+	ret = ioctl(d->fd, CDROM_SIMUL_CHANGE, 0);
+	if (ret == -1) {
+		libdax_msgs_submit(libdax_messenger, d->global_index,
+			0x02, LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
+			"ioctl(CDROM_SIMUL_CHANGE) failed", errno, 0);
+		ret = 0; goto ex;
+	}
+	libdax_msgs_submit(libdax_messenger, d->global_index,
+		0x02, LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
+		"ioctl(CDROM_SIMUL_CHANGE) was performed", 0, 0);
+	/* Try to trigger actual device assessment by a open(2) call */
+	fd = open(d->devname, O_RDONLY | O_NDELAY);
+	if (fd == -1) {
+		libdax_msgs_submit(libdax_messenger, d->global_index,
+			0x02, LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
+		  "Failed to open device file after ioctl(CDROM_SIMUL_CHANGE)",
+			errno, 0);
+		ret = 0; goto ex;
+	}
+	close(fd);
+	ret = ioctl(d->fd, BLKGETSIZE, &new_blocks);
+	if (ret == -1) {
+		libdax_msgs_submit(libdax_messenger, d->global_index,
+			0x02, LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
+			"BLKGETSIZE failed after ioctl(CDROM_SIMUL_CHANGE)",
+			errno, 0);
+	} else if (old_blocks != new_blocks) {
+		sprintf(msg,
+		    "BLKGETSIZE indicates size change from %ld to %ld blocks",
+			old_blocks , new_blocks);
+		libdax_msgs_submit(libdax_messenger, d->global_index,
+			0x02, LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
+			msg, 0, 0);
+	}
+ex:
+	BURN_FREE_MEM(msg);
+	return ret;
+
+#else /* CDROM_SIMUL_CHANGE */
+
+	return 0;
+
+#endif /* ! CDROM_SIMUL_CHANGE */
+
+#else /* Libburn_use_linux_ioctl_simul_changE */
+
+	return 0;
+
+#endif /* ! Libburn_use_linux_ioctl_simul_changE */
+
+}
+
+
 /* ts A60926 */
 static int sg_close_drive(struct burn_drive *d)
 {
@@ -807,6 +911,9 @@ static int sg_close_drive(struct burn_drive *d)
 		return 0;
 	sg_release_siblings(d->sibling_fds, d->sibling_fnames,
 				&(d->sibling_count));
+	if(d->medium_state_changed > 0)
+		sg_os_revalidate_disc(d);
+	d->medium_state_changed = -1;
 	ret = sg_close_drive_fd(d->devname, d->global_index, &(d->fd), 0);
 	return ret;
 }
@@ -914,7 +1021,7 @@ static int is_ata_drive(char *fname, int fd_in)
 	else
 		fd = sg_open_drive_fd(fname, 1);
 	if (fd == -1) {
-		if (linux_ata_enumerate_verbous)
+		if (linux_ata_enumerate_verbose)
 			fprintf(stderr,"open failed, errno=%d  '%s'\n",
 				errno, strerror(errno));
 		return 0;
@@ -925,7 +1032,7 @@ static int is_ata_drive(char *fname, int fd_in)
 
 		/* not atapi */
 	if (!(tm.config & 0x8000) || (tm.config & 0x4000)) {
-		if (linux_ata_enumerate_verbous)
+		if (linux_ata_enumerate_verbose)
 			fprintf(stderr, "not marked as ATAPI\n");
 		if (fd_in < 0)
 			sg_close_drive_fd(fname, -1, &fd, 0);
@@ -935,7 +1042,7 @@ static int is_ata_drive(char *fname, int fd_in)
 	/* if SG_IO fails on an atapi device, we should stop trying to 
 	   use hd* devices */
 	if (sgio_test(fd) == -1) {
-		if (linux_ata_enumerate_verbous)
+		if (linux_ata_enumerate_verbose)
 		  fprintf(stderr,
 			 "FATAL: sgio_test() failed: errno=%d  '%s'\n",
 			 errno, strerror(errno));
@@ -946,7 +1053,7 @@ static int is_ata_drive(char *fname, int fd_in)
 	if (fd_in >= 0)
 		return 1;
 	if (sg_close_drive_fd(fname, -1, &fd, 1) <= 0) {
-		if (linux_ata_enumerate_verbous)
+		if (linux_ata_enumerate_verbose)
 			fprintf(stderr,
 				"cannot close properly, errno=%d  '%s'\n",
 				errno, strerror(errno));
@@ -1036,22 +1143,18 @@ static int is_scsi_drive(char *fname, int fd_in, int *bus_no, int *host_no,
 		{ret = 0; goto ex;}
 	}
 
-	if (sid_ret == -1 || sid.scsi_id < 0) {
-		/* ts A61211 : employ a more general ioctl */
-		/* 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;
-			sid.channel = *channel_no;
-			sid.scsi_id = *target_no;
-			sid.lun = *lun_no;
-		} else {
-			if (linux_sg_enumerate_debug)
-				fprintf(stderr,
-					"sg_obtain_scsi_adr_fd() failed\n");
-			{ret = 0; goto ex;}
-		}
+	/* ts A61211 : employ a more general ioctl */
+	/* ts B11001 : re-use fd */
+	/* ts B80902 : call unconditionally because host_no differs
+	               between SG_GET_SCSI_ID and SCSI_IOCTL_GET_IDLUN
+	*/
+	ret = sg_obtain_scsi_adr_fd(fname, fd, bus_no, host_no,
+				    channel_no, target_no, lun_no);
+	if (ret <= 0) {
+		if (linux_sg_enumerate_debug)
+			fprintf(stderr,
+				"sg_obtain_scsi_adr_fd() failed\n");
+		{ret = 0; goto ex;}
 	}
 
 	/* ts A60927 : trying to do locking with growisofs */
@@ -1071,16 +1174,6 @@ static int is_scsi_drive(char *fname, int fd_in, int *bus_no, int *host_no,
 		sg_release_siblings(sibling_fds, sibling_fnames,
 							&sibling_count);
 	}
-#ifdef SCSI_IOCTL_GET_BUS_NUMBER
-	if(*bus_no == -1)
-		*bus_no = 1000 * (sid.host_no + 1) + sid.channel;
-#else
-	*bus_no = sid.host_no;
-#endif
-	*host_no= sid.host_no;
-	*channel_no= sid.channel;
-	*target_no= sid.scsi_id;
-	*lun_no= sid.lun;
 	ret = 1;
 ex:;
 	if (fd_in < 0 && fd >= 0) {
@@ -1106,7 +1199,7 @@ static int sg_open_for_enumeration(char *fname, int flag)
 
 	fd = sg_open_drive_fd(fname, 1 + (flag & 1));
 	if (fd < 0) {
-		if (linux_sg_enumerate_debug || linux_ata_enumerate_verbous)
+		if (linux_sg_enumerate_debug || linux_ata_enumerate_verbose)
 			fprintf(stderr, "open failed, errno=%d  '%s'\n",
 				errno, strerror(errno));
 		return -1;
@@ -1122,7 +1215,7 @@ static void ata_enumerate(void)
 	int ret, i, fd = -1;
 	char fname[10];
 
-	if (linux_ata_enumerate_verbous)
+	if (linux_ata_enumerate_verbose)
 	  fprintf(stderr, "libburn_debug: linux_ata_device_family = %s\n",
 		  linux_ata_device_family);
 
@@ -1131,12 +1224,12 @@ static void ata_enumerate(void)
 
 	for (i = 0; i < 26; i++) {
 		sprintf(fname, linux_ata_device_family, 'a' + i);
-		if (linux_ata_enumerate_verbous)
+		if (linux_ata_enumerate_verbose)
 		  fprintf(stderr, "libburn_debug: %s : ", fname);
 
 		/* ts A51221 */
 		if (burn_drive_is_banned(fname)) {
-			if (linux_ata_enumerate_verbous)
+			if (linux_ata_enumerate_verbose)
 				fprintf(stderr, "not in whitelist\n");
 	continue;
 		}
@@ -1148,7 +1241,7 @@ static void ata_enumerate(void)
 	break;
 		if (ret == 0)
 	continue;
-		if (linux_ata_enumerate_verbous)
+		if (linux_ata_enumerate_verbose)
 		  fprintf(stderr, "accepting as drive without SCSI address\n");
 		enumerate_common(fname, fd, -1, -1, -1, -1, -1);
 	}
@@ -1412,7 +1505,7 @@ static int add_proc_info_drives(int flag)
 	char **list= NULL;
 
 	if (burn_sg_use_family != 0)
-		return(1); /* Looking only for sr resp. scd resp. sg */
+		return(1); /* Looking only for sr , scd , sg */
 
 	ret = proc_sys_dev_cdrom_info(&list, &list_count, 0);
 	if (ret <= 0)
@@ -1521,7 +1614,7 @@ int sg_initialize(char msg[1024], int flag)
 
 
 /** Performs global finalization of the SCSI transport adapter and eventually
-    needed operating system facilities. Releases globally aquired resources.
+    needed operating system facilities. Releases globally acquired resources.
     @param flag  unused yet, submit 0
     @return      1 = success, <=0 = failure
 */  
@@ -1615,6 +1708,8 @@ next_ata:;
 
 next_proc_info:;
 	baseno += ata_limit;
+	if (burn_sg_use_family != 0) /* Only with default enumeration */
+		return 0;
 	for (i = 0; i < idx->info_count; i++) {
 		if ((idx->info_list)[i][0] == 0)
 	continue;
@@ -1650,7 +1745,7 @@ return_1_pre_proc:;
     and accessability. If burn activities are prone to external interference
     on your system it is also necessary to obtain exclusive access locks on
     the drives.
-    Hand over each accepted drive to enumerate_common() resp. its replacement
+    Hand over each accepted drive to enumerate_common() or its replacement
     within your port.
 
     See FreeBSD port sketch sg-freebsd-port.c for such an implementation.
@@ -1674,9 +1769,9 @@ int scsi_enumerate_drives(void)
 }
 
 
-/** Tells wether libburn has the given drive in use or exclusively reserved.
+/** 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.
+    it is time to give up usage and reservation.
 */
 /** Published as burn_drive.drive_is_open() */
 int sg_drive_is_open(struct burn_drive * d)
@@ -1729,7 +1824,7 @@ int sg_grab(struct burn_drive *d)
 	/* ts A60813 - A60822
 	   After enumeration the drive fd is probably still open.
 	   -1337 is the initial value of burn_drive.fd and the value after
-	   relase of drive. Unclear why not the official error return
+	   release 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];
@@ -1854,7 +1949,7 @@ drive_is_in_use:;
 }
 
 
-/** PORTING: Is mainly about the call to sg_close_drive() and wether it
+/** 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.
@@ -1878,8 +1973,181 @@ 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;
 
-/** Sends a SCSI command to the drive, receives reply and evaluates wether
+	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_NOTE;
+		libdax_msgs_submit(libdax_messenger, d->global_index,
+			0x000201a7, sev, LIBDAX_MSGS_PRIO_HIGH, msg, 0, 0);
+		strcpy(msg, "Command: ");
+		if (spc_human_readable_cmd(c, msg + strlen(msg),
+					   160 - strlen(msg), 0) > 0)
+			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";
+	break; 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_NOTE;
+		libdax_msgs_submit(libdax_messenger, d->global_index,
+			0x000201a8, sev, LIBDAX_MSGS_PRIO_HIGH, msg, 0, 0);
+		strcpy(msg, "Command: ");
+		if (spc_human_readable_cmd(c, msg + strlen(msg),
+					   160 - strlen(msg), 0) > 0)
+			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 whether
     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
@@ -1917,8 +2185,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) {
@@ -1926,8 +2192,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';
 
@@ -1959,6 +2228,26 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 		s.timeout = Libburn_scsi_default_timeouT;
 	if (c->page && !no_c_page) {
 		s.dxferp = c->page->data;
+
+/* # def ine Libburn_debug_dxferP 1 */
+#ifdef Libburn_debug_dxferP
+
+		{ char text[1024], *content; int i = c->page->bytes;
+			if (c->dir == FROM_DRIVE) {
+				for (i = 0; i < c->page->bytes && c->page->data[i] == 0; i++);
+				content = (i <  c->page->bytes) ?
+					  "  (some nonzero)" : "  (all zero)";
+			} else {
+				i = c->page->bytes;
+				content = "";
+			}
+			sprintf(text, "dxferp before = %lx%s",
+					(unsigned long) s.dxferp, content);
+			scsi_log_text(text, fp, 0);
+		}
+
+#endif
+
 		if (c->dir == FROM_DRIVE) {
 
 			/* ts A70519 : kernel 2.4 usb-storage seems to
@@ -1988,12 +2277,30 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 	}
 	s.usr_ptr = c;
 
+	/* ts B90523 : Record effective transfer length request for debugging*/
+	c->dxfer_len = s.dxfer_len;
+
 	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);
+
+
+#ifdef Libburn_debug_dxferP
+		if (c->page && !no_c_page) {
+			char text[1024];
+			sprintf(text, "dxferp after  = %lx",
+					(unsigned long) s.dxferp);
+			scsi_log_text(text, fp, 0);
+		}
+
+#endif
+
 		/* ts A61010 */
 		/* a ssert(err != -1); */
 		if (err == -1) {
@@ -2002,32 +2309,53 @@ 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);
+
+			libdax_msgs_submit(libdax_messenger,
+				 d->global_index, 0x0002010c,
+				 LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
+				 msg, 0, 0);
+			sprintf(msg, "Attempted command: ");
+			spc_human_readable_cmd(c, msg + strlen(msg),
+					       160 - strlen(msg), 0);
+			libdax_msgs_submit(libdax_messenger,
+				 d->global_index, 0x0002010c,
+				 LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
+				 msg, 0, 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)
-			done = 1;
+	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 (!done) {
+			spc_register_retry(c);
+			if (burn_sg_log_scsi & 3) {
+				scsi_log_text("+++ Repeating command", fp, 0);
+				scsi_log_cmd(c, fp, 0);
+			}
+		}
 	}
 
-	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);
@@ -2050,7 +2378,7 @@ static int sg_obtain_scsi_adr_fd(char *path, int fd_in,
 	};
  	struct my_scsi_idlun idlun;
 
-	/* valgrind called idlun unitialized because it is blind for ioctl */
+	/* valgrind called idlun uninitialized because it is blind for ioctl */
 	idlun.x = 0;
 	idlun.host_unique_id = 0;
 
@@ -2119,7 +2447,7 @@ int sg_obtain_scsi_adr(char *path, int *bus_no, int *host_no, int *channel_no,
 
 
 /* ts A60922 ticket 33 : called from drive.c */
-/** Tells wether a text is a persistent address as listed by the enumeration
+/** Tells whether a text is a persistent address as listed by the enumeration
     functions.
 */
 int sg_is_enumerable_adr(char *adr)
@@ -2150,7 +2478,7 @@ ex:;
 
 /* ts B00115 */
 /* 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. 
+   fseeked, read, and possibly written with 2 kB granularity. 
 */
 int burn_os_is_2k_seekrw(char *path, int flag)
 {
@@ -2177,7 +2505,7 @@ int burn_os_is_2k_seekrw(char *path, int flag)
                   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)
+int burn_os_stdio_capacity(char *path, off_t write_start, off_t *bytes)
 {
 	struct stat stbuf;
 	struct statvfs vfsbuf;
@@ -2188,7 +2516,6 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
 
 	BURN_ALLOC_MEM(testpath, char, 4096);
 	testpath[0] = 0;
-	blocks = *bytes / 512;
 	if (stat(path, &stbuf) == -1) {
 		strcpy(testpath, path);
 		cpt = strrchr(testpath, '/');
@@ -2210,7 +2537,7 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
 			{ret = -2; goto ex;}
 		*bytes = ((off_t) blocks) * (off_t) 512;
 	} else if(S_ISREG(stbuf.st_mode)) {
-		add_size = stbuf.st_blocks * (off_t) 512;
+		add_size = burn_sparse_file_addsize(write_start, &stbuf);
 		strcpy(testpath, path);
 	} else
 		{ret = 0; goto ex;}

libburn/sg-netbsd.c

@@ -0,0 +1,916 @@
+/* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */
+
+/*
+   Copyright (c) 2010 - 2016 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.
+   Adapted 2016 to OpenBSD by help of SASANO Takayoshi <uaa@mx5.nisiq.net>.
+
+*/
+
+
+/*
+
+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
+                        OpenBSD 5.9, ioctl SCIOCCOMMAND
+
+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 globally
+                        acquired 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 acquired
+                        underneath scsi_enumerate_drives().
+ 
+sg_drive_is_open()      tells whether 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 whether 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 offers 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/OpenBSD ioctl 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)
+{
+#ifdef __OpenBSD__
+	sprintf(msg, "internal OpenBSD SCIOCCOMMAND adapter sg-netbsd");
+#else
+	sprintf(msg, "internal NetBSD SCIOCCOMMAND adapter sg-netbsd");
+#endif
+	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 acquired 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 and 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 whether
+    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;
+	}
+
+	/* ts B90523 : Record effective transfer length request for debugging*/
+	c->dxfer_len = req.datalen;
+
+	/* 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;
+		if (!done)
+			spc_register_retry(c);
+	} /* 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;}
+
+#ifdef __OpenBSD__
+
+	*bus_no = *host_no = addr.scbus;
+	*target_no = addr.target;
+	*lun_no = addr.lun;
+
+#else /* __OpenBSD__ */
+
+	*bus_no = *host_no = addr.addr.scsi.scbus;
+	*target_no = addr.addr.scsi.target;
+	*lun_no = addr.addr.scsi.lun;
+
+#endif /* ! __OpenBSD__ */
+
+	ret = 1;
+ex:;
+	if (fd != -1)
+		close(fd);
+	return (0);
+}
+
+
+/** Tells whether 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
+   fseeked, 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];
+
+	/* >>> ??? 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;
+		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 write_start, 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 = burn_sparse_file_addsize(write_start, &stbuf);
+		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 - 2016 Thomas Schmitt <scdbackup@gmx.net>
    Provided under GPL version 2 or later.
 */
 
@@ -44,8 +44,8 @@ sg_initialize()         performs global initialization of the SCSI transport
                         facilities. Checks for compatibility of supporting
                         software components.
 
-sg_shutdown()           performs global finalizations and releases golbally
-                        aquired resources.
+sg_shutdown()           performs global finalizations and releases globally
+                        acquired resources.
 
 sg_give_next_adr()      iterates over the set of potentially useful drive 
                         address strings.
@@ -54,10 +54,10 @@ 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
+                        on destruction. Releases resources which were acquired
                         underneath scsi_enumerate_drives().
  
-sg_drive_is_open()      tells wether libburn has the given drive in use.
+sg_drive_is_open()      tells whether libburn has the given drive in use.
 
 sg_grab()               opens the drive for SCSI commands and ensures
                         undisturbed access.
@@ -65,7 +65,7 @@ sg_grab()               opens the drive for SCSI commands and ensures
 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
+                        and evaluates whether the command succeeded or shall
                         be retried or finally failed.
 
 sg_obtain_scsi_adr()    tries to obtain SCSI address parameters.
@@ -78,7 +78,7 @@ burn_os_is_2k_seekrw()  tells whether the given path leads to a file object
 
 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
+burn_os_open_track_src()  opens a disk file in a way that offers best
                         throughput with file reading and/or SCSI write command
                         transmission.
 
@@ -116,6 +116,7 @@ Send feedback to libburn-hackers@pykix.org .
 #include <sys/statvfs.h>
 #endif /* Libburn_os_has_stavtfS */
 
+#include <volmgt.h>
 #include <sys/dkio.h>
 #include <sys/vtoc.h>
 
@@ -200,13 +201,13 @@ static int decode_btl_number(char **cpt, int stopper, int *no)
 }
 
 
-/* Read bus, target, lun from name "cXtYdZs2".
+/* Read bus, target, lun from name "cXtYdZs2" or "cXtYdZ/...".
    Return 0 if name is not of the desired form.
 */
 static int decode_btl_solaris(char *name, int *busno, int *tgtno, int *lunno,
                         int flag)
 {
-  char *cpt;
+  char *cpt, *cpt_mem;
   int ret;
 
   *busno = *tgtno = *lunno = -1;
@@ -219,9 +220,15 @@ static int decode_btl_solaris(char *name, int *busno, int *tgtno, int *lunno,
   ret = decode_btl_number(&cpt, 'd', tgtno);
   if (ret <= 0)
     return ret;
+  cpt_mem = cpt;
   ret = decode_btl_number(&cpt, 's', lunno);
-  if (ret <= 0)
-    return ret;
+  if (ret <= 0) {
+    cpt = cpt_mem;
+    ret = decode_btl_number(&cpt, '/', lunno);
+    if (ret <= 0)
+      return ret;
+    return(1);
+  }
   cpt++;
   if (*cpt != '2' || *(cpt + 1) != 0)
     return 0;
@@ -247,16 +254,64 @@ static int start_enum_cXtYdZs2(burn_drive_enumerator_t *idx, int flag)
 }
 
 
+static int sg_solaris_convert_devname(char *path, char **dev_to_open, int flag)
+{
+	char *sym_name = NULL, *media_name = NULL, *curr_name, *msg = NULL;
+	int ret;
+
+	BURN_ALLOC_MEM(msg, char, 4096);
+
+	BURN_FREE_MEM(*dev_to_open);
+	*dev_to_open = NULL;
+	curr_name = path;
+
+	if (! volmgt_running())
+		goto set_name;
+	sym_name = volmgt_symname(path); 
+	sprintf(msg, "Volume Management symbolic name: '%s' -> %s",
+			path, sym_name == NULL ? "NULL" : sym_name);
+	libdax_msgs_submit(libdax_messenger, -1,
+			0x00000002,
+			LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
+			msg, 0, 0);
+	if (sym_name != NULL)
+		media_name = media_findname(sym_name);
+	else
+		media_name = media_findname(path);
+	if (media_name != NULL)
+		curr_name = media_name;
+	sprintf(msg, "Media name: %s -> %s",
+			sym_name == NULL ? path : sym_name,
+			media_name == NULL ? "NULL" : media_name);
+	libdax_msgs_submit(libdax_messenger, -1,
+			0x00000002,
+			LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
+			msg, 0, 0);
+set_name:
+	BURN_ALLOC_MEM(*dev_to_open, char, strlen(curr_name) + 1);
+	strcpy(*dev_to_open, curr_name);
+	ret = 1;
+ex:
+	if (media_name != NULL)
+		free(media_name);
+	if (sym_name != NULL)
+		free(sym_name);
+	BURN_FREE_MEM(msg);
+	return(ret);
+}
+
+
 static int next_enum_cXtYdZs2(burn_drive_enumerator_t *idx,
 				char adr[], int adr_size, int flag)
 { 
-	int busno, tgtno, lunno, ret, fd = -1, volpath_size = 160;
-	char *volpath = NULL;
+	int busno, tgtno, lunno, ret, fd = -1, volpath_size = 160, os_errno;
+	char *volpath = NULL, *msg = NULL, *dev_to_open = NULL;
 	struct dirent *entry;
 	struct dk_cinfo cinfo;
 	DIR *dir;
 
 	BURN_ALLOC_MEM(volpath, char, volpath_size);
+	BURN_ALLOC_MEM(msg, char, 4096);
 
 	dir = idx->dir;
 	while (1) {
@@ -282,25 +337,68 @@ static int next_enum_cXtYdZs2(burn_drive_enumerator_t *idx,
 
 		sprintf(volpath, "/dev/rdsk/%s", entry->d_name);
 		if (burn_drive_is_banned(volpath))
-	continue; 
-
-		fd = open(volpath, O_RDONLY | O_NDELAY);
-		if (fd < 0)
 	continue;
+		ret = sg_solaris_convert_devname(volpath, &dev_to_open, 0);
+		if (ret <= 0)
+	continue;
+		fd = open(dev_to_open, O_RDONLY | O_NDELAY);
+		if (fd < 0) {
+			os_errno = errno;
+			sprintf(msg, "Could not open '%s' , errno = %d",
+				dev_to_open, os_errno);
+			libdax_msgs_submit(libdax_messenger, -1,
+				0x00000002,
+				LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
+				msg, os_errno, 0);
+	continue;
+		}
 		/* See man dkio */
 		ret = ioctl(fd, DKIOCINFO, &cinfo);
 		close(fd);
-		if (ret < 0)
+		if (ret < 0) {
+			os_errno = errno;
+			sprintf(msg,
+			   "ioctl(DKIOCINFO) failed on drive '%s', errno = %d",
+				volpath, os_errno);
+			libdax_msgs_submit(libdax_messenger, -1,
+				0x00000002,
+				LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
+				msg, os_errno, 0);
 	continue;
-		if (cinfo.dki_ctype != DKC_CDROM)
+		}
+		if (cinfo.dki_ctype != DKC_CDROM) {
+			sprintf(msg,
+				"ioctl(DKIOCINFO) classifies drive '%s' as dki_ctype %ld, not as DKC_CDROM = %ld",
+				volpath, (long int) cinfo.dki_ctype,
+				(long int) DKC_CDROM);
+			libdax_msgs_submit(libdax_messenger, -1,
+				0x00000002,
+				LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
+				msg, 0, 0);
 	continue;
-		if (adr_size <= (int) strlen(volpath))
+		}
+		if (adr_size <= (int) strlen(volpath)) {
+			sprintf(msg,
+				"Device path '%s' too long. (Max. %d)",
+				volpath, adr_size - 1);
+			libdax_msgs_submit(libdax_messenger, -1,
+				0x00000002,
+				LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
+				msg, 0, 0);
 			{ret = -1; goto ex;}
+		}
 		strcpy(adr, volpath);
+		sprintf(msg, "Accepted as valid drive '%s'", volpath);
+		libdax_msgs_submit(libdax_messenger, -1,
+				0x00000002,
+				LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
+				msg, 0, 0);
 		{ret = 1; goto ex;}
 	}
 	ret = 0;
 ex:;
+	BURN_FREE_MEM(dev_to_open);
+	BURN_FREE_MEM(msg);
 	BURN_FREE_MEM(volpath);
 	return ret;
 }
@@ -399,7 +497,7 @@ int sg_initialize(char msg[1024], int flag)
 
 
 /** Performs global finalization of the SCSI transport adapter and eventually
-    needed operating system facilities. Releases globally aquired resources.
+    needed operating system facilities. Releases globally acquired resources.
     @param flag  unused yet, submit 0
     @return      1 = success, <=0 = failure
 */ 
@@ -492,7 +590,7 @@ ex:;
 
 /** 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.
+    it is time to give up usage and reservation.
 */
 /** Published as burn_drive.drive_is_open() */
 int sg_drive_is_open(struct burn_drive * d)
@@ -509,7 +607,7 @@ int sg_drive_is_open(struct burn_drive * d)
 */  
 int sg_grab(struct burn_drive *d)
 {
-	char *msg = NULL;
+	char *msg = NULL, *dev_to_open = NULL;
 	int os_errno, ret;
 	struct dk_cinfo cinfo;
 
@@ -519,10 +617,16 @@ int sg_grab(struct burn_drive *d)
 		d->released = 0;
 		{ret = 1; goto ex;}
 	}
-	d->fd = open(d->devname, O_RDONLY | O_NDELAY);
+	ret = sg_solaris_convert_devname(d->devname, &dev_to_open, 0);
+	if (ret <= 0)
+		goto ex;
+	d->fd = open(dev_to_open, O_RDONLY | O_NDELAY);
 	if (d->fd == -1) {
 		os_errno = errno;
-		sprintf(msg, "Could not grab drive '%s'", d->devname);
+		sprintf(msg, "Could not grab drive '%s'",
+			d->devname);
+		if (strcmp(d->devname, dev_to_open))
+			sprintf(msg + strlen(msg), " via '%s'", dev_to_open);
 		libdax_msgs_submit(libdax_messenger, d->global_index,
 			0x00020003,
 			LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
@@ -530,10 +634,27 @@ int sg_grab(struct burn_drive *d)
 		{ret = 0; goto ex;}
 	}
 	ret = ioctl(d->fd, DKIOCINFO, &cinfo);
-	if (ret < 0)
+	if (ret < 0) {
+		os_errno = errno;
+		sprintf(msg, "ioctl(DKIOCINFO) failed on drive '%s'",
+			d->devname);
+		libdax_msgs_submit(libdax_messenger, d->global_index,
+			0x00000002,
+			LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
+			msg, os_errno, 0);
 		goto revoke;
-	if (cinfo.dki_ctype != DKC_CDROM)
+	}
+	if (cinfo.dki_ctype != DKC_CDROM) {
+		sprintf(msg,
+			"ioctl(DKIOCINFO) classifies drive '%s' as dki_ctype %ld, not as DKC_CDROM = %ld",
+			d->devname, (long int) cinfo.dki_ctype,
+			(long int) DKC_CDROM);
+		libdax_msgs_submit(libdax_messenger, d->global_index,
+			0x00000002,
+			LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
+			msg, 0, 0);
 		goto revoke;
+	}
 
 	/* >>> obtain eventual locks */;
 
@@ -548,6 +669,7 @@ revoke:;
 			msg, 0, 0);
 	ret = 0;
 ex:;
+	BURN_FREE_MEM(dev_to_open);
 	BURN_FREE_MEM(msg);
 	return ret;
 }
@@ -568,7 +690,7 @@ int sg_release(struct burn_drive *d)
 }
 
 
-/** Sends a SCSI command to the drive, receives reply and evaluates wether
+/** Sends a SCSI command to the drive, receives reply and evaluates whether
     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
@@ -632,13 +754,20 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 	cgc.uscsi_rqlen = sizeof(c->sense);
 	cgc.uscsi_rqbuf = (caddr_t) c->sense;
 
+	/* ts B90523 : Record effective transfer length request for debugging*/
+	c->dxfer_len = cgc.uscsi_buflen;
+
 	/* 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, 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
@@ -669,10 +798,12 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 			sense_len = 18;
 		else
 			sense_len = 0;
-		done = scsi_eval_cmd_outcome(d, c, fp, c->sense, sense_len, 0,
-						start_time, timeout_ms, i, 2);
+		done = scsi_eval_cmd_outcome(d, c, fp, c->sense, sense_len,
+						start_time, timeout_ms, i, 0);
 		if (d->cancel)
 			done = 1;
+		if (!done)
+			spc_register_retry(c);
 					
 	} /* end of retry-loop */
 
@@ -706,7 +837,7 @@ int sg_obtain_scsi_adr(char *path, int *bus_no, int *host_no, int *channel_no,
 }
 
 
-/** Tells wether a text is a persistent address as listed by the enumeration
+/** Tells whether a text is a persistent address as listed by the enumeration
     functions.
 */
 
@@ -755,7 +886,7 @@ int sg_is_enumerable_adr(char* adr)
 
 
 /* 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. 
+   fseeked, read, and possibly written with 2 kB granularity. 
 */
 int burn_os_is_2k_seekrw(char *path, int flag)
 {
@@ -781,7 +912,7 @@ int burn_os_is_2k_seekrw(char *path, int flag)
                   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)
+int burn_os_stdio_capacity(char *path, off_t write_start, off_t *bytes)
 {
 	struct stat stbuf;
 	int ret;
@@ -822,7 +953,7 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
 		}
 
 	} else if(S_ISREG(stbuf.st_mode)) {
-		add_size = stbuf.st_blocks * (off_t) 512;
+		add_size = burn_sparse_file_addsize(write_start, &stbuf);
 		strcpy(testpath, path);
 	} else
 		{ret = 0; goto ex;}

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 - 2016 Thomas Schmitt <scdbackup@gmx.net>, 
    provided under GPLv2+
 */
 
@@ -20,6 +20,16 @@
 
 #include "sg-libcdio.c"
 
+#else
+#ifdef __NetBSD__
+
+#include "sg-netbsd.c"
+
+#else
+#ifdef __OpenBSD__
+
+#include "sg-netbsd.c"
+
 #else
 #ifdef __FreeBSD__
 
@@ -58,11 +68,13 @@
 static int intentional_compiler_warning(void)
 {
  int INTENTIONAL_COMPILER_WARNING_;
- int Cannot_recognize_GNU_Linux_nor_FreeBSD_nor_Solaris_;
+ int Cannot_recognize_supported_operating_system_;
+ int Like_GNU_Linux_or_FreeBSD_or_Solaris_or_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_nor_Solaris;
+ int Like_GNU_Linux_or_FreeBSD_or_Solaris_or_NetBSD;
+ int Cannot_recognize_supported_operating_system;
  int INTENTIONAL_COMPILER_WARNING;
 
  return(0);
@@ -74,6 +86,8 @@ static int intentional_compiler_warning(void)
 #endif /* ! __linux */
 #endif /* ! __FreeBSD_kernel__ */
 #endif /* ! __FreeBSD__ */
+#endif /* ! __OpenBSD__ */
+#endif /* ! __NetBSD__ */
 #endif /* ! Libburn_use_libcdiO */
 #endif /* ! Libburn_use_sg_dummY */
 

libburn/sg.h

@@ -36,7 +36,7 @@ int sg_drive_is_open(struct burn_drive * d);
 
 int burn_os_is_2k_seekrw(char *path, int flag);
 
-int burn_os_stdio_capacity(char *path, off_t *bytes);
+int burn_os_stdio_capacity(char *path, off_t write_start, off_t *bytes);
 
 /* ts A91227 */
 /** Returns the id string of the SCSI transport adapter and eventually
@@ -62,7 +62,7 @@ int sg_initialize(char msg[1024], int flag);
 
 /* ts A91227 */
 /** Performs global finalization of the SCSI transport adapter and eventually
-    needed operating system facilities. Releases globally aquired resources.
+    needed operating system facilities. Releases globally acquired resources.
     @param flag  unused yet, submit 0
     @return      1 = success, <=0 = failure
 */

libburn/spc.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 - 2012 Thomas Schmitt <scdbackup@gmx.net>
+   Copyright (c) 2006 - 2019 Thomas Schmitt <scdbackup@gmx.net>
    Provided under GPL version 2 or later.
 */
 
@@ -33,6 +33,7 @@
 #include "debug.h"
 #include "options.h"
 #include "init.h"
+#include "util.h"
 
 #include "libdax_msgs.h"
 extern struct libdax_msgs *libdax_messenger;
@@ -58,6 +59,10 @@ static unsigned char SPC_MODE_SELECT[] = { 0x55, 16, 0, 0, 0, 0, 0, 0, 0, 0 };
 static unsigned char SPC_REQUEST_SENSE[] = { 0x03, 0, 0, 0, 18, 0 };
 static unsigned char SPC_TEST_UNIT_READY[] = { 0x00, 0, 0, 0, 0, 0 };
 
+#ifdef Libburn_enable_scsi_cmd_ABh
+static unsigned char SPC_READ_MEDIA_SERIAL_NUMBER[] =
+				{ 0xAB, 0x01, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
+#endif
 
 /* ts A70519 : An initializer for the abstract SCSI command structure */
 int scsi_init_command(struct command *c, unsigned char *opcode, int oplen)
@@ -70,10 +75,16 @@ int scsi_init_command(struct command *c, unsigned char *opcode, int oplen)
 	c->dir = NO_TRANSFER;
 	c->dxfer_len = -1;
 	memset(c->sense, 0, sizeof(c->sense));
+	c->sense_len = 0;
 	c->error = 0;
 	c->retry = 0;
 	c->page = NULL;
 	c->timeout = Libburn_scsi_default_timeouT;
+	c->start_time = c->end_time = 0.0;
+	c->retry_count = 0;
+	c->last_retry_key = 0;
+	c->last_retry_asc = 0;
+	c->last_retry_ascq = 0;
 	return 1;
 }
 
@@ -123,7 +134,7 @@ int spc_test_unit_ready_r(struct burn_drive *d, int *key, int *asc, int *ascq,
 		    ((c->sense[2] & 0x0f) == 0 || (c->sense[2] & 0x0f) == 2) &&
 		    (c->sense[15] & 0x80))
 			*progress = (c->sense[16] << 8) + c->sense[17];
-		return (key == 0);
+		return (*key == 0);
 	}
 	return 1;
 }
@@ -148,14 +159,20 @@ int spc_wait_unit_attention(struct burn_drive *d, int max_sec, char *cmd_text,
 	int i, ret = 1, key = 0, asc = 0, ascq = 0, clueless_start = 0;
 	static double tests_per_second = 2.0;
 	int sleep_usecs, loop_limit, clueless_timeout, progress;
-	char *msg = NULL;
+	char *msg = NULL, *cmd_name = NULL, *cmd_cpt;
 	unsigned char sense[14];
 
 	BURN_ALLOC_MEM(msg, char, 320);
+	BURN_ALLOC_MEM(cmd_name, char, 320);
 	clueless_timeout = 5 * tests_per_second + 1;
 	loop_limit = max_sec * tests_per_second + 1;
 	sleep_usecs = 1000000 / tests_per_second;
 
+	strcpy(cmd_name, cmd_text);
+	cmd_cpt = strchr(cmd_name, ':');
+	if (cmd_cpt != NULL)
+		*cmd_cpt = 0;
+
 	if (!(flag & 1))
 		usleep(sleep_usecs);
 
@@ -178,14 +195,14 @@ int spc_wait_unit_attention(struct burn_drive *d, int max_sec, char *cmd_text,
 */
 	break;
 			}
-			if (key == 0x6 && asc == 0x28 && ascq == 0x00)
-				/* media change notice = try again */
+			if (key == 0x6 && asc == 0x28)
+				/* medium change notice or alike = try again */
 				goto slumber;
 
 handle_error:;
 			/* ts A90213 */
 			sprintf(msg,
-				"Asynchronous SCSI error on %s: ", cmd_text);
+				"Asynchronous SCSI error on %s: ", cmd_name);
 			sense[0] = 0x70; /* Fixed format sense data */
 			sense[2] = key;
 			sense[12] = asc;
@@ -196,6 +213,14 @@ handle_error:;
 				0x0002014d,
 				LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
 				msg, 0, 0);
+			if (cmd_cpt != NULL) {
+				sprintf(msg, "Attempted SCSI CDB: %s",
+					cmd_cpt + 1);
+				libdax_msgs_submit(libdax_messenger,
+				  d->global_index, 0x0002014d,
+				  LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
+				  msg, 0, 0);
+			}
 			d->cancel = 1;
 	break;
 		} else if (ascq == 0x00) { /* CAUSE NOT REPORTABLE */
@@ -209,6 +234,16 @@ handle_error:;
 				  LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
 				  "Ended clueless NOT READY cycle",
 				  0, 0);
+				if (cmd_cpt != NULL) {
+					sprintf(msg, "Attempted SCSI CDB: %s",
+						cmd_cpt + 1);
+					libdax_msgs_submit(libdax_messenger,
+					  d->global_index,
+					  0x00000002,
+					  LIBDAX_MSGS_SEV_DEBUG,
+					  LIBDAX_MSGS_PRIO_HIGH,
+					  msg, 0, 0);
+				}
 				ret = 1; /* medium not present = ok */
 	break;
 			}
@@ -220,7 +255,7 @@ slumber:;
 	}
 	if (ret <= 0 || !(flag & 2)) {
 		sprintf(msg, "Async %s %s after %d.%d seconds",
-			cmd_text, (ret > 0 ? "succeeded" : "failed"),
+			cmd_name, (ret > 0 ? "succeeded" : "failed"),
 			i / 10, i % 10);
 		libdax_msgs_submit(libdax_messenger, d->global_index,
 			 0x00020150, LIBDAX_MSGS_SEV_DEBUG,
@@ -231,12 +266,19 @@ slumber:;
 		{ret = (ret > 0); goto ex;}
 
 	sprintf(msg, "Timeout (%d s) with asynchronous SCSI command %s\n",
-	 	max_sec, cmd_text);
+	 	max_sec, cmd_name);
 	libdax_msgs_submit(libdax_messenger, d->global_index, 0x0002014f,
 		LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH, msg, 0, 0);
+	if (cmd_cpt != NULL) {
+		sprintf(msg, "Attempted SCSI CDB: %s", cmd_cpt + 1);
+		libdax_msgs_submit(libdax_messenger, d->global_index,
+			0x0002014f, LIBDAX_MSGS_SEV_SORRY,
+			LIBDAX_MSGS_PRIO_HIGH, msg, 0, 0);
+	}
 	ret = 0;
 ex:;
 	BURN_FREE_MEM(msg);
+	BURN_FREE_MEM(cmd_name);
 	return ret;
 }
 
@@ -260,7 +302,34 @@ void spc_request_sense(struct burn_drive *d, struct buffer *buf)
 	d->issue_command(d, c);
 }
 
-/* @return -2 = drive is ready , -1 = not ready, but no progress reported
+static int spc_report_async_error(struct burn_drive *d,
+                                  int key, int asc, int ascq, int flag)
+{
+	char *msg = NULL;
+	unsigned char sense[14];
+	int ret;
+
+	BURN_ALLOC_MEM(msg, char, BURN_DRIVE_ADR_LEN + 160);
+
+	sprintf(msg, "Asynchronous SCSI error : ");
+	sense[0] = 0x70; /* Fixed format sense data */
+	sense[2] = key;
+	sense[12] = asc;
+	sense[13] = ascq;
+	scsi_error_msg(d, sense, 14, msg + strlen(msg), &key, &asc, &ascq);
+	libdax_msgs_submit(libdax_messenger, d->global_index,
+				0x000201a5,
+				LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
+				msg, 0, 0);
+	ret = 1;
+ex:;
+	BURN_FREE_MEM(msg);
+	return ret;
+}
+
+/* @return -3 = other error reported
+           -2 = drive is ready ,
+           -1 = not ready, but no progress reported ,
            >= 0 progress indication between 0 and 65535
 */
 int spc_get_erase_progress(struct burn_drive *d)
@@ -278,6 +347,14 @@ int spc_get_erase_progress(struct burn_drive *d)
 	ret = spc_test_unit_ready_r(d, &key, &asc, &ascq, &progress);
 	if (ret > 0)
 		{ret = -2; goto ex;}
+
+	/* Check key, asc, ascq for errors other than "not yet ready" */
+	if (key != 0 &&
+	    (key != 0x2 || asc != 0x04 || ascq == 0x02 || ascq ==0x03)) {
+		spc_report_async_error(d, key, asc, ascq, 0);
+		ret= -3; goto ex;
+	}
+
 	if (progress >= 0)
 		{ret = progress; goto ex;}
 
@@ -316,6 +393,8 @@ void spc_inquiry(struct burn_drive *d)
 	c->dir = FROM_DRIVE;
 	d->issue_command(d, c);
 	id = (struct burn_scsi_inquiry_data *)d->idata;
+	id->peripheral = 0x7f; /* SPC-3: incabable undefined peripheral type */
+	id->version = 0;                  /* SPC-3: no claim for conformance */
 	memset(id->vendor, 0, 9);
 	memset(id->product, 0, 17);
 	memset(id->revision, 0, 5);
@@ -323,6 +402,8 @@ void spc_inquiry(struct burn_drive *d)
 		id->valid = -1;
 		goto ex;
 	}
+	id->peripheral = ((char *) c->page->data)[0];
+	id->version = ((char *) c->page->data)[2];
 	memcpy(id->vendor, c->page->data + 8, 8);
 	memcpy(id->product, c->page->data + 16, 16);
 	memcpy(id->revision, c->page->data + 32, 4);
@@ -366,10 +447,39 @@ void spc_allow(struct burn_drive *d)
 	d->issue_command(d, c);
 }
 
+
+/* ts B40216 : Outsourced from spc_sense_caps_al().
+               To be called by spc_sense_caps() after spc_sense_caps_al()
+*/
+static int spc_try_get_performance(struct burn_drive *d, int flag)
+{
+	int ret;
+	struct burn_feature_descr *feature_descr;
+
+	/* ts B40107 : Feature 0x107 announces availability of GET PERFORMANCE
+	               Its WSPD bit announces Type 3.
+	               Try this even if the feature is not current.
+	*/
+	ret = burn_drive_has_feature(d, 0x107, &feature_descr, 0);
+	if (ret <= 0)
+		return ret;
+	if (feature_descr->data_lenght <= 0)
+		return 1;
+	if (feature_descr->data[0] & 2)             /* WSPD */
+		ret = mmc_get_write_performance(d);
+	/* Get read performance */
+	mmc_get_performance(d, 0x00, 0);
+	return 1;
+}
+
+
 /*
 ts A70518 - A90603 : Do not call with *alloc_len < 10
 */
-/** flag&1= do only inquire alloc_len */
+/** @param flag bit0= do only inquire alloc_len
+    @return  1=ok , <=0 error ,
+             2=Block Descriptor Length > 0, retry with flag bit1
+*/
 static int spc_sense_caps_al(struct burn_drive *d, int *alloc_len, int flag)
 {
 	struct buffer *buf = NULL;
@@ -393,7 +503,7 @@ static int spc_sense_caps_al(struct burn_drive *d, int *alloc_len, int flag)
 
 	/* ts A90602 : Clearing mdata before command execution */
 	m = d->mdata;
-	m->valid = 0;
+	m->p2a_valid = 0;
 	burn_mdata_free_subs(m);
 
 	memset(buf, 0, sizeof(struct buffer));
@@ -410,7 +520,7 @@ static int spc_sense_caps_al(struct burn_drive *d, int *alloc_len, int flag)
 	d->issue_command(d, c);
 	if (c->error) {
 		memset(buf, 0, sizeof(struct buffer));
-		m->valid = -1;
+		m->p2a_valid = -1;
 		was_error = 1;
 	}
 
@@ -419,6 +529,22 @@ static int spc_sense_caps_al(struct burn_drive *d, int *alloc_len, int flag)
 	*/
 	block_descr_len = c->page->data[6] * 256 + c->page->data[7];
 
+	if (block_descr_len + 8 + 2 > *alloc_len) {
+		if (block_descr_len + 8 + 2 > BUFFER_SIZE || !(flag & 1)) {
+			m->p2a_valid = -1;
+			sprintf(msg,
+		 "MODE SENSE page 2A with oversized Block Descriptors: %s : %d",
+				d->devname, block_descr_len);
+			libdax_msgs_submit(libdax_messenger, d->global_index,
+				0x0002016e, LIBDAX_MSGS_SEV_DEBUG,
+				LIBDAX_MSGS_PRIO_LOW, msg, 0, 0);
+			{ret = 0; goto ex;}
+
+		}
+		*alloc_len = block_descr_len + 10;
+		{ret = 2; goto ex;}
+	}
+
 	/* Skip over Mode Data Header and block descriptors */
 	page = c->page->data + 8 + block_descr_len;
 
@@ -437,7 +563,7 @@ static int spc_sense_caps_al(struct burn_drive *d, int *alloc_len, int flag)
 	*/
 	page_length = page[1];
 	old_alloc_len = *alloc_len;
-	*alloc_len = page_length + 10;
+	*alloc_len = page_length + 10 + block_descr_len;
 	if (flag & 1)
 		{ret = !was_error; goto ex;}
 	if (page_length + 10 > old_alloc_len)
@@ -446,7 +572,7 @@ static int spc_sense_caps_al(struct burn_drive *d, int *alloc_len, int flag)
 	/* ts A90602 : page_length N asserts page[N+1]. (see SPC-1 8.3.3) */
 	/* ts B11031 : qemu drive has a page_length of 18 */
 	if (page_length < 18) {
-		m->valid = -1;
+		m->p2a_valid = -1;
 		sprintf(msg, "MODE SENSE page 2A too short: %s : %d",
 			d->devname, page_length);
 		libdax_msgs_submit(libdax_messenger, d->global_index,
@@ -488,13 +614,11 @@ static int spc_sense_caps_al(struct burn_drive *d, int *alloc_len, int flag)
 	m->max_end_lba = 0;
 
 	if (!was_error)
-		m->valid = 1;
-
-	mmc_get_configuration(d);
+		m->p2a_valid = 1;
 
 	/* ts A61225 : end of MMC-1 , begin of MMC-3 */
 	if (page_length < 30) /* no write speed descriptors ? */
-		goto try_mmc_get_performance;
+		goto no_speed_descriptors;
 
 	m->cur_write_speed = page[28] * 256 + page[29];
 
@@ -548,24 +672,7 @@ static int spc_sense_caps_al(struct burn_drive *d, int *alloc_len, int flag)
 	"LIBBURN_DEBUG: 5Ah,2Ah min_write_speed = %d , max_write_speed = %d\n",
 		m->min_write_speed, m->max_write_speed);
 
-try_mmc_get_performance:;
-	if (m->cdrw_write || page_length >= 32) {
-		/* ts A90823:
-		   One has to avoid U3 enhanced memory sticks here. On my
-		   SuSE 10.2 a SanDisk Cruzer 4GB stalls at the second occasion
-		   of ACh GET PERFORMANCE. (The first one is obviously called
-		   by the OS at plug time.)
-		   This pseudo drive returns no write capabilities and a page
-		   length of 28. MMC-3 describes page length 32. Regrettably
-		   MMC-2 prescribes a page length of 26. Here i have to trust
-		   m->cdrw_write to reliably indicate any MMC-2 burner.
-		*/
-		ret = mmc_get_write_performance(d);
-		if (ret > 0 && speed_debug)
-			fprintf(stderr,
-	  "LIBBURN_DEBUG: ACh min_write_speed = %d , max_write_speed = %d\n",
-			m->min_write_speed, m->max_write_speed);
-	}
+no_speed_descriptors:;
 
 	ret = !was_error;
 ex:
@@ -584,13 +691,19 @@ void spc_sense_caps(struct burn_drive *d)
 	if (mmc_function_spy(d, "sense_caps") <= 0)
 		return;
 
+	mmc_get_configuration(d);
+
 	/* first command execution to learn Allocation Length */
 	alloc_len = start_len;
 	ret = spc_sense_caps_al(d, &alloc_len, 1);
-/*
-	fprintf(stderr,"LIBBURN_DEBUG: 5Ah alloc_len = %d , ret = %d\n",
-			alloc_len, ret);
-*/
+	if (ret == 2) {
+		/* ts B40205: Unexpectedly found Block Descriptors.
+		              Repeat with new alloc_len.
+		*/
+		ret = spc_sense_caps_al(d, &alloc_len, 1);
+		if (ret == 2)
+			goto try_get_performance;
+	}
 	/* ts B11103:
 	   qemu ATAPI DVD-ROM delivers only 28.
 	   SanDisk Cruzer U3 memory stick throws error on alloc_len < 30.
@@ -599,6 +712,9 @@ void spc_sense_caps(struct burn_drive *d)
 	if (alloc_len >= minimum_len && ret > 0)
 		/* second execution with announced length */
 		spc_sense_caps_al(d, &alloc_len, 0);
+
+try_get_performance:;
+	spc_try_get_performance(d, 0);
 }
 
 
@@ -628,7 +744,6 @@ void spc_sense_error_params(struct burn_drive *d)
 	c->page->sectors = 0;
 	c->dir = FROM_DRIVE;
 	d->issue_command(d, c);
-
 	m = d->mdata;
 	page = c->page->data + 8;
 	d->params.retries = page[3];
@@ -654,6 +769,8 @@ void spc_select_error_params(struct burn_drive *d,
 	
 	scsi_init_command(c, SPC_MODE_SELECT, sizeof(SPC_MODE_SELECT));
 	c->retry = 1;
+	if (d->mdata->retry_page_valid <= 0)
+		d->mdata->retry_page_length = 0;
 	c->opcode[8] = 8 + 2 + d->mdata->retry_page_length;
 	c->page = buf;
 	c->page->bytes = 0;
@@ -713,9 +830,11 @@ void spc_sense_write_params(struct burn_drive *d)
 	if (!c->error) {
 		page = c->page->data + 8;
 		m->write_page_length = page[1];
-		m->write_page_valid = 1;
-	} else
-		m->write_page_valid = 0;
+		if (m->write_page_length > 0)
+			m->write_page_valid = 1;
+		else
+			m->write_page_length = 0x32;
+	}
 	mmc_read_disc_info(d);
 
 	/* ts A70212 : try to setup d->media_capacity_remaining */
@@ -813,6 +932,109 @@ ex:;
 	BURN_FREE_MEM(c);
 }
 
+
+#ifdef Libburn_enable_scsi_cmd_ABh
+
+/* At least on Linux kernel 3.16 the command ABh causes EFAULT if not sent
+   from the superuser.
+   For a test it may be replaced by a dummy 28h READ12 on block 0.
+   This causes no EFAULT although it sets the wrong dxfer_len 4 rather
+   than 2048. So it is indeed a permission problem and not bad alignment.
+*/
+
+/* ts B51016 */
+int spc_read_media_serial_number_al(struct burn_drive *d, int *alloc_len)
+{
+	struct buffer *buf = NULL;
+	struct command *c = NULL;
+	unsigned char *data;
+	int ret;
+
+	if (*alloc_len < 4)
+		{ret = 0; goto ex;}
+
+	BURN_ALLOC_MEM(buf, struct buffer, 1);
+	BURN_ALLOC_MEM(c, struct command, 1);
+	if (mmc_function_spy(d, "spc_read_media_serial_number") <= 0)
+		{ret = 0; goto ex;}
+/*
+ #de fine Spc_read_media_serial_number_dummY yes
+*/
+#ifdef Spc_read_media_serial_number_dummY
+
+{
+static unsigned char MMC_READ_12[] =
+                                 { 0x28, 0,  0, 0, 0, 0,  0, 0, 0, 1,  0, 0 };
+
+        scsi_init_command(c, MMC_READ_12, sizeof(MMC_READ_12));
+        c->dxfer_len = *alloc_len;
+}
+
+#else
+
+	scsi_init_command(c, SPC_READ_MEDIA_SERIAL_NUMBER,
+			 sizeof(SPC_READ_MEDIA_SERIAL_NUMBER));
+	c->dxfer_len = *alloc_len;
+	/* (Will not accept more than 32 KB anyway) */
+	c->opcode[8] = (c->dxfer_len >> 8) & 0xff;
+	c->opcode[9] = c->dxfer_len & 0xff;
+
+#endif /* ! Spc_read_media_serial_number_dummY */
+
+	c->retry = 1;
+	c->page = buf;
+	memset(c->page->data, 0, *alloc_len);
+	c->page->bytes = 0;
+	c->page->sectors = 0;
+
+	c->dir = FROM_DRIVE;
+	d->issue_command(d, c);
+
+	if (c->error)
+		{ret = 0; goto ex;}
+
+	data = c->page->data;
+
+#ifdef Spc_read_media_serial_number_dummY
+	d->media_serial_number_len = 0;
+#else
+	d->media_serial_number_len =
+		(data[0] << 24) | (data[1] << 16) | (data[2] << 8) | data[7];
+#endif
+
+	if (*alloc_len >= d->media_serial_number_len + 4) {
+		if (d->media_serial_number != NULL)
+			BURN_FREE_MEM(d->media_serial_number);
+		BURN_ALLOC_MEM(d->media_serial_number, char,
+				d->media_serial_number_len + 1);
+		if (d->media_serial_number_len > 0)
+			memcpy(d->media_serial_number, data + 4,
+				d->media_serial_number_len);
+		d->media_serial_number[d->media_serial_number_len] = 0;
+	}
+
+	*alloc_len = d->media_serial_number_len + 4;
+	ret = 1;
+ex:;
+	BURN_FREE_MEM(c);
+	BURN_FREE_MEM(buf);
+	return ret;
+}
+
+
+int spc_read_media_serial_number(struct burn_drive *d)
+{
+	int alloc_len = 4, ret;
+
+	ret = spc_read_media_serial_number_al(d, &alloc_len);
+	if (alloc_len > 4 && alloc_len <= 0x8000 && ret > 0)
+		ret = spc_read_media_serial_number_al(d, &alloc_len);
+	return ret;
+}
+
+#endif /* Libburn_enable_scsi_cmd_ABh */
+
+
 void spc_getcaps(struct burn_drive *d)
 {
 	if (mmc_function_spy(d, "getcaps") <= 0)
@@ -834,7 +1056,7 @@ void spc_probe_write_modes(struct burn_drive *d)
 	struct buffer *buf = NULL;
 	int try_write_type = 1;
 	int try_block_type = 0;
-	int key, asc, ascq, useable_write_type = -1, useable_block_type = -1;
+	int key, asc, ascq, usable_write_type = -1, usable_block_type = -1;
 	int last_try = 0;
 	struct command *c = NULL;
 
@@ -849,11 +1071,11 @@ void spc_probe_write_modes(struct burn_drive *d)
 	while (try_write_type != 5) {
 		/* ts A70213 */
 		if (try_write_type == 4) {
-			/* Pseudo write type NONE . Set a useable write mode */
-			if (useable_write_type == -1)
+			/* Pseudo write type NONE . Set a usable write mode */
+			if (usable_write_type == -1)
 	break;
-			try_write_type = useable_write_type;
-			try_block_type = useable_block_type;
+			try_write_type = usable_write_type;
+			try_block_type = usable_block_type;
 			last_try= 1;
 		}
 
@@ -896,12 +1118,12 @@ void spc_probe_write_modes(struct burn_drive *d)
 					1 << try_block_type;
 
 			/* ts A70213 */
-			if ((useable_write_type < 0 && try_write_type > 0) ||
+			if ((usable_write_type < 0 && try_write_type > 0) ||
 			    (try_write_type == 1 && try_block_type == 8)) {
 			 	/* Packet is not supported yet.
 				   Prefer TAO MODE_1. */
-				useable_write_type = try_write_type;
-				useable_block_type = try_block_type;
+				usable_write_type = try_write_type;
+				usable_block_type = try_block_type;
 			} 
 		}
 		switch (try_block_type) {
@@ -1003,6 +1225,9 @@ int burn_scsi_setup_drive(struct burn_drive *d, int bus_no, int host_no,
 	/* ts A61106 */
 	d->silent_on_scsi_error = 0;
 
+	/* ts B21023 */
+	d->had_particular_error = 0;
+
 
 	d->idata = calloc(1, sizeof(struct burn_scsi_inquiry_data));
 	d->mdata = calloc(1, sizeof(struct scsi_mode_data));
@@ -1015,8 +1240,14 @@ int burn_scsi_setup_drive(struct burn_drive *d, int bus_no, int host_no,
 		return -1;
 	}
 	d->idata->valid = 0;
-	d->mdata->valid = 0;
+	d->mdata->p2a_valid = 0;
+	d->mdata->max_read_speed = 0;
+	d->mdata->cur_read_speed = 0;
+	d->mdata->max_write_speed = 0;
+	d->mdata->cur_write_speed = 0;
 	d->mdata->speed_descriptors = NULL;
+	d->mdata->write_page_length = 0x32;
+	d->mdata->write_page_valid = 0;
 	if (!(flag & 1)) {
 		ret = spc_setup_drive(d);
 		if (ret<=0)
@@ -1215,21 +1446,28 @@ enum response scsi_error_msg(struct burn_drive *d, unsigned char *sense,
 	case 0x28:
 		if (*ascq == 0)
 			sprintf(msg, "Medium may have changed");
+		else if (*ascq == 1)
+			sprintf(msg, "Import or export element accessed");
 		else if (*ascq == 2)
 			sprintf(msg, "Format layer may have changed");
+		else if (*ascq == 3)
+			sprintf(msg,
+			     "Import/export element accessed, medium changed");
+		else if (*key == 6)
+			sprintf(msg, "Unknown ASCQ with drive event ASC 28");
 		else
 			break;
 		goto return_retry;
 	case 0x29:
 		if (*ascq == 0)
 			sprintf(msg,
-                               "Power on, reset, or bus device reset occured");
+                              "Power on, reset, or bus device reset occurred");
 		else if (*ascq == 1)
-			sprintf(msg, "Power on occured");
+			sprintf(msg, "Power on occurred");
 		else if (*ascq == 2)
-			sprintf(msg, "Bus reset occured");
+			sprintf(msg, "Bus reset occurred");
 		else if (*ascq == 3)
-			sprintf(msg, "Bus device reset function occured");
+			sprintf(msg, "Bus device reset function occurred");
 		else if (*ascq == 4)
 			sprintf(msg, "Device internal reset");
 		else
@@ -1265,6 +1503,16 @@ enum response scsi_error_msg(struct burn_drive *d, unsigned char *sense,
 				"Cannot format medium, incompatible medium");
 		else if (*ascq == 7)
 			sprintf(msg, "Cleaning failure");
+		else if (*ascq == 8)
+			sprintf(msg,
+                                "Cannot write, application code mismatch");
+		else if (*ascq == 9)
+			sprintf(msg, "Current session not fixated for append");
+		else if (*ascq == 10)
+			sprintf(msg, "Medium not formatted");
+		else if (*ascq == 11)
+			sprintf(msg,
+                            "Cannot write medium, unsupported medium version");
 		else
 			break;
 		goto return_fail;
@@ -1276,6 +1524,12 @@ enum response scsi_error_msg(struct burn_drive *d, unsigned char *sense,
 		else
 			break;
 		goto return_fail;
+	case 0x32:
+		if (*ascq == 0)
+			sprintf(msg, "No defect spare location available");
+		else
+			break;
+		goto return_fail;
 	case 0x3A:
 		if (*ascq == 0)
 			sprintf(msg, "Medium not present");
@@ -1303,6 +1557,14 @@ enum response scsi_error_msg(struct burn_drive *d, unsigned char *sense,
 		else
 			break;
 		goto return_fail;
+	case 0x51:
+		if (*ascq == 0)
+			sprintf(msg, "Erase failure");
+		else if (*ascq == 1)
+			sprintf(msg, "Erase failure. Incomplete erase operation");
+		else
+			break;
+		goto return_fail;
 	case 0x57:
 		if (*ascq == 0)
 			sprintf(msg, "Unable to recover Table-of-Content");
@@ -1326,6 +1588,28 @@ enum response scsi_error_msg(struct burn_drive *d, unsigned char *sense,
 		else
 			break;
 		goto return_fail;
+	case 0x6F:
+		if (*ascq == 0)
+			sprintf(msg, "Copy protection key exchange failure – Authentication failure");
+		else if (*ascq == 1)
+			sprintf(msg, "Copy protection key exchange failure – Key not present");
+		else if (*ascq == 2)
+			sprintf(msg, "Copy protection key exchange failure – Key not established");
+		else if (*ascq == 3)
+			sprintf(msg, "Read of scrambled sector without authentication");
+		else if (*ascq == 4)
+			sprintf(msg, "Media region code is mismatched to logical unit region");
+		else if (*ascq == 5)
+			sprintf(msg, "Logical unit region must be permanent / Region reset count error");
+		else if (*ascq == 6)
+			sprintf(msg, "Insufficient block count for binding nonce recording");
+		else if (*ascq == 7)
+			sprintf(msg, "Conflict in binding nonce recording");
+		else if (*ascq == 8)
+			sprintf(msg, "Insufficient permission");
+		else
+			break;
+		goto return_fail;
 	case 0x72:
 		if (*ascq == 0)
 			sprintf(msg, "Session fixation error");
@@ -1453,21 +1737,94 @@ static char *scsi_command_name(unsigned int c, int flag)
 		return "BLANK";
         case 0xaa:
 		return "WRITE(12)";
+        case 0xab:
+		return "READ MEDIA SERIAL NUMBER";
         case 0xac:
 		return "GET PERFORMANCE";
         case 0xad:
 		return "READ DISC STRUCTURE";
         case 0xb6:
 		return "SET STREAMING";
+        case 0xb9:
+		return "READ CD MSF";
         case 0xbb:
 		return "SET CD SPEED";
         case 0xbe:
 		return "READ CD";
+
+#ifdef Libburn_develop_quality_scaN
+
+        case 0xf3:
+		return "NEC/OPTIARC REPORT ERROR RATE";
+
+#endif /* Libburn_develop_quality_scaN */
+
 	}
 	return "(NOT IN LIBBURN COMMAND LIST)";
 }
 
 
+/* ts B90206: Avoid publishing more inner API functions which begin by scsi_ */
+char *spc_command_name(unsigned int c, int flag)
+{
+	return(scsi_command_name(c, flag));
+}
+
+
+/* ts B90616 */
+void spc_register_retry(struct command *c)
+{
+	c->retry_count++;
+	spc_decode_sense(c->sense, c->sense_len, &c->last_retry_key,
+			 &c->last_retry_asc, &c->last_retry_ascq);
+}
+
+
+/* ts B90511 */
+/* @param flag  bit0= do not prepend command name
+                bit1= do not append dxfer_len
+*/
+int spc_human_readable_cmd(struct command *c, char *msg, int msg_max, int flag)
+{
+	int j, l, lname;
+
+	if ((flag & 1) && c->retry_count <= 0) {
+		msg[0] = 0;
+	} else {
+		if (msg_max < 60)
+			return -1;
+		strcpy(msg, spc_command_name( (unsigned int) c->opcode[0], 0));
+		if (c->retry_count > 0) {
+			sprintf(msg + strlen(msg), " #%d", c->retry_count + 1);
+			if (c->last_retry_key > 0)
+				sprintf(msg + strlen(msg), ",[%X %2.2X %2.2X]",
+					c->last_retry_key, c->last_retry_asc,
+					c->last_retry_ascq);
+		}
+		strcat(msg, " : ");
+	}
+	lname = l = strlen(msg);
+	for (j = 0; j < 16 && j < c->oplen; j++) {
+		if (l > msg_max - 3) {
+			if (msg_max - 4 >= lname) {
+				l = msg_max - 4;
+				sprintf(msg + strlen(msg), "... ");
+			}
+			return 0;
+		}
+		sprintf(msg + l, "%2.2x ", c->opcode[j]);
+		l += 3;
+	}
+	if (c->dir != NO_TRANSFER && c->page != NULL && !(flag & 2)) {
+		if (l > msg_max - 24)
+			return 0;
+		sprintf(msg + l, " : dxfer_len= %d", c->dxfer_len);
+		l = strlen(msg);
+	}
+	return 1;
+}
+
+
 /* ts A61030 - A61115 */
 /* @param flag bit0= do report conditions which are considered not an error
                bit1= report with severity FAILURE rather than DEBUG
@@ -1478,7 +1835,7 @@ int scsi_notify_error(struct burn_drive *d, struct command *c,
 	int key= -1, asc= -1, ascq= -1, ret;
 	char *msg = NULL, *scsi_msg = NULL;
 
-	if (d->silent_on_scsi_error)
+	if (d->silent_on_scsi_error == 1 || d->silent_on_scsi_error == 2)
 		{ret = 1; goto ex;}
 
 	BURN_ALLOC_MEM(msg, char, 320);
@@ -1503,8 +1860,18 @@ int scsi_notify_error(struct burn_drive *d, struct command *c,
 		scsi_command_name((unsigned int) c->opcode[0], 0));
 	strcat(msg, scsi_msg);
 	ret = libdax_msgs_submit(libdax_messenger, d->global_index, 0x0002010f,
-		flag & 2 ? LIBDAX_MSGS_SEV_FAILURE : LIBDAX_MSGS_SEV_DEBUG,
-		LIBDAX_MSGS_PRIO_HIGH, msg,0,0);
+		(flag & 2) && d->silent_on_scsi_error != 3 ?
+		  LIBDAX_MSGS_SEV_FAILURE : LIBDAX_MSGS_SEV_DEBUG,
+		LIBDAX_MSGS_PRIO_HIGH, msg, 0, 0);
+	strcpy(msg, "CDB= ");
+	if (spc_human_readable_cmd(c, msg + strlen(msg), 320 - strlen(msg), 1)
+	    > 0) {
+		libdax_msgs_submit(libdax_messenger, d->global_index,
+			0x0002010f,
+			(flag & 2) && d->silent_on_scsi_error != 3 ?
+			LIBDAX_MSGS_SEV_FAILURE : LIBDAX_MSGS_SEV_DEBUG,
+			LIBDAX_MSGS_PRIO_HIGH, msg, 0, 0);
+	}
 ex:;
 	BURN_FREE_MEM(msg);
 	BURN_FREE_MEM(scsi_msg);
@@ -1532,12 +1899,12 @@ int scsi_show_command(unsigned char *opcode, int oplen, int dir,
 	if (flag & 1)
 		return 1;
 	if (opcode[0] == 0x2A) { /* WRITE 10 */
-		if (flag & 2)
+		if ((flag & 2) && oplen > 8)
 			fprintf(fp, "%d -> %d\n",
 				(opcode[7] << 8) | opcode[8], 
 				mmc_four_char_to_int(opcode + 2));
 	} else if (opcode[0] == 0xAA) { /* WRITE 12 */
-		if (flag & 2)
+		if ((flag & 2) && oplen > 9)
 			fprintf(fp, "%d -> %d\n",
 				mmc_four_char_to_int(opcode + 6),
 				mmc_four_char_to_int(opcode + 2));	
@@ -1576,7 +1943,7 @@ int scsi_show_command_reply(unsigned char *opcode, int data_dir,
 	if (data_dir != FROM_DRIVE)
 		return 2;
 	if (opcode[0] == 0x28 || opcode[0] == 0x3C ||
-	    opcode[0] == 0xA8 || opcode[0] == 0xBE) {
+	    opcode[0] == 0xA8 || opcode[0] == 0xB9 || opcode[0] == 0xBE) {
 							/* READ commands */
 		/* >>> report amount of data */;
 
@@ -1612,6 +1979,24 @@ int scsi_log_command(unsigned char *opcode, int oplen, int data_dir,
 }
 
 
+/* ts B40731 */ 
+/* Arbitrary SCSI log message */
+int scsi_log_text(char *text, void *fp_in, int flag)
+{
+	FILE *fp = fp_in;
+
+	if (fp != NULL && (fp == stderr || (burn_sg_log_scsi & 1))) {
+		fprintf(fp, "%s\n", text);
+		if (burn_sg_log_scsi & 4)
+			fflush(fp);
+	}
+	if (fp == stderr || !(burn_sg_log_scsi & 2))
+		return 1;
+	fprintf(stderr, "%s\n", text);
+	return 1;
+}
+
+
 /* ts A91218 (former sg_log_cmd ts A70518) */ 
 /** Logs command (before execution) */
 int scsi_log_cmd(struct command *c, void *fp_in, int flag)
@@ -1636,9 +2021,8 @@ int scsi_log_cmd(struct command *c, void *fp_in, int flag)
 */
 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, int duration, int flag)
+		   int sense_len, double duration, int flag)
 {
-	char durtxt[20];
 	FILE *fp = fp_in;
 	int key, asc, ascq, i, l;
 
@@ -1647,27 +2031,25 @@ int scsi_log_reply(unsigned char *opcode, int data_dir, unsigned char *data,
 			l = 18;
 			if ((sense[0] & 0x7f) == 0x72 ||
 			    (sense[0] & 0x7f) == 0x73)
-				l = sense[7] + 7 + 1; /* SPC-5 4.5.2. */
+				l = sense[7] + 7 + 1; /* SPC-3 4.5.2. */
 			if (l > sense_len)
 				l = sense_len;
 			fprintf(fp, "+++ sense data =");
 			for (i = 0 ; i < l; i++)
 				fprintf(fp, " %2.2X", sense[i]);
 			fprintf(fp, "\n");
-			durtxt[0] = 0;
-			if (!(flag & 2))
-  				sprintf(durtxt, "   (%6d ms)", duration);
 			spc_decode_sense(sense, 0, &key, &asc, &ascq);
-  			fprintf(fp, "+++ key=%X  asc=%2.2Xh  ascq=%2.2Xh%s\n",
+  			fprintf(fp, "+++ key=%X  asc=%2.2Xh  ascq=%2.2Xh\n",
 				(unsigned int) key, (unsigned int) asc,
-				(unsigned int) ascq, durtxt);
+				(unsigned int) ascq);
 		} else {
 			scsi_show_command_reply(opcode, data_dir, data,
 			                        dxfer_len, fp, 0);
-
-			if (!(flag & 2))
-				fprintf(fp,"%6d ms\n", duration);
 		}
+		if (!(flag & 2))
+			fprintf(fp, " %8.f us     [ %.f ]\n",
+			        duration * 1.0e6,
+			        (burn_get_time(0) - lib_start_time) * 1.0e6);
 		if (burn_sg_log_scsi & 4)
 			fflush(fp);
 	}
@@ -1685,19 +2067,38 @@ int scsi_log_reply(unsigned char *opcode, int data_dir, unsigned char *data,
     @param flag  bit0 causes an error message
                  bit1 do not print duration
 */
-int scsi_log_err(struct command *c, void *fp_in, unsigned char sense[18],
-		 int sense_len, int duration, int flag)
+int scsi_log_err(struct burn_drive *d, struct command *c,
+                 void *fp_in, unsigned char sense[18],
+		 int sense_len, int flag)
 {
 	int ret;
 	unsigned char *data = NULL;
 
 	if (c->page != NULL)
 		data = c->page->data;
+
 	ret= scsi_log_reply(c->opcode, c->dir, data, c->dxfer_len ,
-	                    fp_in, sense, sense_len, duration, flag);
+	                    fp_in, sense, sense_len,
+	                    c->end_time - c->start_time, flag);
 	return ret;
 }
 
+/* ts B31112 */
+int scsi_log_message(struct burn_drive *d, void *fp_in, char * msg, int flag)
+{
+	int ret;
+	FILE *fp = fp_in;
+
+      	if (fp != NULL && (fp == stderr || (burn_sg_log_scsi & 1))) {
+		fprintf(fp, "%s\n", msg);
+		if (burn_sg_log_scsi & 4)
+			fflush(fp);
+	}
+	if (fp == stderr || !(burn_sg_log_scsi & 2))
+		return 1;
+	ret = scsi_log_message(d, stderr, msg, flag);
+	return ret;
+}
 
 /* ts B00808 */
 /*
@@ -1707,7 +2108,7 @@ int scsi_log_err(struct command *c, void *fp_in, unsigned char sense[18],
 */
 int scsi_eval_cmd_outcome(struct burn_drive *d, struct command *c, void *fp,
 			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)
 {
 	enum response outcome;
@@ -1715,8 +2116,10 @@ int scsi_eval_cmd_outcome(struct burn_drive *d, struct command *c, void *fp,
 	char *msg = NULL;
 
 	if (burn_sg_log_scsi & 3)
-		scsi_log_err(c, fp, sense, sense_len, duration,
+		scsi_log_err(d, c, fp, sense, sense_len,
 				 (sense_len > 0) | (flag & 2));
+	if (sense == c->sense)
+		c->sense_len = sense_len;
 	if (sense_len <= 0)
 		{done = 1; goto ex;}
 		
@@ -1748,6 +2151,13 @@ int scsi_eval_cmd_outcome(struct burn_drive *d, struct command *c, void *fp,
 				0x0002018a,
 				LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
 				msg, 0, 0);
+			strcpy(msg, "Command: ");
+			if (spc_human_readable_cmd(c, msg + strlen(msg),
+						   320 - strlen(msg), 0) > 0)
+				libdax_msgs_submit(libdax_messenger,
+					d->global_index, 0x0002018a, 
+					LIBDAX_MSGS_SEV_SORRY,
+					LIBDAX_MSGS_PRIO_HIGH, msg, 0, 0);
 			goto err_ex;
 		}
 		if (d->cancel)
@@ -1773,3 +2183,34 @@ ex:;
 	BURN_FREE_MEM(msg);
 	return done;
 }
+
+
+int spc_confirm_cd_drive(struct burn_drive *d, int flag)
+{
+	char *msg = NULL;
+	int ret;
+
+	BURN_ALLOC_MEM(msg, char, strlen(d->devname) + 1024); 
+
+	spc_inquiry(d);
+	if (d->idata->valid < 0) {
+		sprintf(msg, "INQUIRY failed with drive '%s'", d->devname);
+		libdax_msgs_submit(libdax_messenger, -1, 0x0002000a,
+		                   LIBDAX_MSGS_SEV_FAILURE,
+		                   LIBDAX_MSGS_PRIO_HIGH, msg, 0,0);
+		ret = 0; goto ex;
+	}
+	if (d->idata->peripheral != 0x5) {
+		sprintf(msg, "Does not identify itself as CD-ROM drive '%s'",
+		             d->devname);
+		libdax_msgs_submit(libdax_messenger, -1, 0x0002000a,
+		                   LIBDAX_MSGS_SEV_FAILURE,
+		                   LIBDAX_MSGS_PRIO_HIGH, msg, 0,0);
+		ret = 0; goto ex;
+	}
+	ret = 1;
+ex:;
+	BURN_FREE_MEM(msg);
+	return ret;
+}
+

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 - 2012 Thomas Schmitt <scdbackup@gmx.net>
+   Copyright (c) 2006 - 2019 Thomas Schmitt <scdbackup@gmx.net>
    Provided under GPL version 2 or later.
 */
 
@@ -23,6 +23,11 @@ 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 *);
+
+#ifdef Libburn_enable_scsi_cmd_ABh
+int spc_read_media_serial_number(struct burn_drive *d);
+#endif
+
 void spc_probe_write_modes(struct burn_drive *);
 void spc_request_sense(struct burn_drive *d, struct buffer *buf);
 int spc_block_type(enum burn_block_types b);
@@ -76,6 +81,10 @@ int scsi_log_command(unsigned char *opcode, int oplen, int data_dir,
                      unsigned char *data, int bytes,
                      void *fp_in, int flag);
 
+/* ts B40731 */
+/* Arbitrary SCSI log message */
+int scsi_log_text(char *text, void *fp_in, int flag);
+
 /* ts A91218 (former sg_log_cmd ts A70518) */
 /** Legacy frontend to scsi_log_command() */
 int scsi_log_cmd(struct command *c, void *fp, int flag);
@@ -87,20 +96,34 @@ int scsi_log_cmd(struct command *c, void *fp, int flag);
 */
 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, int duration, int flag);
+                   int sense_len, double duration, int flag);
 
 /* ts A91221 (former sg_log_err ts A91108) */
 /** Legacy frontend to scsi_log_reply().
     @param flag  bit0 causes an error message
                  bit1 do not print duration
 */
-int scsi_log_err(struct command *c, void *fp, unsigned char sense[18], 
-                 int sense_len, int duration, int flag);
+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,
                      int *key, int *asc, int *ascq);
 
+/* ts B90206 */
+char *spc_command_name(unsigned int c, int flag);
+
+/* ts B90511 */
+int spc_human_readable_cmd(struct command *c, char *msg, int msg_max,
+                           int flag);
+
+/* ts B90616 */
+void spc_register_retry(struct command *c);
+
 /* ts B00808 */
 /** Evaluates outcome of a single SCSI command, eventually logs sense data,
     and issues DEBUG error message in case the command is evaluated as done.
@@ -109,9 +132,14 @@ 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
@@ -138,17 +166,23 @@ int scsi_eval_cmd_outcome(struct burn_drive *d, struct command *c, void *fp_in,
 /* RESERVE TRACK */
 #define Libburn_mmc_reserve_timeouT          200000
 
-/* CLOSE TRACK/SESSION (with Immed bit) */
+/* CLOSE TRACK/SESSION with Immed bit */
 #define Libburn_mmc_close_timeouT            200000
+/* CLOSE TRACK/SESSION without Immed bit */
+#define Libburn_mmc_close_noim_timeouT      3600000
 
-/* BLANK , FORMAT UNIT (with Immed bit) */
+/* BLANK , FORMAT UNIT with Immed bit */
 #define Libburn_mmc_blank_timeouT            200000
+/* BLANK , FORMAT UNIT without Immed bit */
+#define Libburn_mmc_blank_noim_timeouT     18000000
 
 /* SEND OPC INFORMATION */
 #define Libburn_mmc_opc_timeouT              200000
 
-/* MMC_SYNC_CACHE */
+/* MMC_SYNC_CACHE with Immed bit */
 #define Libburn_mmc_sync_timeouT             200000
+/* MMC_SYNC_CACHE without Immed bit */
+#define Libburn_mmc_sync_noim_timeouT       3600000
 
 /* START STOP UNIT with Start bit and Load bit set */
 #define Libburn_mmc_load_timeouT             300000

libburn/structure.c

@@ -1,6 +1,6 @@
 
 /* Copyright (c) 2004 - 2006 Derek Foreman, Ben Jansens
-   Copyright (c) 2006 - 2012 Thomas Schmitt <scdbackup@gmx.net>
+   Copyright (c) 2006 - 2021 Thomas Schmitt <scdbackup@gmx.net>
    Provided under GPL version 2 or later.
 */
 
@@ -21,6 +21,11 @@
 #include <unistd.h>
 #include <errno.h>
 
+/* ts B41126 : O_BINARY is needed for Cygwin but undefined elsewhere */
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
+
 #include "libburn.h"
 #include "structure.h"
 #include "write.h"
@@ -29,6 +34,7 @@
 #include "util.h"
 #include "transport.h"
 #include "mmc.h"
+#include "drive.h"
 
 #include "libdax_msgs.h"
 extern struct libdax_msgs *libdax_messenger;
@@ -65,6 +71,11 @@ struct burn_disc *burn_disc_create(void)
 	d->refcnt = 1;
 	d->sessions = 0;
 	d->session = NULL;
+
+#ifdef Libburn_disc_with_incomplete_sessioN
+	d->incomplete_sessions= 0;
+#endif
+
 	return d;
 }
 
@@ -309,8 +320,8 @@ void burn_structure_print_track(struct burn_track *t)
 {
 	char msg[80];
 
-	sprintf(msg, "        track size %d sectors",
-		burn_track_get_sectors(t));
+	sprintf(msg, "        track size %.f sectors",
+		(double) burn_track_get_sectors_v2(t));
 	libdax_msgs_submit(libdax_messenger, -1, 0x00000002,
 			LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
 			msg, 0, 0);
@@ -496,14 +507,14 @@ int burn_track_set_postgap_size(struct burn_track *t, int size, int flag)
 	return 1;
 }
 
-/* ts B20119: outsourced from burn_track_get_sectors()
+/* ts B20119 / C40302: outsourced from burn_track_get_sectors()
    @param flag bit0= do not add post-gap
 */
-int burn_track_get_sectors_2(struct burn_track *t, int flag)
+off_t burn_track_get_sectors_2_v2(struct burn_track *t, int flag)
 {
 	/* ts A70125 : was int */
-	off_t size = 0;
-	int sectors, seclen;
+	off_t size = 0, sectors;
+	int seclen;
 
 	seclen = burn_sector_length(t->mode);
 
@@ -519,9 +530,23 @@ int burn_track_get_sectors_2(struct burn_track *t, int flag)
 	} else if(t->entry != NULL) {
 		/* ts A80808 : all burn_toc_entry of track starts should now
 			have (extensions_valid & 1), even those from CD.
+		   ts C40302 : Now there should be long_track_blocks.
 		*/
-		if (t->entry->extensions_valid & 1)
+		if (t->entry->extensions_valid & 8) {
+			size = t->entry->long_track_blocks * (off_t) 2048;
+		} else if (t->entry->extensions_valid & 1) {
 			size = ((off_t) t->entry->track_blocks) * (off_t) 2048;
+		}
+	}
+	if (size > BURN_DRIVE_MAX_BYTES) { 
+		char msg[80];
+
+		sprintf(msg, "Track size exceeds limit of %.f bytes",
+				(double) (BURN_DRIVE_MAX_BYTES));
+		libdax_msgs_submit(libdax_messenger, -1, 0x000201ae,
+				LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
+				msg, 0, 0);
+		return -1;
 	}
 	sectors = size / seclen;
 	if (size % seclen)
@@ -529,14 +554,34 @@ int burn_track_get_sectors_2(struct burn_track *t, int flag)
 	return sectors;
 }
 
+int burn_track_get_sectors_2(struct burn_track *t, int flag)
+{
+	/* ts A70125 : was int */
+	off_t sectors = 0;
+
+	sectors = burn_track_get_sectors_2_v2(t, flag);
+	if (sectors > (off_t) 0x7ffffff0) {
+		libdax_msgs_submit(libdax_messenger, -1, 0x000201ae,
+				LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
+				"Track size exceeds 4 TiB - 32 KiB", 0, 0);
+		return -1;
+	}
+	return (int) sectors;
+}
 
 int burn_track_get_sectors(struct burn_track *t)
 {
 	return burn_track_get_sectors_2(t, 0);
 }
 
+/* ts C40302 : API */
+off_t burn_track_get_sectors_v2(struct burn_track *t)
+{
+	return burn_track_get_sectors_2_v2(t, 0);
+}
+
 /* ts A70125 */
-int burn_track_set_sectors(struct burn_track *t, int sectors)
+int burn_track_set_sectors(struct burn_track *t, off_t sectors)
 {
 	off_t size, seclen;
 	int ret;
@@ -579,17 +624,29 @@ int burn_track_set_fillup(struct burn_track *t, int fill_up_media)
 */
 int burn_track_apply_fillup(struct burn_track *t, off_t max_size, int flag)
 {
-	int max_sectors, ret = 2;
+	int ret = 2;
+	off_t max_sectors, track_sectors;
 	char msg[80];
 
 	if (t->fill_up_media <= 0)
 		return 2;
+	if (max_size > BURN_DRIVE_MAX_BYTES) {
+		sprintf(msg, "Track size exceeds limit of %.f bytes",
+			(double) (BURN_DRIVE_MAX_BYTES));
+		libdax_msgs_submit(libdax_messenger, -1, 0x000201ae,
+			LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
+			msg, 0, 0);
+		return 0;
+	}
 	max_sectors = max_size / 2048;
-	if (burn_track_get_sectors(t) < max_sectors || (flag & 1)) {
-		sprintf(msg, "Setting total track size to %ds (payload %ds)\n",
-			max_sectors & 0x7fffffff,
-			(int) ((t->source->get_size(t->source) / 2048)
-				& 0x7fffffff));
+	track_sectors = burn_track_get_sectors_v2(t);
+	if (track_sectors < 0)
+		return 0;
+	if (track_sectors < max_sectors || (flag & 1)) {
+		sprintf(msg,
+			"Setting total track size to %.fs (payload %.fs)\n",
+			(double) max_sectors,
+			(double) (t->source->get_size(t->source) / 2048));
 		libdax_msgs_submit(libdax_messenger, -1, 0x00000002,
 			LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_ZERO,
 			msg, 0, 0);
@@ -643,7 +700,7 @@ int burn_track_is_data_done(struct burn_track *t)
 
 int burn_track_get_shortage(struct burn_track *t)
 {
-	int size;
+	off_t size;
 	int seclen;
 
 	seclen = burn_sector_length(t->mode);
@@ -655,13 +712,31 @@ int burn_track_get_shortage(struct burn_track *t)
 
 int burn_session_get_sectors(struct burn_session *s)
 {
-	int sectors = 0, i;
+	int sectors = 0, i, track_sectors;
 
-	for (i = 0; i < s->tracks; i++)
-		sectors += burn_track_get_sectors(s->track[i]);
+	for (i = 0; i < s->tracks; i++) {
+		track_sectors = burn_track_get_sectors(s->track[i]);
+		if (track_sectors < 0)
+			track_sectors = 0;
+		sectors += track_sectors;
+	}
 	return sectors;
 }
 
+/* ts C40302: API */
+off_t burn_session_get_sectors_v2(struct burn_session *s)
+{
+	int i;
+	off_t sectors = 0, track_sectors;
+
+	for (i = 0; i < s->tracks; i++) {
+		track_sectors = burn_track_get_sectors_v2(s->track[i]);
+		if (track_sectors < 0)
+			track_sectors = 0;
+		sectors += track_sectors;
+	}
+	return sectors;
+}
 
 int burn_disc_get_sectors(struct burn_disc *d)
 {
@@ -672,6 +747,17 @@ int burn_disc_get_sectors(struct burn_disc *d)
 	return sectors;
 }
 
+/* ts C40302: API */
+off_t burn_disc_get_sectors_v2(struct burn_disc *d)
+{
+	int i;
+	off_t sectors = 0;
+
+	for (i = 0; i < d->sessions; i++)
+		sectors += burn_session_get_sectors_v2(d->session[i]);
+	return sectors;
+}
+
 void burn_track_get_entry(struct burn_track *t, struct burn_toc_entry *entry)
 {
 	if (t->entry == NULL)
@@ -691,10 +777,37 @@ void burn_session_get_leadout_entry(struct burn_session *s,
 
 struct burn_session **burn_disc_get_sessions(struct burn_disc *d, int *num)
 {
+
+#ifdef Libburn_disc_with_incomplete_sessioN
+
+	*num = d->sessions - d->incomplete_sessions;
+
+#else
+
 	*num = d->sessions;
+
+#endif
+
+
 	return d->session;
 }
 
+
+/* ts B30112 : API */
+int burn_disc_get_incomplete_sessions(struct burn_disc *d)
+{
+#ifdef Libburn_disc_with_incomplete_sessioN
+
+	return d->incomplete_sessions;
+
+#else
+
+	return 0;
+
+#endif
+}
+
+
 struct burn_track **burn_session_get_tracks(struct burn_session *s, int *num)
 {
 	*num = s->tracks;
@@ -712,7 +825,7 @@ int burn_session_get_hidefirst(struct burn_session *session)
 }
 
 
-/* ts A80808 : Enhance CD toc to DVD toc */
+/* ts A80808,C40226 : Enhance CD toc to DVD toc with Long block addresses */
 int burn_disc_cd_toc_extensions(struct burn_drive *drive, int flag)
 {
 	int sidx= 0, tidx= 0, ret, track_offset, alloc_len = 34;
@@ -737,11 +850,11 @@ int burn_disc_cd_toc_extensions(struct burn_drive *drive, int flag)
 		ret = 1;
 		goto ex;
 	}
-	track_offset = burn_session_get_start_tno(d->session[0], 0);
-	if (track_offset <= 0)
-		track_offset = 1;
 
 	for (sidx = 0; sidx < d->sessions; sidx++) {
+		track_offset = burn_session_get_start_tno(d->session[sidx], 0);
+		if (track_offset <= 0)
+			track_offset = 1;
 		if (d->session[sidx] == NULL) {
 			sprintf(msg, "d->session[%d of %d] == NULL",
 				sidx, d->sessions);
@@ -780,6 +893,7 @@ int burn_disc_cd_toc_extensions(struct burn_drive *drive, int flag)
 			entry->point_msb = 0;
 			entry->start_lba = burn_msf_to_lba(entry->pmin,
 						entry->psec, entry->pframe);
+			entry->long_start_lba = entry->start_lba;
 			if (tidx > 0) {
 				prev_entry->track_blocks =
 					entry->start_lba
@@ -799,13 +913,16 @@ int burn_disc_cd_toc_extensions(struct burn_drive *drive, int flag)
 					   ret < prev_entry->track_blocks - 2))
 						prev_entry->track_blocks = ret;
 				}
-				prev_entry->extensions_valid |= 1;
+				prev_entry->long_track_blocks =
+						prev_entry->track_blocks;
+				prev_entry->extensions_valid |= 1 | 8;
 			}
 			if (tidx == d->session[sidx]->tracks) {
 				entry->session_msb = 0;
 				entry->point_msb = 0;
 				entry->track_blocks = 0;
-				entry->extensions_valid |= 1;
+				entry->long_track_blocks = entry->track_blocks;
+				entry->extensions_valid |= 1 | 8;
 			}
 			prev_entry = entry;
 		}
@@ -1389,7 +1506,7 @@ static int cue_open_audioxtr(char *path, struct burn_cue_file_cursor *crs,
 
 	ret= libdax_audioxtr_new(&xtr, path, 0);
 	if (ret <= 0)
-		return ret;
+		goto ex;
 	libdax_audioxtr_get_id(xtr, &fmt, &fmt_info, &num_channels,
 		 		&sample_rate, &bits_per_sample, &msb_first, 0);
 	if ((flag & 255) == 1) {
@@ -1451,7 +1568,7 @@ static int cue_create_file_source(char *path, struct burn_cue_file_cursor *crs,
 		if (ret <= 0)
 			goto ex;
 	} else {
-		fd = open(path, O_RDONLY);
+		fd = open(path, O_RDONLY | O_BINARY);
 		if (fd == -1) {
 			sprintf(msg,
 				"In cue sheet: Cannot open FILE '%.4000s'",
@@ -1610,7 +1727,7 @@ out_of_mem:;
 		if (crs->file_source != NULL) {
 			libdax_msgs_submit(libdax_messenger, -1, 0x00020192,
 				LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
-			      "In cue sheet file: Multiple occurences of FILE",
+			     "In cue sheet file: Multiple occurrences of FILE",
 				0, 0);
 			ret = 0; goto ex;
 		}
@@ -2109,6 +2226,12 @@ ex:
 		tracks = burn_session_get_tracks(session, &num_tracks);
 		for (i = 0; i < num_tracks; i++)
 			burn_track_free(tracks[i]);
+		if(text_packs != NULL) {
+			if(*text_packs != NULL)
+				free(*text_packs);
+			*text_packs = NULL;
+			*num_packs = 0;
+		}
 	} else {
 		if (fifo != NULL) {
 			*fifo = crs->fifo;
@@ -2118,6 +2241,8 @@ ex:
 	cue_crs_destroy(&crs, 0);
 	BURN_FREE_MEM(line);
 	BURN_FREE_MEM(msg);
+	if (fp != NULL)
+		fclose(fp);
 	return ret;
 }
 

libburn/structure.h

@@ -53,7 +53,7 @@ struct burn_track
 	/** 1 means Pad with zeros, 0 means start reading the next track */
 	int pad;
 
-	/* ts A70213 : wether to expand this track to full available media */
+	/* ts A70213 : whether to expand this track to full available media */
 	int fill_up_media;
 
 	/* ts A70218 : a track size to use if it is mandarory to have some */
@@ -137,13 +137,18 @@ struct burn_session
 	unsigned char cdtext_language[8];
 
 	/* ts B11226 */
-	unsigned char mediacatalog[14]; /* overrideable by burn_write_opts */
+	unsigned char mediacatalog[14]; /* overridable 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;
 };
 
@@ -155,7 +160,7 @@ int burn_track_is_open_ended(struct burn_track *t);
 int burn_track_is_data_done(struct burn_track *t);
 
 /* ts A70125 : sets overall sectors of a track: offset+payload+padding */
-int burn_track_set_sectors(struct burn_track *t, int sectors);
+int burn_track_set_sectors(struct burn_track *t, off_t sectors);
 
 /* ts A70218 : sets the payload size alone */
 int burn_track_set_size(struct burn_track *t, off_t size);
@@ -180,6 +185,7 @@ void burn_cdtext_free(struct burn_cdtext **cdtext);
 /* @param flag bit0= do not add post-gap
 */
 int burn_track_get_sectors_2(struct burn_track *t, int flag);
+off_t burn_track_get_sectors_2_v2(struct burn_track *t, int flag);
 
 
 #endif /* BURN__STRUCTURE_H */

libburn/toc.c

@@ -147,7 +147,11 @@ void toc_find_modes(struct burn_drive *d)
 					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 - 2011 Thomas Schmitt <scdbackup@gmx.net>
+   Copyright (c) 2006 - 2024 Thomas Schmitt <scdbackup@gmx.net>
    Provided under GPL version 2 or later.
 */
 
@@ -61,23 +61,40 @@ struct command
 	int dir;
 	int dxfer_len;
 	unsigned char sense[128];
+	int sense_len;
 	int error;
 	int retry;
 	struct buffer *page;
 	int timeout; /* milliseconds */
+
+	double start_time;
+	double end_time;
+
+	int retry_count;
+	int last_retry_key;
+	int last_retry_asc;
+	int last_retry_ascq;
 };
 
 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;
@@ -89,8 +106,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;
@@ -101,15 +123,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;
 };
 
 
@@ -127,6 +144,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
 {
@@ -178,12 +215,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;
 
@@ -209,6 +258,16 @@ struct burn_drive
 	*/
 	int current_feat2fh_byte4;
 
+	/* ts B51016 : Result from feature 108h : Drive Serial Number
+	*/
+	char *drive_serial_number;
+	int drive_serial_number_len;
+
+	/* ts B51016 : Result from command AB READ MEDIA SERIAL NUMBER
+	*/
+	char *media_serial_number;
+	int media_serial_number_len;
+
 	/* ts B10524 : whether the damage bit was set for the future track.
 	               bit0= damage bit , bit1= nwa valid bit
 	*/
@@ -218,7 +277,7 @@ struct burn_drive
 	               (which could need closing after write) */
 	int needs_close_session;
 	/* ts A71003 : whether a random write operation was done and no
-	               synchronize chache has happened yet */
+	               synchronize cache has happened yet */
 	int needs_sync_cache;
 
 	/* ts A80412 : whether to use WRITE12 with Streaming bit set
@@ -261,22 +320,41 @@ 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
+	   3= report errors with severity DEBUG
+	*/
 	int silent_on_scsi_error;
 
+	/* ts B21023 */
+	/* bit0= 5 64 00 occurred with READ10 in mmc_read_10()
+	*/
+	int had_particular_error;
+
 	int stdio_fd;
 
-	int nwa;		/* next writeable address */
+	off_t nwa;		/* next writeable address */
 	int alba;		/* absolute lba */
 	int rlba;		/* relative lba in section */
 	int start_lba;
 	int end_lba;
 
+	/* ts B61116 */
+	int do_simulate;
 
 	/* ts A70131 : from 51h READ DISC INFORMATION Number of Sessions (-1)*/
 	int complete_sessions;
 	/* 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;
@@ -293,20 +371,30 @@ struct burn_drive
 	/* ts A70215 : if > 0 : first lba on media that is too high for write*/
 	int media_lba_limit;
 
-	/* ts A81210 : Upper limit of readable data size,
-	               0x7fffffff = unknown
-	               0x7ffffff0 = 32 bit overflow, or unknown stdio size
+	/* ts A81210 / C40303 : Upper limit of readable data size,
+	                0x7fffffffffffffff = unknown
+	       BURN_DRIVE_MAX_BYTES / 2048 = possibly truncated
+	                                     or unknown stdio size
 	 */
-	int media_read_capacity;
+	off_t media_read_capacity;
 
-	/* ts B10314 : Next Writeable Adress for drive_role == 5 */
-        int role_5_nwa;
+	/* ts B60305 : Whether READ CAPACITY of CD is credible:
+	               -1= no READ CAPACITY yet , 0= untrusted READ CAPACITY
+	               1= READ CAPACITY confirmed or corrected by other commands
+	*/
+	int mr_capacity_trusted;
+
+	/* ts B10314 / C40302 : Next Writeable Address for drive_role == 5 */
+        off_t role_5_nwa;
+
+	/* ts B60730 */
+	int do_no_immed;
 
 	int toc_temp;
 	struct burn_disc *disc;	/* disc structure */
 	int block_types[4];
 	struct buffer *buffer;
-	struct burn_progress progress;
+	struct burn_progress_v2 progress;
 
 	/* To be used by mmc.c, sbc.c, spc.c for SCSI commands where the struct
 	   content surely does not have to persist while another command gets
@@ -336,12 +424,32 @@ 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;
 	/* ts B00225 */
 	pthread_t thread_tid;
 
+	/* ts B90513 */
+	unsigned int write_retry_count;
+
+	/* ts C00806 */
+	/* 0=no change, 1=change, -1=already urged OS to revalidate medium */
+	int medium_state_changed;
+
+	/* ts C00822 */
+	/* If set, use Exact bit with SET STREAMING and use SET STREAMING
+	   even if the medium is a CD.
+	 */
+	int set_streaming_exact_bit;
+	int set_streaming_err;
 
 /* transport functions */
 	int (*grab) (struct burn_drive *);
@@ -359,7 +467,7 @@ struct burn_drive
 	/* ts A61021 */
 	void (*read_atip) (struct burn_drive *);
 
-	int (*write) (struct burn_drive *, int, struct buffer *);
+	int (*write) (struct burn_drive *, off_t, struct buffer *);
 	void (*read_toc) (struct burn_drive *);
 	void (*lock) (struct burn_drive *);
 	void (*unlock) (struct burn_drive *);
@@ -372,10 +480,10 @@ 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 *,

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,12 @@
 
 #include <stdlib.h>
 #include <stdio.h>
+#include <time.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
 
 /* ts A80914 : This is unneeded. Version info comes from libburn.h.
 #include "v ersion.h"
@@ -23,42 +29,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)
 {
@@ -207,6 +177,7 @@ char *burn_guess_manufacturer(int prf,
 	{"MCC",         8, "Mitsubishi Chemical Corporation"},
 	{"MCI",         8, "Mitsui Chemicals Inc."},
 	{"MEI",         3, "Panasonic Corporation"},
+	{"MILLEN",      8, "Millenniata Inc."},
 	{"MKM",         3, "Mitsubishi Kagaku Media Co."},
 	{"MMC",         8, "Mitsubishi Kagaku Media Co."},
 	{"MXL",         8, "Hitachi Maxell Ltd."},
@@ -224,7 +195,8 @@ char *burn_guess_manufacturer(int prf,
 	{"RITEK",       5, "Ritek Corp"},
 	{"SONY",        4, "Sony Corporation"},
 	{"TDK",         3, "TDK Corporation"},
-	{"TT",          8, "TDK Corporation"},
+	{"TTG",         3, "TDK Corporation"},
+	{"TTH",         3, "TDK Corporation"},
 	{"TY",          8, "Taiyo Yuden Company Limited"},
 	{"TYG",         3, "Taiyo Yuden Company Limited"},
 	{"UME",         3, "UmeDisc Limited"},
@@ -364,3 +336,68 @@ char *burn_printify(char *msg)
 	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);
+}
+
+/* ts B40609 */
+off_t burn_sparse_file_addsize(off_t write_start, struct stat *stbuf)
+{
+	off_t add_size;
+
+	add_size = stbuf->st_blocks * (off_t) 512;
+	if (add_size < stbuf->st_size) {
+		/* Sparse file */
+		if (write_start < stbuf->st_size) {
+			/* Might write into sparse gaps */
+			if (write_start > add_size)
+				add_size = write_start;
+		} else {
+			/* Will not write into sparse area */
+			add_size = stbuf->st_size;
+		}
+	}
+	return add_size;
+}
+

libburn/util.h

@@ -1,9 +1,10 @@
 #ifndef __UTIL
 #define __UTIL
 
-char *burn_strdup(char *s);
-
-char *burn_strndup(char *s, int n);
+/* for struct stat */
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
 
 /* ts A90905 */
 int burn_util_make_printable_word(char **text, int flag);
@@ -12,4 +13,13 @@ int burn_util_make_printable_word(char **text, int flag);
 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);
+
+/* ts B40609 */
+off_t burn_sparse_file_addsize(off_t write_start, struct stat *stbuf);
+
 #endif

libburn/write.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 - 2012 Thomas Schmitt <scdbackup@gmx.net>
+   Copyright (c) 2006 - 2024 Thomas Schmitt <scdbackup@gmx.net>
    Provided under GPL version 2 or later.
 */
 
@@ -38,6 +38,11 @@
 #include <sys/stat.h>
 #include <sys/time.h>
 
+/* ts B41126 : O_BINARY is needed for Cygwin but undefined elsewhere */
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
+
 #include "error.h"
 #include "sector.h"
 #include "libburn.h"
@@ -76,11 +81,19 @@ extern struct libdax_msgs *libdax_messenger;
 
 /* The size to be used with BD-RE media in normal, not streamed mode.
 */
-#define Libburn_bd_re_obS (32 * 1024)
+#define Libburn_bd_re_obS (64 * 1024)
 
-/* The size to be used with BD-RE media in streamed mode.
+/* The size to be used with BD-R media in normal, not streamed mode.
 */
-#define Libburn_bd_re_streamed_obS (64 * 1024)
+#define Libburn_bd_r_obS (64 * 1024)
+
+/* The size to be used with BD-RE and BD-R media in streamed mode.
+*/
+#define Libburn_bd_streamed_obS (64 * 1024)
+
+/* The number of retries if write(2) returns a short, non-negative write count.
+*/
+#define Libburn_stdio_write_retrieS 16
 
 
 static int type_to_ctrl(int mode)
@@ -213,8 +226,6 @@ int burn_write_track_minsize(struct burn_write_opts *o, struct burn_session *s,
 			0x0002011a,
 			LIBDAX_MSGS_SEV_NOTE, LIBDAX_MSGS_PRIO_HIGH, msg,0,0);
 		step = BUFFER_SIZE / 4096; /* shall fit any sector size */
-		if (step <= 0)
-			step = 1;
 		seclen = burn_sector_length(t->mode);
 		if (seclen <= 0)
 			seclen = 2048;
@@ -429,7 +440,7 @@ static int add_isrc_cue(struct cue_sheet *sheet, unsigned char ctladr, int tno,
 {
 	unsigned char *unit;
 	int i, ret;
-	char text[8];
+	char text[8 + 21]; /* should suffice for 64 bit oversize */
 
 	ret = new_cue(sheet, 2, 0);
 	if (ret <= 0)
@@ -443,6 +454,9 @@ static int add_isrc_cue(struct cue_sheet *sheet, unsigned char ctladr, int tno,
 	unit[5] = isrc->owner[1];
 	unit[6] = isrc->owner[2];
 	sprintf(text, "%-2.2u%-5.5u", (unsigned int) isrc->year, isrc->serial);
+	sprintf(text, "%-2.2u", (unsigned int) isrc->year);
+	sprintf(text + 2, "%-5.5u", isrc->serial);
+	text[7] = 0;
 	unit[7] = text[0];
 	for (i = 1; i < 7; i++)
 		unit[9 + i] = text[i];
@@ -616,11 +630,13 @@ struct cue_sheet *burn_create_toc_entries(struct burn_write_opts *o,
 		   track length.
 		*/ 
 		track_length = burn_track_get_sectors_2(tar[i], 1);
+		if (track_length < 0)
+			goto failed;
 		if (track_length < 300 && !burn_track_is_open_ended(tar[i])) {
 			track_length = 300;
 			if (!tar[i]->pad)
 				tar[i]->pad = 1;
-			burn_track_set_sectors(tar[i], track_length);
+			burn_track_set_sectors(tar[i], (off_t) track_length);
 		}
 
 		type_to_form(tar[i]->mode, &ctladr, &form);
@@ -709,7 +725,7 @@ struct cue_sheet *burn_create_toc_entries(struct burn_write_opts *o,
 			runtime += 150;
 		} else if (pform != form) {
 
-		/* ts A70121 : This seems to be thw wrong test. Correct would
+		/* ts A70121 : This seems to be the wrong test. Correct would
 		   be to compare tar[]->mode or bit2 of ctladr.
 		*/ 
 
@@ -778,7 +794,7 @@ XXX this is untested :)
 			rem += burn_track_get_shortage(tar[i]);
 
 			/* ts A61101 : I doubt that linking would yield a
-					desireable effect. With TAO it is
+					desirable effect. With TAO it is
 					counterproductive in any way.
 			*/
 			if (o->write_type == BURN_WRITE_TAO)
@@ -1011,7 +1027,7 @@ static int burn_write_leadin_cdtext(struct burn_write_opts *o,
 			}
 #endif /* Libburn_debug_cd_texT */
 	
-			err = d->write(d, write_lba, buf);
+			err = d->write(d, (off_t) write_lba, buf);
 			if (err == BE_CANCELLED)
 				{ ret = 0; goto ex; }
 			write_lba += sectors;
@@ -1058,10 +1074,10 @@ ex:;
 }
 
 
-/* ts A61218 : outsourced from burn_write_track() */
+/* ts A61218 / C40303 : outsourced from burn_write_track() */
 int burn_disc_init_track_status(struct burn_write_opts *o,
 				struct burn_session *s, struct burn_track *t,
-				int tnum, int sectors)
+				int tnum, off_t sectors)
 {
 	struct burn_drive *d = o->drive;
 
@@ -1097,7 +1113,7 @@ int burn_write_track(struct burn_write_opts *o, struct burn_session *s,
 	struct burn_drive *d = o->drive;
 	int i, tmp = 0, open_ended = 0, ret= 0, nwa, lba;
 	int sectors;
-	char msg[80];
+	char msg[160];
 
 	d->rlba = -150;
 
@@ -1163,8 +1179,8 @@ int burn_write_track(struct burn_write_opts *o, struct burn_session *s,
 
 		/* <<< */
 		sprintf(msg, 
-	"TAO pre-track %2.2d : get_nwa(%d)=%d, d=%d , demand=%.f , cap=%.f\n",
-			tnum+1, nwa, ret, d->nwa,
+	"TAO pre-track %2.2d : get_nwa(%d)=%d, d=%.f , demand=%.f , cap=%.f\n",
+			tnum+1, nwa, ret, (double) d->nwa,
 			(double) burn_track_get_sectors_2(t, 1) * 2048.0,
 			(double) d->media_capacity_remaining);
 		libdax_msgs_submit(libdax_messenger, d->global_index,
@@ -1189,9 +1205,11 @@ int burn_write_track(struct burn_write_opts *o, struct burn_session *s,
 /* user data */
 
 	sectors = burn_track_get_sectors_2(t, 1);
+	if (sectors < 0)
+		{ ret = 0; goto ex; }
 	open_ended = burn_track_is_open_ended(t);
 
-	burn_disc_init_track_status(o, s, t, tnum, sectors);
+	burn_disc_init_track_status(o, s, t, tnum, (off_t) sectors);
 
 	/* ts A61030 : this cannot happen. tnum is always < s->tracks */
 	if (tnum == s->tracks)
@@ -1314,7 +1332,7 @@ int burn_disc_init_write_status(struct burn_write_opts *o,
 {
 	struct burn_drive *d = o->drive;
 	struct burn_track *t = NULL;
-	int sx, tx;
+	int sx, tx, ret;
 
 	d->cancel = 0;
 
@@ -1340,7 +1358,7 @@ int burn_disc_init_write_status(struct burn_write_opts *o,
 	d->progress.buffer_capacity = 0;
 	d->progress.buffer_available = 0;
 	d->progress.buffered_bytes = 0;
-	d->progress.buffer_min_fill = 0xffffffff;
+	d->progress.buffer_min_fill = 0x7fffffffffffffff;
 
 	/* ts A70711 */
 	d->pessimistic_buffer_free = 0;
@@ -1359,6 +1377,14 @@ int burn_disc_init_write_status(struct burn_write_opts *o,
 	if (o->fill_up_media && t != NULL)
 		burn_track_set_fillup(t, 1);
 
+	d->was_feat21h_failure = 0;
+	if(d->write_opts != NULL)
+		burn_write_opts_free(d->write_opts);
+	ret = burn_write_opts_clone(o, &(d->write_opts), 0);
+	if (ret <= 0)
+		return ret;
+	d->write_retry_count = 0;
+
 	d->busy = BURN_DRIVE_WRITING;
 
 	return 1;
@@ -1401,7 +1427,7 @@ int burn_precheck_write(struct burn_write_opts *o, struct burn_disc *disc,
 	enum burn_write_types wt;
 	struct burn_drive *d = o->drive;
 	char *msg = NULL, *reason_pt;
-	int no_media = 0, ret, has_cdtext;
+	int no_media = 0, ret, has_cdtext, is_bd_pow = 0;
 
 	reason_pt= reasons;
 	reasons[0] = 0;
@@ -1479,6 +1505,20 @@ int burn_precheck_write(struct burn_write_opts *o, struct burn_disc *disc,
 		   sequential stdio "drive" */
 		if (o->start_byte >= 0)
 			strcat(reasons, "write start address not supported, ");
+
+		is_bd_pow = burn_drive_get_bd_r_pow(d);
+		if (is_bd_pow && !silent) 
+			libdax_msgs_submit(libdax_messenger, d->global_index,
+				0x0002011e,
+				LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
+			   "Unsuitable media detected: BD-R formatted to POW.",
+				0, 0);
+		if (is_bd_pow) {
+			strcat(reasons,
+				"unsuitable media formatting POW detected, ");
+			return 0;
+		}
+
 	} else {
 unsuitable_profile:;
 		msg = calloc(1, 160);
@@ -1530,8 +1570,8 @@ int burn_disc_open_track_dvd_minus_r(struct burn_write_opts *o,
 	d->send_write_parameters(d, NULL, -1, o);
 	ret = d->get_nwa(d, -1, &lba, &nwa);
 	sprintf(msg, 
-		"DVD pre-track %2.2d : get_nwa(%d), ret= %d , d->nwa= %d",
-		tnum+1, nwa, ret, d->nwa);
+		"DVD pre-track %2.2d : get_nwa(%d), ret= %d , d->nwa= %.f",
+		tnum+1, nwa, ret, (double) d->nwa);
 	libdax_msgs_submit(libdax_messenger, d->global_index, 0x00000002,
 			LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_ZERO, msg,0,0);
 	if (nwa > d->nwa)
@@ -1555,6 +1595,8 @@ int burn_disc_open_track_dvd_minus_r(struct burn_write_opts *o,
 	if (o->write_type == BURN_WRITE_SAO) { /* DAO */
 		size = ((off_t) burn_track_get_sectors_2(s->track[tnum], 1))
 			* (off_t) 2048;
+		if (size < 0)
+			{ret = 0; goto ex;}
 
  		/* Eventually round track size up to write chunk */
 		if (o->obs_pad && (size % o->obs))
@@ -1590,8 +1632,8 @@ int burn_disc_open_track_dvd_plus_r(struct burn_write_opts *o,
 	BURN_ALLOC_MEM(msg, char, 160);
 	ret = d->get_nwa(d, -1, &lba, &nwa);
 	sprintf(msg, 
-		"DVD+R pre-track %2.2d : get_nwa(%d), ret= %d , d->nwa= %d",
-		tnum+1, nwa, ret, d->nwa);
+		"DVD+R pre-track %2.2d : get_nwa(%d), ret= %d , d->nwa= %.f",
+		tnum+1, nwa, ret, (double) d->nwa);
 	libdax_msgs_submit(libdax_messenger, d->global_index, 0x00000002,
 			LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_ZERO, msg,0,0);
 	if (nwa > d->nwa)
@@ -1604,6 +1646,8 @@ int burn_disc_open_track_dvd_plus_r(struct burn_write_opts *o,
  		/* Reserve track */
 		size = ((off_t) burn_track_get_sectors_2(s->track[tnum], 1))
 			* (off_t) 2048;
+		if (size < 0)
+			{ret = 0; goto ex;}
 		if (o->obs_pad) {
 	 		/* Round track size up to write chunk size */
 			/* o->obs should be 32k or 64k already. But 32k
@@ -1614,16 +1658,6 @@ int burn_disc_open_track_dvd_plus_r(struct burn_write_opts *o,
 				size += (off_t) (o->obs - (size % o->obs));
 		}
 
-		/* <<< Only for now until the first DVD+R succeeded */
-		if (!o->obs_pad) {
-			sprintf(msg, "Program error: encountered DVD+R without chunk padding");
-			libdax_msgs_submit(libdax_messenger, d->global_index,
-				0x00000004,
-				LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
-				msg, 0, 0);
-			{ret = 0; goto ex;}
-		}
-
 		ret = d->reserve_track(d, size);
 		if (ret <= 0) {
 			sprintf(msg, "Cannot reserve track of %.f bytes",
@@ -1670,7 +1704,7 @@ int burn_disc_close_track_dvd_minus_r(struct burn_write_opts *o, int tnum)
 int burn_disc_finalize_dvd_plus_r(struct burn_write_opts *o)
 {
 	struct burn_drive *d = o->drive;
-	char msg[80];
+	char msg[40 + 80]; /* filltext + profile */
 
 	sprintf(msg, "Finalizing %s ...",
 		d->current_profile_text);
@@ -1780,7 +1814,8 @@ static int transact_dvd_chunk(struct burn_write_opts *opts,
 	static int tee_fd= -1;
 	if(tee_fd==-1)
 		tee_fd= open("/tmp/libburn_sg_readin",
-				O_WRONLY|O_CREAT|O_TRUNC,S_IRUSR|S_IWUSR);
+				O_WRONLY | O_CREAT | O_TRUNC | O_BINARY,
+				S_IRUSR | S_IWUSR);
 #endif /* Libburn_log_in_and_out_streaM */
 
 
@@ -1861,12 +1896,15 @@ int burn_dvd_write_track(struct burn_write_opts *o,
 	struct burn_drive *d = o->drive;
 	struct buffer *out = d->buffer;
 	int sectors;
-	int i, open_ended = 0, ret= 0, is_flushed = 0;
-	int first_buf_cap = 0, further_cap = 0, buf_cap_step = 1024;
+	int i, open_ended = 0, ret= 0, is_flushed = 0, track_open = 0;
+	off_t first_buf_cap = 0, further_cap = 0, buf_cap_step = 1024;
 
 	/* ts A70213 : eventually expand size of track to max */
 	burn_track_apply_fillup(t, d->media_capacity_remaining, 0);
 
+	/* ts C00806 : Consider the track state changed by try to open */
+	d->medium_state_changed = 1;
+
 	if (d->current_profile == 0x11 || d->current_profile == 0x14 ||
 	    d->current_profile == 0x15) {
 		/* DVD-R, DVD-RW Sequential, DVD-R/DL Sequential */
@@ -1889,13 +1927,16 @@ int burn_dvd_write_track(struct burn_write_opts *o,
 		if (ret <= 0)
 			goto ex;
 	}
+	track_open = 1;
 
 	sectors = burn_track_get_sectors_2(t, 1);
+	if (sectors < 0)
+		{ret = 0; goto ex;}
 	open_ended = burn_track_is_open_ended(t);
 
 	/* (offset padding is done within sector_data()) */
 
-	burn_disc_init_track_status(o, s, t, tnum, sectors);
+	burn_disc_init_track_status(o, s, t, tnum, (off_t) sectors);
 	for (i = 0; open_ended || i < sectors; i++) {
 
 		/* From time to time inquire drive buffer */
@@ -1971,7 +2012,7 @@ int burn_dvd_write_track(struct burn_write_opts *o,
 ex:;
 	if (d->cancel)
 		burn_source_cancel(t->source);
-	if (!is_flushed)
+	if (track_open && !is_flushed)
 		d->sync_cache(d); /* burn_write_flush() was not called */
 	return ret;
 }
@@ -2059,7 +2100,7 @@ int burn_dvd_write_session(struct burn_write_opts *o,
 		   is not readable.
 
 		   By default the open session gets closed here before the new
-		   session is written. E.g. after writing a small dummy seesion
+		   session is written. E.g. after writing a small dummy session
 		   number 2 one can read session 1 and write session 3 which
 		   points to data of session 1.
 
@@ -2086,7 +2127,7 @@ int burn_dvd_write_session(struct burn_write_opts *o,
 		libdax_msgs_submit(libdax_messenger, d->global_index,
 				0x00020171,
 				LIBDAX_MSGS_SEV_NOTE, LIBDAX_MSGS_PRIO_HIGH,
-				"Closing BD-R with accidently open session",
+				"Closing BD-R with accidentally open session",
 				0, 0);
  		d->close_track_session(d, 3, 0); /* CLOSE SESSION, 110b */
 		d->state_of_last_session = 3; /* mark as complete session */
@@ -2119,13 +2160,16 @@ int burn_dvd_write_session(struct burn_write_opts *o,
 	if (d->current_profile == 0x11 || d->current_profile == 0x14 ||
 	    d->current_profile == 0x15) {
 		/* DVD-R , DVD-RW Sequential, DVD-R/DL Sequential */
-		multi_mem = o->multi;
-		if (!is_last_session)
-			o->multi = 1;
-		ret = burn_disc_close_session_dvd_minus_r(o);
-		o->multi = multi_mem;
-		if (ret <= 0)
-			return 0;
+		/* If feature 21h failed on write 0: do not close session */
+		if (d->was_feat21h_failure != 2) {
+			multi_mem = o->multi;
+			if (!is_last_session)
+				o->multi = 1;
+			ret = burn_disc_close_session_dvd_minus_r(o);
+			o->multi = multi_mem;
+			if (ret <= 0)
+				return 0;
+		}
 	} else if (d->current_profile == 0x12 || d->current_profile == 0x43) {
 		/* DVD-RAM , BD-RE */
 		/* ??? any finalization needed ? */;
@@ -2189,7 +2233,8 @@ int burn_disc_setup_dvd_minus_rw(struct burn_write_opts *o,
 	if (o->start_byte >= 0) {
 		d->nwa = o->start_byte / 32768; /* align to 32 kB */
 
-		sprintf(msg, "Write start address is  %d * 32768", d->nwa);
+		sprintf(msg, "Write start address is  %.f * 32768",
+			(double) d->nwa);
 		libdax_msgs_submit(libdax_messenger, d->global_index,
 				0x00020127,
 				LIBDAX_MSGS_SEV_NOTE, LIBDAX_MSGS_PRIO_HIGH,
@@ -2291,8 +2336,8 @@ int burn_dvd_write_sync(struct burn_write_opts *o,
 		d->nwa = 0;
 		if (o->start_byte >= 0) {
 			d->nwa = o->start_byte / 2048;
-			sprintf(msg, "Write start address is  %d * 2048",
-				d->nwa);
+			sprintf(msg, "Write start address is  %.f * 2048",
+				(double) d->nwa);
 			libdax_msgs_submit(libdax_messenger, d->global_index,
 				0x00020127,
 				LIBDAX_MSGS_SEV_NOTE, LIBDAX_MSGS_PRIO_HIGH,
@@ -2306,7 +2351,7 @@ int burn_dvd_write_sync(struct burn_write_opts *o,
 			if (o->obs_pad < 2)
 				o->obs_pad = 1;
 			if (d->current_profile == 0x43) /* BD-RE */
-				o->obs = Libburn_bd_re_streamed_obS;
+				o->obs = Libburn_bd_streamed_obS;
 		}
 
 	} else if (d->current_profile == 0x13) {
@@ -2382,12 +2427,22 @@ int burn_dvd_write_sync(struct burn_write_opts *o,
 				msg, 0, 0);
 			goto early_failure;
 		}
-		/* ??? padding needed ??? cowardly doing it for now */
-		if (o->obs_pad < 2)
-			o->obs_pad = 1; /* fill-up track's last 32k buffer */
+		/* Unaligned BD-R track end works with various drives and
+		   produces exact READ CAPACITY results.
+		   Nevertheless stream recording hates unaligned WRITE.
+		   With DVD+R it seems that obs_pad is silently applied by the
+		   drive if a non-aligned final WRITE is received.
+		*/
+		if (o->obs_pad < 2 &&
+		    !(d->current_profile == 0x41 && !d->do_stream_recording &&
+		      o->bdr_obs_exempt))
+			o->obs_pad = 1; /* fill-up track's last obs buffer */
+
+		if (d->current_profile == 0x41) /* BD-R */
+			o->obs = Libburn_bd_r_obS;
 		if (d->do_stream_recording) {
 			if (d->current_profile == 0x41) /* BD-R */
-				o->obs = Libburn_bd_re_streamed_obS;
+				o->obs = Libburn_bd_streamed_obS;
 		}
 	}
 
@@ -2417,10 +2472,10 @@ int burn_dvd_write_sync(struct burn_write_opts *o,
 
 	if (d->do_stream_recording &&
 		(d->current_profile == 0x43 || d->current_profile == 0x41) &&
-		o->obs < Libburn_bd_re_streamed_obS) {
+		o->obs < Libburn_bd_streamed_obS) {
 		/* LG GGW-H20 writes junk with stream recording and obs=32k */
 		sprintf(msg,
-		    "Stream recording disabled because of small OS buffer");
+		   "Stream recording disabled because of small output buffer");
 		libdax_msgs_submit(libdax_messenger, d->global_index,
 			 0x00020176, LIBDAX_MSGS_SEV_NOTE,
 			 LIBDAX_MSGS_PRIO_HIGH, msg, 0, 0);
@@ -2503,7 +2558,7 @@ int burn_stdio_open_write(struct burn_drive *d, off_t start_byte,
 	if (fd >= 0)
 		fd = dup(fd); /* check validity and make closeable */
 	else
-		fd = open(d->devname, mode,
+		fd = open(d->devname, mode | O_BINARY,
                     S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
 	if (fd == -1) {
 		libdax_msgs_submit(libdax_messenger, d->global_index,
@@ -2558,30 +2613,45 @@ int burn_stdio_read_source(struct burn_source *source, char *buf, int bufsize,
 int burn_stdio_write(int fd, char *buf, int count, struct burn_drive *d, 
 			 int flag)
 {
-	int ret;
+	int ret = 0;
 	char *msg = NULL;
+	int todo, done, retries;
 
-	if (d->cancel)
+	if (d->cancel || count <= 0)
 		return 0;
+	if(d->do_simulate)
+		return 1;
+
+	todo = count;
+	done = 0;
+	for (retries = 0; todo > 0 && retries <= Libburn_stdio_write_retrieS;
+             retries++) {
 /*
 fprintf(stderr, "libburn_DEBUG: write(%d, %lX, %d)\n",
                 fd, (unsigned long) buf, count);
 */
-
-	ret = write(fd, buf, count);
-	if (ret != count) {
+		ret = write(fd, buf + done, todo);
+		if (ret < 0)
+	break;
+		done += ret;
+		todo -= ret;
+	}
+	if (done != count) {
 		BURN_ALLOC_MEM(msg, char, 160);
 
-		sprintf(msg,
-		  "Cannot write desired amount of data. write(2) returned %d.",
-		        ret);
+		sprintf(msg, "Cannot write desired amount of %d bytes.", count);
+		if (retries > 1)
+			sprintf(msg + strlen(msg), " Did %d retries. Last",
+			        retries - 1);
+		sprintf(msg + strlen(msg), " write(2) returned %d.", ret);
 		libdax_msgs_submit(libdax_messenger, d->global_index,
 			0x00020148,
 			LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
 			msg, errno, 0);
 		d->cancel = 1;
-		return 0;
+		ret = 0; goto ex;
 	}
+	ret = 1;
 ex:;
 	BURN_FREE_MEM(msg);
 	return ret;
@@ -2589,7 +2659,7 @@ ex:;
 
 
 /* ts A70910 : to be used as burn_drive.write(), emulating mmc_write() */
-int burn_stdio_mmc_write(struct burn_drive *d, int start, struct buffer *buf)
+int burn_stdio_mmc_write(struct burn_drive *d, off_t start, struct buffer *buf)
 {
 	int ret;
 	off_t start_byte;
@@ -2632,7 +2702,7 @@ int burn_stdio_mmc_write(struct burn_drive *d, int start, struct buffer *buf)
 
 /* ts A70910 : to be used as burn_drive.write(),
                emulating mmc_write() with simulated writing. */
-int burn_stdio_mmc_dummy_write(struct burn_drive *d, int start,
+int burn_stdio_mmc_dummy_write(struct burn_drive *d, off_t start,
 							struct buffer *buf)
 {
 	if (d->cancel)
@@ -2645,10 +2715,11 @@ int burn_stdio_mmc_dummy_write(struct burn_drive *d, int start,
 /* ts A70911 */
 /* Flush stdio system buffer to physical device.
    @param flag bit0= do not report debug message (intermediate sync)
+               bit1= do fsync(2) unconditionally
 */
 int burn_stdio_sync_cache(int fd, struct burn_drive *d, int flag)
 {
-	int ret;
+	int ret, do_fsync;
 	char *msg = NULL;
 
 	if (fd < 0) {
@@ -2658,14 +2729,23 @@ int burn_stdio_sync_cache(int fd, struct burn_drive *d, int flag)
 			"Invalid file descriptor with stdio pseudo-drive",
 			0, 0);
 		d->cancel = 1;
-		return 0;
+		ret = 0; goto ex;
 	}
 	d->needs_sync_cache = 0;
-	if (!(flag & 1))
-		libdax_msgs_submit(libdax_messenger, -1, 0x00000002,
-			   LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_ZERO,
-			   "syncing cache (stdio fsync)", 0, 0);
-	ret = fsync(fd);
+	do_fsync = 0;
+	if (flag & 2)
+		do_fsync = 1;
+	else if (d->write_opts != NULL)
+		do_fsync = (d->write_opts->stdio_fsync_size >= 0);
+	if (do_fsync) {
+		if (!(flag & 1))
+			libdax_msgs_submit(libdax_messenger, -1, 0x00000002,
+				LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_ZERO,
+				"syncing cache (stdio fsync)", 0, 0);
+		ret = fsync(fd);
+	} else {
+		ret = 0;
+	}
 	if (ret != 0 && errno == EIO) {
 		BURN_ALLOC_MEM(msg, char, 160);
 
@@ -2677,7 +2757,7 @@ int burn_stdio_sync_cache(int fd, struct burn_drive *d, int flag)
 			LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
 			msg, errno, 0);
 		d->cancel = 1;
-		return 0;
+		ret = 0; goto ex;
 	}
 	ret = 1;
 ex:;
@@ -2694,31 +2774,57 @@ void burn_stdio_mmc_sync_cache(struct burn_drive *d)
 }
 
 
-/* ts A70912 */
-/* Enforces eventual nominal write speed.
-   @param flag bit0= initialize *prev_time */
-int burn_stdio_slowdown(struct burn_drive *d, struct timeval *prev_time,
-			 int amount, int flag)
+/* ts C00824 : API */
+/* Enforces nominal write speed */
+int burn_nominal_slowdown(int kb_per_second, int max_corr,
+			  struct timeval *prev_time,
+			  int *us_corr, off_t b_since_prev, int flag)
 {
 	struct timeval tnow;
-	struct timezone dummy_tz;
-	double to_wait;
+	double to_wait, goal, corr;
+	int abs_max_corr;
 
 	if (flag & 1) {
-		gettimeofday(prev_time, &dummy_tz);
+		gettimeofday(prev_time, NULL);
+		*us_corr = 0;
 		return 1;
 	}
-	if(d->nominal_write_speed <= 0)
+	if (kb_per_second <= 0)
 		return 2;
-	gettimeofday(&tnow, &dummy_tz);
-	to_wait = ( ((double) amount) / (double) d->nominal_write_speed ) - 
-		(double) ( tnow.tv_sec - prev_time->tv_sec ) -
-		(double) ( tnow.tv_usec - prev_time->tv_usec ) / 1.0e6
-		- 0.001; /* best would be 1 / kernel granularity HZ */
-	if (to_wait >= 0.0001) {
-		usleep((int) (to_wait * 1000000.0));
+
+	if (max_corr < -1.0e9 || max_corr > 1.0e9)
+		abs_max_corr = 1000000000;
+	else
+		abs_max_corr = abs(max_corr);
+	gettimeofday(&tnow, NULL);
+	goal = ((double) b_since_prev) / 1000.0 / ((double) kb_per_second) +
+		((double) prev_time->tv_sec) +
+		((double) prev_time->tv_usec) / 1.0e6 +
+		((double) *us_corr) / 1.0e6 ;
+	to_wait = goal - ((double) tnow.tv_sec) -
+		  ((double) tnow.tv_usec) / 1.0e6;
+
+	/* usleep might be restricted to 999999 microseconds */
+	while (to_wait > 0.0) {
+		if (to_wait >= 0.5) {
+			usleep(500000);
+			to_wait -= 0.5;
+		} else if (to_wait >= 0.00001) {
+			usleep((int) (to_wait * 1000000.0));
+			to_wait = 0.0;
+		} else {
+			to_wait = 0.0;
+		}	
 	}
-	gettimeofday(prev_time, &dummy_tz);
+	gettimeofday(prev_time, NULL);
+	corr = (goal - ((double) prev_time->tv_sec) -
+		((double) prev_time->tv_usec) / 1.0e6) * 1.0e6;
+	if (corr > abs_max_corr)
+		*us_corr = abs_max_corr;
+	else if (corr < -abs_max_corr)
+		*us_corr = -abs_max_corr;
+	else
+		*us_corr = corr;
 	return 1;
 }
 
@@ -2727,17 +2833,20 @@ int burn_stdio_slowdown(struct burn_drive *d, struct timeval *prev_time,
 int burn_stdio_write_track(struct burn_write_opts *o, struct burn_session *s,
 				int tnum, int flag)
 {
-	int open_ended, bufsize = 16 * 2048, ret, sectors;
+	int open_ended, bufsize = 16 * 2048, ret;
 	struct burn_track *t = s->track[tnum];
 	struct burn_drive *d = o->drive;
 	char *buf = NULL;
-	int i, prev_sync_sector = 0;
+	int us_corr = 0, max_corr = 250000;
+	off_t prev_sync_sector = 0, sectors, i;
 	struct buffer *out = d->buffer;
 	struct timeval prev_time;
 
 	BURN_ALLOC_MEM(buf, char, bufsize);
 
-	sectors = burn_track_get_sectors_2(t, 1);
+	sectors = burn_track_get_sectors_2_v2(t, 1);
+	if (sectors < 0)
+		{ret = 0; goto ex;}
 	burn_disc_init_track_status(o, s, t, tnum, sectors);
 	open_ended = burn_track_is_open_ended(t);
 
@@ -2748,9 +2857,13 @@ int burn_stdio_write_track(struct burn_write_opts *o, struct burn_session *s,
 		d->write = burn_stdio_mmc_dummy_write;
 	else
 		d->write = burn_stdio_mmc_write;
+	d->do_simulate = o->simulate;
 	d->sync_cache = burn_stdio_mmc_sync_cache;
 
-	burn_stdio_slowdown(d, &prev_time, 0, 1); /* initialize */
+	/* initialize */
+	burn_nominal_slowdown(d->nominal_write_speed, max_corr,
+				&prev_time, &us_corr, (off_t) 0, 1);
+
 	for (i = 0; open_ended || i < sectors; i++) {
 		/* transact a (CD sized) sector */
 		if (!sector_data(o, t, 0))
@@ -2763,14 +2876,25 @@ int burn_stdio_write_track(struct burn_write_opts *o, struct burn_session *s,
 		}
 		d->progress.sector++;
 		/* Flush to disk from time to time */
-		if (d->progress.sector - prev_sync_sector >=
-		    o->stdio_fsync_size && o->stdio_fsync_size > 0) {
-			prev_sync_sector = d->progress.sector;
-			if (!o->simulate)
-				burn_stdio_sync_cache(d->stdio_fd, d, 1);
+		if (o->stdio_fsync_size > 0) {
+			if (d->progress.sector - prev_sync_sector >=
+			    o->stdio_fsync_size) {
+				if (!o->simulate)
+					burn_stdio_sync_cache(d->stdio_fd, d,
+									 1);
+				burn_nominal_slowdown(
+					d->nominal_write_speed, max_corr,
+					&prev_time, &us_corr,
+					(off_t) (d->progress.sector -
+						 prev_sync_sector) *
+						 (off_t) 2048,
+					0);
+				prev_sync_sector = d->progress.sector;
+			}
+		} else if ((d->progress.sector % 512) == 0) {
+			burn_nominal_slowdown(d->nominal_write_speed, max_corr,
+				&prev_time, &us_corr, (off_t) (512 * 2048), 0);
 		}
-		if ((d->progress.sector % 512) == 0) 
-			burn_stdio_slowdown(d, &prev_time, 512 * 2, 0);
 	}
 
 	/* Pad up buffer to next full o->obs (usually 32 kB) */
@@ -2843,10 +2967,10 @@ ex:;
 		close(d->stdio_fd);
 	d->stdio_fd = -1;
 
-	/* update media state records */
+	/* update pseudo-media state records by re-grabbing */
 	burn_drive_mark_unready(d, 8);
+	burn_drive_grab_stdio(d, 1);
 
-	/* <<< d->busy = BURN_DRIVE_IDLE; */
 	return ret;
 }
 
@@ -2858,7 +2982,7 @@ void burn_disc_write_sync(struct burn_write_opts *o, struct burn_disc *disc)
 	struct buffer *buffer_mem = o->drive->buffer;
 	struct burn_session *s;
 	struct burn_track *lt, *t;
-	int first = 1, i, ret, lba, nwa = 0, multi_mem;
+	int first = 1, i, ret, lba, nwa = 0, multi_mem, stream_recording_start;
 	off_t default_size;
 	char msg[80];
 
@@ -2870,12 +2994,13 @@ void burn_disc_write_sync(struct burn_write_opts *o, struct burn_disc *disc)
 	/* ts A61224 */
 	burn_disc_init_write_status(o, disc); /* must be done very early */
 
-	/* ts A80412 , A90227 */
-	d->do_stream_recording = !!o->do_stream_recording;
+	/* ts A80412 , A90227 , B90411 */
 	if (o->do_stream_recording >= 16)
-		d->stream_recording_start = o->do_stream_recording;
+		stream_recording_start = o->do_stream_recording;
 	else
-		d->stream_recording_start = 0;
+		stream_recording_start = 0;
+	burn_drive_set_stream_recording(d, !!o->do_stream_recording,
+					stream_recording_start, 0);
 
 	/* ts A91122 : Get buffer suitable for sources made by
 	               burn_os_open_track_src() */
@@ -3005,6 +3130,7 @@ return crap.  so we send the command, then ignore the result.
 		/* goto fail_wo_sync; */
 #endif /* Libburn_write_with_function_print_cuE */
 
+		d->medium_state_changed = 1;
 		ret = 1;
 		if (o->write_type == BURN_WRITE_SAO)
 			ret = d->send_cue_sheet(d, sheet);
@@ -3122,6 +3248,18 @@ ex:;
 		burn_os_free_buffer((char *) d->buffer,
 					sizeof(struct buffer), 0);
 	d->buffer = buffer_mem;
+	if (d->write_opts != NULL) {
+		burn_write_opts_free(d->write_opts);
+		d->write_opts = NULL;
+	}
+	if (d->write_retry_count > 0) {
+		sprintf(msg, "WRITE command repetition happened %u times",
+			d->write_retry_count);
+		libdax_msgs_submit(libdax_messenger, d->global_index,
+			0x000201ad,
+			LIBDAX_MSGS_SEV_NOTE, LIBDAX_MSGS_PRIO_HIGH,
+			msg, 0, 0);
+	}
 	return;
 }
 
@@ -3130,6 +3268,7 @@ int burn_random_access_write(struct burn_drive *d, off_t byte_address,
 				char *data, off_t data_count, int flag)
 {
 	int alignment = 0, start, upto, chunksize, err, fd = -1, ret;
+	int do_close = 0, getfl_ret;
 	char msg[81], *rpt;
 	struct buffer *buf = NULL, *buffer_mem = d->buffer;
 
@@ -3202,11 +3341,27 @@ int burn_random_access_write(struct burn_drive *d, off_t byte_address,
 			"Drive is busy on attempt to write random access",0,0);
 		{ret = 0; goto ex;}
 	}
-	if(d->drive_role != 1) {
-		fd = burn_stdio_open_write(d, byte_address, 2048, 0);
-		if (fd == -1)
-			{ret = 0; goto ex;}
+	if (d->drive_role != 1) {
+		if (d->stdio_fd >= 0) {
+			/* Avoid to have a read-only fd open */
+			getfl_ret = fcntl(d->stdio_fd, F_GETFL);
+			if (((O_RDWR | O_WRONLY | O_RDONLY) & getfl_ret) ==
+			    O_RDONLY) {
+				close(d->stdio_fd);
+				d->stdio_fd = -1;
+			}
+		}
+		if (d->stdio_fd >= 0) {
+			/* Avoid to have two fds open */
+			fd = d->stdio_fd;
+		} else {
+			fd = burn_stdio_open_write(d, byte_address, 2048, 0);
+			if (fd == -1)
+				{ret = 0; goto ex;}
+			do_close = 1;
+		}
 	}
+	d->cancel = 0;
 	d->busy = BURN_DRIVE_WRITING_SYNC;
 	d->buffer = buf;
 
@@ -3222,7 +3377,9 @@ int burn_random_access_write(struct burn_drive *d, off_t byte_address,
 		rpt += d->buffer->bytes;
 		d->buffer->sectors = chunksize;
 		d->nwa = start;
-		if(d->drive_role == 1) {
+		if(d->do_simulate) {
+			err = 0;
+		} else if(d->drive_role == 1) {
 			err = d->write(d, d->nwa, d->buffer);
 		} else {
 			ret = burn_stdio_write(fd, (char *) d->buffer->data,
@@ -3233,7 +3390,7 @@ int burn_random_access_write(struct burn_drive *d, off_t byte_address,
 		}
 		if (err == BE_CANCELLED) {
 			d->busy = BURN_DRIVE_IDLE;
-			if(fd >= 0)
+			if(fd >= 0 && do_close)
 				close(fd);
 			{ret = -(start * 2048 - byte_address); goto ex;}
 		}
@@ -3242,14 +3399,16 @@ int burn_random_access_write(struct burn_drive *d, off_t byte_address,
 	if(d->drive_role == 1)
 		d->needs_sync_cache = 1;
 	if(flag & 1) {
-		if(d->drive_role == 1)
+		if(d->do_simulate) {
+			;
+		} else if(d->drive_role == 1)
 			d->sync_cache(d);
 		else
-			burn_stdio_sync_cache(fd, d, 0);
+			burn_stdio_sync_cache(fd, d, 2);
 		d->needs_sync_cache = 0;
 	}
 		
-	if(fd >= 0)
+	if(fd >= 0 && do_close)
 		close(fd);
 	d->buffer = buffer_mem;
 	d->busy = BURN_DRIVE_IDLE;

test/fake_au.c

@@ -3,7 +3,8 @@
    Fakes a file in SUN .au format from a raw little-endian PCM audio file
    (e.g. a file extracted from .wav by test/dewav). The input data are assumed
    to be 16 bit, stereo, 44100 Hz.
-   Copyright (C) 2006 Thomas Schmitt <scdbackup@gmx.net>, provided under GPL
+   Copyright (C) 2006 - 2015 Thomas Schmitt <scdbackup@gmx.net>
+   Provided under GPL version 2 or later.
 
    Info used: http://www.opengroup.org/public/pubs/external/auformat.html
 */
@@ -47,6 +48,13 @@ int main(int argc, char **argv)
    exit_value= 1;
    goto help;
  }
+ for(i= 1; i<argc; i++) {
+   if(strlen(argv[i]) >= 4096) {
+     fprintf(stderr,"%s: argument at position %d is much too long.\n",
+             argv[0], i);
+     exit(1);
+   }
+ }
  for(i= 1; i<argc; i++) {
    if(strcmp(argv[i],"-o")==0) {
      if(i>=argc-1) {

test/libburner.c

@@ -1,6 +1,6 @@
 
 /* test/libburner.c , API illustration of burning data or audio tracks to CD */
-/* Copyright (C) 2005 - 2011 Thomas Schmitt <scdbackup@gmx.net> */
+/* Copyright (C) 2005 - 2016 Thomas Schmitt <scdbackup@gmx.net> */
 /* Provided under GPL, see also "License and copyright aspects" at file end */
 
 
@@ -16,23 +16,25 @@
   to serve the libburnia team as reference application. libburner.c does indeed
   define the standard way how above three gestures can be implemented and
   stay upward compatible for a good while.
+  There is another demo program, test/telltoc.c, which inspects drive, media
+  state, and media contents.
   
   Before you can do anything, you have to initialize libburn by
      burn_initialize()
   and provide some signal and abort handling, e.g. by the builtin handler, by
      burn_set_signal_handling("libburner : ", NULL, 0x0) 
   as it is done in main() at the end of this file.
-  Then you aquire a drive in an appropriate way conforming to the API. The twoi
+  Then you acquire a drive in an appropriate way conforming to the API. The two
   main approaches are shown here in application functions:
      libburner_aquire_by_adr()     demonstrates usage as of cdrecord traditions
      libburner_aquire_by_driveno()      demonstrates a scan-and-choose approach
 
-  With that aquired drive you can blank a CD-RW or DVD-RW as shown in
+  With that acquired drive you can blank a CD-RW or DVD-RW as shown in
      libburner_blank_disc()
   or you can format a DVD-RW to profile "Restricted Overwrite" (needed once)
   or an unused BD to default size with spare blocks
      libburner_format()
-  With the aquired drive you can burn to CD, DVD, BD. See
+  With the acquired drive you can burn to CD, DVD, BD. See
      libburner_payload()
 
   These three functions switch temporarily to a non-fatal signal handler
@@ -96,12 +98,12 @@ static unsigned int drive_count;
     finally released */
 static int drive_is_grabbed = 0;
 
-/** A number and a text describing the type of media in aquired drive */
+/** A number and a text describing the type of media in acquired drive */
 static int current_profile= -1;
 static char current_profile_name[80]= {""};
 
 
-/* Some in-advance definitions to allow a more comprehensive ordering
+/* Some in-advance definitions make possible a more comprehensive ordering
    of the functions and their explanations in here */
 int libburner_aquire_by_adr(char *drive_adr);
 int libburner_aquire_by_driveno(int *drive_no);
@@ -109,7 +111,7 @@ int libburner_aquire_by_driveno(int *drive_no);
 
 /* ------------------------------- API gestures ---------------------------- */
 
-/** You need to aquire a drive before burning. The API offers this as one
+/** You need to acquire a drive before burning. The API offers this as one
     compact call and alternatively as application controllable gestures of
     whitelisting, scanning for drives and finally grabbing one of them.
 
@@ -237,14 +239,14 @@ int libburner_aquire_by_driveno(int *driveno)
 	and to restart when the choice has been made. The list of selectable
 	drives should also hold persistent drive addresses as obtained
 	above by burn_drive_get_adr(). By such an address one may use
-	burn_drive_scan_and_grab() to finally aquire exactly one drive.
+	burn_drive_scan_and_grab() to finally acquire exactly one drive.
 
 	A not yet tested shortcut should be to call burn_drive_info_free()
 	and to call either burn_drive_scan() or burn_drive_scan_and_grab()
 	before accessing any drives again.
 
 	In both cases you have to be aware that the desired drive might get
-	aquired in the meantime by another user resp. libburn process.
+	acquired in the meantime by another user or libburn process.
 	*/
 
 	/* We already made our choice via command line. (default is 0)
@@ -433,28 +435,31 @@ int libburner_format(struct burn_drive *drive)
 
     In case of external signals expect abort handling of an ongoing burn to
     last up to a minute. Wait the normal burning timespan before any kill -9.
-
-    For simplicity, this function allows memory leaks in case of failure.
-    In apps which do not abort immediately, one should clean up better.
 */
 int libburner_payload(struct burn_drive *drive, 
 		      char source_adr[][4096], int source_adr_count,
 		      int multi, int simulate_burn, int all_tracks_type)
 {
-	struct burn_source *data_src, *fifo_src[99];
-	struct burn_disc *target_disc;
-	struct burn_session *session;
-	struct burn_write_opts *burn_options;
+	struct burn_source *data_src = NULL, *fifo_src[99];
+	struct burn_disc *target_disc = NULL;
+	struct burn_session *session = NULL;
+	struct burn_write_opts *burn_options = NULL;
 	enum burn_disc_status disc_state;
 	struct burn_track *track, *tracklist[99];
 	struct burn_progress progress;
 	time_t start_time;
 	int last_sector = 0, padding = 0, trackno, unpredicted_size = 0, fd;
 	int fifo_chunksize = 2352, fifo_chunks = 1783; /* ~ 4 MB fifo */
+	int ret;
 	off_t fixed_size;
 	char *adr, reasons[BURN_REASONS_LEN];
 	struct stat stbuf;
 
+	for (trackno = 0 ; trackno < source_adr_count; trackno++) {
+		fifo_src[trackno] = NULL;
+		tracklist[trackno] = NULL;
+	}
+
 	if (all_tracks_type != BURN_AUDIO) {
 		all_tracks_type = BURN_MODE1;
 		/* a padding of 300 kiB helps to avoid the read-ahead bug */
@@ -488,7 +493,7 @@ int libburner_payload(struct burn_drive *drive,
 
 	  /* Convert this filedescriptor into a burn_source object */
 	  data_src = NULL;
-	  if (fd>=0)
+	  if (fd >= 0)
 	  	data_src = burn_fd_source_new(fd, -1, fixed_size);
 	  if (data_src == NULL) {
 		fprintf(stderr,
@@ -496,7 +501,7 @@ int libburner_payload(struct burn_drive *drive,
 		if(errno!=0)
 			fprintf(stderr,"(Most recent system error: %s )\n",
 				strerror(errno));
-		return 0;
+		{ret = 0; goto ex;}
 	  }
 	  /* Install a fifo object on top of that data source object */
 	  fifo_src[trackno] = burn_fifo_source_new(data_src,
@@ -504,7 +509,7 @@ int libburner_payload(struct burn_drive *drive,
 	  if (fifo_src[trackno] == NULL) {
 		fprintf(stderr,
 			"FATAL: Could not create fifo object of 4 MB\n");
-		return 0;
+		{ret = 0; goto ex;}
 	  }
 
 	  /* Use the fifo object as data source for the track */
@@ -512,7 +517,7 @@ int libburner_payload(struct burn_drive *drive,
 							 != BURN_SOURCE_OK) {
 		fprintf(stderr,
 		       "FATAL: Cannot attach source object to track object\n");
-		return 0;
+		{ret = 0; goto ex;}
 	  }
 
 	  burn_session_add_track(session, track, BURN_POS_END);
@@ -520,6 +525,7 @@ int libburner_payload(struct burn_drive *drive,
 
 	  /* Give up local reference to the data burn_source object */
 	  burn_source_free(data_src);
+	  data_src = NULL;
 	  
 	} /* trackno loop end */
 
@@ -536,7 +542,7 @@ int libburner_payload(struct burn_drive *drive,
 		else
 			fprintf(stderr,
 			 "FATAL: Cannot recognize state of drive and media\n");
-		return 0;
+		{ret = 0; goto ex;}
 	}
 
 	burn_options = burn_write_opts_new(drive);
@@ -551,7 +557,7 @@ int libburner_payload(struct burn_drive *drive,
 					reasons, 0) == BURN_WRITE_NONE) {
 		fprintf(stderr, "FATAL: Failed to find a suitable write mode with this media.\n");
 		fprintf(stderr, "Reasons given:\n%s\n", reasons);
-		return 0;
+		{ret = 0; goto ex;}
 	}
 	burn_set_signal_handling("libburner : ", NULL, 0x30);
 
@@ -559,7 +565,6 @@ int libburner_payload(struct burn_drive *drive,
 	start_time = time(0);
 	burn_disc_write(burn_options, target_disc);
 
-	burn_write_opts_free(burn_options);
 	while (burn_drive_get_status(drive, NULL) == BURN_DRIVE_SPAWNING)
 		usleep(100002);
 	while (burn_drive_get_status(drive, &progress) != BURN_DRIVE_IDLE) {
@@ -595,21 +600,32 @@ int libburner_payload(struct burn_drive *drive,
 	}
 	printf("\n");
 
-	for (trackno = 0 ; trackno < source_adr_count; trackno++) {
-	  	burn_source_free(fifo_src[trackno]);
-		burn_track_free(tracklist[trackno]);
-	}
-	burn_session_free(session);
-	burn_disc_free(target_disc);
 	if (burn_is_aborting(0) > 0)
-		return -1;
+		{ret = -1; goto ex;}
 	if (multi && current_profile != 0x1a && current_profile != 0x13 &&
 		current_profile != 0x12 && current_profile != 0x43) 
 			/* not with DVD+RW, formatted DVD-RW, DVD-RAM, BD-RE */
 		printf("NOTE: Media left appendable.\n");
 	if (simulate_burn)
 		printf("\n*** Did TRY to SIMULATE burning ***\n\n");
-	return 1;
+	ret = 1;
+ex:;
+	/* Dispose objects */
+	if (burn_options != NULL)
+		burn_write_opts_free(burn_options);
+	for (trackno = 0 ; trackno < source_adr_count; trackno++) {
+		if (fifo_src[trackno] != NULL)
+	  		burn_source_free(fifo_src[trackno]);
+		if (tracklist[trackno])
+			burn_track_free(tracklist[trackno]);
+	}
+	if (data_src != NULL)
+		burn_source_free(data_src);
+	if (session != NULL)
+		burn_session_free(session);
+	if (target_disc != NULL)
+		burn_disc_free(target_disc);
+	return ret;
 }
 
 
@@ -768,7 +784,7 @@ int main(int argc, char **argv)
 	/** Note: driveno might change its value in this call */
 	ret = libburner_aquire_drive(drive_adr, &driveno);
 	if (ret<=0) {
-		fprintf(stderr,"\nFATAL: Failed to aquire drive.\n");
+		fprintf(stderr,"\nFATAL: Failed to acquire drive.\n");
 		{ ret = 34; goto finish_libburn; }
 	}
 	if (ret == 2)

test/poll.c

@@ -7,6 +7,7 @@
 #include <unistd.h>
 #include <stdio.h>
 #include <signal.h>
+#include <string.h>
 #include <assert.h>
 
 static struct burn_drive_info *drives;
@@ -62,6 +63,7 @@ int main()
 		return 1;
 	} 
 
+	memset(&newact, 0, sizeof(newact));
 	newact.sa_handler = catch_int;
 	sigaction(SIGINT, &newact, &oldact);
 	for (i = 0; i < (int) n_drives; i++) {

test/structest.c

@@ -1,51 +0,0 @@
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <libburn/libburn.h>
-
-int main(int argc, char **argv)
-{
-	int i;
-	const char *path;
-	struct burn_track *track;
-	struct burn_disc *disc;
-	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);
-
-	/* Define a source for all of the tracks */
-	path = strdup("/etc/hosts");
-	src = burn_file_source_new(path, NULL);
-
-	/* Add ten tracks to a session */
-	for (i = 0; i < 10; i++) {
-		track = burn_track_create();
-		burn_session_add_track(session, track, 0);
-		if (burn_track_set_source(track, src) != BURN_SOURCE_OK) {
-			printf("problem with the source\n");
-			return 0;
-		}
-	}
-
-	/* Add ten tracks to a session */
-	for (i = 0; i < 10; i++) {
-		track = burn_track_create();
-		burn_session_add_track(session, track, 0);
-		if (burn_track_set_source(track, src) != BURN_SOURCE_OK) {
-			printf("problem with the source\n");
-			return 0;
-		}
-	}
-
-	/* Delete a session */
-	burn_session_remove_track(session, track);
-
-	burn_structure_print_disc(disc);
-	return EXIT_SUCCESS;
-}

test/telltoc.c

@@ -1,32 +1,35 @@
 
 /*  test/telltoc.c , API illustration of obtaining media status info */
-/*  Copyright (C) 2006 - 2011 Thomas Schmitt <scdbackup@gmx.net> 
+/*  Copyright (C) 2006 - 2016 Thomas Schmitt <scdbackup@gmx.net> 
     Provided under GPL */
 
 /**                               Overview 
   
   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
   compatible for a good while.
+  The burn aspects of libburn are demonstrated by program test/libburner.c .
   
   Before you can do anything, you have to initialize libburn by
      burn_initialize()
-  as it is done in main() at the end of this file. Then you aquire a
+  as it is done in main() at the end of this file. Then you acquire a
   drive in an appropriate way conforming to the API. The two main
   approaches are shown here in application functions:
      telltoc_aquire_by_adr()       demonstrates usage as of cdrecord traditions
      telltoc_aquire_by_driveno()   demonstrates a scan-and-choose approach
-  With that aquired drive you can call
+  With that acquired drive you can call
      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()
@@ -69,20 +72,21 @@ static unsigned int drive_count;
 static int drive_is_grabbed = 0;
 
 
-/* Some in-advance definitions to allow a more comprehensive ordering
+/* Some in-advance definitions to make possible a more comprehensive ordering
    of the functions and their explanations in here */
 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 ---------------------------- */
 
-/** You need to aquire a drive before burning. The API offers this as one
+/** You need to acquire a drive before burning. The API offers this as one
     compact call and alternatively as application controllable gestures of
     whitelisting, scanning for drives and finally grabbing one of them.
 
@@ -116,10 +120,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,11 +128,7 @@ 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);
+	fprintf(stderr,"Acquiring drive '%s' ...\n", libburn_drive_adr);
 	ret = burn_drive_scan_and_grab(&drive_list, libburn_drive_adr, 1);
 
 	if (ret <= 0) {
@@ -143,10 +139,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;
 }
 
@@ -248,12 +240,14 @@ int telltoc_regrab(struct burn_drive *drive) {
 
 int telltoc_media(struct burn_drive *drive)
 {
-	int ret, media_found = 0, profile_no = -1;
+	int ret, media_found = 0, profile_no = -1, num_profiles = 0, i;
+	int profiles[64];
+	char is_current_profile[64];
 	double max_speed = 0.0, min_speed = 0.0, speed_conv;
 	off_t available = 0;
 	enum burn_disc_status s;
 	char profile_name[80], speed_unit[40];
-	struct burn_multi_caps *caps;
+	struct burn_multi_caps *caps = NULL;
 	struct burn_write_opts *o = NULL;
 
 	printf("Media current: ");
@@ -266,14 +260,31 @@ int telltoc_media(struct burn_drive *drive)
 	} else
 		printf("is not recognizable\n");
 
+	/* Determine speed unit before profile_name gets reused */
 	speed_conv = 176.4;
 	strcpy(speed_unit,"176.4 kB/s  (CD, data speed 150 KiB/s)");
 	if (strstr(profile_name, "DVD") == profile_name) {
 		speed_conv = 1385.0;
 		strcpy(speed_unit,"1385.0 kB/s  (DVD)");
-	}
+	} else if (strstr(profile_name, "BD") == profile_name) {
+                speed_conv = 4495.625;
+		strcpy(speed_unit,"4495.625 kB/s  (BD)");
+        }
 
-	/* >>> libburn does not obtain full profile list yet */
+	ret = burn_drive_get_all_profiles(drive, &num_profiles, profiles,
+					is_current_profile);
+	if (ret > 0) {
+		for (i = 0; i < num_profiles; i++) {
+			ret = burn_obtain_profile_name(profiles[i],
+							profile_name);
+			if (ret <= 0)
+				sprintf(profile_name,
+					"Unknown media type 0x%4.4X",
+					(unsigned int) profiles[i]);
+			printf("Drive can do : %s%s\n", profile_name,
+				is_current_profile[i] ? " (current)" : "");
+		}
+	}
 
 	printf("Media status : ");
 	s = burn_disc_get_status(drive);
@@ -305,15 +316,15 @@ int telltoc_media(struct burn_drive *drive)
 		/* Media appears writeable */
 		printf("Write multi  : ");
 		printf("%s multi-session , ",
-			 caps->multi_session == 1 ? "allows" : "prohibits");
+			 caps->multi_session == 1 ? "offers" : "cannot do");
 		if (caps->multi_track)
-			printf("allows multiple tracks\n");
+			printf("offers multiple tracks\n");
 		else
-			printf("enforces single track\n");
+			printf("offers only single track\n");
 		printf("Write start  : ");
 		if (caps->start_adr == 1)
 			printf(
-			"allows addresses [%.f , %.f]s , alignment=%.fs\n",
+			"offers addresses [%.f , %.f]s , alignment=%.fs\n",
 				(double) caps->start_range_low / 2048 ,
 				(double) caps->start_range_high / 2048 ,
 				(double) caps->start_alignment / 2048 );
@@ -388,6 +399,8 @@ int telltoc_media(struct burn_drive *drive)
 	}
 	printf("Speed unit 1x: %s\n", speed_unit);
 
+	if (caps != NULL)
+		burn_disc_free_multi_caps(&caps);
 	return 1;
 }
 
@@ -464,12 +477,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 +525,20 @@ int telltoc_toc(struct burn_drive *drive)
 				pframe = toc_entry.pframe;
 				lba= burn_msf_to_lba(pmin, psec, pframe);
 			}
-			printf("Media content: session %2d  ", session_no+1);
-			printf("track    %2d %s  lba: %9d  %4.2d:%2.2d:%2.2d\n",
+
+			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 %3d  ", session_no+1);
+			printf("track    %3d %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;
 		}
@@ -517,14 +553,11 @@ int telltoc_toc(struct burn_drive *drive)
 			pframe = toc_entry.pframe;
 			lba= burn_msf_to_lba(pmin, psec, pframe);
 		}
-		printf("Media content: session %2d  ", session_no+1);
-		printf("leadout            lba: %9d  %4.2d:%2.2d:%2.2d\n",
+		printf("Media content: session %3d  ", session_no+1);
+		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 +630,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,26 +672,63 @@ 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) {
-			if (data_count > 0)
-				fwrite(buf, data_count, 1, raw_fp);
+			if (data_count > 0) {
+				ret = fwrite(buf, data_count, 1, raw_fp);
+				if (ret < 1) {
+                   	 		fprintf(stderr,
+					    "FAILURE: writing to '%s' : %s\n",
+					    raw_file, strerror(errno));
+					fclose(raw_fp);
+					return 1;
+				}
+			}
 		} 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 +744,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 +756,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,8 +779,11 @@ 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));
 
+	if (raw_fp != NULL)
+		fclose(raw_fp);
 	return ret;
 }
 
@@ -728,6 +808,13 @@ int telltoc_setup(int argc, char **argv)
 {
     int i;
 
+    for (i = 1; i < argc; ++i) {
+        if (strlen(argv[i]) >= 4096) {
+            fprintf(stderr,
+                  "Argument at position %d is much too long. (Max 4095)\n", i);
+            return 2;
+        }
+    }
     for (i = 1; i < argc; ++i) {
         if (!strcmp(argv[i], "--drive")) {
             ++i;
@@ -769,7 +856,8 @@ int telltoc_setup(int argc, char **argv)
             sscanf(argv[i-2], "%d", &read_start);
             sscanf(argv[i-1], "%d", &read_count);
             print_encoding = 0;
-            if(strncmp(argv[i], "raw:", 4) == 0 || strcmp(argv[i],"1:") == 0) {
+            if(strncmp(argv[i], "raw:", 4) == 0 ||
+               strncmp(argv[i], "1:", 2) == 0) {
                 print_encoding = 1;
                 strcpy(print_raw_file, strchr(argv[i], ':') + 1);
 		if (strcmp(print_raw_file, "-") == 0) {
@@ -808,10 +896,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 +979,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);
@@ -916,6 +1004,6 @@ finish_libburn:;
 }
 
 /*  License and copyright aspects:
-    See libburner.c
+    See test/libburner.c
 */