Fix for hurd

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

diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index aa2d2ee2eddc33ce488800913a1656bc5bc78b5b..f35cf04d69116b038cdc60a350797d929699115a 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.2 1998/07/07 04:17:13 jgg Exp $
+// $Id: fileutl.h,v 1.12 1999/01/18 06:20:08 jgg Exp $

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


@@ -18,17 +18,16 @@
    
    ##################################################################### */
                                                                        /*}}}*/
    
    ##################################################################### */
                                                                        /*}}}*/

-// Header section: pkglib

 #ifndef PKGLIB_FILEUTL_H
 #define PKGLIB_FILEUTL_H
 
 #ifdef __GNUG__
 #ifndef PKGLIB_FILEUTL_H
 #define PKGLIB_FILEUTL_H
 
 #ifdef __GNUG__

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

 #endif 
 
 #include <string>
 
 #endif 
 
 #include <string>
 

-class File
+class FileFd

 {
    protected:
    int iFd;
 {
    protected:
    int iFd;


@@ -38,11 +37,12 @@ class File
    string FileName;
    
    public:
    string FileName;
    
    public:

-   enum OpenMode {ReadOnly,WriteEmpty,WriteExists};
+   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);

+   unsigned long Tell();

    unsigned long Size();
    bool Close();
 
    unsigned long Size();
    bool Close();
 


@@ -52,16 +52,24 @@ class File
    inline bool Failed() {return (Flags & Fail) == Fail;};
    inline void EraseOnFailure() {Flags |= DelOnFail;};
    inline void OpFail() {Flags |= Fail;};
    inline bool Failed() {return (Flags & Fail) == Fail;};
    inline void EraseOnFailure() {Flags |= DelOnFail;};
    inline void OpFail() {Flags |= Fail;};

-      
-   File(string FileName,OpenMode Mode,unsigned long Perms = 0666);
-   File(int Fd) : iFd(Fd), Flags(AutoClose) {};
-   File(int Fd,bool) : iFd(Fd), Flags(0) {};
-   virtual ~File();
+   inline string &Name() {return FileName;};
+   
+   FileFd(string FileName,OpenMode Mode,unsigned long Perms = 0666);
+   FileFd(int Fd) : iFd(Fd), Flags(AutoClose) {};
+   FileFd(int Fd,bool) : iFd(Fd), Flags(0) {};
+   virtual ~FileFd();

 };
 
 };
 

-bool CopyFile(string From,string To);
+bool CopyFile(FileFd &From,FileFd &To);

 int GetLock(string File,bool Errors = true);
 bool FileExists(string File);
 string SafeGetCWD();
 int GetLock(string File,bool Errors = true);
 bool FileExists(string File);
 string SafeGetCWD();

+void SetCloseExec(int Fd,bool Close);
+void SetNonBlock(int Fd,bool Block);
+bool WaitFd(int Fd);
+
+// File string manipulators
+string flNotDir(string File);
+string flNotFile(string File);

 
 #endif
 
 #endif