Tagged

Makefile.am

@@ -32,6 +32,19 @@ libinclude_HEADERS = \
 bin_PROGRAMS = \
 	xorriso/xorriso
 
+# This looks quite ugly with make install: xorriso.c is compiled twice again
+#
+# Trying to create a build timestamp file
+#
+# BUILT_SOURCES = xorriso/xorriso_buildstamp.h
+#
+# phony targets get rebuilt every time
+#
+# .PHONY: xorriso/xorriso_buildstamp.h
+# xorriso/xorriso_buildstamp.h:
+# 	date -u '+#define Xorriso_build_timestamP "%Y.%m.%d.%H%M%S"' >xorriso/xorriso_buildstamp.h
+# 	cat xorriso/xorriso_buildstamp.h
+
 xorriso_xorriso_CPPFLAGS = -Ilibisoburn
 xorriso_xorriso_CFLAGS = -DXorriso_with_maiN -DXorriso_with_regeX $(READLINE_DEF)
 xorriso_xorriso_LDADD = libisoburn/libisoburn.la -lisofs -lburn $(THREAD_LIBS)
@@ -48,15 +61,16 @@ xorriso_xorriso_SOURCES = \
 # Install symbolic links to the xorriso binary
 #
 install-exec-hook:
-	if test -e $(bindir)/xorrisofs ; then rm $(bindir)/xorrisofs ; else echo ; fi
-	ln -s xorriso $(bindir)/xorrisofs
-	if test -e $(bindir)/osirrox ; then rm $(bindir)/osirrox ; else echo ; fi
-	ln -s xorriso $(bindir)/osirrox
-	if test -e $(bindir)/xorrecord ; then rm $(bindir)/xorrecord ; else echo ; fi
-	ln -s xorriso $(bindir)/xorrecord
+	if test -e "$(DESTDIR)$(bindir)"/xorrisofs ; then rm "$(DESTDIR)$(bindir)"/xorrisofs ; else echo ; fi
+	ln -s xorriso "$(DESTDIR)$(bindir)"/xorrisofs
+	if test -e "$(DESTDIR)$(bindir)"/osirrox ; then rm "$(DESTDIR)$(bindir)"/osirrox ; else echo ; fi
+	ln -s xorriso "$(DESTDIR)$(bindir)"/osirrox
+	if test -e "$(DESTDIR)$(bindir)"/xorrecord ; then rm "$(DESTDIR)$(bindir)"/xorrecord ; else echo ; fi
+	ln -s xorriso "$(DESTDIR)$(bindir)"/xorrecord
 
 
-# Trying to create a build timestamp file
+# Alternative to the disabled .PHONY above.
+# Trying to create a build timestamp file semi-manually:  make buildstamped
 #
 buildstamp:
 	date -u '+#define Xorriso_build_timestamP "%Y.%m.%d.%H%M%S"' >xorriso/xorriso_buildstamp.h
@@ -65,15 +79,7 @@ buildstamp:
 # For now   make buildstamped  has to be performed explicitely.
 buildstamped: buildstamp
 	make
-#
-# Processing of the "all:" rule happens too late.
-# How to create a dependency of xorriso.c on buildstamp ?
-# Not working:
-# Add xorriso_buildstamp.h to xorriso_xorriso_SOURCES and make it depend
-# on buildstamp. It runs. But at quite random occasions.
-# xorriso/xorriso_buildstamp.h: buildstamp
-#
-# all: buildstamp
+
 
 
 ## Build test applications

README

@@ -4,7 +4,7 @@
 libisoburn. By Vreixo Formoso <metalpain2002@yahoo.es> 
             and Thomas Schmitt <scdbackup@gmx.net>
 Integrated sub project of libburnia-project.org.
-http://files.libburnia-project.org/releases/libisoburn-0.2.1.tar.gz
+http://files.libburnia-project.org/releases/libisoburn-0.2.4.pl00.tar.gz
 Copyright (C) 2006-2008 Vreixo Formoso, Thomas Schmitt.
 Provided under GPL version 2.
 ------------------------------------------------------------------------------
@@ -26,18 +26,18 @@ By using this software you agree to the disclaimer at the end of this text:
 
                    Compilation, First Glimpse, Installation
 
-Dynamic library and compile time header requirements for libisoburn-0.2.1 :
-- libburn.so.4  , version libburn-0.4.8 or higher
+Dynamic library and compile time header requirements for libisoburn-0.2.4 :
+- libburn.so.4  , version libburn-0.5.2 or higher
 - libisofs.so.6 , version libisofs-0.6.6 or higher
 libisoburn and xorriso will not start with libraries which are older than their
 headers seen at compile time. So compile in the oldest possible installation
 setup unless you have reason to enforce a newer bug fix level.
 
-Obtain libisoburn-0.2.1.tar.gz, take it to a directory of your choice
+Obtain libisoburn-0.2.4.pl00.tar.gz, take it to a directory of your choice
 and do:
 
-    tar xzf libisoburn-0.2.1.tar.gz
-    cd libisoburn-0.2.1
+    tar xzf libisoburn-0.2.4.pl00.tar.gz
+    cd libisoburn-0.2.4
 
 Within that directory execute:
 

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([libisoburn], [0.2.1], [http://libburnia-project.org])
+AC_INIT([libisoburn], [0.2.4], [http://libburnia-project.org])
 AC_PREREQ([2.50])
 dnl AC_CONFIG_HEADER([config.h])	
 
@@ -21,7 +21,7 @@ dnl
 dnl These three are only copies to provide libtool with unused LT_RELEASE
 ISOBURN_MAJOR_VERSION=0
 ISOBURN_MINOR_VERSION=2
-ISOBURN_MICRO_VERSION=1
+ISOBURN_MICRO_VERSION=4
 dnl ISOBURN_VERSION=$ISOBURN_MAJOR_VERSION.$ISOBURN_MINOR_VERSION.$ISOBURN_MICRO_VERSION
  
 AC_SUBST(ISOBURN_MAJOR_VERSION)
@@ -33,16 +33,16 @@ dnl Libtool versioning
 dnl Generate libisoburn.so.1.x.y
 dnl SONAME will become LT_CURRENT - LT_AGE
 dnl 
-dnl ts A80713
-dnl ### This is the release version 0.2.0 = libisoburn.so.1.9.0
-dnl This is the development version after above stable release
-dnl ### LT_CURRENT++, LT_AGE++ have not happened happened yet.
-dnl LT_CURRENT++, LT_AGE++ has happened imeanwhile.
+dnl ts A80824
+dnl This is the release version 0.2.4 = libisoburn.so.1.13.0
+dnl ### This is the development version after above stable release
+dnl LT_CURRENT++, LT_AGE++ have not happened happened yet.
+dnl ### LT_CURRENT++, LT_AGE++ has happened meanwhile.
 dnl
-dnl SONAME = 11 - 10 = 1 . Library name = libburn.so.1.10.0
+dnl SONAME = 14 - 13 = 1 . Library name = libisoburn.so.1.13.0
 LT_RELEASE=$ISOBURN_MAJOR_VERSION.$ISOBURN_MINOR_VERSION
-LT_CURRENT=11
-LT_AGE=10
+LT_CURRENT=14
+LT_AGE=13
 LT_REVISION=0
 LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
 
@@ -100,7 +100,7 @@ AC_CHECK_HEADER(libburn/libburn.h)
 AC_CHECK_HEADER(libisofs/libisofs.h)
 
 dnl Check for proper library versions
-LIBBURN_REQUIRED=0.5.0
+LIBBURN_REQUIRED=0.5.2
 LIBISOFS_REQUIRED=0.6.6
 PKG_CHECK_MODULES(LIBBURN, libburn-1 >= $LIBBURN_REQUIRED)
 PKG_CHECK_MODULES(LIBISOFS, libisofs-1 >= $LIBISOFS_REQUIRED)

libisoburn/burn_wrap.c

@@ -380,15 +380,10 @@ int isoburn_drive_aquire(struct burn_drive_info *drive_infos[],
  int ret, conv_ret, drive_grabbed= 0;
  char libburn_drive_adr[BURN_DRIVE_ADR_LEN];
  struct isoburn *o= NULL;
- char msg[BURN_MSGS_MESSAGE_LEN+4096];
 
  conv_ret= burn_drive_convert_fs_adr(adr, libburn_drive_adr);
- if(conv_ret<=0) {
-   sprintf(msg, "Unsuitable drive address: '%s'\n",adr);
-   msg[BURN_MSGS_MESSAGE_LEN-1]= 0;
-   isoburn_msgs_submit(NULL, 0x00060000, msg, 0, "FAILURE", 0);
-   ret= 0; goto ex;
- }
+ if(conv_ret<=0)
+   strcpy(libburn_drive_adr, adr);
 
  ret= burn_drive_scan_and_grab(drive_infos, libburn_drive_adr, flag&1);
  if(ret<=0)
@@ -1029,6 +1024,30 @@ int isoburn_read_iso_head(struct burn_drive *d, int lba,
 }
 
 
+int isoburn_make_toc_entry(struct isoburn *o, int *session_count, int lba,
+                           int track_blocks, int flag)
+{
+ int ret;
+ struct isoburn_toc_entry *item;
+
+ ret= isoburn_toc_entry_new(&item, o->toc, 0);
+ if(ret<=0) {
+   isoburn_msgs_submit(o, 0x00060000,
+                       "Not enough memory for emulated TOC entry object",
+                       0, "FATAL", 0);
+   return(-1);
+ }
+ if(o->toc==NULL)
+   o->toc= item;
+ (*session_count)++;
+ item->session= *session_count;
+ item->track_no= *session_count;
+ item->start_lba= lba;
+ item->track_blocks= track_blocks;
+ return(1);
+}
+
+
 /* @param flag bit0= allow unemulated media
                bit1= free scanning without enclosing LBA-0-header 
    @return -1 severe error, 0= no neat header chain, 1= credible chain read
@@ -1037,8 +1056,8 @@ int isoburn_emulate_toc(struct burn_drive *d, int flag)
 {
  int ret, image_size= 0, lba, track_blocks, session_count= 0, read_flag= 0;
  int scan_start= 0, scan_count= 0, probe_minus_16= 0, growisofs_nwa;
+ int with_enclosure= 0;
  struct isoburn *o;
- struct isoburn_toc_entry *item;
  char msg[160], size_text[80], *sev;
  time_t start_time, last_pacifier, now;
  
@@ -1058,6 +1077,7 @@ int isoburn_emulate_toc(struct burn_drive *d, int flag)
    if(ret<=0)
      {ret= 0; goto failure;}
    lba= Libisoburn_overwriteable_starT;
+   with_enclosure= 1;
  }
  while(lba<image_size || (flag&2)) {
    now= time(NULL);
@@ -1066,7 +1086,7 @@ int isoburn_emulate_toc(struct burn_drive *d, int flag)
      if(scan_count>=10*512)
        sprintf(size_text, "%.f MB", ((double) scan_count) / 512.0);
      else
-       sprintf(size_text, "%.f MB", 2 * (double) scan_count);
+       sprintf(size_text, "%.f kB", 2 * (double) scan_count);
      sprintf(msg, "Found %d ISO sessions by scanning %s in %.f seconds",
              session_count, size_text, (double) (now - start_time));
      isoburn_msgs_submit(o, 0x00060000, msg, 0, "UPDATE", 0);
@@ -1106,27 +1126,25 @@ int isoburn_emulate_toc(struct burn_drive *d, int flag)
                "Chain of ISO session headers broken at #%d, LBA %ds",
                session_count+1, lba);
        isoburn_msgs_submit(o, 0x00060000, msg, 0, "WARNING", 0);
+
+       if(with_enclosure) {
+         ret= isoburn_make_toc_entry(o, &session_count, 0, image_size, 0);
+         if(ret<=0)
+           goto failure;
+       }
+ break; /* do not return failure */
+
      }
      {ret= 0; goto failure;}
    }
    if(ret==2) /* ISO header was found in first half block */
      lba-= 16;
-   ret= isoburn_toc_entry_new(&item, o->toc, 0);
-   if(ret<=0) {
-     isoburn_msgs_submit(o, 0x00060000,
-                         "Not enough memory for emulated TOC entry object",
-                         0, "FATAL", 0);
-     ret= -1; goto failure;
-   }
-   if(o->toc==NULL)
-     o->toc= item;
-   session_count++;
-   scan_count+= 32;
-   item->session= session_count;
-   item->track_no= session_count;
-   item->start_lba= lba;
-   item->track_blocks= track_blocks;
+
+   ret= isoburn_make_toc_entry(o, &session_count, lba, track_blocks, 0);
+   if(ret<=0)
+     goto failure;
    lba+= track_blocks;
+   scan_count+= 32;
 
    /* growisofs aligns to 16 rather than 32 */
    growisofs_nwa= lba;
@@ -1153,6 +1171,10 @@ int isoburn_emulate_toc(struct burn_drive *d, int flag)
  return(1);
 failure:;
  isoburn_toc_entry_destroy(&(o->toc), 1);
+ if(with_enclosure && o->emulation_mode == 1) {
+   session_count= 0;
+   ret= isoburn_make_toc_entry(o, &session_count, 0, image_size, 0);
+ }
  return(ret);
 }
 
@@ -1297,15 +1319,31 @@ failure:;
 int isoburn_toc_disc_get_sectors(struct isoburn_toc_disc *disc)
 {
  struct isoburn_toc_entry *t;
- int ret= 0;
+ int ret= 0, num_sessions, num_tracks;
+ struct burn_session **sessions;
+ struct burn_track **tracks;
+ struct burn_toc_entry entry;
 
  if(disc==NULL)
    return(0);
  if(disc->toc!=NULL) {
    for(t= disc->toc; t!=NULL; t= t->next)
      ret= t->start_lba + t->track_blocks;
- } else if(disc->disc!=NULL)
+ } else if(disc->disc!=NULL) {
+   sessions= burn_disc_get_sessions(disc->disc, &num_sessions);
+   if(num_sessions > 0) {
+     tracks = burn_session_get_tracks(sessions[num_sessions - 1],
+                                      &num_tracks);
+     if(num_tracks > 0) {
+       burn_track_get_entry(tracks[num_tracks - 1], &entry);
+       if(entry.extensions_valid & 1)
+         ret= entry.start_lba + entry.track_blocks;
+     }
+   }
+/*
    ret= burn_disc_get_sectors(disc->disc);
+*/
+ }
  return(ret);
 }
 

libisoburn/libisoburn.h

@@ -208,7 +208,7 @@ void isoburn_version(int *major, int *minor, int *micro);
 */
 #define isoburn_libburn_req_major  0
 #define isoburn_libburn_req_minor  5
-#define isoburn_libburn_req_micro  0
+#define isoburn_libburn_req_micro  2
 
 
 /** The minimum version of libisofs to be used with this version of libisoburn
@@ -244,7 +244,7 @@ int isoburn_libburn_req(int *major, int *minor, int *micro);
 */
 #define isoburn_header_version_major  0
 #define isoburn_header_version_minor  2
-#define isoburn_header_version_micro  1
+#define isoburn_header_version_micro  4
 /** Note:
     Above version numbers are also recorded in configure.ac because libtool
     wants them as parameters at build time.
@@ -502,7 +502,8 @@ struct isoburn_toc_disc *isoburn_toc_drive_get_disc(struct burn_drive *d);
 
 
 /** Tell the number of 2048 byte blocks covered by the table of content.
-    Wrapper for: burn_disc_get_sectors()
+    This number includes the eventual gaps between sessions and tracks.
+    So this call is not really a wrapper for burn_disc_get_sectors().
     @since 0.1.6
     @param disc The master handle of the media
     @return number of blocks, <=0 indicates unknown or unreadable state
@@ -553,7 +554,7 @@ struct isoburn_toc_track **isoburn_toc_session_get_tracks(
                                       struct isoburn_toc_session *s, int *num);
 
 
-/** Obtain a copy of the entry which describes a particular itrack.
+/** Obtain a copy of the entry which describes a particular track.
     Wrapper for: burn_track_get_entry()
     @since 0.1.6
     @param s The track handle
@@ -1051,9 +1052,10 @@ off_t isoburn_disc_available_space(struct burn_drive *d,
 
 
 /** Obtain the start block number of the most recent session on media. In
-    case of random access media this will always be 0. Succesfull return is
+    case of random access media this will normally be 0. Successfull return is
     not a guarantee that there is a ISO-9660 image at all. The call will fail,
-    nevertheless,if isoburn_disc_get_status() returns not BURN_DISC_APPENDABLE.
+    nevertheless,if isoburn_disc_get_status() returns not BURN_DISC_APPENDABLE
+    or BURN_DISC_FULL.
     Note: The result of this call may be fabricated by a previous call of
     isoburn_set_msc1() which can override the rule to load the most recent
     session.

xorriso/README

@@ -4,7 +4,7 @@
 xorriso. By Thomas Schmitt <scdbackup@gmx.net>
 Integrated sub project of libburnia-project.org but also published via:
 http://scdbackup.sourceforge.net/xorriso_eng.html
-http://scdbackup.sourceforge.net/xorriso-0.2.1.tar.gz
+http://scdbackup.sourceforge.net/xorriso-0.2.4.pl00.tar.gz
 Copyright (C) 2006-2008 Thomas Schmitt, provided under GPL version 2.
 ------------------------------------------------------------------------------
 
@@ -36,10 +36,10 @@ The tarball contains anything that is needed except libc and libpthread.
 libreadline and the readline-dev headers will make dialog mode more convenient,
 but are not mandatory.
 
-Obtain xorriso-0.2.1.tar.gz, take it to a directory of your choice and do:
+Obtain xorriso-0.2.4.pl00.tar.gz, take it to a directory of your choice and do:
 
-    tar xzf xorriso-0.2.1.tar.gz
-    cd xorriso-0.2.1
+    tar xzf xorriso-0.2.4.pl00.tar.gz
+    cd xorriso-0.2.4
 
 Within that directory execute:
 
@@ -147,6 +147,26 @@ and vice versa:
    | less
 
 
+                             File Formats
+
+Currently there is only one file format peculiar to xorriso : sector maps
+which describe the valid and invalid blocks on a media or a disk copy of
+a media. xorriso creates and reads these file with its option -check_media.
+
+The file begins with 32 bytes of cleartext of which the last one is a
+newline character. The first 25 say "xorriso sector bitmap v2 ", the
+remaining six characters give the size of the info text as decimal number.
+This number of bytes follows the first 32 and will not be interpreted
+by xorriso. They are rather to inform a human reader about the media type
+and its track layout.
+After the info text there are two 4 byte signed integers, most significant
+byte first. The first one, N, gives the number of bits in the following bitmap
+and the second number S gives the number of 2 KiB blocks governed by a single
+bit in the map. Then come the bits in form of 8-bit bytes.
+Data block M is covered by bit B=M/S in the map, bit number B is stored in
+byte B/8 as bit B%8. A valid readable data block has its bit set to 1.
+
+
                              libisoburn
 
 xorriso is based on libisofs which does ISO 9600 filesystem aspects and on
@@ -166,8 +186,8 @@ and a matching dynamically linked xorriso binary.
 This binary is leaner but depends on properly installed libraries of suitable
 revision.
 
-Dynamic library and compile time header requirements for libisoburn-0.2.1 :
-- libburn.so.4  , version libburn-0.4.8 or higher
+Dynamic library and compile time header requirements for libisoburn-0.2.4 :
+- libburn.so.4  , version libburn-0.5.2 or higher
 - libisofs.so.6 , version libisofs-0.6.6 or higher
 libisoburn and xorriso will not start with libraries which are older than their
 headers seen at compile time. So compile in the oldest possible installation

xorriso/changelog.txt

@@ -2993,14 +2993,568 @@ xorriso/make_xorriso_standalone.sh
 xorriso/configure_ac.txt
 Version leap to 0.2.1
 
-22 Jun 2008  []
+22 Jun 2008  [1877]
 xorriso/changelog.txt
 Documented changes and release timestamp
 
------------------------------------- cycle  - xorriso-0.2.1 - 
+------------------------------------ cycle  - xorriso-0.2.1 - 2008.06.22.135202
 
------------------------------------- cycle  - xorriso-0.2.1 - 
------------------------------------- cycle  - xorriso-0.2.1 - 
+
+2008.06.27.124201  [1880]
+xorriso/xorrisoburn.c
+Bug fix: -as cdrecord -atip falsely announced overwriteable DVD-RW to sdvdbackup
+
+2008.06.27.130235  [1881]
+xorriso/xorriso.c
+Extended -as cdrecord blank= by blank type format_overwrite
+
+------------------------------------ cycle  - xorriso-0.2.1 - 2008.06.27.130235
+
+
+2008.07.03.133023  [1882]
+xorriso/xorriso.c
+Flushing stdout after each result text to deconfuse stdout/stderr with SSH
+
+2008.07.04.070001  [1884]
+xorriso/xorriso.c
+Supporting option -as cdrecord -waiti
+
+2008.07.05.132528  [1885]
+libisoburn/libisoburn.h
+libisoburn/isoburn.h
+libisoburn/isoburn.c
+libisoburn/isofs_wrap.c
+libisoburn/burn_wrap.c
+libisoburn/data_source.c
+New API function isoburn_prepare_blind_grow() for -as mkisofs -multi
+
+2008.07.05.133721  [1886]
+xorriso/xorriso_private.h
+xorriso/xorriso.c
+xorriso/xorrisoburn.c
+xorriso/xorriso.1
+New option -grow_blindly 
+
+2008.07.05.180241  [1887]
+libisoburn/isoburn.c
+Fixed a bug with -grow_blindly to overwriteable media
+
+2008.07.05.182424  [1888]
+xorriso/xorriso.h
+xorriso/xorriso.c
+xorriso/xorriso.1
+New options -C and -M for -as mkisofs 
+
+2008.07.05.184434  [1889]
+xorriso/xorriso.c
+Cared for a peculiarity of growisofs when using mkisofs -C
+
+5 Jul 2008  [1890]
+xorriso/xorriso_eng.html
+Updated xorriso homepage
+
+------------------------------------ cycle  - xorriso-0.2.1 - 2008.07.05.184434
+* New API function isoburn_prepare_blind_grow()
+* New option -grow_blindly
+* New options -C and -M for -as mkisofs emulation
+
+
+2008.07.06.110336  [1891]
+xorriso/xorriso.c
+xorriso/xorrisoburn.h
+xorriso/xorrisoburn.c
+Improved effective drive address with -as mkisofs -M
+
+2008.07.07.095531  [1892]
+xorriso/xorriso.c
+Fixed bug about -as mkisofs without -C
+
+2008.07.07.102941  [1893]
+xorriso/xorriso.h
+xorriso/xorriso_private.h
+xorriso/xorriso.c
+Semi-permanent emulation by start names xorrisofs,genisofs,mkisofs,genioimage
+
+------------------------------------ cycle  - xorriso-0.2.1 - 2008.07.07.102941
+
+2008.07.07.150241  [1894]
+xorriso/xorriso.c
+Correction about -as mkisofs -C if already an input device was set
+
+2008.07.07.150337  [1895]
+libisoburn/isoburn.c
+Correction about isoburn_igopt_get_effective_lba() with blind growing
+
+7 Jul 2008  [1896]
+xorriso/xorriso.1
+Clarification about -grow_blindly predicted_nwa
+
+2008.07.07.150337  [1897]
+xorriso/xorriso.c
+xorriso/xorriso.1
+Made leafname triggered emulation more similar to -as emulation
+
+2008.07.08.092732  [1898]
+Makefile.am
+README
+xorriso/xorriso_makefile_am.txt
+xorriso/README
+Installing softlinks xorrisofs and osirrox pointing to the xorriso binary
+
+2008.07.08.102622  [1899]
+xorriso/xorriso_private.h
+Header file forgotten with rev 1897
+
+2008.07.08.132054  [1900]
+xorriso/xorriso.c
+xorriso/xorrisoburn.c
+Avoided misleading message about emptied ISO image during -as mkisofs -C
+
+8 Jul 2008  [1901]
+xorriso/xorriso_eng.html
+Documented newest progress
+
+------------------------------------ cycle  - xorriso-0.2.1 - 2008.07.08.132054
+* Can serve growisofs if started as xorrisofs, genisofs, mkisofs, genisoimage
+* make install creates xorriso aliases as symbolic links: osirrox, xorrisofs
+
+2008.07.09.055133  [1901]
+xorriso/xorriso.c
+Avoided to use MMC code with -as mkisofs -M by prepending stdio: to address
+
+2008.07.09.055133  [1902]
+xorriso/xorriso.h
+xorriso/xorriso.c
+Fixed bug with -as mkisofs -x and pattern expansion
+
+------------------------------------ cycle  - xorriso-0.2.1 - 2008.07.09.055133
+
+
+2008.07.09.155540  [1903]
+Makefile.am
+xorriso/xorriso_private.h
++ xorriso/xorriso_buildstamp.h
++ xorriso/xorriso_buildstamp_none.h
+xorriso/xorriso_makefile_am.txt
+xorriso/make_xorriso_standalone.sh
+Opportunity to generate build timestamp via make buildstamped
+
+9 Jul 2008  [1904]
+xorriso/xorriso_makefile_am.txt
+Completed (unused) dist rule of standalone-xorriso
+
+2008.07.10.141731  [1905]
+xorriso/xorriso.c
+xorriso/xorrisoburn.h
+xorriso/xorrisoburn.c
+xorriso/xorriso.1
+Enabled -multi and -msinfo with -as cdrecord
+
+2008.07.10.141913  [1906]
+libisoburn/libisoburn.h
+Small correction in API introduction text
+
+2008.07.10.144535  [1907]
+xorriso/xorriso_private.h
+Header file forgotten with rev 1903
+
+2008.07.10.162809  [1908]
+xorriso/xorriso_private.h
+xorriso/xorriso.c
+xorriso/xorriso.1
+cdrecord emulation by start names xorrecord, cdrecord, wodim, cdrskin
+
+2008.07.10.164015  [1909]
+xorriso/xorriso.c
+Reacted on compiler warning
+
+2008.07.10.164412  [1910]
+Makefile.am
+README
+xorriso/xorriso_makefile_am.txt
+xorriso/README
+Installing softlink xorrecord pointing to the xorriso binary
+
+10 Jul 2008  [1911]
+xorriso/xorriso.1
+xorriso/xorriso_eng.html
+xorriso/convert_man_to_html.sh
+Some documentation updates
+
+------------------------------------ cycle  - xorriso-0.2.1 - 2008.07.10.164412
+* New options -multi and -msinfo for -as cdrecord emulation
+* make install creates xorriso alias as symbolic link: xorrecord
+
+
+2008.07.12.181846  [1912]
+libisoburn/libisoburn.h
+libisoburn/burn_wrap.c
+New info mode 2 with isoburn_read_iso_head()
+
+2008.07.12.184833  [1913]
+xorriso/xorriso.c
+xorriso/xorrisoburn.h
+xorriso/xorrisoburn.c
+xorriso/xorriso.1
+New options --grow_overwriteable_iso and write_start_address= with -as cdrecord
+
+2008.07.14.114515  [1918]
+libisoburn/libisoburn.h
+Required libburn version is now 0.4.9
+
+2008.07.14.114613  [1919]
+configure.ac
+Did LT_CURRENT++, LT_AGE++ which was forgotten with revision 1885
+
+2008.07.14.120527  [1920]
+libisoburn/libisoburn.h
+libisoburn/burn_wrap.c
+New flag options with isoburn_read_iso_head()
+
+2008.07.14.125133  [1921]
+xorriso/xorriso.c
+xorriso/xorrisoburn.c
+xorriso/xorriso.1
+New option -isosize with -as cdrecord
+
+14 Jul 2008  [1923]
+xorriso/convert_man_to_html.sh
+Small correction with a sed expression
+
+2008.07.15.063040  [1924]
+xorriso/xorriso_makefile_am.txt
+Generating automatic build timestamp 
+
+2008.07.15.121754  [1925]
+xorriso/xorriso.c
+xorriso/xorrisoburn.h
+xorriso/xorrisoburn.c
+xorriso/xorriso.1
+New option tsize= with -as cdrecord
+
+------------------------------------ cycle  - xorriso-0.2.1 - 2008.07.15.121754
+* New options --grow_overwriteable_iso and write_start_address= with -as cdrecord
+* New options -isosize and tsize= with -as cdrecord
+
+
+2008.07.16.130711  [1933]
+xorriso/xorriso.h
+xorriso/xorriso_private.h
+xorriso/xorriso.c
+xorriso/xorrisoburn.c
+xorriso/xorriso.1
+New option -pacifier, more compatible pacifier with -as mkisofs
+
+2008.07.16.130758  [1934]
+xorriso/configure_ac.txt
+Updated xorriso standalone configure.ac version number BURN_*_VERSION
+
+2008.07.16.130841  [1935]
+libisoburn/libisoburn.h
+Required libburn version is now 0.5.0
+
+2008.07.16.131110  [1936]
+configure.ac
+Required libburn version is now 0.5.0
+
+2008.07.16.140043  [1937]
+xorriso/xorriso.c
+xorriso/xorriso.1
+Recognizing "b" as speed factor for BD media
+
+------------------------------------ cycle  - xorriso-0.2.1 - 2008.07.16.140043
+* New option -pacifier, more compatible pacifier with -as mkisofs
+
+2008.07.17.110812  [1939]
+libisoburn/libisoburn.h
+libisoburn/burn_wrap.c
+Ability to emulate a featured bug with mkisofs -C : read 16 block too early
+
+2008.07.17.111411  [1940]
+xorriso/xorriso.h
+xorriso/xorriso.c
+xorriso/xorrisoburn.c
+xorriso/xorriso.1
+Rectified usage of original xorriso options underneath growisofs
+
+2008.07.17.183024  [1941]
+libisoburn/burn_wrap.c
+Recognizing growisofs follow-up sessions on xorriso overwriteables
+
+2008.07.17.184520  [1942]
+libisoburn/burn_wrap.c
+xorriso/xorriso.c
+xorriso/xorrisoburn.c
+Removed MULTI construction site remarks
+
+------------------------------------ cycle  - xorriso-0.2.1 - 2008.07.17.184520
+
+
+2008.07.18.120001  [1944]
+configure.ac
+README
+libisoburn/libisoburn.h
+xorriso/README
+xorriso/xorriso_timestamp.h
+xorriso/xorriso_private.h
+xorriso/xorrisoburn.h
+xorriso/xorriso_eng.html
+xorriso/make_xorriso_standalone.sh
+xorriso/configure_ac.txt
+
+18 Jul 2008  [1946]
+README
+xorriso/README
+Corrected outdated statement about minimum library requirements
+
+
+---------------------------------- release  - xorriso-0.2.2 - 2008.07.18.120001
+* New API function isoburn_prepare_blind_grow()
+* New option -grow_blindly
+* Options -C and -M for -as mkisofs emulation
+* Can serve growisofs if started as xorrisofs, genisofs, mkisofs, genisoimage
+* make install creates aliases as symbolic links: osirrox, xorrisofs, xorrecord
+* Options for -as cdrecord emulation: -multi, -msinfo, -isosize, tsize,
+  --grow_overwriteable_iso, write_start_address,
+* New option -pacifier, more compatible pacifier with -as mkisofs
+
+
+2008.07.18.135540  [1947]
+configure.ac
+README
+libisoburn/libisoburn.h
+xorriso/README
+xorriso/xorriso_timestamp.h
+xorriso/xorriso_private.h
+xorriso/xorrisoburn.h
+xorriso/xorriso_eng.html
+xorriso/make_xorriso_standalone.sh
+xorriso/configure_ac.txt
+xorriso/changelog.txt
+Version leap to 0.2.3
+
+------------------------------------ cycle  - xorriso-0.2.3 - 2008.07.18.135540
+
+
+2008.07.19.113048  [1949]
+Makefile.am
+xorriso/compile_xorriso.sh
+Introduced automatic buildstamp generation for dynamic library version
+
+2008.07.21.155324  [1950]
+Makefile.am
+xorriso/xorriso_makefile_am.txt
+Reacting on ticket 138 by stick, revoked buildstamp due to ugly make install
+
+2008.07.21.161826  [1951]
+Makefile.am
+xorriso/xorriso_makefile_am.txt
+Used quotation marks as does ./bootstrap when generating Makefile.in
+
+------------------------------------ cycle  - xorriso-0.2.3 - 2008.07.21.161826
+* Bug fix: Variable DESTDIR was not properly respected during make install
+
+
+2008.07.23.080001 [xorriso-0.2.2.pl01]
+Makefile.in
+xorriso/xorriso_timestamp.h
+xorriso/changelog.txt
+* Bug fix: external make variable DESTDIR was not used by xorriso link creation
+
+------------------------------- patch  - xorriso-0.2.2.pl01 - 2008.07.23.080001
+* Bug fix: Variable DESTDIR was not properly respected during make install
+
+
+2008.07.26.075027  [1953]
+libisoburn/burn_wrap.c
+Producing on overwriteables a partial TOC up to first damaged superblock
+
+2008.08.01.101355  [1955]
+xorriso/xorrisoburn.c
+Better finish time estimation with -pacifier mkisofs
+
+2008.08.01.141210  [1956]
+xorriso/xorrisoburn.c
+Better finish time estimation with -pacifier mkisofs
+
+2008.08.06.143825  [1967]
+xorriso/xorriso_private.h
+Removed obsolete type definition
+
+2008.08.06.143922  [1968]
+xorriso/xorrisoburn.c
+Removed obsolete function
+
+2008.08.07.112529  [1972]
+xorriso/xorriso.c
+Minor changes around display of time and byte counts
+
+2008.08.09.160515  [1977]
+configure.ac
+libisoburn/libisoburn.h
+Demanding libburn-0.5.1 now
+
+2008.08.09.160947  [1978]
+libisoburn/burn_wrap.c
+Create emulated toc entry for simple ISO session on overwriteable media
+
+2008.08.09.161311  [1979]
+xorriso/xorriso_private.h
+xorriso/xorriso.c
+xorriso/xorrisoburn.h
+xorriso/xorrisoburn.c
+Evaluating readability of media
+
+2008.08.11.201604  [1980]
+xorriso/xorriso_private.h
+xorriso/xorriso.c
+xorriso/xorrisoburn.h
+xorriso/xorrisoburn.c
+Adapted media evaluation to CD peculiarities
+
+2008.08.13.185434  [1981]
+libisoburn/libisoburn.h
+Corrected documentation of isoburn_disc_get_msc1()
+
+2008.08.13.190704  [1982]
+xorriso/xorriso.h
+xorriso/xorriso_private.h
+xorriso/xorriso.c
+xorriso/xorrisoburn.h
+xorriso/xorrisoburn.c
+New capability to redirect program output used for toc in sector map file
+
+2008.08.14.220520  [1983]
+libisoburn/burn_wrap.c
+Changed wrong update message from MB to kB
+
+2008.08.14.221412  [1984]
+xorriso/xorriso.h
+xorriso/xorriso_private.h
+xorriso/xorriso.c
+xorriso/xorrisoburn.h
+xorriso/xorrisoburn.c
+xorriso/xorriso.1
+New option -check_media
+
+2008.08.15.102849  [1985]
+xorriso/xorriso.h
+xorriso/xorriso_private.h
+xorriso/xorriso.c
+Allowed independent redirecton of result and info channel
+
+2008.08.15.155421  [1986]
+xorriso/xorriso.c
+xorriso/xorrisoburn.h
+xorriso/xorrisoburn.c
+xorriso/xorriso.1
+Enabled printing of sector bitmaps by use=sector_map
+
+15 Aug 2008  [1987]
+xorriso/xorriso_eng.html
+Mentioned progress of development version
+
+2008.08.17.220043  [1988]
+xorriso/xorriso_private.h
+xorriso/xorriso.c
+xorriso/xorrisoburn.h
+xorriso/xorrisoburn.c
+xorriso/xorriso.1
+-find tests -damaged and -lba_range, new -find action report_damage
+
+2008.08.17.221350  [1989]
+xorriso/xorrisoburn.c
+xorriso/xorriso_eng.html
+Reacted on compiler warning
+
+------------------------------------ cycle  - xorriso-0.2.3 - 
+* Included libburn has enhanced Linux drive access and listing code
+* New option -check_media
+* New -find test -damaged, new -find action "report_damage"
+
+
+2008.08.18.134140  [1990]
+xorriso/xorrisoburn.c
+xorriso/README
+xorriso/xorriso.1
+New -find action report_lba
+
+2008.08.20.101410  [2000]
+xorriso/configure_ac.txt
+Adopted to new libburn version 0.5.3
+
+2008.08.20.121008  [2002]
+libisoburn/libisoburn.h
+configure.ac
+Demanding libburn-0.5.2 now
+
+2008.08.20.181734  [2003]
+xorriso/xorrisoburn.c
+Made -check_media process first 32 blocks of a multi-session overwriteable
+
+2008.08.21.070602  [2004]
+xorriso/xorriso.c
+Synced -lsl display of major,minor numbers with /usr/include/sys/sysmacros.h
+
+2008.08.22.231051  [2005]
+xorriso/xorriso_private.h
+xorriso/xorriso.c
+xorriso/xorrisoburn.h
+xorriso/xorrisoburn.c
+xorriso/xorriso.1
+New -check_media option -patch_lba0=
+
+2008.08.24.100552  [2007]
+xorriso/xorriso_private.h
+xorriso/xorriso.c
+xorriso/xorrisoburn.c
+xorriso/xorriso.1
+xorriso/xorriso_eng.html
+New -error_behavior behavior occasion "file_extraction"
+
+2008.08.24.124424  [2008]
+xorriso/xorrisoburn.c
+Fixed a bug with -check_media use=outdev
+
+2008.08.24.125257  [2009]
+xorriso/xorrisoburn.c
+Reacted on compiler warning
+
+
+------------------------------------ cycle  - xorriso-0.2.3 - 2008.08.24.125257
+* New -find action "report_lba"
+* New -error_behavior behavior occasion "file_extraction"
+
+2008.08.24.160001  []
+configure.ac
+README
+libisoburn/libisoburn.h
+xorriso/README
+xorriso/xorriso_timestamp.h
+xorriso/xorriso_private.h
+xorriso/xorrisoburn.h
+xorriso/xorriso_eng.html
+xorriso/make_xorriso_standalone.sh
+xorriso/configure_ac.txt
+Version leap to 0.2.4
+
+  []
+xorriso/changelog.txt
+Documented changes and release timestamp
+
+
+---------------------------------- release  - xorriso-0.2.4 - 2008.08.24.160001
+* Included libburn has enhanced Linux drive access and listing code
+* New option -check_media
+* New -find test -damaged, new -find actions "report_damage", "report_lba"
+* New -error_behavior occasion "file_extraction"
+
+------------------------------------ cycle  - xorriso-0.2.5 - 
+------------------------------------ cycle  - xorriso-0.2.5 - 
+
+  []
+libisoburn/burn_wrap.c
+Tested removal of drive address path conversion in isoburn_drive_aquire()
 
 
 ===============================================================================
@@ -3011,11 +3565,17 @@ Documented changes and release timestamp
 
 ------------------------------------------------- important
 
+
 ------------------------------------------------- development
 
-??? Clarify handling  of links in ISO and on disk during restore
+- option -list_delimiter
 
-- mkisofs,cdrecord multi session
+- change -check_media what=disc to libburn disc rather than libisoburn
+  (seems to need new API capabilities of libburn)
+
+- opportunity to retrieve file via burn_read_data() and libisofs provided lba
+
+??? Clarify handling  of links in ISO and on disk during restore
 
 > Relative addressing and pattern matching :
    iso_rr_pattern on
@@ -3043,7 +3603,6 @@ Documented changes and release timestamp
 
 - memory curb for image model
 
-??? semicolon as alias of -- ?
 
 > Make transactional the tree deletions meant for replacing
 
@@ -3054,9 +3613,23 @@ Documented changes and release timestamp
 
 - Error code for libisoburn data source read errors.
 
+- Proper reaction on severity of errors issued by data_source
+  (currently even a FATAL gets converted to ISO_FILE_READ_ERROR 
+   in iso_stream_read())
+
 - #define ISO_ERR_PRIO(e)     ((e & 0x00700000) << 8)
   (rather than 0x00F00000, see ticket 135)
 
+- the error handling system should be comprehensively documented
+  and eventually rectified where needed.
+
+- ticket 137:
+  With softlink /X/YZ and Joliet enabled:
+    libisofs: HINT : Can't add YZ to Joliet tree. This kind of files can only be added to a Rock Ridget tree. Skipping.
+  HINT is not a suitable severity for this. Better: WARNING, SORRY, MISHAP
+  One should at least give the full path of /X/YZ or the type of the file.
+
+
 ------ feature enhancements :
 
 - Data files >= 4 GiB.
@@ -3074,14 +3647,16 @@ Documented changes and release timestamp
   A data file entry should point to that block.
 
 - creation of bootable images
+  >>> Vreixo points to demo/iso.c
+ 
 
 ------ extended attribute stunts: Not visible for mount but for libisofs
 
 - file checksums
 
-- ACLs
-
-- man attr(5) extended attributes
+- ticket 136:
+  ACLs
+  man attr(5) extended attributes
 
 
 ===============================================================================

xorriso/compile_xorriso.sh

@@ -76,9 +76,11 @@ libisofs="$libisofs $isofs"/util.o
 libisofs="$libisofs $isofs"/util_htable.o
 libisofs="$libisofs $isofs"/util_rbtree.o
 
-timestamp="$(date -u '+%Y.%m.%d.%H%M%S')"
+
 echo "Version timestamp :  $(sed -e 's/#define Xorriso_timestamP "//' -e 's/"$//' "$xorr"/xorriso_timestamp.h)"
-echo "Build timestamp   :  $timestamp"
+
+date -u '+#define Xorriso_build_timestamP "%Y.%m.%d.%H%M%S"' >"$xorr"/xorriso_buildstamp.h
+echo "Build timestamp   :  $(sed -e 's/#define Xorriso_build_timestamP "//' -e 's/"$//' "$xorr"/xorriso_buildstamp.h)"
 
 echo "compiling program $xorr/xorriso.c $static_opts $debug_opts $def_opts"
 cc -I. -DXorriso_with_maiN -DXorriso_with_regeX -DXorriso_with_readlinE \
@@ -88,8 +90,6 @@ cc -I. -DXorriso_with_maiN -DXorriso_with_regeX -DXorriso_with_readlinE \
   $def_opts \
   $largefile_opts \
   \
-  -DXorriso_build_timestamP='"'"$timestamp"'"' \
-  \
   -o "$xorr"/xorriso \
   \
   "$xorr"/xorriso.c \

xorriso/configure_ac.txt

@@ -1,4 +1,4 @@
-AC_INIT([xorriso], [0.2.1], [http://libburnia-project.org])
+AC_INIT([xorriso], [0.2.3], [http://libburnia-project.org])
 AC_PREREQ([2.50])
 dnl AC_CONFIG_HEADER([config.h])	
 
@@ -9,7 +9,7 @@ AM_INIT_AUTOMAKE([subdir-objects])
 
 BURN_MAJOR_VERSION=0
 BURN_MINOR_VERSION=5
-BURN_MICRO_VERSION=1
+BURN_MICRO_VERSION=3
 AC_SUBST(BURN_MAJOR_VERSION)
 AC_SUBST(BURN_MINOR_VERSION)
 AC_SUBST(BURN_MICRO_VERSION)

xorriso/make_xorriso_standalone.sh

@@ -25,11 +25,11 @@
 current_dir=$(pwd)
 lone_dir="$current_dir"/"xorriso-standalone"
 
-xorriso_rev=0.2.1
+xorriso_rev=0.2.4
 # For unstable uploads:
-xorriso_pl=""
+# xorriso_pl=""
 # For stable releases:
-# xorriso_pl=".pl00"
+xorriso_pl=".pl00"
 
 with_bootstrap_tarball=1
 

xorriso/xorriso.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 XORRISO 1 "Jul, 17, 2008"
+.TH XORRISO 1 "Aug 24, 2008"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -57,6 +57,8 @@ Can perform multi-session tasks as emulation of mkisofs and cdrecord.
 .br
 Can restore files from ISO image to disk filesystem (see osirrox).
 .br
+Can check media for damages and copy readable blocks to disk.
+.br
 Scans for optical drives, blanks re-useable optical media.
 .br
 Reads its instructions from command line arguments, dialog, and batch files.
@@ -147,11 +149,11 @@ useful to store intermediate states and to continue with image manipulations.
 .B Media types and states:
 There are two families of media in the MMC standard:
 .br
-\fBMulti-session\fR media are CD-R, CD-RW, DVD-R, DVD+R, DVD+R/DL, and
+\fBMulti-session media\fR are CD-R, CD-RW, DVD-R, DVD+R, DVD+R/DL, and
 unformatted DVD-RW. These media provide a table of content which
 describes their existing sessions. See option \fB-toc\fR.
 .br
-\fBOverwriteable\fR media are DVD-RAM, DVD+RW, BD-RE, and formatted DVD-RW.
+\fBOverwriteable media\fR are DVD-RAM, DVD+RW, BD-RE, and formatted DVD-RW.
 They allow random write access but do not provide information about their
 session history. If they contain one or more ISO 9660 sessions and if the
 first session was written by xorriso, then a table of content can
@@ -210,7 +212,7 @@ blank state if it was not blank already.
 .PP
 If there is a input drive with a valid ISO image, then this image gets loaded
 as foundation for manipulations and extension. The constellation of input
-and output drive determines which of two write methods will be used.
+and output drive determines which write method will be used.
 They have quite different capabilities and constraints.
 .PP
 The method of \fBgrowing\fR adds new data to the existing media. These
@@ -551,11 +553,8 @@ If other file types collide then the setting of command
 decides.
 .br
 Renaming of files has similar collision handling, but directories can only
-be replaced, not merged. Directories can hardly collide on renaming because
-of the shell-like behavior of -mv: if a file object hits an existing directory
-then it gets inserted rather than trying to replace that directory.
-Nevertheless, the overwriting rules apply if an operation of xorriso
-ever attempts to do such a replacement.
+be replaced, not merged. Note that -mv inserts the source objects into an
+eventual existing target directory rather than attempting to replace it.
 .PP
 The commands in this section alter the ISO image and not the local filesystem.
 .TP
@@ -835,21 +834,44 @@ where "A0" is year 2000, "B0" is 2010, etc.
 \fB\-alter_date_r\fR type timestring iso_rr_path [***]
 Like -alter_date but affecting all files below eventual directories.
 .TP
-\fB\-find\fR iso_rr_path [-name pattern] [-type t] [-exec action [params]] --
+\fB\-find\fR iso_rr_path [test [test ...]] [-exec action [params]] --
 A very restricted substitute for shell command find in the ISO image.
 It performs an action on matching file objects at or below iso_rr_path.
 .br
-Optional -name pattern is not expanded but used for comparison with
-the particular file names of the eventual directory tree underneath
-iso_rr_path. If no -name pattern is given, then any file name matches.
+Tests are optional. If they are omitted then action is applied to all file
+objects. If tests are given then action is applied only if all of them
+match the file object. Available tests are:
 .br
-The optional -type test restricts matching to files of the given type:
+-name pattern
+.br
+Pattern is not expanded but used for comparison with
+the particular file names of the eventual directory tree underneath
+iso_rr_path.
+.br
+-type type_letter
+.br
+matches only files files of the given type:
 "block", "char", "dir", "pipe", "file", "link", "socket",
 "Xotic" which eventually matches what is not matched by the other types.
 .br
 Only the first letter is interpreted.  E.g.: -find / -type d
 .br
-If a file matches then the action is performed. Default action is "echo",
+-damaged
+.br
+matches only files which use data blocks marked as damaged by a previous
+run of -check_media. The damage info vanishes when a new ISO image gets
+loaded.
+.br
+-undamaged
+.br
+matches only files which use data blocks outside the areas marked as damaged. 
+.br
+-lba_range start_lba block_count
+.br
+matches only files which use data blocks within the range of start_lba
+and start_lba+block_count-1.
+.br
+Default action is "echo",
 i.e. to print the address of the found file. Other actions are certain
 xorriso commands which get performed on the found files. These commands
 may have specific parameters. See also their particular descriptions.
@@ -907,6 +929,24 @@ E.g.:
 .br 
   -find /uh/oh -name *private* -exec rm_r --
 .br
+"report_damage" classifies files whether they hit a data block that is
+marked as damaged. The result is printed together with the eventual address
+of the first damaged byte, the maximum span of damages, file size, and the
+path of the file. 
+.br
+E.g.:
+.br
+  -find / -damaged -exec report_damage
+.br
+"report_lba" prints files which are associated to image data blocks.
+It tells the logical block address, the block number, the byte size,
+and the path of each file. In future there may be reported more than one
+line per file if the file is very large.
+.br
+E.g.:
+.br
+  -find / -lba_range 302000 50000 -exec report_lba
+.br
 "find" performs another run of -find on the matching file address. It accepts
 the same params as -find, except iso_rr_path.
 E.g.:
@@ -1390,10 +1430,11 @@ of xorriso begin. Only "-report_about" with dash "-" is recognized that way.
 .TP
 \fB\-error_behavior\fR occasion behavior
 Control the program behavior at problem event occasions.
+For now this applies to occasions "image_loading" which is given while
+an image tree is read from the input device, and to "file_extraction" which
+is given with osirrox options like -extract.
 .br
-For now this applies only to occasion "image_loading" which is given while
-an image tree is read from the input device. There are three behaviors
-available:
+With "image_loading" there are three behaviors available:
 .br
 "best_effort" goes on with reading after events with severity below FAILURE
 if the threshold of option -abort_on allows this.
@@ -1403,6 +1444,11 @@ It issues an own FAILURE event.
 .br
 "fatal" acts like "failure" but issues the own event as FATAL.
 This is the default.
+.br
+With occasion "file_extraction" there are two behaviors:
+.br
+"keep" maintains incompletely extracted files on disk. "delete" removes
+files which encountered errors during content extraction.
 .TP
 .B Dialog mode control:
 .TP
@@ -1645,9 +1691,106 @@ addresses get compared whether they have counterparts below the other address
 and whether both counterparts match.
 .TP
 \fB\-compare_l\fR disk_prefix iso_rr_prefix disk_path [***]
-Performs -compare_r with each of the disk_path arguments. iso_rr_path will be
+Perform -compare_r with each of the disk_path arguments. iso_rr_path will be
 composed from disk_path by replacing disk_prefix by iso_rr_prefix.
 .TP
+.B Evaluation of readability and recovery:
+.PP
+It is not uncommon that optical media produce read errors. The reasons may be
+various and get obscured by error correction which is performed by the drives
+and based on extra data on the media. If a drive returns data then one can
+quite trust that they are valid. But at some degree of read problems the
+correction will fail and the drive is supposed to indicate error.
+.br
+xorriso can scan the media for readable data blocks, classify them according
+to their read speed, save them to a file, and keep track of successfuly saved
+blocks for further tries on the same media.
+.TP
+\fB\-check_media\fR [option [option ...]] --
+Try to read data blocks from the indev drive, eventually copy them to a
+disk file, and finally report about the encountered quality. Several options
+may be used to modify the default behavior.
+.br
+An option consists of a keyword, a "=" character, and a value.
+.br
+Default is:
+.br
+use=indev what=tracks min_lba=-1 max_lba=-1 retry=default
+time_limit=28800 item_limit=100000
+.br
+abort_file=/var/opt/xorriso/do_abort_check_media
+.br
+data_to='' sector_map='' map_with_volid=off patch_lba0=off report=blocks
+.br
+Non-default settings:
+.br
+"use=outdev" reads from the output drive instead of the input drive. This
+avoids loading the ISO image tree from media.
+.br
+"what=disc" scans the payload range of a media without respecting track gaps.
+.br
+"min_lba=" omits all blocks with addresses lower than the option value.
+.br
+"max_lba=" switches to what=disc and omits all blocks above its option value.
+.br
+"retry=on" forces read retries with single blocks when the normal read
+chunk produces a read error. By default, retries are only enabled with CD
+media. "retry=off" forbits retries for all media types. 
+.br
+"abort_file=" gives the path of the file which may abort a scan run. Abort
+happens if the file exists and its mtime is not older than the start time
+of the run. Use shell command "touch" to trigger this.
+Other than an aborted program run, this will report the tested and untested
+blocks and go on with running xorriso.
+.br
+"time_limit=" gives the number of seconds after which the scan shall be
+aborted. This is useful for unattended scanning of media which may else
+overwork the drive in its effort to squeeze out some readable blocks.
+Abort may be delayed by the drive gnawing on the last single read operation.
+Value -1 means unlimited time.
+.br
+"item_limit=" gives the number of report list items after which to abort.
+Value -1 means unlimited item number.
+.br
+"data_to=" copies the valid blocks to the file which is given as option value.
+.br
+"sector_map=" tries to read the file given by option value as
+sector bitmap and to store such a map file after the scan run.
+The bitmap tells which blocks have been read successfully in previous runs.
+It allows to do several scans on the same media, eventually with intermediate
+eject, in order to collect readable blocks whenever the drive is lucky enough
+to produce them. The stored file contains a human readable TOC of tracks
+and their start block addresses, followed by binary bitmap data.
+.br
+"map_with_volid=on" examines tracks whether they are ISO images and eventually
+prints their volume ids into the human readable TOC of sector_map=.
+.br
+"patch_lba0=on" transfers within the data_to= file a copy of the currently
+loaded session head to the start of that file and patches it to be valid
+at that position.
+This makes the loaded session the default session of the image file
+when it gets mounted or loaded as stdio: drive. But it usually makes
+the original session 1 inaccessible.
+.br
+"patch_lba0=force" performs "patch_lba0=on" even if xorriso believes
+that the copied data are not valid.
+.br
+"patch_lba0=" may also bear a number. If it is 32 or higher it is taken as
+start address of the session to be copied. In this case it is not necessary to
+have an -indev and a loaded image. ":force" may be appended after the number.
+.br
+"use=sector_map" does not read any media but loads the file given by option
+sector_map= and processes this virtual outcome.
+.br
+The result list tells intervals of 2 KiB blocks with start address, number
+of blocks and quality. Qualities which begin with "+" are
+supposed to be valid readable data. Qualities with "-" are no valid data.
+.br
+"report=files" lists the files which use damaged blocks (not with use=outdev).
+The format is like with find -exec report_damage.
+.br
+"report=blocks_files" first lists damaged blocks and then affected files.
+.TP
 .B osirrox restore options:
 .PP
 Normally xorriso only writes to disk files which were given as stdio:
@@ -2323,7 +2466,21 @@ Avoid to eventually create /home/thomas/restored without rwx-permission.
  -extract /personal_mail /home/thomas/restored/personal_mail
 .br
  -rollback_end
+.SS
+.B Try to retrieve as many blocks as possible from a damaged media
 .br
+\fB$\fR xorriso -abort_on NEVER -indev /dev/sr0 \\
+.br
+ -check_media time_limit=1800 report=blocks_files \\
+.br
+ data_to="$HOME"/dvd_copy sector_map="$HOME"/dvd_copy.map --
+.br
+This can be repeated several times, eventually with -eject or with other
+-indev drives. See the human readable part of "$HOME"/dvd_copy.map for
+addresses which can be used on "$HOME"/dvd_copy with mount option sbsector=.
+.br
+If you want to make the newest session the default mount session, you
+may add option "patch_lba0=on" to the final -check_media run.
 .SH FILES
 .SS 
 .B Startup files:
@@ -2341,6 +2498,12 @@ to read and execute lines from the following files:
 .br
 The files are read in the sequence given above, but none of them is required
 for xorriso to function properly.
+.TP
+.B Runtime control files:
+.br
+The default setting of -check_media abort_file= is:
+.br
+   /var/opt/xorriso/do_abort_check_media
 .br
 .SH SEE ALSO
 .TP

xorriso/xorriso.h

@@ -150,6 +150,104 @@ int Xorriso_process_msg_queues(struct XorrisO *xorriso, int flag);
 
 
 
+/* The outlist stack allows to redirect the info and result messages from
+   their normal channels into a pair of string lists which can at some
+   later time be retrieved by the application.
+   These redirection caches can be stacked to allow stacked applications.
+   xorriso itself uses them for internal purposes. 
+*/
+
+/* A list item able of forming double chained lists */
+struct Xorriso_lsT;
+
+/** Maximum number of stacked redirections */
+#define Xorriso_max_outlist_stacK 32
+
+/** Enable a new redirection of info and/or result channel. The normal message
+    output and eventual older redirections will not see new messages until
+    the redirection is ended by a call to Xorriso_pull_outlists() with the
+    stack_handle value returned by this call.
+    Redirected output is not written to the files of Xorriso_option_logfile()
+    and the Xorriso_option_pkt_output() protocol will not be applied.
+    @param xorriso      The environment handle
+    @param stack_handle returns an id number which is unique as long as
+                        its redirection is stacked. It may be re-used after
+                        its redirection was pulled from the stack.
+    @param flag         Bitfield for control purposes
+                         bit0= redirect result channel
+                         bit1= redirect info channel
+                        If bit0 and bit1 are 0, both channels get redirected.
+    @return           1 on success, <=0 if failure
+*/
+int Xorriso_push_outlists(struct XorrisO *xorriso, int *stack_handle,
+                          int flag);
+
+
+/** Disable the redirection given by stack_handle. If it was the current
+    receiver of messages then switch output to the next older redirection
+    resp. to the normal channels if no redirections are stacked any more.
+    The messages collected by the disabled redirection are handed out as
+    two lists. Both lists have to be disposed via Xorriso_lst_destroy_all() 
+    when they are no longer needed.
+    The message lists are either NULL or represented by their first
+    Xorriso_lsT item.
+    @param xorriso       The environment handle
+    @param stack_handle  The id number returned by Xorriso_push_outlists()
+    @param result_list   Result and mark messages (usually directed to stdout)
+    @param info_list     Info and mark messages (usually directed to stderr)
+    @param flag          unused yet, submit 0
+    @return              1 on success, <=0 if failure
+*/
+int Xorriso_pull_outlists(struct XorrisO *xorriso, int stack_handle,
+                          struct Xorriso_lsT **result_list,
+                          struct Xorriso_lsT **info_list, int flag);
+
+
+/** Obtain the text message from the current list item.
+    @param entry    The current list item
+    @param flag     unused yet, submit 0
+    @return         Pointer to the text content of the list item.
+                    This pointer does not have to be freed.
+*/
+char *Xorriso_lst_get_text(struct Xorriso_lsT *entry, int flag);
+
+
+/** Obtain the address of the next item in the chain of messages.
+    An iteration over the output of Xorriso_pull_outlists() starts at the
+    returned result_list resp. info_list and ends when this function returns
+    NULL.
+    @param entry    The current list item
+    @param flag     unused yet, submit 0
+    @return         Pointer to the next list item or NULL if end of list.
+                    This pointer does not have to be freed.
+*/
+struct Xorriso_lsT *Xorriso_lst_get_next(struct Xorriso_lsT *entry, int flag);
+
+
+/** Obtain the address of the previous item in the chain of messages.
+    @param entry    The current list item
+    @param flag     unused yet, submit 0
+    @return         Pointer to the previous list item or NULL if start of list.
+                    This pointer does not have to be freed.
+*/
+struct Xorriso_lsT *Xorriso_lst_get_prev(struct Xorriso_lsT *entry, int flag);
+
+
+/** Destroy all list items which are directly or indirectly connected to
+    the given link item.
+    Apply this to each of the two list handles obtained by 
+    Xorriso_pull_outlists() when the lists are no longer needed.
+    @param lstring  *lstring will be freed and set to NULL.
+                    It is not dangerous to submit a pointer to a NULL-pointer.
+    @param flag     unused yet, submit 0
+    @return         -1= lstring was NULL (i.e. wrong use of this call),
+                     0= *lstring was already NULL,
+                     1= item actually disposed
+*/
+int Xorriso_lst_destroy_all(struct Xorriso_lsT **lstring, int flag);
+
+
+
 /* ---------------------------- Options API ------------------------ */
 /*    See man 1 xorriso for explanation of the particular options    */
 /*
@@ -203,6 +301,10 @@ int Xorriso_option_cdi(struct XorrisO *xorriso, char *iso_rr_path, int flag);
 /* Option -cdx */
 int Xorriso_option_cdx(struct XorrisO *xorriso, char *disk_path, int flag);
 
+/* Option -check_media */
+int Xorriso_option_check_media(struct XorrisO *xorriso,
+                               int argc, char **argv, int *idx, int flag);
+
 /* Option -chgrp alias -chgrpi , chgrp_r alias chgrpi */
 /* @param flag bit0=recursive (-chgrp_r)
 */

xorriso/xorriso_eng.html

@@ -60,7 +60,7 @@ and to MMC-5 for DVD or BD).
 GPL software included:<BR>
 </H2>
 <DL>
-<DT>libburn-0.4.9</DT>
+<DT>libburn-0.5.3</DT>
 <DD>reads and writes data from and to CD, DVD, BD-RE.</DD>
 <DD>(founded by Derek Foreman and Ben Jansens,
 furthered since August 2006 by
@@ -68,7 +68,7 @@ Thomas Schmitt from team of libburnia-project.org)</DD>
 <DT>libisofs-0.6.6</DT>
 <DD>operates on ISO 9660 filesystem images.</DD>
 <DD>(By Vreixo Formoso and Mario Danic from team of libburnia-project.org)</DD>
-<DT>libisoburn-0.2.0</DT>
+<DT>libisoburn-0.2.4</DT>
 <DD>coordinates libburn and libisofs, emulates multi-session where needed.</DD>
 <DD>(By Vreixo Formoso and Thomas Schmitt
 from team of libburnia-project.org)</DD>
@@ -98,24 +98,11 @@ Operates on an existing ISO image or creates a new one.
 Copies files from filesystem into the ISO image.
 </LI>
 <LI>
-Renames or deletes file objects in the ISO image.
-</LI>
-<LI>
-Changes file properties in the ISO image.
+Changes file properties, renames or deletes file objects in the ISO image.
 </LI>
 <LI>
 Updates ISO subtrees incrementally to match given disk subtrees.
 </LI>
-
-<LI>
-Can write result as completely new image to optical media or
-filesystem objects.
-</LI>
-<LI>
-Can write result as add-on session to appendable multi-session media,
-to overwriteable media, to regular files, and to block devices.
-</LI>
-<!--
 <LI>
 Writes result as completely new image or as add-on session
 to optical media or filesystem objects.
@@ -123,12 +110,13 @@ to optical media or filesystem objects.
 <LI>
 Can perform multi-session tasks as emulation of mkisofs and cdrecord.
 </LI>
--->
-
 <LI>
 Can restore single files and whole trees from ISO image to disk filesystem.
 </LI>
 <LI>
+Can check media for damages and copy readable blocks to disk.
+</LI>
+<LI>
 Scans for optical drives, blanks re-useable optical media, formats media.
 </LI>
 <LI>
@@ -291,6 +279,24 @@ with an external consumer of the generated ISO image. Any message
 output will be redirected to stderr in this case.</DT>
 <DD>$<KBD>&nbsp;xorriso -outdev - ...other.options... | consumer</KBD></DD>
 
+
+<DT>
+<HR>
+</DT>
+
+<DT>
+Let xorriso serve underneath growisofs via its alias name "xorrisofs"
+which enables mkisofs emulation:
+</DT>
+<DD>$<KBD>&nbsp;export MKISOFS="xorrisofs"</KBD></DD>
+<DD>$<KBD>&nbsp;growisofs -Z /dev/dvd /some/files</KBD></DD>
+<DD>$<KBD>&nbsp;growisofs -M /dev/dvd /more/files</KBD></DD>
+<DT>
+One may switch from mkisofs emulation to xorriso's own command mode:
+</DT>
+<DD>$<KBD>&nbsp;growisofs -M /dev/dvd -- outdev - -update_r /my/files /files
+</KBD></DD>
+
 <DT>
 <HR>
 </DT>
@@ -326,8 +332,8 @@ are interested in using BD-R media.
 <P>
 <DL>
 <DT><H3>Download as source code (see README):</H3></DT>
-<DD><A HREF="xorriso-0.2.0.pl00.tar.gz">xorriso-0.2.0.pl00.tar.gz</A>
-(1000 KB).
+<DD><A HREF="xorriso-0.2.4.pl00.tar.gz">xorriso-0.2.4.pl00.tar.gz</A>
+(1040 KB).
 </DD>
 </DL>
 </DD>
@@ -352,22 +358,30 @@ an <A HREF="http://www.opensource.org/">Open Source</A> approved license</DD>
 
 <HR>
 <P>
-Bug fixes towards xorriso-0.1.8.pl00:
+Bug fixes towards xorriso-0.2.2.pl01:
 <UL>
-<LI>
--chmod unintentionally performed o-x as first operation
-</LI>
+
+<LI>- none -</LI>
+
 </UL>
 </P>
 <P>
-Enhancements towards previous stable version xorriso-0.1.8.pl00:
+Enhancements towards previous stable version xorriso-0.2.2.pl01:
 <UL>
-<LI>New option -extract restores with arguments of -map or -update_r</LI>
+
 <LI>
-New options -cpax, -cp_rx, -cp_rax to restore files and trees from ISO to disk
+Included libburn has enhanced Linux drive access and listing code
 </LI>
-<LI>New option -paste_in to copy ISO files into parts of disk files</LI>
-<LI>New options -map_l, -compare_l, -update_l, -extract_l</LI>
+<LI>
+New option -check_media
+</LI>
+<LI>
+New -find test -damaged, new -find actions "report_damage", "report_lba"
+</LI>
+<LI>
+New -error_behavior occasion "file_extraction"
+</LI>
+
 </UL>
 </P>
 
@@ -375,35 +389,25 @@ New options -cpax, -cp_rx, -cp_rax to restore files and trees from ISO to disk
 
 <P>
 <DL>
-<DT><H3>Development snapshot, version 0.2.1 :</H3></DT>
-<DD>Bug fixes towards xorriso-0.2.0.pl00:
+<DT><H3>Development snapshot, version 0.2.5 :</H3></DT>
+<DD>Bug fixes towards xorriso-0.2.4.pl00:
 <UL>
-</LI>
 <LI>- none yet -</LI>
 <!-- 
  -->
 </UL>
 </DD>
-<DD>Enhancements towards stable version 0.2.0.pl00:
+<DD>Enhancements towards stable version 0.2.4.pl00:
 <UL>
-<LI>New option -grow_blindly</LI>
-<LI>New options -C and -M for -as mkisofs emulation</LI>
-<LI>Can serve growisofs if started as xorrisofs, genisofs, mkisofs, genisoimage
-</LI>
-<LI>New options -multi and -msinfo for -as cdrecord emulation</LI>
-<LI>make install creates xorriso aliases as symbolic links:
-osirrox, xorrisofs, xorrecord
-</LI>
-<LI></LI>
-<!-- 
 <LI>- none yet -</LI>
+<!-- 
  -->
 </UL>
 </DD>
 <DD>&nbsp;</DD>
-<DD><A HREF="README_xorriso_devel">README 0.2.1</A>
-<DD><A HREF="xorriso_help_devel">xorriso_0.2.1 -help</A></DD>
-<DD><A HREF="man_1_xorriso_devel.html">man xorriso (as of 0.2.1)</A></DD>
+<DD><A HREF="README_xorriso_devel">README 0.2.5</A>
+<DD><A HREF="xorriso_help_devel">xorriso_0.2.5 -help</A></DD>
+<DD><A HREF="man_1_xorriso_devel.html">man xorriso (as of 0.2.5)</A></DD>
 <DD>&nbsp;</DD>
 <DT>If you want to distribute development versions of xorriso, then use
 this tarball which produces static linking between xorriso and the
@@ -413,8 +417,8 @@ libburnia libraries.
 installation see README)
 </DD>
 <DD>
-<A HREF="xorriso-0.2.1.tar.gz">xorriso-0.2.1.tar.gz</A>
-(1000 KB).
+<A HREF="xorriso-0.2.5.tar.gz">xorriso-0.2.5.tar.gz</A>
+(1040 KB).
 </DD>
 <DT>A dynamically linked development version of xorriso can be obtained
 from repositories of

xorriso/xorriso_makefile_am.txt

@@ -21,14 +21,16 @@ xorriso_xorriso_CFLAGS = -DXorriso_standalonE -DXorriso_with_maiN -DXorriso_with
 xorriso_xorriso_LDADD = $(THREAD_LIBS)
 
 
+# This looks quite ugly with make install: xorriso.c is compiled twice again
+#
 # Trying to create a build timestamp file
 #
-BUILT_SOURCES = xorriso/xorriso_buildstamp.h
+# BUILT_SOURCES = xorriso/xorriso_buildstamp.h
 # phony targets get rebuilt every time
-.PHONY: xorriso/xorriso_buildstamp.h
-xorriso/xorriso_buildstamp.h:
-	date -u '+#define Xorriso_build_timestamP "%Y.%m.%d.%H%M%S"' >xorriso/xorriso_buildstamp.h
-	cat xorriso/xorriso_buildstamp.h
+# .PHONY: xorriso/xorriso_buildstamp.h
+# xorriso/xorriso_buildstamp.h:
+# 	date -u '+#define Xorriso_build_timestamP "%Y.%m.%d.%H%M%S"' >xorriso/xorriso_buildstamp.h
+# 	cat xorriso/xorriso_buildstamp.h
 
 
 xorriso_xorriso_SOURCES = \
@@ -165,18 +167,17 @@ test_compare_file_SOURCES = test/compare_file.c
 # Install symbolic links to the xorriso binary
 #
 install-exec-hook:
-	if test -e $(bindir)/xorrisofs ; then rm $(bindir)/xorrisofs ; else echo ; fi
-	ln -s xorriso $(bindir)/xorrisofs
-	if test -e $(bindir)/osirrox ; then rm $(bindir)/osirrox ; else echo ; fi
-	ln -s xorriso $(bindir)/osirrox
-	if test -e $(bindir)/xorrecord ; then rm $(bindir)/xorrecord ; else echo ; fi
-	ln -s xorriso $(bindir)/xorrecord
+	if test -e "$(DESTDIR)$(bindir)"/xorrisofs ; then rm "$(DESTDIR)$(bindir)"/xorrisofs ; else echo ; fi
+	ln -s xorriso "$(DESTDIR)$(bindir)"/xorrisofs
+	if test -e "$(DESTDIR)$(bindir)"/osirrox ; then rm "$(DESTDIR)$(bindir)"/osirrox ; else echo ; fi
+	ln -s xorriso "$(DESTDIR)$(bindir)"/osirrox
+	if test -e "$(DESTDIR)$(bindir)"/xorrecord ; then rm "$(DESTDIR)$(bindir)"/xorrecord ; else echo ; fi
+	ln -s xorriso "$(DESTDIR)$(bindir)"/xorrecord
 
 
 
-# <<< seems to be outperformed by the .PHONY above
-
-# Trying to create a build timestamp file
+# Alternative to the disabled .PHONY above.
+# Trying to create a build timestamp file semi-manually:  make buildstamped
 #
 buildstamp:
 	date -u '+#define Xorriso_build_timestamP "%Y.%m.%d.%H%M%S"' >xorriso/xorriso_buildstamp.h
@@ -185,17 +186,7 @@ buildstamp:
 # For now   make buildstamped  has to be performed manually.
 buildstamped: buildstamp
 	make
-#
-# Processing of the "all:" rule happens too late.
-# How to create a dependency of xorriso.c on buildstamp ?
-# Not working:
-# Add xorriso_buildstamp.h to xorriso_xorriso_SOURCES and make it depend
-# on buildstamp. It runs. But at quite random occasions.
-# xorriso/xorriso_buildstamp.h: buildstamp
-#
-# all: buildstamp
 
-# <<< seems to be outperformed by the .PHONY above
 
 ## ========================================================================= ##
 

xorriso/xorriso_private.h

@@ -18,7 +18,7 @@
 #ifndef Xorriso_private_includeD
 #define Xorriso_private_includeD yes
 
-#define Xorriso_program_versioN "0.2.1"
+#define Xorriso_program_versioN "0.2.4"
 
 /** The source code release timestamp */
 #include "xorriso_timestamp.h"
@@ -45,12 +45,12 @@
 #define Smem_freE free
 #define SfileadrL 4096
 
-/* <<< ??? */
-typedef int (*Cleanup_app_handler_T)();
-
 struct LinkiteM;          /* Trace of hops during symbolic link resolution */
 struct ExclusionS;        /* List of -not_* conditions */
 struct PermiteM;          /* Stack of temporarily altered access permissions */
+struct SpotlisT;          /* List of intervals with different read qualities */
+struct CheckmediajoB;     /* Parameters for Xorriso_check_media() */
+struct SectorbitmaP;      /* Distiniction between valid and invalid sectors */
 
 
 /* maximum number of history lines to be reported with -status:long_history */
@@ -133,6 +133,8 @@ struct XorrisO { /* the global context of xorriso */
                             1= value is session number
                             2= value is track number
                             3= value is lba
+                           bit16= with mode 3 : value is possibly 16 too high.
+                                  Let isoburn_set_msc1() adjust it.
                            bit30= interference with normal msc1 processing
                                   is enabled. Without this bit,
                                   isoburn_set_msc1() will not be called.
@@ -149,6 +151,9 @@ struct XorrisO { /* the global context of xorriso */
  int volset_change_pending; /* whether -commit would make sense */
  int no_volset_present;     /* set to 1 on first failure */
 
+ struct SectorbitmaP *in_sector_map; /* eventual sector validity bitmap */
+
+
  char outdev[SfileadrL];
  void *out_drive_handle; /* interpreted only by xorrisoburn.c */
  int dev_fd_1; /* The fd which substitutes for /dev/fd/1 and is
@@ -224,7 +229,17 @@ struct XorrisO { /* the global context of xorriso */
  char mark_text[SfileadrL]; /* ( stdout+stderr, M: ) */
  int packet_output;
  char logfile[4][SfileadrL];
+ FILE *logfile_fp[4];
+ FILE *pktlog_fp;
+ struct Xorriso_lsT *result_msglists[Xorriso_max_outlist_stacK];
+ struct Xorriso_lsT *info_msglists[Xorriso_max_outlist_stacK];
+ int msglist_flags[Xorriso_max_outlist_stacK]; /* bit0= result is redirected
+                                                  bit1= info is redirected
+                                               */
+ int msglist_stackfill;
+
  int status_history_max; /* for -status long_history */
+ 
 
  char report_about_text[20];
  int report_about_severity;
@@ -239,6 +254,7 @@ struct XorrisO { /* the global context of xorriso */
  FILE *errfile_fp;
 
  int img_read_error_mode; /* 0=best_effort , 1=failure , 2=fatal */
+ int extract_error_mode; /* 0=(not yet: best_effort) , 1=keep , 2=delete */
 
  char return_with_text[20];
  int return_with_severity;
@@ -271,7 +287,7 @@ struct XorrisO { /* the global context of xorriso */
  double error_count; /* double will not roll over */
 
  /* pacifiers */
- int pacifier_style; /* 0= xorriso, 1=cdrecord, 2=mkisofs */
+ int pacifier_style; /* 0= xorriso, 1=mkisofs 2=cdrecord */
  double pacifier_interval;
  double start_time;
  double last_update_time;
@@ -453,6 +469,76 @@ int Xorriso_auto_chmod(struct XorrisO *xorriso, char *disk_path, int flag);
 int Xorriso_protect_stdout(struct XorrisO *xorriso, int flag);
 
 
+/* @param flag bit0= mark untested areas as valid
+*/
+int Xorriso_spotlist_to_sectormap(struct XorrisO *xorriso,
+                                  struct SpotlisT *spotlist,
+                                  int read_chunk,
+                                  struct SectorbitmaP **map,
+                                  int flag);
+
+int Xorriso_toc_to_string(struct XorrisO *xorriso, char **toc_text, int flag);
+
+
+struct Xorriso_lsT {
+  char *text;
+  struct Xorriso_lsT *prev,*next;
+};
+
+/** Create a new list item with arbitrary byte content.
+    @param lstring  The newly created object or NULL on failure
+    @param data     An array of bytes to be copied into the new object
+    @param data_len Number of bytes to be copied
+    @param link     Xorriso_lsT object to which the new object shall be linked
+    @param flag Bitfield for control purposes
+                bit0= insert before link rather than after it
+                bit1= do not copy data (e.g. because *data is invalid)
+    @return <=0 error, 1 ok
+*/
+int Xorriso_lst_new_binary(struct Xorriso_lsT **lstring, char *data,
+                           int data_len, struct Xorriso_lsT *link, int flag);
+
+
+/** Create a new list item with a 0-terminated text as content.
+    @param lstring  The newly created object or NULL on failure
+    @param text     A 0-terminated array of bytes
+    @param link     Xorriso_lsT object to which the new object shall be linked
+    @param flag Bitfield for control purposes
+                bit0= insert before link rather than after it
+    @return <=0 error, 1 ok
+*/
+int Xorriso_lst_new(struct Xorriso_lsT **lstring, char *text,
+                    struct Xorriso_lsT *link, int flag);
+
+
+/** Create a new list item at the end of a given list.
+    @param lstring  Contains as input a pointer to a pointer to any existing
+                    list item. As output this list item pointer will be
+                    changed to the address of the new list item.
+    @param data     An array of bytes to be copied into the new object
+    @param data_len Number of bytes to be copied
+    @param flag     unused yet, submit 0
+    @return <=0 error, 1 ok
+*/
+int Xorriso_lst_append_binary(struct Xorriso_lsT **entry,
+                              char *data, int data_len, int flag);
+
+
+/** Destroy a single list item and connect its eventual list neighbors.
+    @param lstring  pointer to the pointer to be freed and set to NULL
+    @param flag     unused yet, submit 0
+    @return 0= *lstring was alredy NULL, 1= ok
+*/
+int Xorriso_lst_destroy(struct Xorriso_lsT **lstring, int flag);
+
+
+/* Opens the -check_media data copy in for reading and writing
+*/
+int Xorriso_open_job_data_to(struct XorrisO *xorriso,
+                             struct CheckmediajoB *job, int flag);
+
+
+
 int Sfile_str(char target[SfileadrL], char *source, int flag);
 
 double Sfile_microtime(int flag);
@@ -557,6 +643,9 @@ int Findjob_set_start_path(struct FindjoB *o, char *start_path, int flag);
 
 int Findjob_get_start_path(struct FindjoB *o, char **start_path, int flag);
 
+int Findjob_get_lba_damage_filter(struct FindjoB *o, int *start_lba,
+                                  int *end_lba, int *damage_filter, int flag);
+
 
 struct SplitparT;
 
@@ -580,33 +669,6 @@ int Splitpart__compose(char *adr, int partno, int total_parts,
 
 int Splitparts_sort(struct SplitparT *o, int count, int flag);
 
-struct LstrinG {
-  char *text;
-  struct LstrinG *prev,*next;
-};
- 
-int Lstring_destroy(struct LstrinG **lstring, int flag);
-
-int Lstring_destroy_all(struct LstrinG **lstring, int flag);
-
-/*
- @param flag Bitfield for control purposes
-        bit0= insert before link rather than after it 
-        bit1= do not copy data (e.g. because *data is invalid)
-*/
-int Lstring_new_binary(struct LstrinG **lstring, char *data, int data_len,
-                       struct LstrinG *link, int flag);
-
-/* 
- @param flag Bitfield for control purposes
-             bit0= insert before link rather than after it
-*/
-int Lstring_new(struct LstrinG **lstring, char *text, struct LstrinG *link,
-                int flag);
-
-int Lstring_append_binary(struct LstrinG **entry, char *data, int data_len,
-                           int flag);
-
 
 int Permstack_push(struct PermiteM **o, char *disk_path, struct stat *stbuf,
                    int flag);
@@ -615,5 +677,60 @@ int Permstack_pop(struct PermiteM **o, struct PermiteM *stopper,
                   struct XorrisO *xorriso, int flag);
 
 
+int Spotlist_new(struct SpotlisT **o, int flag);
+
+int Spotlist_destroy(struct SpotlisT **o, int flag);
+
+int Spotlist_add_item(struct SpotlisT *o, int start_lba, int blocks,
+                      int quality, int flag);
+
+int Spotlist_count(struct SpotlisT *o, int flag);
+
+int Spotlist_block_count(struct SpotlisT *o, int flag);
+
+int Spotlist_sector_size(struct SpotlisT *o, int read_chunk, int flag);
+
+int Spotlist_get_item(struct SpotlisT *o, int idx,
+                      int *start_lba, int *blocks, int *quality, int flag);
+
+char *Spotlist__quality_name(int quality, char name[80], int flag);
+
+
+#define Xorriso_read_quality_gooD         0x7fffffff
+#define Xorriso_read_quality_sloW         0x60000000
+#define Xorriso_read_quality_partiaL      0x50000000
+#define Xorriso_read_quality_valiD        0x40000000
+#define Xorriso_read_quality_untesteD     0x3fffffff
+#define Xorriso_read_quality_invaliD      0x3ffffffe
+#define Xorriso_read_quality_tao_enD      0x28000000
+#define Xorriso_read_quality_off_tracK    0x20000000
+#define Xorriso_read_quality_unreadablE   0x00000000
+
+
+int Checkmediajob_new(struct CheckmediajoB **o, int flag);
+
+int Checkmediajob_destroy(struct CheckmediajoB **o, int flag);
+
+
+int Sectorbitmap_new(struct SectorbitmaP **o, int sectors, int sector_size,
+                     int flag);
+int Sectorbitmap_destroy(struct SectorbitmaP **o, int flag);
+int Sectorbitmap_from_file(struct SectorbitmaP **o, char *path, char *msg,
+                           int *os_errno, int flag);
+int Sectorbitmap_to_file(struct SectorbitmaP *o, char *path, char *info,
+                         char *msg, int *os_errno, int flag);
+int Sectorbitmap_set(struct SectorbitmaP *o, int sector, int flag);
+int Sectorbitmap_set_range(struct SectorbitmaP *o,
+                           int start_sector, int sectors, int flag);
+int Sectorbitmap_is_set(struct SectorbitmaP *o, int sector, int flag);
+int Sectorbitmap_bytes_are_set(struct SectorbitmaP *o,
+                               off_t start_byte, off_t end_byte, int flag);
+
+int Sectorbitmap_get_layout(struct SectorbitmaP *o,
+                           int *sectors, int *sector_size, int flag);
+
+int Sectorbitmap_copy(struct SectorbitmaP *from, struct SectorbitmaP *to,
+                      int flag);
+
 #endif /* Xorriso_private_includeD */
 

xorriso/xorriso_timestamp.h

@@ -1 +1 @@
-#define Xorriso_timestamP "2008.07.17.184520"
+#define Xorriso_timestamP "2008.08.24.160001"

xorriso/xorrisoburn.h

@@ -14,14 +14,12 @@
 #ifndef Xorrisoburn_includeD
 #define Xorrisoburn_includeD yes
 
-struct XorrisO;
-struct FindjoB;
 
 /* The minimum version of libisoburn to be used with this version of xorriso
 */
 #define xorriso_libisoburn_req_major  0
 #define xorriso_libisoburn_req_minor  2
-#define xorriso_libisoburn_req_micro  1
+#define xorriso_libisoburn_req_micro  4
 
 int Xorriso_startup_libraries(struct XorrisO *xorriso, int flag);
 
@@ -279,6 +277,61 @@ int Xorriso_libburn_adr(struct XorrisO *xorriso, char *address_string,
 */
 int Xorriso_msinfo(struct XorrisO *xorriso, int *msc1, int *msc2, int flag);
 
+/*
+   @param flag bit0= obtain iso_lba from indev
+               bit1= head_buffer already contains a valid head
+               bit2= issue message about success
+               bit3= check whether source blocks are banned by in_sector_map
+*/
+int Xorriso_update_iso_lba0(struct XorrisO *xorriso, int iso_lba, int isosize,
+                            char *head_buffer, struct CheckmediajoB *job,
+                            int flag);
+
+
+struct CheckmediajoB {
+ int use_dev;        /* 0= use indev , 1= use outdev , 2= use sector map*/
+
+ int min_lba;        /* if >=0 : begin checking at this address */
+ int max_lba;        /* if >=0 : read up to this address, else use mode */
+
+ int min_block_size; /* >>> not yet implemented:
+                            granularity desired by user
+                     */
+ int mode;           /* 0= track by track
+                        1= single sweep over libisoburn media capacity
+                        >>> 2= single sweep over libburn media capacity
+                     */
+ time_t start_time;
+ int time_limit;     /* Number of seconds after which to abort */
+
+ int item_limit;     /* Maximum number of media check list items as result */
+
+ char abort_file_path[SfileadrL];
+
+ char data_to_path[SfileadrL];
+ int data_to_fd;
+ int patch_lba0;
+ int patch_lba0_msc1;
+
+ char sector_map_path[SfileadrL];
+ struct SectorbitmaP *sector_map;
+ int map_with_volid;  /* 0=add quick toc to map file,
+                         1=read ISO heads for toc
+                      */
+
+ int retry;          /* -1= only try full read_chunk, 1=retry with 2k blocks
+                         0= retry with CD, full chunk else
+                      */
+
+ int report_mode;    /* 0= print MCL items
+                        1= print damaged files
+                     */
+
+};
+
+int Xorriso_check_media(struct XorrisO *xorriso, struct SpotlisT **spotlist,
+                        struct CheckmediajoB *job, int flag);
+
 
 #endif /* Xorrisoburn_includeD */