From baa26395ccf17fc988bb9cf62d6659ca8415ece9 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. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@79990 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/GraphWriter.h | 2 +- include/llvm/Support/raw_ostream.h | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'include/llvm/Support') diff --git a/include/llvm/Support/GraphWriter.h b/include/llvm/Support/GraphWriter.h index b88dd3f..d5f2e74 100644 --- a/include/llvm/Support/GraphWriter.h +++ b/include/llvm/Support/GraphWriter.h @@ -274,7 +274,7 @@ sys::Path WriteGraph(const GraphType &G, const std::string &Name, errs() << "Writing '" << Filename.str() << "'... "; std::string ErrorInfo; - raw_fd_ostream O(Filename.c_str(), ErrorInfo, raw_fd_ostream::F_Force); + raw_fd_ostream O(Filename.c_str(), ErrorInfo); if (ErrorInfo.empty()) { WriteGraph(O, G, ShortNames, Name, Title); diff --git a/include/llvm/Support/raw_ostream.h b/include/llvm/Support/raw_ostream.h index 58253dd..a01d4cd 100644 --- a/include/llvm/Support/raw_ostream.h +++ b/include/llvm/Support/raw_ostream.h @@ -328,18 +328,17 @@ class raw_fd_ostream : public raw_ostream { public: enum { - /// F_Force - When opening a file, this flag makes raw_fd_ostream overwrite - /// a file if it already exists instead of emitting an error. This may not - /// be specified with F_Append. - F_Force = 1, + /// F_Excl - When opening a file, this flag makes raw_fd_ostream + /// report an error if the file already exists. + F_Excl = 1, /// F_Append - When opening a file, if it already exists append to the /// existing file instead of returning an error. This may not be specified - /// with F_Force. + /// with F_Excl. F_Append = 2, /// F_Binary - The file should be opened in binary mode on platforms that - /// support this distinction. + /// make this distinction. F_Binary = 4 }; -- cgit v1.1