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

Default -abort_on value is now "FAILURE", for dialog it stays "FATAL"

Browse Source
This commit is contained in:
Thomas Schmitt 2011-01-04 19:30:49 +00:00
parent 273366c183
commit 20c2a390e9
8 changed files with 78 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,7 +3,7 @@
/* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images. /* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images.
Copyright 2007-2010 Thomas Schmitt, <scdbackup@gmx.net> Copyright 2007-2011 Thomas Schmitt, <scdbackup@gmx.net>
Provided under GPL version 2 or later. Provided under GPL version 2 or later.
@ -288,8 +288,9 @@ int Xorriso_new(struct XorrisO ** xorriso,char *progname, int flag)
strcpy(m->report_about_text, "UPDATE"); strcpy(m->report_about_text, "UPDATE");
Xorriso__text_to_sev(m->report_about_text, &m->report_about_severity, 0); Xorriso__text_to_sev(m->report_about_text, &m->report_about_severity, 0);
m->library_msg_direct_print= 0; m->library_msg_direct_print= 0;
strcpy(m->abort_on_text,"FATAL"); strcpy(m->abort_on_text,"FAILURE");
Xorriso__text_to_sev(m->abort_on_text, &m->abort_on_severity, 0); Xorriso__text_to_sev(m->abort_on_text, &m->abort_on_severity, 0);
m->abort_on_is_default= 1;
m->problem_status= 0; m->problem_status= 0;
m->problem_status_text[0]= 0; m->problem_status_text[0]= 0;
m->errfile_log[0]= 0; m->errfile_log[0]= 0;

3
libisoburn/trunk/xorriso/opts_a_c.c
View File

@ -1,7 +1,7 @@
/* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images. /* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images.
Copyright 2007-2010 Thomas Schmitt, <scdbackup@gmx.net> Copyright 2007-2011 Thomas Schmitt, <scdbackup@gmx.net>
Provided under GPL version 2 or later. Provided under GPL version 2 or later.
@ -52,6 +52,7 @@ int Xorriso_option_abort_on(struct XorrisO *xorriso, char *severity, int flag)
if(Sfile_str(xorriso->abort_on_text,severity,0)<=0) if(Sfile_str(xorriso->abort_on_text,severity,0)<=0)
return(-1); return(-1);
xorriso->abort_on_severity= sev; xorriso->abort_on_severity= sev;
xorriso->abort_on_is_default= 0;
Xorriso_set_abort_severity(xorriso, 0); Xorriso_set_abort_severity(xorriso, 0);
return(1); return(1);
} }

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

@ -2804,6 +2804,10 @@ file content stems from the loaded ISO image and is not filtered.
Enable or disable to enter dialog mode after all arguments are processed. Enable or disable to enter dialog mode after all arguments are processed.
In dialog mode input lines get prompted via readline or from stdin. In dialog mode input lines get prompted via readline or from stdin.
.br .br
If no -abort_on severity was set when dialog starts, then "FATAL" is set
to avoid abort in most cases of wrong input. Before dialog begins the
default is "FAILURE" which e.g. aborts on unknown commands.
.br
Mode "on" supports input of newline characters within quotation marks and Mode "on" supports input of newline characters within quotation marks and
line continuation by trailing backslash outside quotation marks. line continuation by trailing backslash outside quotation marks.
Mode "single_line" does not. Mode "single_line" does not.
@ -2941,6 +2945,8 @@ Print the foreseeable consumption of 2048 byte blocks
by next -commit. This can last a while as a -commit gets by next -commit. This can last a while as a -commit gets
prepared and only in last moment is revoked by this option. prepared and only in last moment is revoked by this option.
The result depends on several settings and also on the kind of output device. The result depends on several settings and also on the kind of output device.
If no -jidgo options are given, then -padding (300 kB by default) is not
counted as part of the image size.
.TP .TP
\fB\-tell_media_space\fR \fB\-tell_media_space\fR
Print available space on output media and the free space after Print available space on output media and the free space after
@ -4219,6 +4225,8 @@ Files with names matching *.o or *.swp get excluded explicitly.
When done with writing the new session gets checked by its recorded MD5. When done with writing the new session gets checked by its recorded MD5.
.br .br
$ xorriso \\ $ xorriso \\
.br
-abort_on FATAL \\
.br .br
-for_backup -disk_dev_ino on \\ -for_backup -disk_dev_ino on \\
.br .br

8
libisoburn/trunk/xorriso/xorriso.h
View File

@ -2,7 +2,7 @@
/* xorriso - libisoburn higher level API which creates, loads, manipulates /* xorriso - libisoburn higher level API which creates, loads, manipulates
and burns ISO 9660 filesystem images. and burns ISO 9660 filesystem images.
Copyright 2007-2010 Thomas Schmitt, <scdbackup@gmx.net> Copyright 2007-2011 Thomas Schmitt, <scdbackup@gmx.net>
Provided under GPL version 2 or later. Provided under GPL version 2 or later.
@ -573,6 +573,12 @@ int Xorriso_lst_destroy_all(struct Xorriso_lsT **lstring, int flag);
-list_delimiter text or at argv[argc-1]. -list_delimiter text or at argv[argc-1].
After the call, *idx will be the index of the first not yet interpreted After the call, *idx will be the index of the first not yet interpreted
argv. argv.
Do not set any flag bits which are not described by "@param flag".
I.e. if flag is not mentioned, then submit 0.
Yet undefined flag bits might get a meaning in future. Unset bits will
then produce the traditional behavior, whereas set bits might bring
surprises to inadverted callers.
*/ */

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

@ -2484,6 +2484,10 @@ File: xorriso.info, Node: DialogCtl, Next: Inquiry, Prev: Exception, Up: Opt
Enable or disable to enter dialog mode after all arguments are Enable or disable to enter dialog mode after all arguments are
processed. In dialog mode input lines get prompted via readline processed. In dialog mode input lines get prompted via readline
or from stdin. or from stdin.
If no -abort_on severity was set when dialog starts, then "FATAL"
is set to avoid abort in most cases of wrong input. Before dialog
begins the default is "FAILURE" which e.g. aborts on unknown
commands.
Mode "on" supports input of newline characters within quotation Mode "on" supports input of newline characters within quotation
marks and line continuation by trailing backslash outside marks and line continuation by trailing backslash outside
quotation marks. Mode "single_line" does not. quotation marks. Mode "single_line" does not.
@ -2597,7 +2601,9 @@ File: xorriso.info, Node: Inquiry, Next: Navigate, Prev: DialogCtl, Up: Opti
Print the foreseeable consumption of 2048 byte blocks by next Print the foreseeable consumption of 2048 byte blocks by next
-commit. This can last a while as a -commit gets prepared and only -commit. This can last a while as a -commit gets prepared and only
in last moment is revoked by this option. The result depends on in last moment is revoked by this option. The result depends on
several settings and also on the kind of output device. several settings and also on the kind of output device. If no
-jidgo options are given, then -padding (300 kB by default) is not
counted as part of the image size.
-tell_media_space -tell_media_space
Print available space on output media and the free space after Print available space on output media and the free space after
@ -3762,6 +3768,7 @@ Files with names matching *.o or *.swp get excluded explicitly.
When done with writing the new session gets checked by its recorded MD5. When done with writing the new session gets checked by its recorded MD5.
$ xorriso \ $ xorriso \
-abort_on FATAL \
-for_backup -disk_dev_ino on \ -for_backup -disk_dev_ino on \
-assert_volid 'PROJECTS_MAIL_*' FATAL \ -assert_volid 'PROJECTS_MAIL_*' FATAL \
-dev /dev/sr0 \ -dev /dev/sr0 \
@ -4098,7 +4105,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
* -overwrite enables overwriting in ISO: SetInsert. (line 127) * -overwrite enables overwriting in ISO: SetInsert. (line 127)
* -pacifier controls pacifier text form: Emulation. (line 142) * -pacifier controls pacifier text form: Emulation. (line 142)
* -padding sets amount of image padding: SetWrite. (line 263) * -padding sets amount of image padding: SetWrite. (line 263)
* -page set terminal geometry: DialogCtl. (line 15) * -page set terminal geometry: DialogCtl. (line 19)
* -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)
@ -4110,14 +4117,14 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
* -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 108) * -publisher sets publisher id: SetWrite. (line 108)
* -pvd_info shows image id strings: Inquiry. (line 79) * -pvd_info shows image id strings: Inquiry. (line 81)
* -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)
* -quoted_not_list sets exclusions: SetInsert. (line 72) * -quoted_not_list sets exclusions: SetInsert. (line 72)
* -quoted_path_list inserts paths from disk file: Insert. (line 80) * -quoted_path_list inserts paths from disk file: Insert. (line 80)
* -read_mkisofsrc searches and reads .mkisofsrc file: Emulation. * -read_mkisofsrc searches and reads .mkisofsrc file: Emulation.
(line 130) (line 130)
* -reassure enables confirmation question: DialogCtl. (line 28) * -reassure enables confirmation question: DialogCtl. (line 32)
* -report_about controls verbosity: Exception. (line 55) * -report_about controls verbosity: Exception. (line 55)
* -return_with controls exit value: Exception. (line 39) * -return_with controls exit value: Exception. (line 39)
* -rm deletes files from ISO image: Manip. (line 21) * -rm deletes files from ISO image: Manip. (line 21)
@ -4147,14 +4154,14 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
* -stdio_sync controls stdio buffer: SetWrite. (line 240) * -stdio_sync controls stdio buffer: SetWrite. (line 240)
* -stream_recording controls defect management: SetWrite. (line 221) * -stream_recording controls defect management: SetWrite. (line 221)
* -system_id sets system id: SetWrite. (line 123) * -system_id sets system id: SetWrite. (line 123)
* -tell_media_space reports free space: Inquiry. (line 75) * -tell_media_space reports free space: Inquiry. (line 77)
* -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 186) * -uid sets global ownership: SetWrite. (line 186)
* -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 28)
* -version prints help text: Scripting. (line 19) * -version prints help text: Scripting. (line 19)
* -volid sets volume id: SetWrite. (line 84) * -volid sets volume id: SetWrite. (line 84)
* -volset_id sets volume set id: SetWrite. (line 103) * -volset_id sets volume set id: SetWrite. (line 103)
@ -4201,10 +4208,10 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Delete, from ISO image, -rm_r: Manip. (line 28) * Delete, from ISO image, -rm_r: Manip. (line 28)
* Delete, ISO directory, -rmdir: Manip. (line 32) * Delete, ISO directory, -rmdir: Manip. (line 32)
* Dialog, bring text into history, -history: Scripting. (line 22) * Dialog, bring text into history, -history: Scripting. (line 22)
* Dialog, confirmation question, -reassure: DialogCtl. (line 28) * Dialog, confirmation question, -reassure: DialogCtl. (line 32)
* Dialog, enable dialog mode, -dialog: DialogCtl. (line 7) * Dialog, enable dialog mode, -dialog: DialogCtl. (line 7)
* Dialog, line editing, -use_readline: DialogCtl. (line 24) * Dialog, line editing, -use_readline: DialogCtl. (line 28)
* Dialog, terminal geometry, -page: DialogCtl. (line 15) * Dialog, terminal geometry, -page: DialogCtl. (line 19)
* Directory, create, -mkdir: Insert. (line 166) * Directory, create, -mkdir: Insert. (line 166)
* Directory, delete, -rmdir: Manip. (line 32) * Directory, delete, -rmdir: Manip. (line 32)
* disk_path, _definition: Insert. (line 6) * disk_path, _definition: Insert. (line 6)
@ -4255,7 +4262,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Image, set volume id, -volid: SetWrite. (line 84) * Image, set volume id, -volid: SetWrite. (line 84)
* Image, set volume set id, -volset_id: SetWrite. (line 103) * Image, set volume set id, -volset_id: SetWrite. (line 103)
* Image, set volume timestamp, -volume_date: SetWrite. (line 130) * Image, set volume timestamp, -volume_date: SetWrite. (line 130)
* Image, show id strings, -pvd_info: Inquiry. (line 79) * Image, show id strings, -pvd_info: Inquiry. (line 81)
* 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)
* Insert, file exclusion from file, -not_list: SetInsert. (line 67) * Insert, file exclusion from file, -not_list: SetInsert. (line 67)
@ -4391,7 +4398,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Write, defect management, -stream_recording: SetWrite. (line 221) * Write, defect management, -stream_recording: SetWrite. (line 221)
* Write, enable Joliet, -joliet: SetWrite. (line 10) * Write, enable Joliet, -joliet: SetWrite. (line 10)
* Write, fifo size, -fs: SetWrite. (line 250) * Write, fifo size, -fs: SetWrite. (line 250)
* Write, free space, -tell_media_space: Inquiry. (line 75) * Write, free space, -tell_media_space: Inquiry. (line 77)
* 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 263) * Write, padding image, -padding: SetWrite. (line 263)
@ -4434,34 +4441,34 @@ Node: Jigdo113261
Node: Charset117519 Node: Charset117519
Node: Exception120270 Node: Exception120270
Node: DialogCtl124785 Node: DialogCtl124785
Node: Inquiry127130 Node: Inquiry127353
Node: Navigate131344 Node: Navigate131686
Node: Verify139239 Node: Verify139581
Node: Restore147828 Node: Restore148170
Node: Emulation154484 Node: Emulation154826
Node: Scripting163316 Node: Scripting163658
Node: Frontend168878 Node: Frontend169220
Node: Examples170173 Node: Examples170515
Node: ExDevices171342 Node: ExDevices171684
Node: ExCreate171976 Node: ExCreate172318
Node: ExDialog173250 Node: ExDialog173592
Node: ExGrowing174512 Node: ExGrowing174854
Node: ExModifying175314 Node: ExModifying175656
Node: ExBootable175815 Node: ExBootable176157
Node: ExCharset176362 Node: ExCharset176704
Node: ExPseudo177190 Node: ExPseudo177532
Node: ExCdrecord178084 Node: ExCdrecord178426
Node: ExMkisofs178399 Node: ExMkisofs178741
Node: ExGrowisofs179402 Node: ExGrowisofs179744
Node: ExException180526 Node: ExException180868
Node: ExTime180980 Node: ExTime181322
Node: ExIncBackup181439 Node: ExIncBackup181781
Node: ExRestore184911 Node: ExRestore185271
Node: ExRecovery185880 Node: ExRecovery186240
Node: Files186446 Node: Files186806
Node: Seealso187674 Node: Seealso188034
Node: Legal188198 Node: Legal188558
Node: CommandIdx189120 Node: CommandIdx189480
Node: ConceptIdx203346 Node: ConceptIdx203706
 
End Tag Table End Tag Table

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

@ -3316,6 +3316,10 @@ file content stems from the loaded ISO image and is not filtered.
Enable or disable to enter dialog mode after all arguments are processed. Enable or disable to enter dialog mode after all arguments are processed.
In dialog mode input lines get prompted via readline or from stdin. In dialog mode input lines get prompted via readline or from stdin.
@* @*
If no -abort_on severity was set when dialog starts, then "FATAL" is set
to avoid abort in most cases of wrong input. Before dialog begins the
default is "FAILURE" which e.g. aborts on unknown commands.
@*
Mode "on" supports input of newline characters within quotation marks and Mode "on" supports input of newline characters within quotation marks and
line continuation by trailing backslash outside quotation marks. line continuation by trailing backslash outside quotation marks.
Mode "single_line" does not. Mode "single_line" does not.
@ -3475,6 +3479,8 @@ Print the foreseeable consumption of 2048 byte blocks
by next -commit. This can last a while as a -commit gets by next -commit. This can last a while as a -commit gets
prepared and only in last moment is revoked by this option. prepared and only in last moment is revoked by this option.
The result depends on several settings and also on the kind of output device. The result depends on several settings and also on the kind of output device.
If no -jidgo options are given, then -padding (300 kB by default) is not
counted as part of the image size.
@c man .TP @c man .TP
@item -tell_media_space @item -tell_media_space
@kindex -tell_media_space reports free space @kindex -tell_media_space reports free space
@ -5069,6 +5075,8 @@ When done with writing the new session gets checked by its recorded MD5.
@* @*
@sp 1 @sp 1
$ xorriso \ $ xorriso \
@*
-abort_on FATAL \
@* @*
-for_backup -disk_dev_ino on \ -for_backup -disk_dev_ino on \
@* @*

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

@ -2,7 +2,7 @@
/* Command line oriented batch and dialog tool which creates, loads, /* Command line oriented batch and dialog tool which creates, loads,
manipulates and burns ISO 9660 filesystem images. manipulates and burns ISO 9660 filesystem images.
Copyright 2007-2010 Thomas Schmitt, <scdbackup@gmx.net> Copyright 2007-2011 Thomas Schmitt, <scdbackup@gmx.net>
Provided under GPL version 2 or later. Provided under GPL version 2 or later.
@ -482,6 +482,7 @@ struct XorrisO { /* the global context of xorriso */
int library_msg_direct_print; int library_msg_direct_print;
char abort_on_text[20]; char abort_on_text[20];
int abort_on_severity; /* A severity rank number as threshold */ int abort_on_severity; /* A severity rank number as threshold */
int abort_on_is_default; /* will be set to 0 by first -abort_on */
int problem_status; /* Severity rank number. 0= no abort condition present */ int problem_status; /* Severity rank number. 0= no abort condition present */
char problem_status_text[20]; char problem_status_text[20];

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

@ -1 +1 @@
#define Xorriso_timestamP "2010.12.29.104047" #define Xorriso_timestamP "2011.01.04.193042"