From bee991fd3dea2279edb60a69f0142978bd8b2a99 Mon Sep 17 00:00:00 2001
From: Thomas Schmitt <scdbackup@gmx.net>
Date: Sat, 31 Jul 2010 08:55:15 +0000
Subject: [PATCH] Missing device,inode numbers caused -compare_r to report a
 difference

---
 libisoburn/trunk/xorriso/cmp_update.c        | 10 +++++++---
 libisoburn/trunk/xorriso/xorriso_timestamp.h |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/libisoburn/trunk/xorriso/cmp_update.c b/libisoburn/trunk/xorriso/cmp_update.c
index 8988d888..8ce6ecfc 100644
--- a/libisoburn/trunk/xorriso/cmp_update.c
+++ b/libisoburn/trunk/xorriso/cmp_update.c
@@ -297,7 +297,7 @@ int Xorriso_compare_2_files(struct XorrisO *xorriso, char *disk_adr,
 {
  struct stat s1, s2, stbuf;
  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 a[5*SfileadrL], sfe[5*SfileadrL];
  char ttx1[40], ttx2[40];
@@ -636,8 +636,12 @@ int Xorriso_compare_2_files(struct XorrisO *xorriso, char *disk_adr,
  }
  if(was_error)
    ret= -1;
- else
-   ret= (((*result) & ~((1 << 17) | (1 << 18) | (1 << 23)))==0);
+ else {
+   mask= ~((1 << 17) | (1 << 18) | (1 << 22) | (1 << 23));
+   if(xorriso->do_aaip & 32)
+     mask|= 1 << 22;
+   ret= (((*result) & mask)==0);
+ }
 ex:;
  if(split_parts!=NULL)
    Splitparts_destroy(&split_parts, split_count, 0);
diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h
index 2652db27..05e7d8a1 100644
--- a/libisoburn/trunk/xorriso/xorriso_timestamp.h
+++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h
@@ -1 +1 @@
-#define Xorriso_timestamP "2010.07.30.155123"
+#define Xorriso_timestamP "2010.07.31.085437"