X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=bin%2FBackupPC_link;h=1793a0e92c5d6b0e16df84695a09e98958622468;hp=98bada92ffbe81772932f6280882c2b9d3ce68e2;hb=119f107a676267b9f6d65e16153527e9a7d8756b;hpb=2c14784ad71874ec850d189060fe63d6eb9eba95

diff --git a/bin/BackupPC_link b/bin/BackupPC_link
index 98bada9..1793a0e 100755
--- a/bin/BackupPC_link
+++ b/bin/BackupPC_link
@@ -21,7 +21,7 @@
 #   Craig Barratt  <cbarratt@users.sourceforge.net>
 #
 # COPYRIGHT
-#   Copyright (C) 2001-2003  Craig Barratt
+#   Copyright (C) 2001-2007  Craig Barratt
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -39,7 +39,7 @@
 #
 #========================================================================
 #
-# Version 2.1.0_CVS, released 8 Feb 2004.
+# Version 3.1.0beta0, released 3 Sep 2007.
 #
 # See http://backuppc.sourceforge.net.
 #
@@ -51,6 +51,7 @@ use lib "/usr/local/BackupPC/lib";
 use BackupPC::Lib;
 use BackupPC::Attrib;
 use BackupPC::PoolWrite;
+use BackupPC::Storage;
 
 use File::Find;
 use File::Path;
@@ -128,7 +129,7 @@ while ( 1 ) {
     #
     my $noFill = 1;
     my $fillFromNum;
-    if ( $Backups[$num]{type} eq "full" ) {
+    if ( $Backups[$num]{type} ne "incr" ) {
         $noFill = 0
     } elsif ( $Conf{IncrFill} ) {
         my $i;
@@ -156,6 +157,16 @@ while ( 1 ) {
     $Backups[$num]{sizeNewComp}   += $sizeNewComp;
     $Backups[$num]{noFill}         = $noFill;
     $Backups[$num]{fillFromNum}    = $fillFromNum;
+    #
+    # Save just this backup's info in case the main backups file
+    # gets corrupted
+    #
+    BackupPC::Storage->backupInfoWrite($Dir,
+                                       $Backups[$num]{num},
+                                       $Backups[$num], 1);
+    #
+    # Save the main backups file
+    #
     $bpc->BackupInfoWrite($host, @Backups);
 }
 
@@ -211,7 +222,21 @@ sub FillIncr
         #
         # Exists in the older filled backup, and not in the new, so link it
         #
-        link($name, $newName);
+        my($exists, $digest, $origSize, $outSize, $errs)
+                    = BackupPC::PoolWrite::LinkOrCopy(
+                                      $bpc,
+                                      $name, $Compress,
+                                      $newName, $Compress);
+        if ( $exists ) {
+            $nFilesExist++;
+            $sizeExist += $origSize;
+            $sizeExistComp += $outSize;
+        } elsif ( $outSize > 0 ) {
+            $nFilesNew++;
+            $sizeNew += $origSize;
+            $sizeNewComp += -s $outSize;
+            LinkNewFile($digest, $origSize, $newName);
+        }
     }
 }