projects
/
BackupPC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* removed Host_or_User_name from lang files
[BackupPC.git]
/
bin
/
BackupPC_restore
diff --git
a/bin/BackupPC_restore
b/bin/BackupPC_restore
index
1186cac
..
566673d
100755
(executable)
--- a/
bin/BackupPC_restore
+++ b/
bin/BackupPC_restore
@@
-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.0_CVS, released 3 Jul
2003.
#
# 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;
@@
-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},