Merge remote-tracking branch 'mvo/bugfix/bts-712433' into debian/sid

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

diff --git a/apt-pkg/contrib/hashsum.cc b/apt-pkg/contrib/hashsum.cc
index 728747d7ab00ed47b44cc36706ae88daf549d994..289e43aa42ead780a8951d6346244a955a92e1b2 100644 (file)
--- a/apt-pkg/contrib/hashsum.cc
+++ b/apt-pkg/contrib/hashsum.cc
@@ -1,4 +1,5 @@
 // Cryptographic API Base
 // Cryptographic API Base

+#include <config.h>

 
 #include <unistd.h>
 #include "hashsum_template.h"
 
 #include <unistd.h>
 #include "hashsum_template.h"


@@ -6,16 +7,16 @@
 // Summation::AddFD - Add content of file into the checksum            /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // Summation::AddFD - Add content of file into the checksum            /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool SummationImplementation::AddFD(int const Fd, unsigned long Size) {
+bool SummationImplementation::AddFD(int const Fd, unsigned long long Size) {

    unsigned char Buf[64 * 64];
    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;


@@ -23,5 +24,27 @@ bool SummationImplementation::AddFD(int const Fd, unsigned long Size) {
       Add(Buf,Res);
    }
    return true;
       Add(Buf,Res);
    }
    return true;

+}
+bool SummationImplementation::AddFD(FileFd &Fd, unsigned long long Size) {
+   unsigned char Buf[64 * 64];
+   bool 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;
+      Add(Buf, a);
+   }
+   return true;

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