* debian/apt.cron.daily:

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

diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc
index cfe47676356a789fc075a4d0f0759c16ae33f95a..04a45811b63351a5fe00d4d7cd1466fcc88e65de 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.21 2001/02/20 07:03:17 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().


@@ -21,10 +21,6 @@
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
    ##################################################################### */
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/

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

 #define _BSD_SOURCE
 #include <apt-pkg/mmap.h>
 #include <apt-pkg/error.h>
 #define _BSD_SOURCE
 #include <apt-pkg/mmap.h>
 #include <apt-pkg/error.h>


@@ -35,6 +31,8 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>

+
+#include <cstring>

                                                                        /*}}}*/
 
 // MMap::MMap - Constructor                                            /*{{{*/
                                                                        /*}}}*/
 
 // MMap::MMap - Constructor                                            /*{{{*/


@@ -119,7 +117,7 @@ bool MMap::Sync()
    
 #ifdef _POSIX_SYNCHRONIZED_IO   
    if ((Flags & ReadOnly) != ReadOnly)
    
 #ifdef _POSIX_SYNCHRONIZED_IO   
    if ((Flags & ReadOnly) != ReadOnly)

-      if (msync((char *)Base,iSize,MS_SYNC) != 0)
+      if (msync((char *)Base,iSize,MS_SYNC) < 0)

         return _error->Errno("msync","Unable to write mmap");
 #endif   
    return true;
         return _error->Errno("msync","Unable to write mmap");
 #endif   
    return true;


@@ -136,7 +134,7 @@ bool MMap::Sync(unsigned long Start,unsigned long Stop)
 #ifdef _POSIX_SYNCHRONIZED_IO
    unsigned long PSize = sysconf(_SC_PAGESIZE);
    if ((Flags & ReadOnly) != ReadOnly)
 #ifdef _POSIX_SYNCHRONIZED_IO
    unsigned long PSize = sysconf(_SC_PAGESIZE);
    if ((Flags & ReadOnly) != ReadOnly)

-      if (msync((char *)Base+(int)(Start/PSize)*PSize,Stop - Start,MS_SYNC) != 0)
+      if (msync((char *)Base+(int)(Start/PSize)*PSize,Stop - Start,MS_SYNC) < 0)

         return _error->Errno("msync","Unable to write mmap");
 #endif   
    return true;
         return _error->Errno("msync","Unable to write mmap");
 #endif   
    return true;


@@ -155,9 +153,9 @@ DynamicMMap::DynamicMMap(FileFd &F,unsigned long Flags,unsigned long WorkSpace)
    unsigned long EndOfFile = Fd->Size();
    if (EndOfFile > WorkSpace)
       WorkSpace = EndOfFile;
    unsigned long EndOfFile = Fd->Size();
    if (EndOfFile > WorkSpace)
       WorkSpace = EndOfFile;

-   else
+   else if(WorkSpace > 0)

    {
    {

-      Fd->Seek(WorkSpace);
+      Fd->Seek(WorkSpace - 1);

       char C = 0;
       Fd->Write(&C,sizeof(C));
    }
       char C = 0;
       Fd->Write(&C,sizeof(C));
    }


@@ -176,6 +174,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;
 }
                                                                        /*}}}*/


@@ -193,7 +192,8 @@ DynamicMMap::~DynamicMMap()
    unsigned long EndOfFile = iSize;
    iSize = WorkSpace;
    Close(false);
    unsigned long EndOfFile = iSize;
    iSize = WorkSpace;
    Close(false);

-   ftruncate(Fd->Fd(),EndOfFile);
+   if(ftruncate(Fd->Fd(),EndOfFile) < 0)
+      _error->Errno("ftruncate", _("Failed to truncate file"));

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


@@ -210,7 +210,8 @@ unsigned long DynamicMMap::RawAllocate(unsigned long Size,unsigned long Aln)
    // Just in case error check
    if (Result + Size > WorkSpace)
    {
    // Just in case error check
    if (Result + Size > WorkSpace)
    {

-      _error->Error("Dynamic MMap ran out of room");
+         _error->Error(_("Dynamic MMap ran out of room. Please increase the size "
+                                 "of APT::Cache-Limit. Current value: %lu. (man 5 apt.conf)"), WorkSpace);

       return 0;
    }
 
       return 0;
    }
 


@@ -272,7 +273,8 @@ unsigned long DynamicMMap::WriteString(const char *String,
    // Just in case error check
    if (Result + Len > WorkSpace)
    {
    // Just in case error check
    if (Result + Len > WorkSpace)
    {

-      _error->Error("Dynamic MMap ran out of room");
+         _error->Error(_("Dynamic MMap ran out of room. Please increase the size "
+                                 "of APT::Cache-Limit. Current value: %lu. (man 5 apt.conf)"), WorkSpace);

       return 0;
    }   
    
       return 0;
    }