diff options
Diffstat (limited to 'drivers/unix/file_access_unix.cpp')
| -rw-r--r-- | drivers/unix/file_access_unix.cpp | 37 |
1 files changed, 10 insertions, 27 deletions
diff --git a/drivers/unix/file_access_unix.cpp b/drivers/unix/file_access_unix.cpp index 3b15cf60f7..ca5a13799e 100644 --- a/drivers/unix/file_access_unix.cpp +++ b/drivers/unix/file_access_unix.cpp @@ -39,21 +39,10 @@ #include <fcntl.h> #include <sys/stat.h> #include <sys/types.h> - -#if defined(UNIX_ENABLED) #include <unistd.h> -#endif - -#ifdef MSVC -#define S_ISREG(m) ((m)&_S_IFREG) -#include <io.h> -#endif -#ifndef S_ISREG -#define S_ISREG(m) ((m)&S_IFREG) -#endif void FileAccessUnix::check_errors() const { - ERR_FAIL_COND_MSG(!f, "File must be opened before use."); + ERR_FAIL_NULL_MSG(f, "File must be opened before use."); if (feof(f)) { last_error = ERR_FILE_EOF; @@ -185,7 +174,7 @@ String FileAccessUnix::get_path_absolute() const { } void FileAccessUnix::seek(uint64_t p_position) { - ERR_FAIL_COND_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)) { @@ -194,7 +183,7 @@ void FileAccessUnix::seek(uint64_t p_position) { } void FileAccessUnix::seek_end(int64_t p_position) { - ERR_FAIL_COND_MSG(!f, "File must be opened before use."); + ERR_FAIL_NULL_MSG(f, "File must be opened before use."); if (fseeko(f, p_position, SEEK_END)) { check_errors(); @@ -202,7 +191,7 @@ void FileAccessUnix::seek_end(int64_t p_position) { } uint64_t FileAccessUnix::get_position() const { - ERR_FAIL_COND_V_MSG(!f, 0, "File must be opened before use."); + ERR_FAIL_NULL_V_MSG(f, 0, "File must be opened before use."); int64_t pos = ftello(f); if (pos < 0) { @@ -213,7 +202,7 @@ uint64_t FileAccessUnix::get_position() const { } uint64_t FileAccessUnix::get_length() const { - ERR_FAIL_COND_V_MSG(!f, 0, "File must be opened before use."); + ERR_FAIL_NULL_V_MSG(f, 0, "File must be opened before use."); int64_t pos = ftello(f); ERR_FAIL_COND_V(pos < 0, 0); @@ -230,7 +219,7 @@ bool FileAccessUnix::eof_reached() const { } uint8_t FileAccessUnix::get_8() const { - ERR_FAIL_COND_V_MSG(!f, 0, "File must be opened before use."); + ERR_FAIL_NULL_V_MSG(f, 0, "File must be opened before use."); uint8_t b; if (fread(&b, 1, 1, f) == 0) { check_errors(); @@ -241,7 +230,7 @@ uint8_t FileAccessUnix::get_8() const { uint64_t FileAccessUnix::get_buffer(uint8_t *p_dst, uint64_t p_length) const { ERR_FAIL_COND_V(!p_dst && p_length > 0, -1); - ERR_FAIL_COND_V_MSG(!f, -1, "File must be opened before use."); + ERR_FAIL_NULL_V_MSG(f, -1, "File must be opened before use."); uint64_t read = fread(p_dst, 1, p_length, f); check_errors(); @@ -253,17 +242,17 @@ Error FileAccessUnix::get_error() const { } void FileAccessUnix::flush() { - ERR_FAIL_COND_MSG(!f, "File must be opened before use."); + ERR_FAIL_NULL_MSG(f, "File must be opened before use."); fflush(f); } void FileAccessUnix::store_8(uint8_t p_dest) { - ERR_FAIL_COND_MSG(!f, "File must be opened before use."); + ERR_FAIL_NULL_MSG(f, "File must be opened before use."); ERR_FAIL_COND(fwrite(&p_dest, 1, 1, f) != 1); } void FileAccessUnix::store_buffer(const uint8_t *p_src, uint64_t p_length) { - ERR_FAIL_COND_MSG(!f, "File must be opened before use."); + ERR_FAIL_NULL_MSG(f, "File must be opened before use."); ERR_FAIL_COND(!p_src && p_length > 0); ERR_FAIL_COND(fwrite(p_src, 1, p_length, f) != p_length); } @@ -279,16 +268,10 @@ bool FileAccessUnix::file_exists(const String &p_path) { return false; } -#ifdef UNIX_ENABLED // See if we have access to the file if (access(filename.utf8().get_data(), F_OK)) { return false; } -#else - if (_access(filename.utf8().get_data(), 4) == -1) { - return false; - } -#endif // See if this is a regular file switch (st.st_mode & S_IFMT) { |