Print out a message when doing regexing, change regex c...

[apt.git] / methods / rsh.cc

diff --git a/methods/rsh.cc b/methods/rsh.cc
index 9e521edec7998d12f4bc9075f1cadc4129b5f6e7..619cd95084a4d8417d3979e016ad062a60e73368 100644 (file)
--- a/methods/rsh.cc
+++ b/methods/rsh.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: rsh.cc,v 1.2 2001/02/20 07:03:18 jgg Exp $
+// $Id: rsh.cc,v 1.4 2001/03/13 06:51:46 jgg Exp $

 /* ######################################################################
 
    RSH method - Transfer files via rsh compatible program
 /* ######################################################################
 
    RSH method - Transfer files via rsh compatible program


@@ -271,7 +271,7 @@ bool RSHConn::ModTime(const char *Path, time_t &Time)
 // ---------------------------------------------------------------------
 /* */
 bool RSHConn::Get(const char *Path,FileFd &To,unsigned long Resume,
 // ---------------------------------------------------------------------
 /* */
 bool RSHConn::Get(const char *Path,FileFd &To,unsigned long Resume,

-                  MD5Summation &MD5,bool &Missing, unsigned long Size)
+                  Hashes &Hash,bool &Missing, unsigned long Size)

 {
    Missing = false;
 
 {
    Missing = false;
 


@@ -284,7 +284,7 @@ bool RSHConn::Get(const char *Path,FileFd &To,unsigned long Resume,
       return false;
 
    if (Resume != 0) {
       return false;
 
    if (Resume != 0) {

-      if (MD5.AddFD(To.Fd(),Resume) == false) {
+      if (Hash.AddFD(To.Fd(),Resume) == false) {

         _error->Errno("read","Problem hashing file");
         return false;
       }
         _error->Errno("read","Problem hashing file");
         return false;
       }


@@ -323,7 +323,7 @@ bool RSHConn::Get(const char *Path,FileFd &To,unsigned long Resume,
       }
       MyLen += Res;
 
       }
       MyLen += Res;
 

-      MD5.Add(Buffer,Res);
+      Hash.Add(Buffer,Res);

       if (To.Write(Buffer,Res) == false)
       {
          Close();
       if (To.Write(Buffer,Res) == false)
       {
          Close();


@@ -428,7 +428,7 @@ bool RSHMethod::Fetch(FetchItem *Itm)
    }
 
    // Open the file
    }
 
    // Open the file

-   MD5Summation MD5;
+   Hashes Hash;

    {
       FileFd Fd(Itm->DestFile,FileFd::WriteAny);
       if (_error->PendingError() == true)
    {
       FileFd Fd(Itm->DestFile,FileFd::WriteAny);
       if (_error->PendingError() == true)


@@ -441,7 +441,7 @@ bool RSHMethod::Fetch(FetchItem *Itm)
       FailFd = Fd.Fd();
 
       bool Missing;
       FailFd = Fd.Fd();
 
       bool Missing;

-      if (Server->Get(File,Fd,Res.ResumePoint,MD5,Missing,Res.Size) == false)
+      if (Server->Get(File,Fd,Res.ResumePoint,Hash,Missing,Res.Size) == false)

       {
         Fd.Close();
 
       {
         Fd.Close();
 


@@ -462,7 +462,7 @@ bool RSHMethod::Fetch(FetchItem *Itm)
    }
 
    Res.LastModified = FailTime;
    }
 
    Res.LastModified = FailTime;

-   Res.MD5Sum = MD5.Result();
+   Res.TakeHashes(Hash);

 
    // Timestamp
    struct utimbuf UBuf;
 
    // Timestamp
    struct utimbuf UBuf;