projects
/
BackupPC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Revision update for 2.1.0beta2.
[BackupPC.git]
/
bin
/
BackupPC_restore
diff --git
a/bin/BackupPC_restore
b/bin/BackupPC_restore
index
1186cac
..
5843a01
100755
(executable)
--- a/
bin/BackupPC_restore
+++ b/
bin/BackupPC_restore
@@
-1,4
+1,4
@@
-#!/bin/perl
-T
+#!/bin/perl
#============================================================= -*-perl-*-
#
# BackupPC_restore: Restore files to a client.
#============================================================= -*-perl-*-
#
# BackupPC_restore: Restore files to a client.
@@
-11,7
+11,7
@@
# Craig Barratt <cbarratt@users.sourceforge.net>
#
# COPYRIGHT
# Craig Barratt <cbarratt@users.sourceforge.net>
#
# COPYRIGHT
-# Copyright (C) 2001 Craig Barratt
+# Copyright (C) 2001
-2003
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
#
# 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
@@
-29,13
+29,14
@@
#
#========================================================================
#
#
#========================================================================
#
-# Version 2.
0.0beta3, released 1 Jun 2003
.
+# Version 2.
1.0beta2, released 23 May 2004
.
#
# See http://backuppc.sourceforge.net.
#
#========================================================================
use strict;
#
# See http://backuppc.sourceforge.net.
#
#========================================================================
use strict;
+no utf8;
use lib "/usr/local/BackupPC/lib";
use BackupPC::Lib;
use BackupPC::FileZIO;
use lib "/usr/local/BackupPC/lib";
use BackupPC::Lib;
use BackupPC::FileZIO;
@@
-263,6
+264,7
@@
my $xferArgs = {
pipeWH => *WH,
XferLOG => $RestoreLOG,
XferMethod => $Conf{XferMethod},
pipeWH => *WH,
XferLOG => $RestoreLOG,
XferMethod => $Conf{XferMethod},
+ logLevel => $Conf{XferLogLevel},
bkupSrcHost => $RestoreReq{hostSrc},
bkupSrcShare => $RestoreReq{shareSrc},
bkupSrcNum => $RestoreReq{num},
bkupSrcHost => $RestoreReq{hostSrc},
bkupSrcShare => $RestoreReq{shareSrc},
bkupSrcNum => $RestoreReq{num},
@@
-320,6
+322,7
@@
if ( $useTar ) {
$stat{hostError} = "Can't fork to run tar";
exit(RestoreCleanup($client));
}
$stat{hostError} = "Can't fork to run tar";
exit(RestoreCleanup($client));
}
+ binmode(TAR);
if ( !$tarPid ) {
#
# This is the tarCreate child. Clone STDERR to STDOUT,
if ( !$tarPid ) {
#
# This is the tarCreate child. Clone STDERR to STDOUT,
@@
-330,6
+333,7
@@
if ( $useTar ) {
open(STDERR, ">&STDOUT");
close(STDOUT);
open(STDOUT, ">&WH");
open(STDERR, ">&STDOUT");
close(STDOUT);
open(STDOUT, ">&WH");
+ alarm(0);
exec("$BinDir/BackupPC_tarCreate", @tarArgs);
print(LOG $bpc->timeStamp, "can't exec $BinDir/BackupPC_tarCreate\n");
# FIX: need to cleanup xfer
exec("$BinDir/BackupPC_tarCreate", @tarArgs);
print(LOG $bpc->timeStamp, "can't exec $BinDir/BackupPC_tarCreate\n");
# FIX: need to cleanup xfer
@@
-490,17
+494,17
@@
sub RestoreCleanup
# kill off the tranfer program, first nicely then forcefully
#
if ( @xferPid ) {
# kill off the tranfer program, first nicely then forcefully
#
if ( @xferPid ) {
- kill(
2
, @xferPid);
+ kill(
$bpc->sigName2num("INT")
, @xferPid);
sleep(1);
sleep(1);
- kill(
9
, @xferPid);
+ kill(
$bpc->sigName2num("KILL")
, @xferPid);
}
#
# kill off the tar process, first nicely then forcefully
#
if ( $tarPid > 0 ) {
}
#
# kill off the tar process, first nicely then forcefully
#
if ( $tarPid > 0 ) {
- kill(
2
, $tarPid);
+ kill(
$bpc->sigName2num("INT")
, $tarPid);
sleep(1);
sleep(1);
- kill(
9
, $tarPid);
+ kill(
$bpc->sigName2num("KILL")
, $tarPid);
}
}
}
}
@@
-612,6
+616,7
@@
sub UserCommandRun
return if ( !defined($Conf{$type}) );
my $vars = {
xfer => $xfer,
return if ( !defined($Conf{$type}) );
my $vars = {
xfer => $xfer,
+ client => $client,
host => $host,
hostIP => $hostIP,
share => $RestoreReq{shareDest},
host => $host,
hostIP => $hostIP,
share => $RestoreReq{shareDest},
@@
-622,7
+627,8
@@
sub UserCommandRun
moreUsers => $Hosts->{$client}{moreUsers},
XferLOG => $RestoreLOG,
stat => \%stat,
moreUsers => $Hosts->{$client}{moreUsers},
XferLOG => $RestoreLOG,
stat => \%stat,
- xferOK => $stat{xferOK},
+ xferOK => $stat{xferOK} || 0,
+ hostError => $stat{hostError},
type => $type,
bkupSrcHost => $RestoreReq{hostSrc},
bkupSrcShare => $RestoreReq{shareSrc},
type => $type,
bkupSrcHost => $RestoreReq{hostSrc},
bkupSrcShare => $RestoreReq{shareSrc},