With -update_r : detecting hardlink splits and fusions on disk

libisoburn/trunk/xorriso/xorriso_private.h

@@ -106,6 +106,8 @@ struct XorrisO { /* the global context of xorriso */
                             Do not consolidate suitable nodes to hardlinks.
                       bit2= at restore-to-disk time:
                             Do not consolidate suitable nodes to hardlinks.
+                      bit3= with update:
+                            Do not try to detect hardlink splits and joinings.
                     */
 
  int do_joliet;
@@ -389,6 +391,7 @@ struct XorrisO { /* the global context of xorriso */
 
  int find_compare_result; /* 1=everything matches , 0=mismatch , -1=error */ 
 
+ /* LBA sorting and hardlink matching facility */
  int node_counter;
  int node_array_size;
  void **node_array;
@@ -397,6 +400,10 @@ struct XorrisO { /* the global context of xorriso */
  struct Xorriso_lsT *node_disk_prefixes;
  struct Xorriso_lsT *node_img_prefixes;
 
+ /* Array of all nodes in the tree, sorted by disk dev,ino */
+ int di_count;
+ void **di_array;
+
  struct PermiteM *perm_stack; /* Temporarily altered dir access permissions */
 
  /* result (stdout, R: ) */
@@ -640,6 +647,10 @@ int Xorriso_path_setfattr(struct XorrisO *xorriso, void *in_node, char *path,
 int Xorriso_status_result(struct XorrisO *xorriso, char *filter, FILE *fp,
                           int flag);
 
+int Xorriso_compare_2_files(struct XorrisO *xorriso, char *disk_adr,
+                            char *iso_adr, char *adr_common_tail,
+                            int *result, int flag);
+
 int Sfile_str(char target[SfileadrL], char *source, int flag);
 
 double Sfile_microtime(int flag);
@@ -990,6 +1001,10 @@ int Findjob_test_2(struct XorrisO *xorriso, struct FindjoB *o,
 
 int Findjob_set_action_found_path(struct FindjoB *o, int flag);
 
+/* @param flag bit0= recursive
+*/
+int Findjob_set_action_target(struct FindjoB *o, int action, char *target,
+                              int flag);
 int Findjob_get_action(struct FindjoB *o, int flag);
 
 int Findjob_get_action_parms(struct FindjoB *o, char **target, char **text_2,