From aef4a26b9948e330781e1da98707b23f8af44f10 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Thu, 12 Mar 2009 14:16:36 +0000 Subject: [PATCH] Made -compliance old_rr the default --- libisoburn/trunk/xorriso/xorriso.1 | 15 ++++++++----- libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- libisoburn/trunk/xorriso/xorrisoburn.c | 23 ++++++++++++-------- 3 files changed, 24 insertions(+), 16 deletions(-) diff --git a/libisoburn/trunk/xorriso/xorriso.1 b/libisoburn/trunk/xorriso/xorriso.1 index 9c9b97e7..d192f35e 100644 --- a/libisoburn/trunk/xorriso/xorriso.1 +++ b/libisoburn/trunk/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 "Mar 01, 2009" +.TH XORRISO 1 "Mar 12, 2009" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -1591,7 +1591,8 @@ ACLs will be written according to the setting of option -acl. 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 +Adjust the compliance to specifications of ISO 9660 and its contemporary +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 @@ -1624,13 +1625,15 @@ Rule keywords are: "rec_mtime" record with ISO files the disk file's mtime and not the creation time of the image. .br -"old_rr" use Rock Ridge version 1.10 (needed if the intended reader -system does not recognize Rock Ridge 1.12 signature). This implies also +"new_rr" use Rock Ridge version 1.12 (suitable for Linux but not for older +FreeBSD or for Solaris). This implies "aaip_susp_1_10_off" which may be changed +by subsequent "aaip_susp_1_10". +.br +Default is "old_rr" which uses Rock Ridge version 1.10. This implies also "aaip_susp_1_10" which may be changed by subsequent "aaip_susp_1_10_off". .br "aaip_susp_1_10" allows AAIP to be written as inofficial extension of RRIP -rather than as official extension under SUSP-1.12. Try this if a reader program -dislikes the official form. +rather than as official extension under SUSP-1.12. .br Default setting is "clear:deep_paths:long_paths:always_gmt". .br diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index a7c554f6..274da841 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2009.03.11.170236" +#define Xorriso_timestamP "2009.03.12.141647" diff --git a/libisoburn/trunk/xorriso/xorrisoburn.c b/libisoburn/trunk/xorriso/xorrisoburn.c index 10b72de4..4c1b51cb 100644 --- a/libisoburn/trunk/xorriso/xorrisoburn.c +++ b/libisoburn/trunk/xorriso/xorrisoburn.c @@ -117,7 +117,8 @@ int Xorriso_path_from_node(struct XorrisO *xorriso, IsoNode *node, int lba, /* Default setting for -relax_compliance */ #define Xorriso_relax_compliance_defaulT \ (isoburn_igopt_allow_deep_paths | isoburn_igopt_allow_longer_paths | \ - isoburn_igopt_always_gmt) + isoburn_igopt_always_gmt | \ + isoburn_igopt_rrip_version_1_10 | isoburn_igopt_aaip_susp_1_10 ) /* <<< Whether to allow xattr and ACL with the root node. @@ -8520,6 +8521,12 @@ int Xorriso_relax_compliance(struct XorrisO *xorriso, char *mode, } else if(l == 14 && strncmp(cpt, "always_gmt_off", l) == 0) { xorriso->relax_compliance&= ~isoburn_igopt_always_gmt; + } else if((l == 9 && strncmp(cpt, "rec_mtime", l) == 0) || + (l == 12 && strncmp(cpt, "rec_mtime_on", l) == 0)) { + xorriso->relax_compliance|= isoburn_igopt_dir_rec_mtime; + } else if(l == 13 && strncmp(cpt, "rec_mtime_off", l) == 0) { + xorriso->relax_compliance&= ~isoburn_igopt_dir_rec_mtime; + } else if((l == 6 && strncmp(cpt, "old_rr", l) == 0) || (l == 9 && strncmp(cpt, "old_rr_on", l) == 0) || (l == 10 && strncmp(cpt, "new_rr_off", l) == 0)) { @@ -8531,12 +8538,6 @@ int Xorriso_relax_compliance(struct XorrisO *xorriso, char *mode, xorriso->relax_compliance&= ~(isoburn_igopt_rrip_version_1_10 | isoburn_igopt_aaip_susp_1_10); - } else if((l == 9 && strncmp(cpt, "rec_mtime", l) == 0) || - (l == 12 && strncmp(cpt, "rec_mtime_on", l) == 0)) { - xorriso->relax_compliance|= isoburn_igopt_dir_rec_mtime; - } else if(l == 13 && strncmp(cpt, "rec_mtime_off", l) == 0) { - xorriso->relax_compliance&= ~isoburn_igopt_dir_rec_mtime; - } else if((l == 14 && strncmp(cpt, "aaip_susp_1_10", l) == 0) || (l == 17 && strncmp(cpt, "aaip_susp_1_10_on", l) == 0) || (l == 18 && strncmp(cpt, "aaip_susp_1_12_off", l) == 0)) { @@ -8607,8 +8608,12 @@ int Xorriso_get_relax_text(struct XorrisO *xorriso, char mode[1024], strcat(mode, ":old_rr"); if(!(r & isoburn_igopt_aaip_susp_1_10)) strcat(mode, ":aaip_susp_1_10_off"); - } else if(r & isoburn_igopt_aaip_susp_1_10) - strcat(mode, ":aaip_susp_1_10"); + } else { + strcat(mode, ":new_rr"); + if(r & isoburn_igopt_aaip_susp_1_10) + strcat(mode, ":aaip_susp_1_10"); + } + return(1 + (r == Xorriso_relax_compliance_defaulT)); }