tests: don't do boundless string compares with data()

[apt.git] / methods / rsh.h

diff --git a/methods/rsh.h b/methods/rsh.h
index 35cbee3e0cc63febddda4cdeedac23ca7f2dfcec..dee4ad647fff45afa8adc2e77ab06c753e1e2c35 100644 (file)
--- a/methods/rsh.h
+++ b/methods/rsh.h
@@ -25,6 +25,7 @@ class RSHConn
    int WriteFd;
    int ReadFd;
    URI ServerName;
+   std::string const Prog;
 
    // Private helper functions
    bool ReadLine(std::string &Text);
@@ -49,16 +50,14 @@ class RSHConn
    bool Get(const char *Path,FileFd &To,unsigned long long Resume,
             Hashes &Hash,bool &Missing, unsigned long long Size);
 
-   explicit RSHConn(URI Srv);
+   RSHConn(std::string const &Prog, URI Srv);
    ~RSHConn();
 };
 
-#include <apt-pkg/acquire-method.h>
 #include "aptmethod.h"
 
 class RSHMethod : public aptMethod
 {
-   std::string const Prog;
    virtual bool Fetch(FetchItem *Itm) APT_OVERRIDE;
    virtual bool Configuration(std::string Message) APT_OVERRIDE;
 
@@ -71,7 +70,7 @@ class RSHMethod : public aptMethod
 
    public:
 
-   explicit RSHMethod(std::string const &Prog);
+   explicit RSHMethod(std::string &&Prog);
 };
 
 #endif