projects
/
BackupPC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Fixed stupid last-minute change in octal size conversion in
[BackupPC.git]
/
bin
/
BackupPC_restore
diff --git
a/bin/BackupPC_restore
b/bin/BackupPC_restore
index
1186cac
..
a24ae86
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.
@@
-29,14
+29,15
@@
#
#========================================================================
#
#
#========================================================================
#
-# Version 2.0.
0beta3, released 1 Jun
2003.
+# Version 2.0.
2, released 6 Oct
2003.
#
# See http://backuppc.sourceforge.net.
#
#========================================================================
use strict;
#
# See http://backuppc.sourceforge.net.
#
#========================================================================
use strict;
-use lib "/usr/local/BackupPC/lib";
+no utf8;
+use lib "/usr/local/BackupPC2.0.2/lib";
use BackupPC::Lib;
use BackupPC::FileZIO;
use BackupPC::Xfer::Smb;
use BackupPC::Lib;
use BackupPC::FileZIO;
use BackupPC::Xfer::Smb;
@@
-320,6
+321,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,
@@
-612,6
+614,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
+625,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},