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

Missing device,inode numbers caused -compare_r to report a difference

Browse Source
This commit is contained in:
Thomas Schmitt 2010-07-31 08:55:15 +00:00
parent c6215c1c44
commit bee991fd3d
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libisoburn/trunk/xorriso/cmp_update.c
View File

@ -297,7 +297,7 @@ int Xorriso_compare_2_files(struct XorrisO *xorriso, char *disk_adr,
{ {
struct stat s1, s2, stbuf; struct stat s1, s2, stbuf;
int ret, missing= 0, is_split= 0, i, was_error= 0, diff_count= 0; int ret, missing= 0, is_split= 0, i, was_error= 0, diff_count= 0;
int content_shortcut= 0; int content_shortcut= 0, mask;
char *respt; char *respt;
char a[5*SfileadrL], sfe[5*SfileadrL]; char a[5*SfileadrL], sfe[5*SfileadrL];
char ttx1[40], ttx2[40]; char ttx1[40], ttx2[40];
@ -636,8 +636,12 @@ int Xorriso_compare_2_files(struct XorrisO *xorriso, char *disk_adr,
} }
if(was_error) if(was_error)
ret= -1; ret= -1;
else else {
ret= (((*result) & ~((1 << 17) | (1 << 18) | (1 << 23)))==0); mask= ~((1 << 17) | (1 << 18) | (1 << 22) | (1 << 23));
if(xorriso->do_aaip & 32)
mask|= 1 << 22;
ret= (((*result) & mask)==0);
}
ex:; ex:;
if(split_parts!=NULL) if(split_parts!=NULL)
Splitparts_destroy(&split_parts, split_count, 0); Splitparts_destroy(&split_parts, split_count, 0);

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

@ -1 +1 @@
#define Xorriso_timestamP "2010.07.30.155123" #define Xorriso_timestamP "2010.07.31.085437"