Minor fixes for FTP support

[apt.git] / apt-pkg / contrib / fileutl.cc

diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 3ca36377a2095b2008fc27f70d251652084b850e..a761794eefd4d4ad6764cc0d1a4d9fca99ed394f 100644 (file)
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: fileutl.cc,v 1.14 1998/11/23 07:03:06 jgg Exp $
+// $Id: fileutl.cc,v 1.22 1999/03/15 08:10:39 jgg Exp $

 /* ######################################################################
    
    File Utilities
 /* ######################################################################
    
    File Utilities


@@ -24,6 +24,8 @@
 #include <sys/stat.h>
 #include <sys/fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/fcntl.h>
 #include <sys/types.h>

+#include <sys/time.h>
+#include <errno.h>

                                                                        /*}}}*/
 
 // CopyFile - Buffered copy of a file                                  /*{{{*/
                                                                        /*}}}*/
 
 // CopyFile - Buffered copy of a file                                  /*{{{*/


@@ -68,10 +70,10 @@ int GetLock(string File,bool Errors)
    
    // Aquire a write lock
    struct flock fl;
    
    // Aquire a write lock
    struct flock fl;

-   fl.l_type= F_WRLCK;
-   fl.l_whence= SEEK_SET;
-   fl.l_start= 0;
-   fl.l_len= 1;
+   fl.l_type = F_WRLCK;
+   fl.l_whence = SEEK_SET;
+   fl.l_start = 0;
+   fl.l_len = 0;

    if (fcntl(FD,F_SETLK,&fl) == -1)
    {
       if (Errors == true)
    if (fcntl(FD,F_SETLK,&fl) == -1)
    {
       if (Errors == true)


@@ -102,8 +104,11 @@ string SafeGetCWD()
    // Stash the current dir.
    char S[300];
    S[0] = 0;
    // Stash the current dir.
    char S[300];
    S[0] = 0;

-   if (getcwd(S,sizeof(S)) == 0)
+   if (getcwd(S,sizeof(S)-2) == 0)

       return "/";
       return "/";

+   unsigned int Len = strlen(S);
+   S[Len] = '/';
+   S[Len+1] = 0;

    return S;
 }
                                                                        /*}}}*/
    return S;
 }
                                                                        /*}}}*/


@@ -159,16 +164,27 @@ void SetNonBlock(int Fd,bool Block)
 // WaitFd - Wait for a FD to become readable                           /*{{{*/
 // ---------------------------------------------------------------------
 /* This waits for a FD to become readable using select. It is usefull for
 // WaitFd - Wait for a FD to become readable                           /*{{{*/
 // ---------------------------------------------------------------------
 /* This waits for a FD to become readable using select. It is usefull for

-   applications making use of non-blocking sockets. */
-bool WaitFd(int Fd)
+   applications making use of non-blocking sockets. The timeout is 
+   in seconds. */
+bool WaitFd(int Fd,bool write,unsigned long timeout)

 {
    fd_set Set;
 {
    fd_set Set;

+   struct timeval tv;

    FD_ZERO(&Set);
    FD_SET(Fd,&Set);
    FD_ZERO(&Set);
    FD_SET(Fd,&Set);

-
-   if (select(Fd+1,&Set,0,0,0) <= 0)
-      return false;
-
+   tv.tv_sec = timeout;
+   tv.tv_usec = 0;
+   if (write == true) 
+   {
+      if (select(Fd+1,0,&Set,0,(timeout != 0?&tv:0)) <= 0)
+         return false;
+   } 
+   else 
+   {
+      if (select(Fd+1,&Set,0,0,(timeout != 0?&tv:0)) <= 0)
+         return false;
+   }
+   

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


@@ -186,9 +202,13 @@ FileFd::FileFd(string FileName,OpenMode Mode, unsigned long Perms)
       break;
       
       case WriteEmpty:
       break;
       
       case WriteEmpty:

-      unlink(FileName.c_str());
-      iFd = open(FileName.c_str(),O_RDWR | O_CREAT | O_EXCL,Perms);
-      break;
+      {
+        struct stat Buf;
+        if (stat(FileName.c_str(),&Buf) == 0 && S_ISLNK(Buf.st_mode))
+           unlink(FileName.c_str());
+        iFd = open(FileName.c_str(),O_RDWR | O_CREAT | O_TRUNC,Perms);
+        break;
+      }

       
       case WriteExists:
       iFd = open(FileName.c_str(),O_RDWR);
       
       case WriteExists:
       iFd = open(FileName.c_str(),O_RDWR);


@@ -234,7 +254,7 @@ bool FileFd::Read(void *To,unsigned long Size)
 // FileFd::Write - Write to the file                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // FileFd::Write - Write to the file                                   /*{{{*/
 // ---------------------------------------------------------------------
 /* */

-bool FileFd::Write(void *From,unsigned long Size)
+bool FileFd::Write(const void *From,unsigned long Size)

 {
    if (write(iFd,From,Size) != (signed)Size)
    {
 {
    if (write(iFd,From,Size) != (signed)Size)
    {


@@ -259,6 +279,31 @@ bool FileFd::Seek(unsigned long To)
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

+// FileFd::Truncate - Truncate the file                                /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+bool FileFd::Truncate(unsigned long To)
+{
+   if (ftruncate(iFd,To) != 0)
+   {
+      Flags |= Fail;
+      return _error->Error("Unable to truncate to %u",To);
+   }
+   
+   return true;
+}
+                                                                       /*}}}*/
+// FileFd::Tell - Current seek position                                        /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+unsigned long FileFd::Tell()
+{
+   off_t Res = lseek(iFd,0,SEEK_CUR);
+   if (Res == (off_t)-1)
+      _error->Errno("lseek","Failed to determine the current file position");
+   return Res;
+}
+                                                                       /*}}}*/

 // FileFd::Size - Return the size of the file                          /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // FileFd::Size - Return the size of the file                          /*{{{*/
 // ---------------------------------------------------------------------
 /* */