X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=bin%2FBackupPC_restore;h=9ebd8c45c831dca03ba6104261be4a849e2cfedc;hp=212f928183d4b42b21f7ba4adf1188f9f16d910f;hb=2c14784ad71874ec850d189060fe63d6eb9eba95;hpb=7dee89bfce659051d486cc66515bb7f22bbc4f09

diff --git a/bin/BackupPC_restore b/bin/BackupPC_restore
index 212f928..9ebd8c4 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.
@@ -11,7 +11,7 @@
 #   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
@@ -29,19 +29,21 @@
 #
 #========================================================================
 #
-# Version 2.0.0beta1, released 30 Mar 2003.
+# Version 2.1.0_CVS, released 8 Feb 2004.
 #
 # See http://backuppc.sourceforge.net.
 #
 #========================================================================
 
 use strict;
+no  utf8;
 use lib "/usr/local/BackupPC/lib";
 use BackupPC::Lib;
 use BackupPC::FileZIO;
 use BackupPC::Xfer::Smb;
 use BackupPC::Xfer::Tar;
 use BackupPC::Xfer::Rsync;
+use Socket;
 
 use File::Path;
 use Getopt::Std;
@@ -88,6 +90,11 @@ my $tarPid  = -1;
 $SIG{INT}  = \&catch_signal;
 $SIG{ALRM} = \&catch_signal;
 $SIG{TERM} = \&catch_signal;
+$SIG{PIPE} = \&catch_signal;
+$SIG{STOP} = \&catch_signal;
+$SIG{TSTP} = \&catch_signal;
+$SIG{TTIN} = \&catch_signal;
+my $Pid = $$;
 
 mkpath($Dir, 0, 0777) if ( !-d $Dir );
 if ( !-f "$Dir/LOCK" ) {
@@ -224,13 +231,23 @@ my $useTar = $xfer->useTar;
 
 if ( $useTar ) {
     #
-    # Create a pipe to connect BackupPC_tarCreate to the transport program
-    # (smbclient, tar, etc).
+    # Create a socketpair to connect BackupPC_tarCreate to the transport
+    # program (smbclient, tar, etc).
     # WH is the write handle for writing, provided to BackupPC_tarCreate
     # and RH is the other end of the pipe for reading provided to the
     # transport program.
     #
-    pipe(RH, WH);
+    if ( socketpair(RH, WH, AF_UNIX, SOCK_STREAM, PF_UNSPEC) ) {
+	shutdown(RH, 1);    # no writing to this socket
+	shutdown(WH, 0);    # no reading from this socket
+	setsockopt(RH, SOL_SOCKET, SO_RCVBUF, 8 * 65536);
+	setsockopt(WH, SOL_SOCKET, SO_SNDBUF, 8 * 65536);
+    } else {
+	#
+	# Default to pipe() if socketpair() doesn't work.
+	#
+	pipe(RH, WH);
+    }
 }
 
 #
@@ -304,6 +321,7 @@ if ( $useTar ) {
 	$stat{hostError} = "Can't fork to run tar";
 	exit(RestoreCleanup($client));
     }
+    binmode(TAR);
     if ( !$tarPid ) {
 	#
 	# This is the tarCreate child.  Clone STDERR to STDOUT,
@@ -314,6 +332,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
@@ -434,22 +453,29 @@ sub catch_signal
 {
     my $signame = shift;
 
+    #
+    # Children quit quietly on ALRM
+    #
+    exit(1) if ( $Pid != $$ && $signame eq "ALRM" );
+
+    #
+    # Ignore signals in children
+    #
+    return if ( $Pid != $$ );
+
     #
     # Note: needs to be tested for each kind of XferMethod
     #
     print(LOG $bpc->timeStamp, "cleaning up after signal $signame\n");
-    if ( @xferPid ) {
-        kill(2, @xferPid);
-	sleep(1);
-	kill(9, @xferPid);
-    }
-    if ( $tarPid > 0 ) {
-        kill(2, $tarPid);
-	sleep(1);
-	kill(9, $tarPid);
-    }
+    $SIG{$signame} = 'IGNORE';
+    $RestoreLOG->write(\"exiting after signal $signame\n");
     $stat{xferOK} = 0;
-    $stat{hostError} = "aborted by signal $signame";
+    if ( $signame eq "INT" ) {
+	$stat{hostError} = "aborted by user (signal=$signame)";
+    } else {
+	$stat{hostError} = "aborted by signal=$signame";
+    }
+    exit(RestoreCleanup($client));
 }
 
 #
@@ -502,7 +528,6 @@ sub RestoreCleanup
     #
     UserCommandRun("RestorePostUserCmd") if ( $NeedPostCmd );
 
-    $RestoreLOG->close() if ( defined($RestoreLOG) );
     rename("$Dir/RestoreLOG$fileExt", "$Dir/RestoreLOG.$lastNum$fileExt");
     rename("$Dir/$reqFileName", "$Dir/RestoreInfo.$lastNum");
     my $endTime = time();
@@ -523,8 +548,12 @@ sub RestoreCleanup
 	if ( $stat{hostAbort} && $stat{hostError} eq "" ) {
 	    $stat{hostError} = "lost network connection during restore";
 	}
+	$RestoreLOG->write(\"Restore failed: $stat{hostError}\n")
+					    if ( defined($RestoreLOG) );
     }
 
+    $RestoreLOG->close() if ( defined($RestoreLOG) );
+
     #
     # Add the new restore information to the restore file
     #
@@ -550,7 +579,7 @@ sub RestoreCleanup
     $bpc->RestoreInfoWrite($client, @Restores);
 
     if ( !$stat{xferOK} ) {
-	print(LOG $bpc->timeStamp, "Restore aborted ($stat{hostError})\n");
+	print(LOG $bpc->timeStamp, "Restore failed ($stat{hostError})\n");
 	print("restore failed: $stat{hostError}\n");
 	return 1;
     } else {
@@ -572,7 +601,7 @@ sub pidHandler
     my @pids = @xferPid;
     push(@pids, $tarPid) if ( $tarPid > 0 );
     my $str = join(",", @pids);
-    $XferLOG->write(\"Xfer PIDs are now $str\n") if ( defined($XferLOG) );
+    $RestoreLOG->write(\"Xfer PIDs are now $str\n") if ( defined($RestoreLOG) );
     print("xferPids $str\n");
 }
 
@@ -586,6 +615,7 @@ sub UserCommandRun
     return if ( !defined($Conf{$type}) );
     my $vars = {
         xfer         => $xfer,
+        client       => $client,
         host         => $host,
         hostIP       => $hostIP,
         share        => $RestoreReq{shareDest},
@@ -596,7 +626,8 @@ sub UserCommandRun
 	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},