Macintosh-HW/RASCSI
1
0
Fork 0
mirror of https://github.com/akuker/RASCSI.git synced 2025-02-04 01:30:40 +00:00
Code Issues Projects Releases Wiki Activity

Improved error message if ID is already in use

Browse Source
This commit is contained in:
Uwe Seimet 2021-08-28 08:34:50 +02:00
parent 8571a5c735
commit 7191364c88
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/raspberrypi/rascsi.cpp
View File

@ -32,6 +32,7 @@
#include <string>
#include <sstream>
#include <iostream>
#include <map>
#include <vector>
#include <filesystem>
@ -65,7 +66,8 @@ static void *MonThread(void *param);
vector<string> log_levels;
string current_log_level; // Some versions of spdlog do not support get_log_level()
string default_image_folder;
set<string> files_in_use;
typedef pair<int, int> full_id;
map<string, full_id> files_in_use;
DeviceFactory& device_factory = DeviceFactory::instance();
//---------------------------------------------------------------------------
@ -758,13 +760,16 @@ bool ProcessCmd(int fd, const PbDeviceDefinition& pbDevice, const PbOperation cm
}
}
if (files_in_use.find(filepath.GetPath()) != files_in_use.end()) {
const string path = filepath.GetPath();
if (files_in_use.find(path) != files_in_use.end()) {
delete device;
return ReturnStatus(fd, false, "Image file '" + filename + "' is already in use");
const auto& full_id = files_in_use[path];
error << "Image file '" << filename << "' is already used by ID " << full_id.first << ", unit " << full_id.second;
return ReturnStatus(fd, false, error);
}
files_in_use.insert(filepath.GetPath());
files_in_use[path] = make_pair(device->GetId(), device->GetLun());
}
// Stop the dry run here, before permanently modifying something