diff --git a/libisoburn/libisoburn.ver b/libisoburn/libisoburn.ver index 325e4d7f..cdae5e0b 100644 --- a/libisoburn/libisoburn.ver +++ b/libisoburn/libisoburn.ver @@ -188,6 +188,7 @@ Xorriso_option_joliet; Xorriso_option_list_delimiter; Xorriso_option_list_formats; Xorriso_option_list_profiles; +Xorriso_option_list_speeds; Xorriso_option_load; Xorriso_option_logfile; Xorriso_option_lsi; diff --git a/xorriso/drive_mgt.c b/xorriso/drive_mgt.c index 7d65e9ba..fba8dc25 100644 --- a/xorriso/drive_mgt.c +++ b/xorriso/drive_mgt.c @@ -800,7 +800,7 @@ int Xorriso_toc(struct XorrisO *xorriso, int flag) int track_count= 0, session_no, track_no, profile_no= -1, track_size; int last_track_start= 0, last_track_size= -1, num_data= 0, is_data= 0; int is_inout_drive= 0, drive_role, status, num_formats, emul_lba; - int num_payload= 0, num_wasted= 0, num_nondata= 0, not_reconizable= 0; + int num_payload= 0, not_reconizable= 0; char profile_name[80],*respt,*devadr, *typetext= ""; struct burn_toc_entry toc_entry; struct burn_drive_info *dinfo; @@ -1065,8 +1065,12 @@ int Xorriso_toc(struct XorrisO *xorriso, int flag) } if(xorriso->request_to_abort) {ret= 1; goto ex;} +/* + int num_wasted= 0, num_nondata= 0; + num_wasted= lba - num_payload; num_nondata= lba - num_data; +*/ Sfile_scale(((double) num_data) * 2048.0, mem_text,5,1e4,1); sprintf(respt, "Media summary: %d session%s, %d data blocks, %s data", @@ -1280,6 +1284,127 @@ ex:; } +/* @return <=0 error, 1 success +*/ +int Xorriso_list_speeds(struct XorrisO *xorriso, int flag) +{ + int ret, high= -1, low= 0x7fffffff, int_cd_speed, is_cd= 0; + char *respt, *speed_unit= "D"; + double speed_factor= 1385000.0, cd_factor= 75.0 * 2352; + struct burn_drive_info *dinfo; + struct burn_drive *drive; + struct burn_speed_descriptor *speed_list= NULL, *item, *other; + + respt= xorriso->result_line; + + ret= Xorriso_get_drive_handles(xorriso, &dinfo, &drive, + "on attempt to obtain speed descriptor list", 1 | 2); + if(ret<=0) + return(0); + if(ret == 2) + goto ex; + ret= burn_drive_get_speedlist(drive, &speed_list); + if(ret <= 0) { + sprintf(xorriso->info_text, "Cannot obtain speed list info"); + Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0); + ret= 0; goto ex; + } + ret= Xorriso_toc(xorriso, 3); + if(ret<=0) + goto ex; + + for (item= speed_list; item != NULL; item= item->next) { + if(item->profile_loaded >= 0x08 && item->profile_loaded <= 0x0a) + is_cd= 1; + if(item->source == 1) { + /* CD mode page 2Ah : report only if not same speed by GET PERFORMANCE */ + for(other= speed_list; other != NULL; other= other->next) + if(other->source == 2 && item->write_speed == other->write_speed) + break; + if(other != NULL) + continue; + } + speed_unit= "D"; + speed_factor= 1385000.0; + + /* Does this look like an integer CD speed ? */ + int_cd_speed= ((double) item->write_speed) * 1000.0 / cd_factor; + if(abs((int) ((double) int_cd_speed) * cd_factor / 1000.0 - + ((double) item->write_speed)) > 5 || + int_cd_speed > 64) + int_cd_speed= 0; + + if(((item->profile_loaded < 0x08 || item->profile_loaded >= 0x100) && + int_cd_speed) || + (item->profile_loaded >= 0x08 && item->profile_loaded <= 0x0a)) { + speed_unit= "C"; + speed_factor= 75.0 * 2352.0; + } else if(item->profile_loaded >= 0x41 && item->profile_loaded <= 0x43) { + speed_unit= "B"; + speed_factor= 4495625.0; + } + sprintf(respt, "Write speed : "); + sprintf(respt + strlen(respt), " %5dk , %4.1fx%s\n", + item->write_speed, + ((double) item->write_speed) * 1000.0 / speed_factor, + speed_unit); + Xorriso_result(xorriso,0); + if(item->write_speed > high) + high= item->write_speed; + if(item->write_speed < low) + low= item->write_speed; + } + + /* Maybe there is ATIP info */ + if(is_cd) { + ret= burn_disc_read_atip(drive); + if(ret < 0) + goto ex; + if(ret > 0) { + ret= burn_drive_get_min_write_speed(drive); + if(ret > 0) { + if(ret > low) { + sprintf(respt, "Write speed l: "); + sprintf(respt + strlen(respt), " %5dk , %4.1fx%s\n", + ret, ((double) ret) * 1000.0 / cd_factor, "C"); + Xorriso_result(xorriso,0); + } + if(ret > high) + high= ret; + low= ret; + } + ret= burn_drive_get_write_speed(drive); + if(ret > 0) { + if(ret < high) { + sprintf(respt, "Write speed h: "); + sprintf(respt + strlen(respt), " %5dk , %4.1fx%s\n", + ret, ((double) ret) * 1000.0 / cd_factor, "C"); + Xorriso_result(xorriso,0); + } + high= ret; + if(ret < low) + low= ret; + } + } + } + if(high > -1) { + sprintf(respt, "Write speed L: "); + sprintf(respt + strlen(respt), " %5dk , %4.1fx%s\n", + low, ((double) low) * 1000.0 / speed_factor, speed_unit); + Xorriso_result(xorriso,0); + sprintf(respt, "Write speed H: "); + sprintf(respt + strlen(respt), " %5dk , %4.1fx%s\n", + high, ((double) high) * 1000.0 / speed_factor, speed_unit); + Xorriso_result(xorriso,0); + } + ret= 1; +ex:; + if(speed_list != NULL) + burn_drive_free_speedlist(&speed_list); + return(ret); +} + + /* @param flag bit0= cdrecord style bit1= obtain outdrive, else indrive @return <=0 error, 1 success diff --git a/xorriso/opts_d_h.c b/xorriso/opts_d_h.c index 5a0960cb..9185ec61 100644 --- a/xorriso/opts_d_h.c +++ b/xorriso/opts_d_h.c @@ -1523,6 +1523,8 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag) "", " -list_formats Show media specific list of format descriptors.", "", +" -list_speeds Show media specific list of write speed descriptors.", +"", " -list_profiles \"in\"|\"out\"|\"all\"", " Show list of media types supported by indev resp. outdev.", " -print_size Print the foreseeable consumption by next -commit.", diff --git a/xorriso/opts_i_o.c b/xorriso/opts_i_o.c index 25a5d3c9..f6eed47d 100644 --- a/xorriso/opts_i_o.c +++ b/xorriso/opts_i_o.c @@ -125,6 +125,16 @@ int Xorriso_option_list_formats(struct XorrisO *xorriso, int flag) } +/* Option -list_speeds */ +int Xorriso_option_list_speeds(struct XorrisO *xorriso, int flag) +{ + int ret; + + ret= Xorriso_list_speeds(xorriso, 0); + return(ret); +} + + /* Option -list_profiles */ int Xorriso_option_list_profiles(struct XorrisO *xorriso, char *which, int flag) diff --git a/xorriso/parse_exec.c b/xorriso/parse_exec.c index b8af3816..35feb631 100644 --- a/xorriso/parse_exec.c +++ b/xorriso/parse_exec.c @@ -449,7 +449,8 @@ int Xorriso_count_args(struct XorrisO *xorriso, int argc, char **argv, static char arg0_commands[][40]= { "ban_stdio_write","close_filter_list","commit","devices","end", "for_backup", "help", - "list_formats","no_rc","print_size","pvd_info","pwd","pwdi","pwdx", + "list_formats","list_speeds", + "no_rc","print_size","pvd_info","pwd","pwdi","pwdx", "read_mkisofsrc","rollback","rollback_end", "tell_media_space","toc","version", "" @@ -616,7 +617,7 @@ next_command:; sprintf(xorriso->info_text, "Command: %s", argv[*idx]); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "DEBUG", 0); for(i= 1; i <= arg_count && *idx + i < argc; i++) { - sprintf(xorriso->info_text, "Argument: %s", argv[*idx + i]); + sprintf(xorriso->info_text, "Argument: %s", argv[*idx + i]); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "DEBUG", 0); } if(*idx + arg_count >= argc) { @@ -1025,6 +1026,9 @@ next_command:; (*idx)++; ret= Xorriso_option_list_profiles(xorriso, arg1, 0); + } else if(strcmp(cmd,"list_speeds")==0) { + ret= Xorriso_option_list_speeds(xorriso, 0); + } else if(strcmp(cmd,"load")==0) { (*idx)+= 2; ret= Xorriso_option_load(xorriso, arg1, arg2, 0); diff --git a/xorriso/xorriso.1 b/xorriso/xorriso.1 index 7a5ee6f1..552078f6 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.1.1, Jun 18, 2011" +.TH XORRISO 1 "Version 1.1.1, Jul 03, 2011" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -2056,6 +2056,18 @@ MMC format codes are manifold. Most important are: .br Smaller format size with DVD\-RAM, BD\-RE, or BD\-R means more reserve space. .TP +\fB\-list_speeds\fR +Put out a list of speed values as reported by the output drive for +the loaded media. At the end of the list, "Write speed L" and "Write speed H" +are the best guesses for lower and upper speed limit. +.br +"Write speed l" and "Write speed h" may appear only with CD +and eventually override the list of other speed offers. +.br +It is not mandatory to use speed values out of the listed range. +The drive is supposed to choose a safe speed that is as near to the desired +speed as possible. +.TP \fB\-close_damaged\fR "as_needed"|"force" Try to close the upcomming track and session if the drive reported the media as damaged. This may apply to CD\-R, CD\-RW, DVD\-R, DVD\-RW, DVD+R, DVD+R DL, @@ -3173,6 +3185,8 @@ This resembles shell command ls \-d. Like \-ls but also list some of the file attributes. The output format resembles shell command ls \-ln. .br +File type 'e' indicates the El Torito boot catalog. +.br If the file has non\-trivial ACL, then a '+' is appended to the permission info. If the file is hidden, then 'I' for "iso_rr", 'J' for "joliet", resp. 'H' for "on" gets appended. Together with ACL it is 'i', 'j', resp. 'h'. diff --git a/xorriso/xorriso.h b/xorriso/xorriso.h index c98ab8ca..5ce9be49 100644 --- a/xorriso/xorriso.h +++ b/xorriso/xorriso.h @@ -926,6 +926,9 @@ int Xorriso_option_list_formats(struct XorrisO *xorriso, int flag); int Xorriso_option_list_profiles(struct XorrisO *xorriso, char *which, int flag); +/* Option -list_speeds */ +int Xorriso_option_list_speeds(struct XorrisO *xorriso, int flag); + /* Option -load session|track|sbsector value */ /* @param flag bit0= with adr_mode sbsector: adr_value is possibly 16 too high @return <=0 error , 1 success, 2 revoked by -reassure diff --git a/xorriso/xorriso.info b/xorriso/xorriso.info index 8309b23e..7e9ba455 100644 --- a/xorriso/xorriso.info +++ b/xorriso/xorriso.info @@ -1831,6 +1831,17 @@ File: xorriso.info, Node: Writing, Next: SetWrite, Prev: Filter, Up: Options Smaller format size with DVD-RAM, BD-RE, or BD-R means more reserve space. +-list_speeds + Put out a list of speed values as reported by the output drive for + the loaded media. At the end of the list, "Write speed L" and + "Write speed H" are the best guesses for lower and upper speed + limit. + "Write speed l" and "Write speed h" may appear only with CD and + eventually override the list of other speed offers. + It is not mandatory to use speed values out of the listed range. + The drive is supposed to choose a safe speed that is as near to + the desired speed as possible. + -close_damaged "as_needed"|"force" Try to close the upcomming track and session if the drive reported the media as damaged. This may apply to CD-R, CD-RW, DVD-R, @@ -2786,6 +2797,7 @@ File: xorriso.info, Node: Navigate, Next: Verify, Prev: Inquiry, Up: Options -lsl iso_rr_pattern [***] Like -ls but also list some of the file attributes. The output format resembles shell command ls -ln. + File type 'e' indicates the El Torito boot catalog. If the file has non-trivial ACL, then a '+' is appended to the permission info. If the file is hidden, then 'I' for "iso_rr", 'J' for "joliet", resp. 'H' for "on" gets appended. Together with @@ -4201,13 +4213,13 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -chown_r sets ownership in ISO image: Manip. (line 47) * -clone copies ISO directory tree: Insert. (line 171) * -close controls media closing: SetWrite. (line 262) -* -close_damaged closes damaged track and session: Writing. (line 122) +* -close_damaged closes damaged track and session: Writing. (line 133) * -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) -* -compare reports ISO/disk differences: Navigate. (line 139) -* -compare_l reports ISO/disk differences: Navigate. (line 157) -* -compare_r reports ISO/disk differences: Navigate. (line 152) +* -compare reports ISO/disk differences: Navigate. (line 140) +* -compare_l reports ISO/disk differences: Navigate. (line 158) +* -compare_r reports ISO/disk differences: Navigate. (line 153) * -compliance controls standard compliance: SetWrite. (line 14) * -copyright_file sets copyright file name: SetWrite. (line 154) * -cp_clone copies ISO directory tree: Insert. (line 183) @@ -4224,11 +4236,11 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -displacement compensate altered image start address: Loading. (line 35) * -drive_class controls drive accessability: Loading. (line 53) -* -du show directory size in ISO image: Navigate. (line 88) +* -du show directory size in ISO image: Navigate. (line 89) * -dummy controls write simulation: SetWrite. (line 251) -* -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) +* -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 238) * -early_stdio_test classifies stdio drives: Loading. (line 251) * -eject ejects drive tray: Writing. (line 36) @@ -4243,15 +4255,15 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -extract_single copies file to disk: Restore. (line 68) * -file_size_limit limits data file size: SetInsert. (line 7) * -find traverses and alters ISO tree: CmdFind. (line 7) -* -findx traverses disk tree: Navigate. (line 105) +* -findx traverses disk tree: Navigate. (line 106) * -follow softlinks and mount points: SetInsert. (line 76) * -for_backup -acl,-xattr,-hardlinks,-md5: Loading. (line 184) * -format formats media: Writing. (line 72) * -fs sets size of fifo: SetWrite. (line 255) -* -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) +* -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 195) * -grow_blindly overides next writeable address: AqDrive. (line 46) * -hardlinks controls handling of hard links: Loading. (line 109) @@ -4265,18 +4277,19 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -joliet enables production of Joliet tree: SetWrite. (line 10) * -list_delimiter replaces '--': Scripting. (line 42) * -list_formats lists available formats: Writing. (line 110) -* -list_profiles lists supported media: Writing. (line 136) +* -list_profiles lists supported media: Writing. (line 147) +* -list_speeds lists available write speeds: Writing. (line 122) * -load addresses a particular session as input: Loading. (line 11) * -local_charset sets terminal character set: Charset. (line 47) * -logfile logs output channels to file: Frontend. (line 20) * -ls lists files in ISO image: Navigate. (line 26) * -lsd lists files in ISO image: Navigate. (line 34) -* -lsdl lists files in ISO image: Navigate. (line 46) -* -lsdlx lists files on disk: Navigate. (line 65) -* -lsdx lists files on disk: Navigate. (line 57) +* -lsdl lists files in ISO image: Navigate. (line 47) +* -lsdlx lists files on disk: Navigate. (line 66) +* -lsdx lists files on disk: Navigate. (line 58) * -lsl lists files in ISO image: Navigate. (line 38) -* -lslx lists files on disk: Navigate. (line 61) -* -lsx lists files on disk: Navigate. (line 50) +* -lslx lists files on disk: Navigate. (line 62) +* -lsx lists files on disk: Navigate. (line 51) * -map inserts path: Insert. (line 85) * -map_l inserts paths from disk file: Insert. (line 94) * -map_single inserts path: Insert. (line 90) @@ -4341,8 +4354,8 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -setfattr sets xattr in ISO image: Manip. (line 111) * -setfattr_list sets xattr in ISO image: Manip. (line 127) * -setfattr_r sets xattr in ISO image: Manip. (line 124) -* -show_stream shows data source and filters: Navigate. (line 162) -* -show_stream_r shows data source and filters: Navigate. (line 176) +* -show_stream shows data source and filters: Navigate. (line 163) +* -show_stream_r shows data source and filters: Navigate. (line 177) * -signal_handling controls handling of system signals: Exception. (line 69) * -speed set write speed: SetWrite. (line 211) @@ -4381,8 +4394,8 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * ACL, set in ISO image, -setfacl: Manip. (line 73) * ACL, set in ISO image, -setfacl_list: Manip. (line 101) * ACL, set in ISO image, -setfacl_r: Manip. (line 98) -* ACL, show in ISO image, -getfacl: Navigate. (line 69) -* ACL, show in ISO image, -getfacl_r: Navigate. (line 76) +* ACL, show in ISO image, -getfacl: Navigate. (line 70) +* ACL, show in ISO image, -getfacl_r: Navigate. (line 77) * Appendable media, _definition: Media. (line 38) * Appended Filesystem Image, -append_partition: Bootable. (line 199) * Backslash Interpretation, _definition: Processing. (line 48) @@ -4406,7 +4419,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Create, new ISO image, _definiton: Methods. (line 6) * Cylinder alignment, _definiton: Bootable. (line 167) * Cylinder size, _definiton: Bootable. (line 156) -* Damaged track and session, close, -close_damaged: Writing. (line 122) +* Damaged track and session, close, -close_damaged: Writing. (line 133) * Delete, from ISO image, -rm: Manip. (line 21) * Delete, from ISO image, -rm_r: Manip. (line 28) * Delete, ISO directory, -rmdir: Manip. (line 32) @@ -4429,7 +4442,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Drive, for input, -indev: AqDrive. (line 24) * Drive, for output, -outdev: AqDrive. (line 31) * Drive, get drive list, -devices: Inquiry. (line 7) -* Drive, list supported media, -list_profiles: Writing. (line 136) +* Drive, list supported media, -list_profiles: Writing. (line 147) * Drive, reduce activity, -calm_drive: Loading. (line 235) * Drive, report SCSI commands, -scsi_log: Scripting. (line 125) * Drive, write and eject, -commit_eject: Writing. (line 40) @@ -4445,8 +4458,8 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Filter, apply to file, -set_filter: Filter. (line 60) * Filter, ban registration, -close_filter_list: Filter. (line 52) * Filter, register, -external_filter: Filter. (line 20) -* Filter, show chain, -show_stream: Navigate. (line 162) -* Filter, show chains of tree, -show_stream_r: Navigate. (line 176) +* Filter, show chain, -show_stream: Navigate. (line 163) +* Filter, show chains of tree, -show_stream_r: Navigate. (line 177) * Filter, unregister, -unregister_filter: Filter. (line 48) * Filter, zisofs parameters, -zisofs: SetWrite. (line 199) * Group, global in ISO image, -gid: SetWrite. (line 195) @@ -4501,22 +4514,23 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Media, erase, -blank: Writing. (line 45) * Media, format, -format: Writing. (line 72) * Media, list formats, -list_formats: Writing. (line 110) +* Media, list write speeds, -list_speeds: Writing. (line 122) * MIPS boot file, activation: Bootable. (line 176) * mkisofs, Emulation: Emulation. (line 16) * Modifying, _definition: Methods. (line 27) * Multi-session media, _definition: Media. (line 7) * Multi-session, _definition: Model. (line 18) -* Navigate, directory size in ISO image, -du: Navigate. (line 88) -* Navigate, directory size in ISO image, -dus: Navigate. (line 92) -* Navigate, directory size in on disk, -dusx: Navigate. (line 101) -* Navigate, directory size in on disk, -dux: Navigate. (line 96) -* Navigate, list disk files, -lsdlx: Navigate. (line 65) -* Navigate, list disk files, -lsdx: Navigate. (line 57) -* Navigate, list disk files, -lslx: Navigate. (line 61) -* Navigate, list disk files, -lsx: Navigate. (line 50) +* Navigate, directory size in ISO image, -du: Navigate. (line 89) +* Navigate, directory size in ISO image, -dus: Navigate. (line 93) +* Navigate, directory size in on disk, -dusx: Navigate. (line 102) +* Navigate, directory size in on disk, -dux: Navigate. (line 97) +* Navigate, list disk files, -lsdlx: Navigate. (line 66) +* Navigate, list disk files, -lsdx: Navigate. (line 58) +* Navigate, list disk files, -lslx: Navigate. (line 62) +* Navigate, list disk files, -lsx: Navigate. (line 51) * Navigate, list ISO files, -ls: Navigate. (line 26) * Navigate, list ISO files, -lsd: Navigate. (line 34) -* Navigate, list ISO files, -lsdl: Navigate. (line 46) +* Navigate, list ISO files, -lsdl: Navigate. (line 47) * Navigate, list ISO files, -lsl: Navigate. (line 38) * Navigate, set disk working directory, -cdx: Navigate. (line 16) * Navigate, set ISO working directory, -cd: Navigate. (line 7) @@ -4591,12 +4605,12 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Table-of-content, show, -toc: Inquiry. (line 18) * Timestamps, set in ISO image, -alter_date: Manip. (line 147) * Timestamps, set in ISO image, -alter_date_r: Manip. (line 167) -* Tree, disk, traverse, -findx: Navigate. (line 105) +* Tree, disk, traverse, -findx: Navigate. (line 106) * Tree, ISO, traverse and alter, -find: CmdFind. (line 7) * Verify, check blocks, -check_media: Verify. (line 21) -* Verify, compare ISO and disk file, -compare: Navigate. (line 139) -* Verify, compare ISO and disk tree, -compare_r: Navigate. (line 152) -* Verify, compare ISO and disk, -compare_l: Navigate. (line 157) +* Verify, compare ISO and disk file, -compare: Navigate. (line 140) +* Verify, compare ISO and disk tree, -compare_r: Navigate. (line 153) +* Verify, compare ISO and disk, -compare_l: Navigate. (line 158) * Verify, file checksum, -check_md5: Verify. (line 144) * Verify, file tree checksums, -check_md5_r: Verify. (line 160) * Verify, preset -check_media, -check_media_defaults: Verify. (line 40) @@ -4621,8 +4635,8 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * xattr, set in ISO image, -setfattr: Manip. (line 111) * xattr, set in ISO image, -setfattr_list: Manip. (line 127) * xattr, set in ISO image, -setfattr_r: Manip. (line 124) -* xattr, show in ISO image, -getfattr: Navigate. (line 80) -* xattr, show in ISO image, -getfattr_r: Navigate. (line 84) +* xattr, show in ISO image, -getfattr: Navigate. (line 81) +* xattr, show in ISO image, -getfattr_r: Navigate. (line 85)  @@ -4645,41 +4659,41 @@ Node: Manip60454 Node: CmdFind69181 Node: Filter80443 Node: Writing84781 -Node: SetWrite92010 -Node: Bootable106056 -Node: Jigdo119274 -Node: Charset123520 -Node: Exception126279 -Node: DialogCtl132392 -Node: Inquiry134979 -Node: Navigate139307 -Node: Verify147218 -Node: Restore155756 -Node: Emulation162416 -Node: Scripting172219 -Node: Frontend178347 -Node: Examples179646 -Node: ExDevices180817 -Node: ExCreate181455 -Node: ExDialog182729 -Node: ExGrowing183991 -Node: ExModifying184793 -Node: ExBootable185294 -Node: ExCharset185843 -Node: ExPseudo186663 -Node: ExCdrecord187561 -Node: ExMkisofs187876 -Node: ExGrowisofs189214 -Node: ExException190349 -Node: ExTime190803 -Node: ExIncBackup191262 -Node: ExRestore195186 -Node: ExRecovery196144 -Node: Files196712 -Node: Seealso198010 -Node: Bugreport198598 -Node: Legal199179 -Node: CommandIdx200109 -Node: ConceptIdx214850 +Node: SetWrite92544 +Node: Bootable106590 +Node: Jigdo119808 +Node: Charset124054 +Node: Exception126813 +Node: DialogCtl132926 +Node: Inquiry135513 +Node: Navigate139841 +Node: Verify147809 +Node: Restore156347 +Node: Emulation163007 +Node: Scripting172810 +Node: Frontend178938 +Node: Examples180237 +Node: ExDevices181408 +Node: ExCreate182046 +Node: ExDialog183320 +Node: ExGrowing184582 +Node: ExModifying185384 +Node: ExBootable185885 +Node: ExCharset186434 +Node: ExPseudo187254 +Node: ExCdrecord188152 +Node: ExMkisofs188467 +Node: ExGrowisofs189805 +Node: ExException190940 +Node: ExTime191394 +Node: ExIncBackup191853 +Node: ExRestore195777 +Node: ExRecovery196735 +Node: Files197303 +Node: Seealso198601 +Node: Bugreport199189 +Node: Legal199770 +Node: CommandIdx200700 +Node: ConceptIdx215514  End Tag Table diff --git a/xorriso/xorriso.texi b/xorriso/xorriso.texi index 7166f630..654d9af0 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.1.1, Jun 18, 2011" +@c man .TH XORRISO 1 "Version 1.1.1, Jul 03, 2011" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -2466,6 +2466,20 @@ MMC format codes are manifold. Most important are: @* Smaller format size with DVD-RAM, BD-RE, or BD-R means more reserve space. @c man .TP +@item -list_speeds +@kindex -list_speeds lists available write speeds +@cindex Media, list write speeds, -list_speeds +Put out a list of speed values as reported by the output drive for +the loaded media. At the end of the list, "Write speed L" and "Write speed H" +are the best guesses for lower and upper speed limit. +@* +"Write speed l" and "Write speed h" may appear only with CD +and eventually override the list of other speed offers. +@* +It is not mandatory to use speed values out of the listed range. +The drive is supposed to choose a safe speed that is as near to the desired +speed as possible. +@c man .TP @item -close_damaged "as_needed"|"force" @kindex -close_damaged closes damaged track and session @cindex Damaged track and session, close, -close_damaged @@ -3748,6 +3762,8 @@ This resembles shell command ls -d. Like -ls but also list some of the file attributes. The output format resembles shell command ls -ln. @* +File type 'e' indicates the El Torito boot catalog. +@* If the file has non-trivial ACL, then a '+' is appended to the permission info. If the file is hidden, then 'I' for "iso_rr", 'J' for "joliet", resp. 'H' for "on" gets appended. Together with ACL it is 'i', 'j', resp. 'h'. diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index b4c4069f..96c111bd 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2011.07.03.203013" +#define Xorriso_timestamP "2011.07.04.092828" diff --git a/xorriso/xorrisoburn.h b/xorriso/xorrisoburn.h index f57fc3f3..df4e0114 100644 --- a/xorriso/xorrisoburn.h +++ b/xorriso/xorrisoburn.h @@ -92,6 +92,10 @@ int Xorriso_format_media(struct XorrisO *xorriso, off_t size, int flag); */ int Xorriso_list_formats(struct XorrisO *xorriso, int flag); +/* @return <=0 error, 1 success +*/ +int Xorriso_list_speeds(struct XorrisO *xorriso, int flag); + /* @param flag bit1= obtain outdrive, else indrive @return <=0 error, 1 success */