Skip to content

Fixed the error code returned when opening a file. #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nanshiki wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fixed the error code returned when opening a file. #11

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions netmount-server/netmount-server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -681,10 +681,14 @@ int process_request(ReplyCache::ReplyInfo & reply_info, const uint8_t * request_
result_open_mode = stack_attr & 0xFF;
// check that item exists, and is neither a volume nor a directory
const auto attr = drive.get_server_path_dos_properties(server_path, &properties);
if (attr == 0xFF || ((attr & (FAT_VOLUME | FAT_DIRECTORY)) != 0)) {
if (attr == FAT_ERROR_ATTR) {
error = true;
}
if ((result_open_mode & (OPEN_MODE_WRONLY | OPEN_MODE_RDWR)) && (attr & FAT_RO)) {
} else if ((attr & (FAT_VOLUME | FAT_DIRECTORY)) != 0) {
throw FilesystemError(
std::format(
"OPEN_FILE Item \"{}\" is either a DIR or a VOL\n", server_path.string()),
DOS_EXTERR_ACCESS_DENIED);
} else if ((result_open_mode & (OPEN_MODE_WRONLY | OPEN_MODE_RDWR)) && (attr & FAT_RO)) {
throw FilesystemError(
std::format(
"Access denied: File \"{}\" has the READ_ONLY attribute", server_path.string()),
Expand Down Expand Up @@ -729,10 +733,10 @@ int process_request(ReplyCache::ReplyInfo & reply_info, const uint8_t * request_
error = true;
}
} else if ((attr & (FAT_VOLUME | FAT_DIRECTORY)) != 0) {
log(LogLevel::WARNING,
"OPEN/CREATE/EXTENDED_OPEN_CREATE Item \"{}\" is either a DIR or a VOL\n",
server_path.string());
error = true;
throw FilesystemError(
std::format(
"OPEN/CREATE/EXTENDED_OPEN_CREATE Item \"{}\" is either a DIR or a VOL\n", server_path.string()),
DOS_EXTERR_ACCESS_DENIED);
} else {
log(LogLevel::DEBUG, "File exists already (attr 0x{:02X}) -> ", attr);
if ((result_open_mode & (OPEN_MODE_WRONLY | OPEN_MODE_RDWR)) && (attr & FAT_RO)) {
Expand Down