Imported Upstream version 3.2.0

[debian/amanda] / server-src / amrestore.pl

diff --git a/server-src/amrestore.pl b/server-src/amrestore.pl
index c2ec9d441bfaefcafedded12accb2554755f5964..6114336f163f9d59837bda5527d630cb8cb36a53 100644 (file)
--- a/server-src/amrestore.pl
+++ b/server-src/amrestore.pl
@@ -286,11 +286,11 @@ sub main {
            if ($hdr->{'srv_encrypt'}) {
                push @filters,
                    Amanda::Xfer::Filter::Process->new(
-                       [ $hdr->{'srv_encrypt'}, $hdr->{'srv_decrypt_opt'} ], 0);
+                       [ $hdr->{'srv_encrypt'}, $hdr->{'srv_decrypt_opt'} ], 0, 0);
            } elsif ($hdr->{'clnt_encrypt'}) {
                push @filters,
                    Amanda::Xfer::Filter::Process->new(
-                       [ $hdr->{'clnt_encrypt'}, $hdr->{'clnt_decrypt_opt'} ], 0);
+                       [ $hdr->{'clnt_encrypt'}, $hdr->{'clnt_decrypt_opt'} ], 0, 0);
            } else {
                return failure("could not decrypt encrypted dump: no program specified",
                            $finished_cb);
@@ -310,17 +310,17 @@ sub main {
                # TODO: this assumes that srvcompprog takes "-d" to decompress
                push @filters,
                    Amanda::Xfer::Filter::Process->new(
-                       [ $hdr->{'srvcompprog'}, "-d" ], 0);
+                       [ $hdr->{'srvcompprog'}, "-d" ], 0, 0);
            } elsif ($hdr->{'clntcompprog'}) {
                # TODO: this assumes that clntcompprog takes "-d" to decompress
                push @filters,
                    Amanda::Xfer::Filter::Process->new(
-                       [ $hdr->{'clntcompprog'}, "-d" ], 0);
+                       [ $hdr->{'clntcompprog'}, "-d" ], 0, 0);
            } else {
                push @filters,
                    Amanda::Xfer::Filter::Process->new(
                        [ $Amanda::Constants::UNCOMPRESS_PATH,
-                         $Amanda::Constants::UNCOMPRESS_OPT ], 0);
+                         $Amanda::Constants::UNCOMPRESS_OPT ], 0, 0);
            }
            
            # adjust the header
@@ -335,7 +335,7 @@ sub main {
            @filters = (
                Amanda::Xfer::Filter::Process->new(
                    [ $Amanda::Constants::COMPRESS_PATH,
-                     $compress_opt ], 0),
+                     $compress_opt ], 0, 0),
            );
            
            # adjust the header
@@ -348,7 +348,7 @@ sub main {
        # write the header to the destination if requested
        if ($opt_header) {
            $hdr->{'blocksize'} = Amanda::Holding::DISK_BLOCK_BYTES;
-           print $dest_fh $hdr->to_string(32768, 32768);
+           $dest_fh->syswrite($hdr->to_string(32768, 32768));
        }
        
        my $xfer = Amanda::Xfer->new([ $src, @filters, $dest ]);