* apt-inst/deb/debfile.h:

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

diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc
index 1fb84b0af5333e028ca768121b5a3772e0a0c35f..160718ea5ae503caf1848afd63514fbeae0d9a4d 100644 (file)
--- a/apt-pkg/contrib/mmap.cc
+++ b/apt-pkg/contrib/mmap.cc
@@ -66,7 +66,7 @@ MMap::~MMap()
 bool MMap::Map(FileFd &Fd)
 {
    iSize = Fd.Size();
 bool MMap::Map(FileFd &Fd)
 {
    iSize = Fd.Size();

-   
+

    // Set the permissions.
    int Prot = PROT_READ;
    int Map = MAP_SHARED;
    // Set the permissions.
    int Prot = PROT_READ;
    int Map = MAP_SHARED;


@@ -85,7 +85,7 @@ bool MMap::Map(FileFd &Fd)
         return _error->Error("Compressed file %s can only be mapped readonly", Fd.Name().c_str());
       Base = new unsigned char[iSize];
       if (Fd.Seek(0L) == false || Fd.Read(Base, iSize) == false)
         return _error->Error("Compressed file %s can only be mapped readonly", Fd.Name().c_str());
       Base = new unsigned char[iSize];
       if (Fd.Seek(0L) == false || Fd.Read(Base, iSize) == false)

-        return false;
+        return _error->Error("Compressed file %s can't be read into mmap", Fd.Name().c_str());

       return true;
    }
 
       return true;
    }
 


@@ -97,6 +97,13 @@ bool MMap::Map(FileFd &Fd)
       {
         // The filesystem doesn't support this particular kind of mmap.
         // So we allocate a buffer and read the whole file into it.
       {
         // The filesystem doesn't support this particular kind of mmap.
         // So we allocate a buffer and read the whole file into it.

+        if ((Flags & ReadOnly) == ReadOnly)
+        {
+           // for readonly, we don't need sync, so make it simple
+           Base = new unsigned char[iSize];
+           return Fd.Read(Base, iSize);
+        }
+        // FIXME: Writing to compressed fd's ?

         int const dupped_fd = dup(Fd.Fd());
         if (dupped_fd == -1)
            return _error->Errno("mmap", _("Couldn't duplicate file descriptor %i"), Fd.Fd());
         int const dupped_fd = dup(Fd.Fd());
         if (dupped_fd == -1)
            return _error->Errno("mmap", _("Couldn't duplicate file descriptor %i"), Fd.Fd());