Fixed espy's bug with experimental

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

diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index 01dc46b1355669c2ea2c1a2a70207cdf07ffc9ff..4a6f6516e5dfeaa7c4a06fbe61735c834c28a536 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.8 1998/10/26 07:11:50 jgg Exp $
+// $Id: fileutl.h,v 1.17 1999/04/07 05:35:55 jgg Exp $

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


@@ -18,7 +18,6 @@
    
    ##################################################################### */
                                                                        /*}}}*/
    
    ##################################################################### */
                                                                        /*}}}*/

-// Header section: pkglib

 #ifndef PKGLIB_FILEUTL_H
 #define PKGLIB_FILEUTL_H
 
 #ifndef PKGLIB_FILEUTL_H
 #define PKGLIB_FILEUTL_H
 


@@ -38,23 +37,27 @@ class FileFd
    string FileName;
    
    public:
    string FileName;
    
    public:

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

    
    bool Read(void *To,unsigned long Size);
    
    bool Read(void *To,unsigned long Size);

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

    bool Seek(unsigned long To);
    bool Seek(unsigned long To);

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

    unsigned long Size();
    bool Close();
 
    // Simple manipulators
    inline int Fd() {return iFd;};
    unsigned long Size();
    bool Close();
 
    // 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 string &Name() {return FileName;};
+   

    FileFd(string FileName,OpenMode Mode,unsigned long Perms = 0666);
    FileFd(string FileName,OpenMode Mode,unsigned long Perms = 0666);

-   FileFd(int Fd) : iFd(Fd), Flags(AutoClose) {};
+   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();
 };


@@ -65,9 +68,10 @@ 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);

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

+string flNotFile(string File);

 
 #endif
 
 #endif