Macintosh-HW/RASCSI
1
0
Fork 0
mirror of https://github.com/akuker/RASCSI.git synced 2024-12-23 06:30:04 +00:00
Code Issues Projects Releases Wiki Activity

Added support for creating read-only image files

Browse Source
This commit is contained in:
Uwe Seimet 2021-09-15 14:51:01 +02:00
parent 7ed22bf33b
commit c72837a4a3
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/raspberrypi/rascsi.cpp
View File

@ -711,6 +711,18 @@ bool CreateImage(int fd, const PbCommand& command)
return ReturnStatus(fd, false, "Can't create image file: Missing filename or file size"); return ReturnStatus(fd, false, "Can't create image file: Missing filename or file size");
} }
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();
if (strcasecmp(permission, "true") && strcasecmp(permission, "false")) {
return ReturnStatus(fd, false, "Invalid read-only setting '" + command.params().Get(2) + "'");
}
if (!strcasecmp(permission, "true")) {
permissions = S_IRUSR | S_IWUSR | S_IRGRP;
}
}
string filename = command.params().Get(0); string filename = command.params().Get(0);
if (filename.find('/') != string::npos) { if (filename.find('/') != string::npos) {
return ReturnStatus(fd, false, "The image filename '" + filename + "' must not contain a path"); return ReturnStatus(fd, false, "The image filename '" + filename + "' must not contain a path");
@ -740,7 +752,7 @@ bool CreateImage(int fd, const PbCommand& command)
} }
// Since rascsi is running as root ensure that others can access the file // Since rascsi is running as root ensure that others can access the file
int image_fd = open(filename.c_str(), O_CREAT|O_WRONLY, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | S_IWOTH); int image_fd = open(filename.c_str(), O_CREAT|O_WRONLY, permissions);
if (image_fd == -1) { if (image_fd == -1) {
return ReturnStatus(fd, false, "Can't create image file '" + filename + "': " + string(strerror(errno))); return ReturnStatus(fd, false, "Can't create image file '" + filename + "': " + string(strerror(errno)));
} }
@ -754,7 +766,7 @@ bool CreateImage(int fd, const PbCommand& command)
close(image_fd); close(image_fd);
ostringstream msg; ostringstream msg;
msg << "Created image file '" << filename + "' with a size of " << len << " bytes"; msg << "Created " << (permissions & S_IWUSR ? "": "read-only ") << "image file '" << filename + "' with a size of " << len << " bytes";
LOGINFO("%s", msg.str().c_str()); LOGINFO("%s", msg.str().c_str());
return ReturnStatus(fd); return ReturnStatus(fd);

2
src/raspberrypi/rascsi_interface.proto
View File

@ -61,6 +61,8 @@ enum PbOperation {
RESERVE = 14; RESERVE = 14;
// Create an image file. The image file must not yet exist. // Create an image file. The image file must not yet exist.
// PbCommand.params(0) contains the filename, PbCommand.params(1) contains the file size in bytes. // PbCommand.params(0) contains the filename, PbCommand.params(1) contains the file size in bytes.
// PbCommand.params(2) is optional (default is false) and controls the file permissions.
// If "true" (case-insensitive) a read-only file is created.
// The filename is relative to the default image folder and must not contain a slash. // The filename is relative to the default image folder and must not contain a slash.
// The file size must be a multiple of 512. // The file size must be a multiple of 512.
CREATE_IMAGE = 15; CREATE_IMAGE = 15;