Moved time handling, fixed makefiles

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

diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc
index 098c61ca6efe2bde9880537841673f1669171e95..230e133a55cbbb7c75d436e20ae45106147f302c 100644 (file)
--- a/apt-pkg/contrib/mmap.cc
+++ b/apt-pkg/contrib/mmap.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
-// $Id: mmap.cc,v 1.15 1999/04/18 06:36:36 jgg Exp $
+// $Id: mmap.cc,v 1.20 1999/10/02 04:14:54 jgg Exp $
 /* ######################################################################
    
    MMap Class - Provides 'real' mmap or a faked mmap using read().
@@ -117,7 +117,7 @@ bool MMap::Sync()
 #ifdef _POSIX_SYNCHRONIZED_IO   
    if ((Flags & ReadOnly) != ReadOnly)
       if (msync((char *)Base,iSize,MS_SYNC) != 0)
-        return _error->Error("msync","Unable to write mmap");
+        return _error->Errno("msync","Unable to write mmap");
 #endif   
    return true;
 }
@@ -134,7 +134,7 @@ bool MMap::Sync(unsigned long Start,unsigned long Stop)
    unsigned long PSize = sysconf(_SC_PAGESIZE);
    if ((Flags & ReadOnly) != ReadOnly)
       if (msync((char *)Base+(int)(Start/PSize)*PSize,Stop - Start,MS_SYNC) != 0)
-        return _error->Error("msync","Unable to write mmap");
+        return _error->Errno("msync","Unable to write mmap");
 #endif   
    return true;
 }
@@ -206,6 +206,7 @@ unsigned long DynamicMMap::RawAllocate(unsigned long Size,unsigned long Aln)
       _error->Error("Dynamic MMap ran out of room");
       return 0;
    }
+
    return Result;
 }
                                                                        /*}}}*/
@@ -250,7 +251,7 @@ unsigned long DynamicMMap::Allocate(unsigned long ItemSize)
 
    I->Count--;
    unsigned long Result = I->Start;
-   I->Start += ItemSize;
+   I->Start += ItemSize;  
    return Result/ItemSize;
 }
                                                                        /*}}}*/
@@ -262,13 +263,13 @@ unsigned long DynamicMMap::WriteString(const char *String,
 {
    unsigned long Result = iSize;
    // Just in case error check
-   if (Result > WorkSpace)
+   if (Result + Len > WorkSpace)
    {
       _error->Error("Dynamic MMap ran out of room");
       return 0;
    }   
    
-   if (Len == 0)
+   if (Len == (unsigned long)-1)
       Len = strlen(String);
    iSize += Len + 1;
    memcpy((char *)Base + Result,String,Len);