* merged changes from Kamions upload (thanks!)

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

diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc
index 42777a8acc3491885ae360695008dd4ef6e35266..e395e6cc74f5c6741a4220cdbb19935e81d1457a 100644 (file)
--- a/apt-pkg/contrib/mmap.cc
+++ b/apt-pkg/contrib/mmap.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: mmap.cc,v 1.19 1999/08/30 04:20:26 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().
 /* ######################################################################
    
    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 <apt-pkg/mmap.h>
 #include <apt-pkg/error.h>
 

+#include <apti18n.h>
+

 #include <sys/mman.h>
 #include <sys/stat.h>
 #include <unistd.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)
       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)
    
    // 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;
 }
 
    return true;
 }


@@ -102,6 +104,7 @@ bool MMap::Close(bool DoSync)
       _error->Warning("Unable to munmap");
    
    iSize = 0;
       _error->Warning("Unable to munmap");
    
    iSize = 0;

+   Base = 0;

    return true;
 }
                                                                        /*}}}*/
    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)
 #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;
 }
 #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)
    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;
 }
 #endif   
    return true;
 }


@@ -150,9 +153,15 @@ DynamicMMap::DynamicMMap(FileFd &F,unsigned long Flags,unsigned long WorkSpace)
       return;
    
    unsigned long EndOfFile = Fd->Size();
       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;
 }
    Map(F);
    iSize = EndOfFile;
 }


@@ -167,6 +176,7 @@ DynamicMMap::DynamicMMap(unsigned long Flags,unsigned long WorkSpace) :
       return;
    
    Base = new unsigned char[WorkSpace];
       return;
    
    Base = new unsigned char[WorkSpace];

+   memset(Base,0,WorkSpace);

    iSize = 0;
 }
                                                                        /*}}}*/
    iSize = 0;
 }
                                                                        /*}}}*/


@@ -182,11 +192,9 @@ DynamicMMap::~DynamicMMap()
    }
    
    unsigned long EndOfFile = iSize;
    }
    
    unsigned long EndOfFile = iSize;

-   Sync();

    iSize = WorkSpace;
    Close(false);
    ftruncate(Fd->Fd(),EndOfFile);
    iSize = WorkSpace;
    Close(false);
    ftruncate(Fd->Fd(),EndOfFile);

-   Fd->Close();

 }  
                                                                        /*}}}*/
 // DynamicMMap::RawAllocate - Allocate a raw chunk of unaligned space  /*{{{*/
 }  
                                                                        /*}}}*/
 // DynamicMMap::RawAllocate - Allocate a raw chunk of unaligned space  /*{{{*/