Merge commit 'e2073b0276226b625897ef475f225bf8f508719e' as 'triehash'

[apt.git] / methods / rsh.h

diff --git a/methods/rsh.h b/methods/rsh.h
index 98ca6a88ce69162526fe94fafd5d67fd53c58196..dee4ad647fff45afa8adc2e77ab06c753e1e2c35 100644 (file)
--- a/methods/rsh.h
+++ b/methods/rsh.h
@@ -11,10 +11,12 @@
 #define APT_RSH_H
 
 #include <string>
 #define APT_RSH_H
 
 #include <string>

+#include <time.h>
+

 #include <apt-pkg/strutl.h>
 #include <apt-pkg/strutl.h>

-#include <apt-pkg/hashes.h>
-#include <apt-pkg/acquire-method.h>
-#include <apt-pkg/fileutl.h>
+
+class Hashes;
+class FileFd;

 
 class RSHConn
 {
 
 class RSHConn
 {


@@ -23,17 +25,19 @@ class RSHConn
    int WriteFd;
    int ReadFd;
    URI ServerName;
    int WriteFd;
    int ReadFd;
    URI ServerName;

+   std::string const Prog;

 
    // Private helper functions
 
    // Private helper functions

-   bool ReadLine(string &Text);
+   bool ReadLine(std::string &Text);

 
    public:
 
    pid_t Process;
 
    // Raw connection IO
 
    public:
 
    pid_t Process;
 
    // Raw connection IO

-   bool WriteMsg(string &Text,bool Sync,const char *Fmt,...);
-   bool Connect(string Host, string User);
+   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


@@ -41,30 +45,32 @@ class RSHConn
    void Close();
 
    // Query
    void Close();
 
    // Query

-   bool Size(const char *Path,unsigned long &Size);
+   bool Size(const char *Path,unsigned long long &Size);

    bool ModTime(const char *Path, time_t &Time);
    bool ModTime(const char *Path, time_t &Time);

-   bool Get(const char *Path,FileFd &To,unsigned long Resume,
-            Hashes &Hash,bool &Missing, unsigned 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();
 };
 
    ~RSHConn();
 };
 

-class RSHMethod : public pkgAcqMethod
+#include "aptmethod.h"
+
+class RSHMethod : public aptMethod

 {
 {

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

 
    RSHConn *Server;
 
 
    RSHConn *Server;
 

-   static string FailFile;
+   static std::string FailFile;

    static int FailFd;
    static time_t FailTime;
    static int FailFd;
    static time_t FailTime;

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

 
    public:
 
 
    public:
 

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

 };
 
 #endif
 };
 
 #endif