diff options
| -rw-r--r-- | tools/pnacl-freeze/pnacl-freeze.cpp | 15 | ||||
| -rw-r--r-- | tools/pnacl-thaw/pnacl-thaw.cpp | 15 |
2 files changed, 16 insertions, 14 deletions
diff --git a/tools/pnacl-freeze/pnacl-freeze.cpp b/tools/pnacl-freeze/pnacl-freeze.cpp index 963000a714..297edb85a7 100644 --- a/tools/pnacl-freeze/pnacl-freeze.cpp +++ b/tools/pnacl-freeze/pnacl-freeze.cpp @@ -31,19 +31,16 @@ using namespace llvm; static cl::opt<std::string> OutputFilename("o", cl::desc("Specify output filename"), - cl::value_desc("filename")); + cl::value_desc("filename"), cl::init("-")); static cl::opt<std::string> -InputFilename(cl::Positional, cl::desc("<pexe file>"), cl::Required); +InputFilename(cl::Positional, cl::desc("<pexe file>"), cl::init("-")); static void WriteOutputFile(const Module *M) { - std::string FrozenFilename = - (OutputFilename.size() == 0 ? (InputFilename + ".frozen") : OutputFilename); - std::string ErrorInfo; OwningPtr<tool_output_file> Out - (new tool_output_file(FrozenFilename.c_str(), ErrorInfo, + (new tool_output_file(OutputFilename.c_str(), ErrorInfo, raw_fd_ostream::F_Binary)); if (!ErrorInfo.empty()) { errs() << ErrorInfo << '\n'; @@ -72,7 +69,11 @@ int main(int argc, char **argv) { // Use the bitcode streaming interface DataStreamer *streamer = getDataFileStreamer(InputFilename, &ErrorMessage); if (streamer) { - std::string DisplayFilename = InputFilename; + std::string DisplayFilename; + if (InputFilename == "-") + DisplayFilename = "<stdin>"; + else + DisplayFilename = InputFilename; M.reset(getStreamedBitcodeModule(DisplayFilename, streamer, Context, &ErrorMessage)); if(M.get() != 0 && M->MaterializeAllPermanently(&ErrorMessage)) { diff --git a/tools/pnacl-thaw/pnacl-thaw.cpp b/tools/pnacl-thaw/pnacl-thaw.cpp index b28c357165..3060e7c073 100644 --- a/tools/pnacl-thaw/pnacl-thaw.cpp +++ b/tools/pnacl-thaw/pnacl-thaw.cpp @@ -30,19 +30,16 @@ using namespace llvm; static cl::opt<std::string> OutputFilename("o", cl::desc("Specify thawed pexe filename"), - cl::value_desc("filename")); + cl::value_desc("filename"), cl::init("-")); static cl::opt<std::string> -InputFilename(cl::Positional, cl::desc("<frozen file>"), cl::Required); +InputFilename(cl::Positional, cl::desc("<frozen file>"), cl::init("-")); static void WriteOutputFile(const Module *M) { - std::string ThawedFilename = - (OutputFilename.size() == 0 ? (InputFilename + ".thawed") : OutputFilename); - std::string ErrorInfo; OwningPtr<tool_output_file> Out - (new tool_output_file(ThawedFilename.c_str(), ErrorInfo, + (new tool_output_file(OutputFilename.c_str(), ErrorInfo, raw_fd_ostream::F_Binary)); if (!ErrorInfo.empty()) { errs() << ErrorInfo << '\n'; @@ -72,7 +69,11 @@ int main(int argc, char **argv) { // Use the bitcode streaming interface DataStreamer *streamer = getDataFileStreamer(InputFilename, &ErrorMessage); if (streamer) { - std::string DisplayFilename = InputFilename; + std::string DisplayFilename; + if (InputFilename == "-") + DisplayFilename = "<stdin>"; + else + DisplayFilename = InputFilename; M.reset(getNaClStreamedBitcodeModule(DisplayFilename, streamer, Context, &ErrorMessage)); if(M.get() != 0 && M->MaterializeAllPermanently(&ErrorMessage)) { |