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

New -compliance rule joliet_utf16

Browse Source
This commit is contained in:
Thomas Schmitt
2013-12-18 07:43:34 +00:00
parent b5ddf6f4d7
commit 8d9d77bfb6
5 changed files with 112 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
xorriso/write_run.c
View File

@@ -2357,6 +2357,12 @@ int Xorriso_relax_compliance(struct XorrisO *xorriso, char *mode,
} else if(l == 21 && strncmp(cpt, "joliet_long_names_off", l) == 0) {
xorriso->relax_compliance&= ~isoburn_igopt_joliet_long_names;
} else if((l == 12 && strncmp(cpt, "joliet_utf16", l) == 0) ||
(l == 15 && strncmp(cpt, "joliet_utf16_on", l) == 0)) {
xorriso->relax_compliance|= isoburn_igopt_joliet_utf16;
} else if(l == 16 && strncmp(cpt, "joliet_utf16_off", l) == 0) {
xorriso->relax_compliance&= ~isoburn_igopt_joliet_utf16;
} else if((l == 10 && strncmp(cpt, "always_gmt", l) == 0) ||
(l == 13 && strncmp(cpt, "always_gmt_on", l) == 0)) {
xorriso->relax_compliance|= isoburn_igopt_always_gmt;
@@ -2507,6 +2513,8 @@ int Xorriso_get_relax_text(struct XorrisO *xorriso, char mode[1024],
strcat(mode, ":joliet_long_paths");
if(r & isoburn_igopt_joliet_long_names)
strcat(mode, ":joliet_long_names");
if(r & isoburn_igopt_joliet_utf16)
strcat(mode, ":joliet_utf16");
if(r & isoburn_igopt_always_gmt)
strcat(mode, ":always_gmt");
if(r & isoburn_igopt_dir_rec_mtime)

7
xorriso/xorriso.1
View File

@@ -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.3.5, Dec 12, 2013"
.TH XORRISO 1 "Version 1.3.5, Dec 16, 2013"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
@@ -2506,6 +2506,11 @@ than 64.
.br
"joliet_long_paths" allows Joliet paths longer than 240 characters.
.br
"joliet_utf16" encodes Joliet names in UTF\-16BE rather than UCS\-2.
The difference is with characters which are not present
in UCS\-2 and get encoded in UTF\-16 by 2 words of 16 bit each.
Both words then stem from a reserved subset of UCS\-2.
.br
"always_gmt" stores timestamps in GMT representation with timezone 0.
.br
"rec_mtime" records with non\-RockRidge directory entries the disk file's

175
xorriso/xorriso.info
View File

@@ -2216,6 +2216,10 @@ according to the setting of command -acl.
"joliet_long_names" allows Joliet leaf names up to 103 characters
rather than 64.
"joliet_long_paths" allows Joliet paths longer than 240 characters.
"joliet_utf16" encodes Joliet names in UTF-16BE rather than UCS-2.
The difference is with characters which are not present in UCS-2
and get encoded in UTF-16 by 2 words of 16 bit each. Both words
then stem from a reserved subset of UCS-2.
"always_gmt" stores timestamps in GMT representation with timezone
0.
"rec_mtime" records with non-RockRidge directory entries the disk
@@ -4849,7 +4853,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
* # starts a comment line: Scripting. (line 173)
* -abort_on controls abort on error: Exception. (line 27)
* -abstract_file sets abstract file name: SetWrite. (line 233)
* -abstract_file sets abstract file name: SetWrite. (line 237)
* -acl controls handling of ACLs: Loading. (line 170)
* -add inserts one or more paths: Insert. (line 46)
* -add_plainly inserts one or more paths: Insert. (line 65)
@@ -4857,14 +4861,14 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
* -alter_date_r sets timestamps in ISO image: Manip. (line 187)
* -append_partition adds arbitrary file after image end: Bootable.
(line 249)
* -application_id sets application id: SetWrite. (line 192)
* -application_use sets application use field: SetWrite. (line 258)
* -application_id sets application id: SetWrite. (line 196)
* -application_use sets application use field: SetWrite. (line 262)
* -as emulates mkisofs or cdrecord: Emulation. (line 13)
* -assert_volid rejects undesired images: Loading. (line 108)
* -auto_charset learns character set from image: Loading. (line 122)
* -backslash_codes enables backslash conversion: Scripting. (line 78)
* -ban_stdio_write demands real drive: Loading. (line 278)
* -biblio_file sets biblio file name: SetWrite. (line 240)
* -biblio_file sets biblio file name: SetWrite. (line 244)
* -blank erases media: Writing. (line 61)
* -boot_image controls bootability: Bootable. (line 26)
* -calm_drive reduces drive activity: Loading. (line 267)
@@ -4883,7 +4887,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
* -chown sets ownership in ISO image: Manip. (line 49)
* -chown_r sets ownership in ISO image: Manip. (line 54)
* -clone copies ISO directory tree: Insert. (line 180)
* -close controls media closing: SetWrite. (line 353)
* -close controls media closing: SetWrite. (line 357)
* -close_damaged closes damaged track and session: Writing. (line 170)
* -close_filter_list bans filter registration: Filter. (line 52)
* -commit writes pending ISO image: Writing. (line 29)
@@ -4892,7 +4896,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 58)
* -copyright_file sets copyright file name: SetWrite. (line 227)
* -copyright_file sets copyright file name: SetWrite. (line 231)
* -cp_clone copies ISO directory tree: Insert. (line 192)
* -cp_rx copies file trees to disk: Restore. (line 111)
* -cpax copies files to disk: Restore. (line 107)
@@ -4910,11 +4914,11 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
(line 60)
* -drive_class controls drive accessability: Loading. (line 78)
* -du show directory size in ISO image: Navigate. (line 89)
* -dummy controls write simulation: SetWrite. (line 342)
* -dummy controls write simulation: SetWrite. (line 346)
* -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 329)
* -dvd_obs set write block size: SetWrite. (line 333)
* -early_stdio_test classifies stdio drives: Loading. (line 283)
* -eject ejects drive tray: Writing. (line 52)
* -end writes pending session and ends program: Scripting. (line 167)
@@ -4932,12 +4936,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 212)
* -format formats media: Writing. (line 91)
* -fs sets size of fifo: SetWrite. (line 346)
* -fs sets size of fifo: SetWrite. (line 350)
* -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 282)
* -gid sets global ownership: SetWrite. (line 286)
* -grow_blindly overides next writeable address: AqDrive. (line 46)
* -hardlinks controls handling of hard links: Loading. (line 134)
* -help prints help text: Scripting. (line 20)
@@ -4990,17 +4994,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 272)
* -out_charset sets output character set: SetWrite. (line 276)
* -outdev acquires a drive for output: AqDrive. (line 31)
* -overwrite enables overwriting in ISO: SetInsert. (line 127)
* -pacifier controls pacifier text form: Emulation. (line 163)
* -padding sets amount or mode of image padding: SetWrite. (line 378)
* -padding sets amount or mode of image padding: SetWrite. (line 382)
* -page set terminal geometry: DialogCtl. (line 19)
* -paste_in copies file into disk file: Restore. (line 124)
* -path_list inserts paths from disk file: Insert. (line 79)
* -pathspecs sets meaning of = with -add: SetInsert. (line 118)
* -pkt_output consolidates text output: Frontend. (line 7)
* -preparer_id sets preparer id: SetWrite. (line 246)
* -preparer_id sets preparer id: SetWrite. (line 250)
* -print prints result text line: Scripting. (line 110)
* -print_info prints message text line: Scripting. (line 113)
* -print_mark prints synchronizing text line: Scripting. (line 116)
@@ -5008,7 +5012,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
* -prog sets program name: Frontend. (line 181)
* -prog_help prints help text: Frontend. (line 184)
* -prompt prompts for enter key: Scripting. (line 121)
* -publisher sets publisher id: SetWrite. (line 186)
* -publisher sets publisher id: SetWrite. (line 190)
* -pvd_info shows image id strings: Inquiry. (line 115)
* -pwd tells working directory in ISO: Navigate. (line 20)
* -pwdx tells working directory on disk: Navigate. (line 23)
@@ -5029,7 +5033,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
* -rollback_end ends program without writing: Scripting. (line 170)
* -rom_toc_scan searches for sessions: Loading. (line 238)
* -rr_reloc_dir sets name of relocation directory: SetWrite.
(line 141)
(line 145)
* -scdbackup_tag enables scdbackup checksum tag: Emulation. (line 177)
* -scsi_log reports SCSI commands: Scripting. (line 158)
* -session_log logs written sessions: Scripting. (line 149)
@@ -5049,31 +5053,31 @@ 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 125)
* -speed set write speed: SetWrite. (line 298)
* -speed set write speed: SetWrite. (line 302)
* -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 336)
* -stream_recording controls defect management: SetWrite. (line 317)
* -system_id sets system id: SetWrite. (line 201)
* -stdio_sync controls stdio buffer: SetWrite. (line 340)
* -stream_recording controls defect management: SetWrite. (line 321)
* -system_id sets system id: SetWrite. (line 205)
* -tell_media_space reports free space: Inquiry. (line 104)
* -temp_mem_limit curbs memory consumption: Scripting. (line 103)
* -toc shows list of sessions: Inquiry. (line 28)
* -toc_of shows list of sessions: Inquiry. (line 43)
* -uid sets global ownership: SetWrite. (line 278)
* -uid sets global ownership: SetWrite. (line 282)
* -update inserts path if different: Insert. (line 103)
* -update_l inserts paths if different: Insert. (line 125)
* -update_r inserts paths if different: Insert. (line 114)
* -use_readline enables readline for dialog: DialogCtl. (line 28)
* -version prints help text: Scripting. (line 23)
* -volid sets volume id: SetWrite. (line 160)
* -volset_id sets volume set id: SetWrite. (line 181)
* -volume_date sets volume timestamp: SetWrite. (line 208)
* -write_type chooses TAO or SAO/DAO: SetWrite. (line 370)
* -volid sets volume id: SetWrite. (line 164)
* -volset_id sets volume set id: SetWrite. (line 185)
* -volume_date sets volume timestamp: SetWrite. (line 212)
* -write_type chooses TAO or SAO/DAO: SetWrite. (line 374)
* -x enables automatic execution order of arguments: ArgSort.
(line 16)
* -xattr controls handling of xattr (EA): Loading. (line 178)
* -zisofs controls zisofs production: SetWrite. (line 286)
* -zisofs controls zisofs production: SetWrite. (line 290)

File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
@@ -5108,7 +5112,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Character Set, _definition: Charset. (line 6)
* Character Set, for input, -in_charset: Loading. (line 116)
* Character Set, for input/output, -charset: Charset. (line 43)
* Character Set, for output, -out_charset: SetWrite. (line 272)
* Character Set, for output, -out_charset: SetWrite. (line 276)
* Character set, learn from image, -auto_charset: Loading. (line 122)
* Character Set, of terminal, -local_charset: Charset. (line 47)
* CHRP partition, _definition: Bootable. (line 158)
@@ -5166,11 +5170,11 @@ 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 286)
* Filter, zisofs parameters, -zisofs: SetWrite. (line 290)
* Frontend program, start at pipes, -launch_frontend: Frontend.
(line 146)
* GPT, _definition: Extras. (line 38)
* Group, global in ISO image, -gid: SetWrite. (line 282)
* Group, global in ISO image, -gid: SetWrite. (line 286)
* Group, in ISO image, -chgrp: Manip. (line 57)
* Group, in ISO image, -chgrp_r: Manip. (line 62)
* Growing, _definition: Methods. (line 19)
@@ -5183,18 +5187,18 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Image, demand volume ID, -assert_volid: Loading. (line 108)
* 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 233)
* Image, set application id, -application_id: SetWrite. (line 192)
* Image, set abstract file name, -abstract_file: SetWrite. (line 237)
* Image, set application id, -application_id: SetWrite. (line 196)
* Image, set application iuse field, -application_use: SetWrite.
(line 258)
* Image, set biblio file name, -biblio_file: SetWrite. (line 240)
* Image, set copyright file name, -copyright_file: SetWrite. (line 227)
* Image, set preparer id, -preparer_id: SetWrite. (line 246)
* Image, set publisher id, -publisher: SetWrite. (line 186)
* Image, set system id, -system_id: SetWrite. (line 201)
* Image, set volume id, -volid: SetWrite. (line 160)
* Image, set volume set id, -volset_id: SetWrite. (line 181)
* Image, set volume timestamp, -volume_date: SetWrite. (line 208)
(line 262)
* Image, set biblio file name, -biblio_file: SetWrite. (line 244)
* Image, set copyright file name, -copyright_file: SetWrite. (line 231)
* Image, set preparer id, -preparer_id: SetWrite. (line 250)
* Image, set publisher id, -publisher: SetWrite. (line 190)
* Image, set system id, -system_id: SetWrite. (line 205)
* Image, set volume id, -volid: SetWrite. (line 164)
* Image, set volume set id, -volset_id: SetWrite. (line 185)
* Image, set volume timestamp, -volume_date: SetWrite. (line 212)
* Image, show id strings, -pvd_info: Inquiry. (line 115)
* Insert, enable overwriting, -overwrite: SetInsert. (line 127)
* Insert, file exclusion absolute, -not_paths: SetInsert. (line 55)
@@ -5254,7 +5258,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 278)
* Ownership, global in ISO image, -uid: SetWrite. (line 282)
* Ownership, in ISO image, -chown: Manip. (line 49)
* Ownership, in ISO image, -chown_r: Manip. (line 54)
* Partition offset, _definition: Bootable. (line 177)
@@ -5300,7 +5304,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Quoted input, _definition: Processing. (line 46)
* Read, set speed, -read_speed: Loading. (line 11)
* Recovery, retrieve blocks, -check_media: Verify. (line 21)
* Relocation directory, set name, -rr_reloc_dir: SetWrite. (line 141)
* Relocation directory, set name, -rr_reloc_dir: SetWrite. (line 145)
* Rename, in ISO image, -move: Manip. (line 35)
* Rename, in ISO image, -mv: Manip. (line 42)
* Restore, copy file into disk file, -paste_in: Restore. (line 124)
@@ -5334,6 +5338,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Timestamps, set in ISO image, -alter_date_r: Manip. (line 187)
* Tree, disk, traverse, -findx: Navigate. (line 106)
* Tree, ISO, traverse and alter, -find: CmdFind. (line 7)
* UTF-16, for Joliet paths, -compliance: SetWrite. (line 108)
* Verify, check blocks, -check_media: Verify. (line 21)
* Verify, compare ISO and disk file, -compare: Navigate. (line 146)
* Verify, compare ISO and disk tree, -compare_r: Navigate. (line 159)
@@ -5341,25 +5346,25 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Verify, file checksum, -check_md5: Verify. (line 154)
* Verify, file tree checksums, -check_md5_r: Verify. (line 170)
* Verify, preset -check_media, -check_media_defaults: Verify. (line 41)
* Write, block size, -dvd_obs: SetWrite. (line 329)
* Write, block size, -dvd_obs: SetWrite. (line 333)
* Write, bootability, -boot_image: Bootable. (line 26)
* Write, buffer syncing, -stdio_sync: SetWrite. (line 336)
* Write, close media, -close: SetWrite. (line 353)
* Write, buffer syncing, -stdio_sync: SetWrite. (line 340)
* Write, close media, -close: SetWrite. (line 357)
* Write, compliance to specs, -compliance: SetWrite. (line 58)
* Write, defect management, -stream_recording: SetWrite. (line 317)
* Write, defect management, -stream_recording: SetWrite. (line 321)
* Write, disable Rock Ridge, -rockridge: SetWrite. (line 52)
* Write, enable HFS+, -hfsplus: SetWrite. (line 14)
* Write, enable Joliet, -joliet: SetWrite. (line 10)
* Write, fifo size, -fs: SetWrite. (line 346)
* Write, fifo size, -fs: SetWrite. (line 350)
* Write, free space, -tell_media_space: Inquiry. (line 104)
* Write, log problematic disk files, -errfile_log: Scripting. (line 129)
* Write, log written sessions, -session_log: Scripting. (line 149)
* Write, padding image, -padding: SetWrite. (line 378)
* Write, padding image, -padding: SetWrite. (line 382)
* Write, pending ISO image, -commit: Writing. (line 29)
* Write, predict image size, -print_size: Inquiry. (line 91)
* Write, set speed, -speed: SetWrite. (line 298)
* Write, simulation, -dummy: SetWrite. (line 342)
* Write, TAO or SAO/DAO, -write_type: SetWrite. (line 370)
* Write, set speed, -speed: SetWrite. (line 302)
* Write, simulation, -dummy: SetWrite. (line 346)
* Write, TAO or SAO/DAO, -write_type: SetWrite. (line 374)
* xattr, _definition: Extras. (line 65)
* xattr, control handling, -xattr: Loading. (line 178)
* xattr, set in ISO image, -setfattr: Manip. (line 118)
@@ -5391,40 +5396,40 @@ Node: CmdFind76521
Node: Filter91563
Node: Writing96119
Node: SetWrite106250
Node: Bootable126575
Node: Jigdo142965
Node: Charset147212
Node: Exception149974
Node: DialogCtl156094
Node: Inquiry158692
Node: Navigate165009
Node: Verify173307
Node: Restore182339
Node: Emulation189426
Node: Scripting199728
Node: Frontend207499
Node: Examples217106
Node: ExDevices218284
Node: ExCreate218943
Node: ExDialog220228
Node: ExGrowing221493
Node: ExModifying222298
Node: ExBootable222802
Node: ExCharset223354
Node: ExPseudo224246
Node: ExCdrecord225144
Node: ExMkisofs225461
Node: ExGrowisofs226801
Node: ExException227936
Node: ExTime228390
Node: ExIncBackup228849
Node: ExRestore232829
Node: ExRecovery233762
Node: Files234332
Node: Seealso235631
Node: Bugreport236354
Node: Legal236935
Node: CommandIdx237946
Node: ConceptIdx254608
Node: Bootable126835
Node: Jigdo143225
Node: Charset147472
Node: Exception150234
Node: DialogCtl156354
Node: Inquiry158952
Node: Navigate165269
Node: Verify173567
Node: Restore182599
Node: Emulation189686
Node: Scripting199988
Node: Frontend207759
Node: Examples217366
Node: ExDevices218544
Node: ExCreate219203
Node: ExDialog220488
Node: ExGrowing221753
Node: ExModifying222558
Node: ExBootable223062
Node: ExCharset223614
Node: ExPseudo224506
Node: ExCdrecord225404
Node: ExMkisofs225721
Node: ExGrowisofs227061
Node: ExException228196
Node: ExTime228650
Node: ExIncBackup229109
Node: ExRestore233089
Node: ExRecovery234022
Node: Files234592
Node: Seealso235891
Node: Bugreport236614
Node: Legal237195
Node: CommandIdx238206
Node: ConceptIdx254868

End Tag Table

8
xorriso/xorriso.texi
View File

@@ -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.3.5, Dec 12, 2013"
@c man .TH XORRISO 1 "Version 1.3.5, Dec 16, 2013"
@c man .\" Please adjust this date whenever revising the manpage.
@c man .\"
@c man .\" Some roff macros, for reference:
@@ -2965,6 +2965,12 @@ than 64.
@*
"joliet_long_paths" allows Joliet paths longer than 240 characters.
@*
@cindex UTF-16, for Joliet paths, -compliance
"joliet_utf16" encodes Joliet names in UTF-16BE rather than UCS-2.
The difference is with characters which are not present
in UCS-2 and get encoded in UTF-16 by 2 words of 16 bit each.
Both words then stem from a reserved subset of UCS-2.
@*
"always_gmt" stores timestamps in GMT representation with timezone 0.
@*
"rec_mtime" records with non-RockRidge directory entries the disk file's

2
xorriso/xorriso_timestamp.h
View File

@@ -1 +1 @@
#define Xorriso_timestamP "2013.12.18.074049"
#define Xorriso_timestamP "2013.12.18.074219"