Widened the mmap size

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

diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 29b12bef1927af465bdfc40737fdbf980fc4fce2..77e846117bc8778c87117bae05edbc0a455f6c13 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.3 1998/07/07 04:17:12 jgg Exp $
+// $Id: fileutl.cc,v 1.13 1998/10/26 07:11:49 jgg Exp $

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


@@ -15,10 +15,10 @@
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
 #ifdef __GNUG__
                                                                        /*}}}*/
 // Include Files                                                       /*{{{*/
 #ifdef __GNUG__

-#pragma implementation "pkglib/fileutl.h"
+#pragma implementation "apt-pkg/fileutl.h"

 #endif 
 #endif 

-#include <pkglib/fileutl.h>
-#include <pkglib/error.h>
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/error.h>

 
 #include <unistd.h>
 #include <sys/stat.h>
 
 #include <unistd.h>
 #include <sys/stat.h>


@@ -29,7 +29,7 @@
 // CopyFile - Buffered copy of a file                                  /*{{{*/
 // ---------------------------------------------------------------------
 /* The caller is expected to set things so that failure causes erasure */
 // CopyFile - Buffered copy of a file                                  /*{{{*/
 // ---------------------------------------------------------------------
 /* The caller is expected to set things so that failure causes erasure */

-bool CopyFile(File From,File To)
+bool CopyFile(FileFd &From,FileFd &To)

 {
    if (From.IsOpen() == false || To.IsOpen() == false)
       return false;
 {
    if (From.IsOpen() == false || To.IsOpen() == false)
       return false;


@@ -107,13 +107,66 @@ string SafeGetCWD()
    return S;
 }
                                                                        /*}}}*/
    return S;
 }
                                                                        /*}}}*/

+// flNotDir - Strip the directory from the filename                    /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+string flNotDir(string File)
+{
+   string::size_type Res = File.rfind('/');
+   if (Res == string::npos)
+      return File;
+   Res++;
+   return string(File,Res,Res - File.length());
+}
+                                                                       /*}}}*/
+// SetCloseExec - Set the close on exec flag                           /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+void SetCloseExec(int Fd,bool Close)
+{   
+   if (fcntl(Fd,F_SETFD,(Close == false)?0:FD_CLOEXEC) != 0)
+   {
+      cerr << "FATAL -> Could not set close on exec " << strerror(errno) << endl;
+      exit(100);
+   }
+}
+                                                                       /*}}}*/
+// SetNonBlock - Set the nonblocking flag                              /*{{{*/
+// ---------------------------------------------------------------------
+/* */
+void SetNonBlock(int Fd,bool Block)
+{   
+   int Flags = fcntl(Fd,F_GETFL) & (~O_NONBLOCK);
+   if (fcntl(Fd,F_SETFL,Flags | ((Block == false)?0:O_NONBLOCK)) != 0)
+   {
+      cerr << "FATAL -> Could not set non-blocking flag " << strerror(errno) << endl;
+      exit(100);
+   }
+}
+                                                                       /*}}}*/
+// 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)
+{
+   fd_set Set;
+   FD_ZERO(&Set);
+   FD_SET(Fd,&Set);
+
+   if (select(Fd+1,&Set,0,0,0) <= 0)
+      return false;
+
+   return true;
+}
+                                                                       /*}}}*/

 
 

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

 // ---------------------------------------------------------------------
 /* The most commonly used open mode combinations are given with Mode */
 // ---------------------------------------------------------------------
 /* The most commonly used open mode combinations are given with Mode */

-File::File(string FileName,OpenMode Mode, unsigned long Perms)
+FileFd::FileFd(string FileName,OpenMode Mode, unsigned long Perms)

 {
 {

-   Flags = 0;
+   Flags = AutoClose;

    switch (Mode)
    {
       case ReadOnly:
    switch (Mode)
    {
       case ReadOnly:


@@ -128,27 +181,39 @@ File::File(string FileName,OpenMode Mode, unsigned long Perms)
       case WriteExists:
       iFd = open(FileName.c_str(),O_RDWR);
       break;
       case WriteExists:
       iFd = open(FileName.c_str(),O_RDWR);
       break;

+
+      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;

    }  
 
    if (iFd < 0)
       _error->Errno("open","Could not open file %s",FileName.c_str());
    else
    }  
 
    if (iFd < 0)
       _error->Errno("open","Could not open file %s",FileName.c_str());
    else

+   {

       this->FileName = FileName;
       this->FileName = FileName;

+      SetCloseExec(iFd,true);
+   }   

 }
                                                                        /*}}}*/
 }
                                                                        /*}}}*/

-// File::~File - Closes the file                                       /*{{{*/
+// FileFd::~File - Closes the file                                     /*{{{*/

 // ---------------------------------------------------------------------
 /* If the proper modes are selected then we close the Fd and possibly
    unlink the file on error. */
 // ---------------------------------------------------------------------
 /* If the proper modes are selected then we close the Fd and possibly
    unlink the file on error. */

-File::~File()
+FileFd::~FileFd()

 {
    Close();
 }
                                                                        /*}}}*/
 {
    Close();
 }
                                                                        /*}}}*/

-// File::Read - Read a bit of the file                                 /*{{{*/
+// FileFd::Read - Read a bit of the file                               /*{{{*/

 // ---------------------------------------------------------------------
 /* */
 // ---------------------------------------------------------------------
 /* */

-bool File::Read(void *To,unsigned long Size)
+bool FileFd::Read(void *To,unsigned long Size)

 {
    if (read(iFd,To,Size) != (signed)Size)
    {
 {
    if (read(iFd,To,Size) != (signed)Size)
    {


@@ -159,10 +224,10 @@ bool File::Read(void *To,unsigned long Size)
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-// File::Write - Write to the file                                     /*{{{*/
+// FileFd::Write - Write to the file                                   /*{{{*/

 // ---------------------------------------------------------------------
 /* */
 // ---------------------------------------------------------------------
 /* */

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

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


@@ -173,10 +238,10 @@ bool File::Write(void *From,unsigned long Size)
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

-// File::Seek - Seek in the file                                       /*{{{*/
+// FileFd::Seek - Seek in the file                                     /*{{{*/

 // ---------------------------------------------------------------------
 /* */
 // ---------------------------------------------------------------------
 /* */

-bool File::Seek(unsigned long To)
+bool FileFd::Seek(unsigned long To)

 {
    if (lseek(iFd,To,SEEK_SET) != (signed)To)
    {
 {
    if (lseek(iFd,To,SEEK_SET) != (signed)To)
    {


@@ -187,10 +252,10 @@ bool File::Seek(unsigned long To)
    return true;
 }
                                                                        /*}}}*/
    return true;
 }
                                                                        /*}}}*/

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

 // ---------------------------------------------------------------------
 /* */
 // ---------------------------------------------------------------------
 /* */

-unsigned long File::Size()
+unsigned long FileFd::Size()

 {
    struct stat Buf;
    if (fstat(iFd,&Buf) != 0)
 {
    struct stat Buf;
    if (fstat(iFd,&Buf) != 0)


@@ -198,16 +263,17 @@ unsigned long File::Size()
    return Buf.st_size;
 }
                                                                        /*}}}*/
    return Buf.st_size;
 }
                                                                        /*}}}*/

-// File::Close - Close the file        if the close flag is set                /*{{{*/
+// FileFd::Close - Close the file if the close flag is set             /*{{{*/

 // ---------------------------------------------------------------------
 /* */
 // ---------------------------------------------------------------------
 /* */

-bool File::Close()
+bool FileFd::Close()

 {
    bool Res = true;
    if ((Flags & AutoClose) == AutoClose)
 {
    bool Res = true;
    if ((Flags & AutoClose) == AutoClose)

-      if (close(iFd) != 0)
+      if (iFd >= 0 && close(iFd) != 0)

         Res &= _error->Errno("close","Problem closing the file");
         Res &= _error->Errno("close","Problem closing the file");

-      
+   iFd = -1;
+   

    if ((Flags & Fail) == Fail && (Flags & DelOnFail) == DelOnFail &&
        FileName.empty() == false)
       if (unlink(FileName.c_str()) != 0)
    if ((Flags & Fail) == Fail && (Flags & DelOnFail) == DelOnFail &&
        FileName.empty() == false)
       if (unlink(FileName.c_str()) != 0)