New -compliance option old_empty

This commit is contained in:
Thomas Schmitt 2011-01-26 13:31:05 +00:00
parent c4c52cf0e9
commit 96433fd145
7 changed files with 118 additions and 87 deletions

View File

@ -132,6 +132,7 @@ int Xorriso_new(struct XorrisO ** xorriso,char *progname, int flag)
m->do_aaip= 0;
m->do_md5= 0;
m->no_emul_toc= 0;
m->do_old_empty= 0;
m->scdbackup_tag_name[0]= 0;
m->scdbackup_tag_time[0]= 0;
m->scdbackup_tag_written[0]= 0;

View File

@ -748,6 +748,7 @@ int Xorriso_write_session(struct XorrisO *xorriso, int flag)
((!!(xorriso->do_md5 & 2)) * isoburn_igopt_session_md5) |
((!!(xorriso->do_md5 & 4)) * isoburn_igopt_file_md5) |
((!!(xorriso->do_md5 & 8)) * isoburn_igopt_file_stability) |
((!!xorriso->do_old_empty) * isoburn_igopt_old_empty) |
((flag & 1) * isoburn_igopt_will_cancel);
if(xorriso->no_emul_toc & 1)
ext|= isoburn_igopt_no_emul_toc;
@ -2005,6 +2006,12 @@ int Xorriso_relax_compliance(struct XorrisO *xorriso, char *mode,
xorriso->relax_compliance= was;
return(0);
} else if((l == 9 && strncmp(cpt, "old_empty", l) == 0) ||
(l == 12 && strncmp(cpt, "old_empty_on", l) == 0)) {
xorriso->do_old_empty= 1;
} else if(l == 13 && strncmp(cpt, "old_empty_off", l) == 0) {
xorriso->do_old_empty= 0;
} else {
if(l<SfileadrL)
sprintf(xorriso->info_text, "-compliance: unknown rule '%s'",
@ -2077,6 +2084,8 @@ int Xorriso_get_relax_text(struct XorrisO *xorriso, char mode[1024],
xorriso->untranslated_name_len);
if(xorriso->do_iso1999)
sprintf(mode + strlen(mode), ":iso_9660_1999");
if(xorriso->do_old_empty)
sprintf(mode + strlen(mode), ":old_empty");
return(1 +
(r == Xorriso_relax_compliance_defaulT && !(xorriso->no_emul_toc & 1)
&& xorriso->untranslated_name_len == 0 && !xorriso->do_iso1999 &&

View File

@ -2056,6 +2056,10 @@ but makes the image incapable of displaying its session history.
compliant to ISO 9660:1999. It can record long filenames for readers which
do not understand Rock Ridge.
.br
"old_empty" uses the old way of of giving block addresses in the range
of [0,31] to files with no own data content. The new way is to have
a dedicated block to which all such files will point.
.br
Default setting is
.br
"clear:only_iso_version:deep_paths:long_paths:no_j_force_dots:
@ -3569,6 +3573,8 @@ Option -append_partition is supported.
-untranslated_name_len number is
-compliance untranslated_name_len=number.
.br
--old-empty is -compliance old_empty.
.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.

View File

@ -1846,6 +1846,9 @@ will be written according to the setting of option -acl.
"iso_9660_1999" causes the production of an additional directory
tree compliant to ISO 9660:1999. It can record long filenames for
readers which do not understand Rock Ridge.
"old_empty" uses the old way of of giving block addresses in the
range of [0,31] to files with no own data content. The new way is
to have a dedicated block to which all such files will point.
Default setting is
"clear:only_iso_version:deep_paths:long_paths:no_j_force_dots:
always_gmt:old_rr".
@ -3175,6 +3178,7 @@ programs trigger comparable actions.
Option -append_partition is supported.
-untranslated_name_len number is -compliance
untranslated_name_len=number.
--old-empty is -compliance old_empty.
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.
@ -3983,7 +3987,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
* # starts a comment line: Scripting. (line 128)
* -abort_on controls abort on error: Exception. (line 27)
* -abstract_file sets abstract file name: SetWrite. (line 155)
* -abstract_file sets abstract file name: SetWrite. (line 158)
* -acl controls handling of ACLs: Loading. (line 142)
* -add inserts one or more paths: Insert. (line 42)
* -add_plainly inserts one or more paths: Insert. (line 61)
@ -3991,13 +3995,13 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
* -alter_date_r sets timestamps in ISO image: Manip. (line 166)
* -append_partition adds arbitrary file after image end: Bootable.
(line 186)
* -application_id sets application id: SetWrite. (line 114)
* -application_id sets application id: SetWrite. (line 117)
* -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 99)
* -backslash_codes enables backslash conversion: Scripting. (line 45)
* -ban_stdio_write demands real drive: Loading. (line 239)
* -biblio_file sets biblio file name: SetWrite. (line 162)
* -biblio_file sets biblio file name: SetWrite. (line 165)
* -blank erases media: Writing. (line 45)
* -boot_image controls bootability: Bootable. (line 26)
* -calm_drive reduces drive activity: Loading. (line 228)
@ -4014,7 +4018,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
* -chmod_r sets permissions in ISO image: Manip. (line 70)
* -chown sets ownership in ISO image: Manip. (line 42)
* -chown_r sets ownership in ISO image: Manip. (line 47)
* -close controls media closing: SetWrite. (line 257)
* -close controls media closing: SetWrite. (line 260)
* -close_filter_list bans filter registration: Filter. (line 52)
* -commit writes pending ISO image: Writing. (line 13)
* -commit_eject writes and ejects: Writing. (line 40)
@ -4022,7 +4026,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
* -compare_l reports ISO/disk differences: Navigate. (line 157)
* -compare_r reports ISO/disk differences: Navigate. (line 152)
* -compliance controls standard compliance: SetWrite. (line 14)
* -copyright_file sets copyright file name: SetWrite. (line 149)
* -copyright_file sets copyright file name: SetWrite. (line 152)
* -cp_rx copies file trees to disk: Restore. (line 104)
* -cpax copies files to disk: Restore. (line 100)
* -cpr inserts like with cp -r: Insert. (line 152)
@ -4037,11 +4041,11 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
(line 35)
* -drive_class controls drive accessability: Loading. (line 54)
* -du show directory size in ISO image: Navigate. (line 88)
* -dummy controls write simulation: SetWrite. (line 246)
* -dummy controls write simulation: SetWrite. (line 249)
* -dus show directory size in ISO image: Navigate. (line 92)
* -dusx show directory size on disk: Navigate. (line 101)
* -dux show directory size on disk: Navigate. (line 96)
* -dvd_obs set write block size: SetWrite. (line 233)
* -dvd_obs set write block size: SetWrite. (line 236)
* -eject ejects drive tray: Writing. (line 36)
* -end writes pending session and ends program: Scripting. (line 122)
* -errfile_log logs problematic disk files: Scripting. (line 84)
@ -4058,12 +4062,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 177)
* -format formats media: Writing. (line 69)
* -fs sets size of fifo: SetWrite. (line 250)
* -fs sets size of fifo: SetWrite. (line 253)
* -getfacl shows ACL in ISO image: Navigate. (line 69)
* -getfacl_r shows ACL in ISO image: Navigate. (line 76)
* -getfattr shows xattr in ISO image: Navigate. (line 80)
* -getfattr_r shows xattr in ISO image: Navigate. (line 84)
* -gid sets global ownership: SetWrite. (line 190)
* -gid sets global ownership: SetWrite. (line 193)
* -grow_blindly overides next writeable address: AqDrive. (line 44)
* -hardlinks controls handling of hard links: Loading. (line 110)
* -help prints help text: Scripting. (line 16)
@ -4106,30 +4110,30 @@ 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 180)
* -out_charset sets output character set: SetWrite. (line 183)
* -outdev aquires a drive for output: AqDrive. (line 29)
* -overwrite enables overwriting in ISO: SetInsert. (line 127)
* -pacifier controls pacifier text form: Emulation. (line 145)
* -padding sets amount of image padding: SetWrite. (line 263)
* -pacifier controls pacifier text form: Emulation. (line 146)
* -padding sets amount of image padding: SetWrite. (line 266)
* -page set terminal geometry: DialogCtl. (line 19)
* -paste_in copies file into disk file: Restore. (line 117)
* -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 168)
* -preparer_id sets preparer id: SetWrite. (line 171)
* -print prints text line: Scripting. (line 77)
* -print_size predicts image size: Inquiry. (line 69)
* -prog sets program name: Frontend. (line 30)
* -prog_help prints help text: Frontend. (line 33)
* -prompt prompts for enter key: Scripting. (line 80)
* -publisher sets publisher id: SetWrite. (line 108)
* -publisher sets publisher id: SetWrite. (line 111)
* -pvd_info shows image id strings: Inquiry. (line 81)
* -pwd tells working directory in ISO: Navigate. (line 20)
* -pwdx tells working directory on disk: Navigate. (line 23)
* -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 133)
(line 134)
* -reassure enables confirmation question: DialogCtl. (line 32)
* -report_about controls verbosity: Exception. (line 55)
* -return_with controls exit value: Exception. (line 39)
@ -4139,7 +4143,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 155)
* -scdbackup_tag enables scdbackup checksum tag: Emulation. (line 156)
* -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)
@ -4153,27 +4157,27 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
* -setfattr_r sets xattr in ISO image: Manip. (line 123)
* -show_stream shows data source and filters: Navigate. (line 162)
* -show_stream_r shows data source and filters: Navigate. (line 177)
* -speed set write speed: SetWrite. (line 206)
* -speed set write speed: SetWrite. (line 209)
* -split_size enables large file splitting: SetInsert. (line 140)
* -status shows current settings: Scripting. (line 25)
* -status_history_max curbs -status history: Scripting. (line 34)
* -stdio_sync controls stdio buffer: SetWrite. (line 240)
* -stream_recording controls defect management: SetWrite. (line 221)
* -system_id sets system id: SetWrite. (line 123)
* -stdio_sync controls stdio buffer: SetWrite. (line 243)
* -stream_recording controls defect management: SetWrite. (line 224)
* -system_id sets system id: SetWrite. (line 126)
* -tell_media_space reports free space: Inquiry. (line 77)
* -temp_mem_limit curbs memory consumption: Scripting. (line 70)
* -toc shows list of sessions: Inquiry. (line 18)
* -uid sets global ownership: SetWrite. (line 186)
* -uid sets global ownership: SetWrite. (line 189)
* -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 19)
* -volid sets volume id: SetWrite. (line 84)
* -volset_id sets volume set id: SetWrite. (line 103)
* -volume_date sets volume timestamp: SetWrite. (line 130)
* -volid sets volume id: SetWrite. (line 87)
* -volset_id sets volume set id: SetWrite. (line 106)
* -volume_date sets volume timestamp: SetWrite. (line 133)
* -xattr controls handling of xattr (EA): Loading. (line 150)
* -zisofs controls zisofs production: SetWrite. (line 194)
* -zisofs controls zisofs production: SetWrite. (line 197)

File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
@ -4196,15 +4200,15 @@ 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 155)
* Backup, scdbackup checksum tag, -scdbackup: Emulation. (line 156)
* Blank media, _definition: Media. (line 29)
* Blind growing, _definition: Methods. (line 40)
* Bootability, control, -boot_image: Bootable. (line 26)
* cdrecord, Emulation: Emulation. (line 100)
* cdrecord, Emulation: Emulation. (line 101)
* 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 180)
* Character Set, for output, -out_charset: SetWrite. (line 183)
* Character set, learn from image, -auto_charset: Loading. (line 99)
* Character Set, of terminal, -local_charset: Charset. (line 47)
* Closed media, _definition: Media. (line 43)
@ -4235,10 +4239,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 133)
* Emulation, cdrecord, -as: Emulation. (line 100)
* Emulation, .mkisofsrc, -read_mkisofsrc: Emulation. (line 134)
* Emulation, cdrecord, -as: Emulation. (line 101)
* Emulation, mkisofs, -as: Emulation. (line 16)
* Emulation, pacifier form, -pacifier: Emulation. (line 145)
* Emulation, pacifier form, -pacifier: Emulation. (line 146)
* Examples: Examples. (line 6)
* Filter, _definition: Filter. (line 6)
* Filter, apply to file tree, -set_filter_r: Filter. (line 84)
@ -4248,8 +4252,8 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Filter, show chain, -show_stream: Navigate. (line 162)
* Filter, show chains of tree, -show_stream_r: Navigate. (line 177)
* Filter, unregister, -unregister_filter: Filter. (line 48)
* Filter, zisofs parameters, -zisofs: SetWrite. (line 194)
* Group, global in ISO image, -gid: SetWrite. (line 190)
* Filter, zisofs parameters, -zisofs: SetWrite. (line 197)
* Group, global in ISO image, -gid: SetWrite. (line 193)
* Group, in ISO image, -chgrp: Manip. (line 50)
* Group, in ISO image, -chgrp_r: Manip. (line 55)
* Growing, _definition: Methods. (line 19)
@ -4258,16 +4262,16 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Image, _definition: Model. (line 9)
* Image, demand volume id, -assert_volid: Loading. (line 84)
* Image, discard pending changes, -rollback: Writing. (line 9)
* Image, set abstract file name, -abstract_file: SetWrite. (line 155)
* Image, set application id, -application_id: SetWrite. (line 114)
* Image, set biblio file name, -biblio_file: SetWrite. (line 162)
* Image, set copyright file name, -copyright_file: SetWrite. (line 149)
* Image, set preparer id, -preparer_id: SetWrite. (line 168)
* Image, set publisher id, -publisher: SetWrite. (line 108)
* Image, set system id, -system_id: SetWrite. (line 123)
* Image, set volume id, -volid: SetWrite. (line 84)
* Image, set volume set id, -volset_id: SetWrite. (line 103)
* Image, set volume timestamp, -volume_date: SetWrite. (line 130)
* Image, set abstract file name, -abstract_file: SetWrite. (line 158)
* Image, set application id, -application_id: SetWrite. (line 117)
* Image, set biblio file name, -biblio_file: SetWrite. (line 165)
* Image, set copyright file name, -copyright_file: SetWrite. (line 152)
* Image, set preparer id, -preparer_id: SetWrite. (line 171)
* Image, set publisher id, -publisher: SetWrite. (line 111)
* Image, set system id, -system_id: SetWrite. (line 126)
* Image, set volume id, -volid: SetWrite. (line 87)
* Image, set volume set id, -volset_id: SetWrite. (line 106)
* Image, set volume timestamp, -volume_date: SetWrite. (line 133)
* Image, show id strings, -pvd_info: Inquiry. (line 81)
* Insert, enable overwriting, -overwrite: SetInsert. (line 127)
* Insert, file exclusion absolute, -not_paths: SetInsert. (line 55)
@ -4324,7 +4328,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 44)
* Overwriteable media, _definition: Media. (line 14)
* Ownership, global in ISO image, -uid: SetWrite. (line 186)
* Ownership, global in ISO image, -uid: SetWrite. (line 189)
* Ownership, in ISO image, -chown: Manip. (line 42)
* Ownership, in ISO image, -chown_r: Manip. (line 47)
* Partition offset, _definiton: Bootable. (line 148)
@ -4396,22 +4400,22 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Verify, file checksum, -check_md5: Verify. (line 146)
* Verify, file tree checksums, -check_md5_r: Verify. (line 162)
* Verify, preset -check_media, -check_media_defaults: Verify. (line 40)
* Write, block size, -dvd_obs: SetWrite. (line 233)
* Write, block size, -dvd_obs: SetWrite. (line 236)
* Write, bootability, -boot_image: Bootable. (line 26)
* Write, buffer syncing, -stdio_sync: SetWrite. (line 240)
* Write, close media, -close: SetWrite. (line 257)
* Write, buffer syncing, -stdio_sync: SetWrite. (line 243)
* Write, close media, -close: SetWrite. (line 260)
* Write, compliance to specs, -compliance: SetWrite. (line 14)
* Write, defect management, -stream_recording: SetWrite. (line 221)
* Write, defect management, -stream_recording: SetWrite. (line 224)
* Write, enable Joliet, -joliet: SetWrite. (line 10)
* Write, fifo size, -fs: SetWrite. (line 250)
* Write, fifo size, -fs: SetWrite. (line 253)
* Write, free space, -tell_media_space: Inquiry. (line 77)
* Write, log problematic disk files, -errfile_log: Scripting. (line 84)
* Write, log written sessions, -session_log: Scripting. (line 104)
* Write, padding image, -padding: SetWrite. (line 263)
* Write, padding image, -padding: SetWrite. (line 266)
* Write, pending ISO image, -commit: Writing. (line 13)
* Write, predict image size, -print_size: Inquiry. (line 69)
* Write, set speed, -speed: SetWrite. (line 206)
* Write, simulation, -dummy: SetWrite. (line 246)
* Write, set speed, -speed: SetWrite. (line 209)
* Write, simulation, -dummy: SetWrite. (line 249)
* xattr, _definiton: Extras. (line 52)
* xattr, control handling, -xattr: Loading. (line 150)
* xattr, set in ISO image, -setfattr: Manip. (line 110)
@ -4442,39 +4446,39 @@ Node: CmdFind66490
Node: Filter76914
Node: Writing81263
Node: SetWrite87552
Node: Bootable100954
Node: Jigdo113261
Node: Charset117519
Node: Exception120270
Node: DialogCtl124785
Node: Inquiry127372
Node: Navigate131705
Node: Verify139600
Node: Restore148189
Node: Emulation154845
Node: Scripting163845
Node: Frontend169407
Node: Examples170702
Node: ExDevices171871
Node: ExCreate172505
Node: ExDialog173779
Node: ExGrowing175041
Node: ExModifying175843
Node: ExBootable176344
Node: ExCharset176891
Node: ExPseudo177719
Node: ExCdrecord178613
Node: ExMkisofs178928
Node: ExGrowisofs179931
Node: ExException181055
Node: ExTime181509
Node: ExIncBackup181968
Node: ExRestore185536
Node: ExRecovery186505
Node: Files187071
Node: Seealso188299
Node: Legal188823
Node: CommandIdx189745
Node: ConceptIdx203971
Node: Bootable101162
Node: Jigdo113469
Node: Charset117727
Node: Exception120478
Node: DialogCtl124993
Node: Inquiry127580
Node: Navigate131913
Node: Verify139808
Node: Restore148397
Node: Emulation155053
Node: Scripting164096
Node: Frontend169658
Node: Examples170953
Node: ExDevices172122
Node: ExCreate172756
Node: ExDialog174030
Node: ExGrowing175292
Node: ExModifying176094
Node: ExBootable176595
Node: ExCharset177142
Node: ExPseudo177970
Node: ExCdrecord178864
Node: ExMkisofs179179
Node: ExGrowisofs180182
Node: ExException181306
Node: ExTime181760
Node: ExIncBackup182219
Node: ExRestore185787
Node: ExRecovery186756
Node: Files187322
Node: Seealso188550
Node: Legal189074
Node: CommandIdx189996
Node: ConceptIdx204222

End Tag Table

View File

@ -2464,6 +2464,10 @@ but makes the image incapable of displaying its session history.
compliant to ISO 9660:1999. It can record long filenames for readers which
do not understand Rock Ridge.
@*
"old_empty" uses the old way of of giving block addresses in the range
of [0,31] to files with no own data content. The new way is to have
a dedicated block to which all such files will point.
@*
Default setting is
@*
"clear:only_iso_version:deep_paths:long_paths:no_j_force_dots:
@ -4220,6 +4224,8 @@ Option @minus{}append_partition is supported.
@minus{}untranslated_name_len number is
@minus{}compliance untranslated_name_len=number.
@*
@minus{}@minus{}old-empty is -compliance old_empty.
@*
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.

View File

@ -156,6 +156,11 @@ struct XorrisO { /* the global context of xorriso */
write first session to LBA 0 rather than 32.
*/
int do_old_empty; /* See -compliance old_empty
own data content: range [0,31]. The new way is to have
a dedicated block to which all such files will point.
*/
char scdbackup_tag_name[81];
char scdbackup_tag_time[19];
char scdbackup_tag_written[512];

View File

@ -1 +1 @@
#define Xorriso_timestamP "2011.01.26.132843"
#define Xorriso_timestamP "2011.01.26.133107"