X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/38d2959ffb8c6f5f291b2910014a67b1b352ab4c..fa1b5d86bf5ba20047774014b422e7c30ee13a9c:/methods/rsh.h diff --git a/methods/rsh.h b/methods/rsh.h index dd259e744..571e38ba6 100644 --- 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); @@ -36,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); + 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 @@ -48,16 +50,17 @@ class RSHConn 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 +#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; @@ -68,7 +71,7 @@ class RSHMethod : public pkgAcqMethod public: - RSHMethod(); + explicit RSHMethod(std::string const &Prog); }; #endif