Fixed or handling bug

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

diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc
index 0e8c6bdd0641468368a5ad9d1dfab3680bc19b54..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.12 1999/03/18 03:20:24 doogie 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().
@@ -38,11 +38,19 @@
 // MMap::MMap - Constructor                                            /*{{{*/
 // ---------------------------------------------------------------------
 /* */
-MMap::MMap(FileFd &F,unsigned long Flags) : Fd(F), Flags(Flags), iSize(0),
+MMap::MMap(FileFd &F,unsigned long Flags) : Flags(Flags), iSize(0),
                      Base(0)
 {
    if ((Flags & NoImmMap) != NoImmMap)
-      Map();
+      Map(F);
+}
+                                                                       /*}}}*/
+// MMap::MMap - Constructor                                            /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+MMap::MMap(unsigned long Flags) : Flags(Flags), iSize(0),
+                     Base(0)
+{
 }
                                                                        /*}}}*/
 // MMap::~MMap - Destructor                                            /*{{{*/
@@ -50,13 +58,13 @@ MMap::MMap(FileFd &F,unsigned long Flags) : Fd(F), Flags(Flags), iSize(0),
 /* */
 MMap::~MMap()
 {
-   Close(true);
+   Close();
 }
                                                                        /*}}}*/
 // MMap::Map - Perform the mapping                                     /*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool MMap::Map()
+bool MMap::Map(FileFd &Fd)
 {
    iSize = Fd.Size();
    
@@ -82,11 +90,11 @@ bool MMap::Map()
 // MMap::Close - Close the map                                         /*{{{*/
 // ---------------------------------------------------------------------
 /* */
-bool MMap::Close(bool DoClose, bool DoSync)
+bool MMap::Close(bool DoSync)
 {
-   if (Fd.IsOpen() == false)
+   if ((Flags & UnMapped) == UnMapped || Base == 0 || iSize == 0)
       return true;
-
+   
    if (DoSync == true)
       Sync();
    
@@ -94,8 +102,6 @@ bool MMap::Close(bool DoClose, bool DoSync)
       _error->Warning("Unable to munmap");
    
    iSize = 0;
-   if (DoClose == true)
-      Fd.Close();
    return true;
 }
                                                                        /*}}}*/
@@ -105,10 +111,13 @@ bool MMap::Close(bool DoClose, bool DoSync)
    not return till all IO is complete */
 bool MMap::Sync()
 {   
+   if ((Flags & UnMapped) == UnMapped)
+      return true;
+   
 #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;
 }
@@ -118,12 +127,14 @@ bool MMap::Sync()
 /* */
 bool MMap::Sync(unsigned long Start,unsigned long Stop)
 {
-       static int PAGE_SIZE = getpagesize();
-
-#ifdef _POSIX_SYNCHRONIZED_IO   
+   if ((Flags & UnMapped) == UnMapped)
+      return true;
+   
+#ifdef _POSIX_SYNCHRONIZED_IO
+   unsigned long PSize = sysconf(_SC_PAGESIZE);
    if ((Flags & ReadOnly) != ReadOnly)
-      if (msync((char *)Base+(int)(Start/PAGE_SIZE)*PAGE_SIZE,Stop - Start,MS_SYNC) != 0)
-        return _error->Error("msync","Unable to write mmap");
+      if (msync((char *)Base+(int)(Start/PSize)*PSize,Stop - Start,MS_SYNC) != 0)
+        return _error->Errno("msync","Unable to write mmap");
 #endif   
    return true;
 }
@@ -133,30 +144,49 @@ bool MMap::Sync(unsigned long Start,unsigned long Stop)
 // ---------------------------------------------------------------------
 /* */
 DynamicMMap::DynamicMMap(FileFd &F,unsigned long Flags,unsigned long WorkSpace) : 
-             MMap(F,Flags | NoImmMap), WorkSpace(WorkSpace)
+             MMap(F,Flags | NoImmMap), Fd(&F), WorkSpace(WorkSpace)
 {
    if (_error->PendingError() == true)
       return;
    
-   unsigned long EndOfFile = Fd.Size();
-   Fd.Seek(WorkSpace);
+   unsigned long EndOfFile = Fd->Size();
+   Fd->Seek(WorkSpace);
    char C = 0;
-   Fd.Write(&C,sizeof(C));
-   Map();
+   Fd->Write(&C,sizeof(C));
+   Map(F);
    iSize = EndOfFile;
 }
                                                                        /*}}}*/
+// DynamicMMap::DynamicMMap - Constructor for a non-file backed map    /*{{{*/
+// ---------------------------------------------------------------------
+/* This is just a fancy malloc really.. */
+DynamicMMap::DynamicMMap(unsigned long Flags,unsigned long WorkSpace) :
+             MMap(Flags | NoImmMap | UnMapped), Fd(0), WorkSpace(WorkSpace)
+{
+   if (_error->PendingError() == true)
+      return;
+   
+   Base = new unsigned char[WorkSpace];
+   iSize = 0;
+}
+                                                                       /*}}}*/
 // DynamicMMap::~DynamicMMap - Destructor                              /*{{{*/
 // ---------------------------------------------------------------------
 /* We truncate the file to the size of the memory data set */
 DynamicMMap::~DynamicMMap()
 {
+   if (Fd == 0)
+   {
+      delete [] (unsigned char *)Base;
+      return;
+   }
+   
    unsigned long EndOfFile = iSize;
    Sync();
    iSize = WorkSpace;
-   Close(false,false);
-   ftruncate(Fd.Fd(),EndOfFile);
-   Fd.Close();
+   Close(false);
+   ftruncate(Fd->Fd(),EndOfFile);
+   Fd->Close();
 }  
                                                                        /*}}}*/
 // DynamicMMap::RawAllocate - Allocate a raw chunk of unaligned space  /*{{{*/
@@ -176,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;
 }
                                                                        /*}}}*/
@@ -220,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;
 }
                                                                        /*}}}*/
@@ -232,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);