Corrected false info about outdated addressing method

Makefile.am

@@ -103,7 +103,7 @@ test_structest_SOURCES = test/structest.c
 
 ##  cdrskin construction site - ts A60816 - A70312
 cdrskin_cdrskin_CPPFLAGS = -Ilibburn
-cdrskin_cdrskin_CFLAGS = -DCdrskin_libburn_0_3_4
+cdrskin_cdrskin_CFLAGS = -DCdrskin_libburn_0_3_6
 cdrskin_cdrskin_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS)
 cdrskin_cdrskin_SOURCES = cdrskin/cdrskin.c cdrskin/cdrfifo.c cdrskin/cdrfifo.h cdrskin/cdrskin_timestamp.h
 ##

README

@@ -197,13 +197,14 @@ Project history as far as known to me:
   DVD media. Code for double layer DVD+/-R is implemented but awaits a tester
   yet.
 
+- 23th April 2000 version 0.3.6 follows the unanimous opinion of Linux kernel
+  people that one should not use /dev/sg on kernel 2.6.
 
 ------------------------------------------------------------------------------
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
+    the Free Software Foundation. To be exact: version 2 of that License.
-    (at your option) any later version.
 
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of

cdrskin/README

@@ -26,12 +26,12 @@ following possible.
 cdrskin. By Thomas Schmitt <scdbackup@gmx.net>
 Integrated sub project of libburnia.pykix.org but also published via:
 http://scdbackup.sourceforge.net/cdrskin_eng.html
-http://scdbackup.sourceforge.net/cdrskin-0.3.4.pl00.tar.gz
+http://scdbackup.sourceforge.net/cdrskin-0.3.6.pl00.tar.gz
 Copyright (C) 2006-2007 Thomas Schmitt
 
 ------------------------------------------------------------------------------
 
-On top of libburn there is implemented cdrskin 0.3.4, a limited cdrecord
+On top of libburn there is implemented cdrskin 0.3.6, a limited cdrecord
 compatibility wrapper which allows to use some libburn features from
 the command line.
 Interested users of cdrecord are invited to participate in the development
@@ -59,16 +59,16 @@ systems, including 64 bit systems. (Further reports are welcome.)
 
                    Compilation, First Glimpse, Installation
 
-Obtain cdrskin-0.3.4.pl00.tar.gz, take it to a directory of your choice and do:
+Obtain cdrskin-0.3.6.pl00.tar.gz, take it to a directory of your choice and do:
 
-    tar xzf cdrskin-0.3.4.pl00.tar.gz
+    tar xzf cdrskin-0.3.6.pl00.tar.gz
-    cd cdrskin-0.3.4
+    cd cdrskin-0.3.6
 
 Or obtain a libburnia.pykix.org SVN snapshot,
 go into the toplevel directory of the snapshot (e.g.  cd libburn_pykix ),
 and execute the autotools script ./bootstrap . Use autools version >= 1.7 .
 
-Within that toplevel directory of either cdrskin-0.3.4 or libburn then execute:
+Within that toplevel directory of either cdrskin-0.3.6 or libburn then execute:
 
     ./configure
     make
@@ -126,16 +126,16 @@ The superuser should be able to see any usable drive and then set the
 permissions as needed. If this hangs then there is a drive with
 unexpected problems (locked, busy, broken, whatever). You might have to
 guess the address of your (non-broken) burner by other means, then.
-On Linux 2.4 this would be some /dev/sgN and on 2.6. some /dev/hdX.
+On Linux 2.4 this would be some /dev/sgN and on 2.6. some /dev/srM or /dev/hdX.
 
 The output of  cdrskin --devices  might look like
 
-    0  dev='/dev/sg0'  rwrwr- :  '_NEC'  'DVD_RW ND-4570A'
+    0  dev='/dev/sr0'  rwrwr- :  '_NEC'  'DVD_RW ND-4570A'
-    1  dev='/dev/sg1'  rwrw-- :  'HL-DT-ST'  'DVDRAM GSA-4082B'
+    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/sg0 /dev/sg1
+    chmod a+rw /dev/sr0 /dev/sr1
 
 I strongly discourage to run cdrskin with setuid root or via sudo !
 It is not checked for the necessary degree of hacker safety.
@@ -152,7 +152,7 @@ Get an overview of cdrecord style addresses of available devices
     cdrskin --devices
 
 Adresses reported with dev=ATA need prefix "ATA:". Address examples:
-    dev=0,1,0  dev=ATA:1,0,0  dev=/dev/sg1  dev=/dev/hdc
+    dev=0,1,0  dev=ATA:1,0,0  dev=/dev/sg1  dev=/dev/hdc  dev=/dev/sr0
 See also "Drive Addressing" below.
 
 Obtain some info about the drive
@@ -210,7 +210,7 @@ cdrskin -scanbus (and hopefully as listed with cdrecord -scanbus) :
 
 or a device file address as listed by --devices with an accessible drive :
 
-    export SCDBACKUP_SCSI_ADR="/dev/sg1"
+    export SCDBACKUP_SCSI_ADR="/dev/sr1"
 
 Set usage of cdrskin with appropriate options rather than cdrecord :
 
@@ -272,8 +272,8 @@ the meaning of the components. A cdrecord-style address for cdrskin
 can be interpreted in two different modes.
 
 Standard mode tries to be compatible to original cdrecord. This should be true
-with (emulated) SCSI where the /dev/sgN with is looked up with matching
+with (emulated) SCSI where the device file /dev/s[rg]N with is looked up with
-scsibus,target,lun as given by the operating system.
+matching scsibus,target,lun as given by the operating system.
 With dev=ATA: or dev=ATAPI: the translation to /dev/hdX is purely literal
 but matches the cdrecord addresses on all systems tested so far:
   X = 'a' + 2 * scsibus + target
@@ -293,8 +293,8 @@ Component "scsibus" indicates the translation method. Defined busses are:
   1  associated to device file /dev/sgN , target chooses N
   2  associated to device file /dev/hdX , target 0='a', 1='b' ..., 25='z' 
 
-So "1,1,0" is /dev/sg1, "2,3,0" is /dev/hdd, "0,2,0" is libburn drive #2 at
+So "1,1,0" is /dev/sg1 (resp. its /dev/sr*), "2,3,0" is /dev/hdd,
-some unspecified device file. 
+"0,2,0" is libburn drive #2 at some unspecified device file. 
 This scheme shall help to keep cdrecord-style addresses stable and exchangeable
 between users without excluding drives with unexpected device addresses.
 The numbering on bus 0 is prone to arbitrary changes caused by changes in
@@ -314,12 +314,12 @@ Old frontends which do not know dev=ATA or dev=ATAPI and which do ask their
 
 To direct any remaining stubborn callers to the appropriate drives, cdrskin
 allows to define device address aliases. Like
-  cdrskin dev_translation=+1,0,0+/dev/sg1 \
+  cdrskin dev_translation=+1,0,0+/dev/sr1 \
-          dev_translation=+ATA:1,0,0+/dev/sg1 \
+          dev_translation=+ATA:1,0,0+/dev/sr1 \
           dev_translation=-"cd+dvd"-0,1,0 \
           ...
 Any of the addresses dev=1,0,0, dev=ATA:1,0,0, dev=cd+dvd will be mapped to
-/dev/sg1 resp. to 0,1,0.
+/dev/sr1 resp. to 0,1,0.
 The first character after "dev_translation=" defines the character which
 separates the two parts of the translation pair. (Above: "+" and "-".)
 
@@ -331,7 +331,7 @@ and to make them default in menu
 A suitable setting for "cdrecord" in menu 
   Settings:Configure K3b...:Programs:User Parameters
 would then probably be
-  -v dev_translation=+1,0,0+/dev/sg1
+  -v dev_translation=+1,0,0+/dev/sr1
 You will learn from button "Show Debugging Output" after a failed burn run
 what cdrecord command was used with what address "dev=...". This address "..."
 will be the right one to replace "1,0,0" in above example.

cdrskin/add_ts_changes_to_libburn_0_3_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.3.4"
+skin_release="0.3.6"
 patch_level=".pl00"
 skin_rev="$skin_release""$patch_level"
 
@@ -114,7 +114,8 @@ then
 fi
 cp -a "$cdrskin_dir" "$cdrskin_target"
 
-# Remove copied binaries
+# Remove copied vim.swp and binaries
+rm "$cdrskin_target"/.*.swp
 rm "$cdrskin_target"/*.o
 rm "$cdrskin_target"/cdrfifo
 rm "$cdrskin_target"/cdrskin
@@ -192,6 +193,18 @@ do
   fi
 done
 
+# Repair non-portable shell code output of ./bootstrap
+(
+ cd "$compile_dir" || exit 1
+ sed -e 's/^for ac_header in$/test -z 1 \&\& for ac_header in dummy/' \
+     < ./configure > ./configure-repaired
+ if test "$?" = 0
+ then
+   echo "$0: Empty 'for ac_header in' found in configure." >&2
+ fi
+ mv ./configure-repaired ./configure
+ chmod a+rx,go-w,u+w ./configure
+)
 
 # Pack it up to the new libburn+cdrskin-tarball
 tar czf "$cdrskin_tarball" "$target"

cdrskin/add_ts_changes_to_libburn_0_3_7

@@ -38,7 +38,7 @@ original="./libburn_svn.tgz"
 # My changes are in $changes , mainly in $changes/cdrskin
 changes="./libburn-develop"
 
-skin_release="0.3.5"
+skin_release="0.3.7"
 patch_level=""
 skin_rev="$skin_release""$patch_level"
 
@@ -114,7 +114,8 @@ then
 fi
 cp -a "$cdrskin_dir" "$cdrskin_target"
 
-# Remove copied binaries
+# Remove copied vim.swp and binaries
+rm "$cdrskin_target"/.*.swp
 rm "$cdrskin_target"/*.o
 rm "$cdrskin_target"/cdrfifo
 rm "$cdrskin_target"/cdrskin
@@ -192,6 +193,19 @@ do
   fi
 done
 
+# Repair non-portable shell code output of ./bootstrap
+( 
+ cd "$compile_dir" || exit 1
+ sed -e 's/^for ac_header in$/test -z 1 \&\& for ac_header in dummy/' \
+     < ./configure > ./configure-repaired
+ if test "$?" = 0
+ then
+   echo "$0: Empty 'for ac_header in' found in configure." >&2
+ fi
+ mv ./configure-repaired ./configure
+ chmod a+rx,go-w,u+w ./configure
+)
+
 
 # Pack it up to the new libburn+cdrskin-tarball
 tar czf "$cdrskin_tarball" "$target"

cdrskin/cdrfifo.c

@@ -77,6 +77,8 @@ struct CdrfifO {
  double empty_counter;
  double full_counter;
 
+ /* eventual ISO-9660 image size obtained from first 64k of input */
+ double iso_fs_size; 
 
  /* (sequential) fd chaining */
  /* fds: 0=source, 1=dest  */
@@ -159,6 +161,7 @@ int Cdrfifo_new(struct CdrfifO **ff, int source_fd, int dest_fd,
  o->get_counter= 0.0;
  o->empty_counter= 0.0;
  o->full_counter= 0.0;
+ o->iso_fs_size= -1.0;
  for(i= 0; i<Cdrfifo_ffd_maX; i++) {
    o->follow_up_fds[i][0]= o->follow_up_fds[i][1]= -1;
    o->follow_up_eop[i]= o->follow_up_sod[i]= -1;
@@ -390,6 +393,13 @@ int Cdrfifo_get_min_fill(struct CdrfifO *o, int *total_min_fill,
 }
 
 
+int Cdrfifo_get_iso_fs_size(struct CdrfifO *o, double *size_in_bytes, int flag)
+{
+ *size_in_bytes= o->iso_fs_size;
+ return(o->iso_fs_size>=2048);
+}
+
+
 /** Get counters which are mentioned by cdrecord at the end of burning.
     It still has to be examined wether they mean what i believe they do.
 */
@@ -398,7 +408,7 @@ int Cdrfifo_get_cdr_counters(struct CdrfifO *o,
                              double *empty_counter, double *full_counter,
                              int flag)
 {
- *put_counter= o->put_counter;;
+ *put_counter= o->put_counter;
  *get_counter= o->get_counter;
  *empty_counter= o->empty_counter;
  *full_counter= o->full_counter;
@@ -870,6 +880,24 @@ int Cdrfifo_fill(struct CdrfifO *o, int size, int flag)
    if(ret==2)
  break;
  }
+
+#ifndef Cdrfifo_standalonE
+ { int Scan_for_iso_size(unsigned char data[2048], double *size_in_bytes,
+                         int flag);
+   int i;
+   double size;
+
+   /* try to obtain an ISO-9660 file system size */
+   for(i= 0; i<32*2048 && i+2048<=fill; i+=2048) {
+     ret= Scan_for_iso_size((unsigned char *) (o->buffer+i), &size, 0);
+     if(ret<=0)
+   continue;
+     o->iso_fs_size= size;
+   break;
+   }
+ }
+#endif
+
  o->total_min_fill= fill;
  o->interval_min_fill= fill;
  return(1);

cdrskin/cdrfifo.h

@@ -117,6 +117,11 @@ int Cdrfifo_get_cdr_counters(struct CdrfifO *o,
                              double *empty_counter, double *full_counter, 
                              int flag);
 
+/** Inquire the eventually detected size of an eventual ISO-9660 file system
+    @return 0=no ISO resp. size detected, 1=size_in_bytes is valid
+*/
+int Cdrfifo_get_iso_fs_size(struct CdrfifO *o, double *size_in_bytes,int flag);
+
 
 /** Check for pending data at the fifo's source file descriptor and wether the
     fifo is ready to take them. Simultaneously check the buffer for existing

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 "March 6, 2007"
+.TH CDRSKIN 1 "April 22, 2007"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -190,12 +190,6 @@ DVD+R.
 Quite deliberately write mode -sao insists in the tradition of a predicted
 track size and blank media, whereas -tao writes the tracks open ended and
 allows appendable media.
-.br
-Currently DVD+R are always kept appendable regardless wether -multi is given
-or not. This might change in future so it is strongly advised to already now
-use
-.B -multi
-whenever the disc shall be kept appendable.
 .PP
 .B Overwriteable DVD Media:
 .br
@@ -231,7 +225,7 @@ it might be only the
 who is able to get this list without further
 precautions.
 .br
-It is consensus that \fBchmod a+rw /dev/sg0\fP or \fBchmod a+rw /dev/hdc\fP
+It is consensus that \fBchmod a+rw /dev/sr0\fP or \fBchmod a+rw /dev/hdc\fP
 is less security sensitive than chmod u+s /usr/bin/cdrskin. The risk for the
 drive is somewhat higher but the overall system is much less at stake.
 .br
@@ -249,7 +243,7 @@ See option -scanbus for getting a list of cdrecord style addresses.
 .br
 Further are accepted on Linux: 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/sr0).
+and device files which have the same SCSI address parameters (e.g. /dev/sg0).
 .br
 .SH OPTIONS
 .TP
@@ -408,6 +402,22 @@ option fifo_start_at=size.
 .BI gracetime= seconds
 Set the grace time before starting to write. (Default is 0)
 .TP
+.BI -isosize
+The next track following this option will try to obtain its source size from
+the header information out of the first few blocks of the source data.
+If these blocks indicate an ISO-9660 filesystem then its declared size
+will be used under the assumption that it is a single session filesystem.
+.br
+If not, then the burn run will be aborted.
+.br
+The range of -isosize is exactly one track. Further tracks may be preceeded
+by further -isosize options, though. At least 15 blocks of padding will be
+added to each -isosize track. But be advised to rather use padsize=300k.
+.br
+This option can be performed on track sources which are regular files or block
+devices. For the first track of the session it can be performed on any type
+of source if there is a fifo of at least 64 kB. See option fs= .
+.TP
 .BI msifile= path
 Run option -msinfo and copy the result line into the file given by path.
 Unlike -msinfo this option does not redirect all normal output away from
@@ -712,7 +722,7 @@ translate cdrecord addresses into cdrskin addresses.
 dev=. <to> is the address to be used instead whenever <from> is given.
 More than one translation instruction can be given in one cdrskin run.
 .br
-E.g.: dev_translation=+ATA:1,0,0+/dev/sg1 dev_translation=+ATA:1,1,0+/dev/sg2
+E.g.: dev_translation=+ATA:1,0,0+/dev/sr1 dev_translation=+ATA:1,1,0+/dev/sr2
 .TP
 .BI \--drive_abort_on_busy
 Linux specific: Abort process if a busy drive is encountered.
@@ -721,14 +731,33 @@ Linux specific: Abort process if a busy drive is encountered.
 Linux specific: Try to wait for a busy drive to become free.
 This is not guaranteed to work with all drivers. Some need nonblocking i/o.
 .TP
+.BI \--drive_f_setlk
+Linux specific: Try to get exclusive lock on drive device file via fcntl(2).
+.TP
 .BI \--drive_not_exclusive
+Linux specific: Combine --drive_not_f_setlk and --drive_not_o_excl.
+.TP
+.BI \--drive_not_f_setlk
+Linux specific: Do not try to get exclusive lock on drive device file via
+fcntl(2).
+.TP
+.BI \--drive_not_o_excl
 Linux specific: Do not ask the operating system to prevent opening busy drives.
 Wether this leads to senseful behavior depends on operating system and kernel.
 .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
+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.
+.br
+Device file family /dev/hdX on kernel >= 2.6 is not affected by this setting.
+.TP
 .BI \--drive_scsi_exclusive
 Linux specific:
-Try to exclusively reserve device files /dev/srN, /dev/scdM, /dev/stK of drive.
+Try to exclusively reserve device files /dev/srN, /dev/scdM, /dev/sgK of drives.
-this would be helpful to protect against collisions with program growisofs.
+This would be helpful to protect against collisions with program growisofs.
 Regrettably on Linux kernel 2.4 with ide-scsi emulation this seems not to
 work. Wether it becomes helpful with new Linux systems has to be evaluated.
 .TP
@@ -778,7 +807,7 @@ Partly Linux specific:
 Such opening is needed for Bus,Target,Lun addresses unless option
 --old_pseudo_scsi_adr is given. It is also needed to resolve device file
 addresses which are not listed with cdrskin --devices but nevertheless point
-to a usable drive. (Like /dev/sr0 using the same SCSI address as /dev/sg0.)
+to a usable drive. (Like /dev/sg0 using the same SCSI address as /dev/sr0.)
 .TP
 .BI \--old_pseudo_scsi_adr
 Linux specific:
@@ -899,7 +928,7 @@ fs=16m
 .br
 .SH SEE ALSO
 .TP
-Formatting track sources for cdrskin:
+Formatting data track sources for cdrskin:
 .br
 .BR mkisofs (8),
 .BR genisoimage (8),

cdrskin/cdrskin.c

@@ -86,7 +86,7 @@ or
 
 /** The official program version */
 #ifndef Cdrskin_prog_versioN
-#define Cdrskin_prog_versioN "0.3.4"
+#define Cdrskin_prog_versioN "0.3.6"
 #endif
 
 /** The source code release timestamp */
@@ -119,23 +119,24 @@ or
 #endif /* Cdrskin_libburn_cvs_A60220_tS */
 
 
-#ifdef Cdrskin_libburn_0_3_4
+#ifdef Cdrskin_libburn_0_3_6
-#define Cdrskin_libburn_versioN "0.3.4"
+#define Cdrskin_libburn_versioN "0.3.6"
 #define Cdrskin_libburn_from_pykix_svN 1
-#endif /* Cdrskin_libburn_0_3_4 */
+#endif /* Cdrskin_libburn_0_3_6 */
 
-#ifdef Cdrskin_libburn_0_3_5
+#ifdef Cdrskin_libburn_0_3_7
-#define Cdrskin_libburn_versioN "0.3.5"
+#define Cdrskin_libburn_versioN "0.3.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
 */
+/* - no novelty switches currently - */
 
-#endif /* Cdrskin_libburn_0_3_5 */
+#endif /* Cdrskin_libburn_0_3_7 */
 
 #ifndef Cdrskin_libburn_versioN
-#define Cdrskin_libburn_versioN "0.3.4"
+#define Cdrskin_libburn_versioN "0.3.6"
 #define Cdrskin_libburn_from_pykix_svN 1
 #endif
 
@@ -188,6 +189,10 @@ or
 #define Cdrskin_libburn_has_allow_untested_profileS 1
 #define Cdrskin_libburn_has_set_forcE 1
 
+/* 0.3.6 */
+#define Cdrskin_libburn_preset_device_familY 1
+#define Cdrskin_libburn_has_track_set_sizE 1
+
 #ifdef Cdrskin_new_api_tesT
 
 /* put macros under test caveat here */
@@ -295,6 +300,11 @@ or
 #endif
 
 
+/** If tsize= sets a value smaller than media capacity divided by this
+    number then there will be a warning and gracetime set at least to 15 */
+#define Cdrskin_minimum_tsize_quotienT 2048.0
+
+
 /* --------------------------------------------------------------------- */
 
 /* Imported from scdbackup-0.8.5/src/cd_backup_planer.c */
@@ -546,6 +556,25 @@ int Sfile_home_adr_s(char *filename, char *fileadr, int fa_size, int flag)
 #endif /* ! Cdrskin_extra_leaN */
 
 
+/* <<< Preliminary sketch : to go into libburn later */
+/* Learned from reading growisofs.c , 
+   watching mkisofs, and viewing its results via od -c */
+/* @return 0=no size found , 1=*size_in_bytes is valid */
+int Scan_for_iso_size(unsigned char data[2048], double *size_in_bytes,
+                      int flag)
+{
+ double sectors= 0.0;
+
+ if(data[0]!=1)
+   return(0);
+ if(strncmp((char *) (data+1),"CD001",5)!=0)
+   return(0);
+ sectors=  data[80] | (data[81]<<8) | (data[82]<<16) | (data[83]<<24); 
+ *size_in_bytes= sectors*2048.0;
+ return(1);
+}
+
+
 /* --------------------------------------------------------------------- */
 
 /** Address translation table for users/applications which do not look
@@ -751,6 +780,7 @@ struct CdrtracK {
  int trackno;
   
  char source_path[Cdrskin_strleN];
+ char original_source_path[Cdrskin_strleN];
  int source_fd;
  int is_from_stdin;
  double fixed_size;
@@ -763,6 +793,11 @@ struct CdrtracK {
  int track_type_by_default;
  int swap_audio_bytes;
 
+ /** Eventually detected data image size */
+ double data_image_size;
+ /** Wether to demand a detected data image size and use it (or else abort) */
+ int use_data_image_size; /* 0=no, 1=size not defined yet, 2=size defined */
+
  /* wether the data source is a container of defined size with possible tail */
  int extracting_container;
 
@@ -777,7 +812,6 @@ struct CdrtracK {
  /** fd[0] of the fifo pipe. This is from where libburn reads its data. */
  int fifo_outlet_fd;
  int fifo_size;
- int fifo_start_at;
 
  /** The possibly external fifo object which knows the real input fd and
      the fd[1] of the pipe. */
@@ -798,16 +832,16 @@ int Cdrtrack_set_track_type(struct CdrtracK *o, int track_type, int flag);
     @param boss The cdrskin control object (corresponds to session)
     @param trackno The index in the cdrskin tracklist array (is not constant)
     @param flag Bitfield for control purposes:
-                bit0= set fifo_start_at to 0
                 bit1= track is originally stdin
 */
 int Cdrtrack_new(struct CdrtracK **track, struct CdrskiN *boss,
                  int trackno, int flag)
 {
  struct CdrtracK *o;
- int ret,skin_track_type;
+ int ret,skin_track_type,fifo_start_at;
  int Cdrskin_get_source(struct CdrskiN *skin, char *source_path,
                         double *fixed_size, double *tao_to_sao_tsize,
+                        int *use_data_image_size,
                         double *padding, int *set_by_padsize,
                         int *track_type, int *track_type_by_default,
                         int *swap_audio_bytes, int flag);
@@ -820,6 +854,7 @@ int Cdrtrack_new(struct CdrtracK **track, struct CdrskiN *boss,
  o->boss= boss;
  o->trackno= trackno;
  o->source_path[0]= 0;
+ o->original_source_path[0]= 0;
  o->source_fd= -1;
  o->is_from_stdin= !!(flag&2);
  o->fixed_size= 0.0;
@@ -831,33 +866,36 @@ int Cdrtrack_new(struct CdrtracK **track, struct CdrskiN *boss,
  o->sector_size= 2048.0;
  o->track_type_by_default= 1;
  o->swap_audio_bytes= 0;
+ o->data_image_size= -1.0;
+ o->use_data_image_size= 0;
  o->extracting_container= 0;
  o->fifo_enabled= 0;
  o->fifo= NULL;
  o->fifo_outlet_fd= -1;
  o->fifo_size= 0;
- o->fifo_start_at= -1;
  o->ff_fifo= NULL;
  o->ff_idx= -1;
  o->libburn_track= NULL;
+
  ret= Cdrskin_get_source(boss,o->source_path,&(o->fixed_size),
-                         &(o->tao_to_sao_tsize),&(o->padding),
+                         &(o->tao_to_sao_tsize),&(o->use_data_image_size),
-                         &(o->set_by_padsize),&(skin_track_type),
+                         &(o->padding),&(o->set_by_padsize),&(skin_track_type),
                          &(o->track_type_by_default),&(o->swap_audio_bytes),
                          0);
  if(ret<=0)
    goto failed;
+ strcpy(o->original_source_path,o->source_path);
+ if(o->fixed_size>0.0)
+   o->extracting_container= 1;
  Cdrtrack_set_track_type(o,skin_track_type,0);
 
 #ifndef Cdrskin_extra_leaN
  ret= Cdrskin_get_fifo_par(boss, &(o->fifo_enabled),&(o->fifo_size),
-                           &(o->fifo_start_at),0);
+                           &fifo_start_at,0);
  if(ret<=0)
    goto failed;
 #endif /* ! Cdrskin_extra_leaN */
 
- if(flag&1)
-   o->fifo_start_at= 0;
  return(1);
 failed:;
  Cdrtrack_destroy(track,0);
@@ -917,11 +955,12 @@ int Cdrtrack_get_track_type(struct CdrtracK *o, int *track_type,
                 bit1= size returns fixed_size, padding returns tao_to_sao_tsize
 */
 int Cdrtrack_get_size(struct CdrtracK *track, double *size, double *padding,
-                      double *sector_size, int flag)
+                      double *sector_size, int *use_data_image_size, int flag)
 {
 
  *size= track->fixed_size;
  *padding= track->padding;
+ *use_data_image_size= track->use_data_image_size;
 #ifdef Cdrskin_allow_libburn_taO
  if((flag&1) && track->libburn_track!=NULL) {
    off_t readcounter= 0,writecounter= 0;
@@ -938,6 +977,16 @@ int Cdrtrack_get_size(struct CdrtracK *track, double *size, double *padding,
 }
 
 
+int Cdrtrack_get_source_path(struct CdrtracK *track,
+              char **source_path, int *source_fd, int *is_from_stdin, int flag)
+{
+ *source_path= track->original_source_path;
+ *source_fd= track->source_fd;
+ *is_from_stdin= track->is_from_stdin;
+ return(1);
+}
+
+
 int Cdrtrack_get_fifo(struct CdrtracK *track, struct CdrfifO **fifo, int flag)
 {
  *fifo= track->fifo;
@@ -1020,12 +1069,88 @@ ex:
 }
 
 
+/* @param flag bit0=set *size_used as the detected data image size
+*/
+int Cdrtrack_activate_image_size(struct CdrtracK *track, double *size_used,
+                                 int flag)
+{
+ if(flag&1)
+   track->data_image_size= *size_used;
+ else
+   *size_used= track->data_image_size;
+ if(track->use_data_image_size!=1)
+   return(2);
+ if(*size_used<=0)
+   return(0);
+ track->fixed_size= *size_used;
+ track->use_data_image_size= 2;
+ if(track->libburn_track!=NULL) {
+#ifdef Cdrskin_libburn_has_track_set_sizE
+   burn_track_set_size(track->libburn_track, (off_t) *size_used);
+#else
+   fprintf(stderr,
+           "cdrskin: SORRY : libburn version is too old for -isosize\n");
+   return(0);
+#endif
+ }
+ /* man cdrecord prescribes automatic -pad with -isosize. 
+    cdrskin obeys only if the current padding is less than that. */
+ if(track->padding<15*2048) {
+   track->padding= 15*2048;
+   track->set_by_padsize= 0;
+ }
+ track->extracting_container= 1;
+ if(track->ff_fifo!=NULL)
+   Cdrfifo_set_fd_in_limit(track->ff_fifo,track->fixed_size,track->ff_idx,0);
+ return(1);
+}
+
+
+int Cdrtrack_seek_isosize(struct CdrtracK *track, int fd, int flag)
+{
+ struct stat stbuf;
+ char secbuf[2048];
+ int ret,got,i;
+ double size;
+
+ if(fstat(fd,&stbuf)==-1)
+   return(0);
+ if((stbuf.st_mode&S_IFMT)!=S_IFREG && (stbuf.st_mode&S_IFMT)!=S_IFBLK)
+   return(2);
+ for(i=0;i<32 && track->data_image_size<=0;i++) {
+   for(got= 0; got<2048;got+= ret) {
+     ret= read(fd, secbuf+got, 2048-got);
+     if(ret<=0)
+       return(0);
+   }
+   ret= Scan_for_iso_size((unsigned char *) secbuf, &size, 0);
+   if(ret<=0)
+ continue;
+   track->data_image_size= size;
+   if(track->use_data_image_size) {
+     Cdrtrack_activate_image_size(track,&size,1);
+     track->fixed_size= size;
+     track->use_data_image_size= 2;
+   }
+ }
+ ret= lseek(fd, (off_t) 0, SEEK_SET);
+ if(ret!=0) {
+   fprintf(stderr,
+        "cdrskin: FATAL : Cannot lseek() to 0 after -isosize determination\n");
+   if(errno!=0)
+     fprintf(stderr, "cdrskin: errno=%d : %s\n", errno, strerror(errno));
+   return(-1);
+ }
+ return(track->data_image_size>0);
+}
+
+
 /** Deliver an open file descriptor corresponding to the source path of track.
     @return <=0 error, 1 success
 */
 int Cdrtrack_open_source_path(struct CdrtracK *track, int *fd, int flag)
 {
- int is_wav= 0, size_from_file= 0;
+ int is_wav= 0, size_from_file= 0, ret;
  off_t xtr_size= 0;
  struct stat stbuf;
 
@@ -1050,9 +1175,18 @@ int Cdrtrack_open_source_path(struct CdrtracK *track, int *fd, int flag)
                     errno==0?"-no error code available-":strerror(errno));
      return(0);
    }
-   if(track->fixed_size<=0) {
+   if(track->use_data_image_size==1 && xtr_size<=0) {
+     ret= Cdrtrack_seek_isosize(track,*fd,0);
+     if(ret==-1)
+       return(-1);
+   } else if(track->fixed_size<=0) {
+
+     /* >>> ??? is it intentional that tsize overrides .wav header ? */
      if(xtr_size>0) {
+
        track->fixed_size= xtr_size;
+       if(track->use_data_image_size==1)
+         track->use_data_image_size= 2; /* count this as image size found */
        size_from_file= 1;
      } else {
        if(fstat(*fd,&stbuf)!=-1) {
@@ -1163,19 +1297,20 @@ int Cdrtrack_attach_fifo(struct CdrtracK *track, int *outlet_fd,
     exhausted.
     @return <=0 error, 1 success
 */
-int Cdrtrack_fill_fifo(struct CdrtracK *track, int flag)
+int Cdrtrack_fill_fifo(struct CdrtracK *track, int fifo_start_at, int flag)
 {
  int ret,buffer_fill,buffer_space;
+ double data_image_size;
 
- if(track->fifo==NULL || track->fifo_start_at==0)
+ if(track->fifo==NULL || fifo_start_at==0)
    return(2);
- if(track->fifo_start_at>0 && track->fifo_start_at<track->fifo_size)
+ if(fifo_start_at>0 && fifo_start_at<track->fifo_size)
    printf(
       "cdrskin: NOTE : Input buffer will be initially filled up to %d bytes\n",
-      track->fifo_start_at);
+      fifo_start_at);
  printf("Waiting for reader process to fill input buffer ... ");
  fflush(stdout);
- ret= Cdrfifo_fill(track->fifo,track->fifo_start_at,0);
+ ret= Cdrfifo_fill(track->fifo,fifo_start_at,0);
  if(ret<=0)
    return(ret);
 
@@ -1189,6 +1324,9 @@ int Cdrtrack_fill_fifo(struct CdrtracK *track, int flag)
      return(0);
    }
  }
+ ret= Cdrfifo_get_iso_fs_size(track->fifo,&data_image_size,0);
+ if(ret>0)
+   track->data_image_size= data_image_size;
  return(1);
 }
 
@@ -1427,9 +1565,17 @@ struct CdrpreskiN {
  /** Wether to abort when a busy drive is encountered during bus scan */
  int abort_on_busy_drive;
 
- /** Wether to try to avoid collisions when opening drives */
+ /** Linux specific : Wether to try to avoid collisions when opening drives */
  int drive_exclusive;
 
+ /** Linux specific : Wether to obtain an exclusive drive lock via fcntl() */
+ int drive_fcntl_f_setlk;
+
+ /** Linux specific : Device file address family to use :
+     0=default , 1=sr , 2=scd , 4=sg */
+ int drive_scsi_dev_family;
+ 
+
  /** Wether to try to wait for unwilling drives to become willing to open */
  int drive_blocking;
 
@@ -1490,6 +1636,8 @@ int Cdrpreskin_new(struct CdrpreskiN **preskin, int flag)
  o->scan_demands_drive= 0;
  o->abort_on_busy_drive= 0;
  o->drive_exclusive= 1;
+ o->drive_fcntl_f_setlk= 1;
+ o->drive_scsi_dev_family= 0;
  o->drive_blocking= 0;
  strcpy(o->write_mode_name,"DEFAULT");
 
@@ -1956,9 +2104,29 @@ set_dev:;
    } else if(strcmp(argv[i],"--drive_blocking")==0) {
      o->drive_blocking= 1;
 
+   } else if(strcmp(argv[i],"--drive_f_setlk")==0) {
+     o->drive_fcntl_f_setlk= 1;
+
    } else if(strcmp(argv[i],"--drive_not_exclusive")==0) {
      o->drive_exclusive= 0;
+     o->drive_fcntl_f_setlk= 0;
 
+   } else if(strcmp(argv[i],"--drive_not_f_setlk")==0) {
+     o->drive_fcntl_f_setlk= 0;
+
+   } else if(strcmp(argv[i],"--drive_not_o_excl")==0) {
+     o->drive_exclusive= 0;
+
+   } else if(strncmp(argv[i],"drive_scsi_dev_family=",22)==0) {
+     value_pt= argv[i]+22;
+     if(strcmp(value_pt,"sr")==0)
+       o->drive_scsi_dev_family= 1;
+     else if(strcmp(value_pt,"scd")==0)
+       o->drive_scsi_dev_family= 2;
+     else if(strcmp(value_pt,"sg")==0)
+       o->drive_scsi_dev_family= 4;
+     else
+       o->drive_scsi_dev_family= 0;
    } else if(strcmp(argv[i],"--drive_scsi_exclusive")==0) {
      o->drive_exclusive= 2;
 
@@ -2009,8 +2177,14 @@ set_dev:;
      printf("                    (might be triggered by a busy hard disk)\n");
      printf(" --drive_blocking   try to wait for busy drive to become free\n");
      printf("                    (might be stalled by a busy hard disk)\n");
-     printf(" --drive_not_exclusive  do not ask kernel to prevent opening\n");
+     printf(" --drive_f_setlk    obtain exclusive lock via fcntl.\n");
+     printf(" --drive_not_exclusive  combined not_o_excl and not_f_setlk.\n");
+     printf(" --drive_not_f_setlk  do not obtain exclusive lock via fcntl.\n");
+     printf(" --drive_not_o_excl   do not ask kernel to prevent opening\n");
      printf("                    busy drives. Effect is kernel dependend.\n");
+     printf(
+         " drive_scsi_dev_family=<sr|scd|sg|default> select Linux device\n");
+     printf("                    file family to be used for (pseudo-)SCSI.\n");
      printf(
          " --drive_scsi_exclusive  try to exclusively reserve device files\n");
      printf("                    /dev/srN, /dev/scdM, /dev/stK of drive.\n");
@@ -2146,6 +2320,8 @@ see_cdrskin_eng_html:;
      fprintf(stderr,"\t-audio\t\tSubsequent tracks are CD-DA audio tracks\n");
      fprintf(stderr,
             "\t-data\t\tSubsequent tracks are CD-ROM data mode 1 (default)\n");
+     fprintf(stderr,
+           "\t-isosize\tUse iso9660 file system size for next data track\n");
      fprintf(stderr,"\t-pad\t\tpadsize=30k\n");
      fprintf(stderr,
         "\t-nopad\t\tDo not pad (default, but applies only to data tracks)\n");
@@ -2239,6 +2415,17 @@ final_checks:;
  if(flag&1)
    goto ex;
 
+#ifndef Cdrskin_libburn_no_burn_preset_device_opeN
+ burn_preset_device_open(o->drive_exclusive
+#ifdef Cdrskin_libburn_preset_device_familY
+                         | (o->drive_scsi_dev_family<<2)
+                         | ((!!o->drive_fcntl_f_setlk)<<5)
+#endif
+                         ,
+                         o->drive_blocking,
+                         o->abort_on_busy_drive);
+#endif /* ! Cdrskin_libburn_no_burn_preset_device_opeN */
+
  if(strlen(o->raw_device_adr)>0 && !o->no_whitelist) {
    int driveno,hret;
    char *adr,buf[Cdrskin_adrleN];
@@ -2442,6 +2629,8 @@ struct CdrskiN {
  */
  char source_path[Cdrskin_strleN];
  double fixed_size;
+ double smallest_tsize;
+ int has_open_ended_track;
  double padding;
  int set_by_padsize;
  int fill_up_media;
@@ -2509,6 +2698,9 @@ struct CdrskiN {
  double tao_to_sao_tsize;
  int stdin_source_used;
 
+ /* For option -isosize */
+ int use_data_image_size;
+
 };
 
 int Cdrskin_destroy(struct CdrskiN **o, int flag);
@@ -2562,6 +2754,8 @@ int Cdrskin_new(struct CdrskiN **skin, struct CdrpreskiN *preskin, int flag)
  o->eject_device[0]= 0;
  o->source_path[0]= 0;
  o->fixed_size= 0.0;
+ o->smallest_tsize= -1.0;
+ o->has_open_ended_track= 0;
  o->padding= 0.0;
  o->set_by_padsize= 0;
  o->fill_up_media= 0;
@@ -2595,6 +2789,7 @@ int Cdrskin_new(struct CdrskiN **skin, struct CdrpreskiN *preskin, int flag)
 #endif /* ! Cdrskin_extra_leaN */
  o->tao_to_sao_tsize= 0.0;
  o->stdin_source_used= 0;
+ o->use_data_image_size= 0;
 
 #ifndef Cdrskin_extra_leaN
  ret= Cdradrtrn_new(&(o->adr_trn),0);
@@ -2648,6 +2843,7 @@ int Cdrskin_set_msinfo_fd(struct CdrskiN *skin, int result_fd, int flag)
 /** Return information about current track source */
 int Cdrskin_get_source(struct CdrskiN *skin, char *source_path,
                        double *fixed_size, double *tao_to_sao_tsize,
+                       int *use_data_image_size,
                        double *padding, int *set_by_padsize,
                        int *track_type, int *track_type_by_default,
                        int *swap_audio_bytes, int flag)
@@ -2655,6 +2851,7 @@ int Cdrskin_get_source(struct CdrskiN *skin, char *source_path,
  strcpy(source_path,skin->source_path);
  *fixed_size= skin->fixed_size;
  *tao_to_sao_tsize = skin->tao_to_sao_tsize;
+ *use_data_image_size= skin->use_data_image_size;
  *padding= skin->padding;
  *set_by_padsize= skin->set_by_padsize;
  *track_type= skin->track_type;
@@ -2726,7 +2923,7 @@ int Cdrskin_fill_fifo(struct CdrskiN *skin, int flag)
 {
  int ret;
 
- ret= Cdrtrack_fill_fifo(skin->tracklist[0],0);
+ ret= Cdrtrack_fill_fifo(skin->tracklist[0],skin->fifo_start_at,0);
  if(ret<=0)
    return(ret);
  printf("input buffer ready.\n");
@@ -3223,7 +3420,7 @@ wrong_devno:;
 int Cdrskin_driveno_to_btldev(struct CdrskiN *skin, int driveno,
                               char btldev[Cdrskin_adrleN], int flag)
 {
- int k,ret,still_untranslated= 1,hret;
+ int k,ret,still_untranslated= 1,hret,k_start;
  char *loc= NULL,buf[Cdrskin_adrleN],adr[Cdrskin_adrleN];
 
  if(driveno<0 || driveno>skin->n_drives)
@@ -3264,12 +3461,17 @@ int Cdrskin_driveno_to_btldev(struct CdrskiN *skin, int driveno,
  }
 #endif
 
- if(strncmp(loc,"/dev/sg",7)==0) {
+ k_start= 0;
-   for(k= 7;loc[k]!=0;k++)
+ if(strncmp(loc,"/dev/sg",7)==0 || strncmp(loc,"/dev/sr",7)==0)
+   k_start= 7;
+ if(strncmp(loc,"/dev/scd",8)==0)
+   k_start= 8;
+ if(k_start>0) {
+   for(k= k_start;loc[k]!=0;k++)
      if(loc[k]<'0' || loc[k]>'9')
    break;
-   if(loc[k]==0 && k>7) {
+   if(loc[k]==0 && k>k_start) {
-     sprintf(btldev,"1,%s,0",loc+7);
+     sprintf(btldev,"1,%s,0",loc+k_start);
      {ret= 1; goto adr_translation;}
    }
  }
@@ -3843,6 +4045,44 @@ ex:;
 
 #ifndef Cdrskin_extra_leaN
 
+/* A70324: proposal by Eduard Bloch */
+int Cdrskin_warn_of_mini_tsize(struct CdrskiN *skin, int flag)
+{
+ off_t media_space= 0;
+ enum burn_disc_status s;
+ struct burn_drive *drive;
+
+#ifdef Cdrskin_libburn_has_get_spacE
+ if(skin->multi || skin->has_open_ended_track || skin->smallest_tsize<0)
+   return(1);
+ drive= skin->drives[skin->driveno].drive;
+ s= burn_disc_get_status(drive);
+ if(s!=BURN_DISC_BLANK)
+   return(1);
+ media_space= burn_disc_available_space(drive, NULL);
+ if(media_space<=0 || 
+    skin->smallest_tsize >= media_space / Cdrskin_minimum_tsize_quotienT)
+   return(1);
+ fprintf(stderr,"\n");
+ fprintf(stderr,"\n");
+ fprintf(stderr,
+         "cdrskin: WARNING: Very small track size set by option tsize=\n");
+ fprintf(stderr,
+         "cdrskin:          Track size %.1f MB <-> media capacity %.1f MB\n",
+         skin->smallest_tsize/1024.0/1024.0,
+         ((double) media_space)/1024.0/1024.0);
+ fprintf(stderr,"\n");
+ fprintf(stderr,
+         "cdrskin: Will wait at least 15 seconds until real burning starts\n");
+ fprintf(stderr,"\n");
+ if(skin->gracetime<15)
+   skin->gracetime= 15;
+   
+#endif /* Cdrskin_libburn_has_get_spacE */
+ return(1);
+}
+
+
 /** Emulate the gracetime= behavior of cdrecord 
     @param flag Bitfield for control purposes:
                 bit0= do not print message about pseudo-checkdrive
@@ -3854,6 +4094,8 @@ int Cdrskin_wait_before_action(struct CdrskiN *skin, int flag)
 {
  int i;
 
+ Cdrskin_warn_of_mini_tsize(skin,0);
+
  if(skin->verbosity>=Cdrskin_verbose_progresS) {
    char speed_text[80];
    if(skin->x_speed<0)
@@ -4115,7 +4357,7 @@ int Cdrskin_burn_pacifier(struct CdrskiN *skin,
  double elapsed_time,elapsed_total_time,current_time;
  double estim_time,estim_minutes,estim_seconds,percent;
  int ret,fifo_percent,fill,space,advance_interval=0,new_mb,old_mb,time_to_tell;
- int fs,bs,old_track_idx,buffer_fill,formatting= 0;
+ int fs,bs,old_track_idx,buffer_fill,formatting= 0,use_data_image_size;
  char fifo_text[80],mb_text[40];
  char *debug_mark= ""; /* use this to prepend a marker text for experiments */
 
@@ -4199,7 +4441,7 @@ int Cdrskin_burn_pacifier(struct CdrskiN *skin,
 
  if(old_track_idx>=0 && old_track_idx<skin->supposed_track_idx) {
    Cdrtrack_get_size(skin->tracklist[old_track_idx],&fixed_size,&padding,
-                     &sector_size,1);
+                     &sector_size,&use_data_image_size,1);
    if(skin->verbosity>=Cdrskin_verbose_progresS)
      printf("\n");
    printf("%sTrack %-2.2d: Total bytes read/written: %.f/%.f (%.f sectors).\n",
@@ -4211,7 +4453,7 @@ int Cdrskin_burn_pacifier(struct CdrskiN *skin,
  if(skin->supposed_track_idx>=0 && 
     skin->supposed_track_idx<skin->track_counter)
    Cdrtrack_get_size(skin->tracklist[skin->supposed_track_idx],&fixed_size,
-                     &padding,&sector_size,0);
+                     &padding,&sector_size,&use_data_image_size,0);
 
  bytes_to_write= ((double) p->sectors)*sector_size;
  written_total_bytes= ((double) p->sector)*sector_size;
@@ -4484,6 +4726,7 @@ int Cdrskin_activate_write_mode(struct CdrskiN *skin, enum burn_disc_status s,
  int ok, was_still_default= 0, block_type_demand,track_type,sector_size, i;
  int profile_number= -1, track_type_1= 0, mixed_mode= 0, unpredicted_size= 0;
  int might_do_tao= 0, might_do_sao= 1, allows_multi= 1, ret, current_is_cd= 1;
+ int use_data_image_size;
  struct burn_drive_info *drive_info = NULL;
  char profile_name[80];
  double fixed_size= 0.0, tao_to_sao_tsize= 0.0, dummy;
@@ -4526,7 +4769,7 @@ int Cdrskin_activate_write_mode(struct CdrskiN *skin, enum burn_disc_status s,
    else if(track_type_1!=track_type)
      mixed_mode= 1;
    Cdrtrack_get_size(skin->tracklist[i],&fixed_size,
-                     &tao_to_sao_tsize,&dummy,2);
+                     &tao_to_sao_tsize,&dummy,&use_data_image_size,2);
 
    /* <<< until CD-SAO does fill-up: filluped last CD track length undefined */
    if(fixed_size<=0 &&
@@ -4700,6 +4943,68 @@ it_is_done:;
 #endif /* ! Cdrskin_libburn_write_mode_ruleS */
 
 
+#ifndef Cdrskin_extra_leaN
+
+int Cdrskin_announce_tracks(struct CdrskiN *skin, int flag)
+{
+ int i,mb,use_data_image_size;
+ double size,padding,sector_size= 2048.0;
+ double sectors;
+
+ if(skin->verbosity>=Cdrskin_verbose_progresS) {
+   for(i=0;i<skin->track_counter;i++) {
+     Cdrtrack_get_size(skin->tracklist[i],&size,&padding,&sector_size,
+                       &use_data_image_size,0);
+     if(size<=0) {
+       printf("Track %-2.2d: %s unknown length",
+              i+1,(sector_size==2048?"data ":"audio"));
+     } else {
+       mb= size/1024.0/1024.0;
+       printf("Track %-2.2d: %s %4d MB        ",
+              i+1,(sector_size==2048?"data ":"audio"),mb);
+     }
+     if(padding>0)
+       printf(" padsize:  %.f KB\n",padding/1024.0);
+     else
+       printf("\n");
+   }
+   if(skin->fixed_size<=0) {
+     printf("Total size:       0 MB (00:00.00) = 0 sectors\n");
+     printf("Lout start:       0 MB (00:02/00) = 0 sectors\n");
+   } else {
+     /* >>> This is quite a fake. Need to learn about 12:35.25 and "Lout" 
+            ??? Is there a way to obtain the toc in advance (print_cue()) ? */
+     double seconds;
+     int min,sec,frac;
+
+     mb= skin->fixed_size/1024.0/1024.0;
+     seconds= skin->fixed_size/150.0/1024.0+2.0;
+     min= seconds/60.0;
+     sec= seconds-min*60;
+     frac= (seconds-min*60-sec)*100;
+     if(frac>99)
+       frac= 99;
+     sectors= (int) (skin->fixed_size/sector_size);
+     if(sectors*sector_size != skin->fixed_size)
+       sectors++;
+     printf("Total size:    %5d MB (%-2.2d:%-2.2d.%-2.2d) = %d sectors\n",
+             mb,min,sec,frac,(int) sectors);
+     seconds+= 2;
+     min= seconds/60.0;
+     sec= seconds-min*60;
+     frac= (seconds-min*60-sec)*100;
+     if(frac>99)
+       frac= 99;
+     printf("Lout start:    %5d MB (%-2.2d:%-2.2d/%-2.2d) = %d sectors\n",
+            mb,min,sec,frac,(int) sectors);
+   }
+ }
+ return(1);
+}
+
+#endif /* ! Cdrskin_extra_leaN */
+
+
 /** Burn data via libburn according to the parameters set in skin.
     @return <=0 error, 1 success
 */
@@ -4713,12 +5018,14 @@ int Cdrskin_burn(struct CdrskiN *skin, int flag)
  struct burn_progress p;
  struct burn_drive *drive;
  int ret,loop_counter= 0,max_track= -1,i,hflag,nwa,num, wrote_well= 2;
- int fifo_disabled= 0,fifo_percent,total_min_fill,mb,min_buffer_fill= 101;
+ int fifo_disabled= 0,fifo_percent,total_min_fill,min_buffer_fill= 101;
+ int use_data_image_size, needs_early_fifo_fill= 0;
  double put_counter,get_counter,empty_counter,full_counter;
  double start_time,last_time;
  double total_count= 0.0,last_count= 0.0,size,padding,sector_size= 2048.0;
- double sectors;
  char *doing;
+ char *source_path;
+ int source_fd, is_from_stdin;
 
  if(skin->tell_media_space)
    doing= "estimating";
@@ -4783,9 +5090,14 @@ burn_failed:;
      fprintf(stderr,"cdrskin: FATAL : cannot add track %d to session.\n",i+1);
      goto burn_failed;
    }
-   Cdrtrack_get_size(skin->tracklist[i],&size,&padding,&sector_size,0);
+   Cdrtrack_get_size(skin->tracklist[i],&size,&padding,&sector_size,
-   if(size>0)
+                     &use_data_image_size,0);
+   if(use_data_image_size==1) { /* still unfulfilled -isosize demand pending */
+     needs_early_fifo_fill= 1;
+   } else if(size>0)
      skin->fixed_size+= size+padding;
+   else
+     skin->has_open_ended_track= 1;
  }
 
 #ifndef Cdrskin_libburn_write_mode_ruleS
@@ -4801,6 +5113,56 @@ burn_failed:;
 #endif /* ! Cdrskin_allow_sao_for_appendablE */
  }
 #endif /* ! Cdrskin_libburn_write_mode_ruleS */
+
+ /* Final decision on track size has to be made after eventual -isosize
+    determination via fifo content.
+ */
+ if(needs_early_fifo_fill && !skin->tell_media_space) {
+   int start_memorized;
+
+   start_memorized= skin->fifo_start_at;
+   /* try  ISO-9660 size recognition via fifo */
+   if(32*2048<=skin->fifo_size)
+     skin->fifo_start_at= 32*2048;
+   else
+     skin->fifo_start_at= skin->fifo_size;
+   ret= Cdrskin_fill_fifo(skin,0);
+   if(ret<=0)
+     goto fifo_filling_failed;
+   if((start_memorized>skin->fifo_start_at || start_memorized<=0) &&
+      skin->fifo_start_at<skin->fifo_size)
+     needs_early_fifo_fill= 2; /* continue filling fifo at normal stage */
+   skin->fifo_start_at= start_memorized;
+ }
+ skin->fixed_size= 0.0;
+ skin->has_open_ended_track= 0;
+ for(i=0;i<skin->track_counter;i++) {
+   Cdrtrack_get_size(skin->tracklist[i],&size,&padding,&sector_size,
+                     &use_data_image_size,0);
+   if(use_data_image_size==1 && size<=0 && skin->tell_media_space)
+     size= 1024*1024; /* a dummy size */
+   ret= Cdrtrack_activate_image_size(skin->tracklist[i],&size,
+                                     !!skin->tell_media_space);
+   if(ret<=0) {
+     Cdrtrack_get_source_path(skin->tracklist[i],
+                              &source_path,&source_fd,&is_from_stdin,0);
+     fprintf(stderr,
+           "cdrskin: FATAL : cannot determine -isosize of track source\n");
+     fprintf(stderr,
+           "cdrskin:         '%s'\n", source_path);
+     {ret= 0; goto ex;}
+   }
+   Cdrtrack_get_size(skin->tracklist[i],&size,&padding,&sector_size,
+                     &use_data_image_size,0);
+   if(use_data_image_size==2 && skin->verbosity>=Cdrskin_verbose_debuG)
+     ClN(fprintf(stderr,
+            "cdrskin: DEBUG: track %2.2d : activated -isosize %.fs (= %.fb)\n",
+            i+1, size/2048.0,size));
+   if(size>0)
+     skin->fixed_size+= size+padding;
+   else
+     skin->has_open_ended_track= 1;
+ }
  
  o= burn_write_opts_new(drive);
  burn_write_opts_set_perform_opc(o, 0);
@@ -4833,58 +5195,6 @@ burn_failed:;
  burn_write_opts_set_write_type(o,skin->write_type,skin->block_type);
 #endif
 
-#ifndef Cdrskin_extra_leaN
-
- if(skin->verbosity>=Cdrskin_verbose_progresS) {
-   for(i=0;i<skin->track_counter;i++) {
-     Cdrtrack_get_size(skin->tracklist[i],&size,&padding,&sector_size,0);
-     if(size<=0) {
-       printf("Track %-2.2d: %s unknown length",
-              i+1,(sector_size==2048?"data ":"audio"));
-     } else {
-       mb= size/1024.0/1024.0;
-       printf("Track %-2.2d: %s %4d MB        ",
-              i+1,(sector_size==2048?"data ":"audio"),mb);
-     }
-     if(padding>0)
-       printf(" padsize:  %.f KB\n",padding/1024.0);
-     else
-       printf("\n");
-   }
-   if(skin->fixed_size<=0) {
-     printf("Total size:       0 MB (00:00.00) = 0 sectors\n");
-     printf("Lout start:       0 MB (00:02/00) = 0 sectors\n");
-   } else {
-     /* >>> This is quite a fake. Need to learn about 12:35.25 and "Lout" 
-            ??? Is there a way to obtain the toc in advance (print_cue()) ? */
-     double seconds;
-     int min,sec,frac;
-
-     mb= skin->fixed_size/1024.0/1024.0;
-     seconds= skin->fixed_size/150.0/1024.0+2.0;
-     min= seconds/60.0;
-     sec= seconds-min*60;
-     frac= (seconds-min*60-sec)*100;
-     if(frac>99)
-       frac= 99;
-     sectors= (int) (skin->fixed_size/sector_size);
-     if(sectors*sector_size != skin->fixed_size)
-       sectors++;
-     printf("Total size:    %5d MB (%-2.2d:%-2.2d.%-2.2d) = %d sectors\n",
-             mb,min,sec,frac,(int) sectors);
-     seconds+= 2;
-     min= seconds/60.0;
-     sec= seconds-min*60;
-     frac= (seconds-min*60-sec)*100;
-     if(frac>99)
-       frac= 99;
-     printf("Lout start:    %5d MB (%-2.2d:%-2.2d/%-2.2d) = %d sectors\n",
-            mb,min,sec,frac,(int) sectors);
-   }
- }
-
-#endif /* ! Cdrskin_extra_leaN */
-
  ret= Cdrskin_obtain_nwa(skin, &nwa,0);
  if(ret<=0)
    nwa= -1;
@@ -4898,19 +5208,25 @@ burn_failed:;
    {ret= 0; goto ex;}
  }
 
+#ifndef Cdrskin_extra_leaN
+ Cdrskin_announce_tracks(skin,0);
+#endif
+
  if(skin->tell_media_space || skin->track_counter<=0) {
    /* write capacity estimation and return without actual burning */
 
 #ifdef Cdrskin_libburn_has_get_spacE
-   off_t free_space;
+   {
-   char msg[80];
+     off_t free_space;
+     char msg[80];
 
-   free_space= burn_disc_available_space(drive,o);
+     free_space= burn_disc_available_space(drive,o);
-   sprintf(msg,"%d\n",(int) (free_space/(off_t) 2048));
+     sprintf(msg,"%d\n",(int) (free_space/(off_t) 2048));
-   if(skin->msinfo_fd>=0) {
+     if(skin->msinfo_fd>=0) {
-     write(skin->msinfo_fd,msg,strlen(msg));
+       write(skin->msinfo_fd,msg,strlen(msg));
-   } else
+     } else
-     printf("%s",msg);
+       printf("%s",msg);
+   }
 #endif /* Cdrskin_libburn_has_get_spacE */
 
    if(skin->track_counter>0)
@@ -4922,14 +5238,20 @@ burn_failed:;
 
 #ifndef Cdrskin_extra_leaN
  Cdrskin_wait_before_action(skin,0);
- ret= Cdrskin_fill_fifo(skin,0);
+ if(needs_early_fifo_fill==1)
+   ret= 1;
+ else
+   ret= Cdrskin_fill_fifo(skin,0);
  if(ret<=0) {
+fifo_filling_failed:;
    fprintf(stderr,"cdrskin: FATAL : filling of fifo failed\n");
    goto ex;
  }
+
 #endif /* ! Cdrskin_extra_leaN */
 
  Cdrskin_adjust_speed(skin,0);
+
  if(skin->verbosity>=Cdrskin_verbose_progresS && nwa>=0)
    printf("Starting new track at sector: %d\n",nwa);
  skin->drive_is_busy= 1;
@@ -5024,7 +5346,8 @@ burn_failed:;
    printf("Track 01: Total bytes read/written: %.f/%.f (%.f sectors).\n",
           total_count,total_count,total_count/sector_size);
  } else {
-   Cdrtrack_get_size(skin->tracklist[max_track],&size,&padding,&sector_size,1);
+   Cdrtrack_get_size(skin->tracklist[max_track],&size,&padding,&sector_size,
+                     &use_data_image_size,1);
    printf(
          "Track %-2.2d: Total bytes read/written: %.f/%.f (%.f sectors).\n",
          max_track+1,size,size+padding,(size+padding)/sector_size);
@@ -5375,7 +5698,7 @@ int Cdrskin_setup(struct CdrskiN *skin, int argc, char **argv, int flag)
    "-lock", "-fix", "-nofix", "-waiti",
    "-immed", "-raw", "-raw96p", "-raw16",
    "-clone", "-text", "-mode2", "-xa", "-xa1", "-xa2", "-xamix",
-   "-cdi", "-isosize", "-preemp", "-nopreemp", "-copy", "-nocopy",
+   "-cdi", "-preemp", "-nopreemp", "-copy", "-nocopy",
    "-scms", "-shorttrack", "-noshorttrack", "-packet", "-noclose",
    ""
  };
@@ -5605,7 +5928,19 @@ set_blank:;
    } else if(strcmp(argv[i],"--drive_blocking")==0) {
      /* is handled in Cdrpreskin_setup() */;
 
-   } else if(strcmp(argv[i],"--drive_not_exclusive")==0) {
+   } else if(strcmp(argv[i],"--drive_not_exclusive")==0 ||
+             strcmp(argv[i],"--drive_not_f_setlk")==0 ||
+             strcmp(argv[i],"--drive_not_o_excl")==0) {
+     /* is handled in Cdrpreskin_setup() */;
+
+   } else if(strncmp(argv[i],"drive_scsi_dev_family=",22)==0) {
+     /* is handled in Cdrpreskin_setup() */;
+     if(skin->verbosity>=Cdrskin_verbose_debuG &&
+        skin->preskin->drive_scsi_dev_family!=0)
+       ClN(fprintf(stderr,"cdrskin_debug: drive_scsi_dev_family= %d\n",
+                        skin->preskin->drive_scsi_dev_family));
+
+   } else if(strcmp(argv[i],"--drive_scsi_exclusive")==0) {
      /* is handled in Cdrpreskin_setup() */;
 
    } else if(strncmp(argv[i],"-driveropts=",12)==0) {
@@ -5747,6 +6082,9 @@ gracetime_equals:;
    } else if(strcmp(argv[i],"--ignore_signals")==0) {
      /* is handled in Cdrpreskin_setup() */;
 
+   } else if(strcmp(argv[i],"-isosize")==0) {
+     skin->use_data_image_size= 1;
+
    } else if(strcmp(argv[i],"--list_ignored_options")==0) {
      char line[80];
 
@@ -5923,6 +6261,8 @@ track_too_large:;
      }
      if(skin->verbosity>=Cdrskin_verbose_cmD)
        ClN(printf("cdrskin: fixed track size : %.f\n",skin->fixed_size));
+     if(skin->smallest_tsize<0 || skin->smallest_tsize>skin->fixed_size)
+       skin->smallest_tsize= skin->fixed_size;
 
    } else if(strcmp(argv[i],"-v")==0 || strcmp(argv[i],"-verbose")==0) {
      /* is handled in Cdrpreskin_setup() */;
@@ -5993,6 +6333,7 @@ track_too_large:;
        return(ret);
      }
      skin->track_counter++;
+     skin->use_data_image_size= 0;
      if(skin->verbosity>=Cdrskin_verbose_cmD) {
        if(strcmp(skin->source_path,"-")==0)
          printf("cdrskin: track %d data source : '-'  (i.e. standard input)\n",
@@ -6102,12 +6443,6 @@ int Cdrskin_create(struct CdrskiN **o, struct CdrpreskiN **preskin,
  *o= NULL;
  *exit_value= 0;
 
-#ifndef Cdrskin_libburn_no_burn_preset_device_opeN
- burn_preset_device_open((*preskin)->drive_exclusive,
-                         (*preskin)->drive_blocking,
-                         (*preskin)->abort_on_busy_drive);
-#endif
-
  if(strlen((*preskin)->device_adr)>0) {       /* disable scan for all others */
    ClN(printf(
        "cdrskin: NOTE : greying out all drives besides given dev='%s'\n",

cdrskin/cdrskin_eng.html

@@ -56,9 +56,9 @@ and to MMC-5 for DVD).
 GPL software included:<BR>
 </H2>
 <DL>
-<DT>libburn-0.3.4</DT>
+<DT>libburn-0.3.6</DT>
 <DD>(by Derek Foreman, Ben Jansens, and team of libburnia.pykix.org)</DD>
-<DD>transfers data to CD</DD>
+<DD>transfers data to CD and DVD</DD>
 </DL>
 </P>
 
@@ -98,7 +98,7 @@ wishes as well as on the development of libburn.</DT>
 <DD>#<KBD>&nbsp;cdrskin -scanbus</KBD></DD>
 <DD>#<KBD>&nbsp;cdrskin dev=ATA -scanbus</KBD></DD>
 <DD>#<KBD>&nbsp;cdrskin --devices</KBD></DD>
-<DT>Being superuser avoids permission problems with /dev/sgN resp. /dev/hdX .
+<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>
@@ -178,8 +178,8 @@ man cdrecord</A></KBD></DD>
 <P>
 <DL>
 <DT>Download as source code (see README):</DT>
-<DD><A HREF="cdrskin-0.3.4.pl00.tar.gz">cdrskin-0.3.4.pl00.tar.gz</A>
+<DD><A HREF="cdrskin-0.3.6.pl00.tar.gz">cdrskin-0.3.6.pl00.tar.gz</A>
-(570 KB).
+(605 KB).
 </DD>
 <DD>
 The "stable" cdrskin tarballs are source code identical with "stable" 
@@ -189,14 +189,14 @@ cdrskin is part of libburn - full libburn is provided with cdrskin releases.
 </DD>
 <DD>&nbsp;</DD>
 <DT>Download as single x86 binaries (untar and move to /usr/bin/cdrskin):</DT>
-<DD><A HREF="cdrskin_0.3.4.pl00-x86-suse9_0.tar.gz">
+<DD><A HREF="cdrskin_0.3.6.pl00-x86-suse9_0.tar.gz">
-cdrskin_0.3.4.pl00-x86-suse9_0.tar.gz</A>, (80 KB),
+cdrskin_0.3.6.pl00-x86-suse9_0.tar.gz</A>, (90 KB),
 <DL>
 <DD>runs on SuSE 9.0 (2.4.21) , RIP-14.4 (2.6.14) ,
  Gentoo (2.6.15 x86_64 Athlon).</DD>
 </DL>
-<DD><A HREF="cdrskin_0.3.4.pl00-x86-suse9_0-static.tar.gz">
+<DD><A HREF="cdrskin_0.3.6.pl00-x86-suse9_0-static.tar.gz">
-cdrskin_0.3.4.pl00-x86-suse9_0-static.tar.gz</A>, (285 KB), -static compiled,
+cdrskin_0.3.6.pl00-x86-suse9_0-static.tar.gz</A>, (290 KB), -static compiled,
 <DL>
 <DD>runs on SuSE 7.2 (2.4.4), and on the systems above.</DD>
 </DL>
@@ -223,16 +223,16 @@ cdrskin_0.3.4.pl00-x86-suse9_0-static.tar.gz</A>, (285 KB), -static compiled,
 <HR>
 
 <P>
-Enhancements towards previous stable version cdrskin-0.3.2:
+Enhancements towards previous stable version cdrskin-0.3.4:
 <UL>
-<LI>Multi-session burning to DVD+R</LI>
+<LI>Use of /dev/srN rather than /dev/sgN on Linux >= 2.6</LI>
-<LI>New option --tell_media_space tells the maximum size for the next burn</LI>
+<LI>Option drive_scsi_dev_family=sr|scd|sg to select explicitely</LI>
-<LI>New option assert_write_lba= prevents inadverted writing to appendable
+<LI>Option -isosize is supported now</LI>
-<LI>Bug fix: Multi-track runs with fifo could stall in rare cases</LI>
+<LI>DVD+R now get finalized (if not -multi is given)</LI>
 </UL>
 
 <!--
- Bug fixes towards cdrskin-0.3.4.pl00:
+ Bug fixes towards cdrskin-0.3.6.pl00:
 <UL>
 <LI>none yet</LI>
 </UL>
@@ -244,17 +244,17 @@ Enhancements towards previous stable version cdrskin-0.3.2:
 
 <P>
 <DL>
-<DT><H3>Development snapshot, version 0.3.5 :</H3></DT>
+<DT><H3>Development snapshot, version 0.3.7 :</H3></DT>
-<DD>Enhancements towards stable version 0.3.4.pl00:
+<DD>Enhancements towards stable version 0.3.6.pl00:
 <UL>
-<LI>none yet</LI>
+<LI>-none yet-</LI>
 </UL>
 </DD>
 <DD>&nbsp;</DD>
-<DD><A HREF="README_cdrskin_devel">README 0.3.5</A>
+<DD><A HREF="README_cdrskin_devel">README 0.3.7</A>
-<DD><A HREF="cdrskin__help_devel">cdrskin_0.3.5 --help</A></DD>
+<DD><A HREF="cdrskin__help_devel">cdrskin_0.3.7 --help</A></DD>
-<DD><A HREF="cdrskin_help_devel">cdrskin_0.3.5 -help</A></DD>
+<DD><A HREF="cdrskin_help_devel">cdrskin_0.3.7 -help</A></DD>
-<DD><A HREF="man_1_cdrskin_devel.html">man cdrskin (as of 0.3.5)</A></DD>
+<DD><A HREF="man_1_cdrskin_devel.html">man cdrskin (as of 0.3.7)</A></DD>
 <DD>&nbsp;</DD>
 <DT>Maintainers of cdrskin unstable packages please use SVN of
 <A HREF="http://libburnia.pykix.org"> libburnia.pykix.org</A></DT>
@@ -274,15 +274,15 @@ admins with full system souvereignty.</DT>
 <A HREF="README_cdrskin_devel">upcoming README</A> ):
 </DD>
 <DD>
-<A HREF="cdrskin-0.3.5.tar.gz">cdrskin-0.3.5.tar.gz</A>
+<A HREF="cdrskin-0.3.7.tar.gz">cdrskin-0.3.7.tar.gz</A>
-(570 KB).
+(605 KB).
 </DD>
 <DD>Binary (untar and move to /usr/bin/cdrskin):</DD>
-<DD><A HREF="cdrskin_0.3.5-x86-suse9_0.tar.gz">
+<DD><A HREF="cdrskin_0.3.7-x86-suse9_0.tar.gz">
-cdrskin_0.3.5-x86-suse9_0.tar.gz</A>, (80 KB).
+cdrskin_0.3.7-x86-suse9_0.tar.gz</A>, (90 KB).
 </DD>
-<DD><A HREF="cdrskin_0.3.5-x86-suse9_0-static.tar.gz">
+<DD><A HREF="cdrskin_0.3.7-x86-suse9_0-static.tar.gz">
-cdrskin_0.3.5-x86-suse9_0-static.tar.gz</A>, (280 KB)
+cdrskin_0.3.7-x86-suse9_0-static.tar.gz</A>, (285 KB)
 </DD>
 </DL>
 </P>
@@ -310,13 +310,13 @@ provide libburn with invaluable examples on how to deal with DVD media.
 <P>
 <DL>
 <DT>Example for a setup of device permissions. To be done by the superuser:</DT>
-<DT>(CD devices which offer no r-permission are invisible to normal users.)</DT>
+<DT>(CD devices which offer no rw-permission are invisible to normal users.)
-<DT>(CD devices which offer no w-permission are not useable.)</DT>
+</DT>
 <DD># <KBD><B>cdrskin --devices</B></KBD></DD>
 <DD><KBD>...</KBD></DD>
-<DD><KBD>0&nbsp; dev='/dev/sg0'&nbsp; rwrwr- :&nbsp; 'TEAC'  'CD-ROM CD-532S'</KBD></DD>
+<DD><KBD>0&nbsp; dev='/dev/sr0'&nbsp; rwrwr- :&nbsp; 'TEAC'  'CD-ROM CD-532S'</KBD></DD>
 <DD><KBD>1&nbsp; dev='/dev/hdc'&nbsp; rwrw-- :&nbsp; 'LITE-ON'  'LTR-48125S'</KBD></DD>
-<DD># <KBD><B>chmod a+rw /dev/sg0 /dev/hdc</B></KBD></DD>
+<DD># <KBD><B>chmod a+rw /dev/sr0 /dev/hdc</B></KBD></DD>
 </DL>
 </P>
 
@@ -353,7 +353,7 @@ is a GUI frontend which uses cdrecord for CD burning.)
 <DD>$ <KBD><B>export SCDBACKUP_USE_CDRSKIN=1</B></KBD></DD>
 <DD>$ <KBD><B>./CONFIGURE_CD</B></KBD></DD>
 <DD><KBD>...</KBD></DD>
-<DD><KBD>cdrskin 0.3.4 : limited cdrecord compatibility wrapper for libburn</KBD></DD>
+<DD><KBD>cdrskin 0.3.6 : limited cdrecord compatibility wrapper for libburn</KBD></DD>
 </DL>
 If your system is stricken with some ill CD device then this can stall
 and you will have to press <KBD>Ctrl+C</KBD> to abort.

cdrskin/cdrskin_timestamp.h

@@ -1 +1 @@
-#define Cdrskin_timestamP "2007.03.12.110001"
+#define Cdrskin_timestamP "2007.04.23.130001"

cdrskin/changelog.txt

@@ -34,6 +34,10 @@ Deliberate deviations of cdrskin from cdrecord compatibility:
   Option blank=fast is the same as blank=all in order to achieve media which
   are capable of Incremental Streaming.
   
++ It has not been evaluated how far -isosize is compatible with the original
+  cdrecord option. man cdrecord forbids stdin as source, cdrskin allows it
+  if a fifo is used.
+
 
 ------------------------------------------------------------------------------
                                   Changelog
@@ -3320,17 +3324,21 @@ cdrskin/cdrskin_timestamp.h
 cdrskin/cdrskin_eng.html
 Made number transition to 0.3.4 and activated development documentation
 
-12 Mar 2007  [tag 762]  
+12 Mar 2007  [tag 762]
 - cdrskin/add_ts_changes_to_libburn_0_3_2
 - cdrskin/add_ts_changes_to_libburn_0_3_3
 + cdrskin/add_ts_changes_to_libburn_0_3_4
 + cdrskin/add_ts_changes_to_libburn_0_3_5
 Updated cdrskin tarball generator
 
-12 Mar 2007  [tag ]
+12 Mar 2007  [tag 763]
 cdrskin/changelog.txt
 Documented most recent changes
 
+12 Mar 2007  [tag 764]
+README
+Removed redundant sentence
+
 ----------------------------- release  - cdrskin-0.3.4.pl00 - 2007.03.12.110001
 * Multi-session burning to DVD+R
 * New option --tell_media_space tells the maximum size for the next burn
@@ -3338,14 +3346,310 @@ Documented most recent changes
 * Bug fix: Multi-track runs with fifo could stall in rare cases
 
 
+2007.03.12.155600 [765]
+Makefile.am
+configure.ac
+README
+cdrskin/cdrskin.c
+cdrskin/README
+cdrskin/compile_cdrskin.sh
+cdrskin/cdrskin_timestamp.h
+cdrskin/cdrskin_eng.html
+Made number transition to 0.3.5
+
+12 Mar 2007  [766]
+- cdrskin/add_ts_changes_to_libburn_0_3_2
+- cdrskin/add_ts_changes_to_libburn_0_3_3
++ cdrskin/add_ts_changes_to_libburn_0_3_4
++ cdrskin/add_ts_changes_to_libburn_0_3_5
+Updated cdrskin tarball generator
+
+
+------------------------------------ cycle  - cdrskin-0.3.5 - 2007.03.12.160658
+
+14 Mar 2007  [767]
+cdrskin/cdrskin_eng.html
+Corrected truncated sentence and file sizes
+
+14 Mar 2007  [768]
+cdrskin/changelog.txt
+Next cdrskin-0.3.5 cycle
+
+2007.03.14.133618  [769]
+libburn/libburn.h
+libburn/init.c
+libburn/sg-linux.c
+cdrskin/cdrskin.c
+cdrskin/cdrskin.1
+New option drive_scsi_dev_family=sr|scd|sg
+
+2007.03.15.194531  [770]
+libburn/drive.c
+React properly on drive stating that it cannot write any media
+
+2007.03.15.195005  [771]
+libburn/spc.h
+libburn/spc.c
+libburn/sbc.c
+After loading tray wait for unit to become ready or to report some clear error
+
+2007.03.15.195251  [772]
+cdrskin/cdrskin.c
+Moved manual device family decision to a sufficiently early stage
+
+2007.03.15.195428  [773]
+libburn/mmc.c
+Kept mmc_get_configuration() from believing the announcement of 1 GB reply
+
+2007.03.15.195534  [774]
+libburn/sg-linux.c
+Trying to recognize kernel >= 2.6 and use /dev/sr by default
+
+15 Mar 2007  [775]
+cdrskin/cdrskin.1
+Updated drive_scsi_dev_family=
+
+15 Mar 2007  [776]
+cdrskin/changelog.txt
+Next cdrskin-0.3.5 cycle
+
+------------------------------------ cycle  - cdrskin-0.3.5 - 2007.03.16.001311
+* Usage of /dev/srN rather than /dev/sgN on Linux >= 2.6
+* New option drive_scsi_dev_family=sr|scd|sg
+
+
+18 Mar 2007  [777]
+cdrskin/cdrskin_eng.html
+Mentioned new sr behavior
+
+2007.03.24.093238  [785]
+libburn/drive.c
+Fixed bug with burn_disc_available_space(...,NULL)
+
+2007.03.24.093623  [786]
+cdrskin/cdrskin.c
+Warning of very small tsize= settings. (Proposal by Eduard Bloch)
+
+2007.03.27.213543  [787]
+cdrskin/cdrskin.c
+cdrskin/cdrfifo.h
+cdrskin/cdrfifo.c
+Preparations for option -isosize via fifo (only a debug message yet)
+
+2007.03.28.100934  [788]
+libburn/libburn.h
+libburn/structure.c
+cdrskin/cdrskin.c
+Enabled -isosize for first track by help of fifo and without seeking
+
+2007.03.28.111739  [789]
+cdrskin/cdrskin.c
+Silenced error condition about -sao with stdin and -isosize
+
+2007.03.28.160503  [790]
+cdrskin/cdrskin.c
+Enabled -isosize with S_IFREG or S_IFBLK files and without fifo
+
+2007.03.28.182419  [791]
+cdrskin/cdrskin.c
+cdrskin/cdrskin.1
+Made fifo based -isosize read 64k first and the rest only at normal stage
+
+2007.03.28.202802  [792]
+cdrskin/cdrskin.c
+Silenced error message if tsize= is smaller than source is willing to deliver
+
+
+------------------------------------ cycle  - cdrskin-0.3.5 - 2007.03.28.212322
+* Option -isosize is supported now
+
+
+29 Mar 2007  [793]
+cdrskin/cdrskin_eng.html
+cdrskin/changelog.txt
+Next cdrskin-0.3.5 cycle
+
+2007.03.30.201034  [794]
+libburn/write.c
+cdrskin/cdrskin.1
+Allowed finalizing of DVD+R
+
+2007.03.30.214657  [795]
+libburn/write.c
+Avoided unconditional finalizing of DVD+R
+
+2007.04.03.140356  [796]
+libburn/sg-linux.c
+Added fcntl() locking to O_EXCL locking
+
+2007.04.03.145637  [797]
+cdrskin/cdrskin.c
+Make --old_pseudo_scsi_adr -scanbus work with any drive_scsi_dev_family=
+
+2007.04.03.145806  [798]
+libburn/libdax_msgs.h
+Added fcntl() locking to O_EXCL locking
+
+2007.04.04.184341  [799]
+libburn/libburn.h
+libburn/init.c
+libburn/sg-linux.c
+cdrskin/cdrskin.c
+cdrskin/cdrskin.1
+New cdrskin options --drive_not_f_setlk and --drive_not_o_excl 
+
+6 Apr 2007  [801]
+test/libburner.c
+Updated media list in introduction comment
+
+2007.04.09.105543  [802]
+libburn/transport.h
+libburn/os-linux.h
+libburn/sg-linux.c
+cdrskin/cdrskin.1
+Cleaned up scsi sibling management, sketched grafting of DDLP
+
+2007.04.09.111215  [803]
+libburn/sg-linux.c
+Reacted on compiler warning about last_rdev, fixed fresh typo bug
+
+
+------------------------------------ cycle  - cdrskin-0.3.5 - 2007.04.09.112127
+* DVD+R now get finalized (if not -multi is given)
+
+
+10 Apr 2007  [804]
+cdrskin/changelog.txt
+Next cdrskin-0.3.5 cycle
+
+2007.04.10.081855  [805]
+libburn/init.c
+Fixed bug with drive_scsi_dev_family= introduced by revision 796 (fcntl lock)
+
+2007.04.10.082229  [806]
+libburn/sg-linux.c
+Used O_EXCL|O_RDWR and fcntl() even within sg_obtain_scsi_adr()
+
+2007.04.10.083119  [807]
+libburn/sg-linux.c
+Fixed bug in sg_open_scsi_siblings() introduced with revision 802
+
+2007.04.10.144840  [808]
+libburn/spc.c
+libburn/libdax_msgs.h
+Avoided SIGSEGV with an old SCSI CD-ROM drive and its wild replies
+
+12 Apr 2007  [810]
+README
+Clarified license. People who object shall please come forward now.
+
+2007.04.13.171347  [815]
+libburn/sg-linux.c
+libburn/libdax_msgs.h
+Switched from O_NONBLOCK to O_NDELAY (see http://lkml.org/lkml/2007/4/11/141)
+
+2007.04.13.173008  [816]
+cdrskin/cdrskin.c
+cdrskin/cdrskin.1
+Made use of fcntl(F_SETLK) switchable (and thus became more free with default)
+
+15 Apr 2007  [819]
++ libburn/ddlpa.h
++ libburn/ddlpa.c
+Began test implementation of DDLP-A
+
+15 Apr 2007  [820]
+libburn/ddlpa.h
+libburn/ddlpa.c
+Implemented ddlpa_lock_btl()
+
+16 Apr 2007  [821]
+doc/cookbook.txt
+Finalized DVD+R cookbook
+
+16 Apr 2007  [822]
++ doc/ddlp.txt
+Emerging description of DDLP
+
+16 Apr 2007  [823]
+doc/ddlp.txt
+libburn/ddlpa.h
+libburn/ddlpa.c
+Polished txt and finally threw out getter functions
+
+16 Apr 2007  [824]
+libburn/ddlpa.h
+Corrected description of return values
+
+18 Apr 2007  [825]
++ test/open-cd-excl.c
+Program for probing access to device files. By Ted Ts'o with modifications by me.
+
+18 Apr 2007  [826]
+doc/ddlp.txt
+Allowed for Friendly Programs: O_EXCL | O_RDONLY
+
+18 Apr 2007  [827]
+libburn/ddlpa.h
+libburn/ddlpa.c
+Progress due to tests with test/open-cd-excl
+
+2007.04.18.103734  [828]
+libburn/mmc.c
+Updated comments about DVD+R
+
+18 Apr 2007  [829]
+test/open-cd-excl.c
+libburn/ddlpa.c
+doc/ddlp.txt
+Polished messages, comments and description of DDLP-A
+
+18 Apr 2007  [830]
+test/open-cd-excl.c
+doc/ddlp.txt
+Adaptations to new test results and discussions
+
+18 Apr 2007  [831]
+doc/ddlp.txt
+Corrected a list of standard paths
+
+19 Apr 2007  [832] [833]
+doc/ddlp.txt
+Clarifications about motivation and duties of the participants
+
+20 Apr 2007  [834]
+doc/ddlp.txt
+Beginning to develop DDLP-B
+
+21 Apr 2007  [835]
+doc/ddlp.txt
+Declared failure of DDLP to entirely solve the concurrency problem
+
+------------------------------------ cycle  - cdrskin-0.3.5 - 2007.04.22.112236
+
+22 Apr 2007  []
+cdrskin/changelog.txt
+Next cdrskin-0.3.5 cycle
+
+  []
+cdrskin/add_ts_changes_to_libburn_0_3_5
+cdrskin/add_ts_changes_to_libburn_0_3_4
+Repaired autotools bootstrap bug by help of sed
+
+
 ===============================================================================
                                     TODO
 ===============================================================================
 
------------------------------------- cycle  - cdrskin-0.3.3 - 
+------------------------------------ cycle  - cdrskin-0.3.5 - 
+cdrskin/changelog.txt
+Next cdrskin-0.3.5 cycle
+
+
 
 cdrskin: prevent usage of burn drive as track source
 
+Think about cdrecord option minbuf= for simultaneous operation on hdc and hdd
 
 
 What about minimum track sizes ? (POWER OFF/ON , BUS RESET ?)
@@ -3353,9 +3657,6 @@ What about minimum track sizes ? (POWER OFF/ON , BUS RESET ?)
 How to handle finalizing ?
 growisofs does not finalize multi-session DVD[+-]R unless padding up. Why ?
 
-Make wide use of mmc_four_char_to_int(), mmc_int_to_four_char()
-
-Think about cdrecord option minbuf= for simultaneous operation on hdc and hdd
 
 After cooking: review of -do_diet ?
 

cdrskin/compile_cdrskin.sh

@@ -7,7 +7,7 @@
 debug_opts=
 def_opts=
 largefile_opts="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1"
-libvers="-DCdrskin_libburn_0_3_4"
+libvers="-DCdrskin_libburn_0_3_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_3_4"
+  elif test "$i" = "-libburn_0_3_6"
   then
-    libvers="-DCdrskin_libburn_0_3_4"
+    libvers="-DCdrskin_libburn_0_3_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_3_5"
+    libvers="-DCdrskin_libburn_0_3_7"
     libdax_audioxtr_o="libburn/libdax_audioxtr.o"
     libdax_msgs_o="libburn/libdax_msgs.o"
     cleanup_src_or_obj="libburn/cleanup.o"
@@ -79,7 +79,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_3_4    set macro to match libburn-0.3.4."
+    echo "  -libburn_0_3_6    set macro to match libburn-0.3.6 (default)."
     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."

cdrskin/wiki_plain.txt

@@ -67,7 +67,7 @@ and displays their detected properties.
 The drives are listed one per line, with fields:
 libburn-drive-number, sysadmin-device-file, permissions, vendor, type
 {{{
-0  dev='/dev/sg0'  rwrw-- :  'HL-DT-ST'  'DVDRAM GSA-4082B'
+0  dev='/dev/sr0'  rwrw-- :  'HL-DT-ST'  'DVDRAM GSA-4082B'
 }}}
 This feature is valuable since cdrskin -scanbus will not give you
 the device file name and its current permissions.

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([libburn], [0.3.4], [http://libburnia.pykix.org])
+AC_INIT([libburn], [0.3.6], [http://libburnia.pykix.org])
 AC_PREREQ([2.50])
 dnl AC_CONFIG_HEADER([config.h])	
 
@@ -19,7 +19,7 @@ dnl if MAJOR or MINOR version changes, be sure to change AC_INIT above to match
 dnl
 BURN_MAJOR_VERSION=0
 BURN_MINOR_VERSION=3
-BURN_MICRO_VERSION=4
+BURN_MICRO_VERSION=6
 BURN_INTERFACE_AGE=0
 BURN_BINARY_AGE=0
 BURN_VERSION=$BURN_MAJOR_VERSION.$BURN_MINOR_VERSION.$BURN_MICRO_VERSION

doc/comments

@@ -33,7 +33,7 @@ scope by help of existing cdrecord frontends.
 
 - libburn  is the library by which preformatted data get onto optical media.
            It uses either /dev/sgN (e.g. on kernel 2.4 with ide-scsi) or
-           /dev/hdX (e.g. on kernel 2.6).
+           /dev/srM or /dev/hdX (e.g. on kernel 2.6).
            libburn is the foundation of our cdrecord emulation. Its code is
            independent of cdrecord. Its DVD capabilities are learned from
            studying the code of dvd+rw-tools and MMC-5 specs. No code but only

doc/cookbook.txt

@@ -5,7 +5,7 @@ Content:
 - SAO CD Cookbook (CD-R, CD-RW, pure audio or pure data only)
 - Overwriteable DVD Cookbook (DVD-RAM, DVD+RW, DVD-RW)
 - Sequential DVD-R[W] Cookbook
-- DVD+R Cookbook (still emerging)
+- DVD+R Cookbook
 
 -------------------------------------------------------------------------------
                          TAO Multi-Session CD Cookbook
@@ -1078,17 +1078,17 @@ libburn obtains the necessary logical track number from Last Track Number in
 Last Session from the reply of 51h READ DISC INFORMATION requesting
 Data Type 000b.
 (mmc5r03c.pdf 6.22) 
+
 After each track 5Bh CLOSE TRACK SESSION Close Function 010b with Logical Track
 Number 0 closes the DVD+R session but keeps the media appendable.
 (mmc5r03c.pdf 6.3.3.4.3)
-
+If the media shall not stay appendable then the last DVD+R session is to be
-
+closed by Close Function 101b rather than 010b. This finalizes the media
->>> This is not tested yet. growisofs has code for that gesture but explicitly 
+"with minimal radius".
-    avoids to use it. Instead it recommends to fill up the media with zeros.
-Eventually 5Bh CLOSE TRACK SESSION Close Function 101b is used to finalize
-the media with minimal radius. After that the disc is not appendable any more !
 (mmc5r03c.pdf 6.3.3.4.4) 
 
+Note: growisofs has code for that gesture but explicitly avoids to use it.
+Instead it recommends to fill up the media with zeros.
 
 -------------------------------------------------------------------------------
 Hearsay about DVD+R/DL (Dual Layer) :

doc/ddlp.txt

@@ -0,0 +1,388 @@
+-------------------------------------------------------------------------------
+
+Users of modern desktop Linux installations report misburns with CD/DVD
+recording due to concurrency problems.
+
+This text describes two locking protocols which have been developed by our
+best possible effort. But finally they rather serve as repelling example of
+what would be needed in user space to achieve an insufficient partial solution.
+
+Ted Ts'o was so friendly to help as critic with his own use cases. It turned
+out that we cannot imagine a way in user space how to cover reliably the needs
+of callers of libblkid and the needs of our burn programs.
+
+-------------------------------------------------------------------------------
+Content:
+
+The "Delicate Device Locking Protocol" shall demonstrate our sincere
+consideration of the problem.
+
+"What are the Stumble Stones ?" lists reasons why the effort finally failed.
+
+-----------------------------------------------------------------------------
+
+
+                      Delicate Device Locking Protocol
+               (a joint sub project of cdrkit and libburnia)
+                       (contact: scdbackup@gmx.net )
+
+Our projects provide programs which allow recording of data on CD or DVD.
+We encounter an increasing number of bug reports about spoiled burn runs and
+wasted media which obviously have one common cause: interference by other
+programs which access the drive's device files.
+There is some riddling about which gestures exactly are dangerous for
+ongoing recordings or can cause weirdly misformatted drive replies to MMC 
+commands. 
+We do know, nevertheless, that these effects do not occur if no other program
+accesses a device file of the drive while our programs use it. 
+
+DDLP shall help to avoid collisions between programs in the process of
+recording to a CD or DVD drive and other programs which access that drive.
+The protocol intends to provide advisory locking. So any good-willing program
+has to take some extra precautions to participate.
+
+If a program does not feel vulnerable to disturbance, then the precautions
+impose much less effort than if the program feels the need for protection.
+
+Two locking strategies are specified:
+DDLP-A operates on device files only. It is very Linux specific.
+DDLP-B adds proxy lock files, inspired by FHS /var/lock standard.
+
+
+                                  DDLP-A
+
+This protocol relies on the hardly documented feature open(O_EXCL | O_RDWR)
+with Linux device files and on POSIX compliant fcntl(F_SETLK).
+
+Other than the original meaning of O_EXCL with creating regular files, the
+effect on device files is mutual exclusion of access. I.e. if one
+filedescriptor is open on that combination of major-minor device number, then
+no other open(O_EXCL) will succeed. But open() without O_EXCL would succeed.
+So this is advisory and exclusive locking.
+With kernel 2.6 it seems to work on all device drivers which might get used
+to access a CD/DVD drive.
+
+The vulnerable programs shall not start their operation before they occupied a
+wide collection of drive representations.
+Non-vulnerable programs shall take care to detect the occupation of _one_ such
+representation.
+
+                          So for Friendly Programs
+
+A program which does not feel vulnerable to disturbance is urged to access
+CD/DVD drives by opening a file descriptor which will uphold the lock
+as long as it does not get closed. There are two alternative ways to achieve
+this.
+Very reliable is  
+
+  open( some_path , O_EXCL | ...)
+
+But O_EXCL imposes restrictions and interferences:
+- O_EXCL | O_RDONLY does not succeed with /dev/sg* !
+- O_EXCL cannot provide shared locks for programs which only want to lock
+  against burn programs but not against their own peers.
+- O_EXCL keeps from obtaining information by harmless activities.
+- O_EXCL already has a meaning with devices which are mounted as filesystems.
+  This priority meaning is more liberal than the one needed for CD/DV recording
+  protection.
+
+So it may be necessary to use a cautious open() without O_EXCL and to aquire
+a POSIX lock via fcntl(). "Cautious" means to add O_NDELAY to the flags of
+open(), because this is declared to avoid side effects within open().
+
+With this gesture it is important to use the paths expected by our burn
+programs: /dev/sr[0..255] /dev/scd[0..255] /dev/sg[0..255] /dev/hd[a..z]
+because fcntl(F_SETLK) does not lock the device but only a device-inode.
+
+  std_path = one of the standard device files:
+               /dev/sr[0..255] /dev/scd[0..255] /dev/sg[0..255] /dev/hd[a..z]
+             or a symbolic link pointing to one of them.
+  open( std_path , ... | O_NDELAY)
+  fcntl(F_SETLK) and close() on failure
+  ... eventually disable O_NDELAY by fcntl(F_SETFL) ...
+
+There is a pitfall mentioned in man 2 fcntl :
+ "locks are automatically released [...] if it closes any file descriptor
+  referring to a file on which locks are held. This is bad [...]"
+So you may have to re-lock after some temporary fd got closed.
+
+
+                            Vulnerable Programs
+
+For programs which do feel vulnerable, O_EXCL would suffice for the /dev/hd*
+device file family and their driver. But USB and SATA recorders appear with
+at least two different major-minor combinations simultaneously.
+One as /dev/sr* alias /dev/scd*, the other as /dev/sg*.
+The same is true for ide-scsi or recorders attached to SCSI controllers.
+
+So, in order to lock any access to the recorder, one has to open(O_EXCL)
+not only the device file that is intended for accessing the recorder but also
+a device file of any other major-minor representation of the recorder.
+This is done via the SCSI address parameter vector (Host,Channel,Id,Lun)
+and a search on standard device file paths /dev/sr* /dev/scd* /dev/sg*.
+In this text the alternative device representations are called "siblings".
+
+For finding them, it is necessary to apply open() to many device files which
+might be occupied by delicate operations. On the other hand it is very
+important to occupy all reasonable representations of the drive.
+So the reading of the (Host,Channel,Id,Lun) parameters demands an 
+open(O_RDONLY | O_NDELAY) _without_ fcntl() in order to find the outmost
+number of representations among the standard device files. Only ioctls
+SCSI_IOCTL_GET_IDLUN and SCSI_IOCTL_GET_BUS_NUMBER are applied.
+Hopefully this gesture is unable to cause harmful side effects on kernel 2.6.
+
+At least one file of each class sr, scd and sg should be found to regard
+the occupation as satisfying. Thus corresponding sr-scd-sg triplets should have
+matching ownerships and access permissions.
+One will have to help the sysadmins to find those triplets.
+
+A spicy detail is that sr and scd may be distinct device files for the same
+major-minor combination.  In this case fcntl() locks on both are needed
+but O_EXCL can only be applied to one of them.
+
+
+An open and free implementation ddlpa.[ch] is provided as
+  http://libburnia.pykix.org/browser/libburn/trunk/libburn/ddlpa.h?format=txt
+  http://libburnia.pykix.org/browser/libburn/trunk/libburn/ddlpa.c?format=txt
+The current version of this text is 
+  http://libburnia.pykix.org/browser/libburn/trunk/doc/ddlp.txt?format=txt
+
+Put ddlpa.h and ddlpa.c into the same directory and compile as test program by
+  cc -g -Wall -DDDLPA_C_STANDALONE -o ddlpa ddlpa.c
+
+Use it to occupy a drive's representations for a given number of seconds
+  ./ddlpa /dev/sr0 300
+
+It should do no harm to any of your running activities.
+If it does: Please, please alert us.
+
+Your own programs should not be able to circumvent the occupation if they
+obey above rules for Friendly Programs.
+Of course ./ddlpa should be unable to circumvent itself.
+
+A successfull occupation looks like
+  DDLPA_DEBUG: ddlpa_std_by_rdev("/dev/scd0") = "/dev/sr0"
+  DDLPA_DEBUG: ddlpa_collect_siblings() found "/dev/sr0"
+  DDLPA_DEBUG: ddlpa_collect_siblings() found "/dev/scd0"
+  DDLPA_DEBUG: ddlpa_collect_siblings() found "/dev/sg0"
+  DDLPA_DEBUG: ddlpa_occupy()        : '/dev/scd0'
+  DDLPA_DEBUG: ddlpa_occupy() O_EXCL : '/dev/sg0'
+  DDLPA_DEBUG: ddlpa_occupy() O_EXCL : '/dev/sr0'
+  ---------------------------------------------- Lock gained
+  ddlpa: opened           /dev/sr0
+  ddlpa: opened siblings: /dev/scd0 /dev/sg0
+  slept 1 seconds of 300
+
+Now an attempt via device file alias /dev/NEC must fail:
+  DDLPA_DEBUG: ddlpa_std_by_rdev("/dev/NEC") = "/dev/sg0"
+  DDLPA_DEBUG: ddlpa_collect_siblings() found "/dev/sr0"
+  DDLPA_DEBUG: ddlpa_collect_siblings() found "/dev/scd0"
+  DDLPA_DEBUG: ddlpa_collect_siblings() found "/dev/sg0"
+  Cannot exclusively open '/dev/sg0'
+  Reason given    : Failed to open O_RDWR | O_NDELAY | O_EXCL : '/dev/sr0'
+  Error condition : 16 'Device or resource busy'
+
+With hdc, of course, things are trivial
+  DDLPA_DEBUG: ddlpa_std_by_rdev("/dev/hdc") = "/dev/hdc"
+  DDLPA_DEBUG: ddlpa_occupy() O_EXCL : '/dev/hdc'
+  ---------------------------------------------- Lock gained
+  ddlpa: opened           /dev/hdc
+  slept 1 seconds of 1
+
+
+Ted Ts'o provided program  open-cd-excl  which allows to explore open(2) on
+device files with combinations of read-write, O_EXCL, and fcntl().
+(This does not mean that Ted endorsed our project yet. He helps exploring.)
+
+Friendly in the sense of DDLP-A would be any run which uses at least one of
+the options -e (i.e. O_EXCL) or -f (i.e. F_SETLK, applied to a file
+descriptor which was obtained from a standard device file path).
+The code is available under GPL at
+  http://libburnia.pykix.org/browser/libburn/trunk/test/open-cd-excl.c?format=txt
+To be compiled by
+  cc -g -Wall -o open-cd-excl open-cd-excl.c
+
+Options:
+  -e : open O_EXCL
+  -f : aquire lock by fcntl(F_SETLK) after sucessful open
+  -i : do not wait in case of success but exit 0 immediately
+  -r : open O_RDONLY , with -f use F_RDLCK
+  -w : open O_RDWR   , with -f use F_WRLCK
+  plus the path of the devce file to open.
+
+Friendly Programs would use gestures like:
+  ./open-cd-excl -e -r /dev/sr0
+  ./open-cd-excl -e -w /dev/sg1
+  ./open-cd-excl -e -w /dev/black-drive
+  ./open-cd-excl -f -r /dev/sg1
+  ./open-cd-excl -e -f -w /dev/sr0
+
+Ignorant programs would use and cause potential trouble by:
+  ./open-cd-excl -r /dev/sr0
+  ./open-cd-excl -w /dev/sg1
+  ./open-cd-excl -f -w /dev/black-drive
+where "/dev/black-drive" is _not_ a symbolic link to
+any of /dev/sr* /dev/scd* /dev/sg* /dev/hd*, but has an own inode.
+
+Prone to failure without further reason is:
+  ./open-cd-excl -e -r /dev/sg1
+
+
+----------------------------------------------------------------------------
+
+                                  DDLP-B
+
+This protocol relies on proxy lock files in some filesystem directory. It can
+be embedded into DDLP-A or it can be used be used standalone, outside DDLP-A.
+
+DDLP-A shall be kept by DDLP-B from trying to access any device file which
+might already be in use. There is a problematic gesture in DDLP-A when SCSI
+address parameters are to be retrieved. For now this gesture seems to be
+harmless. But one never knows.
+Vice versa DDLP-B may get from DDLP-A the service to search for SCSI device
+file siblings. So they are best as a couple.
+
+But they are not perfect. Not even as couple. fcntl() locking is flawed.
+ 
+
+There is a proxy file locking protocol described in FHS:
+  http://www.pathname.com/fhs/pub/fhs-2.3.html#VARLOCKLOCKFILES
+
+But it has shortcommings (see below). Decisive obstacle for its usage are the
+possibility for stale locks and the lack of shared locks.
+
+DDLP-B rather defines a "path prefix" which is advised to be
+  /tmp/ddlpb-lock-
+This prefix will get appended "device specific suffixes" and then form the path
+of a "lockfile".
+Not the existence of a lockfile but its occupation by an fcntl(F_SETLK) will
+constitute a lock. Lockfiles may get prepared by the sysadmin in directories
+where normal users are not allowed to create new files. Their rw-permissions
+then act as additional access restriction to the device files.
+The use of fcntl(F_SETLK) will prevent any stale locks after the process ended.
+It will also allow to obtain shared locks as well as exclusive locks.
+
+There are two classes of device specific suffixes:
+
+- Device file path suffix. Absolute paths only. "/" gets replaced by "_-". 
+  Eventual "_-" in path gets replaced by "_-_-". The leading group of "_-"
+  is always interpreted as a group of "/", though.  E.g.:
+    /dev/sr0           <-> "_-dev_-sr0"
+    /mydevs/burner/nec <-> "_-mydevs_-burners_-nec"
+    /dev/rare_-name    <-> "_-dev_-rare_-_-name"
+    ///strange/dev/x   <-> "_-_-_-strange_-dev_-x"
+
+- st_rdev suffix. A hex representation of struct stat.st_rdev. Capital letters.
+  The number of characters is pare with at most one leading 0. I.e. bytewise
+  printf("%2.2X") beginning with the highest order byte that is not zero.
+  E.g. : "0B01", "2200", "01000000000004001"
+
+If a lockfile does not exist and cannot be created then this shall not keep
+a program from working on a device. But if a lockfile exists and if permissions
+or locking state do not allow to obtain a lock of the appropirate type, then
+this shall prevent any opening of device file in question resp. shall cause
+immediate close(2) of an already opened device file.
+
+The vulnerable programs shall not start their operation before they locked a
+wide collection of drive representations.
+
+Non-vulnerable programs shall take care to lock the suffix resulting from the
+path they will be using and the suffix from the st_rdev from that path.
+The latter is to be obtained by call stat(2).
+
+Locks get upheld as long as their file descriptor is not closed or no other
+incident as described in man 2 fcntl releases the lock.
+
+So with shared locks there are no imandatory further activities after they
+have been obtained.
+
+In case of exclusive locks, the file has to have been opened for writing and
+must be truncated to 0 bytes length immediately after obtaining the lock.
+When releasing an exclusive lock it is a nice gesture to
+already do this truncation.
+Then a /var/lock/ compatible first line has to be written.
+E.g. by:  printf("%10u\n",(unsigned) getpid()) yielding "      1230\n".
+
+Any further lines are optional. They shall have the form Name=Value and must
+be printable cleartext. If such further lines exist, then the last one must
+have the name "endmark".
+Defined Names are:
+  hostid   =hostname of the machine where the process number of line 1 is valid
+  start    =start time of lock in seconds since 1970. E.g: 1177147634.592410
+  program  =self chosen name of the program which obtained the lock
+  argv0    =argv[0] of that program
+  mainpath =device file path which will be used for operations by that program
+  path     =device file path which lead to the lock
+  st_rdev  =st_rdev suffix which is associated with path
+  scsi_hcil=eventual SCSI parameters Host,Channel,Id,Lun
+  scsi_bus =eventual SCSI parameter Bus
+  endmark  =declares the info as complete.
+Any undefined name or a line without "=" shall be handled as comment.
+"=" in the value is allowed. Any line beginning with an "=" character is an
+extension of the previous value.
+
+If programs encounter an exclusive lock, they are invited to read the content
+of the lockfile anyway. But they should be aware that the info might be in the
+progress of emerging. There is a race condition possible in the short time
+between obtaining the exclusive lock and erasing the file content.
+If it is not crucial to obtain most accurate info then one may take the newline
+of the first line as indicator of a valid process number and the "endmark"
+name as indicator that the preceding lines are valid.
+Very cautious readers should obtain the info twice with a decent waiting period
+inbetween. Only if both results are identical they should be considered valid.
+
+
+There is no implementation of DDLP-B yet.
+
+
+ 
+----------------------------------------------------------------------------
+What are the Stumble Stones ?
+----------------------------------------------------------------------------
+
+Any of the considered locking mechanisms has decisive shortcommings
+which keeps it from being the solution to all known legitimate use cases.
+
+The attempt has failed to compose a waterproof locking mechanism from means of
+POSIX, FHS and from hardly documented Linux open(O_EXCL) on device files.
+The resulting mechanisms would need about 1000 lines of code and still do
+not close all gaps resp. cover the well motivated use cases.
+This attempt you see above: DDLP-A and DDLP-B.
+
+
+Summary of the reasons why the established locking mechanisms do not suffice:
+
+None of the mechanisms can take care of the double device driver identity
+sr versus sg. To deduce the one device file from the other involves the need
+to open many other (possibly unrelated) device files with the risk to disturb
+them.
+This hard to solve problem is aggravated by the following facts.
+
+Shortcommings of Linux specific open(O_EXCL) :
+
+- O_EXCL | O_RDONLY does not succeed with /dev/sg*
+- O_EXCL cannot provide shared locks for programs which only want to lock
+  against burn programs but not against their own peers.
+- O_EXCL keeps from obtaining information by harmless activities.
+- O_EXCL already has a meaning with devices which are mounted as filesystems.
+  This priority meaning is more liberal than the one needed for CD/DV recording
+  protection.
+
+Shortcommings of POSIX fcntl(F_SETLK) :
+
+- fcntl() demands an open file descriptor. open(2) might have side effects.
+- fcntl() locks can be released inadvertedly by submodules which just open and
+  close the same file (inode ?) without refering to fcntl locks in any way.
+  See man 2 fcntl "This is bad:". 
+  Stacking of software modules is a widely used design pattern. But fcntl()
+  cannot cope with that.
+
+Shortcommings of FHS /var/lock/ :
+
+- Stale locks are possible.
+- It is necessary to create a file (using the _old_ meaning of O_EXCL flag ?)
+  but /var/lock/ might not be available early during system start and it often
+  has restrictive permission settings.
+- There is no way to indicate a difference between exclusive and shared locks.
+- The FHS prescription relies entirely on the basename of the device file path.
+

libburn/ddlpa.c

@@ -0,0 +1,614 @@
+
+/* ddlpa
+   Implementation of Delicate Device Locking Protocol level A.
+   Copyright (C) 2007 Thomas Schmitt <scdbackup@gmx.net>
+   Provided under any of the following licenses: GPL, LGPL, BSD. Choose one.
+
+
+   Compile as test program:
+
+     cc -g -Wall \
+        -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1 -D_LARGEFILE64_SOURCE \
+        -DDDLPA_C_STANDALONE -o ddlpa ddlpa.c
+
+   The system macros enable 64-bit off_t and open(2) flag O_LARGEFILE, which
+   are not absolutely necessary but explicitely take into respect that
+   our devices can offer more than 2 GB of addressable data. 
+
+   Run test program:
+
+     ./ddlpa /dev/sr0 15
+     ./ddlpa 0,0,0    15
+
+*/
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <string.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <scsi/scsi.h>
+
+
+/* All callers of ddlpa must do this */
+#include "ddlpa.h"
+
+
+/* 1 = Enable progress message on stderr, 0 = normal silent operation */
+static int ddlpa_debug_mode = 1;
+
+
+/* #define _GNU_SOURCE  or  _LARGEFILE64_SOURCE  to get real O_LARGEFILE */
+#ifndef O_LARGEFILE
+#define O_LARGEFILE 0
+#endif
+
+
+/* ----------------------- private -------------------- */
+
+
+static int ddlpa_new(struct ddlpa_lock **lck, int o_flags, int ddlpa_flags)
+{
+	int i;
+	struct ddlpa_lock *o;
+
+	o = *lck = (struct ddlpa_lock *) malloc(sizeof(struct ddlpa_lock));
+	if (o == NULL)
+		return ENOMEM;
+	for (i = 0; i < sizeof(struct ddlpa_lock); i++)
+		((char *) o)[i] = 0;
+	o->path = NULL;
+	o->fd = -1;
+	for (i = 0; i < DDLPA_MAX_SIBLINGS; i++)
+		o->sibling_fds[i] = -1;
+	o->errmsg = NULL;
+
+	o->o_flags = o_flags;
+	o->ddlpa_flags = ddlpa_flags;
+	return 0;
+}
+
+
+static int ddlpa_enumerate(struct ddlpa_lock *o, int *idx,
+			char path[DDLPA_MAX_STD_LEN + 1])
+{
+	if (*idx < 0)
+		*idx = 0;
+
+	if (*idx < 26)
+		sprintf(path, "/dev/hd%c", 'a' + *idx);
+	else if (*idx < 256 + 26)
+		sprintf(path, "/dev/sr%d", *idx - 26);
+	else if (*idx < 2 * 256 + 26)
+		sprintf(path, "/dev/scd%d", *idx - 256 - 26);
+	else if (*idx < 3 * 256 + 26)
+		sprintf(path, "/dev/sg%d", *idx - 2 * 256 - 26);
+	else
+		return 1;
+	(*idx)++;
+	return 0;
+}
+
+
+static int ddlpa_std_by_rdev(struct ddlpa_lock *o)
+{
+	int idx = 0;
+	char try_path[DDLPA_MAX_STD_LEN+1];
+	struct stat path_stbuf, try_stbuf;
+
+	if (!o->path_is_valid)
+		return EFAULT;
+	if (stat(o->path, &path_stbuf) == -1)
+		return errno;
+
+	while (ddlpa_enumerate(o, &idx, try_path) == 0) {
+		if (stat(try_path, &try_stbuf) == -1)
+			continue;
+		if (path_stbuf.st_rdev != try_stbuf.st_rdev)
+			continue;
+		strcpy(o->std_path, try_path);
+
+		if (ddlpa_debug_mode)
+			fprintf(stderr,
+			   "DDLPA_DEBUG: ddlpa_std_by_rdev(\"%s\") = \"%s\"\n",
+			    o->path, o->std_path);
+
+		return 0;
+	}
+	return ENOENT;
+}
+
+
+/* Caution : these tests are valid only with standard paths */
+
+static int ddlpa_is_scsi(struct ddlpa_lock *o, char *path)
+{
+	return (strncmp(path, "/dev/s", 6) == 0);
+}
+
+static int ddlpa_is_sg(struct ddlpa_lock *o, char *path)
+{
+	return (strncmp(path, "/dev/sg", 7) == 0);
+}
+
+static int ddlpa_is_sr(struct ddlpa_lock *o, char *path)
+{
+	return (strncmp(path, "/dev/sr", 7) == 0);
+}
+
+static int ddlpa_is_scd(struct ddlpa_lock *o, char *path)
+{
+	return (strncmp(path, "/dev/scd", 8) == 0);
+}
+
+
+static int ddlpa_fcntl_lock(struct ddlpa_lock *o, int fd, int l_type)
+{
+	struct flock lockthing;
+	int ret;
+
+	memset(&lockthing, 0, sizeof(lockthing));
+	lockthing.l_type = l_type;
+	lockthing.l_whence = SEEK_SET;
+	lockthing.l_start = 0;
+	lockthing.l_len = 0;
+	ret = fcntl(fd, F_SETLK, &lockthing);
+	if (ret == -1)
+		return EBUSY;
+	return 0;
+}
+
+
+static int ddlpa_occupy(struct ddlpa_lock *o, char *path, int *fd,
+			int no_o_excl)
+{
+	int ret, o_flags, o_rw, l_type;
+	char *o_rwtext;
+
+	o_flags = o->o_flags | O_NDELAY;
+	if(!no_o_excl)
+		o_flags |= O_EXCL;
+	o_rw = (o_flags) & (O_RDONLY | O_WRONLY | O_RDWR);
+	o_rwtext = (o_rw == O_RDONLY ? "O_RDONLY" :
+			(o_rw == O_WRONLY ? "O_WRONLY" :
+			(o_rw == O_RDWR ? "O_RDWR  " : "O_?rw-mode?")));
+
+	*fd = open(path, o_flags);
+	if (*fd == -1) {
+		o->errmsg = malloc(strlen(path)+160);
+		if (o->errmsg)
+			sprintf(o->errmsg,
+				"Failed to open %s | O_NDELAY %s: '%s'", 
+				o_rwtext,
+				(o_flags & O_EXCL ? "| O_EXCL " : ""), path);
+		return (errno ? errno : EBUSY);
+	}
+	if (o_rw == O_RDWR || o_rw == O_WRONLY)
+		l_type = F_WRLCK;
+	else
+		l_type = F_RDLCK;
+	ret = ddlpa_fcntl_lock(o, *fd, l_type);
+	if (ret) {
+		o->errmsg = malloc(strlen(path)+160);
+		if (o->errmsg)
+			sprintf(o->errmsg,
+				"Failed to lock fcntl(F_WRLCK) : '%s'",path);
+		close(*fd);
+		*fd = -1;
+		return ret;
+	}
+	if (ddlpa_debug_mode)
+		fprintf(stderr, "DDLPA_DEBUG: ddlpa_occupy() %s %s: '%s'\n",
+			o_rwtext,
+			(no_o_excl ? "       " : "O_EXCL "), path);
+	return 0;
+}
+
+
+static int ddlpa_obtain_scsi_adr(struct ddlpa_lock *o, char *path,
+			int *bus, int *host, int *channel, int *id, int *lun)
+{
+	int fd, ret, open_mode = O_RDONLY | O_NDELAY;
+	struct my_scsi_idlun {
+		int x;
+		int host_unique_id;
+	};
+	struct my_scsi_idlun idlun;
+
+	fd = open(path, open_mode);
+	if (fd == -1)
+		return (errno ? errno : EBUSY);
+	if (ioctl(fd, SCSI_IOCTL_GET_BUS_NUMBER, bus) == -1)
+		*bus = -1;
+	ret = ioctl(fd, SCSI_IOCTL_GET_IDLUN, &idlun);
+	close(fd);
+	if (ret  == -1)
+		return (errno ? errno : EIO);
+	*host =    (idlun.x >> 24) & 255;
+	*channel = (idlun.x >> 16) & 255;
+	*id =      (idlun.x)       & 255;
+	*lun =     (idlun.x >> 8 ) & 255;
+	return 0;
+}
+
+
+static int ddlpa_collect_siblings(struct ddlpa_lock *o)
+{
+	int idx = 0, ret, have_sg = 0, have_sr = 0, have_scd = 0;
+	dev_t path_dev;
+	ino_t path_inode;
+	struct stat stbuf;
+	char *path, try_path[DDLPA_MAX_STD_LEN+1];
+	int t_bus, t_host, t_channel, t_id, t_lun;
+	
+	if (o->ddlpa_flags & DDLPA_OPEN_GIVEN_PATH)
+		path = o->path;
+	else
+		path = o->std_path;
+	if (path[0] == 0 || o->num_siblings != 0)
+		return EFAULT;
+	if (!ddlpa_is_scsi(o, o->std_path))
+		return EFAULT;
+
+	if (stat(path, &stbuf) == -1)
+		return errno;
+	path_inode = stbuf.st_ino;
+	path_dev = stbuf.st_dev;
+	o->rdev = stbuf.st_rdev;
+	o->dev = stbuf.st_dev;
+	o->ino = stbuf.st_ino;
+	ret = ddlpa_obtain_scsi_adr(o, path,
+				&(o->bus), &(o->host), &(o->channel),
+				&(o->id), &(o->lun));
+	if (ret) {
+		o->errmsg = strdup(
+			"Cannot obtain SCSI parameters host,channel,id,lun");
+		return ret;
+	}
+	o->hcilb_is_valid = 1;
+
+	while (ddlpa_enumerate(o, &idx, try_path) == 0) {
+		if (!ddlpa_is_scsi(o, try_path))
+			continue;
+		if (stat(try_path, &stbuf) == -1)
+			continue;
+		ret = ddlpa_obtain_scsi_adr(o, try_path, 
+				&t_bus, &t_host, &t_channel, &t_id, &t_lun);
+		if (ret) {
+
+			/* >>> interpret error, memorize busy, no permission */
+
+			continue;
+		}
+		if (t_host != o->host || t_channel != o->channel ||
+		    t_id != o->id     || t_lun != o->lun)
+			continue;
+
+		if (o->num_siblings >= DDLPA_MAX_SIBLINGS) {
+			o->errmsg = 
+				strdup("Too many matching device files found");
+			return ERANGE;
+		}
+		if (ddlpa_is_sg(o, try_path))
+			have_sg = 1;
+		else if (ddlpa_is_sr(o, try_path))
+                	have_sr = 1;
+		else if (ddlpa_is_scd(o, try_path))
+                	have_scd = 1;
+		strcpy(o->sibling_paths[o->num_siblings], try_path);
+		o->sibling_rdevs[o->num_siblings] = stbuf.st_rdev;
+		o->sibling_devs[o->num_siblings] = stbuf.st_dev;
+		o->sibling_inodes[o->num_siblings] = stbuf.st_ino;
+
+		if (ddlpa_debug_mode)
+			fprintf(stderr,
+		"DDLPA_DEBUG: ddlpa_collect_siblings() found   \"%s\"\n",
+			try_path);
+
+		(o->num_siblings)++;
+	}
+	if (have_sg && have_sr && have_scd)
+		return 0;
+	if (o->ddlpa_flags & DDLPA_ALLOW_MISSING_SGRCD)
+		return 0;
+
+	o->errmsg = strdup("Did not find enough siblings");
+
+	/* >>> add more info about busy and forbidden paths */
+
+	return EBUSY;
+}
+
+
+static int ddlpa_std_by_btl(struct ddlpa_lock *o)
+{
+	int idx = 0, ret;
+	char try_path[DDLPA_MAX_STD_LEN+1];
+	int t_bus, t_host, t_channel, t_id, t_lun;
+
+	if (!o->inbtl_is_valid)
+		return EFAULT;
+
+	while (ddlpa_enumerate(o, &idx, try_path) == 0) {
+		if (!ddlpa_is_sr(o, try_path))
+			continue;
+		ret = ddlpa_obtain_scsi_adr(o, try_path, 
+				&t_bus, &t_host, &t_channel, &t_id, &t_lun);
+		if (ret) {
+
+			/* >>> interpret error, memorize busy, no permission */
+
+			continue;
+		}
+		if (t_bus != o->in_bus || t_id != o->in_target ||
+		    t_lun != o->in_lun)
+			continue;
+		strcpy(o->std_path, try_path);
+
+		if (ddlpa_debug_mode)
+			fprintf(stderr,
+			 "DDLPA_DEBUG: ddlpa_std_by_btl(%d,%d,%d) = \"%s\"\n",
+			 t_bus, t_id, t_lun, o->std_path);
+
+		return 0;
+	}
+
+	/* >>> add more info about busy and forbidden paths */
+
+	return ENOENT;
+}
+
+
+static int ddlpa_open_all(struct ddlpa_lock *o)
+{
+	int i, j, ret, no_o_excl;
+
+	if (ddlpa_is_scsi(o, o->std_path)) {
+		ret = ddlpa_collect_siblings(o);
+		if (ret)
+			return ret;
+		for (i = 0; i < o->num_siblings; i++) {
+
+			/* Watch out for the main personality of the drive. */
+			/* No need to occupy identical path or softlink path */
+			if (o->sibling_devs[i] == o->dev &&
+			    o->sibling_inodes[i] == o->ino)
+					continue;
+			/* There may be the same rdev but different inode. */
+			no_o_excl = (o->sibling_rdevs[i] == o->rdev);
+		
+			/* Look for multiply registered device drivers with
+			   distinct inodes. */	
+			for (j = 0; j < i; j++) {
+				if (o->sibling_devs[j] == o->sibling_devs[i] &&
+			   	  o->sibling_inodes[j] == o->sibling_inodes[i])
+					break;
+				if (o->sibling_rdevs[j] == o->sibling_rdevs[i])
+					no_o_excl = 1;
+			}
+			if (j < i)
+				continue;   /* inode is already occupied */
+
+			ret = ddlpa_occupy(o, o->sibling_paths[i],
+					   &(o->sibling_fds[i]), no_o_excl);
+			if (ret)
+				return ret;
+		}
+	}
+
+	if (o->ddlpa_flags & DDLPA_OPEN_GIVEN_PATH)
+		ret = ddlpa_occupy(o, o->path, &(o->fd), 0);
+	else
+		ret = ddlpa_occupy(o, o->std_path, &(o->fd), 0);
+	if (ret)
+		return ret;	
+
+	/* >>> use fcntl() to adjust O_NONBLOCK */;
+
+	return 0;
+}
+
+
+/* ----------------------- public -------------------- */
+
+
+int ddlpa_destroy(struct ddlpa_lock **lockbundle)
+{
+	struct ddlpa_lock *o;
+	int i;
+
+	o= *lockbundle;
+	if (o == NULL)
+		return 0;
+	for (i = 0; i < o->num_siblings; i++)
+		if (o->sibling_fds[i] != -1)
+			close(o->sibling_fds[i]);
+	if(o->fd != -1)
+		close(o->fd);
+	if (o->path != NULL)
+		free(o->path);
+	if (o->errmsg != NULL)
+		free(o->errmsg);
+	free((char *) o);
+	*lockbundle = NULL;
+	return 0;
+}
+
+
+int ddlpa_lock_path(char *path, int o_flags, int ddlpa_flags,
+			struct ddlpa_lock **lockbundle, char **errmsg)
+{
+	struct ddlpa_lock *o;
+	int ret;
+
+	*errmsg = NULL;
+	if (ddlpa_new(&o, o_flags, ddlpa_flags))
+		return ENOMEM;
+	*lockbundle = o;
+
+	o->path = strdup(path);
+	if (o->path == NULL)
+		return ENOMEM;
+	o->path_is_valid = 1;
+
+	ret = ddlpa_std_by_rdev(o);
+	if (ret) {
+		*errmsg = strdup(
+		  "Cannot find equivalent of given path among standard paths");	
+		return ret;
+	}
+        ret = ddlpa_open_all(o);
+	if (ret) {
+		*errmsg = o->errmsg;
+		o->errmsg = NULL;
+		ddlpa_destroy(&o);
+	}
+	return ret;
+}
+
+
+int ddlpa_lock_btl(int bus, int target, int lun,
+			int  o_flags, int ddlpa_flags,
+			struct ddlpa_lock **lockbundle, char **errmsg)
+{
+	struct ddlpa_lock *o;
+	int ret;
+
+	*errmsg = NULL;
+	ddlpa_flags &= ~DDLPA_OPEN_GIVEN_PATH;
+	if (ddlpa_new(&o, o_flags, ddlpa_flags))
+		return ENOMEM;
+	*lockbundle = o;
+	
+	o->in_bus = bus;
+	o->in_target = target;
+	o->in_lun = lun;
+	o->inbtl_is_valid = 1;
+	ret = ddlpa_std_by_btl(o);
+	if (ret) {
+		*errmsg = strdup(
+		  "Cannot find /dev/sr* with given Bus,Target,Lun");	
+		return ret;
+	}
+        ret = ddlpa_open_all(o);
+	if (ret) {
+		*errmsg = o->errmsg;
+		o->errmsg = NULL;
+		ddlpa_destroy(&o);
+		return ret;
+	}
+	return 0;
+}
+
+
+#ifdef DDLPA_C_STANDALONE
+
+/* ----------------------------- Test / Demo -------------------------- */
+
+
+int main(int argc, char **argv)
+{
+	struct ddlpa_lock *lck = NULL;
+	char *errmsg = NULL, *opened_path = NULL, *my_path = NULL;
+	int i, ret, fd = -1, duration = -1, bus = -1, target = -1, lun = -1;
+
+	if (argc < 3) {
+usage:;
+		fprintf(stderr, "usage: %s  device_path  duration\n", argv[0]);
+		exit(1);
+	}
+	my_path = argv[1];
+	sscanf(argv[2], "%d", &duration);
+	if (duration < 0)
+		goto usage;
+
+
+	/* For our purpose, only O_RDWR is a suitable access mode.
+	   But in order to allow experiments, o_flags are freely adjustable.
+
+	   Warning: Do _not_ set an own O_EXCL flag with the following calls !
+
+	   (This freedom to fail may get removed in a final version.)
+	*/
+	if (my_path[0] != '/' && my_path[0] != '.' &&
+	    strchr(my_path, ',') != NULL) {
+		/* 
+		   cdrecord style dev=Bus,Target,Lun
+		*/
+
+		sscanf(my_path, "%d,%d,%d", &bus, &target, &lun);
+		ret = ddlpa_lock_btl(bus, target, lun, O_RDWR | O_LARGEFILE,
+					 0, &lck, &errmsg);
+	} else {
+		/*
+		   This substitutes for:
+			fd = open(my_path, O_RDWR | O_EXCL | O_LARGEFILE);
+
+		*/
+
+		ret = ddlpa_lock_path(my_path, O_RDWR | O_LARGEFILE,
+					 0, &lck, &errmsg);
+	}
+	if (ret) {
+		fprintf(stderr, "Cannot exclusively open '%s'\n", my_path);
+		if (errmsg != NULL)
+			fprintf(stderr, "Reason given    : %s\n",
+				errmsg);
+		free(errmsg);
+		fprintf(stderr, "Error condition : %d '%s'\n",
+			ret, strerror(ret));
+		exit(2);
+	}
+	fd = lck->fd;
+
+	printf("---------------------------------------------- Lock gained\n");
+
+
+	/* Use fd for the usual operations on the device depicted by my_path.
+	*/
+
+
+	/* This prints an overview of the impact of the lock */
+	if (lck->ddlpa_flags & DDLPA_OPEN_GIVEN_PATH)
+		opened_path = lck->path;
+	else
+        	opened_path = lck->std_path;
+	printf("ddlpa: opened           %s", opened_path);
+
+	if (strcmp(opened_path, lck->std_path) != 0)
+		printf(" (an alias of '%s')", lck->std_path);
+	printf("\n");
+	if (lck->num_siblings > 0) {
+		printf("ddlpa: opened siblings:");
+		for (i = 0; i < lck->num_siblings; i++)
+			if (lck->sibling_fds[i] != -1)
+				printf(" %s", lck->sibling_paths[i]);
+		printf("\n");
+	}
+
+
+	/* This example waits a while. So other lock candidates can collide. */
+	for (i = 0; i < duration; i++) {
+		sleep(1);
+		fprintf(stderr, "\rslept %d seconds of %d", i + 1, duration);
+	}
+	fprintf(stderr, "\n");
+
+
+	/* When finally done with the drive, this substitutes for:
+		close(fd);
+	*/
+	if (ddlpa_destroy(&lck)) {
+		/* Well, man 2 close says it can fail. */
+		exit(3);
+	}
+	exit(0);
+}
+
+
+#endif /* DDLPA_C_STANDALONE */
+

libburn/ddlpa.h

@@ -0,0 +1,107 @@
+
+/* ddlpa
+   Implementation of Delicate Device Locking Protocol level A.
+   Copyright (C) 2007 Thomas Schmitt <scdbackup@gmx.net>
+   Provided under any of the following licenses: GPL, LGPL, BSD. Choose one.
+
+   See ../doc/ddlp.txt for a description of the protocol.
+*/
+
+#ifndef DDLPA_H_INCLUDED
+#define DDLPA_H_INCLUDED 1
+
+
+/* An upper limit for the length of standard paths and sibling paths */
+#define DDLPA_MAX_STD_LEN 15
+
+/* An upper limit for the number of siblings */
+#define DDLPA_MAX_SIBLINGS 5
+
+struct ddlpa_lock {
+
+	/* Recorded input parameters of locking call */
+	char *path;
+	int  path_is_valid;
+	int  in_bus, in_target, in_lun;
+	int  inbtl_is_valid;
+	int  ddlpa_flags;
+	int  o_flags;
+
+	/* Result of locking call */
+	char std_path[DDLPA_MAX_STD_LEN + 1];
+	int  fd;
+	dev_t rdev;
+	dev_t dev;
+	ino_t ino;
+	int  host, channel, id, lun, bus;
+	int  hcilb_is_valid;
+	int  num_siblings;
+	char sibling_paths[DDLPA_MAX_SIBLINGS][DDLPA_MAX_STD_LEN + 1];
+	int  sibling_fds[DDLPA_MAX_SIBLINGS];
+	dev_t sibling_rdevs[DDLPA_MAX_SIBLINGS];
+	dev_t sibling_devs[DDLPA_MAX_SIBLINGS];
+	ino_t sibling_inodes[DDLPA_MAX_SIBLINGS];
+
+	/* Is NULL if all goes well. Else it may contain a text message. */
+	char *errmsg;
+};
+
+
+
+/** Lock a recorder by naming a device file path. Allocate a new container.
+    @param path        Gives the file system path of the recorder
+                       as known to the calling program.
+    @param o_flags     flags for open(2). Do not use O_EXCL here because this
+                       is done automatically whenever appropriate.
+                       Advised is O_RDWR | O_LARGEFILE, eventually | O_NDELAY.
+    @param ddlpa_flags 0 = default behavior: the standard path will be opened
+                           and treated by fcntl(F_SETLK)
+                       DDLPA_OPEN_GIVEN_PATH causes the input parameter "path"
+                       to be used with open(2) and fcntl(2).
+                       DDLPA_ALLOW_MISSING_SGRCD allows to grant a lock
+                       although not all three, a sg, a sr and a scd device
+                       file have been found during sibling search. Normally
+                       this is counted as failure due to EBUSY. 
+    @param lockbundle  gets allocated and then represents the locking state
+    @param errmsg      if *errmsg is not NULL after the call, it contains an
+                       error message. Then to be released by free(3).
+                       It is NULL in case of success or lack of memory.
+    @return            0=success , else an errno compatible error number
+*/
+int ddlpa_lock_path(char *path, int  o_flags, int ddlpa_flags, 
+                    struct ddlpa_lock **lockbundle, char **errmsg);
+
+
+/** Lock a recorder by naming a Bus,Target,Lun number triple.
+    Allocate a new container.
+    @param bus         parameter to match ioctl(SCSI_IOCTL_GET_BUS_NUMBER)
+    @param target      parameter to match ioctl(SCSI_IOCTL_GET_IDLUN) &0xff
+    @param lun         parameter to match ioctl(SCSI_IOCTL_GET_IDLUN) &0xff00
+    @param o_flags     see ddlpa_lock_path().
+    @param ddlpa_flags see ddlpa_lock_path(). Flag DDLPA_OPEN_GIVEN_PATH
+                       will be ignored.
+    @param lockbundle  see ddlpa_lock_path().
+    @param errmsg      see ddlpa_lock_path().
+    @return            0=success , else an errno compatible error number
+*/
+int ddlpa_lock_btl(int bus, int target, int lun,
+                   int  o_flags, int ddlpa_flags,
+                   struct ddlpa_lock **lockbundle, char **errmsg);
+
+
+/** Release the lock by closing all filedescriptors and freeing memory.
+    @param lockbundle  the lock which is to be released. 
+                       *lockbundle will be set to NULL by this call.
+    @return            0=success , 1=failure
+*/
+int ddlpa_destroy(struct ddlpa_lock **lockbundle);
+
+
+
+/** Definitions of macros used in above functions */
+
+#define DDLPA_OPEN_GIVEN_PATH 1
+#define DDLPA_ALLOW_MISSING_SGRCD 2
+
+
+#endif /* DDLPA_H_INCLUDED */

libburn/drive.c

@@ -206,6 +206,9 @@ int burn_drive_inquire_media(struct burn_drive *d)
 	} else {
 		if (d->current_profile == -1 || d->current_is_cd_profile)
 			d->read_toc(d);
+
+		/* ts A70314 */
+		d->status = BURN_DISC_UNSUITABLE;
 	}
 	return 1;
 }
@@ -1455,10 +1458,12 @@ off_t burn_disc_available_space(struct burn_drive *d,
 		d->send_write_parameters(d, o);
 	d->get_nwa(d, -1, &lba, &nwa);
 ex:;
-	if (o->start_byte > 0) {
+	if (o != NULL) {
-		if (o->start_byte > d->media_capacity_remaining)
+		if (o->start_byte > 0) {
-			return 0;
+			if (o->start_byte > d->media_capacity_remaining)
-		return d->media_capacity_remaining - o->start_byte;
+				return 0;
+			return d->media_capacity_remaining - o->start_byte;
+		}
 	}
 	return d->media_capacity_remaining;
 }

libburn/init.c

@@ -26,9 +26,22 @@ struct libdax_msgs *libdax_messenger= NULL;
 
 int burn_running = 0;
 
-/* ts A60813 : wether to use O_EXCL and/or O_NONBLOCK in libburn/sg.c */
+/* ts A60813 : Linux: wether to use O_EXCL on open() of device files */
 int burn_sg_open_o_excl = 1;
 
+/* ts A70403 : Linux: wether to use fcntl(,F_SETLK,)
+                      after open() of device files  */
+int burn_sg_fcntl_f_setlk = 1;
+
+/* ts A70314 : Linux: what device family to use :
+    0= default family
+    1= sr
+    2= scd
+   (3= st)
+    4= sg
+*/
+int burn_sg_use_family = 0;
+
 /* O_NONBLOCK was hardcoded in enumerate_ata() which i hardly use.
    For enumerate_sg() it seems ok.
    So it should stay default mode until enumerate_ata() without O_NONBLOCK
@@ -119,10 +132,11 @@ void burn_preset_device_open(int exclusive, int blocking, int abort_on_busy)
 	/* a ssert(burn_running); */
 	if (!burn_running)
 		return;	
-
+	burn_sg_open_o_excl = exclusive & 3;
-	burn_sg_open_o_excl= exclusive;
+	burn_sg_fcntl_f_setlk = !!(exclusive & 32);
-	burn_sg_open_o_nonblock= !blocking;
+	burn_sg_use_family = (exclusive >> 2) & 7;
-	burn_sg_open_abort_busy= !!abort_on_busy;
+	burn_sg_open_o_nonblock = !blocking;
+	burn_sg_open_abort_busy = !!abort_on_busy;
 }
 
 

libburn/libburn.h

@@ -572,13 +572,22 @@ void burn_set_verbosity(int level);
     after burn_initialize() and before any bus scan. But not mandatory at all.
     Parameter value 1 enables a feature, 0 disables.  
     Default is (1,0,0). Have a good reason before you change it.
-    @param exclusive 1 = Try to open only devices which are not marked as busy
+    @param exclusive Linux only:
+                     0 = no attempt to make drive access exclusive.
+                     1 = Try to open only devices which are not marked as busy
                      and try to mark them busy if opened sucessfully. (O_EXCL)
                      There are kernels which simply don't care about O_EXCL.
                      Some have it off, some have it on, some are switchable.
                      2 = in case of a SCSI device, also try to open exclusively
-                     the matching /dev/sr, /dev/scd and /dev/st .
+                         the matching /dev/sr, /dev/scd and /dev/st .
-                     0 = no attempt to make drive access exclusive.
+                     One may select a device SCSI file family by adding
+                      0 = default family
+                      4 = /dev/sr%d
+                      8 = /dev/scd%d
+                     16 = /dev/sg%d
+                     Do not use other values !
+                     Add 32 to demand an exclusive lock by fcntl(,F_SETLK,)
+                     after open() has succeeded.
     @param blocking  Try to wait for drives which do not open immediately but
                      also do not return an error as well. (O_NONBLOCK)
                      This might stall indefinitely with /dev/hdX hard disks.
@@ -765,8 +774,8 @@ int burn_drive_grab(struct burn_drive *drive, int load);
 
 
 /** Release a drive. This should not be done until the drive is no longer
-    busy (see burn_drive_get_status). The drive is (O_EXCL) unlocked
+    busy (see burn_drive_get_status).
-    afterwards.
+    Linux: The drive is unlocked afterwards. (O_EXCL , F_SETLK).
 	@param drive The drive to release.
 	@param eject Nonzero to make the drive eject the disc in it.
 */
@@ -1235,7 +1244,6 @@ enum burn_source_status burn_track_set_source(struct burn_track *t,
 */
 int burn_track_set_default_size(struct burn_track *t, off_t size);
 
-
 /** Free a burn_source (decrease its refcount and maybe free it)
 	@param s Source to free
 */
@@ -1256,6 +1264,16 @@ struct burn_source *burn_file_source_new(const char *path,
 struct burn_source *burn_fd_source_new(int datafd, int subfd, off_t size);
 
 
+/* ts A70328 */
+/** Sets a fixed track size after the data source object has already been
+    created.
+    @param t The track to poperate on
+    @param size the number of bytes to use as track size
+    @return <=0 indicates failure , >0 success
+*/
+int burn_track_set_size(struct burn_track *t, off_t size);
+
+
 /** Tells how long a track will be on disc
     >>> NOTE: Not reliable with tracks of undefined length
 */

libburn/libdax_msgs.h

@@ -300,9 +300,10 @@ Range "scdbackup"          :  0x00020000 to 0x0002ffff
  0x00020002 (SORRY,HIGH)   = Encountered error when closing drive
  0x00020003 (SORRY,HIGH)   = Could not grab drive
  0x00020004 (NOTE,HIGH)    = Opened O_EXCL scsi sibling
- 0x00020005 (FATAL,HIGH)   = Failed to open device
+ 0x00020005 (SORRY,HIGH)   = Failed to open device
  0x00020006 (FATAL,HIGH)   = Too many scsi siblings
  0x00020007 (NOTE,HIGH)    = Closed O_EXCL scsi siblings
+ 0x00020008 (SORRY,HIGH)   = Device busy. Failed to fcntl-lock
            
  General library operations:
 
@@ -365,6 +366,8 @@ Range "scdbackup"          :  0x00020000 to 0x0002ffff
  0x00020138 (FATAL,HIGH)   = Cannot reserve track
  0x00020139 (SORRY,HIGH)   = Write job parameters are unsuitable
  0x0002013a (FATAL,HIGH)   = No suitable media detected
+ 0x0002013b
+ 0x0002013c (SORRY,HIGH)   = Malformed capabilities page 2Ah received
 
  libdax_audioxtr:
  0x00020200 (SORRY,HIGH)   = Cannot open audio source file

libburn/mmc.c

@@ -50,10 +50,10 @@ extern struct libdax_msgs *libdax_messenger;
 /* ts A70129 */
 #define Libburn_support_dvd_r_seQ 1
 
-/* ts A70306 >>> UNTESTED */
+/* ts A70306 */
 #define Libburn_support_dvd_plus_R 1
 
-/* Progress report:
+/* DVD progress report:
    ts A61219 : It seems to work with a used (i.e. thoroughly formatted) DVD+RW.
                Error messages of class DEBUG appear because of inability to
                read TOC or track info. Nevertheless, the written images verify.
@@ -88,7 +88,8 @@ extern struct libdax_msgs *libdax_messenger;
    ts A70205 : Beginning to implement DVD-R[W] DAO : single track and session,
                size prediction mandatory.
    ts A70208 : Finally made tests with DVD-R. Worked exactly as new DVD-RW.
-
+   ts A70306 : Implemented DVD+R (always -multi for now)
+   ts A70330 : Allowed finalizing of DVD+R.
 */
 
 
@@ -1514,7 +1515,7 @@ void mmc_get_configuration(struct burn_drive *d)
 		return;
 	len = mmc_four_char_to_int(c.page->data);
 
-	if (len<8)
+	if (len < 8 || len > 4096)
 		return;
 	cp = (c.page->data[6]<<8) | c.page->data[7];
 	d->current_profile = cp;
@@ -1695,7 +1696,7 @@ int mmc_read_format_capacities(struct burn_drive *d, int top_wanted)
 	d->best_format_size = 0;
 
 	memcpy(c.opcode, MMC_READ_FORMAT_CAPACITIES,
-		 sizeof(MMC_GET_CONFIGURATION));
+		 sizeof(MMC_READ_FORMAT_CAPACITIES));
 	c.retry = 1;
 	c.oplen = sizeof(MMC_READ_FORMAT_CAPACITIES);
 	c.opcode[7]= 0x02;

libburn/os-linux.h

@@ -52,6 +52,10 @@ SIGKILL, SIGCHLD, SIGSTOP, SIGURG, SIGWINCH
 typedef int burn_drive_enumerator_t;
 
 
+/* Parameters for sibling list. See sibling_fds, sibling_fnames */
+#define BURN_OS_SG_MAX_SIBLINGS 5
+#define BURN_OS_SG_MAX_NAMELEN 16
+
 /* The list of operating system dependent elements in struct burn_drive.
    Usually they are initialized in  sg-*.c:enumerate_common().
 */
@@ -60,5 +64,7 @@ int fd; \
  \
 /* ts A60926 : trying to lock against growisofs /dev/srN, /dev/scdN */ \
 int sibling_count; \
-int sibling_fds[LIBBURN_SG_MAX_SIBLINGS];
+int sibling_fds[BURN_OS_SG_MAX_SIBLINGS]; \
+/* ts A70409 : DDLP */ \
+char sibling_fnames[BURN_OS_SG_MAX_SIBLINGS][BURN_OS_SG_MAX_NAMELEN];
 

libburn/sbc.c

@@ -3,9 +3,11 @@
 /* scsi block commands */
 
 #include <string.h>
+#include <unistd.h>
 
 #include "transport.h"
 #include "sbc.h"
+#include "spc.h"
 #include "options.h"
 
 /* spc command set */
@@ -23,6 +25,7 @@ void sbc_load(struct burn_drive *d)
 	c.dir = NO_TRANSFER;
 	c.page = NULL;
 	d->issue_command(d, &c);
+	spc_wait_unit_attention(d, 60);
 }
 
 void sbc_eject(struct burn_drive *d)

libburn/sg-linux.c

@@ -71,14 +71,19 @@ Hint: You should also look into sg-freebsd-port.c, which is a younger and
 #include <sys/poll.h>
 #include <linux/hdreg.h>
 #include <stdlib.h>
+#include <sys/utsname.h>
 #include <scsi/sg.h>
 #include <scsi/scsi.h>
 
-/* ts A61211 : to recognize CD devices on /dev/sr* */
+/* ts A61211 : to eventually recognize CD devices on /dev/sr* */
 #include <linux/cdrom.h>
 
 
-/* ts A61211 : preparing for exploration of recent Linux ATA adventures */
+/** Indication of the Linux kernel this software is running on */
+/* -1 = not evaluated , 0 = unrecognizable , 1 = 2.4 , 2 = 2.6 */
+static int sg_kernel_age = -1;
+
+
 /** PORTING : Device file families for bus scanning and drive access.
     Both device families must support the following ioctls:
       SG_IO,
@@ -104,22 +109,22 @@ static int linux_sg_enumerate_debug = 0;
    in the range of 0 to 31 . The resulting addresses must provide SCSI
    address parameters Host, Channel, Id, Lun and also Bus.
    E.g.: "/dev/sg%d"
+   sr%d is supposed to map only CD-ROM style devices. Additionally a test
+   with ioctl(CDROM_DRIVE_STATUS) is made to assert that it is such a drive,
+
+   This initial setting may be overridden in sg_select_device_family() by 
+   settings made via burn_preset_device_open().
 */
-/* NEW INFO: If hard disks at /dev/sr allow ioctl(CDROM_DRIVE_STATUS), they
-             are in danger.
-             If you want it less dangerous:
-               #undef CDROM_DRIVE_STATUS
-             but then you might need linux_sg_accept_any_type = 1 which
-             is _more dangerous_.
-*/
-/* !!! DO NOT SET TO sr%d UNLESS YOU PROTECTED ALL INDISPENSIBLE DEVICES
-       by chmod -rw . A test wether non-CD devices are properly excluded would
-       be well needed though. Heroic disks, scanners, etc. wanted !!! */
 static char linux_sg_device_family[80] = {"/dev/sg%d"};
 
+/* Set this to 1 if you want the default linux_sg_device_family chosen
+   depending on kernel release: sg for <2.6 , sr for >=2.6
+*/
+static int linux_sg_auto_family = 1;
+
 
 /* Set this to 1 in order to accept any TYPE_* (see scsi/scsi.h) */
-/* NEW INFO: Try with 0 first. There is hope via CDROM_DRIVE_STATUS. */
+/* But try with 0 first. There is hope via CDROM_DRIVE_STATUS. */
 /* !!! DO NOT SET TO 1 UNLESS YOU PROTECTED ALL INDISPENSIBLE DEVICES
        chmod -rw !!! */
 static int linux_sg_accept_any_type = 0;
@@ -168,12 +173,15 @@ static void enumerate_common(char *fname, int bus_no, int host_no,
 			     int channel_no, int target_no, int lun_no);
 
 
-/* >>> ts A61115 : this needs mending. A Linux aspect shows up in cdrskin. */
 /* ts A60813 : storage objects are in libburn/init.c
-   wether to use O_EXCL
+   wether to use O_EXCL with open(2) of devices
+   wether to use fcntl(,F_SETLK,) after open(2) of devices
+   what device family to use : 0=default, 1=sr, 2=scd, (3=st), 4=sg
    wether to use O_NOBLOCK with open(2) on devices
    wether to take O_EXCL rejection as fatal error */
 extern int burn_sg_open_o_excl;
+extern int burn_sg_fcntl_f_setlk;
+extern int burn_sg_use_family;
 extern int burn_sg_open_o_nonblock;
 extern int burn_sg_open_abort_busy;
 
@@ -188,6 +196,53 @@ int mmc_function_spy(char * text);
 /*            (Public functions are listed below)                           */
 /* ------------------------------------------------------------------------ */
 
+/* ts A70413 */
+/* This finds out wether the software is running on kernel >= 2.6
+*/
+static void sg_evaluate_kernel(void)
+{
+	struct utsname buf;
+	if (sg_kernel_age >= 0)
+		return;
+
+	sg_kernel_age = 0;
+	if (uname(&buf) == -1)
+		return;
+	sg_kernel_age = 1;
+	if (strcmp(buf.release, "2.6") >= 0)
+		sg_kernel_age = 2;
+}
+
+
+/* ts A70314 */
+/* This installs the device file family if one was chosen explicitely
+   by burn_preset_device_open()
+*/
+static void sg_select_device_family(void)
+{
+
+	/* >>> ??? do we need a mutex here ? */
+	/* >>> (It might be concurrent but is supposed to have always
+	        the same effect. Any race condition should be harmless.) */
+
+	if (burn_sg_use_family == 1)
+		strcpy(linux_sg_device_family, "/dev/sr%d");
+	else if (burn_sg_use_family == 2)
+		strcpy(linux_sg_device_family, "/dev/scd%d");
+	else if (burn_sg_use_family == 3)
+		strcpy(linux_sg_device_family, "/dev/st%d");
+	else if (burn_sg_use_family == 4)
+		strcpy(linux_sg_device_family, "/dev/sg%d");
+	else if (linux_sg_auto_family) {
+		sg_evaluate_kernel();
+		if (sg_kernel_age >= 2)
+			strcpy(linux_sg_device_family, "/dev/sr%d");
+		else
+			strcpy(linux_sg_device_family, "/dev/sg%d");
+		linux_sg_auto_family = 0;
+	}
+}
+
 
 static int sgio_test(int fd)
 {
@@ -229,12 +284,86 @@ static int sg_handle_busy_device(char *fname, int os_errno)
 }
 
 
+/* ts A60925 : ticket 74 */
+static int sg_close_drive_fd(char *fname, int driveno, int *fd, int sorry)
+{
+	int ret, os_errno, sevno= LIBDAX_MSGS_SEV_DEBUG;
+	char msg[4096+100];
+
+	if(*fd < 0)
+		return(0);
+	ret = close(*fd);
+	*fd = -1337;
+	if(ret != -1) {
+		/* ts A70409 : DDLP-B */
+		/* >>> release single lock on fname */
+		return 1;
+	}
+	os_errno= errno;
+
+	sprintf(msg, "Encountered error when closing drive '%s'", fname);
+	if (sorry)
+		sevno = LIBDAX_MSGS_SEV_SORRY;
+	libdax_msgs_submit(libdax_messenger, driveno, 0x00020002,
+			sevno, LIBDAX_MSGS_PRIO_HIGH, msg, os_errno, 0);
+	return 0;	
+}
+
+
+/* ts A70401 : 
+   fcntl() has the unappealing property to work only after open().
+   So libburn will by default use open(O_EXCL) first and afterwards
+   as second assertion will use fcntl(F_SETLK). One lock more should not harm.
+*/
+static int sg_fcntl_lock(int *fd, char *fd_name, int l_type, int verbous)
+{
+	struct flock lockthing;
+	char msg[81];
+	int ret;
+
+	if (!burn_sg_fcntl_f_setlk)
+		return 1;
+
+	memset(&lockthing, 0, sizeof(lockthing));
+	lockthing.l_type = l_type;
+	lockthing.l_whence = SEEK_SET;
+	lockthing.l_start = 0;
+	lockthing.l_len = 0;
+/*
+        fprintf(stderr,"LIBBURN_EXPERIMENTAL: fcntl(%d, F_SETLK, %s)\n",
+                *fd, l_type == F_WRLCK ? "F_WRLCK" : "F_RDLCK");
+*/
+
+	ret = fcntl(*fd, F_SETLK, &lockthing);
+	if (ret == -1) {
+		if (verbous) {
+			sprintf(msg, "Device busy. Failed to fcntl-lock '%s'",
+					fd_name);
+			libdax_msgs_submit(libdax_messenger, -1, 0x00020008,
+				LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
+				msg, errno, 0);
+		}
+		close(*fd);
+		*fd = -1;
+
+		/* ts A70409 : DDLP-B */
+		/* >>> release single lock on fd_name */
+
+		return(0);
+	}
+	return 1;
+}
+
+
 /* ts A60926 */
 static int sg_open_drive_fd(char *fname, int scan_mode)
 {
 	int open_mode = O_RDWR, fd;
 	char msg[81];
 
+	/* ts A70409 : DDLP-B */
+	/* >>> obtain single lock on fname */
+
 	/* ts A60813 - A60927
 	   O_EXCL with devices is a non-POSIX feature
 	   of Linux kernels. Possibly introduced 2002.
@@ -244,17 +373,22 @@ static int sg_open_drive_fd(char *fname, int scan_mode)
 	/* ts A60813
 	   O_NONBLOCK was already hardcoded in ata_ but not in sg_.
 	   There must be some reason for this. So O_NONBLOCK is
-	   default mode for both now. Disable on own risk. */
+	   default mode for both now. Disable on own risk.
+	   ts A70411
+           Switched to O_NDELAY for LKML statement 2007/4/11/141 by Alan Cox:
+	   "open() has side effects. The CD layer allows you to open
+            with O_NDELAY if you want to avoid them." 
+	*/
 	if(burn_sg_open_o_nonblock)
-		open_mode |= O_NONBLOCK;
+		open_mode |= O_NDELAY;
 
 /* <<< debugging
 	fprintf(stderr,
 		"\nlibburn: experimental: o_excl= %d , o_nonblock= %d, abort_on_busy= %d\n",
 	burn_sg_open_o_excl,burn_sg_open_o_nonblock,burn_sg_open_abort_busy);
 	fprintf(stderr,
-		"libburn: experimental: O_EXCL= %d , O_NONBLOCK= %d\n",
+		"libburn: experimental: O_EXCL= %d , O_NDELAY= %d\n",
-		!!(open_mode&O_EXCL),!!(open_mode&O_NONBLOCK));
+		!!(open_mode&O_EXCL),!!(open_mode&O_NDELAY));
 */
           
 	fd = open(fname, open_mode);
@@ -273,50 +407,25 @@ static int sg_open_drive_fd(char *fname, int scan_mode)
 			return -1;
 		sprintf(msg, "Failed to open device '%s'",fname);
 		libdax_msgs_submit(libdax_messenger, -1, 0x00020005,
-				LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
+				LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
 				msg, errno, 0);
 		return -1;
 	}
+	sg_fcntl_lock(&fd, fname, F_WRLCK, 1);
 	return fd;
 }
 
 
-/* ts A60925 : ticket 74 */
-static int sg_close_drive_fd(char *fname, int driveno, int *fd, int sorry)
-{
-	int ret, os_errno, sevno= LIBDAX_MSGS_SEV_DEBUG;
-	char msg[4096+100];
-
-	if(*fd < 0)
-		return(0);
-	ret = close(*fd);
-	*fd = -1337;
-	if(ret != -1)
-		return 1;
-	os_errno= errno;
-
-	if (fname != NULL)
-		sprintf(msg, "Encountered error when closing drive '%s'",
-			fname);
-	else
-		sprintf(msg, "Encountered error when closing drive");
-
-	if (sorry)
-		sevno = LIBDAX_MSGS_SEV_SORRY;
-	libdax_msgs_submit(libdax_messenger, driveno, 0x00020002,
-			sevno, LIBDAX_MSGS_PRIO_HIGH, msg, os_errno, 0);
-	return 0;	
-}
-
-
 /* ts A60926 */
-static int sg_release_siblings(int sibling_fds[], int *sibling_count)
+static int sg_release_siblings(int sibling_fds[],
+				char sibling_fnames[][BURN_OS_SG_MAX_NAMELEN],
+				int *sibling_count)
 {
 	int i;
 	char msg[81];
 
 	for(i= 0; i < *sibling_count; i++)
-		sg_close_drive_fd(NULL, -1, &(sibling_fds[i]), 0);
+		sg_close_drive_fd(sibling_fnames[i], -1, &(sibling_fds[i]), 0);
 	if(*sibling_count > 0) {
 		sprintf(msg, "Closed %d O_EXCL scsi siblings", *sibling_count);
 		libdax_msgs_submit(libdax_messenger, -1, 0x00020007,
@@ -334,7 +443,8 @@ static int sg_close_drive(struct burn_drive *d)
 
 	if (!burn_drive_is_open(d))
 		return 0;
-	sg_release_siblings(d->sibling_fds, &(d->sibling_count));
+	sg_release_siblings(d->sibling_fds, d->sibling_fnames,
+				&(d->sibling_count));
 	ret = sg_close_drive_fd(d->devname, d->global_index, &(d->fd), 0);
 	return ret;
 }
@@ -342,29 +452,45 @@ static int sg_close_drive(struct burn_drive *d)
 
 /* ts A60926 */
 static int sg_open_scsi_siblings(char *path, int driveno,
-			  int sibling_fds[], int *sibling_count,
+			int sibling_fds[],
-			  int host_no, int channel_no, int id_no, int lun_no)
+			char sibling_fnames[][BURN_OS_SG_MAX_NAMELEN],
+			int *sibling_count,
+			int host_no, int channel_no, int id_no, int lun_no)
 {
 	int tld, i, ret, fd, i_bus_no = -1;
 	int i_host_no = -1, i_channel_no = -1, i_target_no = -1, i_lun_no = -1;
 	char msg[161], fname[81];
+	struct stat stbuf;
+	dev_t last_rdev = 0, path_rdev;
 
-	static char tldev[][81]= {"/dev/sr%d", "/dev/scd%d", "/dev/st%d", 
+	static char tldev[][81]= {"/dev/sr%d", "/dev/scd%d", "/dev/sg%d", ""};
-				  "/dev/sg%d", ""};
+					/* ts A70609: removed "/dev/st%d" */
 
+	if(stat(path, &stbuf) == -1)
+		return 0;
+	path_rdev = stbuf.st_rdev;
+
+        sg_select_device_family();
 	if (linux_sg_device_family[0] == 0)
 		return 1;
 
 	if(host_no < 0 || id_no < 0 || channel_no < 0 || lun_no < 0)
 		return(2);
 	if(*sibling_count > 0)
-		sg_release_siblings(sibling_fds, sibling_count);
+		sg_release_siblings(sibling_fds, sibling_fnames,
+					sibling_count);
 		
 	for (tld = 0; tldev[tld][0] != 0; tld++) {
 		if (strcmp(tldev[tld], linux_sg_device_family)==0)
 	continue;
 		for (i = 0; i < 32; i++) {
 			sprintf(fname, tldev[tld], i);
+			if(stat(fname, &stbuf) == -1)
+		continue;
+			if (path_rdev == stbuf.st_rdev)
+		continue;
+			if (*sibling_count > 0 && last_rdev == stbuf.st_rdev)
+		continue;
 			ret = sg_obtain_scsi_adr(fname, &i_bus_no, &i_host_no,
 				&i_channel_no, &i_target_no, &i_lun_no);
 			if (ret <= 0)
@@ -378,7 +504,7 @@ static int sg_open_scsi_siblings(char *path, int driveno,
 			if (fd < 0)
 				goto failed;
 
-			if (*sibling_count>=LIBBURN_SG_MAX_SIBLINGS) {
+			if (*sibling_count>=BURN_OS_SG_MAX_SIBLINGS) {
 				sprintf(msg, "Too many scsi siblings of '%s'",
 					path);
 				libdax_msgs_submit(libdax_messenger,
@@ -388,18 +514,20 @@ static int sg_open_scsi_siblings(char *path, int driveno,
 				goto failed;
 			}
 			sprintf(msg, "Opened O_EXCL scsi sibling '%s' of '%s'",
-				 fname, path);
+				fname, path);
 			libdax_msgs_submit(libdax_messenger, driveno,
 				0x00020004,
 				LIBDAX_MSGS_SEV_NOTE, LIBDAX_MSGS_PRIO_HIGH,
 				msg, 0, 0);
 			sibling_fds[*sibling_count] = fd;
+			strcpy(sibling_fnames[*sibling_count], fname);
 			(*sibling_count)++;
+			last_rdev= stbuf.st_rdev;
 		}
 	}
 	return 1;
 failed:;
-	sg_release_siblings(sibling_fds, sibling_count);
+	sg_release_siblings(sibling_fds, sibling_fnames, sibling_count);
 	return 0;
 }
 
@@ -477,10 +605,13 @@ static void ata_enumerate(void)
 static void sg_enumerate(void)
 {
 	struct sg_scsi_id sid;
-	int i, fd, sibling_fds[LIBBURN_SG_MAX_SIBLINGS], sibling_count= 0, ret;
+	int i, fd, sibling_fds[BURN_OS_SG_MAX_SIBLINGS], sibling_count= 0, ret;
 	int sid_ret = 0;
 	int bus_no= -1, host_no= -1, channel_no= -1, target_no= -1, lun_no= -1;
 	char fname[10];
+	char sibling_fnames[BURN_OS_SG_MAX_SIBLINGS][BURN_OS_SG_MAX_NAMELEN];
+
+        sg_select_device_family();
 
 	if (linux_sg_enumerate_debug)
 	  fprintf(stderr, "libburn_debug: linux_sg_device_family = %s\n",
@@ -520,6 +651,16 @@ static void sg_enumerate(void)
 			    "ioctl(SG_GET_SCSI_ID) failed, errno=%d  '%s' , ",
 			    errno, strerror(errno));
 
+			if (sgio_test(fd) == -1) {
+				if (linux_sg_enumerate_debug)
+			  		fprintf(stderr,
+				 "FATAL: sgio_test() failed: errno=%d  '%s'",
+						errno, strerror(errno));
+
+				sg_close_drive_fd(fname, -1, &fd, 0);
+	continue;
+			}
+
 #ifdef CDROM_DRIVE_STATUS
 			/* ts A61211 : not widening old acceptance range */
 			if (strcmp(linux_sg_device_family,"/dev/sg%d") != 0) {
@@ -581,7 +722,8 @@ static void sg_enumerate(void)
 		/* 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_count,
+					fname, -1, sibling_fds, sibling_fnames,
+					&sibling_count,
 					sid.host_no, sid.channel,
 					sid.scsi_id, sid.lun);
 			if (ret<=0) {
@@ -591,7 +733,8 @@ static void sg_enumerate(void)
 	continue;
 			}
 			/* the final occupation will be done in sg_grab() */
-			sg_release_siblings(sibling_fds, &sibling_count);
+			sg_release_siblings(sibling_fds, sibling_fnames,
+						&sibling_count);
 		}
 #ifdef SCSI_IOCTL_GET_BUS_NUMBER
 		if(bus_no == -1)
@@ -645,7 +788,7 @@ static void enumerate_common(char *fname, int bus_no, int host_no,
 	/* Adapter specific handles and data */
 	out.fd = -1337;
 	out.sibling_count = 0;
-	for(i= 0; i<LIBBURN_SG_MAX_SIBLINGS; i++)
+	for(i= 0; i<BURN_OS_SG_MAX_SIBLINGS; i++)
 		out.sibling_fds[i] = -1337;
 
 	/* PORTING: ---------------- end of non portable part ------------ */
@@ -698,6 +841,7 @@ int sg_give_next_adr(burn_drive_enumerator_t *idx,
 	if (initialize == -1)
 		return 0;
 
+        sg_select_device_family();
 	if (linux_sg_device_family[0] == 0)
 		sg_limit = 0;
 	if (linux_ata_device_family[0] == 0)
@@ -793,9 +937,12 @@ int sg_grab(struct burn_drive *d)
 		open_mode |= O_EXCL;
 
 	/* ts A60813
-	   O_NONBLOCK was hardcoded here. So it should stay default mode. */
+	   O_NONBLOCK was hardcoded here. So it should stay default mode.
+	   ts A70411
+           Switched to O_NDELAY for LKML statement 2007/4/11/141
+	*/
 	if(burn_sg_open_o_nonblock)
-		open_mode |= O_NONBLOCK;
+		open_mode |= O_NDELAY;
 
 	/* ts A60813 - A60822
 	   After enumeration the drive fd is probably still open.
@@ -808,12 +955,15 @@ int sg_grab(struct burn_drive *d)
    		<<< debug: for tracing calls which might use open drive fds */
 		mmc_function_spy("sg_grab ----------- opening");
 
+		/* ts A70409 : DDLP-B */
+		/* >>> obtain single lock on d->devname */
+
 		/* ts A60926 */
 		if(burn_sg_open_o_excl>1) {
 			fd = -1;
 			ret = sg_open_scsi_siblings(d->devname,
 					d->global_index,d->sibling_fds,
-					&(d->sibling_count),
+					d->sibling_fnames,&(d->sibling_count),
 					d->host, d->channel, d->id, d->lun);
 			if(ret <= 0)
 				goto drive_is_in_use;
@@ -821,6 +971,11 @@ int sg_grab(struct burn_drive *d)
 
 		fd = open(d->devname, open_mode);
 		os_errno = errno;
+		if (fd >= 0) {
+			sg_fcntl_lock(&fd, d->devname, F_WRLCK, 1);
+			if (fd < 0)
+				goto drive_is_in_use;
+		}
 	} else
 		fd= d->fd;
 
@@ -1034,19 +1189,33 @@ ex:;
 int sg_obtain_scsi_adr(char *path, int *bus_no, int *host_no, int *channel_no,
                        int *target_no, int *lun_no)
 {
-	int fd, ret, l;
+	int fd, ret, l, open_mode = O_RDONLY;
 	struct my_scsi_idlun {
 		int x;
 		int host_unique_id;
 	};
  	struct my_scsi_idlun idlun;
 
+
 	l = strlen(linux_ata_device_family) - 2;
 	if (l > 0 && strncmp(path, linux_ata_device_family, l) == 0 
 	    && path[7] >= 'a' && path[7] <= 'z' && path[8] == 0)
 		return 0; /* on RIP 14 all hdx return SCSI adr 0,0,0,0 */
 
-	fd = open(path, O_RDONLY | O_NONBLOCK);
+	/* ts A70409 : DDLP-B */
+	/* >>> obtain single lock on path */
+
+	if(burn_sg_open_o_nonblock)
+		open_mode |= O_NDELAY;
+	if(burn_sg_open_o_excl) {
+		/* O_EXCL | O_RDONLY does not work with /dev/sg* on 
+		   SuSE 9.0 (kernel 2.4) and SuSE 9.3 (kernel 2.6) */
+		/* so skip it for now */;
+	}
+	fd = open(path, open_mode);
+	if(fd < 0)
+		return 0;
+	sg_fcntl_lock(&fd, path, F_RDLCK, 0);
 	if(fd < 0)
 		return 0;
 

libburn/spc.c

@@ -40,7 +40,7 @@ static unsigned char SPC_MODE_SELECT[] =
 static unsigned char SPC_REQUEST_SENSE[] = { 0x03, 0, 0, 0, 18, 0 };
 static unsigned char SPC_TEST_UNIT_READY[] = { 0x00, 0, 0, 0, 0, 0 };
 
-int spc_test_unit_ready(struct burn_drive *d)
+int spc_test_unit_ready_r(struct burn_drive *d, int *key, int *asc, int *ascq)
 {
 	struct command c;
 
@@ -50,11 +50,41 @@ int spc_test_unit_ready(struct burn_drive *d)
 	c.page = NULL;
 	c.dir = NO_TRANSFER;
 	d->issue_command(d, &c);
-	if (c.error)
+	if (c.error) {
+		*key= c.sense[2];
+		*asc= c.sense[12];
+		*ascq= c.sense[13];
 		return (c.sense[2] & 0xF) == 0;
+	}
 	return 1;
 }
 
+int spc_test_unit_ready(struct burn_drive *d)
+{
+	int key,asc,ascq;
+
+	return spc_test_unit_ready_r(d, &key, &asc, &ascq);
+}
+
+
+/* ts A70315 */
+/** Wait until the drive state becomes clear in or until max_usec elapsed */
+int spc_wait_unit_attention(struct burn_drive *d, int max_sec)
+{
+	int i, ret, key, asc, ascq;
+
+	for(i=0; i < max_sec; i++) {
+		ret = spc_test_unit_ready_r(d, &key, &asc, &ascq);
+		if(ret > 0 || key!=0x2 || asc!=0x4) /* ready or error */
+	break;
+		usleep(1000000);
+	}
+	if (i < max_sec)
+		return (ret > 0);
+	return 0;
+}
+
+
 void spc_request_sense(struct burn_drive *d, struct buffer *buf)
 {
 	struct command c;
@@ -141,6 +171,7 @@ void spc_sense_caps(struct burn_drive *d)
 	/* ts A61225 : 1 = report about post-MMC-1 speed descriptors */
 	static int speed_debug = 0;
 
+	memset(&buf, 0, sizeof(buf));
 	memcpy(c.opcode, SPC_MODE_SENSE, sizeof(SPC_MODE_SENSE));
 	c.retry = 1;
 	c.oplen = sizeof(SPC_MODE_SENSE);
@@ -150,6 +181,8 @@ void spc_sense_caps(struct burn_drive *d)
 	c.page->sectors = 0;
 	c.dir = FROM_DRIVE;
 	d->issue_command(d, &c);
+	if (c.error)
+		memset(&buf, 0, sizeof(buf));
 
 	size = c.page->data[0] * 256 + c.page->data[1];
 	m = d->mdata;
@@ -211,6 +244,18 @@ void spc_sense_caps(struct burn_drive *d)
 
 	num_write_speeds = page[30] * 256 + page[31];
 	m->max_write_speed = m->min_write_speed = m->cur_write_speed;
+
+        if (32 + 4 * num_write_speeds > page_length + 2) {
+		char msg[161];
+
+		sprintf(msg, "Malformed capabilities page 2Ah received (len=%d, #speeds=%d)", page_length, num_write_speeds);
+		libdax_msgs_submit(libdax_messenger, d->global_index,
+				0x0002013c,
+				LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
+				msg, 0, 0);
+		return;
+	}
+
 	for (i = 0; i < num_write_speeds; i++) {
 		speed = page[32 + 4*i + 2] * 256 + page[32 + 4*i + 3];
 

libburn/spc.h

@@ -20,8 +20,16 @@ void spc_probe_write_modes(struct burn_drive *);
 void spc_request_sense(struct burn_drive *d, struct buffer *buf);
 int spc_block_type(enum burn_block_types b);
 int spc_get_erase_progress(struct burn_drive *d);
+
+/* ts A70315 : test_unit_ready with result parameters */
+int spc_test_unit_ready_r(struct burn_drive *d, int *key, int *asc, int *ascq);
+
 int spc_test_unit_ready(struct burn_drive *d);
 
+/* ts A70315 */
+/** Wait until the drive state becomes clear in or until max_sec elapsed */
+int spc_wait_unit_attention(struct burn_drive *d, int max_sec);
+
 /* ts A61021 : the spc specific part of sg.c:enumerate_common()
 */
 int spc_setup_drive(struct burn_drive *d);

libburn/structure.c

@@ -353,9 +353,13 @@ int burn_track_set_sectors(struct burn_track *t, int sectors)
 }
 
 
-/* ts A70218 */
+/* ts A70218 , API since A70328 */
 int burn_track_set_size(struct burn_track *t, off_t size)
 {
+	if (t->source == NULL)
+		return 0;
+	if (t->source->set_size == NULL)
+		return 0;
 	t->open_ended = (size <= 0);
 	return t->source->set_size(t->source, size);
 }

libburn/transport.h

@@ -117,8 +117,6 @@ struct burn_format_descr {
 };
 
 
-#define LIBBURN_SG_MAX_SIBLINGS 16
-
 /** Gets initialized in enumerate_common() and burn_drive_register() */
 struct burn_drive
 {

libburn/write.c

@@ -1075,9 +1075,31 @@ int burn_disc_close_track_dvd_minus_r(struct burn_write_opts *o,
 }
 
 
+/* ts A70229 */
+int burn_disc_finalize_dvd_plus_r(struct burn_write_opts *o)
+{
+	struct burn_drive *d = o->drive;
+
+	libdax_msgs_submit(libdax_messenger, d->global_index,
+			0x00000002,
+			LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_ZERO,
+			"Finalizing DVD+R ...", 0, 0);
+
+	/* CLOSE SESSION, 101b, Finalize with minimal radius */
+	d->close_track_session(d, 2, 1);  /* (2<<1)|1 = 5 */
+
+	libdax_msgs_submit(libdax_messenger, d->global_index,
+			0x00000002,
+			LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_ZERO,
+			"... finalizing DVD+R done               ", 0, 0);
+
+	return 1;
+}
+
+
 /* ts A70226 */
 int burn_disc_close_track_dvd_plus_r(struct burn_write_opts *o,
-					struct burn_session *s, int tnum)
+			struct burn_session *s, int tnum, int is_last_track)
 {
 	struct burn_drive *d = o->drive;
 	char msg[80];
@@ -1093,8 +1115,11 @@ int burn_disc_close_track_dvd_plus_r(struct burn_write_opts *o,
 
 	/* Each session becomes a single logical track. So to distinguish them,
 	   it is mandatory to close the session together with each track. */
-	d->close_track_session(d, 1, 0); /* CLOSE SESSION, 010b */
 
+	if (is_last_track && !o->multi) 
+		burn_disc_finalize_dvd_plus_r(o);
+	else
+ 		d->close_track_session(d, 1, 0); /* CLOSE SESSION, 010b */
 	d->busy = BURN_DRIVE_WRITING;
 	d->last_track_no++;
 	return 1;
@@ -1103,7 +1128,7 @@ int burn_disc_close_track_dvd_plus_r(struct burn_write_opts *o,
 
 /* ts A61218 - A70129 */
 int burn_dvd_write_track(struct burn_write_opts *o,
-				struct burn_session *s, int tnum)
+			struct burn_session *s, int tnum, int is_last_track)
 {
 	struct burn_track *t = s->track[tnum];
 	struct burn_drive *d = o->drive;
@@ -1189,7 +1214,8 @@ int burn_dvd_write_track(struct burn_write_opts *o,
 			goto ex;
 	} else if (d->current_profile == 0x1b || d->current_profile == 0x2b) {
 		/* DVD+R , DVD+R/DL */
-		ret = burn_disc_close_track_dvd_plus_r(o, s, tnum);
+		ret = burn_disc_close_track_dvd_plus_r(o, s, tnum,
+							 is_last_track);
 		if (ret <= 0)
 			goto ex;
 	}
@@ -1268,7 +1294,7 @@ int burn_disc_close_session_dvd_minus_r(struct burn_write_opts *o,
 
 /* ts A61218 */
 int burn_dvd_write_session(struct burn_write_opts *o,
-				struct burn_session *s)
+				struct burn_session *s, int is_last_session)
 {
 	int i,ret;
         struct burn_drive *d = o->drive;
@@ -1276,7 +1302,8 @@ int burn_dvd_write_session(struct burn_write_opts *o,
 	/* >>> open_session ? */
 
 	for (i = 0; i < s->tracks; i++) {
-		ret = burn_dvd_write_track(o, s, i);
+		ret = burn_dvd_write_track(o, s, i,
+			is_last_session && i == (s->tracks - 1));
 		if (ret <= 0)
 	break;
 	}
@@ -1428,24 +1455,6 @@ int burn_disc_setup_dvd_plus_r(struct burn_write_opts *o,
 }
 
 
-/* ts A70229 */
-int burn_disc_finalize_dvd_plus_r(struct burn_write_opts *o)
-{
-	struct burn_drive *d = o->drive;
-
-	/* <<< FOR NOW: avoid finalizing media */
-	return 3;
-
-	if (o->multi)
-		return 2;
-	d->busy = BURN_DRIVE_CLOSING_SESSION;
-	/* CLOSE SESSION, 101b, Finalize with minimal radius */
-	d->close_track_session(d, 2, 1);  /* (2<<1)|1 = 5 */
-	d->busy = BURN_DRIVE_WRITING;
-	return 1;
-}
-
-
 /* ts A61218 - A70129 */
 int burn_dvd_write_sync(struct burn_write_opts *o,
 				 struct burn_disc *disc)
@@ -1700,7 +1709,8 @@ int burn_dvd_write_sync(struct burn_write_opts *o,
 		d->progress.session = i;
 		d->progress.tracks = disc->session[i]->tracks;
 
-		ret = burn_dvd_write_session(o, disc->session[i]);
+		ret = burn_dvd_write_session(o, disc->session[i],
+					i == (disc->sessions - 1));
 		if (ret <= 0)
 			goto ex;
 
@@ -1709,12 +1719,6 @@ int burn_dvd_write_sync(struct burn_write_opts *o,
 		d->progress.start_sector = 0;
 		d->progress.sectors = 0;
 	}
-
-	if (d->current_profile == 0x1b || d->current_profile == 0x2b) {
-		ret = burn_disc_finalize_dvd_plus_r(o);
-		if (ret <= 0)
-			goto ex;
-	}
 	ret = 1;
 ex:;
 

test/libburner.c

@@ -8,8 +8,8 @@
   
   libburner is a minimal demo application for the library libburn as provided
   on  http://libburnia.pykix.org . It can list the available devices, can
-  blank a CD-RW or DVD-RW, can format a DVD-RW, and can burn to CD-R, CD-RW,
+  blank a CD-RW or DVD-RW, can format a DVD-RW, can burn to CD-R, CD-RW, DVD-R,
-  DVD+RW, DVD-RAM or DVD-RW. Not supported yet: DVD+R [DL].
+  DVD+R, DVD+RW, DVD-RAM or DVD-RW. Not supported yet: double layer media.
 
   It's main purpose, nevertheless, is to show you how to use libburn and also
   to serve the libburnia team as reference application. libburner.c does indeed

test/open-cd-excl.c

@@ -0,0 +1,133 @@
+/*
+ * open-cd-excl.c --- This program tries to open a block device
+ * by various exclusive and non-exclusive gestures in order to explore
+ * their impact on running CD/DVD recordings.
+ *
+ * Copyright 2007, by Theodore Ts'o.
+ *
+ * Detail modifications 2007, by Thomas Schmitt.
+ * 
+ * %Begin-Header%
+ * This file may be redistributed under the terms of the GNU Public
+ * License.
+ * %End-Header%
+ */
+
+#define _GNU_SOURCE /* for O_LARGEFILE *//*ts A70417: or _LARGEFILE64_SOURCE */
+
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <getopt.h>
+
+const char *progname;
+
+static void usage(void)
+{
+	fprintf(stderr, "Usage: %s [-feirw] device\n", progname);
+	exit(1);
+}
+
+/* ts A70417: added parameter do_rdwr */
+static void init_flock(struct flock *fl, int do_rdwr)
+{
+	memset(fl, 0, sizeof(struct flock));
+	if (do_rdwr)
+		fl->l_type = F_WRLCK;
+	else
+		fl->l_type = F_RDLCK;
+	fl->l_whence = SEEK_SET;
+	fl->l_start = 0;
+	fl->l_len = 0;
+}
+
+int main(int argc, char **argv)
+{
+	struct flock	fl;
+	char	*device_name;
+	int	fd, c, f_opt = 0, do_rdwr = 0, end_immediately = 0;
+	int	flags = O_NONBLOCK|O_LARGEFILE;
+	
+	progname = argv[0];
+
+	/* ts A70417: added -w , -r , -i */
+	while ((c = getopt (argc, argv, "feirw")) != EOF) {
+		switch (c) {
+		case 'e':
+			flags |= O_EXCL;
+			break;
+		case 'f':
+			f_opt++;
+			break;
+		case 'i':
+			end_immediately = 1;
+			break;
+		case 'r':
+			do_rdwr = 0;
+			break;
+		case 'w':
+			do_rdwr = 1;
+			break;
+		case '?':
+			usage();
+			exit(1);
+		}
+	}
+
+	if (optind == argc)
+		usage();
+	device_name = argv[optind++];
+
+	/* ts A70417 : made read-write adjustable independently of f_opt */
+	if (do_rdwr) {
+		flags |= O_RDWR;
+		printf("Using O_RDWR\n");
+	} else {
+		flags |= O_RDONLY;
+		printf("Using O_RDONLY\n");
+	}
+
+	if (flags & O_EXCL)
+		printf("Trying to open %s with O_EXCL ...\n", device_name);
+	fd = open(device_name, flags, 0);
+	if (fd < 0) {
+		perror("open");
+		printf("failed\n");
+		exit(1);
+	}
+	if (flags & O_EXCL)
+		printf("succeeded\n");
+		
+	if (f_opt) {
+		init_flock(&fl, do_rdwr);
+		if (fcntl(fd, F_GETLK, &fl) < 0) {
+			perror("fcntl: F_GETLK: ");
+			exit(1);
+		}
+		printf("fcntl lock apparently %sLOCKED\n", 
+		       (fl.l_type == F_UNLCK) ? "NOT " : "");
+
+		init_flock(&fl, do_rdwr);
+		printf("Trying to grab fcntl lock...\n");
+		if (fcntl(fd, F_SETLK, &fl) < 0) {
+			perror("fcntl: F_SETLK: ");
+			printf("failed\n");
+			exit(1);
+		}
+		printf("succeeded\n");
+	}
+
+	/* ts A70417: added end_immediately */
+	printf("Holding %s open.\n", device_name);
+	usleep(100000);
+	if (end_immediately)
+		exit(0);
+	printf("Press ^C to exit.\n");
+	while (1) {
+		sleep(300);
+	} 
+	/* NOTREACHED */
+	return 0;
+}