X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/d38b7b3d803a719b189df80820aeda6a818f4909..aac2e51078714d5130861035e9b3b5d4d6b84471:/apt-pkg/contrib/fileutl.h diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h index 31af3d28b..041aa3309 100644 --- a/apt-pkg/contrib/fileutl.h +++ b/apt-pkg/contrib/fileutl.h @@ -1,6 +1,6 @@ // -*- mode: cpp; mode: fold -*- // Description /*{{{*/ -// $Id: fileutl.h,v 1.9 1998/11/23 07:03:07 jgg Exp $ +// $Id: fileutl.h,v 1.26 2001/05/07 05:06:52 jgg Exp $ /* ###################################################################### File Utilities @@ -18,7 +18,6 @@ ##################################################################### */ /*}}}*/ -// Header section: pkglib #ifndef PKGLIB_FILEUTL_H #define PKGLIB_FILEUTL_H @@ -28,33 +27,55 @@ #include +using std::string; + 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: - enum OpenMode {ReadOnly,WriteEmpty,WriteExists,WriteAny}; + enum OpenMode {ReadOnly,WriteEmpty,WriteExists,WriteAny,WriteTemp}; - bool Read(void *To,unsigned long Size); - bool Write(void *From,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 Skip(unsigned long To); + bool Truncate(unsigned long To); + unsigned long Tell(); unsigned long Size(); + bool Open(string FileName,OpenMode Mode,unsigned long Perms = 0666); bool Close(); - + bool Sync(); + // 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;}; - - FileFd(string FileName,OpenMode Mode,unsigned long Perms = 0666); - FileFd(int Fd) : iFd(Fd), Flags(AutoClose) {}; + inline bool Eof() {return (Flags & HitEof) == HitEof;}; + inline string &Name() {return FileName;}; + + 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(); }; @@ -65,10 +86,15 @@ bool FileExists(string File); 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); +string flNoLink(string File); +string flExtension(string File); +string flCombine(string Dir,string File); #endif