* debian/zzapt.cron.daily:

[apt.git] / methods / rsh.cc

diff --git a/methods/rsh.cc b/methods/rsh.cc
index 2292e72e40958ba825234a315420ad259e20a1c2..21f0d0a22220bf466dd5b33aaf0165ceef0a60e5 100644 (file)
--- a/methods/rsh.cc
+++ b/methods/rsh.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: rsh.cc,v 1.7 2004/01/07 20:39:38 mdz Exp $
+// $Id: rsh.cc,v 1.6.2.1 2004/01/16 18:58:50 mdz Exp $

 /* ######################################################################
 
    RSH method - Transfer files via rsh compatible program
 /* ######################################################################
 
    RSH method - Transfer files via rsh compatible program


@@ -110,6 +110,8 @@ bool RSHConn::Connect(string Host, string User)
       // Probably should do
       // dup2(open("/dev/null",O_RDONLY),STDERR_FILENO);
 
       // Probably should do
       // dup2(open("/dev/null",O_RDONLY),STDERR_FILENO);
 

+      Args[i++] = Prog;
+

       // Insert user-supplied command line options
       Configuration::Item const *Opts = RshOptions;
       if (Opts != 0)
       // Insert user-supplied command line options
       Configuration::Item const *Opts = RshOptions;
       if (Opts != 0)


@@ -123,7 +125,6 @@ bool RSHConn::Connect(string Host, string User)
          }
       }
 
          }
       }
 

-      Args[i++] = Prog;

       if (User.empty() == false) {
          Args[i++] = "-l";
         Args[i++] = User.c_str();
       if (User.empty() == false) {
          Args[i++] = "-l";
         Args[i++] = User.c_str();


@@ -229,7 +230,7 @@ bool RSHConn::WriteMsg(string &Text,bool Sync,const char *Fmt,...)
       int Res = write(WriteFd,S + Start,Len);
       if (Res <= 0)
       {
       int Res = write(WriteFd,S + Start,Len);
       if (Res <= 0)
       {

-         _error->Errno("write",_("Write Error"));
+         _error->Errno("write",_("Write error"));

          Close();
          return false;
       }
          Close();
          return false;
       }


@@ -261,7 +262,7 @@ bool RSHConn::Size(const char *Path,unsigned long &Size)
    char *End;
    Size = strtoul(Msg.c_str(),&End,10);
    if (End == Msg.c_str())
    char *End;
    Size = strtoul(Msg.c_str(),&End,10);
    if (End == Msg.c_str())

-      return _error->Error(_("File Not Found"));
+      return _error->Error(_("File not found"));

    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/


@@ -278,8 +279,7 @@ bool RSHConn::ModTime(const char *Path, time_t &Time)
       return false;
 
    // Parse it
       return false;
 
    // Parse it

-   StrToTime(Msg,Time);
-   return true;
+   return FTPMDTMStrToTime(Msg.c_str(), Time);

 }
                                                                        /*}}}*/
 // RSHConn::Get - Get a file                                           /*{{{*/
 }
                                                                        /*}}}*/
 // RSHConn::Get - Get a file                                           /*{{{*/


@@ -430,7 +430,7 @@ bool RSHMethod::Fetch(FetchItem *Itm)
        Server->ModTime(File,FailTime) == false)
    {
       //Fail(true);
        Server->ModTime(File,FailTime) == false)
    {
       //Fail(true);

-      //_error->Error(_("File Not Found")); // Will be handled by Size
+      //_error->Error(_("File not found")); // Will be handled by Size

       return false;
    }
    Res.Size = Size;
       return false;
    }
    Res.Size = Size;


@@ -511,6 +511,8 @@ bool RSHMethod::Fetch(FetchItem *Itm)
 
 int main(int argc, const char *argv[])
 {
 
 int main(int argc, const char *argv[])
 {

+   setlocale(LC_ALL, "");
+

    RSHMethod Mth;
    Prog = strrchr(argv[0],'/');
    Prog++;
    RSHMethod Mth;
    Prog = strrchr(argv[0],'/');
    Prog++;