* apt-pkg/deb/debsrcrecords.cc:

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

diff --git a/apt-pkg/contrib/md5.cc b/apt-pkg/contrib/md5.cc
index 11fe07e519290dfb087c235784c62d8517fd31a8..c0fa8493dff2e161099c57ad2ac7377a0006139f 100644 (file)
--- a/apt-pkg/contrib/md5.cc
+++ b/apt-pkg/contrib/md5.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: md5.cc,v 1.10 1999/11/16 03:10:56 jgg Exp $
+// $Id: md5.cc,v 1.12 2001/05/13 05:15:03 jgg Exp $

 /* ######################################################################
    
    MD5Sum - MD5 Message Digest Algorithm.
 /* ######################################################################
    
    MD5Sum - MD5 Message Digest Algorithm.


@@ -35,15 +35,11 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

-#ifdef __GNUG__
-#pragma implementation "apt-pkg/md5.h"
-#endif
-

 #include <apt-pkg/md5.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/md5.h>
 #include <apt-pkg/strutl.h>

+#include <apt-pkg/macros.h>

 
 #include <string.h>
 
 #include <string.h>

-#include <system.h>

 #include <unistd.h>
 #include <netinet/in.h>                          // For htonl
 #include <inttypes.h>
 #include <unistd.h>
 #include <netinet/in.h>                          // For htonl
 #include <inttypes.h>


@@ -191,7 +187,7 @@ MD5SumValue::MD5SumValue()
 /* Converts the hex string into a set of chars */
 bool MD5SumValue::Set(string Str)
 {
 /* Converts the hex string into a set of chars */
 bool MD5SumValue::Set(string Str)
 {

-   return Hex2Num(Str.begin(),Str.end(),Sum,sizeof(Sum));
+   return Hex2Num(Str,Sum,sizeof(Sum));

 }
                                                                        /*}}}*/
 // MD5SumValue::Value - Convert the number into a string               /*{{{*/
 }
                                                                        /*}}}*/
 // MD5SumValue::Value - Convert the number into a string               /*{{{*/


@@ -297,11 +293,16 @@ bool MD5Summation::AddFD(int Fd,unsigned long Size)
 {
    unsigned char Buf[64*64];
    int Res = 0;
 {
    unsigned char Buf[64*64];
    int Res = 0;

-   while (Size != 0)
+   int ToEOF = (Size == 0);
+   while (Size != 0 || ToEOF)

    {
    {

-      Res = read(Fd,Buf,MIN(Size,sizeof(Buf)));
-      if (Res < 0 || (unsigned)Res != MIN(Size,sizeof(Buf)))
-        return false;
+      unsigned n = sizeof(Buf);
+      if (!ToEOF) n = min(Size,(unsigned long)n);
+      Res = read(Fd,Buf,n);
+      if (Res < 0 || (!ToEOF && (unsigned) Res != n)) // error, or short read
+         return false;
+      if (ToEOF && Res == 0) // EOF
+         break;

       Size -= Res;
       Add(Buf,Res);
    }
       Size -= Res;
       Add(Buf,Res);
    }