summaryrefslogtreecommitdiffstatshomepage
path: root/3rdparty/lzma/CPP/Common/StdInStream.h
diff options
context:
space:
mode:
Diffstat (limited to '3rdparty/lzma/CPP/Common/StdInStream.h')
-rw-r--r--3rdparty/lzma/CPP/Common/StdInStream.h31
1 files changed, 22 insertions, 9 deletions
diff --git a/3rdparty/lzma/CPP/Common/StdInStream.h b/3rdparty/lzma/CPP/Common/StdInStream.h
index 6d9ed67040d..81ca3bf6f5d 100644
--- a/3rdparty/lzma/CPP/Common/StdInStream.h
+++ b/3rdparty/lzma/CPP/Common/StdInStream.h
@@ -1,7 +1,7 @@
// Common/StdInStream.h
-#ifndef __COMMON_STD_IN_STREAM_H
-#define __COMMON_STD_IN_STREAM_H
+#ifndef ZIP7_INC_COMMON_STD_IN_STREAM_H
+#define ZIP7_INC_COMMON_STD_IN_STREAM_H
#include <stdio.h>
@@ -11,20 +11,33 @@
class CStdInStream
{
FILE *_stream;
- bool _streamIsOpen;
+ // bool _streamIsOpen;
public:
- CStdInStream(): _stream(0), _streamIsOpen(false) {};
- CStdInStream(FILE *stream): _stream(stream), _streamIsOpen(false) {};
+ int CodePage;
+
+ CStdInStream(FILE *stream = NULL):
+ _stream(stream),
+ // _streamIsOpen(false),
+ CodePage(-1)
+ {}
+
+ /*
~CStdInStream() { Close(); }
bool Open(LPCTSTR fileName) throw();
bool Close() throw();
+ */
+
+ // returns:
+ // false, if ZERO character in stream
+ // true, if EOF or '\n'
+ bool ScanAStringUntilNewLine(AString &s);
+ bool ScanUStringUntilNewLine(UString &s);
+ // bool ReadToString(AString &resultString);
- AString ScanStringUntilNewLine(bool allowEOF = false);
- void ReadToString(AString &resultString);
- UString ScanUStringUntilNewLine();
+ bool Eof() const throw() { return (feof(_stream) != 0); }
+ bool Error() const throw() { return (ferror(_stream) != 0); }
- bool Eof() throw();
int GetChar();
};