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

Issueing messages with -clone and -cp_clone

Browse Source
This commit is contained in:
Thomas Schmitt 2011-02-22 07:34:56 +00:00
parent 0a2360bfbe
commit 69ecbdf021
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libisoburn/trunk/xorriso/iso_manip.c
View File

@ -1408,6 +1408,7 @@ int Xorriso_cannot_clone(struct XorrisO *xorriso, char *eff_origin,
} }
/* @param flag bit0= for iso_tree_clone() : merge directories /* @param flag bit0= for iso_tree_clone() : merge directories
bit1= do not issue NOTE message
*/ */
int Xorriso_clone_tree(struct XorrisO *xorriso, void *boss_iter, int Xorriso_clone_tree(struct XorrisO *xorriso, void *boss_iter,
char *origin, char *dest, int flag) char *origin, char *dest, int flag)
@ -1488,6 +1489,14 @@ int Xorriso_clone_tree(struct XorrisO *xorriso, void *boss_iter,
return(0); return(0);
} }
Xorriso_set_change_pending(xorriso, 0); Xorriso_set_change_pending(xorriso, 0);
if(!(flag & 2)) {
strcpy(xorriso->info_text, "Cloned in ISO image: ");
Text_shellsafe(eff_origin, xorriso->info_text, 1);
strcat(xorriso->info_text, " to ");
Text_shellsafe(eff_dest, xorriso->info_text, 1);
strcat(xorriso->info_text, "\n");
Xorriso_info(xorriso, 0);
}
return(1); return(1);
} }

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

@ -1969,12 +1969,6 @@ nondir_exists:;
ret= Xorriso_clone_tree(xorriso, NULL, eff_origin, eff_dest, 1); ret= Xorriso_clone_tree(xorriso, NULL, eff_origin, eff_dest, 1);
if(ret <= 0) if(ret <= 0)
goto problem_handler; goto problem_handler;
sprintf(xorriso->info_text, "Cloned in ISO image: ");
Text_shellsafe(eff_origin, xorriso->info_text, 1);
strcat(xorriso->info_text, " to ");
Text_shellsafe(eff_dest, xorriso->info_text, 1);
strcat(xorriso->info_text, "\n");
Xorriso_info(xorriso, 0);
} }
continue; /* regular bottom of loop */ continue; /* regular bottom of loop */

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

@ -1 +1 @@
#define Xorriso_timestamP "2011.02.19.112541" #define Xorriso_timestamP "2011.02.22.073504"