Macintosh-HW/RASCSI
1
0
Fork 0
mirror of https://github.com/akuker/RASCSI.git synced 2024-11-18 21:07:52 +00:00
Code Issues Projects Releases Wiki Activity

Updated error handling

Browse Source
This commit is contained in:
Uwe Seimet 2021-09-15 16:35:51 +02:00
parent 7f68f9b91f
commit 4ff271eeec
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/raspberrypi/rascsi.cpp
View File

@ -707,12 +707,12 @@ string SetReservedIds(const list<string>& ids_to_reserve)
bool CreateImage(int fd, const PbCommand& command) bool CreateImage(int fd, const PbCommand& command)
{ {
if (command.params().size() < 2 || command.params().Get(0).empty() || command.params().Get(1).empty()) { if (command.params().size() < 3 || command.params().Get(0).empty() || command.params().Get(1).empty()
return ReturnStatus(fd, false, "Can't create image file: Missing filename or file size"); || command.params().Get(2).empty()) {
return ReturnStatus(fd, false, "Can't create image file: Missing filename, file size or permission");
} }
int permissions = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH; int permissions = S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH;
if (command.params().size() > 2) {
const char *permission = command.params().Get(2).c_str(); const char *permission = command.params().Get(2).c_str();
if (strcasecmp(permission, "true") && strcasecmp(permission, "false")) { if (strcasecmp(permission, "true") && strcasecmp(permission, "false")) {
return ReturnStatus(fd, false, "Invalid read-only setting '" + command.params().Get(2) + "'"); return ReturnStatus(fd, false, "Invalid read-only setting '" + command.params().Get(2) + "'");
@ -721,7 +721,6 @@ bool CreateImage(int fd, const PbCommand& command)
if (!strcasecmp(permission, "true")) { if (!strcasecmp(permission, "true")) {
permissions = S_IRUSR | S_IRGRP | S_IROTH; permissions = S_IRUSR | S_IRGRP | S_IROTH;
} }
}
string filename = command.params().Get(0); string filename = command.params().Get(0);
if (filename.find('/') != string::npos) { if (filename.find('/') != string::npos) {