X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=bin%2FBackupPC_tarCreate;h=ce67747005d599174ce96c0d2f970554ffc004f1;hp=64b2b49d6c77ddb2b7c0693bcf582df640675185;hb=17dcbbebb871212f90b81bb97f8d1feb528bdc43;hpb=5c6a6cc4f333ce44a9df62ab828b0b9341579f7c

diff --git a/bin/BackupPC_tarCreate b/bin/BackupPC_tarCreate
index 64b2b49..ce67747 100755
--- a/bin/BackupPC_tarCreate
+++ b/bin/BackupPC_tarCreate
@@ -51,7 +51,7 @@
 #
 #========================================================================
 #
-# Version 2.1.0beta1, released 9 Apr 2004.
+# Version 2.1.0, released 20 Jun 2004.
 #
 # See http://backuppc.sourceforge.net.
 #
@@ -227,9 +227,14 @@ sub archiveWrite
 #
 sub archiveWriteHardLinks
 {
-    my $fh = @_;
+    my($fh) = @_;
     foreach my $hdr ( @HardLinks ) {
         $hdr->{size} = 0;
+	my $name = $hdr->{linkname};
+	$name =~ s{^\./}{/};
+	if ( defined($HardLinkExtraFiles{$name}) ) {
+            $hdr->{linkname} = $HardLinkExtraFiles{$name};
+        }
         if ( defined($PathRemove)
               && substr($hdr->{linkname}, 0, length($PathRemove)+1)
                         eq ".$PathRemove" ) {
@@ -423,10 +428,28 @@ sub TarWriteFile
         TarWriteFileInfo($fh, $hdr);
         my($data, $size);
         while ( $f->read(\$data, $BufSize) > 0 ) {
+            if ( $size + length($data) > $hdr->{size} ) {
+                print(STDERR "Error: truncating $hdr->{fullPath} to"
+                           . " $hdr->{size} bytes\n");
+                $data = substr($data, 0, $hdr->{size} - $size);
+                $ErrorCnt++;
+            }
             TarWrite($fh, \$data);
             $size += length($data);
         }
         $f->close;
+        if ( $size != $hdr->{size} ) {
+            print(STDERR "Error: padding $hdr->{fullPath} to $hdr->{size}"
+                       . " bytes from $size bytes\n");
+            $ErrorCnt++;
+            while ( $size < $hdr->{size} ) {
+                my $len = $hdr->{size} - $size;
+                $len = $BufSize if ( $len > $BufSize );
+                $data = "\0" x $len;
+                TarWrite($fh, \$data);
+                $size += $len;
+            }
+        }
         TarWritePad($fh, $size);
 	$FileCnt++;
 	$ByteCnt += $size;
@@ -456,10 +479,11 @@ sub TarWriteFile
 	my $done = 0;
 	my $name = $hdr->{linkname};
 	$name =~ s{^\./}{/};
-	if ( $HardLinkExtraFiles{$name} ) {
+	if ( defined($HardLinkExtraFiles{$name}) ) {
 	    $done = 1;
 	} else {
 	    foreach my $arg ( @ARGV ) {
+		$arg = "/" if ( $arg eq "." );
 		$arg =~ s{^\./+}{/};
 		$arg =~ s{/+$}{};
 		$done = 1 if ( $name eq $arg || $name =~ /^\Q$arg\// );
@@ -478,8 +502,10 @@ sub TarWriteFile
 	    # routine, so that we save the hassle of dealing with
 	    # mangling, merging and attributes.
 	    #
-	    $HardLinkExtraFiles{$hdr->{linkname}} = 1;
-	    archiveWrite($fh, $hdr->{linkname}, $hdr->{name});
+            my $name = $hdr->{linkname};
+            $name =~ s{^\./}{/};
+	    $HardLinkExtraFiles{$name} = $hdr->{name};
+	    archiveWrite($fh, $name, $hdr->{name});
 	}
     } elsif ( $hdr->{type} == BPC_FTYPE_SYMLINK ) {
         #