properly format multiline error messages

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

diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index 57d3ab8412f58cab599c6380c7ad13c26b364080..f33f7804b0d65f1574f462c7bbbb4bffd5fe3233 100644 (file)
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -45,6 +45,7 @@ class FileFd
    friend class GzipFileFdPrivate;
    friend class Bz2FileFdPrivate;
    friend class LzmaFileFdPrivate;
    friend class GzipFileFdPrivate;
    friend class Bz2FileFdPrivate;
    friend class LzmaFileFdPrivate;

+   friend class Lz4FileFdPrivate;

    friend class DirectFileFdPrivate;
    friend class PipedFileFdPrivate;
    protected:
    friend class DirectFileFdPrivate;
    friend class PipedFileFdPrivate;
    protected:


@@ -66,6 +67,7 @@ class FileFd
        Exclusive = (1 << 3),
        Atomic = Exclusive | (1 << 4),
        Empty = (1 << 5),
        Exclusive = (1 << 3),
        Atomic = Exclusive | (1 << 4),
        Empty = (1 << 5),

+       BufferedWrite = (1 << 6),

 
        WriteEmpty = ReadWrite | Create | Empty,
        WriteExists = ReadWrite,
 
        WriteEmpty = ReadWrite | Create | Empty,
        WriteExists = ReadWrite,


@@ -74,7 +76,7 @@ class FileFd
        ReadOnlyGzip,
        WriteAtomic = ReadWrite | Create | Atomic
    };
        ReadOnlyGzip,
        WriteAtomic = ReadWrite | Create | Atomic
    };

-   enum CompressMode { Auto = 'A', None = 'N', Extension = 'E', Gzip = 'G', Bzip2 = 'B', Lzma = 'L', Xz = 'X' };
+   enum CompressMode { Auto = 'A', None = 'N', Extension = 'E', Gzip = 'G', Bzip2 = 'B', Lzma = 'L', Xz = 'X', Lz4='4' };

    
    inline bool Read(void *To,unsigned long long Size,bool AllowEof)
    {
    
    inline bool Read(void *To,unsigned long long Size,bool AllowEof)
    {


@@ -85,6 +87,7 @@ class FileFd
    }   
    bool Read(void *To,unsigned long long Size,unsigned long long *Actual = 0);
    char* ReadLine(char *To, unsigned long long const Size);
    }   
    bool Read(void *To,unsigned long long Size,unsigned long long *Actual = 0);
    char* ReadLine(char *To, unsigned long long const Size);

+   bool Flush();

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