num startTime endTime result errorMsg nFiles size
tarCreateErrs xferErrs
)],
+ ArchiveFields => [qw(
+ num startTime endTime result errorMsg
+ )],
}, $class;
$bpc->{BinDir} .= "/bin";
$bpc->{LibDir} .= "/lib";
return $bpc->{verbose};
}
-sub timeStamp
-{
- my($bpc, $t, $noPad) = @_;
- my($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst)
- = localtime($t || time);
- $year += 1900;
- $mon++;
- return "$year/$mon/$mday " . sprintf("%02d:%02d:%02d", $hour, $min, $sec)
- . ($noPad ? "" : " ");
-}
-
#
-# An ISO 8601-compliant version of timeStamp. Needed by the
-# --newer-mtime argument to GNU tar in BackupPC::Xfer::Tar.
-# Also see http://www.w3.org/TR/NOTE-datetime.
+# Generate an ISO 8601 format timeStamp (but without the "T").
+# See http://www.w3.org/TR/NOTE-datetime and
+# http://www.cl.cam.ac.uk/~mgk25/iso-time.html
#
-sub timeStampISO
+sub timeStamp
{
my($bpc, $t, $noPad) = @_;
my($sec,$min,$hour,$mday,$mon,$year,$wday,$yday,$isdst)
= localtime($t || time);
- $year += 1900;
- $mon++;
- return sprintf("%04d-%02d-%02d ", $year, $mon, $mday)
- . sprintf("%02d:%02d:%02d", $hour, $min, $sec)
- . ($noPad ? "" : " ");
+ return sprintf("%04d-%02d-%02d %02d:%02d:%02d",
+ $year + 1900, $mon + 1, $mday, $hour, $min, $sec)
+ . ($noPad ? "" : " ");
}
sub BackupInfoRead
binmode(BK_INFO);
while ( <BK_INFO> ) {
s/[\n\r]+//;
- next if ( !/^(\d+\t(incr|full)[\d\t]*$)/ );
+ next if ( !/^(\d+\t(incr|full|partial)[\d\t]*$)/ );
$_ = $1;
@{$Backups[@Backups]}{@{$bpc->{BackupFields}}} = split(/\t/);
}
close(LOCK);
}
+sub ArchiveInfoRead
+{
+ my($bpc, $host) = @_;
+ local(*ARCHIVE_INFO, *LOCK);
+ my(@Archives);
+
+ flock(LOCK, LOCK_EX) if open(LOCK, "$bpc->{TopDir}/pc/$host/LOCK");
+ if ( open(ARCHIVE_INFO, "$bpc->{TopDir}/pc/$host/archives") ) {
+ binmode(ARCHIVE_INFO);
+ while ( <ARCHIVE_INFO> ) {
+ s/[\n\r]+//;
+ next if ( !/^(\d+.*)/ );
+ $_ = $1;
+ @{$Archives[@Archives]}{@{$bpc->{ArchiveFields}}} = split(/\t/);
+ }
+ close(ARCHIVE_INFO);
+ }
+ close(LOCK);
+ return @Archives;
+}
+
+sub ArchiveInfoWrite
+{
+ my($bpc, $host, @Archives) = @_;
+ local(*ARCHIVE_INFO, *LOCK);
+ my($i);
+
+ flock(LOCK, LOCK_EX) if open(LOCK, "$bpc->{TopDir}/pc/$host/LOCK");
+ unlink("$bpc->{TopDir}/pc/$host/archives.old")
+ if ( -f "$bpc->{TopDir}/pc/$host/archives.old" );
+ rename("$bpc->{TopDir}/pc/$host/archives",
+ "$bpc->{TopDir}/pc/$host/archives.old")
+ if ( -f "$bpc->{TopDir}/pc/$host/archives" );
+ if ( open(ARCHIVE_INFO, ">$bpc->{TopDir}/pc/$host/archives") ) {
+ binmode(ARCHIVE_INFO);
+ for ( $i = 0 ; $i < @Archives ; $i++ ) {
+ my %b = %{$Archives[$i]};
+ printf(ARCHIVE_INFO "%s\n",
+ join("\t", @b{@{$bpc->{ArchiveFields}}}));
+ }
+ close(ARCHIVE_INFO);
+ }
+ close(LOCK);
+}
+
sub ConfigRead
{
my($bpc, $host) = @_;
return -2 if ( !defined($rawFile = $bpc->MD52Path($d, $compress)) );
$rawFile .= "_$i" if ( $i >= 0 );
if ( -f $rawFile ) {
- if ( !compare($name, $rawFile) ) {
+ if ( (stat(_))[3] < $bpc->{Conf}{HardLinkMax}
+ && !compare($name, $rawFile) ) {
unlink($name);
return -3 if ( !link($rawFile, $name) );
return 1;
# Return success if the ping cmd is undefined or empty.
#
if ( $bpc->{Conf}{PingCmd} eq "" ) {
- print("CheckHostAlive: return ok because \$Conf{PingCmd} is empty\n")
- if ( $bpc->{verbose} );
+ print(STDERR "CheckHostAlive: return ok because \$Conf{PingCmd}"
+ . " is empty\n") if ( $bpc->{verbose} );
return 0;
}
#
$s = $bpc->cmdSystemOrEval($pingCmd, undef, $args);
if ( $? ) {
- print("CheckHostAlive: first ping failed ($?, $!)\n")
+ print(STDERR "CheckHostAlive: first ping failed ($?, $!)\n")
if ( $bpc->{verbose} );
return -1;
}
#
$s = $bpc->cmdSystemOrEval($pingCmd, undef, $args);
if ( $? ) {
- print("CheckHostAlive: second ping failed ($?, $!)\n")
+ print(STDERR "CheckHostAlive: second ping failed ($?, $!)\n")
if ( $bpc->{verbose} );
return -1;
}
} elsif ( $s =~ /time=([\d\.]+)\s*usec/i ) {
$ret = $1/1000;
} else {
- print("CheckHostAlive: can't extract round-trip time (not fatal)\n")
- if ( $bpc->{verbose} );
+ print(STDERR "CheckHostAlive: can't extract round-trip time"
+ . " (not fatal)\n") if ( $bpc->{verbose} );
$ret = 0;
}
- print("CheckHostAlive: returning $ret\n") if ( $bpc->{verbose} );
+ print(STDERR "CheckHostAlive: returning $ret\n") if ( $bpc->{verbose} );
return $ret;
}
# Skip NetBios check if NmbLookupCmd is emtpy
#
if ( $bpc->{Conf}{NmbLookupCmd} eq "" ) {
- print("NetBiosInfoGet: return $host because \$Conf{NmbLookupCmd}"
- . " is empty\n")
- if ( $bpc->{verbose} );
+ print(STDERR "NetBiosInfoGet: return $host because \$Conf{NmbLookupCmd}"
+ . " is empty\n") if ( $bpc->{verbose} );
return ($host, undef);
}
$netBiosUserName = $1 if ( $2 eq "03" ); # user is last 03
}
if ( !defined($netBiosHostName) ) {
- print("NetBiosInfoGet: failed: can't parse return string\n")
+ print(STDERR "NetBiosInfoGet: failed: can't parse return string\n")
if ( $bpc->{verbose} );
return;
}
$netBiosHostName = lc($netBiosHostName);
$netBiosUserName = lc($netBiosUserName);
- print("NetBiosInfoGet: success, returning host $netBiosHostName,"
- . " user $netBiosUserName\n")
- if ( $bpc->{verbose} );
+ print(STDERR "NetBiosInfoGet: success, returning host $netBiosHostName,"
+ . " user $netBiosUserName\n") if ( $bpc->{verbose} );
return ($netBiosHostName, $netBiosUserName);
}
# Skip NetBios lookup if NmbLookupFindHostCmd is emtpy
#
if ( $bpc->{Conf}{NmbLookupFindHostCmd} eq "" ) {
- print("NetBiosHostIPFind: return $host because"
+ print(STDERR "NetBiosHostIPFind: return $host because"
. " \$Conf{NmbLookupFindHostCmd} is empty\n")
if ( $bpc->{verbose} );
return $host;
}
$ipAddr = $firstIpAddr if ( !defined($ipAddr) );
if ( defined($ipAddr) ) {
- print("NetBiosHostIPFind: found IP address $ipAddr for host $host\n")
- if ( $bpc->{verbose} );
+ print(STDERR "NetBiosHostIPFind: found IP address $ipAddr for"
+ . " host $host\n") if ( $bpc->{verbose} );
return $ipAddr;
} else {
- print("NetBiosHostIPFind: couldn't find IP address for host $host\n")
- if ( $bpc->{verbose} );
+ print(STDERR "NetBiosHostIPFind: couldn't find IP address for"
+ . " host $host\n") if ( $bpc->{verbose} );
return;
}
}
if ( (ref($cmd) eq "ARRAY" ? $cmd->[0] : $cmd) =~ /^\&/ ) {
$cmd = join(" ", $cmd) if ( ref($cmd) eq "ARRAY" );
- print("cmdExecOrEval: about to eval perl code $cmd\n")
+ print(STDERR "cmdExecOrEval: about to eval perl code $cmd\n")
if ( $bpc->{verbose} );
eval($cmd);
print(STDERR "Perl code fragment for exec shouldn't return!!\n");
exit(1);
} else {
$cmd = [split(/\s+/, $cmd)] if ( ref($cmd) ne "ARRAY" );
- print("cmdExecOrEval: about to exec ",
+ print(STDERR "cmdExecOrEval: about to exec ",
$bpc->execCmd2ShellCmd(@$cmd), "\n")
if ( $bpc->{verbose} );
exec(map { m/(.*)/ } @$cmd); # untaint
if ( (ref($cmd) eq "ARRAY" ? $cmd->[0] : $cmd) =~ /^\&/ ) {
$cmd = join(" ", $cmd) if ( ref($cmd) eq "ARRAY" );
- print("cmdSystemOrEval: about to eval perl code $cmd\n")
+ print(STDERR "cmdSystemOrEval: about to eval perl code $cmd\n")
if ( $bpc->{verbose} );
$out = eval($cmd);
$$stdoutCB .= $out if ( ref($stdoutCB) eq 'SCALAR' );
&$stdoutCB($out) if ( ref($stdoutCB) eq 'CODE' );
- print("cmdSystemOrEval: finished: got output $out\n")
+ print(STDERR "cmdSystemOrEval: finished: got output $out\n")
if ( $bpc->{verbose} );
return $out if ( !defined($stdoutCB) );
return;
} else {
$cmd = [split(/\s+/, $cmd)] if ( ref($cmd) ne "ARRAY" );
- print("cmdSystemOrEval: about to system ",
+ print(STDERR "cmdSystemOrEval: about to system ",
$bpc->execCmd2ShellCmd(@$cmd), "\n")
if ( $bpc->{verbose} );
if ( !defined($pid = open(CHILD, "-|")) ) {
$? = 0;
close(CHILD);
}
- print("cmdSystemOrEval: finished: got output $allOut\n")
+ print(STDERR "cmdSystemOrEval: finished: got output $allOut\n")
if ( $bpc->{verbose} );
return $out;
}
projects / BackupPC.git / blobdiff