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

Rectified SORRY,FAILURE,FATAL classification

Browse Source
This commit is contained in:
Thomas Schmitt 2008-02-06 15:37:54 +00:00
parent 9b525e9fff
commit 3abb7a6a9e
5 changed files with 113 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libisoburn/trunk/libisoburn/burn_wrap.c
View File

@ -275,7 +275,7 @@ int isoburn_drive_scan_and_grab(struct burn_drive_info *drive_infos[],
if(conv_ret<=0) { if(conv_ret<=0) {
sprintf(msg, "Unsuitable drive address: '%s'\n",adr); sprintf(msg, "Unsuitable drive address: '%s'\n",adr);
msg[BURN_MSGS_MESSAGE_LEN-1]= 0; msg[BURN_MSGS_MESSAGE_LEN-1]= 0;
burn_msgs_submit(0x00060000, msg, 0, "SORRY", NULL); burn_msgs_submit(0x00060000, msg, 0, "FAILURE", NULL);
ret= 0; goto ex; ret= 0; goto ex;
} }
@ -480,7 +480,7 @@ void isoburn_disc_write(struct burn_write_opts *opts, struct burn_disc *disc)
write_type= burn_write_opts_auto_write_type(opts, disc, reasons, 0); write_type= burn_write_opts_auto_write_type(opts, disc, reasons, 0);
if (write_type == BURN_WRITE_NONE) { if (write_type == BURN_WRITE_NONE) {
sprintf(msg, "Failed to find a suitable write mode:\n%s", reasons); sprintf(msg, "Failed to find a suitable write mode:\n%s", reasons);
burn_msgs_submit(0x00060000, msg, 0, "SORRY", NULL); burn_msgs_submit(0x00060000, msg, 0, "FAILURE", NULL);
if(o!=NULL) if(o!=NULL)
o->wrote_well= 0; o->wrote_well= 0;
/* To cause a negative reply with burn_drive_wrote_well() */ /* To cause a negative reply with burn_drive_wrote_well() */

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

@ -396,7 +396,7 @@ Set the image expansion method to growing.
.br .br
This is only allowed as long as no changes are pending in the currently This is only allowed as long as no changes are pending in the currently
loaded ISO image. Eventually one has to perform -commit or -rollback first. loaded ISO image. Eventually one has to perform -commit or -rollback first.
Violation yields a SORRY event. Violation yields a FAILURE event.
.br .br
Special address string "-" means standard output, to which several restrictions Special address string "-" means standard output, to which several restrictions
apply. See above paragraph "Libburn drives". apply. See above paragraph "Libburn drives".
@ -572,7 +572,7 @@ argument in the list. Use the same rules as with shell command mv.
.br .br
If pattern expansion is enabled and if the last argument contains wildcard If pattern expansion is enabled and if the last argument contains wildcard
characters then it must match exactly one existing file address, or else the characters then it must match exactly one existing file address, or else the
command fails with a SORRY event. command fails with a FAILURE event.
.TP .TP
\fB\-chown\fR uid iso_rr_path [***] \fB\-chown\fR uid iso_rr_path [***]
Set ownership of file objects in the ISO image. uid may either be a decimal Set ownership of file objects in the ISO image. uid may either be a decimal
@ -700,7 +700,7 @@ needs to get terminated by "--".
\fB\-mkdir\fR iso_rr_path [...] \fB\-mkdir\fR iso_rr_path [...]
Create empty directories if they do not exist yet. Create empty directories if they do not exist yet.
Existence as directory generates a WARNING event, existence as Existence as directory generates a WARNING event, existence as
other file causes a SORRY event. other file causes a FAILURE event.
.TP .TP
\fB\-rmdir\fR iso_rr_path [***] \fB\-rmdir\fR iso_rr_path [***]
Delete empty directories. Delete empty directories.
@ -760,7 +760,7 @@ is activated.
.br .br
This affects only the -outdev not the -indev. This affects only the -outdev not the -indev.
If both drives are the same and if the ISO image was altered If both drives are the same and if the ISO image was altered
then this command leads to a SORRY event. then this command leads to a FAILURE event.
Defined modes are: Defined modes are:
fast, all, deformat, deformat_quickest fast, all, deformat, deformat_quickest
.br .br
@ -773,8 +773,8 @@ xorriso will write onto them only if option -close is set to "on".
.br .br
The progress reports issued by some drives while blanking are The progress reports issued by some drives while blanking are
quite unrealistic. Do not conclude success or failure from the quite unrealistic. Do not conclude success or failure from the
reported percentages. Blanking was successful if no FATAL or reported percentages. Blanking was successful if no SORRY event or
SORRY event occured. worse occured.
.TP .TP
\fB\-format\fR mode \fB\-format\fR mode
Convert unformatted DVD-RW into overwriteable ones, Convert unformatted DVD-RW into overwriteable ones,
@ -794,8 +794,8 @@ re-formatting.
The progress reports issued by some drives while formatting are The progress reports issued by some drives while formatting are
quite unrealistic. Do not conclude success or failure from the quite unrealistic. Do not conclude success or failure from the
reported percentages. Formatting was successful if no FATAL or reported percentages. Formatting was successful if no SORRY event
SORRY event occured. or worse occured.
.TP .TP
.B Settings for data insertion: .B Settings for data insertion:
.TP .TP
@ -869,7 +869,7 @@ and eventually enables -disk_pattern expansion.
Allow or disallow to overwrite existing files in the Allow or disallow to overwrite existing files in the
ISO image by files with the same user defined name. ISO image by files with the same user defined name.
.br .br
With setting "off", name collisions cause SORRY-events. With setting "off", name collisions cause FAILURE events.
With setting "nondir", only directories are protected by such events, other With setting "nondir", only directories are protected by such events, other
existing file types get treated with -rm before the new file gets added. existing file types get treated with -rm before the new file gets added.
Setting "on" allows automatic -rm_r. I.e. a non-directory can replace an Setting "on" allows automatic -rm_r. I.e. a non-directory can replace an
@ -918,7 +918,7 @@ the speed value given by the burn program only as upper limit
for their own decision. for their own decision.
.TP .TP
\fB\-dummy\fR "on"|"off" \fB\-dummy\fR "on"|"off"
If "on" simulate burning or refuse with SORRY event if If "on" simulate burning or refuse with FAILURE event if
no simulation is possible, do neither blank nor format. no simulation is possible, do neither blank nor format.
.TP .TP
\fB-fs\fR number["k"|"m"] \fB-fs\fR number["k"|"m"]
@ -948,7 +948,7 @@ For images which will never get to a CD it is safe to use -padding 0 .
.TP .TP
\fB\-abort_on\fR severity \fB\-abort_on\fR severity
Set the threshold for events to abort the program. Set the threshold for events to abort the program.
Events are classified by severity : Events are classified by severity. In decreasing order:
.br .br
"NEVER", "ABORT", "FATAL", "FAILURE" , "SORRY", "NEVER", "ABORT", "FATAL", "FAILURE" , "SORRY",
"WARNING", "HINT", "NOTE", "UPDATE", "DEBUG", "ALL" "WARNING", "HINT", "NOTE", "UPDATE", "DEBUG", "ALL"

99
libisoburn/trunk/xorriso/xorriso.c
View File

@ -285,7 +285,7 @@ int Sfile_prepend_path(char *prefix, char path[SfileadrL], int flag)
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"Combination of wd and relative address too long (%d > %d)", "Combination of wd and relative address too long (%d > %d)",
l,SfileadrL-1); l,SfileadrL-1);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
#endif #endif
return(-1); return(-1);
@ -3524,7 +3524,7 @@ int Xorriso_prepare_regex(struct XorrisO *xorriso, char *adr, int flag)
no_regex_available:; no_regex_available:;
sprintf(xorriso->info_text,"%s : regular expressions not implemented", sprintf(xorriso->info_text,"%s : regular expressions not implemented",
xorriso->progname); xorriso->progname);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0); return(0);
} }
@ -3535,7 +3535,7 @@ no_regex_available:;
l= strlen(adr)+strlen(wd)+1; l= strlen(adr)+strlen(wd)+1;
if(l*2+2>sizeof(xorriso->reg_expr) || l*2+2>sizeof(adr_part)) { if(l*2+2>sizeof(xorriso->reg_expr) || l*2+2>sizeof(adr_part)) {
sprintf(xorriso->info_text,"Search pattern too long"); sprintf(xorriso->info_text,"Search pattern too long");
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0); return(0);
} }
} }
@ -3659,7 +3659,7 @@ next_adr_part:;
return(2); return(2);
sprintf(xorriso->info_text, "Your '..' bonked at the %s directory.", sprintf(xorriso->info_text, "Your '..' bonked at the %s directory.",
is_still_relative ? "working" : "root"); is_still_relative ? "working" : "root");
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY",0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE",0);
return(0); return(0);
} }
@ -3700,7 +3700,7 @@ next_adr_part:;
cannot_compile:; cannot_compile:;
sprintf(xorriso->info_text, "Cannot compile regular expression : %s", sprintf(xorriso->info_text, "Cannot compile regular expression : %s",
xorriso->reg_expr); xorriso->reg_expr);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY",0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE",0);
return(0); return(0);
} }
#else /* Xorriso_with_regeX */ #else /* Xorriso_with_regeX */
@ -3828,7 +3828,7 @@ int Xorriso_resolve_link(struct XorrisO *xorriso,
handle_error:; handle_error:;
sprintf(xorriso->info_text, "Cannot obtain link target of : %s", sprintf(xorriso->info_text, "Cannot obtain link target of : %s",
Text_shellsafe(link_path, sfe, 0)); Text_shellsafe(link_path, sfe, 0));
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, errno, "SORRY",0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, errno, "FAILURE",0);
handle_abort:; handle_abort:;
if(strcmp(lpt, link_path)!=0) { if(strcmp(lpt, link_path)!=0) {
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
@ -3842,7 +3842,7 @@ handle_abort:;
if(l==0) { if(l==0) {
sprintf(xorriso->info_text, "Empty link target with : %s", sprintf(xorriso->info_text, "Empty link target with : %s",
Text_shellsafe(link_path, sfe, 0)); Text_shellsafe(link_path, sfe, 0));
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, errno, "SORRY",0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, errno, "FAILURE",0);
goto handle_abort; goto handle_abort;
} }
@ -3880,7 +3880,8 @@ handle_abort:;
too_many_hops:; too_many_hops:;
sprintf(xorriso->info_text, "Too many link hops with : %s", sprintf(xorriso->info_text, "Too many link hops with : %s",
Text_shellsafe(link_path, sfe, 0)); Text_shellsafe(link_path, sfe, 0));
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, show_errno,"SORRY",0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, show_errno,
"FAILURE",0);
return(0); return(0);
} }
} }
@ -4170,7 +4171,7 @@ int Xorriso_exec(struct XorrisO *xorriso, char *cmd, int flag)
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"Command for external process too long : %d (max %d)", "Command for external process too long : %d (max %d)",
cmd_l, SfileadrL); cmd_l, SfileadrL);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
} }
for(pass=0;pass<2;pass++) { for(pass=0;pass<2;pass++) {
is_done= 0; is_done= 0;
@ -4210,7 +4211,7 @@ int Xorriso_exec(struct XorrisO *xorriso, char *cmd, int flag)
if(errmsg[0]!=0) if(errmsg[0]!=0)
sprintf(xorriso->info_text+strlen(xorriso->info_text), sprintf(xorriso->info_text+strlen(xorriso->info_text),
"message: %s\n",errmsg); "message: %s\n",errmsg);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 1); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 1);
{ret= 0; goto ex;} {ret= 0; goto ex;}
} }
ret= 1; ret= 1;
@ -4239,7 +4240,7 @@ int Xorriso_prepare_expansion_pattern(struct XorrisO *xorriso, char *pattern,
if(ret<=0) { if(ret<=0) {
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"Cannot compile pattern to regular expression: %s", pattern); "Cannot compile pattern to regular expression: %s", pattern);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0); return(0);
} }
return(1+prepwd); return(1+prepwd);
@ -4507,6 +4508,7 @@ int Xorriso_eval_nonmatch(struct XorrisO *xorriso, char *pattern,
/* @param flag bit0= a match count !=1 is a SORRY event /* @param flag bit0= a match count !=1 is a SORRY event
bit1= a match count !=1 is a FAILURE event
*/ */
int Xorriso_check_matchcount(struct XorrisO *xorriso, int Xorriso_check_matchcount(struct XorrisO *xorriso,
int count, int nonconst_mismatches, int num_patterns, int count, int nonconst_mismatches, int num_patterns,
@ -4523,7 +4525,8 @@ int Xorriso_check_matchcount(struct XorrisO *xorriso,
if(num_patterns==1) if(num_patterns==1)
sprintf(xorriso->info_text+strlen(xorriso->info_text), ": %s", sprintf(xorriso->info_text+strlen(xorriso->info_text), ": %s",
Text_shellsafe(patterns[0], sfe, 0)); Text_shellsafe(patterns[0], sfe, 0));
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0,
(flag&2 ? "FAILURE" : "SORRY"), 0);
return(0); return(0);
} }
return(1); return(1);
@ -4572,7 +4575,7 @@ int Xorriso_alloc_pattern_mem(struct XorrisO *xorriso, off_t mem,
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"List of matching file addresses exceeds -temp_mem_limit (%s > %s)", "List of matching file addresses exceeds -temp_mem_limit (%s > %s)",
mem_text, limit_text); mem_text, limit_text);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0); return(0);
} }
@ -4585,7 +4588,7 @@ int Xorriso_alloc_pattern_mem(struct XorrisO *xorriso, off_t mem,
} }
/* @param flag bit0= a match count !=1 is a SORRY event /* @param flag bit0= a match count !=1 is a FAILURE event
bit1= with bit0 tolerate 0 matches if pattern is a constant bit1= with bit0 tolerate 0 matches if pattern is a constant
*/ */
int Xorriso_expand_disk_pattern(struct XorrisO *xorriso, int Xorriso_expand_disk_pattern(struct XorrisO *xorriso,
@ -4620,7 +4623,7 @@ int Xorriso_expand_disk_pattern(struct XorrisO *xorriso,
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"Address set by -cdx is not a directory: %s", "Address set by -cdx is not a directory: %s",
Text_shellsafe(dir_adr, sfe, 0)); Text_shellsafe(dir_adr, sfe, 0));
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
ret= 0; goto ex; ret= 0; goto ex;
} }
} }
@ -4641,7 +4644,7 @@ int Xorriso_expand_disk_pattern(struct XorrisO *xorriso,
} }
ret= Xorriso_check_matchcount(xorriso, count, nonconst_mismatches, ret= Xorriso_check_matchcount(xorriso, count, nonconst_mismatches,
num_patterns, patterns, flag&1); num_patterns, patterns, (flag&1)|2);
if(ret<=0) if(ret<=0)
goto ex; goto ex;
@ -5187,7 +5190,7 @@ int Xorriso_much_too_long(struct XorrisO *xorriso, int len, int flag)
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"Path given for %s is much too long (%d)", "Path given for %s is much too long (%d)",
((flag&1) ? "local filesystem" : "ISO image"), len); ((flag&1) ? "local filesystem" : "ISO image"), len);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0); return(0);
} }
return(1); return(1);
@ -5995,7 +5998,7 @@ int Xorriso_cpmv_args(struct XorrisO *xorriso, char *cmd,
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"%s: more than one origin given, destination is a non-directory: %s", "%s: more than one origin given, destination is a non-directory: %s",
cmd, Text_shellsafe(destv[0], sfe, 0)); cmd, Text_shellsafe(destv[0], sfe, 0));
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
{ret= 0; goto ex;} {ret= 0; goto ex;}
} }
if(ret==0) { /* compute complete eff_dest */ if(ret==0) { /* compute complete eff_dest */
@ -6058,7 +6061,7 @@ int Xorriso_option_abort_on(struct XorrisO *xorriso, char *severity, int flag)
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"-abort_on: Not a known severity name : %s", "-abort_on: Not a known severity name : %s",
Text_shellsafe(severity, sfe, 0)); Text_shellsafe(severity, sfe, 0));
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(ret); return(ret);
} }
if(Sfile_str(xorriso->abort_on_text,severity,0)<=0) if(Sfile_str(xorriso->abort_on_text,severity,0)<=0)
@ -6177,7 +6180,7 @@ int Xorriso_option_add_plainly(struct XorrisO *xorriso, char *mode,int flag)
xorriso->add_plainly= 3; xorriso->add_plainly= 3;
else { else {
sprintf(xorriso->info_text, "-add_plainly: unknown mode '%s'", mode); sprintf(xorriso->info_text, "-add_plainly: unknown mode '%s'", mode);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0); return(0);
} }
return(1); return(1);
@ -6260,14 +6263,14 @@ int Xorriso_option_blank(struct XorrisO *xorriso, char *mode, int flag)
if(xorriso->out_drive_handle == NULL) { if(xorriso->out_drive_handle == NULL) {
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"%s: No output drive set by -dev -or -outdev", cmd); "%s: No output drive set by -dev -or -outdev", cmd);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0); return(0);
} }
if(xorriso->in_drive_handle == xorriso->out_drive_handle) { if(xorriso->in_drive_handle == xorriso->out_drive_handle) {
if(xorriso->volset_change_pending) { if(xorriso->volset_change_pending) {
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"%s: Image changes pending. -commit or -rollback first.", cmd); "%s: Image changes pending. -commit or -rollback first.", cmd);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0); return(0);
} }
aq_flag= 3; aq_flag= 3;
@ -6290,7 +6293,7 @@ int Xorriso_option_blank(struct XorrisO *xorriso, char *mode, int flag)
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"%s: Unknown %s mode '%s'", "%s: Unknown %s mode '%s'",
cmd, ((flag&1) ? "format" : "blank"), mode); cmd, ((flag&1) ? "format" : "blank"), mode);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0); return(0);
} }
if(flag&1) if(flag&1)
@ -6315,7 +6318,7 @@ int Xorriso_option_blank(struct XorrisO *xorriso, char *mode, int flag)
if(ret<=0) { if(ret<=0) {
sprintf(xorriso->info_text,"Could not re-aquire -outdev %s", sprintf(xorriso->info_text,"Could not re-aquire -outdev %s",
Text_shellsafe(xorriso->outdev, sfe, 0)); Text_shellsafe(xorriso->outdev, sfe, 0));
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(ret); return(ret);
} }
} }
@ -6332,7 +6335,7 @@ int Xorriso_option_cdi(struct XorrisO *xorriso, char *iso_rr_path, int flag)
if (strlen(iso_rr_path)>sizeof(xorriso->wdi)) { if (strlen(iso_rr_path)>sizeof(xorriso->wdi)) {
sprintf(xorriso->info_text,"-cdi: iso_rr_path too long (%d > %d)", sprintf(xorriso->info_text,"-cdi: iso_rr_path too long (%d > %d)",
(int) strlen(iso_rr_path), (int) sizeof(xorriso->wdi)-1); (int) strlen(iso_rr_path), (int) sizeof(xorriso->wdi)-1);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0); return(0);
} }
Xorriso_warn_of_wildcards(xorriso, iso_rr_path, 1); Xorriso_warn_of_wildcards(xorriso, iso_rr_path, 1);
@ -6366,7 +6369,7 @@ int Xorriso_option_cdi(struct XorrisO *xorriso, char *iso_rr_path, int flag)
} else if(ret!=2) { } else if(ret!=2) {
sprintf(xorriso->info_text, "-cdi: not a directory : %s", sprintf(xorriso->info_text, "-cdi: not a directory : %s",
Text_shellsafe(eff_path, sfe, 0)); Text_shellsafe(eff_path, sfe, 0));
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0); return(0);
} }
strcpy(xorriso->wdi, eff_path); strcpy(xorriso->wdi, eff_path);
@ -6385,7 +6388,7 @@ int Xorriso_option_cdx(struct XorrisO *xorriso, char *disk_path, int flag)
if (strlen(disk_path)>sizeof(xorriso->wdx)) { if (strlen(disk_path)>sizeof(xorriso->wdx)) {
sprintf(xorriso->info_text,"-cdx: disk_path too long (%d > %d)", sprintf(xorriso->info_text,"-cdx: disk_path too long (%d > %d)",
(int) strlen(disk_path), (int) sizeof(xorriso->wdx)-1); (int) strlen(disk_path), (int) sizeof(xorriso->wdx)-1);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0); return(0);
} }
Xorriso_warn_of_wildcards(xorriso, disk_path, 1|2); Xorriso_warn_of_wildcards(xorriso, disk_path, 1|2);
@ -6414,14 +6417,14 @@ int Xorriso_option_cdx(struct XorrisO *xorriso, char *disk_path, int flag)
if(ret<0) { if(ret<0) {
sprintf(xorriso->info_text,"-cdx: file not found : %s", sprintf(xorriso->info_text,"-cdx: file not found : %s",
Text_shellsafe(eff_path, sfe, 0)); Text_shellsafe(eff_path, sfe, 0));
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0); return(0);
} }
if(ret!=2) { if(ret!=2) {
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"-cdx: not a directory : %s", "-cdx: not a directory : %s",
Text_shellsafe(eff_path, sfe, 0)); Text_shellsafe(eff_path, sfe, 0));
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0); return(0);
} }
} }
@ -6688,7 +6691,7 @@ int Xorriso_option_cpri(struct XorrisO *xorriso, int argc, char **argv,
if(ret<=0) { if(ret<=0) {
printf(xorriso->info_text, "Effective path gets much too long (%d)", printf(xorriso->info_text, "Effective path gets much too long (%d)",
strlen(eff_dest)+strlen(leafname)+1); strlen(eff_dest)+strlen(leafname)+1);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
goto problem_handler; goto problem_handler;
} }
} }
@ -6749,13 +6752,13 @@ int Xorriso_option_dev(struct XorrisO *xorriso, char *in_adr, int flag)
strcmp(adr, "stdio:-")==0) { strcmp(adr, "stdio:-")==0) {
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"No suitable path given by device address '%s'", adr); "No suitable path given by device address '%s'", adr);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0); return(0);
} }
if(xorriso->ban_stdio_write) { if(xorriso->ban_stdio_write) {
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"Drive address banned by -ban_stdio_write : '%s'", adr); "Drive address banned by -ban_stdio_write : '%s'", adr);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0); return(0);
} }
} }
@ -6764,7 +6767,7 @@ int Xorriso_option_dev(struct XorrisO *xorriso, char *in_adr, int flag)
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"%s: Image changes pending. -commit or -rollback first", "%s: Image changes pending. -commit or -rollback first",
(flag&2) ? "-dev" : "-indev"); (flag&2) ? "-dev" : "-indev");
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0); return(0);
} }
if((flag&1) && !(flag&4)) { if((flag&1) && !(flag&4)) {
@ -6810,7 +6813,7 @@ int Xorriso_option_devices(struct XorrisO *xorriso, int flag)
if(xorriso->volset_change_pending) { if(xorriso->volset_change_pending) {
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"-devices: Image changes pending. -commit or -rollback first"); "-devices: Image changes pending. -commit or -rollback first");
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0); return(0);
} }
ret= Xorriso_reassure(xorriso, "-devices", ret= Xorriso_reassure(xorriso, "-devices",
@ -6861,7 +6864,7 @@ int Xorriso_option_disk_pattern(struct XorrisO *xorriso, char *mode, int flag)
xorriso->do_disk_pattern= 2; xorriso->do_disk_pattern= 2;
else { else {
sprintf(xorriso->info_text, "-disk_pattern: unknown mode '%s'", mode); sprintf(xorriso->info_text, "-disk_pattern: unknown mode '%s'", mode);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0); return(0);
} }
return(1); return(1);
@ -6890,7 +6893,7 @@ int Xorriso_option_eject(struct XorrisO *xorriso, char *which, int flag)
if((gu_flag&1) && xorriso->volset_change_pending) { if((gu_flag&1) && xorriso->volset_change_pending) {
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"-eject: Image changes pending. -commit or -rollback first"); "-eject: Image changes pending. -commit or -rollback first");
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0); return(0);
} }
ret= Xorriso_give_up_drive(xorriso, gu_flag); ret= Xorriso_give_up_drive(xorriso, gu_flag);
@ -6953,7 +6956,7 @@ int Xorriso_option_iso_rr_pattern(struct XorrisO *xorriso, char *mode,int flag)
xorriso->do_iso_rr_pattern= 2; xorriso->do_iso_rr_pattern= 2;
else { else {
sprintf(xorriso->info_text, "-iso_rr_pattern: unknown mode '%s'", mode); sprintf(xorriso->info_text, "-iso_rr_pattern: unknown mode '%s'", mode);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0); return(0);
} }
return(1); return(1);
@ -7023,7 +7026,7 @@ unknown_mode:;
else else
sprintf(xorriso->info_text, "-follow: oversized mode parameter (%d)",l); sprintf(xorriso->info_text, "-follow: oversized mode parameter (%d)",l);
sorry_ex: sorry_ex:
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
xorriso->do_follow_pattern= was_fpt; xorriso->do_follow_pattern= was_fpt;
xorriso->do_follow_param= was_fpr; xorriso->do_follow_param= was_fpr;
xorriso->do_follow_links= was_fl; xorriso->do_follow_links= was_fl;
@ -7179,7 +7182,7 @@ not_enough_arguments:;
sprintf(xorriso->info_text, "-find[ix]: unknown option %s", sprintf(xorriso->info_text, "-find[ix]: unknown option %s",
Text_shellsafe(argv[i], sfe, 0)); Text_shellsafe(argv[i], sfe, 0));
sorry_ex:; sorry_ex:;
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
{ret= 0; goto ex;} {ret= 0; goto ex;}
} }
} }
@ -7427,7 +7430,7 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag)
"General options:", "General options:",
" -help Print this text", " -help Print this text",
" -abort_on severity Set the threshhold for events to abort the program.", " -abort_on severity Set the threshhold for events to abort the program.",
" Useful severities are: NEVER, ABORT, FATAL, SORRY, WARNING", " Useful severities: NEVER, ABORT, FATAL, FAILURE, SORRY, WARNING",
" -report_about severity Set the threshhold for events to be reported.", " -report_about severity Set the threshhold for events to be reported.",
" Use -abort_on severities or: HINT, NOTE, UPDATE, DEBUG, ALL", " Use -abort_on severities or: HINT, NOTE, UPDATE, DEBUG, ALL",
" -dialog after all arguments are processed, enter dialog mode.", " -dialog after all arguments are processed, enter dialog mode.",
@ -7545,7 +7548,7 @@ int Xorriso_option_joliet(struct XorrisO *xorriso, char *mode, int flag)
xorriso->do_joliet= 1; xorriso->do_joliet= 1;
else { else {
sprintf(xorriso->info_text, "-joliet: unknown mode '%s'", mode); sprintf(xorriso->info_text, "-joliet: unknown mode '%s'", mode);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0); return(0);
} }
return(1); return(1);
@ -7813,7 +7816,7 @@ int Xorriso_option_mvi(struct XorrisO *xorriso, int argc, char **argv,
if(ret<=0) { if(ret<=0) {
printf(xorriso->info_text, "Effective path gets much too long (%d)", printf(xorriso->info_text, "Effective path gets much too long (%d)",
strlen(eff_dest)+strlen(leafname)+1); strlen(eff_dest)+strlen(leafname)+1);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
goto problem_handler; goto problem_handler;
} }
} }
@ -7947,7 +7950,7 @@ int Xorriso_option_overwrite(struct XorrisO *xorriso, char *mode, int flag)
xorriso->do_overwrite= 2; xorriso->do_overwrite= 2;
else { else {
sprintf(xorriso->info_text, "-overwrite: unknown mode '%s'", mode); sprintf(xorriso->info_text, "-overwrite: unknown mode '%s'", mode);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0); return(0);
} }
return(1); return(1);
@ -7999,7 +8002,7 @@ int Xorriso_option_path_list(struct XorrisO *xorriso, char *adr, int flag)
Xorriso_pacifier_reset(xorriso, 0); Xorriso_pacifier_reset(xorriso, 0);
if(adr[0]==0) { if(adr[0]==0) {
sprintf(xorriso->info_text,"Empty file name given with -path-list"); sprintf(xorriso->info_text,"Empty file name given with -path-list");
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "WARNING", 0);
return(0); return(0);
} }
fp= Afile_fopen(adr,"rb",((!!xorriso->packet_output)<<6)); fp= Afile_fopen(adr,"rb",((!!xorriso->packet_output)<<6));
@ -8036,7 +8039,7 @@ ex:;
sprintf(xorriso->info_text, "Aborted reading of file %s in line number %d", sprintf(xorriso->info_text, "Aborted reading of file %s in line number %d",
Text_shellsafe(adr, sfe, 0), linecount); Text_shellsafe(adr, sfe, 0), linecount);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0,
(fret==-2 ? "NOTE" : "SORRY"), 0); (fret==-2 ? "NOTE" : "FAILURE"), 0);
} }
sprintf(xorriso->info_text, "Added %d items from file %s\n", sprintf(xorriso->info_text, "Added %d items from file %s\n",
insertcount, Text_shellsafe(adr, sfe, 0)); insertcount, Text_shellsafe(adr, sfe, 0));
@ -8056,7 +8059,7 @@ int Xorriso_option_pathspecs(struct XorrisO *xorriso, char *mode, int flag)
xorriso->allow_graft_points= 1; xorriso->allow_graft_points= 1;
else { else {
sprintf(xorriso->info_text, "-pathspecs: unknown mode '%s'", mode); sprintf(xorriso->info_text, "-pathspecs: unknown mode '%s'", mode);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0); return(0);
} }
return(1); return(1);
@ -8504,7 +8507,7 @@ int Xorriso_option_volid(struct XorrisO *xorriso, char *volid, int flag)
warn= 1; warn= 1;
if(i>32) { if(i>32) {
sprintf(xorriso->info_text, "-volid: Text too long (%d > 32)", i); sprintf(xorriso->info_text, "-volid: Text too long (%d > 32)", i);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0); return(0);
} }
if(warn) { if(warn) {
@ -8944,7 +8947,7 @@ unknown_option:;
"=== Not a known option:\n"); "=== Not a known option:\n");
sprintf(xorriso->info_text+strlen(xorriso->info_text), sprintf(xorriso->info_text+strlen(xorriso->info_text),
"=== '%s%s'\n",(was_dashed ? "-" : ""), cmd); "=== '%s%s'\n",(was_dashed ? "-" : ""), cmd);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
{ret= 0; goto eval_any_problems;} {ret= 0; goto eval_any_problems;}
} else { } else {

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

@ -1 +1 @@
#define Xorriso_timestamP "2008.02.06.131028" #define Xorriso_timestamP "2008.02.06.153709"

96
libisoburn/trunk/xorriso/xorrisoburn.c
View File

@ -226,7 +226,7 @@ int Xorriso_get_drive_handles(struct XorrisO *xorriso,
Xorriso_process_msg_queues(xorriso,0); Xorriso_process_msg_queues(xorriso,0);
sprintf(xorriso->info_text, "No %s drive aquired %s", sprintf(xorriso->info_text, "No %s drive aquired %s",
(flag&2 ? "output" : "input"), attempt); (flag&2 ? "output" : "input"), attempt);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0); return(0);
} }
*drive= (*dinfo)[0].drive; *drive= (*dinfo)[0].drive;
@ -431,7 +431,7 @@ int Xorriso_aquire_drive(struct XorrisO *xorriso, char *adr, int flag)
if(xorriso->dev_fd_1<0) { if(xorriso->dev_fd_1<0) {
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"\"stdio:/dev/fd/1\" was not a start argument. stdout possibly already tainted."); "\"stdio:/dev/fd/1\" was not a start argument. stdout possibly already tainted.");
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
{ret= 0; goto ex;} {ret= 0; goto ex;}
} else { } else {
sprintf(adr_data, "stdio:/dev/fd/%d", xorriso->dev_fd_1); sprintf(adr_data, "stdio:/dev/fd/%d", xorriso->dev_fd_1);
@ -462,7 +462,7 @@ int Xorriso_aquire_drive(struct XorrisO *xorriso, char *adr, int flag)
Xorriso_process_msg_queues(xorriso,0); Xorriso_process_msg_queues(xorriso,0);
if(ret<=0) { if(ret<=0) {
sprintf(xorriso->info_text,"Cannot aquire drive '%s'", adr); sprintf(xorriso->info_text,"Cannot aquire drive '%s'", adr);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0); return(0);
} }
} }
@ -548,7 +548,7 @@ int Xorriso_aquire_drive(struct XorrisO *xorriso, char *adr, int flag)
Xorriso_process_msg_queues(xorriso,0); Xorriso_process_msg_queues(xorriso,0);
Xorriso_set_image_severities(xorriso, 0); Xorriso_set_image_severities(xorriso, 0);
sprintf(xorriso->info_text,"Cannot read ISO image volset"); sprintf(xorriso->info_text,"Cannot read ISO image volset");
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
ret= 3; goto ex; ret= 3; goto ex;
} }
xorriso->in_volset_handle= (void *) volset; xorriso->in_volset_handle= (void *) volset;
@ -667,7 +667,7 @@ int Xorriso_make_write_options(
if(*burn_options==NULL) { if(*burn_options==NULL) {
Xorriso_process_msg_queues(xorriso,0); Xorriso_process_msg_queues(xorriso,0);
sprintf(xorriso->info_text,"Cannot allocate option set"); sprintf(xorriso->info_text,"Cannot allocate option set");
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0); return(0);
} }
burn_write_opts_set_simulate(*burn_options, !!xorriso->do_dummy); burn_write_opts_set_simulate(*burn_options, !!xorriso->do_dummy);
@ -755,7 +755,7 @@ int Xorriso_write_session(struct XorrisO *xorriso, int flag)
else else
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"-indev differs from -outdev and -outdev media holds valid ISO image"); "-indev differs from -outdev and -outdev media holds valid ISO image");
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
{ret= 0; goto ex;} {ret= 0; goto ex;}
} }
ret= Xorriso_get_drive_handles(xorriso, &source_dinfo, &source_drive, ret= Xorriso_get_drive_handles(xorriso, &source_dinfo, &source_drive,
@ -767,7 +767,7 @@ int Xorriso_write_session(struct XorrisO *xorriso, int flag)
if (ret <= 0) { if (ret <= 0) {
Xorriso_process_msg_queues(xorriso,0); Xorriso_process_msg_queues(xorriso,0);
sprintf(xorriso->info_text,"Failed to prepare session write run"); sprintf(xorriso->info_text,"Failed to prepare session write run");
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
{ret= 0; goto ex;} {ret= 0; goto ex;}
} }
@ -814,7 +814,7 @@ no_track:;
Xorriso_process_msg_queues(xorriso,0); Xorriso_process_msg_queues(xorriso,0);
sprintf(xorriso->info_text,"Image size %ds exceeds free space on media %ds", sprintf(xorriso->info_text,"Image size %ds exceeds free space on media %ds",
img_sectors + padding, media_space); img_sectors + padding, media_space);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
isoburn_cancel_prepared_write(source_drive, drive, 0); isoburn_cancel_prepared_write(source_drive, drive, 0);
{ret= 0; goto ex;} {ret= 0; goto ex;}
} }
@ -829,7 +829,7 @@ no_track:;
Xorriso_process_msg_queues(xorriso,0); Xorriso_process_msg_queues(xorriso,0);
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"libburn indicates failure with writing."); "libburn indicates failure with writing.");
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
ret= 0; goto ex; ret= 0; goto ex;
} }
@ -939,7 +939,7 @@ int Xorriso_get_volume(struct XorrisO *xorriso, IsoImage **volume,
sprintf(xorriso->info_text+strlen(xorriso->info_text), sprintf(xorriso->info_text+strlen(xorriso->info_text),
" Possible program error with drive '%s'.", xorriso->indev); " Possible program error with drive '%s'.", xorriso->indev);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0); return(0);
} }
*volume= (IsoImage *) xorriso->in_volset_handle; *volume= (IsoImage *) xorriso->in_volset_handle;
@ -964,7 +964,7 @@ int Xorriso_node_from_path(struct XorrisO *xorriso, IsoImage *volume,
if(!(flag&1)) { if(!(flag&1)) {
sprintf(xorriso->info_text, "Cannot find path %s in loaded ISO image", sprintf(xorriso->info_text, "Cannot find path %s in loaded ISO image",
Text_shellsafe(path_pt, sfe, 0)); Text_shellsafe(path_pt, sfe, 0));
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
} }
return(0); return(0);
} }
@ -1042,7 +1042,7 @@ bonked_root:;
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"Relative addressing in path exceeds root directory: %s", "Relative addressing in path exceeds root directory: %s",
Text_shellsafe(img_path, sfe, 0)); Text_shellsafe(img_path, sfe, 0));
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(-1); return(-1);
} }
dir= iso_node_get_parent(node); dir= iso_node_get_parent(node);
@ -1060,7 +1060,7 @@ much_too_long:;
sprintf(xorriso->info_text, "Effective path gets much too long (%d)", sprintf(xorriso->info_text, "Effective path gets much too long (%d)",
(int) (strlen(eff_path)+strlen(apt)+1)); (int) (strlen(eff_path)+strlen(apt)+1));
if(!(flag&1)) if(!(flag&1))
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(-1); return(-1);
} }
if(!(flag&2)) { if(!(flag&2)) {
@ -1181,7 +1181,7 @@ int Xorriso_add_tree(struct XorrisO *xorriso, IsoDir *dir,
cannot_open_dir:; cannot_open_dir:;
sprintf(xorriso->info_text,"Cannot open as source directory: %s", sprintf(xorriso->info_text,"Cannot open as source directory: %s",
Text_shellsafe(disk_dir_path, sfe, 0)); Text_shellsafe(disk_dir_path, sfe, 0));
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
{ret= 0; goto ex;} {ret= 0; goto ex;}
} }
@ -1220,7 +1220,7 @@ cannot_lstat:;
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"Cannot determine attributes of source file %s", "Cannot determine attributes of source file %s",
Text_shellsafe(srcpt, sfe, 0)); Text_shellsafe(srcpt, sfe, 0));
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, errno, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, errno, "FAILURE", 0);
ret= 0; goto was_problem; ret= 0; goto was_problem;
} }
source_is_dir= 0; source_is_dir= 0;
@ -1258,7 +1258,7 @@ cannot_lstat:;
sprintf(xorriso->info_text,"Source file %s %s non-supported file type", sprintf(xorriso->info_text,"Source file %s %s non-supported file type",
Text_shellsafe(disk_path, sfe, 0), Text_shellsafe(disk_path, sfe, 0),
source_is_link ? "leads to" : "is of"); source_is_link ? "leads to" : "is of");
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
ret= 0; goto was_problem; ret= 0; goto was_problem;
#endif /* NIX */ #endif /* NIX */
@ -1289,7 +1289,7 @@ cannot_lstat:;
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"While grafting %s : file object exists and may not be overwritten", "While grafting %s : file object exists and may not be overwritten",
Text_shellsafe(img_path,sfe,0)); Text_shellsafe(img_path,sfe,0));
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
ret= 0; goto was_problem; ret= 0; goto was_problem;
} }
} }
@ -1310,14 +1310,14 @@ cannot_lstat:;
goto was_problem; goto was_problem;
} else { } else {
Xorriso_report_iso_error(xorriso, stbuf_src, ret, Xorriso_report_iso_error(xorriso, stbuf_src, ret,
"Cannot create symbolic link", 0, "SORRY", 1); "Cannot create symbolic link", 0, "FAILURE", 1);
{ret= 0; goto was_problem;} {ret= 0; goto was_problem;}
} }
} else { } else {
ret= iso_tree_add_node(volume, dir, srcpt, &node); ret= iso_tree_add_node(volume, dir, srcpt, &node);
if(ret<0) { if(ret<0) {
Xorriso_report_iso_error(xorriso, stbuf_src, ret, Xorriso_report_iso_error(xorriso, stbuf_src, ret,
"Cannot add node to tree", 0, "SORRY", 1); "Cannot add node to tree", 0, "FAILURE", 1);
goto was_problem; goto was_problem;
} }
} }
@ -1326,7 +1326,7 @@ cannot_lstat:;
Xorriso_process_msg_queues(xorriso,0); Xorriso_process_msg_queues(xorriso,0);
sprintf(xorriso->info_text, "Grafting failed: %s = %s", sprintf(xorriso->info_text, "Grafting failed: %s = %s",
Text_shellsafe(img_path,sfe,0), Text_shellsafe(disk_path,sfe2,0)); Text_shellsafe(img_path,sfe,0), Text_shellsafe(disk_path,sfe2,0));
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
ret=0; goto was_problem; ret=0; goto was_problem;
} }
@ -1411,7 +1411,7 @@ int Xorriso_graft_in(struct XorrisO *xorriso, char *disk_path, char *img_path,
if(cpt!=NULL) { if(cpt!=NULL) {
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"Unsupported relative addressing in iso_rr_path '%s'", img_path); "Unsupported relative addressing in iso_rr_path '%s'", img_path);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, errno, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, errno, "FAILURE", 0);
return(0); return(0);
} }
@ -1432,7 +1432,7 @@ int Xorriso_graft_in(struct XorrisO *xorriso, char *disk_path, char *img_path,
Xorriso_process_msg_queues(xorriso,0); Xorriso_process_msg_queues(xorriso,0);
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"Cannot determine attributes of source file '%s'",disk_path); "Cannot determine attributes of source file '%s'",disk_path);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, errno, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, errno, "FAILURE", 0);
return(0); return(0);
} }
if(S_ISDIR(stbuf.st_mode)) { if(S_ISDIR(stbuf.st_mode)) {
@ -1443,7 +1443,7 @@ int Xorriso_graft_in(struct XorrisO *xorriso, char *disk_path, char *img_path,
Xorriso_process_msg_queues(xorriso,0); Xorriso_process_msg_queues(xorriso,0);
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"Source file '%s' is of non-supported file type", disk_path); "Source file '%s' is of non-supported file type", disk_path);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0); return(0);
#endif /* NIX */ #endif /* NIX */
@ -1456,7 +1456,7 @@ int Xorriso_graft_in(struct XorrisO *xorriso, char *disk_path, char *img_path,
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"Source '%s' is not a directory. Target '%s' would be.", "Source '%s' is not a directory. Target '%s' would be.",
disk_path, img_path); disk_path, img_path);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0); return(0);
} }
} }
@ -1510,7 +1510,7 @@ int Xorriso_graft_in(struct XorrisO *xorriso, char *disk_path, char *img_path,
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"While grafting '%s' : '%s' exists and may not be overwritten", "While grafting '%s' : '%s' exists and may not be overwritten",
img_path, path); img_path, path);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0); return(0);
} }
dir= (IsoDir *) node; dir= (IsoDir *) node;
@ -1522,10 +1522,10 @@ handle_path_node:;
if(ret<0) { if(ret<0) {
Xorriso_process_msg_queues(xorriso,0); Xorriso_process_msg_queues(xorriso,0);
Xorriso_report_iso_error(xorriso, img_path, ret, Xorriso_report_iso_error(xorriso, img_path, ret,
"Cannot create directory", 0, "SORRY", 1); "Cannot create directory", 0, "FAILURE", 1);
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"While grafting '%s' : could not insert '%s'", img_path, path); "While grafting '%s' : could not insert '%s'", img_path, path);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0); return(0);
} }
dir= hdir; dir= hdir;
@ -1559,10 +1559,10 @@ attach_source:;
if(ret<0) { if(ret<0) {
Xorriso_process_msg_queues(xorriso,0); Xorriso_process_msg_queues(xorriso,0);
Xorriso_report_iso_error(xorriso, img_path, ret, "Cannot create node", Xorriso_report_iso_error(xorriso, img_path, ret, "Cannot create node",
0, "SORRY", 1); 0, "FAILURE", 1);
sprintf(xorriso->info_text, "Grafting failed: %s = %s", sprintf(xorriso->info_text, "Grafting failed: %s = %s",
Text_shellsafe(img_path,sfe,0), Text_shellsafe(disk_path,sfe2,0)); Text_shellsafe(img_path,sfe,0), Text_shellsafe(disk_path,sfe2,0));
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0); return(0);
} }
xorriso->volset_change_pending= 1; xorriso->volset_change_pending= 1;
@ -1941,16 +1941,16 @@ int Xorriso_blank_media(struct XorrisO *xorriso, int flag)
; ;
} else if(disc_state == BURN_DISC_EMPTY) { } else if(disc_state == BURN_DISC_EMPTY) {
sprintf(xorriso->info_text,"No media detected in drive"); sprintf(xorriso->info_text,"No media detected in drive");
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return 0; return 0;
} else { } else {
sprintf(xorriso->info_text, "Unsuitable drive and media state"); sprintf(xorriso->info_text, "Unsuitable drive and media state");
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return 0; return 0;
} }
if(!isoburn_disc_erasable(drive)) { if(!isoburn_disc_erasable(drive)) {
sprintf(xorriso->info_text, "Media is not of erasable type"); sprintf(xorriso->info_text, "Media is not of erasable type");
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return 0; return 0;
} }
if(xorriso->do_dummy) { if(xorriso->do_dummy) {
@ -2006,7 +2006,7 @@ int Xorriso_format_media(struct XorrisO *xorriso, int flag)
} else { } else {
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"Can only -format DVD+RW and sequential DVD-RW"); "Can only -format DVD+RW and sequential DVD-RW");
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
sprintf(xorriso->info_text,"Media current: %s (%4.4xh)", sprintf(xorriso->info_text,"Media current: %s (%4.4xh)",
current_profile_name, current_profile); current_profile_name, current_profile);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "NOTE", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "NOTE", 0);
@ -2092,7 +2092,7 @@ int Xorriso_rmi(struct XorrisO *xorriso, void *boss_iter,
root_dir= iso_image_get_root(volume); root_dir= iso_image_get_root(volume);
if(((void *) root_dir) == ((void *) victim_node)) { if(((void *) root_dir) == ((void *) victim_node)) {
sprintf(xorriso->info_text, "May not delete root directory"); sprintf(xorriso->info_text, "May not delete root directory");
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
{ret= 0; goto ex;} {ret= 0; goto ex;}
} }
@ -2102,7 +2102,7 @@ int Xorriso_rmi(struct XorrisO *xorriso, void *boss_iter,
if(flag&2) { /* rmdir */ if(flag&2) { /* rmdir */
sprintf(xorriso->info_text, "%s in loaded ISO image is not a directory", sprintf(xorriso->info_text, "%s in loaded ISO image is not a directory",
Text_shellsafe(path, sfe, 0)); Text_shellsafe(path, sfe, 0));
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
ret= 0; goto ex; ret= 0; goto ex;
} }
} else { } else {
@ -2153,7 +2153,7 @@ dir_not_removed:;
if(!(flag&2)) { /* not rmdir */ if(!(flag&2)) { /* not rmdir */
sprintf(xorriso->info_text, "%s in loaded ISO image is a directory", sprintf(xorriso->info_text, "%s in loaded ISO image is a directory",
Text_shellsafe(path, sfe, 0)); Text_shellsafe(path, sfe, 0));
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
ret= 0; goto ex; ret= 0; goto ex;
} }
@ -2166,7 +2166,7 @@ dir_not_removed:;
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"Directory not empty on attempt to delete: %s", "Directory not empty on attempt to delete: %s",
Text_shellsafe(path, sfe, 0)); Text_shellsafe(path, sfe, 0));
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
ret= 0; goto ex; ret= 0; goto ex;
} }
} }
@ -2181,7 +2181,7 @@ dir_not_removed:;
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"Cannot find parent node of %s in loaded ISO image", "Cannot find parent node of %s in loaded ISO image",
Text_shellsafe(path, sfe, 0)); Text_shellsafe(path, sfe, 0));
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
ret= 0; goto ex; ret= 0; goto ex;
} }
@ -2757,7 +2757,7 @@ int Xorriso_ls(struct XorrisO *xorriso, int flag)
wdi_is_not_a_dir:; wdi_is_not_a_dir:;
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"Working directory path does not lead to a directory in ISO image"); "Working directory path does not lead to a directory in ISO image");
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
ret= 0; goto ex; ret= 0; goto ex;
} }
if(flag&2) if(flag&2)
@ -2877,7 +2877,7 @@ int Xorriso_rename(struct XorrisO *xorriso, char *origin, char *dest, int flag)
ol= strlen(eff_origin); ol= strlen(eff_origin);
if(ol==0) { if(ol==0) {
sprintf(xorriso->info_text, "May not rename root directory"); sprintf(xorriso->info_text, "May not rename root directory");
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0); return(0);
} else if(strcmp(eff_origin, eff_dest)==0) { } else if(strcmp(eff_origin, eff_dest)==0) {
sprintf(xorriso->info_text, "Ignored attempt to rename %s to itself", sprintf(xorriso->info_text, "Ignored attempt to rename %s to itself",
@ -2889,7 +2889,7 @@ int Xorriso_rename(struct XorrisO *xorriso, char *origin, char *dest, int flag)
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"May not rename %s to its own sub address %s", "May not rename %s to its own sub address %s",
Text_shellsafe(eff_origin,sfe,0), Text_shellsafe(eff_dest,sfe2,0)); Text_shellsafe(eff_origin,sfe,0), Text_shellsafe(eff_dest,sfe2,0));
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0); return(0);
} }
@ -2897,12 +2897,12 @@ int Xorriso_rename(struct XorrisO *xorriso, char *origin, char *dest, int flag)
if(dest_ret==2 && xorriso->do_overwrite!=1) { if(dest_ret==2 && xorriso->do_overwrite!=1) {
sprintf(xorriso->info_text, "Renaming may not overwrite directory: %s", sprintf(xorriso->info_text, "Renaming may not overwrite directory: %s",
Text_shellsafe(eff_dest, sfe, 0)); Text_shellsafe(eff_dest, sfe, 0));
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0); return(0);
} else if (dest_ret==1 && !xorriso->do_overwrite) { } else if (dest_ret==1 && !xorriso->do_overwrite) {
sprintf(xorriso->info_text, "Renaming may not overwite: %s", sprintf(xorriso->info_text, "Renaming may not overwite: %s",
Text_shellsafe(eff_dest, sfe, 0)); Text_shellsafe(eff_dest, sfe, 0));
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0); return(0);
} else if(dest_ret>0) { } else if(dest_ret>0) {
ret= Xorriso_rmi(xorriso, NULL, eff_dest, 1|8); ret= Xorriso_rmi(xorriso, NULL, eff_dest, 1|8);
@ -3007,7 +3007,7 @@ int Xorriso_mkdir(struct XorrisO *xorriso, char *path, int flag)
sprintf(xorriso->info_text,"-mkdir: Address already existing %s", sprintf(xorriso->info_text,"-mkdir: Address already existing %s",
Text_shellsafe(eff_path, sfe, 0)); Text_shellsafe(eff_path, sfe, 0));
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0,
(ret==2 ? "WARNING" : "SORRY"), 0); (ret==2 ? "WARNING" : "FAILURE"), 0);
return(-1+(ret==2)); return(-1+(ret==2));
} }
ret= Xorriso_normalize_img_path(xorriso, xorriso->wdi, path, eff_path, 2); ret= Xorriso_normalize_img_path(xorriso, xorriso->wdi, path, eff_path, 2);
@ -3109,7 +3109,7 @@ ex:;
} }
/* @param flag bit0= a match count !=1 is a SORRY event /* @param flag bit0= a match count !=1 is a FAILURE event
bit1= with bit0 tolerate 0 matches if pattern is a constant bit1= with bit0 tolerate 0 matches if pattern is a constant
*/ */
int Xorriso_expand_pattern(struct XorrisO *xorriso, int Xorriso_expand_pattern(struct XorrisO *xorriso,
@ -3162,13 +3162,13 @@ int Xorriso_expand_pattern(struct XorrisO *xorriso,
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"While expanding pattern %s : Working directory does not exist in ISO image", "While expanding pattern %s : Working directory does not exist in ISO image",
Text_shellsafe(patterns[i], sfe, 0)); Text_shellsafe(patterns[i], sfe, 0));
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
ret= 0; goto ex; ret= 0; goto ex;
} }
if(!LIBISO_ISDIR((IsoNode *) dir)) { if(!LIBISO_ISDIR((IsoNode *) dir)) {
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"Working directory path does not lead to a directory in ISO image"); "Working directory path does not lead to a directory in ISO image");
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
ret= 0; goto ex; ret= 0; goto ex;
} }
} }
@ -3186,7 +3186,7 @@ int Xorriso_expand_pattern(struct XorrisO *xorriso,
} }
ret= Xorriso_check_matchcount(xorriso, count, nonconst_mismatches, ret= Xorriso_check_matchcount(xorriso, count, nonconst_mismatches,
num_patterns, patterns, flag&1); num_patterns, patterns, (flag&1)|2);
if(ret<=0) if(ret<=0)
goto ex; goto ex;
count+= extra_filec; count+= extra_filec;