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

Command -toc_of modifier ":short"

Browse Source
This commit is contained in:
Thomas Schmitt 2012-12-18 08:15:41 +00:00
parent 518dbac61c
commit d2128dedd3
7 changed files with 89 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xorriso/opts_d_h.c
View File

@ -1659,7 +1659,7 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag)
" persistent over reboot on modern Linux systems.",
"",
" -toc Show media specific tables of content (sessions).",
" -toc_of \"in\"|\"out\"|\"all\"",
" -toc_of \"in\"|\"out\"|\"all\"[\":short\"]",
" Show -toc of either input drive or output drive or both.",
"",
" -mount_cmd drive entity id path",

14
xorriso/opts_p_z.c
View File

@ -1486,6 +1486,8 @@ int Xorriso_option_temp_mem_limit(struct XorrisO *xorriso, char *size,
/* Option -toc */
/* @param flag bit0= short report form as with -dev, no table-of-content
*/
int Xorriso_option_toc(struct XorrisO *xorriso, int flag)
{
int ret, in_ret= 1000;
@ -1501,7 +1503,7 @@ int Xorriso_option_toc(struct XorrisO *xorriso, int flag)
}
ret= 1;
if(xorriso->outdev[0]!=0)
ret= Xorriso_toc(xorriso, 2);
ret= Xorriso_toc(xorriso, 2 | (flag & 1));
if(in_ret<ret)
ret= in_ret;
}
@ -1512,29 +1514,31 @@ int Xorriso_option_toc(struct XorrisO *xorriso, int flag)
/* Option -toc_of */
int Xorriso_option_toc_of(struct XorrisO *xorriso, char *which, int flag)
{
int ret= 0;
int ret= 0, toc_flag= 0;
if(strstr(which, ":short") != NULL)
toc_flag|= 1;
if(strncmp(which, "in", 2) == 0) {
if(xorriso->indev[0] == 0) {
Xorriso_msgs_submit(xorriso, 0, "-toc_of 'in' : No input drive aquired",
0, "NOTE", 0);
return(2);
}
ret= Xorriso_toc(xorriso, 0);
ret= Xorriso_toc(xorriso, toc_flag | 0);
} else if(strncmp(which, "out", 3) == 0) {
if(xorriso->outdev[0] == 0) {
Xorriso_msgs_submit(xorriso, 0, "-toc_of 'out' : No output drive aquired",
0, "NOTE", 0);
return(2);
}
ret= Xorriso_toc(xorriso, 2);
ret= Xorriso_toc(xorriso, toc_flag | 2);
} else if(strncmp(which, "all", 3) == 0) {
if(xorriso->indev[0] == 0 && xorriso->outdev[0] == 0) {
Xorriso_msgs_submit(xorriso, 0, "-toc_of 'all' : No drive aquired",
0, "NOTE", 0);
return(2);
}
ret= Xorriso_option_toc(xorriso, 0);
ret= Xorriso_option_toc(xorriso, toc_flag | 0);
} else {
sprintf(xorriso->info_text, "-toc_of: Unknown drive code ");
Text_shellsafe(which, xorriso->info_text, 1);

9
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.2.5, Dec 16, 2012"
.TH XORRISO 1 "Version 1.2.5, Dec 18, 2012"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
@ -3425,13 +3425,16 @@ Command \-rom_toc_scan might help.
If input device and output device are both aquired and not the same,
then both tables\-of\-content get shown.
.TP
\fB\-toc_of\fR "in"|"out"|"all"
\fB\-toc_of\fR "in"|"out"|"all"[":short"]
Like command \-toc but explicitely choosing which drive's table\-of\-content
to show. "in" shows \-indev or \-dev, "out" shows \-outdev or \-dev,
"all" shows the same as \-toc.
.br
If ":short" is appended to the drive choosing word, then only a short
summary of drive state and medium content is printed.
.br
As further difference to \-toc, this command does not emit FAILURE events
when the desired drive is not aquired.
if the desired drive is not aquired.
.TP
\fB\-mount_cmd\fR drive entity id path
Emit an appropriate command line for mounting the ISO session

2
xorriso/xorriso.h
View File

@ -1853,6 +1853,8 @@ int Xorriso_option_temp_mem_limit(struct XorrisO *xorriso, char *size,
int flag);
/* Command -toc */
/* @param flag bit0= short report form as with -dev, no table-of-content
*/
int Xorriso_option_toc(struct XorrisO *xorriso, int flag);
/* Command -toc_of */

114
xorriso/xorriso.info
View File

@ -3000,12 +3000,14 @@ File: xorriso.info, Node: Inquiry, Next: Navigate, Prev: DialogCtl, Up: Comm
If input device and output device are both aquired and not the
same, then both tables-of-content get shown.
-toc_of "in"|"out"|"all"
-toc_of "in"|"out"|"all"[":short"]
Like command -toc but explicitely choosing which drive's
table-of-content to show. "in" shows -indev or -dev, "out" shows
-outdev or -dev, "all" shows the same as -toc.
If ":short" is appended to the drive choosing word, then only a
short summary of drive state and medium content is printed.
As further difference to -toc, this command does not emit FAILURE
events when the desired drive is not aquired.
events if the desired drive is not aquired.
-mount_cmd drive entity id path
Emit an appropriate command line for mounting the ISO session
@ -3932,9 +3934,10 @@ File: xorriso.info, Node: Frontend, Next: ExDevices, Prev: Scripting, Up: Co
-msg_op opcode parameter_text
This command shall facilitate extraction of particular information
from the message output of other commands. It gives access to the
C API function Xorriso_parse_line and to the message sieve that is
provided by the C API. Please refer to their description in file
xorriso.h.
C API function Xorriso_parse_line() and to the message sieve that
is provided by the C API. Please refer to their descriptions in
file xorriso.h. Further it helps to interpret the severity codes
of info messages.
Intended users are frontend programs which operate xorriso in
dialog mode.
The result output of this command is not caught by the message
@ -3988,6 +3991,17 @@ File: xorriso.info, Node: Frontend, Next: ExDevices, Prev: Scripting, Up: Co
number of strings. Each string begins by a line that tells the
number of lines of the string. Then follow these lines. They are to
be concatenated with a newline character inbetween each of them.
*parse_bulk*
Like "parse", but with the fifth parameter word being
number_of_input_texts rather than number_of_input_lines. Each
input text has to be preceded by a line that tells
number_of_input_lines as with "parse". Then come the announced
number of text lines.
All input texts will be read before printing of result lines
begins. This consumes memory in xorriso. So the
number_of_input_texts should not be extremely high. On the other
hand, large transactions of command, input texts, and results are
desirable if connection latency is an issue.
*compare_sev*
The parameter_text should contain two comma separated severity
texts as issued by this program. Like "SORRY,UPDATE". See also
@ -4736,8 +4750,8 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
* -md5 controls handling of MD5 sums: Loading. (line 156)
* -mkdir creates ISO directory: Insert. (line 169)
* -mount issues mount command for ISO session: Restore. (line 126)
* -mount_cmd composes mount command line: Inquiry. (line 50)
* -mount_cmd controls mount command: Inquiry. (line 66)
* -mount_cmd composes mount command line: Inquiry. (line 52)
* -mount_cmd controls mount command: Inquiry. (line 68)
* -msg_op perform operations on program messages: Frontend. (line 30)
* -mv renames file in ISO image: Manip. (line 35)
* -no_rc disables startup files: Scripting. (line 7)
@ -4761,12 +4775,12 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
* -print prints result text line: Scripting. (line 99)
* -print_info prints message text line: Scripting. (line 102)
* -print_mark prints synchronizing text line: Scripting. (line 105)
* -print_size predicts image size: Inquiry. (line 89)
* -prog sets program name: Frontend. (line 101)
* -prog_help prints help text: Frontend. (line 104)
* -print_size predicts image size: Inquiry. (line 91)
* -prog sets program name: Frontend. (line 113)
* -prog_help prints help text: Frontend. (line 116)
* -prompt prompts for enter key: Scripting. (line 110)
* -publisher sets publisher id: SetWrite. (line 186)
* -pvd_info shows image id strings: Inquiry. (line 102)
* -pvd_info shows image id strings: Inquiry. (line 104)
* -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)
@ -4789,7 +4803,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
* -scdbackup_tag enables scdbackup checksum tag: Emulation. (line 168)
* -scsi_log reports SCSI commands: Scripting. (line 147)
* -session_log logs written sessions: Scripting. (line 138)
* -session_string composes session info line: Inquiry. (line 76)
* -session_string composes session info line: Inquiry. (line 78)
* -set_filter applies filter to file: Filter. (line 60)
* -set_filter_r applies filter to file tree: Filter. (line 89)
* -setfacl sets ACL in ISO image: Manip. (line 73)
@ -4810,7 +4824,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
* -stdio_sync controls stdio buffer: SetWrite. (line 318)
* -stream_recording controls defect management: SetWrite. (line 299)
* -system_id sets system id: SetWrite. (line 201)
* -tell_media_space reports free space: Inquiry. (line 98)
* -tell_media_space reports free space: Inquiry. (line 100)
* -temp_mem_limit curbs memory consumption: Scripting. (line 92)
* -toc shows list of sessions: Inquiry. (line 28)
* -toc_of shows list of sessions: Inquiry. (line 43)
@ -4944,7 +4958,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* 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)
* Image, show id strings, -pvd_info: Inquiry. (line 102)
* Image, show id strings, -pvd_info: Inquiry. (line 104)
* Insert, enable overwriting, -overwrite: SetInsert. (line 127)
* Insert, file exclusion absolute, -not_paths: SetInsert. (line 55)
* Insert, file exclusion from file, -not_list: SetInsert. (line 67)
@ -5033,7 +5047,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Program, end without writing, -rollback_end: Scripting. (line 159)
* Program, list extra features, -list_extras: Scripting. (line 26)
* Program, print help text, -help: Scripting. (line 20)
* Program, print help text, -prog_help: Frontend. (line 104)
* Program, print help text, -prog_help: Frontend. (line 116)
* Program, print message text line, -print_info: Scripting. (line 102)
* Program, print result text line, -print: Scripting. (line 99)
* Program, print synchronizing text line, -print_mark: Scripting.
@ -5041,7 +5055,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Program, print version, -version: Scripting. (line 23)
* Program, prompt for enter key, -prompt: Scripting. (line 110)
* Program, replace --, -list_delimiter: Scripting. (line 60)
* Program, set name, -prog: Frontend. (line 101)
* Program, set name, -prog: Frontend. (line 113)
* Program, show current settings, -status: Scripting. (line 47)
* Program, status history, -status_history_max: Scripting. (line 56)
* Program, wait a time span, -sleep: Scripting. (line 114)
@ -5061,11 +5075,11 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Rock Ridge, _definition: Extras. (line 6)
* Session, _definition: Model. (line 6)
* Session, altered start address, -displacement: Loading. (line 36)
* Session, info string, -session_string: Inquiry. (line 76)
* Session, info string, -session_string: Inquiry. (line 78)
* Session, issue mount command, -mount: Restore. (line 126)
* Session, log when written, -session_log: Scripting. (line 138)
* Session, mount command line, -mount_cmd: Inquiry. (line 50)
* Session, mount parameters, -mount_opts: Inquiry. (line 66)
* Session, mount command line, -mount_cmd: Inquiry. (line 52)
* Session, mount parameters, -mount_opts: Inquiry. (line 68)
* Session, select as input, -load: Loading. (line 11)
* Sorting order, for -x, -list_arg_sorting: ArgSort. (line 27)
* SUN Disk Label, production: Bootable. (line 210)
@ -5095,12 +5109,12 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Write, enable HFS+, -hfsplus: SetWrite. (line 14)
* Write, enable Joliet, -joliet: SetWrite. (line 10)
* Write, fifo size, -fs: SetWrite. (line 328)
* Write, free space, -tell_media_space: Inquiry. (line 98)
* Write, free space, -tell_media_space: Inquiry. (line 100)
* Write, log problematic disk files, -errfile_log: Scripting. (line 118)
* Write, log written sessions, -session_log: Scripting. (line 138)
* Write, padding image, -padding: SetWrite. (line 349)
* Write, pending ISO image, -commit: Writing. (line 29)
* Write, predict image size, -print_size: Inquiry. (line 89)
* Write, predict image size, -print_size: Inquiry. (line 91)
* Write, set speed, -speed: SetWrite. (line 284)
* Write, simulation, -dummy: SetWrite. (line 324)
* Write, TAO or SAO/DAO, -write_type: SetWrite. (line 341)
@ -5141,34 +5155,34 @@ Node: Charset140512
Node: Exception143274
Node: DialogCtl149394
Node: Inquiry151992
Node: Navigate157310
Node: Verify165608
Node: Restore174640
Node: Emulation181550
Node: Scripting191362
Node: Frontend198523
Node: Examples203771
Node: ExDevices204949
Node: ExCreate205608
Node: ExDialog206893
Node: ExGrowing208158
Node: ExModifying208963
Node: ExBootable209467
Node: ExCharset210019
Node: ExPseudo210840
Node: ExCdrecord211738
Node: ExMkisofs212055
Node: ExGrowisofs213395
Node: ExException214530
Node: ExTime214984
Node: ExIncBackup215443
Node: ExRestore219435
Node: ExRecovery220395
Node: Files220965
Node: Seealso222264
Node: Bugreport222987
Node: Legal223568
Node: CommandIdx224579
Node: ConceptIdx240670
Node: Navigate157452
Node: Verify165750
Node: Restore174782
Node: Emulation181692
Node: Scripting191504
Node: Frontend198665
Node: Examples204596
Node: ExDevices205774
Node: ExCreate206433
Node: ExDialog207718
Node: ExGrowing208983
Node: ExModifying209788
Node: ExBootable210292
Node: ExCharset210844
Node: ExPseudo211665
Node: ExCdrecord212563
Node: ExMkisofs212880
Node: ExGrowisofs214220
Node: ExException215355
Node: ExTime215809
Node: ExIncBackup216268
Node: ExRestore220260
Node: ExRecovery221220
Node: Files221790
Node: Seealso223089
Node: Bugreport223812
Node: Legal224393
Node: CommandIdx225404
Node: ConceptIdx241495

End Tag Table

9
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.2.5, Dec 16, 2012"
@c man .TH XORRISO 1 "Version 1.2.5, Dec 18, 2012"
@c man .\" Please adjust this date whenever revising the manpage.
@c man .\"
@c man .\" Some roff macros, for reference:
@ -4012,14 +4012,17 @@ Command -rom_toc_scan might help.
If input device and output device are both aquired and not the same,
then both tables-of-content get shown.
@c man .TP
@item -toc_of "in"|"out"|"all"
@item -toc_of "in"|"out"|"all"[":short"]
@kindex -toc_of shows list of sessions
Like command -toc but explicitely choosing which drive's table-of-content
to show. "in" shows -indev or -dev, "out" shows -outdev or -dev,
"all" shows the same as -toc.
@*
If ":short" is appended to the drive choosing word, then only a short
summary of drive state and medium content is printed.
@*
As further difference to -toc, this command does not emit FAILURE events
when the desired drive is not aquired.
if the desired drive is not aquired.
@c man .TP
@item -mount_cmd drive entity id path
@kindex -mount_cmd composes mount command line

2
xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2012.12.16.131128"
#define Xorriso_timestamP "2012.12.18.081434"