X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/2d11135a1b8e8ee0a21c7932d7ce08a89b354784..8953292ef197b80c16d08b31830945fb7ac9ff8d:/apt-pkg/contrib/mmap.cc

diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc
index 098c61ca6..e395e6cc7 100644
--- 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.22 2001/05/27 05:19:30 jgg Exp $
 /* ######################################################################
    
    MMap Class - Provides 'real' mmap or a faked mmap using read().
@@ -29,6 +29,8 @@
 #include <apt-pkg/mmap.h>
 #include <apt-pkg/error.h>
 
+#include <apti18n.h>
+
 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -77,12 +79,12 @@ bool MMap::Map(FileFd &Fd)
       Map = MAP_PRIVATE;
    
    if (iSize == 0)
-      return _error->Error("Can't mmap an empty file");
+      return _error->Error(_("Can't mmap an empty file"));
    
    // Map it.
    Base = mmap(0,iSize,Prot,Map,Fd.Fd(),0);
    if (Base == (void *)-1)
-      return _error->Errno("mmap","Couldn't make mmap of %u bytes",iSize);
+      return _error->Errno("mmap",_("Couldn't make mmap of %lu bytes"),iSize);
 
    return true;
 }
@@ -102,6 +104,7 @@ bool MMap::Close(bool DoSync)
       _error->Warning("Unable to munmap");
    
    iSize = 0;
+   Base = 0;
    return true;
 }
 									/*}}}*/
@@ -117,7 +120,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 +137,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;
 }
@@ -150,9 +153,15 @@ DynamicMMap::DynamicMMap(FileFd &F,unsigned long Flags,unsigned long WorkSpace)
       return;
    
    unsigned long EndOfFile = Fd->Size();
-   Fd->Seek(WorkSpace);
-   char C = 0;
-   Fd->Write(&C,sizeof(C));
+   if (EndOfFile > WorkSpace)
+      WorkSpace = EndOfFile;
+   else if(WorkSpace > 0)
+   {
+      Fd->Seek(WorkSpace - 1);
+      char C = 0;
+      Fd->Write(&C,sizeof(C));
+   }
+   
    Map(F);
    iSize = EndOfFile;
 }
@@ -167,6 +176,7 @@ DynamicMMap::DynamicMMap(unsigned long Flags,unsigned long WorkSpace) :
       return;
    
    Base = new unsigned char[WorkSpace];
+   memset(Base,0,WorkSpace);
    iSize = 0;
 }
 									/*}}}*/
@@ -182,11 +192,9 @@ DynamicMMap::~DynamicMMap()
    }
    
    unsigned long EndOfFile = iSize;
-   Sync();
    iSize = WorkSpace;
    Close(false);
    ftruncate(Fd->Fd(),EndOfFile);
-   Fd->Close();
 }  
 									/*}}}*/
 // DynamicMMap::RawAllocate - Allocate a raw chunk of unaligned space	/*{{{*/
@@ -206,6 +214,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 +259,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 +271,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);