Various minor bug fixes

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

diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 77e846117bc8778c87117bae05edbc0a455f6c13..43717da162a759441b9458d1c96c4a1cf6b169c5 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.13 1998/10/26 07:11:49 jgg Exp $
+// $Id: fileutl.cc,v 1.27 1999/04/20 05:02:09 jgg Exp $

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


@@ -24,6 +24,9 @@
 #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 <signal.h>
+#include <errno.h>

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


@@ -36,14 +39,21 @@ bool CopyFile(FileFd &From,FileFd &To)
    
    // Buffered copy between fds
    unsigned char *Buf = new unsigned char[64000];
    
    // Buffered copy between fds
    unsigned char *Buf = new unsigned char[64000];

-   long Size;
-   while ((Size = read(From.Fd(),Buf,64000)) > 0)
+   unsigned long Size = From.Size();
+   while (Size != 0)

    {
    {

-      if (To.Write(Buf,Size) == false)
+      unsigned long ToRead = Size;
+      if (Size > 64000)
+        ToRead = 64000;
+      
+      if (From.Read(Buf,ToRead) == false || 
+         To.Write(Buf,ToRead) == false)

       {
         delete [] Buf;
         return false;
       }
       {
         delete [] Buf;
         return false;
       }

+      
+      Size -= ToRead;

    }
 
    delete [] Buf;
    }
 
    delete [] Buf;


@@ -68,12 +78,17 @@ 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 (fcntl(FD,F_SETLK,&fl) == -1)
    {

+      if (errno == ENOLCK)
+      {
+        _error->Warning("Not using locking for nfs mounted lock file %s",File.c_str());
+        return true;
+      }      

       if (Errors == true)
         _error->Errno("open","Could not get lock %s",File.c_str());
       close(FD);
       if (Errors == true)
         _error->Errno("open","Could not get lock %s",File.c_str());
       close(FD);


@@ -102,8 +117,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;
 }
                                                                        /*}}}*/


@@ -119,6 +137,18 @@ string flNotDir(string File)
    return string(File,Res,Res - File.length());
 }
                                                                        /*}}}*/
    return string(File,Res,Res - File.length());
 }
                                                                        /*}}}*/

+// flNotFile - Strip the file from the directory name                  /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+string flNotFile(string File)
+{
+   string::size_type Res = File.rfind('/');
+   if (Res == string::npos)
+      return File;
+   Res++;
+   return string(File,0,Res);
+}
+                                                                       /*}}}*/

 // SetCloseExec - Set the close on exec flag                           /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // SetCloseExec - Set the close on exec flag                           /*{{{*/
 // ---------------------------------------------------------------------
 /* */


@@ -147,19 +177,78 @@ 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) 
+   {      
+      int Res;
+      do
+      {
+        Res = select(Fd+1,0,&Set,0,(timeout != 0?&tv:0));
+      }
+      while (Res < 0 && errno == EINTR);
+      
+      if (Res <= 0)
+        return false;
+   } 
+   else 
+   {
+      int Res;
+      do
+      {
+        Res = select(Fd+1,&Set,0,0,(timeout != 0?&tv:0));
+      }
+      while (Res < 0 && errno == EINTR);
+      
+      if (Res <= 0)
+        return false;
+   }
+   

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

+// ExecFork - Magical fork that sanitizes the context before execing   /*{{{*/
+// ---------------------------------------------------------------------
+/* This is used if you want to cleanse the environment for the forked 
+   child, it fixes up the important signals and nukes all of the fds,
+   otherwise acts like normal fork. */
+int ExecFork()
+{
+   // Fork off the process
+   pid_t Process = fork();
+   if (Process < 0)
+   {
+      cerr << "FATAL -> Failed to fork." << endl;
+      exit(100);
+   }
+
+   // Spawn the subprocess
+   if (Process == 0)
+   {
+      // Setup the signals
+      signal(SIGPIPE,SIG_DFL);
+      signal(SIGQUIT,SIG_DFL);
+      signal(SIGINT,SIG_DFL);
+      signal(SIGWINCH,SIG_DFL);
+      signal(SIGCONT,SIG_DFL);
+      signal(SIGTSTP,SIG_DFL);
+      
+      // Close all of our FDs - just in case
+      for (int K = 3; K != 40; K++)
+        fcntl(K,F_SETFD,FD_CLOEXEC);
+   }
+   
+   return Process;
+}
+                                                                       /*}}}*/

 
 // FileFd::FileFd - Open a file                                                /*{{{*/
 // ---------------------------------------------------------------------
 
 // FileFd::FileFd - Open a file                                                /*{{{*/
 // ---------------------------------------------------------------------


@@ -174,9 +263,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);


@@ -184,12 +277,7 @@ FileFd::FileFd(string FileName,OpenMode Mode, unsigned long Perms)
 
       case WriteAny:
       iFd = open(FileName.c_str(),O_RDWR | O_CREAT,Perms);
 
       case WriteAny:
       iFd = open(FileName.c_str(),O_RDWR | O_CREAT,Perms);

-      break;
-      
-      // Dont use this in public directories
-      case LockEmpty:
-      iFd = open(FileName.c_str(),O_RDWR | O_CREAT | O_TRUNC,Perms);
-      break;
+      break;      

    }  
 
    if (iFd < 0)
    }  
 
    if (iFd < 0)


@@ -212,30 +300,63 @@ FileFd::~FileFd()
                                                                        /*}}}*/
 // FileFd::Read - Read a bit of the file                               /*{{{*/
 // ---------------------------------------------------------------------
                                                                        /*}}}*/
 // FileFd::Read - Read a bit of the file                               /*{{{*/
 // ---------------------------------------------------------------------

-/* */
+/* We are carefull to handle interruption by a signal while reading 
+   gracefully. */

 bool FileFd::Read(void *To,unsigned long Size)
 {
 bool FileFd::Read(void *To,unsigned long Size)
 {

-   if (read(iFd,To,Size) != (signed)Size)
+   int Res;
+   errno = 0;
+   do

    {
    {

-      Flags |= Fail;
-      return _error->Errno("read","Read error");
-   }   
+      Res = read(iFd,To,Size);
+      if (Res < 0 && errno == EINTR)
+        continue;
+      if (Res < 0)
+      {
+        Flags |= Fail;
+        return _error->Errno("read","Read error");
+      }

       
       

-   return true;
+      To = (char *)To + Res;
+      Size -= Res;
+   }
+   while (Res > 0 && Size > 0);
+   
+   if (Size == 0)
+      return true;
+   
+   Flags |= Fail;
+   return _error->Error("read, still have %u to read but none left",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)
+   int Res;
+   errno = 0;
+   do

    {
    {

-      Flags |= Fail;
-      return _error->Errno("write","Write error");
+      Res = write(iFd,From,Size);
+      if (Res < 0 && errno == EINTR)
+        continue;
+      if (Res < 0)
+      {
+        Flags |= Fail;
+        return _error->Errno("write","Write error");
+      }
+      
+      From = (char *)From + Res;
+      Size -= Res;

    }
    }

+   while (Res > 0 && Size > 0);

    
    

-   return true;
+   if (Size == 0)
+      return true;
+   
+   Flags |= Fail;
+   return _error->Error("write, still have %u to write but couldn't",Size);

 }
                                                                        /*}}}*/
 // FileFd::Seek - Seek in the file                                     /*{{{*/
 }
                                                                        /*}}}*/
 // FileFd::Seek - Seek in the file                                     /*{{{*/


@@ -252,6 +373,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                          /*{{{*/
 // ---------------------------------------------------------------------
 /* */