aboutsummaryrefslogtreecommitdiff
path: root/CPP/Common/StdOutStream.h
diff options
context:
space:
mode:
authorIgor Pavlov <87184205+ip7z@users.noreply.github.com>2024-05-14 00:00:00 +0000
committerIgor Pavlov <87184205+ip7z@users.noreply.github.com>2024-05-15 23:55:04 +0500
commitfc662341e6f85da78ada0e443f6116b978f79f22 (patch)
tree1be1cc402a7a9cbc18d4eeea6b141354c2d559e3 /CPP/Common/StdOutStream.h
parent5b39dc76f1bc82f941d5c800ab9f34407a06b53a (diff)
download7zip-fc662341e6f85da78ada0e443f6116b978f79f22.tar.gz
7zip-fc662341e6f85da78ada0e443f6116b978f79f22.tar.bz2
7zip-fc662341e6f85da78ada0e443f6116b978f79f22.zip
24.0524.05
Diffstat (limited to 'CPP/Common/StdOutStream.h')
-rw-r--r--CPP/Common/StdOutStream.h17
1 files changed, 13 insertions, 4 deletions
diff --git a/CPP/Common/StdOutStream.h b/CPP/Common/StdOutStream.h
index bd15d7c..846b0db 100644
--- a/CPP/Common/StdOutStream.h
+++ b/CPP/Common/StdOutStream.h
@@ -14,6 +14,7 @@ class CStdOutStream
14 // bool _streamIsOpen; 14 // bool _streamIsOpen;
15public: 15public:
16 bool IsTerminalMode; 16 bool IsTerminalMode;
17 CBoolPair ListPathSeparatorSlash;
17 int CodePage; 18 int CodePage;
18 19
19 CStdOutStream(FILE *stream = NULL): 20 CStdOutStream(FILE *stream = NULL):
@@ -21,7 +22,14 @@ public:
21 // _streamIsOpen(false), 22 // _streamIsOpen(false),
22 IsTerminalMode(false), 23 IsTerminalMode(false),
23 CodePage(-1) 24 CodePage(-1)
24 {} 25 {
26 ListPathSeparatorSlash.Val =
27#ifdef _WIN32
28 false;
29#else
30 true;
31#endif
32 }
25 33
26 // ~CStdOutStream() { Close(); } 34 // ~CStdOutStream() { Close(); }
27 35
@@ -62,12 +70,13 @@ public:
62 void PrintUString(const UString &s, AString &temp); 70 void PrintUString(const UString &s, AString &temp);
63 void Convert_UString_to_AString(const UString &src, AString &dest); 71 void Convert_UString_to_AString(const UString &src, AString &dest);
64 72
65 void Normalize_UString_LF_Allowed(UString &s);
66 void Normalize_UString(UString &s); 73 void Normalize_UString(UString &s);
74 void Normalize_UString_Path(UString &s);
67 75
68 void NormalizePrint_UString(const UString &s, UString &tempU, AString &tempA); 76 void NormalizePrint_UString_Path(const UString &s, UString &tempU, AString &tempA);
77 void NormalizePrint_UString_Path(const UString &s);
69 void NormalizePrint_UString(const UString &s); 78 void NormalizePrint_UString(const UString &s);
70 void NormalizePrint_wstr(const wchar_t *s); 79 void NormalizePrint_wstr_Path(const wchar_t *s);
71}; 80};
72 81
73CStdOutStream & endl(CStdOutStream & outStream) throw(); 82CStdOutStream & endl(CStdOutStream & outStream) throw();