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

New -compliance option iso_9660_level=number

Browse Source
This commit is contained in:
Thomas Schmitt 2010-12-25 07:15:36 +00:00
parent 90f92a137f
commit 35819f708a
8 changed files with 176 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libisoburn/trunk/xorriso/base_obj.c
View File

@ -119,6 +119,7 @@ int Xorriso_new(struct XorrisO ** xorriso,char *progname, int flag)
m->split_size= 0; m->split_size= 0;
strcpy(m->list_delimiter, "--"); strcpy(m->list_delimiter, "--");
m->ino_behavior= 7; m->ino_behavior= 7;
m->iso_level= 3;
m->do_joliet= 0; m->do_joliet= 0;
m->do_iso1999= 0; m->do_iso1999= 0;
m->do_aaip= 0; m->do_aaip= 0;

10
libisoburn/trunk/xorriso/emulators.c
View File

@ -970,11 +970,13 @@ int Xorriso_genisofs(struct XorrisO *xorriso, char *whom,
} }
if(iso_level == 4) if(iso_level == 4)
xorriso->do_iso1999= 1; xorriso->do_iso1999= 1;
else if(iso_level < 3) else {
xorriso->file_size_limit=
((off_t) 4) * ((off_t) 1024*1024*1024) - ((off_t) 1);
else
xorriso->file_size_limit= 0; xorriso->file_size_limit= 0;
sprintf(sfe, "iso_9660_level=%s", argv[i]);
ret= Xorriso_relax_compliance(xorriso, sfe, 0);
if(ret <= 0)
goto problem_handler_1;
}
} else if(strcmp(argv[i], "-input-charset")==0) { } else if(strcmp(argv[i], "-input-charset")==0) {
if(i+1>=argc) if(i+1>=argc)

30
libisoburn/trunk/xorriso/write_run.c
View File

@ -719,7 +719,7 @@ int Xorriso_write_session(struct XorrisO *xorriso, int flag)
&value_length, &value, 2 | 8); &value_length, &value, 2 | 8);
} }
isoburn_igopt_set_level(sopts, 3); isoburn_igopt_set_level(sopts, xorriso->iso_level);
ext= isoburn_igopt_rockridge | ext= isoburn_igopt_rockridge |
((!!xorriso->do_joliet) * isoburn_igopt_joliet) | ((!!xorriso->do_joliet) * isoburn_igopt_joliet) |
((!!xorriso->do_iso1999) * isoburn_igopt_iso1999) | ((!!xorriso->do_iso1999) * isoburn_igopt_iso1999) |
@ -1806,6 +1806,8 @@ int Xorriso_relax_compliance(struct XorrisO *xorriso, char *mode,
char *npt, *cpt; char *npt, *cpt;
int l, was, value, ret; int l, was, value, ret;
struct isoburn_imgen_opts *opts= NULL; struct isoburn_imgen_opts *opts= NULL;
char msg[160];
off_t limit;
was= xorriso->relax_compliance; was= xorriso->relax_compliance;
npt= cpt= mode; npt= cpt= mode;
@ -1947,6 +1949,27 @@ int Xorriso_relax_compliance(struct XorrisO *xorriso, char *mode,
} else if(l == 17 && strncmp(cpt, "iso_9660_1999_off", l) == 0) { } else if(l == 17 && strncmp(cpt, "iso_9660_1999_off", l) == 0) {
xorriso->do_iso1999= 0; xorriso->do_iso1999= 0;
} else if((l >= 15 && strncmp(cpt, "iso_9660_level=", 15) == 0)) {
value= 0;
sscanf(cpt + 15, "%d", &value);
limit= ((off_t) 4) * ((off_t) 1024*1024*1024) - ((off_t) 1);
if(value == 1 || value == 2) {
xorriso->iso_level= value;
if(xorriso->file_size_limit > limit)
xorriso->file_size_limit= limit;
} else if(value == 3) {
xorriso->iso_level= value;
if(xorriso->file_size_limit == limit)
xorriso->file_size_limit= Xorriso_default_file_size_limiT;
} else {
sprintf(msg,
"-compliance iso_9660_level=%d : Only 1, 2, or 3 are permissible",
value);
Xorriso_msgs_submit(xorriso, 0, msg, 0, "FAILURE", 0);
xorriso->relax_compliance= was;
return(0);
}
} else if((l == 8 && strncmp(cpt, "iso_9660", l) == 0) || } else if((l == 8 && strncmp(cpt, "iso_9660", l) == 0) ||
(l == 11 && strncmp(cpt, "iso_9660_on", l) == 0)) { (l == 11 && strncmp(cpt, "iso_9660_on", l) == 0)) {
/* may have a meaning in future */; /* may have a meaning in future */;
@ -1986,6 +2009,8 @@ int Xorriso_get_relax_text(struct XorrisO *xorriso, char mode[1024],
return(1); return(1);
} }
strcpy(mode, "clear"); strcpy(mode, "clear");
if(xorriso->iso_level != 3)
sprintf(mode + strlen(mode), ":iso_9660_level=%d", xorriso->iso_level);
if(r & isoburn_igopt_omit_version_numbers) if(r & isoburn_igopt_omit_version_numbers)
strcat(mode, ":omit_version"); strcat(mode, ":omit_version");
if(r & isoburn_igopt_only_iso_versions) if(r & isoburn_igopt_only_iso_versions)
@ -2028,7 +2053,8 @@ int Xorriso_get_relax_text(struct XorrisO *xorriso, char mode[1024],
sprintf(mode + strlen(mode), ":iso_9660_1999"); sprintf(mode + strlen(mode), ":iso_9660_1999");
return(1 + return(1 +
(r == Xorriso_relax_compliance_defaulT && !(xorriso->no_emul_toc & 1) (r == Xorriso_relax_compliance_defaulT && !(xorriso->no_emul_toc & 1)
&& xorriso->untranslated_name_len == 0 && !xorriso->do_iso1999)); && xorriso->untranslated_name_len == 0 && !xorriso->do_iso1999 &&
xorriso->iso_level == 3));
} }

34
libisoburn/trunk/xorriso/xorriso.1
View File

@ -9,7 +9,7 @@
.\" First parameter, NAME, should be all caps .\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1) .\" other parameters are allowed: see man(7), man(1)
.TH XORRISO 1 "Dec 22, 2010" .TH XORRISO 1 "Dec 24, 2010"
.\" Please adjust this date whenever revising the manpage. .\" Please adjust this date whenever revising the manpage.
.\" .\"
.\" Some roff macros, for reference: .\" Some roff macros, for reference:
@ -1992,23 +1992,29 @@ can be revoked individually by appending "_off". Like "deep_paths_off".
.br .br
Rule keywords are: Rule keywords are:
.br .br
"omit_version" do not add versions (";1") to ISO and Joliet file names. "iso_9660_level="number chooses level 1 with ISO names of the form 8.3
and -file_size_limit <= 4g - 1, or level 2 with ISO names up to
length 32 and the same -file_size_limit, or level 3 with ISO names up to
length 32 and -file_size_limit >= 400g -200k. If necessary -file_size_limit
gets adjusted.
.br .br
"only_iso_version" do not add versions (";1") to Joliet file names. "omit_version" does not add versions (";1") to ISO and Joliet file names.
.br .br
"deep_paths" allow ISO file paths deeper than 8 levels. "only_iso_version" does not add versions (";1") to Joliet file names.
.br .br
"long_paths" allow ISO file paths longer than 255 characters. "deep_paths" allows ISO file paths deeper than 8 levels.
.br .br
"long_names" allow up to 37 characters with ISO file names. "long_paths" allows ISO file paths longer than 255 characters.
.br .br
"no_force_dots" do not add a dot to ISO file names which have none. "long_names" allows up to 37 characters with ISO file names.
.br .br
"no_j_force_dots" do not add a dot to Joliet file names which have none. "no_force_dots" does not add a dot to ISO file names which have none.
.br .br
"lowercase" allow lowercase characters in ISO file names. "no_j_force_dots" does not add a dot to Joliet file names which have none.
.br .br
"full_ascii" allow all ASCII characters in ISO file names. "lowercase" allows lowercase characters in ISO file names.
.br
"full_ascii" allows all ASCII characters in ISO file names.
.br .br
"untranslated_names" might be dangerous for inadverted reader programs "untranslated_names" might be dangerous for inadverted reader programs
which rely on the restriction to at most 37 characters in ISO file names. which rely on the restriction to at most 37 characters in ISO file names.
@ -2020,14 +2026,14 @@ fail deliberately.
for the length of file names. 0 disables this feature, -1 chooses maximum for the length of file names. 0 disables this feature, -1 chooses maximum
length limit, numbers larger than 0 give the desired length limit. length limit, numbers larger than 0 give the desired length limit.
.br .br
"joliet_long_paths" allow Joliet paths longer than 240 characters. "joliet_long_paths" allows Joliet paths longer than 240 characters.
.br .br
"always_gmt" store timestamps in GMT representation with timezone 0. "always_gmt" stores timestamps in GMT representation with timezone 0.
.br .br
"rec_mtime" record with ISO files the disk file's mtime and not the "rec_mtime" records with ISO files the disk file's mtime and not the
creation time of the image. creation time of the image.
.br .br
"new_rr" use Rock Ridge version 1.12 (suitable for GNU/Linux but not for older "new_rr" uses Rock Ridge version 1.12 (suitable for GNU/Linux but not for older
FreeBSD or for Solaris). This implies "aaip_susp_1_10_off" which may be changed FreeBSD or for Solaris). This implies "aaip_susp_1_10_off" which may be changed
by subsequent "aaip_susp_1_10". by subsequent "aaip_susp_1_10".
.br .br

191
libisoburn/trunk/xorriso/xorriso.info
View File

@ -1794,17 +1794,24 @@ will be written according to the setting of option -acl.
the following relaxation rules can be revoked individually by the following relaxation rules can be revoked individually by
appending "_off". Like "deep_paths_off". appending "_off". Like "deep_paths_off".
Rule keywords are: Rule keywords are:
"omit_version" do not add versions (";1") to ISO and Joliet file "iso_9660_level="number chooses level 1 with ISO names of the form
8.3 and -file_size_limit <= 4g - 1, or level 2 with ISO names up to
length 32 and the same -file_size_limit, or level 3 with ISO names
up to length 32 and -file_size_limit >= 400g -200k. If necessary
-file_size_limit gets adjusted.
"omit_version" does not add versions (";1") to ISO and Joliet file
names. names.
"only_iso_version" do not add versions (";1") to Joliet file names. "only_iso_version" does not add versions (";1") to Joliet file
"deep_paths" allow ISO file paths deeper than 8 levels. names.
"long_paths" allow ISO file paths longer than 255 characters. "deep_paths" allows ISO file paths deeper than 8 levels.
"long_names" allow up to 37 characters with ISO file names. "long_paths" allows ISO file paths longer than 255 characters.
"no_force_dots" do not add a dot to ISO file names which have none. "long_names" allows up to 37 characters with ISO file names.
"no_j_force_dots" do not add a dot to Joliet file names which have "no_force_dots" does not add a dot to ISO file names which have
none. none.
"lowercase" allow lowercase characters in ISO file names. "no_j_force_dots" does not add a dot to Joliet file names which
"full_ascii" allow all ASCII characters in ISO file names. have none.
"lowercase" allows lowercase characters in ISO file names.
"full_ascii" allows all ASCII characters in ISO file names.
"untranslated_names" might be dangerous for inadverted reader "untranslated_names" might be dangerous for inadverted reader
programs which rely on the restriction to at most 37 characters in programs which rely on the restriction to at most 37 characters in
ISO file names. This option allows ISO file names up to 96 ISO file names. This option allows ISO file names up to 96
@ -1814,12 +1821,12 @@ will be written according to the setting of option -acl.
smaller limit for the length of file names. 0 disables this smaller limit for the length of file names. 0 disables this
feature, -1 chooses maximum length limit, numbers larger than 0 feature, -1 chooses maximum length limit, numbers larger than 0
give the desired length limit. give the desired length limit.
"joliet_long_paths" allow Joliet paths longer than 240 characters. "joliet_long_paths" allows Joliet paths longer than 240 characters.
"always_gmt" store timestamps in GMT representation with timezone "always_gmt" stores timestamps in GMT representation with timezone
0. 0.
"rec_mtime" record with ISO files the disk file's mtime and not the "rec_mtime" records with ISO files the disk file's mtime and not
creation time of the image. the creation time of the image.
"new_rr" use Rock Ridge version 1.12 (suitable for GNU/Linux but "new_rr" uses Rock Ridge version 1.12 (suitable for GNU/Linux but
not for older FreeBSD or for Solaris). This implies not for older FreeBSD or for Solaris). This implies
"aaip_susp_1_10_off" which may be changed by subsequent "aaip_susp_1_10_off" which may be changed by subsequent
"aaip_susp_1_10". "aaip_susp_1_10".
@ -3949,7 +3956,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
* # starts a comment line: Scripting. (line 128) * # starts a comment line: Scripting. (line 128)
* -abort_on controls abort on error: Exception. (line 27) * -abort_on controls abort on error: Exception. (line 27)
* -abstract_file sets abstract file name: SetWrite. (line 143) * -abstract_file sets abstract file name: SetWrite. (line 150)
* -acl controls handling of ACLs: Loading. (line 142) * -acl controls handling of ACLs: Loading. (line 142)
* -add inserts one or more paths: Insert. (line 42) * -add inserts one or more paths: Insert. (line 42)
* -add_plainly inserts one or more paths: Insert. (line 61) * -add_plainly inserts one or more paths: Insert. (line 61)
@ -3957,13 +3964,13 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
* -alter_date_r sets timestamps in ISO image: Manip. (line 166) * -alter_date_r sets timestamps in ISO image: Manip. (line 166)
* -append_partition adds arbitrary file after image end: Bootable. * -append_partition adds arbitrary file after image end: Bootable.
(line 186) (line 186)
* -application_id sets application id: SetWrite. (line 102) * -application_id sets application id: SetWrite. (line 109)
* -as emulates mkisofs or cdrecord: Emulation. (line 13) * -as emulates mkisofs or cdrecord: Emulation. (line 13)
* -assert_volid rejects undesired images: Loading. (line 84) * -assert_volid rejects undesired images: Loading. (line 84)
* -auto_charset learns character set from image: Loading. (line 99) * -auto_charset learns character set from image: Loading. (line 99)
* -backslash_codes enables backslash conversion: Scripting. (line 45) * -backslash_codes enables backslash conversion: Scripting. (line 45)
* -ban_stdio_write demands real drive: Loading. (line 239) * -ban_stdio_write demands real drive: Loading. (line 239)
* -biblio_file sets biblio file name: SetWrite. (line 150) * -biblio_file sets biblio file name: SetWrite. (line 157)
* -blank erases media: Writing. (line 45) * -blank erases media: Writing. (line 45)
* -boot_image controls bootability: Bootable. (line 26) * -boot_image controls bootability: Bootable. (line 26)
* -calm_drive reduces drive activity: Loading. (line 228) * -calm_drive reduces drive activity: Loading. (line 228)
@ -3980,7 +3987,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
* -chmod_r sets permissions in ISO image: Manip. (line 70) * -chmod_r sets permissions in ISO image: Manip. (line 70)
* -chown sets ownership in ISO image: Manip. (line 42) * -chown sets ownership in ISO image: Manip. (line 42)
* -chown_r sets ownership in ISO image: Manip. (line 47) * -chown_r sets ownership in ISO image: Manip. (line 47)
* -close controls media closing: SetWrite. (line 245) * -close controls media closing: SetWrite. (line 252)
* -close_filter_list bans filter registration: Filter. (line 52) * -close_filter_list bans filter registration: Filter. (line 52)
* -commit writes pending ISO image: Writing. (line 13) * -commit writes pending ISO image: Writing. (line 13)
* -commit_eject writes and ejects: Writing. (line 40) * -commit_eject writes and ejects: Writing. (line 40)
@ -3988,7 +3995,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
* -compare_l reports ISO/disk differences: Navigate. (line 157) * -compare_l reports ISO/disk differences: Navigate. (line 157)
* -compare_r reports ISO/disk differences: Navigate. (line 152) * -compare_r reports ISO/disk differences: Navigate. (line 152)
* -compliance controls standard compliance: SetWrite. (line 14) * -compliance controls standard compliance: SetWrite. (line 14)
* -copyright_file sets copyright file name: SetWrite. (line 137) * -copyright_file sets copyright file name: SetWrite. (line 144)
* -cp_rx copies file trees to disk: Restore. (line 104) * -cp_rx copies file trees to disk: Restore. (line 104)
* -cpax copies files to disk: Restore. (line 100) * -cpax copies files to disk: Restore. (line 100)
* -cpr inserts like with cp -r: Insert. (line 152) * -cpr inserts like with cp -r: Insert. (line 152)
@ -4003,11 +4010,11 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
(line 35) (line 35)
* -drive_class controls drive accessability: Loading. (line 54) * -drive_class controls drive accessability: Loading. (line 54)
* -du show directory size in ISO image: Navigate. (line 88) * -du show directory size in ISO image: Navigate. (line 88)
* -dummy controls write simulation: SetWrite. (line 234) * -dummy controls write simulation: SetWrite. (line 241)
* -dus show directory size in ISO image: Navigate. (line 92) * -dus show directory size in ISO image: Navigate. (line 92)
* -dusx show directory size on disk: Navigate. (line 101) * -dusx show directory size on disk: Navigate. (line 101)
* -dux show directory size on disk: Navigate. (line 96) * -dux show directory size on disk: Navigate. (line 96)
* -dvd_obs set write block size: SetWrite. (line 221) * -dvd_obs set write block size: SetWrite. (line 228)
* -eject ejects drive tray: Writing. (line 36) * -eject ejects drive tray: Writing. (line 36)
* -end writes pending session and ends program: Scripting. (line 122) * -end writes pending session and ends program: Scripting. (line 122)
* -errfile_log logs problematic disk files: Scripting. (line 84) * -errfile_log logs problematic disk files: Scripting. (line 84)
@ -4024,12 +4031,12 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
* -follow softlinks and mount points: SetInsert. (line 76) * -follow softlinks and mount points: SetInsert. (line 76)
* -for_backup -acl,-xattr,-hardlinks,-md5: Loading. (line 177) * -for_backup -acl,-xattr,-hardlinks,-md5: Loading. (line 177)
* -format formats media: Writing. (line 69) * -format formats media: Writing. (line 69)
* -fs sets size of fifo: SetWrite. (line 238) * -fs sets size of fifo: SetWrite. (line 245)
* -getfacl shows ACL in ISO image: Navigate. (line 69) * -getfacl shows ACL in ISO image: Navigate. (line 69)
* -getfacl_r shows ACL in ISO image: Navigate. (line 76) * -getfacl_r shows ACL in ISO image: Navigate. (line 76)
* -getfattr shows xattr in ISO image: Navigate. (line 80) * -getfattr shows xattr in ISO image: Navigate. (line 80)
* -getfattr_r shows xattr in ISO image: Navigate. (line 84) * -getfattr_r shows xattr in ISO image: Navigate. (line 84)
* -gid sets global ownership: SetWrite. (line 178) * -gid sets global ownership: SetWrite. (line 185)
* -grow_blindly overides next writeable address: AqDrive. (line 44) * -grow_blindly overides next writeable address: AqDrive. (line 44)
* -hardlinks controls handling of hard links: Loading. (line 110) * -hardlinks controls handling of hard links: Loading. (line 110)
* -help prints help text: Scripting. (line 16) * -help prints help text: Scripting. (line 16)
@ -4072,23 +4079,23 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
* -not_paths sets absolute exclusion paths: SetInsert. (line 55) * -not_paths sets absolute exclusion paths: SetInsert. (line 55)
* -options_from_file reads commands from file: Scripting. (line 12) * -options_from_file reads commands from file: Scripting. (line 12)
* -osirrox enables ISO-to-disk copying: Restore. (line 18) * -osirrox enables ISO-to-disk copying: Restore. (line 18)
* -out_charset sets output character set: SetWrite. (line 168) * -out_charset sets output character set: SetWrite. (line 175)
* -outdev aquires a drive for output: AqDrive. (line 29) * -outdev aquires a drive for output: AqDrive. (line 29)
* -overwrite enables overwriting in ISO: SetInsert. (line 127) * -overwrite enables overwriting in ISO: SetInsert. (line 127)
* -pacifier controls pacifier text form: Emulation. (line 134) * -pacifier controls pacifier text form: Emulation. (line 134)
* -padding sets amount of image padding: SetWrite. (line 251) * -padding sets amount of image padding: SetWrite. (line 258)
* -page set terminal geometry: DialogCtl. (line 15) * -page set terminal geometry: DialogCtl. (line 15)
* -paste_in copies file into disk file: Restore. (line 117) * -paste_in copies file into disk file: Restore. (line 117)
* -path_list inserts paths from disk file: Insert. (line 75) * -path_list inserts paths from disk file: Insert. (line 75)
* -pathspecs sets meaning of = with -add: SetInsert. (line 118) * -pathspecs sets meaning of = with -add: SetInsert. (line 118)
* -pkt_output consolidates text output: Frontend. (line 7) * -pkt_output consolidates text output: Frontend. (line 7)
* -preparer_id sets preparer id: SetWrite. (line 156) * -preparer_id sets preparer id: SetWrite. (line 163)
* -print prints text line: Scripting. (line 77) * -print prints text line: Scripting. (line 77)
* -print_size predicts image size: Inquiry. (line 69) * -print_size predicts image size: Inquiry. (line 69)
* -prog sets program name: Frontend. (line 30) * -prog sets program name: Frontend. (line 30)
* -prog_help prints help text: Frontend. (line 33) * -prog_help prints help text: Frontend. (line 33)
* -prompt prompts for enter key: Scripting. (line 80) * -prompt prompts for enter key: Scripting. (line 80)
* -publisher sets publisher id: SetWrite. (line 96) * -publisher sets publisher id: SetWrite. (line 103)
* -pvd_info shows image id strings: Inquiry. (line 78) * -pvd_info shows image id strings: Inquiry. (line 78)
* -pwd tells working directory in ISO: Navigate. (line 20) * -pwd tells working directory in ISO: Navigate. (line 20)
* -pwdx tells working directory on disk: Navigate. (line 23) * -pwdx tells working directory on disk: Navigate. (line 23)
@ -4119,27 +4126,27 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
* -setfattr_r sets xattr in ISO image: Manip. (line 123) * -setfattr_r sets xattr in ISO image: Manip. (line 123)
* -show_stream shows data source and filters: Navigate. (line 162) * -show_stream shows data source and filters: Navigate. (line 162)
* -show_stream_r shows data source and filters: Navigate. (line 177) * -show_stream_r shows data source and filters: Navigate. (line 177)
* -speed set write speed: SetWrite. (line 194) * -speed set write speed: SetWrite. (line 201)
* -split_size enables large file splitting: SetInsert. (line 140) * -split_size enables large file splitting: SetInsert. (line 140)
* -status shows current settings: Scripting. (line 25) * -status shows current settings: Scripting. (line 25)
* -status_history_max curbs -status history: Scripting. (line 34) * -status_history_max curbs -status history: Scripting. (line 34)
* -stdio_sync controls stdio buffer: SetWrite. (line 228) * -stdio_sync controls stdio buffer: SetWrite. (line 235)
* -stream_recording controls defect management: SetWrite. (line 209) * -stream_recording controls defect management: SetWrite. (line 216)
* -system_id sets system id: SetWrite. (line 111) * -system_id sets system id: SetWrite. (line 118)
* -tell_media_space reports free space: Inquiry. (line 74) * -tell_media_space reports free space: Inquiry. (line 74)
* -temp_mem_limit curbs memory consumption: Scripting. (line 70) * -temp_mem_limit curbs memory consumption: Scripting. (line 70)
* -toc shows list of sessions: Inquiry. (line 18) * -toc shows list of sessions: Inquiry. (line 18)
* -uid sets global ownership: SetWrite. (line 174) * -uid sets global ownership: SetWrite. (line 181)
* -update inserts path if different: Insert. (line 99) * -update inserts path if different: Insert. (line 99)
* -update_l inserts paths if different: Insert. (line 121) * -update_l inserts paths if different: Insert. (line 121)
* -update_r inserts paths if different: Insert. (line 110) * -update_r inserts paths if different: Insert. (line 110)
* -use_readline enables readline for dialog: DialogCtl. (line 24) * -use_readline enables readline for dialog: DialogCtl. (line 24)
* -version prints help text: Scripting. (line 19) * -version prints help text: Scripting. (line 19)
* -volid sets volume id: SetWrite. (line 72) * -volid sets volume id: SetWrite. (line 79)
* -volset_id sets volume set id: SetWrite. (line 91) * -volset_id sets volume set id: SetWrite. (line 98)
* -volume_date sets volume timestamp: SetWrite. (line 118) * -volume_date sets volume timestamp: SetWrite. (line 125)
* -xattr controls handling of xattr (EA): Loading. (line 150) * -xattr controls handling of xattr (EA): Loading. (line 150)
* -zisofs controls zisofs production: SetWrite. (line 182) * -zisofs controls zisofs production: SetWrite. (line 189)
 
File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
@ -4170,7 +4177,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Character Set, _definition: Charset. (line 6) * Character Set, _definition: Charset. (line 6)
* Character Set, for input, -in_charset: Loading. (line 92) * Character Set, for input, -in_charset: Loading. (line 92)
* Character Set, for input/output, -charset: Charset. (line 43) * Character Set, for input/output, -charset: Charset. (line 43)
* Character Set, for output, -out_charset: SetWrite. (line 168) * Character Set, for output, -out_charset: SetWrite. (line 175)
* Character set, learn from image, -auto_charset: Loading. (line 99) * Character set, learn from image, -auto_charset: Loading. (line 99)
* Character Set, of terminal, -local_charset: Charset. (line 47) * Character Set, of terminal, -local_charset: Charset. (line 47)
* Closed media, _definition: Media. (line 43) * Closed media, _definition: Media. (line 43)
@ -4214,8 +4221,8 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Filter, show chain, -show_stream: Navigate. (line 162) * Filter, show chain, -show_stream: Navigate. (line 162)
* Filter, show chains of tree, -show_stream_r: Navigate. (line 177) * Filter, show chains of tree, -show_stream_r: Navigate. (line 177)
* Filter, unregister, -unregister_filter: Filter. (line 48) * Filter, unregister, -unregister_filter: Filter. (line 48)
* Filter, zisofs parameters, -zisofs: SetWrite. (line 182) * Filter, zisofs parameters, -zisofs: SetWrite. (line 189)
* Group, global in ISO image, -gid: SetWrite. (line 178) * Group, global in ISO image, -gid: SetWrite. (line 185)
* Group, in ISO image, -chgrp: Manip. (line 50) * Group, in ISO image, -chgrp: Manip. (line 50)
* Group, in ISO image, -chgrp_r: Manip. (line 55) * Group, in ISO image, -chgrp_r: Manip. (line 55)
* Growing, _definition: Methods. (line 19) * Growing, _definition: Methods. (line 19)
@ -4224,16 +4231,16 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Image, _definition: Model. (line 9) * Image, _definition: Model. (line 9)
* Image, demand volume id, -assert_volid: Loading. (line 84) * Image, demand volume id, -assert_volid: Loading. (line 84)
* Image, discard pending changes, -rollback: Writing. (line 9) * Image, discard pending changes, -rollback: Writing. (line 9)
* Image, set abstract file name, -abstract_file: SetWrite. (line 143) * Image, set abstract file name, -abstract_file: SetWrite. (line 150)
* Image, set application id, -application_id: SetWrite. (line 102) * Image, set application id, -application_id: SetWrite. (line 109)
* Image, set biblio file name, -biblio_file: SetWrite. (line 150) * Image, set biblio file name, -biblio_file: SetWrite. (line 157)
* Image, set copyright file name, -copyright_file: SetWrite. (line 137) * Image, set copyright file name, -copyright_file: SetWrite. (line 144)
* Image, set preparer id, -preparer_id: SetWrite. (line 156) * Image, set preparer id, -preparer_id: SetWrite. (line 163)
* Image, set publisher id, -publisher: SetWrite. (line 96) * Image, set publisher id, -publisher: SetWrite. (line 103)
* Image, set system id, -system_id: SetWrite. (line 111) * Image, set system id, -system_id: SetWrite. (line 118)
* Image, set volume id, -volid: SetWrite. (line 72) * Image, set volume id, -volid: SetWrite. (line 79)
* Image, set volume set id, -volset_id: SetWrite. (line 91) * Image, set volume set id, -volset_id: SetWrite. (line 98)
* Image, set volume timestamp, -volume_date: SetWrite. (line 118) * Image, set volume timestamp, -volume_date: SetWrite. (line 125)
* Image, show id strings, -pvd_info: Inquiry. (line 78) * Image, show id strings, -pvd_info: Inquiry. (line 78)
* Insert, enable overwriting, -overwrite: SetInsert. (line 127) * Insert, enable overwriting, -overwrite: SetInsert. (line 127)
* Insert, file exclusion absolute, -not_paths: SetInsert. (line 55) * Insert, file exclusion absolute, -not_paths: SetInsert. (line 55)
@ -4290,7 +4297,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Navigate, tell ISO working directory, -pwd: Navigate. (line 20) * Navigate, tell ISO working directory, -pwd: Navigate. (line 20)
* Next writeable address, -grow_blindly: AqDrive. (line 44) * Next writeable address, -grow_blindly: AqDrive. (line 44)
* Overwriteable media, _definition: Media. (line 14) * Overwriteable media, _definition: Media. (line 14)
* Ownership, global in ISO image, -uid: SetWrite. (line 174) * Ownership, global in ISO image, -uid: SetWrite. (line 181)
* Ownership, in ISO image, -chown: Manip. (line 42) * Ownership, in ISO image, -chown: Manip. (line 42)
* Ownership, in ISO image, -chown_r: Manip. (line 47) * Ownership, in ISO image, -chown_r: Manip. (line 47)
* Partition offset, _definiton: Bootable. (line 148) * Partition offset, _definiton: Bootable. (line 148)
@ -4362,22 +4369,22 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Verify, file checksum, -check_md5: Verify. (line 146) * Verify, file checksum, -check_md5: Verify. (line 146)
* Verify, file tree checksums, -check_md5_r: Verify. (line 162) * Verify, file tree checksums, -check_md5_r: Verify. (line 162)
* Verify, preset -check_media, -check_media_defaults: Verify. (line 40) * Verify, preset -check_media, -check_media_defaults: Verify. (line 40)
* Write, block size, -dvd_obs: SetWrite. (line 221) * Write, block size, -dvd_obs: SetWrite. (line 228)
* Write, bootability, -boot_image: Bootable. (line 26) * Write, bootability, -boot_image: Bootable. (line 26)
* Write, buffer syncing, -stdio_sync: SetWrite. (line 228) * Write, buffer syncing, -stdio_sync: SetWrite. (line 235)
* Write, close media, -close: SetWrite. (line 245) * Write, close media, -close: SetWrite. (line 252)
* Write, compliance to specs, -compliance: SetWrite. (line 14) * Write, compliance to specs, -compliance: SetWrite. (line 14)
* Write, defect management, -stream_recording: SetWrite. (line 209) * Write, defect management, -stream_recording: SetWrite. (line 216)
* Write, enable Joliet, -joliet: SetWrite. (line 10) * Write, enable Joliet, -joliet: SetWrite. (line 10)
* Write, fifo size, -fs: SetWrite. (line 238) * Write, fifo size, -fs: SetWrite. (line 245)
* Write, free space, -tell_media_space: Inquiry. (line 74) * Write, free space, -tell_media_space: Inquiry. (line 74)
* Write, log problematic disk files, -errfile_log: Scripting. (line 84) * Write, log problematic disk files, -errfile_log: Scripting. (line 84)
* Write, log written sessions, -session_log: Scripting. (line 104) * Write, log written sessions, -session_log: Scripting. (line 104)
* Write, padding image, -padding: SetWrite. (line 251) * Write, padding image, -padding: SetWrite. (line 258)
* Write, pending ISO image, -commit: Writing. (line 13) * Write, pending ISO image, -commit: Writing. (line 13)
* Write, predict image size, -print_size: Inquiry. (line 69) * Write, predict image size, -print_size: Inquiry. (line 69)
* Write, set speed, -speed: SetWrite. (line 194) * Write, set speed, -speed: SetWrite. (line 201)
* Write, simulation, -dummy: SetWrite. (line 234) * Write, simulation, -dummy: SetWrite. (line 241)
* xattr, _definiton: Extras. (line 52) * xattr, _definiton: Extras. (line 52)
* xattr, control handling, -xattr: Loading. (line 150) * xattr, control handling, -xattr: Loading. (line 150)
* xattr, set in ISO image, -setfattr: Manip. (line 110) * xattr, set in ISO image, -setfattr: Manip. (line 110)
@ -4408,39 +4415,39 @@ Node: CmdFind66490
Node: Filter76914 Node: Filter76914
Node: Writing81263 Node: Writing81263
Node: SetWrite87552 Node: SetWrite87552
Node: Bootable100270 Node: Bootable100621
Node: Jigdo112577 Node: Jigdo112928
Node: Charset116835 Node: Charset117186
Node: Exception119586 Node: Exception119937
Node: DialogCtl124101 Node: DialogCtl124452
Node: Inquiry126446 Node: Inquiry126797
Node: Navigate130576 Node: Navigate130927
Node: Verify138471 Node: Verify138822
Node: Restore147060 Node: Restore147411
Node: Emulation153716 Node: Emulation154067
Node: Scripting162090 Node: Scripting162441
Node: Frontend167652 Node: Frontend168003
Node: Examples168947 Node: Examples169298
Node: ExDevices170116 Node: ExDevices170467
Node: ExCreate170750 Node: ExCreate171101
Node: ExDialog172024 Node: ExDialog172375
Node: ExGrowing173286 Node: ExGrowing173637
Node: ExModifying174088 Node: ExModifying174439
Node: ExBootable174589 Node: ExBootable174940
Node: ExCharset175136 Node: ExCharset175487
Node: ExPseudo175964 Node: ExPseudo176315
Node: ExCdrecord176858 Node: ExCdrecord177209
Node: ExMkisofs177173 Node: ExMkisofs177524
Node: ExGrowisofs178176 Node: ExGrowisofs178527
Node: ExException179300 Node: ExException179651
Node: ExTime179754 Node: ExTime180105
Node: ExIncBackup180213 Node: ExIncBackup180564
Node: ExRestore183685 Node: ExRestore184036
Node: ExRecovery184654 Node: ExRecovery185005
Node: Files185220 Node: Files185571
Node: Seealso186448 Node: Seealso186799
Node: Legal186972 Node: Legal187323
Node: CommandIdx187894 Node: CommandIdx188245
Node: ConceptIdx202120 Node: ConceptIdx202471
 
End Tag Table End Tag Table

34
libisoburn/trunk/xorriso/xorriso.texi
View File

@ -44,7 +44,7 @@
@c man .\" First parameter, NAME, should be all caps @c man .\" First parameter, NAME, should be all caps
@c man .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection @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 .\" other parameters are allowed: see man(7), man(1)
@c man .TH XORRISO 1 "Dec 22, 2010" @c man .TH XORRISO 1 "Dec 24, 2010"
@c man .\" Please adjust this date whenever revising the manpage. @c man .\" Please adjust this date whenever revising the manpage.
@c man .\" @c man .\"
@c man .\" Some roff macros, for reference: @c man .\" Some roff macros, for reference:
@ -2400,23 +2400,29 @@ can be revoked individually by appending "_off". Like "deep_paths_off".
@* @*
Rule keywords are: Rule keywords are:
@* @*
"omit_version" do not add versions (";1") to ISO and Joliet file names. "iso_9660_level="number chooses level 1 with ISO names of the form 8.3
and -file_size_limit <= 4g - 1, or level 2 with ISO names up to
length 32 and the same -file_size_limit, or level 3 with ISO names up to
length 32 and -file_size_limit >= 400g -200k. If necessary -file_size_limit
gets adjusted.
@* @*
"only_iso_version" do not add versions (";1") to Joliet file names. "omit_version" does not add versions (";1") to ISO and Joliet file names.
@* @*
"deep_paths" allow ISO file paths deeper than 8 levels. "only_iso_version" does not add versions (";1") to Joliet file names.
@* @*
"long_paths" allow ISO file paths longer than 255 characters. "deep_paths" allows ISO file paths deeper than 8 levels.
@* @*
"long_names" allow up to 37 characters with ISO file names. "long_paths" allows ISO file paths longer than 255 characters.
@* @*
"no_force_dots" do not add a dot to ISO file names which have none. "long_names" allows up to 37 characters with ISO file names.
@* @*
"no_j_force_dots" do not add a dot to Joliet file names which have none. "no_force_dots" does not add a dot to ISO file names which have none.
@* @*
"lowercase" allow lowercase characters in ISO file names. "no_j_force_dots" does not add a dot to Joliet file names which have none.
@* @*
"full_ascii" allow all ASCII characters in ISO file names. "lowercase" allows lowercase characters in ISO file names.
@*
"full_ascii" allows all ASCII characters in ISO file names.
@* @*
"untranslated_names" might be dangerous for inadverted reader programs "untranslated_names" might be dangerous for inadverted reader programs
which rely on the restriction to at most 37 characters in ISO file names. which rely on the restriction to at most 37 characters in ISO file names.
@ -2428,14 +2434,14 @@ fail deliberately.
for the length of file names. 0 disables this feature, -1 chooses maximum for the length of file names. 0 disables this feature, -1 chooses maximum
length limit, numbers larger than 0 give the desired length limit. length limit, numbers larger than 0 give the desired length limit.
@* @*
"joliet_long_paths" allow Joliet paths longer than 240 characters. "joliet_long_paths" allows Joliet paths longer than 240 characters.
@* @*
"always_gmt" store timestamps in GMT representation with timezone 0. "always_gmt" stores timestamps in GMT representation with timezone 0.
@* @*
"rec_mtime" record with ISO files the disk file's mtime and not the "rec_mtime" records with ISO files the disk file's mtime and not the
creation time of the image. creation time of the image.
@* @*
"new_rr" use Rock Ridge version 1.12 (suitable for GNU/Linux but not for older "new_rr" uses Rock Ridge version 1.12 (suitable for GNU/Linux but not for older
FreeBSD or for Solaris). This implies "aaip_susp_1_10_off" which may be changed FreeBSD or for Solaris). This implies "aaip_susp_1_10_off" which may be changed
by subsequent "aaip_susp_1_10". by subsequent "aaip_susp_1_10".
@* @*

1
libisoburn/trunk/xorriso/xorriso_private.h
View File

@ -123,6 +123,7 @@ struct XorrisO { /* the global context of xorriso */
Do not create or use hln arrays if sort_lba_on Do not create or use hln arrays if sort_lba_on
*/ */
int iso_level;
int do_joliet; int do_joliet;
int do_iso1999; int do_iso1999;

2
libisoburn/trunk/xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2010.12.25.071212" #define Xorriso_timestamP "2010.12.25.071522"