Macintosh-HW
/
RASCSI
mirror of https://github.com/akuker/RASCSI.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update output handling

This commit is contained in:
Uwe Seimet 2023-11-16 00:00:24 +01:00
parent 475b625d9d
commit f48700ec75
1 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
cpp/scsiexec/scsiexec_core.cpp
View File

@ -18,6 +18,7 @@
#include <csignal>
#include <cstring>
#include <iostream>
#include <fstream>
using namespace std;
using namespace filesystem;
@ -135,14 +136,6 @@ void ScsiExec::ParseArguments(span<char*> args)
}
}
if (shut_down) {
return;
}
if (input_filename.empty()) {
throw parser_exception("Missing input filename");
}
if (target_id == -1) {
throw parser_exception("Missing target ID");
}
@ -150,6 +143,14 @@ void ScsiExec::ParseArguments(span<char*> args)
if (target_lun == -1) {
target_lun = 0;
}
if (shut_down) {
return;
}
if (input_filename.empty()) {
throw parser_exception("Missing input filename");
}
}
int ScsiExec::run(span<char*> args, bool in_process)
@ -218,7 +219,25 @@ int ScsiExec::run(span<char*> args, bool in_process)
return EXIT_SUCCESS;
}
// TODO File output
if (binary) {
ofstream out(output_filename, ios::binary);
if (out.fail()) {
cerr << "Error: " << "Can't open binary protobuf output file '" << output_filename << "'" << endl;
}
const string data = result.SerializeAsString();
out.write(data.data(), data.size());
}
else {
ofstream out(output_filename);
if (out.fail()) {
cerr << "Error: " << "Can't open JSON protobuf output file '" << output_filename << "'" << endl;
}
string json;
MessageToJsonString(result, &json);
out << json << '\n';
}
CleanUp();