From 47882583cb1a7b2b7cec3a5d0691559b52ee4d5f Mon Sep 17 00:00:00 2001 From: NAKAMURA Takumi Date: Mon, 13 Apr 2015 04:54:19 +0000 Subject: [PATCH] Revert r234615, "Have one raw_fd_ostream constructor forward to the other." It broke MSVCRT hosts: LLVM :: Object/check_binary_output.ll LLVM :: Object/extract.ll git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@234721 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Support/raw_ostream.cpp | 42 +++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 18 deletions(-) diff --git a/lib/Support/raw_ostream.cpp b/lib/Support/raw_ostream.cpp index 199f0a6185b..37e892e6864 100644 --- a/lib/Support/raw_ostream.cpp +++ b/lib/Support/raw_ostream.cpp @@ -487,41 +487,47 @@ void format_object_base::home() { // raw_fd_ostream //===----------------------------------------------------------------------===// -static int getFD(StringRef Filename, std::error_code &EC, - sys::fs::OpenFlags Flags) { +raw_fd_ostream::raw_fd_ostream(StringRef Filename, std::error_code &EC, + sys::fs::OpenFlags Flags) + : Error(false), UseAtomicWrites(false), pos(0) { + EC = std::error_code(); // Handle "-" as stdout. Note that when we do this, we consider ourself // the owner of stdout. This means that we can do things like close the // file descriptor when we're done and set the "binary" flag globally. if (Filename == "-") { - EC = std::error_code(); + FD = STDOUT_FILENO; // If user requested binary then put stdout into binary mode if // possible. if (!(Flags & sys::fs::F_Text)) sys::ChangeStdoutToBinary(); - return STDOUT_FILENO; + // Close stdout when we're done, to detect any output errors. + ShouldClose = true; + return; } - int FD; EC = sys::fs::openFileForWrite(Filename, FD, Flags); - if (EC) - return -1; - return FD; -} + if (EC) { + ShouldClose = false; + return; + } -raw_fd_ostream::raw_fd_ostream(StringRef Filename, std::error_code &EC, - sys::fs::OpenFlags Flags) - : raw_fd_ostream(getFD(Filename, EC, Flags), true) {} + // Ok, we successfully opened the file, so it'll need to be closed. + ShouldClose = true; +} /// FD is the file descriptor that this writes to. If ShouldClose is true, this /// closes the file when the stream is destroyed. raw_fd_ostream::raw_fd_ostream(int fd, bool shouldClose, bool unbuffered) - : raw_ostream(unbuffered), FD(fd), - ShouldClose(shouldClose), Error(false), UseAtomicWrites(false) { - if (FD < 0 ) { - ShouldClose = false; - return; - } + : raw_ostream(unbuffered), FD(fd), ShouldClose(shouldClose), Error(false), + UseAtomicWrites(false) { +#ifdef O_BINARY + // Setting STDOUT to binary mode is necessary in Win32 + // to avoid undesirable linefeed conversion. + // Don't touch STDERR, or w*printf() (in assert()) would barf wide chars. + if (fd == STDOUT_FILENO) + setmode(fd, O_BINARY); +#endif // Get the starting position. off_t loc = ::lseek(FD, 0, SEEK_CUR); -- 2.34.1