# Craig Barratt <cbarratt@users.sourceforge.net>
#
# COPYRIGHT
-# Copyright (C) 2002-2003 Craig Barratt
+# Copyright (C) 2002-2007 Craig Barratt
#
#========================================================================
#
-# Version 3.0.0alpha, released 23 Jan 2006.
+# Version 3.1.0, released 25 Nov 2007.
#
# See http://backuppc.sourceforge.net.
#
my($err, $d, $blkSize) = BackupPC::Xfer::RsyncDigest->digestStart(
$attr->{fullPath}, $attr->{size}, 0,
$defBlkSize, $fio->{checksumSeed},
- 0, $attr->{compress}, 0);
+ 0, $attr->{compress}, 0,
+ $fio->{protocol_version});
my($isCached, $isInvalid) = $d->isCached;
if ( $fio->{logLevel} >= 5 ) {
$fio->log("$attr->{fullPath} verify; cached = $isCached,"
if ( $isCached || $isInvalid ) {
my $ret = BackupPC::Xfer::RsyncDigest->digestAdd(
$attr->{fullPath}, $blkSize,
- $fio->{checksumSeed}, 1 # verify
+ $fio->{checksumSeed}, 1, # verify
+ $fio->{protocol_version}
);
if ( $ret != 1 ) {
$fio->log("Bad cached digest for $attr->{fullPath} ($ret);"
(my $err, $fio->{csum}, my $blkSize)
= BackupPC::Xfer::RsyncDigest->digestStart($attr->{fullPath},
$attr->{size}, 0, $defBlkSize, $fio->{checksumSeed},
- $needMD4, $attr->{compress}, 1);
- if ( $fio->{logLevel} >= 5 ) {
- my($isCached, $invalid) = $fio->{csum}->isCached;
- $fio->log("$attr->{fullPath} cache = $isCached,"
- . " invalid = $invalid, phase = $phase");
- }
+ $needMD4, $attr->{compress}, 1, $fio->{protocol_version});
if ( $err ) {
$fio->log("Can't get rsync digests from $attr->{fullPath}"
. " (err=$err, name=$f->{name})");
$fio->{stats}{errorCnt}++;
return -1;
}
+ if ( $fio->{logLevel} >= 5 ) {
+ my($isCached, $invalid) = $fio->{csum}->isCached;
+ $fio->log("$attr->{fullPath} cache = $isCached,"
+ . " invalid = $invalid, phase = $phase");
+ }
return $blkSize;
}
sub attribGetWhere
{
- my($fio, $f) = @_;
- my($dir, $fname, $share, $shareM);
+ my($fio, $f, $noCache, $fname) = @_;
+ my($dir, $share, $shareM, $partial, $attr);
- $fname = $f->{name};
- $fname = "$fio->{xfer}{pathHdrSrc}/$fname"
+ if ( !defined($fname) ) {
+ $fname = $f->{name};
+ $fname = "$fio->{xfer}{pathHdrSrc}/$fname"
if ( defined($fio->{xfer}{pathHdrSrc}) );
+ }
$fname =~ s{//+}{/}g;
- if ( $fname =~ m{(.*)/(.*)} ) {
+ if ( $fname =~ m{(.*)/(.*)}s ) {
$shareM = $fio->{shareM};
$dir = $1;
$fname = $2;
$dir = "";
$fname = $fio->{share};
}
- $fio->viewCacheDir($share, $dir);
$shareM .= "/$dir" if ( $dir ne "" );
- if ( defined(my $attr = $fio->{viewCache}{$shareM}{$fname}) ) {
- return ($attr, 0);
- } elsif ( defined(my $attr = $fio->{partialCache}{$shareM}{$fname}) ) {
- return ($attr, 1);
+
+ if ( $noCache ) {
+ $share = $fio->{share} if ( !defined($share) );
+ my $dirAttr = $fio->{view}->dirAttrib($fio->{viewNum}, $share, $dir);
+ $attr = $dirAttr->{$fname};
} else {
- return;
+ $fio->viewCacheDir($share, $dir);
+ if ( defined($attr = $fio->{viewCache}{$shareM}{$fname}) ) {
+ $partial = 0;
+ } elsif ( defined($attr = $fio->{partialCache}{$shareM}{$fname}) ) {
+ $partial = 1;
+ } else {
+ return;
+ }
+ if ( $attr->{mode} & S_HLINK_TARGET ) {
+ $attr->{hlink_self} = 1;
+ $attr->{mode} &= ~S_HLINK_TARGET;
+ }
}
+ return ($attr, $partial);
}
sub attribGet
return $attr;
}
$target = "/$target" if ( $target !~ /^\// );
- $fio->log("$attr->{fullPath}: redirecting to $target (will trim "
- . "$fio->{xfer}{pathHdrSrc})") if ( $fio->{logLevel} >= 4 );
- $target =~ s/^\Q$fio->{xfer}{pathHdrSrc}//;
- $f->{name} = $target;
- $attr = $fio->attribGet($f);
+ $fio->log("$attr->{fullPath}: redirecting to $target")
+ if ( $fio->{logLevel} >= 4 );
+ $target =~ s{^/+}{};
+ ($attr) = $fio->attribGetWhere($f, 1, $target);
$fio->log(" ... now got $attr->{fullPath}")
if ( $fio->{logLevel} >= 4 );
}
my($fio, $f, $placeHolder) = @_;
my($dir, $file);
- if ( $f->{name} =~ m{(.*)/(.*)} ) {
+ return if ( $placeHolder && $fio->{phase} > 0 );
+
+ if ( $f->{name} =~ m{(.*)/(.*)}s ) {
$file = $2;
$dir = "$fio->{shareM}/" . $1;
} elsif ( $f->{name} eq "." ) {
$file = $f->{name};
}
- if ( !defined($fio->{attribLastDir}) || $fio->{attribLastDir} ne $dir ) {
+ if ( $dir ne ""
+ && (!defined($fio->{attribLastDir}) || $fio->{attribLastDir} ne $dir) ) {
#
# Flush any directories that don't match the first part
- # of the new directory
+ # of the new directory. Don't flush the top-level directory
+ # (ie: $dir eq "") since the "." might get sorted in the middle
+ # of other top-level directories or files.
#
foreach my $d ( keys(%{$fio->{attrib}}) ) {
next if ( $d eq "" || "$dir/" =~ m{^\Q$d/} );
$fio->{attribLastDir} = $dir;
}
if ( !exists($fio->{attrib}{$dir}) ) {
+ $fio->log("attribSet: dir=$dir not found") if ( $fio->{logLevel} >= 4 );
$fio->{attrib}{$dir} = BackupPC::Attrib->new({
compress => $fio->{xfer}{compress},
});
- my $path = $fio->{outDir} . $dir;
- if ( -f $fio->{attrib}{$dir}->fileName($path)
- && !$fio->{attrib}{$dir}->read($path) ) {
- $fio->log(sprintf("Unable to read attribute file %s",
+ my $dirM = $dir;
+ $dirM = $1 . "/" . $fio->{bpc}->fileNameMangle($2)
+ if ( $dirM =~ m{(.*?)/(.*)}s );
+ my $path = $fio->{outDir} . $dirM;
+ if ( -f $fio->{attrib}{$dir}->fileName($path) ) {
+ if ( !$fio->{attrib}{$dir}->read($path) ) {
+ $fio->log(sprintf("Unable to read attribute file %s",
$fio->{attrib}{$dir}->fileName($path)));
+ } else {
+ $fio->log(sprintf("attribRead file %s",
+ $fio->{attrib}{$dir}->fileName($path)))
+ if ( $fio->{logLevel} >= 4 );
+ }
}
+ } else {
+ $fio->log("attribSet: dir=$dir exists") if ( $fio->{logLevel} >= 4 );
}
- $fio->log("attribSet(dir=$dir, file=$file)") if ( $fio->{logLevel} >= 4 );
+ $fio->log("attribSet(dir=$dir, file=$file, size=$f->{size}, placeholder=$placeHolder)")
+ if ( $fio->{logLevel} >= 4 );
my $mode = $f->{mode};
my($fio, $d) = @_;
my($poolWrite);
- #
- # Don't write attributes on 2nd phase - they're already
- # taken care of during the first phase.
- #
- return if ( $fio->{phase} > 0 );
if ( !defined($d) ) {
#
# flush all entries (in reverse order)
return;
}
return if ( !defined($fio->{attrib}{$d}) );
+
#
# Set deleted files in the attributes. Any file in the view
# that doesn't have attributes is flagged as deleted for
my $dir;
my $share;
- $dir = $1 if ( $d =~ m{.+?/(.*)} );
+ $dir = $1 if ( $d =~ m{.+?/(.*)}s );
$fio->viewCacheDir(undef, $dir);
##print("attribWrite $d,$dir\n");
##$Data::Dumper::Indent = 1;
if ( defined($fio->{viewCache}{$d}) ) {
foreach my $f ( keys(%{$fio->{viewCache}{$d}}) ) {
my $name = $f;
- $name = "$1/$name" if ( $d =~ m{.*?/(.*)} );
+ $name = "$1/$name" if ( $d =~ m{.*?/(.*)}s );
if ( defined(my $a = $fio->{attrib}{$d}->get($f)) ) {
#
# delete temporary attributes (skipped files)
}) if ( $fio->{logLevel} >= 2
&& $a->{type} == BPC_FTYPE_FILE );
}
- } elsif ( !$fio->{full} ) {
+ } elsif ( $fio->{phase} == 0 && !$fio->{full} ) {
##print("Delete file $f\n");
$fio->logFileAction("delete", {
%{$fio->{viewCache}{$d}{$f}},
}
}
}
- if ( $fio->{attrib}{$d}->fileCount ) {
+ if ( $fio->{attrib}{$d}->fileCount || $fio->{phase} > 0 ) {
my $data = $fio->{attrib}{$d}->writeData;
my $dirM = $d;
$dirM = $1 . "/" . $fio->{bpc}->fileNameMangle($2)
- if ( $dirM =~ m{(.*?)/(.*)} );
+ if ( $dirM =~ m{(.*?)/(.*)}s );
my $fileName = $fio->{attrib}{$d}->fileName("$fio->{outDir}$dirM");
$fio->log("attribWrite(dir=$d) -> $fileName")
if ( $fio->{logLevel} >= 4 );
sub makePath
{
my($fio, $f) = @_;
- my $name = $1 if ( $f->{name} =~ /(.*)/ );
+ my $name = $1 if ( $f->{name} =~ /(.*)/s );
my $path;
if ( $name eq "." ) {
}
$fio->logFileAction("create", $f) if ( $fio->{logLevel} >= 1 );
$fio->log("makePath($path, 0777)") if ( $fio->{logLevel} >= 5 );
- $path = $1 if ( $path =~ /(.*)/ );
+ $path = $1 if ( $path =~ /(.*)/s );
File::Path::mkpath($path, 0, 0777) if ( !-d $path );
return $fio->attribSet($f) if ( -d $path );
$fio->log("Can't create directory $path");
sub makeSpecial
{
my($fio, $f) = @_;
- my $name = $1 if ( $f->{name} =~ /(.*)/ );
+ my $name = $1 if ( $f->{name} =~ /(.*)/s );
my $fNameM = $fio->{bpc}->fileNameMangle($name);
my $path = $fio->{outDirSh} . $fNameM;
my $attr = $fio->attribGet($f);
my($fh, $fileData);
if ( $fio->{full}
|| !defined($attr)
- || $attr->{type} != $type
- || $attr->{mtime} != $f->{mtime}
- || $attr->{size} != $f->{size}
- || $attr->{uid} != $f->{uid}
- || $attr->{gid} != $f->{gid}
- || $attr->{mode} != $f->{mode}
+ || $attr->{type} != $type
+ || $attr->{mtime} != $f->{mtime}
+ || $attr->{size} != $f->{size}
+ || $attr->{uid} != $f->{uid}
+ || $attr->{gid} != $f->{gid}
+ || $attr->{mode} != $f->{mode}
+ || $attr->{hlink_self} != $f->{hlink_self}
|| !defined($fh = BackupPC::FileZIO->open($attr->{fullPath}, 0,
$attr->{compress}))
|| $fh->read(\$fileData, length($str) + 1) != length($str)
. " ($fio->{rxLocalAttr}{compress} vs $fio->{xfer}{compress})")
if ( $fio->{logLevel} >= 4 );
}
+ #
+ # If the local file is a hardlink then no match
+ #
+ if ( defined($fio->{rxLocalAttr})
+ && $fio->{rxLocalAttr}{type} == BPC_FTYPE_HARDLINK ) {
+ $fio->{rxMatchBlk} = undef;
+ $fio->log("$fio->{rxFile}{name}: no match on hardlinks")
+ if ( $fio->{logLevel} >= 4 );
+ my $fCopy;
+ # need to copy since hardlink attribGet overwrites the name
+ %{$fCopy} = %$f;
+ $fio->{rxHLinkAttr} = $fio->attribGet($fCopy, 1); # hardlink attributes
+ } else {
+ delete($fio->{rxHLinkAttr});
+ }
delete($fio->{rxInFd});
delete($fio->{rxOutFd});
delete($fio->{rxDigest});
# need to open an output file where we will build the
# new version.
#
- $fio->{rxFile}{name} =~ /(.*)/;
+ $fio->{rxFile}{name} =~ /(.*)/s;
my $rxOutFileRel = "$fio->{shareM}/" . $fio->{bpc}->fileNameMangle($1);
my $rxOutFile = $fio->{outDir} . $rxOutFileRel;
$fio->{rxOutFd} = BackupPC::PoolWrite->new($fio->{bpc},
my $attr = $fio->{rxLocalAttr};
my $fh;
if ( !defined($fio->{rxInFd}) && !defined($fio->{rxInData}) ) {
+ my $inPath = $attr->{fullPath};
+ $inPath = $fio->{rxHLinkAttr}{fullPath}
+ if ( defined($fio->{rxHLinkAttr}) );
if ( $attr->{compress} ) {
if ( !defined($fh = BackupPC::FileZIO->open(
- $attr->{fullPath},
+ $inPath,
0,
$attr->{compress})) ) {
- $fio->log("Can't open $attr->{fullPath}");
+ $fio->log("Can't open $inPath");
$fio->{stats}{errorCnt}++;
return -1;
}
}
$fh->close;
} else {
- if ( open(F, "<", $attr->{fullPath}) ) {
+ if ( open(F, "<", $inPath) ) {
binmode(F);
$fio->{rxInFd} = *F;
$fio->{rxInName} = $attr->{fullPath};
} else {
- $fio->log("Unable to open $attr->{fullPath}");
+ $fio->log("Unable to open $inPath");
$fio->{stats}{errorCnt}++;
return -1;
}
my $seekPosn = $fio->{rxMatchBlk} * $fio->{rxBlkSize};
if ( defined($fio->{rxInFd})
&& !sysseek($fio->{rxInFd}, $seekPosn, 0) ) {
- $fio->log("Unable to seek $attr->{rxInName} to $seekPosn");
+ $fio->log("Unable to seek $fio->{rxInName} to $seekPosn");
$fio->{stats}{errorCnt}++;
return -1;
}
sub fileDeltaRxDone
{
my($fio, $md4, $phase) = @_;
- my $name = $1 if ( $fio->{rxFile}{name} =~ /(.*)/ );
+ my $name = $1 if ( $fio->{rxFile}{name} =~ /(.*)/s );
my $ret;
close($fio->{rxInFd}) if ( defined($fio->{rxInFd}) );
= BackupPC::Xfer::RsyncDigest->digestStart(
$attr->{fullPath}, $attr->{size},
0, 2048, $fio->{checksumSeed}, 1,
- $attr->{compress}, 1);
+ $attr->{compress}, 1,
+ $fio->{protocol_version});
if ( $err ) {
$fio->log("Can't open $attr->{fullPath} for MD4"
. " check (err=$err, $name)");
if ( $phase > 0 ) {
$fio->log("$name: fatal error: md4 doesn't match on retry;"
. " file removed");
+ $fio->{stats}{errorCnt}++;
} else {
$fio->log("$name: md4 doesn't match: will retry in phase 1;"
. " file removed");
}
- $fio->{stats}{errorCnt}++;
if ( defined($fio->{rxOutFd}) ) {
$fio->{rxOutFd}->close;
unlink($fio->{rxOutFile});
my $f = $fio->{rxFile};
$fio->logFileAction("same", $f) if ( $fio->{logLevel} >= 1 );
if ( $fio->{full}
- || $attr->{type} != $f->{type}
- || $attr->{mtime} != $f->{mtime}
- || $attr->{size} != $f->{size}
- || $attr->{gid} != $f->{gid}
- || $attr->{mode} != $f->{mode} ) {
+ || $attr->{type} != $f->{type}
+ || $attr->{mtime} != $f->{mtime}
+ || $attr->{size} != $f->{size}
+ || $attr->{uid} != $f->{uid}
+ || $attr->{gid} != $f->{gid}
+ || $attr->{mode} != $f->{mode}
+ || $attr->{hlink_self} != $f->{hlink_self} ) {
#
# In the full case, or if the attributes are different,
# we need to make a link from the previous file and
my $type = $a->{type};
my $extraAttribs = {};
+ if ( $a->{mode} & S_HLINK_TARGET ) {
+ $a->{hlink_self} = 1;
+ $a->{mode} &= ~S_HLINK_TARGET;
+ }
$n =~ s/^\Q$fio->{xfer}{pathHdrSrc}//;
$fio->log("Sending $name (remote=$n) type = $type") if ( $fio->{logLevel} >= 1 );
if ( $type == BPC_FTYPE_CHARDEV
&& ($type == BPC_FTYPE_HARDLINK || $type == BPC_FTYPE_FILE)
&& ($type == BPC_FTYPE_HARDLINK
|| $fio->{protocol_version} < 27
- || ($a->{mode} & S_HLINK_TARGET) ) ) {
+ || $a->{hlink_self}) ) {
#
# Fill in fake inode information so that the remote rsync
# can correctly create hardlinks.
$fio->log("$a->{fullPath}: can't open for hardlink");
$fio->{stats}{errorCnt}++;
}
- } elsif ( $a->{mode} & S_HLINK_TARGET ) {
+ } elsif ( $a->{hlink_self} ) {
if ( defined($fio->{hlinkFile2Num}{$name}) ) {
$inode = $fio->{hlinkFile2Num}{$name};
} else {
if ( $fio->{clientCharset} ne "" );
$fList->encode($f);
- $logName = "$fio->{xfer}{pathHdrDest}/$f->{name}";
+ $logName = "$fio->{xfer}{pathHdrDest}/$logName";
$logName =~ s{//+}{/}g;
$f->{name} = $logName;
$fio->logFileAction("restore", $f) if ( $fio->{logLevel} >= 1 );
projects / BackupPC.git / blobdiff