From 9e7acd465edb7b7ed826349703933af5bc7697f5 Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Tue, 21 Dec 2004 07:51:33 +0000 Subject: [PATCH] For PR351: Remove unix specific code (use of errno and read) from the reader. Thanks to Jeff Cohen for pointing this out. llvm-svn: 19081 --- llvm/lib/Bytecode/Reader/ReaderWrappers.cpp | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/llvm/lib/Bytecode/Reader/ReaderWrappers.cpp b/llvm/lib/Bytecode/Reader/ReaderWrappers.cpp index c799567a4a6c..9b8491327fa4 100644 --- a/llvm/lib/Bytecode/Reader/ReaderWrappers.cpp +++ b/llvm/lib/Bytecode/Reader/ReaderWrappers.cpp @@ -20,6 +20,7 @@ #include "llvm/ADT/StringExtras.h" #include "llvm/System/MappedFile.h" #include +#include using namespace llvm; //===----------------------------------------------------------------------===// @@ -41,10 +42,6 @@ namespace { }; } -static std::string ErrnoMessage (int savedErrNum, std::string descr) { - return ::strerror(savedErrNum) + std::string(", while trying to ") + descr; -} - BytecodeFileReader::BytecodeFileReader(const std::string &Filename, llvm::BytecodeHandler* H ) : BytecodeReader(H) @@ -133,14 +130,14 @@ namespace { BytecodeStdinReader::BytecodeStdinReader( BytecodeHandler* H ) : BytecodeReader(H) { - int BlockSize; - unsigned char Buffer[4096*4]; + char Buffer[4096*4]; // Read in all of the data from stdin, we cannot mmap stdin... - while ((BlockSize = ::read(0 /*stdin*/, Buffer, 4096*4))) { - if (BlockSize == -1) - throw ErrnoMessage(errno, "read from standard input"); - + while (std::cin.good()) { + std::cin.read(Buffer, 4096*4); + int BlockSize = std::cin.gcount(); + if (0 >= BlockSize) + break; FileData.insert(FileData.end(), Buffer, Buffer+BlockSize); } -- GitLab