Merge branch 'master' into 816

1 files changed, 0 insertions, 78 deletions

diff --git a/other-licenses/7zstub/src/Common/StdInStream.cpp b/other-licenses/7zstub/src/Common/StdInStream.cpp
deleted file mode 100644
index e014f60b5..000000000
--- a/other-licenses/7zstub/src/Common/StdInStream.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-// Common/StdInStream.cpp

-

-#include "StdAfx.h"

-

-#include <tchar.h>

-#include "StdInStream.h"

-

-static const char kIllegalChar = '\0';

-static const char kNewLineChar = '\n';

-

-static const char *kEOFMessage = "Unexpected end of input stream";

-static const char *kReadErrorMessage  ="Error reading input stream"; 

-static const char *kIllegalCharMessage = "Illegal character in input stream";

-

-static LPCTSTR kFileOpenMode = TEXT("r");

-

-CStdInStream g_StdIn(stdin);

-

-bool CStdInStream::Open(LPCTSTR fileName)

-{

-  Close();

-  _stream = _tfopen(fileName, kFileOpenMode);

-  _streamIsOpen = (_stream != 0);

-  return _streamIsOpen;

-}

-

-bool CStdInStream::Close()

-{

-  if(!_streamIsOpen)

-    return true;

-  _streamIsOpen = (fclose(_stream) != 0);

-  return !_streamIsOpen;

-}

-

-CStdInStream::~CStdInStream()

-{

-  Close();

-}

-

-AString CStdInStream::ScanStringUntilNewLine()

-{

-  AString s;

-  while(true)

-  {

-    int intChar = GetChar();

-    if(intChar == EOF)

-      throw kEOFMessage;

-    char c = char(intChar);

-    if (c == kIllegalChar)

-      throw kIllegalCharMessage;

-    if(c == kNewLineChar)

-      return s;

-    s += c;

-  }

-}

-

-void CStdInStream::ReadToString(AString &resultString)

-{

-  resultString.Empty();

-  int c;

-  while((c = GetChar()) != EOF)

-    resultString += char(c);

-}

-

-bool CStdInStream::Eof()

-{

-  return (feof(_stream) != 0);

-}

-

-int CStdInStream::GetChar()

-{

-  int c = getc(_stream);

-  if(c == EOF && !Eof())

-    throw kReadErrorMessage;

-  return c;

-}

-

-