libburnia/legacy
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

New API macro isoburn_ropt_noaaip controls enabling of AAIP loading

Browse Source
This commit is contained in:
Thomas Schmitt 2009-01-21 15:02:56 +00:00
parent 1f37d81537
commit 6db35143f8
5 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libisoburn/trunk/libisoburn/isoburn.c
View File

@ -629,6 +629,7 @@ int isoburn_ropt_new(struct isoburn_read_opts **new_o, int flag)
o->norock= 0; o->norock= 0;
o->nojoliet= 0; o->nojoliet= 0;
o->noiso1999= 1; o->noiso1999= 1;
o->noaaip= 1;
o->preferjoliet= 0; o->preferjoliet= 0;
o->uid= geteuid(); o->uid= geteuid();
o->gid= getegid(); o->gid= getegid();
@ -662,6 +663,7 @@ int isoburn_ropt_set_extensions(struct isoburn_read_opts *o, int ext)
o->noiso1999= !!(ext&4); o->noiso1999= !!(ext&4);
o->preferjoliet= !!(ext&8); o->preferjoliet= !!(ext&8);
o->pretend_blank= !!(ext&16); o->pretend_blank= !!(ext&16);
o->noaaip= !!(ext & 32);
return(1); 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) int isoburn_ropt_get_extensions(struct isoburn_read_opts *o, int *ext)
{ {
*ext= (!!o->norock) | ((!!o->nojoliet)<<1) | ((!!o->noiso1999)<<2) | *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); return(1);
} }

1
libisoburn/trunk/libisoburn/isoburn.h
View File

@ -250,6 +250,7 @@ struct isoburn_read_opts {
unsigned int norock:1; /*< Do not read Rock Ridge extensions */ unsigned int norock:1; /*< Do not read Rock Ridge extensions */
unsigned int nojoliet:1; /*< Do not read Joliet extensions */ unsigned int nojoliet:1; /*< Do not read Joliet extensions */
unsigned int noiso1999:1; /*< Do not read ISO 9660:1999 enhanced tree */ 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; unsigned int preferjoliet:1;
/*< When both Joliet and RR extensions are present, the RR /*< When both Joliet and RR extensions are present, the RR
* tree is used. If you prefer using Joliet, set this to 1. */ * tree is used. If you prefer using Joliet, set this to 1. */

5
libisoburn/trunk/libisoburn/isofs_wrap.c
View File

@ -198,6 +198,11 @@ create_blank_image:;
/* Important: do not return until iso_read_opts_free() */ /* Important: do not return until iso_read_opts_free() */
iso_read_opts_set_start_block(ropts, ms_block); iso_read_opts_set_start_block(ropts, ms_block);
iso_read_opts_set_no_rockridge(ropts, read_opts->norock); 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_joliet(ropts, read_opts->nojoliet);
iso_read_opts_set_no_iso1999(ropts, read_opts->noiso1999); iso_read_opts_set_no_iso1999(ropts, read_opts->noiso1999);
iso_read_opts_set_preferjoliet(ropts, read_opts->preferjoliet); iso_read_opts_set_preferjoliet(ropts, read_opts->preferjoliet);

6
libisoburn/trunk/libisoburn/libisoburn.h
View File

@ -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. tree is used. If you prefer using Joliet, set this to 1.
bit4= pretend_blank bit4= pretend_blank
Always create empty image.Ignore any image on input drive. 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 @return 1 success, <=0 failure
*/ */
#define isoburn_ropt_norock 1 #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_noiso1999 4
#define isoburn_ropt_preferjoliet 8 #define isoburn_ropt_preferjoliet 8
#define isoburn_ropt_pretend_blank 16 #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_set_extensions(struct isoburn_read_opts *o, int ext);
int isoburn_ropt_get_extensions(struct isoburn_read_opts *o, int *ext); int isoburn_ropt_get_extensions(struct isoburn_read_opts *o, int *ext);

2
libisoburn/trunk/xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2009.01.18.213952" #define Xorriso_timestamP "2009.01.21.150243"