diff --git a/xorriso/write_run.c b/xorriso/write_run.c index 1b60308e..1e0bfe87 100644 --- a/xorriso/write_run.c +++ b/xorriso/write_run.c @@ -2068,6 +2068,12 @@ int Xorriso_relax_compliance(struct XorrisO *xorriso, char *mode, } else if(l == 14 && strncmp(cpt, "full_ascii_off", l) == 0) { xorriso->relax_compliance&= ~isoburn_igopt_allow_full_ascii; + } else if((l == 10 && strncmp(cpt, "7bit_ascii", l) == 0) || + (l == 13 && strncmp(cpt, "7bit_ascii_on", l) == 0)) { + xorriso->relax_compliance|= isoburn_igopt_allow_7bit_ascii; + } else if(l == 14 && strncmp(cpt, "7bit_ascii_off", l) == 0) { + xorriso->relax_compliance&= ~isoburn_igopt_allow_7bit_ascii; + } else if((l == 17 && strncmp(cpt, "joliet_long_paths", l) == 0) || (l == 20 && strncmp(cpt, "joliet_long_paths_on", l) == 0)) { xorriso->relax_compliance|= isoburn_igopt_joliet_longer_paths; @@ -2222,6 +2228,8 @@ int Xorriso_get_relax_text(struct XorrisO *xorriso, char mode[1024], strcat(mode, ":lowercase"); if(r & isoburn_igopt_allow_full_ascii) strcat(mode, ":full_ascii"); + else if(r & isoburn_igopt_allow_7bit_ascii) + strcat(mode, ":7bit_ascii"); if(r & isoburn_igopt_joliet_longer_paths) strcat(mode, ":joliet_long_paths"); if(r & isoburn_igopt_joliet_long_names) diff --git a/xorriso/xorriso.1 b/xorriso/xorriso.1 index 77e7f6b8..30aaaff0 100644 --- a/xorriso/xorriso.1 +++ b/xorriso/xorriso.1 @@ -9,7 +9,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 "Version 1.2.1, Mar 14, 2012" +.TH XORRISO 1 "Version 1.2.1, Mar 22, 2012" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -2242,6 +2242,10 @@ not 8.3. .br "lowercase" allows lowercase characters in ECMA\-119 file names. .br +"7bit_ascii" allows nearly all 7\-bit characters in ECMA\-119 file names. +Not allowed are 0x0 and '/'. If not "lowercase" is enabled, then lowercase +letters get converted to uppercase. +.br "full_ascii" allows all 8\-bit characters except 0x0 and '/' in ECMA\-119 file names. .br diff --git a/xorriso/xorriso.info b/xorriso/xorriso.info index 593289d9..ca2236f6 100644 --- a/xorriso/xorriso.info +++ b/xorriso/xorriso.info @@ -2004,6 +2004,9 @@ will be written according to the setting of command -acl. "no_j_force_dots" does not add a dot to Joliet file names which have none. "lowercase" allows lowercase characters in ECMA-119 file names. + "7bit_ascii" allows nearly all 7-bit characters in ECMA-119 file + names. Not allowed are 0x0 and '/'. If not "lowercase" is + enabled, then lowercase letters get converted to uppercase. "full_ascii" allows all 8-bit characters except 0x0 and '/' in ECMA-119 file names. "untranslated_names" might be dangerous for inadverted reader @@ -4356,7 +4359,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * # starts a comment line: Scripting. (line 162) * -abort_on controls abort on error: Exception. (line 27) -* -abstract_file sets abstract file name: SetWrite. (line 184) +* -abstract_file sets abstract file name: SetWrite. (line 187) * -acl controls handling of ACLs: Loading. (line 143) * -add inserts one or more paths: Insert. (line 42) * -add_plainly inserts one or more paths: Insert. (line 61) @@ -4364,13 +4367,13 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -alter_date_r sets timestamps in ISO image: Manip. (line 167) * -append_partition adds arbitrary file after image end: Bootable. (line 199) -* -application_id sets application id: SetWrite. (line 143) +* -application_id sets application id: SetWrite. (line 146) * -as emulates mkisofs or cdrecord: Emulation. (line 13) * -assert_volid rejects undesired images: Loading. (line 84) * -auto_charset learns character set from image: Loading. (line 98) * -backslash_codes enables backslash conversion: Scripting. (line 67) * -ban_stdio_write demands real drive: Loading. (line 247) -* -biblio_file sets biblio file name: SetWrite. (line 191) +* -biblio_file sets biblio file name: SetWrite. (line 194) * -blank erases media: Writing. (line 61) * -boot_image controls bootability: Bootable. (line 26) * -calm_drive reduces drive activity: Loading. (line 236) @@ -4389,7 +4392,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -chown sets ownership in ISO image: Manip. (line 42) * -chown_r sets ownership in ISO image: Manip. (line 47) * -clone copies ISO directory tree: Insert. (line 171) -* -close controls media closing: SetWrite. (line 286) +* -close controls media closing: SetWrite. (line 289) * -close_damaged closes damaged track and session: Writing. (line 152) * -close_filter_list bans filter registration: Filter. (line 52) * -commit writes pending ISO image: Writing. (line 29) @@ -4398,7 +4401,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -compare_l reports ISO/disk differences: Navigate. (line 164) * -compare_r reports ISO/disk differences: Navigate. (line 159) * -compliance controls standard compliance: SetWrite. (line 14) -* -copyright_file sets copyright file name: SetWrite. (line 178) +* -copyright_file sets copyright file name: SetWrite. (line 181) * -cp_clone copies ISO directory tree: Insert. (line 183) * -cp_rx copies file trees to disk: Restore. (line 108) * -cpax copies files to disk: Restore. (line 104) @@ -4416,11 +4419,11 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top (line 36) * -drive_class controls drive accessability: Loading. (line 54) * -du show directory size in ISO image: Navigate. (line 89) -* -dummy controls write simulation: SetWrite. (line 275) +* -dummy controls write simulation: SetWrite. (line 278) * -dus show directory size in ISO image: Navigate. (line 93) * -dusx show directory size on disk: Navigate. (line 102) * -dux show directory size on disk: Navigate. (line 97) -* -dvd_obs set write block size: SetWrite. (line 262) +* -dvd_obs set write block size: SetWrite. (line 265) * -early_stdio_test classifies stdio drives: Loading. (line 252) * -eject ejects drive tray: Writing. (line 52) * -end writes pending session and ends program: Scripting. (line 156) @@ -4438,12 +4441,12 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -follow softlinks and mount points: SetInsert. (line 76) * -for_backup -acl,-xattr,-hardlinks,-md5: Loading. (line 185) * -format formats media: Writing. (line 88) -* -fs sets size of fifo: SetWrite. (line 279) +* -fs sets size of fifo: SetWrite. (line 282) * -getfacl shows ACL in ISO image: Navigate. (line 70) * -getfacl_r shows ACL in ISO image: Navigate. (line 77) * -getfattr shows xattr in ISO image: Navigate. (line 81) * -getfattr_r shows xattr in ISO image: Navigate. (line 85) -* -gid sets global ownership: SetWrite. (line 219) +* -gid sets global ownership: SetWrite. (line 222) * -grow_blindly overides next writeable address: AqDrive. (line 46) * -hardlinks controls handling of hard links: Loading. (line 110) * -help prints help text: Scripting. (line 20) @@ -4489,17 +4492,17 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -not_paths sets absolute exclusion paths: SetInsert. (line 55) * -options_from_file reads commands from file: Scripting. (line 12) * -osirrox enables ISO-to-disk copying: Restore. (line 18) -* -out_charset sets output character set: SetWrite. (line 209) +* -out_charset sets output character set: SetWrite. (line 212) * -outdev acquires a drive for output: AqDrive. (line 31) * -overwrite enables overwriting in ISO: SetInsert. (line 127) * -pacifier controls pacifier text form: Emulation. (line 158) -* -padding sets amount or mode of image padding: SetWrite. (line 292) +* -padding sets amount or mode of image padding: SetWrite. (line 295) * -page set terminal geometry: DialogCtl. (line 19) * -paste_in copies file into disk file: Restore. (line 121) * -path_list inserts paths from disk file: Insert. (line 75) * -pathspecs sets meaning of = with -add: SetInsert. (line 118) * -pkt_output consolidates text output: Frontend. (line 7) -* -preparer_id sets preparer id: SetWrite. (line 197) +* -preparer_id sets preparer id: SetWrite. (line 200) * -print prints result text line: Scripting. (line 99) * -print_info prints message text line: Scripting. (line 102) * -print_mark prints synchronizing text line: Scripting. (line 105) @@ -4507,7 +4510,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -prog sets program name: Frontend. (line 30) * -prog_help prints help text: Frontend. (line 33) * -prompt prompts for enter key: Scripting. (line 110) -* -publisher sets publisher id: SetWrite. (line 137) +* -publisher sets publisher id: SetWrite. (line 140) * -pvd_info shows image id strings: Inquiry. (line 93) * -pwd tells working directory in ISO: Navigate. (line 20) * -pwdx tells working directory on disk: Navigate. (line 23) @@ -4525,7 +4528,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -rollback_end ends program without writing: Scripting. (line 159) * -rom_toc_scan searches for sessions: Loading. (line 211) * -rr_reloc_dir sets name of relocation directory: SetWrite. - (line 94) + (line 97) * -scdbackup_tag enables scdbackup checksum tag: Emulation. (line 168) * -scsi_log reports SCSI commands: Scripting. (line 147) * -session_log logs written sessions: Scripting. (line 138) @@ -4543,29 +4546,29 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -signal_handling controls handling of system signals: Exception. (line 69) * -sleep waits for a given time span: Scripting. (line 114) -* -speed set write speed: SetWrite. (line 235) +* -speed set write speed: SetWrite. (line 238) * -split_size enables large file splitting: SetInsert. (line 140) * -status shows current settings: Scripting. (line 47) * -status_history_max curbs -status history: Scripting. (line 56) -* -stdio_sync controls stdio buffer: SetWrite. (line 269) -* -stream_recording controls defect management: SetWrite. (line 250) -* -system_id sets system id: SetWrite. (line 152) +* -stdio_sync controls stdio buffer: SetWrite. (line 272) +* -stream_recording controls defect management: SetWrite. (line 253) +* -system_id sets system id: SetWrite. (line 155) * -tell_media_space reports free space: Inquiry. (line 89) * -temp_mem_limit curbs memory consumption: Scripting. (line 92) * -toc shows list of sessions: Inquiry. (line 28) -* -uid sets global ownership: SetWrite. (line 215) +* -uid sets global ownership: SetWrite. (line 218) * -update inserts path if different: Insert. (line 99) * -update_l inserts paths if different: Insert. (line 121) * -update_r inserts paths if different: Insert. (line 110) * -use_readline enables readline for dialog: DialogCtl. (line 28) * -version prints help text: Scripting. (line 23) -* -volid sets volume id: SetWrite. (line 113) -* -volset_id sets volume set id: SetWrite. (line 132) -* -volume_date sets volume timestamp: SetWrite. (line 159) +* -volid sets volume id: SetWrite. (line 116) +* -volset_id sets volume set id: SetWrite. (line 135) +* -volume_date sets volume timestamp: SetWrite. (line 162) * -x enables automatic execution order of arguments: ArgSort. (line 16) * -xattr controls handling of xattr (EA): Loading. (line 151) -* -zisofs controls zisofs production: SetWrite. (line 223) +* -zisofs controls zisofs production: SetWrite. (line 226)  File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top @@ -4598,7 +4601,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Character Set, _definition: Charset. (line 6) * Character Set, for input, -in_charset: Loading. (line 92) * Character Set, for input/output, -charset: Charset. (line 43) -* Character Set, for output, -out_charset: SetWrite. (line 209) +* Character Set, for output, -out_charset: SetWrite. (line 212) * Character set, learn from image, -auto_charset: Loading. (line 98) * Character Set, of terminal, -local_charset: Charset. (line 47) * Closed media, _definition: Media. (line 43) @@ -4653,8 +4656,8 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Filter, show chain, -show_stream: Navigate. (line 169) * Filter, show chains of tree, -show_stream_r: Navigate. (line 183) * Filter, unregister, -unregister_filter: Filter. (line 48) -* Filter, zisofs parameters, -zisofs: SetWrite. (line 223) -* Group, global in ISO image, -gid: SetWrite. (line 219) +* Filter, zisofs parameters, -zisofs: SetWrite. (line 226) +* Group, global in ISO image, -gid: SetWrite. (line 222) * Group, in ISO image, -chgrp: Manip. (line 50) * Group, in ISO image, -chgrp_r: Manip. (line 55) * Growing, _definition: Methods. (line 19) @@ -4665,16 +4668,16 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Image, demand volume id, -assert_volid: Loading. (line 84) * Image, discard pending changes, -rollback: Writing. (line 9) * Image, override change status, -changes_pending: Writing. (line 13) -* Image, set abstract file name, -abstract_file: SetWrite. (line 184) -* Image, set application id, -application_id: SetWrite. (line 143) -* Image, set biblio file name, -biblio_file: SetWrite. (line 191) -* Image, set copyright file name, -copyright_file: SetWrite. (line 178) -* Image, set preparer id, -preparer_id: SetWrite. (line 197) -* Image, set publisher id, -publisher: SetWrite. (line 137) -* Image, set system id, -system_id: SetWrite. (line 152) -* Image, set volume id, -volid: SetWrite. (line 113) -* Image, set volume set id, -volset_id: SetWrite. (line 132) -* Image, set volume timestamp, -volume_date: SetWrite. (line 159) +* Image, set abstract file name, -abstract_file: SetWrite. (line 187) +* Image, set application id, -application_id: SetWrite. (line 146) +* Image, set biblio file name, -biblio_file: SetWrite. (line 194) +* Image, set copyright file name, -copyright_file: SetWrite. (line 181) +* Image, set preparer id, -preparer_id: SetWrite. (line 200) +* Image, set publisher id, -publisher: SetWrite. (line 140) +* Image, set system id, -system_id: SetWrite. (line 155) +* Image, set volume id, -volid: SetWrite. (line 116) +* Image, set volume set id, -volset_id: SetWrite. (line 135) +* Image, set volume timestamp, -volume_date: SetWrite. (line 162) * Image, show id strings, -pvd_info: Inquiry. (line 93) * Insert, enable overwriting, -overwrite: SetInsert. (line 127) * Insert, file exclusion absolute, -not_paths: SetInsert. (line 55) @@ -4733,7 +4736,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Navigate, tell ISO working directory, -pwd: Navigate. (line 20) * Next writeable address, -grow_blindly: AqDrive. (line 46) * Overwriteable media, _definition: Media. (line 14) -* Ownership, global in ISO image, -uid: SetWrite. (line 215) +* Ownership, global in ISO image, -uid: SetWrite. (line 218) * Ownership, in ISO image, -chown: Manip. (line 42) * Ownership, in ISO image, -chown_r: Manip. (line 47) * Partition offset, _definition: Bootable. (line 146) @@ -4776,7 +4779,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Program, wait a time span, -sleep: Scripting. (line 114) * Quoted input, _definition: Processing. (line 46) * Recovery, retrieve blocks, -check_media: Verify. (line 21) -* Relocation directory, set name, -rr_reloc_dir: SetWrite. (line 94) +* Relocation directory, set name, -rr_reloc_dir: SetWrite. (line 97) * Rename, in ISO image, -mv: Manip. (line 35) * Restore, copy file into disk file, -paste_in: Restore. (line 121) * Restore, copy file piece to disk, -extract_cut: Restore. (line 81) @@ -4813,22 +4816,22 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Verify, file checksum, -check_md5: Verify. (line 148) * Verify, file tree checksums, -check_md5_r: Verify. (line 164) * Verify, preset -check_media, -check_media_defaults: Verify. (line 41) -* Write, block size, -dvd_obs: SetWrite. (line 262) +* Write, block size, -dvd_obs: SetWrite. (line 265) * Write, bootability, -boot_image: Bootable. (line 26) -* Write, buffer syncing, -stdio_sync: SetWrite. (line 269) -* Write, close media, -close: SetWrite. (line 286) +* Write, buffer syncing, -stdio_sync: SetWrite. (line 272) +* Write, close media, -close: SetWrite. (line 289) * Write, compliance to specs, -compliance: SetWrite. (line 14) -* Write, defect management, -stream_recording: SetWrite. (line 250) +* Write, defect management, -stream_recording: SetWrite. (line 253) * Write, enable Joliet, -joliet: SetWrite. (line 10) -* Write, fifo size, -fs: SetWrite. (line 279) +* Write, fifo size, -fs: SetWrite. (line 282) * Write, free space, -tell_media_space: Inquiry. (line 89) * Write, log problematic disk files, -errfile_log: Scripting. (line 118) * Write, log written sessions, -session_log: Scripting. (line 138) -* Write, padding image, -padding: SetWrite. (line 292) +* Write, padding image, -padding: SetWrite. (line 295) * Write, pending ISO image, -commit: Writing. (line 29) * Write, predict image size, -print_size: Inquiry. (line 80) -* Write, set speed, -speed: SetWrite. (line 235) -* Write, simulation, -dummy: SetWrite. (line 275) +* Write, set speed, -speed: SetWrite. (line 238) +* Write, simulation, -dummy: SetWrite. (line 278) * xattr, _definition: Extras. (line 54) * xattr, control handling, -xattr: Loading. (line 151) * xattr, set in ISO image, -setfattr: Manip. (line 111) @@ -4860,40 +4863,40 @@ Node: CmdFind72193 Node: Filter84302 Node: Writing88857 Node: SetWrite97821 -Node: Bootable113285 -Node: Jigdo126507 -Node: Charset130753 -Node: Exception133514 -Node: DialogCtl139633 -Node: Inquiry142230 -Node: Navigate147096 -Node: Verify155357 -Node: Restore164046 -Node: Emulation170955 -Node: Scripting180766 -Node: Frontend187926 -Node: Examples189226 -Node: ExDevices190403 -Node: ExCreate191062 -Node: ExDialog192347 -Node: ExGrowing193612 -Node: ExModifying194417 -Node: ExBootable194921 -Node: ExCharset195473 -Node: ExPseudo196294 -Node: ExCdrecord197192 -Node: ExMkisofs197509 -Node: ExGrowisofs198849 -Node: ExException199984 -Node: ExTime200438 -Node: ExIncBackup200897 -Node: ExRestore204888 -Node: ExRecovery205848 -Node: Files206418 -Node: Seealso207717 -Node: Bugreport208440 -Node: Legal209021 -Node: CommandIdx209951 -Node: ConceptIdx225539 +Node: Bootable113484 +Node: Jigdo126706 +Node: Charset130952 +Node: Exception133713 +Node: DialogCtl139832 +Node: Inquiry142429 +Node: Navigate147295 +Node: Verify155556 +Node: Restore164245 +Node: Emulation171154 +Node: Scripting180965 +Node: Frontend188125 +Node: Examples189425 +Node: ExDevices190602 +Node: ExCreate191261 +Node: ExDialog192546 +Node: ExGrowing193811 +Node: ExModifying194616 +Node: ExBootable195120 +Node: ExCharset195672 +Node: ExPseudo196493 +Node: ExCdrecord197391 +Node: ExMkisofs197708 +Node: ExGrowisofs199048 +Node: ExException200183 +Node: ExTime200637 +Node: ExIncBackup201096 +Node: ExRestore205087 +Node: ExRecovery206047 +Node: Files206617 +Node: Seealso207916 +Node: Bugreport208639 +Node: Legal209220 +Node: CommandIdx210150 +Node: ConceptIdx225738  End Tag Table diff --git a/xorriso/xorriso.texi b/xorriso/xorriso.texi index a5ffcf85..a81dc1f2 100644 --- a/xorriso/xorriso.texi +++ b/xorriso/xorriso.texi @@ -50,7 +50,7 @@ @c man .\" First parameter, NAME, should be all caps @c man .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection @c man .\" other parameters are allowed: see man(7), man(1) -@c man .TH XORRISO 1 "Version 1.2.1, Mar 14, 2012" +@c man .TH XORRISO 1 "Version 1.2.1, Mar 22, 2012" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -2685,6 +2685,10 @@ not 8.3. @* "lowercase" allows lowercase characters in ECMA-119 file names. @* +"7bit_ascii" allows nearly all 7-bit characters in ECMA-119 file names. +Not allowed are 0x0 and '/'. If not "lowercase" is enabled, then lowercase +letters get converted to uppercase. +@* "full_ascii" allows all 8-bit characters except 0x0 and '/' in ECMA-119 file names. @* diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index dcdfa26f..b45a8368 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2012.03.22.102402" +#define Xorriso_timestamP "2012.03.22.103201"