Merge branch 'debian/sid' into debian/experimental

[apt.git] / apt-pkg / contrib / hashes.cc

diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc
index 9c251e89fa9f31fcf79024482ba7e6493fb32b9b..e1a4318235a8291bf30248fefabd7c8763ab10e4 100644 (file)
--- a/apt-pkg/contrib/hashes.cc
+++ b/apt-pkg/contrib/hashes.cc
@@ -32,20 +32,20 @@ HashString::HashString()
 {
 }
 
 {
 }
 

-HashString::HashString(string Type, string Hash) : Type(Type), Hash(Hash)
+HashString::HashString(std::string Type, std::string Hash) : Type(Type), Hash(Hash)

 {
 }
 
 {
 }
 

-HashString::HashString(string StringedHash)                            /*{{{*/
+HashString::HashString(std::string StringedHash)                       /*{{{*/

 {
    // legacy: md5sum without "MD5Sum:" prefix
 {
    // legacy: md5sum without "MD5Sum:" prefix

-   if (StringedHash.find(":") == string::npos && StringedHash.size() == 32)
+   if (StringedHash.find(":") == std::string::npos && StringedHash.size() == 32)

    {
       Type = "MD5Sum";
       Hash = StringedHash;
       return;
    }
    {
       Type = "MD5Sum";
       Hash = StringedHash;
       return;
    }

-   string::size_type pos = StringedHash.find(":");
+   std::string::size_type pos = StringedHash.find(":");

    Type = StringedHash.substr(0,pos);
    Hash = StringedHash.substr(pos+1, StringedHash.size() - pos);
 
    Type = StringedHash.substr(0,pos);
    Hash = StringedHash.substr(pos+1, StringedHash.size() - pos);
 


@@ -53,34 +53,34 @@ HashString::HashString(string StringedHash)                         /*{{{*/
       std::clog << "HashString(string): " << Type << " : " << Hash << std::endl;
 }
                                                                        /*}}}*/
       std::clog << "HashString(string): " << Type << " : " << Hash << std::endl;
 }
                                                                        /*}}}*/

-bool HashString::VerifyFile(string filename) const                     /*{{{*/
+bool HashString::VerifyFile(std::string filename) const                        /*{{{*/

 {
 {

-   string fileHash;
+   std::string fileHash;

 
    FileFd Fd(filename, FileFd::ReadOnly);
    if(Type == "MD5Sum")
    {
       MD5Summation MD5;
 
    FileFd Fd(filename, FileFd::ReadOnly);
    if(Type == "MD5Sum")
    {
       MD5Summation MD5;

-      MD5.AddFD(Fd.Fd(), Fd.Size());
-      fileHash = (string)MD5.Result();
+      MD5.AddFD(Fd);
+      fileHash = (std::string)MD5.Result();

    }
    else if (Type == "SHA1")
    {
       SHA1Summation SHA1;
    }
    else if (Type == "SHA1")
    {
       SHA1Summation SHA1;

-      SHA1.AddFD(Fd.Fd(), Fd.Size());
-      fileHash = (string)SHA1.Result();
+      SHA1.AddFD(Fd);
+      fileHash = (std::string)SHA1.Result();

    }
    else if (Type == "SHA256")
    {
       SHA256Summation SHA256;
    }
    else if (Type == "SHA256")
    {
       SHA256Summation SHA256;

-      SHA256.AddFD(Fd.Fd(), Fd.Size());
-      fileHash = (string)SHA256.Result();
+      SHA256.AddFD(Fd);
+      fileHash = (std::string)SHA256.Result();

    }
    else if (Type == "SHA512")
    {
       SHA512Summation SHA512;
    }
    else if (Type == "SHA512")
    {
       SHA512Summation SHA512;

-      SHA512.AddFD(Fd.Fd(), Fd.Size());
-      fileHash = (string)SHA512.Result();
+      SHA512.AddFD(Fd);
+      fileHash = (std::string)SHA512.Result();

    }
    Fd.Close();
 
    }
    Fd.Close();
 


@@ -100,26 +100,26 @@ bool HashString::empty() const
    return (Type.empty() || Hash.empty());
 }
 
    return (Type.empty() || Hash.empty());
 }
 

-string HashString::toStr() const
+std::string HashString::toStr() const

 {
 {

-   return Type+string(":")+Hash;
+   return Type + std::string(":") + Hash;

 }
 
 // Hashes::AddFD - Add the contents of the FD                          /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 }
 
 // Hashes::AddFD - Add the contents of the FD                          /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool Hashes::AddFD(int const Fd,unsigned long Size, bool const addMD5,
+bool Hashes::AddFD(int const Fd,unsigned long long Size, bool const addMD5,

                   bool const addSHA1, bool const addSHA256, bool const addSHA512)
 {
    unsigned char Buf[64*64];
                   bool const addSHA1, bool const addSHA256, bool const addSHA512)
 {
    unsigned char Buf[64*64];

-   int Res = 0;
+   ssize_t Res = 0;

    int ToEOF = (Size == 0);
    while (Size != 0 || ToEOF)
    {
    int ToEOF = (Size == 0);
    while (Size != 0 || ToEOF)
    {

-      unsigned n = sizeof(Buf);
-      if (!ToEOF) n = min(Size,(unsigned long)n);
+      unsigned long long n = sizeof(Buf);
+      if (!ToEOF) n = std::min(Size, n);

       Res = read(Fd,Buf,n);
       Res = read(Fd,Buf,n);

-      if (Res < 0 || (!ToEOF && (unsigned) Res != n)) // error, or short read
+      if (Res < 0 || (!ToEOF && Res != (ssize_t) n)) // error, or short read

         return false;
       if (ToEOF && Res == 0) // EOF
         break;
         return false;
       if (ToEOF && Res == 0) // EOF
         break;


@@ -134,6 +134,36 @@ bool Hashes::AddFD(int const Fd,unsigned long Size, bool const addMD5,
         SHA512.Add(Buf,Res);
    }
    return true;
         SHA512.Add(Buf,Res);
    }
    return true;

+}
+bool Hashes::AddFD(FileFd &Fd,unsigned long long Size, bool const addMD5,
+                  bool const addSHA1, bool const addSHA256, bool const addSHA512)
+{
+   unsigned char Buf[64*64];
+   bool const ToEOF = (Size == 0);
+   while (Size != 0 || ToEOF)
+   {
+      unsigned long long n = sizeof(Buf);
+      if (!ToEOF) n = std::min(Size, n);
+      unsigned long long a = 0;
+      if (Fd.Read(Buf, n, &a) == false) // error
+        return false;
+      if (ToEOF == false)
+      {
+        if (a != n) // short read
+           return false;
+      }
+      else if (a == 0) // EOF
+        break;
+      Size -= a;
+      if (addMD5 == true)
+        MD5.Add(Buf, a);
+      if (addSHA1 == true)
+        SHA1.Add(Buf, a);
+      if (addSHA256 == true)
+        SHA256.Add(Buf, a);
+      if (addSHA512 == true)
+        SHA512.Add(Buf, a);
+   }
+   return true;

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/

-