X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=bin%2FBackupPC_restore;h=8f783168a5d6a841d0e242bba0dd2f0e3cc5d543;hp=566673dadb99acd8925b83953f79562ce23dbc43;hb=27f513f89d885d24bf1a01242fba676c7a840fd5;hpb=5729095faa3ef12dc5d4f02538c3650ac81912ef

diff --git a/bin/BackupPC_restore b/bin/BackupPC_restore
index 566673d..8f78316 100755
--- 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.
@@ -29,7 +29,7 @@
 #
 #========================================================================
 #
-# Version 2.1.0_CVS, released 3 Jul 2003.
+# Version 3.0.0alpha, released 23 Jan 2006.
 #
 # See http://backuppc.sourceforge.net.
 #
@@ -43,6 +43,7 @@ use BackupPC::FileZIO;
 use BackupPC::Xfer::Smb;
 use BackupPC::Xfer::Tar;
 use BackupPC::Xfer::Rsync;
+use BackupPC::Xfer::BackupPCd;
 use Socket;
 
 use File::Path;
@@ -186,7 +187,10 @@ if ( (my $errMsg = CorrectHostCheck($hostIP, $host)) ) {
 #
 # Setup file extension for compression and open RestoreLOG output file
 #
-$Conf{CompressLevel} = 0 if ( !BackupPC::FileZIO->compOk );
+if ( $Conf{CompressLevel} && !BackupPC::FileZIO->compOk ) {
+    $stat{hostError} = "Compress:Zlib not found";
+    exit(RestoreCleanup($client));
+}
 my $fileExt = $Conf{CompressLevel} > 0 ? ".z" : "";
 my $RestoreLOG = BackupPC::FileZIO->open("$Dir/RestoreLOG$fileExt", 1,
                                      $Conf{CompressLevel});
@@ -221,6 +225,16 @@ if ( $Conf{XferMethod} eq "tar" ) {
 	$stat{hostError} = $errStr;
 	exit(RestoreCleanup($client));
     }
+} elsif ( $Conf{XferMethod} eq "backuppcd" ) {
+    #
+    # Use backuppcd as the transport program.
+    #
+    if ( !defined($xfer = BackupPC::Xfer::BackupPCd->new($bpc)) ) {
+        my $errStr = BackupPC::Xfer::BackupPCd->errStr;
+	UserCommandRun("RestorePostUserCmd") if ( $NeedPostCmd );
+	$stat{hostError} = $errStr;
+	exit(RestoreCleanup($client));
+    }
 } else {
     #
     # Default is to use smbclient (smb) as the transport program.
@@ -264,6 +278,7 @@ my $xferArgs = {
     pipeWH       => *WH,
     XferLOG      => $RestoreLOG,
     XferMethod   => $Conf{XferMethod},
+    logLevel     => $Conf{XferLogLevel},
     bkupSrcHost  => $RestoreReq{hostSrc},
     bkupSrcShare => $RestoreReq{shareSrc},
     bkupSrcNum   => $RestoreReq{num},
@@ -332,6 +347,7 @@ if ( $useTar ) {
 	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
@@ -492,17 +508,17 @@ sub RestoreCleanup
 	# kill off the tranfer program, first nicely then forcefully
 	#
 	if ( @xferPid ) {
-	    kill(2, @xferPid);
+	    kill($bpc->sigName2num("INT"), @xferPid);
 	    sleep(1);
-	    kill(9, @xferPid);
+	    kill($bpc->sigName2num("KILL"), @xferPid);
 	}
 	#
 	# kill off the tar process, first nicely then forcefully
 	#
 	if ( $tarPid > 0 ) {
-	    kill(2, $tarPid);
+	    kill($bpc->sigName2num("INT"), $tarPid);
 	    sleep(1);
-	    kill(9, $tarPid);
+	    kill($bpc->sigName2num("KILL"), $tarPid);
 	}
     }
 
@@ -609,9 +625,9 @@ sub pidHandler
 #
 sub UserCommandRun
 {
-    my($type) = @_;
+    my($cmdType) = @_;
 
-    return if ( !defined($Conf{$type}) );
+    return if ( !defined($Conf{$cmdType}) );
     my $vars = {
         xfer         => $xfer,
         client       => $client,
@@ -627,7 +643,7 @@ sub UserCommandRun
         stat         => \%stat,
         xferOK       => $stat{xferOK} || 0,
 	hostError    => $stat{hostError},
-	type	     => $type,
+	type	     => "restore",
 	bkupSrcHost  => $RestoreReq{hostSrc},
 	bkupSrcShare => $RestoreReq{shareSrc},
 	bkupSrcNum   => $RestoreReq{num},
@@ -635,9 +651,10 @@ sub UserCommandRun
 	pathHdrSrc   => $RestoreReq{pathHdrSrc},
 	pathHdrDest  => $RestoreReq{pathHdrDest},
 	fileList     => $RestoreReq{fileList},
+	cmdType	     => $cmdType,
     };
-    my $cmd = $bpc->cmdVarSubstitute($Conf{$type}, $vars);
-    $RestoreLOG->write(\"Executing $type: @$cmd\n");
+    my $cmd = $bpc->cmdVarSubstitute($Conf{$cmdType}, $vars);
+    $RestoreLOG->write(\"Executing $cmdType: @$cmd\n");
     #
     # Run the user's command, dumping the stdout/stderr into the
     # Xfer log file.  Also supply the optional $vars and %Conf in