summaryrefslogtreecommitdiff
path: root/apt-pkg/contrib
diff options
context:
space:
mode:
Diffstat (limited to 'apt-pkg/contrib')
-rw-r--r--apt-pkg/contrib/fileutl.cc37
-rw-r--r--apt-pkg/contrib/fileutl.h16
-rw-r--r--apt-pkg/contrib/mmap.cc6
-rw-r--r--apt-pkg/contrib/mmap.h8
4 files changed, 36 insertions, 31 deletions
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 6f515fd67..b29b2e098 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.5 1998/07/15 05:56:43 jgg Exp $
+// $Id: fileutl.cc,v 1.6 1998/07/19 04:42:12 jgg Exp $
/* ######################################################################
File Utilities
@@ -29,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;
@@ -108,10 +108,10 @@ string SafeGetCWD()
}
/*}}}*/
-// 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 = AutoClose;
switch (Mode)
@@ -128,6 +128,11 @@ File::File(string FileName,OpenMode Mode, unsigned long Perms)
case WriteExists:
iFd = open(FileName.c_str(),O_RDWR);
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)
@@ -136,19 +141,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)
{
@@ -159,10 +164,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)
{
@@ -173,10 +178,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)
{
@@ -187,10 +192,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)
@@ -198,10 +203,10 @@ 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)
diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index 3328ce2b4..b53b499ab 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.3 1998/07/12 23:58:49 jgg Exp $
+// $Id: fileutl.h,v 1.4 1998/07/19 04:42:13 jgg Exp $
/* ######################################################################
File Utilities
@@ -28,7 +28,7 @@
#include <string>
-class File
+class FileFd
{
protected:
int iFd;
@@ -38,7 +38,7 @@ class File
string FileName;
public:
- enum OpenMode {ReadOnly,WriteEmpty,WriteExists};
+ enum OpenMode {ReadOnly,WriteEmpty,WriteExists,LockEmpty};
bool Read(void *To,unsigned long Size);
bool Write(void *From,unsigned long Size);
@@ -53,13 +53,13 @@ class File
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();
+ 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();
diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc
index 22251c95a..f8582a1ef 100644
--- a/apt-pkg/contrib/mmap.cc
+++ b/apt-pkg/contrib/mmap.cc
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: mmap.cc,v 1.6 1998/07/15 05:56:44 jgg Exp $
+// $Id: mmap.cc,v 1.7 1998/07/19 04:42:14 jgg Exp $
/* ######################################################################
MMap Class - Provides 'real' mmap or a faked mmap using read().
@@ -39,7 +39,7 @@
// MMap::MMap - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
-MMap::MMap(File &F,unsigned long Flags) : Fd(F), Flags(Flags), iSize(0),
+MMap::MMap(FileFd &F,unsigned long Flags) : Fd(F), Flags(Flags), iSize(0),
Base(0)
{
if ((Flags & NoImmMap) != NoImmMap)
@@ -124,7 +124,7 @@ bool MMap::Sync(unsigned long Start,unsigned long Stop)
// DynamicMMap::DynamicMMap - Constructor /*{{{*/
// ---------------------------------------------------------------------
/* */
-DynamicMMap::DynamicMMap(File &F,unsigned long Flags,unsigned long WorkSpace) :
+DynamicMMap::DynamicMMap(FileFd &F,unsigned long Flags,unsigned long WorkSpace) :
MMap(F,Flags | NoImmMap), WorkSpace(WorkSpace)
{
unsigned long EndOfFile = Fd.Size();
diff --git a/apt-pkg/contrib/mmap.h b/apt-pkg/contrib/mmap.h
index b935ac411..512b8bcf6 100644
--- a/apt-pkg/contrib/mmap.h
+++ b/apt-pkg/contrib/mmap.h
@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
-// $Id: mmap.h,v 1.5 1998/07/15 05:56:45 jgg Exp $
+// $Id: mmap.h,v 1.6 1998/07/19 04:42:15 jgg Exp $
/* ######################################################################
MMap Class - Provides 'real' mmap or a faked mmap using read().
@@ -37,7 +37,7 @@ class MMap
{
protected:
- File &Fd;
+ FileFd &Fd;
unsigned long Flags;
unsigned long iSize;
void *Base;
@@ -58,7 +58,7 @@ class MMap
bool Sync();
bool Sync(unsigned long Start,unsigned long Stop);
- MMap(File &F,unsigned long Flags);
+ MMap(FileFd &F,unsigned long Flags);
virtual ~MMap();
};
@@ -89,7 +89,7 @@ class DynamicMMap : public MMap
inline unsigned long WriteString(string S) {return WriteString(S.begin(),S.size());};
void UsePools(Pool &P,unsigned int Count) {Pools = &P; PoolCount = Count;};
- DynamicMMap(File &F,unsigned long Flags,unsigned long WorkSpace = 1024*1024);
+ DynamicMMap(FileFd &F,unsigned long Flags,unsigned long WorkSpace = 1024*1024);
virtual ~DynamicMMap();
};
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 10:07:10 +0000