From b3e8b5708bfb298283c08341ce8db1cf184a068d Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Thu, 22 Jan 2009 13:01:13 +0000
Subject: [PATCH] Now it is isoburn_ropt_noaaip , isoburn_ropt_noacl and
 isoburn_ropt_noea

---
 libisoburn/trunk/libisoburn/isoburn.c        |  8 +++++---
 libisoburn/trunk/libisoburn/isoburn.h        |  5 +++--
 libisoburn/trunk/libisoburn/isofs_wrap.c     |  2 +-
 libisoburn/trunk/libisoburn/libisoburn.h     | 21 +++++++++++++-------
 libisoburn/trunk/xorriso/xorriso_timestamp.h |  2 +-
 5 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/libisoburn/trunk/libisoburn/isoburn.c b/libisoburn/trunk/libisoburn/isoburn.c
index bc8ef855..76176de3 100644
--- a/libisoburn/trunk/libisoburn/isoburn.c
+++ b/libisoburn/trunk/libisoburn/isoburn.c
@@ -629,6 +629,7 @@ int isoburn_ropt_new(struct isoburn_read_opts **new_o, int flag)
  o->norock= 0;
  o->nojoliet= 0;
  o->noiso1999= 1;
+ o->noaaip= 1;
  o->noacl= 1;
  o->noea= 1;
  o->preferjoliet= 0;
@@ -664,8 +665,9 @@ int isoburn_ropt_set_extensions(struct isoburn_read_opts *o, int ext)
  o->noiso1999= !!(ext&4);
  o->preferjoliet= !!(ext&8);
  o->pretend_blank= !!(ext&16);
- o->noacl= !!(ext & 32);
- o->noea= !!(ext & 64);
+ o->noaaip= !!(ext & 32);
+ o->noacl= !!(ext & 64);
+ o->noea= !!(ext & 128);
  return(1);
 }
 
@@ -674,7 +676,7 @@ int isoburn_ropt_get_extensions(struct isoburn_read_opts *o, int *ext)
 {
  *ext= (!!o->norock) | ((!!o->nojoliet)<<1) | ((!!o->noiso1999)<<2) |
        ((!!o->preferjoliet)<<3) | ((!!o->pretend_blank)<<4) |
-       ((!!o->noacl) << 5) | ((!!o->noea) << 6);
+       ((!!o->noaaip) << 5) | ((!!o->noacl) << 6) | ((!!o->noea) << 7);
  return(1);
 }
 
diff --git a/libisoburn/trunk/libisoburn/isoburn.h b/libisoburn/trunk/libisoburn/isoburn.h
index 78df7ba8..937a4c66 100644
--- a/libisoburn/trunk/libisoburn/isoburn.h
+++ b/libisoburn/trunk/libisoburn/isoburn.h
@@ -252,8 +252,9 @@ struct isoburn_read_opts {
     unsigned int noiso1999:1; /*< Do not read ISO 9660:1999 enhanced tree */
 
     /* ts A90121 */
-    unsigned int noacl:1;    /* Do not read AAIP for ACL */
-    unsigned int noea:1;     /* Do not read AAIP for POSIX EA */
+    unsigned int noaaip:1;   /* Do not read AAIP for ACL and EA */
+    unsigned int noacl:1;    /* Do not read ACL from external file objects */
+    unsigned int noea:1;     /* Do not read XFS-style EA from externals */
 
     unsigned int preferjoliet:1; 
                 /*< When both Joliet and RR extensions are present, the RR
diff --git a/libisoburn/trunk/libisoburn/isofs_wrap.c b/libisoburn/trunk/libisoburn/isofs_wrap.c
index 541f693f..cf015cfe 100644
--- a/libisoburn/trunk/libisoburn/isofs_wrap.c
+++ b/libisoburn/trunk/libisoburn/isofs_wrap.c
@@ -202,7 +202,7 @@ create_blank_image:;
  iso_read_opts_set_no_rockridge(ropts, read_opts->norock);
 
 #ifdef Libisofs_with_aaiP
- iso_read_opts_set_no_aaip(ropts, read_opts->noacl && read_opts->noea);
+ iso_read_opts_set_no_aaip(ropts, read_opts->noaaip);
 #endif /* Libisofs_with_aaiP */
 
  iso_read_opts_set_no_joliet(ropts, read_opts->nojoliet);
diff --git a/libisoburn/trunk/libisoburn/libisoburn.h b/libisoburn/trunk/libisoburn/libisoburn.h
index 5d2117ed..438502a5 100644
--- a/libisoburn/trunk/libisoburn/libisoburn.h
+++ b/libisoburn/trunk/libisoburn/libisoburn.h
@@ -685,12 +685,18 @@ int isoburn_ropt_destroy(struct isoburn_read_opts **o, int flag);
                      tree is used. If you prefer using Joliet, set this to 1.
                bit4= pretend_blank
                      Always create empty image.Ignore any image on input drive.
-               bit5= noacl
+               bit5= noaaip
                      @since 0.3.4
-                     No need to read AAIP informations for ACL
-               bit6= noea
-                     No need to read AAIP informations for POSIX Extended
-                     Attributes.
+                     Do not load AAIP information from image. This information
+                     eventually contains ACL or XFS-style Extended Attributes.
+               bit6= noacl
+                     @since 0.3.4
+                     Do not obtain ACL from external filesystem objects (e.g.
+                     local filesystem files).
+               bit7= noea
+                     @since 0.3.4
+                     Do not obtain XFS-style Extended Attributes from external
+                     filesystem objects (e.g.  local filesystem files).
     @return    1 success, <=0 failure
 */
 #define isoburn_ropt_norock         1
@@ -698,8 +704,9 @@ int isoburn_ropt_destroy(struct isoburn_read_opts **o, int flag);
 #define isoburn_ropt_noiso1999      4
 #define isoburn_ropt_preferjoliet   8
 #define isoburn_ropt_pretend_blank 16
-#define isoburn_ropt_noacl         32
-#define isoburn_ropt_noea          64
+#define isoburn_ropt_noaaip        32
+#define isoburn_ropt_noacl         64
+#define isoburn_ropt_noea         128
 
 int isoburn_ropt_set_extensions(struct isoburn_read_opts *o, int ext);
 int isoburn_ropt_get_extensions(struct isoburn_read_opts *o, int *ext);
diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h
index 3414460d..236d4a18 100644
--- a/libisoburn/trunk/xorriso/xorriso_timestamp.h
+++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2009.01.21.204513"
+#define Xorriso_timestamP "2009.01.22.130107"