Documented changes and 0.3.2 release timestamp

Makefile.am

@@ -101,9 +101,9 @@ test_structest_CPPFLAGS = -Ilibburn
 test_structest_LDADD = $(libburn_libburn_la_OBJECTS) $(THREAD_LIBS)
 test_structest_SOURCES = test/structest.c
 
-##  cdrskin construction site - ts A60816 - A70720
+##  cdrskin construction site - ts A60816 - A70210
 cdrskin_cdrskin_CPPFLAGS = -Ilibburn
-cdrskin_cdrskin_CFLAGS = -DCdrskin_libburn_0_3_8
+cdrskin_cdrskin_CFLAGS = -DCdrskin_libburn_0_3_2
 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

@@ -127,7 +127,7 @@ Project history as far as known to me:
   It has meanwhile moved to use vanilla libburn.pykix.org , though.
   Version 0.1.4 constitutes the first release of this kind.
 
-- In July 2006 our team mate Mario Danic announced a revival of libburn
+- In Juli 2006 our team mate Mario Danic announced a revival of libburn
   which by about nearly everybody else was perceived as unfriendly fork.
   Derek Foreman four days later posted a message which expressed his
   discontent.
@@ -192,24 +192,15 @@ Project history as far as known to me:
 
 - 11th February 2007 version 0.3.2 covers sequential DVD-RW and DVD-R with
   multi-session and with DAO.
-
-- 12th March 2007 version 0.3.4 supports DVD+R and thus covers all single layer
-  DVD media. Code for double layer DVD+/-R is implemented but awaits a tester
-  yet.
-
-- 23th April 2007 version 0.3.6 follows the unanimous opinion of Linux kernel
-  people that one should not use /dev/sg on kernel 2.6.
-
-- 31st July 2007 version 0.3.8 marks the first anniversary of libburn revival.
-  We look back on improved stability, a substantially extended list of media
-  and write modes, and better protection against typical user mishaps.
+  This means all single layer DVD media except DVD+R are supported now.
 
 
 ------------------------------------------------------------------------------
 
     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. To be exact: version 2 of that License.
+    the Free Software Foundation; either version 2 of the License, or
+    (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.8.tar.gz
+http://scdbackup.sourceforge.net/cdrskin-0.3.2.pl00.tar.gz
 Copyright (C) 2006-2007 Thomas Schmitt
 
 ------------------------------------------------------------------------------
 
-On top of libburn there is implemented cdrskin 0.3.8, a limited cdrecord
+On top of libburn there is implemented cdrskin 0.3.2, 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.8.tar.gz, take it to a directory of your choice and do:
+Obtain cdrskin-0.3.2.pl00.tar.gz, take it to a directory of your choice and do:
 
-    tar xzf cdrskin-0.3.8.tar.gz
-    cd cdrskin-0.3.8
+    tar xzf cdrskin-0.3.2.pl00.tar.gz
+    cd cdrskin-0.3.2
 
 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.8 or libburn then execute:
+Within that toplevel directory of either cdrskin-0.3.2 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/srM or /dev/hdX.
+On Linux 2.4 this would be some /dev/sgN and on 2.6. some /dev/hdX.
 
 The output of  cdrskin --devices  might look like
 
-    0  dev='/dev/sr0'  rwrwr- :  '_NEC'  'DVD_RW ND-4570A'
-    1  dev='/dev/sr1'  rwrw-- :  'HL-DT-ST'  'DVDRAM GSA-4082B'
+    0  dev='/dev/sg0'  rwrwr- :  '_NEC'  'DVD_RW ND-4570A'
+    1  dev='/dev/sg1'  rwrw-- :  'HL-DT-ST'  'DVDRAM GSA-4082B'
 
 So full and insecure enabling of both for everybody would look like
 
-    chmod a+rw /dev/sr0 /dev/sr1
+    chmod a+rw /dev/sg0 /dev/sg1
 
 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=/dev/sr0
+    dev=0,1,0  dev=ATA:1,0,0  dev=/dev/sg1  dev=/dev/hdc
 See also "Drive Addressing" below.
 
 Obtain some info about the drive
@@ -174,13 +174,13 @@ Burn image file  my_image.iso  to media
     cdrskin -v dev=0,1,0 speed=12 fs=8m driveropts=burnfree padsize=300k \
             -eject  my_image.iso 
 
-Write multi-session to the same CD , DVD-R[W] or DVD+R
+Write several sessions to the same CD or DVD-R[W]
     cdrskin dev=/dev/hdc padsize=300k -multi 1.iso
     cdrskin dev=/dev/hdc padsize=300k -multi -tao 2.iso
     cdrskin dev=/dev/hdc padsize=300k -multi -tao 3.iso
     cdrskin dev=/dev/hdc padsize=300k -tao 4.iso
 
-Get multi-session info for option -C of program mkisofs:
+Get CD or DVD-R[W] multi-session info for option -C of program mkisofs:
     c_values=$(cdrskin dev=/dev/hdc -msinfo 2>/dev/null)
     mkisofs ... -C "$c_values" ...
 
@@ -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/sr1"
+    export SCDBACKUP_SCSI_ADR="/dev/sg1"
 
 Set usage of cdrskin with appropriate options rather than cdrecord :
 
@@ -223,11 +223,13 @@ Run a backup :
 
                                 Restrictions
 
-Many cdrecord options are still unsupported.
+The major restrictions are lifted now: audio, TAO, multi-session do work.
+
+Many cdrecord options are still unsupported, though.
 If you have use cases for them, please report your wishes and expectations.
 
-DVD support is restricted to single layer DVD for now. Double layer media
-are implemented but untested.
+DVD support is restricted to single layer overwriteable DVD (-RAM, +RW, -RW)
+for now.
 
 
 
@@ -242,6 +244,9 @@ Do not bother Joerg Schilling with any cdrskin problems.
 cdrskin does not contain any bytes copied from cdrecord's sources. Many bytes
 have been copied from the message output of cdrecord runs, though. I am
 thankful to Joerg Schilling for every single one of them.
+
+Actually i, Thomas Schmitt, am a devoted user of cdrecord via my project
+scdbackup which still runs a bit better with cdrecord than with cdrskin. TAO.
 I have the hope that Joerg feels more flattered than annoyed by cdrskin.
 
 Many thanks to Andy Polyakov for his dvd+rw-tools
@@ -272,8 +277,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 device file /dev/s[rg]N with is looked up with
-matching scsibus,target,lun as given by the operating system.
+with (emulated) SCSI where the /dev/sgN with is looked up with 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 +298,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 (resp. its /dev/sr*), "2,3,0" is /dev/hdd,
-"0,2,0" is libburn drive #2 at some unspecified device file. 
+So "1,1,0" is /dev/sg1, "2,3,0" is /dev/hdd, "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 +319,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/sr1 \
-          dev_translation=+ATA:1,0,0+/dev/sr1 \
+  cdrskin dev_translation=+1,0,0+/dev/sg1 \
+          dev_translation=+ATA:1,0,0+/dev/sg1 \
           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/sr1 resp. to 0,1,0.
+/dev/sg1 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 +336,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/sr1
+  -v dev_translation=+1,0,0+/dev/sg1
 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.
@@ -402,7 +407,7 @@ most recent session. For example put an ISO filesystem at address 1 GB:
   cdrskin dev=/dev/sr0 -v fs=32m -eject speed=4 write_start_address=524288s -
 The superuser may then do:
   mount -t iso9660 -o ro,sbsector=524288 /dev/sr0 /mnt
-Note: On my linux-2.4.21-215 mount works only with sbsector <= 337920 (660 MiB)
+Note: On my linux-2.4.21-215 mount works only with sbsector <= 337920 (660 MB).
 To extend a filesystem already existing at address 0
   mkisofs -C 0,524288 -M /dev/sr0 ... | cdrskin dev=/dev/sr0 ...
 Record the number 524288 for usage as first number with -C at the next
@@ -447,7 +452,7 @@ too on blanking by cdrecord, dvd+rw-format or cdrskin. Perils of DVD-RW.
 There are three DVD-RW formatting variants with cdrskin currently:
 
 blank=format_overwrite  uses "DVD-RW Quick" formatting (MMC-type 15h)
-and writes a first session of 128 MiB. This leads to media which are expandable
+and writes a first session of 128 MB. This leads to media which are expandable
 and random addressable by cdrskin.
 
 blank=format_overwrite_quickest  uses "DVD-RW Quick" formatting (type 15h) too,
@@ -470,13 +475,6 @@ Incremental Streaming afterwards. So blank=fast will do full blanking.
 blank=deformat_sequential_quickest   is faster but might yield DAO-only media.
 
 
-                                  DVD+R 
-
-From the view of cdrskin they behave much like DVD-R. Each track gets wrapped
-into an own session, though.
-
-------------------------------------------------------------------------------
-
                         Special compilation variations
 
 You may get a (super fat) statically linked binary by :

cdrskin/add_ts_changes_to_libburn_0_3_2

@@ -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.8"
+skin_release="0.3.2"
 patch_level=".pl00"
 skin_rev="$skin_release""$patch_level"
 
@@ -114,8 +114,7 @@ then
 fi
 cp -a "$cdrskin_dir" "$cdrskin_target"
 
-# Remove copied vim.swp and binaries
-rm "$cdrskin_target"/.*.swp
+# Remove copied binaries
 rm "$cdrskin_target"/*.o
 rm "$cdrskin_target"/cdrfifo
 rm "$cdrskin_target"/cdrskin
@@ -138,7 +137,7 @@ do
 done
 
 # Remove GIFs of cdrskin_eng.html
-rm "$cdrskin_target"/doener_*.gif "$cdrskin_target"/doener_*.png
+rm "$cdrskin_target"/doener_*.gif
 
 # Remove automatically generated HTML man page
 rm "$cdrskin_target"/man_1_cdrskin.html
@@ -193,18 +192,6 @@ 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"
@@ -214,11 +201,11 @@ tar czf "$cdrskin_tarball" "$target"
  cd "$compile_dir" || exit 1
  ./configure
  make
- "$compile_cmd" -O2 -do_strip
+ "$compile_cmd" -do_strip
  cp "$compile_result" "../$bintarget_dynamic"
  if test -n "$compile_static_opts"
  then
-   "$compile_cmd" $compile_static_opts -O2 -do_strip
+   "$compile_cmd" $compile_static_opts -do_strip
    cp "$compile_result" "../$bintarget_static"
  fi
  "$man_to_html_cmd"

cdrskin/add_ts_changes_to_libburn_0_3_3

@@ -38,7 +38,7 @@ original="./libburn_svn.tgz"
 # My changes are in $changes , mainly in $changes/cdrskin
 changes="./libburn-develop"
 
-skin_release="0.3.9"
+skin_release="0.3.3"
 patch_level=""
 skin_rev="$skin_release""$patch_level"
 
@@ -114,8 +114,7 @@ then
 fi
 cp -a "$cdrskin_dir" "$cdrskin_target"
 
-# Remove copied vim.swp and binaries
-rm "$cdrskin_target"/.*.swp
+# Remove copied binaries
 rm "$cdrskin_target"/*.o
 rm "$cdrskin_target"/cdrfifo
 rm "$cdrskin_target"/cdrskin
@@ -138,7 +137,7 @@ do
 done
 
 # Remove GIFs of cdrskin_eng.html
-rm "$cdrskin_target"/doener_*.gif "$cdrskin_target"/doener_*.png
+rm "$cdrskin_target"/doener_*.gif
 
 # Remove automatically generated HTML man page
 rm "$cdrskin_target"/man_1_cdrskin.html
@@ -193,19 +192,6 @@ 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"
@@ -215,11 +201,11 @@ tar czf "$cdrskin_tarball" "$target"
  cd "$compile_dir" || exit 1
  ./configure
  make
- "$compile_cmd" -libburn_svn -O2 -do_strip
+ "$compile_cmd" -do_strip
  cp "$compile_result" "../$bintarget_dynamic"
  if test -n "$compile_static_opts"
  then
-   "$compile_cmd" $compile_static_opts -libburn_svn -O2 -do_strip
+   "$compile_cmd" $compile_static_opts -do_strip
    cp "$compile_result" "../$bintarget_static"
  fi
  "$man_to_html_cmd"

cdrskin/cdrfifo.c

@@ -38,9 +38,7 @@
 #define Cdrfifo_ffd_maX 100
 
 
-/* 1= enable , 0= disable status messages to stderr
-   2= report each 
-*/
+/* 1= enable , 0= disable status messages to stderr */
 static int Cdrfifo_debuG= 0;
 
 
@@ -77,8 +75,6 @@ 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  */
@@ -86,8 +82,6 @@ struct CdrfifO {
 
  /* index of first byte in buffer which does not belong to predecessor fd */
  int follow_up_eop[Cdrfifo_ffd_maX];
- /* if follow_up_eop[i]==buffer_size : read_idx was 0 when this was set */
- int follow_up_was_full_buffer[Cdrfifo_ffd_maX];
 
  /* index of first byte in buffer which belongs to [this] fd pair */
  int follow_up_sod[Cdrfifo_ffd_maX];
@@ -105,9 +99,6 @@ struct CdrfifO {
  /* (simultaneous) peer chaining */
  struct CdrfifO *next;
  struct CdrfifO *prev;
-
- /* rank in peer chain */
- int chain_idx;
 };
 
 
@@ -161,17 +152,14 @@ 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;
-   o->follow_up_was_full_buffer[i]= 0;
    o->follow_up_in_limits[i]= -1.0;
  }
  o->follow_up_fd_counter= 0;
  o->follow_up_fd_idx= -1;
  o->next= o->prev= NULL;
- o->chain_idx= 0;
  o->buffer= TSOB_FELD(char,buffer_size);
  if(o->buffer==NULL)
    goto failed;
@@ -311,16 +299,10 @@ int Cdrfifo_attach_follow_up_fds(struct CdrfifO *o, int source_fd, int dest_fd,
 */
 int Cdrfifo_attach_peer(struct CdrfifO *o, struct CdrfifO *next, int flag)
 {
- int idx;
- struct CdrfifO *s;
-
- for(s= o;s->prev!=NULL;s= s->prev); /* determine start of o-chain */
  for(;o->next!=NULL;o= o->next);          /* determine end of o-chain */
  for(;next->prev!=NULL;next= next->prev); /* determine start of next-chain */
  next->prev= o;
  o->next= next;
- for(idx= 0;s!=NULL;s= s->next)
-   s->chain_idx= idx++;
  return(1);
 }
 
@@ -393,13 +375,6 @@ 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.
 */
@@ -408,7 +383,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;
@@ -433,26 +408,10 @@ int Cdrfifo_eop_adjust(struct CdrfifO *o,int *buffer_fill, int *eop_idx,
  for(i=0; i<=o->follow_up_fd_idx; i++) {
    if(o->follow_up_eop[i]>=0 && o->follow_up_eop[i]>=o->read_idx) {
      eop_is_near= 1;
-     if(o->follow_up_eop[i]<o->buffer_size || o->read_idx>0) {
-       valid_fill= o->follow_up_eop[i]-o->read_idx;
-       o->follow_up_was_full_buffer[i]= 0;
-     } else {
-       /*
-        If an input fd change hit exactly the buffer end then follow_up_eop
-        points to buffer_size and not to 0. So it is time to switch output
-        pipes unless this is immediately after follow_up_eop was set and
-        read_idx was 0 (... if this is possible at all while write_idx is 0).
-        follow_up_was_full_buffer was set in this case and gets invalid as
-        soon as a non-0 read_idx is detected (see above).
-       */
-       if(o->follow_up_was_full_buffer[i])
-         valid_fill= o->buffer_size;
-       else
-         valid_fill= 0; /* the current pipe is completely served */
-     }
+     valid_fill= o->follow_up_eop[i]-o->read_idx;
      if(valid_fill==0)
        *eop_idx= i;
-     else if(valid_fill<o->chunk_size)
+     else if(valid_fill<=o->chunk_size)
        eop_is_near= 2; /* for debugging. to carry a break point */
  break;
    }
@@ -477,7 +436,7 @@ static int Cdrfifo_setup_try(struct CdrfifO *o, struct timeval start_tv,
 */
 {
  int buffer_space,buffer_fill,eop_reached= -1,eop_is_near= 0,was_closed;
- int fd_buffer_fill, eop_reached_counter= 0;
+ int fd_buffer_fill;
  struct timeval current_tv;
  struct timezone tz;
  double diff_time,diff_counter,limit,min_wait_time;
@@ -506,26 +465,21 @@ setup_try:;
 
    if(eop_reached>=0) { /* switch to next output fd */
       o->dest_fd= o->follow_up_fds[eop_reached][1];
-       if(Cdrfifo_debuG)
-         fprintf(stderr,"\ncdrfifo %d: new fifo destination fd : %d\n",
-                        o->chain_idx,o->dest_fd);
       o->read_idx= o->follow_up_sod[eop_reached];
       o->follow_up_eop[eop_reached]= -1;
       eop_is_near= 0;
       eop_reached= -1;
-      eop_reached_counter= 0;
       goto setup_try;
    } else {
      /* work is really done */
      if((!was_closed) && ((flag&1)||Cdrfifo_debuG))
        fprintf(stderr,
-            "\ncdrfifo %d:  w=%d r=%d | b=%d s=%d | i=%.f o=%.f (done)\n",
-            o->chain_idx,o->write_idx,o->read_idx,buffer_fill,buffer_space,
+            "\ncdrfifo_debug:  w=%d r=%d | b=%d s=%d | i=%.f o=%.f (done)\n",
+            o->write_idx,o->read_idx,buffer_fill,buffer_space,
             o->in_counter,o->out_counter);
      return(2);
    }
- } else if(eop_reached>=0)
-   eop_reached_counter++;
+ }
  if(o->interval_counter>0) {
    if(o->total_min_fill>buffer_fill && o->source_fd>=0)
      o->total_min_fill= buffer_fill;
@@ -627,8 +581,7 @@ return: <0 = error , 0 = idle , 1 = did some work
    if(ret==-1) {
 
      /* >>> handle broken pipe */;
-     fprintf(stderr,"\ncdrfifo %d: on write: errno=%d , \"%s\"\n",
-                    o->chain_idx,errno,
+     fprintf(stderr,"\ncdrfifo: on write: errno=%d , \"%s\"\n",errno,
                     errno==0?"-no error code available-":strerror(errno));
 
      if(!(flag&4))
@@ -660,31 +613,22 @@ after_write:;
    if(ret==-1) {
 
      /* >>> handle input error */;
-     fprintf(stderr,"\ncdrfifo %d: on read: errno=%d , \"%s\"\n",
-                    o->chain_idx,errno,
+     fprintf(stderr,"\ncdrfifo: on read: errno=%d , \"%s\"\n",errno,
                     errno==0?"-no error code available-":strerror(errno));
 
      o->source_fd= -1;
    } else if(ret==0) { /* eof */
      /* activate eventual follow-up source fd */
      if(Cdrfifo_debuG || (flag&1))
-       fprintf(stderr,"\ncdrfifo %d: on read(%d,buffer,%d): eof\n",
-               o->chain_idx,o->source_fd,can_read);
+       fprintf(stderr,"\ncdrfifo: on read(%d,buffer,%d): eof\n",
+               o->source_fd,can_read);
      if(o->follow_up_fd_idx+1 < o->follow_up_fd_counter) {
        idx= ++(o->follow_up_fd_idx);
        o->source_fd= o->follow_up_fds[idx][0];
        /* End-Of-Previous */
-       if(o->write_idx==0) {
+       if(o->write_idx==0)
          o->follow_up_eop[idx]= o->buffer_size;
-
-         /* A70304 : can this happen ? */
-         o->follow_up_was_full_buffer[idx]= (o->read_idx==0);
-
-         if(Cdrfifo_debuG || (flag&1))
-           fprintf(stderr,"\ncdrfifo %d: write_idx 0 on eop: read_idx= %d\n",
-                          o->chain_idx,o->read_idx);
-
-       } else
+       else
          o->follow_up_eop[idx]= o->write_idx;
        /* Start-Of-Data . Try to start at next full chunk */
        sod= o->write_idx;
@@ -700,8 +644,7 @@ after_write:;
        o->fd_in_counter= 0;
        o->fd_in_limit= o->follow_up_in_limits[idx];
        if(Cdrfifo_debuG || (flag&1))
-         fprintf(stderr,"\ncdrfifo %d: new fifo source fd : %d\n",
-                        o->chain_idx,o->source_fd);
+         fprintf(stderr,"\ncdrfio: new fifo source fd : %d\n",o->source_fd);
      } else {
        o->source_fd= -1;
      }
@@ -834,13 +777,13 @@ ex:;
  } else
    elapsed= wait_usec;
  if(elapsed>=wait_usec) {
-   if((flag&1)||Cdrfifo_debuG>=2) {
+   if((flag&1)||Cdrfifo_debuG) {
      fprintf(stderr,"\n");
      for(ff= o; ff!=NULL; ff= ff->next) {
        buffer_space= Cdrfifo_tell_buffer_space(ff,0);
        fprintf(stderr,
-               "cdrfifo %d:  w=%d r=%d | b=%d s=%d | i=%.f o=%.f\n",
-               ff->chain_idx,ff->write_idx,ff->read_idx,
+               "cdrfifo_debug:  w=%d r=%d | b=%d s=%d | i=%.f o=%.f\n",
+               ff->write_idx,ff->read_idx,
                ff->buffer_size-buffer_space,buffer_space,
                ff->in_counter,ff->out_counter);
      }
@@ -880,24 +823,6 @@ 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);
@@ -950,76 +875,6 @@ double Scanf_io_size(char *text, int flag)
 }
 
 
-/* This is a hardcoded test mock-up for two simultaneous fifos of which the
-   one runs with block size 2048 and feeds the other which runs with 2352.
-   Both fifos have the same number of follow_up pipes (tracks) which shall
-   be connected 1-to-1.
-*/
-int Test_mixed_bs(char **paths, int path_count,
-                  int fs_size, double speed_limit, double interval, int flag)
-/*
- bit0= debugging verbousity
-*/
-{
- int fd_in[100],fd_out[100],ret,pipe_fds[100][2],real_out[100];
- int i,iv,stall_counter= 0,cycle_counter= 0.0;
- char buf[10240], target_path[80];
- double in_counter, out_counter, prev_in= -1.0, prev_out= -1.0;
- struct CdrfifO *ff_in= NULL, *ff_out= NULL;
-
- if(path_count<1)
-   return(2);
- Cdrfifo_new(&ff_in,fd_in[0],fd_out[0],2048,fs_size,0);
- for(i= 0; i<path_count; i++) {
-   fd_in[2*i]= open(paths[i],O_RDONLY);
-   if(fd_in[2*i]==-1)
-     return(0);
-   if(pipe(pipe_fds[2*i])==-1)
-     return(-1);
-   fd_out[2*i]= pipe_fds[2*i][1];
-   if(i==0)
-     ret= Cdrfifo_new(&ff_in,fd_in[2*i],fd_out[2*i],2048,fs_size,0);
-   else
-     ret= Cdrfifo_attach_follow_up_fds(ff_in,fd_in[2*i],fd_out[2*i],0);
-   if(ret<=0)
-     return(ret);
-   fd_in[2*i+1]= pipe_fds[2*i][0];
-   sprintf(target_path,"/dvdbuffer/fifo_mixed_bs_test_%d",i);
-   fd_out[2*i+1]= open(target_path,O_WRONLY|O_CREAT|O_TRUNC, S_IRUSR|S_IWUSR);
-   if(i==0)
-     ret= Cdrfifo_new(&ff_out,fd_in[2*i+1],fd_out[2*i+1],2352,fs_size,0);
-   else
-     ret= Cdrfifo_attach_follow_up_fds(ff_out,fd_in[2*i+1],fd_out[2*i+1],0);
-   if(ret<=0)
-     return(ret);
-   fprintf(stderr,"test_mixed_bs: %d : %2d fifo %2d pipe %2d fifo %2d : %s\n",
-           i, fd_in[2*i],fd_out[2*i],fd_in[2*i+1],fd_out[2*i+1], target_path);
- }
- Cdrfifo_attach_peer(ff_in,ff_out,0);
- 
-
- /* Let the fifos work */
- iv= interval*1e6;
- while(1) {
-   ret= Cdrfifo_try_to_work(ff_in,iv,NULL,NULL,flag&1);
-   if(ret<0 || ret==2) { /* <0 = error , 2 = work is done */
-     fprintf(stderr,"\ncdrfifo %d: fifo ended work with ret=%d\n",
-                    ff_in->chain_idx,ret);
-     if(ret<0)
-       return(-7);
- break;
-   }
-   cycle_counter++;
-   Cdrfifo_get_counters(ff_in, &in_counter, &out_counter, 0);
-   if(prev_in == in_counter && prev_out == out_counter)
-     stall_counter++;
-   prev_in= in_counter;
-   prev_out= out_counter;
- }
- return(1);
-}
-
-
 /* This is a hardcoded test mock-up for two simultaneous fifos of which the
    first one simulates the cdrskin fifo feeding libburn and the second one 
    simulates libburn and the burner at given speed. Both have two fd pairs
@@ -1078,8 +933,7 @@ int Test_multi(int fs_size, double speed_limit, double interval, int flag)
  while(1) {
    ret= Cdrfifo_try_to_work(ff1,iv,NULL,NULL,flag&1);
    if(ret<0 || ret==2) { /* <0 = error , 2 = work is done */
-     fprintf(stderr,"\ncdrfifo %d: fifo ended work with ret=%d\n",
-                    ff1->chain_idx,ret);
+     fprintf(stderr,"\ncdrfifo: fifo ended work with ret=%d\n",ret);
      if(ret<0)
        return(-7);
  break;
@@ -1138,13 +992,6 @@ int main(int argc, char **argv)
    } else if(strncmp(argv[i],"vb=",3)==0) {
      sscanf(argv[i]+3,"%d",&verbous);
 
-   } else if(strcmp(argv[i],"-mixed_bs_test")==0) {
-
-     ret= Test_mixed_bs(argv+i+1,argc-i-1,
-                        (int) fs_value,speed_limit,interval,(verbous>=2));
-     fprintf(stderr,"Test_mixed_bs(): ret= %d\n",ret);
-     exit(ret<0);
-
    } else if(strcmp(argv[i],"-multi_test")==0) {
 
      if(speed_limit==0.0)
@@ -1188,7 +1035,7 @@ int main(int argc, char **argv)
  if(speed_limit!=0.0)
    Cdrfifo_set_speed_limit(ff,speed_limit,0);
  if(fill_buffer) {
-   ret= Cdrfifo_fill(ff,0,0);
+   ret= Cdrfifo_fill(ff,0);
    if(ret<=0) {
      fprintf(stderr,
              "cdrfifo: FATAL : initial filling of fifo buffer failed\n");

cdrskin/cdrfifo.h

@@ -117,11 +117,6 @@ 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 "July 19, 2007"
+.TH CDRSKIN 1 "February 8, 2007"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -16,8 +16,8 @@
 .\" .sp <n>    insert n+1 empty lines
 .\" for manpage-specific macros, see man(7)
 .SH NAME
-cdrskin \- burns preformatted data to CD-R[W], DVD-R[W], DVD+R[W], DVD-RAM
-via libburn.
+cdrskin \- burns preformatted data to CD-R, CD-RW, DVD-R, DVD-RW, DVD+RW,
+DVD-RAM via libburn.
 .SH SYNOPSIS
 .B cdrskin
 .RI [ options | track_source_addresses ]
@@ -44,7 +44,7 @@ or in Session at Once mode for seamless tracks.
 .br
 Multi session on CD (follow-up sessions in TAO only)
 .br
-or on DVD-R[W] (in Incremental mode) or on DVD+R.
+and on DVD-RW or DVD-R (in Incremental write mode only).
 .br
 Single session on DVD-RW or DVD-R (Disk-at-once)
 .br
@@ -54,20 +54,6 @@ Bus scan, burnfree, speed options, retrieving media info, padding, fifo.
 .br
 See section EXAMPLES at the end of this text.
 .PP
-.B General information paragraphs:
-.br
-Track recording model
-.br
-Write mode selection
-.br
-Recordable CD Media
-.br
-Sequentially Recordable DVD Media
-.br
-Overwriteable DVD Media
-.br
-Drive preparation and addressing
-.PP
 .B Track recording model:
 .br
 The input-output entities which get processed are called tracks.
@@ -110,16 +96,6 @@ have been developed for magnetic tapes. Only formats which mark a detectable
 end-of-archive in their data are suitable, though. Well tested are
 the archivers afio and star. Not suitable seems GNU tar.
 .PP
-.B Write mode selection:
-.br
-If none of the options -dao, -tao or -sao is given then the program will
-try to choose a write mode which matches the defined recording job,
-the capabilities of the drive and the state of the present media.
-.br
-So the mentioning of write modes in the following paragraphs and in the
-examples is not so much a demand that the user shall choose one explicitely,
-but rather an illustration of what to expect with particular media types.
-.PP
 .B Recordable CD Media:
 .br
 CD-R can be initially written only once and eventually extended until they
@@ -148,34 +124,15 @@ Multiple cycles of blanking and overwriting with random numbers might be.
 .PP
 .B Sequentially Recordable DVD Media:
 .br
-Currently DVD-RW, DVD-R and DVD+R can be used for the Sequential recording
-model.
-.br
+Currently only DVD-RW and DVD-R can be used for the Sequential recording model.
 DVD-RW must be in state "Sequential Recording".
 The media must be either blank or appendable.
 Newly purchased DVD-RW and DVD-R media are in this state.
 Used DVD-RW get into blank sequential state by option
 .B blank=deformat_sequential .
 .br
-With DVD-R[W] two write modes may be available:
-.br
-Mode DAO has many restrictions. It does not work with
-appendable media, allows no -multi and only a single track. The size of the
-track needs to be known in advance. So either its source has to be a disk file
-of recognizable size or the size has to be announced explicitely by options
-.B tsize= 
-or
-.B tao_to_sao_tsize= .
-.br
-DAO is the only mode for media which do not offer feature 21h Incremental
-Streaming. DAO may also be selected explicitely by option
-.B -sao .
-Program growisofs uses DAO on sequential DVD-R[W] media for maximum
-DVD-ROM/-Video compatibility.
-.br
-The other mode, Incremental Streaming, is the default write mode if
-it is available and if the restrictions of DAO would prevent the job.
-Incremental Streaming may be selected explicitely by option
+Incremental Streaming is the default write mode if it is offered by the media.
+It may be selected explicitely by option
 .B -tao
 as it resembles much CD TAO by allowing track sources of
 unpredicted length and to keep media appendable by option
@@ -183,17 +140,24 @@ unpredicted length and to keep media appendable by option
 The only restriction towards CD-R[W] is the lack of support for -audio tracks.
 Multiple tracks per session are permissible.
 .br
-The write modes for DVD+R resemble those with DVD-R except that with DVD+R
-each track gets wrapped in an own session. There is no -dummy writing with
-DVD+R.
+The other write mode, DAO, has many restrictions. It does not work with
+appendable media, allows no -multi and only a single track. The size of the
+track needs to be known in advance. So either its source has to be a disk file
+of recognizable size or the size has to be announced explicitely by options
+.B tsize= 
+or
+.B tao_to_sao_tsize= .
 .br
-Quite deliberately write mode -sao insists in the tradition of a predicted
-track size and blank media, whereas -tao writes the tracks open ended and
-allows appendable media.
+DAO is the default mode for media which do not offer feature 21h Incremental
+Streaming. It may also be selected explicitely by option
+.B -sao .
+.br
+Program growisofs uses DAO on sequential DVD-R[W] media for maximum
+DVD-ROM/-Video compatibility.
 .PP
 .B Overwriteable DVD Media:
 .br
-Currently types DVD+RW, DVD-RW and DVD-RAM can be overwritten via cdrskin.
+Currently only types DVD+RW, DVD-RW and DVD-RAM can be overwritten via cdrskin.
 .br
 DVD+RW and DVD-RAM media get treated as blank media regardless wether they
 hold data or not. They need no special initial formatting.
@@ -208,8 +172,8 @@ Overwriteable DVD recording model they need to get formatted to state
 can be done by option
 .B blank=format_overwrite .
 .br
-Several programs like dvd+rw-format, cdrecord, wodim, or cdrskin
-can bring a DVD-RW out of overwriteable state so
+Several programs like dvd+rw-format, cdrecord, wodim, or cdrskin option
+blank=deformat_sequential can bring a DVD-RW out of overwriteable state so
 that it has to be formatted again. If in doubt, just give it a try.
 .PP
 .B Drive preparation and addressing:
@@ -220,12 +184,10 @@ by a run of \fBcdrskin --devices\fP.
 .br
 On Linux, they are device files which traditionally do not offer
 w-permissions for normal users. Because libburn needs rw-permission,
-it might be only the
-.B superuser
-who is able to get this list without further
+it might be only the superuser who is able to get this list without further
 precautions.
 .br
-It is consensus that \fBchmod a+rw /dev/sr0\fP or \fBchmod a+rw /dev/hdc\fP
+It is consensus that \fBchmod a+rw /dev/sg0\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
@@ -243,7 +205,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/sg0).
+and device files which have the same SCSI address parameters (e.g. /dev/sr0).
 .br
 .SH OPTIONS
 .TP
@@ -269,9 +231,9 @@ Announces that the subsequent tracks are to be burned as audio.
 The source is supposed to be uncompressed headerless PCM, 44100 Hz, 16 bit,
 stereo. For little-endian byte order (which is usual on PCs) use option
 -swab. Unless marked explicitely by option -data, input files with suffix
-".wav" are examined wether they have a header in MS-WAVE format confirming
+.wav are examined wether they have a header in MS-WAVE format confirming
 those parameters and eventually raw audio data get extracted and burned as
-audio track. Same is done for suffix ".au" and SUN Audio.
+audio track. Same is done for suffix .au and SUN Audio.
 .br
 Option -audio may be used only with CD media and not with DVD.
 .TP 
@@ -298,14 +260,14 @@ Format a DVD-RW to "Restricted Overwrite". The user should bring some patience.
 (Note: blank=format_overwrite* are not original cdrecord options.)
 .TP
 format_overwrite_quickest
-Like format_overwrite without creating a 128 MiB trailblazer session.
+Like format_overwrite without creating a 128 MB trailblazer session.
 Leads to "intermediate" state which only allows sequential write
 beginning from address 0.
 The "intermediate" state ends after the first session of writing data.
 .TP
 format_overwrite_full
 For DVD-RW this is like format_overwrite but claims full media size
-rather than just 128 MiB.
+rather than just 128 MB.
 Most traditional formatting is attempted. No data get written. 
 Much patience is required.
 .br
@@ -317,9 +279,6 @@ complete "de-icing" so no reader slips on unwritten data areas.
 deformat_sequential
 Like blank=all but with the additional ability to blank overwriteable DVD-RW.
 This will destroy their formatting and make them sequentially recordable. 
-Another peculiarity is the ability to blank media which appear already blank.
-This is similar to option -force but does not try to blank media other than
-recognizable CD-RW and DVD-RW.
 .br
 (Note: blank=deformat_sequential* are not original cdrecord options.)
 .TP
@@ -365,10 +324,8 @@ even if attempted explicitely via "driveropts=burnfree".
 .TP
 .BI \-dummy
 Try to perform the drive operations without actually affecting the inserted
-media. There is no warranty that this will work with a particular combination
+media. There is no guarantee that this will work with a particular combination
 of drive, media, and write mode. Blanking is prevented reliably, though.
-To avoid inadverted real burning, -dummy refuses burn runs on anything but
-CD-R[W] and DVD-R[W].
 .TP
 .BI \-eject
 Eject the disc after work is done.
@@ -379,13 +336,9 @@ insecure about drive or media state. This includes the attempt to blank
 media which are classified as unknown or unsuitable, and the attempt to use
 write modes which libburn believes they are not supported by the drive.
 .br
-Another application is to enforce blanking or re-formatting of media
-which appear to be in the desired blank or format state already.
+Another application is with blank=format_* to enforce re-formatting of media
+which appear to be sufficiently formatted already.
 .br
-This option enables a burn run with option -dummy even if libburn believes
-that drive and media will not simulate the write mode but will write for real.
-.br
-.B Caution:
 Use this only when in urgent need.
 .TP
 .BI fs= size
@@ -407,29 +360,6 @@ 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 kiB. See option fs= .
-.TP
-.BI minbuf= percentage
-Equivalent to:
-.br
-modesty_on_drive=1:min_percent=<percentage>:max_percent=95
-.br
-Percentage is permissible between 25 and 95.
-.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
@@ -440,8 +370,8 @@ Note: msifile=path is actually an option of wodim and not of cdrecord.
 .BI \-msinfo
 Retrieve multi-session info for preparing a follow-up session by option -C
 of programs mkisofs or genisoimage. Print result to standard output.
-This option redirects to stderr all message output except the one of option
---tell_media_space and its own result string, which consists of two numbers.
+This option redirects to stderr all
+message output besides its own result string, which consists of two numbers.
 The result string shall be used as argument of option -C with said programs.
 It gives the start address of the most recent session and the predicted
 start address of the next session to be appended. The string is empty if
@@ -473,7 +403,7 @@ to be no use for audio tracks with incomplete last sector, this option applies
 only to data tracks. There it is default.
 .TP
 .BI \-pad
-Add 30 kiB of trailing zeros to each data track. (This is not sufficient to
+Add 30 kB of trailing zeros to each data track. (This is not sufficient to
 avoid problems with various CD-ROM read drivers.)
 .TP
 .BI padsize= size
@@ -489,8 +419,8 @@ then behave strange or even go bad for the next few attempts to burn a CD.
 One should use it only if inavoidable.
 .TP
 .BI \-sao
-Write CD in Session At Once mode, a sequential DVD-R[W] in Disc-at-once
-(DAO) mode, or a DVD+R.
+Write CD in Session At Once mode, resp. a sequential DVD-R[W] in Disc-at-once
+(DAO) mode.
 .br
 With CD this mode is able to put several audio tracks on media without
 producing audible gaps between them.
@@ -498,9 +428,6 @@ producing audible gaps between them.
 With DVD-R[W] this mode can only write a single track.
 No -multi is allowed with DVD-R[W] -sao.
 .br
--sao is permissible with overwriteable DVD and with DVD+R but actually only
-imposes restrictions without providing known advantages. 
-.br
 -sao can only be used for tracks of fixely predicted size. This implies that
 track arguments which depict stdin or named pipes need to be preceeded by
 option tsize= or by option tao_to_sao_tsize=.
@@ -525,9 +452,6 @@ Set speed of drive. With data CD, 1x speed corresponds to a throughput of
 150,000 bytes/second. With DVD, 1x = 1,385,000 bytes/second.
 It is not an error to set a speed higher than is suitable for drive
 and media. One should stay within a realistic speed range, though.
-Special speed settings are:
-.br
-0 = minimal speed , -1 = maximal speed (default).
 .TP
 .BI \-swab
 Announce that the raw audio data source of subsequent tracks is byte swapped
@@ -538,9 +462,8 @@ Less guesswork is needed if track sources are in format MS-WAVE in a file with
 suffix ".wav".
 .TP
 .BI \-tao
-Write CD in Track At Once (TAO) mode, sequential DVD-R[W] in Incremental
-Streaming mode, or DVD+R without traditional -sao restrictions.
-This mode also applies pro-forma to overwriteable DVD media.
+Write CD in Track At Once (TAO) mode, resp. sequential DVD-R[W] in Incremental
+Streaming mode. This mode also applies pro-forma to overwriteable DVD media.
 .br
 Mode -tao can be used with track sources of unpredictable size, like standard
 input or named pipes. It is also the only mode that can be used for writing
@@ -595,12 +518,6 @@ somebody who had a look into the program sourcecode.
 Alphabetical list of options which are genuine to cdrskin and intended for
 normal use:
 .TP
-.BI \--adjust_speed_to_drive
-Curb explicitely given speed= values to the maximum which is announced by the
-drive for the loaded media. By default, such an adjustment is only made with
-pseudo-speeds 0 and -1 whereas speed settings > 0 are sent unchanged to the
-drive which will then choose an appropriate speed on its own.
-.TP
 .BI \--allow_setuid
 Disable the loud warning about insecure discrepance between login user and
 effective user which indicates application of chmod u+s to the program binary.
@@ -612,20 +529,6 @@ contain a "=" character.
 By default such arguments are seen as misspelled options. It is nevertheless
 not possible to use one of the options listed with --list_ignored_options.
 .TP
-.BI assert_write_lba= block_number | byte_address
-Abort if the write address given with this option is not the same as predicted
-immediately before the write session starts. This option can ensure that a
-start address which was presumed by a formatter like mkisofs -C is really used
-by the drive for writing.
-assert_write_lba=0 effectively demands blank media and excludes appendables.
-.br
-Block numbering is peculiar: If the last character of the option string is
-a letter [a-zA-Z] then the usual unit scaling by "s", "k", "m", etc. applies
-and the result is divided by 2048. Else the number value of the string is
-taken as plain block number with block size 2048 byte.
-(E.g ...=1000 or ...=1000s means block 1000, ...=1m means block
-512, ...=4096b means block number 2)
-.TP
 .BI \--demand_a_drive
 Exit with a nonzero value if no drive can be found during a bus scan.
 .TP
@@ -688,29 +591,10 @@ for best DVD-ROM compatibility.
 If the track source delivers less bytes than announced then the missing ones
 will be filled with zeros.
 .TP 
-.BI --tell_media_space
-Prepare a recording session, do not perform it but rather inquire the
-maximum number of 2048 byte data blocks which may be written in
-the current state of media with the prepared setup. So this option disables
-recording of data. It does allow blanking, though, and will measure space
-afterwards.
-.br
-It is not mandatory to give track sources but their nature may influence
-the available capacity. So for most realistic results one may set up
-the full burn session and add --tell_media_space. But if one has to expect
-a cdrskin version prior to 0.3.3 no track source should be given in order
-not to start an involuntary burn session.
-In this case set at least -sao or -tao explicitely.
-.br
-The result gets printed to standard output. It is 0 or empty if no writing
-is possible with the given options.
-This option redirects to stderr all message output except its own result
-string and eventual output of -msinfo.
-.TP 
 .BI write_start_address= byte_offset
 Set the address on media where to start writing the track. With DVD+RW or
-DVD-RAM byte_offset must be aligned to 2 kiB blocks, but better is 32 kiB.
-With DVD-RW 32 kiB alignment is mandatory.
+DVD-RAM byte_offset must be aligned to 2 KB blocks, but better is 32 kB.
+With DVD-RW 32 kB alignment is mandatory.
 .br
 Other media are not suitable for this option yet.
 .PP
@@ -723,17 +607,6 @@ but rather to shut it down and to wait until it has ended the final operations.
 This option is only needed for revoking eventual --ignore_signals or
 --no_abort_handler.
 .TP
-.BI \--allow_untested_media
-Enable the use of media profiles which have been implemented but not yet
-tested. Currently this applies to :
-.br
-Profile 0015h , DVD-R/DL Sequential (will not allow -multi).
-.br
-Profile 002Bh , DVD+R/DL.
-.br
-If you really test such media, then please report the outcome on
-libburn-hackers@pykix.org 
-.TP
 .BI dev_translation= <sep><from><sep><to>
 Set drive address alias. This was necessary before cdrskin-0.2.4 to manually
 translate cdrecord addresses into cdrskin addresses.
@@ -743,7 +616,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/sr1 dev_translation=+ATA:1,1,0+/dev/sr2
+E.g.: dev_translation=+ATA:1,0,0+/dev/sg1 dev_translation=+ATA:1,1,0+/dev/sg2
 .TP
 .BI \--drive_abort_on_busy
 Linux specific: Abort process if a busy drive is encountered.
@@ -752,33 +625,14 @@ 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/sgK of drives.
-This would be helpful to protect against collisions with program growisofs.
+Try to exclusively reserve device files /dev/srN, /dev/scdM, /dev/stK of drive.
+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
@@ -788,18 +642,6 @@ Disable fifo despite any fs=.
 .BI \--fifo_per_track
 Use a separate fifo for each track.
 .TP
-.BI \--fill_up_media
-Expand the last track of the session to occupy all remaining free space on
-the media.
-.br
-This option overrides option -multi. It will not fill up media if option -sao
-is given with CD media.
-.br
-.B Caution:
-This option might increase read compatibility with DVD-ROM drives but
-with some DVD recorders and media types it might also fail to produce readable
-media at all. "Your mileage may vary".
-.TP
 .BI grab_drive_and_wait= seconds
 Open the addressed drive, wait the given number of seconds, release the drive,
 and do normal work as indicated by the other options used. This option helps
@@ -812,30 +654,6 @@ Try to ignore any signals rather than to abort the program. This is not a
 very good idea. You might end up waiting a very long time for cdrskin
 to finish.
 .TP
-.BI modesty_on_drive= <mode>[:min_percent=<num>][:max_percent=<num>]
-Mode 1 keeps the program from trying to write to the burner drive while its
-buffer is in danger to be filled by more than max_percent. If this filling is
-exceeded then the program will wait until the filling is at most min_percent.
-.br
-This can ease the load on operating system and drive controller and thus help
-with achieving better input bandwidth if disk and burner are not on independent
-controllers (like hda and hdb). Unsufficient input bandwidth is indicated by
-output "(fifo  xy%)" of option -v if xy is lower than 90 for some time.
-modesty_on_drive= might hamper output bandwidth and cause buffer underruns.
-.br
-To have max_percent larger than the burner's best actual
-buffer fill has the same effect as min_percent==max_percent. Some burners
-do not use their full buffer with all media types. Watch output "[buf xy%]"
-of option -v to get an impression of the actual buffer usage. Some burners
-are not suitable because they report buffer fill with granularity too large
-in size or time. 
-.br
-Mode 0 disables this feature. Mode -1 keeps it unchanged. Default is:
-.br
-modesty_on_drive=0:min_percent=65:max_percent=95
-.br
-Percentages are permissible in the range of 25 to 100.
-.TP
 .BI \--no_abort_handler
 On signals exit even if the drive is in busy state. This is not a very good
 idea. You might end up with a stuck drive that refuses to hand out the media.
@@ -852,7 +670,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/sg0 using the same SCSI address as /dev/sr0.)
+to a usable drive. (Like /dev/sr0 using the same SCSI address as /dev/sg0.)
 .TP
 .BI \--old_pseudo_scsi_adr
 Linux specific:
@@ -898,7 +716,7 @@ cdrskin -v dev=/dev/hdc speed=12 fs=8m \\
 .br
 -sao -eject padsize=300k my_image.iso
 .SS
-.B Write compressed afio archive on-the-fly (not possible with minimally blanked DVD-RW):
+.B Write compressed afio archive on-the-fly:
 .br
 find . | afio -oZ - | \\
 .br
@@ -906,7 +724,7 @@ cdrskin -v dev=0,1,0 fs=32m speed=8 \\
 .br
 -tao padsize=300k -
 .SS
-.B Write multi-session to the same CD, DVD-R[W] or DVD+R:
+.B Write several sessions to the same CD or DVD-R[W]:
 .br
 cdrskin dev=/dev/hdc -v padsize=300k -multi -tao 1.iso
 .br
@@ -916,20 +734,12 @@ cdrskin dev=/dev/hdc -v padsize=300k -multi -tao 3.iso
 .br
 cdrskin dev=/dev/hdc -v padsize=300k -tao 4.iso
 .SS
-.B Get multi-session info for option -C of program mkisofs:
+.B Get CD or DVD-R[W] multi-session info for option -C of program mkisofs:
 .br
-c_values=$(cdrskin dev=/dev/hdc -msinfo 2>/dev/null)
+c_values=$(cdrskin dev=/dev/sr0 -msinfo 2>/dev/null)
 .br
 mkisofs ... -C "$c_values" ...
 .SS
-.B Inquire free space on media for a -tao -multi run:
-.br
-x=$(cdrskin dev=/dev/sr0 -tao -multi \\
-.br
---tell_media_space 2>/dev/null)
-.br
-echo "Available: $x blocks of 2048 data bytes"
-.SS
 .B Write audio tracks to CD:
 .br
 cdrskin -v dev=ATA:1,0,0 speed=48 -sao \\
@@ -973,7 +783,7 @@ fs=16m
 .br
 .SH SEE ALSO
 .TP
-Formatting data track sources for cdrskin:
+Formatting track sources for cdrskin:
 .br
 .BR mkisofs (8),
 .BR genisoimage (8),

cdrskin/cdrskin_eng.html

@@ -2,7 +2,7 @@
 
 <HEAD>
 <META NAME="description" CONTENT="cdrskin, a limited cdrecord compatibility wrapper for libburn">
-<META NAME="keywords" CONTENT="cdrskin, libburn, libburnia, burn, CD, DVD, linux, recording, burning, CD-R, CD-RW, DVD-R, DVD-RW, DVD+RW, DVD+R, cdrecord, compatible, scdbackup">
+<META NAME="keywords" CONTENT="cdrskin, libburn, libburnia, burn, CD, linux, CDR, CD-R, CDRW, CD-RW, cdrecord, compatible, scdbackup, burning">
 <META NAME="robots" CONTENT="follow">
 <TITLE>cdrskin homepage english</TITLE>
 </HEAD>
@@ -12,7 +12,7 @@
 
 <CENTER>
 <A HREF="http://en.wikipedia.org/wiki/D%C3%B6ner_kebab">
-<IMG SRC="doener_150x200_tr_octx.png" BORDER=0
+<IMG SRC="doener_150x200_tr_octx.gif" BORDER=0
      ALT="cdrskin logo: Doener mit Scharf">
 </A>
 <P><H2> Homepage of </H2>
@@ -24,8 +24,9 @@
 
 <P>
 <H2>Purpose:</H2>
-Burns preformatted data to CD and single layer DVD media:<BR>
-CD-R, DVD-R, DVD+R, CD-RW, DVD-RW, DVD-RAM, DVD+RW
+<UL>
+<LI>Burns preformatted data to CD-R, CD-RW, DVD-R, DVD-RW, DVD-RAM, DVD+RW</LI>
+</UL>
 </P>
 <P>
 
@@ -34,9 +35,8 @@ CD-R, DVD-R, DVD+R, CD-RW, DVD-RW, DVD-RAM, DVD+RW
 <P>
 <H2>Hardware requirements:</H2>
 A CD/DVD recorder suitable for 
-<A HREF="http://libburnia.pykix.org">libburnia.pykix.org</A> <BR>
-(SCSI , ATA , USB , or SATA writers compliant to standard MMC-3 for CD
-and to MMC-5 for DVD).
+<A HREF="http://libburnia.pykix.org">libburnia.pykix.org</A> 
+(SCSI or IDE/ATAPI writers compliant to standard MMC-3 or higher).
 <BR>
 </P>
 
@@ -44,7 +44,7 @@ and to MMC-5 for DVD).
 <H2>Software requirements :</H2>
 <DL>
 <DT>Linux kernel 2.4 or higher</DT>
-<DD>With kernel 2.4 an ATA drive has to be under ide-scsi emulation.</DD>
+<DD>With kernel 2.4 the drive has to be under ide-scsi emulation.</DD>
 <DD>With kernel 2.6 the drive should not be under ide-scsi.</DD>
 <DT>libpthread</DT>
 <DD>is supposed to be a standard system component.</DD>
@@ -56,9 +56,9 @@ and to MMC-5 for DVD).
 GPL software included:<BR>
 </H2>
 <DL>
-<DT>libburn-0.3.8</DT>
+<DT>libburn-0.3.2</DT>
 <DD>(by Derek Foreman, Ben Jansens, and team of libburnia.pykix.org)</DD>
-<DD>transfers data to CD and DVD</DD>
+<DD>transfers data to CD</DD>
 </DL>
 </P>
 
@@ -81,23 +81,23 @@ Ports to other usable systems are appreciated. Reports are welcome.
 <P>
 <H2>Commands:</H2>
 <DL>
-<DT>The most common options of cdrecord for data and audio on CD media
-are provided in a compatible way.<BR>
-On single layer DVD media cdrskin is able to perform any recording job
-which is possible with cdrecord.
-Other than with cdrecord, options -multi and -tao are supported with
-certain DVD types.
-</DT>
+<DT>The goal is to provide some of cdrecord's options in a compatible way.
+This has been achieved quite sufficiently for the needs of backup tool
+<A HREF="http://scdbackup.sourceforge.net/main_eng.html">scdbackup</A>
+and for data CD projects of <A HREF="http://www.k3b.org">K3b</A> 
+(see <A HREF="#examples">examples</A>).
+Suitability for audio CD frontends has been improved much and is now being
+evaluated.<BR>
+Most DVD types are written in pseudo -tao modes which are very different
+from the write mode DAO used by cdrecord(-ProDVD). With DVD-R[W] cdrskin
+can use this write mode, too.<BR>
+Further enhancements depend on people who can describe and discuss their
+wishes as well as on the development of libburn.</DT>
 <BR><BR>
-<DT>Get an overview of drives and their addresses</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/srN resp. /dev/hdX .
-</DT>
-<DT>Ordinary users should then get granted rw access to the /dev files
-as listed by option --devices.</DT>
-<DT>&nbsp;</DT>
+<DT>Get an overview of drives and their addresses:</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>Get info about a particular drive or loaded media:</DT>
 <DD>$<KBD>&nbsp;cdrskin dev=0,1,0 -checkdrive</KBD></DD>
@@ -124,7 +124,7 @@ as listed by option --devices.</DT>
 <DD><KBD>&nbsp;&nbsp;cdrskin -v dev=0,1,0 fs=32m speed=8 \</KBD></DD>
 <DD><KBD>&nbsp;&nbsp;-tao padsize=300k -</KBD></DD>
 
-<DT>Write several sessions to the same CD, DVD-R[W] or DVD+R:</DT>
+<DT>Write several sessions to the same CD or DVD-R[W]:</DT>
 <DD>$<KBD>&nbsp;cdrskin dev=/dev/hdc -v padsize=300k -multi -tao 1.iso</KBD>
 </DD>
 <DD>$<KBD>&nbsp;cdrskin dev=/dev/hdc -v padsize=300k -multi -tao 2.iso</KBD>
@@ -133,15 +133,10 @@ as listed by option --devices.</DT>
 </DD>
 <DD>$<KBD>&nbsp;cdrskin dev=/dev/hdc -v padsize=300k -tao 4.iso</KBD></DD>
 
-<DT>Get multi-session info for option -C of program mkisofs:</DT>
+<DT>Get CD or DVD-R[W] multi-session info for option -C of program mkisofs:</DT>
 <DD>$<KBD>&nbsp;c_values=$(cdrskin dev=/dev/sr0 -msinfo 2>/dev/null)</KBD></DD>
 <DD>$<KBD>&nbsp;mkisofs ... -C "$c_values" ...</KBD></DD>
 
-<DT>Inquire free space on media for a -tao -multi run:</DT>
-<DD>$<KBD>&nbsp;x=$(cdrskin dev=/dev/sr0 -tao -multi \</KBD></DD>
-<DD><KBD>&nbsp;&nbsp;--tell_media_space 2>/dev/null)</KBD></DD>
-<DD>$<KBD>&nbsp;echo "Available: $x blocks of 2048 data bytes"</KBD></DD>
-
 <DT>Write audio tracks to CD:</DT>
 <DD>$<KBD>&nbsp;cdrskin -v dev=ATA:1,0,0 speed=48 -sao \</KBD></DD>
 <DD><KBD>&nbsp;&nbsp;track1.wav track2.au -audio -swab track3.raw</KBD></DD>
@@ -155,6 +150,7 @@ as listed by option --devices.</DT>
 <DT>Read the detailed manual page:</DT>
 <DD>$<KBD>&nbsp;<A HREF="man_1_cdrskin.html">man cdrskin</A></KBD></DD>
 </DL>
+
 <DL>
 <DT>Read about the standard for which cdrskin is striving:</DT>
 <DD>$<KBD>&nbsp;
@@ -165,9 +161,28 @@ man cdrecord</A></KBD></DD>
  this "don't bother Joerg" demand.)
 </DD>
 </DL>
+</P>
 
-Testers wanted who are willing to risk some double layer DVD media.
-
+<P>
+<H2>Known deficiencies:</H2>
+<UL>
+<DT></DT>
+<LI>
+Appending sessions to unclosed media is restricted to write mode TAO.
+</LI>
+<LI>
+cdrskin -scanbus or --devices hangs for quite a while if there is 
+a CD drive which does not work properly (e.g. because it has individual
+problems with DMA). 
+So if the superuser gets no result with cdrskin --devices then one should
+disable DMA with the problematic CD drives
+(like: <KBD>hdparm -d0 /dev/hdd</KBD> )
+and try again.<BR>
+In severe cases it might be necessary to guess the device name /dev/sgN resp.
+/dev/hdX of the non-ill burner if it cannot be found otherwise among its
+ill peers. Alternatively one can guess the address of the ill device, remove
+rw-permissions and retry the bus scan as non-superuser.
+</UL>
 </P>
 
 <HR>
@@ -175,8 +190,8 @@ Testers wanted who are willing to risk some double layer DVD media.
 <P>
 <DL>
 <DT>Download as source code (see README):</DT>
-<DD><A HREF="cdrskin-0.3.8.pl00.tar.gz">cdrskin-0.3.8.pl00.tar.gz</A>
-(615 KB).
+<DD><A HREF="cdrskin-0.3.2.pl00.tar.gz">cdrskin-0.3.2.pl00.tar.gz</A>
+(570 KB).
 </DD>
 <DD>
 The "stable" cdrskin tarballs are source code identical with "stable" 
@@ -186,21 +201,21 @@ 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.8.pl00-x86-suse9_0.tar.gz">
-cdrskin_0.3.8.pl00-x86-suse9_0.tar.gz</A>, (90 KB),
+<DD><A HREF="cdrskin_0.3.2.pl00-x86-suse9_0.tar.gz">
+cdrskin_0.3.2.pl00-x86-suse9_0.tar.gz</A>, (80 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.8.pl00-x86-suse9_0-static.tar.gz">
-cdrskin_0.3.8.pl00-x86-suse9_0-static.tar.gz</A>, (290 KB), -static compiled,
+<DD><A HREF="cdrskin_0.3.2.pl00-x86-suse9_0-static.tar.gz">
+cdrskin_0.3.2.pl00-x86-suse9_0-static.tar.gz</A>, (285 KB), -static compiled,
 <DL>
 <DD>runs on SuSE 7.2 (2.4.4), and on the systems above.</DD>
 </DL>
 </DD>
 </DL>
 <DL><DT>Documentation:</DT>
-<DD><A HREF="README_cdrskin">README</A> an introduction</DD>
+<DD><A HREF="README_cdrskin">README</A> a short introduction</DD>
 <DD><A HREF="cdrskin__help">cdrskin --help</A> non-cdrecord options</DD>
 <DD><A HREF="cdrskin_help">cdrskin -help</A> cdrecord compatible options</DD>
 <DD><A HREF="man_1_cdrskin.html">man cdrskin</A> the manual page</DD>
@@ -220,40 +235,32 @@ cdrskin_0.3.8.pl00-x86-suse9_0-static.tar.gz</A>, (290 KB), -static compiled,
 <HR>
 
 <P>
-Enhancements towards previous stable version cdrskin-0.3.4:
+Enhancements towards previous stable version cdrskin-0.3.0:
 <UL>
-<LI>Now able to cope with the peculiarities of Linux 2.4 USB</LI>
-<LI>Refusal to perform -dummy runs on media which cannot simulate burning</LI>
-<LI>Precautions against using the burner drive as track source</LI>
-<LI>New option modesty_on_drive= may help with hda -> hdb burns</LI>
-<LI>New option minbuf= , cdrecord compatible frontend of modesty_on_drive=</LI>
-<LI>New option --adjust_speed_to_drive</LI>
+<LI>Burnfree enabled by default</LI>
+<LI>Multi-session burning to DVD-R
+and sequential (i.e. unformatted) DVD-RW</LI>
+<LI>Option -toc with sequential DVD-R[W]</LI>
+<LI>Options -msinfo and msifile= with appendable DVD-R[W]</LI>
+<LI>Single session DAO write mode with DVD-R[W]</LI>
 </UL>
-
-<!--
- Bug fixes towards cdrskin-0.3.8.pl00:
-<UL>
-<LI>none yet</LI>
-</UL>
--->
-
 </P>
 
 <HR>
 
 <P>
 <DL>
-<DT><H3>Development snapshot, version 0.3.9 :</H3></DT>
-<DD>Enhancements towards stable version 0.3.8.pl00:
+<DT><H3>Development snapshot, version 0.3.3 :</H3></DT>
+<DD>Enhancements towards stable version 0.3.2:
 <UL>
-<LI>none yet</LI>
+<LI>- none yet -</LI>
 </UL>
 </DD>
 <DD>&nbsp;</DD>
-<DD><A HREF="README_cdrskin_devel">README 0.3.9</A>
-<DD><A HREF="cdrskin__help_devel">cdrskin_0.3.9 --help</A></DD>
-<DD><A HREF="cdrskin_help_devel">cdrskin_0.3.9 -help</A></DD>
-<DD><A HREF="man_1_cdrskin_devel.html">man cdrskin (as of 0.3.9)</A></DD>
+<DD><A HREF="README_cdrskin_devel">README 0.3.3</A>
+<DD><A HREF="cdrskin__help_devel">cdrskin_0.3.3 --help</A></DD>
+<DD><A HREF="cdrskin_help_devel">cdrskin_0.3.3 -help</A></DD>
+<DD><A HREF="man_1_cdrskin_devel.html">man cdrskin (as of 0.3.3)</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>
@@ -273,15 +280,15 @@ admins with full system souvereignty.</DT>
 <A HREF="README_cdrskin_devel">upcoming README</A> ):
 </DD>
 <DD>
-<A HREF="cdrskin-0.3.9.tar.gz">cdrskin-0.3.9.tar.gz</A>
-(615 KB).
+<A HREF="cdrskin-0.3.3.tar.gz">cdrskin-0.3.3.tar.gz</A>
+(570 KB).
 </DD>
 <DD>Binary (untar and move to /usr/bin/cdrskin):</DD>
-<DD><A HREF="cdrskin_0.3.9-x86-suse9_0.tar.gz">
-cdrskin_0.3.9-x86-suse9_0.tar.gz</A>, (90 KB).
+<DD><A HREF="cdrskin_0.3.3-x86-suse9_0.tar.gz">
+cdrskin_0.3.3-x86-suse9_0.tar.gz</A>, (80 KB).
 </DD>
-<DD><A HREF="cdrskin_0.3.9-x86-suse9_0-static.tar.gz">
-cdrskin_0.3.9-x86-suse9_0-static.tar.gz</A>, (290 KB)
+<DD><A HREF="cdrskin_0.3.3-x86-suse9_0-static.tar.gz">
+cdrskin_0.3.3-x86-suse9_0-static.tar.gz</A>, (280 KB)
 </DD>
 </DL>
 </P>
@@ -309,13 +316,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 rw-permission are invisible to normal users.)
-</DT>
+<DT>(CD devices which offer no r-permission are invisible to normal users.)</DT>
+<DT>(CD devices which offer no w-permission are not useable.)</DT>
 <DD># <KBD><B>cdrskin --devices</B></KBD></DD>
 <DD><KBD>...</KBD></DD>
-<DD><KBD>0&nbsp; dev='/dev/sr0'&nbsp; rwrwr- :&nbsp; 'TEAC'  'CD-ROM CD-532S'</KBD></DD>
+<DD><KBD>0&nbsp; dev='/dev/sg0'&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/sr0 /dev/hdc</B></KBD></DD>
+<DD># <KBD><B>chmod a+rw /dev/sg0 /dev/hdc</B></KBD></DD>
 </DL>
 </P>
 
@@ -352,7 +359,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.8 : limited cdrecord compatibility wrapper for libburn</KBD></DD>
+<DD><KBD>cdrskin 0.3.2 : 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.
@@ -411,8 +418,8 @@ Contact me. Let's see what we can achieve.
 <BR>
 <BR>
 libburn and cdrskin are now mature enough to substitute cdrecord in its
-major use cases of CD and DVD burning. It is possible to foist cdrskin on
-various software packages if it gets falsely named "cdrecord".
+major use cases of CD burning. It is possible to foist cdrskin on various
+software packages if it gets falsely named "cdrecord".
 I do not encourage this approach, but of course such a replacement
 opportunity is the goal of a cdrecord compatibility wrapper.
 <BR>
@@ -429,7 +436,7 @@ I owe him much. For cdrecord, for mkisofs, for star. Chapeau.
 <BR><BR>
  -->
 <A HREF="http://en.wikipedia.org/wiki/D%C3%B6ner_kebab">
-<IMG SRC="doener_150x200_tr.png" BORDER=0
+<IMG SRC="doener_150x200_tr.gif" BORDER=0
      ALT="cdrskin logo: Doener mit Scharf"></A>
 <BR><BR>
 <FONT SIZE=+0>Enjoying free Open Source hosting by <A HREF="http://www.webframe.org">www.webframe.org</A><BR>

cdrskin/cdrskin_timestamp.h

@@ -1 +1 @@
-#define Cdrskin_timestamP "2007.07.20.120001"
+#define Cdrskin_timestamP "2007.02.10.120001"

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_8"
+libvers="-DCdrskin_libburn_0_3_2"
 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_8"
+  elif test "$i" = "-libburn_0_3_2"
   then
-    libvers="-DCdrskin_libburn_0_3_8"
+    libvers="-DCdrskin_libburn_0_3_2"
     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_9"
+    libvers="-DCdrskin_libburn_0_3_3"
     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_8    set macro to match libburn-0.3.8."
+    echo "  -libburn_0_3_2    set macro to match libburn-0.3.2."
     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/convert_man_to_html.sh

@@ -43,15 +43,12 @@ then
   -e 's/<h1 align=center>CDRSKIN<\/h1>/<h1 align=center>man 1 cdrskin<\/h1>/' \
   -e 's/<body>/<body BGCOLOR="#F5DEB3" TEXT=#000000 LINK=#0000A0 VLINK=#800000>/' \
   -e 's/<b>Overview of features:<\/b>/\&nbsp;<BR><b>Overview of features:<\/b>/' \
-  -e 's/<b>General information paragraphs:<\/b>/\&nbsp;<BR><b>General information paragraphs:<\/b>/' \
   -e 's/<b>Track recording model:<\/b>/\&nbsp;<BR><b>Track recording model:<\/b>/' \
   -e 's/In general there are two types of tracks: data and audio./\&nbsp;<BR>In general there are two types of tracks: data and audio./' \
   -e 's/While audio tracks just contain a given/\&nbsp;<BR>While audio tracks just contain a given/' \
-  -e 's/<b>Write mode selection:<\/b>/\&nbsp;<BR><b>Write mode selection:<\/b>/' \
   -e 's/<b>Recordable CD Media:<\/b>/\&nbsp;<BR><b>Recordable CD Media:<\/b>/' \
   -e 's/<b>Overwriteable DVD Media:<\/b>/\&nbsp;<BR><b>Overwriteable DVD Media:<\/b>/' \
   -e 's/<b>Sequentially Recordable DVD Media:<\/b>/\&nbsp;<BR><b>Sequentially Recordable DVD Media:<\/b>/' \
-  -e 's/The write modes for DVD+R/\&nbsp;<BR>The write modes for DVD+R/' \
   -e 's/<b>Drive preparation and addressing:<\/b>/\&nbsp;<BR><b>Drive preparation and addressing:<\/b>/' \
   -e 's/If you only got one CD capable drive/\&nbsp;<BR>If you only got one CD capable drive/' \
   -e 's/^Alphabetical list of options/\&nbsp;<BR>Alphabetical list of options/' \
@@ -63,7 +60,7 @@ then
 
   chmod u+rw,go+r,go-w "$htmlpage"
   echo "Emerged file:"
-  ls -lL "$htmlpage"
+  ls -l "$htmlpage"
 
 else
 

cdrskin/wiki_plain.txt

@@ -1,7 +1,7 @@
 --------------------------------------------------------------------------
                        cdrskin Wiki - plain text copy
 --------------------------------------------------------------------------
-[[Image(source:/libburn/trunk/cdrskin/doener_150x200_tr.png)]] [http://en.wikipedia.org/wiki/D%C3%B6ner_kebab Doener]
+[[Image(source:/libburn/trunk/cdrskin/doener_150x200_tr.gif)]] [http://en.wikipedia.org/wiki/D%C3%B6ner_kebab Doener]
 
 '''cdrskin is the cdrecord compatibility middleware of libburn.'''
 
@@ -10,9 +10,8 @@ Schilling's cdrtools. cdrskin strives to be a second source for the services
 traditionally provided by cdrecord. Currently it does CD-R and CD-RW this way.
 Overwriteable media DVD-RAM, DVD+RW and DVD-RW are handled differently than 
 with cdrecord-ProDVD in order to offer TAO-like single track recording.
-Sequential DVD-R[W] and DVD+R are handled like CD-R[W] with TAO and
-multi-session. Additionally cdrskin offers cdrecord-ProDVD-like mode DAO
-with DVD-R[W].
+Sequential DVD-R[W] are handled like CD-R[W] with TAO and multi-session.
+Additionally cdrskin offers cdrecord-ProDVD-like mode DAO with DVD-R[W].
 
 cdrskin does not contain any bytes copied from cdrecord's sources.
 Many bytes have been copied from the message output of cdrecord
@@ -23,9 +22,13 @@ About libburn API for burning CD: http://libburnia-api.pykix.org
 
 --------------------------------------------------------------------------
 
-For dual layer DVD types and for appending sessions to ISO filesystems on
-DVD other than DVD-RW, DVD-R, DVD+R see the advise to use dvd+rw-tools at
-the end of this text.
+Appending sessions to an unclosed CD or DVD-R[W] is restricted to write mode
+TAO. (Users who have a burner which succeeds with a follow-up session on CD via
+cdrecord -sao : please contact us.)
+
+For DVD types other than DVD-RAM, DVD+RW, DVD-RW, DVD-R and for appending
+sessions to ISO filesystems on DVD other than DVD-RW, DVD-R see the advise
+to use dvd+rw-tools at the end of this text.
 
 --------------------------------------------------------------------------
 
@@ -67,7 +70,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/sr0'  rwrw-- :  'HL-DT-ST'  'DVDRAM GSA-4082B'
+0  dev='/dev/sg0'  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.
@@ -83,9 +86,10 @@ has to offer both, r- and w-permission.
 --------------------------------------------------------------------------
 
 The DVD capabilities of cdrskin differ from those of cdrecord-ProDVD. cdrskin
-offers TAO-like multi-session with DVD-R[W], DVD+R and TAO-like single session
-with overwriteable DVD media. It also offers DAO on DVD-R[W] which is probably
-the same as the traditional cdrecord-ProDVD write mode.
+lacks of support for DVD+R and for dual layer DVD media. On the other hand it
+offers TAO-like multi-session with DVD-R[W] and TAO-like single session with
+overwriteable DVD media. It also offers DAO on DVD-R[W] which is probably the
+same as the traditional cdrecord-ProDVD write mode.
 
 Non-cdrecord blank mode blank=format_overwrite brings a DVD-RW
 disc from its initial profile "Sequential Recording" into profile state
@@ -119,29 +123,6 @@ multi-session. (The default behavior of cdrskin deems me to be preferrable.)
 
 --------------------------------------------------------------------------
 
-assert_write_lba=<lba> allows to ensure that the start block address which
-was used with the formatter program (e.g. mkisofs -C) matches the start block
-address which will be used by the upcoming burn.
-
-E.g. cdrskin aborts with an error message if 
-{{{
-assert_write_lba=0
-}}}
-is given but an appendable media is to be burned which would start at
-block 68432.
-
-
-An ISO-9660 file system image must be prepared according to a particular
-block address on media. If the prepared address and the real address on media
-do not match then the filesystem will not be mountable or may even cause system
-trouble.
-
-A sequential archive format like afio or star will not necessarily need such
-a coordination of addresses. It might nevertheless be confusing to a reader
-if the archive does not start at block 0.
-
---------------------------------------------------------------------------
-
 fifo_start_at=<num> is a throughput enhancer for unsteady data streams
 like they are produced by a compressing archiver program when piping to
 CD on-the-fly. It makes better use of the general property of a FIFO 
@@ -228,10 +209,10 @@ for an illustrated example with K3b 0.10 .
 
 DVD advise:
 
-For burning of DVD media other than DVD-RAM, DVD+RW, DVD+R, DVD-RW, DVD-R,
-the cdrskin project currently advises to use Andy Polyakov's dvd+rw-tools
-which despite their historic name are capable of all the media above 
-and also do dual layer and even BD discs. 
+For burning of DVD media other than DVD-RAM, DVD+RW, DVD-RW, DVD-R, the cdrskin
+project currently advises to use Andy Polyakov's dvd+rw-tools which despite
+their historic name burn for me on above burner: DVD-RAM, DVD+RW, DVD+R,
+DVD-RW, DVD-R and are also capable of dual layer and even BD discs. 
 
 http://fy.chalmers.se/~appro/linux/DVD+RW/tools
 
@@ -247,10 +228,9 @@ So for growable ISO filesystems on DVD-RAM or DVD+RW growisofs is the only
 choice, currently.
 
 
-cdrskin can offer DVD multi-session only with sequential DVD-R[W] and with
-DVD+R.
-Associated options blank=, -multi, -msinfo and -toc are available in this case.
-Thus sequential DVD-RW behave much like large CD-RW with possibly more than 99
+cdrskin can offer DVD multi-session only with sequential DVD-R[W]. Associated
+options blank=, -multi, -msinfo and -toc are available in this case. Thus
+sequential DVD-RW behave much like large CD-RW with possibly more than 99
 tracks.
 
 --------------------------------------------------------------------------

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([libburn], [0.3.8], [http://libburnia.pykix.org])
+AC_INIT([libburn], [0.3.2], [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=8
+BURN_MICRO_VERSION=2
 BURN_INTERFACE_AGE=0
 BURN_BINARY_AGE=0
 BURN_VERSION=$BURN_MAJOR_VERSION.$BURN_MINOR_VERSION.$BURN_MICRO_VERSION
@@ -33,7 +33,7 @@ AC_SUBST(BURN_VERSION)
 
 dnl Libtool versioning
 LT_RELEASE=$BURN_MAJOR_VERSION.$BURN_MINOR_VERSION
-LT_CURRENT=4
+LT_CURRENT=`expr $BURN_MICRO_VERSION - $BURN_INTERFACE_AGE`
 LT_REVISION=$BURN_INTERFACE_AGE
 LT_AGE=`expr $BURN_BINARY_AGE - $BURN_INTERFACE_AGE`
 LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`

doc/comments

@@ -6,11 +6,9 @@
    @section intro Introduction
 
 Libburnia is an open-source project for reading, mastering and writing
-optical discs.
-For now this means CD-R, CD-RW, DVD-RAM, DVD+RW, DVD+R, DVD-RW, DVD-R.
+optical discs. For now this means CD-R, CD-RW, DVD-RAM, DVD+RW, DVD-RW, DVD-R.
 
-Not supported yet are dual layer media, HD-DVD, BD (blue ray). Testers for
-dual layer DVD+/-R are wanted, though.
+Not supported yet are DVD+R, any dual layer media, HD-DVD, BD (blue ray).
 
 The project comprises of several more or less interdependent parts which
 together strive to be a usable foundation for application development.
@@ -33,7 +31,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/srM or /dev/hdX (e.g. on kernel 2.6).
+           /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
@@ -91,7 +89,7 @@ languages and development tools.
 libburner is a minimal demo application for the library libburn 
 (see: libburn/libburn.h) as provided on  http://libburn.pykix.org .
 It can list the available devices, can blank a CD-RW or DVD-RW and
-can burn to recordable CD and recordable single layer DVD.
+can burn to CD-R, CD-RW, DVD-RAM, DVD+RW, DVD-RW, DVD-R.
 
 It's main purpose, nevertheless, is to show you how to use libburn and also
 to serve the libburnia team as reference application. libburner does indeed

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
+
 
 -------------------------------------------------------------------------------
                          TAO Multi-Session CD Cookbook
@@ -689,7 +689,6 @@ Media type can be recognized by Current Profile from 46h GET CONFIGURATION.
 DVD-R                          0011h
 DVD-RW Restricted Overwrite    0013h
 DVD-RW Sequential Recording    0014h
-(DVD-R/DL Sequential Recording 0015h untested, might be single-session only)
 
 There are two approaches for writing to sequential DVD-R[W]: DAO and
 Incremental. Not all media and drives offer Incremental which allows 
@@ -702,8 +701,6 @@ track and it demands an exactly predicted track size.
 - DAO writing
 - Obtaining DVD-R[W] multi-session info for extending ISO-9660 filesystems
 - Obtaining a Table Of Content from DVD-R[W]
-- Hearsay about DVD-R/DL (Dual Layer)
-
 
 -------------------------------------------------------------------------------
 About overwriteable, blank, appendable and finalized DVD-R[W] media :
@@ -788,12 +785,12 @@ growisofs (transport.hxx) sets Link Size to 16 for profiles 0011h and 0014h.
 libburn now records the first link size from feature 0021h in its burn_drive
 structure. If another link size item is 16, then 16 is used.
 [*4:]
-growisofs takes Packet Size from 52h. Specs predict it will be 16 (= 32 kiB).
+growisofs takes Packet Size from 52h. Specs predict it will be 16 (= 32 kB).
 (mmc5r03.pdf 7.5.4.16)
 
 The writing process is much like in "Writing a session to CD in TAO mode" :
 Next Writeable Address is fetched from the reply of 52h READ TRACK INFORMATION.
-libburn writes full 32 kiB buffers via 2Ah WRITE.
+libburn writes full 32 kB buffers via 2Ah WRITE.
 (mmc5r03c.pdf, 6.27 READ TRACK INFORMATION, 6.44 WRITE)
 When writing is done, it is mandatory to force the drive's buffer to media by
 35h SYNCHRONIZE CACHE.
@@ -860,8 +857,7 @@ tested yet, what happens if not enough data get written.
 (mmc5r03c.pdf 6.31)
 
 Next Writeable Address is fetched from the reply of 52h READ TRACK INFORMATION.
-The reply is supposed to be 0. libburn writes full 32 kiB buffers via
-2Ah WRITE.
+The reply is supposed to be 0. libburn writes full 32 kB buffers via 2Ah WRITE.
 (mmc5r03c.pdf, 6.27 READ TRACK INFORMATION, 6.44 WRITE)
 If the track source delivers less than the announced size then libburn pads up
 by zeros.
@@ -874,7 +870,6 @@ No further finalization is necessary. (I.e. no 5Bh CLOSE TRACK SESSION.)
 
 -------------------------------------------------------------------------------
 Obtaining DVD-R[W] multi-session info for extending ISO-9660 filesystems :
-(valid for DVD+R too)
 
 Like with CD it is necessary to obtain the two numbers for mkisofs option -C
 in order to prepare a ISO-9660 filesystem image which by its inner pointers
@@ -927,8 +922,7 @@ Session from 51h READ DISC INFORMATION.
 
 
 -------------------------------------------------------------------------------
-Obtaining a Table Of Content from DVD-R[W]:
-(valid for DVD+R too)
+Obtaining a Table Of Content from DVD-R[W] :
 
 The raw TOC entries from 43h READ TOC/PMA/ATIP Format 0010b as described with
 CD media are not available with non-CD.
@@ -968,133 +962,5 @@ model. Their start address is computed from the start and size of the last
 track of the session.
 
 
--------------------------------------------------------------------------------
-Hearsay about DVD-R/DL (Dual Layer) :
-
-DVD-R/DL can assume profile 0015h DVD-R Dual Layer Sequential which is supposed
-to behave like DVD-R or 0016h DVD-R Dual Layer Jump which has no counterpart
-with DVD-R.
-
-A half-sentence in mmc5r03c.pdf 6.3.3.3.3 might indicate that closing a session
-by 5Bh CLOSE TRACK SESSION Close Function 010b overrides the multi-session bits
-in mode page 05h.
-growisofs applies this function in case of not DAO, though. A comment in
-growisofs_mmc.cpp states: "// DVD-R DL Seq has no notion of multi-session".
-I am not reading this from the specs - but not explicitely the contrary either.
-
-For now libburn will close the session but there is a macro prepared in
-libburn/write.c Libburn_dvd_r_dl_multi_no_close_sessioN which will suppress
-close session if multi-session is demanded.
-
-
--------------------------------------------------------------------------------
-
--------------------------------------------------------------------------------
-
-                              INCOMPLETE YET
-
-                              DVD+R Cookbook
--------------------------------------------------------------------------------
-Inspired by reading mmc5r03c.pdf from http://www.t10.org/ftp/t10/drafts/mmc5/
-backed by Andy Polyakov's http://fy.chalmers.se/~appro/linux/DVD+RW/tools ,
-
-For libburnia.pykix.org by Thomas Schmitt <scdbackup@gmx.net>
-
--------------------------------------------------------------------------------
-
-Media type can be recognized by Current Profile from 46h GET CONFIGURATION.
-(mmc5r03c.pdf 6.6.2.1)
-DVD+R                          001bh
-DVD+R/DL                       002bh
-
-- About empty, appendable and finalized DVD+R
-- Writing a Pseudo Session to DVD+R
-- >>> Hearsay about DVD+R/DL (Dual Layer) :
-
-The following two chapters of the Sequential DVD-R[W] Cookbook are valid for
-DVD+R media too:
-- Obtaining DVD-R[W] multi-session info for extending ISO-9660 filesystems
-- Obtaining a Table Of Content from DVD-R[W]
-
--------------------------------------------------------------------------------
-About blank, appendable and finalized DVD+R :
-
-In the beginning a DVD+R holds an empty session and the Incomplete Fragment.
-From these one may spawn reserved fragments or one may write directly to
-the incomplete fragment. As soon as this is done the empty session becomes the
-open session which finally needs to get closed. By closing fragments and
-session a new empty session with empty Incomplete Fragment gets spawned.
-So the disc stays appendable.
-
-A DVD+R may hold 153 closed sessions with a single track each.
-The open session may hold up to 15 open fragments. But on closure of the
-session those fragments together form a single logical track.  So one will
-usually only use a single fragment for sequential writing. 
-(mmc5r03c.pdf 4.3.6.2)
-
-The disc may get finalized by another close command so that no more data can
-be written.
-(mmc5r03c.pdf 6.3.3.4.4) 
-
-
--------------------------------------------------------------------------------
-Writing a Pseudo Session to DVD+R :
-
-Session writing has to be pseudo because only one logical track per session
-can be distinguished. So actually there have to be written multiple sessions
-to mark multiple tracks. The pseudo session cannot get marked on disc and thus
-the tracks of a pseudo session cannot be grouped accordingly in a TOC.
-
-Speed can be influenced by B6h SET STREAMING , speed capabilities can be
-inquired by ACh GET PERFORMANCE. It is advised to set only speeds and sizes
-which are returned by ACh.
-(mmc5r03c.pdf 6.39 SET STREAMING, 6.8 GET PERFORMANCE)	
-
-No mode page 05h is to be sent.
-growisofs sends a page but the specs clearly state that one shall not do.
-(mmc5r03c.pdf 7.5.3)
-
-It is optional wether a track size is reserved in advance or not. Eventually
-this is done by 53h RESERVE TRACK, RMZ=ARSV=0. Reservation size should better
-already be aligned to 32 KiB.
-(mmc5r03c.pdf 6.31)
-The specs promise to pad up the track if not enough data get written.
-(mmc5r03c.pdf 6.3.3.4.2)
-
-Next Writeable Address is fetched from the reply of 52h READ TRACK INFORMATION
-with track number FFh.
-(mmc5r03c.pdf 6.27)
-Since the fixely set write type is 16-block packet, full 32 kiB buffers have
-to be transmitted via 2Ah WRITE.
-(mmc5r03c.pdf 4.3.6.2.2)
-
-When writing is done, it is mandatory to force the drive's buffer to media by
-35h SYNCHRONIZE CACHE.
-(mmc5r03c.pdf 6.41)
-
-The written fragment (i.e. track-to-be) has to be closed by 5Bh CLOSE TRACK
-SESSION Close Function 001b.
-(mmc5r03c.pdf 6.3.3.4.2)
-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
-"with minimal radius".
-(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

@@ -1,388 +0,0 @@
--------------------------------------------------------------------------------
-
-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/async.c

@@ -12,7 +12,6 @@
 #include <pthread.h>
 #include <stdlib.h>
 #include <stdio.h>
-#include <string.h>
 
 /*
 #include <a ssert.h>
@@ -237,17 +236,10 @@ void burn_disc_erase(struct burn_drive *drive, int fast)
 	/* ts A70103 moved up from burn_disc_erase_sync() */
 	/* ts A60825 : allow on parole to blank appendable CDs */
 	/* ts A70131 : allow blanking of overwriteable DVD-RW (profile 0x13) */
-	/* ts A70216 : allow blanking of CD-RW or DVD-RW in any regular state
-	               and of any kind of full media */
-	if ((drive->current_profile != 0x0a &&
-	     drive->current_profile != 0x13 &&
-	     drive->current_profile != 0x14 &&
-	     drive->status != BURN_DISC_FULL)
-	    ||
-	    (drive->status != BURN_DISC_FULL &&
-	     drive->status != BURN_DISC_APPENDABLE &&
-	     drive->status != BURN_DISC_BLANK)
-	   ) {
+	if ( ! (drive->status == BURN_DISC_FULL ||
+		(drive->status == BURN_DISC_APPENDABLE &&
+		 ! libburn_back_hack_42) ||
+		drive->current_profile == 0x13 ) ) {
 		libdax_msgs_submit(libdax_messenger, drive->global_index,
 			0x00020130,
 			LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
@@ -333,11 +325,7 @@ static void *write_disc_worker_func(struct w_list *w)
 void burn_disc_write(struct burn_write_opts *opts, struct burn_disc *disc)
 {
 	struct write_opts o;
-	char reasons[BURN_REASONS_LEN+80];
-#ifndef Libburn_precheck_write_ruleS
 	int i, j, mode, mixed_mode = 0;
-#endif
-
 
 	/* For the next lines any return indicates failure */
 	opts->drive->cancel = 1;
@@ -365,37 +353,10 @@ void burn_disc_write(struct burn_write_opts *opts, struct burn_disc *disc)
 				"Drive capabilities not inquired yet", 0, 0);
 		return;
 	}
-
-	/* ts A70219 : intended to replace all further tests here and many
-	               tests in burn_*_write_sync()
-	*/
-	strcpy(reasons, "Write job parameters are unsuitable:\n");
-	if (burn_precheck_write(opts, disc, reasons + strlen(reasons), 1)
-	     == BURN_WRITE_NONE) {
-
-#ifndef Libburn_precheck_write_ruleS
-		libdax_msgs_submit(libdax_messenger,
-				opts->drive->global_index, 0x00020139,
-				LIBDAX_MSGS_SEV_WARNING, LIBDAX_MSGS_PRIO_HIGH,
-				reasons, 0, 0);
-#else
-		libdax_msgs_submit(libdax_messenger,
-				opts->drive->global_index, 0x00020139,
-				LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
-				reasons, 0, 0);
-		return;
-#endif /* Libburn_precheck_write_ruleS */
-
-	}
-
-
-#ifndef Libburn_precheck_write_ruleS
-	/* <<< covered burn_precheck_write() */
 	/* ts A61009 : obsolete Assert in sector_headers() */
-	if (! burn_disc_write_is_ok(opts, disc, 0)) /* issues own msgs */
+	if (! burn_disc_write_is_ok(opts, disc)) /* issues own msgs */
 		return;
 
-	/* <<< covered burn_precheck_write() */
 	/* ts A70122 : libburn SAO code mishandles mode changes */
 	for (i = 0; i < disc->sessions; i++) {
 		if (disc->session[i]->tracks <= 0)
@@ -412,7 +373,6 @@ void burn_disc_write(struct burn_write_opts *opts, struct burn_disc *disc)
 				"Cannot mix data and audio in SAO mode", 0, 0);
 		return;
 	}
-#endif /* ! Libburn_precheck_write_ruleS */
 
 	opts->drive->cancel = 0; /* End of the return = failure area */
 

libburn/ddlpa.c

@@ -1,614 +0,0 @@
-
-/* 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

@@ -1,107 +0,0 @@
-
-/* 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

@@ -29,12 +29,6 @@
 /* ts A70107 : to get BE_CANCELLED */
 #include "error.h"
 
-/* ts A70219 : for burn_disc_get_write_mode_demands() */
-#include "options.h"
-
-/* A70225 : to learn about eventual Libburn_dvd_r_dl_multi_no_close_sessioN */
-#include "write.h"
-
 #include "libdax_msgs.h"
 extern struct libdax_msgs *libdax_messenger;
 
@@ -206,9 +200,6 @@ 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;
 }
@@ -857,35 +848,6 @@ void burn_drive_set_speed(struct burn_drive *d, int r, int w)
 	d->set_speed(d, r, w);
 }
 
-
-/* ts A70711  API function */
-int burn_drive_set_buffer_waiting(struct burn_drive *d, int enable,
-				int min_usec, int max_usec, int timeout_sec,
-				int min_percent, int max_percent)
-{
-
-	if (enable >= 0)
-		d->wait_for_buffer_free = !!enable;
-	if (min_usec >= 0)
-		d->wfb_min_usec = min_usec;
-	if (max_usec >= 0)
-		d->wfb_max_usec = max_usec;
-	if (timeout_sec >= 0)
-		d->wfb_timeout_sec = timeout_sec;
-        if (min_percent >= 0) {
-		if (min_percent < 25 || min_percent > 100)
-			return 0;
-		d->wfb_min_percent = min_percent;
-	}
-	if (max_percent >= 0) {
-		if (max_percent < 25 || max_percent > 100)
-			return 0;
-		d->wfb_max_percent = max_percent;
-	}
-	return 1;
-}
-
-
 int burn_msf_to_sectors(int m, int s, int f)
 {
 	return (m * 60 + s) * 75 + f;
@@ -1051,6 +1013,7 @@ int burn_drive_is_enumerable_adr(char *adr)
 #define BURN_DRIVE_MAX_LINK_DEPTH 20
 
 /* ts A60922 ticket 33 */
+/* Try to find an enumerated address with the given stat.st_rdev number */
 int burn_drive_resolve_link(char *path, char adr[], int *recursion_count)
 {
 	int ret;
@@ -1439,7 +1402,7 @@ int burn_disc_track_lba_nwa(struct burn_drive *d, struct burn_write_opts *o,
 			0, 0);
 		return -1;
 	}
-	if (o != NULL)
+	if (o!=NULL)
 		d->send_write_parameters(d, o);
 	ret = d->get_nwa(d, trackno, lba, nwa);
 	return ret;
@@ -1472,31 +1435,6 @@ int burn_disc_get_msc1(struct burn_drive *d, int *start)
 }
 
 
-/* ts A70213 : new API function */
-off_t burn_disc_available_space(struct burn_drive *d,
-				 struct burn_write_opts *o)
-{
-	int lba, nwa;
-
-	if (burn_drive_is_released(d))
-		goto ex;
-	if (d->busy != BURN_DRIVE_IDLE)
-		goto ex;
-	if (o != NULL)
-		d->send_write_parameters(d, o);
-	d->get_nwa(d, -1, &lba, &nwa);
-ex:;
-	if (o != NULL) {
-		if (o->start_byte > 0) {
-			if (o->start_byte > d->media_capacity_remaining)
-				return 0;
-			return d->media_capacity_remaining - o->start_byte;
-		}
-	}
-	return d->media_capacity_remaining;
-}
-
-
 /* ts A61202 : New API function */
 int burn_disc_get_profile(struct burn_drive *d, int *pno, char name[80])
 {
@@ -1614,55 +1552,6 @@ int burn_drive_get_speedlist(struct burn_drive *d,
 }
 
 
-/* ts A70713 : API function */
-int burn_drive_get_best_speed(struct burn_drive *d, int speed_goal,
-			struct burn_speed_descriptor **best_descr, int flag)
-{
-	struct burn_speed_descriptor *sd;
-	int best_speed = 0, best_lba = 0, source= 2, speed;
-
-	if (flag & 2)
-		source = -1;
-	if (speed_goal < 0)
-		best_speed = 2000000000;
-	*best_descr = NULL;
-	for (sd = d->mdata->speed_descriptors; sd != NULL; sd = sd->next) {
-		if (flag & 1)
-			speed = sd->read_speed;
-		else
-			speed = sd->write_speed;
-		if ((source >= 0 && sd->source != source) || 
-		    speed <= 0)
-	continue;
-		if (speed_goal < 0) {
-			if (speed < best_speed) {
-				best_speed = speed;
-				*best_descr = sd;
-			}
-		} else if (speed_goal == 0) {
-			if ((source == 2 && sd->end_lba > best_lba) ||
-			    ((source !=2 || sd->end_lba == best_lba) &&
-			     speed > best_speed)) {
-				best_lba = sd->end_lba;
-				best_speed = speed;
-				*best_descr = sd;
-			}
-		} else if (speed <= speed_goal) {
-			if (speed > best_speed) {
-				best_speed = speed;
-				*best_descr = sd;
-			}
-		}
-	}
-	if (d->current_is_cd_profile && *best_descr == NULL && ! (flag & 2))
-		/* Mode page 2Ah is deprecated in MMC-5 although all known
-		   burners still support it with CD media. */
-		return burn_drive_get_best_speed(d, speed_goal, best_descr,
-						 flag | 2);
-	return (*best_descr != NULL);
-}
-
-
 /* ts A61226 : API function */
 int burn_drive_free_speedlist(struct burn_speed_descriptor **speed_list)
 {
@@ -1697,7 +1586,6 @@ int burn_disc_get_multi_caps(struct burn_drive *d, enum burn_write_types wt,
 	o->selected_write_mode = wt;
 	o->current_profile = d->current_profile;
 	o->current_is_cd_profile = d->current_is_cd_profile;
-        o->might_simulate = 0;
 	
 	if (s != BURN_DISC_BLANK && s != BURN_DISC_APPENDABLE) {
 		return 0;
@@ -1727,30 +1615,19 @@ int burn_disc_get_multi_caps(struct burn_drive *d, enum burn_write_types wt,
 		}
 		if (wt == BURN_WRITE_RAW)
 			o->multi_session = o->multi_track = 0;
-		else if(wt == BURN_WRITE_NONE || wt == BURN_WRITE_SAO ||
-			wt == BURN_WRITE_TAO)
-			o->might_simulate = !!d->mdata->simulate;
-	} else if (d->current_profile == 0x11 || d->current_profile == 0x14 ||
-			d->current_profile == 0x15) {
-		/* DVD-R , sequential DVD-RW , DVD-R/DL Sequential */
+	} else if (d->current_profile == 0x11 || d->current_profile == 0x14) {
+		/* DVD-R , sequential DVD-RW */
 		if (s == BURN_DISC_BLANK) {
 			o->might_do_sao = 1;
 			o->advised_write_mode = BURN_WRITE_SAO;
 		}
 		if (d->current_has_feat21h) {
-#ifndef Libburn_dvd_r_dl_multi_no_close_sessioN
-			if (d->current_profile != 0x15)
-#endif
-				o->multi_session = 1;
-			o->multi_track = 1;
+			o->multi_session = o->multi_track = 1;
 			o->might_do_tao = 2;
 			o->advised_write_mode = BURN_WRITE_TAO;
 		}
 		if (wt == BURN_WRITE_SAO)
 			o->multi_session = o->multi_track = 0;
-		if (wt == BURN_WRITE_NONE || wt == BURN_WRITE_SAO ||
-		    wt == BURN_WRITE_TAO)
-			o->might_simulate = 1;
 	} else if (d->current_profile == 0x12 || d->current_profile == 0x13 ||
 			d->current_profile == 0x1a) {
 		/* DVD-RAM, overwriteable DVD-RW, DVD+RW */
@@ -1780,15 +1657,8 @@ int burn_disc_get_multi_caps(struct burn_drive *d, enum burn_write_types wt,
 						d->best_format_size - 2048;
 			}
 		}
-		o->might_do_sao = 4;
 		o->might_do_tao = 2;
 		o->advised_write_mode = BURN_WRITE_TAO;
-	} else if (d->current_profile == 0x1b || d->current_profile == 0x2b) {
-		/* DVD+R , DVD+R/DL */
-		o->multi_session = o->multi_track = 1;
-		o->might_do_tao = 2;
-		o->might_do_sao = 1;
-		o->advised_write_mode = BURN_WRITE_TAO;
 	} else /* unknown media */
 		return 0;
 		
@@ -1816,25 +1686,15 @@ int burn_disc_free_multi_caps(struct burn_multi_caps **caps)
 }
 
 
-/* ts A70207 : evaluate write mode related peculiarities of a disc
-   @param flag bit0= fill_up_media is active
-*/
+/* ts A70207 : evaluate write mode related peculiarities of a disc */
 int burn_disc_get_write_mode_demands(struct burn_disc *disc,
-			struct burn_write_opts *opts,
 			struct burn_disc_mode_demands *result, int flag)
 {
 	struct burn_session *session;
 	struct burn_track *track;
-	int i, j, mode, unknown_track_sizes = 0, last_track_is_unknown = 0;
-	enum burn_disc_status s;
-	
+	int i, j, mode;
 
 	memset((char *) result, 0, sizeof(struct burn_disc_mode_demands));
-	if (disc == NULL)
-		return 2;
-	s = burn_disc_get_status(opts->drive);
-	if (s == BURN_DISC_APPENDABLE || disc->sessions > 1)
-		result->will_append = 1;
 	if (disc->sessions > 1)
 		result->multi_session = 1;
 	for (i = 0; i < disc->sessions; i++) {
@@ -1846,33 +1706,15 @@ int burn_disc_get_write_mode_demands(struct burn_disc *disc,
 			result->multi_track = 1;
 		for (j = 0; j < session->tracks; j++) {
 			track = session->track[j];
-			if (burn_track_is_open_ended(track)) {
-				if (burn_track_get_default_size(track) > 0) {
-					if (result->unknown_track_size == 0)
-						result->unknown_track_size = 2;
-				} else
-					result->unknown_track_size = 1;
-				unknown_track_sizes++;
-				last_track_is_unknown = 1;
-			} else
-				last_track_is_unknown = 0;
+			if (burn_track_is_open_ended(track))
+				result->unknown_track_size = 1;
 			if (mode != track->mode)
 				result->mixed_mode = 1;
-			if (track->mode == BURN_MODE1) {
-				result->block_types |= BURN_BLOCK_MODE1;
-			} else if (track->mode == BURN_AUDIO) {
+			if (track->mode != BURN_MODE1)
+				result->exotic_track = 1;
+			if (track->mode == BURN_AUDIO)
 				result->audio = 1;
-				result->block_types |= BURN_BLOCK_RAW0;
-				result->exotic_track = 1;
-			} else {
-				result->block_types |= opts->block_type;
-				result->exotic_track = 1;
-			}
 		}
 	}
-	if (flag&1) {/* fill_up_media will define the size of the last track */
-		if (unknown_track_sizes == 1 && last_track_is_unknown)
-			result->unknown_track_size = 0;
-	}
 	return (disc->sessions > 0);
 }

libburn/drive.h

@@ -100,15 +100,12 @@ void burn_disc_format_sync(struct burn_drive *d, off_t size, int flag);
 struct burn_disc_mode_demands {
 	int multi_session;
 	int multi_track;
-	int unknown_track_size; /* 0=known, 1=unknown, 2=unknown+defaulted */
+	int unknown_track_size;
 	int mixed_mode;
 	int audio;
 	int exotic_track;
-	int block_types;
-	int will_append; /* because of media state or multi session disc */
 };
 int burn_disc_get_write_mode_demands(struct burn_disc *disc,
-			struct burn_write_opts *opts,
-			struct burn_disc_mode_demands *result, int flag);
+			 struct burn_disc_mode_demands *result, int flag);
 
 #endif /* __DRIVE */

libburn/init.c

@@ -26,22 +26,9 @@ struct libdax_msgs *libdax_messenger= NULL;
 
 int burn_running = 0;
 
-/* ts A60813 : Linux: wether to use O_EXCL on open() of device files */
+/* ts A60813 : wether to use O_EXCL and/or O_NONBLOCK in libburn/sg.c */
 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
@@ -63,10 +50,6 @@ static char abort_message_prefix[81] = {"libburn : "};
 static pid_t abort_control_pid= 0;
 
 
-/* ts A70223 : wether implemented untested profiles are supported */
-int burn_support_untested_profiles = 0;
-
-
 /* ts A60925 : ticket 74 */
 /** Create the messenger object for libburn. */
 int burn_msgs_initialize(void)
@@ -90,7 +73,6 @@ int burn_initialize(void)
 
 	if (burn_running)
 		return 1;
-	burn_support_untested_profiles = 0;
 	ret = burn_msgs_initialize();
 	if (ret <= 0)
 		return 0;
@@ -132,11 +114,10 @@ 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_fcntl_f_setlk = !!(exclusive & 32);
-	burn_sg_use_family = (exclusive >> 2) & 7;
-	burn_sg_open_o_nonblock = !blocking;
-	burn_sg_open_abort_busy = !!abort_on_busy;
+
+	burn_sg_open_o_excl= exclusive;
+	burn_sg_open_o_nonblock= !blocking;
+	burn_sg_open_abort_busy= !!abort_on_busy;
 }
 
 
@@ -293,10 +274,3 @@ void burn_set_signal_handling(void *handle, burn_abort_handler_t handler,
 	Cleanup_set_handlers(handle, (Cleanup_app_handler_T) handler, mode|4);
 }
 
-
-/* ts A70223 : API */
-void burn_allow_untested_profiles(int yes)
-{
-	burn_support_untested_profiles = !!yes;
-}
-

libburn/libburn.h

@@ -455,9 +455,8 @@ struct burn_progress {
 	/* ts A61119 */
 	/** The number of bytes sent to the drive buffer */
 	off_t buffered_bytes;
-	/** The minimum number of bytes stored in buffer during write.
-            (Caution: Before surely one buffer size of bytes was processed,
-                      this value is 0xffffffff.) 
+	/** The minimum number of buffered bytes. (Caution: Before surely
+	    one buffer size of bytes was processed, this value is 0xffffffff.) 
 	*/
 	unsigned buffer_min_fill;
 };
@@ -573,22 +572,13 @@ 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 Linux only:
-                     0 = no attempt to make drive access exclusive.
-                     1 = Try to open only devices which are not marked as busy
+    @param 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 .
-                     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.
+                     the matching /dev/sr, /dev/scd and /dev/st .
+                     0 = no attempt to make drive access exclusive.
     @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.
@@ -599,19 +589,6 @@ void burn_set_verbosity(int level);
 void burn_preset_device_open(int exclusive, int blocking, int abort_on_busy);
 
 
-/* ts A70223 */
-/** Allows the use of media types which are implemented in libburn but not yet
-    tested. The list of those untested profiles is subject to change.
-    Currently it contains: 0x15 "DVD-R/DL Sequential".
-    If you really test such media, then please report the outcome on
-    libburn-hackers@pykix.org
-    If ever then this call should be done soon after burn_initialize() before
-    any drive scanning.
-    @param yes 1=allow all implemented profiles, 0=only tested media (default)
-*/
-void burn_allow_untested_profiles(int yes);
-
-
 /* ts A60823 */
 /** Aquire a drive with known persistent address.This is the sysadmin friendly
     way to open one drive and to leave all others untouched. It bundles
@@ -697,9 +674,7 @@ int burn_drive_scan(struct burn_drive_info *drive_infos[],
 int burn_drive_info_forget(struct burn_drive_info *drive_info, int force);
 
 
-/** When no longer needed, free a whole burn_drive_info array which was
-    returned by burn_drive_scan().
-    For freeing single drive array elements use burn_drive_info_forget().
+/** Free a burn_drive_info array returned by burn_drive_scan
 */
 void burn_drive_info_free(struct burn_drive_info drive_infos[]);
 
@@ -775,8 +750,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).
-    Linux: The drive is unlocked afterwards. (O_EXCL , F_SETLK).
+    busy (see burn_drive_get_status). The drive is (O_EXCL) unlocked
+    afterwards.
 	@param drive The drive to release.
 	@param eject Nonzero to make the drive eject the disc in it.
 */
@@ -863,32 +838,11 @@ int burn_disc_track_lba_nwa(struct burn_drive *d, struct burn_write_opts *o,
 */
 int burn_disc_get_msc1(struct burn_drive *d, int *start_lba);
 
-
-/* ts A70213 */
-/** Return the best possible estimation of the currently available capacity of
-    the media. This might depend on particular write option settings. For
-    inquiring the space with such a set of options, the drive has to be
-    grabbed and BURN_DRIVE_IDLE. If not, then one will only get a canned value
-    from the most recent automatic inquiry (e.g. during last drive grabbing).
-    An eventual start address from burn_write_opts_set_start_byte() will be
-    subtracted from the obtained capacity estimation. Negative results get
-    defaulted to 0.
-    @param d The drive to query.
-    @param o If not NULL: write parameters to be set on drive before query
-    @return number of most probably available free bytes
-*/
-off_t burn_disc_available_space(struct burn_drive *d,
-                                struct burn_write_opts *o);
-
-
 /* ts A61202 */
 /** Tells the MMC Profile identifier of the loaded media. The drive must be
     grabbed in order to get a non-zero result.
     libburn currently writes only to profiles 0x09 "CD-R", 0x0a "CD-RW",
-    0x11 "DVD-R", 0x12 "DVD-RAM", 0x13 "DVD-RW restricted overwrite",
-    0x14 "DVD-RW Sequential Recording" or 0x1a "DVD+RW".
-    If enabled by burn_allow_untested_profiles() it also writes to profile
-    0x15 "DVD-R/DL Sequential Recording".
+    0x12 "DVD-RAM", 0x13 "DVD-RW restricted overwrite" or 0x1a "DVD+RW".
     @param d The drive where the media is inserted.
     @param pno Profile Number as of mmc5r03c.pdf, table 89
     @param name Profile Name (e.g "CD-RW", unknown profiles have empty name)
@@ -941,7 +895,6 @@ void burn_read_opts_free(struct burn_read_opts *opts);
     @param drive The drive with which to erase a disc.
     @param fast Nonzero to do a fast erase, where only the disc's headers are
                 erased; zero to erase the entire disc.
-                With DVD-RW, fast blanking yields media capable only of DAO.
 */
 void burn_disc_erase(struct burn_drive *drive, int fast);
 
@@ -1026,35 +979,9 @@ int burn_disc_get_format_descr(struct burn_drive *drive, int index,
 */
 void burn_disc_read(struct burn_drive *drive, const struct burn_read_opts *o);
 
-
-
-/* ts A70222 */
-/** The length of a rejection reasons string for burn_precheck_write() and
-    burn_write_opts_auto_write_type() .
-*/
-#define BURN_REASONS_LEN 4096
-
-
-/* ts A70219 */
-/** Examines a completed setup for burn_disc_write() wether it is permissible
-    with drive and media. This function is called by burn_disc_write() but
-    an application might be interested in this check in advance.
-    @param o The options for the writing operation.
-    @param disc The descrition of the disc to be created
-    @param reasons Eventually returns a list of rejection reason statements
-    @param silent 1= do not issue error messages , 0= report problems
-    @return 1 ok, -1= no recordable media detected, 0= other failure
-*/
-int burn_precheck_write(struct burn_write_opts *o, struct burn_disc *disc,
-                        char reasons[BURN_REASONS_LEN], int silent);
-
-/* <<< enabling switch for internal usage and trust in this function */
-#define Libburn_precheck_write_ruleS 1
-
-
 /** Write a disc in the drive. The drive must be grabbed successfully before
     calling this function. Always ensure that the drive reports a status of
-    BURN_DISC_BLANK ot BURN_DISC_APPENDABLE before calling this function.
+    BURN_DISC_BLANK before calling this function.
     Note: write_type BURN_WRITE_SAO is currently not capable of writing a mix
     of data and audio tracks. You must use BURN_WRITE_TAO for such sessions.
     To be set by burn_write_opts_set_write_type(). 
@@ -1232,19 +1159,6 @@ struct burn_disc *burn_drive_get_disc(struct burn_drive *d);
 enum burn_source_status burn_track_set_source(struct burn_track *t,
 					      struct burn_source *s);
 
-
-/* ts A70218 */
-/** Set a default track size to be used only if the track turns out to be of
-    unpredictable length and if the effective write type demands a fixed size.
-    This can be useful to enable write types CD SAO or DVD DAO together with
-    a track source like stdin. If the track source delivers fewer bytes than
-    announced then the track will be padded up with zeros.
-    @param t The track to change
-    @param size The size to set
-    @return 0=failure 1=sucess
-*/
-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
 */
@@ -1264,17 +1178,6 @@ 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
 */
@@ -1289,51 +1192,12 @@ int burn_track_get_counters(struct burn_track *t,
 
 
 /** Sets drive read and write speed
-    Note: "k" is 1000, not 1024. 1xCD = 176.4 k/s, 1xDVD = 1385 k/s.
-          Fractional speeds should be rounded up. Like 4xCD = 706.
     @param d The drive to set speed for
-    @param read Read speed in k/s (0 is max, -1 is min).
-    @param write Write speed in k/s (0 is max, -1 is min). 
+    @param read Read speed in k/s (0 is max)
+    @param write Write speed in k/s (0 is max)
 */
 void burn_drive_set_speed(struct burn_drive *d, int read, int write);
 
-
-/* ts A70711 */
-/** Controls the behavior with writing when the drive buffer is suspected to
-    be full. To check and wait for enough free buffer space before writing
-    will move the task of waiting from the operating system's device driver
-    to libburn. While writing is going on and waiting is enabled, any write
-    operation will be checked wether it will fill the drive buffer up to
-    more than max_percent. If so, then waiting will happen until the buffer
-    fill is predicted with at most min_percent.
-    Thus: if min_percent < max_percent then transfer rate will oscillate. 
-    This may allow the driver to operate on other devices, e.g. a disk from
-    which to read the input for writing. On the other hand, this checking might
-    reduce maximum throughput to the drive or even get misled by faulty buffer
-    fill replies from the drive.
-    If a setting parameter is < 0, then this setting will stay unchanged
-    by the call.
-    Known burner or media specific pitfalls:
-    To have max_percent larger than the burner's best reported buffer fill has
-    the same effect as min_percent==max_percent. Some burners do not report
-    their full buffer with all media types. Some are not suitable because
-    they report their buffer fill with delay.
-    @param d The drive to control
-    @param enable 0= disable , 1= enable waiting , (-1 = do not change setting)
-    @param min_usec Shortest possible sleeping period (given in micro seconds)
-    @param max_usec Longest possible sleeping period (given in micro seconds)
-    @param timeout_sec If a single write has to wait longer than this number
-                       of seconds, then waiting gets disabled and mindless
-                       writing starts. A value of 0 disables this timeout.
-    @param min_percent Minimum of desired buffer oscillation: 25 to 100
-    @param max_percent Maximum of desired buffer oscillation: 25 to 100
-    @return 1=success , 0=failure
-*/
-int burn_drive_set_buffer_waiting(struct burn_drive *d, int enable,
-                                int min_usec, int max_usec, int timeout_sec,
-                                int min_percent, int max_percent);
-
-
 /* these are for my debugging, they will disappear */
 void burn_structure_print_disc(struct burn_disc *d);
 void burn_structure_print_session(struct burn_session *s);
@@ -1351,7 +1215,6 @@ int burn_write_opts_set_write_type(struct burn_write_opts *opts,
 				   enum burn_write_types write_type,
 				   int block_type);
 
-
 /* ts A70207 */
 /** As an alternative to burn_write_opts_set_write_type() this function tries
     to find a suitable write type and block type for a given write job
@@ -1360,15 +1223,12 @@ int burn_write_opts_set_write_type(struct burn_write_opts *opts,
     @param opts The nearly complete write opts to change
     @param disc The already composed session and track model
     @param reasons This text string collects reasons for decision resp. failure
-    @param flag Bitfield for control purposes:
-                bit0= do not choose type but check the one that is already set
-                bit1= do not issue error messages via burn_msgs queue
-                      (is automatically set with bit0)
+    @param flag Bitfield for control purposes (unused yet, submit 0)
     @return Chosen write type. BURN_WRITE_NONE on failure.
 */
 enum burn_write_types burn_write_opts_auto_write_type(
           struct burn_write_opts *opts, struct burn_disc *disc,
-          char reasons[BURN_REASONS_LEN], int flag);
+          char reasons[1024], int flag);
 
 
 /** Supplies toc entries for writing - not normally required for cd mastering
@@ -1435,29 +1295,6 @@ void burn_write_opts_set_multi(struct burn_write_opts *opts, int multi);
 void burn_write_opts_set_start_byte(struct burn_write_opts *opts, off_t value);
 
 
-/* ts A70213 */
-/** Caution: still immature and likely to change. Problems arose with
-    sequential DVD-RW on one drive.
-
-    Controls wether the whole available space of the media shall be filled up
-    by the last track of the last session.
-    @param opts The write opts to change
-    @param fill_up_media If 1 : fill up by last track, if 0 = do not fill up
-*/
-void burn_write_opts_set_fillup(struct burn_write_opts *opts,
-                                int fill_up_media);
-
-
-/* ts A70303 */
-/** Eventually makes libburn ignore the failure of some conformance checks:
-    - the check wether CD write+block type is supported by the drive
-    - the check wether the media profile supports simulated burning 
-    @param opts The write opts to change
-    @param use_force 1=ignore above checks, 0=refuse work on failed check
-*/
-void burn_write_opts_set_force(struct burn_write_opts *opts, int use_force);
-
-
 /** Sets whether to read in raw mode or not
     @param opts The read opts to change
     @param raw_mode If non-zero, reading will be done in raw mode, so that everything in the data tracks on the
@@ -1554,26 +1391,6 @@ int burn_drive_get_read_speed(struct burn_drive *d);
 int burn_drive_get_speedlist(struct burn_drive *d,
                              struct burn_speed_descriptor **speed_list);
 
-/* ts A70713 */
-/** Look up the fastest speed descriptor which is not faster than the given
-    speed_goal. If it is 0, then the fastest one is chosen among the
-    descriptors with the highest end_lba. If it is -1 then the slowest speed
-    descriptor is chosen regardless of end_lba. Parameter flag decides wether
-    the speed goal means write speed or read speed.
-    @param d Drive to query
-    @param speed_goal Upper limit for speed,
-                      0=search for maximum speed , -1 search for minimum speed
-    @param best_descr Result of the search, NULL if no match
-    @param flag Bitfield for control purposes
-                bit0= look for best read speed rather than write speed
-                bit1= look for any source type (else look for source==2 first
-	              and for any other source type only with CD media)
-    @return >0 indicates a valid best_descr, 0 = no valid best_descr
-*/
-int burn_drive_get_best_speed(struct burn_drive *d, int speed_goal,
-                        struct burn_speed_descriptor **best_descr, int flag);
-
-
 /* ts A61226 */
 /** Dispose a speed descriptor list copy which was obtained by
     burn_drive_get_speedlist().
@@ -1597,7 +1414,7 @@ struct burn_multi_caps {
 	   of multi-session by keeping a disc appendable. But .might_do_sao
 	   will be 0 afterwards, when checking the appendable media.)
 	    1= media may be kept appendable by burn_write_opts_set_multi(o,1)
- 	    0= media will not be appendable
+ 	    0= media will not be apendable appendable
 	*/
 	int multi_session;
 
@@ -1633,8 +1450,6 @@ struct burn_multi_caps {
 	off_t start_range_high;
 
 	/** Potential availability of write modes
-	     4= needs no size prediction, not to be chosen automatically
-	     3= needs size prediction, not to be chosen automatically
   	     2= available, no size prediction necessary
 	     1= available, needs exact size prediction
 	     0= not available
@@ -1645,9 +1460,7 @@ struct burn_multi_caps {
 	int might_do_sao;
 	int might_do_raw;
 
-	/** Generally advised write mode.
-	    Not necessarily the one chosen by burn_write_opts_auto_write_type()
-	    because the burn_disc structure might impose particular demands.
+	/** Advised write mode.
 	*/
 	enum burn_write_types advised_write_mode;
 
@@ -1660,10 +1473,6 @@ struct burn_multi_caps {
 
 	/** Wether the current profile indicates CD media. 1=yes, 0=no */
 	int current_is_cd_profile;
-
-        /* ts A70528, added to version 0.3.7 */
-	/** Wether the current profile is able to perform simulated write */
-	int might_simulate;
 };
 
 /** Allocates a struct burn_multi_caps (see above) and fills it with values
@@ -1683,7 +1492,7 @@ int burn_disc_get_multi_caps(struct burn_drive *d, enum burn_write_types wt,
 			 struct burn_multi_caps **caps, int flag);
 
 /** Removes from memory a multi session info structure which was returned by
-    burn_disc_get_multi_caps(). The pointer *caps gets set to NULL.
+    burn_disc_get_multi_caps(). The pointer *caps gets set o NULL.
     @param caps the info structure to dispose (note: pointer to pointer)
     @return 0 : *caps was already NULL, 1 : memory object was disposed
 */

libburn/libdax_msgs.h

@@ -300,10 +300,9 @@ 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 (SORRY,HIGH)   = Failed to open device
+ 0x00020005 (FATAL,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:
 
@@ -351,26 +350,16 @@ Range "scdbackup"          :  0x00020000 to 0x0002ffff
  0x00020129 (SORRY,HIGH)   = Will not format media type
  0x0002012a (FATAL,HIGH)   = Cannot inquire write mode capabilities
  0x0002012b (FATAL,HIGH)   = Drive offers no suitable write mode with this job
- 0x0002012c (SORRY,HIGH)   = Too many logical tracks recorded
- 0x0002012d (FATAL,HIGH)   = Exceeding range of permissible write addresses
- 0x0002012e (NOTE,HIGH)    = Activated track default size
- 0x0002012f (SORRY,HIGH)   = SAO is restricted to single fixed size session
+
  0x00020130 (SORRY,HIGH)   = Drive and media state unsuitable for blanking
  0x00020131 (SORRY,HIGH)   = No suitable formatting type offered by drive
  0x00020132 (SORRY,HIGH)   = Selected format is not suitable for libburn
  0x00020133 (SORRY,HIGH)   = Cannot mix data and audio in SAO mode
  0x00020134 (NOTE,HIGH)    = Defaulted TAO to DAO
  0x00020135 (SORRY,HIGH)   = Cannot perform TAO, job unsuitable for DAO
- 0x00020136 (SORRY,HIGH)   = DAO burning restricted to single fixed size track
+ 0x00020136 (SORRY,HIGH)   = DAO Burning restricted to single fixed size track
  0x00020137 (HINT,HIGH)    = TAO would be possible
  0x00020138 (FATAL,HIGH)   = Cannot reserve track
- 0x00020139 (SORRY,HIGH)   = Write job parameters are unsuitable
- 0x0002013a (FATAL,HIGH)   = No suitable media detected
- 0x0002013b (DEBUG,HIGH)   = SCSI command indicates host or driver error
- 0x0002013c (SORRY,HIGH)   = Malformed capabilities page 2Ah received
- 0x0002013d (DEBUG,LOW)    = Waiting for free buffer space takes long time
- 0x0002013e (SORRY,HIGH)   = Timeout with waiting for free buffer. Now disabled
- 0x0002013f (DEBUG,LOW)    = Reporting total time spent with waiting for buffer
 
 
  libdax_audioxtr:

libburn/mmc.h

@@ -69,7 +69,4 @@ int mmc_compose_mode_page_5(struct burn_drive *d,
                             unsigned char *pd);
 
 
-/* mmc5r03c.pdf 4.3.4.4.1 d) "The maximum number of RZones is 2 302." */
-#define BURN_MMC_FAKE_TOC_MAX_SIZE 2302
-
 #endif /*__MMC*/

libburn/options.c

@@ -36,8 +36,6 @@ struct burn_write_opts *burn_write_opts_new(struct burn_drive *drive)
 	opts->obs = -1;
 	opts->obs_pad = 0;
 	opts->start_byte = -1;
-	opts->fill_up_media = 0;
-	opts->force_is_set = 0;
 	opts->has_mediacatalog = 0;
 	opts->format = BURN_CDROM;
 	opts->multi = 0;
@@ -124,19 +122,11 @@ void burn_write_opts_set_format(struct burn_write_opts *opts, int format)
 
 int burn_write_opts_set_simulate(struct burn_write_opts *opts, int sim)
 {
-/* <<< ts A70529 :
-       One cannot predict the ability to simulate from page 05h
-       information alone. This check is now done later in 
-       function  burn_write_opts_auto_write_type().
-
 	if (opts->drive->mdata->simulate) {
 		opts->simulate = sim;
 		return 1;
 	}
 	return 0;
-*/
-	opts->simulate = !!sim;
-	return 1;
 }
 
 int burn_write_opts_set_underrun_proof(struct burn_write_opts *opts,
@@ -182,199 +172,92 @@ void burn_write_opts_set_start_byte(struct burn_write_opts *opts, off_t value)
 
 
 /* ts A70207 API */
-/** @param flag Bitfield for control purposes:
-                bit0= do not choose type but check the one that is already set
-                bit1= do not issue error messages via burn_msgs queue
-*/
 enum burn_write_types burn_write_opts_auto_write_type(
 		struct burn_write_opts *opts, struct burn_disc *disc,
-		char reasons[BURN_REASONS_LEN], int flag)
+		char reasons[1024], int flag)
 {
 	struct burn_multi_caps *caps = NULL;
 	struct burn_drive *d = opts->drive;
 	struct burn_disc_mode_demands demands;
-	enum burn_write_types wt;
-	int ret, would_do_sao = 0;
+	int ret;
 	char *reason_pt;
 
 	reasons[0] = 0;
-
-	if (d->status != BURN_DISC_BLANK &&
-	    d->status != BURN_DISC_APPENDABLE){
-		if (d->status == BURN_DISC_FULL)
-			strcat(reasons, "MEDIA: closed or not recordable, ");
-		else
-			strcat(reasons,"MEDIA: no writeable media detected, ");
-		if (!(flag & 3))
-			libdax_msgs_submit(libdax_messenger, d->global_index,
-				0x0002013a,
-				LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
-				"No suitable media detected", 0, 0);
-		return BURN_WRITE_NONE;
-	}
-	ret = burn_disc_get_write_mode_demands(disc, opts, &demands,
-			 			!!opts->fill_up_media);
+	ret = burn_disc_get_write_mode_demands(disc, &demands, 0);
 	if (ret <= 0) {
 		strcat(reasons, "cannot recognize job demands, ");
-		{wt = BURN_WRITE_NONE; goto ex;}
+		return BURN_WRITE_NONE;
 	}
 	if (demands.exotic_track && !d->current_is_cd_profile) {
+		libdax_msgs_submit(libdax_messenger, d->global_index,
+			0x00020123,
+			LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
+			"DVD Media are unsuitable for desired track type",
+			0, 0);
 		if (demands.audio)
 			strcat(reasons, "audio track prohibited by non-CD, ");
 		else
 			strcat(reasons, "exotic track prohibited by non-CD, ");
-		{wt = BURN_WRITE_NONE; goto ex;}
+		return BURN_WRITE_NONE;
 	}
-	if ((flag & 1) && opts->write_type != BURN_WRITE_SAO)
-		goto try_tao;
-	reason_pt = reasons + strlen(reasons);
-	strcat(reasons, "SAO: ");
-	if (d->status != BURN_DISC_BLANK) {
-		strcat(reasons, "write type SAO works only on blank media, ");
-		goto try_tao;
-	}
-	burn_disc_free_multi_caps(&caps);
+	
 	ret = burn_disc_get_multi_caps(d, BURN_WRITE_SAO, &caps, 0);
 	if (ret < 0) {
 no_caps:;
+		libdax_msgs_submit(libdax_messenger, d->global_index,
+				0x0002012a,
+				LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
+				"Cannot inquire write mode capabilities",
+				0, 0);
 		strcat(reasons, "cannot inquire write mode capabilities, ");
-		{wt = BURN_WRITE_NONE; goto ex;}
-	} else if (ret == 0) {
-		strcat(reasons, "no SAO offered by drive and media, ");
-		goto no_sao;
-	}
-	if ((opts->multi || demands.multi_session) &&
-	    !caps->multi_session)
-		strcat(reasons, "multi session capability lacking, ");
-	if (demands.will_append)
-		strcat(reasons, "appended session capability lacking, ");
-	if (demands.multi_track && !caps->multi_track)
-		strcat(reasons, "multi track capability lacking, ");
-	if (demands.unknown_track_size == 1 &&
-	    (caps->might_do_sao == 1 || caps->might_do_sao == 3))
-		strcat(reasons, "track size unpredictable, ");
-	if (demands.mixed_mode)
-		strcat(reasons, "tracks of different modes mixed, ");
-	if (demands.exotic_track && !d->current_is_cd_profile)
-		strcat(reasons, "non-data track on non-cd, ");
-	else if (d->current_is_cd_profile)
-		if ((d->block_types[BURN_WRITE_TAO] & demands.block_types) !=
-			demands.block_types)
-			strcat(reasons, "drive dislikes block type, ");
-	if (d->current_is_cd_profile && opts->fill_up_media)
-		strcat(reasons, "cd sao cannot do media fill up yet, ");
-	if (strcmp(reason_pt, "SAO: ") != 0)
-		goto no_sao;
-	would_do_sao = 1;
-	if (demands.unknown_track_size == 2 && (!(flag & 1)) &&
-	    (caps->might_do_sao == 1 || caps->might_do_sao == 3)) {
-		strcat(reasons, "would have to use default track sizes, ");
-		goto no_sao;
-	} else if (caps->might_do_sao >= 3 && !(flag & 1))
-		goto try_tao;
-do_sao:;
-	if (caps->might_simulate == 0 && opts->simulate && !opts->force_is_set)
-		goto no_simulate;
-	if (!(flag & 1))
-		burn_write_opts_set_write_type(
-					opts, BURN_WRITE_SAO, BURN_BLOCK_SAO);
-	{wt = BURN_WRITE_SAO; goto ex;}
+		return BURN_WRITE_NONE;
+	} if (ret > 0) {
+		reason_pt = reasons + strlen(reasons);
+		strcat(reasons, "SAO: ");
+		if ((opts->multi || demands.multi_session) &&
+		    !caps->multi_session)
+			strcat(reasons, "multi session capability lacking, ");
+		if (demands.multi_track && !caps->multi_track)
+			strcat(reasons, "multi track capability lacking, ");
+		if (demands.unknown_track_size)
+			strcat(reasons, "track size unpredictable, ");
+		if (demands.mixed_mode)
+			strcat(reasons, "tracks of different modes mixed, ");
+		if (strcmp(reason_pt, "SAO: ") != 0)
+			goto no_sao;
+		burn_write_opts_set_write_type(opts,
+					BURN_WRITE_SAO, BURN_BLOCK_SAO);
+		return BURN_WRITE_SAO;
+	} else
+		strcat(reasons, "SAO: no SAO offered by drive and media, ");
 no_sao:;
-try_tao:;
-	if ((flag & 1) && opts->write_type != BURN_WRITE_TAO)
-		goto try_raw;
+	burn_disc_free_multi_caps(&caps);
+	strcat(reasons, "\n");
 	reason_pt = reasons + strlen(reasons);
 	strcat(reasons, "TAO: ");
-	burn_disc_free_multi_caps(&caps);
 	ret = burn_disc_get_multi_caps(d, BURN_WRITE_TAO, &caps, 0);
 	if (ret < 0)
 		goto no_caps;
 	if (ret == 0) {	
 		strcat(reasons, "no TAO offered by drive and media, ");
-		goto no_tao;
-	}
-	if ((opts->multi || demands.multi_session) && !caps->multi_session)
-		strcat(reasons, "multi session capability lacking, ");
-	if (demands.multi_track && !caps->multi_track)
-		strcat(reasons, "multi track capability lacking, ");
-	if (demands.exotic_track && !d->current_is_cd_profile)
-		strcat(reasons, "non-data track on non-cd, ");
-	if (d->current_is_cd_profile && !opts->force_is_set)
-		if ((d->block_types[BURN_WRITE_TAO] & demands.block_types) !=
-			demands.block_types)
-			strcat(reasons, "drive dislikes block type, ");
-	if (strcmp(reason_pt, "TAO: ") != 0)
-		goto no_tao;
-	/* ( TAO data/audio block size will be handled automatically ) */
-	if (caps->might_simulate == 0 && opts->simulate && !opts->force_is_set)
-		goto no_simulate;
-	if (!(flag & 1))
-		burn_write_opts_set_write_type(
-				opts, BURN_WRITE_TAO, BURN_BLOCK_MODE1);
-	{wt = BURN_WRITE_TAO; goto ex;}
-no_tao:;
-	if (would_do_sao && !(flag & 1))
-		goto do_sao;
-	if (!d->current_is_cd_profile)
-		goto no_write_mode;
-try_raw:;
-	if ((flag & 1) && opts->write_type != BURN_WRITE_RAW)
-		goto no_write_mode;
-
-	if (!(flag & 1)) /* For now: no automatic raw write modes */
-		goto no_write_mode;
-
-	reason_pt = reasons + strlen(reasons);
-	strcat(reasons, "RAW: ");
-	if (!d->current_is_cd_profile)
-		strcat(reasons, "write type RAW prohibited by non-cd, ");
-	else if (d->status != BURN_DISC_BLANK)
-		strcat(reasons, "write type RAW works only on blank media, ");
-	else if ((d->block_types[BURN_WRITE_TAO] & demands.block_types) !=
-						    	demands.block_types)
-		strcat(reasons, "drive dislikes block type, ");
-	if (strcmp(reason_pt, "RAW: ") != 0)
-		goto no_write_mode;
-	if (!opts->force_is_set)
-		goto no_simulate;
-
-	/*  For now: no setting of raw write modes */
-
-	{wt = BURN_WRITE_RAW; goto ex;}
-
 no_write_mode:;
-	{wt = BURN_WRITE_NONE; goto ex;}
-
-no_simulate:;
-	strcat(reasons,
-	       "simulation of write job not supported by drive and media, ");
-	{wt = BURN_WRITE_NONE; goto ex;}
-	
-ex:;
-	burn_disc_free_multi_caps(&caps);
-	if (wt == BURN_WRITE_NONE && !(flag & 3)) {
 		libdax_msgs_submit(libdax_messenger, d->global_index,
 			0x0002012b,
 			LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
 			"Drive offers no suitable write mode with this job",
 			0, 0);
+		return BURN_WRITE_NONE;
 	}
-	return wt;
-}
-
-
-/* ts A70213 : new API function */
-void burn_write_opts_set_fillup(struct burn_write_opts *opts,int fill_up_media)
-{
-	opts->fill_up_media = !!fill_up_media;
-	return;
-}
-
-
-/* ts A70303: API */
-void burn_write_opts_set_force(struct burn_write_opts *opts, int use_force)
-{
-	opts->force_is_set = !!use_force;
+	if ((opts->multi || demands.multi_session) && !caps->multi_session)
+		strcat(reasons, "multi session capability lacking, ");
+	if (demands.multi_track && !caps->multi_track)
+		strcat(reasons, "multi track capability lacking, ");
+	if (strcmp(reason_pt, "TAO: ") != 0)
+		goto no_write_mode;
+	/* ( TAO data/audio block size will be handled automatically ) */
+	burn_write_opts_set_write_type(opts,
+				BURN_WRITE_TAO, BURN_BLOCK_MODE1);
+	return BURN_WRITE_TAO;
 }
 
 

libburn/options.h

@@ -41,14 +41,6 @@ struct burn_write_opts
 	/* ts A61222 : Start address for media which allow a choice */
 	off_t start_byte;
 
-	/* ts A70213 : Wether to fill up the available space on media */
-	int fill_up_media;
-
-	/* ts A70303 : Wether to override conformance checks:
-	   - the check wether CD write+block type is supported by the drive 
-	*/
-	int force_is_set;
-
 	/** A disc can have a media catalog number */
 	int has_mediacatalog;
 	unsigned char mediacatalog[13];

libburn/os-linux.h

@@ -42,10 +42,7 @@ SIGKILL, SIGCHLD, SIGSTOP, SIGURG, SIGWINCH
 
 /* The maximum size for a (SCSI) i/o transaction */
 /* Important : MUST be at least 32768 ! */
-/* ts A70523 : >32k seems not good with kernel 2.4 USB drivers and audio
 #define BURN_OS_TRANSPORT_BUFFER_SIZE 65536
-*/
-#define BURN_OS_TRANSPORT_BUFFER_SIZE 32768
 
 
 /* To hold the index number of the most recently delivered address from
@@ -55,10 +52,6 @@ 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().
 */
@@ -67,7 +60,5 @@ int fd; \
  \
 /* ts A60926 : trying to lock against growisofs /dev/srN, /dev/scdN */ \
 int sibling_count; \
-int sibling_fds[BURN_OS_SG_MAX_SIBLINGS]; \
-/* ts A70409 : DDLP */ \
-char sibling_fnames[BURN_OS_SG_MAX_SIBLINGS][BURN_OS_SG_MAX_NAMELEN];
+int sibling_fds[LIBBURN_SG_MAX_SIBLINGS];
 

libburn/sbc.c

@@ -3,44 +3,36 @@
 /* scsi block commands */
 
 #include <string.h>
-#include <unistd.h>
 
 #include "transport.h"
 #include "sbc.h"
-#include "spc.h"
 #include "options.h"
 
 /* spc command set */
-static unsigned char SBC_LOAD[] = { 0x1b, 0, 0, 0, 3, 0 };
-static unsigned char SBC_UNLOAD[] = { 0x1b, 0, 0, 0, 2, 0 };
-static unsigned char SBC_START_UNIT[] = { 0x1b, 0, 0, 0, 1, 0 };
+static char SBC_LOAD[] = { 0x1b, 0, 0, 0, 3, 0 };
+static char SBC_UNLOAD[] = { 0x1b, 0, 0, 0, 2, 0 };
+static char SBC_START_UNIT[] = { 0x1b, 0, 0, 0, 1, 0 };
 
 void sbc_load(struct burn_drive *d)
 {
 	struct command c;
 
-	scsi_init_command(&c, SBC_LOAD, sizeof(SBC_LOAD));
-/*
 	memcpy(c.opcode, SBC_LOAD, sizeof(SBC_LOAD));
-	c.oplen = sizeof(SBC_LOAD);
-	c.page = NULL;
-*/
 	c.retry = 1;
+	c.oplen = sizeof(SBC_LOAD);
 	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)
 {
 	struct command c;
 
-	scsi_init_command(&c, SBC_UNLOAD, sizeof(SBC_UNLOAD));
-/*
-	memcpy(c.opcode, SBC_UNLOAD, sizeof(SBC_UNLOAD));
-	c.oplen = sizeof(SBC_UNLOAD);
 	c.page = NULL;
-*/
+	memcpy(c.opcode, SBC_UNLOAD, sizeof(SBC_UNLOAD));
+	c.oplen = 1;
+	c.oplen = sizeof(SBC_UNLOAD);
 	c.page = NULL;
 	c.dir = NO_TRANSFER;
 	d->issue_command(d, &c);
@@ -51,14 +43,11 @@ int sbc_start_unit(struct burn_drive *d)
 {
 	struct command c;
 
-	scsi_init_command(&c, SBC_START_UNIT, sizeof(SBC_START_UNIT));
-/*
 	memcpy(c.opcode, SBC_START_UNIT, sizeof(SBC_START_UNIT));
-	c.oplen = sizeof(SBC_START_UNIT);
-	c.page = NULL;
-*/
 	c.retry = 1;
+	c.oplen = sizeof(SBC_START_UNIT);
 	c.dir = NO_TRANSFER;
+	c.page = NULL;
 	d->issue_command(d, &c);
 	return (c.error==0);
 }

libburn/sector.c

@@ -218,8 +218,7 @@ static unsigned char *get_sector(struct burn_write_opts *opts,
 	seclen += burn_subcode_length(outmode);
 
 	/* ts A61219 : opts->obs is eventually a 32k trigger for DVD */
-	if (out->bytes + seclen > BUFFER_SIZE ||
-	    (opts->obs > 0 && out->bytes + seclen > opts->obs)) {
+	if (out->bytes + (seclen) > BUFFER_SIZE || out->bytes == opts->obs) {
 		int err;
 		err = d->write(d, d->nwa, out);
 		if (err == BE_CANCELLED)

libburn/sg-linux.c

@@ -71,26 +71,14 @@ 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>
 
-#include <scsi/sg.h>
-/* Values within sg_io_hdr_t indicating success after ioctl(SG_IO) : */
-/* .host_status : from http://tldp.org/HOWTO/SCSI-Generic-HOWTO/x291.html */
-#define Libburn_sg_host_oK 0
-/* .driver_status : from http://tldp.org/HOWTO/SCSI-Generic-HOWTO/x322.html */
-#define Libburn_sg_driver_oK 0
-
-
-/* ts A61211 : to eventually recognize CD devices on /dev/sr* */
+/* ts A61211 : to recognize CD devices on /dev/sr* */
 #include <linux/cdrom.h>
 
 
-/** 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;
-
-
+/* ts A61211 : preparing for exploration of recent Linux ATA adventures */
 /** PORTING : Device file families for bus scanning and drive access.
     Both device families must support the following ioctls:
       SG_IO,
@@ -116,22 +104,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) */
-/* But try with 0 first. There is hope via CDROM_DRIVE_STATUS. */
+/* NEW INFO: 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;
@@ -180,15 +168,12 @@ 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 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_EXCL
    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;
 
@@ -203,53 +188,6 @@ 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)
 {
@@ -291,86 +229,12 @@ 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.
@@ -380,22 +244,17 @@ 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.
-	   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." 
-	*/
+	   default mode for both now. Disable on own risk. */
 	if(burn_sg_open_o_nonblock)
-		open_mode |= O_NDELAY;
+		open_mode |= O_NONBLOCK;
 
 /* <<< 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_NDELAY= %d\n",
-		!!(open_mode&O_EXCL),!!(open_mode&O_NDELAY));
+		"libburn: experimental: O_EXCL= %d , O_NONBLOCK= %d\n",
+		!!(open_mode&O_EXCL),!!(open_mode&O_NONBLOCK));
 */
           
 	fd = open(fname, open_mode);
@@ -414,25 +273,50 @@ 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_SORRY, LIBDAX_MSGS_PRIO_HIGH,
+				LIBDAX_MSGS_SEV_FATAL, 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[],
-				char sibling_fnames[][BURN_OS_SG_MAX_NAMELEN],
-				int *sibling_count)
+static int sg_release_siblings(int sibling_fds[], int *sibling_count)
 {
 	int i;
 	char msg[81];
 
 	for(i= 0; i < *sibling_count; i++)
-		sg_close_drive_fd(sibling_fnames[i], -1, &(sibling_fds[i]), 0);
+		sg_close_drive_fd(NULL, -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,
@@ -450,8 +334,7 @@ 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_fnames,
-				&(d->sibling_count));
+	sg_release_siblings(d->sibling_fds, &(d->sibling_count));
 	ret = sg_close_drive_fd(d->devname, d->global_index, &(d->fd), 0);
 	return ret;
 }
@@ -459,45 +342,29 @@ static int sg_close_drive(struct burn_drive *d)
 
 /* ts A60926 */
 static int sg_open_scsi_siblings(char *path, int driveno,
-			int sibling_fds[],
-			char sibling_fnames[][BURN_OS_SG_MAX_NAMELEN],
-			int *sibling_count,
-			int host_no, int channel_no, int id_no, int lun_no)
+			  int sibling_fds[], 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/sg%d", ""};
-					/* ts A70609: removed "/dev/st%d" */
+	static char tldev[][81]= {"/dev/sr%d", "/dev/scd%d", "/dev/st%d", 
+				  "/dev/sg%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_fnames,
-					sibling_count);
+		sg_release_siblings(sibling_fds, 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)
@@ -511,7 +378,7 @@ static int sg_open_scsi_siblings(char *path, int driveno,
 			if (fd < 0)
 				goto failed;
 
-			if (*sibling_count>=BURN_OS_SG_MAX_SIBLINGS) {
+			if (*sibling_count>=LIBBURN_SG_MAX_SIBLINGS) {
 				sprintf(msg, "Too many scsi siblings of '%s'",
 					path);
 				libdax_msgs_submit(libdax_messenger,
@@ -521,20 +388,18 @@ 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_fnames, sibling_count);
+	sg_release_siblings(sibling_fds, sibling_count);
 	return 0;
 }
 
@@ -612,13 +477,10 @@ static void ata_enumerate(void)
 static void sg_enumerate(void)
 {
 	struct sg_scsi_id sid;
-	int i, fd, sibling_fds[BURN_OS_SG_MAX_SIBLINGS], sibling_count= 0, ret;
+	int i, fd, sibling_fds[LIBBURN_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",
@@ -658,16 +520,6 @@ 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) {
@@ -729,8 +581,7 @@ 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_fnames,
-					&sibling_count,
+					fname, -1, sibling_fds, &sibling_count,
 					sid.host_no, sid.channel,
 					sid.scsi_id, sid.lun);
 			if (ret<=0) {
@@ -740,8 +591,7 @@ static void sg_enumerate(void)
 	continue;
 			}
 			/* the final occupation will be done in sg_grab() */
-			sg_release_siblings(sibling_fds, sibling_fnames,
-						&sibling_count);
+			sg_release_siblings(sibling_fds, &sibling_count);
 		}
 #ifdef SCSI_IOCTL_GET_BUS_NUMBER
 		if(bus_no == -1)
@@ -795,7 +645,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<BURN_OS_SG_MAX_SIBLINGS; i++)
+	for(i= 0; i<LIBBURN_SG_MAX_SIBLINGS; i++)
 		out.sibling_fds[i] = -1337;
 
 	/* PORTING: ---------------- end of non portable part ------------ */
@@ -848,7 +698,6 @@ 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)
@@ -944,12 +793,9 @@ int sg_grab(struct burn_drive *d)
 		open_mode |= O_EXCL;
 
 	/* ts A60813
-	   O_NONBLOCK was hardcoded here. So it should stay default mode.
-	   ts A70411
-           Switched to O_NDELAY for LKML statement 2007/4/11/141
-	*/
+	   O_NONBLOCK was hardcoded here. So it should stay default mode. */
 	if(burn_sg_open_o_nonblock)
-		open_mode |= O_NDELAY;
+		open_mode |= O_NONBLOCK;
 
 	/* ts A60813 - A60822
 	   After enumeration the drive fd is probably still open.
@@ -962,15 +808,12 @@ 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_fnames,&(d->sibling_count),
+					&(d->sibling_count),
 					d->host, d->channel, d->id, d->lun);
 			if(ret <= 0)
 				goto drive_is_in_use;
@@ -978,11 +821,6 @@ 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,71 +872,6 @@ int sg_release(struct burn_drive *d)
 }
 
 
-/** ts A70518: 
-    Debugging log facility. Controlled by existence of macros:
-     Libburn_log_sg_commandS          enables logging to file
-                                        /tmp/libburn_sg_command_log
-     Libburn_fflush_log_sg_commandS   enables fflush after each output line
-     Libburn_log_sg_command_stderR    enables additional log to stderr
-*/
-/*
-#define Libburn_log_sg_commandS 1
-#define Libburn_fflush_log_sg_commandS 1
-#define Libburn_log_sg_command_stderR 1
-*/
-
-#ifdef Libburn_log_sg_commandS
-
-/** Logs command (before execution) */
-static int sg_log_cmd(struct command *c, FILE *fp, int flag)
-{
-	int i;
-
-	if (fp != NULL) {
-		for(i = 0; i < 16 && i < c->oplen; i++)
-  			fprintf(fp,"%2.2x ", c->opcode[i]);
-		fprintf(fp, "\n");
-#ifdef Libburn_fflush_log_sg_commandS
-		fflush(fp);
-#endif
-	}
-	if (fp == stderr)
-		return 1;
-#ifdef Libburn_log_sg_command_stderR
-	sg_log_cmd(c, stderr, flag);
-#endif
-	return 1;
-}
-
-
-/** logs outcome of a sg command. flag&1 causes an error message */
-static int sg_log_err(struct command *c, FILE *fp, 
-		sg_io_hdr_t *s,
-		int flag)
-{
-      	if(fp!=NULL) {
-		if(flag & 1)
-  			fprintf(fp,
-			"+++ key=%X  asc=%2.2Xh  ascq=%2.2Xh   (%6d ms)\n",
-				s->sbp[2], s->sbp[12], s->sbp[13],s->duration);
-		else
-			fprintf(fp,"%6d ms\n", s->duration);
-#ifdef Libburn_fflush_log_sg_commandS
-		fflush(fp);
-#endif
-	}
-	if (fp == stderr)
-		return 1;
-#ifdef Libburn_log_sg_command_stderR
-	sg_log_err(c, stderr, s, flag);
-#endif
-	return 1;
-}
-
-
-#endif /* Libburn_log_sg_commandS */
-
-
 /** Sends a SCSI command to the drive, receives reply and evaluates wether
     the command succeeded or shall be retried or finally failed.
     Returned SCSI errors shall not lead to a return value indicating failure.
@@ -1113,10 +886,15 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 	int done = 0, no_c_page = 0;
 	int err;
 	sg_io_hdr_t s;
+/*
+#define Libburn_log_sg_commandS 1
+*/
 
 #ifdef Libburn_log_sg_commandS
 	/* ts A61030 */
 	static FILE *fp= NULL;
+	static int fpcount= 0;
+	int i;
 #endif /* Libburn_log_sg_commandS */
 
 	/* <<< ts A60821
@@ -1132,7 +910,12 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 		fp= fopen("/tmp/libburn_sg_command_log","a");
 		fprintf(fp,"\n-----------------------------------------\n");
 	}
-	sg_log_cmd(c,fp,0);
+	if(fp!=NULL) {
+		for(i=0;i<10;i++)
+	  		fprintf(fp,"%2.2x ", c->opcode[i]);
+		fprintf(fp,"\n");
+		fpcount++;
+	}
 #endif /* Libburn_log_sg_commandS */
 	  
 
@@ -1167,15 +950,7 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 	if (c->page && !no_c_page) {
 		s.dxferp = c->page->data;
 		if (c->dir == FROM_DRIVE) {
-
-			/* ts A70519 : kernel 2.4 usb-storage seems to
-					expect exact dxfer_len for data
-					fetching commands.
-			*/
-			if (c->dxfer_len >= 0)
-				s.dxfer_len = c->dxfer_len;
-			else
-				s.dxfer_len = BUFFER_SIZE;
+			s.dxfer_len = BUFFER_SIZE;
 /* touch page so we can use valgrind */
 			memset(c->page->data, 0, BUFFER_SIZE);
 		} else {
@@ -1238,27 +1013,16 @@ int sg_issue_command(struct burn_drive *d, struct command *c)
 ex:;
 	if (c->error) {
 		scsi_notify_error(d, c, s.sbp, s.sb_len_wr, 0);
-	} else if (s.host_status != Libburn_sg_host_oK || 
-	    s.driver_status != Libburn_sg_driver_oK) {
-		char msg[161];
-
-		sprintf(msg,
-			"SCSI command %2.2Xh indicates host or driver error:",
-			(unsigned int) c->opcode[0]);
-		sprintf(msg+strlen(msg),
-			" host_status= %xh , driver_status= %xh",
-			(unsigned int) s.host_status,
-			(unsigned int) s.driver_status);
-		libdax_msgs_submit(libdax_messenger, d->global_index,
-				0x0002013b,
-				LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
-				msg, 0, 0);
-	}
 
 #ifdef Libburn_log_sg_commandS
-	sg_log_err(c, fp, &s, c->error != 0);
+        	if(fp!=NULL) {
+  			fprintf(fp,"+++ key=%X  asc=%2.2Xh  ascq=%2.2Xh\n",
+				s.sbp[2], s.sbp[12], s.sbp[13]);
+			fpcount++;
+		}
 #endif /* Libburn_log_sg_commandS */
 
+	}
 	return 1;
 }
 
@@ -1270,33 +1034,19 @@ 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, open_mode = O_RDONLY;
+	int fd, ret, l;
 	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 */
 
-	/* 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);
+	fd = open(path, O_RDONLY | O_NONBLOCK);
 	if(fd < 0)
 		return 0;
 

libburn/spc.c

@@ -29,8 +29,7 @@ extern struct libdax_msgs *libdax_messenger;
 
 
 /* spc command set */
-/* ts A70519 : allocation length byte 3+4 was 0,255 */
-static unsigned char SPC_INQUIRY[] = { 0x12, 0, 0, 0, 36, 0 };
+static unsigned char SPC_INQUIRY[] = { 0x12, 0, 0, 0, 255, 0 };
 
 /*static char SPC_TEST[]={0,0,0,0,0,0};*/
 static unsigned char SPC_PREVENT[] = { 0x1e, 0, 0, 0, 1, 0 };
@@ -41,84 +40,28 @@ 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 };
 
-
-/* ts A70519 : An initializer for the abstract SCSI command structure */
-int scsi_init_command(struct command *c, unsigned char *opcode, int oplen)
-{
-	if (oplen > 16)
-		return 0;
-	memcpy(c->opcode, opcode, oplen);
-	c->oplen = oplen;
-	c->dir = NO_TRANSFER;
-	c->dxfer_len = -1;
-	memset(c->sense, 0, sizeof(c->sense));
-	c->error = 0;
-	c->retry = 0;
-	c->page = NULL;
-	return 1;
-}
-
-
-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)
 {
 	struct command c;
 
-	scsi_init_command(&c, SPC_TEST_UNIT_READY,sizeof(SPC_TEST_UNIT_READY));
-/*
+	c.retry = 0;
 	c.oplen = sizeof(SPC_TEST_UNIT_READY);
 	memcpy(c.opcode, SPC_TEST_UNIT_READY, sizeof(SPC_TEST_UNIT_READY));
 	c.page = NULL;
-*/
-	c.retry = 0;
 	c.dir = NO_TRANSFER;
 	d->issue_command(d, &c);
-	if (c.error) {
-		*key= c.sense[2];
-		*asc= c.sense[12];
-		*ascq= c.sense[13];
+	if (c.error)
 		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 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;
 
-	scsi_init_command(&c, SPC_REQUEST_SENSE, sizeof(SPC_REQUEST_SENSE));
 	c.retry = 0;
-/*
 	c.oplen = sizeof(SPC_REQUEST_SENSE);
 	memcpy(c.opcode, SPC_REQUEST_SENSE, sizeof(SPC_REQUEST_SENSE));
-*/
-	c.dxfer_len= c.opcode[4];
-	c.retry = 0;
 	c.page = buf;
 	c.page->sectors = 0;
 	c.page->bytes = 0;
@@ -140,29 +83,24 @@ void spc_inquiry(struct burn_drive *d)
 	struct burn_scsi_inquiry_data *id;
 	struct command c;
 
-	scsi_init_command(&c, SPC_INQUIRY, sizeof(SPC_INQUIRY));
-/*
 	memcpy(c.opcode, SPC_INQUIRY, sizeof(SPC_INQUIRY));
-	c.oplen = sizeof(SPC_INQUIRY);
-*/
-	c.dxfer_len= (c.opcode[3] << 8) | c.opcode[4];
 	c.retry = 1;
+	c.oplen = sizeof(SPC_INQUIRY);
 	c.page = &buf;
 	c.page->bytes = 0;
 	c.page->sectors = 0;
 	c.dir = FROM_DRIVE;
 	d->issue_command(d, &c);
+
 	id = (struct burn_scsi_inquiry_data *)d->idata;
-	memset(id->vendor, 0, 9);
-	memset(id->product, 0, 17);
-	memset(id->revision, 0, 5);
-	if (c.error) {
-		id->valid = -1;
-		return;
-	}
+	id->vendor[8] = 0;
+	id->product[16] = 0;
+	id->revision[4] = 0;
+
 	memcpy(id->vendor, c.page->data + 8, 8);
 	memcpy(id->product, c.page->data + 16, 16);
 	memcpy(id->revision, c.page->data + 32, 4);
+
 	id->valid = 1;
 	return;
 }
@@ -171,13 +109,10 @@ void spc_prevent(struct burn_drive *d)
 {
 	struct command c;
 
-	scsi_init_command(&c, SPC_PREVENT, sizeof(SPC_PREVENT));
-/*
 	memcpy(c.opcode, SPC_PREVENT, sizeof(SPC_PREVENT));
+	c.retry = 1;
 	c.oplen = sizeof(SPC_PREVENT);
 	c.page = NULL;
-*/
-	c.retry = 1;
 	c.dir = NO_TRANSFER;
 	d->issue_command(d, &c);
 }
@@ -186,27 +121,19 @@ void spc_allow(struct burn_drive *d)
 {
 	struct command c;
 
-	scsi_init_command(&c, SPC_ALLOW, sizeof(SPC_ALLOW));
-/*
 	memcpy(c.opcode, SPC_ALLOW, sizeof(SPC_ALLOW));
+	c.retry = 1;
 	c.oplen = sizeof(SPC_ALLOW);
 	c.page = NULL;
-*/
-	c.retry = 1;
 	c.dir = NO_TRANSFER;
 	d->issue_command(d, &c);
 }
 
-/*
-ts A70518 : Do not call with *alloc_len < 8
-*/
-/** flag&1= do only inquire alloc_len */
-static int spc_sense_caps_al(struct burn_drive *d, int *alloc_len, int flag)
+void spc_sense_caps(struct burn_drive *d)
 {
 	struct buffer buf;
 	struct scsi_mode_data *m;
 	int size, page_length, num_write_speeds = 0, i, speed, ret;
-	int old_alloc_len, was_error = 0;
 	unsigned char *page;
 	struct command c;
 	struct burn_speed_descriptor *sd;
@@ -214,30 +141,15 @@ static int spc_sense_caps_al(struct burn_drive *d, int *alloc_len, int flag)
 	/* ts A61225 : 1 = report about post-MMC-1 speed descriptors */
 	static int speed_debug = 0;
 
-	if (*alloc_len < 8)
-		return 0;
-
-	memset(&buf, 0, sizeof(buf));
-	scsi_init_command(&c, SPC_MODE_SENSE, sizeof(SPC_MODE_SENSE));
-/*
 	memcpy(c.opcode, SPC_MODE_SENSE, sizeof(SPC_MODE_SENSE));
-	c.oplen = sizeof(SPC_MODE_SENSE);
-*/
-	c.dxfer_len = *alloc_len;
-	c.opcode[7] = (c.dxfer_len >> 8) & 0xff;
-	c.opcode[8] = c.dxfer_len & 0xff;
 	c.retry = 1;
+	c.oplen = sizeof(SPC_MODE_SENSE);
 	c.opcode[2] = 0x2A;
 	c.page = &buf;
 	c.page->bytes = 0;
 	c.page->sectors = 0;
 	c.dir = FROM_DRIVE;
 	d->issue_command(d, &c);
-	if (c.error) {
-		memset(&buf, 0, sizeof(buf));
-		d->mdata->valid = -1;
-		was_error = 1;
-	}
 
 	size = c.page->data[0] * 256 + c.page->data[1];
 	m = d->mdata;
@@ -250,14 +162,6 @@ static int spc_sense_caps_al(struct burn_drive *d, int *alloc_len, int flag)
 	   set of speed descriptors. In MMC-5 E.11 it is declared "legacy".
 	*/
 	page_length = page[1];
-	old_alloc_len = *alloc_len;
-	*alloc_len = page_length + 8;
-	if (flag & 1)
-		return !was_error;
-	if (page_length + 8 > old_alloc_len)
-		page_length = old_alloc_len - 8;
-	if (page_length < 22)
-		return 0;
 
 	m->valid = 0;
 	burn_mdata_free_subs(m);
@@ -307,18 +211,6 @@ static int spc_sense_caps_al(struct burn_drive *d, int *alloc_len, int flag)
 
 	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 0;
-	}
-
 	for (i = 0; i < num_write_speeds; i++) {
 		speed = page[32 + 4*i + 2] * 256 + page[32 + 4*i + 3];
 
@@ -360,24 +252,6 @@ try_mmc_get_performance:;
 		fprintf(stderr,
 	  "LIBBURN_DEBUG: ACh min_write_speed = %d , max_write_speed = %d\n",
 		m->min_write_speed, m->max_write_speed);
-	return !was_error;
-}
-
-
-void spc_sense_caps(struct burn_drive *d)
-{
-	int alloc_len, start_len = 22, ret;
-
-	/* first command execution to learn Allocation Length */
-	alloc_len = start_len;
-	ret = spc_sense_caps_al(d, &alloc_len, 1);
-/*
-	fprintf(stderr,"LIBBURN_DEBUG: 5Ah alloc_len = %d , ret = %d\n",
-			alloc_len, ret);
-*/
-	if (alloc_len >= start_len && ret > 0)
-		/* second execution with announced length */
-		spc_sense_caps_al(d, &alloc_len, 0);
 }
 
 
@@ -385,19 +259,13 @@ void spc_sense_error_params(struct burn_drive *d)
 {
 	struct buffer buf;
 	struct scsi_mode_data *m;
-	int size, alloc_len = 12 ;
+	int size;
 	unsigned char *page;
 	struct command c;
 
-	scsi_init_command(&c, SPC_MODE_SENSE, sizeof(SPC_MODE_SENSE));
-/*
 	memcpy(c.opcode, SPC_MODE_SENSE, sizeof(SPC_MODE_SENSE));
-	c.oplen = sizeof(SPC_MODE_SENSE);
-*/
-	c.dxfer_len = alloc_len;
-	c.opcode[7] = (c.dxfer_len >> 8) & 0xff;
-	c.opcode[8] = c.dxfer_len & 0xff;
 	c.retry = 1;
+	c.oplen = sizeof(SPC_MODE_SENSE);
 	c.opcode[2] = 0x01;
 	c.page = &buf;
 	c.page->bytes = 0;
@@ -419,12 +287,9 @@ void spc_select_error_params(struct burn_drive *d,
 	struct buffer buf;
 	struct command c;
 
-	scsi_init_command(&c, SPC_MODE_SELECT, sizeof(SPC_MODE_SELECT));
-/*
 	memcpy(c.opcode, SPC_MODE_SELECT, sizeof(SPC_MODE_SELECT));
-	c.oplen = sizeof(SPC_MODE_SELECT);
-*/
 	c.retry = 1;
+	c.oplen = sizeof(SPC_MODE_SELECT);
 	c.opcode[8] = 8 + 2 + d->mdata->retry_page_length;
 	c.page = &buf;
 	c.page->bytes = 0;
@@ -453,7 +318,7 @@ void spc_sense_write_params(struct burn_drive *d)
 {
 	struct buffer buf;
 	struct scsi_mode_data *m;
-	int size, dummy, alloc_len = 10;
+	int size;
 	unsigned char *page;
 	struct command c;
 
@@ -461,15 +326,9 @@ void spc_sense_write_params(struct burn_drive *d)
 	/* a ssert(d->mdata->cdr_write || d->mdata->cdrw_write ||
 	       d->mdata->dvdr_write || d->mdata->dvdram_write); */
 
-	scsi_init_command(&c, SPC_MODE_SENSE, sizeof(SPC_MODE_SENSE));
-/*
 	memcpy(c.opcode, SPC_MODE_SENSE, sizeof(SPC_MODE_SENSE));
-	c.oplen = sizeof(SPC_MODE_SENSE);
-*/
-	c.dxfer_len = alloc_len;
-	c.opcode[7] = (c.dxfer_len >> 8) & 0xff;
-	c.opcode[8] = c.dxfer_len & 0xff;
 	c.retry = 1;
+	c.oplen = sizeof(SPC_MODE_SENSE);
 	c.opcode[2] = 0x05;
 	c.page = &buf;
 	c.page->bytes = 0;
@@ -484,35 +343,26 @@ void spc_sense_write_params(struct burn_drive *d)
 	m->write_page_length = page[1];
 	m->write_page_valid = 1;
 	mmc_read_disc_info(d);
-
-	/* ts A70212 : try to setup d->media_capacity_remaining */
-	if (d->current_profile == 0x1a || d->current_profile == 0x13 ||
-	    d->current_profile == 0x12)
-		d->read_format_capacities(d, -1);
-	else if (d->status == BURN_DISC_BLANK ||
-	     (d->current_is_cd_profile && d->status == BURN_DISC_APPENDABLE)) {
-		d->get_nwa(d, -1, &dummy, &dummy);
-	}
-	/* others are hopefully up to date from mmc_read_disc_info() */
-
-/*
-        fprintf(stderr, "LIBBURN_DEBUG: media_capacity_remaining = %.f\n",
-                (double) d->media_capacity_remaining);
-*/
-
 }
 
 
+/* ts A61229 */
+#define Libburn_mmc_compose_mode_page_5 1
+
+
 /* remark ts A61104 :
 Although command MODE SELECT is SPC, the content of the
 Write Parameters Mode Page (05h) is MMC (Table 108 in MMC-1). 
-Thus the filling of the mode page is done by mmc_compose_mode_page_5().
+Thus the filling of the mode page should be done by a mmc_ function.
 */
 void spc_select_write_params(struct burn_drive *d,
 			     const struct burn_write_opts *o)
 {
 	struct buffer buf;
 	struct command c;
+#ifndef Libburn_mmc_compose_mode_page_5
+	int bufe, sim;
+#endif
 
 	/* ts A61007 : All current callers are safe. */
 	/* a ssert(o->drive == d); */
@@ -524,12 +374,9 @@ void spc_select_write_params(struct burn_drive *d,
 		o->block_type,spc_block_type(o->block_type));
 	*/
 
-	scsi_init_command(&c, SPC_MODE_SELECT, sizeof(SPC_MODE_SELECT));
-/*
 	memcpy(c.opcode, SPC_MODE_SELECT, sizeof(SPC_MODE_SELECT));
-	c.oplen = sizeof(SPC_MODE_SELECT);
-*/
 	c.retry = 1;
+	c.oplen = sizeof(SPC_MODE_SELECT);
 	c.opcode[8] = 8 + 2 + d->mdata->write_page_length;
 	c.page = &buf;
 	c.page->bytes = 0;
@@ -544,10 +391,40 @@ void spc_select_write_params(struct burn_drive *d,
 	burn_print(12, "using write page length %d (valid %d)\n",
 		   d->mdata->write_page_length, d->mdata->write_page_valid);
 
+#ifdef Libburn_mmc_compose_mode_page_5
+
 	/* ts A61229 */
 	if (mmc_compose_mode_page_5(d, o, c.page->data + 8) <= 0)
 		return;
 
+#else 
+
+	c.page->data[8] = 5;
+	c.page->data[9] = d->mdata->write_page_length;
+
+	bufe = o->underrun_proof;
+	sim = o->simulate;
+	c.page->data[10] = (bufe << 6)
+		+ (sim << 4)
+		+ o->write_type;
+
+	/* ts A61106 : MMC-1 table 110 : multi==0 or multi==3 */
+	c.page->data[11] = ((3 * !!o->multi) << 6) | o->control;
+
+	c.page->data[12] = spc_block_type(o->block_type);
+
+	/* ts A61104 */
+	if(!(o->control&4)) /* audio (MMC-1 table 61) */
+		if(o->write_type == BURN_WRITE_TAO) /* ??? for others too ? */
+			c.page->data[12] = 0; /* Data Block Type: Raw Data */
+
+	c.page->data[22] = 0;
+	c.page->data[23] = 150;	/* audio pause length */
+
+/*XXX need session format! */
+
+#endif /* ! Libburn_mmc_compose_mode_page_5 */
+
 	c.dir = TO_DRIVE;
 	d->issue_command(d, &c);
 }
@@ -557,9 +434,16 @@ void spc_getcaps(struct burn_drive *d)
 	spc_inquiry(d);
 	spc_sense_caps(d);
 	spc_sense_error_params(d);
+
+	/* <<< for debugging. >>> ??? to be fixely included here ?
+	mmc_read_format_capacities(d, -1);
+	*/
 }
 
 /*
+only called when a blank is present, so we set type to blank
+(on the last pass)
+
 don't check totally stupid modes (raw/raw0)
 some drives say they're ok, and they're not.
 */
@@ -569,30 +453,15 @@ void spc_probe_write_modes(struct burn_drive *d)
 	struct buffer buf;
 	int try_write_type = 1;
 	int try_block_type = 0;
-	int key, asc, ascq, useable_write_type = -1, useable_block_type = -1;
-	int last_try = 0;
+	int key, asc, ascq;
 	struct command c;
 
-	/* ts A70213 : added pseudo try_write_type 4 to set a suitable mode */
-	while (try_write_type != 5) {
+	while (try_write_type != 4) {
 		burn_print(9, "trying %d, %d\n", try_write_type,
 			   try_block_type);
-
-		/* ts A70213 */
-		if (try_write_type == 4) {
-			/* Pseudo write type NONE . Set a useable write mode */
-			if (useable_write_type == -1)
-	break;
-			try_write_type = useable_write_type;
-			try_block_type = useable_block_type;
-			last_try= 1;
-		}
-		scsi_init_command(&c, SPC_MODE_SELECT,sizeof(SPC_MODE_SELECT));
-/*
 		memcpy(c.opcode, SPC_MODE_SELECT, sizeof(SPC_MODE_SELECT));
-		c.oplen = sizeof(SPC_MODE_SELECT);
-*/
 		c.retry = 1;
+		c.oplen = sizeof(SPC_MODE_SELECT);
 		c.opcode[8] = 8 + 2 + 0x32;
 		c.page = &buf;
 
@@ -614,9 +483,6 @@ void spc_probe_write_modes(struct burn_drive *d)
 		d->issue_command(d, &c);
 		d->silent_on_scsi_error = 0;
 
-		if (last_try)
-	break;
-
 		key = c.sense[2];
 		asc = c.sense[12];
 		ascq = c.sense[13];
@@ -632,15 +498,6 @@ void spc_probe_write_modes(struct burn_drive *d)
 			else
 				d->block_types[try_write_type] |=
 					1 << try_block_type;
-
-			/* ts A70213 */
-			if ((useable_write_type < 0 && try_write_type > 0) ||
-			    (try_write_type == 1 && try_block_type == 8)) {
-			 	/* Packet is not supported yet.
-				   Prefer TAO MODE_1. */
-				useable_write_type = try_write_type;
-				useable_block_type = try_block_type;
-			} 
 		}
 		switch (try_block_type) {
 		case 0:

libburn/spc.h

@@ -20,16 +20,8 @@ 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);
@@ -55,7 +47,4 @@ enum response scsi_error_msg(struct burn_drive *d, unsigned char *sense,
 int scsi_notify_error(struct burn_drive *, struct command *c,
 			unsigned char *sense, int senselen, int flag);
 
-/* ts A70519 */
-int scsi_init_command(struct command *c, unsigned char *opcode, int oplen);
-
 #endif /*__SPC*/

libburn/structure.c

@@ -113,12 +113,6 @@ struct burn_track *burn_track_create(void)
 	t->mode = BURN_MODE1;
 	t->isrc.has_isrc = 0;
 	t->pad = 1;
-
-	/* ts A70213 */
-	t->fill_up_media = 0;
-	/* ts A70218 */
-	t->default_size = 0;
-
 	t->entry = NULL;
 	t->source = NULL;
 	t->eos = 0;
@@ -348,54 +342,6 @@ int burn_track_set_sectors(struct burn_track *t, int sectors)
 	if (size < 0)
 		return 0;
 	ret = t->source->set_size(t->source, size);
-	t->open_ended = (t->source->get_size(t->source) <= 0);
-	return ret;
-}
-
-
-/* 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);
-}
-
-
-/* ts A70213 */
-int burn_track_set_fillup(struct burn_track *t, int fill_up_media)
-{
-	t->fill_up_media = fill_up_media;
-	if (fill_up_media)
-		t->open_ended = 0;
-	return 1;
-}
-
-
-/* ts A70213 */
-/**
-  @param flag bit0= force new size even if existing track size is larger
-*/
-int burn_track_apply_fillup(struct burn_track *t, off_t max_size, int flag)
-{
-	int max_sectors, ret = 2;
-	char msg[160];
-
-	if (t->fill_up_media <= 0)
-		return 2;
-	max_sectors = max_size / 2048;
-	if (burn_track_get_sectors(t) < max_sectors || (flag & 1)) {
-		sprintf(msg, "Setting total track size to %ds (payload %ds)\n",
-		    max_sectors, (int) (t->source->get_size(t->source)/2048));
-		libdax_msgs_submit(libdax_messenger, -1, 0x00000002,
-			LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_ZERO,
-			msg, 0, 0);
-		ret = burn_track_set_sectors(t, max_sectors);
-		t->open_ended = 0;
-	}
 	return ret;
 }
 
@@ -406,22 +352,6 @@ int burn_track_is_open_ended(struct burn_track *t)
 	return !!t->open_ended;
 }
 
-
-/* ts A70218 : API */
-int burn_track_set_default_size(struct burn_track *t, off_t size)
-{
-	t->default_size = size;
-	return 1;
-}
-
-
-/* ts A70218 */
-off_t burn_track_get_default_size(struct burn_track *t)
-{
-	return t->default_size;
-}
-
-
 /* ts A61101 : API function */
 int burn_track_get_counters(struct burn_track *t, 
                             off_t *read_bytes, off_t *written_bytes)

libburn/structure.h

@@ -27,13 +27,6 @@ struct burn_track
 	int tailcount;
 	/** 1 means Pad with zeros, 0 means start reading the next track */
 	int pad;
-
-	/* ts A70213 : wether to expand this track to full available media */
-	int fill_up_media;
-
-	/* ts A70218 : a track size to use if it is mandarory to have some */
-	off_t default_size;
-
 	/** Data source */
 	struct burn_source *source;
 	/** End of Source flag */
@@ -95,18 +88,8 @@ int burn_track_get_shortage(struct burn_track *t);
 int burn_track_is_open_ended(struct burn_track *t);
 int burn_track_is_data_done(struct burn_track *t);
 
-/* ts A70125 : sets overall sectors of a track: offset+payload+padding */
+/* ts A70125 */
 int burn_track_set_sectors(struct burn_track *t, int sectors);
 
-/* ts A70218 : sets the payload size alone */
-int burn_track_set_size(struct burn_track *t, off_t size);
-
-/* ts A70213 */
-int burn_track_set_fillup(struct burn_track *t, int fill_up_media);
-int burn_track_apply_fillup(struct burn_track *t, off_t max_size, int flag);
-
-/* ts A70218 */
-off_t burn_track_get_default_size(struct burn_track *t);
-
 
 #endif /* BURN__STRUCTURE_H */

libburn/toc.c

@@ -128,14 +128,9 @@ void toc_find_modes(struct burn_drive *d)
 			if (e && !(e->control & 4)) {
 				t->mode = BURN_AUDIO;
 			} else {
-
-				t->mode = BURN_MODE1;
-/* ts A70519 : this does not work with Linux 2.4 USB because one cannot
-               predict the exact dxfer_size without knowing the sector type.
 				mem.sectors = 1;
 				d->read_sectors(d, lba, mem.sectors, &o, &mem);
 				t->mode = sector_identify(mem.data);
-*/
 			}
 		}
 }

libburn/transport.h

@@ -51,7 +51,6 @@ struct command
 	unsigned char opcode[16];
 	int oplen;
 	int dir;
-	int dxfer_len;
 	unsigned char sense[128];
 	int error;
 	int retry;
@@ -118,6 +117,8 @@ struct burn_format_descr {
 };
 
 
+#define LIBBURN_SG_MAX_SIBLINGS 16
+
 /** Gets initialized in enumerate_common() and burn_drive_register() */
 struct burn_drive
 {
@@ -128,9 +129,6 @@ struct burn_drive
 	int lun;
 	char *devname;
 
-	/* ts A70302: mmc5r03c.pdf 5.3.2 Physical Interface Standard */
-	int phys_if_std;   /* 1=SCSI, 2=ATAPI, 3,4,6=FireWire, 7=SATA, 8=USB */
-	char phys_if_name[80];  /* MMC-5 5.3.2 table 91 , e.g. "SCSI Family" */ 
 
 	/* see os.h for name of particular os-*.h where this is defined */
 	BURN_OS_TRANSPORT_DRIVE_ELEMENTS	
@@ -208,14 +206,6 @@ struct burn_drive
 	/* ts A70129 :
 	   from 51h READ DISC INFORMATION Last Track Number in Last Session */
 	int last_track_no;
-	/* ts A70212 : from various sources : free space on media (in bytes)
-	               With CD this might change after particular write
-	               parameters have been set and nwa has been inquired.
-	               (e.g. by d->send_write_parameters() ; d->get_nwa()).
-	*/
-	off_t media_capacity_remaining;
-	/* ts A70215 : if > 0 : first lba on media that is too high for write*/
-	int media_lba_limit;
 
 
 	int toc_temp;
@@ -224,21 +214,6 @@ struct burn_drive
 	struct buffer *buffer;
 	struct burn_progress progress;
 
-	/* ts A70711 : keeping an eye on the drive buffer */
-	off_t pessimistic_buffer_free;
-	int pbf_altered;
-	int wait_for_buffer_free;
-	int nominal_write_speed;
-	unsigned wfb_min_usec;
-	unsigned wfb_max_usec;
-	unsigned wfb_timeout_sec;
-	unsigned wfb_min_percent;
-	unsigned wfb_max_percent;
-	unsigned pessimistic_writes;
-	unsigned waited_writes;
-	unsigned waited_tries;
-	unsigned waited_usec;
-
 	volatile int cancel;
 	volatile enum burn_drive_status busy;
 /* transport functions */

libburn/write.c

@@ -37,7 +37,6 @@
 #include "sg.h"
 #include "write.h"
 #include "options.h"
-#include "structure.h"
 
 #include "libdax_msgs.h"
 extern struct libdax_msgs *libdax_messenger;
@@ -461,7 +460,7 @@ struct cue_sheet *burn_create_toc_entries(struct burn_write_opts *o,
 		   track length.
 		*/ 
 		track_length = burn_track_get_sectors(tar[i]);
-		if (track_length < 300 && !burn_track_is_open_ended(tar[i])) {
+		if (track_length < 300) {
 			track_length = 300;
 			if (!tar[i]->pad)
 				tar[i]->pad = 1;
@@ -707,21 +706,14 @@ int burn_write_track(struct burn_write_opts *o, struct burn_session *s,
 
 		/* ts A61103 */
 		ret = d->get_nwa(d, -1, &lba, &nwa);
-
-		/* ts A70213: CD-TAO: eventually expand size of track to max */
-		burn_track_apply_fillup(t, d->media_capacity_remaining, 0);
-
-		/* <<< */
 		sprintf(msg, 
-	"TAO pre-track %2.2d : get_nwa(%d)=%d, d=%d , demand=%.f , cap=%.f\n",
-	tnum+1, nwa, ret, d->nwa, (double) burn_track_get_sectors(t) * 2048.0,
-	(double) d->media_capacity_remaining);
+			"pre-track %2.2d : get_nwa(%d), ret= %d , d->nwa= %d\n",
+			tnum+1, nwa, ret, d->nwa);
 		libdax_msgs_submit(libdax_messenger, d->global_index, 0x000002,
 				LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_ZERO,
-				msg, 0, 0);
+				msg,0,0);
 		if (nwa > d->nwa)
 			d->nwa = nwa;
-
 	}
 
 /* user data */
@@ -820,9 +812,7 @@ ex:;
 }
 
 /* ts A61009 */
-/* @param flag bit1 = do not libdax_msgs_submit() */
-int burn_disc_write_is_ok(struct burn_write_opts *o, struct burn_disc *disc,
-			int flag)
+int burn_disc_write_is_ok(struct burn_write_opts *o, struct burn_disc *disc)
 {
 	int i, t;
 	char msg[80];
@@ -836,10 +826,9 @@ int burn_disc_write_is_ok(struct burn_write_opts *o, struct burn_disc *disc,
 bad_track_mode_found:;
 	sprintf(msg, "Unsuitable track mode 0x%x in track %d of session %d",
 		disc->session[i]->track[t]->mode, i+1, t+1);
-	if (!(flag & 2))
-		libdax_msgs_submit(libdax_messenger, -1, 0x0002010a,
-				LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
-				msg, 0, 0);
+	libdax_msgs_submit(libdax_messenger, -1, 0x0002010a,
+			LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
+			msg, 0, 0);
 	return 0;
 }
 
@@ -849,8 +838,6 @@ int burn_disc_init_write_status(struct burn_write_opts *o,
 				struct burn_disc *disc)
 {
 	struct burn_drive *d = o->drive;
-	struct burn_track *t = NULL;
-	int sx, tx;
 
 	d->cancel = 0;
 
@@ -875,107 +862,12 @@ int burn_disc_init_write_status(struct burn_write_opts *o,
 	d->progress.buffered_bytes = 0;
 	d->progress.buffer_min_fill = 0xffffffff;
 
-	/* ts A70711 */
-	d->pessimistic_buffer_free = 0;
-	d->pbf_altered = 0;
-	d->pessimistic_writes = 0;
-	d->waited_writes = 0;
-	d->waited_tries = 0;
-	d->waited_usec = 0;
-
-	/* Set eventual media fill up for last track only */
-	for (sx = 0; sx < disc->sessions; sx++)
-		for (tx = 0 ; tx < disc->session[sx]->tracks; tx++) {
-			t = disc->session[sx]->track[tx];
-			burn_track_set_fillup(t, 0);
-		}
-	if (o->fill_up_media && t != NULL)
-		burn_track_set_fillup(t, 1);
-
 	d->busy = BURN_DRIVE_WRITING;
 
 	return 1;
 }
 
 
-/* ts A70219 : API */
-int burn_precheck_write(struct burn_write_opts *o, struct burn_disc *disc,
-				 char reasons[BURN_REASONS_LEN], int silent)
-{
-	enum burn_write_types wt;
-	struct burn_drive *d = o->drive;
-	char msg[160], *reason_pt;
-	int no_media = 0;
-
-	reason_pt= reasons;
-	reasons[0] = 0;
-
-	/* check write mode against write job */
-	wt = burn_write_opts_auto_write_type(o, disc, reasons, 1);
-	if (wt == BURN_WRITE_NONE) {
-		if (strncmp(reasons, "MEDIA: ", 7)==0)
-			no_media = 1;
-		goto ex;
-	}
-
-	sprintf(reasons, "%s: ", d->current_profile_text);
-	reason_pt= reasons + strlen(reasons);
-	if (d->status == BURN_DISC_UNSUITABLE)
-		goto unsuitable_profile;
-	if (d->current_profile == 0x09 || d->current_profile == 0x0a) {
-		if (!burn_disc_write_is_ok(o, disc, (!!silent) << 1))
-			strcat(reasons, "unsuitable track mode found, ");
-		if (o->start_byte >= 0)
-			strcat(reasons, "write start address not supported, ");
-	} else if (d->current_profile == 0x1a || d->current_profile == 0x12) { 
-		/* DVD+RW , DVD-RAM */
-		if (o->start_byte >= 0 && (o->start_byte % 2048))
-			strcat(reasons,
-			 "write start address not properly aligned to 2048, ");
-	} else if (d->current_profile == 0x13) {
-		/* DVD-RW Restricted Overwrite */
-		if (o->start_byte >= 0 && (o->start_byte % 32768))
-			strcat(reasons,
-			  "write start address not properly aligned to 32k, ");
-	} else if (d->current_profile == 0x11 || d->current_profile == 0x14 ||
-	           d->current_profile == 0x15 ||
-	           d->current_profile == 0x1b || d->current_profile == 0x2b ) {
-		/* DVD-R* Sequential , DVD+R[/DL] */
-		if (o->start_byte >= 0)
-			strcat(reasons, "write start address not supported, ");
-	} else {
-unsuitable_profile:;
-		sprintf(msg, "Unsuitable media detected. Profile %4.4Xh  %s",
-			d->current_profile, d->current_profile_text);
-		if (!silent)
-			libdax_msgs_submit(libdax_messenger, d->global_index,
-				0x0002011e,
-				LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
-				msg, 0, 0);
-		strcat(reasons, "no suitable media profile detected, ");
-		return 0;
-	}
-ex:;
-	if (reason_pt[0]) {
-		if (no_media) {
-			if (!silent)
-				libdax_msgs_submit(libdax_messenger,
-				  d->global_index, 0x0002013a,
-				  LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
-				  "No suitable media detected", 0, 0);
-			return -1;
-		}
-		if (!silent)
-			libdax_msgs_submit(libdax_messenger,
-				  d->global_index, 0x00020139,
-				  LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
-				  "Write job parameters are unsuitable", 0, 0);
-		return 0;
-	}
-	return 1;
-}
-
-
 /* ts A70129 : learned much from dvd+rw-tools-7.0/growisofs_mmc.cpp */
 int burn_disc_open_track_dvd_minus_r(struct burn_write_opts *o,
 					struct burn_session *s, int tnum)
@@ -994,8 +886,6 @@ int burn_disc_open_track_dvd_minus_r(struct burn_write_opts *o,
 			LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_ZERO, msg,0,0);
 	if (nwa > d->nwa)
 		d->nwa = nwa;
-	/* ts A70214 : eventually adjust already expanded size of track */
-	burn_track_apply_fillup(s->track[tnum], d->media_capacity_remaining,1);
 
 	if (o->write_type == BURN_WRITE_SAO) { /* DAO */
  		/* Round track size up to 32 KiB and reserve track */
@@ -1009,48 +899,7 @@ int burn_disc_open_track_dvd_minus_r(struct burn_write_opts *o,
 			libdax_msgs_submit(libdax_messenger, d->global_index,
 				0x00020138,
 				LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
-				msg, 0, 0);
-			return 0;
-		}
-	}
-	return 1;
-}
-
-
-/* ts A70226 */
-int burn_disc_open_track_dvd_plus_r(struct burn_write_opts *o,
-					struct burn_session *s, int tnum)
-{
-	struct burn_drive *d = o->drive;
-	char msg[160];
-	int ret, lba, nwa;
-	off_t size;
-
-	ret = d->get_nwa(d, -1, &lba, &nwa);
-	sprintf(msg, 
-		"DVD+R pre-track %2.2d : get_nwa(%d), ret= %d , d->nwa= %d",
-		tnum+1, nwa, ret, d->nwa);
-	libdax_msgs_submit(libdax_messenger, d->global_index, 0x000002,
-			LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_ZERO, msg,0,0);
-	if (nwa > d->nwa)
-		d->nwa = nwa;
-	/* ts A70214 : eventually adjust already expanded size of track */
-	burn_track_apply_fillup(s->track[tnum], d->media_capacity_remaining,1);
-
-	if (o->write_type == BURN_WRITE_SAO &&
-	    ! burn_track_is_open_ended(s->track[tnum])) {
- 		/* Round track size up to 32 KiB and reserve track */
-		size = ((off_t) burn_track_get_sectors(s->track[tnum]))
-			 * (off_t) 2048;
-		size = (size + (off_t) 0x7fff) & ~((off_t) 0x7fff);
-		ret = d->reserve_track(d, size);
-		if (ret <= 0) {
-			sprintf(msg, "Cannot reserve track of %.f bytes",
-				(double) size);
-			libdax_msgs_submit(libdax_messenger, d->global_index,
-				0x00020138,
-				LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
-				msg, 0, 0);
+				msg, 0,0);
 			return 0;
 		}
 	}
@@ -1083,60 +932,9 @@ 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, int is_last_track)
-{
-	struct burn_drive *d = o->drive;
-	char msg[80];
-
-	sprintf(msg,
-		"Closing track %2.2d  (absolute track and session number %d)",
-		tnum + 1, d->last_track_no);
-	libdax_msgs_submit(libdax_messenger, o->drive->global_index,0x00020119,
-			LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH, msg,0,0);
-
-	d->busy = BURN_DRIVE_CLOSING_SESSION;
-	d->close_track_session(d, 0, d->last_track_no); /* CLOSE TRACK, 001b */
-
-	/* Each session becomes a single logical track. So to distinguish them,
-	   it is mandatory to close the session together with each track. */
-
-	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;
-}
-
-
 /* ts A61218 - A70129 */
 int burn_dvd_write_track(struct burn_write_opts *o,
-			struct burn_session *s, int tnum, int is_last_track)
+				struct burn_session *s, int tnum)
 {
 	struct burn_track *t = s->track[tnum];
 	struct burn_drive *d = o->drive;
@@ -1144,41 +942,16 @@ int burn_dvd_write_track(struct burn_write_opts *o,
 	int sectors;
 	int i, open_ended = 0, ret= 0, is_flushed = 0;
 
-	/* ts A70213 : eventually expand size of track to max */
-	burn_track_apply_fillup(t, d->media_capacity_remaining, 0);
+	sectors = burn_track_get_sectors(t);
+	open_ended = burn_track_is_open_ended(t);
 
-	if (d->current_profile == 0x11 || d->current_profile == 0x14 ||
-	    d->current_profile == 0x15) {
-		/* DVD-R, DVD-RW Sequential, DVD-R/DL Sequential */
+	if (d->current_profile == 0x11 || d->current_profile == 0x14) {
+		/* DVD-R, DVD-RW Sequential */
 		ret = burn_disc_open_track_dvd_minus_r(o, s, tnum);
 		if (ret <= 0)
 			goto ex;
-	} else if (d->current_profile == 0x1b || d->current_profile == 0x2b) {
-		/* DVD+R , DVD+R/DL */
-		ret = burn_disc_open_track_dvd_plus_r(o, s, tnum);
-		if (ret <= 0)
-			goto ex;
 	}
 
-	sectors = burn_track_get_sectors(t);
-	open_ended = burn_track_is_open_ended(t);
-	/* <<< */
-	{
-		char msg[160];
-
-		sprintf(msg,
-		 "DVD pre-track %2.2d : demand=%.f%s, cap=%.f\n",
-			tnum+1, (double) sectors * 2048.0,
-			(open_ended ? " (open ended)" : ""),
-			(double) d->media_capacity_remaining);
-		libdax_msgs_submit(libdax_messenger, d->global_index, 0x000002,
-				LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_ZERO,
-				msg, 0, 0);
-	}
-
-
-	/* >>> ts A70215 : what about offset padding ? */
-
 	burn_disc_init_track_status(o, s, tnum, sectors);
 	for (i = 0; open_ended || i < sectors; i++) {
 
@@ -1200,8 +973,6 @@ int burn_dvd_write_track(struct burn_write_opts *o,
 		d->progress.sector++;
 	}
 	
-	/* >>> ts A70215 : what about tail padding ? */
-
 	/* Pad up buffer to next full o->obs (usually 32 kB) */
 	if (o->obs_pad && out->bytes > 0 && out->bytes < o->obs) {
 		memset(out->data + out->bytes, 0, o->obs - out->bytes);
@@ -1214,17 +985,10 @@ int burn_dvd_write_track(struct burn_write_opts *o,
 	is_flushed = 1;
 
 	/* Eventually finalize track */
-	if (d->current_profile == 0x11 || d->current_profile == 0x14 ||
-	    d->current_profile == 0x15) {
-		/* DVD-R, DVD-RW Sequential, DVD-R/DL Sequential */
+	if (d->current_profile == 0x11 || d->current_profile == 0x14) {
+		/* DVD-R, DVD-RW Sequential */
 		ret = burn_disc_close_track_dvd_minus_r(o, s, tnum);
-		if (ret <= 0)
-			goto ex;
-	} else if (d->current_profile == 0x1b || d->current_profile == 0x2b) {
-		/* DVD+R , DVD+R/DL */
-		ret = burn_disc_close_track_dvd_plus_r(o, s, tnum,
-							 is_last_track);
-		if (ret <= 0)
+		if (ret != 2)
 			goto ex;
 	}
 	ret = 1;
@@ -1274,7 +1038,7 @@ int burn_disc_close_session_dvd_minus_rw(struct burn_write_opts *o,
 }
 
 
-/* ts A70129 : for profile 0x11 DVD-R, 0x14 DVD-RW Seq, 0x15 DVD-R/DL Seq */
+/* ts A70129 : for profile 0x11 DVD-R and 0x14 DVD-RW Sequential */
 int burn_disc_close_session_dvd_minus_r(struct burn_write_opts *o,
 					struct burn_session *s)
 {
@@ -1284,11 +1048,6 @@ int burn_disc_close_session_dvd_minus_r(struct burn_write_opts *o,
 	if (o->write_type != BURN_WRITE_TAO)
 		return 2;
 
-#ifdef Libburn_dvd_r_dl_multi_no_close_sessioN
-	if (d->current_profile == 0x15 && o->multi)
-		return 2;
-#endif
-
 	libdax_msgs_submit(libdax_messenger, o->drive->global_index,0x00020119,
 			LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_HIGH,
 			"Closing session", 0, 0);
@@ -1302,7 +1061,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, int is_last_session)
+				struct burn_session *s)
 {
 	int i,ret;
         struct burn_drive *d = o->drive;
@@ -1310,14 +1069,12 @@ 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,
-			is_last_session && i == (s->tracks - 1));
+		ret = burn_dvd_write_track(o, s, i);
 		if (ret <= 0)
 	break;
 	}
-	if (d->current_profile == 0x11 || d->current_profile == 0x14 ||
-	    d->current_profile == 0x15) {
-		/* DVD-R , DVD-RW Sequential, DVD-R/DL Sequential */
+	if ((d->current_profile == 0x11 || d->current_profile == 0x14)) {
+		/* DVD-R , DVD-RW Sequential */
 		ret = burn_disc_close_session_dvd_minus_r(o, s);
 		if (ret <= 0)
 			return 0;
@@ -1338,8 +1095,6 @@ int burn_dvd_write_session(struct burn_write_opts *o,
 			if (ret <= 0)
 				return 0;
 		}
-	} else if (d->current_profile == 0x1b || d->current_profile == 0x2b) {
-		/* DVD+R , DVD+R/DL do each track as an own session */;
 	}
 	return 1;
 }
@@ -1370,7 +1125,7 @@ int burn_disc_setup_dvd_plus_rw(struct burn_write_opts *o,
 		libdax_msgs_submit(libdax_messenger, d->global_index,
 				0x00020127,
 				LIBDAX_MSGS_SEV_NOTE, LIBDAX_MSGS_PRIO_HIGH,
-				msg, 0, 0);
+				msg, 0,0);
 	}
 
 	/* >>> perform OPC if needed */;
@@ -1397,37 +1152,47 @@ int burn_disc_setup_dvd_minus_rw(struct burn_write_opts *o,
 		libdax_msgs_submit(libdax_messenger, d->global_index,
 				0x00020127,
 				LIBDAX_MSGS_SEV_NOTE, LIBDAX_MSGS_PRIO_HIGH,
-				msg, 0, 0);
+				msg, 0,0);
 
 		d->nwa *= 16; /* convert to 2048 block units */
 	}
 
+	if (d->current_profile == 0x13) { /* DVD-RW restricted overwrite */
 
-	/* ??? mmc5r03c.pdf 7.5.2 :
-	"For DVD-RW media ... If a medium is in Restricted overwrite
-	 mode, this mode page shall not be used."
+		/* ??? mmc5r03c.pdf 7.5.2 :
+		"For DVD-RW media ... If a medium is in Restricted overwrite
+		 mode, this mode page shall not be used."
 
-	But growisofs composes a page 5 and sends it.
-	mmc5r03c.pdf 5.3.16 , table 127 specifies that mode page 5
-	shall be supported with feature 0026h Restricted Overwrite.
-	5.3.22 describes a feature 002Ch Rigid Restrictive Overwrite
-	which seems to apply to DVD-RW and does not mention page 5.
+		But growisofs composes a page 5 and sends it.
+		mmc5r03c.pdf 5.3.16 , table 127 specifies that mode page 5
+		shall be supported with feature 0026h Restricted Overwrite.
+		5.3.22 describes a feature 002Ch Rigid Restrictive Overwrite
+		which seems to apply to DVD-RW and does not mention page 5.
 
-	5.4.14 finally states that profile 0013h includes feature
-	002Ch rather than 0026h.
+		5.4.14 finally states that profile 0013h includes feature
+		002Ch rather than 0026h.
 		
 		d->send_write_parameters(d, o);
-	*/
+		*/
 
-	d->busy = BURN_DRIVE_FORMATTING;
+		d->busy = BURN_DRIVE_FORMATTING;
 
-	/* "quick grow" to at least byte equivalent of d->nwa */
-	ret = d->format_unit(d, (off_t) d->nwa * (off_t) 2048,
-			     (d->nwa > 0) << 3);
-	if (ret <= 0)
+		/* "quick grow" to at least byte equivalent of d->nwa */
+                ret = d->format_unit(d, (off_t) d->nwa * (off_t) 2048,
+				     (d->nwa > 0) << 3);
+		if (ret <= 0)
+			return 0;
+		d->busy = BURN_DRIVE_WRITING;
+
+	} else {
+		sprintf(msg, "Unsuitable media detected. Profile %4.4Xh  %s",
+			d->current_profile, d->current_profile_text);
+		libdax_msgs_submit(libdax_messenger, d->global_index,
+			0x0002011e,
+			LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
+			msg, 0,0);
 		return 0;
-
-	d->busy = BURN_DRIVE_WRITING;
+	}
 
 	/* >>> perform OPC if needed */;
 
@@ -1450,37 +1215,15 @@ int burn_disc_setup_dvd_minus_r(struct burn_write_opts *o,
 }
 
 
-/* ts A70226 : for DVD+R , DVD+R/DL */
-int burn_disc_setup_dvd_plus_r(struct burn_write_opts *o,
-				struct burn_disc *disc)
-{
-	struct burn_drive *d = o->drive;
-
-	/* most setup is in burn_disc_setup_track_dvd_plus_r() */;
-
-	d->nwa = 0;
-	return 1;
-}
-
-
 /* ts A61218 - A70129 */
 int burn_dvd_write_sync(struct burn_write_opts *o,
 				 struct burn_disc *disc)
 {
-	int i, ret, o_end;
-	off_t default_size = 0;
+	int i, ret, sx, tx, mode, exotic_track = 0, dao_is_ok;
 	struct burn_drive *d = o->drive;
-	struct burn_track *t;
 	char msg[160];
 
-#ifndef Libburn_precheck_write_ruleS
-	int exotic_track = 0, dao_is_ok, sx, tx, mode;
-#endif
-
 	d->needs_close_session = 0;
-
-#ifndef Libburn_precheck_write_ruleS
-	/* <<< covered by burn_precheck_write() */
 	for (sx = 0; sx < disc->sessions; sx++)
 		for (tx = 0 ; tx < disc->session[sx]->tracks; tx++) {
 			mode = disc->session[sx]->track[tx]->mode;
@@ -1492,11 +1235,10 @@ int burn_dvd_write_sync(struct burn_write_opts *o,
 		libdax_msgs_submit(libdax_messenger, d->global_index,
 			0x00020123,
 			LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
-			msg, 0, 0);
+			msg, 0,0);
 		goto early_failure;
 	}
 
-	/* <<< covered by burn_precheck_write() */
 	if (d->current_profile == 0x1a || d->current_profile == 0x13 ||
 	    d->current_profile == 0x12) {
 		 /* DVD+RW , DVD-RW Restricted Overwrite , DVD-RAM */
@@ -1508,28 +1250,21 @@ int burn_dvd_write_sync(struct burn_write_opts *o,
 			libdax_msgs_submit(libdax_messenger, d->global_index,
 				0x0002011f,
 				LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
-				msg, 0, 0);
+				msg, 0,0);
 			goto early_failure;
 		}
 	}
-#endif /* ! Libburn_precheck_write_ruleS */
-
 	if (d->current_profile == 0x1a || d->current_profile == 0x12) { 
 		/* DVD+RW , DVD-RAM */
-
-#ifndef Libburn_precheck_write_ruleS
-		/* <<< covered by burn_precheck_write() */
 		if (o->start_byte >= 0 && (o->start_byte % 2048)) {
 			sprintf(msg,
 			  "Write start address not properly aligned to 2048");
 			libdax_msgs_submit(libdax_messenger, d->global_index,
 				0x00020125,
 				LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
-				msg, 0, 0);
+				msg, 0,0);
 			goto early_failure;
 		}
-#endif /* ! Libburn_precheck_write_ruleS */
-
 		ret = 1;
 		if (d->current_profile == 0x1a)
 			ret = burn_disc_setup_dvd_plus_rw(o, disc);
@@ -1539,27 +1274,22 @@ int burn_dvd_write_sync(struct burn_write_opts *o,
 			libdax_msgs_submit(libdax_messenger, d->global_index,
 				0x00020121,
 				LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
-				msg, 0, 0);
+				msg, 0,0);
 			goto early_failure;
 		}
 		o->obs_pad = 0; /* no filling-up of track's last 32k buffer */
 
 	} else if (d->current_profile == 0x13) {
 		 /* DVD-RW Restricted Overwrite */
-
-#ifndef Libburn_precheck_write_ruleS
-		/* <<< covered by burn_precheck_write() */
 		if (o->start_byte >= 0 && (o->start_byte % 32768)) {
 			sprintf(msg,
 			  "Write start address not properly aligned to 32K");
 			libdax_msgs_submit(libdax_messenger, d->global_index,
 				0x00020125,
 				LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
-				msg, 0, 0);
+				msg, 0,0);
 			goto early_failure;
 		}
-#endif /* ! Libburn_precheck_write_ruleS */
-
 		ret = burn_disc_setup_dvd_minus_rw(o, disc);
 		if (ret <= 0) {
 			sprintf(msg,
@@ -1567,31 +1297,24 @@ int burn_dvd_write_sync(struct burn_write_opts *o,
 			libdax_msgs_submit(libdax_messenger, d->global_index,
 				0x00020121,
 				LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
-				msg, 0, 0);
+				msg, 0,0);
 			goto early_failure;
 		}
 
 		/* _Rigid_ Restricted Overwrite demands this */
 		o->obs_pad = 1; /* fill-up track's last 32k buffer */
 
-	} else if (d->current_profile == 0x11 || d->current_profile == 0x14 ||
-			d->current_profile == 0x15) {
-		/* DVD-R , DVD-RW Sequential , DVD-R/DL Sequential */
-		t = disc->session[0]->track[0];
-		o_end = ( burn_track_is_open_ended(t) && !o->fill_up_media );
-		default_size = burn_track_get_default_size(t);
-
-#ifndef Libburn_precheck_write_ruleS
+	} else if (d->current_profile == 0x11 || d->current_profile == 0x14) {
+		/* DVD-R , DVD-RW Sequential */
 		dao_is_ok =
 			(disc->sessions == 1 &&
 			 disc->session[0]->tracks == 1 &&
-			 (default_size > 0 || !o_end) &&
+			 (! burn_track_is_open_ended(
+						disc->session[0]->track[0])) &&
 			 (!o->multi) && d->status == BURN_DISC_BLANK
 			);
 		if (o->write_type == BURN_WRITE_TAO && 
 		    !d->current_has_feat21h) {
-
-			/* <<< ??? keep this automatic write type change ? */
 			if (dao_is_ok) {
 				o->write_type = BURN_WRITE_SAO;
 				libdax_msgs_submit(libdax_messenger,
@@ -1599,8 +1322,6 @@ int burn_dvd_write_sync(struct burn_write_opts *o,
 				  LIBDAX_MSGS_SEV_NOTE, LIBDAX_MSGS_PRIO_HIGH,
 				  "Defaulted TAO to DAO (lack of feature 21h)",
 				  0, 0);
-
-			/* <<< covered by burn_precheck_write() */
 			} else {
 				libdax_msgs_submit(libdax_messenger,
 				  d->global_index, 0x00020135,
@@ -1609,49 +1330,29 @@ int burn_dvd_write_sync(struct burn_write_opts *o,
 				  0, 0);
 				goto early_failure;
 			}
-
 		} else if (o->write_type == BURN_WRITE_SAO && !dao_is_ok) {
-
-			/* <<< covered by burn_precheck_write() */
 			libdax_msgs_submit(libdax_messenger, d->global_index,
 				0x00020136,
 				LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
 				"DAO burning is restricted to a single fixed size track and no multi-session",
-				0, 0);
-
-			/* <<< ??? keep this automatic advise ? */
+				0,0);
 			if (d->current_has_feat21h)
 				libdax_msgs_submit(libdax_messenger,
 					d->global_index, 0x00020137,
 					LIBDAX_MSGS_SEV_HINT,
 					LIBDAX_MSGS_PRIO_HIGH,
 				"TAO would be possible and could do the job",
-					0, 0);
-
+					0,0);
 			goto early_failure;
-
 		}
-
-		/* <<< covered by burn_precheck_write() */
 		if (o->start_byte >= 0) {
 			sprintf(msg, "Write start address not supported");
 			libdax_msgs_submit(libdax_messenger, d->global_index,
 				0x00020124,
 				LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
-				msg, 0, 0);
+				msg, 0,0);
 			goto early_failure;
 		}
-#endif /* ! Libburn_precheck_write_ruleS */
-
-		if (o->write_type == BURN_WRITE_SAO && o_end) {
-			sprintf(msg, "Activated track default size %.f",
-				(double) default_size);
-			libdax_msgs_submit(libdax_messenger,
-				  d->global_index, 0x0002012e,
-				  LIBDAX_MSGS_SEV_NOTE, LIBDAX_MSGS_PRIO_HIGH,
-				  msg, 0, 0);
-			burn_track_set_size(t, default_size);
-		}
 		ret = burn_disc_setup_dvd_minus_r(o, disc);
 		if (ret <= 0) {
 			sprintf(msg,
@@ -1659,56 +1360,20 @@ int burn_dvd_write_sync(struct burn_write_opts *o,
 			libdax_msgs_submit(libdax_messenger, d->global_index,
 				0x00020121,
 				LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
-				msg, 0, 0);
+				msg, 0,0);
 			goto early_failure;
 		}
 		/* ??? padding needed ??? cowardly doing it for now */
 		o->obs_pad = 1; /* fill-up track's last 32k buffer */
 		
-	} else if (d->current_profile == 0x1b || d->current_profile == 0x2b) {
-		/* DVD+R , DVD+R/DL */
-		t = disc->session[0]->track[0];
-		o_end = ( burn_track_is_open_ended(t) && !o->fill_up_media );
-		default_size = burn_track_get_default_size(t);
-
-#ifndef Libburn_precheck_write_ruleS
-		/* >>> oldfashioned checks hopefully never re-enabled */
-#endif /* ! Libburn_precheck_write_ruleS */
-
-		if (o->write_type == BURN_WRITE_SAO && o_end) {
-			sprintf(msg, "Activated track default size %.f",
-				(double) default_size);
-			libdax_msgs_submit(libdax_messenger,
-				  d->global_index, 0x0002012e,
-				  LIBDAX_MSGS_SEV_NOTE, LIBDAX_MSGS_PRIO_HIGH,
-				  msg, 0, 0);
-			burn_track_set_size(t, default_size);
-		}
-		ret = burn_disc_setup_dvd_plus_r(o, disc);
-		if (ret <= 0) {
-			sprintf(msg,
-			  "Write preparation setup failed for DVD+R");
-			libdax_msgs_submit(libdax_messenger, d->global_index,
-				0x00020121,
-				LIBDAX_MSGS_SEV_FATAL, LIBDAX_MSGS_PRIO_HIGH,
-				msg, 0, 0);
-			goto early_failure;
-		}
-		/* ??? padding needed ??? cowardly doing it for now */
-		o->obs_pad = 1; /* fill-up track's last 32k buffer */
-
-#ifndef Libburn_precheck_write_ruleS
-	/* <<< covered by burn_precheck_write() */
 	} else {
 		sprintf(msg, "Unsuitable media detected. Profile %4.4Xh  %s",
 			d->current_profile, d->current_profile_text);
 		libdax_msgs_submit(libdax_messenger, d->global_index,
 			0x0002011e,
 			LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
-			msg, 0, 0);
+			msg, 0,0);
 		goto early_failure;
-#endif /* ! Libburn_precheck_write_ruleS */
-
 	}
 	o->obs = 32*1024; /* buffer flush trigger for sector.c:get_sector() */
 
@@ -1717,8 +1382,7 @@ 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],
-					i == (disc->sessions - 1));
+		ret = burn_dvd_write_session(o, disc->session[i]);
 		if (ret <= 0)
 			goto ex;
 
@@ -1727,6 +1391,9 @@ int burn_dvd_write_sync(struct burn_write_opts *o,
 		d->progress.start_sector = 0;
 		d->progress.sectors = 0;
 	}
+
+	/* >>> eventual normal  finalization measures */
+
 	ret = 1;
 ex:;
 
@@ -1748,9 +1415,8 @@ void burn_disc_write_sync(struct burn_write_opts *o, struct burn_disc *disc)
 	struct cue_sheet *sheet;
 	struct burn_drive *d = o->drive;
 	struct buffer buf;
-	struct burn_track *lt, *t;
+	struct burn_track *lt;
 	int first = 1, i, ret, lba, nwa = 0;
-	off_t default_size;
 	char msg[80];
 
 /* ts A60924 : libburn/message.c gets obsoleted
@@ -1773,56 +1439,14 @@ void burn_disc_write_sync(struct burn_write_opts *o, struct burn_disc *disc)
 		return;
 	}
 
-#ifndef Libburn_precheck_write_ruleS
-	/* <<< covered by burn_precheck_write() */
 	if (o->start_byte >= 0) {
 		sprintf(msg, "Write start address not supported");
 		libdax_msgs_submit(libdax_messenger, d->global_index,
 			0x00020124,
 			LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
-			msg, 0, 0);
+			msg, 0,0);
 		goto fail_wo_sync;
 	}
-#endif /* ! Libburn_precheck_write_ruleS */
-
-	/* ts A70218 */
-	if (o->write_type == BURN_WRITE_SAO) {
-
-#ifndef Libburn_precheck_write_ruleS
-		/* <<< covered by burn_precheck_write() "appended session" */
-		if (disc->sessions > 1) {
-sao_restriction_violated:;
-			libdax_msgs_submit(libdax_messenger, d->global_index,
-				0x0002012f,
-				LIBDAX_MSGS_SEV_SORRY, LIBDAX_MSGS_PRIO_HIGH,
-				"SAO is restricted to a single session with fixed track sizes",
-				0, 0);
-			goto fail_wo_sync;
-		}
-#endif /* ! Libburn_precheck_write_ruleS */
-
-		for (i = 0 ; i < disc->session[0]->tracks; i++) {
-			t = disc->session[0]->track[i];
-			if (burn_track_is_open_ended(t)) {
-				default_size = burn_track_get_default_size(t);
-
-#ifndef Libburn_precheck_write_ruleS
-				/* <<< covered by burn_precheck_write() */
-				if (default_size <= 0)
-					goto sao_restriction_violated;
-#endif /* ! Libburn_precheck_write_ruleS */
-
-				sprintf(msg,
-					"Activated track default size %.f",
-					(double) default_size);
-				libdax_msgs_submit(libdax_messenger,
-					d->global_index, 0x0002012e,
-					LIBDAX_MSGS_SEV_NOTE,
-					LIBDAX_MSGS_PRIO_HIGH, msg, 0, 0);
-				burn_track_set_size(t, default_size);
-			}
-		}
-	}
 
 	burn_print(1, "sync write of %d CD sessions\n", disc->sessions);
 
@@ -1840,16 +1464,11 @@ return crap.  so we send the command, then ignore the result.
 		d->send_write_parameters(d, o);
 
 		ret = d->get_nwa(d, -1, &lba, &nwa);
-		sprintf(msg,
-			"SAO|RAW: Inquired nwa: %d , ret= %d , cap=%.f\n",
-			nwa, ret, (double) d->media_capacity_remaining);
+		sprintf(msg, "Inquired nwa: %d  (ret=%d)", nwa, ret);
 		libdax_msgs_submit(libdax_messenger, d->global_index,
 				0x00000002,
 				LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_ZERO,
-				msg,0, 0);
-
-		/* >>> ts A70212 : CD-DAO/SAO : eventually expand size of last track to maximum */;
-
+				msg,0,0);
 	}
 
 	for (i = 0; i < disc->sessions; i++) {
@@ -1893,7 +1512,7 @@ return crap.  so we send the command, then ignore the result.
 						libdax_msgs_submit(
 				libdax_messenger, d->global_index, 0x000002,
 				LIBDAX_MSGS_SEV_DEBUG, LIBDAX_MSGS_PRIO_ZERO,
-				msg, 0, 0);
+				msg,0,0);
 
 					} else {
 						d->nwa = -150;

libburn/write.h

@@ -15,8 +15,7 @@ int burn_sector_length(int trackmode);
 int burn_subcode_length(int trackmode);
 
 /* ts A61009 */
-int burn_disc_write_is_ok(struct burn_write_opts *o, struct burn_disc *disc,
-			int flag);
+int burn_disc_write_is_ok(struct burn_write_opts *o, struct burn_disc *disc);
 
 void burn_disc_write_sync(struct burn_write_opts *o, struct burn_disc *disc);
 int burn_write_leadin(struct burn_write_opts *o,
@@ -33,16 +32,4 @@ int burn_write_close_track(struct burn_write_opts *o, struct burn_session *s,
                            int tnum);
 int burn_write_close_session(struct burn_write_opts *o,struct burn_session *s);
 
-
-
-/* mmc5r03c.pdf 6.3.3.3.3: DVD-R DL: Close Function 010b: Close Session
-     "When the recording mode is Incremental Recording,
-      the disc is single session."
-   Enable this macro to get away from growisofs which uses Close Session
-   but also states "// DVD-R DL Seq has no notion of multi-session".
-
-     #define Libburn_dvd_r_dl_multi_no_close_sessioN 1
-
-*/
-
 #endif /* BURN__WRITE_H */

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, can burn to CD-R, CD-RW, DVD-R,
-  DVD+R, DVD+RW, DVD-RAM or DVD-RW. Not supported yet: double layer media.
+  blank a CD-RW or DVD-RW, can format a DVD-RW, and can burn to CD-R, CD-RW,
+  DVD+RW, DVD-RAM or DVD-RW. Not tested: DVD-R. Not supported yet: DVD+R [DL].
 
   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
@@ -276,7 +276,7 @@ int libburner_blank_disc(struct burn_drive *drive, int blank_fast)
 		return 2;
 	} else if (disc_state == BURN_DISC_FULL ||
 		   disc_state == BURN_DISC_APPENDABLE) {
-		; /* this is what libburner is willing to blank */
+		; /* this is what libburn is willing to blank */
 	} else if (disc_state == BURN_DISC_EMPTY) {
 		fprintf(stderr,"FATAL: No media detected in drive\n");
 		return 0;
@@ -306,9 +306,8 @@ int libburner_blank_disc(struct burn_drive *drive, int blank_fast)
 }
 
 
-/** Persistently changes DVD-RW profile 0014h "Sequential Recording" to
-    profile 0013h "Restricted Overwrite" which needs no blanking for re-use
-    but is not capable of multi-session.
+/** Persistently changes DVD-RW profile 0014h "Sequential Recording"
+    to profile 0013h "Restricted Overwrite" which is usable with libburner.
 
     Expect a behavior similar to blanking with unusual noises from the drive.
 */
@@ -350,7 +349,7 @@ int libburner_format_row(struct burn_drive *drive)
 
 /** Brings preformatted track images (ISO 9660, audio, ...) onto media.
     To make sure a data image is fully readable on any Linux machine, this
-    function adds 300 kiB of padding to the (usualy single) track.
+    function adds 300 kB of padding to the (usualy single) track.
     Audio tracks get padded to complete their last sector.
 
     In case of external signals expect abort handling of an ongoing burn to
@@ -373,12 +372,12 @@ int libburner_payload(struct burn_drive *drive,
 	time_t start_time;
 	int last_sector = 0, padding = 0, trackno, unpredicted_size = 0, fd;
 	off_t fixed_size;
-	char *adr, reasons[BURN_REASONS_LEN];
+	char *adr, reasons[1024];
 	struct stat stbuf;
 
 	if (all_tracks_type != BURN_AUDIO) {
 		all_tracks_type = BURN_MODE1;
-		/* a padding of 300 kiB helps to avoid the read-ahead bug */
+		/* a padding of 300 kB helps to avoid the read-ahead bug */
 		padding = 300*1024;
 	}
 
@@ -503,6 +502,8 @@ static int all_tracks_type = BURN_MODE1;
 
 
 /** Converts command line arguments into above setup parameters.
+    drive_adr[] must provide at least BURN_DRIVE_ADR_LEN bytes.
+    source_adr[] must provide at least 4096 bytes.
 */
 int libburner_setup(int argc, char **argv)
 {

test/open-cd-excl.c

@@ -1,133 +0,0 @@
-/*
- * 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;
-}

test/telltoc.c

@@ -200,11 +200,11 @@ int telltoc_aquire_by_driveno(int *driveno, int silent_drive)
 }
 
 
+
 /** This gesture is necessary to get my NEC DVD_RW ND-4570A out of a state
-    of noisy overexcitement after its tray was loaded and it then was inquired
-    for Next Writeable Address.
+    of noisy overexcitement after it was inquired for Next Writeable Address.
     The noise then still lasts 20 seconds. Same with cdrecord -toc, btw.
-    This opens a small gap for losing the drive to another libburn instance.
+    It opens a small gap for losing the drive to another libburn instance.
     Not a problem in telltoc. This is done as very last drive operation.
     Eventually the other libburn instance will have the same sanitizing effect.
 */
@@ -226,11 +226,9 @@ int telltoc_media(struct burn_drive *drive)
 {
 	int ret, media_found = 0, profile_no = -1;
 	double max_speed = 0.0, min_speed = 0.0, speed_conv;
-	off_t available = 0;
 	enum burn_disc_status s;
 	char profile_name[80], speed_unit[40];
 	struct burn_multi_caps *caps;
-	struct burn_write_opts *o = NULL;
 
 	printf("Media current: ");
 	ret = burn_disc_get_profile(drive, &profile_no, profile_name);
@@ -253,16 +251,16 @@ int telltoc_media(struct burn_drive *drive)
 
 	printf("Media status : ");
 	s = burn_disc_get_status(drive);
-	if (s == BURN_DISC_FULL) {
+	if (s==BURN_DISC_FULL) {
 		printf("is written , is closed\n");
 		media_found = 1;
-	} else if (s == BURN_DISC_APPENDABLE) {
+	} else if (s==BURN_DISC_APPENDABLE) {
 		printf("is written , is appendable\n");
 		media_found = 1;
-	} else if (s == BURN_DISC_BLANK) {
+	} else if (s==BURN_DISC_BLANK) {
 		printf("is blank\n");
 		media_found = 1;
-	} else if (s == BURN_DISC_EMPTY)
+	} else if (s==BURN_DISC_EMPTY)
 		printf("is not present\n");
 	else
 		printf("is not recognizable\n");
@@ -278,7 +276,6 @@ int telltoc_media(struct burn_drive *drive)
 
 	ret = burn_disc_get_multi_caps(drive, BURN_WRITE_NONE, &caps, 0);
 	if (ret > 0) {
-		/* Media appears writeable */
 		printf("Write multi  : ");
 		printf("%s multi-session , ",
 			 caps->multi_session == 1 ? "allows" : "prohibits");
@@ -312,37 +309,12 @@ int telltoc_media(struct burn_drive *drive)
 				caps->advised_write_mode == BURN_WRITE_RAW ?
 				" (advised)" : "");
 		printf("\n");
-		printf("Write dummy  : ");
-		if (caps->might_simulate)
-			printf("supposed to work with non-RAW modes\n");
-		else
-			printf("will not work\n");
-		o= burn_write_opts_new(drive);
-		if (o != NULL) {
-			burn_write_opts_set_perform_opc(o, 0);
- 			if(caps->advised_write_mode == BURN_WRITE_TAO)
-   				burn_write_opts_set_write_type(o,
-					BURN_WRITE_TAO, BURN_BLOCK_MODE1);
-			else if (caps->advised_write_mode == BURN_WRITE_SAO)
-				burn_write_opts_set_write_type(o,
-					BURN_WRITE_SAO, BURN_BLOCK_SAO);
-			else {
-				burn_write_opts_free(o);
-				o = NULL;
-			}
-		}
-		available = burn_disc_available_space(drive, o);
-		printf("Write space  : %.1f MiB  (%.fs)\n",
-			((double) available) / 1024.0 / 1024.0,
-			((double) available) / 2048.0);
 		burn_disc_free_multi_caps(&caps);
-		if (o != NULL)
-			burn_write_opts_free(o);
 	}
 
-	ret = burn_drive_get_write_speed(drive);
+	ret= burn_drive_get_write_speed(drive);
 	max_speed = ((double ) ret) / speed_conv;
-	ret = burn_drive_get_min_write_speed(drive);
+	ret= burn_drive_get_min_write_speed(drive);
 	min_speed = ((double ) ret) / speed_conv;
 	if (!media_found)
 		printf("Drive speed  : max=%.1f  , min=%.1f\n",
@@ -353,11 +325,11 @@ int telltoc_media(struct burn_drive *drive)
 
 	ret = 0;
 	if (media_found)
-		ret = burn_disc_read_atip(drive);
+		ret= burn_disc_read_atip(drive);
 	if(ret>0) {
-		ret = burn_drive_get_min_write_speed(drive);
+		ret= burn_drive_get_min_write_speed(drive);
 		min_speed = ((double ) ret) / speed_conv;
-		ret = burn_drive_get_write_speed(drive);
+		ret= burn_drive_get_write_speed(drive);
 		max_speed = ((double ) ret) / speed_conv;
 		printf("Media speed  : max=%.1f  , min=%.1f\n",
 			max_speed, min_speed);
@@ -531,7 +503,7 @@ int telltoc_msinfo(struct burn_drive *drive,
 	/* man mkisofs , option -C :
 	   The second  number is the starting sector number of the new session.
 	*/
-	/* Set some roughly suitable write opts to be sent to drive. */
+	/* Set some write opts to be sent to drive. LG GSA-4082B needs it. */
 	o= burn_write_opts_new(drive);
  	if(o!=NULL) {
    		burn_write_opts_set_perform_opc(o, 0);
@@ -552,7 +524,7 @@ int telltoc_msinfo(struct burn_drive *drive,
 	printf("%d,%d\n",lba,nwa);
 	ret = 1;
 ex:;
-	if (o != NULL)
+	if (o!=NULL)
 		burn_write_opts_free(o);
 	return ret;
 }