fix program name detection in rsh method

[apt.git] / methods / rsh.h

diff --git a/methods/rsh.h b/methods/rsh.h
index d7efa3f065dee3d9d180dd0fba1d49c467b6ee54..64a5cf66190c756a652ec0fe9c8214d668c76813 100644 (file)
--- a/methods/rsh.h
+++ b/methods/rsh.h
@@ -11,6 +11,8 @@
 #define APT_RSH_H
 
 #include <string>
 #define APT_RSH_H
 
 #include <string>

+#include <time.h>
+

 #include <apt-pkg/strutl.h>
 
 class Hashes;
 #include <apt-pkg/strutl.h>
 
 class Hashes;


@@ -23,6 +25,7 @@ class RSHConn
    int WriteFd;
    int ReadFd;
    URI ServerName;
    int WriteFd;
    int ReadFd;
    URI ServerName;

+   std::string const Prog;

 
    // Private helper functions
    bool ReadLine(std::string &Text);
 
    // Private helper functions
    bool ReadLine(std::string &Text);


@@ -34,6 +37,7 @@ class RSHConn
    // Raw connection IO
    bool WriteMsg(std::string &Text,bool Sync,const char *Fmt,...);
    bool Connect(std::string Host, std::string User);
    // Raw connection IO
    bool WriteMsg(std::string &Text,bool Sync,const char *Fmt,...);
    bool Connect(std::string Host, std::string User);

+   bool Connect(std::string Host, unsigned int Port, std::string User);

    bool Comp(URI Other) const {return Other.Host == ServerName.Host && Other.Port == ServerName.Port;};
 
    // Connection control
    bool Comp(URI Other) const {return Other.Host == ServerName.Host && Other.Port == ServerName.Port;};
 
    // Connection control


@@ -46,27 +50,29 @@ class RSHConn
    bool Get(const char *Path,FileFd &To,unsigned long long Resume,
             Hashes &Hash,bool &Missing, unsigned long long Size);
 
    bool Get(const char *Path,FileFd &To,unsigned long long Resume,
             Hashes &Hash,bool &Missing, unsigned long long Size);
 

-   RSHConn(URI Srv);
+   RSHConn(std::string const &Prog, URI Srv);

    ~RSHConn();
 };
 
 #include <apt-pkg/acquire-method.h>
    ~RSHConn();
 };
 
 #include <apt-pkg/acquire-method.h>

+#include "aptmethod.h"

 
 

-class RSHMethod : public pkgAcqMethod
+class RSHMethod : public aptMethod

 {
 {

-   virtual bool Fetch(FetchItem *Itm);
-   virtual bool Configuration(std::string Message);
+   std::string const Prog;
+   virtual bool Fetch(FetchItem *Itm) APT_OVERRIDE;
+   virtual bool Configuration(std::string Message) APT_OVERRIDE;

 
    RSHConn *Server;
 
    static std::string FailFile;
    static int FailFd;
    static time_t FailTime;
 
    RSHConn *Server;
 
    static std::string FailFile;
    static int FailFd;
    static time_t FailTime;

-   static void SigTerm(int);
+   static APT_NORETURN void SigTerm(int);

 
    public:
 
 
    public:
 

-   RSHMethod();
+   explicit RSHMethod(std::string const &Prog);

 };
 
 #endif
 };
 
 #endif