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

Update shutdown

This commit is contained in:
Uwe Seimet 2023-11-16 00:11:38 +01:00
parent f48700ec75
commit f217aa156c
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cpp/scsiexec/scsi_executor.cpp
View File

@ -83,7 +83,6 @@ bool ScsiExecutor::Execute(const string& filename, bool binary, PbResult& result
bool ScsiExecutor::ShutDown()
{
array<uint8_t, 6> cdb = { };
cdb[4] = 0x02;
phase_executor->Execute(scsi_command::eCmdStartStop, cdb, buffer, 0, 0);

12
cpp/scsiexec/scsiexec_core.cpp
View File

@ -199,8 +199,7 @@ int ScsiExec::run(span<char*> args, bool in_process)
PbResult result;
string error;
const bool status = scsi_executor->Execute(input_filename, binary, result, error);
if (!status) {
if (scsi_executor->Execute(input_filename, binary, result, error)) {
cerr << "Error: " << error << endl;
CleanUp();
@ -211,8 +210,7 @@ int ScsiExec::run(span<char*> args, bool in_process)
if (output_filename.empty()) {
string json;
MessageToJsonString(result, &json);
cout << json << '\n' << flush;
cout << json << '\n';
CleanUp();
@ -222,7 +220,7 @@ int ScsiExec::run(span<char*> args, bool in_process)
if (binary) {
ofstream out(output_filename, ios::binary);
if (out.fail()) {
cerr << "Error: " << "Can't open binary protobuf output file '" << output_filename << "'" << endl;
cerr << "Error: " << "Can't open binary output file '" << output_filename << "'" << endl;
}
const string data = result.SerializeAsString();
@ -231,7 +229,7 @@ int ScsiExec::run(span<char*> args, bool in_process)
else {
ofstream out(output_filename);
if (out.fail()) {
cerr << "Error: " << "Can't open JSON protobuf output file '" << output_filename << "'" << endl;
cerr << "Error: " << "Can't open JSON output file '" << output_filename << "'" << endl;
}
string json;
@ -241,7 +239,7 @@ int ScsiExec::run(span<char*> args, bool in_process)
CleanUp();
return status ? EXIT_SUCCESS : EXIT_FAILURE;
return EXIT_SUCCESS;
}
bool ScsiExec::SetLogLevel() const