Promoted branch to tag

COPYRIGHT

@@ -1,11 +1,11 @@
 Mario Danic <mario.danic@gmail.com>,
 Vreixo Formoso <metalpain2002@yahoo.es> 
 Thomas Schmitt <scdbackup@gmx.net>
-libisoburn is Copyright (C) 2007-2008 Vreixo Formoso, Thomas Schmitt
-xorriso is Copyright (C) 2007-2008 Thomas Schmitt
-libisofs (if included) is Copyright (C) 2007-2008 Vreixo Formoso, Mario Danic
+libisoburn is Copyright (C) 2007-2009 Vreixo Formoso, Thomas Schmitt
+xorriso is Copyright (C) 2007-2009 Thomas Schmitt
+libisofs (if included) is Copyright (C) 2007-2009 Vreixo Formoso, Mario Danic
 libburn (if included) is Copyright (C) 2002-2006 Derek Foreman, Ben Jansens
-                     and Copyright (C) 2006-2008 Mario Danic, Thomas Schmitt
+                     and Copyright (C) 2006-2009 Mario Danic, Thomas Schmitt
 
 
     This program is free software; you can redistribute it and/or modify

Makefile.am

@@ -46,7 +46,7 @@ bin_PROGRAMS = \
 # 	cat xorriso/xorriso_buildstamp.h
 
 xorriso_xorriso_CPPFLAGS = -Ilibisoburn
-xorriso_xorriso_CFLAGS = -DXorriso_with_maiN -DXorriso_with_regeX $(READLINE_DEF)
+xorriso_xorriso_CFLAGS = -DXorriso_with_maiN $(READLINE_DEF)
 xorriso_xorriso_LDADD = libisoburn/libisoburn.la -lisofs -lburn $(THREAD_LIBS)
 xorriso_xorriso_SOURCES = \
 	xorriso/xorriso.h \
@@ -152,6 +152,8 @@ man_MANS = xorriso/xorriso.1
 EXTRA_DIST = \
 	libisoburn-1.pc.in \
 	version.h.in \
+	doc/comments \
+	doc/doxygen.conf.in \
 	README \
 	AUTHORS \
 	CONTRIBUTORS \

README

@@ -4,8 +4,8 @@
 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.7.tar.gz
-Copyright (C) 2006-2008 Vreixo Formoso, Thomas Schmitt.
+http://files.libburnia-project.org/releases/libisoburn-0.3.2.pl00.tar.gz
+Copyright (C) 2006-2009 Vreixo Formoso, Thomas Schmitt.
 Provided under GPL version 2.
 ------------------------------------------------------------------------------
 
@@ -18,7 +18,8 @@ The price for that is thorough specialization on data files in ISO-9660
 filesystem images. So libisoburn is not suitable for audio (CD-DA) or any
 other CD layout which does not entirely consist of ISO-9660 sessions.
 
-Currently it is only supported on Linux with kernels >= 2.4.
+Currently it is supported on Linux with kernels >= 2.4 and on FreeBSD versions
+with ATAPI/CAM support enabled in the kernel, see atapicam(4).
 
 By using this software you agree to the disclaimer at the end of this text:
 "... without even the implied warranty ..."
@@ -26,18 +27,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.7 :
-- libburn.so.4  , version libburn-0.5.2 or higher
-- libisofs.so.6 , version libisofs-0.6.9 or higher
+Dynamic library and compile time header requirements for libisoburn-0.3.2 :
+- libburn.so.4  , version libburn-0.6.0 or higher
+- libisofs.so.6 , version libisofs-0.6.12 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.7.tar.gz, take it to a directory of your choice
+Obtain libisoburn-0.3.2.pl00.tar.gz, take it to a directory of your choice
 and do:
 
-    tar xzf libisoburn-0.2.7.tar.gz
-    cd libisoburn-0.2.7
+    tar xzf libisoburn-0.3.2.pl00.tar.gz
+    cd libisoburn-0.3.2
 
 Within that directory execute:
 
@@ -155,7 +156,7 @@ libburnia-project.org
 By Mario Danic           <mario.danic@gmail.com>,
    Vreixo Formoso        <metalpain2002@yahoo.es>
    Thomas Schmitt        <scdbackup@gmx.net>
-Copyright (C) 2006-2008 Mario Danic, Vreixo Formoso, Thomas Schmitt.
+Copyright (C) 2006-2009 Mario Danic, Vreixo Formoso, Thomas Schmitt.
 
 libburnia-project.org is inspired by and in other components still containing
 parts of old

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT([libisoburn], [0.2.7], [http://libburnia-project.org])
+AC_INIT([libisoburn], [0.3.2], [http://libburnia-project.org])
 AC_PREREQ([2.50])
 dnl AC_CONFIG_HEADER([config.h])	
 
@@ -8,7 +8,7 @@ AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([subdir-objects])
 
 dnl Hint: Search list for version code aspects:
-dnl       /AC_INT(
+dnl       /AC_INIT(
 dnl       /ISOBURN_.*_VERSION
 dnl       /LT_.*
 dnl       /LIB.*_REQUIRED
@@ -20,8 +20,8 @@ dnl LT_CURREN, LT_AGE, LT_REVISION where SONAME becomes LT_CURRENT - LT_AGE
 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=7
+ISOBURN_MINOR_VERSION=3
+ISOBURN_MICRO_VERSION=2
 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 A80920
-dnl ### This is the release version 0.2.6 = libisoburn.so.1.15.0
-dnl This is the development version after above stable release
+dnl ts A90105
+dnl This is the release version 0.3.2 = libisoburn.so.1.21.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 = 16 - 15 = 1 . Library name = libisoburn.so.1.15.0
+dnl SONAME = 22 - 21 = 1 . Library name = libisoburn.so.1.21.0
 LT_RELEASE=$ISOBURN_MAJOR_VERSION.$ISOBURN_MINOR_VERSION
-LT_CURRENT=16
-LT_AGE=15
+LT_CURRENT=22
+LT_AGE=21
 LT_REVISION=0
 LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
 
@@ -106,8 +106,8 @@ AC_CHECK_HEADER(libburn/libburn.h)
 AC_CHECK_HEADER(libisofs/libisofs.h)
 
 dnl Check for proper library versions
-LIBBURN_REQUIRED=0.5.4
-LIBISOFS_REQUIRED=0.6.10
+LIBBURN_REQUIRED=0.6.0
+LIBISOFS_REQUIRED=0.6.12
 PKG_CHECK_MODULES(LIBBURN, libburn-1 >= $LIBBURN_REQUIRED)
 PKG_CHECK_MODULES(LIBISOFS, libisofs-1 >= $LIBISOFS_REQUIRED)
 

doc/comments

@@ -0,0 +1,58 @@
+/**
+   @author Mario Danic, Vreixo Formoso, Thomas Schmitt
+
+   @mainpage Libisoburn Documentation Index
+
+   @section intro Introduction
+
+Libburnia is an open-source project for reading, mastering and writing
+optical discs. This page is about its capability to read, manipulate, and
+write ISO 9660 filesystems with Rock Ridge extensions. Media can be optical
+media or filesystem objects.
+
+Our scope is currently Linux 2.4 and 2.6, or FreeBSD .
+
+libisoburn is an add-on to libburn and libisofs which coordinates both and
+also allows to grow ISO-9660 filesystem images on multi-session media as well
+as on overwriteable media via the same API.
+All media peculiarities are handled automatically.
+
+xorriso is an application of all three libraries which creates, loads,
+manipulates and writes ISO 9660 filesystem images with Rock Ridge extensions.
+Manipulation is not only adding or overwriting of files but also deletion,
+renaming, and attribute changing. An incremental backup feature is provided.
+See xorriso/README for more
+
+SONAME:
+libisoburn.so.1 (since 0.1.0, February 2008).
+
+
+   @section using Using the libraries
+
+Our build system is based on autotools.
+User experience tells us that you will need at least autotools version 1.7.
+
+To build libisoburn go into its toplevel directory and execute
+
+-  ./bootstrap  (needed if you downloaded from SVN)
+
+-  ./configure
+
+-  make
+
+To make the libraries accessible for running resp. developing applications 
+
+-  make install
+
+Read libisoburn/libisoburn.h for a description of the API.
+See also README, xorriso/README, and the man page xorriso/xorriso.1 which
+gives an idea of the capabilities provided by Libburnia.
+
+You will also have to install and understand the two libraries of the 
+Libburnia project which provide fundamental services:
+libburn is the library by which preformatted data get onto optical media.
+See libburn/libburn.h for its API description.
+libisofs is the library to handle ISO 9660 filesystems with Rock Ridge 
+extensions. Its API is described in libisofs/libisofs.h .
+
+*/

doc/susp_aaip_0_2.txt

@@ -0,0 +1,328 @@
+
+
+                 Arbitrary Attribute Interchange Protocol
+
+                             Draft version 0.2
+                                Dec 19 2008
+
+                Interchange of Persistent File Attributes
+
+          by Thomas Schmitt    - mailto:scdbackup@gmx.net
+          Libburnia project    - mailto:libburn-hackers@pykix.org
+
+
+AAIP is intended as companion of the Rock Ridge Interchange Protocol RRIP
+which under the general design of System Use Sharing Protocol SUSP extends
+ISO 9660 aka ECMA-119 filesystem semantics to match POSIX needs.
+
+Goal is to have for each file an arbitrary number of attributes which consist
+of two components (Name and Value) of arbitrary length and to have a compact
+representation of ACLs.
+
+This document describes a SUSP field with adjustable name (Signature Word).
+The name is defined in an ER field of which the content form is described here.
+Recommended is to use the name "AA" which collides neither with SUSP 1.12 nor
+with RRIP 1.12.
+The field has been designed to be as similar to the RRIP field SL as possible.
+
+Since the size of a SUSP field is limited to 255, multiple fields may be
+needed to describe one component. The CE mechanism of SUSP shall be used to
+address enough storage if needed.
+
+-------------------------------------------------------------------------------
+
+System Entries Provided by this Specification
+
+* AA (or another name which does not disturb other co-existing SUSP protocols)
+
+Description of the "AA" System Use Entry
+
+The field has exactly the same layout as RRIP field SL. One has to expect
+more data bytes than with SL, though, and any of the 256 possible byte values. 
+The reader shall be prepared to detect and handle oversized data.
+
+One or more AA fields form the Attribute List of a file object with
+a pare number of components. Each two consequtive components form a pair of
+Name and Value. The empty name is reserved for a compact representation of
+ALCs. The meaning of any other name is not specified by this document.
+
+All AA fields except the last one shall have the CONTINUE flag set. An AA
+field with CONTINUE set to 0 indicates the end of the Attribute List.
+
+The format of the "AA" System Use Field is as follows:
+
+  [1] "BP 1 to BP 2 - Signature Word" shall be (41)(41) ("AA") resp. the word
+      that is defined in the ER field. See below.
+
+  [2] "BP 3 - Length" shall specify as an 8-bit number the length in bytes of
+      the "AA" entry recorded according to ISO 9660:7.1.1.
+
+  [3] "BP 4 - System Use Entry Version" shall be 1 as in ISO 9660:7.1.1.
+
+  [4] "BP 5 - Flags" shall contain bit field flags numbered 0 to 7 starting
+      with the least significant bit as follows:
+        0   CONTINUE  This AA field continues in the next AA field.
+      All other bits shall be set to 0.
+
+  [5] "BP 6 to Length - Component Area" shall contain Component Records
+      as described below.
+
+  | 'A' | 'A' | LENGTH | 1 | FLAGS | COMPONENT AREA |
+  
+
+Within "AA" fields each component (Name or Value) shall be recorded as one
+or more component records. If a component does not fit into the remaining
+space of an AA field then it shall be continued in following AA fields.
+
+All Component Records of a component except the last one shall have the
+CONTINUE flag set. A Component Record with CONTINUE set to 0 indicates the end
+of the component. An eventually following Component Record starts the next
+component.
+
+-------------------------------------------------------------------------------
+
+The Component Record format is identical to the one of the SL field.
+The complete form of the following summary can be found in RRIP 1.12 "4.1.3.1".
+In case of discrepancies, RRIP 1.12 is the decisive specification.
+
+Component Records shall be recorded contiguously within each Component Area,
+starting in the first byte of the Component Area. The last Component Record
+in the Component Area of an "AA" System Use Entry may be continued in the
+Component Area of the next recorded "AA" System Use Entry in the same
+System Use Area.
+
+Each Component Record shall have the following format:
+
+  [A] "BP 1 - Component Flags" shall contain bit field flags numbered 0 to 7,
+      starting with the least significant bit, as follows:
+        0   CONTINUE  This Component Record continues in the next
+                      AA Component Record.
+      The following bits are defined but may not be set if the Component
+      Record shall carry payload. (Their use case is unclear yet.)
+        1   CURRENT   This Component Record refers to the current
+                      directory.
+        2   PARENT    This Component Record refers to the parent of
+                      the current directory.
+        3   ROOT      This Component Record refers to root directory.
+
+        all others are RESERVED and shall be 0.
+
+      No more than one of "AA" Component Flag Bits 0-3 shall be set to ONE.
+
+  [B] "BP 2 - Component Length (LEN_CP)" shall specify as an 8-bit number the
+      number of component bytes in the Component Record. This length shall not
+      include the first two bytes of the Component Record.
+      If any of the bit positions 1-3 is set, the value of this field shall be
+      set to ZERO and no Component Content shall be recorded.
+      This field shall be recorded according to ISO 9660 Format section 7.1.1.
+
+  [C] "BP 3 to 2 + LEN_CP - Component Content" shall contain the component
+      bytes in the Component Record.
+
+  | COMPONENT FLAGS | LEN_CP | COMPONENT BYTES |
+
+
+Example: Two pairs of "name"="long...content" and "one"="more" encoded as
+         two AA fields
+
+  Field 1 contains the Component Record of Name and one Component Record of
+  Value :
+  { 'A', 'A', 255,   1,   1,
+      0,   4, 'n', 'a', 'm', 'e',
+      1, 255, 'l', 'o', 'n', 'g', ... 238 more bytes, 13 go to next AA ... }
+  Field 2 contains the rest of "long...content" and the complete second pair.
+  It marks the end of the Attribute List :
+  { 'A', 'A',  38,   1,   0,
+              ... 13 remaining bytes of the Component Record in first field ...
+      0,   7, 'c', 'o', 'n', 't', 'e', 'n', 't',
+      0,   3, 'o', 'n', 'e',
+      0,   4, 'm', 'o', 'r', 'e' }
+
+-------------------------------------------------------------------------------
+
+Specification of binary ACL representation as special Arbitrary Attribute
+
+The Name component of a binary ACL shall be of length 0.
+
+The Value shall be an arbitrary number of ACL Entries:
+
+  [a] "BP 1 - Entry Flags" shall contain bit field flags numbered 0 to 7,
+      starting with the least significant bit, as follows:
+        0   EXEC      indicates that this entry grants execute permission
+        1   WRITE                                      write permission
+        2   READ                                       read permission
+        3   QUALIFIER indicates that one or more Qualifier Records follow
+        4 - 7  TYPE
+               shall contain the tag type of the ACL entry as four bit code:
+                 0  TRANSLATE      entry for a global map of name to numeric id
+                 1  ACL_USER_OBJ   permissions of owning user (as of PX field)
+                 2  ACL_USER       of arbitrary user, with name as qualifier
+                 3  ACL_GROUP_OBJ  permissions of owning group (as of PX field)
+                 4  ACL_GROUP      of arbitrary group, with name as qualifier
+                 5  ACL_MASK       restricts 2, 3, and 4 via logical AND
+                 6  ACL_OTHER      permissions of non-listed, non-owning users
+                 8  SWITCH_MARK    switch from "access" ACL to "default" ACL
+                10  ACL_USER_N     like 2, with numeric user id as qualifier
+                12  ACL_GROUP_N    like 4, with numeric group id as qualifier
+                15  FUTURE_VERSION  will indicate that this document
+                                    does not apply to the entry.
+                The other values are reserved. Readers shall ignore them if
+                they are not aware of updates of this document which would
+                assign a meaning to them.
+
+If any of ACL_USER_OBJ, ACL_GROUP_OBJ, ACL_OTHER are missing then the settings
+from the PX field shall get into effect. If they exist then they shall override
+the PX field.
+
+A numeric qualifier is a binary number of variable length. The Most Significant
+Byte comes first. The number shall be the "POSIX File User ID" resp.
+"POSIX File Group ID" as also used in RRIP PX fields. The ids of owning user
+and owning group shall be taken from the PX field of the file object.
+
+Optional TRANSLATE entries may associate user or group names with numeric
+ids to allow the reading system to remap the numeric ids. See below.
+The writer is not obliged to write them and the reader is not obliged to
+interpret them.
+
+The ACL entries belong to the "access" ACL of a file object. An optional
+SWITCH_MARK entry may direct further entries to the "default" ACL which
+is defined for directory objects. The switching is controlled by the EXEC bit.
+        0  "access" ACL
+        1  "default" ACL
+The bits for WRITE, READ, QUALIFIER shall be 0 with SWITCH_MARK.
+
+The eventually needed qualifier is stored in one or more Qualifier Records.
+
+  [b] "BP 2 - Qualifier Record Head" shall be present only if QUALIFIER is set
+      to 1. It shall give the number of Qualifier Bytes and eventually
+      indicate that the qualifier continues in a Qualifier Record which comes
+      imediately after this record.
+          0 to 127   Q_LENGTH, the qualifier is complete by this record
+        128 to 255   Q_LENGTH+128, the qualifier is continued by next record
+      So a Qualifier Record can contain at most 127 Qualifier Bytes.
+      This field shall be recorded according to ISO 9660 Format section 7.1.1.
+
+  [c] "BP 3 to BP 2 + Q_LENGTH - Qualifier Bytes" shall be present only if
+      QUALIFIER is set to 1 and hold the announced number of bytes of the
+      user or group name.
+
+  | ENTRY FLAGS [ | QUALIFIER HEAD | QUALIFIER BYTES | ]
+
+ 
+Example: From man 5 acl:  u::rw-,u:lisa:rw-,g::r--,g:toolies:rw-,m::r--,o::r--
+  { 'A', 'A',  28,   1,   0,
+      0,   0,
+      0,  19,  0x16,
+               0x2E,   4, 'l', 'i', 's', 'a',
+               0x34,
+               0x4E,   7, 't', 'o', 'o', 'l', 'i', 'e', 's',
+               0x54,
+               0x64 }
+
+Example: An entry with very long qualifier  u:His_Excellency_..._the_Boss:r--
+               0x2C, 255, 'H', 'i', 's', '_', 'E', 'x', 'c', 'e', 'l', 'e',
+                          ... 117 more bytes ...,
+                       8, 't', 'h', 'e', '_', 'B', 'o', 's', 's', 
+
+Example: User number 71 in numerical form gets rwx
+               0xAF,   1,  71,
+         Group number 65534 gets r-x
+               0xCD,   2, 255, 254,
+
+
+-------------------------------------------------------------------------------
+
+About Names and Numeric Identifiers
+         
+It makes an important difference whether qualifiers are represented as names
+or as id numbers. By storing names (and usually wasting space) it is possible
+to control permissions in a way that is portable between uncoordinated
+computers as long as the human readable user/group names are present on both
+sides. POSIX File ID numbers make most sense in backups which shall be read
+by the same system which wrote it.
+Rock Ridge can only record POSIX File Ids but not user or group names.
+
+The entry flag value 0x08 TRANSLATE is not a ACL entry of the hosting object
+but rather a global hint about the relation of roles, names and numeric ids.
+If it is recorded at all, then it shall be recorded with the first Directory
+Entry of the volume's root directory. According to the description of SUSP
+field ER, this has to be "dot" or (00). Other than with ER, a TRANSLATE entry
+may not appear in the root of directory sub trees.
+
+An interested reader shall examine the Arbitrary Attributes of this Directory
+Entry in order to collect a translation table.
+The advised translation is: PX or AA Id number -> name -> local id number.
+
+The Qualifier Bytes of a TRANSLATE entry shall have the following format:
+
+  [i] "BP 0 - Role" shall tell whether it is about a user name (role 0) or
+      a group name (role 1). Other values are not allowed.
+
+ [ii] "BP 1 to BP 8 - Numeric Id" shall hold the 32 bit POSIX Id number of the
+      entry. This field shall be recorded according to ISO 9660:7.3.3.
+
+[iii] "BP 9 to End Of Qualifier - Name" shall hold the name bytes of this
+      entry.
+
+  | ROLE | NUMERIC ID | NAME |
+
+Example: User id number 1001 gets associated with user name "lisa"
+
+               0x08,   13,   0,   233,3,0,0,   0,0,3,233, 'l', 'i', 's', 'a',
+
+
+-------------------------------------------------------------------------------
+
+Specification of the ER System Use Entry Values for AAIP:
+
+The Extension Version number for this version of AAIP shall be 1.
+
+The Extension Identifier field shall be "AAIP_0002" with Identifier Length 9.
+
+The mandatory content form of the Extension Descriptor is 
+"AA PROVIDES VIA AAIP 0.2 SUPPORT FOR ARBITRARY FILE ATTRIBUTES IN ISO 9660 IMAGES"
+with possibly two letters other than "AA" at the start of the string.
+The Description Length is 81.
+
+The reader of AAIP shall take the actual name of the AA field from BP 19 and
+BP 20 of the ER field.
+
+The recommended content of the Extension Source is
+"PLEASE CONTACT THE LIBBURNIA PROJECT VIA LIBBURNIA-PROJECT.ORG".
+The corresponding Source Length is 62.
+
+
+-------------------------------------------------------------------------------
+
+Model Relations:
+
+  Attribute List ------------- [1:0..1] ------------- ACL 
+  [1:0..n]                                            [1:0..n]
+  Arbitrary Attribute ( [1:0..1] ACL )                Entry
+  [1:2..2n]                                           [1:0..1]
+  Component  ( [1..m:1..n] AA Field )                 Qualifier
+  [1:1..n]                                            <<  one of >> 
+  Component Record                                  /       \       \
+  [1..m:1..n]                          Translation Entry , Name , Numeric Id
+  AA Field                                        |          |        |
+                                               [1:1..n]   [1:1..n]   [1:1]
+                                                    \        |       /
+                                                      Qualifier Record
+
+-------------------------------------------------------------------------------
+Revoked drafts:
+
+There was a draft AAIP 0.0 with ER signature "AAIP_2008A". It did not resemble
+the existing field SL and therefore shall not be used by writers of ISO images.
+
+-------------------------------------------------------------------------------
+References:
+
+ECMA-119  http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-119.pdf
+
+SUSP 1.12 ftp://ftp.ymi.com/pub/rockridge/susp112.ps
+
+RRIP 1.12 ftp://ftp.ymi.com/pub/rockridge/rrip112.ps
+(especially field SL)
+
+

libisoburn/burn_wrap.c

@@ -6,7 +6,7 @@
 */
 /* libburn wrappers for libisoburn 
 
-   Copyright 2007 - 2008  Thomas Schmitt, <scdbackup@gmx.net> 
+   Copyright 2007 - 2009  Thomas Schmitt, <scdbackup@gmx.net> 
 */
 
 /* <<< A70929 : hardcoded CD-RW with fabricated -msinfo 
@@ -24,6 +24,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <time.h>
+#include <regex.h>
 
 
 #ifndef Xorriso_standalonE
@@ -1041,7 +1042,9 @@ int isoburn_read_iso_head(struct burn_drive *d, int lba,
  }
  ret= isoburn_read_iso_head_parse(d, buffer+32*1024, image_blocks, info,
                                   info_mode);
- return(ret);
+ if(ret<=0)
+   return(ret);
+ return(1);
 }
 
 
@@ -1509,12 +1512,14 @@ int isoburn_drive_set_msgs_submit(struct burn_drive *d,
 
  
 /* @param flag bit0= with adr_mode 3: adr_value might be 16 blocks too high
+               bit1= insist in seeing a disc object with at least one session
+               bit2= with adr_mode 4: use adr_value as regular expression
 */
 int isoburn_set_msc1(struct burn_drive *d, int adr_mode, char *adr_value,
                      int flag)
 {
  int ret, num_sessions, num_tracks, adr_num, i, j, total_tracks;
- int lba, best_lba, size;
+ int lba, best_lba, size, re_valid= 0;
  char volid[33], msg[160];
  struct isoburn *o;
  struct isoburn_toc_disc *disc= NULL;
@@ -1522,6 +1527,8 @@ int isoburn_set_msc1(struct burn_drive *d, int adr_mode, char *adr_value,
  struct isoburn_toc_track **tracks= NULL;
  static char mode_names[][20]= {"auto", "session", "track", "lba", "volid"};
  static int max_mode_names= 4;
+ regex_t re;
+ regmatch_t match[1];
 
  ret= isoburn_find_emulator(&o, d, 0);
  if(ret<0)
@@ -1530,7 +1537,7 @@ int isoburn_set_msc1(struct burn_drive *d, int adr_mode, char *adr_value,
    return(-1);
 
  adr_num= atoi(adr_value);
- if(adr_mode!=3) {
+ if(adr_mode!=3 || (flag & 2)) {
    disc= isoburn_toc_drive_get_disc(d);
    if(disc==NULL) {
 not_found:;
@@ -1589,6 +1596,13 @@ not_found:;
    }
  } else if(adr_mode==4) {
    /* search for volume id that is equal to adr_value */
+   if(flag & 4) {
+     ret= regcomp(&re, adr_value, 0);
+     if(ret != 0)
+       flag&= ~4;
+     else
+       re_valid= 1;
+   }
    best_lba= -1;
    for(i=0; i<num_sessions; i++) {
      tracks= isoburn_toc_session_get_tracks(sessions[i], &num_tracks);
@@ -1599,8 +1613,14 @@ not_found:;
        ret= isoburn_read_iso_head(d, lba, &size, volid, 1);
        if(ret<=0)
      continue;
-       if(strcmp(volid, adr_value)!=0)
+       if(flag & 4) {
+         ret= regexec(&re, volid, 1, match, 0);
+         if(ret != 0)
      continue;
+       } else {
+         if(strcmp(volid, adr_value)!=0)
+     continue;
+       }
        best_lba= lba;
      }
    }
@@ -1618,7 +1638,64 @@ unknown_mode:;
 ex:;
  if(disc!=NULL)
    isoburn_toc_disc_free(disc);
+ if((flag & 4) && re_valid)
+   regfree(&re);
  return(ret);
 }
 
 
+int isoburn_get_mount_params(struct burn_drive *d,
+                             int adr_mode, char *adr_value,
+                             int *lba, int *track, int *session,
+                             char volid[33], int flag)
+{
+ int msc1_mem, ret, total_tracks, num_sessions, num_tracks, i, j, track_lba;
+ int size, is_iso= 0;
+ struct isoburn *o;
+ struct isoburn_toc_disc *disc= NULL;
+ struct isoburn_toc_session **sessions= NULL;
+ struct isoburn_toc_track **tracks= NULL;
+
+ *lba= *track= *session= -1;
+ volid[0]= 0;
+ ret= isoburn_find_emulator(&o, d, 0);
+ if(ret < 0 || o == NULL)
+   return(-1);
+ msc1_mem= o->fabricated_msc1;
+ ret= isoburn_set_msc1(d, adr_mode, adr_value, 2 | (flag & 4));
+ if(ret <= 0)
+   return(ret);
+ *lba= o->fabricated_msc1;
+
+ disc= isoburn_toc_drive_get_disc(d);
+ if(disc==NULL) 
+   {ret= -1; goto ex;} /* cannot happen because checked by isoburn_set_msc1 */
+ sessions= isoburn_toc_disc_get_sessions(disc, &num_sessions);
+ if(sessions==NULL || num_sessions<=0)
+   {ret= -1; goto ex;} /* cannot happen because checked by isoburn_set_msc1 */
+ total_tracks= 0;
+ for(i=0; i<num_sessions && *session < 0; i++) {
+   tracks= isoburn_toc_session_get_tracks(sessions[i], &num_tracks);
+   if(tracks==NULL)
+ continue;
+   for(j= 0; j<num_tracks && *track < 0; j++) {
+     total_tracks++;
+     isoburn_get_track_lba(tracks[j], &track_lba, 0);
+     if(track_lba == *lba) {
+       *track= total_tracks;
+       *session= i + 1;
+     }
+   }
+ }
+ ret= isoburn_read_iso_head(d, *lba, &size, volid, 1);
+ if(ret <= 0)
+   volid[0]= 0;
+ else
+   is_iso= 1;
+
+ex:;
+ o->fabricated_msc1= msc1_mem;
+ return(2 - is_iso); 
+}
+
+

libisoburn/data_source.c

@@ -1,7 +1,7 @@
 /*
   data source for libisoburn.
 
-  Copyright 2007 - 2008 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
+  Copyright 2007 - 2009 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
                     and Thomas Schmitt <scdbackup@gmx.net>
 */
 

libisoburn/isoburn.c

@@ -6,7 +6,7 @@
 /*
   Class core of libisoburn.
 
-  Copyright 2007 - 2008 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
+  Copyright 2007 - 2009 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
                         Thomas Schmitt <scdbackup@gmx.net>
 */
 
@@ -413,6 +413,9 @@ int isoburn_prepare_disc_aux(struct burn_drive *in_d, struct burn_drive *out_d,
  iso_write_opts_set_allow_full_ascii(wopts, opts->allow_full_ascii);
  iso_write_opts_set_relaxed_vol_atts(wopts, 1);
  iso_write_opts_set_joliet_longer_paths(wopts, opts->joliet_longer_paths);
+ iso_write_opts_set_always_gmt(wopts, opts->always_gmt);
+ iso_write_opts_set_rrip_version_1_10(wopts, opts->rrip_version_1_10);
+ iso_write_opts_set_dir_rec_mtime(wopts, opts->dir_rec_mtime);
  iso_write_opts_set_sort_files(wopts, opts->sort_files);
  iso_write_opts_set_replace_mode(wopts, opts->replace_dir_mode,
                 opts->replace_file_mode, opts->replace_uid, opts->replace_gid);
@@ -773,6 +776,9 @@ int isoburn_igopt_new(struct isoburn_imgen_opts **new_o, int flag)
  o->allow_lowercase= 0;
  o->allow_full_ascii= 0;
  o->joliet_longer_paths= 0;
+ o->always_gmt= 0;
+ o->rrip_version_1_10= 0;
+ o->dir_rec_mtime= 0;
  o->sort_files= 0;
  o->replace_dir_mode= 0;
  o->replace_file_mode= 0;
@@ -782,7 +788,7 @@ int isoburn_igopt_new(struct isoburn_imgen_opts **new_o, int flag)
  o->file_mode= 0444;
  o->uid= 0;
  o->gid= 0;
- o->output_charset= 0;
+ o->output_charset= NULL;
  o->fifo_size= 4*1024*1024;
  o->effective_lba= -1;
  return(1);
@@ -839,6 +845,9 @@ int isoburn_igopt_set_relaxed(struct isoburn_imgen_opts *o, int relax)
  o->allow_lowercase= !!(relax&32);
  o->allow_full_ascii= !!(relax&64);
  o->joliet_longer_paths= !!(relax&128);
+ o->always_gmt= !!(relax & isoburn_igopt_always_gmt);
+ o->rrip_version_1_10= !!(relax & isoburn_igopt_rrip_version_1_10);
+ o->dir_rec_mtime= !!(relax & isoburn_igopt_dir_rec_mtime);
  return(1);
 }
 

libisoburn/isoburn.h

@@ -357,6 +357,24 @@ struct isoburn_imgen_opts {
      */
     unsigned int joliet_longer_paths :1;
 
+    /**
+     * Store timestamps as GMT rather than in local time.
+     */
+    unsigned int always_gmt :1;
+
+    /**
+     * Write Rock Ridge info as of specification RRIP-1.10 rather than
+     * RRIP-1.12: signature "RRIP_1991A" rather than "IEEE_1282",
+     *            field PX without file serial number
+     */
+    unsigned int rrip_version_1_10 :1;
+
+    /**
+     * Store as ECMA-119 Directory Record timestamp the mtime
+     * of the source rather than the image creation time.
+     */
+    unsigned int dir_rec_mtime :1;
+
     unsigned int sort_files:1;
                 /**< If files should be sorted based on their weight. */
 

libisoburn/isofs_wrap.c

@@ -6,7 +6,7 @@
 /*
   libisofs related functions of libisoburn.
 
-  Copyright 2007 - 2008  Vreixo Formoso Lopes <metalpain2002@yahoo.es>
+  Copyright 2007 - 2009  Vreixo Formoso Lopes <metalpain2002@yahoo.es>
                          Thomas Schmitt <scdbackup@gmx.net>
 */
 

libisoburn/libisoburn.h

@@ -2,7 +2,7 @@
 /*
   API definition of libisoburn.
 
-  Copyright 2007-2008 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
+  Copyright 2007-2009 Vreixo Formoso Lopes <metalpain2002@yahoo.es>
                   and Thomas Schmitt <scdbackup@gmx.net>
 */
 
@@ -200,15 +200,15 @@ void isoburn_version(int *major, int *minor, int *micro);
 */
 #define isoburn_libisofs_req_major  0
 #define isoburn_libisofs_req_minor  6
-#define isoburn_libisofs_req_micro 10 
+#define isoburn_libisofs_req_micro 12 
 
 /** The minimum version of libburn to be used with this version of libisoburn
     at compile time.
     @since 0.1.0
 */
 #define isoburn_libburn_req_major  0
-#define isoburn_libburn_req_minor  5
-#define isoburn_libburn_req_micro  4
+#define isoburn_libburn_req_minor  6
+#define isoburn_libburn_req_micro  0
 
 
 /** The minimum version of libisofs to be used with this version of libisoburn
@@ -243,8 +243,8 @@ int isoburn_libburn_req(int *major, int *minor, int *micro);
     @since 0.1.0
 */
 #define isoburn_header_version_major  0
-#define isoburn_header_version_minor  2
-#define isoburn_header_version_micro  7
+#define isoburn_header_version_minor  3
+#define isoburn_header_version_micro  2
 /** Note:
     Above version numbers are also recorded in configure.ac because libtool
     wants them as parameters at build time.
@@ -336,7 +336,8 @@ int isoburn_set_msgs_submit(int (*msgs_submit)(void *handle, int error_code,
                   (cdrom/burner). Thus use with driveno 0 only. On failure
                   the array has no valid elements at all.
                   The returned array should be freed via burn_drive_info_free()
-                  when the drive is no longer needed.
+                  when the drive is no longer needed. But before this is done
+                  one has to call isoburn_drive_release(drive_infos[0].drive).
     @param adr    The persistent address of the desired drive.
     @param load   1 attempt to load the disc tray. 0 no attempt,rather failure.
     @return       1 = success , 0 = drive not found , <0 = other error
@@ -353,7 +354,8 @@ int isoburn_drive_scan_and_grab(struct burn_drive_info *drive_infos[],
                   (cdrom/burner). Thus use with driveno 0 only. On failure
                   the array has no valid elements at all.
                   The returned array should be freed via burn_drive_info_free()
-                  when the drive is no longer needed.
+                  when the drive is no longer needed. But before this is done
+                  one has to call isoburn_drive_release(drive_infos[0].drive).
     @param adr    The persistent address of the desired drive.
     @param flag   bit0= attempt to load the disc tray.
                         Else: failure if not loaded.
@@ -375,6 +377,7 @@ int isoburn_drive_aquire(struct burn_drive_info *drive_infos[],
     Wrapper for: burn_drive_grab()
     @since 0.1.0
     @param drive The drive to grab. E.g. drive_infos[1].drive .
+                 Call isoburn_drive_release(drive) when it it no longer needed.
     @param load  1 attempt to load the disc tray. 0 no attempt, rather failure.
     @return      1 success, <=0 failure
 */
@@ -450,12 +453,14 @@ void isoburn_disc_erase(struct burn_drive *drive, int fast);
                     3= adr_value itself is the lba to be used
                     4= start lba of last session with volume id
                        given by adr_value
-    @parm adr_value A string describing the value to be eventually used.
+    @param adr_value A string describing the value to be eventually used.
     @param flag Bitfield for control purposes.
                 bit0= @since 0.2.2
                       with adr_mode 3: adr_value might be 16 blocks too high
                       (e.g. -C stemming from growisofs). Probe for ISO head
                       at adr_value-16 and eventually adjust setting. 
+                bit1= insist in seeing a disc object with at least one session
+                bit2= with adr_mode 4: use adr_value as regular expression
 */
 int isoburn_set_msc1(struct burn_drive *d, int adr_mode, char *adr_value,
                      int flag);
@@ -600,6 +605,35 @@ int isoburn_read_iso_head(struct burn_drive *d, int lba,
                           int *image_blocks, char *info, int flag);
 
 
+/** Try to convert the given entity address into various entity addresses
+    which would describe it.
+    Note: Sessions and tracks are counted beginning with 1, not with 0.
+    @since 0.3.2
+    @param drive The drive where msc1 is to be set
+    @param adr_mode Determines how to interpret the input adr_value.
+                    If adr_value shall represent a number then decimal ASCII
+                    digits are expected.
+                    0= start lba of last session in TOC, ignore adr_value
+                    1= start lba of session number given by adr_value
+                    2= start lba of track given number by adr_value
+                    3= adr_value itself is the lba to be used
+                    4= start lba of last session with volume id
+                       given by adr_value
+    @param adr_value A string describing the value to be eventually used.
+    @param lba       returns the block address of the entity, -1 means invalid
+    @param track     returns the track number of the entity, -1 means invalid
+    @param session   returns the session number of the entity, -1 means invalid
+    @param volid     returns the volume id of the entity if it is a ISO session
+    @param flag      Bitfield for control purposes.
+                     bit2= with adr_mode 4: use adr_value as regular expression
+    @return          <=0 error , 1 ok, ISO session, 2 ok, not an ISO session
+*/
+int isoburn_get_mount_params(struct burn_drive *d,
+                             int adr_mode, char *adr_value,
+                             int *lba, int *track, int *session,
+                             char volid[33], int flag);
+
+
 /* ----------------------------------------------------------------------- */
 /*
 
@@ -842,6 +876,21 @@ int isoburn_igopt_get_extensions(struct isoburn_imgen_opts *o, int *ext);
            bit7= joliet_longer_paths
                  Allow paths in the Joliet tree to have more than
                  240 characters.
+           bit8= always_gmt
+                 Write timestamps as GMT although the specs prescribe local
+                 time with eventual non-zero timezone offset. Negative
+                 timezones (west of GMT) can trigger bugs in some operating
+                 systems which typically appear in mounted ISO images as if
+                 the timezone shift from GMT was applied twice
+                 (e.g. in New York 22:36 becomes 17:36).
+           bit9= rrip_version_1_10
+                 Write Rock Ridge info as of specification RRIP-1.10 rather
+                 than RRIP-1.12: signature "RRIP_1991A" rather than
+                 "IEEE_1282", field PX without file serial number.
+          bit10= dir_rec_mtime
+                 Store as ECMA-119 Directory Record timestamp the mtime
+                 of the source rather than the image creation time.
+
     @return 1 success, <=0 failure
 */
 #define isoburn_igopt_omit_version_numbers       1
@@ -852,6 +901,9 @@ int isoburn_igopt_get_extensions(struct isoburn_imgen_opts *o, int *ext);
 #define isoburn_igopt_allow_lowercase           32
 #define isoburn_igopt_allow_full_ascii          64
 #define isoburn_igopt_joliet_longer_paths      128
+#define isoburn_igopt_always_gmt               256
+#define isoburn_igopt_rrip_version_1_10        512
+#define isoburn_igopt_dir_rec_mtime           1024
 int isoburn_igopt_set_relaxed(struct isoburn_imgen_opts *o, int relax);
 int isoburn_igopt_get_relaxed(struct isoburn_imgen_opts *o, int *relax);
 
@@ -1225,7 +1277,7 @@ void isoburn_disc_write(struct burn_write_opts *o, struct burn_disc *disc);
     Hint: If only burn_write_opts and not burn_drive is known, then the drive
           can be obtained by burn_write_opts_get_drive().
     @since 0.1.0
-    @parm d      The drive to which the track with the fifo gets burned.
+    @param d     The drive to which the track with the fifo gets burned.
     @param size  The total size of the fifo
     @param free_bytes  The current free capacity of the fifo
     @param status_text  Returns a pointer to a constant text, see below

test/aaip-os-freebsd.c

@@ -0,0 +1,283 @@
+
+/*
+
+ aaip-os-freebsd.c
+ Arbitrary Attribute Interchange Protocol , system adapter for getting and
+ setting of ACLs and XFS-style Extended Attributes.
+
+ To be included by aaip_0_2.c
+*/
+
+#include <ctype.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+#include <sys/acl.h>
+
+
+/* ------------------------------ Getters --------------------------------- */
+
+/* Obtain the ACL of the given file in long text form.
+   @param path          Path to the file
+   @param text          Will hold the result. This is a managed object which
+                        finally has to be freed by a call to this function
+                        with bit15 of flag.
+   @param flag          Bitfield for control purposes
+                        bit0=  obtain default ACL rather than access ACL
+                        bit15= free text and return 1
+   @return              > 0 ok
+                        -1  failure of system ACL service (see errno)
+*/
+int aaip_get_acl_text(char *path, char **text, int flag)
+{
+ acl_t acl= NULL;
+
+ if(flag & (1 << 15)) {
+   if(*text != NULL)
+     acl_free(text);
+   *text= NULL;
+   return(1);
+ }
+ *text= NULL;
+
+ /* Note: no ACL_TYPE_DEFAULT in FreeBSD  */
+ if(flag & 1)
+   return(0);
+
+ acl= acl_get_file(path, ACL_TYPE_ACCESS);
+
+ if(acl == NULL)
+   return(-1);
+ *text= acl_to_text(acl, NULL);
+ acl_free(acl);
+ if(*text == NULL)
+   return(-1);
+ return(1);
+}
+
+
+/* Obtain the Extended Attributes and/or the ACLs of the given file in a form
+   that is ready for aaip_encode().
+
+   Note: There are no Extended Attributes in FreeBSD. So only ACL will be
+         obtained.
+
+   @param path          Path to the file
+   @param num_attrs     Will return the number of name-value pairs
+   @param names         Will return an array of pointers to 0-terminated names
+   @param value_lengths Will return an arry with the lenghts of values
+   @param values        Will return an array of pointers to 8-bit values
+   @param flag          Bitfield for control purposes
+                        bit0=  obtain ACL (access and eventually default)
+                        bit1=  use numeric ACL qualifiers rather than names
+                        bit2=  do not encode attributes other than ACL
+                        bit15= free memory of names, value_lengths, values
+   @return              >0  ok
+                        <=0 error
+*/
+int aaip_get_attr_list(char *path, size_t *num_attrs, char ***names,
+                       size_t **value_lengths, char ***values, int flag)
+{
+ int ret, retry= 0;
+ char *list= NULL;
+ ssize_t list_size= 0, i, num_names, value_ret;
+ size_t a_acl_len= 0, d_acl_len= 0, acl_len= 0;
+ unsigned char *a_acl= NULL, *d_acl= NULL, *acl= NULL;
+ char *acl_text= NULL;
+
+ if(flag & (1 << 15)) { /* Free memory */
+   if(*names != NULL)
+     list= (*names)[0];
+   {ret= 1; goto ex;}
+ }
+
+ *num_attrs= 0;
+ *names= NULL;
+ *value_lengths= NULL;
+ *values= NULL;
+
+ if(flag & 1)
+   num_names++;
+ if(num_names == 0)
+   {ret= 1; goto ex;}
+ (*names)= calloc(num_names, sizeof(char *));
+ (*value_lengths)= calloc(num_names, sizeof(size_t));
+ (*values)= calloc(num_names, sizeof(char *));
+ if(*names == NULL || *value_lengths == NULL || *values == NULL)
+   {ret= -1; goto ex;}
+
+ for(i= *num_attrs; i < num_names; i++)
+   (*names)[i]= NULL;
+ for(i= 0; i < num_names; i++) {
+   (*values)[i]= NULL;
+   (*value_lengths)[i]= 0;
+ }
+
+ if(flag & 1) { /* Obtain ACL */
+   /* access-ACL */
+   ret= aaip_get_acl_text(path, &acl_text, 0);
+   if(ret <= 0)
+     goto ex;
+   ret= aaip_encode_acl(acl_text, &a_acl_len, &a_acl, flag & 2);
+   if(ret <= 0)
+     goto ex;
+   aaip_get_acl_text("", &acl_text, 1 << 15); /* free */
+   
+   /* Note: There are no default-ACL in FreeBSD */
+
+   /* Set as attribute with empty name */;
+   (*names)[*num_attrs]= strdup("");
+   if((*names)[*num_attrs] == NULL)
+     {ret= -1; goto ex;}
+   (*values)[*num_attrs]= (char *) acl;
+   (*value_lengths)[*num_attrs]= acl_len;
+   (*num_attrs)++;
+ }
+
+ ret= 1;
+ex:;
+ if(a_acl != NULL)
+   free(a_acl);
+ if(d_acl != NULL)
+   free(d_acl);
+ if(acl_text != NULL)
+   aaip_get_acl_text("", &acl_text, 1 << 15); /* free */
+
+ if(ret <= 0 || (flag & (1 << 15))) {
+   if(list != NULL)
+     free(list);
+   if(*names != NULL)
+     free(*names);
+   *names= NULL;
+   if(*value_lengths != NULL)
+     free(*value_lengths);
+   *value_lengths= NULL;
+   if(*values != NULL) {
+     for(i= 0; i < *num_attrs; i++)
+       free((*values)[i]);
+     free(*values);
+   }
+   if(acl != NULL)
+     free(acl);
+   *values= NULL;
+   *num_attrs= 0;
+ }
+ return(ret);
+}
+
+
+/* ------------------------------ Setters --------------------------------- */
+
+
+/* Set the ACL of the given file to a given list in long text form.
+   @param path          Path to the file
+   @param text          The input text (0 terminated, ACL long text form)
+   @param flag          Bitfield for control purposes
+                        bit0=  set default ACL rather than access ACL
+   @return              > 0 ok
+                        -1  failure of system ACL service (see errno)
+*/
+int aaip_set_acl_text(char *path, char *text, int flag)
+{
+ int ret;
+ acl_t acl= NULL;
+
+ acl= acl_from_text(text);
+ if(acl == NULL) {
+   ret= -1; goto ex;
+ }
+
+ /* Note: no ACL_TYPE_DEFAULT in FreeBSD */
+ if(flag & 1)
+   {ret= 0; goto ex;}
+
+ ret= acl_set_file(path, ACL_TYPE_ACCESS, acl);
+
+ if(ret == -1)
+   goto ex;
+ ret= 1;
+ex:
+ if(acl != NULL)
+   acl_free(acl);
+ return(ret);
+}
+
+
+/* Bring the given attributes and/or ACLs into effect with the given file.
+
+   Note: There are no Extended Attributes in FreeBSD. So only ACL get set.
+
+   @param flag          Bitfield for control purposes
+                        bit0= decode and set ACLs
+                      ( bit1= first clear all existing attributes of the file )
+                      ( bit2= do not set attributes other than ACLs )
+   @return              1 success
+                       -1 error memory allocation
+                       -2 error with decoding of ACL
+                       -3 error with setting ACL
+                     ( -4 error with setting attribute )
+                     ( -5 error with deleting attribute )
+                       
+*/
+int aaip_set_attr_list(char *path, size_t num_attrs, char **names,
+                       size_t *value_lengths, char **values, int flag)
+{
+ int ret, has_default_acl= 0;
+ size_t i, consumed, acl_text_fill, list_size= 0;
+ char *acl_text= NULL, *list= NULL;
+
+ for(i= 0; i < num_attrs; i++) {
+   if(names[i] == NULL || values[i] == NULL)
+ continue;
+   if(names[i][0] == 0) { /* Decode ACLs */
+     /* access ACL */
+     ret= aaip_decode_acl((unsigned char *) values[i], value_lengths[i],
+                          &consumed, NULL, 0, &acl_text_fill, 1);
+     if(ret <= 0)
+       {ret= -2; goto ex;}
+     acl_text= calloc(acl_text_fill, 1);
+     if(acl_text == NULL)
+       {ret= -1; goto ex;}
+     ret= aaip_decode_acl((unsigned char *) values[i], value_lengths[i],
+                       &consumed, acl_text, acl_text_fill, &acl_text_fill, 0);
+     if(ret <= 0)
+       {ret= -2; goto ex;}
+     has_default_acl= (ret == 2);
+     ret= aaip_set_acl_text(path, acl_text, 0);
+     if(ret <= 0)
+       {ret= -3; goto ex;}
+     if(has_default_acl) {
+       free(acl_text);
+       acl_text= NULL;
+       ret= aaip_decode_acl((unsigned char *) (values[i] + consumed),
+                            value_lengths[i] - consumed, &consumed,
+                            NULL, 0, &acl_text_fill, 1);
+       if(ret <= 0)
+         {ret= -2; goto ex;}
+       acl_text= calloc(acl_text_fill, 1);
+       if(acl_text == NULL)
+         {ret= -1; goto ex;}
+       ret= aaip_decode_acl((unsigned char *) (values[i] + consumed),
+                            value_lengths[i] - consumed, &consumed,
+                            acl_text, acl_text_fill, &acl_text_fill, 0);
+       if(ret <= 0)
+         {ret= -2; goto ex;}
+       ret= aaip_set_acl_text(path, acl_text, 1);
+       if(ret <= 0)
+         {ret= -3; goto ex;}
+     }
+   }
+ }
+ ret= 1;
+ex:;
+ if(acl_text != NULL)
+   free(acl_text);
+ if(list != NULL)
+   free(list);
+ return(ret);
+}
+
+

test/aaip-os-linux.c

@@ -0,0 +1,371 @@
+
+/*
+
+ aaip-os-linux.c
+ Arbitrary Attribute Interchange Protocol , system adapter for getting and
+ setting of ACLs and XFS-style Extended Attributes.
+
+ To be included by aaip_0_2.c
+*/
+
+#include <ctype.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+#include <sys/acl.h>
+#include <attr/xattr.h>
+
+#define Aaip_acl_attrnamE "system.posix_acl_access"
+
+
+/* ------------------------------ Getters --------------------------------- */
+
+/* Obtain the ACL of the given file in long text form.
+   @param path          Path to the file
+   @param text          Will hold the result. This is a managed object which
+                        finally has to be freed by a call to this function
+                        with bit15 of flag.
+   @param flag          Bitfield for control purposes
+                        bit0=  obtain default ACL rather than access ACL
+                        bit15= free text and return 1
+   @return              > 0 ok
+                        -1  failure of system ACL service (see errno)
+*/
+int aaip_get_acl_text(char *path, char **text, int flag)
+{
+ acl_t acl= NULL;
+
+ if(flag & (1 << 15)) {
+   if(*text != NULL)
+     acl_free(text);
+   *text= NULL;
+   return(1);
+ }
+ *text= NULL;
+ acl= acl_get_file(path, (flag & 1) ? ACL_TYPE_DEFAULT : ACL_TYPE_ACCESS);
+ if(acl == NULL)
+   return(-1);
+ *text= acl_to_text(acl, NULL);
+ acl_free(acl);
+ if(*text == NULL)
+   return(-1);
+ return(1);
+}
+
+
+/* Obtain the Extended Attributes and/or the ACLs of the given file in a form
+   that is ready for aaip_encode().
+   @param path          Path to the file
+   @param num_attrs     Will return the number of name-value pairs
+   @param names         Will return an array of pointers to 0-terminated names
+   @param value_lengths Will return an arry with the lenghts of values
+   @param values        Will return an array of pointers to 8-bit values
+   @param flag          Bitfield for control purposes
+                        bit0=  obtain ACL (access and eventually default)
+                        bit1=  use numeric ACL qualifiers rather than names
+                        bit2=  do not obtain attributes other than ACL
+                        bit3=  do not ignore eventual local ACL attribute
+                               (e.g. system.posix_acl_access)
+                        bit15= free memory of names, value_lengths, values
+   @return              >0  ok
+                        <=0 error
+*/
+int aaip_get_attr_list(char *path, size_t *num_attrs, char ***names,
+                       size_t **value_lengths, char ***values, int flag)
+{
+ int ret, retry= 0;
+ char *list= NULL;
+ ssize_t list_size= 0, i, num_names= 0, value_ret;
+ size_t a_acl_len= 0, d_acl_len= 0, acl_len= 0;
+ unsigned char *a_acl= NULL, *d_acl= NULL, *acl= NULL;
+ char *acl_text= NULL;
+
+ if(flag & (1 << 15)) { /* Free memory */
+   if(*names != NULL)
+     list= (*names)[0];
+   {ret= 1; goto ex;}
+ }
+
+ *num_attrs= 0;
+ *names= NULL;
+ *value_lengths= NULL;
+ *values= NULL;
+
+ /* Set up arrays */
+ if(!(flag & 4)) { /* Get xattr names */
+    list_size= listxattr(path, list, 0);
+    if(list_size == -1)
+      {ret= -1; goto ex;}
+    list= calloc(list_size, 1);
+    if(list == NULL)
+      {ret= -1; goto ex;}
+    list_size= listxattr(path, list, list_size);
+    if(list_size == -1)
+      {ret= -1; goto ex;}
+    for(i= 0; i < list_size; i+= strlen(list + i) + 1)
+      num_names++;
+ }
+ if(flag & 1)
+   num_names++;
+ if(num_names == 0)
+   {ret= 1; goto ex;}
+ (*names)= calloc(num_names, sizeof(char *));
+ (*value_lengths)= calloc(num_names, sizeof(size_t));
+ (*values)= calloc(num_names, sizeof(char *));
+ if(*names == NULL || *value_lengths == NULL || *values == NULL)
+   {ret= -1; goto ex;}
+
+ if(!(flag & 4))
+   for(i= 0; i < list_size && num_names > *num_attrs;
+       i+= strlen(list + i) + 1) {
+     if(!(flag & 8))
+       if(strcmp(list + i, Aaip_acl_attrnamE) == 0)
+   continue;
+     (*names)[(*num_attrs)++]= list + i;
+   }
+ for(i= *num_attrs; i < num_names; i++)
+   (*names)[i]= NULL;
+ for(i= 0; i < num_names; i++) {
+   (*values)[i]= NULL;
+   (*value_lengths)[i]= 0;
+ }
+
+ if(!(flag & 4)) { /* Get xattr values */
+   for(i= 0; i < *num_attrs; i++) {
+     if(!(flag & 8))
+       if(strcmp((*names)[i], Aaip_acl_attrnamE) == 0)
+   continue;
+     value_ret= getxattr(path, (*names)[i], NULL, 0);
+     if(value_ret == -1)
+ continue;
+     (*values)[i]= calloc(value_ret + 1, 1);
+     if((*values)[i] == NULL)
+       {ret= -1; goto ex;}
+     (*value_lengths)[i]= getxattr(path, (*names)[i], (*values)[i], value_ret);
+     if(value_ret == -1) { /* there could be a race condition */
+       if(retry++ > 5)
+         {ret= -1; goto ex;}
+       i--;
+ continue;
+     }
+     (*value_lengths)[i]= value_ret;
+     retry= 0;
+   }
+ }
+
+ if(flag & 1) { /* Obtain ACL */
+   /* access-ACL */
+   ret= aaip_get_acl_text(path, &acl_text, 0);
+   if(ret <= 0)
+     goto ex;
+   ret= aaip_encode_acl(acl_text, &a_acl_len, &a_acl, flag & 2);
+   if(ret <= 0)
+     goto ex;
+   aaip_get_acl_text("", &acl_text, 1 << 15); /* free */
+   
+   /* eventually default-ACL */
+   ret= aaip_get_acl_text(path, &acl_text, 1);
+   if(ret > 0) {
+     /* encode and append to a_acl */;
+     ret= aaip_encode_acl(acl_text, &d_acl_len, &d_acl, (flag & 2) | 4);
+     if(ret <= 0)
+       goto ex;
+     acl= calloc(a_acl_len + d_acl_len + 1, 1);
+     if(acl == NULL)
+       {ret= -1; goto ex;}
+     if(a_acl_len)
+       memcpy(acl, a_acl, a_acl_len);
+     if(d_acl_len)
+       memcpy(acl + a_acl_len, d_acl, d_acl_len);
+     acl_len= a_acl_len + d_acl_len;
+   } else {
+     acl= a_acl;
+     a_acl= NULL;
+     acl_len= a_acl_len;
+   }
+
+   /* Set as attribute with empty name */;
+   (*names)[*num_attrs]= strdup("");
+   if((*names)[*num_attrs] == NULL)
+     {ret= -1; goto ex;}
+   (*values)[*num_attrs]= (char *) acl;
+   (*value_lengths)[*num_attrs]= acl_len;
+   (*num_attrs)++;
+ }
+
+ ret= 1;
+ex:;
+ if(a_acl != NULL)
+   free(a_acl);
+ if(d_acl != NULL)
+   free(d_acl);
+ if(acl_text != NULL)
+   aaip_get_acl_text("", &acl_text, 1 << 15); /* free */
+
+ if(ret <= 0 || (flag & (1 << 15))) {
+   if(list != NULL)
+     free(list);
+   if(*names != NULL)
+     free(*names);
+   *names= NULL;
+   if(*value_lengths != NULL)
+     free(*value_lengths);
+   *value_lengths= NULL;
+   if(*values != NULL) {
+     for(i= 0; i < *num_attrs; i++)
+       free((*values)[i]);
+     free(*values);
+   }
+   if(acl != NULL)
+     free(acl);
+   *values= NULL;
+   *num_attrs= 0;
+ }
+ return(ret);
+}
+
+
+/* ------------------------------ Setters --------------------------------- */
+
+
+/* Set the ACL of the given file to a given list in long text form.
+   @param path          Path to the file
+   @param text          The input text (0 terminated, ACL long text form)
+   @param flag          Bitfield for control purposes
+                        bit0=  set default ACL rather than access ACL
+   @return              > 0 ok
+                        -1  failure of system ACL service (see errno)
+*/
+int aaip_set_acl_text(char *path, char *text, int flag)
+{
+ int ret;
+ acl_t acl= NULL;
+
+ acl= acl_from_text(text);
+ if(acl == NULL) {
+   ret= -1; goto ex;
+ }
+ ret= acl_set_file(path, (flag & 1) ? ACL_TYPE_DEFAULT : ACL_TYPE_ACCESS, acl);
+ if(ret == -1)
+   goto ex;
+ ret= 1;
+ex:
+ if(acl != NULL)
+   acl_free(acl);
+ return(ret);
+}
+
+
+/* Bring the given attributes and/or ACLs into effect with the given file.
+   @param flag          Bitfield for control purposes
+                        bit0= decode and set ACLs
+                        bit1= first clear all existing attributes of the file
+                        bit2= do not set attributes other than ACLs
+                        bit3= do not ignore eventual ACL attribute
+                              (e.g. system.posix_acl_access)
+   @return              1 success
+                       -1 error memory allocation
+                       -2 error with decoding of ACL
+                       -3 error with setting ACL
+                       -4 error with setting attribute
+                       -5 error with deleting attributes
+                       
+*/
+int aaip_set_attr_list(char *path, size_t num_attrs, char **names,
+                       size_t *value_lengths, char **values, int flag)
+{
+ int ret, has_default_acl= 0;
+ size_t i, consumed, acl_text_fill, list_size= 0, acl_idx= 0;
+ char *acl_text= NULL, *list= NULL;
+
+ if(flag & 2) /* Delete all file attributes */
+   list_size= listxattr(path, list, 0);
+ if(list_size > 0) { /* Delete all file attributes */
+  list= calloc(list_size, 1);
+  if(list == NULL)
+    {ret= -5; goto ex;}
+  list_size= listxattr(path, list, list_size);
+  if(list_size == -1)
+    {ret= -5; goto ex;}
+  for(i= 0; i < list_size; i+= strlen(list + i) + 1) {
+     if(!(flag & 8))
+       if(strcmp(list + i, Aaip_acl_attrnamE) == 0)
+   continue;
+    ret= removexattr(path, list + i);
+    if(ret == -1)
+      {ret= -5; goto ex;}
+  }
+  free(list); list= NULL;
+ }
+
+ for(i= 0; i < num_attrs; i++) {
+   if(names[i] == NULL || values[i] == NULL)
+ continue;
+   if(names[i][0] == 0) { /* ACLs */
+     if(flag & 1)
+       acl_idx= i + 1;
+ continue;
+   }
+   /* Extended Attribute */
+   if((flag & 1) && !(flag & 8))
+     if(strcmp(names[i], Aaip_acl_attrnamE) == 0)
+ continue;
+   ret= setxattr(path, names[i], values[i], value_lengths[i], 0);
+   if(ret == -1)
+     {ret= -4; goto ex;}
+ }
+
+/* Decode ACLs */
+ if(acl_idx == 0)
+   {ret= 1; goto ex;}
+ i= acl_idx - 1;
+                                                             /* "access" ACL */
+ ret= aaip_decode_acl((unsigned char *) values[i], value_lengths[i],
+                      &consumed, NULL, 0, &acl_text_fill, 1);
+ if(ret <= 0)
+   {ret= -2; goto ex;}
+ acl_text= calloc(acl_text_fill, 1);
+ if(acl_text == NULL)
+   {ret= -1; goto ex;}
+ ret= aaip_decode_acl((unsigned char *) values[i], value_lengths[i],
+                   &consumed, acl_text, acl_text_fill, &acl_text_fill, 0);
+ if(ret <= 0)
+   {ret= -2; goto ex;}
+ has_default_acl= (ret == 2);
+ ret= aaip_set_acl_text(path, acl_text, 0);
+ if(ret <= 0)
+   {ret= -3; goto ex;}
+                                                            /* "default" ACL */
+ if(has_default_acl) {
+   free(acl_text);
+   acl_text= NULL;
+   ret= aaip_decode_acl((unsigned char *) (values[i] + consumed),
+                        value_lengths[i] - consumed, &consumed,
+                        NULL, 0, &acl_text_fill, 1);
+   if(ret <= 0)
+     {ret= -2; goto ex;}
+   acl_text= calloc(acl_text_fill, 1);
+   if(acl_text == NULL)
+     {ret= -1; goto ex;}
+   ret= aaip_decode_acl((unsigned char *) (values[i] + consumed),
+                        value_lengths[i] - consumed, &consumed,
+                        acl_text, acl_text_fill, &acl_text_fill, 0);
+   if(ret <= 0)
+     {ret= -2; goto ex;}
+   ret= aaip_set_acl_text(path, acl_text, 1);
+   if(ret <= 0)
+     {ret= -3; goto ex;}
+ }
+ ret= 1;
+ex:;
+ if(acl_text != NULL)
+   free(acl_text);
+ if(list != NULL)
+   free(list);
+ return(ret);
+}
+
+

test/aaip_0_2.h

@@ -0,0 +1,381 @@
+
+/*
+
+ Arbitrary Attribute Interchange Protocol , AAIP version 0.2
+ Demonstration program for encoding and decoding EA and ACL.
+
+ See http://libburnia-project.org/wiki/AAIP
+ or  doc/susp_aaip_0_2.txt
+
+ test/aaip_0.2.h - Public declarations
+
+*/
+
+#ifndef Aaip_h_is_includeD
+#define Aaip_h_is_includeD yes
+
+
+/* --------------------------------- Encoder ---------------------------- */
+
+/* Convert an array of Arbitrary Attributes into a series of AAIP fields.
+   @param aa_name       The 2 byte SUSP Signature Word of the fields
+   @param num_attrs     Number of attributes
+   @param names         Array of pointers to 0 terminated name strings
+   @param value_lengths Array of byte lengths for each value
+   @param values        Array of pointers to the value bytes
+   @param result_len    Number of bytes in the resulting SUSP field string
+   @param result        *result will point to the start of the result string.
+                        This is malloc() memory which needs to be freed when
+                        no longer needed 
+   @param flag          Bitfield for control purposes
+                        bit0= set CONTINUE bit of last AA field to 1
+   @return              >0 is the number of SUSP fields generated,
+                        0 means error 
+*/
+unsigned int aaip_encode(char aa_name[2],
+                         unsigned int num_attrs, char **names,
+                         size_t *value_lengths, char **values, 
+                         size_t *result_len, unsigned char **result, int flag);
+
+
+/* ------ ACL representation ------ */
+
+/* Convert an ACL from long text form into the value of an Arbitrary
+   Attribute. According to AAIP 0.2 this value is to be stored together with
+   an empty name.
+   @param acl_text      The ACL in long text form
+   @param result_len    Number of bytes in the resulting value
+   @param result        *result will point to the start of the result string.
+                        This is malloc() memory which needs to be freed when
+                        no longer needed
+   @param flag          Bitfield for control purposes
+                        bit0= count only
+                        bit1= use numeric qualifiers rather than names
+   @return              >0 means ok
+                        0 means error
+*/
+int aaip_encode_acl(char *acl_text,
+                    size_t *result_len, unsigned char **result, int flag);
+
+
+/* ------ OS interface ------ */
+
+/* Obtain the ACL of the given file in long text form.
+   @param path          Path to the file
+   @param text          Will hold the result. This is a managed object which
+                        finally has to be freed by a call to this function
+                        with bit15 of flag.
+   @param flag          Bitfield for control purposes
+                        bit0=  obtain default ACL rather than access ACL
+                        bit15= free text and return 1
+   @return              > 0 ok
+                        -1  failure of system ACL service (see errno)
+*/
+int aaip_get_acl_text(char *path, char **text, int flag);
+
+
+/* Obtain the Extended Attributes and/or the ACLs of the given file in a form
+   that is ready for aaip_encode(). The returned data objects finally have
+   to be freed by a call with flag bit 15.
+   @param path          Path to the file
+   @param num_attrs     Will return the number of name-value pairs
+   @param names         Will return an array of pointers to 0-terminated names
+   @param value_lengths Will return an arry with the lenghts of values
+   @param values        Will return an array of pointers to 8-bit values
+   @param flag          Bitfield for control purposes
+                        bit0=  obtain ACLs (access and eventually default) via
+                               system ACL API and encode 
+                        bit1=  use numeric ACL qualifiers rather than names
+                        bit2=  do not obtain attributes other than ACLs
+                        bit3=  do not ignore eventual ACL attribute
+                               (e.g. system.posix_acl_access)
+                        bit15= free memory of names, value_lengths, values
+   @return              >0  ok
+                        <=0 error
+*/
+int aaip_get_attr_list(char *path, size_t *num_attrs, char ***names,
+                       size_t **value_lengths, char ***values, int flag);
+
+
+/* --------------------------------- Decoder ---------------------------- */
+
+/*
+   The AAIP decoder offers several levels of abstraction of which the
+   lower two avoid the use of dynamic memory. It provides a stateful decoding
+   context with a small buffer which delivers results to caller provided
+   memory locations.
+
+   The lowest level is the stream-like Component Level Interface. It allows
+   to decode very many very long attributes.
+ 
+   Next is the Pair Level Interface which delivers to fixly sized storage for
+   name and value. It allows to decode very many attributes. 
+
+   The List Level Interface uses dynamic memory allocation to provide arrays
+   of names, values and value lengths. It is intended for moderately sized
+   attribute lists but may also be used as alternative to Pair Level.
+*/
+
+
+/* The AAIP decoder context.
+*/
+struct aaip_state;
+
+
+/* Obtain the size in bytes of an aaip_state object.
+*/
+size_t aaip_sizeof_aaip_state(void);
+
+
+/* Initialize a AAIP decoder context.
+   This has to be done before the first AA field of a node is processed.
+   The caller has to provide the storage of the struct aaip_state.
+   @param aaip          The AAIP decoder context to be initialized
+   @param aa_name       The Signature Word (advised is "AA")
+   @param flag          Bitfield for control purposes
+                        submit 0
+   @return <=0 error , >0 ok
+*/
+int aaip_init_aaip_state(struct aaip_state *aaip, char aa_name[2], int flag);
+
+
+/* -------------------------  Component Level Interface  ------------------- */
+/* 
+   Provides support for unlimited component size but demands the caller
+   to have a growing storage facility resp. to do own oversize handling.
+
+   This interface expects moderatly sized input pieces and will hand out
+   moderately sized result pieces. The number of transactions is virtually
+   unlimited. 
+*/
+
+/* Submit small data chunk for decoding.
+   The return value will tell whether data are pending for being fetched.
+   @param aaip          The AAIP decoder context
+   @param data          Not more than 2048 bytes input for the decoder
+   @param num_data      Number of bytes in data
+                        0 inquires the buffer status avoiding replies <= 0
+   @param ready_bytes   Number of decoded bytes ready for delivery
+   @param flag          Bitfield for control purposes
+   @return             -1= non-AA field detected
+                           *ready_bytes gives number of consumed bytes in data
+                        0= cannot accept data because buffer full
+                        1= no component record complete, submit more data
+                        2= component record complete, may be delivered
+                        3= component complete, may be delivered
+                        4= no component available, no more data expected, done
+*/
+int aaip_submit_data(struct aaip_state *aaip,
+                     unsigned char *data, size_t num_data,
+                     size_t *ready_bytes, int flag);
+
+
+/* Fetch the available part of current component.
+   The return value will tell whether it belongs to name or to value and
+   whether that name or value is completed now.
+   @param aaip          The AAIP decoder context
+   @param result        Has to point to storage for the component data
+   @param result_size   Gives the amount of provided result storage
+   @param num_result    Will tell the number of fetched result bytes
+   @param flag          Bitfield for control purposes
+                        bit0= discard data rather than copying to result
+   @return -2 = insufficient result_size
+           -1 = no data ready for delivery
+            0 = result holds the final part of a name
+            1 = result holds an intermediate part of a name
+            2 = result holds the final part of a value
+            3 = result holds an intermediate part of a value
+*/
+int aaip_fetch_data(struct aaip_state *aaip,
+                    char *result, size_t result_size, size_t *num_result,
+                    int flag);
+
+
+/* Skip the current component and eventually the following value component.
+   This has to be called if fetching of a component shall be aborted
+   but the next component resp. pair shall be fetchable again.
+   aaip_submit_data() will not indicate readiness for fetching until all
+   bytes of the skipped components are submitted. Those bytes get discarded.
+   @param aaip          The AAIP decoder context
+   @param flag          Bitfield for control purposes
+                        bit0= do not skip value if current component is name
+   @return              <=0 error , 1= now in skip state, 2= not in skip state
+*/
+int aaip_skip_component(struct aaip_state *aaip, int flag);
+
+
+/* -------------------------  Pair Level Interface  ------------------------ */
+/*
+   Provides support for names and values of limited size. The limits are
+   given by the caller who has to provide the storage for name and value.
+
+   This interface expects moderatly sized input pieces.
+   The number of input transcations is virtually unlimited.
+   The number of pair transactions after aaip_init() should be limited
+   to 4 billion.
+*/
+
+
+/* Accept raw input data and collect a pair of name and value.
+   The return value will indicate whether the pair is complete, whether more
+   pairs are complete or whether more data are desired. No input data will be
+   accepted as long as complete pairs are pending. The end of the attribute
+   list will be indicated.
+   @param aaip          The AAIP decoder context
+   @param data          The raw data to decode
+   @param num_data      Number of data bytes provided
+   @param consumed      Returns the number of consumed data bytes
+   @param name          Buffer to build the name string
+   @param name_size     Maximum number of bytes in name
+   @param name_fill     Holds the current buffer fill of name
+   @param value         Buffer to build the value string
+   @param value_size    Maximum number of bytes in value
+   @param value_fill    Holds the current buffer fill of value
+   @param flag          Bitfield for control purposes - submit 0 for now
+   @return <0 error
+            0 data not accepted, first fetch pending pairs with num_data == 0
+            1 name and value are not valid yet, submit more data
+            2 name and value are valid, submit more data
+            3 name and value are valid, pairs pending, fetch with num_data == 0
+            4 name and value are valid, no more data expected
+            5 name and value are not valid, no more data expected
+
+*/
+int aaip_decode_pair(struct aaip_state *aaip,
+                     unsigned char *data, size_t num_data, size_t *consumed,
+                     char *name, size_t name_size, size_t *name_fill,
+                     char *value, size_t value_size, size_t *value_fill,
+                     int flag);
+
+
+/* Inquire the number of pairs which were skipped because being oversized.
+   @param aaip          The AAIP decoder context
+   @param flag          Bitfield for control purposes - submit 0 for now
+   @return The number of pairs skipped since aaip_init()
+*/
+unsigned int aaip_get_pairs_skipped(struct aaip_state *aaip, int flag);
+
+
+/* -------------------------  List Level Interface  ------------------------ */
+/*
+   Provides support for names and values of limited size. The limits are
+   given for total memory consumption and for number of attributes.
+
+   Iterated decoding is supported as long as no single attribute exceeds
+   the memory limit.
+*/
+
+/* Accept raw input data and collect arrays of name pointers, value lengths
+   and value pointers. A handle object will emerge which finally has to be
+   be freed by a call with bit 15.
+   @param handle        The decoding context.
+                        It will be created by this call with flag bit 0 or if
+                        *handle == NULL. This handle has to be the same as long
+                        as decoding goes on and finally has to be freed by a
+                        call with bit15.
+   @param aa_name       The Signature Word (advised is "AA")
+   @param memory_limit  Maximum number of bytes to allocate
+   @param num_attr_limit  Maximum number of name-value pairs to allocate
+   @param data          The raw data to decode
+   @param num_data      Number of data bytes provided
+   @param consumed      Returns the number of consumed data bytes
+   @param flag          Bitfield for control purposes
+                        bit0=  this is the first call for a file object
+                        bit15= end decoding :
+                               Free handle and its intermediate list memory.
+   @return <=0 error
+             1 not complete yet, submit more data
+             2 arrays are complete, call aaip_get_decoded_attrs()
+             3 limit exceeded, not complete yet, call with bit15 and give up
+             4 limit exceeded, call aaip_get_decoded_attrs() and try again
+*/
+int aaip_decode_attrs(struct aaip_state **handle, char aa_name[2],
+                      size_t memory_limit, size_t num_attr_limit,
+                      unsigned char *data, size_t num_data, size_t *consumed, 
+                      int flag);
+
+
+/* Obtain the resulting attributes when aaip_decode_attrs() indicates to
+   be done or to have the maximum possible amount of result ready.
+   The returned data objects get detached from handle making it ready for
+   the next round of decoding with possibly a different input source. The
+   returned data objects finally have to be freed by a call with flag bit 15.
+   @param handle        The decoding context created by aaip_decode_attrs()
+   @param num_attrs     Will return the number of name-value pairs
+   @param names         Will return an array of pointers to 0-terminated names
+   @param value_lengths Will return an arry with the lenghts of values
+   @param values        Will return an array of pointers to 8-bit values
+   @param flag          Bitfield for control purposes
+                        bit15= free memory of names, value_lengths, values
+*/
+int aaip_get_decoded_attrs(struct aaip_state **handle, size_t *num_attrs,
+                         char ***names, size_t **value_lengths, char ***values,
+                         int flag);
+
+
+/* ------ ACL representation ------ */
+
+/* Convert an AAIP 0.2 ACL attribute value into the long text form of ACL.
+   @param data          The raw data to decode
+   @param num_data      Number of data bytes provided
+   @param consumed      Returns the number of consumed data bytes
+   @param acl_text      Will be filled with ACL long text form
+   @param acl_text_size Maximum number of bytes to be written to acl_text
+   @param acl_text_fill Will return the number of bytes in acl_text
+   @param flag          Bitfield for control purposes
+                        bit0= count only, do not really produce bytes:
+                               acl_text will not be touched,
+                               acl_text_size will be ignored,
+                               *acl_text_fill will return the counted number
+                        bit1= expected is a default ACL (see return value 2)
+   @return              1 success
+                        2 success, begin of default/access ACL encountered,
+                          submit data + *consumed for access/default ACL
+                       -1 error with reading of qualifier
+                       -2 error with writing of ACL text line
+                       -3 version mismatch
+                       -4 unknown tag type encountered
+*/
+int aaip_decode_acl(unsigned char *data, size_t num_data, size_t *consumed,
+                    char *acl_text, size_t acl_text_size,
+                    size_t *acl_text_fill, int flag);
+
+
+/* ------ OS interface ------ */
+
+/* Set the ACL of the given file to a given list in long text form.
+   @param path          Path to the file
+   @param text          The input text (0 terminated, ACL long text form)
+   @param flag          Bitfield for control purposes
+                        bit0=  set default ACL rather than access ACL
+   @return              > 0 ok
+                        -1  failure of system ACL service (see errno)
+*/
+int aaip_set_acl_text(char *path, char *text, int flag);
+
+
+/* Bring the given attributes and/or ACLs into effect with the given file.
+   @param path          Path to the file
+   @param num_attrs     Number of attributes
+   @param names         Array of pointers to 0 terminated name strings
+   @param value_lengths Array of byte lengths for each attribute payload
+   @param values        Array of pointers to the attribute payload bytes
+   @param flag          Bitfield for control purposes
+                        bit0= decode and set ACLs
+                        bit1= first clear all existing attributes of the file
+                        bit2= do not set attributes other than ACLs
+                        bit3= do not ignore eventual ACL attribute
+                              (e.g. system.posix_acl_access)
+   @return              1 success
+                       -1 error memory allocation
+                       -2 error with decoding of ACL
+                       -3 error with setting ACL
+                       -4 error with setting attribute
+                       -5 error with deleting attributes
+
+*/
+int aaip_set_attr_list(char *path, size_t num_attrs, char **names,
+                       size_t *value_lengths, char **values, int flag);
+
+#endif /* ! Aaip_h_is_includeD */
+

test/aaip_0_2_test.c

@@ -0,0 +1,443 @@
+
+/*
+   
+ Arbitrary Attribute Interchange Protocol , AAIP version 0.2
+ Demonstration program for encoding and decoding EA and ACL.
+   
+ See http://libburnia-project.org/wiki/AAIP
+
+ test/aaip_0_2_test.c - Main program for test binary
+
+ Compile: 
+   cc -g -Wall -o test/aaip test/aaip_0_2.c test/aaip_0_2_test.c -lacl
+   
+ Usage:            ./aaip name value
+ Long parameters   ./aaip -name"x100" -value"x100"
+
+ >>> ACLs
+
+*/
+
+#include <ctype.h>
+#include <sys/types.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <errno.h>
+
+#include <sys/acl.h>
+
+#include "aaip_0_2.h"
+
+#define Aaip_test_name_sizE 1024
+#define Aaip_test_value_sizE 1024
+
+
+static int print_result(unsigned char *result, size_t result_len, int flag)
+{
+ int i;
+
+ printf(
+     " - - - - - - 0 - - 1 - - 2 - - 3 - - 4 - - 5 - - 6 - - 7 - - 8 - - 9\n");
+ printf("\n");
+ printf("%4u :     ", 0);
+ for(i= 0; i < result_len; i++) {
+   if(result[i] >= 32 && result[i] <= 126)
+     printf("'%c'   ", result[i]);
+   else
+     printf("%3u   ", (unsigned int) ((unsigned char *) result)[i]);
+   if((i % 10) == 9)
+     printf("\n%4u :     ", (unsigned int) (i + 1));
+ }
+ printf("\n\n");
+ printf(
+     " - - - - - - 0 - - 1 - - 2 - - 3 - - 4 - - 5 - - 6 - - 7 - - 8 - - 9\n");
+ printf("\n");
+ return(1);
+}
+
+
+static int print_attrs(size_t num_attrs, char **names, size_t *value_lengths,
+                       char **values, int flag)
+{
+ size_t i, j;
+
+ for(i= 0; i < num_attrs; i++) {
+   printf("name='");
+   for(j= 0; names[i][j] != 0; j++) {
+     if(names[i][j] >= 32 && names[i][j] <= 126 &&
+        names[i][j] != '\\' && names[i][j] != '\'')
+       printf("%c", names[i][j]);
+     else
+       printf("\\%o", (unsigned int) ((unsigned char **) names)[i][j]);
+   }
+   printf("' (%d)\n", (int) j);
+   printf("value='");
+   for(j= 0; j < value_lengths[i]; j++) {
+     if(values[i][j] >= 32 && values[i][j] <= 126 &&
+        values[i][j] != '\\' && values[i][j] != '\'')
+       printf("%c", values[i][j]);
+     else
+       printf("\\%3.3o", (unsigned int) ((unsigned char **) values)[i][j]);
+   }
+   printf("' (%d)\n\n", (int) j);
+ }
+ return(1);
+}
+
+
+static int do_touch(char *path, int flag)
+{
+ FILE *fp;
+
+ fp= fopen(path, "a");
+ if(fp == NULL) {
+   fprintf(stderr, "fopen(\"%s\") failed: %d  %s\n",
+           path, errno, errno != 0 ? strerror(errno) : "");
+   return(0);
+ }
+ fclose(fp);
+ return(1);
+}
+
+
+static int decode_acl(unsigned char *result, size_t result_len,
+                      char *out_path, int flag)
+{
+ int ret;
+ size_t consumed, text_fill;
+ char *text= NULL;
+
+ ret= aaip_decode_acl(result, result_len, &consumed, NULL, 0, &text_fill, 1);
+ if(ret <= 0) {
+   fprintf(stderr, "aaip_decode_acl(,1) failed: ret= %d\n", ret);
+   ret= 0; goto ex;
+ }
+ text= calloc(text_fill, 1);
+ ret= aaip_decode_acl(result, result_len, &consumed, text, text_fill,
+                      &text_fill, 0);
+ if(ret <= 0) {
+   fprintf(stderr, "aaip_decode_acl(,0) failed: ret= %d\n", ret);
+   ret= 0; goto ex;
+ }
+ printf("--- ret= %d , text=\n%s--- end of text\n\n", ret, text);
+
+ if(out_path == NULL)
+   {ret= 1; goto ex;}
+
+ ret= do_touch(out_path, 0);
+ if(ret <= 0)
+   goto ex;
+
+ ret= aaip_set_acl_text(out_path, text, 0);
+ if(ret <= 0) {
+   fprintf(stderr, "aaip_set_acl_text() failed");
+   if(ret == -1)
+     fprintf(stderr, ": %d  %s\n", errno, errno != 0 ? strerror(errno) : "");
+   else
+     fprintf(stderr, "\n");
+   ret= 0; goto ex;
+ }
+ ret= 1;
+ex:
+ if(text != NULL)
+   free(text);
+ return(ret);
+}
+
+
+static int test_acl(char *in_path, char *out_path, int flag)
+{
+ int ret;
+ char *acl_text= NULL;
+ unsigned char *result= NULL;
+ size_t result_len;
+
+ ret= aaip_get_acl_text(in_path, &acl_text, 0);
+ if(ret <= 0) {
+   fprintf(stderr, "aaip_get_acl_text() failed");
+   if(ret == -1)
+     fprintf(stderr, ": %d  %s\n", errno, errno != 0 ? strerror(errno) : "");
+   else
+     fprintf(stderr, "\n");
+   ret= 6; goto ex;
+ }
+ printf("--- ACL:\n%s--- end of ACL\n\n", acl_text);
+
+ ret= aaip_encode_acl(acl_text, &result_len, &result, 0);
+ if(ret <= 0) {
+   fprintf(stderr, "aaip_encode_acl(text) failed: ret= %d\n", ret);
+   ret= 7; goto ex;
+ }
+ print_result(result, result_len, 0);
+ ret= decode_acl(result, result_len, out_path, 0);
+ if(ret <= 0)
+   {ret= 8; goto ex;}
+ free(result); result= NULL;
+
+ ret= aaip_encode_acl(acl_text, &result_len, &result, 2);
+ if(ret <= 0) {
+   fprintf(stderr, "aaip_encode_acl(num) failed: ret= %d\n", ret);
+   ret= 9; goto ex;
+ }
+ print_result(result, result_len, 0);
+ ret= decode_acl(result, result_len, out_path, 0);
+ if(ret <= 0)
+   {ret= 10; goto ex;}
+
+ ret= 0;
+ex:;
+ aaip_get_acl_text("", &acl_text, 1 << 15);
+ if(result != NULL)
+   free(result);
+ return(ret);
+}
+
+
+int synthetic_pairs(char *prog, int argc, char **argv, int flag)
+{
+ int  ret, l, mult= 0, k;
+ size_t result_len, i;
+ unsigned char *result= NULL;
+ char **names= NULL, **values= NULL, *cpt, **param;
+ size_t *value_lengths= NULL;
+
+ struct aaip_state *aaip;
+ size_t consumed= 0;
+ char name[Aaip_test_name_sizE + 1];
+ size_t name_fill;
+ char value[Aaip_test_value_sizE + 1];
+ size_t value_fill;
+ size_t todo;
+ int submit_data, is_done;
+ unsigned char *rpt;
+ unsigned int skipped, was_skipped= 0;
+
+ aaip= (struct aaip_state *) calloc(aaip_sizeof_aaip_state(), 1);
+ names= calloc(sizeof(char *), argc / 2);
+ values= calloc(sizeof(char *), argc / 2);
+ value_lengths= calloc(sizeof(size_t), argc / 2);
+ 
+ for(i= 0; i < argc; i++) {
+   if(i % 2)
+     param= values + i / 2;
+   else
+     param= names + i / 2;
+   (*param)= argv[i];
+   if(argv[i][0] == '-') {
+     cpt= strchr(argv[i], 'x');
+     if(cpt != NULL) {
+       l= cpt - argv[i] - 1;
+       if(l > 0)
+         sscanf(cpt + 1, "%d", &mult);
+       if(l > 0 && mult > 0) {
+         (*param)= calloc(1, l * mult + 1);
+         if((*param) != NULL) {
+           for(k= 0; k < mult; k++)
+             memcpy((*param) + k * l, argv[i] + 1, l);
+           (*param)[mult * l]= 0;
+         } else
+           (*param)= argv[i];
+       }
+     }
+   }
+   if(i % 2)
+     value_lengths[i / 2]= strlen(values[i / 2]);
+ }
+
+ ret= aaip_encode("AA", (unsigned int) (argc / 2), names,
+                  value_lengths, values, 
+                  &result_len, &result, 0);
+ if(ret <= 0) {
+   fprintf(stderr, "%s : aaip_encode failed with ret= %d\n", prog, ret);
+   return(2);
+ }
+ print_result(result, result_len, 0);
+
+ aaip_init_aaip_state(aaip, "AA", 0);
+ rpt= result;
+ submit_data= 1;
+ is_done= 0;
+ while(!is_done) {
+   if(submit_data) {
+     todo= result_len - (rpt - result);
+     if(todo > 2048) 
+       todo= 2048;
+     if(todo == 0) {
+       fprintf(stderr, "%s : Out of data while still prompted to submit\n",
+               prog);
+       return(5);
+     }
+   } else
+     todo= 0;
+   ret= aaip_decode_pair(aaip, rpt, todo, &consumed,
+                         name, Aaip_test_name_sizE, &name_fill,
+                         value, Aaip_test_value_sizE, &value_fill, 0);
+   skipped= aaip_get_pairs_skipped(aaip, 0);
+   if(skipped > was_skipped) {
+     printf("- skipped %d pair%s -\n\n", skipped - was_skipped,
+            skipped - was_skipped > 1 ? "s" : "");
+     was_skipped= skipped;
+   }
+   if(ret < 0) {
+     fprintf(stderr, "%s : aaip_decode_pair failed with ret= %d\n", prog, ret);
+     return(3);
+   }
+   rpt+= todo;
+   if(ret == 0) {
+     rpt-= todo;
+     submit_data= 0;
+ continue;
+   } else if(ret == 1) {
+     submit_data= 1;
+ continue;
+   } else if(ret == 2) {
+     submit_data= 1;
+   } else if(ret == 3) {
+     submit_data= 0;
+   } else if(ret == 4) {
+     is_done= 1;
+   } else if(ret == 5) {
+     is_done= 1;
+ break;
+   } else {
+     fprintf(stderr, "%s : Unknown return %d from aaip_decode_pair()\n",
+             prog, ret);
+     return(4);
+   }
+   name[name_fill]= 0;
+   value[value_fill]= 0;
+   if((name_fill < 1000 && value_fill < 1000)) {
+     printf("name = '%s' (%lu)\n", name, (unsigned long) name_fill);
+     printf("value= '%s' (%lu)\n", value, (unsigned long) value_fill);
+   } else {
+     printf("name = (%lu)\n", (unsigned long) name_fill);
+     printf("value= (%lu)\n", (unsigned long) value_fill);
+   }
+   printf("\n");
+ }
+
+ return(0);
+}
+
+
+/*
+  @param flag bit0= use numeric qualifiers
+*/
+static int copy_all(char *in_path, char *out_path, int flag)
+{
+ int ret;
+ struct aaip_state *aaip= NULL;
+ size_t in_num_attrs, *in_value_lengths= NULL;
+ char **in_names= NULL, **in_values= NULL;
+ int is_done= 0, first_round= 1;
+ unsigned char *result= NULL, *rpt;
+ size_t result_len, todo, consumed;
+ size_t out_num_attrs, *out_value_lengths= NULL;
+ char **out_names= NULL, **out_values= NULL;
+ 
+ ret= aaip_get_attr_list(in_path, &in_num_attrs, &in_names, &in_value_lengths,
+                         &in_values, 1 | ((flag & 1) << 1));
+ if(ret <= 0)
+   {ret= 11; goto ex;}
+ print_attrs(in_num_attrs, in_names, in_value_lengths, in_values, 0);
+
+ ret= aaip_encode("AA", (unsigned int) in_num_attrs, in_names,
+                  in_value_lengths, in_values, &result_len, &result, 0);
+ if(ret == 0)
+   {ret= 12; goto ex;}
+
+ if(result_len <= 0) {
+   fprintf(stderr, "No result\n");
+   ret= 13; goto ex;
+ }
+ print_result(result, result_len, 0);
+
+ rpt= result;
+ while(!is_done) {
+   todo= result_len - (rpt - result);
+   if(todo > 2048) 
+       todo= 2048;
+   if(todo == 0) {
+     fprintf(stderr, "Out of data while still prompted to submit\n");
+     ret= 14; goto ex;
+   }
+   /* Allow 1 million bytes of memory consumption, 100,000 attributes */
+   ret= aaip_decode_attrs(&aaip, "AA", (size_t) 1000000, (size_t) 100000,
+                          rpt, todo, &consumed, first_round);
+   rpt+= consumed;
+   first_round= 0;
+   if(ret == 1)
+ continue;
+   if(ret == 2)
+ break;
+   fprintf(stderr, "aaip_decode_attrs() returns %d\n", ret);
+   ret= 15; goto ex;
+ }
+ if(rpt - result != result_len) {
+   fprintf(stderr, "aaip_decode_attrs() returns 2 but %d bytes are left\n",
+           (int) (result_len - (rpt - result)));
+   ret= 16; goto ex;
+ }
+ ret= aaip_get_decoded_attrs(&aaip, &out_num_attrs, &out_names,
+                             &out_value_lengths, &out_values, 0);
+
+ if(ret != 1) {
+   fprintf(stderr, "aaip_get_decoded_attrs() returns %d\n", ret);
+   ret= 17; goto ex;
+ }
+ print_attrs(out_num_attrs, out_names, out_value_lengths, out_values, 0);
+
+ ret= do_touch(out_path, 0);
+ if(ret <= 0)
+   {ret= 19; goto ex;}
+
+ ret= aaip_set_attr_list(out_path, out_num_attrs, out_names, out_value_lengths,
+                         out_values, 1 | 2);
+ if(ret != 1) {
+   fprintf(stderr, "aaip_set_attr_list() returns %d\n", ret);
+   ret= 18; goto ex;
+ }
+ ret= 0;
+ex:;
+ if(in_names != NULL || in_value_lengths != NULL || in_values != NULL)
+   aaip_get_attr_list(in_path, &in_num_attrs, &in_names, &in_value_lengths,
+                      &in_values, 1 << 15);
+ if(out_names != NULL || out_value_lengths != NULL || out_values != NULL)
+   aaip_get_decoded_attrs(&aaip, &out_num_attrs, &out_names,
+                          &out_value_lengths, &out_values, 15);
+ aaip_decode_attrs(&aaip, "AA", (size_t) 0, (size_t) 0, NULL, (size_t) 0,
+                   &consumed, 1 << 15);
+ return(ret);
+}
+
+
+int main(int argc, char **argv)
+{
+ int ret;
+
+ if(argc < 2) {
+usage:
+   fprintf(stderr, "usage : %s options\n", argv[0]);
+   fprintf(stderr, "  -pairs [-]name[xNNN] [-]value[xNNN] [...]\n");
+   fprintf(stderr, "  -copy_acl source_path target_path\n");
+   fprintf(stderr, "  -copy source_path target_path\n");
+   exit(1);
+ }
+ if(strcmp(argv[1], "-pairs") == 0) {
+   if(argc < 4 || (argc % 2) != 0)
+     goto usage;
+   ret= synthetic_pairs(argv[0], argc - 2, argv + 2, 0);
+ } else if(strcmp(argv[1], "-copy_acl") == 0) {
+   if(argc != 4)
+     goto usage;
+   ret= test_acl(argv[2], argv[3], 0);
+ } else if(strcmp(argv[1], "-copy") == 0) {
+   if(argc != 4)
+     goto usage;
+   ret= copy_all(argv[2], argv[3], 1);
+ } else
+   goto usage;
+ exit(ret);
+}

xorriso/README

@@ -4,8 +4,8 @@
 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.7.tar.gz
-Copyright (C) 2006-2008 Thomas Schmitt, provided under GPL version 2.
+http://scdbackup.sourceforge.net/xorriso-0.3.2.pl00.tar.gz
+Copyright (C) 2006-2009 Thomas Schmitt, provided under GPL version 2.
 ------------------------------------------------------------------------------
 
 
@@ -16,7 +16,8 @@ information of existing ISO images and it writes the session results to
 optical media or to filesystem objects.
 Vice versa xorriso is able to restore file objects from ISO 9660 filesystems.
 
-Currently it is only supported on Linux with kernels >= 2.4.
+Currently it is supported on Linux with kernels >= 2.4 and on FreeBSD versions
+with ATAPI/CAM support enabled in the kernel, see atapicam(4).
 
 A special property of xorriso is that it needs neither an external ISO 9660
 formatter program nor an external burn program for CD or DVD but rather
@@ -36,10 +37,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.7.tar.gz, take it to a directory of your choice and do:
+Obtain xorriso-0.3.2.pl00.tar.gz, take it to a directory of your choice and do:
 
-    tar xzf xorriso-0.2.7.tar.gz
-    cd xorriso-0.2.7
+    tar xzf xorriso-0.3.2.pl00.tar.gz
+    cd xorriso-0.3.2
 
 Within that directory execute:
 
@@ -53,8 +54,8 @@ which you may strip to reduce it in size
     strip ./xorriso/xorriso
 
 You may copy or move it to a directory where it can be found by the shell,
-you may execute xorriso at the place where it was built, or you may execute
-as superuser:
+or you may execute xorriso at the place where it was built,
+or you may execute as superuser:
     make install
 
 For general concepts, options and usage examples see
@@ -80,6 +81,9 @@ development package is installed, then rather build xorriso by:
     make clean ; make
 Never omit the "make clean" command after switching libreadline enabling.
 
+If you want xorriso to report a "Build timestamp" with its option -version:
+    make buildstamped
+
 
                        Drives and Disk File Objects 
 
@@ -119,9 +123,13 @@ Better try to unmount an eventually mounted media before a write run.
 
 
 Besides true optical drives, xorriso can also address disk files as input or
-output drives. The addresses of the disk files have to be preceded by "stdio:".
+output drives. By default paths to files under /dev are accepted only if the
+device represents a real optical drive. Other device files may be addressed
+by prepending "stdio:" to the path.
 Like:
-    xorriso -dev stdio:/tmp/pseudo_drive ...more arguments...
+    xorriso -dev stdio:/dev/sdb ...more arguments...
+This rule may be changed by xorriso option -drive_class.
+Prefix "mmc:" causes a path to be accepted only if it is a real optical drive.
 
 
                               Testing
@@ -192,9 +200,9 @@ 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.7 :
-- libburn.so.4  , version libburn-0.5.2 or higher
-- libisofs.so.6 , version libisofs-0.6.9 or higher
+Dynamic library and compile time header requirements for libisoburn-0.3.2 :
+- libburn.so.4  , version libburn-0.6.0 or higher
+- libisofs.so.6 , version libisofs-0.6.12 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.
@@ -223,7 +231,7 @@ libburnia-project.org
 By Mario Danic           <mario.danic@gmail.com>,
    Vreixo Formoso        <metalpain2002@yahoo.es>
    Thomas Schmitt        <scdbackup@gmx.net>
-Copyright (C) 2006-2008 Mario Danic, Vreixo Formoso, Thomas Schmitt.
+Copyright (C) 2006-2009 Mario Danic, Vreixo Formoso, Thomas Schmitt.
 
 libburnia-project.org is inspired by and in other components still containing
 parts of old

xorriso/compile_xorriso.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # compile_xorriso.sh
-# Copyright 2005 - 2008 Thomas Schmitt, scdbackup@gmx.net, GPL
+# Copyright 2005 - 2009 Thomas Schmitt, scdbackup@gmx.net, GPL
 #
 # Not intended for general use in production installations !
 # Rather use:  ./bootstrap ; ./configure ; make
@@ -82,6 +82,8 @@ libisofs="$libisofs $isofs"/tree.o
 libisofs="$libisofs $isofs"/util.o
 libisofs="$libisofs $isofs"/util_htable.o
 libisofs="$libisofs $isofs"/util_rbtree.o
+libisofs="$libisofs $isofs"/system_area.o
+libisofs="$libisofs $isofs"/make_isohybrid_mbr.o
 
 
 echo "Version timestamp :  $(sed -e 's/#define Xorriso_timestamP "//' -e 's/"$//' "$xorr"/xorriso_timestamp.h)"
@@ -90,7 +92,7 @@ date -u '+#define Xorriso_build_timestamP "%Y.%m.%d.%H%M%S"' >"$xorr"/xorriso_bu
 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 $def_libreadline \
+cc -I. -DXorriso_with_maiN $def_libreadline \
   $warn_opts \
   $static_opts \
   $debug_opts \

xorriso/configure_ac.txt

@@ -1,4 +1,4 @@
-AC_INIT([xorriso], [0.2.7], [http://libburnia-project.org])
+AC_INIT([xorriso], [0.3.2], [http://libburnia-project.org])
 AC_PREREQ([2.50])
 dnl AC_CONFIG_HEADER([config.h])	
 
@@ -8,15 +8,15 @@ AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([subdir-objects])
 
 BURN_MAJOR_VERSION=0
-BURN_MINOR_VERSION=5
-BURN_MICRO_VERSION=5
+BURN_MINOR_VERSION=6
+BURN_MICRO_VERSION=1
 AC_SUBST(BURN_MAJOR_VERSION)
 AC_SUBST(BURN_MINOR_VERSION)
 AC_SUBST(BURN_MICRO_VERSION)
 
 LIBISOFS_MAJOR_VERSION=0
 LIBISOFS_MINOR_VERSION=6
-LIBISOFS_MICRO_VERSION=10
+LIBISOFS_MICRO_VERSION=12
 AC_SUBST(LIBISOFS_MAJOR_VERSION)
 AC_SUBST(LIBISOFS_MINOR_VERSION)
 AC_SUBST(LIBISOFS_MICRO_VERSION)

xorriso/convert_man_to_html.sh

@@ -65,6 +65,7 @@ then
   -e 's/<b>Settings for result writing:<\/b>/\&nbsp;<BR><b>Settings for result writing:<\/b><BR>\&nbsp;<BR>/' \
   -e 's/^706k = 706kB/\&nbsp;\&nbsp;706k = 706kB/' \
   -e 's/^5540k = 5540kB/\&nbsp;\&nbsp;5540k = 5540kB/' \
+  -e 's/<b>Character sets:<\/b>/\&nbsp;<BR><b>Character sets:<\/b><BR>\&nbsp;<BR>/' \
   -e 's/<b>Exception processing:<\/b>/\&nbsp;<BR><b>Exception processing:<\/b><BR>\&nbsp;<BR>/' \
   -e 's/<b>El Torito bootable ISO images:<\/b>/\&nbsp;<BR><b>El Torito bootable ISO images:<\/b><BR>\&nbsp;<BR>/' \
   -e 's/<b>Dialog mode control:<\/b>/\&nbsp;<BR><b>Dialog mode control:<\/b><BR>\&nbsp;<BR>/' \

xorriso/make_xorriso_standalone.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # make_xorriso_standalone.sh
-# Copyright 2008 Thomas Schmitt, scdbackup@gmx.net, GPL
+# Copyright 2008 - 2009 Thomas Schmitt, scdbackup@gmx.net, GPL
 #
 # Not intended for general use in production installations !
 # 
@@ -25,11 +25,11 @@
 current_dir=$(pwd)
 lone_dir="$current_dir"/"xorriso-standalone"
 
-xorriso_rev=0.2.7
+xorriso_rev=0.3.2
 # 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 "Oct 10, 2008"
+.TH XORRISO 1 "Dec 16, 2008"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -59,6 +59,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 issue commands to mount older sessions on Linux or FreeBSD.
+.br
 Can check media for damages and copy readable blocks to disk.
 .br
 Scans for optical drives, blanks re-useable optical media.
@@ -100,7 +102,8 @@ The data content of the session is called filesystem
 The written image in its session can then be mounted by the operating system
 for being used read-only. Linux is able to mount ISO images from block devices,
 which may represent optical media, other media or via a loop device even
-from regular disk files.
+from regular disk files. FreeBSD mounts ISO images from devices that represent
+arbitrary media or from regular disk files.
 .PP
 This session usage model has been extended on CD media by the concept of
 .B multi-session ,
@@ -176,9 +179,10 @@ suitable for xorriso.
 .br
 Blank is the state of newly purchased optical media.
 With used CD-RW and DVD-RW it can be achieved by action -blank "as_needed".
-Overwriteable media are considered blank unless they contain an ISO image
-suitable for xorriso. Action -blank "as_needed" can be used to invalidate the
-image on overwriteable media, or to apply eventual mandatory formatting.
+Overwriteable media are considered blank if they are new or if they have
+been marked as blank by xorriso.
+Action -blank "as_needed" can be used to do this marking on overwriteable
+media, or to apply eventual mandatory formatting of new media.
 .br
 \fBAppendable\fR media accept further sessions. Either they are MMC
 multi-session media in appendable state, or they are overwriteable media
@@ -196,17 +200,16 @@ probably show any media as closed CD-ROM resp. DVD-ROM.
 Overwriteable media assume this state in such read-only drives or if they
 contain unrecognizable data in the first 32 data blocks.
 .br
-\fBRead-only\fR drives may or may not show session histories of multi-session
+Read-only drives may or may not show session histories of multi-session
 media. Often only the first and the last session are visible. Sometimes
 not even that. Option -rom_toc_scan might or might not help in such cases.
 .SS
 .B Creating, Growing, Modifying, Blind Growing:
 .br
 A new empty ISO image gets \fBcreated\fR
-if there is no input drive with a valid
-ISO 9660 image plus Rock Ridge extensions when the first time an output drive
-is defined. This is achieved by option -dev on blank media or by option -outdev
-on media in any state.
+if there is no input drive with a valid ISO 9660 image when the first time
+an output drive is defined. This is achieved by option -dev on blank media
+or by option -outdev on media in any state.
 .br
 The new empty image can be populated with directories and files.
 Before it can be written, the media in the output drive must get into
@@ -258,9 +261,6 @@ program is desired. -C $msc1,$msc2 is equivalent to:
 Input drive, i.e. source of an existing or empty ISO image, can be any random
 access readable libburn drive: optical media with readable data,
 blank optical media, regular files, block devices.
-.br
-Rock Ridge info must be present in existing ISO images and it will be generated
-by the program unconditionally.
 .PP
 Output drive, i.e. target for writing, can be any libburn drive.
 Some drive types do not support the method of growing but only the methods
@@ -278,6 +278,12 @@ the path of their block device or of their generic character device. E.g.
 .br
   -dev /dev/sg2
 .br
+On FreeBSD the device files have names like
+.br
+  -dev /dev/cd0
+.br
+  -dev /dev/acd0
+.br
 Get a list of accessible drives by command
 .br
   -devices
@@ -290,14 +296,19 @@ Consider to bundle the authorized users in a group like old "floppy".
 Filesystem objects of nearly any type can be addressed by prefix "stdio:" and
 their path in the filesystem. E.g.:
 .br
-  -dev stdio:/tmp/pseudo_drive
+  -dev stdio:/dev/sdc
+.br
+The default setting of -drive_class allows to address files outside the
+/dev tree without that prefix. E.g.:
+.br
+  -dev /tmp/pseudo_drive
 .br
 If path leads to a regular file or to a block device then the emulated drive
 is random access readable and can be used for the method of growing if it
 already contains a valid ISO 9660 image. Any other file type is not readable
 via "stdio:" and can only be used as target for the method of modifying or
 blind growing.
-Non existing paths in existing directories are handled as empty regular files.
+Non-existing paths in existing directories are handled as empty regular files.
 .PP
 A very special kind of pseudo drive are open file descriptors. They are
 depicted by "stdio:/dev/fd/" and descriptor number (see man 2 open).
@@ -320,12 +331,18 @@ If stdout is used as drive, then -use_readline is permanently disabled.
 Use of backdoors will cause severe memory and/or tty corruption.
 .PP
 Be aware that especially the superuser can write into any accessible file or
-device by using its path with the "stdio:" prefix. Addresses without prefix
-"stdio:" will only work if they lead to a MMC drive.
+device by using its path with the "stdio:" prefix. By default any address
+in the /dev tree without prefix "stdio:" will work only if it leads to a MMC
+drive.
 .br
 One may use option
 .B -ban_stdio_write
 to surely prevent this risk and to allow only MMC drives.
+.br
+One may prepend "mmc:" to a path to surely disallow any automatic "stdio:".
+.br
+By option -drive_class one may ban certain paths or allow access without
+prefix "stdio:" to other paths.
 .SS
 .B Rock Ridge, POSIX, X/Open, and El Torito:
 .br
@@ -336,7 +353,7 @@ with ownership, access permissions, symbolic links, and other attributes.
 .PP
 This is what xorriso uses for a decent representation of the disk files
 within the ISO image. Rock Ridge information is produced with any xorriso
-image and xorriso will load for manipulation only Rock Ridge enhanced images.
+image.
 .PP
 xorriso is not named "porriso" because POSIX only guarantees 14 characters
 of filename length. It is the X/Open System Interface standard XSI which
@@ -352,20 +369,26 @@ The content of the boot image files is not in the scope of El Torito.
 .br
 Most bootable Linux CDs are equipped with ISOLINUX boot images. xorriso is
 able to create or maintain an El Torito object which makes such an image
-bootable. Emulation -as mkisofs supports the example options out of the
-ISOLINUX wiki.
+bootable. For details see option -boot_image.
+Emulation -as mkisofs supports the example options out of the ISOLINUX wiki.
 .br
 The support for other boot image types is sparse.
+.br
+An MBR is generated together with the El Torito boot record if the boot image
+bears the isohybrid signature of ISOLINUX 3.72 or later. It will occupy the
+first 512 bytes of the emerging ISO image and enable booting from media which
+appear as hard disk rather than as CDROM. An MBR does not hamper CDROM booting.
+The MBR of a follow-up session can get in effect only on overwriteable media.
 .SS
 .B Command processing:
 .br
 Commands are either actions or settings. They consist of a command word,
 followed by zero or more parameter words. If the list of parameter words
 is of variable length (indicated by "[...]" or "[***]") then it has to be
-terminated by either the list delimiter, or the end of argument list, or an
-end of an input line.
+terminated by either the \fBlist delimiter\fR, or the end of argument list,
+or an end of an input line.
 .PP
-At program start the \fBlist delimiter\fR is the word "--". This may be changed
+At program start the list delimiter is the word "--". This may be changed
 by option -list_delimiter in order to allow "--" as argument in a list of
 variable length.  It is advised to reset the delimiter to "--" immediately
 afterwards.
@@ -385,14 +408,30 @@ lists which are marked in this man page by "[***]" rather than "[...]".
 Some other commands perform pattern matching unconditionally.
 .PP
 Command and parameter words are either read from program arguments, where one
-argument is one word, or from input lines where words are recognized similar
-to the quotation rules of a shell parser.
+argument is one word, or from quoted input lines where words are recognized
+similar to the quotation rules of a shell parser.
 .br
 xorriso is not a shell, although it might appear so on first glimpse.
 Be aware that the interaction of quotation marks and pattern symbols like "*"
 differs from the usual shell parsers. In xorriso, a quotation mark does not
 make a pattern symbol literal.
 .PP
+.B Quoted input
+converts whitespace separated text pieces into words.
+The double quotation mark " and the single quotation mark ' can be used to
+enclose whitespace and make it part of words (e.g. of file names). Each mark
+type can enclose the marks of the other type. A trailing backslash \\ outside
+quotations or an open quotation cause the next input line to be appended.
+.br
+Quoted input accepts any ASCII character except NUL (0) as content of quotes.
+Nevertheless it can be cumbersome for the user to produce those characters
+at all. Therefore quoted input and program arguments allow optional
+.B Backslash Interpretation
+which can represent all ASCII characters except NUL (0) by backslash codes
+as in $'...' of bash.
+.br
+It is not enabled by default. See option -backslash_codes.
+.PP
 When the program begins then it first looks for argument -no_rc. If this is
 not present then it looks for its startup files and
 eventually reads their content as command input lines. Then it interprets
@@ -405,7 +444,7 @@ event which triggers the threshold of command -abort_on.
 .SS
 .B Dialog, Readline, Result pager:
 .br
-Dialog mode prompts for an input line, parses it into words, and performs
+Dialog mode prompts for a quoted input line, parses it into words, and performs
 them as commands with their parameters. It provides assisting services
 to make dialog more comfortable.
 .PP
@@ -490,6 +529,41 @@ apply. See above paragraph "Libburn drives".
 An empty address string "" gives up the current output drive
 without aquiring a new one. No writing is possible without an output drive.
 .TP
+\fB\-drive_class\fR "harmless"|"banned"|"risky"|"clear_list" disk_pattern
+Add a drive path pattern to one of the safety lists or make those lists empty.
+There are three lists defined which get tested in the following sequence:
+.br
+If a drive address path matches the "harmless" list then the drive will be
+accepted. If it is not a MMC device then the prefix "stdio:" will be prepended
+automatically. This list is empty by default.
+.br
+Else if the path matches the "banned" list then the drive will not be
+accepted by xorriso but rather lead to a FAILURE event. This list is empty by
+default.
+.br
+Else if the path matches the "risky" list and if it is not a MMC device,
+then its address must have the prefix "stdio:" or it will be rejected.
+This list has by default one entry: "/dev".
+.br
+If a drive path matches no list then it is considered "harmless". By default
+these are all paths which do not begin with directory "/dev".
+.br
+A path matches a list if one of its parent paths or itself matches a list
+entry. An eventual address prefix "stdio:" or "mmc:" will be ignored when
+testing for matches.
+.br
+By pseudo-class "clear_list" and pseudo-patterns "banned", "risky", "harmless",
+or "all", the lists may be made empty.
+.br
+E.g.: -drive_class clear_list banned
+.br
+One will normally define the -drive_class lists in one of the xorriso
+Startup Files.
+.br
+Note: This is not a security feature but rather a bumper for the superuser to
+prevent inadverted mishaps. For reliably blocking access to a device file you
+have to deny its rw-permissions in the filesystem.
+.TP
 \fB\-grow_blindly\fR "off"|predicted_nwa
 If predicted_nwa is a non-negative number then perform blind growing rather
 than modifying if -indev and -outdev are set to different drives.
@@ -521,7 +595,8 @@ address. The following entities are defined:
 .br
 "lba" or "sbsector" with a number as of a line "ISO ...", column "sbsector".
 .br
-"volid" with a text as of a line "ISO ...", column "Volume Id".
+"volid" with a search pattern for a text as of a line "ISO ...",
+column "Volume Id".
 .br
 Adressing a non-existing entity or one which does not represent an ISO
 image will either abandon -indev or at least lead to a blank image.
@@ -532,6 +607,21 @@ until the next -dev or -indev. After the image has been loaded once, the
 setting is valid for -rollback until next -dev or -indev, where it
 will be reset to "auto".
 .TP
+\fB\-assert_volid\fR pattern severity
+Refuse to load ISO images with volume ids which do not match the given
+search pattern. When refusing an image, give up the input drive and issue
+an event of the given severity. An empty search pattern accepts any image.
+.br
+This option does not hamper the creation of an empty image from blank
+input media and does not discard an already loaded image.
+.TP
+\fB\-in_charset\fR character_set_name
+Set the character set from which to convert file names when loading an
+image. This has eventually to be done before specifying -dev , -indev or
+-rollback. See paragraph "Character sets" for more explanations.
+When loading the written image after -commit the setting of -out_charset
+will be copied to -in_charset.
+.TP
 \fB\-rom_toc_scan\fR "on"|"off"[:"emul_on"|"emul_off"]
 Read-only drives do not tell the actual media type but show any media as
 ROM (e.g. as DVD-ROM). The session history of MMC multi-session media might
@@ -665,6 +755,10 @@ Like -add but read the parameter words from file disk_path
 or standard input if disk_path is "-". 
 The list must contain exactly one pathspec resp. disk_path pattern per line. 
 .TP
+\fB\-quoted_path_list\fR disk_path
+Like -path_list but with quoted input reading rules. Lines get split into
+parameter words for -add. Whitespace outside quotes is discarded.
+.TP
 \fB\-map\fR disk_path iso_rr_path
 Insert file object disk_path into the ISO image as iso_rr_path. If disk_path
 is a directory then its whole sub tree is inserted into the ISO image.
@@ -673,7 +767,7 @@ is a directory then its whole sub tree is inserted into the ISO image.
 Like -map, but if disk_path is a directory then its sub tree is not inserted.
 .TP
 \fB\-map_l\fR disk_prefix iso_rr_prefix disk_path [***]
-Performs -map with each of the disk_path arguments. iso_rr_path will be
+Perform -map 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
 \fB\-update\fR disk_path iso_rr_path
@@ -701,7 +795,7 @@ If iso_rr_path does not exist yet, then it gets added. If disk_path does not
 exist, then iso_rr_path gets deleted.
 .TP
 \fB\-update_l\fR disk_prefix iso_rr_prefix disk_path [***]
-Performs -update_r with each of the disk_path arguments. iso_rr_path will be
+Perform -update_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
 \fB\-cut_out\fR disk_path byte_offset byte_count iso_rr_path
@@ -1052,7 +1146,9 @@ Defined modes are:
 .br
 "as_needed" cares for used CD-RW, DVD-RW and for used overwriteable media
 by applying -blank "fast". It applies -format "full" to  yet unformatted
-DVD-RAM or BD-RE. Other media or states are gracefully ignored.
+DVD-RAM and BD-RE. Other media in blank state are gracefully ignored.
+Media which cannot be made ready for writing from scratch cause a FAILURE
+event.
 .br
 "fast" and "all" make CD-RW and unformatted DVD-RW re-usable,
 or invalidate overwriteable ISO images.
@@ -1070,16 +1166,16 @@ worse occured.
 .TP
 \fB\-format\fR mode
 Convert unformatted DVD-RW into overwriteable ones, "de-ice" DVD+RW, format
-newly purchased BD-RE, re-format DVD-RAM or BD-RE.
+newly purchased BD-RE or BD-R, re-format DVD-RAM or BD-RE.
 .br
 Defined modes are:
 .br
   as_needed, full, fast, by_index_<num>, fast_by_index_<num> 
 .br
-"as_needed" formats yet unformatted DVD-RW, DVD-RAM, BD-RE. Other media
-are left untouched.
+"as_needed" formats yet unformatted DVD-RW, DVD-RAM, BD-RE, or blank
+unformatted BD-R. Other media are left untouched.
 .br
-"full" (re-)formats DVD-RW, DVD+RW, DVD-RAM, BD-RE.
+"full" (re-)formats DVD-RW, DVD+RW, DVD-RAM, BD-RE, or blank unformatted BD-R.
 .br
 "fast" does the same as "full" but tries to be quicker.
 .br
@@ -1089,6 +1185,12 @@ mode word. E.g: "by_index_3".
 .br
 "fast_by_index_" does the same as "by_index_" but tries to be quicker.
 .br
+"by_size_" selects a format out of the descriptor list which provides at
+least the given size. That size is to be appended to the mode word.
+E.g: "by_size_4100m". This applies to media with Defect Management.
+.br
+"fast_by_size_" does the same as "by_size_" but tries to be quicker.
+.br
 The formatting action has no effect on media if -dummy is activated.
 .br
 Formatting is normally needed only once during the lifetime of a media,
@@ -1096,10 +1198,15 @@ if ever. But it is a reason for re-formatting if:
 .br
  DVD-RW was deformatted by -blank,
 .br
- DVD+RW has read failures (re-formatting might help or not),
+ DVD+RW has read failures (re-format before next write),
 .br
  DVD-RAM or BD-RE shall change their amount of defect reserve.
 .br
+BD-R may be written unformatted or may be formatted before first use.
+Formatting activates Defect Management which tries to catch and repair
+bad spots on media during the write process at the expense of half speed
+even with flawless media.
+.br
 The progress reports issued by some drives while formatting are
 quite unrealistic. Do not conclude success or failure from the
 reported percentages. Formatting was successful if no SORRY event
@@ -1114,9 +1221,9 @@ and the same size in MiB.
 MMC format codes are manifold. Most important are:
 "00h" general formatting, "01h" increases reserve space for DVD-RAM,
 "26h" for DVD+RW, "30h" for BD-RE with reserve space,
-"31h" for BD-RE without reserve space.
+"31h" for BD-RE without reserve space, "32h" for BD-R.
 .br
-Smaller format size with DVD-RAM or BD-RE means more reserve space.
+Smaller format size with DVD-RAM, BD-RE, or BD-R means more reserve space.
 .TP
 .B Settings for data insertion:
 .TP
@@ -1190,6 +1297,14 @@ Add a single shell parser style pattern to the list of exclusions for
 disk leafnames. These patterns are evaluated when the exclusion checks are
 made.
 .TP
+\fB\-not_list\fR disk_path
+Read lines from disk_path and use each of them either as -not_paths argument,
+if they contain a / character, or as -not_leaf pattern.
+.TP
+\fB\-quoted_not_list\fR disk_path
+Like -not_list but with quoted input reading rules. Each word is
+handled as one argument for -not_paths resp. -not_leaf.
+.TP
 \fB\-follow\fR occasion[:occasion[...]]
 Enable or disable resolution of symbolic links and mountpoints under
 disk_paths. This applies to actions -add, -du*x, -ls*x, -findx,
@@ -1289,11 +1404,53 @@ Rock Ridge info will be generated by the program unconditionally.
 \fB\-joliet\fR "on"|"off"
 If enabled by "on", generate Joliet info additional to Rock Ridge info.
 .TP
+\fB\-compliance\fR rule[:rule...]
+Adjust the compliance to specifications of ISO 9660 and its extensions. In some
+cases it is worth to deviate a bit in order to circumvent bugs of the intended
+reader system or to get inofficial extra features.
+.br
+There are several adjustable rules which have a keyword each. If they
+are mentioned with this option then their rule gets added to the relaxation
+list. This list can be erased by rules "strict" or "clear". It can be reset
+to its start setting by "default". All of the following relaxation rules
+can be revoked individually by appending "_off". Like "deep_paths_off".
+.br
+Rule keywords are:
+.br
+"omit_version" do not add versions (";1") to the file names.
+.br
+"deep_paths" allow ISO file paths deeper than 8 levels.
+.br
+"long_paths" allow ISO file paths longer than 255 characters.
+.br
+"long_names" allow up to 37 characters with ISO file names.
+.br
+"no_force_dots" do not add a dot to filenames which have none.
+.br
+"lowercase" allow lowercase characters in ISO file names.
+.br
+"full_ascii" allow all ASCII characters in ISO file names.
+.br
+"joliet_long_paths" allow Joliet paths longer than 240 characters.
+.br
+"always_gmt" store timestamps in GMT representation with timezone 0.
+.br
+"old_rr" use Rock Ridge version 1.10 (needed if the intended reader
+system does not recognize Rock Ridge 1.12 signature).
+.br
+"rec_mtime" record with ISO files the disk file's mtime and not the
+creation time of the image.
+.br
+Default setting is "clear:deep_paths:long_paths:always_gmt".
+.br
+Note: The term "ISO file" means the plain ISO 9660 names wnd attributes
+which get visible if the reader ignores Rock Ridge.
+.TP
 \fB\-volid\fR text
-Specifies the volume ID. xorriso accepts any text up to 32 characters,
+Specify the volume ID. xorriso accepts any text up to 32 characters,
 but according to rarely obeyed specs stricter rules apply:
 .br
-ECMA 119 demands character set [A-Z0-9_]. Like: "IMAGE_23"
+ECMA 119 demands ASCII characters out of [A-Z0-9_]. Like: "IMAGE_23"
 .br
 Joliet allows 16 UCS-2 characters. Like: "Windows name"
 .br
@@ -1313,6 +1470,16 @@ If you insist in -volid "ISOIMAGE", set it again after those commands.
 Set the publisher string to be written with the next -commit. Permissible
 are up to 128 characters.
 .TP
+\fB\-application_id\fR text
+Set the application id string to be written with the next -commit. Permissible
+are up to 128 characters.
+.TP
+\fB\-out_charset\fR character_set_name
+Set the character set to which file names get converted when writing an
+image. See paragraph "Character sets" for more explanations.
+When loading the written image after -commit the setting of -out_charset
+will be copied to -in_charset.
+.TP
 \fB\-uid\fR uid
 User id to be used for all files when the new ISO tree gets written to media.
 .TP
@@ -1340,8 +1507,8 @@ the speed value given by the burn program only as upper limit
 for their own decision.
 .TP
 \fB\-stream_recording\fR "on"|"off"
-Setting "on" tries to circumvent the management of defects on DVD-RAM and
-BD-RE. Defect management keeps partly damaged media usable. But it reduces
+Setting "on" tries to circumvent the management of defects on DVD-RAM, BD-RE,
+or BD-R. Defect management keeps partly damaged media usable. But it reduces
 write speed to half nominal speed even if the media is in perfect shape.
 For the case of flawless media, one may use -stream_recording "on" to get
 full speed. 
@@ -1390,8 +1557,11 @@ when a follow-up session gets written. But one should not rely on the
 capability to influence the bootability of the existing sessions, unless one
 can assume overwriteable media.
 .TP
-\fB\-boot_image\fR "any"|"isolinux" "discard"|"keep"|"patch"|bootspec
-Defines the handling of an eventual El Torito object which has
+\fB\-boot_image\fR "any"|"isolinux"
+.br
+     "discard"|"keep"|"patch"|"show_status"|bootspec
+.br
+Define the handling of an eventual El Torito object which has
 been read from an existing ISO image or defines how to make a prepared
 ISOLINUX file set bootable.
 .br
@@ -1400,6 +1570,9 @@ All types ("any") of El Torito boot images can be discarded or kept unaltered.
 The latter makes only sense if the format of the boot image is
 relocatable without content changes.
 .br
+With any type, "show_status" will print what is known about the loaded image
+and its designated fate.
+.br
 An existing boot image of type "isolinux" can be discarded or it can be
 patched to match its relocation. In the latter case the resulting ISO image
 stays bootable if the boot image was really produced by ISOLINUX.
@@ -1410,13 +1583,16 @@ xorriso cannot recognize the inner form of boot images.
 So the user has already to know about the particular needs of the
 boot image which is present on the input media.
 .br
-Most safe is the default: "any" "discard".
+Most safe is the default: -boot_image "any" "discard".
 .br
 
-On all media types it is possible to activate a set of ISOLINUX files
-for booting within the first session. In further sessions an existing boot
-image can get replaced by a new one, but depending on the media type 
-this may have few effect at boot time. See above.
+A bootspec is a word of the form name=value and is used to describe the
+activation of a ISOLINUX boot image by an El Torito record and eventually
+a MBR. The names "dir" and "bin_path" lead to boot image activation.
+.br
+On all media types this is possible within the first session. In further
+sessions an existing boot image can get replaced by a new one, but depending
+on the media type this may have few effect at boot time. See above.
 .br
 The ISOLINUX files have to be added to the ISO image by normal means
 (image loading, -map, -add, ...) and should reside either in ISO image
@@ -1442,8 +1618,45 @@ cat_path at -commit time.
 It is subject to normal -overwrite and -reassure processing if there is already
 a file with the same name.
 .br
-The setting of -boot_image will change to "isolinux" "patch" after successful
-writing of a session with -boot_image "isolinux" bootspec.
+Bootspec "isohybrid=off" disables MBR generation, "isohybrid=on" prevents the
+write session if not the isohybrid signature is found in the bin_path file.
+Default is "isohybrid=auto" which silently omits the MBR if the signature is
+missing. 
+.TP
+.B Character sets:
+.PP
+File names are strings of non-zero bytes with 8 bit each. Unfortunately
+the same byte string may appear as different peculiar national characters
+on differently nationalized computers.
+The meanings of byte codes are defined in \fBcharacter sets\fR which have
+names. Shell command iconv -l lists them. 
+.br
+Character sets should not matter as long as only english alphanumeric
+characters are used for file names or as long as all writers and readers
+of the media use the same character set.
+Outside these constraints it may be necessary to let xorriso convert byte
+codes.
+.br
+There is an input conversion from input character set to the local character
+set which applies when an ISO image gets loaded. A conversion from local
+character set to the output character set is performed when an
+image tree gets written. The sets can be defined independently by options
+-in_charset and -out_charset. Normally one will have both identical, if ever.
+.br
+If conversions are desired then xorriso needs to know the name of the
+local character set. xorriso can inquire the same info as shell command
+"locale" with argument "charmap". This may be influenced by environment
+variables LC_ALL, LC_CTYPE, or LANG and should match the expectations of
+the terminal.
+.TP
+\fB\-charset\fR character_set_name
+Set the character set from which to convert file names when loading an
+image and to which to convert when writing an image.
+.TP
+\fB\-local_charset\fR character_set_name
+Override the system assumption of the local character set name.
+If this appears necessary, one should consider to set -backslash_codes to
+"on" in order to avoid dangerous binary codes being sent to the terminal.
 .TP
 .B Exception processing:
 .PP
@@ -1562,7 +1775,7 @@ With occasion "file_extraction" there are three behaviors:
 Enable or disable to enter dialog mode after all arguments are processed.
 In dialog mode input lines get prompted via readline or from stdin.
 .br
-Mode "on" supports input of newline characters witing quotation marks and
+Mode "on" supports input of newline characters within quotation marks and
 line continuation by trailing backslash outside quotation marks.
 Mode "single_line" does not.
 .TP
@@ -1648,6 +1861,44 @@ to be the most recent real session then.
 Some read-only drives and media show no usable session history at all.
 Eventually option -rom_toc_scan might help.
 .TP
+\fB\-mount_cmd\fR drive entity id path
+Emit an appropriate command line for mounting the ISO session
+indicated by drive, entity and id.
+The result will be different on Linux and on FreeBSD.
+.br
+drive can be "indev" or "outdev" to indicate already aquired drives,
+or it can be the path of a not yet acquired drive.
+Prefix "stdio:" for non-MMC drives is not mandatory.
+.br
+entity must be either "sbsector" , "track" , "session" , "volid" 
+or "auto". See also option -load.
+.br
+id gives the superblock sector address, the track number, the session number,
+or a search pattern for the volume id respectively.
+.br
+path will be used as mount point and must already exist as a directory.
+.br
+The command gets printed to the result channel. See option -mount
+for direct execution of this command.
+.TP
+\fB\-session_string\fR drive entity id format
+Print to the result channel a text which gets composed according to
+format and the parameters of the addressed session.
+.br
+Formats "linux:"path or "freebsd:"path produce the output of -mount_cmd
+for the given operating systems.
+.br
+In other texts xorriso will substitute the following parameter names.
+An optional prefix "string:" will be removed. 
+.br
+"%device%" will be substituted by the mountable device path of the drive
+address.
+.br
+"%sbsector%" will be substituted by the session start sector.
+.br
+"%track%", "%session%", "%volid%" will be substituted by track number,
+session number, resp. volume id of the depicted session.
+.TP
 \fB\-print_size\fR
 Print the foreseeable consumption of 2048 byte blocks
 by next -commit. This can last a while as a -commit gets
@@ -1974,7 +2225,7 @@ Like -extract, but if iso_rr_path is a directory then its sub tree gets not
 restored.
 .TP
 \fB\-extract_l\fR iso_rr_prefix disk_prefix iso_rr_path [***]
-Performs -extract with each of the iso_rr_path arguments. disk_path will be
+Perform -extract with each of the iso_rr_path arguments. disk_path will be
 composed from iso_rr_path by replacing iso_rr_prefix by disk_prefix.
 .TP
 \fB\-extract_cut\fR iso_rr_path byte_offset byte_count disk_path
@@ -2025,6 +2276,13 @@ Read the content of a ISO data file and write it into a data file on disk
 beginning at the byte_offset. Write at most byte_count bytes.
 This is the inverse of option -cut_out.
 .TP
+\fB\-mount\fR drive entity id path
+Produce the same line as -mount_cmd and then execute it as external program run
+after giving up the depicted drive.
+This demands -osirrox to be enabled and normally will succeed only for the
+superuser. For safety reasons the mount program is only executed if it is 
+reachable as /bin/mount or /sbin/mount.
+.TP
 .B Command compatibility emulations:
 .PP
 Writing of ISO 9660 on CD is traditionally done by program mkisofs
@@ -2035,7 +2293,7 @@ of commands which in said programs trigger comparable actions.
 .TP
 \fB\-as\fR personality option [options] --
 .br
-Performs its variable length option list as sparse emulation of the program
+Perform its variable length option list as sparse emulation of the program
 depicted by the personality word.
 .br
 
@@ -2045,8 +2303,8 @@ Personality "\fBmkisofs\fR" accepts the options listed with:
 .br
 Among them: -R (always on), -J, -o, -M, -C, -path-list, -m, -exclude-list,
 -f, -print-size, -pad, -no-pad, -V, -v, -version, -graft-points,
--no-emul-boot, -b, -c, -boot-info-table, -boot-load-size,
-pathspecs as with xorriso -add.
+-no-emul-boot, -b, -c, -boot-info-table, -boot-load-size, -input-charset,
+-output-charset, pathspecs as with xorriso -add.
 A lot of options are not supported and lead to failure of the mkisofs
 emulation. Some are ignored, but better do not rely on this tolerance.
 .br
@@ -2072,6 +2330,9 @@ Writing to stdout is possible only if -as "mkisofs" was among the start
 arguments or if other start arguments pointed the output drive to
 standard output.
 .br
+Not original mkisofs options are --quoted_path_list (see -quoted_path_list)
+and isolinux_mbr= (see -boot_image isolinux isohybrid=).
+.br
 Personalites "\fBxorrisofs\fR", "\fBgenisoimage\fR", and "\fBgenisofs\fR"
 are aliases for "mkisofs".
 .br
@@ -2147,7 +2408,7 @@ prevents reading and interpretation of eventual startup
 files. See section FILES below.
 .TP
 \fB\-options_from_file\fR fileaddress
-Reads lines from fileaddress and executes them as dialog lines.
+Read quoted input from fileaddress and executes it like dialog lines.
 .TP
 \fB\-help\fR
 .br
@@ -2183,6 +2444,43 @@ quotation marks.
 .br
 For brevity the list delimiter is referred as "--" throughout this text.
 .TP
+\fB\-backslash_codes\fR "on"|"off"|mode[:mode]
+Enable or disable the interpretation of symbolic representations of special
+characters with quoted input, or with program arguments, or with program
+text output. If enabled the following translations apply:
+.br
+ \\a=bell(007) \\b=backspace(010) \\e=Escape(033) \\f=formfeed(014)
+.br
+ \\n=linefeed(012) \\r=carriage_return(015) \\t=tab(011)
+.br
+ \\v=vtab(013) \\\\=backslash(134) \\[0-7][0-7][0-7]=octal_code
+.br
+ \\\\x[0-9a-f][0-9a-f]=hex_code \\cC=control-C
+.br
+Translations can occur with quoted input in 3 modes:
+.br
+ "in_double_quotes" translates only inside " quotation.
+.br
+ "in_quotes" translates inside " and ' quotation.
+.br
+ "with_quoted_input" translates inside and outside quotes.
+.br
+With the start program arguments there is mode:
+.br
+ "with_program_arguments" translates all program arguments.
+.br
+.br
+Mode "encode_output" encodes output characters. It combines "encode_results"
+with "encode_infos". Inside single or double quotation marks encoding applies
+to ASCII characters octal 001 to 037 , 177 to 377 and to backslash(134).
+Outside quotation marks some harmless control characters stay unencoded:
+bell(007), backspace(010), tab(011), linefeed(012), formfeed(014),
+carriage_return(015).
+.br
+Mode "off" is default and disables any translation.
+Mode "on" is
+"with_quoted_input:with_program_arguments:encode_output".
+.TP
 \fB\-temp_mem_limit\fR number["k"|"m"]
 Set the maximum size of temporary memory to be used for image dependent
 buffering. Currently this applies to pattern expansion only.
@@ -2220,8 +2518,8 @@ This transport becomes visible with -report_about "ALL".
 \fB\-session_log\fR path
 If path is not empty it gives the address of a plain text file where
 a log record gets appended after each session. This log can be used to
-determine the start_lba of a session for mount option sbsector= from
-date or volume id.
+determine the start_lba of a session for mount options -o sbsector=
+resp. -s from date or volume id.
 .br
 Record format is: timestamp start_lba size volume-id
 .br
@@ -2285,6 +2583,8 @@ Copy modified ISO image from one media to another
 .br
 Bring a prepared ISOLINUX tree onto media and make it bootable
 .br
+Change existing file name tree from ISO-8859-1 to UTF-8
+.br
 Operate on storage facilities other than optical drives
 .br
 Perform multi-session runs as of cdrtools traditions
@@ -2314,14 +2614,27 @@ which shall be able to use the drives with xorriso.
 2  -dev '/dev/sr2' rwrw-- :  'PHILIPS ' 'SPD3300L' 
 .SS
 .B Blank media and compose a new ISO image as batch run
-Aquire drive /dev/sr2, blank media resp. invalidate existing ISO image.
-Add the files from hard disk directories /home/me/sounds and /pictures.
+Aquire drive /dev/sr2, make media ready for writing a new image,
+fill the image with the files from hard disk directories /home/me/sounds
+and /home/me/pictures.
+.br
+Because no -dialog "on" is given, the program will then end by writing the
+session to media.
+.br
+\fB$\fR xorriso -outdev /dev/sr2 \\
+.br
+ -blank as_needed \\
+.br
+ -map /home/me/sounds /sounds \\
+.br
+ -map /home/me/pictures /pictures
+.br
+
+.br
+The ISO image may be shaped in a more elaborate way like the following:
 Omit some unwanted stuff by removing it from the image directory tree.
 Re-add some wanted stuff.
 .br
-Because no -dialog "on" is given, the program will then end by committing the
-session to media.
-.br
 \fB$\fR cd /home/me
 .br
 \fB$\fR xorriso -outdev /dev/sr2 \\
@@ -2450,14 +2763,40 @@ Now xorriso can burn an El Torito bootable media:
 .br
    -boot_image isolinux dir=/boot/isolinux
 .SS
+.B Change existing file name tree from ISO-8859-1 to UTF-8
+This example assumes that the existing ISO image was written with character
+set ISO-8859-1 but that the readers expected UTF-8. Now a new session with
+the same files gets added with converted file names.
+In order to avoid any weaknesses of the local character set, this command
+pretends that it uses already the final target set UTF-8.
+Therefore strange file names may appear in eventual messages which
+will be made terminal-safe by option -backslash_codes.
+.br
+\fB$\fR xorriso -in_charset ISO-8859-1 -local_charset UTF-8 \\
+.br
+   -out_charset UTF-8 -backslash_codes on -dev /dev/sr0 \\
+.br
+   -alter_date m +0 / -- -commit -eject all
+.SS
 .B Operate on storage facilities other than optical drives
 Full read-write operation is possible with regular files and block devices:
 .br
-\fB$\fR xorriso -dev stdio:/tmp/regular_file ...
+\fB$\fR xorriso -dev /tmp/regular_file ...
+.br
+Paths underneath /dev normally need prefix "stdio:"
+.br
+\fB$\fR xorriso -dev stdio:/dev/sdb ...
+.br
+If /dev/sdb is to be used frequently and /dev/sda is the system disk,
+then consider to place the following lines in a xorriso Startup File.
+They allow to use /dev/sdb without prefix and protect your disk from xorriso:
+.br
+  -drive_class banned   /dev/sda*
+  -drive_class harmless /dev/sdb
 .br
 Other writeable file types are supported write-only:
 .br
-\fB$\fR xorriso -outdev stdio:/tmp/named_pipe ...
+\fB$\fR xorriso -outdev /tmp/named_pipe ...
 .br
 Among the write-only drives is standard output:
 .br
@@ -2560,16 +2899,17 @@ Seconds since Jan 1 1970:
 .B =1194531416
 .SS
 .B Incremental backup of a few directory trees
-This does the following to directories /open_source_project and /personal_mail
-in the ISO image:
-create them if not existing yet,
-compare them with their disk counterparts,
-add disk file objects which are missing yet,
-overwrite those which are different on disk,
-and delete those which have vanished on disk.
-But do not add or overwrite files matching *.o, *.swp.
+This changes the directory trees /open_source_project and /personal_mail
+in the ISO image so that they become exact copies of their disk counterparts.
+ISO file objects get created, deleted or get their attributes adjusted
+accordingly.
+Files with names matching *.o or *.swp get excluded explicitely.
 .br
-\fB$\fR xorriso -dev /dev/sr0 \\
+Only media with the expected volume id or blank media are accepted.
+.br
+\fB$\fR xorriso -assert_volid 'PROJECTS_MAIL_*' FATAL \\
+.br
+ -dev /dev/sr0 \\
 .br
  -volid PROJECTS_MAIL_"$(date '+%Y_%m_%d_%H%M%S')" \\
 .br
@@ -2590,12 +2930,22 @@ This makes sense if the full backup leaves substantial remaining capacity
 on media and if the expected changes are much smaller than the full backup.
 An update run will probably save no time but last longer than a full backup.
 .br 
-With \fBmount\fR option \fB"sbsector="\fR it is possible to access the session
-trees which represent the older backup versions. With CD media, Linux mount
-accepts session numbers directly by its option "session=".
+With \fBmount\fR option \fB-o "sbsector="\fR on Linux resp. \fB-s\fR on FreeBSD
+it is possible to access the session trees which represent the older backup
+versions. With CD media, Linux mount accepts session numbers directly by
+its option "session=".
 .br
 Multi-session media and most overwriteable media written by xorriso can tell
 the sbsectors of their sessions by xorriso option -toc.
+Used after -commit the following option prints the matching mount command for
+the newly written session (here for mount point /mnt):
+.br
+ -mount_cmd "indev" "auto" "auto" /mnt
+.br
+Options -mount_cmd and -mount are also able to produce the mount commands for
+older sessions in the table-of-content. E.g. as superuser:
+.br
+ \fB$\fR osirrox -mount /dev/sr0 "volid" '*2008_12_05*' /mnt
 .br
 Sessions on multi-session media are separated by several MB of unused blocks.
 So with small sessions the payload capacity can become substantially lower
@@ -2620,7 +2970,7 @@ First check which backup sessions are on the media:
 Then load the desired session and copy the file trees to disk.
 Avoid to eventually create /home/thomas/restored without rwx-permission.
 .br
-\fB$\fR xorriso -load volid PROJECTS_MAIL_2008_06_19_205956 \\
+\fB$\fR xorriso -load volid 'PROJECTS_MAIL_2008_06_19*' \\
 .br
  -indev /dev/sr0 \\
 .br
@@ -2646,7 +2996,8 @@ Avoid to eventually create /home/thomas/restored without rwx-permission.
 .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=.
+addresses which can be used on "$HOME"/dvd_copy with mount option -o sbsector=
+resp. -s.
 .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.

xorriso/xorriso.h

@@ -2,7 +2,7 @@
 /* Command line oriented batch and dialog tool which creates, loads,
    manipulates and burns ISO 9660 filesystem images.
 
-   Copyright 2007-2008 Thomas Schmitt, <scdbackup@gmx.net>
+   Copyright 2007-2009 Thomas Schmitt, <scdbackup@gmx.net>
 
    Provided under GPL version 2.
 
@@ -282,6 +282,25 @@ int Xorriso_option_alter_date(struct XorrisO *xorriso,
                               char *time_type, char *timestring,
                               int argc, char **argv, int *idx, int flag);
 
+/* Option -application_id */
+int Xorriso_option_application_id(struct XorrisO *xorriso, char *name, 
+                                  int flag);
+
+/* Option -as */
+/* @param flag bit0=do not report the added item
+               bit1=do not reset pacifier, no final pacifier message
+*/  
+int Xorriso_option_as(struct XorrisO *xorriso, int argc, char **argv,
+                      int *idx, int flag);
+
+/* Option -assert_volid */
+int Xorriso_option_assert_volid(struct XorrisO *xorriso, char *pattern,
+                                char *severity, int flag);
+
+/* Option -backslash_codes */
+int Xorriso_option_backslash_codes(struct XorrisO *xorriso, char *mode,
+                                   int flag);
+
 /* Option -ban_stdio_write */
 int Xorriso_option_ban_stdio_write(struct XorrisO *xorriso, int flag);
 
@@ -301,6 +320,12 @@ 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 -charset */
+/* @param flag bit0= set in_charset
+               bit1= set out_charset
+*/
+int Xorriso_option_charset(struct XorrisO *xorriso, char *name, int flag);
+
 /* Option -check_media */
 int Xorriso_option_check_media(struct XorrisO *xorriso,
                                int argc, char **argv, int *idx, int flag);
@@ -512,6 +537,13 @@ int Xorriso_option_mark(struct XorrisO *xorriso, char *mark, int flag);
 int Xorriso_option_mkdiri(struct XorrisO *xorriso, int argc, char **argv,
                           int *idx, int flag);
 
+/* Option -mount */
+/* @param bit0= print mount command to result channel rather than performing it
+*/
+int Xorriso_option_mount(struct XorrisO *xorriso, char *dev, char *adr_mode,
+                         char *adr, char *cmd, int flag);
+
+
 /* Option -mv alias -mvi */
 int Xorriso_option_mvi(struct XorrisO *xorriso, int argc, char **argv,
                       int *idx, int flag);
@@ -522,14 +554,15 @@ int Xorriso_option_no_rc(struct XorrisO *xorriso, int flag);
 /* Option -not_leaf */
 int Xorriso_option_not_leaf(struct XorrisO *xorriso, char *pattern, int flag);
 
-/* Option -not_list */
+/* Option -not_list , -quoted_not_list */
+/* @param flag bit0= -quoted_not_list */
 int Xorriso_option_not_list(struct XorrisO *xorriso, char *adr, int flag);
 
 /* Option -not_paths */
 int Xorriso_option_not_paths(struct XorrisO *xorriso, int argc, char **argv,
                              int *idx, int flag);
 
-/* Option -options_from_file*/
+/* Option -options_from_file */
 /* @return <=0 error , 1 = success , 3 = request to end program run */
 int Xorriso_option_options_from_file(struct XorrisO *xorriso, char *adr,
                                      int flag);
@@ -553,7 +586,8 @@ int Xorriso_option_page(struct XorrisO *xorriso, int len, int width, int flag);
 int Xorriso_option_paste_in(struct XorrisO *xorriso, char *iso_rr_path,
                           char *disk_path, char *start, char *count, int flag);
 
-/* Option -path-list */
+/* Option -path_list , -quoted_path_list */
+/* @param flag bit0= -quoted_path_list */
 int Xorriso_option_path_list(struct XorrisO *xorriso, char *adr, int flag);
 
 /* Option -pathspecs */
@@ -588,6 +622,10 @@ int Xorriso_option_pwdx(struct XorrisO *xorriso, int flag);
 /* Option -reassure "on"|"tree"|"off" */
 int Xorriso_option_reassure(struct XorrisO *xorriso, char *mode, int flag);
 
+/* Option -relax_compliance */
+int Xorriso_option_relax_compliance(struct XorrisO *xorriso, char *mode,
+                                    int flag);
+
 /* Option -report_about */
 int Xorriso_option_report_about(struct XorrisO *xorriso, char *severity, 
                                 int flag);

xorriso/xorriso_eng.html

@@ -2,7 +2,7 @@
 
 <HEAD>
 <META NAME="description" CONTENT="xorriso, creates, loads, manipulates and writes ISO 9660 filesystem images with Rock Ridge extensions">
-<META NAME="keywords" CONTENT="xorriso, libburn, libburnia, burn, CD, DVD, ISO, ISO 9660, RockRidge, Rock Ridge, linux, recording, burning, CD-R, CD-RW, DVD-R, DVD-RW, DVD+RW, DVD+R, DVD+R DL, BD-RE, scdbackup">
+<META NAME="keywords" CONTENT="xorriso, libburn, libburnia, burn, CD, DVD, ISO, ISO 9660, RockRidge, Rock Ridge, Linux, FreeBSD, recording, burning, CD-R, CD-RW, DVD-R, DVD-RW, DVD+RW, DVD+R, DVD+R DL, BD-RE, BD-R, scdbackup">
 <META NAME="robots" CONTENT="follow">
 <TITLE>xorriso homepage english</TITLE>
 </HEAD>
@@ -14,12 +14,12 @@
 <P><H2> Homepage of </H2>
 <H1> xorriso </H1>
 
-<H2>ISO 9660 Rock Ridge Filesystem Manipulator for Linux</H2>
+<H2>ISO 9660 Rock Ridge Filesystem Manipulator for Linux and FreeBSD</H2>
 </CENTER>
 
 <P>
 <H2>Purpose:</H2>
-xorriso maps file objects from POSIX compliant filesystems
+xorriso copies file objects from POSIX compliant filesystems
 into Rock Ridge enhanced ISO 9660 filesystems and allows
 session-wise manipulation of such filesystems. It can load the management
 information of existing ISO images and it writes the session results to
@@ -48,6 +48,8 @@ and to MMC-5 for DVD or BD).
 <DT>Linux with kernel 2.4 or higher (and libc, of course) :</DT>
 <DD>With kernel 2.4 an ATA drive has to be under ide-scsi emulation.</DD>
 <DD>With kernel 2.6 the drive should not be under ide-scsi.</DD>
+<DT>or FreeBSD (with libc, of course) :</DT>
+<DD>ATAPI/CAM support has to be enabled in the kernel, see atapicam(4).</DD>
 <DT>libpthread</DT>
 <DD>is supposed to be a standard system component.</DD>
 <DT>libreadline and libreadline-dev</DT>
@@ -60,15 +62,15 @@ and to MMC-5 for DVD or BD).
 GPL software included:<BR>
 </H2>
 <DL>
-<DT>libburn-0.5.3</DT>
-<DD>reads and writes data from and to CD, DVD, BD-RE.</DD>
+<DT>libburn-0.6.1</DT>
+<DD>reads and writes data from and to CD, DVD, BD.</DD>
 <DD>(founded by Derek Foreman and Ben Jansens,
 developed and maintained since August 2006 by
 Thomas Schmitt from team of libburnia-project.org)</DD>
-<DT>libisofs-0.6.8</DT>
+<DT>libisofs-0.6.12</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.6</DT>
+<DT>libisoburn-0.3.2</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>
@@ -79,7 +81,8 @@ cdrecord and mkisofs.</A>
 </P>
 
 <P>
-This program system has been tested on Intel/AMD Linux systems only.<BR>
+This program has been tested on Intel/AMD Linux
+and on FreeBSD systems.<BR>
 For ports to other usable systems <A HREF="#contact">contact us</A>.
 </P>
 
@@ -107,13 +110,9 @@ Updates ISO subtrees incrementally to match given disk subtrees.
 Writes result as completely new image or as add-on session
 to optical media or filesystem objects.
 </LI>
-
-<!--
 <LI>
-Can activate ISOLINUX boot images via El Torito.
+Can activate ISOLINUX boot images by El Torito boot record and by MBR.
 </LI>
--->
-
 <LI>
 Can perform multi-session tasks as emulation of mkisofs and cdrecord.
 </LI>
@@ -121,6 +120,9 @@ Can perform multi-session tasks as emulation of mkisofs and cdrecord.
 Can restore single files and whole trees from ISO image to disk filesystem.
 </LI>
 <LI>
+Can issue commands to mount older sessions on Linux or FreeBSD.
+</LI>
+<LI>
 Can check media for damages and copy readable blocks to disk.
 </LI>
 <LI>
@@ -136,9 +138,6 @@ Reads its instructions from command line arguments, dialog, and batch files.
 <LI>
 Provides navigation commands for interactive ISO image manipulation.
 </LI>
-<LI>
-Adjustable thresholds for abort, exit value, and problem reporting.
-</LI>
 
 </UL>
 </P>
@@ -146,6 +145,7 @@ Adjustable thresholds for abort, exit value, and problem reporting.
 <P>
 <H2>Command Examples:</H2>
 <DL>
+
 <DT>Get an overview of drives and their addresses</DT>
 <DD>#<KBD>&nbsp;xorriso -devices</KBD></DD>
 <DD><KBD>...</KBD></DD>
@@ -181,7 +181,7 @@ eventually prepare yet unused BD-RE:</DT>
 <DD>$<KBD>&nbsp;xorriso -dev /dev/sr0 -add /home/me/sounds /home/me/pictures
 </KBD></DD>
 
-<DT>Check the result:</DT>
+<DT>Have a look at the result:</DT>
 <DD>$<KBD>&nbsp;xorriso -indev /dev/sr0 -du / -- -toc 2>&amp;1 | less</KBD></DD>
 
 <DT>
@@ -264,18 +264,19 @@ already been done by a previous -commit.</DT>
 <HR>
 </DT>
 
-<DT>The following command can be run on blank media to create a
-copy of the mentioned disk directory trees, and it can be run on appendable
-media to perform a minimal set of change operations which update the
-old ISO copies to match the new disk trees.
-Older states can be retrieved by help of mount option "session=" from CD-R[W],
-by help of "sbsector=" from other media.
-So this constitutes true incremental backup.
+<DT>The following command performs incremental backup.
+It can be run on blank media to create a copy of the mentioned disk
+directory trees, and it can be run on appendable media to perform a
+minimal set of change operations which update the old ISO copies
+to match the new disk trees.
+Older states can be retrieved by help of mount options like "sbsector="
+or by help of xorriso option -mount.
 <BR>
-The copies will be complete, except all file names ending
-with ".o" or ".swp" which are excluded by options -not_leaf.
+Only blank media or media with volume id "PROJECTS_MAIL_..." will be accepted.
+Files with names ending by ".o" or ".swp" are excluded by options -not_leaf.
 </DT>
-<DD>$<KBD>&nbsp;xorriso -dev /dev/sr0 \</KBD></DD>
+<DD>$<KBD>&nbsp;xorriso -assert_volid 'PROJECTS_MAIL_*' FATAL \ \</KBD></DD>
+<DD><KBD>&nbsp;&nbsp; -dev /dev/sr0 \</KBD></DD>
 <DD><KBD>&nbsp;&nbsp; -volid PROJECTS_MAIL_"$(date '+%Y_%m_%d_%H%M%S')" \</KBD></DD>
 <DD><KBD>&nbsp;&nbsp; -not_leaf '*.o' -not_leaf '*.swp' \</KBD></DD>
 <DD><KBD>&nbsp;&nbsp; -update_r /home/thomas/open_source_projects /open_source_projects \</KBD></DD>
@@ -285,15 +286,62 @@ with ".o" or ".swp" which are excluded by options -not_leaf.
 <DT>
 <HR>
 </DT>
+
+<DT>
+Operating systems usually mount the most recent session on media.
+xorriso can issue the appropriate mount commands for older sessions.
+First get an overview of the sessions on disk:
+</DT>
+<DD>$<KBD>&nbsp;xorriso -outdev /dev/sr0 -toc</KBD></DD>
+<PRE>
+TOC layout   : Idx ,  sbsector ,       Size , Volume Id
+ISO session  :   1 ,         0 ,    104719s , PROJECTS_MAIL_2008_08_10_231435
+ISO session  :   2 ,    106928 ,      6785s , PROJECTS_MAIL_2008_08_14_184548
+...
+ISO session  :  76 ,    820384 ,     11035s , PROJECTS_MAIL_2009_01_04_191150
+</PRE>
+
+<DT>
+Then become superuser and let xorriso mount the session of August 14, 2008
+to directory /mnt:
+</DT>
+<DD>#<KBD>&nbsp;xorriso -mount /dev/sr0 volid '*_2008_08_14_*' /mnt </KBD></DD>
+<DT>
+To be later unmounted by: <KBD>umount /mnt</KBD>
+</DT>
+
+<DT>
+<HR>
+</DT>
+
+<DT>
+After the user has already created a suitable file tree on disk
+and copied the ISOLINUX files into subdirectory ./boot/isolinux of
+that tree, xorriso can burn an El Torito bootable media:
+</DT>
+<DD>$<KBD>&nbsp;xorriso -outdev /dev/sr0 -blank as_needed \</KBD></DD>
+<DD><KBD>&nbsp;&nbsp; -map /home/me/ISOLINUX_prepared_tree / \</KBD></DD>
+<DD><KBD>&nbsp;&nbsp; -boot_image isolinux dir=/boot/isolinux</KBD></DD>
+<DT>
+An additional MBR is generated if the file isolinux.bin is modern enough
+(syslinux version 3.72) and ready for "isohybrid". An MBR enables booting
+from hard disk or USB stick.
+<HR>
+</DT>
+
 <DT>ISO images may not only be stored on optical media but also in
 regular disk files or block devices for full multi-session operation.
-The prefix &quot;stdio:&quot; indicates that normal file operations are
-desired rather than MMC drive commands:
 </DT>
-<DD>$<KBD>&nbsp;xorriso -dev stdio:/tmp/regular_file ...other.options...</DD>
+<DD>$<KBD>&nbsp;xorriso -dev /tmp/regular_file ...other.options...</DD>
+<DT>
+A default setting for safety reasons requires that files below /dev/
+need prefix &quot;stdio:&quot; if they do not lead to MMC burner devices.
+Be cautious not to overwrite your hard disk instead of your USB stick:
+</DT>
+<DD>$<KBD>&nbsp;xorriso -dev stdio:/dev/sdb ...other.options...</DD>
 
 <DT>Other file types are suitable only for writing but not for reading:</DT>
-<DD>$<KBD>&nbsp;xorriso -outdev stdio:/tmp/named_pipe ...other.options...</DD>
+<DD>$<KBD>&nbsp;xorriso -outdev /tmp/named_pipe ...other.options...</DD>
 
 <DT>In batch mode it is possible to operate xorriso in a pipeline
 with an external consumer of the generated ISO image. Any message
@@ -322,14 +370,17 @@ One may switch from mkisofs emulation to xorriso's own command mode:
 <HR>
 </DT>
 
-<DT>Enable reverse operation of xorriso and copy some files and a tree to disk:
+<DT>If for any reason the reading operating system mishandles the ISO image
+or some files in it, one may enable reverse operation of xorriso and copy
+files or trees to disk:
 <DD>$<KBD>&nbsp;xorriso -indev /dev/sr0 \</KBD></DD>
 <DD><KBD>&nbsp;&nbsp; -osirrox on \</KBD></DD>
-<DD><KBD>&nbsp;&nbsp; -cpx /pictures/private/horses*/*buttercup* \</KBD></DD>
+<DD><KBD>&nbsp;&nbsp; -cpx '/pictures/private/horses*/*buttercup*' \</KBD></DD>
 <DD><KBD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; /home/her/buttercup_dir -- \</KBD>
 <DD><KBD>&nbsp;&nbsp; -extract /sounds /home/her/sounds_from_me</KBD></DD>
 </DD>
-
+<DT>Consider to enter dialog mode and use commands like
+<KBD>-cd , -du , -lsl , -find<KBD>.
 <DT>
 <HR>
 </DT>
@@ -342,10 +393,6 @@ One may switch from mkisofs emulation to xorriso's own command mode:
 <DD>$<KBD>&nbsp;<A HREF="man_1_xorriso.html">man xorriso</A></KBD></DD>
 </DL>
 
-
-Testers wanted who are willing to risk some double layer DVD media or
-are interested in using BD-R media.
-
 </P>
 
 <HR>
@@ -353,8 +400,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.6.pl01.tar.gz">xorriso-0.2.6.pl01.tar.gz</A>
-(1050 KB).
+<DD><A HREF="xorriso-0.3.2.pl00.tar.gz">xorriso-0.3.2.pl00.tar.gz</A>
+(1100 KB).
 </DD>
 </DL>
 </DD>
@@ -380,36 +427,25 @@ an <A HREF="http://www.opensource.org/">Open Source</A> approved license</DD>
 <HR>
 
 <P>
-Bug fixes towards xorriso-0.2.6.pl00:
+Bug fixes towards xorriso-0.3.0.pl00:
 <UL>
-<LI>A potential buffer overflow has been fixed</LI>
-</UL>
-</P>
-
-<P>
-Bug fixes towards xorriso-0.2.4.pl00:
-<UL>
-
-<LI>-format full did not re-format already formatted DVD+RW</LI>
-
+<LI>Options -extract and -extract_single were not disabled with -osirrox off
 <!--
 <LI>- none -</LI>
 -->
 
 </UL>
+
 </P>
+
 <P>
-Enhancements towards previous stable version xorriso-0.2.4.pl00:
+Enhancements towards previous stable version xorriso-0.3.0.pl00:
 <UL>
-
-<LI>Capability to insert and extract files far larger than 4 GB</LI>
-<LI>New option -file_size_limit, -as mkisofs now supports -iso-level 1 to 3
-</LI>
-<LI>New option -extract_cut to retrieve data from oversized files</LI>
-<LI>New option -check_media_defaults</LI>
-<LI>New -error_behavior "file_extraction" behavior "best_effort"</LI>
-<LI>New option -list_delimiter</LI>
-
+<LI>New options -mount, -mount_cmd, -session_string</LI>
+<LI>By using libburn-0.6.1: support for BD-R media</LI>
+<LI>New -format modes by_size_ and fast_by_size_</LI>
+<LI>New option -assert_volid</LI>
+<LI>New option -drive_class for safety management of pseudo-drive access</LI>
 </UL>
 </P>
 
@@ -417,28 +453,27 @@ Enhancements towards previous stable version xorriso-0.2.4.pl00:
 
 <P>
 <DL>
-<DT><H3>Development snapshot, version 0.2.7 :</H3></DT>
-<DD>Bug fixes towards xorriso-0.2.6.pl00:
+<DT><H3>Development snapshot, version 0.3.3 :</H3></DT>
+<DD>Bug fixes towards xorriso-0.3.2.pl00:
 <UL>
-<LI>A potential buffer overflow has been fixed</LI>
-<LI>-as mkisofs -iso-level was accused to be an unknown option</LI>
-<!-- 
+
+</LI>
 <LI>- none yet -</LI>
+<!-- 
  -->
 </UL>
 </DD>
-<DD>Enhancements towards stable version 0.2.6.pl00:
+<DD>Enhancements towards stable version 0.3.2.pl00:
 <UL>
-<LI>Ability to write and maintain bootable ISO images based on ISOLINUX</LI>
-<!-- 
 <LI>- none yet -</LI>
+<!-- 
  -->
 </UL>
 </DD>
 <DD>&nbsp;</DD>
-<DD><A HREF="README_xorriso_devel">README 0.2.7</A>
-<DD><A HREF="xorriso_help_devel">xorriso_0.2.7 -help</A></DD>
-<DD><A HREF="man_1_xorriso_devel.html">man xorriso (as of 0.2.7)</A></DD>
+<DD><A HREF="README_xorriso_devel">README 0.3.3</A>
+<DD><A HREF="xorriso_help_devel">xorriso_0.3.3 -help</A></DD>
+<DD><A HREF="man_1_xorriso_devel.html">man xorriso (as of 0.3.3)</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
@@ -448,8 +483,8 @@ libburnia libraries.
 installation see README)
 </DD>
 <DD>
-<A HREF="xorriso-0.2.7.tar.gz">xorriso-0.2.7.tar.gz</A>
-(1050 KB).
+<A HREF="xorriso-0.3.3.tar.gz">xorriso-0.3.3.tar.gz</A>
+(1100 KB).
 </DD>
 <DT>A dynamically linked development version of xorriso can be obtained
 from repositories of

xorriso/xorriso_makefile_am.txt

@@ -16,7 +16,7 @@ xorriso_xorriso_CPPFLAGS = -I./libburn -I./libisofs -I./libisoburn -I./xorriso
 
 # No readline in the vanilla version because the necessary headers
 # are in a separate readline-development package.
-xorriso_xorriso_CFLAGS = -DXorriso_standalonE -DXorriso_with_maiN -DXorriso_with_regeX $(READLINE_DEF)
+xorriso_xorriso_CFLAGS = -DXorriso_standalonE -DXorriso_with_maiN $(READLINE_DEF)
 
 xorriso_xorriso_LDADD = $(THREAD_LIBS)
 
@@ -96,6 +96,9 @@ xorriso_xorriso_SOURCES = \
         libisofs/filter.h \
         libisofs/filter.c \
         libisofs/filters/xor_encrypt.c \
+        libisofs/system_area.h \
+        libisofs/system_area.c \
+        libisofs/make_isohybrid_mbr.c \
 	\
 	libburn/async.c \
 	libburn/async.h \

xorriso/xorriso_private.h

@@ -2,7 +2,7 @@
 /* Command line oriented batch and dialog tool which creates, loads,
    manipulates and burns ISO 9660 filesystem images.
 
-   Copyright 2007-2008 Thomas Schmitt, <scdbackup@gmx.net>
+   Copyright 2007-2009 Thomas Schmitt, <scdbackup@gmx.net>
 
    Provided under GPL version 2.
 
@@ -18,7 +18,7 @@
 #ifndef Xorriso_private_includeD
 #define Xorriso_private_includeD yes
 
-#define Xorriso_program_versioN "0.2.7"
+#define Xorriso_program_versioN "0.3.2"
 
 /** The source code release timestamp */
 #include "xorriso_timestamp.h"
@@ -34,11 +34,7 @@
 #define Xorriso_build_timestamP "-none-given-"
 #endif
 
-
-/* Because regex_t is mentioned in struct XorrisO */
-#ifdef Xorriso_with_regeX
 #include <regex.h>
-#endif /* Xorriso_with_regeX */
 
 
 #define Smem_malloC malloc
@@ -104,6 +100,7 @@ struct XorrisO { /* the global context of xorriso */
  /* >>> put libisofs aspects here <<< */
 
  int do_joliet;
+ int relax_compliance;        /* opaque bitfield to be set by xorrisoburn */
  int do_follow_pattern;
  int do_follow_param;
  int do_follow_links;
@@ -123,8 +120,11 @@ struct XorrisO { /* the global context of xorriso */
  char volid[33];
  int volid_default;
  char loaded_volid[33];
+ char assert_volid[SfileadrL];
+ char assert_volid_sev[80];
 
  char publisher[129];
+ char application_id[129];
 
  char session_logfile[SfileadrL];
  int session_lba;
@@ -132,6 +132,10 @@ struct XorrisO { /* the global context of xorriso */
 
  /* >>> put libburn/isoburn aspects here */
 
+ struct Xorriso_lsT *drive_blacklist;
+ struct Xorriso_lsT *drive_greylist;
+ struct Xorriso_lsT *drive_whitelist;
+
  int toc_emulation_flag; /* bit0= bit3 for isoburn_drive_aquire()
                                   scan -ROM profiles for ISO sessions
                             bit1= bit4 for isoburn_drive_aquire()
@@ -158,6 +162,7 @@ struct XorrisO { /* the global context of xorriso */
  char indev[SfileadrL];
  void *in_drive_handle;  /* interpreted only by xorrisoburn.c */
  void *in_volset_handle; /* interpreted only by xorrisoburn.c */
+ char *in_charset;       /* The charset to interpret the filename bytes */
 
  int volset_change_pending; /* whether -commit would make sense */
  int no_volset_present;     /* set to 1 on first failure */
@@ -168,6 +173,7 @@ struct XorrisO { /* the global context of xorriso */
 
  char outdev[SfileadrL];
  void *out_drive_handle; /* interpreted only by xorrisoburn.c */
+ char *out_charset;      /* The charset to produce the filename bytes for */
  int dev_fd_1; /* The fd which substitutes for /dev/fd/1 and is
                      connected to externaly perveived stdout.
                   */
@@ -183,6 +189,11 @@ struct XorrisO { /* the global context of xorriso */
  int speed;     /* in libburn units : 1000 bytes/second , 0 = Max, -1 = Min */
  int fs;        /* fifo size in 2048 byte chunks : at most 1 GB */
  int padding;   /* number of bytes to add after ISO 9660 image */
+
+ int alignment; /* if > 0 : image size alignment in 2048 byt blocks */
+                /* <<< not sure whether to keep this after libisofs will have
+                       learned to pad up MBR images to full MB */
+
  int do_stream_recording;
 
  int keep_boot_image;
@@ -194,7 +205,12 @@ struct XorrisO { /* the global context of xorriso */
                       */
  char boot_image_cat_path[SfileadrL];
  off_t boot_image_load_size;
+ int boot_image_isohybrid; /* 0=off , 1=auto , 2=on , 3=force */
 
+ /* LBA of boot image after image loading */
+ int loaded_boot_bin_lba;
+ /* Path of the catalog node after image loading */
+ char loaded_boot_cat_path[SfileadrL];
 
  /* XORRISO options */
  int allow_graft_points;
@@ -209,6 +225,18 @@ struct XorrisO { /* the global context of xorriso */
 
  int dialog;  /* 0=off , 1=single-line , 2=multi-line */
 
+ int bsl_interpretation;
+                     /* whether to run input through Sfile_bsl_interpreter():
+                        bit0-1= dialog and quoted file reading
+                          0= no interpretation, leave unchanged
+                          1= only inside double quotes
+                          2= outside single quotes
+                          3= everywhere
+                        bit2-3= reserved as future expansion of bit0-1
+                        bit4= interpretation within program start arguments
+                        bit5= perform backslash encoding with results
+                        bit6= perform backslash encoding with info texts
+                     */
 
  /* Pattern matching facility. It still carries legacy from scdbackup/askme.c
     but is fully functional for xorriso.
@@ -284,10 +312,8 @@ struct XorrisO { /* the global context of xorriso */
  char eternal_problem_status_text[20];
 
  /* temporary search facilities */
-#ifdef Xorriso_with_regeX
  regex_t *re;
  regmatch_t match[1]; 
-#endif /* Xorriso_with_regeX */
  char **re_constants;
  int re_count;
  int re_fill;
@@ -501,6 +527,12 @@ int Xorriso_spotlist_to_sectormap(struct XorrisO *xorriso,
 int Xorriso_toc_to_string(struct XorrisO *xorriso, char **toc_text, int flag);
 
 
+/* @param flag bit0+1= what to aquire after giving up outdev
+                       0=none, 1=indev, 2=outdev, 3=both
+*/
+int Xorriso_reaquire_outdev(struct XorrisO *xorriso, int flag);
+
+
 struct Xorriso_lsT {
   char *text;
   struct Xorriso_lsT *prev,*next;
@@ -558,6 +590,24 @@ int Xorriso_lst_destroy(struct Xorriso_lsT **lstring, int flag);
 int Xorriso_open_job_data_to(struct XorrisO *xorriso,
                              struct CheckmediajoB *job, int flag);
 
+int Xorriso_no_findjob(struct XorrisO *xorriso, char *cmd, int flag);
+
+
+int Xorriso_make_mount_cmd(struct XorrisO *xorriso, char *cmd,
+                           int lba, int track, int session, char *volid,
+                           char *devadr, char result[SfileadrL], int flag);
+
+
+/* @param flag bit0= use env_path to find the desired program
+*/
+int Xorriso_execv(struct XorrisO *xorriso, char *cmd, char *env_path,
+                  int *status, int flag);
+
+int Xorriso_is_in_patternlist(struct XorrisO *xorriso,
+                        struct Xorriso_lsT *patternlist, char *path, int flag);
+
+char *Xorriso_get_pattern(struct XorrisO *xorriso,
+                         struct Xorriso_lsT *patternlist, int index, int flag);
 
 
 int Sfile_str(char target[SfileadrL], char *source, int flag);
@@ -609,6 +659,9 @@ char *Ftypetxt(mode_t st_mode, int flag);
 */
 char *Ftimetxt(time_t t, char timetext[40], int flag);
 
+int System_uname(char **sysname, char **release, char **version, 
+                 char **machine, int flag);
+
 
 struct DirseQ;
 
@@ -624,6 +677,12 @@ int Linkitem_reset_stack(struct LinkiteM **o, struct LinkiteM *to, int flag);
 
 struct FindjoB;
 
+
+int Findjob_new(struct FindjoB **o, char *start_path, int flag);
+
+int Findjob_destroy(struct FindjoB **job, int flag);
+
+
 /* @return 0=no match , 1=match , <0 = error
 */
 int Findjob_test(struct FindjoB *job, char *name, 
@@ -662,13 +721,26 @@ int Findjob_set_action_ad(struct FindjoB *o, int type, time_t date, int flag);
 
 int Findjob_set_start_path(struct FindjoB *o, char *start_path, int flag);
 
+int Findjob_set_action_found_path(struct FindjoB *o, int flag);
+
 int Findjob_get_start_path(struct FindjoB *o, char **start_path, int flag);
 
+int Findjob_set_lba_range(struct FindjoB *o, int start_lba, int count,
+                          int flag);
+
 int Findjob_get_lba_damage_filter(struct FindjoB *o, int *start_lba,
                                   int *end_lba, int *damage_filter, int flag);
 
 int Findjob_get_commit_filter(struct FindjoB *o, int *commit_filter, int flag);
 
+int Findjob_set_wanted_node(struct FindjoB *o, void *wanted_node, int flag);
+
+int Findjob_get_wanted_node(struct FindjoB *o, void **wanted_node, int flag);
+
+int Findjob_set_found_path(struct FindjoB *o, char *path, int flag);
+
+int Findjob_get_found_path(struct FindjoB *o, char **path, int flag);
+
 
 struct SplitparT;
 
@@ -757,5 +829,12 @@ int Sectorbitmap_get_layout(struct SectorbitmaP *o,
 int Sectorbitmap_copy(struct SectorbitmaP *from, struct SectorbitmaP *to,
                       int flag);
 
+/* bit0= append (text!=NULL) */
+int Sregex_string(char **handle, char *text, int flag);
+
+/* @param flag bit0= only test expression whether compilable
+*/
+int Sregex_match(char *pattern, char *text, int flag);
+
 #endif /* Xorriso_private_includeD */
 

xorriso/xorriso_timestamp.h

@@ -1 +1 @@
-#define Xorriso_timestamP "2008.10.10.134020"
+#define Xorriso_timestamP "2009.01.05.123001"

xorriso/xorrisoburn.h

@@ -4,7 +4,7 @@
    a command line oriented batch and dialog tool which creates, loads,
    manipulates and burns ISO 9660 filesystem images.
 
-   Copyright 2007-2008 Thomas Schmitt, <scdbackup@gmx.net>
+   Copyright 2007-2009 Thomas Schmitt, <scdbackup@gmx.net>
 
    Provided under GPL version 2.
 
@@ -18,8 +18,8 @@
 /* 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  7
+#define xorriso_libisoburn_req_minor  3
+#define xorriso_libisoburn_req_micro  2
 
 int Xorriso_startup_libraries(struct XorrisO *xorriso, int flag);
 
@@ -52,9 +52,16 @@ int Xorriso__text_to_sev(char *severity_name, int *severity_number,int flag);
 
 /* @param flag bit0=report about output drive 
                bit1=short report form
+               bit2=do not try to read ISO heads
+               bit3=report to info channel (else to result channel)
 */
 int Xorriso_toc(struct XorrisO *xorriso, int flag);
 
+/* @param flag bit0= no output if no boot record was found
+               bit3= report to info channel (else to result channel)
+*/
+int Xorriso_show_boot_info(struct XorrisO *xorriso, int flag);
+
 int Xorriso_show_devices(struct XorrisO *xorriso, int flag);
 
 int Xorriso_tell_media_space(struct XorrisO *xorriso,
@@ -67,10 +74,14 @@ int Xorriso_tell_media_space(struct XorrisO *xorriso,
 int Xorriso_blank_media(struct XorrisO *xorriso, int flag);
 
 /* @param flag bit0= try to achieve faster formatting
+               bit1= use parameter size (else use default size)
+               bit2= do not re-aquire drive
+               bit7= by_index mode:
+                     bit8 to bit15 contain the index of the format to use.
    @return 0=failure, did not touch media , -1=failure, altered media
            1=success, altered media       ,  2=success, did not touch media
 */
-int Xorriso_format_media(struct XorrisO *xorriso, int flag);
+int Xorriso_format_media(struct XorrisO *xorriso, off_t size, int flag);
 
 /* @return <=0 error, 1 success
 */
@@ -200,9 +211,15 @@ int Xorriso_burn_track(struct XorrisO *xorriso, off_t write_start_address,
 int Xorriso_get_profile(struct XorrisO *xorriso, int *profile_number,
                         char profile_name[80], int flag);
 
+#ifdef NIX
+
 /* @param flag bit0= do not mark image as changed */
 int Xorriso_set_publisher(struct XorrisO *xorriso, char *name, int flag);
 
+/* @param flag bit0= do not mark image as changed */
+int Xorriso_set_application_id(struct XorrisO *xorriso, char *name, int flag);
+
+#endif /* NIX */
 
 /* @param flag bit0= node_pt is a valid ISO object handle, ignore pathname
 */
@@ -287,6 +304,11 @@ int Xorriso_update_iso_lba0(struct XorrisO *xorriso, int iso_lba, int isosize,
                             char *head_buffer, struct CheckmediajoB *job,
                             int flag);
 
+int Xorriso_get_local_charset(struct XorrisO *xorriso, char **name, int flag);
+
+int Xorriso_set_local_charset(struct XorrisO *xorriso, char *name, int flag);
+
+
 
 struct CheckmediajoB {
  int use_dev;        /* 0= use indev , 1= use outdev , 2= use sector map*/
@@ -339,6 +361,27 @@ int Xorriso_extract_cut(struct XorrisO *xorriso,
                         off_t img_offset, off_t bytes, int flag);
 
 
+int Xorriso_relax_compliance(struct XorrisO *xorriso, char *mode,
+                                    int flag);
+
+/* @return 1=ok  2=ok, is default setting */
+int Xorriso_get_relax_text(struct XorrisO *xorriso, char mode[1024],
+                           int flag);
+
+
+/**
+    @param flag bit0= print mount command to result channel rather than
+                      performing it 
+*/
+int Xorriso_mount(struct XorrisO *xorriso, char *dev, int adr_mode,
+                  char *adr_value, char *cmd, int flag);
+
+
+
+int Xorriso_auto_driveadr(struct XorrisO *xorriso, char *adr, char *result,
+                          int flag);
+
+
 /* A pseudo file type for El-Torito bootsectors as in man 2 stat :
    For now take the highest possible value.
 */