diff --git a/xorriso/sort_cmp.c b/xorriso/sort_cmp.c index 43ff3ecf..3ccade1c 100644 --- a/xorriso/sort_cmp.c +++ b/xorriso/sort_cmp.c @@ -167,9 +167,19 @@ int Xorriso__get_di(IsoNode *node, dev_t *dev, ino_t *ino, int flag) goto ex; } vpt= (unsigned char *) value; + if(vpt[0] > sizeof(ino_t)) { + + /* >>> obviously not the same system that recorded the device number */; + + } for(i= 1; i <= vpt[0] && i < (int) value_length; i++) *dev= ((*dev) << 8) | vpt[i]; i_end= i + vpt[i] + 1; + if(vpt[i] > sizeof(ino_t)) { + + /* >>> obviously not the same system that recorded the inode number */; + + } for(i++; i < i_end && i < (int) value_length; i++) *ino= ((*ino) << 8) | vpt[i]; free(value); @@ -646,9 +656,9 @@ int Xorriso_hardlink_update(struct XorrisO *xorriso, int *compare_result, "xorriso_DEBUG: old_idx= %d , low= %d , high= %d , iso= '%s' , disk='%s'\n", old_idx, low, high, iso_rr_path, disk_path); fprintf(stderr, - "xorriso_DEBUG: old_dev= %lu , old_ino= %lu , dev= %lu , ino= %lu\n", - (unsigned long) old_dev, (unsigned long) old_ino, - (unsigned long) stbuf.st_dev, (unsigned long) stbuf.st_ino); + "xorriso_DEBUG: old_dev= %lu , old_ino= %.f , dev= %lu , ino= %.f\n", + (unsigned long) old_dev, (double) old_ino, + (unsigned long) stbuf.st_dev, (double) stbuf.st_ino); if(idx >= 0 && idx != old_idx) fprintf(stderr, "xorriso_DEBUG: idx= %d , old_idx = %d\n", idx, old_idx); @@ -667,8 +677,8 @@ int Xorriso_hardlink_update(struct XorrisO *xorriso, int *compare_result, dev_t dev; Xorriso__get_di(xorriso->di_array[i], &dev, &ino, 0); - fprintf(stderr, "xorriso_DEBUG: iso_sibling= '%s' , dev= %lu , ino= %lu\n", - node_path, (unsigned long) dev, (unsigned long) ino); + fprintf(stderr, "xorriso_DEBUG: iso_sibling= '%s' , dev= %lu , ino= %.f\n", + node_path, (unsigned long) dev, (double) ino); } #endif /* Xorriso_hardlink_update_debuG */ diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index a9b160ff..3f639a3b 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2014.05.03.115011" +#define Xorriso_timestamP "2014.05.18.144453"