Macintosh-HW/RASCSI
1
0
Fork 0
mirror of https://github.com/akuker/RASCSI.git synced 2024-05-28 09:41:33 +00:00
Code Issues Projects Releases Wiki Activity

Update result handling

Browse Source
This commit is contained in:
Uwe Seimet 2023-11-15 23:50:53 +01:00
parent a1a860f4e7
commit 475b625d9d
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
cpp/scsiexec/scsiexec_core.cpp
View File

@ -12,6 +12,7 @@
#include "hal/gpiobus_factory.h"
#include "controllers/controller_manager.h"
#include "shared/piscsi_util.h"
#include <google/protobuf/util/json_util.h>
#include <spdlog/spdlog.h>
#include <filesystem>
#include <csignal>
@ -20,6 +21,7 @@
using namespace std;
using namespace filesystem;
using namespace google::protobuf::util;
using namespace spdlog;
using namespace scsi_defs;
using namespace piscsi_util;
@ -186,9 +188,8 @@ int ScsiExec::run(span<char*> args, bool in_process)
scsi_executor->SetTarget(target_id, target_lun);
bool status = false;
if (shut_down) {
status = scsi_executor->ShutDown();
const bool status = scsi_executor->ShutDown();
CleanUp();
@ -197,13 +198,24 @@ int ScsiExec::run(span<char*> args, bool in_process)
PbResult result;
string error;
status = scsi_executor->Execute(input_filename, binary, result, error);
const bool status = scsi_executor->Execute(input_filename, binary, result, error);
if (!status) {
cerr << "Error: " << error << endl;
CleanUp();
return status ? EXIT_SUCCESS : EXIT_FAILURE;
return EXIT_FAILURE;
}
if (output_filename.empty()) {
string json;
MessageToJsonString(result, &json);
cout << json << '\n' << flush;
CleanUp();
return EXIT_SUCCESS;
}
// TODO File output