From 61a8796ddbc1669184bdb5b947796305243da4eb Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Tue, 25 Aug 2009 15:34:52 +0000 Subject: Make LLVM command-line tools overwrite their output files without -f. This is conventional command-line tool behavior. -f now just means "enable binary output on terminals". Add a -f option to llvm-extract and llvm-link, for consistency. Remove F_Force from raw_fd_ostream and enable overwriting and truncating by default. Introduce an F_Excl flag to permit users to enable a failure when the file already exists. This flag is currently unused. Update Makefiles and documentation accordingly. llvm-svn: 79990 --- llvm/tools/llvm-link/llvm-link.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'llvm/tools/llvm-link/llvm-link.cpp') diff --git a/llvm/tools/llvm-link/llvm-link.cpp b/llvm/tools/llvm-link/llvm-link.cpp index 6dc04e67228..14327af70c3 100644 --- a/llvm/tools/llvm-link/llvm-link.cpp +++ b/llvm/tools/llvm-link/llvm-link.cpp @@ -22,6 +22,7 @@ #include "llvm/Support/MemoryBuffer.h" #include "llvm/Support/PrettyStackTrace.h" #include "llvm/Support/raw_ostream.h" +#include "llvm/Support/SystemUtils.h" #include "llvm/System/Signals.h" #include "llvm/System/Path.h" #include @@ -35,7 +36,8 @@ static cl::opt OutputFilename("o", cl::desc("Override output filename"), cl::init("-"), cl::value_desc("filename")); -static cl::opt Force("f", cl::desc("Overwrite output files")); +static cl::opt +Force("f", cl::desc("Enable binary output on terminals")); static cl::opt Verbose("v", cl::desc("Print information about actions taken")); @@ -122,12 +124,9 @@ int main(int argc, char **argv) { std::string ErrorInfo; std::auto_ptr Out(new raw_fd_ostream(OutputFilename.c_str(), ErrorInfo, - raw_fd_ostream::F_Binary | - (Force ? raw_fd_ostream::F_Force : 0))); + raw_fd_ostream::F_Binary)); if (!ErrorInfo.empty()) { errs() << ErrorInfo << '\n'; - if (!Force) - errs() << "Use -f command line argument to force output\n"; return 1; } @@ -142,7 +141,8 @@ int main(int argc, char **argv) { } if (Verbose) errs() << "Writing bitcode...\n"; - WriteBitcodeToFile(Composite.get(), *Out); + if (Force || !CheckBitcodeOutputToConsole(*Out, true)) + WriteBitcodeToFile(Composite.get(), *Out); return 0; } -- cgit v1.2.3