Corrected wrong version number of cdrskin

Documented changes and release timestamp
Updated cdrskin tarball generator
2008-11-12 11:47:45 +00:00 · 2008-11-12 11:23:07 +00:00 · 2008-11-12 11:22:07 +00:00 · 2008-11-12 11:19:39 +00:00 · 2008-11-12 08:27:54 +00:00 · 2008-11-12 07:53:01 +00:00
31 changed files with 1587 additions and 183 deletions
--- a/Makefile.am
+++ b/Makefile.am
@ -101,9 +101,9 @@ test_structest_CPPFLAGS = -Ilibburn
 test_structest_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS)
 test_structest_SOURCES = test/structest.c

-##  cdrskin construction site - ts A60816 - A80517
+##  cdrskin construction site - ts A60816 - A81112
 cdrskin_cdrskin_CPPFLAGS = -Ilibburn
-cdrskin_cdrskin_CFLAGS = -DCdrskin_libburn_0_4_9
+cdrskin_cdrskin_CFLAGS = -DCdrskin_libburn_0_5_6

 # cdrskin_cdrskin_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS)
 # ts A80123, change proposed by Simon Huggins to cause dynamic libburn linking
--- a/44
+++ b/44
@ -12,12 +12,6 @@ Still containing parts of
 Libburn. By Derek Foreman <derek@signalmarketing.com> and
            Ben Jansens <xor@orodu.net>
 Copyright (C) 2002-2006  Derek Foreman and Ben Jansens
-These parts are to be replaced by own code of above libburnia-project.org
-copyright holders and then libburnia-project.org is to be their sole copyright.
-This is done to achieve the right to issue the clarification and the
-commitment as written at the end of this text.
-The rights and merits of the Libburn-copyright holders Derek Foreman and
-Ben Jansens will be duely respected. 

 This libburnia-project.org toplevel README (C) 2006-2008 Thomas Schmitt 
 ------------------------------------------------------------------------------
@ -173,7 +167,7 @@ Project history as far as known to me:
  discontent.
  The situation first caused me to publically regret it and then - after i
  got the opportunity to move in with cdrskin - gave me true reason to
-  personally apologize to Derek Foreman, Ben Jansens and the contibutors at 
+  personally apologize to Derek Foreman, Ben Jansens and the contributors at 
  icculus.org/burn. Posted to both projects:
    http://lists.freedesktop.org/archives/libburn/2006-August/000446.html
    http://mailman-mail1.webfaction.com/pipermail/libburn-hackers/2006-August/000024.html
@ -277,7 +271,7 @@ Project history as far as known to me:
  image tree nodes. It now depends on libisofs-0.6.4 and libburn-0.4.4.
  xorriso makes use of new libisofs features by performing incremental
  updates of directory trees and by cutting oversized data files into
-  pieces. A primitive single session emulation of cdrcord and mkisofs is
+  pieces. A primitive single session emulation of cdrecord and mkisofs is
  provided.

 - 10th May 2008 libburn-0.4.6 supports formatting and writing of BD-RE,
@ -294,6 +288,40 @@ Project history as far as known to me:

 - 3rd Jun 2008 libisoburn-0.1.8 fixes a bug with overwriteable media.

+- 23rd Jun 2008 libisoburn-0.2.0 introduces extraction of files from
+  ISO images.
+
+- 16th Jul 2008 libburn-0.5.0 handles systems with no /dev/sr* but only
+  /dev/scd*.
+
+- 19th Jul 2008 libisoburn/xorriso-0.2.2 can do multi-session in mkisofs
+  and cdrecord style. xorriso now can serve underneath growisofs.
+
+- 20th Aug 2008 libburn-0.5.2 revokes the necessity that a drive must be
+  enumerable in order to be adressable. Enumeration is enhanced by examining
+  /proc/sys/dev/cdrom/info.
+  
+- 24th Aug 2008 libisoburn/xorriso-0.2.4 introduces a media readability check
+  with data retrieval option.
+
+- 18th Sep 2008 libisofs-0.6.8 supports ISO 9660 Level 3 which allows very
+  large data files in the image.
+
+- 20th Sep 2008 libisoburn/xorriso-0.2.6 takes into respect the new Level 3
+  capabilities of libisofs. 
+
+- 6th Oct 2008 libburn-0.5.4 adjusts the changes of 0.5.2 to the needs of
+  Linux kernel 2.4 and introduces human readable SCSI error messages.
+
+- 6th Oct 2008 libisofs-0.6.10 fixes two bugs which prevented adding and
+  manipulation of ISOLINUX boot images.
+
+- 15th Oct 2008 libisoburn/xorriso-0.2.8 can activate and maintain an
+  ISOLINUX boot image by an EL Torito boot record.
+
+- 12th Nov 2008 libburn-0.5.6 fixes usage of freed memory by the fifo thread
+  of an aborted burn run.
+

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

--- a/cdrskin/README
+++ b/cdrskin/README
@ -4,7 +4,7 @@
 cdrskin. By Thomas Schmitt <scdbackup@gmx.net>
 Integrated sub project of libburnia-project.org but also published via:
 http://scdbackup.sourceforge.net/cdrskin_eng.html
-http://scdbackup.sourceforge.net/cdrskin-0.4.9.tar.gz
+http://scdbackup.sourceforge.net/cdrskin-0.5.6.pl00.tar.gz
 Copyright (C) 2006-2008 Thomas Schmitt, provided under GPL version 2.
 ------------------------------------------------------------------------------

@ -20,10 +20,10 @@ By using this software you agree to the disclaimer at the end of this text

                   Compilation, First Glimpse, Installation

-Obtain cdrskin-0.4.9.tar.gz, take it to a directory of your choice and do:
+Obtain cdrskin-0.5.6.pl00.tar.gz, take it to a directory of your choice and do:

-    tar xzf cdrskin-0.4.9.tar.gz
-    cd cdrskin-0.4.9
+    tar xzf cdrskin-0.5.6.pl00.tar.gz
+    cd cdrskin-0.5.6

 Within that directory execute:

--- a/cdrskin/add_ts_changes_to_libburn_0_5_6
+++ b/cdrskin/add_ts_changes_to_libburn_0_5_6
@ -38,7 +38,7 @@ original="./libburn_svn_release.tgz"
 # My changes are in $changes , mainly in $changes/cdrskin
 changes="./libburn-release"

-skin_release="0.4.8"
+skin_release="0.5.6"
 patch_level=".pl00"
 skin_rev="$skin_release""$patch_level"

--- a/cdrskin/add_ts_changes_to_libburn_0_5_7
+++ b/cdrskin/add_ts_changes_to_libburn_0_5_7
@ -38,7 +38,7 @@ original="./libburn_svn.tgz"
 # My changes are in $changes , mainly in $changes/cdrskin
 changes="./libburn-develop"

-skin_release="0.4.9"
+skin_release="0.5.7"
 patch_level=""
 skin_rev="$skin_release""$patch_level"

@ -239,7 +239,7 @@ rm -rf "$target"
 ./"$bintarget_dynamic" -version
 ./"$bintarget_static" -version
 ls -l "$cdrskin_tarball"
-ls -l "$bintarget_dynamic"*
+ls -l "$bintarget_dynamic"
 ls -l "$bintarget_static"
 ls -l $(basename "$man_page_html")

--- 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 "May 17, 2008"
+.TH CDRSKIN 1 "Oct 15, 2008"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@ -108,8 +108,9 @@ While audio tracks just contain a given time span of acoustic vibrations,
 data tracks may have an arbitray meaning. Nevertheless, ISO-9660 filesystems
 are established as a format which can represent a tree of directories and
 files on all major operating systems. Such filesystem images can be
-produced by programs mkisofs or genisoimage. They can also be extended by
-follow-up tracks if prepared properly. See the man pages of said programs.
+produced by programs mkisofs or genisoimage or xorriso.
+They can also be extended by follow-up tracks if prepared properly.
+See the man pages of said programs.
 cdrskin is able to fulfill the needs about their option -C.
 .br
 Another type of data track content are archive formats which originally
@ -160,7 +161,8 @@ round of overwriting. Usually
 is the appropriate option.
 Blanking damages the previous content but does not
 make it completely unreadable. It is no effective privacy precaution.
-Multiple cycles of blanking and overwriting with random numbers might be.
+Multiple cycles of blanking and overwriting with random numbers might be
+needed.
 .SS
 .B Sequentially Recordable DVD Media:
 .br
@ -617,7 +619,8 @@ Note: msifile=path is actually an option of wodim and not of cdrecord.
 .TP
 .BI \-msinfo
 Retrieve multi-session info for preparing a follow-up session by option -C
-of programs mkisofs or genisoimage. Print result to standard output.
+of programs mkisofs, genisoimage, or xorriso -as mkisofs.
+Print result to standard output.
 This option redirects to stderr all message output except the one of option
 --tell_media_space and its own result string, which consists of two numbers.
 The result string shall be used as argument of option -C with said programs.
@ -1080,8 +1083,9 @@ Linux specific: Do not ask the operating system to prevent opening busy drives.
 Wether this leads to senseful behavior depends on operating system and kernel.
 .TP
 .BI drive_scsi_dev_family= sr | scd | sg
-Linux specific: Select a SCSI device file family to be used for drive command
-transactions. Normally this is /dev/sgN on kernel versions < 2.6 and /dev/srN
+Linux specific: Select a SCSI device file family to be scanned for by
+options --devices and -scanbus.
+Normally this is /dev/sgN on kernel versions < 2.6 and /dev/srN
 on kernels >= 2.6 . This option allows to explicitely override that default
 in order to meet other programs at a common device file for each drive.
 On kernel 2.4 families sr and scd will find no drives.
--- a/cdrskin/cdrskin.c
+++ b/cdrskin/cdrskin.c
@ -88,7 +88,7 @@ or

 /** The official program version */
 #ifndef Cdrskin_prog_versioN
-#define Cdrskin_prog_versioN "0.4.9"
+#define Cdrskin_prog_versioN "0.5.6"
 #endif

 /** The official libburn interface revision to use.
@ -98,10 +98,10 @@ or
 #define Cdrskin_libburn_majoR 0
 #endif
 #ifndef Cdrskin_libburn_minoR
-#define Cdrskin_libburn_minoR 4
+#define Cdrskin_libburn_minoR 5
 #endif
 #ifndef Cdrskin_libburn_micrO
-#define Cdrskin_libburn_micrO 9
+#define Cdrskin_libburn_micrO 6
 #endif


@ -135,44 +135,44 @@ or
 #endif /* Cdrskin_libburn_cvs_A60220_tS */


-#ifdef Cdrskin_libburn_0_4_8
-#define Cdrskin_libburn_versioN "0.4.8"
+#ifdef Cdrskin_libburn_0_5_6
+#define Cdrskin_libburn_versioN "0.5.6"
 #define Cdrskin_libburn_from_pykix_svN 1
-#endif /* Cdrskin_libburn_0_4_8 */
+#endif /* Cdrskin_libburn_0_5_6 */

-#ifdef Cdrskin_libburn_0_4_9
-#define Cdrskin_libburn_versioN "0.4.9"
+#ifdef Cdrskin_libburn_0_5_7
+#define Cdrskin_libburn_versioN "0.5.7"
 #define Cdrskin_libburn_from_pykix_svN 1

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

-/* there are no libburn novelties in 0.4.9 yet */
+/* there are no libburn novelties in 0.5.7 yet */

-#endif /* Cdrskin_libburn_0_4_9 */
+#endif /* Cdrskin_libburn_0_5_7 */

 #ifndef Cdrskin_libburn_versioN
-#define Cdrskin_libburn_0_4_8
-#define Cdrskin_libburn_versioN "0.4.8"
+#define Cdrskin_libburn_0_5_6
+#define Cdrskin_libburn_versioN "0.5.6"
 #define Cdrskin_libburn_from_pykix_svN 1
 #endif

-#ifdef Cdrskin_libburn_0_4_8
+#ifdef Cdrskin_libburn_0_5_6
 #undef Cdrskin_libburn_majoR
 #undef Cdrskin_libburn_minoR
 #undef Cdrskin_libburn_micrO
 #define Cdrskin_libburn_majoR 0
-#define Cdrskin_libburn_minoR 4
+#define Cdrskin_libburn_minoR 5
 #define Cdrskin_libburn_micrO 6
 #endif
-#ifdef Cdrskin_libburn_0_4_9
+#ifdef Cdrskin_libburn_0_5_7
 #undef Cdrskin_libburn_majoR
 #undef Cdrskin_libburn_minoR
 #undef Cdrskin_libburn_micrO
 #define Cdrskin_libburn_majoR 0
-#define Cdrskin_libburn_minoR 4
-#define Cdrskin_libburn_micrO 9
+#define Cdrskin_libburn_minoR 5
+#define Cdrskin_libburn_micrO 5
 #endif


@ -251,6 +251,10 @@ or
 /* 0.4.8 */
 /* Bug fix release for  write_start_address=... on DVD-RAM and BD-RE */

+/* 0.5.0 , 0.5.2 , 0.5.4 , 0.5.6 */
+/* novel libburn features are transparent to cdrskin */
+
+
 #ifdef Cdrskin_new_api_tesT

 /* put macros under test caveat here */
@ -5504,7 +5508,7 @@ thank_you_for_patience:;
       if(skin->is_writing)
         fprintf(stderr,"\n");
       fprintf(stderr,
- "\rcdrskin: thank you for being patient since %.f seconds                   ",
+ "\rcdrskin: thank you for being patient for %.f seconds                     ",
           elapsed_total_time);
     }
     advance_interval= 1;
--- a/cdrskin/cdrskin_eng.html
+++ b/cdrskin/cdrskin_eng.html
@ -57,9 +57,9 @@ and to MMC-5 for DVD or BD).
 GPL software included:<BR>
 </H2>
 <DL>
-<DT>libburn-0.4.8</DT>
+<DT>libburn-0.5.6</DT>
 <DD>(founded by Derek Foreman and Ben Jansens,
-furthered by team of libburnia-project.org)</DD>
+furthered since August 2006 by Thomas Schmitt from team of libburnia-project.org)</DD>
 <DD>transfers data to CD, DVD, BD-RE</DD>
 </DL>
 </P>
@ -186,8 +186,8 @@ or to do experiments on BD-R media.
 <P>
 <DL>
 <DT>Download as source code (see README):</DT>
-<DD><A HREF="cdrskin-0.4.8.pl00.tar.gz">cdrskin-0.4.8.pl00.tar.gz</A>
-(730 KB).
+<DD><A HREF="cdrskin-0.5.6.pl00.tar.gz">cdrskin-0.5.6.pl00.tar.gz</A>
+(740 KB).
 </DD>
 <DD>
 The cdrskin tarballs are source code identical with libburn releases
@ -236,16 +236,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-0.4.6.pl00:
+Enhancements towards previous stable version cdrskin-0.5.4.pl00:
 <UL>
 <LI>none</LI>
-</UL>
-
 <!--
 -->
-Bug fixes towards cdrskin-0.4.6.pl00:
+</UL>
+
+Bug fixes towards cdrskin-0.5.4.pl00:
 <UL>
-<LI>Random access addressing for DVD-RAM and BD-RE did not work</LI>
+<LI>
+libburn fifo thread was not aborted when burn run was aborted which could
+lead to use of freed memory
+</LI>
+<!--
+<LI>none</LI>
+-->
 </UL>

 </P>
@ -254,8 +260,8 @@ Bug fixes towards cdrskin-0.4.6.pl00:

 <P>
 <DL>
-<DT><H3>Development snapshot, version 0.4.9 :</H3></DT>
-<DD>Enhancements towards current stable version 0.4.8.pl00:
+<DT><H3>Development snapshot, version 0.5.7 :</H3></DT>
+<DD>Enhancements towards current stable version 0.5.6.pl00:
 <UL>
 <!--
 -->
@ -264,10 +270,10 @@ Bug fixes towards cdrskin-0.4.6.pl00:
 </UL>
 </DD>
 <DD>&nbsp;</DD>
-<DD><A HREF="README_cdrskin_devel">README 0.4.9</A>
-<DD><A HREF="cdrskin__help_devel">cdrskin_0.4.9 --help</A></DD>
-<DD><A HREF="cdrskin_help_devel">cdrskin_0.4.9 -help</A></DD>
-<DD><A HREF="man_1_cdrskin_devel.html">man cdrskin (as of 0.4.9)</A></DD>
+<DD><A HREF="README_cdrskin_devel">README 0.5.7</A>
+<DD><A HREF="cdrskin__help_devel">cdrskin_0.5.7 --help</A></DD>
+<DD><A HREF="cdrskin_help_devel">cdrskin_0.5.7 -help</A></DD>
+<DD><A HREF="man_1_cdrskin_devel.html">man cdrskin (as of 0.5.7)</A></DD>
 <DD>&nbsp;</DD>
 <DT>Maintainers of cdrskin unstable packages please use SVN of
 <A HREF="http://libburnia-project.org"> libburnia-project.org</A></DT>
@ -287,8 +293,8 @@ admins with full system souvereignty.</DT>
 <A HREF="README_cdrskin_devel">upcoming README</A> ):
 </DD>
 <DD>
-<A HREF="cdrskin-0.4.9.tar.gz">cdrskin-0.4.9.tar.gz</A>
-(730 KB).
+<A HREF="cdrskin-0.5.7.tar.gz">cdrskin-0.5.7.tar.gz</A>
+(740 KB).
 </DD>

 <!-- This is not offered any more since spring 2008
@ -329,14 +335,33 @@ provide libburn with invaluable examples on how to deal with DVD media.
 <A NAME="examples">
 <P>
 <DL>
-<DT>Example for a setup of device permissions. To be done by the superuser:</DT>
-<DT>(CD devices which offer no rw-permission are invisible to normal users.)
+<DT>Example for a setup of device permissions.</DT>
+<DT>
+Newer Linux distros enable rw-access for the desktop user automatically.
+So try as normal user whether all your drives are found.
+CD devices which offer no rw-permission will stay invisible.
+</DT>
+<DD>$ <KBD><B>cdrskin --devices</B></KBD></DD>
+<DT>If not all desired drives show up, become superuser and do again:</DT>
 </DT>
 <DD># <KBD><B>cdrskin --devices</B></KBD></DD>
 <DD><KBD>...</KBD></DD>
-<DD><KBD>0&nbsp; dev='/dev/sr0'&nbsp; rwrwr- :&nbsp; 'TEAC'  'CD-ROM CD-532S'</KBD></DD>
+<DD><KBD>0&nbsp; dev='/dev/sr0'&nbsp; rwr-r- :&nbsp; 'TEAC'  'CD-ROM CD-532S'</KBD></DD>
 <DD><KBD>1&nbsp; dev='/dev/hdc'&nbsp; rwrw-- :&nbsp; 'LITE-ON'  'LTR-48125S'</KBD></DD>
+<DT>Most simple and most insecure is this equivalent
+of the usual cdrecord permissions u+s,a+x:</DT>
 <DD># <KBD><B>chmod a+rw /dev/sr0 /dev/hdc</B></KBD></DD>
+<DT>
+More secure is to put the permitted users into a group like
+"floppy", to assign /dev/sr0 /dev/hdc to this group,
+and to allow rw-access only to group members.
+</DT>
+<DD># <KBD><B>vi /etc/group</B></KBD></DD>
+<DD><KBD>...</KBD></DD>
+<DD><KBD>floppy:x:19:thomas,scdbackup</KBD></DD>
+<DD><KBD>...</KBD></DD>
+<DD># <KBD><B>chgrp floppy /dev/sr0 /dev/hdc</B></KBD></DD>
+<DD># <KBD><B>chmod g+rw /dev/sr0 /dev/hdc</B></KBD></DD>
 </DL>
 </P>

--- a/cdrskin/cdrskin_timestamp.h
+++ b/cdrskin/cdrskin_timestamp.h
@ -1 +1 @@
-#define Cdrskin_timestamP "2008.07.14.164528"
+#define Cdrskin_timestamP "2008.11.12.120001"
--- a/cdrskin/changelog.txt
+++ b/cdrskin/changelog.txt
@ -5546,13 +5546,14 @@ Made number transition to 0.4.8 and activated development documentation
 + cdrskin/add_ts_changes_to_libburn_0_4_9
 Updated cdrskin tarball generator

-17 May 2008  []
+17 May 2008  [1792]
 cdrskin/changelog.txt
 Documented changes and release timestamp

 ----------------------------- release  - cdrskin-0.4.8.pl00 - 2008.05.17.080001
 * Bug fix: random access addressing for DVD-RAM and BD-RE did not work

+
 2008.05.17.115434  [1790]
 Makefile.am
 configure.ac
@ -5573,13 +5574,389 @@ Made number transition to 0.4.9
 + cdrskin/add_ts_changes_to_libburn_0_4_9
 Updated cdrskin tarball generator

-17 May 2008  []
+17 May 2008  [1793]
 cdrskin/changelog.txt
 Documented changes and release timestamp

+------------------------------------ cycle  - cdrskin-0.4.9 - 2008.05.17.121250

------------------------------------ cycle  - cdrskin-0.4.9 - 
------------------------------------ cycle  - cdrskin-0.4.9 - 
+14 Jun 2008  [1852]
+README
+Updated release history
+
+2008.06.14.140711  [1853]
+libburn/libburn.h
+Inserted @since tags for all functions older than 0.2.0
+
+2008.07.02.093933  [1882]
+libburn/sg-linux.c
+With auto device family: scd is now fallback if sr does not exist
+
+------------------------------------ cycle  - cdrskin-0.4.9 - 2008.07.12.164045
+* Ability to use /dev/scd as fallback if /dev/sr does not exist
+* Bug fix: option drive_scsi_dev_family=scd lead to buffer overflow
+
+
+2008.07.14.112935  [1914]
+libburn/sg-linux.c
+libburn/libdax_msgs.h
+Trying to avoid SORRY messages when hitting busy hard disk /dev/hdX
+
+2008.07.14.113050  [1915]
+cdrskin/cdrskin.c
+Making visible the new NOTE and HINT about busy alleged hard disks
+
+2008.07.14.113152  [1916]
+configure.ac
+Did LT_CURRENT++, LT_AGE++ because of new API call
+
+2008.07.14.113903  [1917]
+libburn/libburn.h
+libburn/file.c
+libburn/async.c
+New API call burn_fifo_peek_data()
+
+2008.07.14.164528  [1922]
+libburn/sg-linux.c
+Followed hint of Giulio Orsero to recognize disk by /proc/ide/hdX/media
+
+------------------------------------ cycle  - cdrskin-0.4.9 - 2008.07.14.164906
+* New API call burn_fifo_peek_data()
+
+2008.07.16.070001  [1927]
+Makefile.am
+configure.ac
+README
+libburn/libburn.h
+cdrskin/cdrskin.c
+cdrskin/README
+cdrskin/compile_cdrskin.sh
+cdrskin/cdrskin_timestamp.h
+cdrskin/cdrskin_eng.html
+Made number transition to 0.5.0 and activated development documentation
+
+16 Jul 2008  [1928]
+- cdrskin/add_ts_changes_to_libburn_0_4_8
+- cdrskin/add_ts_changes_to_libburn_0_4_9
+ cdrskin/add_ts_changes_to_libburn_0_5_0
+ cdrskin/add_ts_changes_to_libburn_0_5_1
+Updated cdrskin tarball generator
+
+16 Jul 2008  [1929]
+cdrskin/changelog.txt
+Documented changes and release timestamp
+
+------------------------------ release - cdrskin-0.5.0.pl00 - 2008.07.16.070001
+* Ability to use /dev/scd as fallback if /dev/sr does not exist
+* Bug fix: option drive_scsi_dev_family=scd lead to buffer overflow
+* New API call burn_fifo_peek_data()
+
+
+2008.07.16.090816  [1930]
+Makefile.am
+configure.ac
+README
+libburn/libburn.h
+cdrskin/cdrskin.c
+cdrskin/README
+cdrskin/compile_cdrskin.sh
+cdrskin/cdrskin_timestamp.h
+cdrskin/cdrskin_eng.html
+Made number transition to 0.5.1 and activated development documentation
+
+16 Jul 2008  [1931]
+- cdrskin/add_ts_changes_to_libburn_0_4_8
+- cdrskin/add_ts_changes_to_libburn_0_4_9
+ cdrskin/add_ts_changes_to_libburn_0_5_0
+ cdrskin/add_ts_changes_to_libburn_0_5_1
+Updated cdrskin tarball generator
+
+16 Jul 2008  [1932]
+cdrskin/changelog.txt
+Documented changes and release timestamp
+
+------------------------------------ cycle  - cdrskin-0.5.1 - 2008.07.14.164528
+
+
+2008.08.01.101053  [1954]
+libburn/drive.h
+libburn/drive.c
+libburn/sg-linux.c
+Avoiding drive scan if single drive is given
+
+2008.08.05.175930  [1963]
+libburn/os-linux.h
+libburn/drive.h
+libburn/drive.c
+libburn/sg-linux.c
+libburn/libdax_msgs.h
+cdrskin/cdrskin.1
+Taking into respect drive list from /proc/sys/dev/cdrom/info
+
+5 Aug 2008  [1964]
+cdrskin/cdrskin_eng.html
+Updated for next 0.5.1 cycle
+
+------------------------------------ cycle  - cdrskin-0.5.1 - 
+* Larger set of possibly acceptable drive device file names
+
+
+2008.08.09.071742  [1975]
+libburn/mmc.c
+libburn/structure.h
+libburn/structure.c
+CD burn_toc_entries now bear extension_valid data
+
+2008.08.09.071854  [1976]
+libburn/libburn.h
+libburn/read.c
+New flag bit2 with burn_read_data()
+
+2008.08.19.122535  [1991]
+libburn/libburn.h
+API clarification about CD burn_toc_entries
+
+2008.08.19.123513  [1992]
+libburn/structure.c
+Reacted on harmless compiler warning
+
+------------------------------------ cycle  - cdrskin-0.5.1 - 2008.08.19.123513
+
+2008.08.20.080001  [1994]
+Makefile.am
+configure.ac
+README
+libburn/libburn.h
+cdrskin/cdrskin.c
+cdrskin/README
+cdrskin/compile_cdrskin.sh
+cdrskin/cdrskin_timestamp.h
+cdrskin/cdrskin_eng.html
+Made number transition to 0.5.2 and activated development documentation
+
+20 Aug 2008  [1995]
+- cdrskin/add_ts_changes_to_libburn_0_5_0
+- cdrskin/add_ts_changes_to_libburn_0_5_1
+ cdrskin/add_ts_changes_to_libburn_0_5_2
+ cdrskin/add_ts_changes_to_libburn_0_5_3
+Updated cdrskin tarball generator
+
+20 Aug 2008  [1996]
+cdrskin/changelog.txt
+Documented changes and release timestamp
+
+------------------------------ release - cdrskin-0.5.2.pl00 - 2008.08.20.080001
+* Larger set of possibly acceptable drive device file names
+
+2008.08.20.100045  [1997]
+Makefile.am
+configure.ac
+README
+libburn/libburn.h
+cdrskin/cdrskin.c
+cdrskin/README
+cdrskin/compile_cdrskin.sh
+cdrskin/cdrskin_timestamp.h
+cdrskin/cdrskin_eng.html
+Made number transition to 0.5.3
+
+20 Aug 2008  [1998]
+- cdrskin/add_ts_changes_to_libburn_0_5_0
+- cdrskin/add_ts_changes_to_libburn_0_5_1
+ cdrskin/add_ts_changes_to_libburn_0_5_2
+ cdrskin/add_ts_changes_to_libburn_0_5_3
+Updated cdrskin tarball generator
+
+20 Aug 2008  [1999]
+cdrskin/changelog.txt
+Documented changes and release timestamp
+
+------------------------------------ cycle  - cdrskin-0.5.3 - 2008.08.20.110457
+
+30 Aug 2008  [2023]
+README
+Mentioned release of libisoburn-0.2.4
+
+2008.08.30.104339  [2024]
+libburn/mmc.c
+libburn/spc.c
+Issueing many SCSI error messages in cleartext now
+
+2008.09.09.131915  [2039]
+libburn/sg-linux.c
+Trying to avoid unnecessary access to sibling device objects
+
+12 Sep 2008  [2043]
+doc/cookbook.txt
+Described ISO 9660 multi-session on overwriteable media
+
+2008.09.14.174344  [2048]
+libburn/util.c
+Gave up problematic and unused version.h
+
+2008.09.16.060250  [2052]
+cdrskin/cdrskin.c
+Corrected pacifier text (Ticket 141)
+
+24 Sep 2008  [2079]
+README
+Mentioned recent releases of libisofs and libisoburn
+
+2008.09.28.193802  [2086]
+libburn/spc.c
+Bug fix: Potential buffer overflow introduced with revision 2024
+
+2008.09.28.211741  [2087]
+libburn/sg-linux.c
+Bug fix: /dev/sr0 was accepted as enumerable address on Linux 2.4
+
+2008.10.04.072657  [2096]
+libburn/write.c
+libburn/read.c
+libburn/drive.c
+Prevented SIGSEGV after illegal drive operations during sync write
+
+2008.10.04.072657  [2097]
+cdrskin/cdrskin.1
+Mentioned new xorriso capabilities in man cdrskin
+
+2008.10.04.073814  [2098]
+configure.ac
+Incremented LT_CURRENT and LT_AGE to get libburn.so.4.18.0 
+
+------------------------------------ cycle  - cdrskin-0.5.3 - 2008.10.04.072657
+* Bug fix: /dev/sr0 was accepted as enumerable address on Linux 2.4
+
+
+2008.10.05.073001  [2102]
+Makefile.am
+configure.ac
+README
+libburn/libburn.h
+cdrskin/cdrskin.c
+cdrskin/README
+cdrskin/compile_cdrskin.sh
+cdrskin/cdrskin_timestamp.h
+cdrskin/cdrskin_eng.html
+Made number transition
+
+5 Oct 2008  [2103]
+- cdrskin/add_ts_changes_to_libburn_0_5_2
+- cdrskin/add_ts_changes_to_libburn_0_5_3
+ cdrskin/add_ts_changes_to_libburn_0_5_4
+ cdrskin/add_ts_changes_to_libburn_0_5_5
+Updated cdrskin tarball generator
+
+5 Oct 2008  [2104]
+cdrskin/changelog.txt
+Documented changes and release timestamp
+
+------------------------------ release - cdrskin-0.5.4.pl00 - 2008.10.06.073001
+* Bug fix: /dev/sr0 was accepted as enumerable address on Linux 2.4
+* Issueing many SCSI error messages in cleartext now
+
+
+2008.10.05.123737  [2106]
+Makefile.am
+configure.ac
+README
+libburn/libburn.h
+cdrskin/cdrskin.c
+cdrskin/README
+cdrskin/compile_cdrskin.sh
+cdrskin/cdrskin_timestamp.h
+cdrskin/cdrskin_eng.html
+Made number transition to next development cycle
+
+5 Oct 2008  [2107]
+- cdrskin/add_ts_changes_to_libburn_0_5_2
+- cdrskin/add_ts_changes_to_libburn_0_5_3
+ cdrskin/add_ts_changes_to_libburn_0_5_4
+ cdrskin/add_ts_changes_to_libburn_0_5_5
+Updated cdrskin tarball generator
+
+5 Oct 2008  [2108]
+cdrskin/changelog.txt
+Documented changes and release timestamp
+
+------------------------------------ cycle  - cdrskin-0.5.5 - 2008.10.05.130109
+
+
+2008.10.15.103224  [2126]
+libburn/libburn.h
+A clarification in comment about burn_disc_format()
+
+15 Oct 2008  [2127]
+cdrskin/cdrskin.1
+Fixed incomplete sentence in man cdrskin
+
+2008.11.01.121240  [2157]
+libburn/libburn.h
+libburn/async.c
+Bug fix: Unsuitable write modes were caught silently and later than desired
+
+------------------------------------ cycle  - cdrskin-0.5.5 - 2008.11.01.121445
+
+2008.11.08.134828  [2173]
+libburn/libburn.h
+Clarified behavior of burn_source with pipes
+
+2008.11.08.141734  [2174]
+libburn/file.h
+libburn/file.c
+libburn/async.c
+Cancelling libburn fifo thread before freeing the fifo object
+
+2008.11.08.202456  [2175]
+libburn/async.c
+Disabling the sigsegv provoking new debug message
+
+2008.11.12.075111  [2180]
+libburn/async.h
+Avoiding warning message about implicitely declared burn_fifo_abort()
+
+------------------------------------ cycle  - cdrskin-0.5.5 - 2008.11.12.075411
+* Bug fix: libburn fifo thread was not aborted when burn run was aborted
+
+12 Nov 2008  [2181]
+svn copy http://svn.libburnia-project.org/libburn/trunk
+         http://svn.libburnia-project.org/libburn/branches/ZeroFiveSix
+Preparing for libburn-0.5.6
+
+12 Nov 2008  [2182]
+svn delete http://svn.libburnia-project.org/libburn/branches/ZeroFourSix
+Removing obsolete libburn branch ZeroFourSix
+
+
+2008.11.12.120001 [2183]
+Makefile.am
+configure.ac
+README
+libburn/libburn.h
+cdrskin/cdrskin.c
+cdrskin/README
+cdrskin/compile_cdrskin.sh
+cdrskin/cdrskin_timestamp.h
+cdrskin/cdrskin_eng.html
+Made number transition to 0.5.6
+
+12 Nov 2008  [2184]
+- cdrskin/add_ts_changes_to_libburn_0_5_4
+- cdrskin/add_ts_changes_to_libburn_0_5_5
+ cdrskin/add_ts_changes_to_libburn_0_5_6
+ cdrskin/add_ts_changes_to_libburn_0_5_7
+Updated cdrskin tarball generator
+
+12 Nov 2008  []
+cdrskin/changelog.txt
+Documented changes and release timestamp
+
+------------------------------ release - cdrskin-0.5.6.pl00 - 2008.10.06.073001
+* Bug fix: libburn fifo thread was not aborted when burn run was aborted
+which could lead to use of freed memory
+
+------------------------------------ cycle  - cdrskin-0.5.7 - 
+------------------------------------ cycle  - cdrskin-0.5.7 - 

 ===============================================================================
                                    TODO
@ -5588,6 +5965,11 @@ Documented changes and release timestamp

 --------------------------------- bugs -------------------------------------

+- Do something about drive->buffer asynchronous race conditions
+  and dangerous use of local heap memory.
+  (The various asynchronous operations use the same buffer
+   pointer in struct burn_drive and let it point to
+   their private memory.)

 - Why are DVD+R tracks labeled "invisible" by dvd+rw-mediainfo ?
  Why does the DVD drive only show the first session ?
@ -5601,9 +5983,11 @@ READ TRACK INFORMATION[#5]:

 ------------------------------ end of bugs ---------------------------------

-provide DVD+R DL layer break setter
+Enable profile 0x41 BD-R sequential recording (much like DVD+R)

-@since tags
+? Enable profile 0x42 BD-R random recording
+
+Provide DVD+R DL layer break setter

 Check all SORRY and FATAL errors whether they should become FAILUREs

@ -5645,10 +6029,6 @@ http://developer.osdl.org/dev/robustmutexes/src/fusyn.hg/Documentation/ioctl/cdr
  []
 Convert burn_print() into libdax_msgs_submit()

-  []
-Test unlocking of all drives by burn_drive_info_free()
-Test unlocking of single drive by burn_drive_grab(), burn_drive_release()
-
  []
 Clear outdated persistent read buffer after small CD image was read (ticket 57)

--- a/cdrskin/compile_cdrskin.sh
+++ b/cdrskin/compile_cdrskin.sh
@ -7,7 +7,7 @@
 debug_opts="-O2"
 def_opts=
 largefile_opts="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1"
-libvers="-DCdrskin_libburn_0_4_9"
+libvers="-DCdrskin_libburn_0_5_6"
 cleanup_src_or_obj="libburn/cleanup.o"
 libdax_msgs_o="libburn/libdax_msgs.o"
 libdax_audioxtr_o="libburn/libdax_audioxtr.o"
@ -33,15 +33,15 @@ do
    libdax_audioxtr_o=
    libdax_msgs_o="libburn/message.o"
    cleanup_src_or_obj="-DCleanup_has_no_libburn_os_H cdrskin/cleanup.c"
-  elif test "$i" = "-libburn_0_4_8"
+  elif test "$i" = "-libburn_0_5_6"
  then
-    libvers="-DCdrskin_libburn_0_4_8"
+    libvers="-DCdrskin_libburn_0_5_6"
    libdax_audioxtr_o="libburn/libdax_audioxtr.o"
    libdax_msgs_o="libburn/libdax_msgs.o"
    cleanup_src_or_obj="libburn/cleanup.o"
  elif test "$i" = "-libburn_svn"
  then
-    libvers="-DCdrskin_libburn_0_4_9"
+    libvers="-DCdrskin_libburn_0_5_7"
    libdax_audioxtr_o="libburn/libdax_audioxtr.o"
    libdax_msgs_o="libburn/libdax_msgs.o"
    cleanup_src_or_obj="libburn/cleanup.o"
@ -76,7 +76,7 @@ do
    echo "  -compile_cdrfifo  compile program cdrskin/cdrfifo."
    echo "  -compile_dewav    compile program test/dewav without libburn."
    echo "  -cvs_A60220       set macro to match libburn-CVS of 20 Feb 2006."
-    echo "  -libburn_0_4_8    set macro to match libburn-0.4.8."
+    echo "  -libburn_0_5_6    set macro to match libburn-0.5.6"
    echo "  -libburn_svn      set macro to match current libburn-SVN."
    echo "  -no_largefile     do not use 64 bit off_t (must match libburn)."
    echo "  -do_not_compile_cdrskin  omit compilation of cdrskin/cdrskin."
--- a/configure.ac
+++ b/configure.ac
@ -1,4 +1,4 @@
-AC_INIT([libburn], [0.4.9], [http://libburnia-project.org])
+AC_INIT([libburn], [0.5.6], [http://libburnia-project.org])
 AC_PREREQ([2.50])
 dnl AC_CONFIG_HEADER([config.h])	

@ -7,7 +7,7 @@ AC_CANONICAL_TARGET

 AM_INIT_AUTOMAKE([subdir-objects])

-dnl Notes by ts A71207 - A80126 :
+dnl Notes by ts A71207 - A81111 :
 dnl
 dnl Regrettably the meaning of the various version types was misunderstood
 dnl before version 0.4.1.
@ -62,6 +62,10 @@ dnl    0.4.2 = libburn.so.4.7.0
 dnl    0.4.4 = libburn.so.4.9.0
 dnl    0.4.6 = libburn.so.4.11.0
 dnl    0.4.8 = libburn.so.4.13.0
+dnl    0.5.0 = libburn.so.4.15.0
+dnl    0.5.2 = libburn.so.4.17.0
+dnl    0.5.4 = libburn.so.4.19.0
+dnl    0.5.6 = libburn.so.4.21.0
 dnl
 dnl So LT_CURRENT, LT_REVISION and LT_AGE get set directly here.
 dnl SONAME of the emerging library is  LT_CURRENT - LT_AGE.
@ -86,8 +90,8 @@ dnl If BURN_*_VERSION changes, be sure to change AC_INIT above to match.
 dnl
 dnl As said: Only copies. Original in libburn/libburn.h : burn_header_version_*
 BURN_MAJOR_VERSION=0
-BURN_MINOR_VERSION=4
-BURN_MICRO_VERSION=9
+BURN_MINOR_VERSION=5
+BURN_MICRO_VERSION=6
 BURN_VERSION=$BURN_MAJOR_VERSION.$BURN_MINOR_VERSION.$BURN_MICRO_VERSION

 AC_SUBST(BURN_MAJOR_VERSION)
@ -98,15 +102,15 @@ AC_SUBST(BURN_VERSION)
 dnl Libtool versioning
 LT_RELEASE=$BURN_MAJOR_VERSION.$BURN_MINOR_VERSION.$BURN_MICRO_VERSION
 dnl
-dnl ts A80713
-dnl ### This is the release version libburn-0.4.8 = libburn.so.4.13.0
-dnl This is the development version after above release version
-dnl ### LT_CURRENT++, LT_AGE++ has not yet happened.
-dnl LT_CURRENT++, LT_AGE++ has happened meanwhile.
+dnl ts A81111
+dnl This is the release version libburn-0.5.6 = libburn.so.4.21.0
+dnl ### This is the development version after above release version
+dnl LT_CURRENT++, LT_AGE++ has not yet happened.
+dnl ### LT_CURRENT++, LT_AGE++ has happened meanwhile.
 dnl
-dnl SONAME = 18 - 14 = 4 . Library name = libburn.so.4.14.0
-LT_CURRENT=18
-LT_AGE=14
+dnl SONAME = 25 - 21 = 4 . Library name = libburn.so.4.21.0
+LT_CURRENT=25
+LT_AGE=21
 LT_REVISION=0
 LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`

--- a/doc/cookbook.txt
+++ b/doc/cookbook.txt
@ -432,6 +432,10 @@ The recipes described here are depending on formatting state:
 - DVD-RAM and BD-RE formatting
 - DVD-RAM and BD-RE speed tuning

+Slightly off topic are
+- ISO 9660 multi-session emulation on overwriteable media
+- ISO 9660 based TOC emulation on overwriteable media
+
 -------------------------------------------------------------------------------
 Overwriting in general :

@ -522,7 +526,7 @@ with Close Function 010b despite there is no session open in this scenario.)


 -------------------------------------------------------------------------------
-Unformatted DVD+RW
+Unformatted DVD+RW :

 This is the state of previously unused DVD+RW media.

@ -762,6 +766,76 @@ Nevertheless it worked on all tested drives is proper alignment was observed.
 (mmc5r03c.pdf 5.4.13, 6.45)


+-------------------------------------------------------------------------------
+ISO 9660 multi-session emulation on overwriteable media :
+
+Overwriteable media provide a single overwriteable track which may grow up to
+the full media capacity. There is no builtin table-of-content which records
+the history of write sessions.
+mount -t iso9660 will use sbsector=0 as default.
+The term "superblock" shall depict the first 64 KiB after the sbsector address.
+
+ISO 9660 multi-session depends on typical TOC information in two ways:
+It needs the superblock address MSC1 of the most recently recorded session and
+it needs the Next Writeable Address NWA for which to prepare the adress offset.
+
+The following is learned from growisofs and from ECMA-119:
+http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-119.pdf
+
+ISO 9660 filesystems provide information about the number of sectors which
+is also the lowest unused block address and thus a suitable NWA.
+This block address is stored in the Primary Volume Descriptor which is supposed
+to be stored in block 16 (eventually relative to MSC1).
+The bytes 0 to 5 of a PVD block are 
+   0x01 'C' 'D' '0' '0' '1'
+The sector count can then be read from byte 80 to 83
+   sectors= pvd[80] | (pvd[81] << 8) | (pvd[82] << 16) | (pvd[83] << 24);
+To support CD, DVD and BD media alike, it is advisable to round the NWA
+to the next multiple of 32 (= 64 KiB).
+(Ecma-119.pdf 8.4)
+
+So one can use 0 as MSC1 and prepare a new ISO session for the computed NWA.
+After writing the session it is necessary to patch the PVD at LBA 16.
+The minimal change would be to update the number of image sectors.
+It is stored in both notations LSB and MSB:
+   for(i= 0; i < 4; i++)
+     pvd[87 - i]= pvd[80 + i]= (sectors >> (8 * i)) & 0xff;
+
+cdrskin --grow_overwriteable not only patches the sector fields of the
+PVD block but also the blocks up to LBA 31 which begin with
+   0xff 'C' 'D' '0' '0' '1'
+libisoburn submits 64 KiB data buffer to libisofs before image generation and
+afterwards writes these 64 KiB as new superblock to LBA 0.
+
+
+-------------------------------------------------------------------------------
+ISO 9660 based TOC emulation on overwriteable media :
+
+Above method of multi-session emulation yields a single session image after
+each add-on session. No reliable session history can be read because the
+sector size of the existing session gets overwritten by the new one.
+A TOC with session history is nevertheless desirable with incremental backups
+in order to access older backup states by mounting older superblocks at the
+start addresses of older sessions.
+
+All usual ISO 9660 formatter programs write a complete superblock to the
+start of each session.
+With a uniform NWA rounding rule it is possible to compute the address of
+superblock N+1 as the NWA after session N. The only problem is N=1
+because it gets overwritten by later sessions.
+
+libisoburn preserves the information of session 1 by writing the first session
+to LBA 32 rather than LBA 0. Afterwards it writes the overall superblock to
+LBA 0 (up to 31).
+So with all further add-on sessions the superblock at LBA 0 will enclose the
+overall image, while the superblocks of the sessions form a chain beginning
+at LBA 32. Each session superblock points to the next one by its sector count
+rounded up to 32. The chain end is marked by the overall image size.
+This chain gives the start addresses of sessions. The sector count minus start
+address gives the size of a particular session. ECMA-119 explains how to
+retrieve more info from the PVD (e.g. the volume id).
+
+
 -------------------------------------------------------------------------------

 -------------------------------------------------------------------------------
--- a/doc/doxygen.conf.in
+++ b/doc/doxygen.conf.in
@ -38,7 +38,7 @@ PROJECT_NUMBER         = @PACKAGE_VERSION@
 # If a relative path is entered, it will be relative to the location 
 # where doxygen was started. If left blank the current directory will be used.

-OUTPUT_DIRECTORY       = 
+OUTPUT_DIRECTORY       = @abs_top_builddir@

 # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 
 # 4096 sub-directories (in 2 levels) under the output directory of each output 
@ -104,7 +104,7 @@ INLINE_INHERITED_MEMB  = NO
 # path before files name in the file list and in the header files. If set 
 # to NO the shortest path that makes the file name unique will be used.

-FULL_PATH_NAMES        = YES
+FULL_PATH_NAMES        = NO

 # If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag 
 # can be used to strip a user-defined part of the path. Stripping is 
@ -113,7 +113,7 @@ FULL_PATH_NAMES        = YES
 # If left blank the directory from which doxygen is run is used as the 
 # path to strip.

-STRIP_FROM_PATH        = @top_srcdir@
+STRIP_FROM_PATH        = 

 # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of 
 # the path mentioned in the documentation of a class, which tells 
--- a/libburn/async.c
+++ b/libburn/async.c
@ -25,9 +25,9 @@
 #include "drive.h"
 #include "write.h"
 #include "options.h"
+#include "file.h"
 #include "async.h"
 #include "init.h"
-#include "file.h"
 #include "back_hacks.h"

 #include <pthread.h>
@ -495,7 +495,7 @@ void burn_disc_write(struct burn_write_opts *opts, struct burn_disc *disc)
 	*/
 	strcpy(reasons, "Write job parameters are unsuitable:\n");
 	if (burn_precheck_write(opts, disc, reasons + strlen(reasons), 1)
-	     == BURN_WRITE_NONE) {
+	     <= 0) {
 		libdax_msgs_submit(libdax_messenger,
 				opts->drive->global_index, 0x00020139,
 				LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
@ -518,6 +518,12 @@ void burn_disc_write(struct burn_write_opts *opts, struct burn_disc *disc)

 static void *fifo_worker_func(struct w_list *w)
 {
+	int old;
+
+	pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &old);
+	pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, &old);
+		/* Note: Only burn_fifo_abort() shall cancel the fifo thread */
+
 	burn_fifo_source_shoveller(w->u.fifo.source, w->u.fifo.flag);
 	remove_worker(pthread_self());
 	return NULL;
@ -547,6 +553,27 @@ int burn_fifo_start(struct burn_source *source, int flag)
 }


+int burn_fifo_abort(struct burn_source_fifo *fs, int flag)
+{
+	int ret;
+	pthread_t pt;
+
+	if (fs->thread_is_valid <= 0 || fs->thread_handle == NULL)
+		return(2);
+
+#ifdef NIX
+	libdax_msgs_submit(libdax_messenger, -1, 0x00000002,
+			LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
+			"Aborting running burn_source_fifo thread", 0, 0);
+#endif /* NIX */
+
+	pt= *((pthread_t *) fs->thread_handle);
+	remove_worker(pt);
+	ret = pthread_cancel(pt);
+	return (ret == 0);
+}
+
+
 #ifdef Libburn_has_burn_async_join_alL

 /* ts A71019 : never used */
--- a/libburn/async.h
+++ b/libburn/async.h
@ -10,5 +10,9 @@ struct burn_write_opts;
 /* To be called when the first read() call comes to a fifo */
 int burn_fifo_start(struct burn_source *source, int flag);

+/* ts A81108 */
+/* To abort a running fifo thread before the fifo object gets deleted */
+int burn_fifo_abort(struct burn_source_fifo *fs, int flag);
+

 #endif /* BURN__ASYNC_H */
--- a/libburn/drive.c
+++ b/libburn/drive.c
@ -196,6 +196,31 @@ unsigned int burn_drive_count(void)
 }


+/* ts A80801 */
+int burn_drive_is_listed(char *path, struct burn_drive **found, int flag)
+{
+	int i, ret;
+	char drive_adr[BURN_DRIVE_ADR_LEN], off_adr[BURN_DRIVE_ADR_LEN];
+
+	ret = burn_drive_convert_fs_adr(path, off_adr);
+	if (ret <= 0)
+		strcpy(off_adr, path);
+	for (i = 0; i <= drivetop; i++) {
+		if (drive_array[i].global_index < 0)
+	continue;
+		ret = burn_drive_d_get_adr(&(drive_array[i]), drive_adr);
+		if (ret <= 0)
+	continue;
+		if(strcmp(off_adr, drive_adr) == 0) {
+			if (found != NULL)
+				*found= &(drive_array[i]);
+			return 1;
+		}
+	}
+	return 0;
+}
+
+
 /* ts A61125 : media status aspects of burn_drive_grab() */
 int burn_drive_inquire_media(struct burn_drive *d)
 {
@ -599,7 +624,7 @@ void burn_disc_format_sync(struct burn_drive *d, off_t size, int flag)
 	int ret, buf_secs, err, i, stages = 1, pbase, pfill, pseudo_sector;
 	off_t num_bufs;
 	char msg[80];
-	struct buffer buf;
+	struct buffer buf, *buf_mem = d->buffer;

 	/* reset the progress */
 	d->progress.session = 0;
@ -681,7 +706,7 @@ void burn_disc_format_sync(struct burn_drive *d, off_t size, int flag)
 ex:;
 	d->progress.sector = 0x10000;
 	d->busy = BURN_DRIVE_IDLE;
-	d->buffer = NULL;
+	d->buffer = buf_mem;
 }


@ -1166,6 +1191,20 @@ int burn_drive_is_banned(char *device_address)
 }


+/* ts A80731 */
+int burn_drive_whitelist_count(void)
+{
+	return enumeration_whitelist_top + 1;
+}
+
+char *burn_drive_whitelist_item(int idx, int flag)
+{
+	if (idx < 0 || idx > enumeration_whitelist_top)
+		return NULL;
+	return enumeration_whitelist[idx];
+}
+
+
 /* ts A70924 */
 int burn_drive__fd_from_special_adr(char *adr)
 {
--- a/libburn/drive.h
+++ b/libburn/drive.h
@ -125,4 +125,14 @@ int burn_drive__fd_from_special_adr(char *adr);
 int burn_drive_find_by_thread_pid(struct burn_drive **d, pid_t pid);


+/* ts A51221 - A80731 : Whitelist inquiry functions */
+int burn_drive_is_banned(char *device_address);
+int burn_drive_whitelist_count(void);
+char *burn_drive_whitelist_item(int idx, int flag);
+
+
+/* ts A80801 */
+int burn_drive_is_listed(char *path, struct burn_drive **found, int flag);
+
+
 #endif /* __DRIVE */
--- a/libburn/file.c
+++ b/libburn/file.c
@ -9,6 +9,8 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <time.h>
+#include <pthread.h>
+
 #include "source.h"
 #include "libburn.h"
 #include "file.h"
@ -307,6 +309,7 @@ static void fifo_free(struct burn_source *source)
 {
 	struct burn_source_fifo *fs = source->data;

+	burn_fifo_abort(fs, 0);
 	if (fs->inp != NULL)
 		burn_source_free(fs->inp);
 	if (fs->buf != NULL)
@ -320,9 +323,12 @@ int burn_fifo_source_shoveller(struct burn_source *source, int flag)
 	struct burn_source_fifo *fs = source->data;
 	int ret, bufsize, diff, wpos, rpos, trans_end, free_bytes;
 	char *bufpt;
+	pthread_t thread_handle_storage;

+	fs->thread_handle= &thread_handle_storage;
+	*((pthread_t *) fs->thread_handle)= pthread_self();
 	fs->thread_pid = getpid();
-	fs->thread_pid_valid = 1;
+	fs->thread_is_valid = 1;

 	bufsize = fs->chunksize * fs->chunks;
 	while (!fs->end_of_consumption) {
@ -430,6 +436,8 @@ int burn_fifo_source_shoveller(struct burn_source *source, int flag)
 	free(fs->buf); /* Give up fifo buffer. Next fifo might start soon. */
 	fs->buf = NULL;

+	fs->thread_handle= NULL;
+	fs->thread_is_valid = 0;
 	return (fs->input_error == 0);
 }

@ -465,8 +473,9 @@ struct burn_source *burn_fifo_source_new(struct burn_source *inp,
 	if (fs == NULL)
 		return NULL;
 	fs->is_started = 0;
+	fs->thread_handle = NULL;
 	fs->thread_pid = 0;
-	fs->thread_pid_valid = 0;
+	fs->thread_is_valid = 0;
 	fs->inp = NULL; /* set later */
 	fs->chunksize = chunksize;
 	fs->chunks = chunks;
--- a/libburn/file.h
+++ b/libburn/file.h
@ -29,8 +29,9 @@ struct burn_source_fifo {
 	*/
 	int is_started;

+	void *thread_handle; /* actually a pointer to a thread_t */
 	int thread_pid;
-	int thread_pid_valid;
+	int thread_is_valid;

 	/* the burn_source for which this fifo is acting as proxy */
 	struct burn_source *inp;
--- a/libburn/libburn.h
+++ b/libburn/libburn.h
@ -306,7 +306,8 @@ struct burn_toc_entry

 	/* Indicates whether extension data are valid and eventually override
 	   older elements in this structure:
-	     bit0= DVD extension is valid
+	     bit0= DVD extension is valid @since 0.3.2
+                   @since 0.5.2 : DVD extensions are made valid for CD too
 	*/
 	unsigned char extensions_valid;  

@ -383,6 +384,13 @@ struct burn_source {
 	    The size of a sector depends on BURN_MODE_*. The known range is
 	    2048 to 2352.

+            If this call is reading from a pipe then it will learn
+            about the end of data only when that pipe gets closed on the
+            feeder side. So if the track size is not fixed or if the pipe
+            delivers less than the predicted amount or if the size is not
+            block aligned, then burning will halt until the input process
+            closes the pipe.
+
 	    IMPORTANT:
 	    If this function pointer is NULL, then the struct burn_source is of
 	    version >= 1 and the job of .(*read)() is done by .(*read_xt)().
@ -812,7 +820,8 @@ void burn_allow_untested_profiles(int yes);
    If the path does not exist in the filesystem yet, it is attempted to create
    it as a regular file as soon as write operations are started.

-    The capabilities of role 3 resemble a blank DVD-R.
+    The capabilities of role 3 resemble a blank DVD-R. Nevertheless each
+    burn_disc_write() run may only write a single track.

    One may distinguish pseudo-drives from MMC drives by call
    burn_drive_get_drive_role().
@ -1211,7 +1220,8 @@ void burn_disc_erase(struct burn_drive *drive, int fast);
 /** Format media for use with libburn. This currently applies to DVD-RW
    in state "Sequential Recording" (profile 0014h) which get formatted to
    state "Restricted Overwrite" (profile 0013h). DVD+RW can be "de-iced"
-    by setting bit2 of flag. Other media cannot be formatted yet. 
+    by setting bit2 of flag. DVD-RAM and BD-RE may get formatted initially
+    or re-formatted to adjust their Defect Managment.
    This function usually returns while the drive is still in the process
    of formatting. The formatting is done, when burn_drive_get_status()
    returns BURN_DRIVE_IDLE. This may be immediately after return or may
@ -1235,13 +1245,15 @@ void burn_disc_erase(struct burn_drive *drive, int fast);
                bit4= enforce re-format of (partly) formatted media
                bit5= try to disable eventual defect management
 		bit6= try to avoid lengthy media certification
-                bit7= MMC expert application mode (else libburn tries to
-                      choose a suitable format type):
-                      bit8 to bit15 contain the index of the format to use. See
-                      burn_disc_get_formats(), burn_disc_get_format_descr().
+                bit7, bit8 to bit15 =
+                      bit7 enables MMC expert application mode (else libburn
+                      tries to choose a suitable format type):
+                      If it is set then bit8 to bit15 contain the index of
+                      the format to use. See burn_disc_get_formats(),
+                      burn_disc_get_format_descr().
                      Acceptable types are: 0x00, 0x01, 0x10, 0x11, 0x13,
                      0x15, 0x26, 0x30, 0x31.
-                      If bit7 is set, bit4 is set automatically.
+                      If bit7 is set, then bit4 is set automatically.
    @since 0.3.0
 */
 void burn_disc_format(struct burn_drive *drive, off_t size, int flag);
@ -2192,8 +2204,8 @@ void burn_version(int *major, int *minor, int *micro);

 */
 #define burn_header_version_major  0
-#define burn_header_version_minor  4
-#define burn_header_version_micro  9
+#define burn_header_version_minor  5
+#define burn_header_version_micro  6
 /** Note:
    Above version numbers are also recorded in configure.ac because libtool
    wants them as parameters at build time.
@ -2420,6 +2432,8 @@ int burn_random_access_write(struct burn_drive *d, off_t byte_address,
    @param flag         Bitfield for control purposes:
                        bit0= - reserved -
                        bit1= do not submit error message if read error
+                        bit2= on error do not try to read a second time
+                              with single block steps. @since 0.5.2 
    @return 1=sucessful , <=0 an error occured
    @since 0.4.0
 */
--- a/libburn/libdax_msgs.h
+++ b/libburn/libdax_msgs.h
@ -432,6 +432,8 @@ Range "scdbackup"          :  0x00020000 to 0x0002ffff
 0x00020007 (NOTE,HIGH)    = Closed O_EXCL scsi siblings
 0x00020008 (SORRY,HIGH)   = Device busy. Failed to fcntl-lock
 0x00020009 (SORRY,HIGH)   = Neither stdio-path nor its directory exist
+ 0x0002000a (FAILURE,HIGH) = Cannot accept '...' as SG_IO CDROM drive
+ 0x0002000b (FAILURE,HIGH) = File object '...' not found
           
 General library operations:

--- a/libburn/mmc.c
+++ b/libburn/mmc.c
@ -62,7 +62,7 @@ extern struct libdax_msgs *libdax_messenger;
 /* ts A80410 : <<< Dangerous experiment: Pretend that DVD-RAM is BD-RE
 # define Libburn_dvd_ram_as_bd_rE yes
 */
-/* ts A80509 : <<< Experiment: pretend that DVD-COM and CD-ROM are other media
+/* ts A80509 : <<< Experiment: pretend that DVD-ROM and CD-ROM are other media
                   like BD-ROM (0x40), BD-R seq (0x41), BD-R random (0x42)
 # define Libburn_rom_as_profilE 0x40
 */
@ -773,11 +773,24 @@ int mmc_write(struct burn_drive *d, int start, struct buffer *buf)

 		/* >>> make this scsi_notify_error() when liberated */
 		if (c.sense[2]!=0) {
+
+#ifdef NIX
 			char msg[160];
 			sprintf(msg,
 		"SCSI error on write(%d,%d): key=%X asc=%2.2Xh ascq=%2.2Xh",
 				start, len,
 				c.sense[2],c.sense[12],c.sense[13]);
+#else /* NIX */
+			char msg[256];
+			int key, asc, ascq;
+
+			sprintf(msg, "SCSI error on write(%d,%d): ",
+					start, len);
+			scsi_error_msg(d, c.sense, 14, msg + strlen(msg), 
+					&key, &asc, &ascq);
+
+#endif /* !NIX */
+
 			libdax_msgs_submit(libdax_messenger, d->global_index,
 				0x0002011d,
 				LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
@ -1293,6 +1306,10 @@ static int mmc_read_toc_al(struct burn_drive *d, int *alloc_len)
 	if (d->status == BURN_DISC_UNREADY)
 		d->status = BURN_DISC_FULL;
 	toc_find_modes(d);
+
+	/* A80808 */
+	burn_disc_cd_toc_extensions(d->disc, 0);
+
 	return 1;
 }

@ -1920,8 +1937,9 @@ int mmc_set_streaming(struct burn_drive *d,
 	struct buffer buf;
 	struct command c;
 	int b, eff_end_lba;
-	char msg[160];
+	char msg[256];
 	unsigned char *pd;
+	int key, asc, ascq;

 	if (mmc_function_spy(d, "mmc_set_streaming") <= 0)
 		return 0;
@ -1984,6 +2002,8 @@ int mmc_set_streaming(struct burn_drive *d,
 	d->issue_command(d, &c);
 	if (c.error) {
 		if (c.sense[2]!=0 && !d->silent_on_scsi_error) {
+
+#ifdef NIX
 			sprintf(msg,
 	"SCSI error on set_streaming(%d): key=%X asc=%2.2Xh ascq=%2.2Xh",
 				w_speed,
@ -1993,6 +2013,15 @@ int mmc_set_streaming(struct burn_drive *d,
 				0x00020124,
 				LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
 				msg, 0, 0);
+#else /* NIX */
+
+			sprintf(msg,
+				"SCSI error on set_streaming(%d): ", w_speed);
+			scsi_error_msg(d, c.sense, 14, msg + strlen(msg), 
+					&key, &asc, &ascq);
+
+#endif /* !NIX */
+
 		}
 		return 0;
 	}
@ -2694,7 +2723,8 @@ int mmc_format_unit(struct burn_drive *d, off_t size, int flag)
 	int index, format_sub_type = 0, format_00_index, size_mode;
 	int accept_count = 0;
 	off_t num_of_blocks = 0, diff, format_size, i_size, format_00_max_size;
-	char msg[160],descr[80];
+	char msg[256],descr[80];
+	int key, asc, ascq;
 	int full_format_type = 0x00; /* Full Format (or 0x10 for DVD-RW ?) */

 	if (mmc_function_spy(d, "mmc_format_unit") <= 0)
@ -3096,6 +3126,8 @@ unsuitable_media:;
 	d->issue_command(d, &c);
 	if (c.error && !tolerate_failure) {
 		if (c.sense[2]!=0) {
+
+#ifdef NIX
 			sprintf(msg,
 		"SCSI error on format_unit(%s): key=%X asc=%2.2Xh ascq=%2.2Xh",
 				descr,
@ -3104,6 +3136,13 @@ unsuitable_media:;
 				0x00020122,
 				LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
 				msg, 0, 0);
+#else /* NIX */
+			sprintf(msg, "SCSI error on format_unit(%s): ", descr);
+			scsi_error_msg(d, c.sense, 14, msg + strlen(msg), 
+					&key, &asc, &ascq);
+
+#endif /* !NIX */
+
 		}
 		return 0;
 	} else if ((!c.error) && (format_type == 0x13 || format_type == 0x15))
@ -3405,11 +3444,24 @@ int mmc_read_10(struct burn_drive *d, int start,int amount, struct buffer *buf)
 	c.dir = FROM_DRIVE;
 	d->issue_command(d, &c);
 	if (c.error) {
+
+#ifdef NIX
 		char msg[160];
+
 		sprintf(msg,
 		"SCSI error on read_10(%d,%d): key=%X asc=%2.2Xh ascq=%2.2Xh",
 			start, amount,
 			c.sense[2],c.sense[12],c.sense[13]);
+#else /* NIX */
+		char msg[256];
+		int key, asc, ascq;
+
+		sprintf(msg, "SCSI error on read_10(%d,%d): ", start, amount);
+		scsi_error_msg(d, c.sense, 14, msg + strlen(msg), 
+				&key, &asc, &ascq);
+
+#endif /* !NIX */
+
 		if(!d->silent_on_scsi_error)
 			libdax_msgs_submit(libdax_messenger, d->global_index,
 				0x00020144,
--- a/libburn/os-linux.h
+++ b/libburn/os-linux.h
@ -51,11 +51,17 @@ SIGKILL, SIGCHLD, SIGSTOP, SIGURG, SIGWINCH
 #define BURN_OS_TRANSPORT_BUFFER_SIZE 65536


-/* To hold the index number of the most recently delivered address from
+/* To hold the position of the most recently delivered address from
   device enumeration.
 */
+struct burn_drive_enumerator_struct {
+	int pos;
+	int info_count;
+	char **info_list;
+};
+
 #define BURN_OS_DEFINE_DRIVE_ENUMERATOR_T \
-typedef int burn_drive_enumerator_t;
+typedef struct burn_drive_enumerator_struct burn_drive_enumerator_t;


 /* Parameters for sibling list. See sibling_fds, sibling_fnames */
--- a/libburn/read.c
+++ b/libburn/read.c
@ -323,7 +323,7 @@ int burn_read_data(struct burn_drive *d, off_t byte_address,
 	int alignment = 2048, start, upto, chunksize = 1, err, cpy_size, i;
 	int sose_mem = 0, fd = -1, ret;
 	char msg[81], *wpt;
-	struct buffer buf;
+	struct buffer buf, *buffer_mem = d->buffer;

 /*
 #define Libburn_read_data_adr_logginG 1
@ -443,7 +443,8 @@ int burn_read_data(struct burn_drive *d, off_t byte_address,
 			d->silent_on_scsi_error = sose_mem;
 		if (err == BE_CANCELLED) {
 			/* Try to read a smaller part of the chunk */
-			for (i = 0; i < chunksize - 1; i++) {
+			if(!(flag & 4))
+			  for (i = 0; i < chunksize - 1; i++) {
 				if (flag & 2)
 					d->silent_on_scsi_error = 1;
 				if (d->drive_role == 1) {
@ -484,7 +485,7 @@ ex:;
 	if (fd != -1)
 		close(fd);
 */
-	d->buffer = NULL;
+	d->buffer = buffer_mem;
 	d->busy = BURN_DRIVE_IDLE;
 	return ret;
 }
--- a/libburn/sg-linux.c
+++ b/libburn/sg-linux.c
@ -644,12 +644,193 @@ failed:;
 }


+#define Libburn_drive_new_deaL 1
+
+#ifdef Libburn_drive_new_deaL
+
+/* ts A80731 */
+static int is_ata_drive(char *fname)
+{
+	int fd;
+	struct hd_driveid tm;
+
+	fd = sg_open_drive_fd(fname, 1);
+	if (fd == -1) {
+		if (linux_ata_enumerate_verbous)
+			fprintf(stderr,"open failed, errno=%d  '%s'\n",
+				errno, strerror(errno));
+		return 0;
+	}
+
+	memset(&tm, 0, sizeof(tm));
+	ioctl(fd, HDIO_GET_IDENTITY, &tm);
+
+		/* not atapi */
+	if (!(tm.config & 0x8000) || (tm.config & 0x4000)) {
+		if (linux_ata_enumerate_verbous)
+			fprintf(stderr, "not marked as ATAPI\n");
+		sg_close_drive_fd(fname, -1, &fd, 0);
+		return 0;
+	}
+
+	/* if SG_IO fails on an atapi device, we should stop trying to 
+	   use hd* devices */
+	if (sgio_test(fd) == -1) {
+		if (linux_ata_enumerate_verbous)
+		  fprintf(stderr,
+			 "FATAL: sgio_test() failed: errno=%d  '%s'\n",
+			 errno, strerror(errno));
+		sg_close_drive_fd(fname, -1, &fd, 0);
+		return 0;
+	}
+	if (sg_close_drive_fd(fname, -1, &fd, 1) <= 0) {
+		if (linux_ata_enumerate_verbous)
+			fprintf(stderr,
+				"cannot close properly, errno=%d  '%s'\n",
+				errno, strerror(errno));
+		return 0;
+	}
+	return 1;
+}
+
+
+static int is_scsi_drive(char *fname, int *bus_no, int *host_no,
+			 int *channel_no, int *target_no, int *lun_no)
+{
+	int fd, sid_ret = 0, ret;
+	struct sg_scsi_id sid;
+	int sibling_fds[BURN_OS_SG_MAX_SIBLINGS], sibling_count= 0;
+	char sibling_fnames[BURN_OS_SG_MAX_SIBLINGS][BURN_OS_SG_MAX_NAMELEN];
+
+	fd = sg_open_drive_fd(fname, 1);
+	if (fd == -1) {
+		if (linux_sg_enumerate_debug)
+			fprintf(stderr, "open failed, errno=%d  '%s'\n",
+				errno, strerror(errno));
+		return 0;
+	}
+
+	sid_ret = ioctl(fd, SG_GET_SCSI_ID, &sid);
+	if (sid_ret == -1) {
+		sid.scsi_id = -1; /* mark SCSI address as invalid */
+		if(linux_sg_enumerate_debug) 
+			fprintf(stderr,
+			"ioctl(SG_GET_SCSI_ID) failed, errno=%d  '%s' , ",
+			errno, strerror(errno));
+
+		if (sgio_test(fd) == -1) {
+			if (linux_sg_enumerate_debug)
+		  		fprintf(stderr,
+				 "FATAL: sgio_test() failed: errno=%d  '%s'",
+				errno, strerror(errno));
+
+			sg_close_drive_fd(fname, -1, &fd, 0);
+			return 0;
+		}
+
+#ifdef CDROM_DRIVE_STATUS
+		/* http://developer.osdl.org/dev/robustmutexes/
+			  src/fusyn.hg/Documentation/ioctl/cdrom.txt */
+		sid_ret = ioctl(fd, CDROM_DRIVE_STATUS, 0);
+		if(linux_sg_enumerate_debug)
+			  fprintf(stderr,
+				"ioctl(CDROM_DRIVE_STATUS) = %d , ",
+				sid_ret);
+		if (sid_ret != -1 && sid_ret != CDS_NO_INFO)
+			sid.scsi_type = TYPE_ROM;
+		else
+			sid_ret = -1;
+#endif /* CDROM_DRIVE_STATUS */
+
+	}
+
+#ifdef SCSI_IOCTL_GET_BUS_NUMBER
+	/* Hearsay A61005 */
+	if (ioctl(fd, SCSI_IOCTL_GET_BUS_NUMBER, bus_no) == -1)
+		*bus_no = -1;
+#endif
+
+	if (sg_close_drive_fd(fname, -1, &fd, 
+					sid.scsi_type == TYPE_ROM ) <= 0) {
+		if (linux_sg_enumerate_debug)
+			fprintf(stderr,
+				"cannot close properly, errno=%d  '%s'\n",
+				errno, strerror(errno)); 
+		return 0;
+	}
+	if ( (sid_ret == -1 || sid.scsi_type != TYPE_ROM)
+	     && !linux_sg_accept_any_type) {
+		if (linux_sg_enumerate_debug)
+			fprintf(stderr, "sid.scsi_type = %d (!= TYPE_ROM)\n",
+				sid.scsi_type); 
+		return 0;
+	}
+
+	if (sid_ret == -1 || sid.scsi_id < 0) {
+		/* ts A61211 : employ a more general ioctl */
+		ret = sg_obtain_scsi_adr(fname, bus_no, host_no,
+					   channel_no, target_no, lun_no);
+		if (ret>0) {
+			sid.host_no = *host_no;
+			sid.channel = *channel_no;
+			sid.scsi_id = *target_no;
+			sid.lun = *lun_no;
+		} else {
+			if (linux_sg_enumerate_debug)
+				fprintf(stderr,
+					"sg_obtain_scsi_adr() failed\n");
+			return 0;
+		}
+	}
+
+	/* ts A60927 : trying to do locking with growisofs */
+	if(burn_sg_open_o_excl>1) {
+		ret = sg_open_scsi_siblings(
+				fname, -1, sibling_fds, sibling_fnames,
+				&sibling_count,
+				sid.host_no, sid.channel,
+				sid.scsi_id, sid.lun);
+		if (ret<=0) {
+			if (linux_sg_enumerate_debug)
+				fprintf(stderr, "cannot lock siblings\n"); 
+				sg_handle_busy_device(fname, 0);
+			return 0;
+		}
+		/* the final occupation will be done in sg_grab() */
+		sg_release_siblings(sibling_fds, sibling_fnames,
+							&sibling_count);
+	}
+#ifdef SCSI_IOCTL_GET_BUS_NUMBER
+	if(*bus_no == -1)
+		*bus_no = 1000 * (sid.host_no + 1) + sid.channel;
+#else
+	*bus_no = sid.host_no;
+#endif
+	*host_no= sid.host_no;
+	*channel_no= sid.channel;
+	*target_no= sid.scsi_id;
+	*lun_no= sid.lun;
+	return 1;
+}	
+
+#endif /* Libburn_drive_new_deaL */
+
+
 /** Speciality of Linux: detect non-SCSI ATAPI (EIDE) which will from
   then on used used via generic SCSI as is done with (emulated) SCSI drives */ 
 static void ata_enumerate(void)
 {
+
+#ifdef Libburn_drive_new_deaL
+
+	int ret;
+
+#else 
 	struct hd_driveid tm;
-	int i, fd;
+	int fd;
+#endif
+
+	int i;
 	char fname[10];

 	if (linux_ata_enumerate_verbous)
@ -670,6 +851,17 @@ static void ata_enumerate(void)
 				fprintf(stderr, "not in whitelist\n");
 	continue;
 		}
+
+#ifdef Libburn_drive_new_deaL
+
+		ret = is_ata_drive(fname);
+		if (ret < 0)
+	break;
+		if (ret == 0)
+	continue;
+
+#else /* Libburn_drive_new_deaL */
+
 		fd = sg_open_drive_fd(fname, 1);
 		if (fd == -1) {
 			if (linux_ata_enumerate_verbous)
@ -706,6 +898,10 @@ static void ata_enumerate(void)
 				errno, strerror(errno));
 	continue;
 		}
+
+#endif /* Libburn_drive_new_deaL */
+
+
 		if (linux_ata_enumerate_verbous)
 		  fprintf(stderr, "accepting as drive without SCSI address\n");
 		enumerate_common(fname, -1, -1, -1, -1, -1);
@ -716,12 +912,18 @@ static void ata_enumerate(void)
 /** Detects (probably emulated) SCSI drives */
 static void sg_enumerate(void)
 {
+#ifdef Libburn_drive_new_deaL
+
+#else 
 	struct sg_scsi_id sid;
-	int i, fd, sibling_fds[BURN_OS_SG_MAX_SIBLINGS], sibling_count= 0, ret;
+	int fd, sibling_fds[BURN_OS_SG_MAX_SIBLINGS], sibling_count= 0;
+	char sibling_fnames[BURN_OS_SG_MAX_SIBLINGS][BURN_OS_SG_MAX_NAMELEN];
 	int sid_ret = 0;
+#endif
+
+	int i, ret;
 	int bus_no= -1, host_no= -1, channel_no= -1, target_no= -1, lun_no= -1;
 	char fname[17];
-	char sibling_fnames[BURN_OS_SG_MAX_SIBLINGS][BURN_OS_SG_MAX_NAMELEN];

        sg_select_device_family();

@ -748,6 +950,23 @@ static void sg_enumerate(void)
 	continue;
 		}

+
+#ifdef Libburn_drive_new_deaL
+
+		ret = is_scsi_drive(fname, &bus_no, &host_no, &channel_no,
+							&target_no, &lun_no);
+		if (ret < 0)
+	break;
+		if (ret == 0)
+	continue;
+		if (linux_sg_enumerate_debug)
+		  fprintf(stderr, "accepting as SCSI %d,%d,%d,%d bus=%d\n",
+			  host_no, channel_no, target_no, lun_no, bus_no);
+		enumerate_common(fname, bus_no, host_no, channel_no, 
+				target_no, lun_no);
+
+#else /* Libburn_drive_new_deaL */
+
 		/* ts A60927 */
 		fd = sg_open_drive_fd(fname, 1);
 		if (fd == -1) {
@ -857,16 +1076,223 @@ static void sg_enumerate(void)
 #else
 		bus_no = sid.host_no;
 #endif
+
 		if (linux_sg_enumerate_debug)
 		  fprintf(stderr, "accepting as SCSI %d,%d,%d,%d bus=%d\n",
 			  sid.host_no, sid.channel, sid.scsi_id, sid.lun,
 			  bus_no);
 		enumerate_common(fname, bus_no, sid.host_no, sid.channel, 
 				 sid.scsi_id, sid.lun);
+#endif /* Libburn_drive_new_deaL */
+
 	}
 }


+#ifdef Libburn_drive_new_deaL
+
+
+/* ts A80805 : eventually produce the other official name of a device file */
+static int fname_other_name(char *fname, char other_name[80], int flag)
+{
+	if(strncmp(fname, "/dev/sr", 7) == 0 &&
+	   (fname[7] >= '0' && fname[7] <= '9') &&
+           (fname[8] == 0 ||
+	    (fname[8] >= '0' && fname[8] <= '9' && fname[9] == 0))) {
+		sprintf(other_name, "/dev/scd%s", fname + 7);
+		return 1;
+	}
+	if(strncmp(fname, "/dev/scd", 8) == 0 &&
+	   (fname[8] >= '0' && fname[8] <= '9') &&
+           (fname[9] == 0 ||
+	    (fname[9] >= '0' && fname[9] <= '9' && fname[10] == 0))) {
+		sprintf(other_name, "/dev/sr%s", fname + 8);
+		return 1;
+	}
+	return 0;
+}
+
+
+/* ts A80805 */
+static int fname_drive_is_listed(char *fname, int flag)
+{
+	char other_fname[80];
+
+	if (burn_drive_is_listed(fname, NULL, 0))
+		return 1;
+	if (fname_other_name(fname, other_fname, 0) > 0)
+		if (burn_drive_is_listed(other_fname, NULL, 0))
+			return 2;
+	return 0;
+}
+
+
+/* ts A80731 : Directly open the given address.
+   @param flag bit0= do not complain about missing file
+               bit1= do not check whether drive is already listed
+*/
+static int fname_enumerate(char *fname, int flag)
+{
+	int is_ata= 0, is_scsi= 0;
+	int bus_no= -1, host_no= -1, channel_no= -1, target_no= -1, lun_no= -1;
+	char msg[BURN_DRIVE_ADR_LEN + 80];
+	struct stat stbuf;
+
+	if (!(flag & 2))
+		if (fname_drive_is_listed(fname, 0))
+			return 2;
+	if (stat(fname, &stbuf) == -1) {
+		sprintf(msg, "File object '%s' not found", fname);
+		if (!(flag & 1))
+			libdax_msgs_submit(libdax_messenger, -1, 0x0002000b,
+			  LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
+			  msg, 0, 0);
+		return -1;
+	}
+	
+	is_ata = is_ata_drive(fname);
+	if (is_ata < 0)
+		return -1;
+	if (!is_ata)
+		is_scsi = is_scsi_drive(fname, &bus_no, &host_no, &channel_no,
+					&target_no, &lun_no);
+	if (is_scsi < 0)
+		return -1;
+	if (is_ata == 0 && is_scsi == 0)
+		return 0;
+
+	if (linux_sg_enumerate_debug)
+		  fprintf(stderr,
+			"(single) accepting as SCSI %d,%d,%d,%d bus=%d\n",
+			host_no, channel_no, target_no, lun_no, bus_no);
+	enumerate_common(fname, bus_no, host_no, channel_no, 
+				target_no, lun_no);
+	return 1;
+}
+
+
+/* ts A80731 : Directly open the given address from a single-item whitlist */
+static int single_enumerate(int flag)
+{
+	int ret, wl_count;
+	char *fname, msg[BURN_DRIVE_ADR_LEN + 80];
+
+        wl_count= burn_drive_whitelist_count();
+	if (wl_count != 1)
+		return 0;
+	fname= burn_drive_whitelist_item(0, 0);
+	if (fname == NULL)
+		return 0;
+	ret = fname_enumerate(fname, 2);
+	if (ret <= 0) {
+		sprintf(msg, "Cannot access '%s' as SG_IO CDROM drive", fname);
+		libdax_msgs_submit(libdax_messenger, -1, 0x0002000a,
+			LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
+			msg, 0, 0);
+		ret = -1;
+	}
+	return ret;
+}
+
+
+/* ts A80801 : looking up drives listed in /proc/sys/dev/cdrom/info line like:
+                drive name:             sr1     hdc     hda     sr0
+   @parm flag bit0= release list memory and exit
+*/
+static int proc_sys_dev_cdrom_info(char ***list, int *count, int flag)
+{
+	FILE *fp;
+	char line[1024], fname[1024 + 5], *cpt, *retpt, *list_data;
+	int maxl= 0, pass, i;
+
+	if (*list != NULL) {
+		if ((*list)[0] != NULL)
+			free((*list)[0]);
+		free(*list);
+		*list = NULL;
+		*count = 0;
+	}
+	if (flag & 1) 
+		return 1;
+
+	*count = 0;
+	sg_evaluate_kernel();
+	if (sg_kernel_age < 2) /* addresses are not suitable for kernel 2.4 */
+		return 1;
+	fp = fopen("/proc/sys/dev/cdrom/info", "r");
+	if (fp == NULL)
+		return 0;
+	while (1) {
+		retpt = fgets(line, sizeof(line), fp);
+		if (retpt == NULL)
+	break;
+		if(strncmp(line, "drive name:", 11) == 0)
+	break;
+	}
+	fclose(fp);
+	if (retpt == NULL)
+		return 0;
+	strcpy(fname, "/dev/");
+	for(pass = 0; pass < 2; pass++) {
+		*count = 0;
+		cpt = line + 11;
+		while (*cpt != 0) {
+			for(; *cpt == ' ' || *cpt == '\t'; cpt++);
+			if (*cpt == 0 || *cpt == '\n')
+		break;
+			sscanf(cpt, "%s", fname + 5);
+			if (strlen(fname) > maxl)
+				maxl = strlen(fname);
+			if (pass == 1)
+				strcpy((*list)[*count], fname);
+			(*count)++;
+			for(cpt++; *cpt != ' ' && *cpt != '\t'
+					 && *cpt != 0 && *cpt != '\n'; cpt++);
+		}
+		if (pass == 0) {
+			list_data = calloc(*count + 1, maxl+1);
+			*list = calloc(*count + 1, sizeof(char *));
+			if(list_data == NULL || *list == NULL) {
+				libdax_msgs_submit(libdax_messenger, -1,
+				0x00000003,
+				LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
+				"Out of virtual memory", 0, 0);
+				if (list_data != NULL)
+					free(list_data);
+				if (*list != NULL)
+					free((char *) *list);
+				return -1;
+			}
+			for (i = 0; i <= *count; i++)
+				(*list)[i] = list_data + i * (maxl + 1);
+		}
+	}
+	return 1;
+}
+
+
+static int add_proc_info_drives(int flag)
+{
+	int ret, list_count, count = 0, i;
+	char **list= NULL;
+
+	ret = proc_sys_dev_cdrom_info(&list, &list_count, 0);
+	if (ret <= 0)
+		return ret;
+	for (i = 0; i < list_count; i++) {
+		if (burn_drive_is_banned(list[i]))
+	continue;
+		ret = fname_enumerate(list[i], 1);
+		if (ret == 1)
+			count++;
+	}
+	proc_sys_dev_cdrom_info(&list, &list_count, 1); /* free memory */
+	return 1 + count;
+}
+
+#endif /* Libburn_drive_new_deaL */
+
+
 /* ts A61115 */
 /* ----------------------------------------------------------------------- */
 /* PORTING: Private functions which contain publicly needed functionality. */
@ -951,10 +1377,14 @@ int sg_give_next_adr(burn_drive_enumerator_t *idx,
 {
 	/* os-linux.h : typedef int burn_drive_enumerator_t; */
 	static int sg_limit = 32, ata_limit = 26;
-	int baseno = 0;
+	int baseno = 0, i;
+	char other_name[80];

-	if (initialize == -1)
+	if (initialize == -1) {
+		proc_sys_dev_cdrom_info(&(idx->info_list), &(idx->info_count),
+					1);
 		return 0;
+	}

        sg_select_device_family();
 	if (linux_sg_device_family[0] == 0)
@ -962,30 +1392,56 @@ int sg_give_next_adr(burn_drive_enumerator_t *idx,
 	if (linux_ata_device_family[0] == 0)
 		ata_limit = 0;

-	if (initialize  == 1)
-		*idx = -1;
-	(*idx)++;
-	if (*idx >= sg_limit)
+	if (initialize  == 1) {
+		idx->pos = -1;
+		idx->info_count= 0;
+		idx->info_list= NULL;
+		proc_sys_dev_cdrom_info(&(idx->info_list), &(idx->info_count),
+					0);
+	}
+	(idx->pos)++;
+	if (idx->pos >= sg_limit)
 		goto next_ata;
-	if (adr_size < 10)
+	if (adr_size < 11)
 		return -1;
-	sprintf(adr, linux_sg_device_family, *idx);
+	sprintf(adr, linux_sg_device_family, idx->pos);

-	/* ts A80702 */
 	sg_exchange_scd_for_sr(adr, 0);
+	goto return_1_pre_proc;

-	return 1;
 next_ata:;
 	baseno += sg_limit;
-	if (*idx - baseno >= ata_limit)
-		goto next_nothing;
+	if (idx->pos - baseno >= ata_limit)
+		goto next_proc_info;
 	if (adr_size < 9)
 		return -1;
-	sprintf(adr, linux_ata_device_family, 'a' + (*idx - baseno));
-	return 1;
-next_nothing:;
+	sprintf(adr, linux_ata_device_family, 'a' + (idx->pos - baseno));
+	goto return_1_pre_proc;
+
+next_proc_info:;
 	baseno += ata_limit;
+	for (i = 0; i < idx->info_count; i++) {
+		if ((idx->info_list)[i][0] == 0)
+	continue;
+		if (baseno == idx->pos) {
+			if (adr_size < strlen((idx->info_list)[i]) + 1)
+				return -1;
+			strcpy(adr, (idx->info_list)[i]);
+			return 1;
+		}
+		baseno++;
+	}
 	return 0;
+
+return_1_pre_proc:;
+	for (i = 0; i < idx->info_count; i++) {
+		if (strcmp((idx->info_list)[i], adr) == 0)
+			(idx->info_list)[i][0] = 0;
+	        if (fname_other_name(adr, other_name, 0) > 0)
+			if (strcmp((idx->info_list)[i], other_name) == 0)
+				(idx->info_list)[i][0] = 0;
+	}
+	return 1;
 }


@ -1007,8 +1463,27 @@ next_nothing:;
 /* ts A61115: replacing call to sg-implementation internals from drive.c */
 int scsi_enumerate_drives(void)
 {
+
+#ifdef Libburn_drive_new_deaL
+	int ret;
+#endif
+
+#ifdef Libburn_drive_new_deaL
+	/* Direct examination of eventually single whitelisted name */
+	ret = single_enumerate(0);
+	if (ret < 0)
+		return -1;
+	if (ret > 0)
+		return 1;
+#endif /* Libburn_drive_new_deaL */
+
 	sg_enumerate();
 	ata_enumerate();
+
+#ifdef Libburn_drive_new_deaL
+	add_proc_info_drives(0);
+#endif /* Libburn_drive_new_deaL */
+
 	return 1;
 }

@ -1460,7 +1935,8 @@ int sg_is_enumerable_adr(char *adr)
 			return 1;
 		}
 	}
-	sg_give_next_adr(&idx, fname, sizeof(fname), -1);
+	if (first == 0)
+		sg_give_next_adr(&idx, fname, sizeof(fname), -1);
 	return(0);
 }

--- a/libburn/spc.c
+++ b/libburn/spc.c
@ -117,9 +117,9 @@ int spc_wait_unit_attention(struct burn_drive *d, int max_sec, char *cmd_text,
 		i, ret, (unsigned) key, (unsigned) asc, (unsigned) ascq);
 */

-		if(ret > 0) /* ready */
+		if (ret > 0) /* ready */
 	break;
-		if(key!=0x2 || asc!=0x4) {
+		if (key!=0x2 || asc!=0x4) {
 			if (key == 0x2 && asc == 0x3A) {
 				ret = 1; /* medium not present = ok */
 /* <<<
@ -568,7 +568,7 @@ void spc_sense_write_params(struct burn_drive *d)

 	/* ts A71128 : do not interpret reply if error */
 	m = d->mdata;
-	if(!c.error) {
+	if (!c.error) {
 		size = c.page->data[0] * 256 + c.page->data[1];
 		page = c.page->data + 8;
 		burn_print(1, "write page length 0x%x\n", page[1]);
@ -845,7 +845,7 @@ int burn_scsi_setup_drive(struct burn_drive *d, int bus_no, int host_no,
 	d->mdata = calloc(1, sizeof(struct scsi_mode_data));

 	/* ts A61007 : obsolete Assert in drive_getcaps() */
-	if(d->idata == NULL || d->mdata == NULL) {
+	if (d->idata == NULL || d->mdata == NULL) {
 	        libdax_msgs_submit(libdax_messenger, -1, 0x00020108,
 	                LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
 	                "Could not allocate new drive object", 0, 0);
@ -854,7 +854,7 @@ int burn_scsi_setup_drive(struct burn_drive *d, int bus_no, int host_no,
 	d->idata->valid = 0;
 	d->mdata->valid = 0;
 	d->mdata->speed_descriptors = NULL;
-	if(!(flag & 1)) {
+	if (!(flag & 1)) {
 		ret = spc_setup_drive(d);
 		if (ret<=0)
 			return ret;
@ -869,11 +869,14 @@ int burn_scsi_setup_drive(struct burn_drive *d, int bus_no, int host_no,
 }


-/* ts A61122  */
+/* ts A61122 - A80829 */
 enum response scsi_error_msg(struct burn_drive *d, unsigned char *sense,
-			     int senselen, char msg[161],
+			     int senselen, char msg_data[161],
 			     int *key, int *asc, int *ascq)
 {
+	char *msg;
+
+	msg= msg_data;
 	*key= *asc= *ascq= -1;

 	if (senselen<=0 || senselen>2)
@ -883,50 +886,236 @@ enum response scsi_error_msg(struct burn_drive *d, unsigned char *sense,
 	if (senselen<=0 || senselen>13)
 		*ascq = sense[13];

+	sprintf(msg, "[%X %2.2X %2.2X]  ", *key, *asc, *ascq);
+	msg= msg + strlen(msg);
+
 	burn_print(12, "CONDITION: 0x%x 0x%x 0x%x on %s %s\n",
 		   *key, *asc, *ascq, d->idata->vendor, d->idata->product);

 	switch (*asc) {
-	case 0:
-		sprintf(msg, "(no error reported by SCSI transaction)");
+	case 0x00:
+		sprintf(msg, "(No error reported by SCSI transaction)");
 		return RETRY;

-	case 2:
-		sprintf(msg, "not ready");
+	case 0x02:
+		sprintf(msg, "Not ready");
 		return RETRY;
-	case 4:
+	case 0x04:
 		sprintf(msg,
-			"logical unit is in the process of becoming ready");
+			"Logical unit is in the process of becoming ready");
 		return RETRY;
+	case 0x09:
+		if (*key != 4)
+			break;
+		if (*ascq == 0)
+			sprintf(msg, "Track following error");
+		else if (*ascq == 1)
+			sprintf(msg, "Tracking servo failure");
+		else if (*ascq == 2)
+			sprintf(msg, "Focus servo failure");
+		else if (*ascq == 3)
+			sprintf(msg, "Spindle servo failure");
+		else if (*ascq == 4)
+			sprintf(msg, "Head select fault");
+		else
+			break;
+		return FAIL;
+	case 0x0C:
+		if (*key == 2 && *ascq == 7)
+			sprintf(msg, "Write error, recovery needed"); 
+		else if (*key == 2 && *ascq == 0x0f)
+			sprintf(msg, "Defects in error window"); 
+		else if (*key == 3 && *ascq == 2)
+			sprintf(msg, "Write error, auto reallocation failed");
+		else if (*key == 3 && *ascq == 9)
+			sprintf(msg, "Write error, loss of streaming");
+		else if (*key == 3)
+			sprintf(msg, "Write error");
+		else
+			break;
+		return FAIL;
+	case 0x11:
+		if (*key != 3)
+			break;
+		if (*ascq == 0)
+			sprintf(msg, "Unrecovered read error");
+		else if (*ascq == 1)
+			sprintf(msg, "Read retries exhausted");
+		else if (*ascq == 2)
+			sprintf(msg, "Error too long to correct");
+		else if (*ascq == 5)
+			sprintf(msg, "L-EC uncorrectable error");
+		else if (*ascq == 6)
+			sprintf(msg, "CIRC uncorrectable error");
+		else
+			break;
+		return FAIL;
+	case 0x15:
+		if (*key != 3 && *key != 4)
+			break;
+		sprintf(msg, "Random positioning error");
+		return FAIL;
+	case 0x1a:
+		if (*key != 5)
+			break;
+		sprintf(msg, "Parameter list length error");
+		return FAIL;
+	case 0x1b:
+		if (*key != 4)
+			break;
+		sprintf(msg, "Synchronous data transfer error");
+		return FAIL;
 	case 0x20:
-		if (*key == 5)
-			sprintf(msg, "bad opcode");
+		if (*key != 5)
+			break;
+		sprintf(msg, "Invalid command operation code");
 		return FAIL;
 	case 0x21:
-		sprintf(msg, "invalid address");
+		if (*key != 5)
+			break;
+		if (*ascq == 0)
+			sprintf(msg, "Lba out of range");
+		else if (*ascq == 3)
+			sprintf(msg, "Invalid write crossing layer jump");
+		else
+			sprintf(msg, "Invalid address");
 		return FAIL;
 	case 0x24:
-		if (*key == 5)
-			sprintf(msg, "invalid field in cdb");
-		else
+		if (*key != 5)
 			break;
+		sprintf(msg, "Invalid field in cdb");
 		return FAIL;
 	case 0x26:
-		if (*key == 5 )
-			sprintf(msg, "invalid field in parameter list" );
+		if (*key != 5)
+			break;
+		if (*ascq == 1)
+			sprintf(msg, "Parameter not supported");
+		else if (*ascq == 2)
+			sprintf(msg, "Parameter value invalid");
+		else
+			sprintf(msg, "Invalid field in parameter list");
+		return FAIL;
+	case 0x27:
+		if (*key != 7)
+			break;
+		sprintf(msg, "Write protected");
 		return FAIL;
 	case 0x28:
-		if (*key == 6)
+		if (*key != 6)
+			break;
+		if (*ascq == 0)
 			sprintf(msg, "Medium may have changed");
+		else if (*ascq == 2)
+			sprintf(msg, "Format layer may have changed");
 		else
 			break;
 		return RETRY;
+	case 0x29:
+		if (*key != 6)
+			break;
+		if (*ascq == 0)
+			sprintf(msg,
+                               "Power on, reset, or bus device reset occured");
+		else if (*ascq == 1)
+			sprintf(msg, "Power on occured");
+		else if (*ascq == 2)
+			sprintf(msg, "Bus reset occured");
+		else if (*ascq == 3)
+			sprintf(msg, "Bus device reset function occured");
+		else if (*ascq == 4)
+			sprintf(msg, "Device internal reset");
+		else
+			break;
+		return RETRY;
+	case 0x2c:
+		if (*key != 5)
+			break;
+		if (*ascq == 0)
+			sprintf(msg, "Command sequence error");
+		else 
+			break;
+		return FAIL;
+	case 0x2e:
+		if (*key != 6)
+			break;
+		if (*ascq == 0)
+			sprintf(msg,
+                               "Insufficient time for operation");
+		else 
+			break;
+		return FAIL;
+	case 0x30:
+		if (*key != 2 && *key != 5)
+			break;
+		if (*ascq == 1)
+			sprintf(msg, "Cannot read medium, unknown format");
+		else if (*ascq == 2)
+			sprintf(msg,
+				"Cannot read medium, incompatible format");
+		else if (*ascq == 4)
+			sprintf(msg, "Cannot write medium, unknown format");
+		else if (*ascq == 5)
+			sprintf(msg,
+				"Cannot write medium, incompatible format");
+		else if (*ascq == 6)
+			sprintf(msg,
+				"Cannot format medium, incompatible medium");
+		else if (*ascq == 7)
+			sprintf(msg, "Cleaning failure");
+		else
+			sprintf(msg, "Incompatible medium installed");
+		return FAIL;
 	case 0x3A:
-		sprintf(msg, "Medium not present");
+		if (*key != 2)
+			break;
+		if (*ascq == 1)
+			sprintf(msg, "Medium not present, tray closed");
+		else if (*ascq == 2)
+			sprintf(msg, "Medium not present, tray open");
+		else if (*ascq == 3)
+			sprintf(msg, "Medium not present, loadable");
+		else
+			sprintf(msg, "Medium not present");
 		d->status = BURN_DISC_EMPTY;
 		return FAIL;
+	case 0x63:
+		if (*key != 5)
+			break;
+		if (*ascq == 0)
+			sprintf(msg,
+				"End of user area encountered on this track");
+		else if (*ascq == 1)
+			sprintf(msg, "Packet does not fit in available space");
+		else
+			break;
+		return FAIL;
+	case 0x64:
+		if (*key != 5)
+			break;
+		if (*ascq == 0)
+			sprintf(msg, "Illegal mode for this track");
+		else if (*ascq == 1)
+			sprintf(msg, "Invalid packet size");
+		else
+			break;
+		return FAIL;
+	case 0x72:
+		if (*key == 3)
+			sprintf(msg, "Session fixation error");
+		else if (*key == 5 && *ascq == 3)
+			sprintf(msg,
+			"Session fixation error, incomplete track in session");
+		else if (*key == 5 && *ascq == 4)
+			sprintf(msg,
+			"Empty or partially written reserved track");
+		else if (*key == 5 && *ascq == 5)
+			sprintf(msg,
+			"No more track reservations allowed");
+		else
+			break;
+		return FAIL;
 	}
-	sprintf(msg,
+	sprintf(msg_data,
 		"Failure. See mmc3r10g.pdf: Sense Key %X ASC %2.2X ASCQ %2.2X",
 		*key, *asc, *ascq);
 	return FAIL;
@ -962,12 +1151,9 @@ int scsi_notify_error(struct burn_drive *d, struct command *c,
 	if (d->silent_on_scsi_error)
 		return 1;

-	strcpy(scsi_msg, "    \"");
-	scsi_error_msg(d, sense, senselen, scsi_msg + strlen(scsi_msg),
-			 &key, &asc, &ascq);
-	strcat(scsi_msg, "\"");
+	scsi_error_msg(d, sense, senselen, scsi_msg, &key, &asc, &ascq);

-	if(!(flag & 1)) {
+	if (!(flag & 1)) {
 		/* SPC : TEST UNIT READY command */
 		if (c->opcode[0] == 0)
 			return 1;
@ -978,7 +1164,9 @@ int scsi_notify_error(struct burn_drive *d, struct command *c,
 				return 1;
 	}

-	sprintf(msg,"SCSI error condition on command %2.2Xh :", c->opcode[0]);
+	sprintf(msg,"SCSI error condition on command %2.2Xh : ", c->opcode[0]);
+
+#ifdef NIX
 	if (key>=0)
 		sprintf(msg+strlen(msg), " key=%Xh", key);
 	if (asc>=0)
@ -992,6 +1180,13 @@ int scsi_notify_error(struct burn_drive *d, struct command *c,
 	ret = libdax_msgs_submit(libdax_messenger, d->global_index, 0x0002010f,
 			LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
 			scsi_msg,0,0);
+#else
+	strcat(msg, scsi_msg);
+	ret = libdax_msgs_submit(libdax_messenger, d->global_index, 0x0002010f,
+			LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH, msg,0,0);
+
+#endif /* NIX */
+
 	return ret;
 }

--- a/libburn/structure.c
+++ b/libburn/structure.c
@ -330,11 +330,19 @@ void burn_track_clear_isrc(struct burn_track *t)
 int burn_track_get_sectors(struct burn_track *t)
 {
 	/* ts A70125 : was int */
-	off_t size;
+	off_t size = 0;
 	int sectors, seclen;

 	seclen = burn_sector_length(t->mode);
-	size = t->offset + t->source->get_size(t->source) + t->tail;
+	if (t->source != NULL)                /* ts A80808 : mending sigsegv */
+		size = t->offset + t->source->get_size(t->source) + t->tail;
+	else if(t->entry != NULL) {
+		/* ts A80808 : all burn_toc_entry of track starts should now
+			have (extensions_valid & 1), even those from CD.
+		*/
+		if (t->entry->extensions_valid & 1)
+			size = ((off_t) t->entry->track_blocks) * (off_t) 2048;
+	}
 	sectors = size / seclen;
 	if (size % seclen)
 		sectors++;
@ -468,6 +476,7 @@ int burn_session_get_sectors(struct burn_session *s)
 	return sectors;
 }

+
 int burn_disc_get_sectors(struct burn_disc *d)
 {
 	int sectors = 0, i;
@ -515,3 +524,40 @@ int burn_session_get_hidefirst(struct burn_session *session)
 {
 	return session->hidefirst;
 }
+
+
+/* ts A80808 : Enhance CD toc to DVD toc */
+int burn_disc_cd_toc_extensions(struct burn_disc *d, int flag)
+{
+	int sidx, tidx;
+	struct burn_toc_entry *entry, *prev_entry= NULL;
+
+	for (sidx = 0; sidx < d->sessions; sidx++) {
+		for (tidx = 0; tidx < d->session[sidx]->tracks + 1; tidx++) {
+			if (tidx < d->session[sidx]->tracks)
+				entry = d->session[sidx]->track[tidx]->entry;
+			else
+				entry = d->session[sidx]->leadout_entry;
+			entry->session_msb = 0;
+			entry->point_msb = 0;
+			entry->start_lba = burn_msf_to_lba(entry->pmin,
+						entry->psec, entry->pframe);
+			if (tidx > 0) {
+				prev_entry->track_blocks =
+					entry->start_lba
+					- prev_entry->start_lba;
+				prev_entry->extensions_valid |= 1;
+			}
+			if (tidx == d->session[sidx]->tracks) {
+				entry->session_msb = 0;
+				entry->point_msb = 0;
+				entry->track_blocks = 0;
+				entry->extensions_valid |= 1;
+			}
+			prev_entry = entry;
+		}
+	}
+	return 1;
+}
+
+
--- a/libburn/structure.h
+++ b/libburn/structure.h
@ -109,4 +109,8 @@ int burn_track_apply_fillup(struct burn_track *t, off_t max_size, int flag);
 off_t burn_track_get_default_size(struct burn_track *t);


+/* ts A80808 : Enhance CD toc to DVD toc */
+int burn_disc_cd_toc_extensions(struct burn_disc *d, int flag);
+
+
 #endif /* BURN__STRUCTURE_H */
--- a/libburn/util.c
+++ b/libburn/util.c
@ -4,7 +4,11 @@
 /* #include <a ssert.h> */

 #include <stdlib.h>
-#include "../version.h"
+
+/* ts A80914 : This is unneeded. Version info comes from libburn.h.
+#include "v ersion.h"
+*/
+
 #include "util.h"
 #include "libburn.h"

@ -48,13 +52,7 @@ char *burn_strndup(char *s, int n)
 void burn_version(int *major, int *minor, int *micro)
 {
 /* ts A80408 : switched from configure.ac versioning to libburn.h versioning */
-#ifdef burn_header_version_major
-    *major = burn_header_version_major;
-    *minor = burn_header_version_minor;
-    *micro = burn_header_version_micro;
-#else
-    *major = BURN_MAJOR_VERSION;
-    *minor = BURN_MINOR_VERSION;
-    *micro = BURN_MICRO_VERSION;
-#endif
+	*major = burn_header_version_major;
+	*minor = burn_header_version_minor;
+	*micro = burn_header_version_micro;
 }
--- a/libburn/write.c
+++ b/libburn/write.c
@ -1996,7 +1996,7 @@ void burn_disc_write_sync(struct burn_write_opts *o, struct burn_disc *disc)
 {
 	struct cue_sheet *sheet;
 	struct burn_drive *d = o->drive;
-	struct buffer buf;
+	struct buffer buf, *buffer_mem = o->drive->buffer;
 	struct burn_track *lt, *t;
 	int first = 1, i, ret, lba, nwa = 0;
 	off_t default_size;
@ -2206,6 +2206,7 @@ fail_wo_sync:;
 	d->busy = BURN_DRIVE_IDLE;
 ex:;
 	d->do_stream_recording = 0;
+	d->buffer = buffer_mem;
 	return;
 }

@ -2215,7 +2216,7 @@ int burn_random_access_write(struct burn_drive *d, off_t byte_address,
 {
 	int alignment = 0, start, upto, chunksize, err, fd = -1, ret;
 	char msg[81], *rpt;
-	struct buffer buf;
+	struct buffer buf, *buffer_mem = d->buffer;

 	if (d->released) {
 		libdax_msgs_submit(libdax_messenger,
@ -2326,7 +2327,7 @@ int burn_random_access_write(struct burn_drive *d, off_t byte_address,
 		
 	if(fd >= 0)
 		close(fd);
-	d->buffer = NULL;
+	d->buffer = buffer_mem;
 	d->busy = BURN_DRIVE_IDLE;
 	return 1;
 }
Author	SHA1	Message	Date
Thomas Schmitt	583092f7ec	Corrected wrong version number of cdrskin	2008-11-12 11:47:45 +00:00
Thomas Schmitt	1ac74b6145	Documented changes and release timestamp	2008-11-12 11:23:07 +00:00
Thomas Schmitt	287f27ca26	Updated cdrskin tarball generator	2008-11-12 11:22:07 +00:00
Thomas Schmitt	36436e3ad4	Made number transition to 0.5.6	2008-11-12 11:19:39 +00:00
Thomas Schmitt	bea64f4073	Preparing for libburn-0.5.6	2008-11-12 08:27:54 +00:00
Thomas Schmitt	2fb19dd08e	Avoiding warning message about implicitely declared burn_fifo_abort()	2008-11-12 07:53:01 +00:00
Thomas Schmitt	2ce3199241	Disabling the sigsegv provoking new debug message	2008-11-08 20:25:38 +00:00
Thomas Schmitt	6fe53827da	Cancelling libburn fifo thread before freeing the fifo object	2008-11-08 14:18:14 +00:00
Thomas Schmitt	6053f3a6e3	Clarified behavior of burn_source with pipes	2008-11-08 13:48:59 +00:00
Thomas Schmitt	de274ddaff	Bug fix: Unsuitable write modes were caught silently and later than desired	2008-11-01 12:13:26 +00:00
Thomas Schmitt	92b0e145d5	Fixed incomplete sentence in man cdrskin	2008-10-15 10:35:06 +00:00
Thomas Schmitt	4a5083739d	A clarification in comment about burn_disc_format()	2008-10-15 10:33:09 +00:00
Thomas Schmitt	7a8040fe9f	Documented changes and release timestamp	2008-10-05 12:45:10 +00:00
Thomas Schmitt	57df15054f	Updated cdrskin tarball generator	2008-10-05 12:43:18 +00:00
Thomas Schmitt	a57cf121d8	Made number transition to next development cycle	2008-10-05 12:41:44 +00:00
Thomas Schmitt	935239b4f9	Incremented LT_CURRENT and LT_AGE to get libburn.so.4.18.0	2008-10-04 07:39:22 +00:00
Thomas Schmitt	e50cc04374	Mentioned new xorriso capabilities in man cdrskin	2008-10-04 07:29:28 +00:00
Thomas Schmitt	89c12404d0	Prevented SIGSEGV after illegal drive operations during sync write	2008-10-04 07:27:43 +00:00
Thomas Schmitt	78642d08ae	Bug fix: /dev/sr0 was accepted as enumerable address on Linux 2.4	2008-09-29 07:35:30 +00:00
Thomas Schmitt	c2c2499862	Bug fix: Potential buffer overflow introduced with revision 2024	2008-09-28 19:39:00 +00:00
Thomas Schmitt	32252122b8	Mentioned recent releases of libisofs and libisoburn	2008-09-24 20:34:01 +00:00
Thomas Schmitt	63a48571af	Corrected pacifier text (Ticket 141)	2008-09-16 06:04:08 +00:00
Thomas Schmitt	006fb98aee	Gave up problematic and unused version.h	2008-09-14 17:45:11 +00:00
Mario Danic	afded80e10	Hopefully made out-of-tree building possible	2008-09-12 19:51:19 +00:00
Thomas Schmitt	fb3d2de5df	Described ISO 9660 multi-session on overwriteable media	2008-09-12 10:04:41 +00:00
Thomas Schmitt	c640c7954b	Trying to avoid unnecessary access to sibling device objects	2008-09-09 13:20:08 +00:00
Thomas Schmitt	bc30c4201a	Issueing many SCSI error messages in cleartext now	2008-08-30 10:44:45 +00:00
Thomas Schmitt	50b587a22c	Mentioned release of libisoburn-0.2.4	2008-08-30 10:39:46 +00:00
Thomas Schmitt	cd99716ab5	Documented changes and release timestamp	2008-08-20 10:09:35 +00:00
Thomas Schmitt	13bdbd3555	Updated cdrskin tarball generator	2008-08-20 10:08:16 +00:00
Thomas Schmitt	711c055730	Made number transition to 0.5.3	2008-08-20 10:06:01 +00:00
Thomas Schmitt	f64ed23a98	Reacted on harmless compiler warning	2008-08-19 12:36:10 +00:00
Thomas Schmitt	730c1555ab	API clarification about CD burn_toc_entries	2008-08-19 12:26:48 +00:00
Thomas Schmitt	acd7dbc5c6	New flag bit2 with burn_read_data()	2008-08-09 07:19:54 +00:00
Thomas Schmitt	6dc9ecbcad	CD burn_toc_entries now bear extension_valid data	2008-08-09 07:18:53 +00:00
Thomas Schmitt	5a99f9c4d8	Updated for next 0.5.1 cycle	2008-08-05 18:11:09 +00:00
Thomas Schmitt	ea17318e18	Taking into respect drive list from /proc/sys/dev/cdrom/info	2008-08-05 18:00:37 +00:00
Thomas Schmitt	98d742a4ef	Avoiding drive scan if single drive is given	2008-08-01 10:10:13 +00:00
Thomas Schmitt	332a92ac78	Documented changes and release timestamp	2008-07-16 09:14:28 +00:00
Thomas Schmitt	6c50416d3c	Updated cdrskin tarball generator	2008-07-16 09:13:36 +00:00
Thomas Schmitt	91d678a503	Made number transition to 0.5.1 and activated development documentation	2008-07-16 09:12:22 +00:00