godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-08 12:40:44 +00:00
Code Releases Wiki Activity

[FileAccess] Set last_error on file read/write errors.

Browse Source
This commit is contained in:
bruvzg
2024-12-02 12:03:28 +02:00
committed by Pāvels Nadtočajevs
parent 893bbdfde8
commit d97313cd7d
4 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/unix/file_access_unix.cpp
View File

@@ -46,10 +46,18 @@
#include <stdlib.h> #include <stdlib.h>
#endif #endif
void FileAccessUnix::check_errors() const { void FileAccessUnix::check_errors(bool p_write) const {
ERR_FAIL_NULL_MSG(f, "File must be opened before use."); ERR_FAIL_NULL_MSG(f, "File must be opened before use.");
if (feof(f)) { last_error = OK;
if (ferror(f)) {
if (p_write) {
last_error = ERR_FILE_CANT_WRITE;
} else {
last_error = ERR_FILE_CANT_READ;
}
}
if (!p_write && feof(f)) {
last_error = ERR_FILE_EOF; last_error = ERR_FILE_EOF;
} }
} }
@@ -217,7 +225,6 @@ String FileAccessUnix::get_real_path() const {
void FileAccessUnix::seek(uint64_t p_position) { void FileAccessUnix::seek(uint64_t p_position) {
ERR_FAIL_NULL_MSG(f, "File must be opened before use."); ERR_FAIL_NULL_MSG(f, "File must be opened before use.");
last_error = OK;
if (fseeko(f, p_position, SEEK_SET)) { if (fseeko(f, p_position, SEEK_SET)) {
check_errors(); check_errors();
} }
@@ -256,7 +263,7 @@ uint64_t FileAccessUnix::get_length() const {
} }
bool FileAccessUnix::eof_reached() const { bool FileAccessUnix::eof_reached() const {
return last_error == ERR_FILE_EOF; return feof(f);
} }
uint64_t FileAccessUnix::get_buffer(uint8_t *p_dst, uint64_t p_length) const { uint64_t FileAccessUnix::get_buffer(uint8_t *p_dst, uint64_t p_length) const {
@@ -298,7 +305,9 @@ void FileAccessUnix::flush() {
bool FileAccessUnix::store_buffer(const uint8_t *p_src, uint64_t p_length) { bool FileAccessUnix::store_buffer(const uint8_t *p_src, uint64_t p_length) {
ERR_FAIL_NULL_V_MSG(f, false, "File must be opened before use."); ERR_FAIL_NULL_V_MSG(f, false, "File must be opened before use.");
ERR_FAIL_COND_V(!p_src && p_length > 0, false); ERR_FAIL_COND_V(!p_src && p_length > 0, false);
return fwrite(p_src, 1, p_length, f) == p_length; bool res = fwrite(p_src, 1, p_length, f) == p_length;
check_errors(true);
return res;
} }
bool FileAccessUnix::file_exists(const String &p_path) { bool FileAccessUnix::file_exists(const String &p_path) {

2
drivers/unix/file_access_unix.h
View File

@@ -43,7 +43,7 @@ typedef void (*CloseNotificationFunc)(const String &p_file, int p_flags);
class FileAccessUnix : public FileAccess { class FileAccessUnix : public FileAccess {
FILE *f = nullptr; FILE *f = nullptr;
int flags = 0; int flags = 0;
void check_errors() const; void check_errors(bool p_write = false) const;
mutable Error last_error = OK; mutable Error last_error = OK;
String save_path; String save_path;
String path; String path;

20
drivers/windows/file_access_windows.cpp
View File

@@ -52,10 +52,18 @@
#define S_ISREG(m) ((m) & _S_IFREG) #define S_ISREG(m) ((m) & _S_IFREG)
#endif #endif
void FileAccessWindows::check_errors() const { void FileAccessWindows::check_errors(bool p_write) const {
ERR_FAIL_NULL(f); ERR_FAIL_NULL(f);
if (feof(f)) { last_error = OK;
if (ferror(f)) {
if (p_write) {
last_error = ERR_FILE_CANT_WRITE;
} else {
last_error = ERR_FILE_CANT_READ;
}
}
if (!p_write && feof(f)) {
last_error = ERR_FILE_EOF; last_error = ERR_FILE_EOF;
} }
} }
@@ -284,7 +292,6 @@ bool FileAccessWindows::is_open() const {
void FileAccessWindows::seek(uint64_t p_position) { void FileAccessWindows::seek(uint64_t p_position) {
ERR_FAIL_NULL(f); ERR_FAIL_NULL(f);
last_error = OK;
if (_fseeki64(f, p_position, SEEK_SET)) { if (_fseeki64(f, p_position, SEEK_SET)) {
check_errors(); check_errors();
} }
@@ -320,8 +327,7 @@ uint64_t FileAccessWindows::get_length() const {
} }
bool FileAccessWindows::eof_reached() const { bool FileAccessWindows::eof_reached() const {
check_errors(); return feof(f);
return last_error == ERR_FILE_EOF;
} }
uint64_t FileAccessWindows::get_buffer(uint8_t *p_dst, uint64_t p_length) const { uint64_t FileAccessWindows::get_buffer(uint8_t *p_dst, uint64_t p_length) const {
@@ -385,7 +391,9 @@ bool FileAccessWindows::store_buffer(const uint8_t *p_src, uint64_t p_length) {
prev_op = WRITE; prev_op = WRITE;
} }
return fwrite(p_src, 1, p_length, f) == (size_t)p_length; bool res = fwrite(p_src, 1, p_length, f) == (size_t)p_length;
check_errors(true);
return res;
} }
bool FileAccessWindows::file_exists(const String &p_name) { bool FileAccessWindows::file_exists(const String &p_name) {

2
drivers/windows/file_access_windows.h
View File

@@ -41,7 +41,7 @@
class FileAccessWindows : public FileAccess { class FileAccessWindows : public FileAccess {
FILE *f = nullptr; FILE *f = nullptr;
int flags = 0; int flags = 0;
void check_errors() const; void check_errors(bool p_write = false) const;
mutable int prev_op = 0; mutable int prev_op = 0;
mutable Error last_error = OK; mutable Error last_error = OK;
String path; String path;