X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/d7a51997c30b2098bb60b3397095ec58ec825303..cb7fce24492ff6e0b7df0f33e2ac47970b4281dd:/methods/rred.cc

diff --git a/methods/rred.cc b/methods/rred.cc
index 7c2ccd98e..351c1ebf9 100644
--- a/methods/rred.cc
+++ b/methods/rred.cc
@@ -13,6 +13,7 @@
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/configuration.h>
+#include "aptmethod.h"
 
 #include <stddef.h>
 #include <iostream>
@@ -38,7 +39,7 @@ class MemBlock {
    char *free;
    MemBlock *next;
 
-   MemBlock(size_t size) : size(size), next(NULL)
+   explicit MemBlock(size_t size) : size(size), next(NULL)
    {
       free = start = new char[size];
    }
@@ -117,7 +118,7 @@ struct Change {
    size_t add_len; /* bytes */
    char *add;
 
-   Change(size_t off)
+   explicit Change(size_t off)
    {
       offset = off;
       del_cnt = add_cnt = add_len = 0;
@@ -532,7 +533,7 @@ class Patch {
    }
 };
 
-class RredMethod : public pkgAcqMethod {
+class RredMethod : public aptMethod {
    private:
       bool Debug;
 
@@ -621,7 +622,7 @@ class RredMethod : public pkgAcqMethod {
 	    if (p.Open(patch_name, FileFd::ReadOnly, FileFd::Gzip) == false ||
 		  patch.read_diff(p, &patch_hash) == false)
 	    {
-	       _error->DumpErrors(std::cerr);
+	       _error->DumpErrors(std::cerr, GlobalError::DEBUG, false);
 	       return false;
 	    }
 	    p.Close();
@@ -680,24 +681,15 @@ class RredMethod : public pkgAcqMethod {
 	 return true;
       }
 
-      bool Configuration(std::string Message) APT_OVERRIDE
-      {
-	 if (pkgAcqMethod::Configuration(Message) == false)
-	    return false;
-
-	 DropPrivsOrDie();
-
-	 return true;
-      }
-
    public:
-      RredMethod() : pkgAcqMethod("2.0",SingleInstance | SendConfig), Debug(false) {}
+      RredMethod() : aptMethod("rred", "2.0",SingleInstance | SendConfig), Debug(false) {}
 };
 
 int main(int argc, char **argv)
 {
    int i;
    bool just_diff = true;
+   bool test = false;
    Patch patch;
 
    if (argc <= 1) {
@@ -705,7 +697,12 @@ int main(int argc, char **argv)
       return Mth.Run();
    }
 
-   if (argc > 1 && strcmp(argv[1], "-f") == 0) {
+   // Usage: rred -t input output diff ...
+   if (argc > 1 && strcmp(argv[1], "-t") == 0) {
+      just_diff = false;
+      test = true;
+      i = 4;
+   } else if (argc > 1 && strcmp(argv[1], "-f") == 0) {
       just_diff = false;
       i = 2;
    } else {
@@ -725,7 +722,13 @@ int main(int argc, char **argv)
       }
    }
 
-   if (just_diff) {
+   if (test) {
+      FileFd out, inp;
+      std::cerr << "Patching " << argv[2] << " into " << argv[3] << "\n";
+      inp.Open(argv[2], FileFd::ReadOnly,FileFd::Extension);
+      out.Open(argv[3], FileFd::WriteOnly | FileFd::Create, FileFd::Extension);
+      patch.apply_against_file(out, inp);
+   } else if (just_diff) {
       FileFd out;
       out.OpenDescriptor(STDOUT_FILENO, FileFd::WriteOnly | FileFd::Create);
       patch.write_diff(out);