From 2a63813700db2e292b9d324b6298a8608da13c1a Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Wed, 14 Mar 2012 19:51:36 +0000 Subject: [PATCH] Adjusted behavior of -as mkisofs option -l --- libisoburn/trunk/xorriso/emulators.c | 21 ++++--- libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- libisoburn/trunk/xorriso/xorrisofs.1 | 8 +-- libisoburn/trunk/xorriso/xorrisofs.info | 62 ++++++++++---------- libisoburn/trunk/xorriso/xorrisofs.texi | 15 ++--- 5 files changed, 55 insertions(+), 53 deletions(-) diff --git a/libisoburn/trunk/xorriso/emulators.c b/libisoburn/trunk/xorriso/emulators.c index 9952ddb7..f2c33c52 100644 --- a/libisoburn/trunk/xorriso/emulators.c +++ b/libisoburn/trunk/xorriso/emulators.c @@ -1305,10 +1305,8 @@ illegal_c:; } else if(strcmp(argpt, "-J")==0 || strcmp(argpt, "-joliet")==0) { xorriso->do_joliet= 1; } else if(strcmp(argpt, "-joliet-long")==0) { - ret= Xorriso_option_compliance(xorriso, - "joliet_long_paths:joliet_long_names", 0); - if(ret<=0) - goto problem_handler_2; + Xorriso_relax_compliance(xorriso, + "joliet_long_paths:joliet_long_names", 0); } else if(strcmp(argpt, "-graft-points")==0) { xorriso->allow_graft_points= 1; } else if(strcmp(argpt, "-path-list")==0 || @@ -1493,8 +1491,12 @@ not_enough_args:; strcmp(argpt, "-omit-version-number") == 0) { Xorriso_relax_compliance(xorriso, "omit_version", 0); } else if(strcmp(argpt, "-l") == 0 || - strcmp(argpt, "-full-iso9660-filenames") == 0 || - strcmp(argpt, "-max-iso9660-filenames") == 0) { + strcmp(argpt, "-full-iso9660-filenames") == 0) { + if(xorriso->iso_level <= 2) + Xorriso_relax_compliance(xorriso, "iso_9660_level=2", 0); + if(iso_level <= 2) + iso_level= 2; + } else if(strcmp(argpt, "-max-iso9660-filenames") == 0) { Xorriso_relax_compliance(xorriso, "long_names", 0); } else if(strcmp(argpt, "-d") == 0 || strcmp(argpt, "-omit-period") == 0) { @@ -1654,10 +1656,7 @@ rr_reloc_dir:; ret= Xorriso_option_rr_reloc_dir(xorriso, rr_reloc_dir_pt, 0); if(ret <= 0) goto problem_handler_2; - ret= Xorriso_option_compliance(xorriso, "deep_paths_off:long_paths_off", - 0); - if(ret <= 0) - goto problem_handler_2; + Xorriso_relax_compliance(xorriso, "deep_paths_off:long_paths_off", 0); } else if(argpt[0]=='-' && argpt[1]!=0) { hargv[0]= argpt; @@ -1832,7 +1831,7 @@ problem_handler_2:; } if(option_d) - Xorriso_option_compliance(xorriso, "deep_paths:long_paths", 0); + Xorriso_relax_compliance(xorriso, "deep_paths:long_paths", 0); /* After all pathspecs are added: perform boot related options */ for(j= 0; j < delay_opt_count; j++) { diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index 23341347..f5e88367 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2012.03.14.152414" +#define Xorriso_timestamP "2012.03.14.195147" diff --git a/libisoburn/trunk/xorriso/xorrisofs.1 b/libisoburn/trunk/xorriso/xorrisofs.1 index 0cf2a627..2f54f968 100644 --- a/libisoburn/trunk/xorriso/xorrisofs.1 +++ b/libisoburn/trunk/xorriso/xorrisofs.1 @@ -452,15 +452,15 @@ Alias of \-d. .TP \fB\-l\fR .br -Allow up to 37 characters in ISO file names. -.br -This violates ISO 9660 specs. +Allow up to 31 characters in ISO file names. .TP \fB\-full-iso9660-filenames\fR Alias of \-l. .TP \fB\-max-iso9660-filenames\fR -Alias of \-l. +Allow up to 37 characters in ISO file names. +.br +This violates ISO 9660 specs. .TP \fB\-N\fR .br diff --git a/libisoburn/trunk/xorriso/xorrisofs.info b/libisoburn/trunk/xorriso/xorrisofs.info index e5ebd633..715112d6 100644 --- a/libisoburn/trunk/xorriso/xorrisofs.info +++ b/libisoburn/trunk/xorriso/xorrisofs.info @@ -467,14 +467,14 @@ File: xorrisofs.info, Node: SetCompl, Next: SetExtras, Prev: SetProduct, Up: Alias of -d. -l - Allow up to 37 characters in ISO file names. - This violates ISO 9660 specs. + Allow up to 31 characters in ISO file names. -full-iso9660-filenames Alias of -l. -max-iso9660-filenames - Alias of -l. + Allow up to 37 characters in ISO file names. + This violates ISO 9660 specs. -N Omit the semicolon and the version numbers at the end of ISO names. @@ -1601,8 +1601,8 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T * -f follow symbolic links on disk: SetInsert. (line 24) * -file-mode permissions for all data files: SetProduct. (line 66) * -follow-links follow symbolic links on disk: SetInsert. (line 28) -* -full-iso9660-filenames allow 37 characters in ISO file names: SetCompl. - (line 61) +* -full-iso9660-filenames allow 31 characters in ISO file names: SetCompl. + (line 60) * -G Fill System Area e.g. by MBR: SystemArea. (line 17) * -generic-boot Fill System Area e.g. by MBR: SystemArea. (line 24) * -graft-points enable target=source pathspecs: SetInsert. (line 31) @@ -1634,11 +1634,11 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T * -joliet enable production of Joliet directory tree: SetExtras. (line 107) * -joliet-long allow longer Joliet names: SetExtras. (line 110) -* -l allow 37 characters in ISO file names: SetCompl. (line 57) +* -l allow 31 characters in ISO file names: SetCompl. (line 57) * -m exclude disk files from inserting: SetInsert. (line 35) * -M set path for loading existing ISO image: Loading. (line 11) * -max-iso9660-filenames allow 37 characters in ISO file names: SetCompl. - (line 64) + (line 63) * -md5-list set path of readable .md5: Jigdo. (line 73) * -mips-boot MIPS Big Endian boot image: SystemArea. (line 103) * -mipsel-boot MIPS Little Endian boot image: SystemArea. (line 110) @@ -1774,8 +1774,10 @@ File: xorrisofs.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Incremental insertion, enable, -old-root: SetInsert. (line 70) * ISO 9660, _definition: Standards. (line 6) * ISO 9660:1999, _definition: Standards. (line 26) -* ISO file names, allow 37 characters, -l, -full-iso9660-filenames, -max-iso9660-filenames: SetCompl. +* ISO file names, allow 31 characters, -l, -full-iso9660-filenames: SetCompl. (line 57) +* ISO file names, allow 37 characters, -max-iso9660-filenames: SetCompl. + (line 63) * ISO file names, allow lowercase, -allow-lowercase: SetCompl. (line 46) * ISO file names, omit trailing dot, -d, -omit-period: SetCompl. @@ -1867,27 +1869,27 @@ Node: Loading6846 Node: SetInsert9142 Node: SetProduct13558 Node: SetCompl17265 -Node: SetExtras19584 -Node: SetHide24316 -Node: ImageId25315 -Node: Bootable28820 -Node: SystemArea32885 -Node: Charset39219 -Node: Jigdo40245 -Node: Miscellaneous44512 -Node: Examples45676 -Node: ExSimple46162 -Node: ExGraft46641 -Node: ExMkisofs47888 -Node: ExGrowisofs49141 -Node: ExIncBackup50313 -Node: ExIncBckAcc53421 -Node: ExBootable55097 -Node: Files57189 -Node: Seealso58263 -Node: Bugreport58919 -Node: Legal59500 -Node: CommandIdx60315 -Node: ConceptIdx72148 +Node: SetExtras19616 +Node: SetHide24348 +Node: ImageId25347 +Node: Bootable28852 +Node: SystemArea32917 +Node: Charset39251 +Node: Jigdo40277 +Node: Miscellaneous44544 +Node: Examples45708 +Node: ExSimple46194 +Node: ExGraft46673 +Node: ExMkisofs47920 +Node: ExGrowisofs49173 +Node: ExIncBackup50345 +Node: ExIncBckAcc53453 +Node: ExBootable55129 +Node: Files57221 +Node: Seealso58295 +Node: Bugreport58951 +Node: Legal59532 +Node: CommandIdx60347 +Node: ConceptIdx72180  End Tag Table diff --git a/libisoburn/trunk/xorriso/xorrisofs.texi b/libisoburn/trunk/xorriso/xorrisofs.texi index a5d4a422..b2c35cda 100644 --- a/libisoburn/trunk/xorriso/xorrisofs.texi +++ b/libisoburn/trunk/xorriso/xorrisofs.texi @@ -664,20 +664,21 @@ This violates ISO 9660 specs. Alias of -d. @c man .TP @item -l -@kindex -l allow 37 characters in ISO file names -@cindex ISO file names, allow 37 characters, -l, -full-iso9660-filenames, -max-iso9660-filenames +@kindex -l allow 31 characters in ISO file names +@cindex ISO file names, allow 31 characters, -l, -full-iso9660-filenames @* -Allow up to 37 characters in ISO file names. -@* -This violates ISO 9660 specs. +Allow up to 31 characters in ISO file names. @c man .TP @item -full-iso9660-filenames -@kindex -full-iso9660-filenames allow 37 characters in ISO file names +@kindex -full-iso9660-filenames allow 31 characters in ISO file names Alias of -l. @c man .TP @item -max-iso9660-filenames @kindex -max-iso9660-filenames allow 37 characters in ISO file names -Alias of -l. +@cindex ISO file names, allow 37 characters, -max-iso9660-filenames +Allow up to 37 characters in ISO file names. +@* +This violates ISO 9660 specs. @c man .TP @item -N @kindex -N omit version number in ISO file names