From 6db35143f8fcb03019ce589977d2e2fb5a16bd34 Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Wed, 21 Jan 2009 15:02:56 +0000
Subject: [PATCH] New API macro isoburn_ropt_noaaip controls enabling of AAIP
 loading

---
 libisoburn/trunk/libisoburn/isoburn.c        | 5 ++++-
 libisoburn/trunk/libisoburn/isoburn.h        | 1 +
 libisoburn/trunk/libisoburn/isofs_wrap.c     | 5 +++++
 libisoburn/trunk/libisoburn/libisoburn.h     | 6 ++++++
 libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +-
 5 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/libisoburn/trunk/libisoburn/isoburn.c b/libisoburn/trunk/libisoburn/isoburn.c
index 8ca7dc87..b1d6c696 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->preferjoliet= 0;
  o->uid= geteuid();
  o->gid= getegid();
@@ -662,6 +663,7 @@ 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->noaaip= !!(ext & 32);
  return(1);
 }
 
@@ -669,7 +671,8 @@ int isoburn_ropt_set_extensions(struct isoburn_read_opts *o, int ext)
 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->preferjoliet)<<3) | ((!!o->pretend_blank)<<4) |
+       ((!!o->noaaip) << 5);
  return(1);
 }
 
diff --git a/libisoburn/trunk/libisoburn/isoburn.h b/libisoburn/trunk/libisoburn/isoburn.h
index 5ee483bb..d2b18d7e 100644
--- a/libisoburn/trunk/libisoburn/isoburn.h
+++ b/libisoburn/trunk/libisoburn/isoburn.h
@@ -250,6 +250,7 @@ struct isoburn_read_opts {
     unsigned int norock:1; /*< Do not read Rock Ridge extensions */
     unsigned int nojoliet:1; /*< Do not read Joliet extensions */
     unsigned int noiso1999:1; /*< Do not read ISO 9660:1999 enhanced tree */
+    unsigned int noaaip:1;    /* Do not read AAIP for ACL and POSIX EA*/
     unsigned int preferjoliet:1; 
                 /*< When both Joliet and RR extensions are present, the RR
                  *  tree is used. If you prefer using Joliet, set this to 1. */
diff --git a/libisoburn/trunk/libisoburn/isofs_wrap.c b/libisoburn/trunk/libisoburn/isofs_wrap.c
index 1a809bf8..e281078d 100644
--- a/libisoburn/trunk/libisoburn/isofs_wrap.c
+++ b/libisoburn/trunk/libisoburn/isofs_wrap.c
@@ -198,6 +198,11 @@ create_blank_image:;
  /* Important: do not return until iso_read_opts_free() */
  iso_read_opts_set_start_block(ropts, ms_block);
  iso_read_opts_set_no_rockridge(ropts, read_opts->norock);
+
+#ifdef Libisofs_with_aaiP
+ iso_read_opts_set_no_aaip(ropts, read_opts->noaaip);
+#endif /* Libisofs_with_aaiP */
+
  iso_read_opts_set_no_joliet(ropts, read_opts->nojoliet);
  iso_read_opts_set_no_iso1999(ropts, read_opts->noiso1999);
  iso_read_opts_set_preferjoliet(ropts, read_opts->preferjoliet);
diff --git a/libisoburn/trunk/libisoburn/libisoburn.h b/libisoburn/trunk/libisoburn/libisoburn.h
index f64a7f4e..fe73d5f3 100644
--- a/libisoburn/trunk/libisoburn/libisoburn.h
+++ b/libisoburn/trunk/libisoburn/libisoburn.h
@@ -682,6 +682,10 @@ 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= noaaip
+                     @since 0.3.4
+                     Do not read AAIP informations for ACL and POSIX Extended
+                     Attributes.
     @return    1 success, <=0 failure
 */
 #define isoburn_ropt_norock         1
@@ -689,6 +693,8 @@ 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_noaaip        32
+
 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 33256ac3..89bd98a9 100644
--- a/libisoburn/trunk/xorriso/xorriso_timestamp.h
+++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2009.01.18.213952"
+#define Xorriso_timestamP "2009.01.21.150243"