X-Git-Url: http://git.rot13.org/?p=BackupPC.git;a=blobdiff_plain;f=lib%2FBackupPC%2FXfer%2FTar.pm;h=8c05492727411ac195e3f9ef8422e409318c68c9;hp=6d313d4699aa579f17f06d96e6e5e5bc7f21359e;hb=2460880d23902e74d5d8541f9c2fbb9538eaf4cb;hpb=1ce7d1541ea1279aaa0a75c16986a3fd40b608ec

diff --git a/lib/BackupPC/Xfer/Tar.pm b/lib/BackupPC/Xfer/Tar.pm
index 6d313d4..8c05492 100644
--- a/lib/BackupPC/Xfer/Tar.pm
+++ b/lib/BackupPC/Xfer/Tar.pm
@@ -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,7 +29,7 @@
 #
 #========================================================================
 #
-# Version 1.5.0, released 2 Aug 2002.
+# Version 2.1.0_CVS, released 8 Feb 2004.
 #
 # See http://backuppc.sourceforge.net.
 #
@@ -43,6 +43,7 @@ sub new
 {
     my($class, $bpc, $args) = @_;
 
+    $args ||= {};
     my $t = bless {
         bpc       => $bpc,
         conf      => { $bpc->Conf },
@@ -58,16 +59,30 @@ sub new
     return $t;
 }
 
+sub args
+{
+    my($t, $args) = @_;
+
+    foreach my $arg ( keys(%$args) ) {
+	$t->{$arg} = $args->{$arg};
+    }
+}
+
+sub useTar
+{
+    return 1;
+}
+
 sub start
 {
     my($t) = @_;
     my $bpc = $t->{bpc};
     my $conf = $t->{conf};
-    my(@fileList, @tarClientCmd, $logMsg, $incrDate);
+    my(@fileList, $tarClientCmd, $logMsg, $incrDate);
     local(*TAR);
 
     if ( $t->{type} eq "restore" ) {
-        push(@tarClientCmd, split(/ +/, $conf->{TarClientRestoreCmd}));
+	$tarClientCmd = $conf->{TarClientRestoreCmd};
         $logMsg = "restore started below directory $t->{shareName}";
 	#
 	# restores are considered to work unless we see they fail
@@ -110,52 +125,37 @@ sub start
         } else {
 	    push(@fileList, ".");
         }
+	if ( ref($conf->{TarClientCmd}) eq "ARRAY" ) {
+	    $tarClientCmd = $conf->{TarClientCmd};
+	} else {
+	    $tarClientCmd = [split(/ +/, $conf->{TarClientCmd})];
+	}
+	my $args;
         if ( $t->{type} eq "full" ) {
-	    push(@tarClientCmd,
-		    split(/ +/, $conf->{TarClientCmd}),
-		    split(/ +/, $conf->{TarFullArgs})
-	    );
+	    $args = $conf->{TarFullArgs};
             $logMsg = "full backup started for directory $t->{shareName}";
         } else {
-            $incrDate = $bpc->timeStampISO($t->{lastFull} - 3600, 1);
-	    push(@tarClientCmd,
-		    split(/ +/, $conf->{TarClientCmd}),
-		    split(/ +/, $conf->{TarIncrArgs})
-	    );
+            $incrDate = $bpc->timeStamp($t->{lastFull} - 3600, 1);
+	    $args = $conf->{TarIncrArgs};
             $logMsg = "incr backup started back to $incrDate for directory"
                     . " $t->{shareName}";
         }
+	push(@$tarClientCmd, split(/ +/, $args));
     }
     #
     # Merge variables into @tarClientCmd
     #
-    my $vars = {
+    my $args = {
         host      => $t->{host},
         hostIP    => $t->{hostIP},
+        client    => $t->{client},
         incrDate  => $incrDate,
         shareName => $t->{shareName},
+	fileList  => \@fileList,
         tarPath   => $conf->{TarClientPath},
         sshPath   => $conf->{SshPath},
     };
-    my @cmd = @tarClientCmd;
-    @tarClientCmd = ();
-    foreach my $arg ( @cmd ) {
-	next if ( $arg =~ /^\s*$/ );
-	if ( $arg =~ /^\$fileList(\+?)/ ) {
-	    my $esc = $1 eq "+";
-	    foreach $arg ( @fileList ) {
-		$arg = $bpc->shellEscape($arg) if ( $esc );
-		push(@tarClientCmd, $arg);
-	    }
-	} else {
-	    $arg =~ s{\$(\w+)(\+?)}{
-		defined($vars->{$1})
-		    ? ($2 eq "+" ? $bpc->shellEscape($vars->{$1}) : $vars->{$1})
-		    : "\$$1"
-	    }eg;
-	    push(@tarClientCmd, $arg);
-	}
-    }
+    $tarClientCmd = $bpc->cmdVarSubstitute($tarClientCmd, $args);
     if ( !defined($t->{xferPid} = open(TAR, "-|")) ) {
         $t->{_errStr} = "Can't fork to run tar";
         return;
@@ -189,13 +189,15 @@ sub start
         #
         # Run the tar command
         #
-        exec(@tarClientCmd);
+	alarm(0);
+	$bpc->cmdExecOrEval($tarClientCmd, $args);
         # should not be reached, but just in case...
-        $t->{_errStr} = "Can't exec @tarClientCmd";
+        $t->{_errStr} = "Can't exec @$tarClientCmd";
         return;
     }
-    $t->{XferLOG}->write(\"Running: @tarClientCmd\n");
-    alarm($conf->{SmbClientTimeout});
+    my $str = "Running: " . $bpc->execCmd2ShellCmd(@$tarClientCmd) . "\n";
+    $t->{XferLOG}->write(\"Running: @$tarClientCmd\n");
+    alarm($conf->{ClientTimeout});
     $t->{_errStr} = undef;
     return $logMsg;
 }
@@ -220,17 +222,19 @@ sub readOutput
     while ( $t->{tarOut} =~ /(.*?)[\n\r]+(.*)/s ) {
         $_ = $1;
         $t->{tarOut} = $2;
-        $t->{XferLOG}->write(\"$_\n");
         #
         # refresh our inactivity alarm
         #
-        alarm($conf->{SmbClientTimeout});
+        alarm($conf->{ClientTimeout}) if ( !$t->{abort} );
         $t->{lastOutputLine} = $_ if ( !/^$/ );
         if ( /^Total bytes written: / ) {
+            $t->{XferLOG}->write(\"$_\n") if ( $t->{logLevel} >= 1 );
             $t->{xferOK} = 1;
         } elsif ( /^\./ ) {
+            $t->{XferLOG}->write(\"$_\n") if ( $t->{logLevel} >= 2 );
             $t->{fileCnt}++;
         } else {
+            $t->{XferLOG}->write(\"$_\n") if ( $t->{logLevel} >= 0 );
             $t->{xferErrCnt}++;
 	    #
 	    # If tar encounters a minor error, it will exit with a non-zero
@@ -239,11 +243,34 @@ sub readOutput
 	    #
 	    $t->{tarBadExitOk} = 1
 		    if ( $t->{xferOK} && /Error exit delayed from previous / );
+            #
+            # Also remember files that had read errors
+            #
+            if ( /: \.\/(.*): Read error at byte / ) {
+                my $badFile = $1;
+                push(@{$t->{badFiles}}, {
+                        share => $t->{shareName},
+                        file  => $badFile
+                    });
+            }
+
 	}
     }
     return 1;
 }
 
+sub abort
+{
+    my($t, $reason) = @_;
+    my @xferPid = $t->xferPid;
+
+    $t->{abort} = 1;
+    $t->{abortReason} = $reason;
+    if ( @xferPid ) {
+	kill($t->{bpc}->sigName2num("INT"), @xferPid);
+    }
+}
+
 sub setSelectMask
 {
     my($t, $FDreadRef) = @_;
@@ -262,7 +289,7 @@ sub xferPid
 {
     my($t) = @_;
 
-    return $t->{xferPid};
+    return ($t->{xferPid});
 }
 
 sub logMsg