more sensible default text in pot files

[apt.git] / methods / gzip.cc

diff --git a/methods/gzip.cc b/methods/gzip.cc
index 2429069e50a92b09c194a8d573546799806850bf..c470807ac9b73a547ac9cd0b75dc9dbaba164a3e 100644 (file)
--- a/methods/gzip.cc
+++ b/methods/gzip.cc
@@ -18,6 +18,7 @@
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/aptconfiguration.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/aptconfiguration.h>

+#include "aptmethod.h"

 
 #include <string.h>
 #include <sys/stat.h>
 
 #include <string.h>
 #include <sys/stat.h>


@@ -28,27 +29,15 @@
 #include <apti18n.h>
                                                                        /*}}}*/
 
 #include <apti18n.h>
                                                                        /*}}}*/
 

-const char *Prog;
-
-class GzipMethod : public pkgAcqMethod
+class GzipMethod : public aptMethod

 {
 {

+   std::string const Prog;

    virtual bool Fetch(FetchItem *Itm) APT_OVERRIDE;
    virtual bool Fetch(FetchItem *Itm) APT_OVERRIDE;

-   virtual bool Configuration(std::string Message) APT_OVERRIDE;
-   
-   public:
-   
-   GzipMethod() : pkgAcqMethod("1.1",SingleInstance | SendConfig) {};
-};
-
-bool GzipMethod::Configuration(std::string Message)
-{
-   if (pkgAcqMethod::Configuration(Message) == false)
-      return false;

 
 

-   DropPrivsOrDie();
+   public:

 
 

-   return true;
-}
+   explicit GzipMethod(std::string const &pProg) : aptMethod(pProg.c_str(),"1.1",SingleInstance | SendConfig), Prog(pProg) {};
+};

 
 // GzipMethod::Fetch - Decompress the passed URI                       /*{{{*/
 // ---------------------------------------------------------------------
 
 // GzipMethod::Fetch - Decompress the passed URI                       /*{{{*/
 // ---------------------------------------------------------------------


@@ -68,7 +57,7 @@ bool GzipMethod::Fetch(FetchItem *Itm)
       if (compressor->Name == Prog)
         break;
    if (compressor == compressors.end())
       if (compressor->Name == Prog)
         break;
    if (compressor == compressors.end())

-      return _error->Error("Extraction of file %s requires unknown compressor %s", Path.c_str(), Prog);
+      return _error->Error("Extraction of file %s requires unknown compressor %s", Path.c_str(), Prog.c_str());

 
    // Open the source and destination files
    FileFd From;
 
    // Open the source and destination files
    FileFd From;


@@ -157,10 +146,6 @@ int main(int, char *argv[])
 {
    setlocale(LC_ALL, "");
 
 {
    setlocale(LC_ALL, "");
 

-   Prog = strrchr(argv[0],'/');
-   ++Prog;
-
-   GzipMethod Mth;
-
+   GzipMethod Mth(flNotDir(argv[0]));

    return Mth.Run();
 }
    return Mth.Run();
 }