summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/lzma/CPP/Common/StdOutStream.h
diff options
context:
space:
mode:
Diffstat (limited to '3rdparty/lzma/CPP/Common/StdOutStream.h')
-rw-r--r--3rdparty/lzma/CPP/Common/StdOutStream.h32
1 files changed, 24 insertions, 8 deletions
diff --git a/3rdparty/lzma/CPP/Common/StdOutStream.h b/3rdparty/lzma/CPP/Common/StdOutStream.h
index 1837bfb0adc..bd15d7cb208 100644
--- a/3rdparty/lzma/CPP/Common/StdOutStream.h
+++ b/3rdparty/lzma/CPP/Common/StdOutStream.h
@@ -1,7 +1,7 @@
// Common/StdOutStream.h
-#ifndef __COMMON_STD_OUT_STREAM_H
-#define __COMMON_STD_OUT_STREAM_H
+#ifndef ZIP7_INC_COMMON_STD_OUT_STREAM_H
+#define ZIP7_INC_COMMON_STD_OUT_STREAM_H
#include <stdio.h>
@@ -11,18 +11,28 @@
class CStdOutStream
{
FILE *_stream;
- bool _streamIsOpen;
+ // bool _streamIsOpen;
public:
- CStdOutStream(): _stream(0), _streamIsOpen(false) {};
- CStdOutStream(FILE *stream): _stream(stream), _streamIsOpen(false) {};
- ~CStdOutStream() { Close(); }
+ bool IsTerminalMode;
+ int CodePage;
+
+ CStdOutStream(FILE *stream = NULL):
+ _stream(stream),
+ // _streamIsOpen(false),
+ IsTerminalMode(false),
+ CodePage(-1)
+ {}
+
+ // ~CStdOutStream() { Close(); }
// void AttachStdStream(FILE *stream) { _stream = stream; _streamIsOpen = false; }
// bool IsDefined() const { return _stream != NULL; }
operator FILE *() { return _stream; }
+ /*
bool Open(const char *fileName) throw();
bool Close() throw();
+ */
bool Flush() throw();
CStdOutStream & operator<<(CStdOutStream & (* func)(CStdOutStream &))
@@ -50,6 +60,14 @@ public:
CStdOutStream & operator<<(const wchar_t *s);
void PrintUString(const UString &s, AString &temp);
+ void Convert_UString_to_AString(const UString &src, AString &dest);
+
+ void Normalize_UString_LF_Allowed(UString &s);
+ void Normalize_UString(UString &s);
+
+ void NormalizePrint_UString(const UString &s, UString &tempU, AString &tempA);
+ void NormalizePrint_UString(const UString &s);
+ void NormalizePrint_wstr(const wchar_t *s);
};
CStdOutStream & endl(CStdOutStream & outStream) throw();
@@ -57,6 +75,4 @@ CStdOutStream & endl(CStdOutStream & outStream) throw();
extern CStdOutStream g_StdOut;
extern CStdOutStream g_StdErr;
-void StdOut_Convert_UString_to_AString(const UString &s, AString &temp);
-
#endif