projects
/
apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use some semantically more correct buffer operations
[apt.git]
/
methods
/
rsh.h
diff --git
a/methods/rsh.h
b/methods/rsh.h
index dd259e7442caf7b00cc2658ab003260f94f9edee..64a5cf66190c756a652ec0fe9c8214d668c76813 100644
(file)
--- a/
methods/rsh.h
+++ b/
methods/rsh.h
@@
-25,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);
@@
-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);
// 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
@@
-48,16
+50,18
@@
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
pkgAcq
Method
+class RSHMethod : public
apt
Method
{
{
- 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;
RSHConn *Server;
@@
-68,7
+72,7
@@
class RSHMethod : public pkgAcqMethod
public:
public:
-
RSHMethod(
);
+
explicit RSHMethod(std::string const &Prog
);
};
#endif
};
#endif