Documented changes and release timestamp

Makefile.am

@@ -110,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 - B00122
+##  cdrskin construction site - ts A60816 - B00611
 cdrskin_cdrskin_CPPFLAGS = -Ilibburn
-cdrskin_cdrskin_CFLAGS = -DCdrskin_libburn_0_7_7
+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
@@ -203,10 +203,12 @@ EXTRA_DIST = \
 	libburn/os-freebsd.h \
 	libburn/os-linux.h \
 	libburn/os-libcdio.h \
+	libburn/os-solaris.h \
 	libburn/sg-dummy.c \
 	libburn/sg-freebsd.c \
 	libburn/sg-linux.c \
 	libburn/sg-libcdio.c \
+	libburn/sg-solaris.c \
 	COPYING \
 	NEWS \
 	ChangeLog \

README

@@ -11,7 +11,7 @@ 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-0.7.6.pl00.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-0.7.6.pl00.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-0.7.6.pl00.tar.gz
-   cd libburn-0.7.6
+   tar xzf libburn-0.8.4.pl00.tar.gz
+   cd libburn-0.8.4
    ./configure --prefix=/usr
    make
 
@@ -105,8 +105,9 @@ The project comprises of several more or less interdependent parts which
 together strive to be a usable foundation for application development.
 These are libraries, language bindings, and middleware binaries which emulate
 classical (and valuable) Linux tools.
-Currently it is supported on Linux with kernels >= 2.4 and on FreeBSD versions 
-with ATAPI/CAM support enabled in the kernel, see atapicam(4).
+Currently it is supported on GNU/Linux with kernels >= 2.4,
+on FreeBSD with ATAPI/CAM enabled in the kernel (see man atapicam),
+and on OpenSolaris (tested with kernel 5.11).
 On other X/Open compliant systems there will only be pseudo drives, but no
 direct MMC operation on real CD/DVD/BD drives.
 
@@ -144,6 +145,8 @@ The project components (list subject to growth, hopefully):
            also allows to grow ISO-9660 filesystem images on multi-session
            media as well as on overwriteable media via the same API.
            All media peculiarities are handled automatically.
+           It also contains the methods of command oriented application
+           xorriso and offers them via a C language API.
 
 - cdrskin  is a limited cdrecord compatibility wrapper for libburn.
            cdrecord is a powerful GPL'ed burn program included in Joerg
@@ -163,6 +166,8 @@ The project components (list subject to growth, hopefully):
            changing, incremental backups, activating boot images, and
            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.
 
 - "test"   is a collection of application gestures and examples given by the
@@ -496,6 +501,43 @@ Project history as far as known to me:
   fixes bugs about the generic X/Open system adapter, and allows to use
   libcdio >= 0.83 as SCSI transport facility.
 
+- 10 Feb 2010 libisofs-0.6.28 fixes a regression about bootable images which
+  was introduced by version 0.6.22 in August 2009.
+
+- 23 Feb 2010 libisoburn-0.5.0 marks the transition of the xorriso standalone
+  version to an official GNU project. The name changed to "GNU xorriso" and its
+  license is now GPLv3+.
+  The licenses of libburnia libraries and applications are not affected by
+  this change. 
+
+- 10 Mar 2010 libburn-0.7.8 fixes bugs and improves the built-in abort handler
+  on FreeBSD.
+
+- 30 Mar 2010 Release 0.5.2 of libisoburn provides xorriso documentation in
+  GNU Texinfo format with embedded extra data to derive a full man page.
+
+- 09 Apr 2010 libburn-0.8.0 now works with ahci driver on FreeBSD 8-STABLE.
+
+- 03 May 2010 Version 0.6.32 of libisofs is able to create ISO images with
+  multiple boot images. All boot catalog parameters described in El-Torito
+  specs can be set and inquired. This allows to use GRUB boot images for EFI. 
+
+- 04 May 2010 Release 0.5.6.pl00 of libisoburn makes use of the new libisofs
+  capabilities about boot images.
+
+- 11 Jun 2010 libburn-0.8.2 now works on Solaris. 
+
+- 14 Jun 2010 By release 0.5.8.pl00 of libisoburn, xorriso becomes a public C
+  language API of libisoburn. The emulations of mkisofs and cdrecord have
+  been enhanced. 
+
+- 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 provides small improvements with system
+  adapters for libcdio and generic POSIX systems.
+
+
 ------------------------------------------------------------------------------
 
     This program is free software; you can redistribute it and/or modify

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.7.7.tar.gz
+http://scdbackup.sourceforge.net/cdrskin-0.8.4.pl00.tar.gz
 
 Copyright (C) 2006-2010 Thomas Schmitt, provided under GPL version 2 or later.
 ------------------------------------------------------------------------------
@@ -13,7 +13,8 @@ Copyright (C) 2006-2010 Thomas Schmitt, provided under GPL version 2 or later.
 cdrskin is a limited cdrecord compatibility wrapper which allows to use
 most of the libburn features from the command line.
 
-Currently it is supported on Linux with kernels >= 2.4 and on FreeBSD.
+Currently it is supported on GNU/Linux with kernels >= 2.4,
+on FreeBSD and on OpenSolaris.
 IDE drives under Linux 2.4. need kernel module ide-scsi.
 ATA and SATA drives under FreeBSD need kernel module atapicam.
 On other X/Open compliant systems there will only be emulated drives, but no
@@ -25,10 +26,10 @@ By using this software you agree to the disclaimer at the end of this text
 
                    Compilation, First Glimpse, Installation
 
-Obtain cdrskin-0.7.7.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-0.7.7.tar.gz
-    cd cdrskin-0.7.7
+    tar xzf cdrskin-0.8.4.pl00.tar.gz
+    cd cdrskin-0.8.4
 
 Within that directory execute:
 
@@ -103,17 +104,25 @@ The output of  cdrskin --devices  might look like
     0  dev='/dev/sr0'  rwrwr- :  '_NEC'  'DVD_RW ND-4570A'
     1  dev='/dev/sr1'  rwrw-- :  'HL-DT-ST'  'DVDRAM GSA-4082B'
 
-So full and insecure enabling of both for everybody would look like
-
-    chmod a+rw /dev/sr0 /dev/sr1
-
+On Linux, full and insecure enabling of both for everybody would look like
+    chmod a+rw /dev/sr0 /dev/hda
 This is equivalent to the traditional setup chmod a+x,u+s cdrecord.
 
+On FreeBSD, device permissions are to be set in /etc/devfs.rules.
+On Solaris, pfexec privileges may be restricted to "basic,sys_devices".
+See below "System Dependend Drive Permission Examples".
+
 I strongly discourage to run cdrskin with setuid root or via sudo !
 It is not checked for the necessary degree of hacker safety.
+Better consider to grant the necessary permissions to group "floppy"
+and to add users to it.
+
+
+A behavioral conflict is known between any burn software and demons like hald
+which probe CD drives. This can spoil burn runs for CD-R or CD-RW.
+You may have to keep your hald away from the drive. See for example
+   http://www.freebsd.org/gnome/docs/halfaq.html
 
-Consider to put all authorized users into group "floppy", to chgrp the
-device file to that group and to disallow w-access to others.
 
 Helpful with Linux kernel 2.4 is a special SCSI feature:
 It is possible to address a scsi(-emulated) drive via associated device files
@@ -122,11 +131,6 @@ as listed device files. This addressing via e.g. /dev/sr0 or /dev/scd1 is
 compatible with generic read programs like dd and with write program growisofs.
 For finding /dev/sg1 from /dev/sr0, the program needs rw-access to both files.
 
-A behavioral conflict is known between any burn software and demons like hald
-which probe CD drives. This can spoil burn runs for CD-R or CD-RW.
-You may have to keep your hald away from the drive. See for example
-   http://www.freebsd.org/gnome/docs/halfaq.html
-
 
                                 Usage examples 
 
@@ -433,6 +437,84 @@ It will not read startup files, will abort on option  dev_translation= ,
 will not have a fifo buffer, and will not be able to put out help texts or
 debugging messages.
 
+------------------------------------------------------------------------------
+
+                  System Dependend Drive Permission Examples
+
+Accessing the optical drives requires privileges which usually are granted
+only to the superuser. Linux, FreeBSD and Solaris offer quite different
+approaches for avoiding the need for unrestricted privileges.
+
+First check whether some friendly system setting already allows you to
+access the drives as normal user:
+  cdrskin --devices
+Those drives of which you see address and type strings are already usable.
+
+If there remain drives invisible which the superuser can see by the same
+command, then the following examples might help:
+
+--------------------- 
+On all three systems:
+--------------------- 
+Add the authorized users of CD drives to group "floppy" in /etc/group.
+If missing: create this group.
+Changes to /etc/group often only affect new login sessions. So log out and in
+before making the first tests.
+
+---------
+On Linux:
+---------
+Allow rw-access to the drives
+  chgrp floppy /dev/sr0 /dev/sr1
+  chmod g+rw   /dev/sr0 /dev/sr1
+It might be necessary to perform chgrp and chmod after each reboot or to
+edit distro dependent device configuration files for permanent settings.
+
+-----------
+On FreeBSD:
+-----------
+Edit /etc/devfs.rules and make sure to have these lines
+  [localrules=10]
+  add path 'acd*' mode 0664 group floppy
+  add path 'cd*' mode 0664 group floppy
+  add path 'pass*' mode 0664 group floppy
+  add path 'xpt*' mode 0664 group floppy
+  [localrules=5]
+  add path 'pass*' mode 0664 group floppy
+  add path 'cd*' mode 0664 group floppy
+  add path 'xpt*' mode 0664 group floppy
+  add path 'acd*' mode 0664 group floppy
+
+Edit /etc/rc.conf and add the following line if missing
+  devfs_system_ruleset="localrules"
+
+This gets into effect by reboot or by command
+  /etc/rc.d/devfs start
+
+-----------
+On Solaris:
+-----------
+Run cdrskin by
+  pfexec cdrskin ...arguments...
+
+The following settings will make pfexec keep original UID and EUID and prevent
+most superuser powers. Be aware that you still can manipulate all device files
+if you have the file permissions for that.
+Full root privileges for cdrskin can then be aquired only by command su.
+
+Edit /etc/security/exec_attr and add this line to the other "Media Backup"
+lines:
+  Media Backup:solaris:cmd:::/usr/local/bin/cdrskin:privs=basic,sys_devices
+Edit /etc/user_attr and add profile "Media Backup" to the user's line:
+  thomas::::profiles=Media Backup,Primary Administrator;roles=root
+See also man privileges, man exec_attr, man user_attr.
+
+Then allow the group r-access to the drives
+  pfexec chgrp floppy /dev/rdsk/c3t0d0s2 /dev/rdsk/c4t0d0s2
+  pfexec chmod g+r    /dev/rdsk/c3t0d0s2 /dev/rdsk/c4t0d0s2
+The last two commands have to be executed after each boot. I do not know
+the relevant device configuration files yet.
+
 
 ------------------------------------------------------------------------------
                       Project aspects and legal stuff

cdrskin/add_ts_changes_to_libburn_0_8_4

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

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="0.7.7"
+skin_release="0.8.5"
 patch_level=""
 skin_rev="$skin_release""$patch_level"
 

cdrskin/cdrskin.1

@@ -2,7 +2,7 @@
 .\" First parameter, NAME, should be all caps
 .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
 .\" other parameters are allowed: see man(7), man(1)
-.TH CDRSKIN 1 "Feb 29, 2010"
+.TH CDRSKIN 1 "Jun 10, 2010"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -271,19 +271,22 @@ the drive is somewhat higher but the overall system is much less at stake.
 Consider to restrict rw-access to a single group which bundles the users who
 are allowed to use the burner drive (like group "floppy").
 .br
+For drive permission examples on Linux, FreeBSD, and Solaris,
+see cdrskin/README.
+.br
 .PP
 If you only got one CD capable drive then you may leave out cdrskin option
 \fBdev=\fP. Else you should use this option to address the drive you want.
 .br
 cdrskin option dev= not only accepts the listed addresses but also
-traditional cdrecord SCSI addresses which on Linux consist of three
-numbers: Bus,Target,Lun. There is also a related address family "ATA" which
+traditional cdrecord SCSI addresses which consist of three numbers:
+Bus,Target,Lun. On Linux there is also a related address family "ATA" which
 accesses IDE drives not under control of Linux SCSI drivers:
 ATA:Bus,Target,Lun.
 .br
 See option -scanbus for getting a list of cdrecord style addresses.
 .br
-Further are accepted on Linux: links to libburn-suitable device files, 
+Further are accepted: links to libburn-suitable device files, 
 device files which have the same major and minor device number,
 and device files which have the same SCSI address parameters (e.g. /dev/sg0).
 .br

cdrskin/cdrskin.c

@@ -88,7 +88,7 @@ or
 
 /** The official program version */
 #ifndef Cdrskin_prog_versioN
-#define Cdrskin_prog_versioN "0.7.7"
+#define Cdrskin_prog_versioN "0.8.4"
 #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 7
+#define Cdrskin_libburn_minoR 8
 #endif
 #ifndef Cdrskin_libburn_micrO
-#define Cdrskin_libburn_micrO 7
+#define Cdrskin_libburn_micrO 4
 #endif
 
 
@@ -135,13 +135,13 @@ or
 #endif /* Cdrskin_libburn_cvs_A60220_tS */
 
 
-#ifdef Cdrskin_libburn_0_7_6
-#define Cdrskin_libburn_versioN "0.7.6"
+#ifdef Cdrskin_libburn_0_8_4
+#define Cdrskin_libburn_versioN "0.8.4"
 #define Cdrskin_libburn_from_pykix_svN 1
-#endif /* Cdrskin_libburn_0_7_6 */
+#endif /* Cdrskin_libburn_0_8_4 */
 
-#ifdef Cdrskin_libburn_0_7_7
-#define Cdrskin_libburn_versioN "0.7.7"
+#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. 
@@ -151,32 +151,31 @@ or
 /* 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.
 */
-#define Cdrskin_signal_handler_return_2 1
 
 
-#endif /* Cdrskin_libburn_0_7_7 */
+#endif /* Cdrskin_libburn_0_8_5 */
 
 #ifndef Cdrskin_libburn_versioN
-#define Cdrskin_libburn_0_7_6
-#define Cdrskin_libburn_versioN "0.7.6"
+#define Cdrskin_libburn_0_8_4
+#define Cdrskin_libburn_versioN "0.8.4"
 #define Cdrskin_libburn_from_pykix_svN 1
 #endif
 
-#ifdef Cdrskin_libburn_0_7_6
+#ifdef Cdrskin_libburn_0_8_4
 #undef Cdrskin_libburn_majoR
 #undef Cdrskin_libburn_minoR
 #undef Cdrskin_libburn_micrO
 #define Cdrskin_libburn_majoR 0
-#define Cdrskin_libburn_minoR 7
-#define Cdrskin_libburn_micrO 6
+#define Cdrskin_libburn_minoR 8
+#define Cdrskin_libburn_micrO 4
 #endif
-#ifdef Cdrskin_libburn_0_7_7
+#ifdef Cdrskin_libburn_0_8_5
 #undef Cdrskin_libburn_majoR
 #undef Cdrskin_libburn_minoR
 #undef Cdrskin_libburn_micrO
 #define Cdrskin_libburn_majoR 0
-#define Cdrskin_libburn_minoR 7
-#define Cdrskin_libburn_micrO 7
+#define Cdrskin_libburn_minoR 8
+#define Cdrskin_libburn_micrO 5
 #endif
 
 
@@ -4157,11 +4156,7 @@ int Cdrskin__is_aborting(int flag)
 {
  if(Cdrskin_abort_leveL)
    return(-1);
-#ifdef Cdrskin_signal_handler_return_2
-  return(burn_is_aborting(0));
-#else
-  return 0;
-#endif
+ return(burn_is_aborting(0));
 }
 
 
@@ -4192,11 +4187,7 @@ int Cdrskin_abort(struct CdrskiN *skin, int flag)
 int Cdrskin_abort_handler(struct CdrskiN *skin, int signum, int flag)
 {
 
-#ifdef Cdrskin_libburn_has_burn_aborT
-
- int ret;
-
-#else 
+#ifndef Cdrskin_libburn_has_burn_aborT
 
  int wait_grain= 100000,first_status= 1;
  double start_time,last_time,current_time;
@@ -4209,8 +4200,9 @@ int Cdrskin_abort_handler(struct CdrskiN *skin, int signum, int flag)
  if(getpid()!=skin->control_pid) {
    if(skin->verbosity>=Cdrskin_verbose_debuG)   
      ClN(fprintf(stderr,
-          "\ncdrskin_debug: ABORT : [%d] Thread rejected: pid=%d, signum=%d\n",
-          skin->control_pid,getpid(),signum));
+        "\ncdrskin_debug: ABORT : [%lu] Thread rejected: pid=%lu, signum=%lu\n",
+        (unsigned long int) skin->control_pid, (unsigned long int) getpid(),
+        (unsigned long int) signum));
 
 #ifdef Not_yeT
    /* >>> find more abstract and system independent way to determine 
@@ -4251,8 +4243,6 @@ int Cdrskin_abort_handler(struct CdrskiN *skin, int signum, int flag)
  if(skin->verbosity>=Cdrskin_verbose_debuG)
    ClN(fprintf(stderr,"cdrskin_debug: ABORT : Calling burn_abort()\n"));
 
-#ifdef Cdrskin_signal_handler_return_2
-
  Cdrskin_abort_leveL= -1;
  if (!(flag & 1))
  burn_abort(-1, burn_abort_pacifier, "cdrskin: ");
@@ -4260,16 +4250,6 @@ int Cdrskin_abort_handler(struct CdrskiN *skin, int signum, int flag)
         "cdrskin: ABORT : Urged drive worker threads to do emergency halt.\n");
  return -2;
 
-#endif /* Cdrskin_signal_handler_return_2 */
-
- ret= burn_abort(skin->abort_max_wait, burn_abort_pacifier, "cdrskin: ");
- if(ret<=0) {
-   fprintf(stderr,
-         "\ncdrskin: ABORT : Cannot cancel burn session and release drive.\n");
-   return(0);
- }
- fprintf(stderr,"\n");
-
 #else /* Cdrskin_libburn_has_burn_aborT */
 
  if(skin->grabbed_drive!=NULL) {
@@ -5297,8 +5277,8 @@ int Cdrskin_minfo(struct CdrskiN *skin, int flag)
        /* If last two blocks not readable then assume TAO and subtract 2
           from lra and size.
        */;
-       ret= burn_read_data(drive, (off_t) lra * (off_t) 2048, buf, 2 * 2048,
-                           &buf_count, 2 | 4);
+       ret= burn_read_data(drive, (off_t) (lra - 1) * (off_t) 2048, buf,
+                           2 * 2048, &buf_count, 2 | 4);
        if(ret <= 0) {
          lra-= 2;
          size-= 2;

cdrskin/cdrskin_eng.html

@@ -38,8 +38,8 @@ About any CD, DVD, or BD recorder produced in the recent ten years.
 <BR>
 <A HREF="http://libburnia-project.org">libburn</A>
 supports recorders which are compliant to standards MMC-1 for CD and
-MMC-5 for DVD or BD. Linux and FreeBSD allow to access drives connected
-via SCSI, PATA (aka IDE, ATA), USB, or SATA.
+MMC-5 for DVD or BD. Linux, FreeBSD, and Solaris allow to access drives
+connected via SCSI, PATA (aka IDE, ATA), USB, or SATA.
 <BR>
 </P>
 
@@ -52,6 +52,8 @@ via SCSI, PATA (aka IDE, ATA), USB, or SATA.
 <DT>or FreeBSD (with libc, of course) :</DT>
 <DD>ATA and SATA drives need atapicam running.</DD>
 <DD>libcam has to be installed.</DD>
+<DT>or Solaris (with libc, of course) :</DT>
+<DD>Tested on kernel 5.11, hopefully suitable for older ones too.</DD>
 <DT>libpthread</DT>
 <DD>is supposed to be a standard system component.</DD>
 </DL>
@@ -62,7 +64,7 @@ via SCSI, PATA (aka IDE, ATA), USB, or SATA.
 GPL software included:<BR>
 </H2>
 <DL>
-<DT>libburn-0.7.6</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)
@@ -72,8 +74,8 @@ Thomas Schmitt from team of libburnia-project.org)
 </P>
 
 <P>
-This program system has been tested on Intel/AMD Linux and FreeBSD systems
-only.<BR>
+This program system has been tested on Intel/AMD with Linux, FreeBSD,
+and OpenSolaris based operating systems.<BR>
 Ports to other usable systems are appreciated. Reports are welcome.
 </P>
 
@@ -105,8 +107,9 @@ BD-R. Write mode -tao works with anything but quickly blanked DVD-RW.
 <DD>#<KBD>&nbsp;cdrskin --devices</KBD></DD>
 <DT>Being superuser avoids permission problems with /dev/srN resp. /dev/hdX .
 </DT>
-<DT>Ordinary users should then get granted rw access to the /dev files
-as listed by option --devices.</DT>
+<DT>Ordinary users should then get granted access to the /dev files
+as listed by option --devices. Linux and FreeBSD demand rw-permission.
+On Solaris it is r-permission and privileges "basic,sys_devices".</DT>
 <DT>&nbsp;</DT>
 
 <DT>Get info about a particular drive or loaded media:</DT>
@@ -194,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-0.7.6.pl00.tar.gz">cdrskin-0.7.6.pl00.tar.gz</A>
-(820 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
@@ -244,22 +247,24 @@ 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.7.4.pl00:
+Enhancements towards previous stable version cdrskin-0.8.2.pl00:
 <UL>
 <LI>
-Made FreeBSD system adapter safe from mutal burn spoiling and drive deadlock
+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>Experimental system adapter via GNU libcdio on X/Open systems</LI>
-<LI>Experimentally using FreeBSD system adapter for Debian kfreebsd</LI>
 <!--
 <LI>none</LI>
 -->
 </UL>
 
-Bug fixes towards cdrskin-0.7.4.pl00:
+Bug fixes towards cdrskin-0.8.2.pl00:
 <UL>
 <LI>none</LI>
 <!--
+<LI>none</LI>
 -->
 </UL>
 
@@ -267,29 +272,31 @@ Bug fixes towards cdrskin-0.7.4.pl00:
 
 <P>
 <DL>
-<DT><H3>Development snapshot, version 0.7.7 :</H3></DT>
-<DD>Enhancements towards current stable version 0.7.6.pl00:
+<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>
 <!--
+<LI>none yet</LI>
 -->
 
 </UL>
 </DD>
 
-<DD>Bug fixes towards cdrskin-0.7.6.pl00:
+<DD>Bug fixes towards cdrskin-0.8.4.pl00:
 <UL>
 <LI>none yet</LI>
 <!--
+<LI>none yet</LI>
 -->
 </UL>
 </DD>
 
 <DD>&nbsp;</DD>
-<DD><A HREF="README_cdrskin_devel">README 0.7.7</A>
-<DD><A HREF="cdrskin__help_devel">cdrskin_0.7.7 --help</A></DD>
-<DD><A HREF="cdrskin_help_devel">cdrskin_0.7.7 -help</A></DD>
-<DD><A HREF="man_1_cdrskin_devel.html">man cdrskin (as of 0.7.7)</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>
@@ -309,8 +316,8 @@ admins with full system souvereignty.</DT>
 <A HREF="README_cdrskin_devel">upcoming README</A> ):
 </DD>
 <DD>
-<A HREF="cdrskin-0.7.7.tar.gz">cdrskin-0.7.7.tar.gz</A>
-(820 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

cdrskin/cdrskin_timestamp.h

@@ -1 +1 @@
-#define Cdrskin_timestamP "2010.03.09.140341"
+#define Cdrskin_timestamP "2010.06.30.100001"

cdrskin/compile_cdrskin.sh

@@ -8,7 +8,7 @@ debug_opts="-O2"
 def_opts=
 largefile_opts="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1"
 fifo_opts=""
-libvers="-DCdrskin_libburn_0_7_7"
+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_0_7_6"
+  elif test "$i" = "-libburn_0_8_4"
   then
-    libvers="-DCdrskin_libburn_0_7_6"
+    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_0_7_7"
+    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_0_7_6    set macro to match libburn-0.7.6"
+    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."

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([libburn], [0.7.7], [http://libburnia-project.org])
+AC_INIT([libburn], [0.8.4], [http://libburnia-project.org])
 AC_PREREQ([2.50])
 dnl AC_CONFIG_HEADER([config.h])	
 
@@ -9,7 +9,7 @@ LIBBURNIA_SET_FLAGS
 
 AM_INIT_AUTOMAKE([subdir-objects])
 
-dnl Notes by ts A71207 - B00122 :
+dnl Notes by ts A71207 - B00630 :
 dnl
 dnl Regrettably the meaning of the various version types was misunderstood
 dnl before version 0.4.1.
@@ -79,6 +79,10 @@ dnl    0.7.0 = libburn.so.4.35.0
 dnl    0.7.2 = libburn.so.4.37.0
 dnl    0.7.4 = libburn.so.4.39.0
 dnl    0.7.6 = libburn.so.4.41.0
+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
 dnl So LT_CURRENT, LT_REVISION and LT_AGE get set directly here.
 dnl SONAME of the emerging library is  LT_CURRENT - LT_AGE.
@@ -103,8 +107,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=7
-BURN_MICRO_VERSION=7
+BURN_MINOR_VERSION=8
+BURN_MICRO_VERSION=4
 BURN_VERSION=$BURN_MAJOR_VERSION.$BURN_MINOR_VERSION.$BURN_MICRO_VERSION
 
 AC_SUBST(BURN_MAJOR_VERSION)
@@ -115,15 +119,14 @@ AC_SUBST(BURN_VERSION)
 dnl Libtool versioning
 LT_RELEASE=$BURN_MAJOR_VERSION.$BURN_MINOR_VERSION.$BURN_MICRO_VERSION
 dnl
-dnl ts B00122
-dnl ### This is the release version libburn-0.7.6 = libburn.so.4.41.0
-dnl This is the development version after above release version
+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 = 45 - 41 = 4 . Linux library name = libburn.so.4.41.0
-LT_CURRENT=45
-LT_AGE=41
+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`
 
@@ -201,7 +204,7 @@ 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_fifo_odirect=no)
+               , enable_dvd_obs_64k=no)
 if test x$enable_dvd_obs_64k = xyes; then
     LIBBURN_DVD_OBS_64K="-DLibburn_dvd_obs_default_64K"
     echo "enabled  write size default 64 KB on DVD and BD"

libburn/async.c

@@ -23,6 +23,9 @@
 #define Libburn_detach_done_workeR 1
 */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
 
 #include "libburn.h"
 #include "transport.h"

libburn/cleanup.c

@@ -10,6 +10,10 @@
  cc -g -o cleanup -DCleanup_standalonE cleanup.c
 */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
 #include <sys/types.h>
 #include <stdlib.h>
 #include <unistd.h>

libburn/crc.c

@@ -1,5 +1,9 @@
 /* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
 #include "crc.h"
 
 static unsigned short ccitt_table[256] = {
@@ -104,6 +108,15 @@ unsigned long crc32_table[256] = {
 	0x71C0FC00L, 0xE151FD01L, 0xE0E1FE01L, 0x7070FF00L
 };
 
+
+/* Exploration ts B00214 :
+   ECMA-130, 22.3.6 "CRC field"
+   Generating polynomial: x^16 + x^12 + x^5 + 1
+   Also known as CRC-16-CCITT, CRC-CCITT 
+
+   Use in libburn for raw write modes in sector.c.
+   There is also disabled code in read.c which would use it.
+*/
 unsigned short crc_ccitt(unsigned char *q, int len)
 {
 	unsigned short crc = 0;
@@ -112,6 +125,20 @@ unsigned short crc_ccitt(unsigned char *q, int len)
 		crc = ccitt_table[(crc >> 8 ^ *q++) & 0xff] ^ (crc << 8);
 	return ~crc;
 }
+
+
+/* Exploration ts B00214 :
+   ECMA-130, 14.3 "EDC field"
+   "The EDC codeword must be divisible by the check polynomial:
+    P(x) = (x^16 + x^15 + x^2 + 1) . (x^16 + x^2 + x + 1)   
+   "
+
+   >>> Test whether this coincides with CRC-32 IEEE 802.3
+   x^32 + x^26 + x^23 + x^22 + x^16 + x^12 + x^11 + x^10
+   + x^8 + x^7 + x^5 + x^4 + x^2 + x + 1
+
+   Used for raw writing in sector.c
+*/
 unsigned int crc_32(unsigned char *data, int len)
 {
 	unsigned int crc = 0;

libburn/ddlpa.c

@@ -22,6 +22,10 @@
 
 */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
 #include <stdio.h>
 #include <sys/types.h>
 #include <unistd.h>

libburn/debug.c

@@ -4,6 +4,10 @@
    Provided under GPL version 2 or later.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
 
 #ifdef WIN32
 #include <windows.h>

libburn/drive.c

@@ -6,6 +6,10 @@
 */
 
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
 #include <sys/types.h>
 #include <sys/stat.h>
 

libburn/ecma130ab.c

@@ -1,6 +1,10 @@
 
 /* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
 /* ts A91016 : libburn/ecma130ab.c is the replacement for old libburn/lec.c
 
    Copyright 2009, Thomas Schmitt <scdbackup@gmx.net>, libburnia-project.org

libburn/file.c

@@ -6,6 +6,10 @@
 */
 
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
 
 #include <stdlib.h>
 #include <sys/types.h>
@@ -399,9 +403,13 @@ int burn_fifo_source_shoveller(struct burn_source *source, int flag)
 		else
 			ret = fs->inp->read_xt( fs->inp,
 				 (unsigned char *) bufpt, fs->inp_read_size);
-		if (ret == 0)
+		if (ret == 0) {
+
+			/* >>> ??? ts B00326 */
+			/* >>> report EOF of fifo input and fs->in_counter */;
+
 	break; /* EOF */
-		else if (ret < 0) {
+		} else if (ret < 0) {
 			libdax_msgs_submit(libdax_messenger, -1, 0x00020153,
 				 LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
 				"Read error on fifo input", errno, 0);

libburn/init.c

@@ -5,6 +5,10 @@
    Provided under GPL version 2 or later.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
 
 #include <unistd.h>
 
@@ -338,7 +342,7 @@ char *burn_util_thread_id(pid_t pid, pthread_t tid, char text[80])
 {
 	int i, l;
 
-	sprintf(text, "[%d,", getpid());
+	sprintf(text, "[%lu,", (unsigned long int) getpid());
 	l= strlen(text);
 	for(i= 0; i < sizeof(pthread_t) && 2 * i < 80 - l - 3; i++)
 		sprintf(text + l + 2 * i,

libburn/libburn.h

@@ -2627,8 +2627,8 @@ void burn_version(int *major, int *minor, int *micro);
 
 */
 #define burn_header_version_major  0
-#define burn_header_version_minor  7
-#define burn_header_version_micro  7
+#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.

libburn/libdax_audioxtr.c

@@ -4,6 +4,10 @@
    Copyright (C) 2006 Thomas Schmitt <scdbackup@gmx.net>, provided under GPLv2+
 */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
 #include <stdio.h>
 #include <sys/types.h>
 #include <sys/stat.h>

libburn/libdax_msgs.c

@@ -5,6 +5,10 @@
    provided under GPL version 2 or later.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
 #include <stdio.h>
 #include <sys/types.h>
 #include <unistd.h>

libburn/libdax_msgs.h

@@ -434,6 +434,8 @@ Range "scdbackup"          :  0x00020000 to 0x0002ffff
  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
+ 0x0002000c (FAILURE,HIGH) = Cannot start device file enumeration
+ 0x0002000d (FAILURE,HIGH) = Cannot enumerate next device
            
  General library operations:
 

libburn/mmc.c

@@ -5,6 +5,10 @@
    Provided under GPL version 2 or later.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
 
 /* ts A61009 */
 /* #include <a ssert.h> */
@@ -425,6 +429,10 @@ int mmc_get_nwa(struct burn_drive *d, int trackno, int *lba, int *nwa)
 	if (mmc_function_spy(d, "mmc_get_nwa") <= 0)
 		return -1;
 
+	/* ts B00327 : Avoid to inquire unsuitable media states */
+	if (d->status != BURN_DISC_BLANK && d->status != BURN_DISC_APPENDABLE)
+		return 0;
+
 	ret = mmc_read_track_info(d, trackno, &buf, alloc_len);
 	if (ret <= 0)
 		return ret;
@@ -1396,6 +1404,11 @@ static int mmc_read_toc_al(struct burn_drive *d, int *alloc_len)
 		fprintf(stderr, "libburn_experimental: toc entry #%d : %d %d %d\n",i,tdata[8], tdata[9], tdata[10]); 
 */
 
+#ifdef Libburn_allow_first_hiddeN
+		/* ts B00430 : this causes problems because the track has
+		               no entry. One would have to coordinate this
+		               with other parts of libburn.
+		*/
 		if (tdata[3] == 1) {
 			if (burn_msf_to_lba(tdata[8], tdata[9], tdata[10])) {
 				d->disc->session[0]->hidefirst = 1;
@@ -1404,9 +1417,10 @@ static int mmc_read_toc_al(struct burn_drive *d, int *alloc_len)
 						       session[tdata[0] - 1],
 						       track, BURN_POS_END);
 				burn_track_free(track);
-
 			}
 		}
+#endif /* Libburn_allow_first_hiddeN */
+
 		if (tdata[0] <= 0 || tdata[0] > d->disc->sessions)
 			tdata[0] = d->disc->sessions;
 		if (tdata[3] < 100 && tdata[0] > 0) {
@@ -1964,8 +1978,13 @@ void mmc_read_atip(struct burn_drive *d)
 
 	c.dir = FROM_DRIVE;
 	d->issue_command(d, &c);
-	burn_print(1, "atip shit for you\n");
-
+	/* ts B00501 : now caring for error */
+	if (c.error) {
+		d->erasable= 0;
+		d->start_lba= 0;
+		d->end_lba= 0;
+		return;
+	}
 
 	/* ts A61021 */
 	data = c.page->data;

libburn/null.c

@@ -5,6 +5,10 @@
 */
 
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
 #include "null.h"
 #include "libburn.h"
 #include <stdlib.h>

libburn/options.c

@@ -4,6 +4,10 @@
    Provided under GPL version 2 or later.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
 #include "libburn.h"
 #include "options.h"
 #include "drive.h"

libburn/os-dummy.h

@@ -29,12 +29,37 @@
 /* The number of above list items */
 #define BURN_OS_SIGNAL_COUNT 16
 
-/** To list all signals which shall surely not be caught */
+/** The list of all signals which shall surely not be caught.
+    It depends on the particular signal whether it can be ignored or whether
+    it will lead to sudden death of the process.
+    Some signals are not POSIX,
+    but nevertheless ought to be ignored if they are defined.
+*/
+
+#ifdef SIGWINCH
+#define BURN_OS_SIG_WINCH ,SIGWINCH
+#define BURN_OS_SIG_WINCH_CNT 1
+#else
+#define BURN_OS_SIG_WINCH 
+#define BURN_OS_SIG_WINCH_CNT 0
+#endif
+
+#ifdef SIGURG
+#define BURN_OS_SIG_URG ,SIGURG
+#define BURN_OS_SIG_URG_CNT 1
+#else
+#define BURN_OS_SIG_URG 
+#define BURN_OS_SIG_URG_CNT 0
+#endif
+
+/** The combined list of all signals which shall not be caught.
+ */
 #define BURN_OS_NON_SIGNAL_MACRO_LIST \
-SIGKILL, SIGCHLD, SIGSTOP
+SIGKILL, SIGCHLD, SIGSTOP BURN_OS_SIG_WINCH BURN_OS_SIG_URG
 
 /* The number of above list items */
-#define BURN_OS_NON_SIGNAL_COUNT 3
+#define BURN_OS_NON_SIGNAL_COUNT \
+( 3 + BURN_OS_SIG_WINCH_CNT + BURN_OS_SIG_URG_CNT )
 
 
 /* The maximum size for a (SCSI) i/o transaction */

libburn/os-freebsd.h

@@ -4,7 +4,8 @@
    by os.h in case of compilation for
                                   FreeBSD with CAM
 
-   Copyright (C) 2006 Thomas Schmitt <scdbackup@gmx.net>, provided under GPLv2+
+   Copyright (C) 2006 - 2010 Thomas Schmitt <scdbackup@gmx.net>,
+   provided under GPLv2+
 */
 
 /** List of all signals which shall be caught by signal handlers and trigger
@@ -41,7 +42,11 @@ SIGKILL, SIGCHLD, SIGSTOP, SIGURG, SIGWINCH
 
 /* The maximum size for a (SCSI) i/o transaction */
 /* Important : MUST be at least 32768 ! */
-#define BURN_OS_TRANSPORT_BUFFER_SIZE 32768
+/* Older BSD info says that 32 kB is maximum. But 64 kB seems to work well
+   on 8-STABLE. It is by default only used with BD in streaming mode.
+   So older systems should still be quite safe with this buffer max size.
+*/
+#define BURN_OS_TRANSPORT_BUFFER_SIZE 65536
 
 
 /** To hold all state information of BSD device enumeration
@@ -59,5 +64,6 @@ typedef struct burn_drive_enumeration_state *burn_drive_enumerator_t;
 #define BURN_OS_TRANSPORT_DRIVE_ELEMENTS \
 struct cam_device* cam; \
 int lock_fd; \
+int is_ahci; \
 
 

libburn/os-libcdio.h

@@ -29,26 +29,49 @@
 /* The number of above list items */
 #define BURN_OS_SIGNAL_COUNT 16
 
-/** To list all signals which shall surely not be caught */
+
+/** The list of all signals which shall surely not be caught.
+    It depends on the particular signal whether it can be ignored or whether
+    it will lead to sudden death of the process.
+    Some signals are not POSIX,
+    but nevertheless ought to be ignored if they are defined.
+*/
+
+#ifdef SIGWINCH
+#define BURN_OS_SIG_WINCH ,SIGWINCH
+#define BURN_OS_SIG_WINCH_CNT 1
+#else
+#define BURN_OS_SIG_WINCH 
+#define BURN_OS_SIG_WINCH_CNT 0
+#endif
+
+#ifdef SIGURG
+#define BURN_OS_SIG_URG ,SIGURG
+#define BURN_OS_SIG_URG_CNT 1
+#else
+#define BURN_OS_SIG_URG 
+#define BURN_OS_SIG_URG_CNT 0
+#endif
+
+/** The combined list of all signals which shall not be caught.
+ */
 #define BURN_OS_NON_SIGNAL_MACRO_LIST \
-SIGKILL, SIGCHLD, SIGSTOP
+SIGKILL, SIGCHLD, SIGSTOP BURN_OS_SIG_WINCH BURN_OS_SIG_URG
 
 /* The number of above list items */
-#define BURN_OS_NON_SIGNAL_COUNT 3
+#define BURN_OS_NON_SIGNAL_COUNT \
+( 3 + BURN_OS_SIG_WINCH_CNT + BURN_OS_SIG_URG_CNT )
 
 
 /* The maximum size for a (SCSI) i/o transaction */
-/* Important : MUST be at least 32768 ! */
 /* My Blu-ray burner LG GGW-H20 writes junk if stream recording is combined
    with buffer size 32 kB. So stream recording is allowed only with size 64k.
-   This makes it worth to have a special case for GNU/Linux buffer size here.
+   Older BSD info says that 32 kB is maximum. But 64 kB seems to work well
+   on 8-STABLE. It is by default only used with BD in streaming mode.
+   So older systems should still be quite safe with this buffer max size.
 */
-#ifdef __linux
+/* Important : MUST be at least 32768 ! */
 #define BURN_OS_TRANSPORT_BUFFER_SIZE 65536
-#else
-/* (It might be risky to use 64k. FreeBSD is said to can only 32k.) */
-#define BURN_OS_TRANSPORT_BUFFER_SIZE 32768
-#endif
 
 
 /* To hold the position of the most recently delivered address from

libburn/os-solaris.h

@@ -0,0 +1,66 @@
+
+/* os-solaris.h
+   Operating system specific libburn definitions and declarations. Included
+   by os.h in case of compilation for
+           Solaris based systems, e.g. SunOS 5.11
+           with Solaris uscsi MMC transport adapter sg-solaris.c
+
+   Copyright (C) 2010 Thomas Schmitt <scdbackup@gmx.net>, provided under GPLv2+
+*/
+
+
+/** List of all signals which shall be caught by signal handlers and trigger
+    a graceful abort of libburn. (See man signal.h)
+*/
+/* Once as system defined macros */
+#define BURN_OS_SIGNAL_MACRO_LIST \
+ SIGHUP, SIGINT, SIGQUIT, SIGILL, SIGABRT, \
+ SIGFPE, SIGSEGV, SIGPIPE, SIGALRM, SIGTERM, \
+ SIGUSR1, SIGUSR2, SIGXCPU, SIGTSTP, SIGTTIN, \
+ SIGTTOU
+
+/* Once as text 1:1 list of strings for messages and interpreters */
+#define BURN_OS_SIGNAL_NAME_LIST \
+ "SIGHUP", "SIGINT", "SIGQUIT", "SIGILL", "SIGABRT", \
+ "SIGFPE", "SIGSEGV", "SIGPIPE", "SIGALRM", "SIGTERM", \
+ "SIGUSR1", "SIGUSR2", "SIGXCPU", "SIGTSTP", "SIGTTIN", \
+ "SIGTTOU"
+
+/* The number of above list items */
+#define BURN_OS_SIGNAL_COUNT 16
+
+/** To list all signals which shall surely not be caught */
+#define BURN_OS_NON_SIGNAL_MACRO_LIST \
+SIGKILL, SIGCHLD, SIGSTOP, SIGURG, SIGWINCH
+
+/* The number of above list items */
+#define BURN_OS_NON_SIGNAL_COUNT 5
+
+
+/* The maximum size for a (SCSI) i/o transaction */
+/* Important : MUST be at least 32768 ! */
+/* My Blu-ray burner LG GGW-H20 writes junk if stream recording is combined
+   with buffer size 32 kB. So stream recording is allowed only with size 64k.
+*/
+#define BURN_OS_TRANSPORT_BUFFER_SIZE 65536
+
+
+/* >>> */
+
+/* To hold the position of the most recently delivered address from
+   device enumeration.
+*/
+struct burn_drive_enumerator_struct {
+	void *dir;
+};
+
+#define BURN_OS_DEFINE_DRIVE_ENUMERATOR_T \
+typedef struct burn_drive_enumerator_struct burn_drive_enumerator_t;
+
+
+/* The list of operating system dependent elements in struct burn_drive.
+   Usually they are initialized in  sg-*.c:enumerate_common().
+*/
+#define BURN_OS_TRANSPORT_DRIVE_ELEMENTS \
+	int fd;
+

libburn/os.h

@@ -14,6 +14,14 @@
 */
 
 
+#ifdef Libburn_use_sg_dummY
+
+
+/* --------- Any other system. With dummy MMC transport sg-dummy.c --------- */
+#include "os-dummy.h"
+
+
+#else
 #ifdef Libburn_use_libcdiO
 
 
@@ -45,6 +53,14 @@
 #include "os-linux.h"
 
 
+#else
+#ifdef __sun
+
+
+/* ------- Solaris (e.g. SunOS 5.11) with uscsi ------ */
+#include "os-solaris.h"
+
+
 #else
 
 
@@ -52,10 +68,12 @@
 #include "os-dummy.h"
 
 
+#endif /* ! __sun*/
 #endif /* ! __linux */
 #endif /* ! __FreeBSD__kernel__ */
 #endif /* ! __FreeBSD__ */
 #endif /* ! Libburn_use_libcdiO */
+#endif /* ! Libburn_use_sg_dummY */
 
 
 #endif /* ! BURN_OS_H_INCLUDED */

libburn/read.c

@@ -5,6 +5,10 @@
    Provided under GPL version 2 or later.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
 
 /* #include <m alloc.h>  ts A61013 : not in GNU/Linux man 3 malloc */
 

libburn/sbc.c

@@ -7,6 +7,9 @@
    Provided under GPL version 2 or later.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
 
 #include <string.h>
 #include <unistd.h>

libburn/sector.c

@@ -5,6 +5,9 @@
    Provided under GPL version 2 or later.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
 
 #include <stdio.h>
 

libburn/sg-dummy.c

@@ -5,6 +5,10 @@
    Provided under GPL version 2 or later.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
 
 /*
 

libburn/sg-freebsd-port.c

@@ -95,6 +95,10 @@ Send feedback to libburn-hackers@pykix.org .
 
 */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
 
 /** PORTING : ------- OS dependent headers and definitions ------ */
 

libburn/sg-freebsd.c

@@ -5,6 +5,9 @@
    Provided under GPL version 2 or later.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
 
 #include <errno.h>
 #include <unistd.h>
@@ -30,6 +33,18 @@
 #include <sys/disk.h> /* DIOCGMEDIASIZE */
 
 
+/* ts B00326 : For use of CAM_PASS_ERR_RECOVER with ahci */
+#define Libburn_for_freebsd_ahcI yes
+
+/* ts B00327 : for debugging of cam_send_cdb() failures
+ # define Libburn_ahci_verbouS yes
+*/
+
+/* ts B00327 : Apply CAM_PASS_ERR_RECOVER to drives even if not ahci
+ # define libburn_ahci_style_for_alL yes
+*/
+
+
 #include "transport.h"
 #include "drive.h"
 #include "sg.h"
@@ -435,6 +450,7 @@ static void enumerate_common(char *fname, int bus_no, int host_no,
 
 	out.cam = NULL;
 	out.lock_fd = -1;
+	out.is_ahci = 0;
 
 	out.start_lba= -2000000000;
 	out.end_lba= -2000000000;
@@ -527,6 +543,7 @@ static void enumerate_common(char *fname, int bus_no, int host_no,
 	/* Adapter specific handles and data */
 	out.cam = NULL;
 	out.lock_fd = -1;
+	out.is_ahci = 0;
 
 	/* Adapter specific functions */
 	out.grab = sg_grab;
@@ -678,6 +695,7 @@ static int sg_lock(struct burn_drive *d, int flag)
 int sg_grab(struct burn_drive *d)
 {
 	struct cam_device *cam;
+	char path_string[80];
 
 	if (mmc_function_spy(d, "sg_grab") <= 0)
 		return 0;
@@ -700,6 +718,18 @@ int sg_grab(struct burn_drive *d)
 		if (sg_lock(d, 0) <= 0)
 			return 0;
 	fcntl(cam->fd, F_SETOWN, getpid());
+
+	cam_path_string(d->cam, path_string, sizeof(path_string));
+
+#ifdef Libburn_ahci_verbouS
+	fprintf(stderr, "libburn_EXPERIMENTAL: CAM path = %s\n", path_string);
+#endif
+
+	if (strstr(path_string, ":ahcich") != NULL)
+		d->is_ahci = 1;
+	else
+		d->is_ahci = -1;
+
 	d->released = 0;
 	return 1;
 }
@@ -729,7 +759,8 @@ int sg_release(struct burn_drive *d)
 
 int sg_issue_command(struct burn_drive *d, struct command *c)
 {
-	int done = 0, err, sense_len, ret;
+	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;
@@ -777,6 +808,23 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 		break;
 	}
 
+#ifdef Libburn_for_freebsd_ahcI
+	/* ts B00325 : Advise by Alexander Motin */
+        /* Runs well on 8-STABLE (23 Mar 2003)
+	   But on 8-RELEASE cam_send_ccb() returns non-zero with errno 6
+           on eject. Long lasting TEST UNIT READY cycles break with
+           errno 16.
+        */
+#ifdef Libburn_ahci_style_for_alL
+	{
+#else
+	if (d->is_ahci > 0) {
+#endif
+		ccb->ccb_h.flags |= CAM_PASS_ERR_RECOVER;
+		cam_pass_err_recover = 1;
+	}
+#endif /* Libburn_for_freebsd_ahcI */
+
 	ccb->csio.cdb_len = c->oplen;
 	memcpy(&ccb->csio.cdb_io.cdb_bytes, &c->opcode, c->oplen);
 	
@@ -807,8 +855,74 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 	}
 
 	do {
+		memset(c->sense, 0, sizeof(c->sense));
 		err = cam_send_ccb(d->cam, ccb);
-		if (err == -1) {
+
+		ignore_error = sense_len = 0;
+		/* ts B00325 : CAM_AUTOSNS_VALID advised by Alexander Motin */
+		if (ccb->ccb_h.status & CAM_AUTOSNS_VALID) {
+			/* ts B00110 */
+			/* Better curb sense_len */
+			sense_len = ccb->csio.sense_len;
+			if (sense_len > sizeof(c->sense))
+				sense_len = sizeof(c->sense);
+			memcpy(c->sense, &ccb->csio.sense_data, sense_len);
+			if (sense_len >= 14 && cam_pass_err_recover &&
+			    (c->sense[2] & 0x0f))
+				ignore_error = 1;
+		}
+
+		if (err == -1 && cam_pass_err_recover && ! ignore_error) {
+
+#ifdef Libburn_ahci_verbouS
+			fprintf(stderr, "libburn_EXPERIMENTAL: errno = %d . cam_errbuf = '%s'\n", errno, cam_errbuf);
+#endif
+
+			if (errno == ENXIO && c->opcode[0] != 0) {
+				/* Operations on empty or ejected tray */
+				/* MEDIUM NOT PRESENT */
+
+#ifdef Libburn_ahci_verbouS
+				fprintf(stderr, "libburn_EXPERIMENTAL: Emulating [2,3A,00] MEDIUM NOT PRESENT\n");
+#endif
+
+				c->sense[2] = 0x02;
+				c->sense[12] = 0x3A;
+				c->sense[13] = 0x00;
+				sense_len = 14;
+				ignore_error = 1;
+			} else if (c->opcode[0] == 0 && 
+					(errno == EBUSY || errno == ENXIO)) {
+				/* Timeout of TEST UNIT READY loop */
+				/* Inquiries while tray is being loaded */
+				/*LOGICAL UNIT NOT READY,CAUSE NOT REPORTABLE*/
+
+#ifdef Libburn_ahci_verbouS
+				fprintf(stderr, "libburn_EXPERIMENTAL: Emulating [2,04,00] LOGICAL UNIT NOT READY,CAUSE NOT REPORTABLE\n");
+#endif
+
+				c->sense[2] = 0x02;
+				c->sense[12] = 0x04;
+				c->sense[13] = 0x00;
+				sense_len = 14;
+				ignore_error = 1;
+			} else if (errno == EINVAL) {
+				/* Inappropriate MODE SENSE */
+				/* INVALID FIELD IN CDB */
+
+#ifdef Libburn_ahci_verbouS
+				fprintf(stderr, "libburn_EXPERIMENTAL: Emulating [5,24,00] INVALID FIELD IN CDB\n");
+#endif
+
+				c->sense[2] = 0x05;
+				c->sense[12] = 0x24;
+				c->sense[13] = 0x00;
+				sense_len = 14;
+				ignore_error = 1;
+			}
+		}
+
+		if (err == -1 && !ignore_error) {
 			libdax_msgs_submit(libdax_messenger,
 				d->global_index, 0x0002010c,
 				LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
@@ -822,20 +936,33 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 		}
 		/* XXX */
 
-		/* ts B00110 */
-		/* Better curb sense_len */
-		sense_len = ccb->csio.sense_len;
-		if (sense_len > sizeof(c->sense))
-			sense_len = sizeof(c->sense);
-		memcpy(c->sense, &ccb->csio.sense_data, ccb->csio.sense_len);
 		if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) {
-			if (!c->retry) {
+			if (sense_len < 14) {
+				/*LOGICAL UNIT NOT READY,CAUSE NOT REPORTABLE*/
+
+#ifdef Libburn_ahci_verbouS
+				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[2] = 0x02;
+				c->sense[12] = 0x04;
+				c->sense[13] = 0x00;
+				no_retry = 1;
+			}
+			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;

libburn/sg-libcdio.c

@@ -94,6 +94,10 @@ Send feedback to libburn-hackers@pykix.org .
 
 */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
 
 /** PORTING : ------- OS dependent headers and definitions ------ */
 
@@ -131,6 +135,13 @@ Send feedback to libburn-hackers@pykix.org .
 
 #define Libburn_guess_freebsd_atapi_devicE 1
 
+#ifdef sun
+#define Libburn_is_on_solariS 1
+#endif
+#ifdef __sun
+#define Libburn_is_on_solariS 1
+#endif
+
 #include <cdio/cdio.h>
 #include <cdio/logging.h>
 #include <cdio/mmc.h>
@@ -225,8 +236,9 @@ static int sg_give_next_adr_raw(burn_drive_enumerator_t *idx,
 		}
 
 	} else if (initialize == -1) {
-		if (*(idx->ppsz_cd_drives) != NULL)
-			cdio_free_device_list(idx->ppsz_cd_drives);
+		if (idx->ppsz_cd_drives != NULL)
+			if (*(idx->ppsz_cd_drives) != NULL)
+				cdio_free_device_list(idx->ppsz_cd_drives);
 		idx->ppsz_cd_drives = NULL;
 	}
 
@@ -419,14 +431,28 @@ int sg_give_next_adr(burn_drive_enumerator_t *idx,
 {
 	int ret, recursion_count = 0;
 	char path[4096];
+#ifdef Libburn_is_on_solariS
+	int l;
+#endif
 
 	ret = sg_give_next_adr_raw(idx, adr, adr_size, initialize);
 	if (ret <= 0)
 		return ret;
 	if (strlen(adr) >= sizeof(path))
 		return ret;
-	strcpy(path, adr);
-	ret = burn_drive_resolve_link(path, adr, &recursion_count, 2);
+
+#ifdef Libburn_is_on_solariS
+	/* >>> provisory : preserve Solaris /dev/rdsk/cXtYdZs2 addresses */
+	l = strlen(adr);
+	if (l >= 18)
+		if (strncmp(adr, "/dev/rdsk/c", 11) == 0 && adr[11] >= '0' &&
+		    adr[11] <= '9' && strcmp(adr + (l - 2), "s2") == 0)
+			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);
 	return (ret >= 0);
 }
 
@@ -440,13 +466,31 @@ int scsi_enumerate_drives(void)
 	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;
 	char buf[4096], target[4096];
+#ifdef Libburn_is_on_solariS
+	int l;
+#endif
 
 	while(1) {
 		ret = sg_give_next_adr_raw(&idx, buf, sizeof(buf), initialize);
 		initialize = 0;
 		if (ret <= 0)
 	break;
-		ret = burn_drive_resolve_link(buf, target, &recursion_count,2);
+		ret = 1;
+
+#ifdef Libburn_is_on_solariS 
+		/* >>> provisory : preserve Solaris /dev/rdsk/cXtYdZs2 */
+		l = strlen(buf);
+		if (l >= 18)
+			if (strncmp(buf, "/dev/rdsk/c", 11) == 0 &&
+			    buf[11] >= '0' && buf[11] <= '9' &&
+			    strcmp(buf + (l - 2), "s2") == 0)
+				ret = 0;
+#endif /* Libburn_is_on_solariS */
+
+		if (ret == 1) {
+			ret = burn_drive_resolve_link(buf, target,
+							 &recursion_count,2);
+		}
 		if (ret <= 0)
 			strcpy(target, buf);
 		if (burn_drive_is_banned(target))
@@ -553,7 +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, usleep_time, timeout_ms;
+	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;
@@ -568,15 +612,15 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 		return 0;
 	}
 	p_cdio = (CdIo_t *) d->p_cdio;
-        if (burn_sg_log_scsi & 1) {
-                if (fp == NULL) {
-                        fp= fopen("/tmp/libburn_sg_command_log", "a");
-                        fprintf(fp,
-                            "\n-----------------------------------------\n");
-                }
-        }
-        if (burn_sg_log_scsi & 3)
-                scsi_log_cmd(c,fp,0);
+	if (burn_sg_log_scsi & 1) {
+		if (fp == NULL) {
+			fp= fopen("/tmp/libburn_sg_command_log", "a");
+			fprintf(fp,
+			    "\n-----------------------------------------\n");
+		}
+	}
+	if (burn_sg_log_scsi & 3)
+		scsi_log_cmd(c,fp,0);
 
 	memcpy(cdb.field, c->opcode, c->oplen);
 	if (c->dir == TO_DRIVE) {
@@ -628,24 +672,35 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 		}
 */
 
-		if (!sense_valid) {
+		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*/
+				/*LOGICAL UNIT NOT READY,
+					CAUSE NOT REPORTABLE*/
 				c->sense[2] = 0x02;
 				c->sense[12] = 0x04;
+				no_retry = 1;
 			}
 		} else
 			c->sense[2] &= 15;
 	
 		if (i_status != 0 ||
 		    (c->sense[2] || c->sense[12] || c->sense[13])) {
-			if (!c->retry) {
+			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;
@@ -869,7 +924,24 @@ int burn_os_stdio_capacity(char *path, off_t *bytes)
 			return -2;
 		*bytes = add_size;
 
-#endif/* Libburn_is_on_freebsD */
+#endif /* Libburn_is_on_freebsD */
+
+#ifdef Libburn_is_on_solariS
+
+	} else if(S_ISBLK(stbuf.st_mode)) {
+		int open_mode = O_RDONLY, fd;
+		
+		fd = open(path, open_mode);
+		if (fd == -1)
+			return -2;
+		*bytes = lseek(fd, 0, SEEK_END);
+		close(fd);
+		if (*bytes == -1) {
+			*bytes = 0;
+			return 0;
+		}
+		
+#endif /* Libburn_is_on_solariS */
 
 	} else if(S_ISREG(stbuf.st_mode)) {
 		add_size = stbuf.st_blocks * (off_t) 512;

libburn/sg-linux.c

@@ -104,6 +104,10 @@ Hint: You should also look into sg-freebsd-port.c, which is a younger and
 
 */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
 
 /** PORTING : ------- OS dependent headers and definitions ------ */
 
@@ -1928,6 +1932,11 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 			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;

libburn/sg-solaris.c

@@ -0,0 +1,891 @@
+/* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */
+
+/*
+   Copyright (c) 2010 Thomas Schmitt <scdbackup@gmx.net>
+   Provided under GPL version 2 or later.
+*/
+
+
+/*
+
+This is the main operating system dependent SCSI part of libburn. It implements
+the transport level aspects of SCSI control and command i/o.
+
+Present implementation: Solaris uscsi, e.g. for SunOS 5.11
+
+
+PORTING:
+
+Porting libburn typically will consist of adding a new operating system case
+to the following switcher files:
+  os.h    Operating system specific libburn definitions and declarations.
+  sg.c    Operating system dependent transport level modules.
+and of deriving the following system specific files from existing examples:
+  os-*.h  Included by os.h. You will need some general system knowledge
+          about signals and knowledge about the storage object needs of your
+          transport level module sg-*.c.
+
+  sg-*.c  This source module. You will need special system knowledge about
+          how to detect all potentially available drives, how to open them,
+          eventually how to exclusively reserve them, how to perform
+          SCSI transactions, how to inquire the (pseudo-)SCSI driver.
+          You will not need to care about CD burning, MMC or other high-level
+          SCSI aspects.
+
+Said sg-*.c operations are defined by a public function interface, which has
+to be implemented in a way that provides libburn with the desired services:
+
+sg_id_string()          returns an id string of the SCSI transport adapter.
+                        It may be called before initialization but then may
+                        return only a preliminary id.
+
+sg_initialize()         performs global initialization of the SCSI transport
+                        adapter and eventually needed operating system
+                        facilities. Checks for compatibility of supporting
+                        software components.
+
+sg_shutdown()           performs global finalizations and releases golbally
+                        aquired resources.
+
+sg_give_next_adr()      iterates over the set of potentially useful drive 
+                        address strings.
+
+scsi_enumerate_drives() brings all available, not-whitelist-banned, and
+                        accessible drives into libburn's list of drives.
+
+sg_dispose_drive()      finalizes adapter specifics of struct burn_drive
+                        on destruction. Releases resources which were aquired
+                        underneath scsi_enumerate_drives().
+ 
+sg_drive_is_open()      tells wether libburn has the given drive in use.
+
+sg_grab()               opens the drive for SCSI commands and ensures
+                        undisturbed access.
+
+sg_release()            closes a drive opened by sg_grab()
+
+sg_issue_command()      sends a SCSI command to the drive, receives reply,
+                        and evaluates wether the command succeeded or shall
+                        be retried or finally failed.
+
+sg_obtain_scsi_adr()    tries to obtain SCSI address parameters.
+
+
+burn_os_is_2k_seekrw()  tells whether the given path leads to a file object
+                        that can be used in 2 kB granularity by lseek(2),
+                        read(2), and possibly write(2) if not read-only..
+                        E.g. a USB stick or a hard disk.
+
+burn_os_stdio_capacity()  estimates the emulated media space of stdio-drives.
+
+burn_os_open_track_src()  opens a disk file in a way that allows best
+                        throughput with file reading and/or SCSI write command
+                        transmission.
+
+burn_os_alloc_buffer()  allocates a memory area that is suitable for file
+                        descriptors issued by burn_os_open_track_src().
+                        The buffer size may be rounded up for alignment
+                        reasons.
+
+burn_os_free_buffer()   delete a buffer obtained by burn_os_alloc_buffer().
+
+Porting hints are marked by the text "PORTING:".
+Send feedback to libburn-hackers@pykix.org .
+
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
+
+/** PORTING : ------- OS dependent headers and definitions ------ */
+
+#include <unistd.h>
+#include <stropts.h>
+#include <stdio.h>
+#include <sys/types.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <string.h>
+#include <stdlib.h>
+#include <dirent.h>
+
+#ifdef Libburn_os_has_statvfS
+#include <sys/statvfs.h>
+#endif /* Libburn_os_has_stavtfS */
+
+#include <sys/dkio.h>
+#include <sys/vtoc.h>
+
+#include <sys/scsi/impl/uscsi.h>
+
+
+/* The waiting time before eventually retrying a failed SCSI command.
+   Before each retry wait Libburn_sg_linux_retry_incR longer than with
+   the previous one.
+*/
+#define Libburn_sg_solaris_retry_usleeP 100000
+#define Libburn_sg_solaris_retry_incR   100000
+
+
+/** PORTING : ------ libburn portable headers and definitions ----- */
+
+#include "transport.h"
+#include "drive.h"
+#include "sg.h"
+#include "spc.h"
+#include "sbc.h"
+#include "debug.h"
+#include "toc.h"
+#include "util.h"
+
+#include "libdax_msgs.h"
+extern struct libdax_msgs *libdax_messenger;
+
+
+/* is in portable part of libburn */
+int burn_drive_is_banned(char *device_address);
+int burn_drive_resolve_link(char *path, char adr[],
+			 int *recursion_count, int flag); /* drive.c */
+
+/* Whether to log SCSI commands:
+   bit0= log in /tmp/libburn_sg_command_log
+   bit1= log to stderr
+   bit2= flush every line
+*/
+extern int burn_sg_log_scsi;
+
+
+/* ------------------------------------------------------------------------ */
+/* PORTING:   Private definitions. Port only if needed by public functions. */
+/*            (Public functions are listed below)                           */
+/* ------------------------------------------------------------------------ */
+
+
+/* Storage object is in libburn/init.c
+   whether to strive for exclusive access to the drive
+*/
+extern int burn_sg_open_o_excl;
+
+
+/* ------------------------------------------------------------------------ */
+/* PORTING: Private functions. Port only if needed by public functions      */
+/*          (Public functions are listed below)                             */
+/* ------------------------------------------------------------------------ */
+
+
+static int sg_close_drive(struct burn_drive * d)
+{
+	if (d->fd != -1) {
+		close(d->fd);
+		d->fd = -1;
+		return 1;
+	}
+	return 0;
+}
+
+
+static int decode_btl_number(char **cpt, int stopper, int *no)
+{
+  *no = 0;
+  for ((*cpt)++; **cpt != stopper; (*cpt)++) {
+    if (**cpt < '0' || **cpt > '9')
+      return 0;
+    *no = *no * 10 + **cpt - '0';
+  }
+  return 1;
+}
+
+
+/* Read bus, target, lun from name "cXtYdZs2".
+   Return 0 if name is not of the desired form.
+*/
+static int decode_btl_solaris(char *name, int *busno, int *tgtno, int *lunno,
+                        int flag)
+{
+  char *cpt;
+  int ret;
+
+  *busno = *tgtno = *lunno = -1;
+  cpt = name;
+  if (*cpt != 'c')
+    return 0;
+  ret = decode_btl_number(&cpt, 't', busno);
+  if (ret <= 0)
+    return ret;
+  ret = decode_btl_number(&cpt, 'd', tgtno);
+  if (ret <= 0)
+    return ret;
+  ret = decode_btl_number(&cpt, 's', lunno);
+  if (ret <= 0)
+    return ret;
+  cpt++;
+  if (*cpt != '2' || *(cpt + 1) != 0)
+    return 0;
+  return 1;
+}
+
+
+static int start_enum_cXtYdZs2(burn_drive_enumerator_t *idx, int flag)
+{
+	DIR *dir;
+
+	idx->dir = NULL;
+	dir = opendir("/dev/rdsk");
+	if (dir == NULL) {
+		libdax_msgs_submit(libdax_messenger, -1,
+		    0x0002000c, LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
+	"Cannot start device file enumeration. opendir(\"/dev/rdsk\") failed.",
+		    errno, 0);
+		return 0;
+	}
+	idx->dir = dir;
+	return 1;
+}
+
+
+static int next_enum_cXtYdZs2(burn_drive_enumerator_t *idx,
+				char adr[], int adr_size, int flag)
+{ 
+	int busno, tgtno, lunno, ret, fd = -1;
+	char volpath[160];
+	struct dirent *entry;
+	struct dk_cinfo cinfo;
+	DIR *dir;
+
+	dir = idx->dir;
+	while (1) {
+		errno = 0;
+		entry = readdir(dir);
+		if (entry == NULL) {
+			if (errno) {
+				libdax_msgs_submit(libdax_messenger,
+						-1, 0x0002000d,
+				LIBDAX_MSGS_SEV_FAILURE, LIBDAX_MSGS_PRIO_HIGH,
+	"Cannot enumerate next device. readdir() from \"/dev/rdsk\" failed.",
+						errno, 0);
+				return -1;
+			}
+	break;
+		}
+		if (strlen(entry->d_name) > sizeof(volpath) - 11)
+	continue;
+		ret = decode_btl_solaris(entry->d_name,
+					&busno, &tgtno, &lunno, 0);
+		if (ret <= 0)
+	continue; /* not cXtYdZs2 */
+
+		sprintf(volpath, "/dev/rdsk/%s", entry->d_name);
+		if (burn_drive_is_banned(volpath))
+	continue; 
+
+		fd = open(volpath, O_RDONLY | O_NDELAY);
+		if (fd < 0)
+	continue;
+		/* See man dkio */
+		ret = ioctl(fd, DKIOCINFO, &cinfo);
+		close(fd);
+		if (ret < 0)
+	continue;
+		if (cinfo.dki_ctype != DKC_CDROM)
+	continue;
+		if (adr_size <= strlen(volpath))
+			return -1;
+		strcpy(adr, volpath);
+		return 1;
+	}
+	return 0;
+}
+
+
+static int end_enum_cXtYdZs2(burn_drive_enumerator_t *idx, int flag)
+{
+	DIR *dir;
+
+	dir = idx->dir;
+	if(dir != NULL)
+		closedir(dir);
+	idx->dir = NULL;
+	return 1;
+}
+
+
+/* ----------------------------------------------------------------------- */
+/* PORTING: Private functions which contain publicly needed functionality. */
+/*          Their portable part must be performed. So it is probably best  */
+/*          to replace the non-portable part and to call these functions   */
+/*          in your port, too.                                             */
+/* ----------------------------------------------------------------------- */
+
+
+/** Wraps a detected drive into libburn structures and hands it over to
+    libburn drive list.
+*/
+static void enumerate_common(char *fname,
+				int bus_no, int host_no,
+				int channel_no, int target_no, int lun_no)
+{
+	int ret;
+	struct burn_drive out;
+
+	/* General libburn drive setup */
+	burn_setup_drive(&out, fname);
+
+	/* This transport adapter uses SCSI-family commands and models
+	   (seems the adapter would know better than its boss, if ever) */
+	ret = burn_scsi_setup_drive(&out, bus_no, host_no, channel_no,
+                                 target_no, lun_no, 0);
+        if (ret <= 0)
+                return;
+
+	/* PORTING: ------------------- non portable part --------------- */
+
+	/* Transport adapter is Solaris uscsi */
+	/* Adapter specific handles and data */
+	out.fd = -1;
+
+	/* PORTING: ---------------- end of non portable part ------------ */
+
+	/* Adapter specific functions with standardized names */
+	out.grab = sg_grab;
+	out.release = sg_release;
+	out.drive_is_open = sg_drive_is_open;
+	out.issue_command = sg_issue_command;
+	/* Finally register drive and inquire drive information */
+	burn_drive_finish_enum(&out);
+}
+
+
+/* ------------------------------------------------------------------------ */
+/* PORTING:           Public functions. These MUST be ported.               */
+/* ------------------------------------------------------------------------ */
+
+
+/** Returns the id string  of the SCSI transport adapter and eventually
+    needed operating system facilities.
+    This call is usable even if sg_initialize() was not called yet. In that
+    case a preliminary constant message might be issued if detailed info is
+    not available yet.
+    @param msg   returns id string
+    @param flag  unused yet, submit 0
+    @return      1 = success, <=0 = failure
+*/
+int sg_id_string(char msg[1024], int flag)
+{
+	sprintf(msg, "internal Solaris uscsi adapter sg-solaris");
+	return 1;
+}
+
+
+/** Performs global initialization of the SCSI transport adapter and eventually
+    needed operating system facilities. Checks for compatibility of supporting
+    software components.
+    @param msg   returns ids and/or error messages of eventual helpers
+    @param flag  unused yet, submit 0
+    @return      1 = success, <=0 = failure
+*/ 
+int sg_initialize(char msg[1024], int flag)
+{
+	return sg_id_string(msg, 0);
+}
+
+
+/** Performs global finalization of the SCSI transport adapter and eventually
+    needed operating system facilities. Releases globally aquired resources.
+    @param flag  unused yet, submit 0
+    @return      1 = success, <=0 = failure
+*/ 
+int sg_shutdown(int flag)
+{
+	return 1;
+}
+
+
+/** Finalizes BURN_OS_TRANSPORT_DRIVE_ELEMENTS, the components of
+    struct burn_drive which are defined in os-*.h.
+    The eventual initialization of those components was made underneath
+    scsi_enumerate_drives().
+    This will be called when a burn_drive gets disposed.
+    @param d     the drive to be finalized
+    @param flag  unused yet, submit 0
+    @return      1 = success, <=0 = failure
+*/
+int sg_dispose_drive(struct burn_drive *d, int flag)
+{
+	return 1;
+}
+
+
+/** Returns the next index number and the next enumerated drive address.
+    The enumeration has to cover all available and accessible drives. It is
+    allowed to return addresses of drives which are not available but under
+    some (even exotic) circumstances could be available. It is on the other
+    hand allowed, only to hand out addresses which can really be used right
+    in the moment of this call. (This implementation chooses the latter.)
+    @param idx An opaque handle. Make no own theories about it.
+    @param adr Takes the reply
+    @param adr_size Gives maximum size of reply including final 0
+    @param initialize  1 = start new,
+                       0 = continue, use no other values for now
+                      -1 = finish
+    @return 1 = reply is a valid address , 0 = no further address available
+           -1 = severe error (e.g. adr_size too small)
+*/
+int sg_give_next_adr(burn_drive_enumerator_t *idx,
+		     char adr[], int adr_size, int initialize)
+{
+	int ret;
+
+	if (initialize == 1) {
+		ret = start_enum_cXtYdZs2(idx, 0);
+		if (ret <= 0)
+			return ret;
+	} else if (initialize == -1) {
+		ret = end_enum_cXtYdZs2(idx, 0);
+		return 0;
+	}
+	ret = next_enum_cXtYdZs2(idx, adr, adr_size, 0);
+	return ret;
+}
+
+
+/** Brings all available, not-whitelist-banned, and accessible drives into
+    libburn's list of drives.
+*/
+int scsi_enumerate_drives(void)
+{
+	burn_drive_enumerator_t idx;
+	int initialize = 1, ret, i_bus_no = -1;
+        int i_host_no = -1, i_channel_no = -1, i_target_no = -1, i_lun_no = -1;
+	char buf[4096];
+
+	while(1) {
+		ret = sg_give_next_adr(&idx, buf, sizeof(buf), initialize);
+		initialize = 0;
+		if (ret <= 0)
+	break;
+		if (burn_drive_is_banned(buf))
+	continue; 
+		sg_obtain_scsi_adr(buf, &i_bus_no, &i_host_no,
+				&i_channel_no, &i_target_no, &i_lun_no);
+		enumerate_common(buf,
+				i_bus_no, i_host_no, i_channel_no,
+				i_target_no, i_lun_no);
+	}
+	sg_give_next_adr(&idx, buf, sizeof(buf), -1);
+	return 1;
+}
+
+
+/** Tells whether libburn has the given drive in use or exclusively reserved.
+    If it is "open" then libburn will eventually call sg_release() on it when
+    it is time to give up usage resp. reservation.
+*/
+/** Published as burn_drive.drive_is_open() */
+int sg_drive_is_open(struct burn_drive * d)
+{
+	return (d->fd != -1);
+}
+
+
+/** Opens the drive for SCSI commands and - if burn activities are prone
+    to external interference on your system - obtains an exclusive access lock
+    on the drive. (Note: this is not physical tray locking.)
+    A drive that has been opened with sg_grab() will eventually be handed
+    over to sg_release() for closing and unreserving. 
+*/  
+int sg_grab(struct burn_drive *d)
+{
+	char msg[4096];
+	int os_errno, ret;
+	struct dk_cinfo cinfo;
+
+	if (d->fd != -1) {
+		d->released = 0;
+		return 1;
+	}
+	d->fd = open(d->devname, O_RDONLY | O_NDELAY);
+	if (d->fd == -1) {
+		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);
+		return 0;
+	}
+	ret = ioctl(d->fd, DKIOCINFO, &cinfo);
+	if (ret < 0)
+		goto revoke;
+	if (cinfo.dki_ctype != DKC_CDROM)
+		goto revoke;
+
+	/* >>> obtain eventual locks */;
+
+	d->released = 0;
+	return 1;
+revoke:;
+	sprintf(msg, "Could not grab drive '%s'. Not a CDROM device.",
+		 d->devname);
+	libdax_msgs_submit(libdax_messenger, d->global_index,
+			0x00020003,
+			LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
+			msg, 0, 0);
+	return 0;
+}
+
+
+/** PORTING: Is mainly about the call to sg_close_drive() and whether it
+             implements the demanded functionality.
+*/
+/** Gives up the drive for SCSI commands and releases eventual access locks.
+    (Note: this is not physical tray locking.) 
+*/
+int sg_release(struct burn_drive *d)
+{
+	if (d->fd < 0) {
+		burn_print(1, "release an ungrabbed drive.  die\n");
+		return 0;
+	}
+	sg_close_drive(d);
+	return 0;
+}
+
+
+/** Sends a SCSI command to the drive, receives reply and evaluates wether
+    the command succeeded or shall be retried or finally failed.
+    Returned SCSI errors shall not lead to a return value indicating failure.
+    The callers get notified by c->error. An SCSI failure which leads not to
+    a retry shall be notified via scsi_notify_error().
+    The Libburn_log_sg_commandS facility might be of help when problems with
+    a drive have to be examined. It shall stay disabled for normal use.
+    @return: 1 success , <=0 failure
+*/
+int sg_issue_command(struct burn_drive *d, struct command *c)
+{
+	int i, usleep_time, timeout_ms, no_retry = 0, ret;
+	time_t start_time;
+	struct uscsi_cmd cgc;
+	char msg[80];
+        static FILE *fp = NULL;
+
+	c->error = 0;
+	memset(c->sense, 0, sizeof(c->sense));
+	if (d->fd == -1)
+		return 0;
+
+	if (burn_sg_log_scsi & 1) {
+		if (fp == NULL) {
+			fp= fopen("/tmp/libburn_sg_command_log", "a");
+			fprintf(fp,
+			    "\n-----------------------------------------\n");
+		}
+	}
+	if (burn_sg_log_scsi & 3)
+		scsi_log_cmd(c,fp,0);
+
+	memset (&cgc, 0, sizeof (struct uscsi_cmd));
+	/* No error messages, no retries,
+           do not execute with other commands, request sense data
+	*/
+	cgc.uscsi_flags = USCSI_SILENT | USCSI_DIAGNOSE | USCSI_ISOLATE
+				| USCSI_RQENABLE;
+	cgc.uscsi_timeout = 200;
+	cgc.uscsi_cdb = (caddr_t) c->opcode;
+	cgc.uscsi_bufaddr = (caddr_t) c->page->data;
+	if (c->dir == TO_DRIVE) {
+		cgc.uscsi_flags |= USCSI_WRITE;
+		cgc.uscsi_buflen = c->page->bytes;
+	} else if (c->dir == FROM_DRIVE) {
+		cgc.uscsi_flags |= USCSI_READ;
+		if (c->dxfer_len >= 0)
+			cgc.uscsi_buflen = c->dxfer_len;
+		else
+			cgc.uscsi_buflen = BUFFER_SIZE;
+		/* touch page so we can use valgrind */
+		memset(c->page->data, 0, BUFFER_SIZE);
+	} else {
+		cgc.uscsi_buflen = 0;
+	}
+	cgc.uscsi_cdblen  = c->oplen;
+	cgc.uscsi_rqlen = sizeof(c->sense);
+	cgc.uscsi_rqbuf = (caddr_t) c->sense;
+
+	/* retry-loop */
+	start_time = time(NULL);
+	timeout_ms = 200000;
+	for(i = 0; ; i++) {
+
+		ret = ioctl(d->fd, USCSICMD, &cgc);
+
+		/* For cgc.uscsi_status see SAM-3 5.3.1, Table 22
+		   0 = GOOD , 2 = CHECK CONDITION : Sense Data are delivered
+		   8 = BUSY
+		*/
+		if (ret != 0 && cgc.uscsi_status != 2) {
+			sprintf(msg,
+		"Failed to transfer command to drive. (uscsi_status = 0x%X)",
+				(unsigned int) cgc.uscsi_status),
+			libdax_msgs_submit(libdax_messenger,
+				d->global_index, 0x0002010c,
+				LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
+				msg, errno, 0);
+			sg_close_drive(d);
+			d->released = 1;
+			d->busy = BURN_DRIVE_IDLE;
+			c->error = 1;
+			return -1;
+		}
+
+		c->sense[2] &= 15;
+
+		/* >>> valid sense:  cgc.uscsi_rqlen - cgc.uscsi_rqresid */;
+
+		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
+			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;
+}
+
+
+/** Tries to obtain SCSI address parameters.
+    @return  1 is success , 0 is failure
+*/
+int sg_obtain_scsi_adr(char *path, int *bus_no, int *host_no, int *channel_no,
+                       int *target_no, int *lun_no)
+{
+	int ret;
+
+	/* Try to guess from path */
+	if (strncmp("/dev/rdsk/", path, 10) == 0) {
+		ret = decode_btl_solaris(path + 10,
+					bus_no, target_no, lun_no, 0);
+		if (ret > 0) {
+			*host_no = *bus_no;
+			*channel_no = 0;
+			return 1;
+		}
+	}
+	*bus_no = *host_no = *channel_no = *target_no = *lun_no = -1;
+
+	/* >>> Could need a ioctl which gives SCSI numbers */;
+
+	return (0);
+}
+
+
+/** Tells wether a text is a persistent address as listed by the enumeration
+    functions.
+*/
+
+#ifndef NIX
+
+int sg_is_enumerable_adr(char* path)
+{
+	int ret;
+	int bus_no, target_no, lun_no;
+	struct stat stbuf;
+
+	if (strncmp("/dev/rdsk/", path, 10) != 0)
+		return 0;
+	ret = decode_btl_solaris(path + 10, &bus_no, &target_no, &lun_no, 0);
+	if (ret <= 0)
+		return 0;
+	if (stat(path, &stbuf) == -1)
+		return 0;
+	return 1;
+}
+
+#else /* ! NIX */
+
+int sg_is_enumerable_adr(char* adr)
+{
+	burn_drive_enumerator_t idx;
+	int initialize = 1, ret;
+	char buf[64];
+
+	while(1) {
+		ret = sg_give_next_adr(&idx, buf, sizeof(buf), initialize);
+		initialize = 0;
+		if (ret <= 0)
+	break;
+		if (strcmp(adr, buf) == 0) {
+			sg_give_next_adr(&idx, buf, sizeof(buf), -1);
+			return 1;
+		}
+	}
+	sg_give_next_adr(&idx, buf, sizeof(buf), -1);
+	return (0);
+}
+#endif /* NIX */
+
+
+
+
+/* Return 1 if the given path leads to a regular file or a device that can be
+   seeked, read, and possibly written with 2 kB granularity. 
+*/
+int burn_os_is_2k_seekrw(char *path, int flag)
+{
+	struct stat stbuf;
+
+	if (stat(path, &stbuf) == -1)
+		return 0;
+	if (S_ISREG(stbuf.st_mode))
+		return 1;
+	if (S_ISBLK(stbuf.st_mode))
+		return 1;
+	return 0;
+}
+
+
+/** Estimate the potential payload capacity of a file address.
+    @param path  The address of the file to be examined. If it does not
+                 exist yet, then the directory will be inquired.
+    @param bytes The pointed value gets modified, but only if an estimation is
+                 possible.
+    @return      -2 = cannot perform necessary operations on file object
+                 -1 = neither path nor dirname of path exist
+                  0 = could not estimate size capacity of file object
+                  1 = estimation has been made, bytes was set
+*/
+int burn_os_stdio_capacity(char *path, off_t *bytes)
+{
+	struct stat stbuf;
+
+#ifdef Libburn_os_has_statvfS
+	struct statvfs vfsbuf;
+#endif
+
+	char testpath[4096], *cpt;
+	long blocks;
+	off_t add_size = 0;
+
+	testpath[0] = 0;
+	blocks = *bytes / 512;
+	if (stat(path, &stbuf) == -1) {
+		strcpy(testpath, path);
+		cpt = strrchr(testpath, '/');
+		if(cpt == NULL)
+			strcpy(testpath, ".");
+		else if(cpt == testpath)
+			testpath[1] = 0;
+		else
+			*cpt = 0;
+		if (stat(testpath, &stbuf) == -1)
+			return -1;
+
+	} else if(S_ISBLK(stbuf.st_mode)) {
+		int open_mode = O_RDONLY, fd;
+
+		fd = open(path, open_mode);
+		if (fd == -1)
+			return -2;
+		*bytes = lseek(fd, 0, SEEK_END);
+		close(fd);
+		if (*bytes == -1) {
+			*bytes = 0;
+			return 0;
+		}
+
+	} else if(S_ISREG(stbuf.st_mode)) {
+		add_size = stbuf.st_blocks * (off_t) 512;
+		strcpy(testpath, path);
+	} else
+		return 0;
+
+	if (testpath[0]) {	
+
+#ifdef Libburn_os_has_statvfS
+
+		if (statvfs(testpath, &vfsbuf) == -1)
+			return -2;
+		*bytes = add_size + ((off_t) vfsbuf.f_frsize) *
+						(off_t) vfsbuf.f_bavail;
+
+#else /* Libburn_os_has_statvfS */
+
+		return 0;
+
+#endif /* ! Libburn_os_has_stavtfS */
+
+	}
+	return 1;
+}
+
+
+/* ts A91122 : an interface to open(O_DIRECT) or similar OS tricks. */
+
+#ifdef Libburn_read_o_direcT
+
+	/* No special O_DIRECT-like precautions are implemented here */
+
+#endif /* Libburn_read_o_direcT */
+
+
+int burn_os_open_track_src(char *path, int open_flags, int flag)
+{
+	int fd;
+
+	fd = open(path, open_flags);
+	return fd;
+}
+
+
+void *burn_os_alloc_buffer(size_t amount, int flag)
+{
+	void *buf = NULL;
+
+	buf = calloc(1, amount);
+	return buf;
+}
+
+
+int burn_os_free_buffer(void *buffer, size_t amount, int flag)
+{
+	if (buffer == NULL)
+		return 0;
+	free(buffer);
+	return 1;
+}
+

libburn/sg.c

@@ -1,10 +1,21 @@
 
 /* sg.c
    Switcher for operating system dependent transport level modules of libburn.
-   Copyright (C) 2009 Thomas Schmitt <scdbackup@gmx.net>, provided under GPLv2+
+   Copyright (C) 2009 - 2010 Thomas Schmitt <scdbackup@gmx.net>, 
+   provided under GPLv2+
 */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#undef HAVE_CONFIG_H
+#endif
 
+
+#ifdef Libburn_use_sg_dummY
+
+#include "sg-dummy.c"
+
+#else
 #ifdef Libburn_use_libcdiO
 
 #include "sg-libcdio.c"
@@ -24,6 +35,11 @@
 
 #include "sg-linux.c"
 
+#else
+#ifdef __sun
+
+#include "sg-solaris.c"
+
 #else
 
 /* The dummy adapter formally fulfills the expectations of libburn towards
@@ -46,8 +62,10 @@ static int intentional_compiler_warning(void)
 
 #include "sg-dummy.c"
 
+#endif /* ! __sun */
 #endif /* ! __linux */
 #endif /* ! __FreeBSD_kernel__ */
 #endif /* ! __FreeBSD__ */
 #endif /* ! Libburn_use_libcdiO */
+#endif /* ! Libburn_use_sg_dummY */
 

libburn/source.c

@@ -5,6 +5,10 @@
    Provided under GPL version 2 or later.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
 
 #include <stdlib.h>
 #include <string.h>

libburn/spc.c

@@ -5,9 +5,12 @@
    Provided under GPL version 2 or later.
 */
 
-
 /* scsi primary commands */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
 #include <unistd.h>
 #include <stdio.h>
 #include <sys/types.h>
@@ -113,7 +116,8 @@ int spc_test_unit_ready(struct burn_drive *d)
 int spc_wait_unit_attention(struct burn_drive *d, int max_sec, char *cmd_text,
 				int flag)
 {
-	int i, ret = 1, key = 0, asc = 0, ascq = 0;
+	int i, ret = 1, key = 0, asc = 0, ascq = 0, clueless_start = 0;
+	static int clueless_timeout = 5 * 10;
 	char msg[320];
 	unsigned char sense[14];
 	enum response resp;
@@ -143,6 +147,7 @@ int spc_wait_unit_attention(struct burn_drive *d, int max_sec, char *cmd_text,
 				/* media change notice = try again */
 				goto slumber;
 
+handle_error:;
 			/* ts A90213 */
 			sprintf(msg,
 				"Asynchronous SCSI error on %s: ", cmd_text);
@@ -157,7 +162,23 @@ int spc_wait_unit_attention(struct burn_drive *d, int max_sec, char *cmd_text,
 				msg, 0, 0);
 			d->cancel = 1;
 	break;
-		}
+		} else if (ascq == 0x00) { /* CAUSE NOT REPORTABLE */
+			/* Might be a clueless system adapter */
+			if (clueless_start == 0)
+				clueless_start = i;
+			if (i - clueless_start > clueless_timeout) {
+				libdax_msgs_submit(libdax_messenger,
+				  d->global_index,
+				  0x00000002,
+				  LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
+				  "Ended clueless NOT READY cycle",
+				  0, 0);
+				ret = 1; /* medium not present = ok */
+	break;
+			}
+		} else if (ascq == 0x02 || ascq == 0x03) 
+			goto handle_error;
+
 slumber:;
 		usleep(100000);
 	}
@@ -961,13 +982,13 @@ enum response scsi_error_msg(struct burn_drive *d, unsigned char *sense,
 	*key= *asc= *ascq= -1;
 
 	if (senselen<=0 || senselen>2)
-		*key = sense[2];
+		*key = sense[2] & 0x0f;
 	if (senselen<=0 || senselen>12)
 		*asc = sense[12];
 	if (senselen<=0 || senselen>13)
 		*ascq = sense[13];
 
-	sprintf(msg, "[%X %2.2X %2.2X] ", (*key) & 0xf, *asc, *ascq);
+	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",
@@ -982,8 +1003,11 @@ enum response scsi_error_msg(struct burn_drive *d, unsigned char *sense,
 		sprintf(msg, "Not ready");
 		return RETRY;
 	case 0x04:
-		sprintf(msg,
+		if (*ascq == 1)
+			sprintf(msg,
 			"Logical unit is in the process of becoming ready");
+		else
+			sprintf(msg, "Logical unit is not ready");
 		return RETRY;
 	case 0x08:
 		if (*key != 4)

libburn/structure.c

@@ -4,6 +4,10 @@
    Provided under GPL version 2 or later.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
 /* ts A61008 */
 /* #include <a ssert.h> */
 

libburn/toc.c

@@ -5,6 +5,10 @@
 */
 
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
 /* ts A61008 */
 /* #include <a ssert.h> */
 

libburn/util.c

@@ -4,6 +4,10 @@
    Provided under GPL version 2 or later.
 */
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
 #include <string.h>
 
 /* ts A61008 */
@@ -138,6 +142,10 @@ char *burn_guess_cd_manufacturer(int m_li, int s_li, int f_li,
 	char buf[1024];
 	char *result = NULL;
 
+	if (m_li == 0 && s_li == 2 && f_li == 0) {
+		result = strdup("(no manufacturer code)");
+		return result;
+	}
 	f_li_0 = f_li - (f_li % 10);
 	for (i = 0; mid_list[i].manufacturer[0]; i++) {
 		if (m_li == mid_list[i].m_li &&

libburn/write.c

@@ -6,6 +6,10 @@
 */
 
 
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif
+
 #include <unistd.h>
 #include <signal.h>
 

test/libburner.c

@@ -732,6 +732,13 @@ int main(int argc, char **argv)
 {
 	int ret;
 
+	/* A warning to programmers who start their own projekt from here. */
+	if (sizeof(off_t) != 8) {
+		 fprintf(stderr,
+	   "\nFATAL: Compile time misconfiguration. off_t is not 64 bit.\n\n");
+		 exit(39);
+	}
+
 	ret = libburner_setup(argc, argv);
 	if (ret)
 		exit(ret);