* methods/rred.cc:

  - operate optional on gzip compressed pdiffs
* apt-pkg/acquire-item.cc:
  - don't uncompress downloaded pdiff files before feeding it to rred

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index 2c4ce91a01496bde3cd24e66982995ffd8d71d3a..d4e90b552b352bac397151326f69cdc5bd092392 100644 (file)
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -570,24 +570,7 @@ void pkgAcqIndexDiffs::Done(string Message,unsigned long Size,string Md5Hash,      /*
    FinalFile = _config->FindDir("Dir::State::lists")+URItoFileName(RealURI);
 
    // sucess in downloading a diff, enter ApplyDiff state
-   if(State == StateFetchDiff) 
-   {
-
-      if(Debug)
-        std::clog << "Sending to gzip method: " << FinalFile << std::endl;
-
-      string FileName = LookupTag(Message,"Filename");
-      State = StateUnzipDiff;
-      Local = true;
-      Desc.URI = "gzip:" + FileName;
-      DestFile += ".decomp";
-      QueueURI(Desc);
-      Mode = "gzip";
-      return;
-   } 
-
-   // sucess in downloading a diff, enter ApplyDiff state
-   if(State == StateUnzipDiff) 
+   if(State == StateFetchDiff)
    {
 
       // rred excepts the patch as $FinalFile.ed

diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index 943c61876c6e6a8938bc7289a68bf9828f065f21..d97a96a0f3fea0c1d6bbbe0a3b6bff6604ab17fd 100644 (file)
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -449,7 +449,7 @@ class pkgAcqIndexDiffs : public pkgAcquire::Item
         StateFetchDiff,
         
         /** \brief The diff is currently being uncompressed. */
-        StateUnzipDiff,
+        StateUnzipDiff, // FIXME: No longer used
 
         /** \brief The diff is currently being applied. */
         StateApplyDiff

diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index 146d917d89113facaf15a9a80384d38d1f2b6935..cde288ad20e7787dc2993a07844f42a5d918fd92 100644 (file)
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -72,6 +72,7 @@ class FileFd
    // Simple manipulators
    inline int Fd() {return iFd;};
    inline void Fd(int fd) {iFd = fd;};
+   inline gzFile gzFd() {return gz;};
    inline bool IsOpen() {return iFd >= 0;};
    inline bool Failed() {return (Flags & Fail) == Fail;};
    inline void EraseOnFailure() {Flags |= DelOnFail;};

diff --git a/debian/changelog b/debian/changelog
index 11768794d6cd19a6b25ae521eafcfb3ef3049372..5c8adb4343df3b0d6ec1f50d5d77f40a58f123e5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -49,8 +49,12 @@ apt (0.8.11+wheezy) unstable; urgency=low
     - remove as it is not needed for a working 'bzr bd'
   * debian/{apt,apt-utils}.symbols:
     - ship experimental unmangled c++ symbol files
+  * methods/rred.cc:
+    - operate optional on gzip compressed pdiffs
+  * apt-pkg/acquire-item.cc:
+    - don't uncompress downloaded pdiff files before feeding it to rred
 
- -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 15 Jan 2011 02:42:18 +0100
+ -- David Kalnischkies <kalnischkies@gmail.com>  Sat, 15 Jan 2011 20:24:03 +0100
 
 apt (0.8.10) unstable; urgency=low
 

diff --git a/methods/rred.cc b/methods/rred.cc
index d51c45c85a990a2c213544350e4825ee963647bc..1a18a381c803351dd46d56f846a4b8e0277fb794 100644 (file)
--- a/methods/rred.cc
+++ b/methods/rred.cc
@@ -12,6 +12,7 @@
 #include <utime.h>
 #include <stdio.h>
 #include <errno.h>
+#include <zlib.h>
 #include <apti18n.h>
                                                                                /*}}}*/
 /** \brief RredMethod - ed-style incremential patch method                     {{{
@@ -33,11 +34,14 @@ class RredMethod : public pkgAcqMethod {
        // return values
        enum State {ED_OK, ED_ORDERING, ED_PARSER, ED_FAILURE, MMAP_FAILED};
 
-       State applyFile(FILE *ed_cmds, FILE *in_file, FILE *out_file,
+       State applyFile(gzFile &ed_cmds, FILE *in_file, FILE *out_file,
                     unsigned long &line, char *buffer, Hashes *hash) const;
        void ignoreLineInFile(FILE *fin, char *buffer) const;
+       void ignoreLineInFile(gzFile &fin, char *buffer) const;
        void copyLinesFromFileToFile(FILE *fin, FILE *fout, unsigned int lines,
                                    Hashes *hash, char *buffer) const;
+       void copyLinesFromFileToFile(gzFile &fin, FILE *fout, unsigned int lines,
+                                   Hashes *hash, char *buffer) const;
 
        State patchFile(FileFd &Patch, FileFd &From, FileFd &out_file, Hashes *hash) const;
        State patchMMap(FileFd &Patch, FileFd &From, FileFd &out_file, Hashes *hash) const;
@@ -65,10 +69,10 @@ public:
  *  \param hash the created file for correctness
  *  \return the success State of the ed command executor
  */
-RredMethod::State RredMethod::applyFile(FILE *ed_cmds, FILE *in_file, FILE *out_file,
+RredMethod::State RredMethod::applyFile(gzFile &ed_cmds, FILE *in_file, FILE *out_file,
                        unsigned long &line, char *buffer, Hashes *hash) const {
        // get the current command and parse it
-       if (fgets(buffer, BUF_SIZE, ed_cmds) == NULL) {
+       if (gzgets(ed_cmds, buffer, BUF_SIZE) == NULL) {
                if (Debug == true)
                        std::clog << "rred: encounter end of file - we can start patching now." << std::endl;
                line = 0;
@@ -123,7 +127,7 @@ RredMethod::State RredMethod::applyFile(FILE *ed_cmds, FILE *in_file, FILE *out_
        unsigned char mode = *idx;
 
        // save the current position
-       unsigned const long pos = ftell(ed_cmds);
+       unsigned const long pos = gztell(ed_cmds);
 
        // if this is add or change then go to the next full stop
        unsigned int data_length = 0;
@@ -157,7 +161,7 @@ RredMethod::State RredMethod::applyFile(FILE *ed_cmds, FILE *in_file, FILE *out_
 
        // include data from ed script
        if (mode == MODE_CHANGED || mode == MODE_ADDED) {
-               fseek(ed_cmds, pos, SEEK_SET);
+               gzseek(ed_cmds, pos, SEEK_SET);
                copyLinesFromFileToFile(ed_cmds, out_file, data_length, hash, buffer);
        }
 
@@ -183,6 +187,18 @@ void RredMethod::copyLinesFromFileToFile(FILE *fin, FILE *fout, unsigned int lin
        }
 }
                                                                                /*}}}*/
+void RredMethod::copyLinesFromFileToFile(gzFile &fin, FILE *fout, unsigned int lines,/*{{{*/
+                                       Hashes *hash, char *buffer) const {
+       while (0 < lines--) {
+               do {
+                       gzgets(fin, buffer, BUF_SIZE);
+                       size_t const written = fwrite(buffer, 1, strlen(buffer), fout);
+                       hash->Add((unsigned char*)buffer, written);
+               } while (strlen(buffer) == (BUF_SIZE - 1) &&
+                      buffer[BUF_SIZE - 2] != '\n');
+       }
+}
+                                                                               /*}}}*/
 void RredMethod::ignoreLineInFile(FILE *fin, char *buffer) const {             /*{{{*/
        fgets(buffer, BUF_SIZE, fin);
        while (strlen(buffer) == (BUF_SIZE - 1) &&
@@ -192,11 +208,20 @@ void RredMethod::ignoreLineInFile(FILE *fin, char *buffer) const {                /*{{{*/
        }
 }
                                                                                /*}}}*/
+void RredMethod::ignoreLineInFile(gzFile &fin, char *buffer) const {           /*{{{*/
+       gzgets(fin, buffer, BUF_SIZE);
+       while (strlen(buffer) == (BUF_SIZE - 1) &&
+              buffer[BUF_SIZE - 2] != '\n') {
+               gzgets(fin, buffer, BUF_SIZE);
+               buffer[0] = ' ';
+       }
+}
+                                                                               /*}}}*/
 RredMethod::State RredMethod::patchFile(FileFd &Patch, FileFd &From,           /*{{{*/
                                        FileFd &out_file, Hashes *hash) const {
    char buffer[BUF_SIZE];
    FILE* fFrom = fdopen(From.Fd(), "r");
-   FILE* fPatch = fdopen(Patch.Fd(), "r");
+   gzFile fPatch = Patch.gzFd();
    FILE* fTo = fdopen(out_file.Fd(), "w");
 
    /* we do a tail recursion to read the commands in the right order */
@@ -228,6 +253,12 @@ RredMethod::State RredMethod::patchMMap(FileFd &Patch, FileFd &From,               /*{{{*/
                                        FileFd &out_file, Hashes *hash) const {
 #ifdef _POSIX_MAPPED_FILES
        MMap ed_cmds(Patch, MMap::ReadOnly);
+       if (Patch.gzFd() != NULL) {
+               unsigned long mapSize = Patch.Size();
+               DynamicMMap dyn(0, mapSize, 0);
+               gzread(Patch.gzFd(), dyn.Data(), mapSize);
+               ed_cmds = dyn;
+       }
        MMap in_file(From, MMap::ReadOnly);
 
        if (ed_cmds.Size() == 0 || in_file.Size() == 0)
@@ -445,7 +476,7 @@ bool RredMethod::Fetch(FetchItem *Itm)                                              /*{{{*/
    // Open the source and destination files (the d'tor of FileFd will do 
    // the cleanup/closing of the fds)
    FileFd From(Path,FileFd::ReadOnly);
-   FileFd Patch(Path+".ed",FileFd::ReadOnly);
+   FileFd Patch(Path+".ed",FileFd::ReadOnlyGzip);
    FileFd To(Itm->DestFile,FileFd::WriteAtomic);   
    To.EraseOnFailure();
    if (_error->PendingError() == true)
@@ -456,8 +487,8 @@ bool RredMethod::Fetch(FetchItem *Itm)                                              /*{{{*/
    State const result = patchMMap(Patch, From, To, &Hash);
    if (result == MMAP_FAILED) {
       // retry with patchFile
-      lseek(Patch.Fd(), 0, SEEK_SET);
-      lseek(From.Fd(), 0, SEEK_SET);
+      Patch.Seek(0);
+      From.Seek(0);
       To.Open(Itm->DestFile,FileFd::WriteAtomic);
       if (_error->PendingError() == true)
          return false;

diff --git a/test/integration/test-pdiff-usage b/test/integration/test-pdiff-usage
index a70b6122c7215a709b301e07923587be0b1dd305..eb1818bcd3ead6c63dde7b33426551f473dc2aa9 100755 (executable)
--- a/test/integration/test-pdiff-usage
+++ b/test/integration/test-pdiff-usage
@@ -44,6 +44,7 @@ sed -i aptarchive/Release \
  -e "/^SHA256:/ a\
  \ $(sha256sum $PATCHINDEX | cut -d' ' -f 1) $(stat -c%s $PATCHINDEX) Packages.diff/Index"
 signreleasefiles
+rm -f aptarchive/Packages aptarchive/Packages.gz aptarchive/Packages.bz2 aptarchive/Packages.lzma
 aptget update -qq
 
 testnopackage oldstuff