* merged changes from Kamions upload (thanks!)

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

diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index f35cf04d69116b038cdc60a350797d929699115a..041aa33096c94d18a936420fcc7d1cd277682bbe 100644 (file)
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -1,6 +1,6 @@
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/
 // -*- mode: cpp; mode: fold -*-
 // Description                                                         /*{{{*/

-// $Id: fileutl.h,v 1.12 1999/01/18 06:20:08 jgg Exp $
+// $Id: fileutl.h,v 1.26 2001/05/07 05:06:52 jgg Exp $

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


@@ -27,35 +27,55 @@
 
 #include <string>
 
 
 #include <string>
 

+using std::string;
+

 class FileFd
 {
    protected:
    int iFd;
  
 class FileFd
 {
    protected:
    int iFd;
  

-   enum LocalFlags {AutoClose = (1<<0),Fail = (1<<1),DelOnFail = (1<<2)};
+   enum LocalFlags {AutoClose = (1<<0),Fail = (1<<1),DelOnFail = (1<<2),
+                    HitEof = (1<<3)};

    unsigned long Flags;
    string FileName;
    
    public:
    unsigned long Flags;
    string FileName;
    
    public:

-   enum OpenMode {ReadOnly,WriteEmpty,WriteExists,WriteAny};
+   enum OpenMode {ReadOnly,WriteEmpty,WriteExists,WriteAny,WriteTemp};

    
    

-   bool Read(void *To,unsigned long Size);
+   inline bool Read(void *To,unsigned long Size,bool AllowEof)
+   {
+      unsigned long Jnk;
+      if (AllowEof)
+        return Read(To,Size,&Jnk);
+      return Read(To,Size);
+   }   
+   bool Read(void *To,unsigned long Size,unsigned long *Actual = 0);

    bool Write(const void *From,unsigned long Size);
    bool Seek(unsigned long To);
    bool Write(const void *From,unsigned long Size);
    bool Seek(unsigned long To);

+   bool Skip(unsigned long To);
+   bool Truncate(unsigned long To);

    unsigned long Tell();
    unsigned long Size();
    unsigned long Tell();
    unsigned long Size();

+   bool Open(string FileName,OpenMode Mode,unsigned long Perms = 0666);

    bool Close();
    bool Close();

-
+   bool Sync();
+   

    // Simple manipulators
    inline int Fd() {return iFd;};
    // Simple manipulators
    inline int Fd() {return iFd;};

+   inline void Fd(int fd) {iFd = fd;};

    inline bool IsOpen() {return iFd >= 0;};
    inline bool Failed() {return (Flags & Fail) == Fail;};
    inline void EraseOnFailure() {Flags |= DelOnFail;};
    inline void OpFail() {Flags |= Fail;};
    inline bool IsOpen() {return iFd >= 0;};
    inline bool Failed() {return (Flags & Fail) == Fail;};
    inline void EraseOnFailure() {Flags |= DelOnFail;};
    inline void OpFail() {Flags |= Fail;};

+   inline bool Eof() {return (Flags & HitEof) == HitEof;};

    inline string &Name() {return FileName;};
    
    inline string &Name() {return FileName;};
    

-   FileFd(string FileName,OpenMode Mode,unsigned long Perms = 0666);
-   FileFd(int Fd) : iFd(Fd), Flags(AutoClose) {};
+   FileFd(string FileName,OpenMode Mode,unsigned long Perms = 0666) : iFd(-1), 
+            Flags(0) 
+   {
+      Open(FileName,Mode,Perms);
+   };
+   FileFd(int Fd = -1) : iFd(Fd), Flags(AutoClose) {};

    FileFd(int Fd,bool) : iFd(Fd), Flags(0) {};
    virtual ~FileFd();
 };
    FileFd(int Fd,bool) : iFd(Fd), Flags(0) {};
    virtual ~FileFd();
 };


@@ -66,10 +86,15 @@ bool FileExists(string File);
 string SafeGetCWD();
 void SetCloseExec(int Fd,bool Close);
 void SetNonBlock(int Fd,bool Block);
 string SafeGetCWD();
 void SetCloseExec(int Fd,bool Close);
 void SetNonBlock(int Fd,bool Block);

-bool WaitFd(int Fd);
+bool WaitFd(int Fd,bool write = false,unsigned long timeout = 0);
+pid_t ExecFork();
+bool ExecWait(pid_t Pid,const char *Name,bool Reap = false);

 
 // File string manipulators
 string flNotDir(string File);
 string flNotFile(string File);
 
 // File string manipulators
 string flNotDir(string File);
 string flNotFile(string File);

+string flNoLink(string File);
+string flExtension(string File);
+string flCombine(string Dir,string File);

 
 #endif
 
 #endif