Documented changes and release timestamp

Updated cdrskin tarball generator
Made number transition to 0.8.4
2010-06-30 10:59:01 +00:00 · 2010-06-30 10:57:55 +00:00 · 2010-06-30 10:56:55 +00:00 · 2010-06-30 09:14:13 +00:00
63 changed files with 2163 additions and 5144 deletions
--- a/2
+++ b/2
@ -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-2010 Mario Danic, Thomas Schmitt


    This program is free software; you can redistribute it and/or modify
--- a/300
+++ b/300
@ -1,299 +1 @@
-
-libburn-1.1.0.tar.gz Sat Jun 18 2011
-===============================================================================
-* Bug fix: burn_disc_format() on DVD-RW issued wrong block size with type 00h
-* New API call burn_disc_next_track_is_damaged()
-* New API call burn_disc_close_damaged()
-* Dropped suffix .plXY from tarball name
-
-Release 1.0.8 was skipped to get back in sync with libisofs and libisoburn.
-
-libburn-1.0.6.pl00.tar.gz Sat Apr 9 2011
-===============================================================================
-* Burning DVD-R DAO with 2 kB size granularity rather than 32 kB
-* New API call burn_allow_drive_role_4()
-
-libburn-1.0.4.pl00.tar.gz Thu Mar 3 2011
-===============================================================================
-* Bug fix: Read-only file descriptors were classified as write-only pseudo
-           drives
-
-libburn-1.0.2.pl00.tar.gz Wed Feb 23 2011
-===============================================================================
-* Removed compilation obstacles on Solaris 9.
-* Improved recognition of non-seekable stdio pseudo-drives.
-
-libburn-1.0.0.pl00.tar.gz Sun Jan 16 2011
-===============================================================================
-* Allowed umask to create stdio-drive files with rw-permissions for all
-* cdrskin now refuses to burn if the foreseeable size exceeds media capacity
-
-libburn-0.9.0.pl00.tar.gz Wed Dec 08 2010
-===============================================================================
-* Regression fix: SCSI reply data logging was disabled in release 0.8.6
-
-libburn-0.8.8.pl00.tar.gz Wed Oct 20 2010
-===============================================================================
-* New API call burn_offst_source_new()
-* New API call burn_disc_get_bd_spare_info()
-
-libburn-0.8.6.pl00.tar.gz Fri Sep 17 2010
-===============================================================================
-* Lifted test reservation on DVD-R DL media.
-* Hiding all non-API symbols from the linker by use of --version-script
-* Now with history of release notes in ./ChangeLog file.
-
-libburn-0.8.4.pl00.tar.gz Wed Jun 30 2010
-===============================================================================
-* General POSIX system adapters ignore SIGWINCH and SIGURG if defined
-* Allowed 64 kB max output buffer size on all OSes
-
-libburn-0.8.2.pl00.tar.gz Fri Jun 11 2010
-===============================================================================
-* New system adapter for Solaris uscsi (tested on snv134, kernel 5.11)
-* Bug fix: CD TOC was not read if the first track did not start at LBA 0
-* Bug fix: CD-ROM media got attributed random lead-in and lead-out adresses
-* Bug fix: SIGSEGV of experimental libcdio system adapter if drive list is
-  empty
-
-libburn-0.8.0.pl00.tar.gz Fri Apr 09 2010
-===============================================================================
-* libburn now works with ahci driver on FreeBSD 8-STABLE.
-
-libburn-0.7.8.pl00.tar.gz Wed Mar 10 2010
-===============================================================================
-* Bug fix: On FreeBSD, piped input was falsely attributed a small fixed size.
-* Built-in abort handling is more suitable for FreeBSD now.
-cdrskin novelties:
-* Bug fix: Option fs=0 led to SIGSEGV. Regression introduced by version 0.7.4
-  in december 2009.
-* Abort handling is more suitable for FreeBSD now.
-
-libburn-0.7.6.pl00.tar.gz Sat Jan 23 2010
-===============================================================================
-* Bug fix: System adapter for generic X/Open was missing in libburn release
-  tarball
-* Bug fix: with non-Linux adapters there were 0 readable bytes on block devices
-* Made FreeBSD system adapter safe from mutal burn spoiling and drive deadlock
-* Enabled FreeBSD system adapter for Debian kfreebsd
-* Experimental SCSI transport adapter via GNU libcdio 0.83git
-cdrskin novelties:
-* none
-
-libburn-0.7.4.pl01.tar.gz Sat Dec 26 2009
-===============================================================================
-* Bug fix: Added missing system adapter for generic X/Open to libburn release
-  tarball
-
-Libburn 0.7.4.pl00 Mon Dec 07 2009
-===============================================================================
-* Bug fix: SIGSEGV from NULL pointer with media product id inquiry on LG
-  GH22LS30
-* Bug fix: DVD DAO track size was rounded up much too generously
-* Workaround for Pioneer DVR-216D which got stuck on DVD-R burns. 
-  (already fixed in 0.7.2.pl01)
-* Workaround for Pioneer DVR-216D refusal to eject.
-  (already fixed in 0.7.2.pl01)
-* Configure options --enable-dvd-obs-64k, --enable-track-src-odirect
-* New API calls burn_write_opts_set_dvd_obs(), 
-  burn_write_opts_set_stdio_fsync()
-* New API call burn_set_scsi_logging()
-* New API calls burn_fifo_get_statistics(), burn_fifo_next_interval(),
-  burn_fifo_fill()
-* Re-implemented ECMA-130 P-parity, Q-parity and scrambling for BURN_WRITE_RAW
-cdrskin novelties:
-* cdrskin option -V for logging of SCSI commands
-* New cdrskin options dvd_obs= and stdio_fsync=
-* New compile_cdrskin.sh option -dvd_obs_64k
-
-libburn-0.7.2.pl01.tar.gz Fri Nov 13 2009
-===============================================================================
-* Workaround for Pioneer DVR-216D which got stuck on DVD-R burns.
-* Workaround for Pioneer DVR-216D refusal to eject.
-
-Libburn 0.7.2.pl00 Mon Oct 12 2009
-===============================================================================
-* Bug fix: CD TAO sessions with multiple tracks did not work in -dummy mode
-* New API calls burn_get_media_product_id() , burn_guess_manufacturer() ,
-  burn_guess_cd_manufacturer()
-* New API call burn_disc_get_cd_info()
-* New API call burn_track_set_cdxa_conv()
-cdrskin novelties:
-* Better interpretation of options -mode2, -xa, -xa1, -xa2
-* New option --xa1-ignore
-* New -atip report lines "Product Id:" and "Producer:"
-
-libburn-0.7.0.pl00.tar.gz Thu Aug 27 2009
-===============================================================================
-* New API calls burn_drive_get_all_profiles(), burn_obtain_profile_name() allow
-  to inquire and process the list of supported media types. cdrskin lists all
-  supported profiles with option -atip -v
-* New API call burn_drive_snooze() allows to calm down a drive when no i/o is
-  expected for a while.
-* Bug fix: Some SCSI commands stalled on U3 memory sticks which appear as a hub
-  with a memory stick and a CD-ROM drive containing a small CD. These commands
-  make not much sense with a CD-ROM and are now avoided for this media 
-  situation.
-
-libburn-0.6.8.pl00.tar.gz Tue Jul 14 2009
-===============================================================================
-* Bug fix: Old MMC-1 drives were rejected because of mode page 2Ah length.
-* cdrskin -scanbus now works with high SCSI bus numbers.
-
-libburn-0.6.6.pl00.tar.gz Fri May 8 2009
-===============================================================================
-* Bug fix: Improper abort handling with broken pipe during outputto a stdio:
-  pseudo-drive.
-* Bug fix: Device scan stalled on FreeBSD with non-burner USB device
-
-libburn-0.6.4.pl00.tar.gz Fri Mar 13 2009
-===============================================================================
-* New operating system adapter "dummy" for stdio on general X/Open systems
-* New API function burn_drive_set_stream_recording() allows to write the 
-  crucial start blocks of a filesystem with slow BD-RE Defect Management and to
-  write the bulk of data with full nominal speed.
-
-libburn-0.6.2.pl00.tar.gz Fri Feb 20 2009
-===============================================================================
-* Improvements with build system for FreeBSD
-
-libburn-0.6.0.pl01.tar.gz Wed Jan 07 2009
-===============================================================================
-* Bug fix: BD-R were not correctly finalized
-
-libburn-0.6.0.pl00.tar.gz Sun Jan 04 2009
-===============================================================================
-* Formatting and writing of BD-R media
-* New API function burn_get_read_capacity()
-
-libburn-0.5.8.pl00.tar.gz Mon Dec 08 2008
-===============================================================================
-* Bug fix: A session without leadout entry on CD caused a SIGSEGV by NULL
-* Improvements about BD-RE formatting
-
-libburn-0.5.6.pl00.tar.gz Wed Nov 12 2008
-===============================================================================
-* Bug fix: libburn fifo thread was not aborted when burn run was aborted which
-  could lead to use of freed memory.
-
-libburn-0.5.4.pl00.tar.gz Mon Oct 6 2008
-===============================================================================
-* Bug fix: On Linux 2.4 /dev/sr0 was accepted as enumerable address but then
-  failed to work.
-
-libburn-0.5.2.pl00.tar.gz Wed Aug 20 2008
-===============================================================================
-* Larger set of possibly acceptable drive device file names
-
-libburn-0.5.0.pl00.tar.gz Thu Jul 17 2008
-===============================================================================
-* Bug fix: cdrskin option drive_scsi_dev_family=scd lead to buffer overflow
-* Ability to use /dev/scd as fallback if /dev/sr does not exist
-* New API call burn_fifo_peek_data()
-
-libburn-0.4.8.pl00.tar.gz Sat May 17 2008
-===============================================================================
-* Bug fix: Random access addressing for DVD-RAM and BD-RE did not work.
-* cdrskin: Affected were options write_start_address= and 
-  -- grow_overwriteable_iso on DVD-RAM or BD-RE.
-* xorriso: Affected were sessions on DVD-RAM or BD-RE after the first one.
-
-libburn-0.4.6.pl00.tar.gz Sun May 11 2008
-===============================================================================
-* Support for BD-RE media is now official
-* New burn_write_opts_set_stream_recording() can speed up DVD-RAM and BD-RE
-* New cdrskin option --list_formats
-* New cdrskin blank types for expert formatting of DVD-RAM and BD-RE
-* New cdrskin blank type blank=as_needed for automatic handling of media
-
-libburn-0.4.4.tar.gz Thu April 10 2008
-===============================================================================
-* Support for DVD+R/DL media is now official
-
-libburn-0.4.2.tar.gz Sun Feb 3 2008
-===============================================================================
-* Long term commitment to ABI libburn.so.4.
-* ABI compatibility is guaranteed for any older feature set released since
-  libburn-0.3.2 about one year ago.
-* libburn provides means for compile time and runtime checking of its version.
-* Compile time check in cdrskin for proper version of libburn include file.
-  Required is at least 0.4.2.
-* Runtime check in cdrskin prevents dynamic linking with outdated version of
-  libburn.so.4. Required is at least the version seen in the include file at
-  compile time.
-
-libburn-0.4.0.tar.gz Mon Oct 29 2007
-===============================================================================
-* New option direct_write_amount=
-* New option --grow_overwriteable_iso
-* New option --allow_emulated_drives dev=stdio:<path>
-* More cdrecord options supported: -format, -inq, -load, -lock, -immed, -waiti
-* New option fallback_program=
-* A lot of libburn API additions.
-
-libburn-0.3.8.tar.gz Tue Jul 31 2007
-===============================================================================
-* Now able to cope with the peculiarities of Linux 2.4 USB
-* Refusal to perform -dummy runs on media which cannot simulate burning
-* New option modesty_on_drive= may help with hda -> hdb burns
-* New option minbuf= , cdrecord compatible frontend of modesty_on_drive=
-* New option --adjust_speed_to_drive
-* Precautions against using the burner drive as track source
-* Note: ABI has not been broken.
-
-libburn-0.3.6.tar.gz Thu Apr 26 2007
-===============================================================================
-* On Linux kernel 2.6, /dev/sr* gets used rather than /dev/sg*.
-* DVD+R now get finalized (if not -multi is given)
-
-libburn-0.3.4.tar.gz Mon Mar 12 2007
-===============================================================================
-* Multi-session recording on DVD+R, including -toc, -msinfo
-* Options --tell_media_space , assert_write_lba=
-* Bug fix of rare multi track fifo stall
-
-libburn-0.3.2.tar.gz Feb 11 2007
-===============================================================================
-* Burnfree enabled by default
-* Multi-session recording on sequential DVD-R[W], including -toc, -msinfo
-* DVD-R[W] Disk-at-once recording
-
-libburn-0.3.0.1.tar.gz Tue Jan 30 2007
-===============================================================================
-* Improved recognition of unsuitable media types
-* Replaced ban of chmod u+s by loud warning
-* detailed man page for cdrskin
-* Burning of DVD+RW and DVD-RAM media as single-track TAO-like initial session
-* Formatting and then burning to DVD-RW like to DVD+RW
-* New option -msifile=path from cdrkit/wodim
-* 0.3.0.1 release notes *
-* Bug fix enabling tracks >= 1.3 GB from disk file
-
-libburn-0.2.6.3.tar.gz Fri Dec 29 2006
-===============================================================================
-* 0.2.6 release notes (Wed Nov 22 2006) 
-* After a lot of time with dedication to this project, we proudly present you
-  libburn 0.2.6. It is the first version of cdrskin and libburn after they have
-  been split from genisofs and libisofs. Main new features are write mode TAO 
-  and support for multi session.
-* 0.2.6.1 release notes (Fri Nov 24 2006) 
-* Point release to fix misleading version numbers in messages and documentation
-* 0.2.6.2 release notes (Sat Dec 16 2006) 
-* cdrskin man page backported from development version 0.2.7.
-* 0.2.6.3 release notes (Fri Dec 29 2006) 
-* Point release to fix build system problems people have experienced with the
-  past release.
-
-libburn-0.2.3.snapshot02.tar.gz Thu Nov 02 2006
-===============================================================================
-* Stabilized snapshot including release 0.2.4.pl01 of cdrskin
-* cdrskin 0.2.4 release notes 
-* Compatibility with cdrecord has been improved in respect to drive addresses,
-  audio extraction from .wav, -scanbus, -toc, drive buffer fill indicator.
-* Note: The previous snapshot01 with the same source base is handicapped by a
-  broken ./configure setup. It works well on Intel compatible CPUs but is
-  supposed to be unusable on big-endian architectures.
-
-libburn-0.2.2.tar.gz Wed Sep 20 2006
-===============================================================================
-Initial release of libburnia's libburn combined with cdrskin.
+nothing here now
--- a/Makefile.am
+++ b/Makefile.am
@ -6,7 +6,6 @@ pkgconfigdir=$(LIBBURNIA_PKGCONFDIR)
 libincludedir=$(includedir)/libburn

 lib_LTLIBRARIES = libburn/libburn.la 
-ACLOCAL_AMFLAGS = -I ./

 ## ========================================================================= ##

@ -76,15 +75,11 @@ libburn_libburn_la_SOURCES = \
 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)"
-
 ## ========================================================================= ##

 ## Build test applications
 noinst_PROGRAMS = \
 	test/libburner \
-	test/offst_source \
 	test/telltoc \
 	test/dewav \
 	test/fake_au \
@ -99,9 +94,6 @@ LIBBURN_EXTRALIBS = $(LIBBURN_ARCH_LIBS) $(THREAD_LIBS)
 test_libburner_CPPFLAGS = -Ilibburn
 test_libburner_LDADD = $(libburn_libburn_la_OBJECTS) $(LIBBURN_EXTRALIBS)
 test_libburner_SOURCES = test/libburner.c
-test_offst_source_CPPFLAGS = -Ilibburn
-test_offst_source_LDADD = $(libburn_libburn_la_OBJECTS) $(LIBBURN_EXTRALIBS)
-test_offst_source_SOURCES = test/offst_source.c
 test_telltoc_CPPFLAGS = -Ilibburn
 test_telltoc_LDADD = $(libburn_libburn_la_OBJECTS) $(LIBBURN_EXTRALIBS)
 test_telltoc_SOURCES = test/telltoc.c
@ -118,9 +110,9 @@ test_structest_CPPFLAGS = -Ilibburn
 test_structest_LDADD = $(libburn_libburn_la_OBJECTS) $(LIBBURN_EXTRALIBS)
 test_structest_SOURCES = test/structest.c

-##  cdrskin construction site - ts A60816 - B10409
+##  cdrskin construction site - ts A60816 - B00611
 cdrskin_cdrskin_CPPFLAGS = -Ilibburn
-cdrskin_cdrskin_CFLAGS = -DCdrskin_libburn_1_1_0
+cdrskin_cdrskin_CFLAGS = -DCdrskin_libburn_0_8_4

 # cdrskin_cdrskin_LDADD = $(libburn_libburn_la_OBJECTS) $(LIBBURN_EXTRALIBS)
 # ts A80123, change proposed by Simon Huggins to cause dynamic libburn linking
@ -151,10 +143,7 @@ doc/html: doc/doxygen.conf
 doc-upload: doc/html
 	scp -r $</* $(webhost):$(webpath)

-## ts B00729
-## Not by default any more.
-## It is unclear who is supposed to create file ./doc/doc.lock
-# all: doc
+all: doc

 install-data-local: 
 	if [ -f ./doc/doc.lock ]; then \
@ -197,8 +186,6 @@ EXTRA_DIST = \
 	version.h.in \
 	doc/comments \
 	doc/doxygen.conf.in \
-	doc/cookbook.txt \
-	doc/mediainfo.txt \
 	README \
 	AUTHORS \
 	CONTRIBUTORS \
@ -212,7 +199,6 @@ EXTRA_DIST = \
 	cdrskin/wiki_plain.txt \
 	cdrskin/cleanup.h \
 	cdrskin/cleanup.c \
-	libburn/libburn.ver \
 	libburn/os-dummy.h \
 	libburn/os-freebsd.h \
 	libburn/os-linux.h \
--- a/108
+++ b/108
@ -6,12 +6,12 @@ This all is under GPL.
 ------------------------------------------------------------------------------
 libburn-project.org
 By Mario Danic <mario.danic@gmail.com> and Thomas Schmitt <scdbackup@gmx.net>
-Copyright (C) 2006-2011 Mario Danic, Thomas Schmitt
+Copyright (C) 2006-2010 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.1.0.tar.gz
+     http://files.libburnia-project.org/releases/libburn-0.8.4.pl00.tar.gz

 ------------------------------------------------------------------------------

@ -19,10 +19,10 @@ Copyright (C) 2002-2006  Derek Foreman and Ben Jansens

                                From tarball

-Obtain libburn-1.1.0.tar.gz, take it to a directory of your choice and do:
+Obtain libburn-0.8.4.pl00.tar.gz, take it to a directory of your choice and do:

-   tar xzf libburn-1.1.0.tar.gz
-   cd libburn-1.1.0
+   tar xzf libburn-0.8.4.pl00.tar.gz
+   cd libburn-0.8.4
   ./configure --prefix=/usr
   make

@ -60,11 +60,6 @@ Warning: The trunk might contain experimental features which might not

                        Special ./configure options

-make install on GNU/Linux will try to run program ldconfig with the library
-installation directory as only argument. Failure to do so will not abort
-installation. One may disable ldconfig by ./configure option:
-   --disable-ldconfig-at-install
-
 In some situations Linux may deliver a better write performance to drives if
 the track input is read with O_DIRECT (see man 2 open). The API call
 burn_os_open_track_src() and the input readers of cdrskin and libburn fifo
@ -81,12 +76,6 @@ 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

-By use of a version script, the libburn.so library exposes no other function
-names but those of the API definition in libburn/libburn.h.
-If -Wl,--version-script=... makes problems with the local compiler, then
-disable this encapsulation feature by
-    --disable-versioned-libs
-
 Make sure to re-compile all source files after running ./configure
   make clean ; make
   make install
@ -150,8 +139,7 @@ The project components (list subject to growth, hopefully):

 - libisofs is the library to pack up hard disk files and directories into a
           ISO 9660 disk image. This may then be brought to CD via libburn.
-           An own ISO 9660 extension stores ACLs, xattr, and MD5 of file
-           content.
+           libisofs is to be the foundation of our upcoming mkisofs emulation.

 - libisoburn is an add-on to libburn and libisofs which coordinates both and
           also allows to grow ISO-9660 filesystem images on multi-session
@ -176,8 +164,8 @@ The project components (list subject to growth, hopefully):
           Rock Ridge extensions. Manipulation is not only adding or
           overwriting of files but also deleting, renaming, attribute
           changing, incremental backups, activating boot images, and
-           extracting of files from ISO images to disk. There is also a
-           sparse emulation of cdrecord and a more laborate one of mkisofs.
+           extracting of files from ISO images to disk. An own ISO 9660
+           extension stores ACLs, xattr, and MD5 of file content.
           All features of xorriso are also available via a C language API
           of libisoburn.
           See xorriso/README for more.
@ -546,85 +534,9 @@ Project history as far as known to me:
 - Tue Jun 29 2010 Version 0.6.34 of libisofs provides new features about
  hiding file names from directory trees.

- Wed Jun 30 2010 libburn-0.8.4 removes some restrictions on operating
-  systems other than Linux and FreeBSD.
+- Wed Jun 30 2010 libburn-0.8.4 provides small improvements with system
+  adapters for libcdio and generic POSIX systems.

- Fri Jul 02 2010 Release 0.6.0.pl00 of libisoburn adds more options to the
-  mkisofs emulation of xorriso. It also fixes minor bugs and shortcommings.
-
- Wed Sep 15 2010 Version 0.6.36 of libisofs can produce ISO images which
-  bear a partiton 1 with non-zero start address. They can be mounted from
-  USB stick via the main device file (e.g. /dev/sdb) as well as via the
-  partition device file (e.g. /dev/sdb1).
-
- Fri Sep 17 2010 libburn-0.8.6 lifts the test reservation on DVD-R DL media.
-
- Sat Sep 18 2010 Release 0.6.2.pl00 of libisoburn introduces a partition
-  with non-zero offset for ISO 9660 images on USB sticks, improves mkisofs
-  emulation, and fixes a regression which existed since version 0.4.2.
-
- Wed Oct 20 2010 libburn-0.8.8 can report the used amount of BD spare blocks.
-
- Sat Oct 23 2010 Version 0.6.38 of libisofs can use libjte to produce jigdo
-  files along with the ISO image. Further filesystem images may be appended
-  as MBR partitions 1 to 4. The capability was added to produce boot blocks
-  for computers with MIPS CPU.
-
- Tue Oct 26 2010 Release 0.6.4.pl00 of libisoburn and xorriso makes use of
-  the new libisofs capabilities.
-
- Wed Dec 08 2010 libburn-0.9.0 fixes a regression with SCSI command logging.
-
- Fri Dec 10 2010 Version 0.6.40 of libisofs makes the prediction of the
-  emerging image size less expensive and is able to make images bootable
-  for SUN SPARC systems.
-
- Sun Dec 12 2010 Release 0.6.6.pl00 of libisoburn and xorriso can read ISO
-  images which were copied to a different start address than they were prepared
-  for.
-
- 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,
-  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.
-
- Wed Feb 23 2011 release 1.0.2:
-  libisofs fixes several bugs and introduces the capability to copy files
-  inside the ISO filesystem.
-  libburn removed a compilation obstacle on Solaris 9 and improved recognition
-  of stdio pseudo-drives.
-  libisoburn and xorriso fix bugs and make use of the new libisofs capability.
-  xorriso improves its mkisofs emulation.
-
- Thu Mar 10 2011 release 1.0.4:
-  Several bugs were fixed in the libraries and in the mkisofs emulation of
-  xorriso. This emulation xorrisofs has now an own man page and info document.
-
- Sat Apr 09 2011 release 1.0.6:
-  libburn refined its representation of emulated drives. The size alignment
-  of DVD DAO is now 2 kB rather than 32 kB. libisofs produces Joliet names of
-  up to 103 characters. xorriso fixes two bugs and makes use of the library
-  improvements.
-
- Thu Apr 14 2011 release libisoburn-1.0.8:
-  A bug in the mkisofs emulation of xorriso could cause options to be ignored.
-  The problem was freshly introduced with libisoburn-1.0.6. 
-
- Fri May 13 2011 release libisofs-1.0.8:
-  Fixes a few rarely occurring bugs that have been found during the last month.
-
- Sat Jun 18 2011 release 1.1.0:
-  The consumption of stack memory was reduced. Statical program analysis found
-  some rarely occuring memory leaks. Several small bugs were fixed.
-  The suffix .plXY was dropped from tarball names of libburn and libisoburn.
-  

 ------------------------------------------------------------------------------

--- a/acinclude.m4
+++ b/acinclude.m4
@ -16,13 +16,11 @@ AC_DEFUN([TARGET_SHIZZLE],

  AC_MSG_CHECKING([target operating system])

-  LIBBURNIA_LDCONFIG_CMD="echo 'No ldconfig run performed. If needed, configure manually for:'"
  
  case $target_os in
    linux*)
      ARCH=linux
      LIBBURN_ARCH_LIBS=
-      LIBBURNIA_LDCONFIG_CMD=ldconfig
      ;;
    freebsd*)
      ARCH=freebsd
@ -44,21 +42,6 @@ AC_DEFUN([TARGET_SHIZZLE],
 ])


-dnl LIBBURN_ASSERT_VERS_LIBS is by Thomas Schmitt, libburnia project
-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"
-    AC_TRY_LINK([#include <stdio.h>], [printf("Hello\n");],
-                [vers_libs_test="yes"], [vers_libs_test="no"])
-    if test x$vers_libs_test = xno
-    then
-        LDFLAGS="$libburnia_save_LDFLAGS"
-    fi
-])
-  
-
 dnl LIBBURNIA_SET_PKGCONFIG determines the install directory for the *.pc file.
 dnl Important: Must be performed _after_ TARGET_SHIZZLE
 dnl 
--- a/2
+++ b/2
@ -1,6 +1,6 @@
 #!/bin/sh -x

-aclocal -I .
+aclocal
 libtoolize --copy --force
 autoconf

--- a/cdrskin/README
+++ b/cdrskin/README
@ -4,9 +4,9 @@
 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.1.0.tar.gz
+http://scdbackup.sourceforge.net/cdrskin-0.8.4.pl00.tar.gz

-Copyright (C) 2006-2011 Thomas Schmitt, provided under GPL version 2 or later.
+Copyright (C) 2006-2010 Thomas Schmitt, provided under GPL version 2 or later.
 ------------------------------------------------------------------------------


@ -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.1.0.tar.gz, take it to a directory of your choice and do:
+Obtain cdrskin-0.8.4.pl00.tar.gz, take it to a directory of your choice and do:

-    tar xzf cdrskin-1.1.0.tar.gz
-    cd cdrskin-1.1.0
+    tar xzf cdrskin-0.8.4.pl00.tar.gz
+    cd cdrskin-0.8.4

 Within that directory execute:

@ -310,11 +310,10 @@ Add-on session (equivalent to growisofs -M):
    cdrskin dev=/dev/sr0 --grow_overwriteable_iso ... -


-                            DVD-RW , DVD-R , DVD-R DL
+                               DVD-RW and DVD-R

 DVD-RW are usable if formatted to state "Restricted Overwrite" or if in state
-"Sequential Recording". DVD-R are always in sequential state. DVD-R DL are
-always sequential and incapable of multi-session.
+"Sequential Recording". DVD-R are always in sequential state.

 "Sequential" is the state of unused media and of media previously blanked
 or written by cdrecord. dvd+rw-format -blank can also achieve this state.
--- a/cdrskin/add_ts_changes_to_libburn_0_8_4
+++ b/cdrskin/add_ts_changes_to_libburn_0_8_4
@ -38,9 +38,8 @@ original="./libburn_svn_release.tgz"
 # My changes are in $changes , mainly in $changes/cdrskin
 changes="./libburn-release"

-skin_release="1.1.0"
-patch_level=""
-# patch_level=".pl00"
+skin_release="0.8.4"
+patch_level=".pl00"
 skin_rev="$skin_release""$patch_level"

 # The result directory and the name of the result tarballs
--- a/cdrskin/add_ts_changes_to_libburn_0_8_5
+++ b/cdrskin/add_ts_changes_to_libburn_0_8_5
@ -38,7 +38,7 @@ original="./libburn_svn.tgz"
 # My changes are in $changes , mainly in $changes/cdrskin
 changes="./libburn-develop"

-skin_release="1.1.1"
+skin_release="0.8.5"
 patch_level=""
 skin_rev="$skin_release""$patch_level"

--- a/cdrskin/cdrfifo.c
+++ b/cdrskin/cdrfifo.c
@ -34,7 +34,7 @@


 /* Macro for creation of arrays of objects (or single objects) */
-#define TSOB_FELD(typ,anz) (typ *) calloc(anz, sizeof(typ));
+#define TSOB_FELD(typ,anz) (typ *) malloc((anz)*sizeof(typ));


 #define Cdrfifo_buffer_chunK 2048
--- a/cdrskin/cdrskin.1
+++ b/cdrskin/cdrskin.1
@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH CDRSKIN 1 "Jan 09, 2011"
+.TH CDRSKIN 1 "Jun 10, 2010"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@ -47,7 +47,7 @@ Multi session on CD (follow-up sessions in TAO only)
 .br
 or on DVD-R[W] (in Incremental mode) or DVD+R[/DL] or BD-R.
 .br
-Single session Disk-at-once on DVD-RW, DVD-R, DVD-R DL.
+Single session on DVD-RW or DVD-R (Disk-at-once).
 .br
 Single session or emulated ISO-9660 multi-session 
 .br
@ -166,7 +166,7 @@ needed.
 .SS
 .B Sequentially Recordable DVD or BD Media:
 .br
-Currently DVD-RW, DVD-R[DL], DVD+R[DL], and BD-R can be used for the Sequential
+Currently DVD-RW, DVD-R , DVD+R[/DL], and BD-R can be used for the Sequential
 recording model. It resembles the model of CD media. Only DVD-RW can be
 blanked and re-used from scratch.
 .br
@ -186,8 +186,8 @@ of recognizable size or the size has to be announced explicitly by options
 or
 .B tao_to_sao_tsize= .
 .br
-DAO is the only mode for DVD-R media which do not offer feature 21h Incremental
-Streaming (e.g. DVD-R DL). DAO may also be selected explicitly by option
+DAO is the only mode for media which do not offer feature 21h Incremental
+Streaming. DAO may also be selected explicitly by option
 .B -sao .
 Program growisofs uses DAO on sequential DVD-R[W] media for maximum
 DVD-ROM/-Video compatibility.
@ -198,7 +198,7 @@ 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
-.B -multi . It does not work with DVD-R DL and minimally blanked DVD-RW.
+.B -multi .
 The only restriction towards CD-R[W] is the lack of support for -audio tracks.
 Multiple tracks per session are permissible.
 .br
@ -554,9 +554,6 @@ which appear to be in the desired blank or format state already.
 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.
-.br
 .B Caution:
 Use this only when in urgent need.
 .TP
@ -662,8 +659,7 @@ Without it the disc gets closed and may not be written any more  - unless it
 is a -RW and gets blanked which causes loss of its content.
 .br
 The following sessions can only be written in -tao mode. -multi is prohibited
-with DVD-R[W] DAO write mode and on DVD-R DL media.
-Option --prodvd_cli_compatible eventually makes
+with DVD-R[W] DAO write mode. Option --prodvd_cli_compatible eventually makes
 -multi tolerable but cannot make it work.
 .br
 In order to have all filesystem content accessible, the eventual ISO-9660
@ -757,8 +753,6 @@ 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.
-.br
-Mode -tao is not usable for minimally blanked DVD-RW and for DVD-R DL.
 .TP
 .BI \-toc
 Print the table of content (TOC) which describes the tracks recorded on disc.
@ -1096,11 +1090,12 @@ This option is only needed for revoking eventual --ignore_signals or
 .TP
 .BI \--allow_untested_media
 Enable the use of media profiles which have been implemented but not yet
-tested. Currently this option is without effect because no media types are
-under test reservation.
+tested. Currently this applies to :
 .br
-(If you really test experimental media, then please report the outcome on
-libburn-hackers@pykix.org)
+Profile 0015h , DVD-R/DL Sequential (will not allow -multi).
+.br
+If you really test such media, then please report the outcome on
+libburn-hackers@pykix.org 
 .TP
 .BI dev_translation= <sep><from><sep><to>
 Set drive address alias. This was necessary before cdrskin-0.2.4 to manually
@ -1270,7 +1265,7 @@ cdrskin -v dev=/dev/hdc speed=12 fs=8m \\
 .br
 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):
+.B Write compressed afio archive on-the-fly (not possible with minimally blanked DVD-RW):
 .br
 find . | afio -oZ - | \\
 .br
--- a/cdrskin/cdrskin.c
+++ b/cdrskin/cdrskin.c
@ -1,6 +1,6 @@

 /*
- cdrskin.c , Copyright 2006-2011 Thomas Schmitt <scdbackup@gmx.net>
+ cdrskin.c , Copyright 2006-2010 Thomas Schmitt <scdbackup@gmx.net>
 Provided under GPL version 2 or later.

 A cdrecord compatible command line interface for libburn.
@ -88,20 +88,20 @@ or

 /** The official program version */
 #ifndef Cdrskin_prog_versioN
-#define Cdrskin_prog_versioN "1.1.0"
+#define Cdrskin_prog_versioN "0.8.4"
 #endif

 /** The official libburn interface revision to use.
    (May get changed further below)
 */
 #ifndef Cdrskin_libburn_majoR
-#define Cdrskin_libburn_majoR 1
+#define Cdrskin_libburn_majoR 0
 #endif
 #ifndef Cdrskin_libburn_minoR
-#define Cdrskin_libburn_minoR 1
+#define Cdrskin_libburn_minoR 8
 #endif
 #ifndef Cdrskin_libburn_micrO
-#define Cdrskin_libburn_micrO 0
+#define Cdrskin_libburn_micrO 4
 #endif


@ -135,43 +135,47 @@ or
 #endif /* Cdrskin_libburn_cvs_A60220_tS */


-#ifdef Cdrskin_libburn_1_1_0
-#define Cdrskin_libburn_versioN "1.1.0"
+#ifdef Cdrskin_libburn_0_8_4
+#define Cdrskin_libburn_versioN "0.8.4"
 #define Cdrskin_libburn_from_pykix_svN 1
-#endif
+#endif /* Cdrskin_libburn_0_8_4 */

-#ifdef Cdrskin_libburn_1_1_1
-#define Cdrskin_libburn_versioN "1.1.1"
+#ifdef Cdrskin_libburn_0_8_5
+#define Cdrskin_libburn_versioN "0.8.5"
 #define Cdrskin_libburn_from_pykix_svN 1

 /* Place novelty switch macros here. 
   Move them down to Cdrskin_libburn_from_pykix_svN on version leap
 */

+/* Do not stay in signal handler but only cancel and set Cdrskin_abort_leveL.
+   Make use of burn_is_aborting() to detect pending libburn aborts.
+*/

-#endif /* Cdrskin_libburn_1_1_1 */
+
+#endif /* Cdrskin_libburn_0_8_5 */

 #ifndef Cdrskin_libburn_versioN
-#define Cdrskin_libburn_1_1_1
-#define Cdrskin_libburn_versioN "1.1.1"
+#define Cdrskin_libburn_0_8_4
+#define Cdrskin_libburn_versioN "0.8.4"
 #define Cdrskin_libburn_from_pykix_svN 1
 #endif

-#ifdef Cdrskin_libburn_1_1_0
+#ifdef Cdrskin_libburn_0_8_4
 #undef Cdrskin_libburn_majoR
 #undef Cdrskin_libburn_minoR
 #undef Cdrskin_libburn_micrO
-#define Cdrskin_libburn_majoR 1
-#define Cdrskin_libburn_minoR 1
-#define Cdrskin_libburn_micrO 0
+#define Cdrskin_libburn_majoR 0
+#define Cdrskin_libburn_minoR 8
+#define Cdrskin_libburn_micrO 4
 #endif
-#ifdef Cdrskin_libburn_1_1_1
+#ifdef Cdrskin_libburn_0_8_5
 #undef Cdrskin_libburn_majoR
 #undef Cdrskin_libburn_minoR
 #undef Cdrskin_libburn_micrO
-#define Cdrskin_libburn_majoR 1
-#define Cdrskin_libburn_minoR 1
-#define Cdrskin_libburn_micrO 1
+#define Cdrskin_libburn_majoR 0
+#define Cdrskin_libburn_minoR 8
+#define Cdrskin_libburn_micrO 5
 #endif


@ -359,6 +363,9 @@ or

 #include "../libburn/libburn.h"

+#ifdef Cdrskin_libburn_has_audioxtR
+#include "../libburn/libdax_audioxtr.h"
+#endif

 #ifdef Cdrskin_libburn_has_cleanup_handleR
 #define Cleanup_set_handlers burn_set_signal_handling
@ -416,7 +423,7 @@ static int Cdrskin_abort_leveL= 0;
 /* Imported from scdbackup-0.8.5/src/cd_backup_planer.c */

 /** Macro for creation of arrays of objects (or single objects) */
-#define TSOB_FELD(typ,anz) (typ *) calloc(anz, sizeof(typ));
+#define TSOB_FELD(typ,anz) (typ *) malloc((anz)*sizeof(typ));


 /** Convert a text so that eventual characters special to the shell are
@ -566,7 +573,7 @@ int Sfile_multi_read_argv(char *progname, char **filenames, int filename_count,
     if(pass==0)
       maxl= strlen(progname)+1;
     else {
-      (*argv)[0]= (char *) calloc(1, strlen(progname)+1);
+      (*argv)[0]= (char *) malloc(strlen(progname)+1);
      if((*argv)[0]==NULL)
         {ret= -1; goto ex;}
       strcpy((*argv)[0],progname);
@ -597,7 +604,7 @@ int Sfile_multi_read_argv(char *progname, char **filenames, int filename_count,
       } else {
         if(argcount >= *argc)
     break;
-         (*argv)[argcount]= (char *) calloc(1, l+1);
+         (*argv)[argcount]= (char *) malloc(l+1);
         if((*argv)[argcount]==NULL)
           {ret= -1; goto ex;}
         strcpy((*argv)[argcount],buf);
@ -611,9 +618,9 @@ int Sfile_multi_read_argv(char *progname, char **filenames, int filename_count,
   if(pass==0){
     *argc= argcount;
     if(argcount>0) {
-       *argv= (char **) calloc(argcount, sizeof(char *));
-       *argidx= (int *) calloc(argcount, sizeof(int));
-       *arglno= (int *) calloc(argcount, sizeof(int));
+       *argv= (char **) malloc(argcount*sizeof(char *));
+       *argidx= (int *) malloc(argcount*sizeof(int));
+       *arglno= (int *) malloc(argcount*sizeof(int));
       if(*argv==NULL || *argidx==NULL || *arglno==NULL)
         {ret= -1; goto ex;}
     }
@ -648,7 +655,7 @@ int Sfile_home_adr_s(char *filename, char *fileadr, int fa_size, int flag)
 home= getenv("HOME");
 if(home==NULL)
   return(0);
- if((int) (strlen(home) + strlen(filename) + 1) >= fa_size)
+ if(strlen(home)+strlen(filename)+1>=fa_size)
   return(-1);
 strcpy(fileadr,home);
 if(filename[0]!=0){
@ -813,8 +820,8 @@ int Cdradrtrn_add(struct CdradrtrN *trn, char *from, char *to, int flag)
 }
 if(strlen(from)>=Cdrskin_adrleN || strlen(to)>=Cdrskin_adrleN)
   return(0);
- trn->from_address[cnt]= calloc(1, strlen(from_pt)+1);
- trn->to_address[cnt]= calloc(1, strlen(to_pt)+1);
+ trn->from_address[cnt]= malloc(strlen(from_pt)+1);
+ trn->to_address[cnt]= malloc(strlen(to_pt)+1);
 if(trn->from_address[cnt]==NULL ||
    trn->to_address[cnt]==NULL)
   return(-2);
@ -2217,7 +2224,6 @@ LIBBURN_MISCONFIGURATION_ = 0;
   return(-1);
 }
 Cdrpreskin_set_severities(preskin,NULL,NULL,0);
- burn_allow_drive_role_4(1);
 return(1);
 }

@ -3168,7 +3174,7 @@ set_severities:;
     int major, minor, micro;

     printf(
-"Cdrecord 2.01-Emulation Copyright (C) 2006-2011, see libburnia-project.org\n");
+"Cdrecord 2.01-Emulation Copyright (C) 2006-2010, see libburnia-project.org\n");
     if(o->fallback_program[0]) {
       char *hargv[2];

@ -3750,7 +3756,7 @@ int Cdrskin_get_device_adr(struct CdrskiN *skin,

 int Cdrskin_get_drive(struct CdrskiN *skin, struct burn_drive **drive,int flag)
 {
- if(skin->driveno<0 || (unsigned int) skin->driveno >= skin->n_drives)
+ if(skin->driveno<0 || skin->driveno >= skin->n_drives)
   return(0);
 *drive= skin->drives[skin->driveno].drive;
 return ((*drive) != NULL); 
@ -4014,7 +4020,7 @@ int Cdrskin_grab_drive(struct CdrskiN *skin, int flag)
       ClN(fprintf(stderr,
         "cdrskin_debug: Cdrskin_grab_drive() dropping unwanted drives (%d)\n",
          skin->n_drives-1));
-     for(i= 0; i < (int) skin->n_drives; i++) {
+     for(i=0;i<skin->n_drives;i++) {
       if(i==skin->driveno)
     continue;
       if(skin->verbosity>=Cdrskin_verbose_debuG)   
@ -4357,7 +4363,7 @@ int Cdrskin_driveno_of_location(struct CdrskiN *skin, char *devicename,
 int i,ret;
 char adr[Cdrskin_adrleN];

- for(i= 0; i < (int) skin->n_drives; i++) {
+ for(i=0;i<skin->n_drives;i++) {

 #ifdef Cdrskin_libburn_has_drive_get_adR
   ret= burn_drive_get_adr(&(skin->drives[i]), adr);
@ -4447,7 +4453,7 @@ wrong_devno:;
     goto location_not_found;
   }
 }
- if((unsigned int) (*driveno) >= skin->n_drives || (*driveno) < 0) {
+ if((*driveno)>=skin->n_drives || (*driveno)<0) {
   ClN(fprintf(stderr,"cdrskin: obtained drive number  %d  from '%s'\n",
               *driveno,adr));
   goto wrong_devno;
@ -4473,7 +4479,7 @@ int Cdrskin_driveno_to_btldev(struct CdrskiN *skin, int driveno,
 int k,ret,still_untranslated= 1,hret,k_start;
 char *loc= NULL,buf[Cdrskin_adrleN],adr[Cdrskin_adrleN];

- if(driveno < 0 || driveno > (int) skin->n_drives)
+ if(driveno<0 || driveno>skin->n_drives)
   goto fallback;

 #ifdef Cdrskin_libburn_has_drive_get_adR
@ -4738,17 +4744,17 @@ int Cdrskin_scanbus(struct CdrskiN *skin, int flag)
 int *drives_busses= NULL;
 struct stat stbuf;

- drives_shown= calloc(1, skin->n_drives+1);
- drives_busses= calloc((skin->n_drives+1), sizeof(int));
+ drives_shown= malloc(skin->n_drives+1);
+ drives_busses= malloc((skin->n_drives+1) * sizeof(int));
 if(drives_shown == NULL || drives_busses == NULL)
   {ret= -1; goto ex;}
- for(i= 0; i < (int) skin->n_drives; i++)
+ for(i=0;i<skin->n_drives;i++)
   drives_shown[i]= 0;
 if(flag&1) {
   printf("cdrskin: Overview of accessible drives (%d found) :\n",
          skin->n_drives);
   printf("-----------------------------------------------------------------------------\n");
-   for(i= 0; i < (int) skin->n_drives; i++) {
+   for(i=0;i<skin->n_drives;i++) {

 #ifdef Cdrskin_libburn_has_drive_get_adR
     ret= burn_drive_get_adr(&(skin->drives[i]), adr);
@ -4798,7 +4804,7 @@ int Cdrskin_scanbus(struct CdrskiN *skin, int flag)
   if(skin->preskin->old_pseudo_scsi_adr)
     printf("cdrskin: NOTE : The printed addresses are not cdrecord compatible !\n");

-   for(i= 0; i < (int) skin->n_drives; i++) {
+   for(i=0;i<skin->n_drives;i++) {
     drives_busses[i]= -1;
     ret= Cdrskin_driveno_to_btldev(skin,i,btldev,1);
     if(ret >= pseudo_transport_group &&
@ -4808,8 +4814,8 @@ int Cdrskin_scanbus(struct CdrskiN *skin, int flag)
         busmax= 1 + ret - pseudo_transport_group;
     }
   }
-   for(busidx= 0; busidx < (int) skin->n_drives + 1; busidx++) {
-     if(busidx < (int) skin->n_drives)
+   for(busidx= 0; busidx < skin->n_drives + 1; busidx++) {
+     if(busidx < skin->n_drives)
       busno= drives_busses[busidx];
     else
       busno= busmax;
@ -4821,7 +4827,7 @@ int Cdrskin_scanbus(struct CdrskiN *skin, int flag)
     if(i < busidx)
   continue;
     first_on_bus= 1;
-     for(i= 0; i < (int) skin->n_drives; i++) {
+     for(i=0;i<skin->n_drives;i++) {
       ret= Cdrskin_driveno_to_btldev(skin,i,btldev,1);
       if(busno==busmax && drives_shown[i]==0) {
         if(ret/1000000 != pseudo_transport_group) {
@ -4880,7 +4886,7 @@ int Cdrskin_checkdrive(struct CdrskiN *skin, char *profile_name, int flag)
   else
     ClN(printf("cdrskin: pseudo-checkdrive on drive %d\n",skin->driveno));
 }
- if(skin->driveno >= (int) skin->n_drives || skin->driveno < 0) {
+ if(skin->driveno>=skin->n_drives || skin->driveno<0) {
   fprintf(stderr,"cdrskin: FATAL : there is no drive #%d\n",skin->driveno);
   {ret= 0; goto ex;}  
 } 
@ -4897,10 +4903,6 @@ int Cdrskin_checkdrive(struct CdrskiN *skin, char *profile_name, int flag)
   printf("%s\n","Emulated (stdio-drive, 2k random read-write)");
 else if(ret==3)
   printf("%s\n","Emulated (stdio-drive, sequential write-only)");
- else if(ret==4)
-   printf("%s\n","Emulated (stdio-drive, 2k random read-only)");
- else if(ret == 5)
-   printf("%s\n","Emulated (stdio-drive, 2k random write-only)");
 else if(ret!=1)
   printf("%s\n","Emulated (stdio-drive)");
 else
@ -5144,7 +5146,7 @@ int Cdrskin_minfo(struct CdrskiN *skin, int flag)
 #endif
 char media_class[80];
 int nominal_sessions= 1, ftils= 1, ltils= 1, first_track= 1, read_capacity= 0;
- int app_code, cd_info_valid, lra, alloc_blocks, free_blocks;
+ int app_code, cd_info_valid, lra;
 off_t avail, buf_count;
 char disc_type[80], bar_code[9], buf[2 * 2048];
 unsigned int disc_id;
@ -5240,11 +5242,6 @@ int Cdrskin_minfo(struct CdrskiN *skin, int flag)
   printf("Disk type: unrecognizable\n");
 if(cd_info_valid & 2)
   printf("Disk id: 0x%-X\n", disc_id);
- ret= burn_disc_get_bd_spare_info(drive, &alloc_blocks, &free_blocks, 0);
- if(ret == 1) {
-   printf("BD Spare Area consumed:   %d\n", alloc_blocks - free_blocks);
-   printf("BD Spare Area available:  %d\n", free_blocks);
- }

 printf("\n");
 printf("Track  Sess Type   Start Addr End Addr   Size\n");
@ -5645,7 +5642,7 @@ ex:;
 int Cdrskin_list_formats(struct CdrskiN *skin, int flag)
 {
 struct burn_drive *drive;
- int ret, i, status, num_formats, profile_no, type, alloc_blocks, free_blocks;
+ int ret, i, status, num_formats, profile_no, type;
 off_t size;
 unsigned dummy;
 char status_text[80], profile_name[90];
@ -5692,10 +5689,6 @@ int Cdrskin_list_formats(struct CdrskiN *skin, int flag)
 } else
   sprintf(status_text, "illegal status according to MMC-5");
 printf("Format status: %s\n", status_text);
- ret= burn_disc_get_bd_spare_info(drive, &alloc_blocks, &free_blocks, 0);
- if(ret == 1)
-   printf("BD Spare Area: %d blocks consumed, %d blocks available\n",
-          alloc_blocks - free_blocks, free_blocks);

 for (i = 0; i < num_formats; i++) {
   ret= burn_disc_get_format_descr(drive, i, &type, &size, &dummy);
@ -6907,7 +6900,7 @@ int Cdrskin_direct_write(struct CdrskiN *skin, int flag)
   if(ret<=0)
     goto ex;
 }
- buf= calloc(1, max_chunksize);
+ buf= malloc(max_chunksize);
 if(buf==NULL) {
   fprintf(stderr,
           "cdrskin: FATAL : Cannot allocate %d bytes of read buffer.\n",
@ -7082,10 +7075,6 @@ int Cdrskin_burn(struct CdrskiN *skin, int flag)
 double put_counter, get_counter, empty_counter, full_counter;
 int total_min_fill, fifo_percent;
 #endif
-#ifdef Cdrskin_libburn_has_get_spacE
- off_t free_space;
- char msg[80];
-#endif

 if(skin->tell_media_space)
   doing= "estimating";
@ -7329,12 +7318,17 @@ burn_failed:;
   /* write capacity estimation and return without actual burning */

 #ifdef Cdrskin_libburn_has_get_spacE
-   free_space= burn_disc_available_space(drive,o);
-   sprintf(msg,"%d\n",(int) (free_space/(off_t) 2048));
-   if(skin->preskin->result_fd>=0) {
-     write(skin->preskin->result_fd,msg,strlen(msg));
-   } else
-     printf("%s",msg);
+   {
+     off_t free_space;
+     char msg[80];
+
+     free_space= burn_disc_available_space(drive,o);
+     sprintf(msg,"%d\n",(int) (free_space/(off_t) 2048));
+     if(skin->preskin->result_fd>=0) {
+       write(skin->preskin->result_fd,msg,strlen(msg));
+     } else
+       printf("%s",msg);
+   }
 #endif /* Cdrskin_libburn_has_get_spacE */

   if(skin->track_counter>0)
@ -7344,23 +7338,6 @@ burn_failed:;
   {ret= 1; goto ex;}
 }

-
-#ifdef Cdrskin_libburn_has_get_spacE
- if(skin->fixed_size > 0 && !skin->force_is_set) {
-   free_space= burn_disc_available_space(drive,o);
-   if(skin->fixed_size > free_space && free_space > 0) {
-     fprintf(stderr,
- "cdrskin: FATAL : predicted session size %lus does not fit on media (%lus)\n",
-             (unsigned long) ((skin->fixed_size + 2047.0) / 2048.0),
-             (unsigned long) ((free_space + 2047) / 2048));
-     ClN(fprintf(stderr,
-              "cdrskin: HINT : This test may be disabled by option -force\n");)
-     {ret= 0; goto ex;}
-   }
- }
-#endif /* Cdrskin_libburn_has_get_spacE */
-
-
 Cdrskin_adjust_speed(skin,0);

 #ifndef Cdrskin_extra_leaN
@ -7763,7 +7740,7 @@ int Cdrskin_eject(struct CdrskiN *skin, int flag)
 if(!skin->do_eject)
   return(1);

- if((int) skin->n_drives <= skin->driveno || skin->driveno < 0)
+ if(skin->n_drives<=skin->driveno || skin->driveno < 0)
   return(2);

 /* ??? A61012 : retry loop might now be obsolete 
--- a/cdrskin/cdrskin_eng.html
+++ b/cdrskin/cdrskin_eng.html
@ -2,7 +2,7 @@

 <HEAD>
 <META NAME="description" CONTENT="cdrskin, a limited cdrecord compatibility wrapper for libburn">
-<META NAME="keywords" CONTENT="cdrskin, libburn, libburnia, burn, CD, DVD, BD, linux, recording, burning, CD-R, CD-RW, DVD-R, DVD-R DL, DVD-RW, DVD+RW, DVD+R, DVD+R DL, DVD-RAM, BD-RE, BD-R, cdrecord, compatible, scdbackup">
+<META NAME="keywords" CONTENT="cdrskin, libburn, libburnia, burn, CD, DVD, linux, recording, burning, CD-R, CD-RW, DVD-R, DVD-RW, DVD+RW, DVD+R, DVD+R/DL, DVD-RAM, BD-RE, BD-R, cdrecord, compatible, scdbackup">
 <META NAME="robots" CONTENT="follow">
 <TITLE>cdrskin homepage english</TITLE>
 </HEAD>
@ -24,8 +24,7 @@
 <P>
 <H2>Purpose:</H2>
 Burns preformatted data to CD, DVD, and BD media:<BR>
-CD-R, DVD-R, DVD-R DL, DVD+R, DVD+R DL, BD-R, CD-RW,
-DVD-RW, DVD-RAM, DVD+RW, BD-RE
+CD-R, DVD-R, DVD+R, DVD+R/DL, BD-R, CD-RW, DVD-RW, DVD-RAM, DVD+RW, BD-RE
 </P>
 <P>

@ -65,7 +64,7 @@ connected via SCSI, PATA (aka IDE, ATA), USB, or SATA.
 GPL software included:<BR>
 </H2>
 <DL>
-<DT>libburn-1.1.0</DT>
+<DT>libburn-0.8.4</DT>
 <DD>(founded by Derek Foreman and Ben Jansens,
 developed and maintained since August 2006 by
 Thomas Schmitt from team of libburnia-project.org)
@ -96,11 +95,10 @@ Ports to other usable systems are appreciated. Reports are welcome.
 <DL>
 <DT>The most common options of cdrecord for data and audio on CD media
 are provided in a compatible way.<BR>
-On all DVD media, cdrskin is able to perform any recording job
+On all DVD media except DVD-R DL, cdrskin is able to perform any recording job
 which is possible with cdrecord.
 Other than with cdrecord, option -multi is supported with many DVD types and
-BD-R. Write mode -tao works with anything but quickly blanked DVD-RW and
-DVD-R DL, which both support no -multi.
+BD-R. Write mode -tao works with anything but quickly blanked DVD-RW.
 </DT>
 <BR><BR>
 <DT>Get an overview of drives and their addresses</DT>
@ -133,8 +131,7 @@ On Solaris it is r-permission and privileges "basic,sys_devices".</DT>
 <DD>$<KBD>&nbsp;cdrskin -v dev=/dev/hdc speed=12 fs=8m \</KBD></DD>
 <DD><KBD>&nbsp;&nbsp;blank=as_needed -eject padsize=300k my_image.iso</KBD></DD>

-<DT>Write compressed afio archive on-the-fly
-(not DVD-R DL or minimally blanked DVD-RW):</DT>
+<DT>Write compressed afio archive on-the-fly:</DT>
 <DD>$<KBD>&nbsp;find . | afio -oZ - | \</KBD></DD>
 <DD><KBD>&nbsp;&nbsp;cdrskin -v dev=0,1,0 fs=32m speed=8 \</KBD></DD>
 <DD><KBD>&nbsp;&nbsp;blank=as_needed padsize=300k -</KBD></DD>
@ -200,8 +197,8 @@ Standalone ISO 9660 multi-session CD/DVD/BD tool
 <P>
 <DL>
 <DT>Download as source code (see README):</DT>
-<DD><A HREF="cdrskin-1.1.0.tar.gz">cdrskin-1.1.0.tar.gz</A>
-(870 KB).
+<DD><A HREF="cdrskin-0.8.4.pl00.tar.gz">cdrskin-0.8.4.pl00.tar.gz</A>
+(845 KB).
 </DD>
 <DD>
 The cdrskin tarballs are source code identical with libburn releases
@ -250,21 +247,22 @@ cdrskin_0.4.2.pl00-x86-suse9_0-static.tar.gz</A>, (310 KB), -static compiled,
 <HR>

 <P>
-Enhancements towards previous stable version cdrskin-1.0.6.pl00:
+Enhancements towards previous stable version cdrskin-0.8.2.pl00:
 <UL>
-<LI>none</LI>
+<LI>
+Let general POSIX system adapters ignore SIGWINCH and SIGURG if defined
+</LI>
+<LI>
+Allowed 64 kB max output buffer size on all OSes
 </LI>
 <!--
 <LI>none</LI>
 -->
 </UL>

-Bug fixes towards cdrskin-1.0.6.pl00:
+Bug fixes towards cdrskin-0.8.2.pl00:
 <UL>
-<LI>
-Option -format as_needed issued a wrong block size.
-A Pioneer BDR-205 drive refused on that command.
-</LI>
+<LI>none</LI>
 <!--
 <LI>none</LI>
 -->
@ -274,8 +272,8 @@ A Pioneer BDR-205 drive refused on that command.

 <P>
 <DL>
-<DT><H3>Development snapshot, version 1.1.1 :</H3></DT>
-<DD>Enhancements towards current stable version 1.0.0:
+<DT><H3>Development snapshot, version 0.8.5 :</H3></DT>
+<DD>Enhancements towards current stable version 0.8.4.pl00:
 <UL>
 <LI>none yet</LI>
 <!--
@ -285,7 +283,7 @@ A Pioneer BDR-205 drive refused on that command.
 </UL>
 </DD>

-<DD>Bug fixes towards cdrskin-1.1.0:
+<DD>Bug fixes towards cdrskin-0.8.4.pl00:
 <UL>
 <LI>none yet</LI>
 <!--
@ -295,10 +293,10 @@ A Pioneer BDR-205 drive refused on that command.
 </DD>

 <DD>&nbsp;</DD>
-<DD><A HREF="README_cdrskin_devel">README 1.1.1</A>
-<DD><A HREF="cdrskin__help_devel">cdrskin-1.1.1 --help</A></DD>
-<DD><A HREF="cdrskin_help_devel">cdrskin-1.1.1 -help</A></DD>
-<DD><A HREF="man_1_cdrskin_devel.html">man cdrskin (as of 1.1.1)</A></DD>
+<DD><A HREF="README_cdrskin_devel">README 0.8.5</A>
+<DD><A HREF="cdrskin__help_devel">cdrskin_0.8.5 --help</A></DD>
+<DD><A HREF="cdrskin_help_devel">cdrskin_0.8.5 -help</A></DD>
+<DD><A HREF="man_1_cdrskin_devel.html">man cdrskin (as of 0.8.5)</A></DD>
 <DD>&nbsp;</DD>
 <DT>Maintainers of cdrskin unstable packages please use SVN of
 <A HREF="http://libburnia-project.org"> libburnia-project.org</A></DT>
@ -318,8 +316,8 @@ admins with full system souvereignty.</DT>
 <A HREF="README_cdrskin_devel">upcoming README</A> ):
 </DD>
 <DD>
-<A HREF="cdrskin-1.1.1.tar.gz">cdrskin-1.1.1.tar.gz</A>
-(870 KB).
+<A HREF="cdrskin-0.8.5.tar.gz">cdrskin-0.8.5.tar.gz</A>
+(845 KB).
 </DD>

 <!-- This is not offered any more since spring 2008
--- a/cdrskin/cdrskin_timestamp.h
+++ b/cdrskin/cdrskin_timestamp.h
@ -1 +1 @@
-#define Cdrskin_timestamP "2011.06.18.100001"
+#define Cdrskin_timestamP "2010.06.30.100001"
--- a/cdrskin/changelog.txt
+++ b/cdrskin/changelog.txt
--- a/cdrskin/compile_cdrskin.sh
+++ b/cdrskin/compile_cdrskin.sh
@ -1,14 +1,14 @@
 #!/bin/sh

 # compile_cdrskin.sh  
-# Copyright 2005 - 2011 Thomas Schmitt, scdbackup@gmx.net, GPL
+# Copyright 2005 - 2010 Thomas Schmitt, scdbackup@gmx.net, GPL
 # to be executed within  ./libburn-*  resp ./cdrskin-*

 debug_opts="-O2"
 def_opts=
 largefile_opts="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1"
 fifo_opts=""
-libvers="-DCdrskin_libburn_1_1_0"
+libvers="-DCdrskin_libburn_0_8_4"

 # To be used if Makefile.am uses libburn_libburn_la_CFLAGS
 # burn="libburn/libburn_libburn_la-"
@ -47,15 +47,15 @@ do
    libdax_audioxtr_o=
    libdax_msgs_o="$burn"message.o
    cleanup_src_or_obj="-DCleanup_has_no_libburn_os_H cdrskin/cleanup.c"
-  elif test "$i" = "-libburn_1_1_0"
+  elif test "$i" = "-libburn_0_8_4"
  then
-    libvers="-DCdrskin_libburn_1_1_0"
+    libvers="-DCdrskin_libburn_0_8_4"
    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_1_1"
+    libvers="-DCdrskin_libburn_0_8_5"
    libdax_audioxtr_o="$burn"libdax_audioxtr.o
    libdax_msgs_o="$burn"libdax_msgs.o
    cleanup_src_or_obj="$burn"cleanup.o
@ -109,7 +109,7 @@ do
    echo "Options:"
    echo "  -compile_cdrfifo  compile program cdrskin/cdrfifo."
    echo "  -compile_dewav    compile program test/dewav without libburn."
-    echo "  -libburn_1_1_0    set macro to match libburn-1.1.0"
+    echo "  -libburn_0_8_4    set macro to match libburn-0.8.4"
    echo "  -libburn_svn      set macro to match current libburn-SVN."
    echo "  -dvd_obs_64k      64 KB default size for DVD/BD writing."
    echo "  -use_libcdio      link with -lcdio because libburn uses it."
--- a/configure.ac
+++ b/configure.ac
@ -1,4 +1,4 @@
-AC_INIT([libburn], [1.1.0], [http://libburnia-project.org])
+AC_INIT([libburn], [0.8.4], [http://libburnia-project.org])
 AC_PREREQ([2.50])
 dnl AC_CONFIG_HEADER([config.h])	

@ -8,9 +8,8 @@ AC_CANONICAL_TARGET
 LIBBURNIA_SET_FLAGS

 AM_INIT_AUTOMAKE([subdir-objects])
-AC_CONFIG_MACRO_DIR([./])

-dnl Notes by ts A71207 - B10409 :
+dnl Notes by ts A71207 - B00630 :
 dnl
 dnl Regrettably the meaning of the various version types was misunderstood
 dnl before version 0.4.1.
@ -84,14 +83,6 @@ dnl    0.7.8 = libburn.so.4.43.0
 dnl    0.8.0 = libburn.so.4.45.0
 dnl    0.8.2 = libburn.so.4.47.0
 dnl    0.8.4 = libburn.so.4.49.0
-dnl    0.8.6 = libburn.so.4.51.0
-dnl    0.8.8 = libburn.so.4.53.0
-dnl    0.9.0 = libburn.so.4.55.0
-dnl    1.0.0 = libburn.so.4.57.0
-dnl    1.0.2 = libburn.so.4.59.0
-dnl    1.0.4 = libburn.so.4.61.0
-dnl    1.0.6 = libburn.so.4.63.0
-dnl    1.1.0 = libburn.so.4.65.0
 dnl
 dnl So LT_CURRENT, LT_REVISION and LT_AGE get set directly here.
 dnl SONAME of the emerging library is  LT_CURRENT - LT_AGE.
@ -115,9 +106,9 @@ dnl
 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=1
-BURN_MICRO_VERSION=0
+BURN_MAJOR_VERSION=0
+BURN_MINOR_VERSION=8
+BURN_MICRO_VERSION=4
 BURN_VERSION=$BURN_MAJOR_VERSION.$BURN_MINOR_VERSION.$BURN_MICRO_VERSION

 AC_SUBST(BURN_MAJOR_VERSION)
@ -128,14 +119,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.1.0
+dnl This is the release version libburn-0.8.4
 dnl ### This is the development version after above release version
 dnl LT_CURRENT++, LT_AGE++ has not yet happened.
 dnl ### LT_CURRENT++, LT_AGE++ has happened meanwhile.
 dnl
-dnl SONAME = 69 - 65 = 4 . Linux library name = libburn.so.4.65.0
-LT_CURRENT=69
-LT_AGE=65
+dnl SONAME = 53 - 49 = 4 . Linux library name = libburn.so.4.49.0
+LT_CURRENT=53
+LT_AGE=49
 LT_REVISION=0
 LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`

@ -193,11 +184,11 @@ AC_CHECK_HEADER(sys/statvfs.h, X=, STATVFS_DEF=)
 AC_CHECK_FUNC([statvfs], X=, STATVFS_DEF=)
 dnl If this would be done more specifically in Makefile.am
 dnl via libburn_libburn_la_CFLAGS then undesired .o file names would emerge
-CFLAGS="$STATVFS_DEF $CFLAGS"
+CFLAGS="$CFLAGS $STATVFS_DEF"

 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   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"
@ -208,11 +199,11 @@ else
 fi
 dnl Avoid the need for libburn_libburn_la_CFLAGS in Makefile.am (ugly .o names)
 dnl ### AC_SUBST(LIBBURN_O_DIRECT_DEF)
-CFLAGS="$LIBBURN_O_DIRECT_DEF $CFLAGS"
+CFLAGS="$CFLAGS $LIBBURN_O_DIRECT_DEF"

 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/BD 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"
@ -221,11 +212,11 @@ else
    LIBBURN_DVD_OBS_64K=
    echo "disabled write size default 64 KB on DVD and BD"
 fi
-CFLAGS="$LIBBURN_DVD_OBS_64K $CFLAGS"
+CFLAGS="$CFLAGS $LIBBURN_DVD_OBS_64K"

 dnl ts A91218
 AC_ARG_ENABLE(libcdio,
-[  --enable-libcdio        Enable EXPERIMENTAL use of libcdio as system adapter, default=no],
+[  --enable-libcdio         Enable EXPERIMENTAL use of libcdio as system adapter, default=no],
               , enable_libcdio=no)
 if test x$enable_libcdio = xyes; then
 dnl Check whether there is libcdio-devel and libcdio-runtime.
@ -244,45 +235,13 @@ then
    fi
 else
    echo "enabled  EXPERIMENTAL use of libcdio as system adapter"
-    CFLAGS="$LIBCDIO_DEF $CFLAGS"
+    CFLAGS="$CFLAGS $LIBCDIO_DEF"

    LIBCDIO_REQUIRED=0.83
    PKG_CHECK_MODULES(LIBCDIO, libcdio >= $LIBCDIO_REQUIRED)

 fi

-dnl ts B00704
-# Library versioning normally serves a complex purpose.
-# Since libburn obeys strict ABI backward compatibility, it needs only the
-# simple feature to declare function names "global:" or "local:". Only the
-# global ones are visible to applications at library load time.
-AC_ARG_ENABLE(versioned-libs,
-[  --enable-versioned-libs Enable strict symbol encapsulation , default=yes],
-               , enable_versioned_libs=yes)
-if test x$enable_versioned_libs = xyes; then
-    vers_libs_test=no
-    LIBBURN_ASSERT_VERS_LIBS
-    if test x$vers_libs_test = xno
-    then 
-        echo "disabled strict symbol encapsulation (test failed)"
-    else
-        echo "enabled  strict symbol encapsulation"
-    fi
-else
-    echo "disabled strict symbol encapsulation"
-fi
-
-AC_ARG_ENABLE(ldconfig-at-install,
-[  --enable-ldconfig-at-install    On GNU/Linux run ldconfig, default=yes],
-               , ldconfig_at_install=yes)
-if test x$ldconfig_at_install = xyes; then 
-    dummy=dummy
-else
-    LIBBURNIA_LDCONFIG_CMD="echo 'NOTE: ldconfig is disabled. If needed, configure manually for:'"
-    echo "disabled run of ldconfig during installation on GNU/Linux"
-fi  
-AC_SUBST(LIBBURNIA_LDCONFIG_CMD)
-

 dnl Add compiler-specific flags

@ -292,15 +251,15 @@ AC_ARG_ENABLE(debug,
              , enable_debug=yes)
 if test x$enable_debug != xyes; then
    if test x$GCC = xyes; then
-        CFLAGS="-O3 $CFLAGS"
-        CFLAGS="-fexpensive-optimizations $CFLAGS"
+        CFLAGS="$CFLAGS -O3"
+        CFLAGS="$CFLAGS -fexpensive-optimizations"
    fi
-    CFLAGS="-DNDEBUG $CFLAGS"
+    CFLAGS="$CFLAGS -DNDEBUG"
 else
    if test x$GCC = xyes; then
-        CFLAGS="-g -pedantic -Wall -Wextra -Wno-unused-parameter $CFLAGS"
+        CFLAGS="$CFLAGS -g -pedantic -Wall"
    fi
-    CFLAGS="-DDEBUG $CFLAGS"
+    CFLAGS="$CFLAGS -DDEBUG"
 fi

 dnl Determine target directory for libburn-*.pc
--- a/doc/comments
+++ b/doc/comments
@ -8,13 +8,14 @@
 Libburnia is an open-source project for reading, mastering and writing
 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.
+DVD-R, 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
-about the equivalent of Linux sg or FreeBSD CAM, volunteers for testing of
-realistic use cases.
+Not supported yet are DVD-R/DL. Testers wanted.
+
+Our scope is currently Linux 2.4 and 2.6, or FreeBSD . For ports to other
+systems we would need : login on a development machine resp. a live OS on CD
+or DVD, advise from a system person about the equivalent of Linux sg or FreeBSD
+CAM, volunteers for testing of realistic use cases.

 libburn is the library by which preformatted data get onto optical media.
 Its code is independent of cdrecord. Its DVD capabilities are learned from
--- a/doc/cookbook.txt
+++ b/doc/cookbook.txt
@ -1,9 +1,3 @@
-
-------------------------------------------------------------------------------
-Note: This is about how libburn operates optical drives. Not about how to
-      operate libburn. The libburn API is described in libburn/libburn.h
-------------------------------------------------------------------------------
-
 libburnia-project.org Optical Media Rotisserie Recipes as of January 2010

 Content:
--- a/doc/doxygen.conf.in
+++ b/doc/doxygen.conf.in
@ -154,6 +154,13 @@ QT_AUTOBRIEF           = NO

 MULTILINE_CPP_IS_BRIEF = YES

+# If the DETAILS_AT_TOP tag is set to YES then Doxygen 
+# will output the detailed description near the top, like JavaDoc.
+# If set to NO, the detailed description appears after the member 
+# documentation.
+
+DETAILS_AT_TOP         = YES
+
 # If the INHERIT_DOCS tag is set to YES (the default) then an undocumented 
 # member inherits the documentation from any documented member that it 
 # re-implements.
@ -1145,8 +1152,7 @@ HIDE_UNDOC_RELATIONS   = YES
 # toolkit from AT&T and Lucent Bell Labs. The other options in this section 
 # have no effect if this option is set to NO (the default)

-# ts B10415: dot causes sigsegv on Debian buildd
-HAVE_DOT               = NO
+HAVE_DOT               = YES

 # If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen 
 # will generate a graph for each documented class showing the direct and 
--- a/doc/mediainfo.txt
+++ b/doc/mediainfo.txt
@ -1,10 +1,4 @@

-------------------------------------------------------------------------------
-Note: This is about how libburn operates optical drives. Not about how to
-      operate libburn. The libburn API is described in libburn/libburn.h
-------------------------------------------------------------------------------
-
-
        Overview of class specific or individual media information
             especially manufacturer and exact product type

@ -178,9 +172,6 @@ BD-R and BD-RE:
   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 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,
-                                            BDR for BD-R
                  that bytes 100 to 105 are Disc Manufactuer ID
                  that bytes 106 to 108 are Media Type ID
                  that byte  111        is Product Revision Number
@ -942,7 +933,6 @@ CMCMAG      CN2     CMC Magnetics Corporation 1-2X HTL 25GB(12cm)  [Blu]
 DAXON 016           DAXON  8X   [Hij]
 DAXON       AZ3     DAXON  16X   [Hij]
 DAXON       CY3     DAXON  12X   [Hij]
-DAXON       D42/52  (user reported DVD+RW)
 Daxon       R2X     Daxon Technology Inc.  1-2X HTL 25GB(12cm)  [Blu]
 Daxon       R4X     Daxon Technology Inc.  1-4X HTL 25GB(12cm)  [Blu]

@ -1182,7 +1172,6 @@ TTH02               TDK  12X   [Hij]
 TYG01               TAIYO YUDEN  4X   [Hij]
 TYG02               TAIYO YUDEN  12X   [Hij]
 TYG03               TAIYO YUDEN  16X   [Hij]
-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]

--- a/libburn/async.c
+++ b/libburn/async.c
@ -143,7 +143,7 @@ static void add_worker(int w_type, struct burn_drive *d,
 	pthread_attr_t attr;
 #endif

-	a = calloc(1, sizeof(struct w_list));
+	a = malloc(sizeof(struct w_list));
 	a->w_type = w_type;
 	a->drive = d;
 	a->u = *(union w_list_data *)data;
@ -355,7 +355,7 @@ void burn_disc_erase(struct burn_drive *drive, int fast)
 	/* a ssert(!find_worker(drive)); */

 	if((drive == NULL)) {
-		libdax_msgs_submit(libdax_messenger, -1,
+		libdax_msgs_submit(libdax_messenger, drive->global_index,
 			0x00020104,
 			LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
 			"NULL pointer caught in burn_disc_erase", 0, 0);
@ -383,9 +383,7 @@ void burn_disc_erase(struct burn_drive *drive, int fast)
 	/* ts A70909 : the willingness to burn any BURN_DISC_FULL media is
 	               inappropriate. One would rather need a -force option
 	               Note: keep this in sync with mmc_read_disc_info() */
-	/* ts B10321 : Allowed role 5 to be blanked */
-	if ((drive->drive_role == 1 &&
-	     drive->current_profile != 0x0a &&
+	if ((drive->current_profile != 0x0a &&
 	     drive->current_profile != 0x13 &&
 	     drive->current_profile != 0x14 &&
 	     drive->status != BURN_DISC_FULL)
@ -394,7 +392,7 @@ void burn_disc_erase(struct burn_drive *drive, int fast)
 	     drive->status != BURN_DISC_APPENDABLE &&
 	     drive->status != BURN_DISC_BLANK)
 	    ||
-	    (drive->drive_role != 1 && drive->drive_role != 5)
+	    (drive->drive_role != 1)
 	   ) {
 		libdax_msgs_submit(libdax_messenger, drive->global_index,
 			0x00020130,
@ -445,7 +443,7 @@ void burn_disc_format(struct burn_drive *drive, off_t size, int flag)
 {
 	struct format_opts o;
 	int ok = 0, ret;
-	char msg[40];
+	char msg[160];

 	reset_progress(drive, 1, 1, 1, 0x10000, 0);

@ -519,6 +517,42 @@ void burn_disc_format(struct burn_drive *drive, off_t size, int flag)
 			return;

 		} 
+		if ((flag & 6) != 6 || (flag & 128)) {
+		    if ((flag & 64) && !(drive->current_feat23h_byte4 & 2)) {
+			if (drive->current_feat23h_byte4 & 1) {
+				libdax_msgs_submit(libdax_messenger,
+					drive->global_index, 0x00020165,
+				   	LIBDAX_MSGS_SEV_WARNING,
+					LIBDAX_MSGS_PRIO_HIGH,
+				      "Drive does not support fast formatting",
+					0, 0);
+				flag &= ~64;
+			} else {
+no_non_default_bd_re:;
+				libdax_msgs_submit(libdax_messenger,
+					drive->global_index, 0x00020167,
+				   	LIBDAX_MSGS_SEV_SORRY,
+					LIBDAX_MSGS_PRIO_HIGH,
+				"Drive does not support non-default formatting",
+					0, 0);
+				drive->cancel = 1;
+				return;
+			}
+		    }
+		    if ((!(flag & 64)) && !(drive->current_feat23h_byte4 & 1)){
+			if (drive->current_feat23h_byte4 & 2) {
+				libdax_msgs_submit(libdax_messenger,
+					drive->global_index, 0x00020166,
+				   	LIBDAX_MSGS_SEV_WARNING,
+					LIBDAX_MSGS_PRIO_HIGH,
+				      "Drive does not support full formatting",
+					0, 0);
+				flag |= 64;
+			} else
+				goto no_non_default_bd_re;
+		    }
+		}
+
 	}

 	if (!ok) {
@ -585,9 +619,8 @@ static void *write_disc_worker_func(struct w_list *w)

 void burn_disc_write(struct burn_write_opts *opts, struct burn_disc *disc)
 {
-	int ret;
 	struct write_opts o;
-	char *reasons= NULL;
+	char reasons[BURN_REASONS_LEN+80];
 	struct burn_drive *d;

 	d = opts->drive;
@ -611,13 +644,8 @@ void burn_disc_write(struct burn_write_opts *opts, struct burn_disc *disc)
 	d->cancel = 1;

 	/* ts A70203 : people have been warned in API specs */
-	if (opts->write_type == BURN_WRITE_NONE) {
-		libdax_msgs_submit(libdax_messenger, d->global_index,
-			0x0002017c,
-			LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
-			"No valid write type selected", 0, 0);
+	if (opts->write_type == BURN_WRITE_NONE)
 		return;
-	}

 	if (d->drive_role == 0) {
 		libdax_msgs_submit(libdax_messenger, d->global_index,
@ -626,14 +654,6 @@ void burn_disc_write(struct burn_write_opts *opts, struct burn_disc *disc)
 			"Drive is a virtual placeholder (null-drive)", 0, 0);
 		return;
 	}
-	if (d->drive_role == 4) {
-		libdax_msgs_submit(libdax_messenger, d->global_index,
-			0x00020181,
-			LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
-			"Pseudo-drive is a read-only file. Cannot write.",
-			0, 0);
-		return;
-	}

 	/* ts A61007 : obsolete Assert in spc_select_write_params() */
 	if (d->drive_role == 1 && d->mdata->valid <= 0) {
@ -647,8 +667,6 @@ void burn_disc_write(struct burn_write_opts *opts, struct burn_disc *disc)
 	/* ts A70219 : intended to replace all further tests here and many
 	               tests in burn_*_write_sync()
 	*/
-
-        BURN_ALLOC_MEM(reasons, char, BURN_REASONS_LEN + 80);
 	strcpy(reasons, "Write job parameters are unsuitable:\n");
 	if (burn_precheck_write(opts, disc, reasons + strlen(reasons), 1)
 	     <= 0) {
@ -656,9 +674,8 @@ void burn_disc_write(struct burn_write_opts *opts, struct burn_disc *disc)
 				d->global_index, 0x00020139,
 				LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
 				reasons, 0, 0);
-		goto ex;
+		return;
 	}
-        BURN_FREE_MEM(reasons); reasons= NULL;

 	/* ts A90106 : early catching of unformatted BD-RE */
 	if (d->current_profile == 0x43) 
@ -682,9 +699,6 @@ void burn_disc_write(struct burn_write_opts *opts, struct burn_disc *disc)

 	add_worker(Burnworker_type_writE, d,
 			(WorkerFunc) write_disc_worker_func, &o);
-
-ex:;
-	BURN_FREE_MEM(reasons);
 }


--- a/libburn/drive.c
+++ b/libburn/drive.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 - 2010 Thomas Schmitt <scdbackup@gmx.net>
   Provided under GPL version 2 or later.
 */

@ -12,6 +12,9 @@

 #include <sys/types.h>
 #include <sys/stat.h>
+
+/* #include <m alloc.h>  ts A61013 : not in GNU/Linux man 3 malloc */
+
 #include <stdlib.h>
 #include <unistd.h>
 #include <signal.h>
@ -24,7 +27,6 @@
 #include <ctype.h>
 #include <pthread.h>
 #include <errno.h>
-#include <fcntl.h>
 #include "libburn.h"
 #include "init.h"
 #include "drive.h"
@ -60,10 +62,6 @@ static int drivetop = -1;
 /* ts A80410 : in init.c */
 extern int burn_support_untested_profiles;

-/* ts B10312 : in init.c */
-extern int burn_drive_role_4_allowed;
-
-
 /* ts A61021 : the unspecific part of sg.c:enumerate_common()
 */
 int burn_setup_drive(struct burn_drive *d, char *fname)
@ -78,7 +76,6 @@ int burn_setup_drive(struct burn_drive *d, char *fname)
 	d->status = BURN_DISC_UNREADY;
 	d->do_stream_recording = 0;
        d->stream_recording_start= 0;
-	d->role_5_nwa = 0;
 	return 1;
 }

@ -218,10 +215,7 @@ unsigned int burn_drive_count(void)
 int burn_drive_is_listed(char *path, struct burn_drive **found, int flag)
 {
 	int i, ret;
-	char *drive_adr = NULL, *off_adr = NULL;
-
-	BURN_ALLOC_MEM(drive_adr, char, BURN_DRIVE_ADR_LEN);
-	BURN_ALLOC_MEM(off_adr, char, BURN_DRIVE_ADR_LEN);
+	char drive_adr[BURN_DRIVE_ADR_LEN], off_adr[BURN_DRIVE_ADR_LEN];

 	ret = burn_drive_convert_fs_adr(path, off_adr);
 	if (ret <= 0)
@ -235,14 +229,10 @@ int burn_drive_is_listed(char *path, struct burn_drive **found, int flag)
 		if(strcmp(off_adr, drive_adr) == 0) {
 			if (found != NULL)
 				*found= &(drive_array[i]);
-			{ret= 1; goto ex;}
+			return 1;
 		}
 	}
-	ret= 0;
-ex:;
-	BURN_FREE_MEM(drive_adr);
-	BURN_FREE_MEM(off_adr);
-	return ret;
+	return 0;
 }


@ -320,9 +310,8 @@ int burn_drive_inquire_media(struct burn_drive *d)
 int burn_drive_grab(struct burn_drive *d, int le)
 {
 	int errcode;
-	/* ts A61125 - B10314 */
-	int ret, sose, stat_ret = -1;
-	struct stat stbuf;
+	/* ts A61125 - A61202 */
+	int ret, sose;

 	if (!d->released) {
 		burn_print(1, "can't grab - already grabbed\n");
@ -330,24 +319,9 @@ int burn_drive_grab(struct burn_drive *d, int le)
 	}
 	if(d->drive_role != 1) {
 		d->released = 0;
-		d->current_profile = 0xffff;
-		if (d->devname[0])
-			stat_ret = stat(d->devname, &stbuf);
 		if(d->drive_role == 2 || d->drive_role == 3) {
 			d->status = BURN_DISC_BLANK;
-		} else if(d->drive_role == 4) {
-			if (d->media_read_capacity > 0)
-				d->status = BURN_DISC_FULL;
-			else
-				d->status = BURN_DISC_EMPTY;
-		} else if(d->drive_role == 5) {
-			if (stat_ret != -1 && S_ISREG(stbuf.st_mode) &&
-			    stbuf.st_size > 0) {
-				d->status = BURN_DISC_APPENDABLE;
-				d->role_5_nwa = stbuf.st_size / 2048 +
-						!!(stbuf.st_size % 2048);
-			} else
-				d->status = BURN_DISC_BLANK;
+			d->current_profile = 0xffff;
 		} else {
 			d->status = BURN_DISC_EMPTY;
 			d->current_profile = 0;
@ -458,12 +432,10 @@ int burn_drive_unregister(struct burn_drive *d)
 */
 struct burn_drive *burn_drive_finish_enum(struct burn_drive *d)
 {
-	struct burn_drive *t = NULL;
-	char *msg = NULL;
+	struct burn_drive *t;
+	char msg[BURN_DRIVE_ADR_LEN + 160];
 	int ret;

-	BURN_ALLOC_MEM(msg, char, BURN_DRIVE_ADR_LEN + 160);
-
 	d->drive_role = 1; /* MMC drive */

 	t = burn_drive_register(d);
@ -492,8 +464,6 @@ struct burn_drive *burn_drive_finish_enum(struct burn_drive *d)
 	/* ts A60821 */
 	mmc_function_spy(NULL, "enumerate_common : ----- would release ");

-ex:
-	BURN_FREE_MEM(msg);
 	return t;
 }

@ -648,29 +618,13 @@ void burn_wait_all(void)

 void burn_disc_erase_sync(struct burn_drive *d, int fast)
 {
-	int ret;
+/* ts A60924 : libburn/message.c gets obsoleted
+	burn_message_clear_queue();
+*/

 	burn_print(1, "erasing drive %s %s\n", d->idata->vendor,
 		   d->idata->product);

-	if (d->drive_role == 5) { /* Random access write-only drive */
-		ret = truncate(d->devname, (off_t) 0);
-		if (ret == -1) {
-			libdax_msgs_submit(libdax_messenger, -1,
-			     0x00020182,
-			     LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
-			     "Cannot truncate disk file for pseudo blanking",
-			     0, 0);
-			return;
-		}
-		d->role_5_nwa = 0;
-		d->cancel = 0;
-		d->status = BURN_DISC_BLANK;
-		d->busy = BURN_DRIVE_IDLE;
-		d->progress.sector = 0x10000;
-		return;
-	}
-
 	d->cancel = 0;

 #ifdef Libburn_reset_progress_asynC
@ -714,9 +668,7 @@ void burn_disc_format_sync(struct burn_drive *d, off_t size, int flag)
 	int ret, buf_secs, err, i, stages = 1, pbase, pfill, pseudo_sector;
 	off_t num_bufs;
 	char msg[80];
-	struct buffer *buf = NULL, *buf_mem = d->buffer;
-
-	BURN_ALLOC_MEM(buf, struct buffer, 1);
+	struct buffer buf, *buf_mem = d->buffer;

 #ifdef Libburn_reset_progress_asynC
 	/* <<< This is now done in async.c */
@ -775,7 +727,7 @@ void burn_disc_format_sync(struct burn_drive *d, off_t size, int flag)
 				LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_ZERO,
 				msg, 0, 0);

-		d->buffer = buf;
+		d->buffer = &buf;
 		memset(d->buffer, 0, sizeof(struct buffer));
 		d->buffer->bytes = buf_secs * 2048;
 		d->buffer->sectors = buf_secs;
@ -803,7 +755,6 @@ ex:;
 	d->progress.sector = 0x10000;
 	d->busy = BURN_DRIVE_IDLE;
 	d->buffer = buf_mem;
-	BURN_FREE_MEM(buf);
 }


@ -921,11 +872,6 @@ void burn_drive_cancel(struct burn_drive *d)
 /* ts B00225 : these mutexes are unnecessary because "= 1" is atomar.
 	pthread_mutex_lock(&d->access_lock);
 */
-	if (!d->cancel) {
-		libdax_msgs_submit(libdax_messenger, -1, 0x00000002,
-				LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_ZERO,
-				"burn_drive_cancel() was called", 0, 0);
-	}
 	d->cancel = 1;
 /*
 	pthread_mutex_unlock(&d->access_lock);
@ -1106,7 +1052,7 @@ int burn_drive_scan_sync(struct burn_drive_info *drives[],
 	*n_drives = 0;

 	/* ts A70907 : wether to scan from scratch or to extend */
-	for (i = 0; i < (int) sizeof(scanned); i++)
+	for (i = 0; i < sizeof(scanned); i++)
 		scanned[i] = 0;
 	if (flag & 1) {
 		burn_drive_free_all();
@ -1134,12 +1080,12 @@ int burn_drive_scan_sync(struct burn_drive_info *drives[],
 					"Out of virtual memory", 0, 0);
 			return -1;
 		} else
-			for (i = 0; i <= (int) count; i++) /* invalidate */
+			for (i = 0; i <= count; i++) /* invalidate */
 				(*drives)[i].drive = NULL;
 	} else
 		*drives = NULL;

-	for (i = 0; i < (int) count; ++i) {
+	for (i = 0; i < count; ++i) {
 		if (scanned[i / 8] & (1 << (i % 8)))
 	continue;		/* device already scanned by previous run */
 		if (drive_array[i].global_index < 0)
@ -1351,7 +1297,7 @@ int burn_drive_add_whitelist(char *device_address)
 	if(enumeration_whitelist_top+1 >= BURN_DRIVE_WHITELIST_LEN)
 		return 0;
 	enumeration_whitelist_top++;
-	new_item = calloc(1, strlen(device_address) + 1);
+	new_item = malloc(strlen(device_address) + 1);
 	if (new_item == NULL)
 		return -1;
 	strcpy(new_item, device_address);
@ -1411,109 +1357,40 @@ int burn_drive__fd_from_special_adr(char *adr)
 	return fd;
 }

-/* @param flag bit0= accept read-only files and return 2 in this case
-               bit1= accept write-only files and return 3 in this case
-*/
-static int burn_drive__is_rdwr(char *fname, int *stat_ret, 
-                               struct stat *stbuf_ret,
-                               off_t *read_size_ret, int flag)
-{
-	int fd, is_rdwr = 1, ret, getfl_ret, st_ret, mask;
-	struct stat stbuf;
-        off_t read_size = 0;
-
-	memset(&stbuf, 0, sizeof(struct stat));
-	fd = burn_drive__fd_from_special_adr(fname);
-	if (fd >= 0)
-		st_ret = fstat(fd, &stbuf);
-	else
-		st_ret = stat(fname, &stbuf);
-	if (st_ret != -1) {
-		is_rdwr = burn_os_is_2k_seekrw(fname, 0);
-		if (S_ISREG(stbuf.st_mode))
-			read_size = stbuf.st_size;
-		else if (is_rdwr) {
-			ret = burn_os_stdio_capacity(fname, &read_size);
-			if (ret <= 0)
-				read_size = (off_t) 0x7ffffff0 * (off_t) 2048;  
-		}
-	}
-
-	if (is_rdwr && fd >= 0) {
-		getfl_ret = fcntl(fd, F_GETFL);
-
-/*
-fprintf(stderr, "LIBBURN_DEBUG: burn_drive__is_rdwr: getfl_ret = %lX , O_RDWR = %lX , & = %lX , O_RDONLY = %lX\n", (unsigned long) getfl_ret, (unsigned long) O_RDWR, (unsigned long) (getfl_ret & O_RDWR), (unsigned long) O_RDONLY);
-*/
-
-		mask = O_RDWR | O_WRONLY | O_RDONLY;
-
-		if (getfl_ret == -1 || (getfl_ret & mask) != O_RDWR)
-			is_rdwr = 0;
-		if ((flag & 1) && getfl_ret != -1 &&
-		    (getfl_ret & mask) == O_RDONLY)
-			is_rdwr = 2;
-		if ((flag & 2) && getfl_ret != -1 &&
-		    (getfl_ret & mask) == O_WRONLY)
-			is_rdwr = 3;
-	}
-	if (stat_ret != NULL)
-		*stat_ret = st_ret;
-	if (stbuf_ret != NULL)
-		memcpy(stbuf_ret, &stbuf, sizeof(struct stat));
-	if (read_size_ret != NULL)
-		*read_size_ret = read_size;
-	return is_rdwr;
-}
-
-
-static int burn_role_by_access(char *fname, int flag)
-{
-/* We normally need _LARGEFILE64_SOURCE defined by the build system.
-   Nevertheless the system might use large address integers by default.
-*/
-#ifndef O_LARGEFILE
-#define O_LARGEFILE 0
-#endif
-	int fd;
-        
-	fd = open(fname, O_RDWR | O_LARGEFILE);
-	if (fd != -1) {
-		close(fd);
-		return 2;
-	}
-	fd = open(fname, O_RDONLY | O_LARGEFILE);
-        if (fd != -1) {
-		close(fd);
-		return 4;
-	}
-	fd = open(fname, O_WRONLY | O_LARGEFILE);
-	if (fd != -1) {
-		close(fd);
-		return 5;
-	}
-	if (flag & 1)
-		return 0;
-	return 2;
-}
-

 /* ts A70903 : Implements adquiration of pseudo drives */
 int burn_drive_grab_dummy(struct burn_drive_info *drive_infos[], char *fname)
 {
-	int ret = -1, role = 0, fd;
-	int is_rdwr = 0, stat_ret = -1;
+	int ret = -1, fd = -1, role = 0;
+	int is_block_dev = 0;
 	/* divided by 512 it needs to fit into a signed long integer */
 	off_t size = ((off_t) (512 * 1024 * 1024 - 1) * (off_t) 2048);
 	off_t read_size = -1;
 	struct burn_drive *d= NULL, *regd_d;
 	struct stat stbuf;

+	static int allow_role_3 = 1;
+
 	if (fname[0] != 0) {
+		memset(&stbuf, 0, sizeof(stbuf));
 		fd = burn_drive__fd_from_special_adr(fname);
-		is_rdwr = burn_drive__is_rdwr(fname, &stat_ret, &stbuf,
-						&read_size, 1 | 2);
-		if (stat_ret == -1 || is_rdwr) {
+		if (fd >= 0)
+			ret = fstat(fd, &stbuf);
+		else
+			ret = stat(fname, &stbuf);
+		if (ret != -1) {
+			is_block_dev = burn_os_is_2k_seekrw(fname, 0);
+			if (S_ISREG(stbuf.st_mode))
+				read_size = stbuf.st_size;
+			else if (is_block_dev) {
+				ret = burn_os_stdio_capacity(fname,
+								&read_size);
+				if (ret <= 0)
+					read_size = (off_t) 0x7ffffff0 *
+								(off_t) 2048;  
+			}
+		}
+		if (ret == -1 || is_block_dev || S_ISREG(stbuf.st_mode)) {
 			ret = burn_os_stdio_capacity(fname, &size);
 			if (ret == -1) {
 				libdax_msgs_submit(libdax_messenger, -1,
@ -1530,22 +1407,18 @@ int burn_drive_grab_dummy(struct burn_drive_info *drive_infos[], char *fname)
 				errno, 0);
 				return 0;
 			}
-			if (fname[0] != 0) {
-				if (is_rdwr == 2 &&
-				    (burn_drive_role_4_allowed & 1))
-					role = 4;
-				else if (is_rdwr == 3 &&
-				    (burn_drive_role_4_allowed & 1))
-					role = 5;
-				else
-					role = 2;
-				if (stat_ret != -1 && role == 2 && fd == -1 &&
-				    (burn_drive_role_4_allowed & 3) == 3)
-					role = burn_role_by_access(fname,
-					    !!(burn_drive_role_4_allowed & 4));
-			} else
+			if (fname[0] != 0)
+				role = 2;
+			else
 				role = 0;
 		} else {
+			if(S_ISDIR(stbuf.st_mode) || !allow_role_3) {
+				libdax_msgs_submit(libdax_messenger, -1,
+				 0x00020149,
+				 LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
+				 "Unsuitable filetype for pseudo-drive", 0, 0);
+				return 0;
+			}
 			role = 3;
 		}
 	}
@ -1566,39 +1439,22 @@ int burn_drive_grab_dummy(struct burn_drive_info *drive_infos[], char *fname)
 	}
 	free((char *) d); /* all sub pointers have been copied to *regd_d */
 	d = regd_d;
-	if (d->drive_role >= 2 && d->drive_role <= 5) {
-		if (d->drive_role == 4) {
-			if (read_size > 0)
-				d->status = BURN_DISC_FULL;
-			else
-				d->status = BURN_DISC_EMPTY;
-			d->block_types[BURN_WRITE_TAO] = 0;
-			d->block_types[BURN_WRITE_SAO] = 0;
-		} else {
-			if (d->drive_role == 5 && stat_ret != -1 &&
-			    S_ISREG(stbuf.st_mode) && stbuf.st_size > 0 &&
-			    (burn_drive_role_4_allowed & 8)) {
-				d->status = BURN_DISC_APPENDABLE;
-				d->block_types[BURN_WRITE_SAO] = 0;
-				d->role_5_nwa = stbuf.st_size / 2048 +
-						!!(stbuf.st_size % 2048);
-			} else {
-				d->status = BURN_DISC_BLANK;
-				d->block_types[BURN_WRITE_SAO] =
-								BURN_BLOCK_SAO;
-				d->role_5_nwa = 0;
-			}
-			d->block_types[BURN_WRITE_TAO] = BURN_BLOCK_MODE1;
-		}
+	if (d->drive_role == 2 || d->drive_role == 3) {
+		d->status = BURN_DISC_BLANK;
 		d->current_profile = 0xffff; /* MMC for non-compliant drive */
 		strcpy(d->current_profile_text,"stdio file");
 		d->current_is_cd_profile = 0;
 		d->current_is_supported_profile = 1;
+		d->block_types[BURN_WRITE_TAO] = BURN_BLOCK_MODE1;
+		d->block_types[BURN_WRITE_SAO] = BURN_BLOCK_SAO;
 		if (read_size >= 0)
 			/* despite its name : last valid address, not size */
 			d->media_read_capacity =
 				read_size / 2048 - !(read_size % 2048);
 		burn_drive_set_media_capacity_remaining(d, size);
+
+		/* >>> ? open file for a test ? (>>> beware of "-" = stdin) */;
+
 	} else
 		d->current_profile = 0; /* Drives return this if empty */

@ -1617,14 +1473,6 @@ int burn_drive_grab_dummy(struct burn_drive_info *drive_infos[], char *fname)
 		strcpy((*drive_infos)[0].vendor,"YOYODYNE");
 		strcpy((*drive_infos)[0].product,"BLACKHOLE");
 		strcpy((*drive_infos)[0].revision,"FX02");
-	} else if (d->drive_role == 4) {
-		strcpy((*drive_infos)[0].vendor,"YOYODYNE");
-		strcpy((*drive_infos)[0].product,"WARP DRIVE");
-		strcpy((*drive_infos)[0].revision,"FX03");
-	} else if (d->drive_role == 5) {
-		strcpy((*drive_infos)[0].vendor,"YOYODYNE");
-		strcpy((*drive_infos)[0].product,"WARP DRIVE");
-		strcpy((*drive_infos)[0].revision,"FX04");
 	} else {
 		strcpy((*drive_infos)[0].vendor,"FERENGI");
 		strcpy((*drive_infos)[0].product,"VAPORWARE");
@ -1705,21 +1553,18 @@ int burn_drive_scan_and_grab(struct burn_drive_info *drive_infos[], char* adr,
 int burn_drive_adr_debug_msg(char *fmt, char *arg)
 {
 	int ret;
-	char *msg = NULL, *msgpt;
+	char msg[4096], *msgpt;

-	BURN_ALLOC_MEM(msg, char, 4096);
-	msgpt = msg;
+        msgpt= msg;
 	if(arg != NULL)
 		sprintf(msg, fmt, arg);
 	else
-		msgpt = fmt;
+		msgpt= fmt;
 	if(libdax_messenger == NULL)
 		return 0;
 	ret = libdax_msgs_submit(libdax_messenger, -1, 0x00000002,
 				LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_ZERO,
 				msgpt, 0, 0);
-ex:;
-	BURN_FREE_MEM(msg);
 	return ret;
 }

@ -1768,14 +1613,10 @@ int burn_drive_is_enumerable_adr(char *adr)
 int burn_drive_resolve_link(char *path, char adr[], int *recursion_count,
 				int flag)
 {
-	int ret, link_target_size = 4096;
-	char *link_target = NULL, *msg = NULL, *link_adr = NULL, *adrpt;
+	int ret;
+	char link_target[4096], msg[4096+100], link_adr[4096], *adrpt;
 	struct stat stbuf;

-	BURN_ALLOC_MEM(link_target, char, link_target_size);
-	BURN_ALLOC_MEM(msg, char, link_target_size + 100);
-	BURN_ALLOC_MEM(link_adr, char, link_target_size);
-
 	if (flag & 1)
 		burn_drive_adr_debug_msg("burn_drive_resolve_link( %s )",
 									path);
@ -1784,24 +1625,24 @@ int burn_drive_resolve_link(char *path, char adr[], int *recursion_count,
 			burn_drive_adr_debug_msg(
 			"burn_drive_resolve_link aborts because link too deep",
 			NULL);
-		{ret = 0; goto ex;}
+		return 0;
 	}
 	(*recursion_count)++;
-	ret = readlink(path, link_target, link_target_size);
+	ret = readlink(path, link_target, sizeof(link_target));
 	if (ret == -1) {
 		if (flag & 1)
 			burn_drive_adr_debug_msg("readlink( %s ) returns -1",
 									path);
-		{ret = 0; goto ex;}
+		return 0;
 	}
-	if (ret >= link_target_size - 1) {
+	if (ret >= sizeof(link_target) - 1) {
 		sprintf(msg,"readlink( %s ) returns %d (too much)", path, ret);
 		if (flag & 1)
 			burn_drive_adr_debug_msg(msg, NULL);
-		{ret = -1; goto ex;}
+		return -1;
 	}
 	link_target[ret] = 0;
-	adrpt = link_target;
+	adrpt= link_target;
 	if (link_target[0] != '/') {
 		strcpy(link_adr, path);
 		if ((adrpt = strrchr(link_adr, '/')) != NULL) {
@ -1829,10 +1670,6 @@ int burn_drive_resolve_link(char *path, char adr[], int *recursion_count,
 	}
 	if (flag & 1)
 		burn_drive_adr_debug_msg(msg, NULL);
-ex:;
-	BURN_FREE_MEM(link_target);
-	BURN_FREE_MEM(msg);
-	BURN_FREE_MEM(link_adr);
 	return ret;
 }

@ -1840,16 +1677,13 @@ ex:;
 /* Try to find an enumerated address with the given stat.st_rdev number */
 int burn_drive_find_devno(dev_t devno, char adr[])
 {
-	char *fname = NULL, *msg = NULL;
-	int ret = 0, first = 1, fname_size = 4096;
+	char fname[4096], msg[4096+100];
+	int ret = 0, first = 1;
 	struct stat stbuf;
 	burn_drive_enumerator_t enm;

-	BURN_ALLOC_MEM(fname, char, fname_size);
-	BURN_ALLOC_MEM(msg, char, fname_size + 100);
-
 	while (1) {
-		ret = sg_give_next_adr(&enm, fname, fname_size, first);
+		ret = sg_give_next_adr(&enm, fname, sizeof(fname), first);
 		if(ret <= 0)
 	break;
 		first = 0;
@ -1859,7 +1693,7 @@ int burn_drive_find_devno(dev_t devno, char adr[])
 		if(devno != stbuf.st_rdev)
 	continue;
 		if(strlen(fname) >= BURN_DRIVE_ADR_LEN)
-			{ret= -1; goto ex;}
+			return -1;

 		sprintf(msg, "burn_drive_find_devno( 0x%lX ) found %s",
 			 (long) devno, fname);
@ -1870,9 +1704,7 @@ int burn_drive_find_devno(dev_t devno, char adr[])
 	ret = 0;
 ex:;
 	if (first == 0)
-		sg_give_next_adr(&enm, fname, fname_size, -1);
-	BURN_FREE_MEM(fname);
-	BURN_FREE_MEM(msg);
+		sg_give_next_adr(&enm, fname, sizeof(fname), -1);
 	return ret;
 }

@ -1885,9 +1717,7 @@ int burn_drive_obtain_scsi_adr(char *path,
 			       int *target_no, int *lun_no)
 {
 	int ret, i;
-	char *adr = NULL;
-
-	BURN_ALLOC_MEM(adr, char, BURN_DRIVE_ADR_LEN);
+	char adr[BURN_DRIVE_ADR_LEN];

 	/* open drives cannot be inquired by sg_obtain_scsi_adr() */
 	for (i = 0; i < drivetop + 1; i++) {
@ -1895,7 +1725,7 @@ int burn_drive_obtain_scsi_adr(char *path,
 	continue;
 		ret = burn_drive_d_get_adr(&(drive_array[i]),adr);
 		if (ret < 0)
-			{ret = 1; goto ex;}
+			return -1;
 		if (ret == 0)
 	continue;
 		if (strcmp(adr, path) == 0) {
@ -1906,15 +1736,13 @@ int burn_drive_obtain_scsi_adr(char *path,
 			*bus_no = drive_array[i].bus_no;
 			if (*host_no < 0 || *channel_no < 0 ||
 			    *target_no < 0 || *lun_no < 0)
-				{ret = 0; goto ex;}
-			{ret = 1; goto ex;}
+				return 0;
+			return 1;
 		}
 	}

 	ret = sg_obtain_scsi_adr(path, bus_no, host_no, channel_no,
 				 target_no, lun_no);
-ex:;
-	BURN_FREE_MEM(adr);
 	return ret;
 }

@ -1922,20 +1750,17 @@ ex:;
 int burn_drive_convert_scsi_adr(int bus_no, int host_no, int channel_no,
 				int target_no, int lun_no, char adr[])
 {
-	char *fname = NULL, *msg = NULL;
-	int ret = 0, first = 1, i_bus_no = -1, fname_size = 4096;
+	char fname[4096],msg[4096+100];
+	int ret = 0, first = 1, i_bus_no = -1;
 	int i_host_no = -1, i_channel_no = -1, i_target_no = -1, i_lun_no = -1;
 	burn_drive_enumerator_t enm;

-	BURN_ALLOC_MEM(fname, char, fname_size);
-	BURN_ALLOC_MEM(msg, char, fname_size + 100);
-
 	sprintf(msg,"burn_drive_convert_scsi_adr( %d,%d,%d,%d,%d )",
 		bus_no, host_no, channel_no, target_no, lun_no);
 	burn_drive_adr_debug_msg(msg, NULL);

 	while (1) {
-		ret= sg_give_next_adr(&enm, fname, fname_size, first);
+		ret= sg_give_next_adr(&enm, fname, sizeof(fname), first);
 		if(ret <= 0)
 	break;
 		first = 0;
@ -1964,8 +1789,6 @@ int burn_drive_convert_scsi_adr(int bus_no, int host_no, int channel_no,
 ex:;
 	if (first == 0)
 		sg_give_next_adr(&enm, fname, sizeof(fname), -1);
-	BURN_FREE_MEM(fname);
-	BURN_FREE_MEM(msg);
 	return ret;
 }

@ -2281,11 +2104,6 @@ int burn_disc_track_lba_nwa(struct burn_drive *d, struct burn_write_opts *o,
 		return -1;
 	}
 	*lba = *nwa = 0;
-	if (d->drive_role == 5 && trackno == 0 &&
-	    d->status == BURN_DISC_APPENDABLE) {
-		*lba = *nwa = d->role_5_nwa;
-		return 1;
-	}
 	if (d->drive_role != 1)
 		return 0;
 	if (o != NULL)
@ -2403,7 +2221,7 @@ int burn_speed_descriptor_new(struct burn_speed_descriptor **s,
 {
 	struct burn_speed_descriptor *o;

-	(*s) = o = calloc(1, sizeof(struct burn_speed_descriptor));
+	(*s) = o = malloc(sizeof(struct burn_speed_descriptor));
 	if (o == NULL)
 		return -1;
 	o->source = 0;
@ -2574,7 +2392,7 @@ int burn_disc_get_multi_caps(struct burn_drive *d, enum burn_write_types wt,
 	if(s == BURN_DISC_UNGRABBED)
 		return -1;
 	*caps = o = (struct burn_multi_caps *)
-		calloc(1, sizeof(struct burn_multi_caps));
+		malloc(sizeof(struct burn_multi_caps));
 	if(*caps == NULL)
 		return -1;
 	/* Default says nothing is available */
@ -2588,7 +2406,7 @@ int burn_disc_get_multi_caps(struct burn_drive *d, enum burn_write_types wt,
 	o->current_is_cd_profile = d->current_is_cd_profile;
        o->might_simulate = 0;
 	
-	if (d->drive_role == 0 || d->drive_role == 4)
+	if (d->drive_role == 0)
 		return 0;
 	if (d->drive_role == 2) {
 		/* stdio file drive : random access read-write */
@ -2596,39 +2414,12 @@ int burn_disc_get_multi_caps(struct burn_drive *d, enum burn_write_types wt,
 		size = d->media_capacity_remaining;
 		burn_os_stdio_capacity(d->devname, &size);
 		burn_drive_set_media_capacity_remaining(d, size);
-
-		/* >>> This looks wrong ! */
-		/* >>> should add file size */
 		o->start_range_high = size;
-
 		o->start_alignment = 2048; /* imposting a drive, not a file */
 		o->might_do_sao = 4;
 		o->might_do_tao = 2;
 		o->advised_write_mode = BURN_WRITE_TAO;
        	o->might_simulate = 1;
-	} else if (d->drive_role == 5) {
-		/* stdio file drive : random access write-only */
-		o->start_adr = 1;
-		size = d->media_capacity_remaining;
-		burn_os_stdio_capacity(d->devname, &size);
-		burn_drive_set_media_capacity_remaining(d, size);
-
-		/* >>> start_range_low = file size rounded to 2048 */;
-
-		/* >>> This looks wrong ! */
-		/* >>> should add file size */
-		o->start_range_high = size;
-
-		o->start_alignment = 2048; /* imposting a drive, not a file */
-		if (s == BURN_DISC_APPENDABLE) {
-			if (wt == BURN_WRITE_SAO || wt == BURN_WRITE_RAW)
-				return 0;
-			o->might_do_sao = 0;
-		} else
-			o->might_do_sao = 4;
-		o->might_do_tao = 2;
-		o->advised_write_mode = BURN_WRITE_TAO;
-        	o->might_simulate = 1;
 	} else if (d->drive_role != 1) {
 		/* stdio file drive : sequential access write-only */
 		o->might_do_sao = 4;
@ -2852,88 +2643,49 @@ static int burn__split_path(char *adr, char **dpt, char **npt)
 int burn_drive_equals_adr(struct burn_drive *d1, char *adr2_in, int role2)
 {
 	struct stat stbuf1, stbuf2;
-	char *adr1 = NULL, *adr2 = adr2_in;
-	char *conv_adr1 = NULL, *conv_adr2 = NULL;
+	char adr1[BURN_DRIVE_ADR_LEN], *adr2 = adr2_in;
+	char conv_adr1[BURN_DRIVE_ADR_LEN], conv_adr2[BURN_DRIVE_ADR_LEN];
 	char *npt1, *dpt1, *npt2, *dpt2;
-	int role1, stat_ret1, stat_ret2, conv_ret2, exact_role_matters = 0, fd;
-	int ret;
-
-	BURN_ALLOC_MEM(adr1, char, BURN_DRIVE_ADR_LEN);
-	BURN_ALLOC_MEM(conv_adr1, char, BURN_DRIVE_ADR_LEN);
-	BURN_ALLOC_MEM(conv_adr2, char, BURN_DRIVE_ADR_LEN);
+	int role1, stat_ret1, stat_ret2, conv_ret2;

 	role1 = burn_drive_get_drive_role(d1);
 	burn_drive_d_get_adr(d1, adr1);
 	stat_ret1 = stat(adr1, &stbuf1);

-	/* If one of the candidate paths depicts an open file descriptor then
-	   its read-write capability decides about its role and the difference
-	   between roles 2 and 3 does matter.
-	*/
-	fd = burn_drive__fd_from_special_adr(d1->devname);
-	if (fd != -1)
-		exact_role_matters = 1;
 	if (strncmp(adr2, "stdio:", 6) == 0) {
 		adr2+= 6;
-		if (adr2[0] == 0) {
-			role2 = 0;
-		} else {
-			fd = burn_drive__fd_from_special_adr(adr2);
-			if (fd != -1)
-				exact_role_matters = 1;
-			ret = burn_drive__is_rdwr(adr2, NULL, NULL, NULL,
-									1 | 2);
-			if (ret == 2 && (burn_drive_role_4_allowed & 1))
-				role2 = 4;
-			else if (ret == 3 && (burn_drive_role_4_allowed & 1))
-				role2 = 5;
-			else if (ret > 0)
-				role2 = 2;
-			else
-				role2 = 3;
-			if (fd == -1 &&
-			    role2 == 2 && (burn_drive_role_4_allowed & 3) == 3)
-				role2 = burn_role_by_access(adr2,
-					    !!(burn_drive_role_4_allowed & 4));
-		}
+		role2 = (!!adr2[0]) * 2;
 	}
-
 	if (strlen(adr2) >= BURN_DRIVE_ADR_LEN)
-		{ret = -1; goto ex;}
+		return -1;
 	stat_ret2 = stat(adr2, &stbuf2);
 	conv_ret2 = burn_drive_convert_fs_adr(adr2, conv_adr2);

-	if (!exact_role_matters) {
-		/* roles >= 2 have the same name space and object
-		   interpretation */
-		if (role1 >= 2)
-			role1 = 2;
-		if (role2 >= 2)
-			role2 = 2;
-	}
+	/* roles 2 and 3 have the same name space and object interpretation */
+	if (role1 == 3)
+		role1 = 2;
+	if (role2 == 3)
+		role2 = 2;

 	if (strcmp(adr1, adr2) == 0 && role1 == role2)
-		{ret = 1; goto ex;}		/* equal role and address */
+		return(1);			/* equal role and address */
 	if (role1 == 1 && role2 == 1) {
 					/* MMC drive meets wannabe MMC drive */
 		if (conv_ret2 <= 0)
-			{ret = 0; goto ex;}	/* no MMC drive at adr2 */
+			return 0;		/* no MMC drive at adr2 */
 		if (strcmp(adr1, conv_adr2) == 0)
-			{ret = 1; goto ex;}	/* equal real MMC drives */
-		{ret = 0; goto ex;}
+			return 1;		/* equal real MMC drives */
+		return 0;

 	} else if (role1 == 0 || role2 == 0)
-		{ret = 0; goto ex;}		/* one null-drive, one not */
+		return 0;			/* one null-drive, one not */

 	else if (role1 != 1 && role2 != 1) {
 					/* pseudo-drive meets file object */

-		if (role1 != role2)
-			{ret = 0; goto ex;}
 		if (stat_ret1 == -1 || stat_ret2 == -1) {
 			if (stat_ret1 != -1 || stat_ret2 != -1)
-				 {ret = 0; goto ex;}
-					/* one adress existing, one not */
+				 return 0;  /* one adress existing, one not */

 			/* Two non-existing file objects */

@ -2942,12 +2694,11 @@ int burn_drive_equals_adr(struct burn_drive *d1, char *adr2_in, int role2)
 			strcpy(conv_adr2, adr2);
 			burn__split_path(conv_adr2, &dpt2, &npt2);
 			if (strcmp(npt1, npt2))
-				{ret = 0; goto ex;}	/* basenames differ */
+				return 0;		/* basenames differ */
 			stat_ret1= stat(adr1, &stbuf1);
 			stat_ret2= stat(adr2, &stbuf2);
 			if (stat_ret1 != stat_ret2)
-				 {ret = 0; goto ex;}
-						/* one dir existing, one not */
+				 return 0;  /* one dir existing, one not */

 			/* Both directories exist. The basenames are equal.
 			   So the adresses are equal if the directories are
@ -2955,52 +2706,47 @@ int burn_drive_equals_adr(struct burn_drive *d1, char *adr2_in, int role2)
 		}
 		if (stbuf1.st_ino == stbuf2.st_ino &&
 	 		stbuf1.st_dev == stbuf2.st_dev)
-			{ret = 1; goto ex;}	/* same filesystem object */
+			return 1;		/* same filesystem object */

 		if (S_ISBLK(stbuf1.st_mode) && S_ISBLK(stbuf2.st_mode) &&
 			 stbuf1.st_rdev == stbuf2.st_rdev)
-			{ret = 1; goto ex;}/* same major,minor device number */
+			return 1;	/* same major,minor device number */
 		if (S_ISCHR(stbuf1.st_mode) && S_ISCHR(stbuf2.st_mode) &&
 			 stbuf1.st_rdev == stbuf2.st_rdev)
-			{ret = 1; goto ex;}/* same major,minor device number */
+			return 1;	/* same major,minor device number */

 		/* Are both filesystem objects related to the same MMC drive */
 		if (conv_ret2 <= 0)
-			{ret = 0; goto ex;}	/* no MMC drive at adr2 */
+			return 0;		/* no MMC drive at adr2 */
 		if (burn_drive_convert_fs_adr(adr1, conv_adr1) <= 0)
-			{ret = 0; goto ex;}	/* no MMC drive at adr1 */
+			return 0;		/* no MMC drive at adr1 */
 		if (strcmp(conv_adr1, conv_adr2) == 0)
-			{ret = 1; goto ex;}	/* same MMC drive */
+			return 1;		/* same MMC drive */

-		{ret = 0; goto ex;}  /* all filesystem disguises are checked */
+		return 0;	/* all filesystem disguises are checked */

 	} else if (role1 == 1 && role2 != 1) {
 	                          /* MMC drive meets file object */

 		if (conv_ret2 <= 0)
-			{ret = 0; goto ex;}	/* no MMC drive at adr2 */
+			return 0;		/* no MMC drive at adr2 */
 		if (strcmp(adr1, conv_adr2) == 0)
-			{ret = 1; goto ex;}	/* same MMC drive */
-		{ret = 0; goto ex;}
+			return 1;		/* same MMC drive */
+		return 0;

 	} else if (role1 != 1 && role2 == 1) {
 	                          /* stdio-drive meets wannabe MMC drive */

 		if (conv_ret2 <= 0)
-			{ret = 0; goto ex;}  /* no MMC drive at adr2 */
+			return 0;		/* no MMC drive at adr2 */
 		if (burn_drive_convert_fs_adr(adr1, conv_adr1) <= 0)
-			{ret = 0; goto ex;}  /* no MMC drive at adr1 */
+			return 0;		/* no MMC drive at adr1 */
 		if (strcmp(conv_adr1, conv_adr2) == 0)
-			{ret = 1; goto ex;}  /* same MMC drive */
-		{ret = 0; goto ex;}
+			return 1;		/* same MMC drive */
+		return 0;

 	}
-	ret = 0;
-ex:;
-	BURN_FREE_MEM(adr1);
-	BURN_FREE_MEM(conv_adr1);
-	BURN_FREE_MEM(conv_adr2);
-	return ret;
+	return 0;		/* now i believe they are really not equal */
 }


@ -3093,26 +2839,3 @@ int burn_disc_get_cd_info(struct burn_drive *d, char disc_type[80],
 	*valid =  d->disc_info_valid;
 	return 1;
 }
-
-
-/* ts B00924 : API */
-int burn_disc_get_bd_spare_info(struct burn_drive *d,
-				int *alloc_blocks, int *free_blocks, int flag)
-{
-	int ret;
-
-	if (burn_drive_get_drive_role(d) != 1)
-		return 0;
-	*alloc_blocks = *free_blocks = 0;
-	ret = mmc_get_bd_spare_info(d, alloc_blocks, free_blocks, 0);
-	return ret;
-}
-
-
-/* ts B10525 : API */
-int burn_disc_next_track_is_damaged(struct burn_drive *d, int flag)
-{
-	return d->next_track_damaged;
-}
-
-
--- a/libburn/drive.h
+++ b/libburn/drive.h
@ -12,7 +12,6 @@
 #include "libburn.h"
 #include "toc.h"
 #include "structure.h"
-#include <pthread.h>

 struct burn_drive;
 struct command;
--- a/libburn/file.c
+++ b/libburn/file.c
@ -129,7 +129,7 @@ struct burn_source *burn_file_source_new(const char *path, const char *subpath)
 			return NULL;
 		}
 	}
-	fs = calloc(1, sizeof(struct burn_source_file));
+	fs = malloc(sizeof(struct burn_source_file));

 	/* ts A70825 */
 	if (fs == NULL) {
@ -175,7 +175,7 @@ struct burn_source *burn_fd_source_new(int datafd, int subfd, off_t size)

 	if (datafd == -1)
 		return NULL;
-	fs = calloc(1, sizeof(struct burn_source_file));
+	fs = malloc(sizeof(struct burn_source_file));
 	if (fs == NULL) /* ts A70825 */
 		return NULL;
 	fs->datafd = datafd;
@ -211,10 +211,9 @@ struct burn_source *burn_fd_source_new(int datafd, int subfd, off_t size)

 static int fifo_sleep(int flag)
 {
-	static unsigned long sleeptime = 50000; /* 50 ms */
+	static struct timespec sleeptime = { 0, 50000000}; /* 50 ms */

-	usleep(sleeptime);
-	return 0;
+	return nanosleep(&sleeptime, NULL);
 }


@ -482,11 +481,10 @@ int burn_fifo_source_shoveller(struct burn_source *source, int flag)

 int burn_fifo_cancel(struct burn_source *source)
 {
-	int ret;
 	struct burn_source_fifo *fs = source->data;

-	ret = burn_source_cancel(fs->inp);
-	return ret;
+	burn_source_cancel(fs->inp);
+	return(1);
 }

 /*
@ -510,7 +508,7 @@ struct burn_source *burn_fifo_source_new(struct burn_source *inp,
 				"Desired fifo buffer too small", 0, 0);
 		return NULL;
 	}
-	fs = calloc(1, sizeof(struct burn_source_fifo));
+	fs = malloc(sizeof(struct burn_source_fifo));
 	if (fs == NULL)
 		return NULL;
 	fs->is_started = 0;
@ -749,162 +747,3 @@ int burn_fifo_fill(struct burn_source *source, int bufsize, int flag)
 					1 | ((flag & 1) << 1));
 }

-
-/* ----------------------------- Offset source ----------------------------- */
-/* ts B00922 */
-
-static void offst_free(struct burn_source *source);
-
-static struct burn_source_offst *offst_auth(struct burn_source *source)
-{
-	if (source->free_data != offst_free) {
-		libdax_msgs_submit(libdax_messenger, -1, 0x0002017a,
-			LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
- 			"Expected offset source object as parameter",
-			0, 0);
-		return NULL;
-	}
-	return (struct burn_source_offst *) source->data;
-}
-
-static off_t offst_get_size(struct burn_source *source)
-{
-        struct burn_source_offst *fs;
-
-	if ((fs = offst_auth(source)) == NULL)
-		return (off_t) 0;
-        return fs->size;
-}
-
-static int offst_set_size(struct burn_source *source, off_t size)
-{
-	struct burn_source_offst *fs;
-
-	if ((fs = offst_auth(source)) == NULL)
-		return 0;
-	fs->size = size;
-	return 1;
-}
-
-static void offst_free(struct burn_source *source)
-{
-	struct burn_source_offst *fs;
-
-	if ((fs = offst_auth(source)) == NULL)
-		return;
-	if (fs->prev != NULL)
-		offst_auth(fs->prev)->next = fs->next;
-	if (fs->next != NULL)
-		offst_auth(fs->next)->prev = fs->prev;
-	if (fs->inp != NULL)
-		burn_source_free(fs->inp); /* i.e. decrement refcount */
-	free(source->data);
-}
-
-static int offst_read(struct burn_source *source, unsigned char *buffer,
-			int size)
-{
-	int ret, to_read, todo;
-	struct burn_source_offst *fs;
-
-	if ((fs = offst_auth(source)) == NULL)
-		return -1;
-
-	/* Eventually skip bytes up to start position */;
-	if (!fs->running) {
-		if (fs->prev != NULL)
-			fs->pos = offst_auth(fs->prev)->pos;
-		fs->running= 1;
-	}
-	if(fs->pos < fs->start) {
-		todo = fs->start - fs->pos;
-		while (todo > 0) {
-			to_read = todo;
-			if (to_read > size)
-				to_read = size;
-			ret = burn_source_read(fs->inp, buffer, to_read);
-			if (ret <= 0)
-				return ret;
-			todo -= ret;
-			fs->pos += ret;
-		}
-	}
-
-	/* Produce EOF if source size is exhausted.
-	   burn_source delivers no incomplete sector buffers.
-	*/
-	if (fs->pos + size > fs->start + fs->size)
-		return 0;
-
-	/* Read payload */
-	ret = burn_source_read(fs->inp, buffer, size);
-	if (ret > 0)
-		fs->pos += ret;
-	return ret;
-}
-
-static int offst_cancel(struct burn_source *source)
-{
-	int ret;
-	struct burn_source_offst *fs;
-
-	if ((fs = offst_auth(source)) == NULL)
-		return -1;
-	ret = burn_source_cancel(fs->inp);
-	return ret;
-}
-
-struct burn_source *burn_offst_source_new(
-		struct burn_source *inp, struct burn_source *prev,
-		off_t start, off_t size, int flag)
-{
-	struct burn_source *src;
-	struct burn_source_offst *fs, *prev_fs = NULL;
-
-	if (prev != NULL)
-		if ((prev_fs = offst_auth(prev)) == NULL)
-			return NULL; /* Not type burn_source_offst */
-
-	fs = calloc(1, sizeof(struct burn_source_offst));
-	if (fs == NULL)
-		return NULL;
-        src = burn_source_new();
-        if (src == NULL) {
-                free((char *) fs);
-                return NULL;
-        }
-        src->read = NULL;
-        src->read_sub = NULL;
-        src->get_size = offst_get_size;
-        src->set_size = offst_set_size;
-        src->free_data = offst_free;
-        src->data = fs;
-        src->version= 1;
-        src->read_xt = offst_read;
-        src->cancel= offst_cancel;
-        fs->inp = inp;
-	fs->prev = prev;
-	fs->next = NULL;
-	if (prev != NULL) {
-		if (prev_fs->next != NULL) {
-			offst_auth(prev_fs->next)->prev = src;
-			fs->next = prev_fs->next;
-		}
-		prev_fs->next = src;
-		if (prev_fs->start + prev_fs->size > start) {
-			libdax_msgs_submit(libdax_messenger, -1, 0x00020179,
-			LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
- 		"Offset source start address is before end of previous source",
-			0, 0);
-			return NULL;
-		}
-	}
-	fs->start = start;
-	fs->size = size;
-	fs->running = 0;
-	fs->pos = 0;
-        inp->refcount++; /* make sure inp lives longer than src */
-
-        return src;
-}
-
--- a/libburn/file.h
+++ b/libburn/file.h
@ -74,22 +74,4 @@ struct burn_source_fifo {
 int burn_fifo_source_shoveller(struct burn_source *source, int flag);


-/* ts B00922 */
-struct burn_source_offst {
-
-	/* See burn_offst_source_new() */
-	struct burn_source *inp;
-	struct burn_source *prev;
-	off_t start;
-	off_t size;
-
-	/* To help offst_free() */
-	struct burn_source *next;
-
-	/* The current reading position */
-	int running;
-	off_t pos;
-
-};
-
 #endif /* LIBBURN__FILE_H */
--- a/libburn/init.c
+++ b/libburn/init.c
@ -1,7 +1,7 @@
 /* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */

 /* Copyright (c) 2004 - 2006 Derek Foreman, Ben Jansens
-   Copyright (c) 2006 - 2011 Thomas Schmitt <scdbackup@gmx.net>
+   Copyright (c) 2006 - 2010 Thomas Schmitt <scdbackup@gmx.net>
   Provided under GPL version 2 or later.
 */

@ -105,14 +105,6 @@ int burn_support_untested_profiles = 0;
 */
 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
-*/
-int burn_drive_role_4_allowed = 0;
-
-
 /* ts A60925 : ticket 74 */
 /** Create the messenger object for libburn. */
 int burn_msgs_initialize(void)
@ -177,8 +169,6 @@ void burn_finish(void)

 	sg_shutdown(0);

-	burn_drive_clear_whitelist();
-
 	burn_running = 0;
 }

@ -354,7 +344,7 @@ char *burn_util_thread_id(pid_t pid, pthread_t tid, char text[80])

 	sprintf(text, "[%lu,", (unsigned long int) getpid());
 	l= strlen(text);
-	for(i= 0; i < ((int) sizeof(pthread_t)) && 2 * i < 80 - l - 3; i++)
+	for(i= 0; i < sizeof(pthread_t) && 2 * i < 80 - l - 3; i++)
 		sprintf(text + l + 2 * i,
 			 "%2.2X", ((unsigned char *) &tid)[i]);

@ -575,25 +565,3 @@ void burn_set_scsi_logging(int flag)
 {
 	burn_sg_log_scsi = flag & 7;
 }
-
-
-/* ts B10312 API */
-void burn_allow_drive_role_4(int allowed)
-{
-	burn_drive_role_4_allowed = (allowed & 0xf);
-}
-
-
-/* ts B10606 */
-void *burn_alloc_mem(size_t size, size_t count, int flag)
-{
-	void *pt;
-
-	pt = calloc(size, count);
-	if(pt == NULL)
-		libdax_msgs_submit(libdax_messenger, -1, 0x00000003,
-				LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
-				"Out of virtual memory", 0, 0);
-	return pt;
-}
-
--- a/libburn/init.h
+++ b/libburn/init.h
@ -27,19 +27,5 @@ extern volatile int burn_builtin_triggered_action;    /*  burn_is_aborting() */
 */
 int burn_init_catch_on_abort(int flag);

-/* ts B10606 */
-void *burn_alloc_mem(size_t size, size_t count, int flag);
-
-#define BURN_ALLOC_MEM(pt, typ, count) { \
-	pt= (typ *) burn_alloc_mem(sizeof(typ), (size_t) (count), 0); \
-	if(pt == NULL) { \
-		ret= -1; goto ex; \
-	} }
-
-#define BURN_FREE_MEM(pt) { \
-	if(pt != NULL) \
-		free((char *) pt); \
-	}
-

 #endif /* BURN__INIT_H */
--- a/libburn/libburn.h
+++ b/libburn/libburn.h
@ -1,15 +1,12 @@
 /* -*- 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 - 2010 Thomas Schmitt <scdbackup@gmx.net>
   Provided under GPL version 2 or later.

   This is the official API definition of libburn.

 */
-/* Important: If you add a public API function then add its name to file
-                 libburn/libburn.ver
-*/


 #ifndef LIBBURN_H
@ -828,7 +825,7 @@ void burn_preset_device_open(int exclusive, int blocking, int abort_on_busy);
 /* ts A70223 */
 /** Allows the use of media types which are implemented in libburn but not yet
    tested. The list of those untested profiles is subject to change.
-             - Currently no media types are under test reservation -
+    Currently it contains: 0x15 "DVD-R/DL sequential recording",
    If you really test such media, then please report the outcome on
    libburn-hackers@pykix.org
    If ever then this call should be done soon after burn_initialize() before
@ -1237,29 +1234,12 @@ char *burn_guess_cd_manufacturer(int m_li, int s_li, int f_li,
                     bit5= Disc is nominally erasable (Erasable bit)
                           This will be set with overwriteable media which
                           libburn normally considers to be unerasable blank.
-    @return          1 success, <= 0 an error occured
    @since 0.7.2
 */
 int burn_disc_get_cd_info(struct burn_drive *d, char disc_type[80],
                        unsigned int *disc_id, char bar_code[9], int *app_code,
 			int *valid);

-/* ts B00924 */
-/** Read the current usage of the eventual BD Spare Area. This area gets
-    reserved on BD media during formatting. During writing it is used to
-    host replacements of blocks which failed the checkread immediately after
-    writing.
-    This call applies only to recordable BD media. I.e. profiles 0x41 to 0x43.
-    @param d            The drive to query.
-    @param alloc_blocks Returns the number of blocks reserved as Spare Area
-    @param free_blocks  Returns the number of yet unused blocks in that area
-    @param flag         Bitfield for control purposes (unused yet, submit 0)
-    @return             1 = reply prarameters are valid,
-                        <=0 = reply is invalid (e.g. because no BD profile)
-    @since 0.8.8
-*/
-int burn_disc_get_bd_spare_info(struct burn_drive *d,
-                                int *alloc_blocks, int *free_blocks, int flag);

 /* ts A61110 */
 /** Read start lba and Next Writeable Address of a track from media.
@ -1279,45 +1259,6 @@ int burn_disc_get_bd_spare_info(struct burn_drive *d,
 int burn_disc_track_lba_nwa(struct burn_drive *d, struct burn_write_opts *o,
 				int trackno, int *lba, int *nwa);

-/* ts B10525 */
-/** Tells whether a previous attempt to determine the Next Writeable Address
-    of the upcomming track reveiled that the READ TRACK INFORMATION Damage Bit
-    is set for this track, resp. that no valid writable address is available. 
-    See MMC-5 6.27.3.7 Damage Bit, 6.27.3.11 NWA_V (NWA valid)
-    @param d     The drive to query.
-    @param flag  Bitfield for control purposes (unused yet, submit 0)
-    @return      0= Looks ok: Damage Bit is not set, NWA_V is set
-                 1= Damaged and theoretically writable (NWA_V is set)
-                 2= Not writable: NWA_V is not set
-                 3= Damaged and not writable (NWA_V is not set),
-    @since 1.1.0
-*/
-int burn_disc_next_track_is_damaged(struct burn_drive *d, int flag);
-
-/* ts B10527 */
-/** Try to close the last track and session of media which have bit0 set in
-    the return value of call burn_disc_next_track_is_damaged().
-    Whether it helps depends much on the reason why the media is reported
-    as damaged by the drive.
-    This call works only for profiles 0x09 CD-R, 0x0a CD-RW, 0x11 DVD-R,
-    0x14 DVD-RW sequential, 0x1b DVD+R, 0x2b DVD+R DL, 0x41 BD-R sequential.
-    Note: After writing it is advised to give up the drive and to grab it again
-          in order to learn about its view on the new media state.
-    @param o     Write options created by burn_write_opts_new() and
-                 manipulated by burn_write_opts_set_multi().
-                 burn_write_opts_set_write_type() should be set to
-                 BURN_WRITE_TAO, burn_write_opts_set_simulate() should be
-                 set to 0.
-    @param flag  Bitfield for control purposes
-                 bit0= force close, even if no damage was seen
-    @return      <=0 media not marked as damaged, or media type not suitable,
-                     or closing attempted but failed
-                 1= attempt finished without error indication
-    @since 1.1.0
-*/
-int burn_disc_close_damaged(struct burn_write_opts *o, int flag);
-
-
 /* ts A70131 */
 /** Read start lba of the first track in the last complete session.
    This is the first parameter of mkisofs option -C. The second parameter
@ -1347,29 +1288,25 @@ int burn_disc_get_msc1(struct burn_drive *d, int *start_lba);
 off_t burn_disc_available_space(struct burn_drive *d,
                                struct burn_write_opts *o);

+
 /* ts A61202 */
 /** Tells the MMC Profile identifier of the loaded media. The drive must be
    grabbed in order to get a non-zero result.
    libburn currently writes only to profiles 
-      0x09 "CD-R"
-      0x0a "CD-RW"
-      0x11 "DVD-R sequential recording"
-      0x12 "DVD-RAM"
-      0x13 "DVD-RW restricted overwrite"
-      0x14 "DVD-RW sequential recording",
-      0x15 "DVD-R/DL sequential recording",
-      0x1a "DVD+RW"
-      0x1b "DVD+R",
+      0x09 "CD-R",                          0x0a "CD-RW",
+      0x11 "DVD-R sequential recording",    0x12 "DVD-RAM",
+      0x13 "DVD-RW restricted overwrite",   0x14 "DVD-RW sequential recording",
+      0x1a "DVD+RW",                        0x1b "DVD+R",
      0x2b "DVD+R/DL",
-      0x41 "BD-R sequential recording",
-      0x43 "BD-RE",
+      0x41 "BD-R sequential recording",     0x43 "BD-RE",
      0xffff "stdio file"
    Note: 0xffff is not a MMC profile but a libburn invention.
+    If enabled by burn_allow_untested_profiles() it also writes to profiles
+      0x15 "DVD-R/DL sequential recording",
    Read-only are the profiles
-      0x08 "CD-ROM",
-      0x10 "DVD-ROM",
+      0x08 "CD-ROM",                        0x10 "DVD-ROM",
      0x40 "BD-ROM",
-    Read-only for now is this BD-R profile (testers wanted)
+    For now read-only is BD-R profile (testers wanted)
      0x42 "BD-R random recording"
    @param d The drive where the media is inserted.
    @param pno Profile Number. See also mmc5r03c.pdf, table 89
@ -1486,8 +1423,6 @@ void burn_read_opts_free(struct burn_read_opts *opts);
    cancellable, as control of the operation is passed wholly to the drive and
    there is no way to interrupt it safely.
    @param drive The drive with which to erase a disc.
-                 Only drive roles 1 (MMC) and 5 (stdio random write-only)
-                 support erasing.
    @param fast Nonzero to do a fast erase, where only the disc's headers are
                erased; zero to erase the entire disc.
                With DVD-RW, fast blanking yields media capable only of DAO.
@ -1632,13 +1567,8 @@ int burn_precheck_write(struct burn_write_opts *o, struct burn_disc *disc,
    of data and audio tracks. You must use BURN_WRITE_TAO for such sessions.
    To be set by burn_write_opts_set_write_type(). 
    Note: This function is not suitable for overwriting data in the middle of
-          a valid data area because it is allowed to append trailing data.
-          For exact random access overwriting use burn_random_access_write().
-    Note: After writing it is advised to give up the drive and to grab it again
-          in order to learn about its view on the new media state.
-    Note: Before mounting the written media it might be necessary to eject
-          and reload in order to allow the operating system to notice the new
-          media state.
+    a valid data area because it is allowed to append trailing data.
+    For exact random access overwriting use burn_random_access_write().
    @param o The options for the writing operation.
    @param disc The struct burn_disc * that described the disc to be created
 */
@ -1952,41 +1882,6 @@ int burn_os_free_buffer(void *buffer, size_t amount, int flag);
 struct burn_source *burn_fd_source_new(int datafd, int subfd, off_t size);


-/* ts B00922 */
-/** Creates an offset source which shall provide a byte interval of a stream
-    to its consumer. It is supposed to be chain-linked with other offset
-    sources which serve neighboring consumers. The chronological sequence
-    of consumers and the sequence of offset sources must match. The intervals
-    of the sources must not overlap.
-
-    A chain of these burn_source objects may be used to feed multiple tracks
-    from one single stream of input bytes.
-    Each of the offset sources will skip the bytes up to its start address and
-    provide the prescribed number of bytes to the track. Skipping takes into
-    respect the bytes which have been processed by eventual predecessors in the
-    chain.
-    Important: It is not allowed to free an offset source before its successor
-               has ended its work. Best is to keep them all until all tracks
-               are done.
-
-    @param inp   The burn_source object from which to read stream data.
-                 E.g. created by burn_file_source_new().
-    @param prev  The eventual offset source object which shall read data from
-                 inp before the new offset source will begin its own work.
-                 This must either be a result of  burn_offst_source_new()  or
-                 it must be NULL.
-    @param start The byte address where to start reading bytes for the
-                 consumer. inp bytes may get skipped to reach this address.
-    @param size  The number of bytes to be delivered to the consumer.
-    @param flag  Bitfield for control purposes (unused yet, submit 0).
-    @return      Pointer to a burn_source object, later to be freed by
-                 burn_source_free(). NULL indicates failure.
-    @since 0.8.8
-*/
-struct burn_source *burn_offst_source_new(
-                struct burn_source *inp, struct burn_source *prev,
-                off_t start, off_t size, int flag);
-
 /* ts A70930 */
 /** Creates a fifo which acts as proxy for an already existing data source.
    The fifo provides a ring buffer which shall smoothen the data stream
@ -2259,7 +2154,7 @@ void burn_write_opts_set_format(struct burn_write_opts *opts, int format);
    This corresponds to the Test Write bit in MMC mode page 05h. Several media
    types do not support this. See struct burn_multi_caps.might_simulate for
    actual availability of this feature. 
-    If the media is suitable, the drive will perform burn_disc_write() as a
+    If the media is suitable, the drive will perform burn_write_disc() as a
    simulation instead of effective write operations. This means that the
    media content and burn_disc_get_status() stay unchanged.
    Note: With stdio-drives, the target file gets eventually created, opened,
@ -2296,10 +2191,6 @@ void burn_write_opts_set_mediacatalog(struct burn_write_opts *opts, unsigned cha
 /* ts A61106 */
 /** Sets the multi flag which eventually marks the emerging session as not
    being the last one and thus creating a BURN_DISC_APPENDABLE media.
-    Note: DVD-R[W] in write mode BURN_WRITE_SAO are not capable of this.
-          DVD-R DL are not capable of this at all.
-          libburn will refuse to write if burn_write_opts_set_multi() is
-          enabled under such conditions.
    @param opts The option object to be manipulated
    @param multi 1=media will be appendable, 0=media will be closed (default) 
    @since 0.2.6
@ -2735,9 +2626,9 @@ void burn_version(int *major, int *minor, int *micro);
      }

 */
-#define burn_header_version_major  1
-#define burn_header_version_minor  1
-#define burn_header_version_micro  0
+#define burn_header_version_major  0
+#define burn_header_version_minor  8
+#define burn_header_version_micro  4
 /** Note:
    Above version numbers are also recorded in configure.ac because libtool
    wants them as parameters at build time.
@ -2791,8 +2682,8 @@ These two advises are mutually exclusive.
 /** Obtain the id string of the SCSI transport interface.
    This interface may be a system specific adapter module of libburn or
    an adapter to a supporting library like libcdio.
-    @param flag  Bitfield for control puposes, submit 0 for now
-    @return      A pointer to the id string. Do not alter the string content.
+    @flag     Bitfield for control puposes, submit 0 for now
+    @return   A pointer to the id string. Do not alter the string content.
    @since 0.7.6
 */
 char *burn_scsi_transport_id(int flag);
@ -2825,7 +2716,7 @@ int burn_msgs_set_severities(char *queue_severity,
                      "DEBUG", "ALL".
                      To call with minimum_severity "NEVER" will discard the
                      whole queue.
-    @param error_code Will become a unique error code as listed in
+    @param error_code Will become a unique error code as liste in
                      libburn/libdax_msgs.h
    @param msg_text   Must provide at least BURN_MSGS_MESSAGE_LEN bytes.
    @param os_errno   Will become the eventual errno related to the message
@ -2920,7 +2811,7 @@ typedef int (*burn_abort_handler_t)(void *handle, int signum, int flag);
    But during burn_disc_write() onto real CD or DVD, FreeBSD 8.0 pauses the
    other threads until the signal handler returns.
    The new actions try to avoid this deadlock. It is advised to use action 3
-    at least during burn_disc_write(), burn_disc_erase(), burn_disc_format():
+    at least during burn_disc_write(), burn_disc_rease(), burn_disc_format():
      burn_set_signal_handling(text, NULL, 0x30);
    and to call burn_is_aborting(0) when the drive is BURN_DRIVE_IDLE.
    If burn_is_aborting(0) returns 1, then call burn_abort() and exit(1).
@ -3041,20 +2932,15 @@ int burn_get_read_capacity(struct burn_drive *d, int *capacity, int flag);
                        bit0= - reserved -
                        bit1= do not submit error message if read error
                        bit2= on error do not try to read a second time
-                              with single block steps.
-                              @since 0.5.2 
-                        bit3= return -2 on permission denied error rather than
-                              issueing a warning message.
-                              @since 1.0.6
+                              with single block steps. @since 0.5.2 
    @return 1=sucessful , <=0 an error occured
-                          with bit3:  -2= permission denied error
    @since 0.4.0
 */
 int burn_read_data(struct burn_drive *d, off_t byte_address,
                   char data[], off_t data_size, off_t *data_count, int flag);


-/* ts A70904 */
+/* A70904 */
 /** Inquire whether the drive object is a real MMC drive or a pseudo-drive
    created by a stdio: address.
    @param d      The drive to inquire
@ -3062,47 +2948,11 @@ int burn_read_data(struct burn_drive *d, off_t byte_address,
                  1= real MMC drive
                  2= stdio-drive, random access, read-write
                  3= stdio-drive, sequential, write-only
-                  4= stdio-drive, random access, read-only
-                     (only if enabled by burn_allow_drive_role_4())
    @since 0.4.0
 */
 int burn_drive_get_drive_role(struct burn_drive *d);


-/* ts B10312 */
-/** Allow drive role 4 "random access read-only"
-    and drive role 5 "random access write-only".
-    By default a random access file assumes drive role 2 "read-write"
-    regardless whether it is actually readable or writeable.
-    If enabled, random-access file objects which recognizably allow no
-    writing will be classified as role 4 and those which allow no reading
-    will get role 5.
-    Candidates are drive addresses of the form stdio:/dev/fd/# , where # is
-    the integer number of an open file descriptor. If this descriptor was
-    opened read-only resp. write-only, then it gets role 4 resp. role 5.
-    Other paths may get tested by an attempt to open them for read-write
-    (role 2) resp. read-only (role 4) resp. write-only (role 5). See bit1.
-    @param allowed      Bitfield for control purposes:
-                        bit0= Enable roles 4 and 5 for drives which get
-                              aquired after this call
-                        bit1= with bit0:
-                              Test whether the file can be opened for
-                              read-write resp. read-only resp. write-only.
-                              Classify as roles 2 resp. 4 resp. 5.
-                        bit2= with bit0 and bit1:
-                              Classify files which cannot be opened at all
-                              as role 0 : useless dummy.
-                              Else classify as role 2.
-                        bit3= Classify non-empty role 5 drives as
-                              BURN_DISC_APPENDABLE with Next Writeable Address
-                              after the end of the file. It is nevertheless
-                              possible to change this address by call
-                              burn_write_opts_set_start_byte().
-    @since 1.0.6
-*/
-void burn_allow_drive_role_4(int allowed);
-
-
 /* ts A70923 */
 /** Find out whether a given address string would lead to the given drive
    object. This should be done in advance for track source addresses
@ -3130,110 +2980,6 @@ void burn_allow_drive_role_4(int allowed);
 int burn_drive_equals_adr(struct burn_drive *d1, char *adr2, int drive_role2);


-
-/*
-  Audio track data extraction facility.
-*/
-
-/* Maximum size for address paths and fmt_info strings */
-#define LIBDAX_AUDIOXTR_STRLEN 4096
-
-
-/** Extractor object encapsulating intermediate states of extraction.
-    The clients of libdax_audioxtr shall only allocate pointers to this
-    struct and get a storage object via libdax_audioxtr_new().
-    Appropriate initial value for the pointer is NULL.
-*/
-struct libdax_audioxtr;
-
-
-/** Open an audio file, check wether 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).
-    @param flag Bitfield for control purposes (unused yet, submit 0)
-    @return >0 success
-             0 unsuitable format
-            -1 severe error
-            -2 path not found
-    @since 0.2.4
-*/
-int libdax_audioxtr_new(struct libdax_audioxtr **xtr, char *path, int flag);
-
-
-/** Obtain identification parameters of opened audio source.
-    @param xtr Opaque handle to extractor
-    @param fmt Gets pointed to the audio file format id text: ".wav" , ".au"
-    @param fmt_info Gets pointed to a format info text telling parameters
-    @param num_channels     e.g. 1=mono, 2=stereo, etc
-    @param sample_rate      e.g. 11025, 44100
-    @param bits_per_sample  e.g. 8= 8 bits per sample, 16= 16 bits ...
-    @param msb_first Byte order of samples: 0=Intel 1=Motorola
-    @param flag Bitfield for control purposes (unused yet, submit 0)
-    @return >0 success, <=0 failure
-    @since 0.2.4
-*/
-int libdax_audioxtr_get_id(struct libdax_audioxtr *xtr,
-                           char **fmt, char **fmt_info,
-                           int *num_channels, int *sample_rate,
-                           int *bits_per_sample, int *msb_first, int flag);
-
-
-/** Obtain a prediction about the extracted size based on internal information
-    of the formatted file.
-    @param xtr Opaque handle to extractor
-    @param size Gets filled with the predicted size
-    @param flag Bitfield for control purposes (unused yet, submit 0)
-    @return 1 prediction was possible , 0 no prediction could be made
-    @since 0.2.4
-*/
-int libdax_audioxtr_get_size(struct libdax_audioxtr *o, off_t *size, int flag);
-
-
-/** Obtain next buffer full of extracted data in desired format (only raw audio
-    for now).
-    @param xtr Opaque handle to extractor
-    @param buffer Gets filled with extracted data
-    @param buffer_size Maximum number of bytes to be filled into buffer
-    @param flag Bitfield for control purposes
-                bit0= do not stop at predicted end of data
-    @return >0 number of valid buffer bytes,
-             0 End of file
-            -1 operating system reports error
-            -2 usage error by application
-    @since 0.2.4
-*/
-int libdax_audioxtr_read(struct libdax_audioxtr *xtr,
-                         char buffer[], int buffer_size, int flag);
-
-
-/** Try to obtain a file descriptor which will deliver extracted data
-    to normal calls of read(2). This may fail because the format is
-    unsuitable for that, but ".wav" is ok. If this call succeeds the xtr
-    object will have forgotten its file descriptor and libdax_audioxtr_read()
-    will return a usage error. One may use *fd after libdax_audioxtr_destroy()
-    and will have to close it via close(2) when done with it.
-    @param xtr Opaque handle to extractor
-    @param fd Eventually returns the file descriptor number
-    @param flag Bitfield for control purposes
-                bit0= do not dup(2) and close(2) but hand out original fd
-    @return 1 success, 0 cannot hand out fd , -1 severe error
-    @since 0.2.4
-*/
-int libdax_audioxtr_detach_fd(struct libdax_audioxtr *o, int *fd, int flag);
-
-
-/** Clean up after extraction and destroy extractor object.
-    @param xtr Opaque handle to extractor, *xtr is allowed to be NULL,
-               *xtr is set to NULL by this function
-    @param flag Bitfield for control purposes (unused yet, submit 0)
-    @return 1 = destroyed object, 0 = was already destroyed
-    @since 0.2.4
-*/
-int libdax_audioxtr_destroy(struct libdax_audioxtr **xtr, int flag);
-
-
-
 #ifndef DOXYGEN

 BURN_END_DECLS
--- a/libburn/libburn.ver
+++ b/libburn/libburn.ver
@ -1,170 +0,0 @@
-LIBBURN4 {
-global:
-burn_abort;
-burn_abort_pacifier;
-burn_allow_drive_role_4;
-burn_allow_untested_profiles;
-burn_disc_add_session;
-burn_disc_available_space;
-burn_disc_close_damaged;
-burn_disc_create;
-burn_disc_erasable;
-burn_disc_erase;
-burn_disc_format;
-burn_disc_free;
-burn_disc_free_multi_caps;
-burn_disc_get_bd_spare_info;
-burn_disc_get_cd_info;
-burn_disc_get_format_descr;
-burn_disc_get_formats;
-burn_disc_get_media_id;
-burn_disc_get_msc1;
-burn_disc_get_multi_caps;
-burn_disc_get_profile;
-burn_disc_get_sectors;
-burn_disc_get_sessions;
-burn_disc_get_status;
-burn_disc_next_track_is_damaged;
-burn_disc_pretend_blank;
-burn_disc_pretend_full;
-burn_disc_read;
-burn_disc_read_atip;
-burn_disc_remove_session;
-burn_disc_track_lba_nwa;
-burn_disc_write;
-burn_drive_add_whitelist;
-burn_drive_cancel;
-burn_drive_clear_whitelist;
-burn_drive_convert_fs_adr;
-burn_drive_convert_scsi_adr;
-burn_drive_d_get_adr;
-burn_drive_equals_adr;
-burn_drive_free_speedlist;
-burn_drive_get_adr;
-burn_drive_get_all_profiles;
-burn_drive_get_best_speed;
-burn_drive_get_disc;
-burn_drive_get_drive_role;
-burn_drive_get_min_write_speed;
-burn_drive_get_read_speed;
-burn_drive_get_speedlist;
-burn_drive_get_start_end_lba;
-burn_drive_get_status;
-burn_drive_get_write_speed;
-burn_drive_grab;
-burn_drive_info_forget;
-burn_drive_info_free;
-burn_drive_is_enumerable_adr;
-burn_drive_leave_locked;
-burn_drive_obtain_scsi_adr;
-burn_drive_probe_cd_write_modes;
-burn_drive_release;
-burn_drive_scan;
-burn_drive_scan_and_grab;
-burn_drive_set_buffer_waiting;
-burn_drive_set_speed;
-burn_drive_set_stream_recording;
-burn_drive_snooze;
-burn_drive_wrote_well;
-burn_fd_source_new;
-burn_fifo_fill;
-burn_fifo_get_statistics;
-burn_fifo_inquire_status;
-burn_fifo_next_interval;
-burn_fifo_peek_data;
-burn_fifo_source_new;
-burn_file_source_new;
-burn_finish;
-burn_get_read_capacity;
-burn_guess_cd_manufacturer;
-burn_guess_manufacturer;
-burn_initialize;
-burn_is_aborting;
-burn_lba_to_msf;
-burn_msf_to_lba;
-burn_msf_to_sectors;
-burn_msgs_obtain;
-burn_msgs_set_severities;
-burn_msgs_submit;
-burn_obtain_profile_name;
-burn_offst_source_new;
-burn_os_alloc_buffer;
-burn_os_free_buffer;
-burn_os_open_track_src;
-burn_precheck_write;
-burn_preset_device_open;
-burn_random_access_write;
-burn_read_data;
-burn_read_opts_free;
-burn_read_opts_new;
-burn_read_opts_read_subcodes_audio;
-burn_read_opts_read_subcodes_data;
-burn_read_opts_report_recovered_errors;
-burn_read_opts_set_c2errors;
-burn_read_opts_set_hardware_error_recovery;
-burn_read_opts_set_hardware_error_retries;
-burn_read_opts_set_raw;
-burn_read_opts_transfer_damaged_blocks;
-burn_scsi_transport_id;
-burn_sectors_to_msf;
-burn_session_add_track;
-burn_session_create;
-burn_session_free;
-burn_session_get_hidefirst;
-burn_session_get_leadout_entry;
-burn_session_get_sectors;
-burn_session_get_tracks;
-burn_session_hide_first_track;
-burn_session_remove_track;
-burn_set_messenger;
-burn_set_scsi_logging;
-burn_set_signal_handling;
-burn_set_verbosity;
-burn_sev_to_text;
-burn_source_free;
-burn_structure_print_disc;
-burn_structure_print_session;
-burn_structure_print_track;
-burn_text_to_sev;
-burn_track_clear_isrc;
-burn_track_create;
-burn_track_define_data;
-burn_track_free;
-burn_track_get_counters;
-burn_track_get_entry;
-burn_track_get_mode;
-burn_track_get_sectors;
-burn_track_set_byte_swap;
-burn_track_set_cdxa_conv;
-burn_track_set_default_size;
-burn_track_set_isrc;
-burn_track_set_size;
-burn_track_set_source;
-burn_version;
-burn_write_opts_auto_write_type;
-burn_write_opts_free;
-burn_write_opts_get_drive;
-burn_write_opts_new;
-burn_write_opts_set_dvd_obs;
-burn_write_opts_set_fillup;
-burn_write_opts_set_force;
-burn_write_opts_set_format;
-burn_write_opts_set_has_mediacatalog;
-burn_write_opts_set_mediacatalog;
-burn_write_opts_set_multi;
-burn_write_opts_set_perform_opc;
-burn_write_opts_set_simulate;
-burn_write_opts_set_start_byte;
-burn_write_opts_set_stdio_fsync;
-burn_write_opts_set_stream_recording;
-burn_write_opts_set_toc_entries;
-burn_write_opts_set_underrun_proof;
-burn_write_opts_set_write_type;
-libdax_audioxtr_destroy;
-libdax_audioxtr_detach_fd;
-libdax_audioxtr_get_id;
-libdax_audioxtr_get_size;
-libdax_audioxtr_new;
-libdax_audioxtr_read;
-local: *;
-};
--- a/libburn/libdax_audioxtr.c
+++ b/libburn/libdax_audioxtr.c
@ -25,8 +25,7 @@ extern struct libdax_msgs *libdax_messenger;
 /* Only this single source module is entitled to do this */
 #define LIBDAX_AUDIOXTR_H_INTERNAL 1

-/* All clients of the extraction facility must do this or include libburn.h */
-#define LIBDAX_AUDIOXTR_H_PUBLIC 1
+/* All clients of the extraction facility must do this */
 #include "libdax_audioxtr.h"


@ -35,7 +34,7 @@ int libdax_audioxtr_new(struct libdax_audioxtr **xtr, char *path, int flag)
 int ret= -1;
 struct libdax_audioxtr *o;

- o= *xtr= (struct libdax_audioxtr *) calloc(1, sizeof(struct libdax_audioxtr));
+ o= *xtr= (struct libdax_audioxtr *) malloc(sizeof(struct libdax_audioxtr));
 if(o==NULL)
   return(-1);
 strncpy(o->path,path,LIBDAX_AUDIOXTR_STRLEN-1);
--- a/libburn/libdax_audioxtr.h
+++ b/libburn/libdax_audioxtr.h
@ -7,13 +7,6 @@
 #ifndef LIBDAX_AUDIOXTR_H_INCLUDED
 #define LIBDAX_AUDIOXTR_H_INCLUDED 1

-
-/* Normally this public API is defined in <libburn/libburn.h>
-   Macro LIBDAX_AUDIOXTR_H_PUBLIC enables the definition for programs
-   which only include this file.
-*/
-#ifdef LIBDAX_AUDIOXTR_H_PUBLIC
-
                            /* Public Macros */

 /* Maximum size for address paths and fmt_info strings */
@ -117,16 +110,15 @@ int libdax_audioxtr_detach_fd(struct libdax_audioxtr *o, int *fd, int flag);
 */
 int libdax_audioxtr_destroy(struct libdax_audioxtr **xtr, int flag);

-#endif /* LIBDAX_AUDIOXTR_H_PUBLIC */


-#ifdef LIBDAX_AUDIOXTR________________
+#ifdef LIDBAX_AUDIOXTR________________


 -- place documentation text here ---


-#endif /* LIBDAX_AUDIOXTR_________________ */
+#endif /* LIDBAX_AUDIOXTR_________________ */



--- a/libburn/libdax_msgs.c
+++ b/libburn/libdax_msgs.c
@ -37,7 +37,7 @@ static int libdax_msgs_item_new(struct libdax_msgs_item **item,
 struct timezone tz;

 (*item)= o= 
-        (struct libdax_msgs_item *) calloc(1, sizeof(struct libdax_msgs_item));
+           (struct libdax_msgs_item *) malloc(sizeof(struct libdax_msgs_item));
 if(o==NULL)
   return(-1);
 o->timestamp= 0.0;
@ -140,7 +140,7 @@ int libdax_msgs_new(struct libdax_msgs **m, int flag)
 {
 struct libdax_msgs *o;

- (*m)= o= (struct libdax_msgs *) calloc(1, sizeof(struct libdax_msgs));
+ (*m)= o= (struct libdax_msgs *) malloc(sizeof(struct libdax_msgs));
 if(o==NULL)
   return(-1);
 o->refcount= 1;
@ -370,7 +370,7 @@ int libdax_msgs_submit(struct libdax_msgs *m, int origin, int error_code,
 item->severity= severity;
 item->priority= priority;
 if(msg_text!=NULL) {
-   item->msg_text= calloc(1, strlen(msg_text)+1);
+   item->msg_text= malloc(strlen(msg_text)+1);
   if(item->msg_text==NULL)
     goto failed;
   strcpy(item->msg_text,msg_text);
--- a/libburn/libdax_msgs.h
+++ b/libburn/libdax_msgs.h
@ -1,7 +1,7 @@

 /* libdax_msgs
   Message handling facility of libdax.
-   Copyright (C) 2006-2011 Thomas Schmitt <scdbackup@gmx.net>,
+   Copyright (C) 2006-2010 Thomas Schmitt <scdbackup@gmx.net>,
   provided under GPL version 2 or later.
 */

@ -395,7 +395,7 @@ int libdax_msgs_item_get_rank(struct libdax_msgs_item *item,
                              int *severity, int *priority, int flag);


-#ifdef LIBDAX_MSGS_________________
+#ifdef LIDBAX_MSGS_________________


                      /* Registered Error Codes */
@ -519,7 +519,7 @@ Range "scdbackup"          :  0x00020000 to 0x0002ffff
 0x0002014d (SORRY,HIGH)   = Asynchromous SCSI error
 0x0002014f (SORRY,HIGH)   = Timeout with asynchromous SCSI command
 0x00020150 (DEBUG,LOW)    = Reporting asynchronous waiting time
- 0x00020151 (FAILURE,HIGH) = Read attempt on write-only drive
+ 0x00020151 (FATAL,HIGH)   = Read attempt on write-only drive
 0x00020152 (FATAL,HIGH)   = Cannot start fifo thread
 0x00020153 (SORRY,HIGH)   = Read error on fifo input
 0x00020154 (NOTE,HIGH)    = Forwarded input error ends output
@ -558,22 +558,7 @@ Range "scdbackup"          :  0x00020000 to 0x0002ffff
 0x00020176 (NOTE,HIGH)    = Stream recording disabled because of small OS buffer
 0x00020177 (ABORT,HIGH)   = Urged drive worker threads to do emergency halt
 0x00020178 (DEBUG,HIGH)   = Write thread ended
- 0x00020179 (FAILURE,HIGH) = Offset source start address is before end of previous source
- 0x0002017a (FAILURE,HIGH) = Expected offset source object as parameter
- 0x0002017b (WARNING,HIGH) = Sequential BD-R media likely to soon fail writing
- 0x0002017c (FAILURE,HIGH) = No valid write type selected
- 0x0002017d (FATAL,HIGH)   = Invalid file descriptor with stdio pseudo-drive
- 0x0002017e (FAILURE,HIGH) = Failed to close track, session, or disc
- 0x0002017f (FAILURE,HIGH) = Failed to synchronize drive cache
- 0x00020180 (FAILURE,HIGH) = Premature end of input encountered
- 0x00020181 (FAILURE,HIGH) = Pseudo-drive is a read-only file. Cannot write.
- 0x00020182 (FAILURE,HIGH) = Cannot truncate disk file for pseudo blanking
- 0x00020183 (WARNING,HIGH) = Failed to open device (a pseudo-drive) for reading
- 0x00020184 (WARNING,HIGH) = No Next-Writable-Address
- 0x00020185 (WARNING,HIGH) = Track damaged, not closed and not writable
- 0x00020186 (WARNING,HIGH) = Track damaged and not closed
- 0x00020187 (NOTE,HIGH)    = Track not marked as damaged. No action taken.
- 0x00020188 (FAILURE,HIGH) = Cannot close damaged track on given media type
+ 

 libdax_audioxtr:
 0x00020200 (SORRY,HIGH)   = Cannot open audio source file
@ -694,7 +679,7 @@ Range "libisoburn"          :  0x00060000 to 0x00006ffff

 ------------------------------------------------------------------------------

-#endif /* LIBDAX_MSGS_________________ */
+#endif /* LIDBAX_MSGS_________________ */



--- a/libburn/mmc.c
+++ b/libburn/mmc.c
--- a/libburn/mmc.h
+++ b/libburn/mmc.h
@ -106,8 +106,5 @@ int mmc_function_spy(struct burn_drive *d, char * text);
 /* ts A91118 */
 int mmc_start_if_needed(struct burn_drive *d, int flag);

-/* ts B00924 */
-int mmc_get_bd_spare_info(struct burn_drive *d,
-                                int *alloc_blocks, int *free_blocks, int flag);

 #endif /*__MMC*/
--- a/libburn/null.c
+++ b/libburn/null.c
@ -24,7 +24,7 @@ struct burn_source *burn_null_source_new(void)
 {
 	struct burn_source *src;

-	src = calloc(1, sizeof(struct burn_source));
+	src = malloc(sizeof(struct burn_source));
 	src->refcount = 1;
 	src->read = null_read;
 	src->read_sub = NULL;
--- a/libburn/options.c
+++ b/libburn/options.c
@ -27,7 +27,7 @@ struct burn_write_opts *burn_write_opts_new(struct burn_drive *drive)
 {
 	struct burn_write_opts *opts;

-	opts = calloc(1, sizeof(struct burn_write_opts));
+	opts = malloc(sizeof(struct burn_write_opts));
 	if (opts == NULL) {
 		libdax_msgs_submit(libdax_messenger, -1, 0x00020111,
 			LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
@ -68,7 +68,7 @@ struct burn_read_opts *burn_read_opts_new(struct burn_drive *drive)
 {
 	struct burn_read_opts *opts;

-	opts = calloc(1, sizeof(struct burn_read_opts));
+	opts = malloc(sizeof(struct burn_read_opts));
 	opts->drive = drive;
 	opts->refcount = 1;
 	opts->raw = 0;
@ -125,7 +125,7 @@ void burn_write_opts_set_toc_entries(struct burn_write_opts *opts, int count,
 				     struct burn_toc_entry *toc_entries)
 {
 	opts->toc_entries = count;
-	opts->toc_entry = calloc(count, sizeof(struct burn_toc_entry));
+	opts->toc_entry = malloc(count * sizeof(struct burn_toc_entry));
 	memcpy(opts->toc_entry, &toc_entries,
 	       sizeof(struct burn_toc_entry) * count);
 }
--- a/libburn/read.c
+++ b/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 - 2010 Thomas Schmitt <scdbackup@gmx.net>
   Provided under GPL version 2 or later.
 */

@ -9,6 +9,9 @@
 #include "../config.h"
 #endif

+
+/* #include <m alloc.h>  ts A61013 : not in GNU/Linux man 3 malloc */
+
 #include <stdlib.h>
 #include <unistd.h>
 #include <signal.h>
@ -54,7 +57,7 @@ void burn_disc_read(struct burn_drive *d, const struct burn_read_opts *o)
 	int drive_lba;
 	unsigned short crc;
 	unsigned char fakesub[96];
-	struct buffer page;  <- needs to become dynamic memory
+	struct buffer page;
 	int speed;

 	/* ts A61007 : if this function gets revived, then these
@ -286,12 +289,8 @@ void burn_packet_process(struct burn_drive *d, unsigned char *data,
 /*  so yeah, when you uncomment these, make them write zeros insted of crap
 static void write_empty_sector(int fd)
 {
-	static char sec[2352], initialized = 0;
+	char sec[2352];

-	if (!initialized) {
-		memset(sec, 0, 2352);
-		initialized = 1;
-	}
 	burn_print(1, "writing an 'empty' sector\n");
 	write(fd, sec, 2352);
 }
@ -343,7 +342,7 @@ int burn_read_data(struct burn_drive *d, off_t byte_address,
 	int alignment = 2048, start, upto, chunksize = 1, err, cpy_size, i;
 	int sose_mem = 0, fd = -1, ret;
 	char msg[81], *wpt;
-	struct buffer *buf = NULL, *buffer_mem = d->buffer;
+	struct buffer buf, *buffer_mem = d->buffer;

 /*
 #define Libburn_read_data_adr_logginG 1
@ -357,7 +356,7 @@ int burn_read_data(struct burn_drive *d, off_t byte_address,
 		fprintf(log_fp, "%d\n", (int) (byte_address / 2048));
 #endif /* Libburn_read_data_logginG */

-	BURN_ALLOC_MEM(buf, struct buffer, 1);
+
 	*data_count = 0;
 	sose_mem = d->silent_on_scsi_error;

@ -366,20 +365,20 @@ int burn_read_data(struct burn_drive *d, off_t byte_address,
 			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;}
+		return 0;
 	}
 	if (d->drive_role == 0) {
 		libdax_msgs_submit(libdax_messenger, d->global_index,
 			0x00020146,
 			LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
 			"Drive is a virtual placeholder (null-drive)", 0, 0);
-		{ret = 0; goto ex;}
+		return 0;
 	} else if (d->drive_role == 3) {
 		libdax_msgs_submit(libdax_messenger, d->global_index,
 			0x00020151,
-			LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
+			LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
 			"Read attempt on write-only drive", 0, 0);
-		{ret = 0; goto ex;}
+		return 0;
 	}
 	if ((byte_address % alignment) != 0) {
 		sprintf(msg,
@ -389,7 +388,7 @@ int burn_read_data(struct burn_drive *d, off_t byte_address,
 			0x00020143,
 			LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
 			msg, 0, 0);
-		{ret = 0; goto ex;}
+		return 0;
 	}
 	if (d->media_read_capacity != 0x7fffffff && byte_address >=
 		((off_t) d->media_read_capacity + (off_t) 1) * (off_t) 2048) {
@ -403,7 +402,7 @@ int burn_read_data(struct burn_drive *d, off_t byte_address,
 				LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
 				msg, 0, 0);
 		}
-		{ret = 0; goto ex;}
+		return 0;
 	}

 	if (d->busy != BURN_DRIVE_IDLE) {
@ -411,7 +410,7 @@ int burn_read_data(struct burn_drive *d, off_t byte_address,
 			d->global_index, 0x00020145,
 			LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
 			"Drive is busy on attempt to read data", 0, 0);
-		{ret = 0; goto ex;}
+		return 0;
 	}

 	if (d->drive_role != 1) {
@ -427,41 +426,28 @@ int burn_read_data(struct burn_drive *d, off_t byte_address,
 			d->stdio_fd = fd =
 				open(d->devname, O_RDONLY | O_LARGEFILE);
 		if (fd == -1) {
-			if (errno == EACCES && (flag & 2)) {
-				if (!(flag & 8))
-					libdax_msgs_submit(libdax_messenger,
-					  d->global_index, 0x00020183,
-					  LIBDAX_MSGS_SEV_WARNING,
-					  LIBDAX_MSGS_PRIO_HIGH,
-			  "Failed to open device (a pseudo-drive) for reading",
-					  errno, 0);
-			} else if (errno!= ENOENT || !(flag & 2))
+			if (errno != ENOENT  || !(flag & 2))
 				libdax_msgs_submit(libdax_messenger,
-				  d->global_index, 0x00020005,
+				  d->global_index,
+				  0x00020005,
 				  LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
 			  "Failed to open device (a pseudo-drive) for reading",
 				   errno, 0);
-			ret = 0;
-			if (errno == EACCES && (flag & 8))
-				ret= -2;
-			goto ex;
+			ret = 0; goto ex;
 		}
 		if (lseek(fd, byte_address, SEEK_SET) == -1) {
-			if (!(flag & 2)) {
-				sprintf(msg, "Cannot address start byte %.f",
-					(double) byte_address);
+			if (!(flag & 2))
 				libdax_msgs_submit(libdax_messenger,
 				  d->global_index,
 				  0x00020147,
 				  LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
-				  msg, errno, 0);
-			}
+				  "Cannot address start byte", errno, 0);
 			ret = 0; goto ex;
 		}
 	}

 	d->busy = BURN_DRIVE_READING_SYNC;
-	d->buffer = buf;
+	d->buffer = &buf;

 	start = byte_address / 2048;
 	upto = start + data_size / 2048;
@ -528,7 +514,10 @@ int burn_read_data(struct burn_drive *d, off_t byte_address,

 	ret = 1;
 ex:;
-	BURN_FREE_MEM(buf);
+/* <<< let it open until drive is given up or writing shall happen
+	if (fd != -1)
+		close(fd);
+*/
 	d->buffer = buffer_mem;
 	d->busy = BURN_DRIVE_IDLE;
 	return ret;
--- a/libburn/sbc.c
+++ b/libburn/sbc.c
@ -54,21 +54,20 @@ static unsigned char SBC_STOP_UNIT[] = { 0x1b, 0, 0, 0, 0, 0 };

 void sbc_load(struct burn_drive *d)
 {
-	struct command *c;
+	struct command c;

-	c = &(d->casual_command);
 	if (mmc_function_spy(d, "load") <= 0)
 		return;

-	scsi_init_command(c, SBC_LOAD, sizeof(SBC_LOAD));
-	c->retry = 1;
+	scsi_init_command(&c, SBC_LOAD, sizeof(SBC_LOAD));
+	c.retry = 1;

 	/* ts A70921 : Had to revoke Immed because of LG GSA-4082B */
-	/* c->opcode[1] |= 1; / * ts A70918 : Immed */
+	/* c.opcode[1] |= 1; / * ts A70918 : Immed */

-	c->dir = NO_TRANSFER;
-	d->issue_command(d, c);
-	if (c->error)
+	c.dir = NO_TRANSFER;
+	d->issue_command(d, &c);
+	if (c.error)
 		return;
 	/* ts A70923 : Needed regardless of Immed bit. Was once 1 minute, now
           5 minutes for loading. If this does not suffice then other commands
@ -78,21 +77,20 @@ void sbc_load(struct burn_drive *d)

 void sbc_eject(struct burn_drive *d)
 {
-	struct command *c;
+	struct command c;

-	c = &(d->casual_command);
 	if (mmc_function_spy(d, "eject") <= 0)
 		return;

-	scsi_init_command(c, SBC_UNLOAD, sizeof(SBC_UNLOAD));
-	/* c->opcode[1] |= 1; / * ts A70918 : Immed , ts B00109 : revoked */
-	c->page = NULL;
-	c->dir = NO_TRANSFER;
-	d->issue_command(d, c);
+	scsi_init_command(&c, SBC_UNLOAD, sizeof(SBC_UNLOAD));
+	/* c.opcode[1] |= 1; / * ts A70918 : Immed , ts B00109 : revoked */
+	c.page = NULL;
+	c.dir = NO_TRANSFER;
+	d->issue_command(d, &c);
 	/* ts A70918 : Wait long. A late eject could surprise or hurt user.
 	   ts B00109 : Asynchronous eject revoked, as one cannot reliably
 	               distinguish out from unready.
-	if (c->error)
+	if (c.error)
 		return;
 	spc_wait_unit_attention(d, 1800, "STOP UNIT (+ EJECT)", 0);
 	*/
@ -104,19 +102,18 @@ void sbc_eject(struct burn_drive *d)
 */
 int sbc_start_unit_flag(struct burn_drive *d, int flag)
 {
-	struct command *c;
+	struct command c;
 	int ret;

-	c = &(d->casual_command);
 	if (mmc_function_spy(d, "start_unit") <= 0)
 		return 0;

-	scsi_init_command(c, SBC_START_UNIT, sizeof(SBC_START_UNIT));
-	c->retry = 1;
-	c->opcode[1] |= (flag & 1); /* ts A70918 : Immed */
-	c->dir = NO_TRANSFER;
-	d->issue_command(d, c);
-	if (c->error)
+	scsi_init_command(&c, SBC_START_UNIT, sizeof(SBC_START_UNIT));
+	c.retry = 1;
+	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))
 		return 1;
@ -147,19 +144,18 @@ int sbc_start_unit(struct burn_drive *d)
 /* ts A90824 : Trying to reduce drive noise */
 int sbc_stop_unit(struct burn_drive *d)
 {
-	struct command *c;
+	struct command c;
 	int ret;

-	c = &(d->casual_command);
 	if (mmc_function_spy(d, "stop_unit") <= 0)
 		return 0;

-	scsi_init_command(c, SBC_STOP_UNIT, sizeof(SBC_STOP_UNIT));
-	c->retry = 0;
-	c->opcode[1] |= 1; /* Immed */
-	c->dir = NO_TRANSFER;
-	d->issue_command(d, c);
-	if (c->error)
+	scsi_init_command(&c, SBC_STOP_UNIT, sizeof(SBC_STOP_UNIT));
+	c.retry = 0;
+	c.opcode[1] |= 1; /* Immed */
+	c.dir = NO_TRANSFER;
+	d->issue_command(d, &c);
+	if (c.error)
 		return 0;
 	ret = spc_wait_unit_attention(d, 1800, "STOP UNIT", 0);
 	d->is_stopped = 1;
--- a/libburn/sector.c
+++ b/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 - 2010 Thomas Schmitt <scdbackup@gmx.net>
   Provided under GPL version 2 or later.
 */

@ -179,22 +179,10 @@ static void get_bytes(struct burn_track *track, int count, unsigned char *data)
 	if (!shortage)
 		goto ex;

-	/* ts A61031 - B10103 */
+	/* ts A61031 */
 	if (shortage >= count)
 		track->track_data_done = 1;
-	if (track->end_on_premature_eoi && shortage >= count &&
-	    !track->open_ended) {
-		char msg[80];
-		/* Memorize that premature end of input happened */
-		sprintf(msg,
-		    "Premature end of input encountered. Missing: %d bytes",
-		    shortage);
-		libdax_msgs_submit(libdax_messenger, -1, 0x00020180,
-				LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
-				msg, 0,0);
-		track->end_on_premature_eoi = 2;
-	}
-	if (track->open_ended || track->end_on_premature_eoi)
+	if (track->open_ended)
 		goto ex;

 /* If we're still short, and there's a "next" pointer, we pull from that.
@ -700,7 +688,7 @@ int sector_data(struct burn_write_opts *o, struct burn_track *t, int psub)
 		return 0;

 	/* ts A61031 */
-	if ((t->open_ended || t->end_on_premature_eoi) && t->track_data_done) {
+	if (t->open_ended && t->track_data_done) {
 		unget_sector(o, t->mode);
 		return 2;
 	}
--- a/libburn/sg-dummy.c
+++ b/libburn/sg-dummy.c
@ -251,12 +251,9 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
 	struct statvfs vfsbuf;
 #endif

-	char *testpath = NULL, *cpt;
+	char testpath[4096], *cpt;
 	long blocks;
 	off_t add_size = 0;
-	int ret;
-
-	BURN_ALLOC_MEM(testpath, char, 4096);

 	testpath[0] = 0;
 	blocks = *bytes / 512;
@ -270,18 +267,18 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
 		else
 			*cpt = 0;
 		if (stat(testpath, &stbuf) == -1)
-			{ret = -1; goto ex;}
+			return -1;

 #ifdef Libburn_if_this_was_linuX

 	} else if(S_ISBLK(stbuf.st_mode)) {
 		fd = open(path, open_mode);
 		if (fd == -1)
-			{ret = -2; goto ex;}
+			return -2;
 		ret = ioctl(fd, BLKGETSIZE, &blocks);
 		close(fd);
 		if (ret == -1)
-			{ret = -2; goto ex;}
+			return -2;
 		*bytes = ((off_t) blocks) * (off_t) 512;

 #endif /* Libburn_if_this_was_linuX */
@ -290,28 +287,25 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
 		add_size = stbuf.st_blocks * (off_t) 512;
 		strcpy(testpath, path);
 	} else
-		{ret = 0; goto ex;}
+		return 0;

 	if (testpath[0]) {	

 #ifdef Libburn_os_has_statvfS

 		if (statvfs(testpath, &vfsbuf) == -1)
-			{ret = -2; goto ex;}
+			return -2;
 		*bytes = add_size + ((off_t) vfsbuf.f_frsize) *
 						(off_t) vfsbuf.f_bavail;

 #else /* Libburn_os_has_statvfS */

-		{ret = 0; goto ex;}
+		return 0;

 #endif /* ! Libburn_os_has_stavtfS */

 	}
-	ret = 1;
-ex:;
-	BURN_FREE_MEM(testpath);
-	return ret;
+	return 1;
 }


--- a/libburn/sg-freebsd-port.c
+++ b/libburn/sg-freebsd-port.c
@ -160,7 +160,7 @@ static int sg_init_enumerator(burn_drive_enumerator_t *idx)
 		return -1;
 	}

-	memset(&(idx->ccb), 0, sizeof(union ccb));
+	bzero(&(idx->ccb), sizeof(union ccb));

 	idx->ccb.ccb_h.path_id = CAM_XPT_PATH_ID;
 	idx->ccb.ccb_h.target_id = CAM_TARGET_WILDCARD;
@ -169,10 +169,9 @@ static int sg_init_enumerator(burn_drive_enumerator_t *idx)
 	idx->ccb.ccb_h.func_code = XPT_DEV_MATCH;
 	idx->bufsize = sizeof(struct dev_match_result) * 100;
 	idx->ccb.cdm.match_buf_len = idx->bufsize;
-	idx->ccb.cdm.matches = (struct dev_match_result *)
-						calloc(1, idx->bufsize);
+	idx->ccb.cdm.matches = (struct dev_match_result *)malloc(idx->bufsize);
 	if (idx->ccb.cdm.matches == NULL) {
-		warnx("cannot allocate memory for matches");
+		warnx("can't malloc memory for matches");
 		close(idx->fd);
 		return -1;
 	}
@ -720,12 +719,11 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
 {
 	struct stat stbuf;
 	struct statvfs vfsbuf;
-	char *testpath = NULL, *cpt;
+	char testpath[4096], *cpt;
 	long blocks;
+	int open_mode = O_RDWR, fd, ret;
 	off_t add_size = 0;
-	int fd, ret;

-	BURN_ALLOC_MEM(testpath, char, 4096);
 	testpath[0] = 0;
 	blocks = *bytes / 512;
 	if (stat(path, &stbuf) == -1) {
@ -738,52 +736,38 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
 		else
 			*cpt = 0;
 		if (stat(testpath, &stbuf) == -1)
-			{ret = -1; goto ex;}
+			return -1;

 #ifdef Libburn_if_this_was_linuX

 	} else if(S_ISBLK(stbuf.st_mode)) {
-		int open_mode = O_RDWR, fd, ret;
-
 		if(burn_sg_open_o_excl)
 			open_mode |= O_EXCL;
 		fd = open(path, open_mode);
 		if (fd == -1)
-			{ret = -2; goto ex;}
+			return -2;
 		ret = ioctl(fd, BLKGETSIZE, &blocks);
 		close(fd);
 		if (ret == -1)
-			{ret = -2; goto ex;}
+			return -2;
 		*bytes = ((off_t) blocks) * (off_t) 512;

 #endif /* Libburn_if_this_was_linuX */


-	} else if(S_ISCHR(stbuf.st_mode)) {
-		fd = open(path, O_RDONLY);
-		if (fd == -1)
-			{ret = -2; goto ex;}
-		ret = ioctl(fd, DIOCGMEDIASIZE, &add_size);
-		close(fd);
-		if (ret == -1)
-			{ret = -2; goto ex;}
-		*bytes = add_size;
 	} else if(S_ISREG(stbuf.st_mode)) {
 		add_size = stbuf.st_blocks * (off_t) 512;
 		strcpy(testpath, path);
 	} else
-		{ret = 0; goto ex;}
+		return 0;

 	if (testpath[0]) {	
 		if (statvfs(testpath, &vfsbuf) == -1)
-			{ret = -2; goto ex;}
+			return -2;
 		*bytes = add_size + ((off_t) vfsbuf.f_frsize) *
 						(off_t) vfsbuf.f_bavail;
 	}
-	ret = 1;
-ex:
-	BURN_FREE_MEM(testpath);
-	return ret;
+	return 1;
 }


--- a/libburn/sg-freebsd.c
+++ b/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 - 2010 Thomas Schmitt <scdbackup@gmx.net>
   Provided under GPL version 2 or later.
 */

@ -54,7 +54,6 @@
 #include "debug.h"
 #include "toc.h"
 #include "util.h"
-#include "init.h"

 #include "libdax_msgs.h"
 extern struct libdax_msgs *libdax_messenger;
@ -161,21 +160,21 @@ static int sg_init_enumerator(burn_drive_enumerator_t *idx_)
 	struct burn_drive_enumeration_state *idx;
 	int bufsize;

-	idx = calloc(1, sizeof(*idx));
+	idx = malloc(sizeof(*idx));
 	if (idx == NULL) {
-		warnx("cannot allocate memory for enumerator");
+		warnx("can't malloc memory for enumerator");
 		return -1;
 	}
 	idx->skip_device = 0;

 	if ((idx->fd = open(XPT_DEVICE, O_RDWR)) == -1) {
-		warn("could not open %s", XPT_DEVICE);
+		warn("couldn't open %s", XPT_DEVICE);
 		free(idx);
 		idx = NULL;
 		return -1;
 	}

-	memset(&(idx->ccb), 0, sizeof(union ccb));
+	bzero(&(idx->ccb), sizeof(union ccb));

 	idx->ccb.ccb_h.path_id = CAM_XPT_PATH_ID;
 	idx->ccb.ccb_h.target_id = CAM_TARGET_WILDCARD;
@ -184,9 +183,9 @@ static int sg_init_enumerator(burn_drive_enumerator_t *idx_)
 	idx->ccb.ccb_h.func_code = XPT_DEV_MATCH;
 	bufsize = sizeof(struct dev_match_result) * 100;
 	idx->ccb.cdm.match_buf_len = bufsize;
-	idx->ccb.cdm.matches = (struct dev_match_result *) calloc(1, bufsize);
+	idx->ccb.cdm.matches = (struct dev_match_result *)malloc(bufsize);
 	if (idx->ccb.cdm.matches == NULL) {
-		warnx("cannot allocate memory for matches");
+		warnx("can't malloc memory for matches");
 		close(idx->fd);
 		free(idx);
 		return -1;
@ -488,9 +487,9 @@ static void enumerate_common(char *fname, int bus_no, int host_no,
 	out.close_session = mmc_close_session;
 	out.close_track_session = mmc_close;
 	out.read_buffer_capacity = mmc_read_buffer_capacity;
-	out.idata = calloc(1, sizeof(struct burn_scsi_inquiry_data));
+	out.idata = malloc(sizeof(struct burn_scsi_inquiry_data));
 	out.idata->valid = 0;
-	out.mdata = calloc(1, sizeof(struct scsi_mode_data));
+	out.mdata = malloc(sizeof(struct scsi_mode_data));
 	out.mdata->valid = 0;
 	if (out.idata == NULL || out.mdata == NULL) {
 		libdax_msgs_submit(libdax_messenger, -1, 0x00020108,
@ -674,9 +673,8 @@ static int freebsd_dev_lock(int dev_fd, char *devname,
 static int sg_lock(struct burn_drive *d, int flag)
 {
 	int ret, os_errno, pass_dev_no = -1, flock_fd = -1;
-	char *msg = NULL;
+	char msg[4096];

-	BURN_ALLOC_MEM(msg, char, 4096);
 	ret = freebsd_dev_lock(d->cam->fd, d->devname,
 				&os_errno, &pass_dev_no, &flock_fd, msg, 0);
 	if (ret <= 0) {
@ -685,15 +683,12 @@ static int sg_lock(struct burn_drive *d, int flag)
 			LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
 			msg, os_errno, 0);
 		sg_close_drive(d);
-		{ret = 0; goto ex;}
+		return 0;
 	}
 	if (d->lock_fd > 0)
 		close(d->lock_fd);
 	d->lock_fd = flock_fd;
-	ret = 1;
-ex:;
-	BURN_FREE_MEM(msg);
-	return ret;
+	return 1;
 }


@ -764,13 +759,15 @@ int sg_release(struct burn_drive *d)

 int sg_issue_command(struct burn_drive *d, struct command *c)
 {
-	int done = 0, err, sense_len = 0, ret, ignore_error, no_retry = 0, i;
-	int cam_pass_err_recover = 0, key, asc, ascq, timeout_ms;
+	int done = 0, err, sense_len = 0, ret, ignore_error, no_retry = 0;
+	int cam_pass_err_recover = 0;
 	union ccb *ccb;
+	char buf[161];
 	static FILE *fp = NULL;
-	time_t start_time;

-	mmc_function_spy(NULL, "sg_issue_command");
+	snprintf(buf, sizeof (buf), "sg_issue_command  d->cam=%p d->released=%d",
+		(void*)d->cam, d->released);
+	mmc_function_spy(NULL, buf);

 	if (d->cam == NULL) {
 		c->error = 0;
@ -857,9 +854,7 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 		ccb->csio.dxfer_len = 0;
 	}

-	start_time = time(NULL);
-	timeout_ms = 200000;
-	for (i = 0; !done; i++) {
+	do {
 		memset(c->sense, 0, sizeof(c->sense));
 		err = cam_send_ccb(d->cam, ccb);

@ -869,12 +864,11 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 			/* ts B00110 */
 			/* Better curb sense_len */
 			sense_len = ccb->csio.sense_len;
-			if (sense_len > (int) sizeof(c->sense))
+			if (sense_len > sizeof(c->sense))
 				sense_len = sizeof(c->sense);
 			memcpy(c->sense, &ccb->csio.sense_data, sense_len);
-			spc_decode_sense(c->sense, sense_len,
-							&key, &asc, &ascq);
-			if (sense_len >= 14 && cam_pass_err_recover && key)
+			if (sense_len >= 14 && cam_pass_err_recover &&
+			    (c->sense[2] & 0x0f))
 				ignore_error = 1;
 		}

@ -892,7 +886,6 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 				fprintf(stderr, "libburn_EXPERIMENTAL: Emulating [2,3A,00] MEDIUM NOT PRESENT\n");
 #endif

-				c->sense[0] = 0x70; /*Fixed format sense data*/
 				c->sense[2] = 0x02;
 				c->sense[12] = 0x3A;
 				c->sense[13] = 0x00;
@ -908,7 +901,6 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 				fprintf(stderr, "libburn_EXPERIMENTAL: Emulating [2,04,00] LOGICAL UNIT NOT READY,CAUSE NOT REPORTABLE\n");
 #endif

-				c->sense[0] = 0x70; /*Fixed format sense data*/
 				c->sense[2] = 0x02;
 				c->sense[12] = 0x04;
 				c->sense[13] = 0x00;
@ -922,7 +914,6 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 				fprintf(stderr, "libburn_EXPERIMENTAL: Emulating [5,24,00] INVALID FIELD IN CDB\n");
 #endif

-				c->sense[0] = 0x70; /*Fixed format sense data*/
 				c->sense[2] = 0x05;
 				c->sense[12] = 0x24;
 				c->sense[13] = 0x00;
@ -953,26 +944,44 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 				fprintf(stderr, "libburn_EXPERIMENTAL: CAM_STATUS= %d .Emulating [2,04,00] LOGICAL UNIT NOT READY,CAUSE NOT REPORTABLE\n", (ccb->ccb_h.status & CAM_STATUS_MASK));
 #endif

-				c->sense[0] = 0x70; /*Fixed format sense data*/
 				c->sense[2] = 0x02;
 				c->sense[12] = 0x04;
 				c->sense[13] = 0x00;
 				no_retry = 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 (no_retry || ignore_error || !c->retry) {
+				c->error = 1;
+				{ret = 1; goto ex;}
+			}
+			switch (scsi_error(d, c->sense, 0)) {
+			case RETRY:
+				done = 0;
+				if (burn_sg_log_scsi & 3) {
+					/* >>> Need own duration time
+					       measurement. Then remove bit1 */
+					scsi_log_err(c, fp, c->sense, 0,
+							(c->error != 0) | 2);
+					scsi_log_cmd(c,fp,0);
+				}
+				break;
+			case FAIL:
+				done = 1;
+				c->error = 1;
+				break;
+			}
 		} else {
 			done = 1;
 		}
 	} while (!done);
 	ret = 1;
 ex:;
+	if (c->error)
+		scsi_notify_error(d, c, c->sense, 18, 0);
+
+	if (burn_sg_log_scsi & 3)
+		/* >>> Need own duration time measurement. Then remove bit1 */
+		scsi_log_err(c, fp, c->sense, 0, (c->error != 0) | 2);
+
 	cam_freeccb(ccb);
 	return ret;
 }
@ -987,10 +996,6 @@ int burn_os_is_2k_seekrw(char *path, int flag)
        struct stat stbuf;
 	char *spt;
 	int i, e;
-#ifdef Libburn_DIOCGMEDIASIZE_ISBLK
-	int fd;
-	off_t add_size;
-#endif

        if (stat(path, &stbuf) == -1)
                return 0;
@ -998,22 +1003,6 @@ int burn_os_is_2k_seekrw(char *path, int flag)
                return 1;
 	if (!S_ISCHR(stbuf.st_mode))
 		return 0;
-
-#ifdef Libburn_DIOCGMEDIASIZE_ISBLK
-
-	/* If it throws no error with DIOCGMEDIASIZE then it is a
-	   'block device'
-	*/
-	fd = open(path, O_RDONLY);
-	if (fd == -1)
-		return 0;
-	ret = ioctl(fd, DIOCGMEDIASIZE, &add_size);
-	close(fd);
-
-	return 1;
-
-#else /* Libburn_DIOCGMEDIASIZE_ISBLK */
-
 	spt = strrchr(path, '/');
 	if (spt == NULL)
 	        spt = path;
@ -1036,9 +1025,6 @@ int burn_os_is_2k_seekrw(char *path, int flag)
 	if (strncmp(spt, "fla", e) == 0) /* Flash drive */
 		return 1;
 	return 0;
-
-#endif /* ! Libburn_DIOCGMEDIASIZE_ISBLK */
-
 }


@ -1056,12 +1042,11 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
 {
 	struct stat stbuf;
 	struct statvfs vfsbuf;
-	char *testpath = NULL, *cpt;
+	char testpath[4096], *cpt;
 	long blocks;
 	off_t add_size = 0;
 	int fd, ret;

-	BURN_ALLOC_MEM(testpath, char, 4096);
 	testpath[0] = 0;
 	blocks = *bytes / 512;
 	if (stat(path, &stbuf) == -1) {
@ -1074,7 +1059,7 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
 		else
 			*cpt = 0;
 		if (stat(testpath, &stbuf) == -1)
-			{ret = -1; goto ex;}
+			return -1;

 #ifdef Libburn_if_this_was_linuX

@ -1085,11 +1070,11 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
 			open_mode |= O_EXCL;
 		fd = open(path, open_mode);
 		if (fd == -1)
-			{ret = -2; goto ex;}
+			return -2;
 		ret = ioctl(fd, BLKGETSIZE, &blocks);
 		close(fd);
 		if (ret == -1)
-			{ret = -2; goto ex;}
+			return -2;
 		*bytes = ((off_t) blocks) * (off_t) 512;

 #endif /* Libburn_if_this_was_linuX */
@ -1098,28 +1083,25 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
 	} else if(S_ISCHR(stbuf.st_mode)) {
 		fd = open(path, O_RDONLY);
 		if (fd == -1)
-			{ret = -2; goto ex;}
+			return -2;
 		ret = ioctl(fd, DIOCGMEDIASIZE, &add_size);
 		close(fd);
 		if (ret == -1)
-			{ret = -2; goto ex;}
+			return -2;
 		*bytes = add_size;
 	} else if(S_ISREG(stbuf.st_mode)) {
 		add_size = stbuf.st_blocks * (off_t) 512;
 		strcpy(testpath, path);
 	} else
-		{ret = 0; goto ex;}
+		return 0;

 	if (testpath[0]) {	
 		if (statvfs(testpath, &vfsbuf) == -1)
-			{ret = -2; goto ex;}
+			return -2;
 		*bytes = add_size + ((off_t) vfsbuf.f_frsize) *
 						(off_t) vfsbuf.f_bavail;
 	}
-	ret = 1;
-ex:
-	BURN_FREE_MEM(testpath);
-	return ret;
+	return 1;
 }


--- a/libburn/sg-libcdio.c
+++ b/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) 2010 Thomas Schmitt <scdbackup@gmx.net>
   Provided under GPL version 2 or later.
 */

@ -168,7 +168,6 @@ Send feedback to libburn-hackers@pykix.org .
 #include "debug.h"
 #include "toc.h"
 #include "util.h"
-#include "init.h"

 #include "libdax_msgs.h"
 extern struct libdax_msgs *libdax_messenger;
@ -430,18 +429,17 @@ int sg_dispose_drive(struct burn_drive *d, int flag)
 int sg_give_next_adr(burn_drive_enumerator_t *idx,
 		     char adr[], int adr_size, int initialize)
 {
-	int ret, recursion_count = 0, path_size = 4096;
-	char *path = NULL;
+	int ret, recursion_count = 0;
+	char path[4096];
 #ifdef Libburn_is_on_solariS
 	int l;
 #endif
-	BURN_ALLOC_MEM(path, char, path_size);

 	ret = sg_give_next_adr_raw(idx, adr, adr_size, initialize);
 	if (ret <= 0)
-		goto ex;
-	if (strlen(adr) >= path_size)
-		goto ex;
+		return ret;
+	if (strlen(adr) >= sizeof(path))
+		return ret;

 #ifdef Libburn_is_on_solariS
 	/* >>> provisory : preserve Solaris /dev/rdsk/cXtYdZs2 addresses */
@ -449,16 +447,13 @@ int sg_give_next_adr(burn_drive_enumerator_t *idx,
 	if (l >= 18)
 		if (strncmp(adr, "/dev/rdsk/c", 11) == 0 && adr[11] >= '0' &&
 		    adr[11] <= '9' && strcmp(adr + (l - 2), "s2") == 0)
-			{ret = 1; goto ex;}
+			return 1;
 #endif /* Libburn_is_on_solariS */

 	ret = burn_drive_resolve_link(adr, path, &recursion_count, 2);
        if(ret > 0 && strlen(path) < adr_size)
 		strcpy(path, adr);
-	ret = (ret >= 0);
-ex:
-	BURN_FREE_MEM(path);
-	return ret;
+	return (ret >= 0);
 }


@ -470,17 +465,13 @@ int scsi_enumerate_drives(void)
 	burn_drive_enumerator_t idx;
 	int initialize = 1, ret, i_bus_no = -1, recursion_count = 0;
        int i_host_no = -1, i_channel_no = -1, i_target_no = -1, i_lun_no = -1;
-	int buf_size = 4096;
-	char *buf = NULL, *target = NULL;
+	char buf[4096], target[4096];
 #ifdef Libburn_is_on_solariS
 	int l;
 #endif

-	BURN_ALLOC_MEM(buf, char, buf_size);
-	BURN_ALLOC_MEM(target, char, buf_size);
-
 	while(1) {
-		ret = sg_give_next_adr_raw(&idx, buf, buf_size, initialize);
+		ret = sg_give_next_adr_raw(&idx, buf, sizeof(buf), initialize);
 		initialize = 0;
 		if (ret <= 0)
 	break;
@ -510,12 +501,8 @@ int scsi_enumerate_drives(void)
 				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);
-	BURN_FREE_MEM(target);
-	return ret;
+	sg_give_next_adr(&idx, buf, sizeof(buf), -1);
+	return 1;
 }


@ -539,12 +526,12 @@ int sg_drive_is_open(struct burn_drive * d)
 int sg_grab(struct burn_drive *d)
 {
 	CdIo_t *p_cdio;
-	char *am_eff, *msg = NULL, *am_wanted;
-	int os_errno, second_try = 0, ret;
+	char *am_eff, msg[4096], *am_wanted;
+	int os_errno, second_try = 0;

 	if (d->p_cdio != NULL) {
 		d->released = 0;
-		{ret = 1; goto ex;}
+		return 1;
 	}
 	if (d->libcdio_name[0] == 0) /* just to be sure it is initialized */
 		strcpy(d->libcdio_name, d->devname);
@ -552,14 +539,13 @@ int sg_grab(struct burn_drive *d)
 try_to_open:;
 	p_cdio = cdio_open_am(d->libcdio_name, DRIVER_DEVICE, am_wanted);
 	if (p_cdio == NULL) {
-		BURN_ALLOC_MEM(msg, char, 4096);
 		os_errno = errno;
 		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, os_errno, 0);
-		{ret = 0; goto ex;}
+		return 0;
 	}
 	am_eff = (char *) cdio_get_arg(p_cdio, "access-mode");
        if (strncmp(am_eff, "MMC_RDWR", 8) != 0) {
@ -574,15 +560,12 @@ try_to_open:;
 			0x00020003,
 			LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
 			"libcdio provides no MMC_RDWR access mode", 0, 0);
-		{ret = 0; goto ex;}
+		return 0;
        }

 	d->p_cdio = p_cdio;
 	d->released = 0;
-	ret = 1;
-ex:;
-	BURN_FREE_MEM(msg);
-	return ret;
+	return 1;
 }


@ -614,8 +597,7 @@ int sg_release(struct burn_drive *d)
 */
 int sg_issue_command(struct burn_drive *d, struct command *c)
 {
-	int sense_valid = 0, i, timeout_ms, no_retry = 0;
-	int key = 0, asc = 0, ascq = 0, done = 0;
+	int sense_valid = 0, i, usleep_time, timeout_ms, no_retry = 0;
 	time_t start_time;
        driver_return_code_t i_status;
 	unsigned int dxfer_len;
@ -660,18 +642,15 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 	/* retry-loop */
 	start_time = time(NULL);
 	timeout_ms = 200000;
-	for(i = 0; !done; i++) {
+	for(i = 0; ; i++) {

 		i_status = mmc_run_cmd(p_cdio, timeout_ms, &cdb, e_direction,
 				 	dxfer_len, c->page->data);
 		sense_valid = mmc_last_cmd_sense(p_cdio, &sense_pt);
-		if (sense_valid >= 18) {
+		if (sense_valid >= 18)
 			memcpy(c->sense, sense_pt,
 				sense_valid >= sizeof(c->sense) ?
 				sizeof(c->sense) : sense_valid );
-			spc_decode_sense(c->sense, 0, &key, &asc, &ascq);
-		} else
-			key = asc = ascq = 0;
 		if (sense_pt != NULL)
 			free(sense_pt);

@ -693,25 +672,62 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 		}
 */

-		if ((!sense_valid) || (key == 0 && asc == 0 && ascq == 0)) {
+		if ((!sense_valid) ||
+			 ((c->sense[2] & 0x0f) == 0 && c->sense[12] == 0 &&
+							 c->sense[13] == 0)) {
 			memset(c->sense, 0, sizeof(c->sense));
 			if (i_status != 0) { /* set dummy sense */
 				/*LOGICAL UNIT NOT READY,
 					CAUSE NOT REPORTABLE*/
-				c->sense[0] = 0x70; /*Fixed format sense data*/
 				c->sense[2] = 0x02;
 				c->sense[12] = 0x04;
 				no_retry = 1;
 			}
-		} 
-		if (i_status != 0 || (key || asc || ascq)) {
-			done = scsi_eval_cmd_outcome(d, c, fp,  c->sense, 18,
-					0, start_time, timeout_ms, i, 2);
 		} else
-			done = 1;
-
+			c->sense[2] &= 15;
+	
+		if (i_status != 0 ||
+		    (c->sense[2] || c->sense[12] || c->sense[13])) {
+			if (no_retry || !c->retry) {
+				c->error = 1;
+				goto ex;
+			}
+			switch (scsi_error(d, c->sense, 18)) {
+			case RETRY:
+				if (burn_sg_log_scsi & 3) {
+					/* >>> Need own duration time
+					       measurement. Then remove bit1 */
+					scsi_log_err(c, fp, c->sense, 0,
+							(c->error != 0) | 2);
+					scsi_log_cmd(c,fp,0);
+				}
+				break;
+			case FAIL:
+				c->error = 1;
+				goto ex;
+			}
+			/* 
+			   Calming down retries and breaking up endless cycle
+			*/
+			usleep_time = Libburn_sg_libcdio_retry_usleeP +
+					i * Libburn_sg_libcdio_retry_incR;
+			if (time(NULL) + usleep_time / 1000000 - start_time >
+			    timeout_ms / 1000 + 1) {
+				c->error = 1;
+				goto ex;
+			}
+			usleep(usleep_time);
+		} else
+			break; /* retry-loop */
 	} /* end of retry-loop */

+ex:;
+	if (c->error)
+		scsi_notify_error(d, c, c->sense, 18, 0);
+
+	if (burn_sg_log_scsi & 3) 
+		/* >>> Need own duration time measurement. Then remove bit1 */
+		scsi_log_err(c, fp, c->sense, 0, (c->error != 0) | 2);
 	return 1;
 }

@ -859,12 +875,10 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
 	struct statvfs vfsbuf;
 #endif

-	char *testpath = NULL, *cpt;
+	char testpath[4096], *cpt;
 	long blocks;
 	off_t add_size = 0;
-	int ret;

-	BURN_ALLOC_MEM(testpath, char, 4096);
 	testpath[0] = 0;
 	blocks = *bytes / 512;
 	if (stat(path, &stbuf) == -1) {
@ -877,7 +891,7 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
 		else
 			*cpt = 0;
 		if (stat(testpath, &stbuf) == -1)
-			{ret = -1; goto ex;}
+			return -1;

 #ifdef __linux

@ -887,11 +901,11 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)

 		fd = open(path, open_mode);
 		if (fd == -1)
-			{ret = -2; goto ex;}
+			return -2;
 		ret = ioctl(fd, BLKGETSIZE, &blocks);
 		close(fd);
 		if (ret == -1)
-			{ret = -2; goto ex;}
+			return -2;
 		*bytes = ((off_t) blocks) * (off_t) 512;

 #endif /* __linux */
@ -903,11 +917,11 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)

 		fd = open(path, O_RDONLY);
 		if (fd == -1)
-			{ret = -2; goto ex;}
+			return -2;
 		ret = ioctl(fd, DIOCGMEDIASIZE, &add_size);
 		close(fd);
 		if (ret == -1)
-			{ret = -2; goto ex;}
+			return -2;
 		*bytes = add_size;

 #endif /* Libburn_is_on_freebsD */
@ -919,12 +933,12 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
 		
 		fd = open(path, open_mode);
 		if (fd == -1)
-			{ret = -2; goto ex;}
+			return -2;
 		*bytes = lseek(fd, 0, SEEK_END);
 		close(fd);
 		if (*bytes == -1) {
 			*bytes = 0;
-			{ret = 0; goto ex;}
+			return 0;
 		}
 		
 #endif /* Libburn_is_on_solariS */
@ -933,28 +947,25 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
 		add_size = stbuf.st_blocks * (off_t) 512;
 		strcpy(testpath, path);
 	} else
-		{ret = 0; goto ex;}
+		return 0;

 	if (testpath[0]) {	

 #ifdef Libburn_os_has_statvfS

 		if (statvfs(testpath, &vfsbuf) == -1)
-			{ret = -2; goto ex;}
+			return -2;
 		*bytes = add_size + ((off_t) vfsbuf.f_frsize) *
 						(off_t) vfsbuf.f_bavail;

 #else /* Libburn_os_has_statvfS */

-		{ret = 0; goto ex;}
+		return 0;

 #endif /* ! Libburn_os_has_stavtfS */

 	}
-	ret = 1;
-ex:;
-	BURN_FREE_MEM(testpath);
-	return ret;
+	return 1;
 }


--- a/libburn/sg-linux.c
+++ b/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 - 2010 Thomas Schmitt <scdbackup@gmx.net>
   Provided under GPL version 2 or later.
 */

@ -237,7 +237,6 @@ static int linux_ata_enumerate_verbous = 0;
 #include "debug.h"
 #include "toc.h"
 #include "util.h"
-#include "init.h"

 #include "libdax_msgs.h"
 extern struct libdax_msgs *libdax_messenger;
@ -344,7 +343,7 @@ static void sg_select_device_family(void)
 static int sg_exchange_scd_for_sr(char *fname, int flag)
 {
 	struct stat stbuf;
-	char scd[17], *msg = NULL;
+	char scd[17], msg[160];

 	if (burn_sg_use_family != 0 || strncmp(fname, "/dev/sr", 7)!=0 ||
 	    strlen(fname)>9 || strlen(fname)<8)
@ -359,14 +358,9 @@ static int sg_exchange_scd_for_sr(char *fname, int flag)
 	strcpy(scd + 8, fname + 7);
 	if (stat(scd, &stbuf) == -1)
 		return 2;
-	msg = calloc(strlen(scd) + strlen(fname) + 80, 1);
-	if (msg != NULL) {
-		sprintf(msg, "%s substitutes for non-existent %s", scd, fname);
-		libdax_msgs_submit(libdax_messenger, -1, 0x00000002,
-			LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
-			msg, 0, 0);
-		free(msg);
-	}
+	sprintf(msg, "%s substitutes for non-existent %s", scd, fname);
+	libdax_msgs_submit(libdax_messenger, -1, 0x00000002,
+		LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH, msg, 0, 0);
 	strcpy(fname, scd);
 	return 1;
 }
@ -390,12 +384,10 @@ static int sgio_test(int fd)
 /* ts A60924 */
 static int sg_handle_busy_device(char *fname, int os_errno)
 {
-	char *msg = NULL;
+	char msg[4096];
 	struct stat stbuf;
 	int looks_like_hd= 0, fd, ret;

-	BURN_ALLOC_MEM(msg, char, 4096);
-
 	/* ts A80713 :
 	   check existence of /dev/hdX1 as hint for hard disk rather than CD
 	   Hint by Giulio Orsero: check /proc/ide/hdX/media for "disk"
@ -453,10 +445,7 @@ static int sg_handle_busy_device(char *fname, int os_errno)
 				LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_LOW,
 				msg, os_errno, 0);
 	}
-	ret = 1;
-ex:;
-	BURN_FREE_MEM(msg);
-	return ret;
+	return 1;
 }


@ -464,11 +453,10 @@ ex:;
 static int sg_close_drive_fd(char *fname, int driveno, int *fd, int sorry)
 {
 	int ret, os_errno, sevno= LIBDAX_MSGS_SEV_DEBUG;
-	char *msg = NULL;
+	char msg[4096+100];

 	if(*fd < 0)
-		{ret = 0; goto ex;}
-	BURN_ALLOC_MEM(msg, char, 4096 + 100);
+		return(0);

 #ifdef CDROM_MEDIA_CHANGED_disabled_because_not_helpful
 #ifdef CDSL_CURRENT
@ -496,7 +484,7 @@ static int sg_close_drive_fd(char *fname, int driveno, int *fd, int sorry)
 	if(ret != -1) {
 		/* ts A70409 : DDLP-B */
 		/* >>> release single lock on fname */
-		{ret = 1; goto ex;}
+		return 1;
 	}
 	os_errno= errno;

@ -505,10 +493,7 @@ static int sg_close_drive_fd(char *fname, int driveno, int *fd, int sorry)
 		sevno = LIBDAX_MSGS_SEV_SORRY;
 	libdax_msgs_submit(libdax_messenger, driveno, 0x00020002,
 			sevno, LIBDAX_MSGS_PRIO_HIGH, msg, os_errno, 0);
-	ret = 0;
-ex:;
-	BURN_FREE_MEM(msg);
-	return ret;	
+	return 0;	
 }


@ -673,28 +658,23 @@ static int sg_open_scsi_siblings(char *path, int driveno,
 {
 	int tld, i, ret, fd, i_bus_no = -1;
 	int i_host_no = -1, i_channel_no = -1, i_target_no = -1, i_lun_no = -1;
-	char *msg = NULL, fname[40];
+	char msg[161], fname[81];
 	struct stat stbuf;
 	dev_t last_rdev = 0, path_rdev;

-	static char tldev[][20]= {"/dev/sr%d", "/dev/scd%d", "/dev/sg%d", ""};
+	static char tldev[][81]= {"/dev/sr%d", "/dev/scd%d", "/dev/sg%d", ""};
 					/* ts A70609: removed "/dev/st%d" */

-	if (strlen(path) > BURN_MSGS_MESSAGE_LEN - 160)
-		{ret = 0; goto ex;}
-
-	BURN_ALLOC_MEM(msg, char, BURN_MSGS_MESSAGE_LEN);
-
 	if(stat(path, &stbuf) == -1)
-		{ret = 0; goto ex;}
+		return 0;
 	path_rdev = stbuf.st_rdev;

        sg_select_device_family();
 	if (linux_sg_device_family[0] == 0)
-		{ret = 1; goto ex;}
+		return 1;

 	if(host_no < 0 || id_no < 0 || channel_no < 0 || lun_no < 0)
-		{ret = 2; goto ex;}
+		return(2);
 	if(*sibling_count > 0)
 		sg_release_siblings(sibling_fds, sibling_fnames,
 					sibling_count);
@ -744,17 +724,17 @@ static int sg_open_scsi_siblings(char *path, int driveno,
 			last_rdev= stbuf.st_rdev;
 		}
 	}
-	ret = 1;
-ex:;
-	BURN_FREE_MEM(msg);
-	return ret;
+	return 1;
 failed:;
 	sg_release_siblings(sibling_fds, sibling_fnames, sibling_count);
-	ret = 0;
-	goto ex;
+	return 0;
 }


+#define Libburn_drive_new_deaL 1
+
+#ifdef Libburn_drive_new_deaL
+
 /* ts A80731 */
 static int is_ata_drive(char *fname)
 {
@ -806,20 +786,15 @@ static int is_scsi_drive(char *fname, int *bus_no, int *host_no,
 {
 	int fd, sid_ret = 0, ret;
 	struct sg_scsi_id sid;
-	int *sibling_fds = NULL, sibling_count= 0;
-	typedef char burn_sg_sibling_fname[BURN_OS_SG_MAX_NAMELEN];
-	burn_sg_sibling_fname *sibling_fnames = NULL;
-
-	BURN_ALLOC_MEM(sibling_fds, int, BURN_OS_SG_MAX_SIBLINGS);
-	BURN_ALLOC_MEM(sibling_fnames, burn_sg_sibling_fname,
-			BURN_OS_SG_MAX_SIBLINGS);
+	int sibling_fds[BURN_OS_SG_MAX_SIBLINGS], sibling_count= 0;
+	char sibling_fnames[BURN_OS_SG_MAX_SIBLINGS][BURN_OS_SG_MAX_NAMELEN];

 	fd = sg_open_drive_fd(fname, 1);
 	if (fd == -1) {
 		if (linux_sg_enumerate_debug)
 			fprintf(stderr, "open failed, errno=%d  '%s'\n",
 				errno, strerror(errno));
-		{ret = 0; goto ex;}
+		return 0;
 	}

 	sid_ret = ioctl(fd, SG_GET_SCSI_ID, &sid);
@ -837,7 +812,7 @@ static int is_scsi_drive(char *fname, int *bus_no, int *host_no,
 				errno, strerror(errno));

 			sg_close_drive_fd(fname, -1, &fd, 0);
-			{ret = 0; goto ex;}
+			return 0;
 		}

 #ifdef CDROM_DRIVE_STATUS
@ -868,14 +843,14 @@ static int is_scsi_drive(char *fname, int *bus_no, int *host_no,
 			fprintf(stderr,
 				"cannot close properly, errno=%d  '%s'\n",
 				errno, strerror(errno)); 
-		{ret = 0; goto ex;}
+		return 0;
 	}
 	if ( (sid_ret == -1 || sid.scsi_type != TYPE_ROM)
 	     && !linux_sg_accept_any_type) {
 		if (linux_sg_enumerate_debug)
 			fprintf(stderr, "sid.scsi_type = %d (!= TYPE_ROM)\n",
 				sid.scsi_type); 
-		{ret = 0; goto ex;}
+		return 0;
 	}

 	if (sid_ret == -1 || sid.scsi_id < 0) {
@ -891,7 +866,7 @@ static int is_scsi_drive(char *fname, int *bus_no, int *host_no,
 			if (linux_sg_enumerate_debug)
 				fprintf(stderr,
 					"sg_obtain_scsi_adr() failed\n");
-			{ret = 0; goto ex;}
+			return 0;
 		}
 	}

@ -906,7 +881,7 @@ static int is_scsi_drive(char *fname, int *bus_no, int *host_no,
 			if (linux_sg_enumerate_debug)
 				fprintf(stderr, "cannot lock siblings\n"); 
 			sg_handle_busy_device(fname, 0);
-			{ret = 0; goto ex;}
+			return 0;
 		}
 		/* the final occupation will be done in sg_grab() */
 		sg_release_siblings(sibling_fds, sibling_fnames,
@ -922,19 +897,26 @@ static int is_scsi_drive(char *fname, int *bus_no, int *host_no,
 	*channel_no= sid.channel;
 	*target_no= sid.scsi_id;
 	*lun_no= sid.lun;
-	ret = 1;
-ex:;
-	BURN_FREE_MEM(sibling_fds);
-	BURN_FREE_MEM(sibling_fnames);
-	return ret;
+	return 1;
 }	

+#endif /* Libburn_drive_new_deaL */
+

 /** Speciality of GNU/Linux: detect non-SCSI ATAPI (EIDE) which will from
   then on used used via generic SCSI as is done with (emulated) SCSI drives */ 
 static void ata_enumerate(void)
 {
+
+#ifdef Libburn_drive_new_deaL
+
 	int ret;
+
+#else 
+	struct hd_driveid tm;
+	int fd;
+#endif
+
 	int i;
 	char fname[10];

@ -956,11 +938,57 @@ static void ata_enumerate(void)
 				fprintf(stderr, "not in whitelist\n");
 	continue;
 		}
+
+#ifdef Libburn_drive_new_deaL
+
 		ret = is_ata_drive(fname);
 		if (ret < 0)
 	break;
 		if (ret == 0)
 	continue;
+
+#else /* Libburn_drive_new_deaL */
+
+		fd = sg_open_drive_fd(fname, 1);
+		if (fd == -1) {
+			if (linux_ata_enumerate_verbous)
+				fprintf(stderr,"open failed, errno=%d  '%s'\n",
+					errno, strerror(errno));
+	continue;
+		}
+
+		/* found a drive */
+		ioctl(fd, HDIO_GET_IDENTITY, &tm);
+
+		/* not atapi */
+		if (!(tm.config & 0x8000) || (tm.config & 0x4000)) {
+			if (linux_ata_enumerate_verbous)
+				fprintf(stderr, "not marked as ATAPI\n");
+			sg_close_drive_fd(fname, -1, &fd, 0);
+	continue;
+		}
+
+		/* if SG_IO fails on an atapi device, we should stop trying to 
+		   use hd* devices */
+		if (sgio_test(fd) == -1) {
+			if (linux_ata_enumerate_verbous)
+			  fprintf(stderr,
+				 "FATAL: sgio_test() failed: errno=%d  '%s'\n",
+				 errno, strerror(errno));
+			sg_close_drive_fd(fname, -1, &fd, 0);
+			return;
+		}
+		if (sg_close_drive_fd(fname, -1, &fd, 1) <= 0) {
+			if (linux_ata_enumerate_verbous)
+			  fprintf(stderr,
+				"cannot close properly, errno=%d  '%s'\n",
+				errno, strerror(errno));
+	continue;
+		}
+
+#endif /* Libburn_drive_new_deaL */
+
+
 		if (linux_ata_enumerate_verbous)
 		  fprintf(stderr, "accepting as drive without SCSI address\n");
 		enumerate_common(fname, -1, -1, -1, -1, -1);
@ -971,6 +999,15 @@ static void ata_enumerate(void)
 /** Detects (probably emulated) SCSI drives */
 static void sg_enumerate(void)
 {
+#ifdef Libburn_drive_new_deaL
+
+#else 
+	struct sg_scsi_id sid;
+	int fd, sibling_fds[BURN_OS_SG_MAX_SIBLINGS], sibling_count= 0;
+	char sibling_fnames[BURN_OS_SG_MAX_SIBLINGS][BURN_OS_SG_MAX_NAMELEN];
+	int sid_ret = 0;
+#endif
+
 	int i, ret;
 	int bus_no= -1, host_no= -1, channel_no= -1, target_no= -1, lun_no= -1;
 	char fname[17];
@ -1000,6 +1037,9 @@ static void sg_enumerate(void)
 	continue;
 		}

+
+#ifdef Libburn_drive_new_deaL
+
 		ret = is_scsi_drive(fname, &bus_no, &host_no, &channel_no,
 							&target_no, &lun_no);
 		if (ret < 0)
@ -1012,10 +1052,132 @@ static void sg_enumerate(void)
 		enumerate_common(fname, bus_no, host_no, channel_no, 
 				target_no, lun_no);

+#else /* Libburn_drive_new_deaL */
+
+		/* ts A60927 */
+		fd = sg_open_drive_fd(fname, 1);
+		if (fd == -1) {
+			if (linux_sg_enumerate_debug)
+			  fprintf(stderr, "open failed, errno=%d  '%s'\n",
+				  errno, strerror(errno));
+	continue;
+		}
+
+		/* found a drive */
+		sid_ret = ioctl(fd, SG_GET_SCSI_ID, &sid);
+		if (sid_ret == -1) {
+			sid.scsi_id = -1; /* mark SCSI address as invalid */
+			if(linux_sg_enumerate_debug) 
+		  	  fprintf(stderr,
+			    "ioctl(SG_GET_SCSI_ID) failed, errno=%d  '%s' , ",
+			    errno, strerror(errno));
+
+			if (sgio_test(fd) == -1) {
+				if (linux_sg_enumerate_debug)
+			  		fprintf(stderr,
+				 "FATAL: sgio_test() failed: errno=%d  '%s'",
+						errno, strerror(errno));
+
+				sg_close_drive_fd(fname, -1, &fd, 0);
+	continue;
+			}
+
+#ifdef CDROM_DRIVE_STATUS
+			/* ts A61211 : not widening old acceptance range */
+			if (strcmp(linux_sg_device_family,"/dev/sg%d") != 0) {
+				/* http://developer.osdl.org/dev/robustmutexes/
+				  src/fusyn.hg/Documentation/ioctl/cdrom.txt */
+				sid_ret = ioctl(fd, CDROM_DRIVE_STATUS, 0);
+				if(linux_sg_enumerate_debug)
+				  fprintf(stderr,
+					"ioctl(CDROM_DRIVE_STATUS) = %d , ",
+					sid_ret);
+				if (sid_ret != -1 && sid_ret != CDS_NO_INFO)
+					sid.scsi_type = TYPE_ROM;
+				else
+					sid_ret = -1;
+			}
+#endif /* CDROM_DRIVE_STATUS */
+
+		}
+
+#ifdef SCSI_IOCTL_GET_BUS_NUMBER
+		/* Hearsay A61005 */
+		if (ioctl(fd, SCSI_IOCTL_GET_BUS_NUMBER, &bus_no) == -1)
+			bus_no = -1;
+#endif
+
+		if (sg_close_drive_fd(fname, -1, &fd, 
+				sid.scsi_type == TYPE_ROM ) <= 0) {
+			if (linux_sg_enumerate_debug)
+			  fprintf(stderr,
+				  "cannot close properly, errno=%d  '%s'\n",
+				  errno, strerror(errno)); 
+	continue;
+		}
+		if ( (sid_ret == -1 || sid.scsi_type != TYPE_ROM)
+		     && !linux_sg_accept_any_type) {
+			if (linux_sg_enumerate_debug)
+			  fprintf(stderr, "sid.scsi_type = %d (!= TYPE_ROM)\n",
+				sid.scsi_type); 
+	continue;
+		}
+
+		if (sid_ret == -1 || sid.scsi_id < 0) {
+			/* ts A61211 : employ a more general ioctl */
+			ret = sg_obtain_scsi_adr(fname, &bus_no, &host_no,
+					   &channel_no, &target_no, &lun_no);
+			if (ret>0) {
+				sid.host_no = host_no;
+				sid.channel = channel_no;
+				sid.scsi_id = target_no;
+				sid.lun = lun_no;
+			} else {
+				if (linux_sg_enumerate_debug)
+				  fprintf(stderr,
+					"sg_obtain_scsi_adr() failed\n");
+	continue;
+			}
+                }
+
+		/* ts A60927 : trying to do locking with growisofs */
+		if(burn_sg_open_o_excl>1) {
+			ret = sg_open_scsi_siblings(
+					fname, -1, sibling_fds, sibling_fnames,
+					&sibling_count,
+					sid.host_no, sid.channel,
+					sid.scsi_id, sid.lun);
+			if (ret<=0) {
+				if (linux_sg_enumerate_debug)
+				  fprintf(stderr, "cannot lock siblings\n"); 
+				sg_handle_busy_device(fname, 0);
+	continue;
+			}
+			/* the final occupation will be done in sg_grab() */
+			sg_release_siblings(sibling_fds, sibling_fnames,
+						&sibling_count);
+		}
+#ifdef SCSI_IOCTL_GET_BUS_NUMBER
+		if(bus_no == -1)
+			bus_no = 1000 * (sid.host_no + 1) + sid.channel;
+#else
+		bus_no = sid.host_no;
+#endif
+
+		if (linux_sg_enumerate_debug)
+		  fprintf(stderr, "accepting as SCSI %d,%d,%d,%d bus=%d\n",
+			  sid.host_no, sid.channel, sid.scsi_id, sid.lun,
+			  bus_no);
+		enumerate_common(fname, bus_no, sid.host_no, sid.channel, 
+				 sid.scsi_id, sid.lun);
+#endif /* Libburn_drive_new_deaL */
+
 	}
 }


+#ifdef Libburn_drive_new_deaL
+

 /* ts A80805 : eventually produce the other official name of a device file */
 static int fname_other_name(char *fname, char other_name[80], int flag)
@ -1058,35 +1220,33 @@ static int fname_drive_is_listed(char *fname, int flag)
 */
 static int fname_enumerate(char *fname, int flag)
 {
-	int is_ata= 0, is_scsi= 0, ret;
+	int is_ata= 0, is_scsi= 0;
 	int bus_no= -1, host_no= -1, channel_no= -1, target_no= -1, lun_no= -1;
-	char *msg = NULL;
+	char msg[BURN_DRIVE_ADR_LEN + 80];
 	struct stat stbuf;

-	BURN_ALLOC_MEM(msg, char, BURN_DRIVE_ADR_LEN + 80);
-
 	if (!(flag & 2))
 		if (fname_drive_is_listed(fname, 0))
-			{ret = 2; goto ex;}
+			return 2;
 	if (stat(fname, &stbuf) == -1) {
 		sprintf(msg, "File object '%s' not found", fname);
 		if (!(flag & 1))
 			libdax_msgs_submit(libdax_messenger, -1, 0x0002000b,
 			  LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
 			  msg, 0, 0);
-		{ret = -1; goto ex;}
+		return -1;
 	}
 	
 	is_ata = is_ata_drive(fname);
 	if (is_ata < 0)
-		{ret = -1; goto ex;}
+		return -1;
 	if (!is_ata)
 		is_scsi = is_scsi_drive(fname, &bus_no, &host_no, &channel_no,
 					&target_no, &lun_no);
 	if (is_scsi < 0)
-		{ret = -1; goto ex;}
+		return -1;
 	if (is_ata == 0 && is_scsi == 0)
-		{ret = 0; goto ex;}
+		return 0;

 	if (linux_sg_enumerate_debug)
 		  fprintf(stderr,
@ -1094,10 +1254,7 @@ static int fname_enumerate(char *fname, int flag)
 			host_no, channel_no, target_no, lun_no, bus_no);
 	enumerate_common(fname, bus_no, host_no, channel_no, 
 				target_no, lun_no);
-	ret = 1;
-ex:;
-	BURN_FREE_MEM(msg);
-	return ret;
+	return 1;
 }


@ -1105,25 +1262,22 @@ ex:;
 static int single_enumerate(int flag)
 {
 	int ret, wl_count;
-	char *fname, *msg = NULL;
+	char *fname, msg[BURN_DRIVE_ADR_LEN + 80];

        wl_count= burn_drive_whitelist_count();
 	if (wl_count != 1)
-		{ret = 0; goto ex;}
+		return 0;
 	fname= burn_drive_whitelist_item(0, 0);
 	if (fname == NULL)
-		{ret = 0; goto ex;}
+		return 0;
 	ret = fname_enumerate(fname, 2);
 	if (ret <= 0) {
-		BURN_ALLOC_MEM(msg, char, BURN_DRIVE_ADR_LEN + 80);
 		sprintf(msg, "Cannot access '%s' as SG_IO CDROM drive", fname);
 		libdax_msgs_submit(libdax_messenger, -1, 0x0002000a,
 			LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
 			msg, 0, 0);
 		ret = -1;
 	}
-ex:;
-	BURN_FREE_MEM(msg);
 	return ret;
 }

@ -1135,11 +1289,8 @@ ex:;
 static int proc_sys_dev_cdrom_info(char ***list, int *count, int flag)
 {
 	FILE *fp;
-	char *line = NULL, *fname = NULL, *cpt, *retpt, *list_data;
-	int maxl= 0, pass, i, line_size = 1024, ret;
-
-	BURN_ALLOC_MEM(line, char, line_size);
-	BURN_ALLOC_MEM(fname, char, line_size + 5);
+	char line[1024], fname[1024 + 5], *cpt, *retpt, *list_data;
+	int maxl= 0, pass, i;

 	if (*list != NULL) {
 		if ((*list)[0] != NULL)
@ -1149,17 +1300,17 @@ static int proc_sys_dev_cdrom_info(char ***list, int *count, int flag)
 		*count = 0;
 	}
 	if (flag & 1) 
-		{ret = 1; goto ex;}
+		return 1;

 	*count = 0;
 	sg_evaluate_kernel();
 	if (sg_kernel_age < 2) /* addresses are not suitable for kernel 2.4 */
-		{ret = 1; goto ex;}
+		return 1;
 	fp = fopen("/proc/sys/dev/cdrom/info", "r");
 	if (fp == NULL)
-		{ret = 0; goto ex;}
+		return 0;
 	while (1) {
-		retpt = fgets(line, line_size, fp);
+		retpt = fgets(line, sizeof(line), fp);
 		if (retpt == NULL)
 	break;
 		if(strncmp(line, "drive name:", 11) == 0)
@ -1167,7 +1318,7 @@ static int proc_sys_dev_cdrom_info(char ***list, int *count, int flag)
 	}
 	fclose(fp);
 	if (retpt == NULL)
-		{ret = 0; goto ex;}
+		return 0;
 	strcpy(fname, "/dev/");
 	for(pass = 0; pass < 2; pass++) {
 		*count = 0;
@ -1177,7 +1328,7 @@ static int proc_sys_dev_cdrom_info(char ***list, int *count, int flag)
 			if (*cpt == 0 || *cpt == '\n')
 		break;
 			sscanf(cpt, "%s", fname + 5);
-			if ((int) strlen(fname) > maxl)
+			if (strlen(fname) > maxl)
 				maxl = strlen(fname);
 			if (pass == 1)
 				strcpy((*list)[*count], fname);
@ -1197,17 +1348,13 @@ static int proc_sys_dev_cdrom_info(char ***list, int *count, int flag)
 					free(list_data);
 				if (*list != NULL)
 					free((char *) *list);
-				{ret = -1; goto ex;}
+				return -1;
 			}
 			for (i = 0; i <= *count; i++)
 				(*list)[i] = list_data + i * (maxl + 1);
 		}
 	}
-	ret = 1;
-ex:;
-	BURN_FREE_MEM(line);
-	BURN_FREE_MEM(fname);
-	return ret;
+	return 1;
 }


@ -1230,6 +1377,8 @@ static int add_proc_info_drives(int flag)
 	return 1 + count;
 }

+#endif /* Libburn_drive_new_deaL */
+

 /* ts A61115 */
 /* ----------------------------------------------------------------------- */
@ -1417,7 +1566,7 @@ next_proc_info:;
 		if ((idx->info_list)[i][0] == 0)
 	continue;
 		if (baseno == idx->pos) {
-			if (adr_size < (int) strlen((idx->info_list)[i]) + 1)
+			if (adr_size < strlen((idx->info_list)[i]) + 1)
 				return -1;
 			strcpy(adr, (idx->info_list)[i]);
 			return 1;
@ -1456,18 +1605,27 @@ return_1_pre_proc:;
 /* ts A61115: replacing call to sg-implementation internals from drive.c */
 int scsi_enumerate_drives(void)
 {
-	int ret;

+#ifdef Libburn_drive_new_deaL
+	int ret;
+#endif
+
+#ifdef Libburn_drive_new_deaL
 	/* Direct examination of eventually single whitelisted name */
 	ret = single_enumerate(0);
 	if (ret < 0)
 		return -1;
 	if (ret > 0)
 		return 1;
+#endif /* Libburn_drive_new_deaL */

 	sg_enumerate();
 	ata_enumerate();
+
+#ifdef Libburn_drive_new_deaL
 	add_proc_info_drives(0);
+#endif /* Libburn_drive_new_deaL */
+
 	return 1;
 }

@ -1615,6 +1773,36 @@ int sg_release(struct burn_drive *d)
 }


+#ifdef NIX
+/* <<< now in spc.c as scsi_log_err */
+
+/** logs outcome of a sg command. flag&1 causes an error message */
+static int sg_log_err(struct command *c, FILE *fp, 
+		sg_io_hdr_t *s,
+		int flag)
+{
+      	if(fp != NULL && (fp == stderr || (burn_sg_log_scsi & 1))) {
+		if(flag & 1) {
+  			fprintf(fp,
+			"+++ key=%X  asc=%2.2Xh  ascq=%2.2Xh   (%6d ms)\n",
+				s->sbp[2], s->sbp[12], s->sbp[13],s->duration);
+		} else {
+			scsi_show_cmd_reply(c, fp, 0);
+			fprintf(fp,"%6d ms\n", s->duration);
+		}
+		if (burn_sg_log_scsi & 4)
+			fflush(fp);
+	}
+	if (fp == stderr || !(burn_sg_log_scsi & 2))
+		return 1;
+
+	sg_log_err(c, stderr, s, flag);
+	return 1;
+}
+
+#endif /* NIX */
+
+
 /** Sends a SCSI command to the drive, receives reply and evaluates wether
    the command succeeded or shall be retried or finally failed.
    Returned SCSI errors shall not lead to a return value indicating failure.
@ -1624,21 +1812,19 @@ int sg_release(struct burn_drive *d)
 */
 int sg_issue_command(struct burn_drive *d, struct command *c)
 {
-	int done = 0, no_c_page = 0, i, ret;
+	int done = 0, no_c_page = 0, usleep_time, i;
 	int err;
 	time_t start_time;
 	sg_io_hdr_t s;
 	/* ts A61030 */
 	static FILE *fp= NULL;
-	char *msg = NULL;
-
-	BURN_ALLOC_MEM(msg, char, 161);

 	/* <<< ts A60821
 	   debug: for tracing calls which might use open drive fds */
-	sprintf(msg, "sg_issue_command   d->fd= %d  d->released= %d\n",
-		d->fd, d->released);
-	mmc_function_spy(NULL, msg);
+	char buf[161];
+	sprintf(buf,"sg_issue_command   d->fd= %d  d->released= %d\n",
+		d->fd,d->released);
+	mmc_function_spy(NULL, buf);

 	/* ts A61030 */
 	if (burn_sg_log_scsi & 1) {
@ -1654,7 +1840,7 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 	/* ts A61010 : with no fd there is no chance to send an ioctl */
 	if (d->fd < 0) {
 		c->error = 1;
-		{ret = 0; goto ex;}
+		return 0;
 	}

 	c->error = 0;
@ -1706,7 +1892,7 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 			/* a ssert(c->page->bytes > 0); */
 			if (c->page->bytes <= 0) {
 				c->error = 1;
-				{ret = 0; goto ex;}
+				return 0;
 			}

 			s.dxfer_len = c->page->bytes;
@ -1733,14 +1919,55 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 			d->released = 1;
 			d->busy = BURN_DRIVE_IDLE;
 			c->error = 1;
-			{ret = -1; goto ex;}
+			return -1;
+		}
+
+		if (s.sb_len_wr) {
+			if (!c->retry) {
+				c->error = 1;
+
+				/* A61106: rather than : return 1 */
+				goto ex;
+			}
+			switch (scsi_error(d, s.sbp, s.sb_len_wr)) {
+			case RETRY:
+				done = 0;
+				if (burn_sg_log_scsi & 3) {
+					scsi_log_err(c, fp, s.sbp, s.duration,
+								c->error != 0);
+					scsi_log_cmd(c,fp,0);
+				}
+				break;
+			case FAIL:
+				done = 1;
+				c->error = 1;
+				break;
+			}
+
+			/* ts A90921 :
+			   Calming down retries and breaking up endless cycle
+			*/
+			usleep_time = Libburn_sg_linux_retry_usleeP +
+					i * Libburn_sg_linux_retry_incR;
+			if (time(NULL) + usleep_time / 1000000 - start_time >
+			    s.timeout / 1000 + 1) {
+				c->error = 1;
+				goto ex;
+			}
+			usleep(usleep_time);
+		} else {
+			done = 1;
 		}
-                done = scsi_eval_cmd_outcome(d, c, fp, s.sbp, s.sb_len_wr,
-				s.duration, start_time, s.timeout, i, 0);
 	}

-	if (s.host_status != Libburn_sg_host_oK || 
-	    (s.driver_status != Libburn_sg_driver_oK && !c->error)) {
+	/* ts A61106 */
+ex:;
+	if (c->error) {
+		scsi_notify_error(d, c, s.sbp, s.sb_len_wr, 0);
+	} else if (s.host_status != Libburn_sg_host_oK || 
+	    s.driver_status != Libburn_sg_driver_oK) {
+		char msg[161];
+
 		sprintf(msg,
 			"SCSI command %2.2Xh indicates host or driver error:",
 			(unsigned int) c->opcode[0]);
@ -1753,10 +1980,10 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 				LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
 				msg, 0, 0);
 	}
-	ret = 1;
-ex:;
-	BURN_FREE_MEM(msg);
-	return ret;
+	if (burn_sg_log_scsi & 3)
+		/* <<< sg_log_err(c, fp, &s, c->error != 0); */
+		scsi_log_err(c, fp, s.sbp, s.duration, c->error != 0);
+	return 1;
 }


@ -1831,27 +2058,23 @@ int sg_obtain_scsi_adr(char *path, int *bus_no, int *host_no, int *channel_no,
 */
 int sg_is_enumerable_adr(char *adr)
 {
-	char *fname = NULL;
-	int ret = 0, first = 1, fname_size = 4096;
+	char fname[4096];
+	int ret = 0, first = 1;
 	burn_drive_enumerator_t idx;

-	BURN_ALLOC_MEM(fname, char, fname_size);
 	while (1) {
-		ret= sg_give_next_adr(&idx, fname, fname_size, first);
+		ret= sg_give_next_adr(&idx, fname, sizeof(fname), first);
 		if(ret <= 0)
 	break;
 		first = 0;
 		if (strcmp(adr, fname) == 0) {
-			sg_give_next_adr(&idx, fname, fname_size, -1);
-			{ret = 1; goto ex;}
+			sg_give_next_adr(&idx, fname, sizeof(fname), -1);
+			return 1;
 		}
 	}
-	ret = 0;
-ex:;
 	if (first == 0)
-		sg_give_next_adr(&idx, fname, fname_size, -1);
-	BURN_FREE_MEM(fname);
-	return ret;
+		sg_give_next_adr(&idx, fname, sizeof(fname), -1);
+	return(0);
 }


@ -1888,12 +2111,11 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
 {
 	struct stat stbuf;
 	struct statvfs vfsbuf;
-	char *testpath = NULL, *cpt;
+	char testpath[4096], *cpt;
 	long blocks;
 	int open_mode = O_RDONLY, fd, ret;
 	off_t add_size = 0;

-	BURN_ALLOC_MEM(testpath, char, 4096);
 	testpath[0] = 0;
 	blocks = *bytes / 512;
 	if (stat(path, &stbuf) == -1) {
@ -1906,32 +2128,29 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
 		else
 			*cpt = 0;
 		if (stat(testpath, &stbuf) == -1)
-			{ret = -1; goto ex;}
+			return -1;
 	} else if(S_ISBLK(stbuf.st_mode)) {
 		fd = open(path, open_mode);
 		if (fd == -1)
-			{ret = -2; goto ex;}
+			return -2;
 		ret = ioctl(fd, BLKGETSIZE, &blocks);
 		close(fd);
 		if (ret == -1)
-			{ret = -2; goto ex;}
+			return -2;
 		*bytes = ((off_t) blocks) * (off_t) 512;
 	} else if(S_ISREG(stbuf.st_mode)) {
 		add_size = stbuf.st_blocks * (off_t) 512;
 		strcpy(testpath, path);
 	} else
-		{ret = 0; goto ex;}
+		return 0;

 	if (testpath[0]) {	
 		if (statvfs(testpath, &vfsbuf) == -1)
-			{ret = -2; goto ex;}
+			return -2;
 		*bytes = add_size + ((off_t) vfsbuf.f_frsize) *
 						(off_t) vfsbuf.f_bavail;
 	}
-	ret = 1;
-ex:;
-	BURN_FREE_MEM(testpath);
-	return ret;
+	return 1;
 }


--- a/libburn/sg-solaris.c
+++ b/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 Thomas Schmitt <scdbackup@gmx.net>
   Provided under GPL version 2 or later.
 */

@ -140,7 +140,6 @@ Send feedback to libburn-hackers@pykix.org .
 #include "debug.h"
 #include "toc.h"
 #include "util.h"
-#include "init.h"

 #include "libdax_msgs.h"
 extern struct libdax_msgs *libdax_messenger;
@ -250,14 +249,12 @@ static int start_enum_cXtYdZs2(burn_drive_enumerator_t *idx, int flag)
 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;
+	char volpath[160];
 	struct dirent *entry;
 	struct dk_cinfo cinfo;
 	DIR *dir;

-	BURN_ALLOC_MEM(volpath, char, volpath_size);
-
 	dir = idx->dir;
 	while (1) {
 		errno = 0;
@ -269,11 +266,11 @@ static int next_enum_cXtYdZs2(burn_drive_enumerator_t *idx,
 				LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
 	"Cannot enumerate next device. readdir() from \"/dev/rdsk\" failed.",
 						errno, 0);
-				{ret = -1; goto ex;}
+				return -1;
 			}
 	break;
 		}
-		if (strlen(entry->d_name) > (size_t) (volpath_size - 11))
+		if (strlen(entry->d_name) > sizeof(volpath) - 11)
 	continue;
 		ret = decode_btl_solaris(entry->d_name,
 					&busno, &tgtno, &lunno, 0);
@ -294,15 +291,12 @@ static int next_enum_cXtYdZs2(burn_drive_enumerator_t *idx,
 	continue;
 		if (cinfo.dki_ctype != DKC_CDROM)
 	continue;
-		if (adr_size <= (int) strlen(volpath))
-			{ret = -1; goto ex;}
+		if (adr_size <= strlen(volpath))
+			return -1;
 		strcpy(adr, volpath);
-		{ret = 1; goto ex;}
+		return 1;
 	}
-	ret = 0;
-ex:;
-	BURN_FREE_MEM(volpath);
-	return ret;
+	return 0;
 }


@ -463,14 +457,12 @@ int sg_give_next_adr(burn_drive_enumerator_t *idx,
 int scsi_enumerate_drives(void)
 {
 	burn_drive_enumerator_t idx;
-	int initialize = 1, ret, i_bus_no = -1, buf_size = 4096;
+	int initialize = 1, ret, i_bus_no = -1;
        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);
+	char buf[4096];

 	while(1) {
-		ret = sg_give_next_adr(&idx, buf, buf_size, initialize);
+		ret = sg_give_next_adr(&idx, buf, sizeof(buf), initialize);
 		initialize = 0;
 		if (ret <= 0)
 	break;
@ -482,11 +474,8 @@ int scsi_enumerate_drives(void)
 				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;
+	sg_give_next_adr(&idx, buf, sizeof(buf), -1);
+	return 1;
 }


@ -509,15 +498,13 @@ int sg_drive_is_open(struct burn_drive * d)
 */  
 int sg_grab(struct burn_drive *d)
 {
-	char *msg = NULL;
+	char msg[4096];
 	int os_errno, ret;
 	struct dk_cinfo cinfo;

-	BURN_ALLOC_MEM(msg, char, 4096);
-
 	if (d->fd != -1) {
 		d->released = 0;
-		{ret = 1; goto ex;}
+		return 1;
 	}
 	d->fd = open(d->devname, O_RDONLY | O_NDELAY);
 	if (d->fd == -1) {
@ -527,7 +514,7 @@ int sg_grab(struct burn_drive *d)
 			0x00020003,
 			LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
 			msg, os_errno, 0);
-		{ret = 0; goto ex;}
+		return 0;
 	}
 	ret = ioctl(d->fd, DKIOCINFO, &cinfo);
 	if (ret < 0)
@ -538,7 +525,7 @@ int sg_grab(struct burn_drive *d)
 	/* >>> obtain eventual locks */;

 	d->released = 0;
-	{ret = 1; goto ex;}
+	return 1;
 revoke:;
 	sprintf(msg, "Could not grab drive '%s'. Not a CDROM device.",
 		 d->devname);
@ -546,10 +533,7 @@ revoke:;
 			0x00020003,
 			LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
 			msg, 0, 0);
-	ret = 0;
-ex:;
-	BURN_FREE_MEM(msg);
-	return ret;
+	return 0;
 }


@ -581,7 +565,7 @@ int sg_release(struct burn_drive *d)
 */
 int sg_issue_command(struct burn_drive *d, struct command *c)
 {
-	int i, timeout_ms, ret, key, asc, ascq, done = 0;
+	int i, usleep_time, timeout_ms, no_retry = 0, ret;
 	time_t start_time;
 	struct uscsi_cmd cgc;
 	char msg[80];
@ -632,7 +616,7 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 	/* retry-loop */
 	start_time = time(NULL);
 	timeout_ms = 200000;
-	for(i = 0; !done; i++) {
+	for(i = 0; ; i++) {

 		ret = ioctl(d->fd, USCSICMD, &cgc);

@ -655,21 +639,51 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 			return -1;
 		}

+		c->sense[2] &= 15;

-		/* >>> Should replace "18" by realistic sense length.
-		       What's about following older remark ?
-		*/
 		/* >>> valid sense:  cgc.uscsi_rqlen - cgc.uscsi_rqresid */;

-		spc_decode_sense(c->sense, 0, &key, &asc, &ascq);
-		if (key || asc || ascq) {
-			done = scsi_eval_cmd_outcome(d, c, fp, c->sense, 18, 0,
-						start_time, timeout_ms, i, 2);
+		if (c->sense[2] || c->sense[12] || c->sense[13]) {
+			if (no_retry || !c->retry) {
+				c->error = 1;
+				goto ex;
+			}
+			switch (scsi_error(d, c->sense, 18)) {
+			case RETRY:
+				if (burn_sg_log_scsi & 3) {
+					/* >>> Need own duration time
+					       measurement. Then remove bit1 */
+					scsi_log_err(c, fp, c->sense, 0,
+							(c->error != 0) | 2);
+					scsi_log_cmd(c,fp,0);
+				}
+				break;
+			case FAIL:
+				c->error = 1;
+				goto ex;
+			}
+			/* 
+			   Calming down retries and breaking up endless cycle
+			*/
+			usleep_time = Libburn_sg_solaris_retry_usleeP +
+					i * Libburn_sg_solaris_retry_incR;
+			if (time(NULL) + usleep_time / 1000000 - start_time >
+			    timeout_ms / 1000 + 1) {
+				c->error = 1;
+				goto ex;
+			}
+			usleep(usleep_time);
 		} else
-			done = 1;
-					
+			break; /* retry-loop */
 	} /* end of retry-loop */

+ex:;
+	if (c->error)
+		scsi_notify_error(d, c, c->sense, 18, 0);
+
+	if (burn_sg_log_scsi & 3) 
+		/* >>> Need own duration time measurement. Then remove bit1 */
+		scsi_log_err(c, fp, c->sense, 0, (c->error != 0) | 2);
 	return 1;
 }

@ -778,18 +792,15 @@ int burn_os_is_2k_seekrw(char *path, int flag)
 int burn_os_stdio_capacity(char *path, off_t *bytes)
 {
 	struct stat stbuf;
-	int ret;

 #ifdef Libburn_os_has_statvfS
 	struct statvfs vfsbuf;
 #endif

-	char *testpath = NULL, *cpt;
+	char testpath[4096], *cpt;
 	long blocks;
 	off_t add_size = 0;

-	BURN_ALLOC_MEM(testpath, char, 4096);
-
 	testpath[0] = 0;
 	blocks = *bytes / 512;
 	if (stat(path, &stbuf) == -1) {
@ -802,47 +813,44 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
 		else
 			*cpt = 0;
 		if (stat(testpath, &stbuf) == -1)
-			{ret = -1; goto ex;}
+			return -1;

 	} 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;}
+			return -2;
 		*bytes = lseek(fd, 0, SEEK_END);
 		close(fd);
 		if (*bytes == -1) {
 			*bytes = 0;
-			{ret = 0; goto ex;}
+			return 0;
 		}

 	} else if(S_ISREG(stbuf.st_mode)) {
 		add_size = stbuf.st_blocks * (off_t) 512;
 		strcpy(testpath, path);
 	} else
-		{ret = 0; goto ex;}
+		return 0;

 	if (testpath[0]) {	

 #ifdef Libburn_os_has_statvfS

 		if (statvfs(testpath, &vfsbuf) == -1)
-			{ret = -2; goto ex;}
+			return -2;
 		*bytes = add_size + ((off_t) vfsbuf.f_frsize) *
 						(off_t) vfsbuf.f_bavail;

 #else /* Libburn_os_has_statvfS */

-		{ret = 0; goto ex;}
+		return 0;

 #endif /* ! Libburn_os_has_stavtfS */

 	}
-	ret = 1;
-ex:;
-	BURN_FREE_MEM(testpath);
-	return ret;
+	return 1;
 }


--- a/libburn/source.c
+++ b/libburn/source.c
@ -63,15 +63,3 @@ int burn_source_cancel(struct burn_source *src)
 	return 1;
 }

-
-/* ts B00922 */
-int burn_source_read(struct burn_source *src, unsigned char *buffer, int size)
-{
-	int ret;
-
-	if (src->read != NULL)
-		 ret = src->read(src, buffer, size);
-	else
-		 ret = src->read_xt(src, buffer, size);
-	return ret;
-}
--- a/libburn/source.h
+++ b/libburn/source.h
@ -7,6 +7,4 @@ struct burn_source *burn_source_new(void);

 int burn_source_cancel(struct burn_source *src);

-int burn_source_read(struct burn_source *src, unsigned char *buffer, int size);
-
 #endif /*__SOURCE*/
--- a/libburn/spc.c
+++ b/libburn/spc.c
--- a/libburn/spc.h
+++ b/libburn/spc.h
@ -49,7 +49,7 @@ int burn_scsi_setup_drive(struct burn_drive *d, int bus_no, int host_no,
 			int channel_no, int target_no, int lun_no, int flag);

 /* ts A61115 moved from sg-*.h */
-enum response { RETRY, FAIL, GO_ON };
+enum response { RETRY, FAIL };
 enum response scsi_error(struct burn_drive *, unsigned char *, int);

 /* ts A61122 */
@ -78,29 +78,7 @@ int scsi_log_cmd(struct command *c, void *fp, int flag);
 /* ts A91221 (former sg_log_err ts A91108) */
 /** Logs outcome of a sg command. */
 int scsi_log_err(struct command *c, void *fp, unsigned char sense[18], 
-                 int sense_len, int duration, int flag);
-
-/* ts B00728 */
-int spc_decode_sense(unsigned char *sense, int senselen,
-                     int *key, int *asc, int *ascq);
-
-/* 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.
-    @param flag   bit1 = do not print duration
-    @return 0 = not yet done , 1 = done , -1 = error
-*/
-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,
-			int loop_count, int flag);
-
-/* The waiting time before eventually retrying a failed SCSI command.
-   Before each retry wait Libburn_scsi_retry_incR longer than with
-   the previous one.
-*/
-#define Libburn_scsi_retry_usleeP 100000
-#define Libburn_scsi_retry_incR   100000
+                 int duration, int flag);


 #endif /*__SPC*/
--- a/libburn/structure.c
+++ b/libburn/structure.c
@ -1,6 +1,6 @@

 /* Copyright (c) 2004 - 2006 Derek Foreman, Ben Jansens
-   Copyright (c) 2006 - 2011 Thomas Schmitt <scdbackup@gmx.net>
+   Copyright (c) 2006 - 2010 Thomas Schmitt <scdbackup@gmx.net>
   Provided under GPL version 2 or later.
 */

@ -18,7 +18,6 @@
 #include "structure.h"
 #include "write.h"
 #include "debug.h"
-#include "init.h"

 #include "libdax_msgs.h"
 extern struct libdax_msgs *libdax_messenger;
@ -34,7 +33,7 @@ extern struct libdax_msgs *libdax_messenger;
 		return 0;\
 	if (pos == BURN_POS_END)\
 		pos = TO->NEW##s;\
-	if ((int) pos > TO->NEW##s)\
+	if (pos > TO->NEW##s)\
 		return 0;\
 \
 	tmp = realloc(TO->NEW, sizeof(struct NEW *) * (TO->NEW##s + 1));\
@ -171,8 +170,6 @@ struct burn_track *burn_track_create(void)
 	/* ts A61031 */
 	t->open_ended = 0;
 	t->track_data_done = 0;
-	/* ts B10103 */
-	t->end_on_premature_eoi = 0;

 	t->postgap = 0;
 	t->pregap1 = 0;
@ -270,14 +267,13 @@ void burn_track_define_data(struct burn_track *t, int offset, int tail,
 	int burn_sector_length(int tracktype);
 	unsigned char ctladr;
 	int form = -1; /* unchanged form will be considered an error too */
-	char msg[80];

 	type_to_form(mode, &ctladr, &form);
 	if (form == -1 || burn_sector_length(mode) <= 0) {
+		char msg[160];

-		sprintf(msg,
-			"Attempt to set track mode to unusable value 0x%X",
-			(unsigned int) mode);
+		sprintf(msg, "Attempt to set track mode to unusable value %d",
+			mode);
 		libdax_msgs_submit(libdax_messenger, -1, 0x00020115,
 			LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
 			msg, 0, 0);
@ -448,16 +444,14 @@ 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;
-	char msg[80];
+	char msg[160];

 	if (t->fill_up_media <= 0)
 		return 2;
 	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));
+		    max_sectors, (int) (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);
@ -583,12 +577,11 @@ int burn_session_get_hidefirst(struct burn_session *session)
 /* ts A80808 : Enhance CD toc to DVD toc */
 int burn_disc_cd_toc_extensions(struct burn_disc *d, int flag)
 {
-	int sidx= 0, tidx= 0, ret;
+	int sidx= 0, tidx= 0;
 	struct burn_toc_entry *entry, *prev_entry= NULL;
 	/* ts A81126 : ticket 146 : There was a SIGSEGV in here */
-	char *msg_data = NULL, *msg;
+	char msg_data[321], *msg;

-	BURN_ALLOC_MEM(msg_data, char, 321);
 	strcpy(msg_data,
 		"Damaged CD table-of-content detected and truncated.");
 	strcat(msg_data, " In burn_disc_cd_toc_extensions: ");
@ -651,15 +644,12 @@ int burn_disc_cd_toc_extensions(struct burn_disc *d, int flag)
 			prev_entry = entry;
 		}
 	}
-	{ret = 1; goto ex;}
+	return 1;
 failure:
 	libdax_msgs_submit(libdax_messenger, -1, 0x0002015f,
 		LIBDAX_MSGS_SEV_MISHAP, LIBDAX_MSGS_PRIO_HIGH, msg_data, 0, 0);
 	d->sessions= sidx;
-	ret = 0;
-ex:;
-	BURN_FREE_MEM(msg_data);
-	return ret;
+	return 0;
 }


--- a/libburn/structure.h
+++ b/libburn/structure.h
@ -1,6 +1,6 @@

 /* Copyright (c) 2004 - 2006 Derek Foreman, Ben Jansens
-   Copyright (c) 2006 - 2011 Thomas Schmitt <scdbackup@gmx.net>
+   Copyright (c) 2006 - 2010 Thomas Schmitt <scdbackup@gmx.net>
   Provided under GPL version 2 or later.
 */

@ -55,14 +55,6 @@ struct burn_track
 	int open_ended;
 	/** End of open ended track flag : offset+payload+tail are delivered */
 	int track_data_done;
-	/* ts B10103 */
-	/** End track writing on premature End-of-input if source is of
-	    defined length.
-	    0= normal operation in case of eoi
-	    1= be ready to end track writing on eoi
-	    2= eoi was encountered with previously set value of 1
-	*/
-	int end_on_premature_eoi;

 	/** The audio/data mode for the entry. Derived from control and
 	    possibly from reading the track's first sector. */
--- a/libburn/toc.c
+++ b/libburn/toc.c
@ -1,7 +1,6 @@
 /* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */

 /* Copyright (c) 2004 - 2006 Derek Foreman, Ben Jansens
-   Copyright (c) 2011 - 2011 Thomas Schmitt <scdbackup@gmx.net>
   Provided under GPL version 2 or later.
 */

@ -21,7 +20,6 @@
 #include "libburn.h"
 #include "sector.h"
 #include "options.h"
-#include "init.h"

 #if 0
 static void write_clonecd2(volatile struct toc *toc, int f);
@ -107,14 +105,15 @@ void toc_find_modes(struct burn_drive *d)
 {
 	struct burn_read_opts o;
 	int lba;
-	int i, j, ret;
-	struct buffer *mem = NULL;
+	int i, j;
+	struct buffer mem;
 	struct burn_toc_entry *e;

-	BURN_ALLOC_MEM(mem, struct buffer, 1);
+	/* ts A61008 : to be prevented on the higher levels */
+	/* a ssert(d->busy); */

-	mem->bytes = 0;
-	mem->sectors = 1;
+	mem.bytes = 0;
+	mem.sectors = 1;
 	o.raw = 1;
 	o.c2errors = 0;
 	o.subcodes_audio = 1;
@ -142,13 +141,10 @@ void toc_find_modes(struct burn_drive *d)
 				t->mode = BURN_MODE1;
 /* ts A70519 : this does not work with GNU/Linux 2.4 USB because one cannot
               predict the exact dxfer_size without knowing the sector type.
-				mem->sectors = 1;
-				d->read_sectors(d, lba, mem.sectors, &o, mem);
-				t->mode = sector_identify(mem->data);
+				mem.sectors = 1;
+				d->read_sectors(d, lba, mem.sectors, &o, &mem);
+				t->mode = sector_identify(mem.data);
 */
 			}
 		}
-
-ex:
-	BURN_FREE_MEM(mem);
 }
--- a/libburn/transport.h
+++ b/libburn/transport.h
@ -134,8 +134,6 @@ struct burn_drive
 		1=MMC drive ,
 		2=stdio random read-write
 		3=stdio sequential write-only
-                4=stdio random read-only
-                5=stdio random write-only
 	*/
 	int drive_role;

@ -208,11 +206,6 @@ struct burn_drive
 	*/
 	int current_feat2fh_byte4;

-	/* ts B10524 : whether the damage bit was set for the future track.
-	               bit0= damage bit , bit1= nwa valid bit
-	*/
-	int next_track_damaged;
-
 	/* ts A70114 : whether a DVD-RW media holds an incomplete session
 	               (which could need closing after write) */
 	int needs_close_session;
@ -292,25 +285,12 @@ struct burn_drive
 	               0x7fffffff = unknown */
 	int media_read_capacity;

-	/* ts B10314 : Next Writeable Adress for drive_role == 5 */
-        int role_5_nwa;
-
 	int toc_temp;
 	struct burn_disc *disc;	/* disc structure */
 	int block_types[4];
 	struct buffer *buffer;
 	struct burn_progress 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
-	   composed and executed.
-	   (Inherently, sending SCSI commands to the same drive cannot be
-	    thread-safe. But there are functions which send SCSI commands
-	    and also call other such functions. These shall use own allocated
-	    command structs and not this struct here.)
-	*/
-	struct command casual_command;
-
 	/* ts A70711 : keeping an eye on the drive buffer */
 	off_t pessimistic_buffer_free;
 	int pbf_altered;
--- a/libburn/util.c
+++ b/libburn/util.c
@ -34,7 +34,7 @@ char *burn_strdup(char *s)
 		return NULL;

 	l = strlen(s) + 1;
-	ret = calloc(1, l);
+	ret = malloc(l);
 	memcpy(ret, s, l);

 	return ret;
@ -52,7 +52,7 @@ char *burn_strndup(char *s, int n)
 		return NULL;

 	l = strlen(s);
-	ret = calloc(1, l < n ? l : n);
+	ret = malloc(l < n ? l : n);

 	memcpy(ret, s, l < n - 1 ? l : n - 1);
 	ret[n - 1] = '\0';
--- a/libburn/write.c
+++ b/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 - 2011 Thomas Schmitt <scdbackup@gmx.net>
+   Copyright (c) 2006 - 2010 Thomas Schmitt <scdbackup@gmx.net>
   Provided under GPL version 2 or later.
 */

@ -276,7 +276,7 @@ int burn_write_close_track(struct burn_write_opts *o, struct burn_session *s,


 /* ts A61030 */
-int burn_write_close_session(struct burn_write_opts *o)
+int burn_write_close_session(struct burn_write_opts *o, struct burn_session *s)
 {

 	/* ts A61106 */
@ -385,9 +385,9 @@ struct cue_sheet *burn_create_toc_entries(struct burn_write_opts *o,
 		runtime = nwa-150;
 #endif

-	sheet = calloc(1, sizeof(struct cue_sheet));
+	sheet = malloc(sizeof(struct cue_sheet));

-	/* ts A61009 : react on failures of calloc(), add_cue_sheet()
+	/* ts A61009 : react on failures of malloc(), add_cue_sheet()
 	               type_to_form() */
 	if (sheet == NULL) {
 		libdax_msgs_submit(libdax_messenger, -1, 0x00020111,
@ -687,7 +687,7 @@ int burn_write_session(struct burn_write_opts *o, struct burn_session *s)
 	ret = 1;
 ex:;
 	if (o->write_type == BURN_WRITE_TAO)
-		burn_write_close_session(o);
+		burn_write_close_session(o, s);
 	return ret;
 }

@ -999,18 +999,15 @@ 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;
+	char msg[160], *reason_pt;
 	int no_media = 0;

 	reason_pt= reasons;
 	reasons[0] = 0;

-	if (d->drive_role == 0 || d->drive_role == 4) {
-		if (d->drive_role == 0)
-			sprintf(reasons,
-			       "DRIVE: is a virtual placeholder (null-drive)");
-		else
-			sprintf(reasons, "DRIVE: read-only pseudo drive");
+	if (d->drive_role == 0) {
+		sprintf(reasons,
+			 "DRIVE: is a virtual placeholder (null-drive)");
 		no_media = 1;
 		goto ex;
 	}
@ -1027,7 +1024,7 @@ int burn_precheck_write(struct burn_write_opts *o, struct burn_disc *disc,
 	reason_pt= reasons + strlen(reasons);
 	if (d->status == BURN_DISC_UNSUITABLE)
 		goto unsuitable_profile;
-	if (d->drive_role == 2 || d->drive_role == 5 ||
+	if (d->drive_role == 2 ||
 		d->current_profile == 0x1a || d->current_profile == 0x12 ||
 		d->current_profile == 0x43) { 
 		/* DVD+RW , DVD-RAM , BD-RE, emulated drive on stdio file */
@ -1056,18 +1053,13 @@ int burn_precheck_write(struct burn_write_opts *o, struct burn_disc *disc,
 			strcat(reasons, "write start address not supported, ");
 	} else {
 unsuitable_profile:;
-		msg = calloc(1, 160);
-		if (msg != NULL && !silent) {
-			sprintf(msg,
-			    "Unsuitable media detected. Profile %4.4Xh  %s",
-			    d->current_profile, d->current_profile_text);
+		sprintf(msg, "Unsuitable media detected. Profile %4.4Xh  %s",
+			d->current_profile, d->current_profile_text);
+		if (!silent)
 			libdax_msgs_submit(libdax_messenger, d->global_index,
 				0x0002011e,
 				LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
 				msg, 0, 0);
-		}
-		if (msg != NULL)
-			free(msg);
 		strcat(reasons, "no suitable media profile detected, ");
 		return 0;
 	}
@ -1097,11 +1089,10 @@ int burn_disc_open_track_dvd_minus_r(struct burn_write_opts *o,
 					struct burn_session *s, int tnum)
 {
 	struct burn_drive *d = o->drive;
-	char *msg = NULL;
+	char msg[160];
 	int ret, lba, nwa;
 	off_t size;

-	BURN_ALLOC_MEM(msg, char, 160);
 	d->send_write_parameters(d, o);
 	ret = d->get_nwa(d, -1, &lba, &nwa);
 	sprintf(msg, 
@ -1128,13 +1119,11 @@ int burn_disc_open_track_dvd_minus_r(struct burn_write_opts *o,
 #endif

 	if (o->write_type == BURN_WRITE_SAO) { /* DAO */
+ 		/* Round track size up to write chunk size and reserve track */
 		size = ((off_t) burn_track_get_sectors(s->track[tnum]))
 			* (off_t) 2048;
-
- 		/* Eventually round track size up to write chunk */
-		if (o->obs_pad && (size % o->obs))
+		if (size % o->obs)
 			size += (off_t) (o->obs - (size % o->obs));
-
 		ret = d->reserve_track(d, size);
 		if (ret <= 0) {
 			sprintf(msg, "Cannot reserve track of %.f bytes",
@ -1143,13 +1132,10 @@ int burn_disc_open_track_dvd_minus_r(struct burn_write_opts *o,
 				0x00020138,
 				LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
 				msg, 0, 0);
-			{ret = 0; goto ex;}
+			return 0;
 		}
 	}
-	ret = 1;
-ex:;
-	BURN_FREE_MEM(msg);
-	return ret;
+	return 1;
 }


@ -1158,11 +1144,10 @@ int burn_disc_open_track_dvd_plus_r(struct burn_write_opts *o,
 					struct burn_session *s, int tnum)
 {
 	struct burn_drive *d = o->drive;
-	char *msg;
+	char msg[160];
 	int ret, lba, nwa;
 	off_t size;

-	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",
@ -1179,10 +1164,6 @@ int burn_disc_open_track_dvd_plus_r(struct burn_write_opts *o,
 		/* Round track size up to write chunk size and reserve track */
 		size = ((off_t) burn_track_get_sectors(s->track[tnum]))
 			* (off_t) 2048;
-		/* o->obs should be 32k or 64k already. But 32k alignment
-		  was once performed in d->reserve_track() */
-		if (o->obs % 32768)
-			o->obs += 32768 - (o->obs % 32768);
 		if (size % o->obs)
 			size += (off_t) (o->obs - (size % o->obs));
 		ret = d->reserve_track(d, size);
@ -1193,18 +1174,16 @@ int burn_disc_open_track_dvd_plus_r(struct burn_write_opts *o,
 				0x00020138,
 				LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
 				msg, 0, 0);
-			{ret = 0; goto ex;}
+			return 0;
 		}
 	}
-	ret = 1;
-ex:;
-	BURN_FREE_MEM(msg);
-	return ret;
+	return 1;
 }


 /* ts A70129 */
-int burn_disc_close_track_dvd_minus_r(struct burn_write_opts *o, int tnum)
+int burn_disc_close_track_dvd_minus_r(struct burn_write_opts *o,
+					struct burn_session *s, int tnum)
 {
 	struct burn_drive *d = o->drive;
 	char msg[80];
@ -1261,7 +1240,7 @@ int burn_disc_finalize_dvd_plus_r(struct burn_write_opts *o)

 /* ts A70226 */
 int burn_disc_close_track_dvd_plus_r(struct burn_write_opts *o,
-			int tnum, int is_last_track)
+			struct burn_session *s, int tnum, int is_last_track)
 {
 	struct burn_drive *d = o->drive;
 	char msg[80];
@ -1453,6 +1432,20 @@ int burn_dvd_write_track(struct burn_write_opts *o,

 	sectors = burn_track_get_sectors(t);
 	open_ended = burn_track_is_open_ended(t);
+	/* <<< */
+	{
+		char msg[160];
+
+		sprintf(msg,
+		 "DVD pre-track %2.2d : demand=%.f%s, cap=%.f\n",
+			tnum+1, (double) sectors * 2048.0,
+			(open_ended ? " (open ended)" : ""),
+			(double) d->media_capacity_remaining);
+		libdax_msgs_submit(libdax_messenger, d->global_index, 0x000002,
+				LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_ZERO,
+				msg, 0, 0);
+	}
+

 	/* (offset padding is done within sector_data()) */

@ -1512,18 +1505,18 @@ int burn_dvd_write_track(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 */
-		ret = burn_disc_close_track_dvd_minus_r(o, tnum);
+		ret = burn_disc_close_track_dvd_minus_r(o, s, tnum);
 		if (ret <= 0)
 			goto ex;
 	} else if (d->current_profile == 0x1b || d->current_profile == 0x2b) {
 		/* DVD+R , DVD+R/DL */
-		ret = burn_disc_close_track_dvd_plus_r(o, tnum,
+		ret = burn_disc_close_track_dvd_plus_r(o, s, tnum,
 							 is_last_track);
 		if (ret <= 0)
 			goto ex;
 	} else if (d->current_profile == 0x41) {
 		/* BD-R SRM */
-		ret = burn_disc_close_track_dvd_plus_r(o, tnum,
+		ret = burn_disc_close_track_dvd_plus_r(o, s, tnum,
 							 is_last_track);
 		if (ret <= 0)
 			goto ex;
@ -1578,7 +1571,8 @@ int burn_disc_close_session_dvd_minus_rw(struct burn_write_opts *o,


 /* ts A70129 : for profile 0x11 DVD-R, 0x14 DVD-RW Seq, 0x15 DVD-R/DL Seq */
-int burn_disc_close_session_dvd_minus_r(struct burn_write_opts *o)
+int burn_disc_close_session_dvd_minus_r(struct burn_write_opts *o,
+					struct burn_session *s)
 {
 	struct burn_drive *d = o->drive;

@ -1683,7 +1677,7 @@ int burn_dvd_write_session(struct burn_write_opts *o,
 		multi_mem = o->multi;
 		if (!is_last_session)
 			o->multi = 1;
-		ret = burn_disc_close_session_dvd_minus_r(o);
+		ret = burn_disc_close_session_dvd_minus_r(o, s);
 		o->multi = multi_mem;
 		if (ret <= 0)
 			return 0;
@ -1743,7 +1737,7 @@ int burn_disc_setup_dvd_minus_rw(struct burn_write_opts *o,
 				struct burn_disc *disc)
 {
 	struct burn_drive *d = o->drive;
-	char msg[60];
+	char msg[160];
 	int ret;

 	d->nwa = 0;
@ -1826,9 +1820,8 @@ int burn_dvd_write_sync(struct burn_write_opts *o,
 	off_t default_size = 0;
 	struct burn_drive *d = o->drive;
 	struct burn_track *t;
-	char *msg = NULL;
+	char msg[160];

-	BURN_ALLOC_MEM(msg, char, 160);
 	d->needs_close_session = 0;

 	/* buffer flush trigger for sector.c:get_sector() */
@ -1899,8 +1892,6 @@ int burn_dvd_write_sync(struct burn_write_opts *o,
 				  msg, 0, 0);
 			burn_track_set_size(t, default_size);
 		}
-		/* Whether to fill-up last 32k buffer of track. */
-		o->obs_pad = (o->write_type != BURN_WRITE_SAO);
 		ret = burn_disc_setup_dvd_minus_r(o, disc);
 		if (ret <= 0) {
 			sprintf(msg,
@ -1911,6 +1902,8 @@ int burn_dvd_write_sync(struct burn_write_opts *o,
 				msg, 0, 0);
 			goto early_failure;
 		}
+		/* ??? padding needed ??? cowardly doing it for now */
+		o->obs_pad = 1; /* fill-up track's last 32k buffer */
 		
 	} else if (d->current_profile == 0x1b || d->current_profile == 0x2b ||
 		   d->current_profile == 0x41) {
@ -2013,16 +2006,9 @@ ex:;
 	burn_drive_mark_unready(d);
 	burn_drive_inquire_media(d);

-	if (d->current_profile == 0x41 && d->complete_sessions >= 300) {
-		sprintf(msg, "Sequential BD-R media now contains %d sessions. It is likely to soon fail writing.", d->complete_sessions);
-		libdax_msgs_submit(libdax_messenger, d->global_index,
-				0x0002017b, LIBDAX_MSGS_SEV_WARNING,
-				LIBDAX_MSGS_PRIO_ZERO, msg, 0, 0);
-	}
-	BURN_FREE_MEM(msg);
+	/* <<< d->busy = BURN_DRIVE_IDLE; */
 	return ret;
 early_failure:;
-	BURN_FREE_MEM(msg);
 	return 0;
 }

@ -2032,8 +2018,7 @@ int burn_stdio_open_write(struct burn_drive *d, off_t start_byte,
 			 int sector_size, int flag)
 {

-/* We normally need _LARGEFILE64_SOURCE defined by the build system.
-   Nevertheless the system might use large address integers by default.
+/* <<< We need _LARGEFILE64_SOURCE defined by the build system.
 */
 #ifndef O_LARGEFILE
 #define O_LARGEFILE 0
@ -2041,27 +2026,15 @@ int burn_stdio_open_write(struct burn_drive *d, off_t start_byte,

 	int fd = -1;
 	int mode = O_RDWR | O_CREAT | O_LARGEFILE;
-	char msg[60];
-	off_t lseek_res;
+	char msg[160];

-	if(d->drive_role == 4) {
-		libdax_msgs_submit(libdax_messenger, d->global_index,
-			0x00020181,
-			LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
-			"Pseudo-drive is a read-only file. Cannot write.",
-			0, 0);
-		return 0;
-	}
-	if (d->drive_role == 5 || d->drive_role == 3)
-		mode = O_WRONLY | O_CREAT | O_LARGEFILE;
 	if (d->devname[0] == 0) /* null drives should not come here */
 		return -1;
 	fd = burn_drive__fd_from_special_adr(d->devname);
 	if (fd >= 0)
 		fd = dup(fd); /* check validity and make closeable */
 	else
-		fd = open(d->devname, mode,
-                    S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH);
+		fd = open(d->devname, mode, S_IRUSR | S_IWUSR);
 	if (fd == -1) {
 		libdax_msgs_submit(libdax_messenger, d->global_index,
 			0x00020005,
@ -2072,11 +2045,10 @@ int burn_stdio_open_write(struct burn_drive *d, off_t start_byte,
 	} 
 	if (start_byte < 0)
 		start_byte = 0;
-	if (d->drive_role == 2 || d->drive_role == 5) {
-		lseek_res = lseek(fd, start_byte, SEEK_SET);
-		if (lseek_res == -1) {
+	if (d->drive_role == 2)
+		if (lseek(fd, start_byte, SEEK_SET)==-1) {
 			sprintf(msg, "Cannot address start byte %.f",
-				(double) start_byte);
+			 	(double) start_byte);
 			libdax_msgs_submit(libdax_messenger, d->global_index,
 				0x00020147,
 				LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
@ -2085,7 +2057,6 @@ int burn_stdio_open_write(struct burn_drive *d, off_t start_byte,
 			d->cancel = 1;
 			fd = -1;
 		}
-	}
 	d->nwa = start_byte / sector_size;
 	return fd;
 }
@ -2143,11 +2114,9 @@ int burn_stdio_mmc_write(struct burn_drive *d, int start, struct buffer *buf)
 	if (d->cancel)
 		return BE_CANCELLED;
 	if (d->stdio_fd < 0) {
-		libdax_msgs_submit(libdax_messenger, d->global_index,
-			0x0002017d,
-			LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
-			"Invalid file descriptor with stdio pseudo-drive",
-			0, 0);
+
+		/* >>> program error */;
+
 		d->cancel = 1;
 		return BE_CANCELLED;
 	}
@ -2195,11 +2164,9 @@ int burn_stdio_mmc_dummy_write(struct burn_drive *d, int start,
 int burn_stdio_sync_cache(int fd, struct burn_drive *d, int flag)
 {
 	if (fd < 0) {
-		libdax_msgs_submit(libdax_messenger, d->global_index,
-			0x0002017d,
-			LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
-			"Invalid file descriptor with stdio pseudo-drive",
-			0, 0);
+
+		/* >>> program error */;
+
 		d->cancel = 1;
 		return 0;
 	}
@ -2263,23 +2230,21 @@ 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, fd;
+	int open_ended, bufsize, ret, sectors, fd;
 	struct burn_track *t = s->track[tnum];
 	struct burn_drive *d = o->drive;
-	char *buf = NULL;
+	char buf[16*2048];
 	int i, prev_sync_sector = 0;
 	struct buffer *out = d->buffer;
 	struct timeval prev_time;

-	BURN_ALLOC_MEM(buf, char, bufsize);
+	bufsize = sizeof(buf);
 	fd = d->stdio_fd;

 	sectors = burn_track_get_sectors(t);
 	burn_disc_init_track_status(o, s, tnum, sectors);
 	open_ended = burn_track_is_open_ended(t);

-	t->end_on_premature_eoi = (o->write_type == BURN_WRITE_TAO);
-
 	/* attach stdio emulators for mmc_*() functions */
 	if (o->simulate)
 		d->write = burn_stdio_mmc_dummy_write;
@ -2292,9 +2257,8 @@ int burn_stdio_write_track(struct burn_write_opts *o, struct burn_session *s,
 		/* transact a (CD sized) sector */
 		if (!sector_data(o, t, 0))
 			{ret= 0; goto ex;}
-		if (open_ended)
+		if (open_ended) {
 			d->progress.sectors = sectors = d->progress.sector;
-		if (open_ended || t->end_on_premature_eoi) {
 			if (burn_track_is_data_done(t))
 	break;
 		}
@ -2321,9 +2285,6 @@ int burn_stdio_write_track(struct burn_write_opts *o, struct burn_session *s,
 ex:;
 	if (d->cancel)
 		burn_source_cancel(t->source);
-	if (t->end_on_premature_eoi == 2)
-		d->cancel = 1;
-	BURN_FREE_MEM(buf);
 	return ret;
 }

@ -2352,9 +2313,6 @@ int burn_stdio_write_sync(struct burn_write_opts *o,
 	/* open target file */
 	if (d->stdio_fd >= 0)
 		close(d->stdio_fd);
-	if (d->drive_role == 5 && d->status == BURN_DISC_APPENDABLE &&
-            o->start_byte < 0)
-		o->start_byte = d->role_5_nwa * 2048;
 	d->stdio_fd = burn_stdio_open_write(d, o->start_byte, 2048, 0);
 	if (d->stdio_fd == -1)
 		{ret = 0; goto ex;}
@ -2437,14 +2395,6 @@ calloc() seems not to have the desired effect. valgrind warns:
 	d->rlba = -150;
 	d->toc_temp = 9;

-	if(d->drive_role == 4) {
-		libdax_msgs_submit(libdax_messenger, d->global_index,
-			0x00020181,
-			LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
-			"Pseudo-drive is a read-only file. Cannot write.",
-			0, 0);
-		goto fail_wo_sync;
-	}
 	/* ts A70904 */
 	if (d->drive_role != 1) {
 		ret = burn_stdio_write_sync(o, disc);
@ -2531,8 +2481,6 @@ return crap.  so we send the command, then ignore the result.
 /*		print_cue(sheet);*/
 		if (o->write_type == BURN_WRITE_SAO)
 			d->send_cue_sheet(d, sheet);
-		if (sheet->data != NULL)
-			free(sheet->data);
 		free(sheet);

 		if (o->write_type == BURN_WRITE_RAW) {
@ -2654,33 +2602,24 @@ int burn_random_access_write(struct burn_drive *d, off_t byte_address,
 {
 	int alignment = 0, start, upto, chunksize, err, fd = -1, ret;
 	char msg[81], *rpt;
-	struct buffer *buf = NULL, *buffer_mem = d->buffer;
+	struct buffer buf, *buffer_mem = d->buffer;

-	BURN_ALLOC_MEM(buf, struct buffer, 1);
 	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 write", 0, 0);
-		{ret = 0; goto ex;}
+		return 0;
 	}
 	if(d->drive_role == 0) {
 		libdax_msgs_submit(libdax_messenger, d->global_index,
 			0x00020146,
 			LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
 			"Drive is a virtual placeholder (null-drive)", 0, 0);
-		{ret = 0; goto ex;}
-	}
-	if(d->drive_role == 4) {
-		libdax_msgs_submit(libdax_messenger, d->global_index,
-			0x00020181,
-			LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
-			"Pseudo-drive is a read-only file. Cannot write.",
-			0, 0);
-		{ret = 0; goto ex;}
+		return 0;
 	}

-	if(d->drive_role == 2 || d->drive_role == 5)
+	if(d->drive_role == 2)
 		alignment = 2 * 1024;
 	if (d->current_profile == 0x12) /* DVD-RAM */
 		alignment = 2 * 1024;
@ -2696,7 +2635,7 @@ int burn_random_access_write(struct burn_drive *d, off_t byte_address,
 			0x00020125,
 			LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
 			"Write start address not supported", 0, 0);
-		{ret = 0; goto ex;}
+		return 0;
 	}
 	if ((byte_address % alignment) != 0) {
 		sprintf(msg,
@ -2706,7 +2645,7 @@ int burn_random_access_write(struct burn_drive *d, off_t byte_address,
 			0x00020126,
 			LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
 			msg, 0, 0);
-		{ret = 0; goto ex;}
+		return 0;
 	}
 	if ((data_count % alignment) != 0) {
 		sprintf(msg,
@ -2716,22 +2655,22 @@ int burn_random_access_write(struct burn_drive *d, off_t byte_address,
 			0x00020141,
 			LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
 			msg, 0, 0);
-		{ret = 0; goto ex;}
+		return 0;
 	}
 	if (d->busy != BURN_DRIVE_IDLE) {
 		libdax_msgs_submit(libdax_messenger,
 			d->global_index, 0x00020140,
 			LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
 			"Drive is busy on attempt to write random access",0,0);
-		{ret = 0; goto ex;}
+		return 0;
 	}
 	if(d->drive_role != 1) {
 		fd = burn_stdio_open_write(d, byte_address, 2048, 0);
 		if (fd == -1)
-			{ret = 0; goto ex;}
+			return 0;
 	}
 	d->busy = BURN_DRIVE_WRITING_SYNC;
-	d->buffer = buf;
+	d->buffer = &buf;

 	start = byte_address / 2048;
 	upto = start + data_count / 2048;
@ -2758,7 +2697,7 @@ int burn_random_access_write(struct burn_drive *d, off_t byte_address,
 			d->busy = BURN_DRIVE_IDLE;
 			if(fd >= 0)
 				close(fd);
-			{ret = -(start * 2048 - byte_address); goto ex;}
+			return (-(start * 2048 - byte_address));
 		}
 	}

@ -2776,95 +2715,6 @@ int burn_random_access_write(struct burn_drive *d, off_t byte_address,
 		close(fd);
 	d->buffer = buffer_mem;
 	d->busy = BURN_DRIVE_IDLE;
-	ret = 1;
-ex:
-	BURN_FREE_MEM(buf);
-	return ret;
+	return 1;
 }

-
-/* ts B10527 */
-/* @param bit0= force close, even if no damage was seen
-*/
-int burn_disc_close_damaged(struct burn_write_opts *o, int flag)
-{
-	struct burn_drive *d;
-	int ret;
-	enum burn_drive_status busy;
-
-	d = o->drive;
-	busy = d->busy;
-
-	if (busy != BURN_DRIVE_IDLE) {
-		libdax_msgs_submit(libdax_messenger,
-			d->global_index, 0x00020106,
-			LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
-			"Drive is busy on attempt to close damaged session",
-			0, 0);
-		{ret = 0; goto ex;}
-	}
-	if (!((d->next_track_damaged & 1) || (flag & 1))) {
-		libdax_msgs_submit(libdax_messenger,
-			d->global_index, 0x00020187,
-			LIBDAX_MSGS_SEV_NOTE, LIBDAX_MSGS_PRIO_HIGH,
-			"Track not marked as damaged. No action taken.",
-			0, 0);
-		{ret = 0; goto ex;}
-	}
-	d->busy = BURN_DRIVE_WRITING;
-
-	if (d->current_profile == 0x09 || d->current_profile == 0x0a) {
-		/* Close CD track and session */
-		o->write_type = BURN_WRITE_TAO; /* no action without TAO */
-
-		/* Send mode page 5 */;
-		d->send_write_parameters(d, o);
-
-		ret = burn_write_close_session(o);
-		if (ret <= 0)
-			goto ex;
-
-	} else if(d->current_profile == 0x11 || d->current_profile == 0x14) {
-		/* Close DVD-R[W] track and session */
-		o->write_type = BURN_WRITE_TAO; /* no action without TAO */
-
-		/* Send mode page 5 */;
-		d->send_write_parameters(d, o);
-
-		ret = burn_disc_close_track_dvd_minus_r(o, 0);
-		if (ret <= 0)
-			goto ex;
-		ret = burn_disc_close_session_dvd_minus_r(o);
-		if (ret <= 0)
-			goto ex;
-
-	} else if(d->current_profile == 0x1b || d->current_profile == 0x2b) {
-		/* Close DVD+R track and session */
-		ret = burn_disc_close_track_dvd_plus_r(o, d->last_track_no, 1);
-		if (ret <= 0)
-			goto ex;
-
-	} else if(d->current_profile == 0x41) {
-		/* Close BD-R track and session */
-		ret = burn_disc_close_track_dvd_plus_r(o, d->last_track_no, 1);
-		if (ret <= 0)
-			goto ex;
-
-	} else {
-		libdax_msgs_submit(libdax_messenger,
-			d->global_index, 0x00020188,
-			LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
-			"Cannot close damaged track on given media type",
-			0, 0);
-		{ret = 0; goto ex;}
-
-	}
-	ret = 1;
-ex:;
-	d->busy = busy;
-	/* Record with drive that repair was attempted */
-	d->next_track_damaged &= ~1;
-	return ret;
-}
-
-
--- a/libburn/write.h
+++ b/libburn/write.h
@ -37,7 +37,7 @@ int burn_write_flush(struct burn_write_opts *o, struct burn_track *track);
 /* ts A61030 : necessary for TAO */
 int burn_write_close_track(struct burn_write_opts *o, struct burn_session *s,
                           int tnum);
-int burn_write_close_session(struct burn_write_opts *o);
+int burn_write_close_session(struct burn_write_opts *o,struct burn_session *s);



--- a/test/dewav.c
+++ b/test/dewav.c
@ -25,19 +25,18 @@
 #include "../libburn/libdax_msgs.h"
 struct libdax_msgs *libdax_messenger= NULL;

-/* The API for .wav extraction */
-#define LIBDAX_AUDIOXTR_H_PUBLIC 1
-#include "../libburn/libdax_audioxtr.h"
-
 #else /* Dewav_without_libburN */

-/* This build environment uses libdax_msgs and libdax_audioxtr via libburn */
+/* This build environment uses libdax_msgs via libburn */
 /* Thus the API header of libburn */
 #include "../libburn/libburn.h"

 #endif /* ! Dewav_without_libburN */


+/* The API for .wav extraction */
+#include "../libburn/libdax_audioxtr.h"
+

 int main(int argc, char **argv)
 {
--- a/test/libburner.c
+++ b/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 - 2010 Thomas Schmitt <scdbackup@gmx.net> */
 /* Provided under GPL, see also "License and copyright aspects" at file end */


@ -20,37 +20,31 @@
  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
-  main approaches are shown here in application functions:
+     burn_set_signal_handling() 
+  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 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 aquired drive you can blank a CD-RW or DVD-RW
     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 aquired drive you can burn to CD, DVD, BD
     libburner_payload()
-
-  These three functions switch temporarily to a non-fatal signal handler
-  while they are waiting for the drive to become idle again:
-     burn_set_signal_handling("libburner : ", NULL, 0x30)
-  After the waiting loop ended, they check for eventual abort events by
-     burn_is_aborting(0)
-  The 0x30 handler will eventually execute
-     burn_abort()
-  but not wait for the drive to become idle and not call exit().
-  This is needed because the worker threads might block as long as the signal
-  handler has not returned. The 0x0 handler would wait for them to finish.
-  Take this into respect when implementing own signal handlers.
-
  When everything is done, main() releases the drive and shuts down libburn:
     burn_drive_release();
     burn_finish()

+  FreeBSD does not work well with the convenient synchronous signal handler. So
+  the waiting loops for blanking, formatting, and writing use the asynchronous
+  mode of the libburn signal handler. It will not shutdown the library and
+  abort the program, but rather tell the ongoing drive operation to stop as
+  soon as possible. After the loops and at the end of the program there is a
+  call to determine whether an abort happened:
+     burn_is_aborting()
+  
  Applications must use 64 bit off_t. E.g. by defining
    #define _LARGEFILE_SOURCE
    #define _FILE_OFFSET_BITS 64
@ -66,7 +60,7 @@
 /*  This program insists in the own headerfile. */
 #include "../libburn/libburn.h"

-/* libburn works on Linux systems with kernel 2.4 or 2.6, FreeBSD, Solaris */
+/* libburn is intended for Linux systems with kernel 2.4 or 2.6 for now */
 #include <stdio.h>
 #include <ctype.h>
 #include <sys/types.h>
@ -218,7 +212,7 @@ int libburner_aquire_by_driveno(int *driveno)
 	printf("\nOverview of accessible drives (%d found) :\n",
 		drive_count);
 	printf("-----------------------------------------------------------------------------\n");
-	for (i = 0; i < (int) drive_count; i++) {
+	for (i = 0; i < drive_count; i++) {
 		if (burn_drive_get_adr(&(drive_list[i]), adr) <=0)
 			strcpy(adr, "-get_adr_failed-");
 		printf("%d  --drive '%s'  :  '%s'  '%s'\n",
@ -255,7 +249,7 @@ int libburner_aquire_by_driveno(int *driveno)
 		printf("Pseudo-drive \"-\" given : bus scanning done.\n");
 		return 2; /* the program will end after this */
 	}
-	if ((int) drive_count <= *driveno) {
+	if (drive_count <= *driveno) {
 		fprintf(stderr,
 			"Found only %d drives. Number %d not available.\n",
 			drive_count, *driveno);
@ -263,7 +257,7 @@ int libburner_aquire_by_driveno(int *driveno)
 	}

 	/* Drop all drives which we do not want to use */
-	for (i = 0; i < (int) drive_count; i++) {
+	for (i = 0; i < drive_count; i++) {
 		if (i == *driveno) /* the one drive we want to keep */
 	continue;
 		ret = burn_drive_info_forget(&(drive_list[i]),0);
@ -339,7 +333,7 @@ int libburner_blank_disc(struct burn_drive *drive, int blank_fast)
 	if (burn_is_aborting(0) > 0)
 		return -1;
 	/* Back to synchronous handling */
-	burn_set_signal_handling("libburner : ", NULL, 0x0);
+	burn_set_signal_handling("libburner : ", NULL, 0);
 	printf("Done\n");
 	return 1;
 }
@ -407,7 +401,7 @@ int libburner_format(struct burn_drive *drive)
 	}
 	if (burn_is_aborting(0) > 0)
 		return -1;
-	burn_set_signal_handling("libburner : ", NULL, 0x0);
+	burn_set_signal_handling("libburner : ", NULL, 0);
 	burn_disc_get_profile(drive_list[0].drive, &current_profile,
 				 current_profile_name);
 	if (current_profile == 0x14 || current_profile == 0x13)
@ -763,7 +757,7 @@ int main(int argc, char **argv)

 	/* Activate the synchronous signal handler which eventually will try to
 	   properly shutdown drive and library on aborting events. */
-	burn_set_signal_handling("libburner : ", NULL, 0x0);
+	burn_set_signal_handling("libburner : ", NULL, 0);

 	/** Note: driveno might change its value in this call */
 	ret = libburner_aquire_drive(drive_adr, &driveno);
--- a/test/offst_source.c
+++ b/test/offst_source.c
@ -1,134 +0,0 @@
-
-/*
-  cc -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS -g -o test/offst_source test/offst_source.c -lburn
-*/
-
-#include "../libburn/libburn.h" 
-
-/* Just everything from test/libburner.c */
-#include <stdio.h>
-#include <ctype.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <time.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-
-static int create_original(struct burn_source **original, char *path, int flag)
-{
-	printf("create_original: path='%s'\n", path);
-	*original = burn_file_source_new(path, NULL);
-	if (*original == NULL)
-		return 0;
-	return 1;
-}
-
-
-static int set_up_offst_sources(struct burn_source *original,
-				struct burn_source *offsetters[],
-				int count, int flag)
-{
-	int i;
-	off_t start = 3, size = 10, gap = 7;
-
-	for (i = 0; i < count; i++) {
-		offsetters[i] = burn_offst_source_new(original,
-					i > 0 ? offsetters[i - 1] : NULL,
-					start, size, 0);
-		if (offsetters[i] == NULL)
-			return 0;
-		printf("set_up_offst_sources: idx=%d, start=%d\n",
-			 i, (int) start);
-		start += size + gap;
-	}
-	return 1;
-}
-
-
-static int consume_source(struct burn_source *src, int flag)
-{
-	int ret, count = 0;
-	unsigned char buf[1];
-
-	while (1) {
-		ret = src->read_xt(src, buf, 1);
-		if (ret < 0) {
-			printf("\n");
-			fprintf(stderr, "consume_source: count=%d, ret=%d\n",
-					count, ret);
-			return 0;
-		}
-		if (ret == 0)
-	break;
-		printf("%u ", buf[0]);
-		count++;
-	}
-	printf(" count=%d\n", count);
-	return 1;
-}
-
-
-static int consume_all_sources(struct burn_source *offsetters[],
-                                int count, int flag)
-{
-	int i, ret;
-
-	for (i = 0; i < count; i++) {
-		printf("consume_source: idx=%d\n", i);
-		ret = consume_source(offsetters[i], 0);
-		if (ret <= 0)
-			return ret;
-	}
-	return 1;
-}
-
-
-static int free_all_sources(struct burn_source *original,
-                                struct burn_source *offsetters[],
-                                int count, int flag)
-{
-	int i;
-
-	for (i = 0; i < count; i++)
-		burn_source_free(offsetters[i]);
-	burn_source_free(original);
-	return 1;
-}
-
-
-int main(int argc, char **argv)
-{
-	int ret;
-	char *path = "./COPYRIGHT";
-	struct burn_source *original = NULL, *offsetters[4];
-
-	if (argc > 1)
-		path = argv[1];
-
-	if (burn_initialize() == 0)
-		exit(1);
-
-	ret = create_original(&original, path, 0);
-	if (ret <= 0)
-		exit(2);
-
-	ret = set_up_offst_sources(original, offsetters, 4, 0);
-	if (ret <= 0)
-		exit(3);
-
-	ret = consume_all_sources(offsetters, 4, 0);
-	if (ret <= 0)
-		exit(4);
-
-	ret = free_all_sources(original, offsetters, 4, 0);
-	if (ret <= 0)
-		exit(5);
-
-	burn_finish();
-	exit(0);
-}
-
--- a/test/poll.c
+++ b/test/poll.c
@ -67,7 +67,7 @@ int main()

 	newact.sa_handler = catch_int;
 	sigaction(SIGINT, &newact, &oldact);
-	for (i = 0; i < (int) n_drives; i++) {
+	for (i = 0; i < n_drives; i++) {
 	    NEXT=0;
 	    poll_drive(i);
 	}
--- a/test/telltoc.c
+++ b/test/telltoc.c
@ -1,6 +1,6 @@

 /*  test/telltoc.c , API illustration of obtaining media status info */
-/*  Copyright (C) 2006 - 2011 Thomas Schmitt <scdbackup@gmx.net> 
+/*  Copyright (C) 2006 - 2010 Thomas Schmitt <scdbackup@gmx.net> 
    Provided under GPL */

 /**                               Overview 
@ -178,7 +178,7 @@ int telltoc_aquire_by_driveno(int *driveno, int silent_drive)
 	}
 	fprintf(stderr, "Done\n");

-	for (i = 0; i < (int) drive_count; i++) {
+	for (i = 0; i < drive_count; i++) {
 		if (*driveno >= 0 && (silent_drive || *driveno != i))
 	continue;
 		if (burn_drive_get_adr(&(drive_list[i]), adr) <=0)
@ -197,7 +197,7 @@ int telltoc_aquire_by_driveno(int *driveno, int silent_drive)
 	/* We already made our choice via command line. (default is 0)
 	   So we just have to keep our desired drive and drop all others.
 	 */
-	if ((int) drive_count <= *driveno) {
+	if (drive_count <= *driveno) {
 		fprintf(stderr,
 			"Found only %d drives. Number %d not available.\n",
 			drive_count, *driveno);
@ -205,7 +205,7 @@ int telltoc_aquire_by_driveno(int *driveno, int silent_drive)
 	}

 	/* Drop all drives which we do not want to use */
-	for (i = 0; i < (int) drive_count; i++) {
+	for (i = 0; i < drive_count; i++) {
 		if (i == *driveno) /* the one drive we want to keep */
 	continue;
 		ret = burn_drive_info_forget(&(drive_list[i]),0);
Author	SHA1	Message	Date
Thomas Schmitt	11ce12c134	Documented changes and release timestamp	2010-06-30 10:59:01 +00:00
Thomas Schmitt	e3ae588da2	Updated cdrskin tarball generator	2010-06-30 10:57:55 +00:00
Thomas Schmitt	ee2714a20d	Made number transition to 0.8.4	2010-06-30 10:56:55 +00:00
Thomas Schmitt	c9ffa61278	Branching for libburn release 0.8.4	2010-06-30 09:14:13 +00:00