HCoop
/
ntk
/
apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'mvo/debian/sid' into debian/experimental-no-abi-break
[ntk/apt.git]
/
methods
/
rsh.h
diff --git
a/methods/rsh.h
b/methods/rsh.h
index
98ca6a8
..
d7efa3f
100644
(file)
--- a/
methods/rsh.h
+++ b/
methods/rsh.h
@@
-12,9
+12,9
@@
#include <string>
#include <apt-pkg/strutl.h>
#include <string>
#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
{
@@
-25,15
+25,15
@@
class RSHConn
URI ServerName;
// Private helper functions
URI ServerName;
// Private helper functions
- bool ReadLine(string &Text);
+ bool ReadLine(st
d::st
ring &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(st
ring Host,
string User);
+ bool WriteMsg(st
d::st
ring &Text,bool Sync,const char *Fmt,...);
+ bool Connect(st
d::string Host, 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,23
+41,25
@@
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();
};
RSHConn(URI Srv);
~RSHConn();
};
+#include <apt-pkg/acquire-method.h>
+
class RSHMethod : public pkgAcqMethod
{
virtual bool Fetch(FetchItem *Itm);
class RSHMethod : public pkgAcqMethod
{
virtual bool Fetch(FetchItem *Itm);
- virtual bool Configuration(string Message);
+ virtual bool Configuration(st
d::st
ring Message);
RSHConn *Server;
RSHConn *Server;
- static string FailFile;
+ static st
d::st
ring FailFile;
static int FailFd;
static time_t FailTime;
static void SigTerm(int);
static int FailFd;
static time_t FailTime;
static void SigTerm(int);