X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/578bfd0aed2ec993f4ad85fa6a7094a852261422..0118833a3b3e65ad7296863aa7d49574eb615f83:/apt-pkg/contrib/fileutl.cc

diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 6048ff0bb..60b9f8b75 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description								/*{{{*/
-// $Id: fileutl.cc,v 1.1 1998/07/02 02:58:13 jgg Exp $
+// $Id: fileutl.cc,v 1.8 1998/10/02 04:39:50 jgg Exp $
 /* ######################################################################
    
    File Utilities
@@ -14,8 +14,11 @@
    ##################################################################### */
 									/*}}}*/
 // Include Files							/*{{{*/
-#include <fileutl.h>
-#include <pkglib/error.h>
+#ifdef __GNUG__
+#pragma implementation "apt-pkg/fileutl.h"
+#endif 
+#include <apt-pkg/fileutl.h>
+#include <apt-pkg/error.h>
 
 #include <unistd.h>
 #include <sys/stat.h>
@@ -26,7 +29,7 @@
 // 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;
@@ -104,13 +107,25 @@ string SafeGetCWD()
    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());
+}
+									/*}}}*/
 
-// File::File - Open a file						/*{{{*/
+// FileFd::FileFd - Open a file						/*{{{*/
 // ---------------------------------------------------------------------
 /* 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:
@@ -125,6 +140,15 @@ File::File(string FileName,OpenMode Mode, unsigned long Perms)
       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)
@@ -133,19 +157,19 @@ File::File(string FileName,OpenMode Mode, unsigned long Perms)
       this->FileName = FileName;
 }
 									/*}}}*/
-// 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. */
-File::~File()
+FileFd::~FileFd()
 {
    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)
    {
@@ -156,10 +180,10 @@ bool File::Read(void *To,unsigned long Size)
    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)
    {
@@ -170,10 +194,10 @@ bool File::Write(void *From,unsigned long Size)
    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)
    {
@@ -184,10 +208,10 @@ bool File::Seek(unsigned long To)
    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)
@@ -195,16 +219,17 @@ unsigned long File::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)
-      if (close(iFd) != 0)
+      if (iFd >= 0 && close(iFd) != 0)
 	 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)