* Changes in preparation for 3.2.0beta1...

[BackupPC.git] / lib / BackupPC / Xfer / Archive.pm

diff --git a/lib/BackupPC/Xfer/Archive.pm b/lib/BackupPC/Xfer/Archive.pm
index ba86fb3..d58d3b3 100644 (file)
--- a/lib/BackupPC/Xfer/Archive.pm
+++ b/lib/BackupPC/Xfer/Archive.pm
@@ -11,7 +11,7 @@
 #   Craig Barratt  <cbarratt@users.sourceforge.net>
 #
 # COPYRIGHT
-#   Copyright (C) 2001-2003  Craig Barratt
+#   Copyright (C) 2001-2009  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 2.1.0beta1, released 9 Apr 2004.
+# Version 3.2.0beta0, released 5 April 2009.
 #
 # See http://backuppc.sourceforge.net.
 #
@@ -38,40 +38,7 @@
 package BackupPC::Xfer::Archive;
 
 use strict;
-
-sub new
-{
-    my($class, $bpc, $args) = @_;
-
-    $args ||= {};
-    my $t = bless {
-        bpc       => $bpc,
-        conf      => { $bpc->Conf },
-        host      => "",
-        hostIP    => "",
-        shareName => "",
-        pipeRH    => undef,
-        pipeWH    => undef,
-        badFiles  => [],
-        %$args,
-    }, $class;
-
-    return $t;
-}
-
-sub args
-{
-    my($t, $args) = @_;
-
-    foreach my $arg ( keys(%$args) ) {
-       $t->{$arg} = $args->{$arg};
-    }
-}
-
-sub useArchive
-{
-    return 1;
-}
+use base qw(BackupPC::Xfer::Protocol);
 
 sub start
 {
@@ -115,11 +82,11 @@ sub run
                                                     $cmdargs);
         $t->{XferLOG}->write(\"Executing: @$archiveClientCmd2\n");
 
-        $bpc->cmdSystemOrEval($archiveClientCmd2,
+        $bpc->cmdSystemOrEvalLong($archiveClientCmd2,
             sub {
                 $errStr = $_[0];
                 $t->{XferLOG}->write(\$_[0]);
-            });
+            }, 0, $t->{pidHandler});
         if ( $? ) {
             ($t->{_errStr} = $errStr) =~ s/[\n\r]+//;
             return;
@@ -130,36 +97,4 @@ sub run
     return "Completed Archive";
 }
 
-sub errStr
-{
-    my($t) = @_;
-
-    return $t->{_errStr};
-}
-
-sub abort
-{
-}
-
-sub xferPid
-{
-    my($t) = @_;
-
-    return ($t->{xferPid});
-}
-
-sub logMsg
-{
-    my($t, $msg) = @_;
-
-    push(@{$t->{_logMsg}}, $msg);
-}
-
-sub logMsgGet
-{
-    my($t) = @_;
-
-    return shift(@{$t->{_logMsg}});
-}
-
 1;