From 918c7abcbdb5e5fba59d2e050c131c34b6605253 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Wed, 22 Dec 2010 15:15:47 +0000 Subject: [PATCH] New -as mkisofs option -untranslated_name_len --- libisoburn/trunk/xorriso/emulators.c | 11 +++- libisoburn/trunk/xorriso/xorriso.1 | 3 + libisoburn/trunk/xorriso/xorriso.info | 66 ++++++++++---------- libisoburn/trunk/xorriso/xorriso.texi | 3 + libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- 5 files changed, 51 insertions(+), 34 deletions(-) diff --git a/libisoburn/trunk/xorriso/emulators.c b/libisoburn/trunk/xorriso/emulators.c index 41c155e9..eded61ad 100644 --- a/libisoburn/trunk/xorriso/emulators.c +++ b/libisoburn/trunk/xorriso/emulators.c @@ -563,7 +563,7 @@ int Xorriso_genisofs_count_args(struct XorrisO *xorriso, int argc, char **argv, "-checksum_algorithm_iso", "-checksum_algorithm_template", "--stdio_sync", "--quoted_path_list", "--efi-boot", "--embedded-boot", "-isohybrid-mbr", "-e", "-partition_offset", "-partition_hd_cyl", - "-partition_sec_hd", + "-partition_sec_hd", "-untranslated_name_len", "" }; static char arg2_options[][41]= { @@ -686,6 +686,7 @@ int Xorriso_genisofs_help(struct XorrisO *xorriso, int flag) " -J, -joliet Generate Joliet directory information", " -joliet-long Allow Joliet file names to be 103 Unicode characters", " -U, -untranslated-filenames Allow Untranslated filenames (for HPUX & AIX - violates ISO9660).", +" -untranslated_name_len LEN Allow up to LEN (1..96) name characters (heavily violates ISO9660).", " -allow-lowercase Allow lower case characters in addition to the current character set (violates ISO9660)", " -d, -omit-period Omit trailing periods from filenames (violates ISO9660)", " -l, -full-iso9660-filenames Allow full 31 character filenames for ISO9660 names", @@ -1309,6 +1310,14 @@ not_enough_args:; strcmp(argv[i], "-untranslated-filenames") == 0) { Xorriso_relax_compliance(xorriso, "no_force_dots:long_paths:omit_version:full_ascii:lowercase", 0); + } else if(strcmp(argv[i], "-untranslated_name_len") == 0) { + if(i+1>=argc) + goto not_enough_args; + i++; + sprintf(sfe, "untranslated_name_len=%s", argv[i]); + ret= Xorriso_relax_compliance(xorriso, sfe, 0); + if(ret <= 0) + goto problem_handler_2; } else if(strcmp(argv[i], "-N") == 0 || strcmp(argv[i], "-omit-version-number") == 0) { Xorriso_relax_compliance(xorriso, "omit_version", 0); diff --git a/libisoburn/trunk/xorriso/xorriso.1 b/libisoburn/trunk/xorriso/xorriso.1 index 8aea4ce4..9d88fcea 100644 --- a/libisoburn/trunk/xorriso/xorriso.1 +++ b/libisoburn/trunk/xorriso/xorriso.1 @@ -3532,6 +3532,9 @@ instead of -G to apply the effect of -boot_image isolinux partition_table=on. .br Option -append_partition is supported. .br +-untranslated_name_len number is +-compliance untranslated_name_len=number. +.br The options of genisoimage Jigdo Template Extraction are recognized and performed via xorriso option -jigdo. See the "Alias:" names there for the meaning of the genisoimage options. diff --git a/libisoburn/trunk/xorriso/xorriso.info b/libisoburn/trunk/xorriso/xorriso.info index 1a7b299d..62a4e322 100644 --- a/libisoburn/trunk/xorriso/xorriso.info +++ b/libisoburn/trunk/xorriso/xorriso.info @@ -3140,6 +3140,8 @@ programs trigger comparable actions. -partition_offset number is -boot_image any partition_offset=number. Option -append_partition is supported. + -untranslated_name_len number is -compliance + untranslated_name_len=number. The options of genisoimage Jigdo Template Extraction are recognized and performed via xorriso option -jigdo. See the "Alias:" names there for the meaning of the genisoimage options. @@ -4070,7 +4072,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -out_charset sets output character set: SetWrite. (line 165) * -outdev aquires a drive for output: AqDrive. (line 29) * -overwrite enables overwriting in ISO: SetInsert. (line 127) -* -pacifier controls pacifier text form: Emulation. (line 132) +* -pacifier controls pacifier text form: Emulation. (line 134) * -padding sets amount of image padding: SetWrite. (line 248) * -page set terminal geometry: DialogCtl. (line 15) * -paste_in copies file into disk file: Restore. (line 117) @@ -4090,7 +4092,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -quoted_not_list sets exclusions: SetInsert. (line 72) * -quoted_path_list inserts paths from disk file: Insert. (line 80) * -read_mkisofsrc searches and reads .mkisofsrc file: Emulation. - (line 120) + (line 122) * -reassure enables confirmation question: DialogCtl. (line 28) * -report_about controls verbosity: Exception. (line 55) * -return_with controls exit value: Exception. (line 39) @@ -4100,7 +4102,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -rollback discards pending changes: Writing. (line 9) * -rollback_end ends program without writing: Scripting. (line 125) * -rom_toc_scan searches for sessions: Loading. (line 203) -* -scdbackup_tag enables scdbackup checksum tag: Emulation. (line 142) +* -scdbackup_tag enables scdbackup checksum tag: Emulation. (line 144) * -scsi_log reports SCSI commands: Scripting. (line 113) * -session_log logs written sessions: Scripting. (line 104) * -session_string composes session info line: Inquiry. (line 56) @@ -4157,11 +4159,11 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Backslash Interpretation, _definition: Processing. (line 49) * Backup, enable fast incremental, -disk_dev_ino: Loading. (line 182) * Backup, enable features, -for_backup: Loading. (line 177) -* Backup, scdbackup checksum tag, -scdbackup: Emulation. (line 142) +* Backup, scdbackup checksum tag, -scdbackup: Emulation. (line 144) * Blank media, _definition: Media. (line 29) * Blind growing, _definition: Methods. (line 40) * Bootability, control, -boot_image: Bootable. (line 26) -* cdrecord, Emulation: Emulation. (line 87) +* cdrecord, Emulation: Emulation. (line 89) * Character Set, _definition: Charset. (line 6) * Character Set, for input, -in_charset: Loading. (line 92) * Character Set, for input/output, -charset: Charset. (line 43) @@ -4196,10 +4198,10 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Drive, write and eject, -commit_eject: Writing. (line 40) * El Torito, _definiton: Extras. (line 19) * Emulation, -as: Emulation. (line 13) -* Emulation, .mkisofsrc, -read_mkisofsrc: Emulation. (line 120) -* Emulation, cdrecord, -as: Emulation. (line 87) +* Emulation, .mkisofsrc, -read_mkisofsrc: Emulation. (line 122) +* Emulation, cdrecord, -as: Emulation. (line 89) * Emulation, mkisofs, -as: Emulation. (line 16) -* Emulation, pacifier form, -pacifier: Emulation. (line 132) +* Emulation, pacifier form, -pacifier: Emulation. (line 134) * Examples: Examples. (line 6) * Filter, _definition: Filter. (line 6) * Filter, apply to file tree, -set_filter_r: Filter. (line 84) @@ -4413,29 +4415,29 @@ Node: Navigate130386 Node: Verify138281 Node: Restore146870 Node: Emulation153526 -Node: Scripting161815 -Node: Frontend167377 -Node: Examples168672 -Node: ExDevices169841 -Node: ExCreate170475 -Node: ExDialog171749 -Node: ExGrowing173011 -Node: ExModifying173813 -Node: ExBootable174314 -Node: ExCharset174861 -Node: ExPseudo175689 -Node: ExCdrecord176583 -Node: ExMkisofs176898 -Node: ExGrowisofs177901 -Node: ExException179025 -Node: ExTime179479 -Node: ExIncBackup179938 -Node: ExRestore183410 -Node: ExRecovery184379 -Node: Files184945 -Node: Seealso186173 -Node: Legal186697 -Node: CommandIdx187619 -Node: ConceptIdx201845 +Node: Scripting161900 +Node: Frontend167462 +Node: Examples168757 +Node: ExDevices169926 +Node: ExCreate170560 +Node: ExDialog171834 +Node: ExGrowing173096 +Node: ExModifying173898 +Node: ExBootable174399 +Node: ExCharset174946 +Node: ExPseudo175774 +Node: ExCdrecord176668 +Node: ExMkisofs176983 +Node: ExGrowisofs177986 +Node: ExException179110 +Node: ExTime179564 +Node: ExIncBackup180023 +Node: ExRestore183495 +Node: ExRecovery184464 +Node: Files185030 +Node: Seealso186258 +Node: Legal186782 +Node: CommandIdx187704 +Node: ConceptIdx201930  End Tag Table diff --git a/libisoburn/trunk/xorriso/xorriso.texi b/libisoburn/trunk/xorriso/xorriso.texi index 80cb1d07..b5f048f3 100644 --- a/libisoburn/trunk/xorriso/xorriso.texi +++ b/libisoburn/trunk/xorriso/xorriso.texi @@ -4183,6 +4183,9 @@ instead of -G to apply the effect of -boot_image isolinux partition_table=on. @* Option @minus{}append_partition is supported. @* +@minus{}untranslated_name_len number is +@minus{}compliance untranslated_name_len=number. +@* The options of genisoimage Jigdo Template Extraction are recognized and performed via xorriso option -jigdo. See the "Alias:" names there for the meaning of the genisoimage options. diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index d3f10b33..eaaa65e8 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2010.12.22.133936" +#define Xorriso_timestamP "2010.12.22.151542"