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

Changed failure to find a file for removal from FAILURE to SORRY

Browse Source
This commit is contained in:
Thomas Schmitt 2008-02-11 16:24:51 +00:00
parent 7f6e23305c
commit a38f7cf4c2
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
xorriso/xorriso.c
View File

@ -8133,7 +8133,7 @@ int Xorriso_option_rmi(struct XorrisO *xorriso, int argc, char **argv,
int *idx, int flag) int *idx, int flag)
{ {
int i, ret, end_idx, was_failure= 0, fret; int i, ret, end_idx, was_failure= 0, fret;
char path[SfileadrL], eff_path[SfileadrL]; char path[SfileadrL], eff_path[SfileadrL], sfe[5*SfileadrL];
int optc= 0; int optc= 0;
char **optv= NULL; char **optv= NULL;
@ -8149,9 +8149,16 @@ int Xorriso_option_rmi(struct XorrisO *xorriso, int argc, char **argv,
if(ret<=0) if(ret<=0)
goto problem_handler; goto problem_handler;
} }
ret= Xorriso_normalize_img_path(xorriso, xorriso->wdi, path, eff_path, 2); ret= Xorriso_normalize_img_path(xorriso, xorriso->wdi, path, eff_path, 1);
if(ret<=0) if(ret<0)
goto problem_handler; goto problem_handler;
if(ret==0) {
sprintf(xorriso->info_text,
"Cannot find path %s in loaded ISO image for removal",
Text_shellsafe(path, sfe, 0));
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "SORRY", 0);
goto problem_handler;
}
strcpy(path, eff_path); strcpy(path, eff_path);
ret= Xorriso_rmi(xorriso, NULL, path, flag&(1|2)); ret= Xorriso_rmi(xorriso, NULL, path, flag&(1|2));
@ -8432,12 +8439,13 @@ int Xorriso_option_volid(struct XorrisO *xorriso, char *volid, int flag)
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "WARNING", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "WARNING", 0);
} }
if(xorriso->do_joliet && strlen(volid)>16) { if(xorriso->do_joliet && strlen(volid)>16) {
sprintf(xorriso->info_text, "-volid text is too long for Joliet"); sprintf(xorriso->info_text,
"-volid text is too long for Joliet (%d > 16)",(int) strlen(volid));
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "WARNING", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "WARNING", 0);
} }
if(warn_ecma) { if(warn_ecma) {
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"-volid text does not comply to ISO 9660 / ECMA 119 rules"); "-volid text does not comply to ISO 9660 / ECMA 119 rules");
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "WARNING", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "WARNING", 0);
} }
strcpy(xorriso->volid, volid); strcpy(xorriso->volid, volid);

2
xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2008.02.11.150700" #define Xorriso_timestamP "2008.02.11.162406"

3
xorriso/xorrisoburn.c
View File

@ -1138,8 +1138,7 @@ bonked_root:;
much_too_long:; 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)) Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(-1); return(-1);
} }
if(!(flag&2)) { if(!(flag&2)) {