New -find actions update_merge, rm_merge, clear_merge. -cp_clone now merges.

2011-02-12 17:14:23 +00:00
parent 2c37215969
commit 7f01cfd5dc
18 changed files with 435 additions and 116 deletions
--- a/libisoburn/trunk/xorriso/disk_ops.c
+++ b/libisoburn/trunk/xorriso/disk_ops.c
@ -1132,8 +1132,8 @@ int Xorriso_findx_action(struct XorrisO *xorriso, struct FindjoB *job,
   if(ret<xorriso->find_compare_result)
     xorriso->find_compare_result= ret;
   if(ret==0) {
-     uret= Xorriso_update_interpreter(xorriso, NULL, compare_result,
-                                      abs_path, iso_path, (flag&1)<<2);
+     uret= Xorriso_update_interpreter(xorriso, NULL, NULL, compare_result,
+                                      abs_path, iso_path, ((flag&1)<<2) | 2);
     if(uret<=0)
       ret= 0;
   }