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

New -msg_op opcdoes "parse_silently" and "parse_bulk_silently"

This commit is contained in:
Thomas Schmitt 2013-07-02 09:28:57 +00:00
parent 8a9be6477f
commit 9ddf84daa4
6 changed files with 72 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libisoburn/trunk/xorriso/opts_d_h.c
View File

@ -2070,11 +2070,15 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag)
" width (default 80) can adjust line number computation", " width (default 80) can adjust line number computation",
" to the output terminal's line width.", " to the output terminal's line width.",
#ifdef Xorriso_with_readlinE #ifdef Xorriso_with_readlinE
" -use_stdin Use raw standard input even if libreadline is available", " -use_readline \"on\"|\"off\"",
" -use_readline Use libreadline for dialog if available", " Whether to use libreadline for dialog if available.",
" -history text Copy text into libreadline history. This command", " -history text Copy text into libreadline history. This command",
" itself is not copied to the history list.", " itself is not copied to the history list.",
#endif /* Xorriso_with_readlinE */ #endif /* Xorriso_with_readlinE */
" -sh_style_result \"on\"|\"off\"",
" If \"on\" do not wrap file addresses in quotation marks with",
" -pwd -pwdx -ls -lsd -lsl -lsdl -lsx -lsdx -lslx -lsdlx",
" -du -dus -dux -dusx -findx -find",
" -backslash_codes \"on\"|\"off\"|", " -backslash_codes \"on\"|\"off\"|",
" \"in_double_quotes\"|\"in_quotes\"|\"with_quoted_input\"", " \"in_double_quotes\"|\"in_quotes\"|\"with_quoted_input\"",
" [:\"with_program_arguments\"][:\"encode_output\"]", " [:\"with_program_arguments\"][:\"encode_output\"]",
@ -2090,7 +2094,8 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag)
" I:1: enter option text :", " I:1: enter option text :",
" -pkt_output:on is intended for use by frontend programs.", " -pkt_output:on is intended for use by frontend programs.",
" -msg_op \"start_sieve\"|\"read_sieve\"|\"clear_sieve\"|\"end_sieve\"|", " -msg_op \"start_sieve\"|\"read_sieve\"|\"clear_sieve\"|\"end_sieve\"|",
" \"parse\"|\"parse_bulk\"|\"compare_sev\"|\"list_sev\" param_text", " \"parse\"|\"parse_silently\"|\"parse_bulk\"|\"parse_bulk_silently\"|",
" \"compare_sev\"|\"list_sev\" param_text",
" Enable, use, or disable message sieve. Or parse lines into", " Enable, use, or disable message sieve. Or parse lines into",
" words. Or compare or list severity names.", " words. Or compare or list severity names.",
" -named_pipes_loop disk_path_stdin disk_path_stdout disk_path_stderr", " -named_pipes_loop disk_path_stdin disk_path_stdout disk_path_stderr",

12
libisoburn/trunk/xorriso/opts_i_o.c
View File

@ -904,7 +904,9 @@ int Xorriso_option_msg_op(struct XorrisO *xorriso, char *what, char *arg,
msd_mem= xorriso->msg_sieve_disabled; msd_mem= xorriso->msg_sieve_disabled;
ret= 1; ret= 1;
if(strcmp(what, "parse") == 0 || strcmp(what, "parse_bulk") == 0) { if(strcmp(what, "parse") == 0 || strcmp(what, "parse_silently") == 0 ||
strcmp(what, "parse_bulk") == 0 ||
strcmp(what, "parse_bulk_silently") == 0) {
ret= Xorriso_parse_line(xorriso, arg, "", "", 5, &argc, &argv, 0); ret= Xorriso_parse_line(xorriso, arg, "", "", 5, &argc, &argv, 0);
prefix= ""; prefix= "";
if(argc > 0) if(argc > 0)
@ -921,12 +923,14 @@ int Xorriso_option_msg_op(struct XorrisO *xorriso, char *what, char *arg,
input_lines= 1; input_lines= 1;
if(argc > 4) if(argc > 4)
sscanf(argv[4], "%d", &input_lines); sscanf(argv[4], "%d", &input_lines);
if(strcmp(what, "parse") == 0) { if(strcmp(what, "parse") == 0 || strcmp(what, "parse_silently") == 0) {
ret= Xorriso_msg_op_parse(xorriso, "", prefix, separators, ret= Xorriso_msg_op_parse(xorriso, "", prefix, separators,
max_words, pflag, input_lines, 0); max_words, pflag, input_lines,
(strcmp(what, "parse_silently") == 0));
} else { } else {
ret= Xorriso_msg_op_parse_bulk(xorriso, prefix, separators, ret= Xorriso_msg_op_parse_bulk(xorriso, prefix, separators,
max_words, pflag, input_lines, 0); max_words, pflag, input_lines,
(strcmp(what, "parse_bulk_silently") == 0));
} }
if(ret <= 0) if(ret <= 0)
goto ex; goto ex;

10
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 "Version 1.3.1, Jul 01, 2013" .TH XORRISO 1 "Version 1.3.1, Jul 02, 2013"
.\" 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:
@ -4674,6 +4674,14 @@ be extremely high. On the other hand, large transactions of command,
input texts, and results are desirable if connection latency is an input texts, and results are desirable if connection latency is an
issue. issue.
.br .br
\fBparse_silently\fR
.br
Like "parse" but not issueing a prompting message. Confusing to humans.
.br
\fBparse_bulk_silently\fR
.br
Like "parse_bulk" but not issueing a prompting message. Confusing to humans.
.br
\fBcompare_sev\fR \fBcompare_sev\fR
.br .br
The parameter_text should contain two comma separated severity texts as The parameter_text should contain two comma separated severity texts as

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

@ -4091,6 +4091,12 @@ File: xorriso.info, Node: Frontend, Next: ExDevices, Prev: Scripting, Up: Co
number_of_input_texts should not be extremely high. On the other number_of_input_texts should not be extremely high. On the other
hand, large transactions of command, input texts, and results are hand, large transactions of command, input texts, and results are
desirable if connection latency is an issue. desirable if connection latency is an issue.
*parse_silently*
Like "parse" but not issueing a prompting message. Confusing to
humans.
*parse_bulk_silently*
Like "parse_bulk" but not issueing a prompting message. Confusing
to humans.
*compare_sev* *compare_sev*
The parameter_text should contain two comma separated severity The parameter_text should contain two comma separated severity
texts as issued by this program. Like "SORRY,UPDATE". See also texts as issued by this program. Like "SORRY,UPDATE". See also
@ -4866,7 +4872,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
* -jigdo clears JTE or or adds parameter to JTE: Jigdo. (line 33) * -jigdo clears JTE or or adds parameter to JTE: Jigdo. (line 33)
* -joliet enables production of Joliet tree: SetWrite. (line 10) * -joliet enables production of Joliet tree: SetWrite. (line 10)
* -launch_frontend starts frontend program at pipes: Frontend. * -launch_frontend starts frontend program at pipes: Frontend.
(line 134) (line 140)
* -list_arg_sorting prints sorting order of -x: ArgSort. (line 27) * -list_arg_sorting prints sorting order of -x: ArgSort. (line 27)
* -list_delimiter replaces '--': Scripting. (line 60) * -list_delimiter replaces '--': Scripting. (line 60)
* -list_extras lists compile time extra features: Scripting. * -list_extras lists compile time extra features: Scripting.
@ -4898,7 +4904,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
* -msg_op perform operations on program messages: Frontend. (line 30) * -msg_op perform operations on program messages: Frontend. (line 30)
* -mv renames files in ISO image: Manip. (line 42) * -mv renames files in ISO image: Manip. (line 42)
* -mv renames single file in ISO image: Manip. (line 35) * -mv renames single file in ISO image: Manip. (line 35)
* -named_pipe_loop enters EOF resistant dialog: Frontend. (line 117) * -named_pipe_loop enters EOF resistant dialog: Frontend. (line 123)
* -no_rc disables startup files: Scripting. (line 7) * -no_rc disables startup files: Scripting. (line 7)
* -not_leaf sets exclusion pattern: SetInsert. (line 62) * -not_leaf sets exclusion pattern: SetInsert. (line 62)
* -not_list sets exclusions from disk file: SetInsert. (line 67) * -not_list sets exclusions from disk file: SetInsert. (line 67)
@ -4921,8 +4927,8 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
* -print_info prints message text line: Scripting. (line 113) * -print_info prints message text line: Scripting. (line 113)
* -print_mark prints synchronizing text line: Scripting. (line 116) * -print_mark prints synchronizing text line: Scripting. (line 116)
* -print_size predicts image size: Inquiry. (line 91) * -print_size predicts image size: Inquiry. (line 91)
* -prog sets program name: Frontend. (line 169) * -prog sets program name: Frontend. (line 175)
* -prog_help prints help text: Frontend. (line 172) * -prog_help prints help text: Frontend. (line 178)
* -prompt prompts for enter key: Scripting. (line 121) * -prompt prompts for enter key: Scripting. (line 121)
* -publisher sets publisher id: SetWrite. (line 186) * -publisher sets publisher id: SetWrite. (line 186)
* -pvd_info shows image id strings: Inquiry. (line 115) * -pvd_info shows image id strings: Inquiry. (line 115)
@ -5040,7 +5046,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Dialog, bring text into history, -history: Scripting. (line 44) * Dialog, bring text into history, -history: Scripting. (line 44)
* Dialog, confirmation question, -reassure: DialogCtl. (line 32) * Dialog, confirmation question, -reassure: DialogCtl. (line 32)
* Dialog, enable dialog mode, -dialog: DialogCtl. (line 7) * Dialog, enable dialog mode, -dialog: DialogCtl. (line 7)
* Dialog, EOF resistant, -named_pipe_loop: Frontend. (line 117) * Dialog, EOF resistant, -named_pipe_loop: Frontend. (line 123)
* Dialog, line editing, -use_readline: DialogCtl. (line 28) * Dialog, line editing, -use_readline: DialogCtl. (line 28)
* Dialog, terminal geometry, -page: DialogCtl. (line 19) * Dialog, terminal geometry, -page: DialogCtl. (line 19)
* Directories, copy, -cp_clone: Insert. (line 192) * Directories, copy, -cp_clone: Insert. (line 192)
@ -5083,7 +5089,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Filter, unregister, -unregister_filter: Filter. (line 48) * Filter, unregister, -unregister_filter: Filter. (line 48)
* Filter, zisofs parameters, -zisofs: SetWrite. (line 272) * Filter, zisofs parameters, -zisofs: SetWrite. (line 272)
* Frontend program, start at pipes, -launch_frontend: Frontend. * Frontend program, start at pipes, -launch_frontend: Frontend.
(line 134) (line 140)
* GPT, _definition: Extras. (line 38) * GPT, _definition: Extras. (line 38)
* Group, global in ISO image, -gid: SetWrite. (line 268) * Group, global in ISO image, -gid: SetWrite. (line 268)
* Group, in ISO image, -chgrp: Manip. (line 57) * Group, in ISO image, -chgrp: Manip. (line 57)
@ -5197,7 +5203,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Program, end without writing, -rollback_end: Scripting. (line 170) * Program, end without writing, -rollback_end: Scripting. (line 170)
* Program, list extra features, -list_extras: Scripting. (line 26) * Program, list extra features, -list_extras: Scripting. (line 26)
* Program, print help text, -help: Scripting. (line 20) * Program, print help text, -help: Scripting. (line 20)
* Program, print help text, -prog_help: Frontend. (line 172) * Program, print help text, -prog_help: Frontend. (line 178)
* Program, print message text line, -print_info: Scripting. (line 113) * Program, print message text line, -print_info: Scripting. (line 113)
* Program, print result text line, -print: Scripting. (line 110) * Program, print result text line, -print: Scripting. (line 110)
* Program, print synchronizing text line, -print_mark: Scripting. * Program, print synchronizing text line, -print_mark: Scripting.
@ -5205,7 +5211,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Program, print version, -version: Scripting. (line 23) * Program, print version, -version: Scripting. (line 23)
* Program, prompt for enter key, -prompt: Scripting. (line 121) * Program, prompt for enter key, -prompt: Scripting. (line 121)
* Program, replace --, -list_delimiter: Scripting. (line 60) * Program, replace --, -list_delimiter: Scripting. (line 60)
* Program, set name, -prog: Frontend. (line 169) * Program, set name, -prog: Frontend. (line 175)
* Program, show current settings, -status: Scripting. (line 47) * Program, show current settings, -status: Scripting. (line 47)
* Program, status history, -status_history_max: Scripting. (line 56) * Program, status history, -status_history_max: Scripting. (line 56)
* Program, wait a time span, -sleep: Scripting. (line 125) * Program, wait a time span, -sleep: Scripting. (line 125)
@ -5314,28 +5320,28 @@ Node: Restore178554
Node: Emulation185641 Node: Emulation185641
Node: Scripting195943 Node: Scripting195943
Node: Frontend203714 Node: Frontend203714
Node: Examples212776 Node: Examples212994
Node: ExDevices213954 Node: ExDevices214172
Node: ExCreate214613 Node: ExCreate214831
Node: ExDialog215898 Node: ExDialog216116
Node: ExGrowing217163 Node: ExGrowing217381
Node: ExModifying217968 Node: ExModifying218186
Node: ExBootable218472 Node: ExBootable218690
Node: ExCharset219024 Node: ExCharset219242
Node: ExPseudo219845 Node: ExPseudo220063
Node: ExCdrecord220743 Node: ExCdrecord220961
Node: ExMkisofs221060 Node: ExMkisofs221278
Node: ExGrowisofs222400 Node: ExGrowisofs222618
Node: ExException223535 Node: ExException223753
Node: ExTime223989 Node: ExTime224207
Node: ExIncBackup224448 Node: ExIncBackup224666
Node: ExRestore228428 Node: ExRestore228646
Node: ExRecovery229361 Node: ExRecovery229579
Node: Files229931 Node: Files230149
Node: Seealso231230 Node: Seealso231448
Node: Bugreport231953 Node: Bugreport232171
Node: Legal232534 Node: Legal232752
Node: CommandIdx233545 Node: CommandIdx233763
Node: ConceptIdx250061 Node: ConceptIdx250279
 
End Tag Table End Tag Table

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

@ -50,7 +50,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 "Version 1.3.1, Jul 01, 2013" @c man .TH XORRISO 1 "Version 1.3.1, Jul 02, 2013"
@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:
@ -5465,6 +5465,14 @@ be extremely high. On the other hand, large transactions of command,
input texts, and results are desirable if connection latency is an input texts, and results are desirable if connection latency is an
issue. issue.
@* @*
@strong{parse_silently}
@*
Like "parse" but not issueing a prompting message. Confusing to humans.
@*
@strong{parse_bulk_silently}
@*
Like "parse_bulk" but not issueing a prompting message. Confusing to humans.
@*
@strong{compare_sev} @strong{compare_sev}
@* @*
The parameter_text should contain two comma separated severity texts as The parameter_text should contain two comma separated severity texts as

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

@ -1 +1 @@
#define Xorriso_timestamP "2013.07.01.180652" #define Xorriso_timestamP "2013.07.02.092827"