From a1bdcedc3879510a874d24c450e07feb170d9cd6 Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Wed, 15 Jul 2009 17:29:42 +0000 Subject: Add a Force option to raw_fd_ostream to specify whether opening an existing file is considered an error. Convert several tools to use raw_fd_ostream instead of std::ostream, and to use this new option instead of doing a manual check. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@75801 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/llvm-link/llvm-link.cpp | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) (limited to 'tools/llvm-link') diff --git a/tools/llvm-link/llvm-link.cpp b/tools/llvm-link/llvm-link.cpp index f65e602f27..e6349fae5b 100644 --- a/tools/llvm-link/llvm-link.cpp +++ b/tools/llvm-link/llvm-link.cpp @@ -24,8 +24,6 @@ #include "llvm/Support/Streams.h" #include "llvm/System/Signals.h" #include "llvm/System/Path.h" -#include -#include #include using namespace llvm; @@ -122,20 +120,16 @@ int main(int argc, char **argv) { if (DumpAsm) cerr << "Here's the assembly:\n" << *Composite.get(); // FIXME: cout is not binary! - std::ostream *Out = &std::cout; // Default to printing to stdout... + raw_ostream *Out = &outs(); // Default to printing to stdout... if (OutputFilename != "-") { - if (!Force && std::ifstream(OutputFilename.c_str())) { - // If force is not specified, make sure not to overwrite a file! - cerr << argv[0] << ": error opening '" << OutputFilename - << "': file exists!\n" - << "Use -f command line argument to force output\n"; - return 1; - } - std::ios::openmode io_mode = std::ios::out | std::ios::trunc | - std::ios::binary; - Out = new std::ofstream(OutputFilename.c_str(), io_mode); - if (!Out->good()) { - cerr << argv[0] << ": error opening '" << OutputFilename << "'!\n"; + std::string ErrorInfo; + Out = new raw_fd_ostream(OutputFilename.c_str(), /*Binary=*/true, + Force, ErrorInfo); + if (!ErrorInfo.empty()) { + errs() << ErrorInfo << '\n'; + if (!Force) + errs() << "Use -f command line argument to force output\n"; + delete Out; return 1; } @@ -152,6 +146,6 @@ int main(int argc, char **argv) { if (Verbose) cerr << "Writing bitcode...\n"; WriteBitcodeToFile(Composite.get(), *Out); - if (Out != &std::cout) delete Out; + if (Out != &outs()) delete Out; return 0; } -- cgit v1.2.3