diff --git a/hardlinks.diff b/hardlinks.diff index f69a1d0..dba3a6b 100644 --- a/hardlinks.diff +++ b/hardlinks.diff @@ -52,15 +52,17 @@ } /** -@@ -491,6 +502,7 @@ static void handleInstInstalledFile(const rpmts ts, rpmte p, rpmfiles fi, int fx - static void handleOverlappedFiles(rpmts ts, fingerPrintCache fpc, rpmte p, rpmfiles fi) - { - rpm_loff_t fixupSize = 0; -+ rpm_loff_t fileSize = 0; - int i, j; - rpmfs fs = rpmteGetFileStates(p); - rpmfs otherFs; -@@ -628,7 +640,8 @@ assert(otherFi != NULL); +@@ -506,6 +517,9 @@ static void handleOverlappedFiles(rpmts ts, fingerPrintCache fpc, rpmte p, rpmfi + rpmfileAttrs FFlags; + struct rpmffi_s * recs; + int numRecs; ++ rpm_loff_t fileSize; ++ int nlink; ++ const int *links; + + if (XFA_SKIPPING(rpmfsGetAction(fs, i))) + continue; +@@ -628,7 +642,8 @@ assert(otherFi != NULL); break; /* Try to get the disk accounting correct even if a conflict. */ @@ -70,7 +72,7 @@ if (rpmfilesConfigConflict(fi, i)) { /* Here is an overlapped pre-existing config file. */ -@@ -675,9 +688,16 @@ assert(otherFi != NULL); +@@ -675,9 +690,16 @@ assert(otherFi != NULL); } rpmfilesFree(otherFi);