summaryrefslogtreecommitdiffstats
path: root/drivers/unix
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/unix')
-rw-r--r--drivers/unix/file_access_unix.cpp37
-rw-r--r--drivers/unix/ip_unix.cpp65
-rw-r--r--drivers/unix/os_unix.cpp4
3 files changed, 30 insertions, 76 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) {
diff --git a/drivers/unix/ip_unix.cpp b/drivers/unix/ip_unix.cpp
index ec60d9e91a..5987c1675d 100644
--- a/drivers/unix/ip_unix.cpp
+++ b/drivers/unix/ip_unix.cpp
@@ -32,19 +32,21 @@
#if defined(UNIX_ENABLED) || defined(WINDOWS_ENABLED)
-#include <string.h>
-
#ifdef WINDOWS_ENABLED
-#include <stdio.h>
+
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#include <winsock2.h>
#include <ws2tcpip.h>
-#ifndef UWP_ENABLED
+
#include <iphlpapi.h>
-#endif
+
+#include <stdio.h>
+
#else // UNIX
+
#include <netdb.h>
+
#ifdef ANDROID_ENABLED
// We could drop this file once we up our API level to 24,
// where the NDK's ifaddrs.h supports to needed getifaddrs.
@@ -55,13 +57,19 @@
#endif
#include <ifaddrs.h>
#endif
+
#include <arpa/inet.h>
#include <sys/socket.h>
+
#ifdef __FreeBSD__
#include <netinet/in.h>
#endif
-#include <net/if.h> // Order is important on OpenBSD, leave as last
-#endif
+
+#include <net/if.h> // Order is important on OpenBSD, leave as last.
+
+#endif // UNIX
+
+#include <string.h>
static IPAddress _sockaddr2ip(struct sockaddr *p_addr) {
IPAddress ip;
@@ -126,42 +134,6 @@ void IPUnix::_resolve_hostname(List<IPAddress> &r_addresses, const String &p_hos
#if defined(WINDOWS_ENABLED)
-#if defined(UWP_ENABLED)
-
-void IPUnix::get_local_interfaces(HashMap<String, Interface_Info> *r_interfaces) const {
- using namespace Windows::Networking;
- using namespace Windows::Networking::Connectivity;
-
- // Returns addresses, not interfaces.
- auto hostnames = NetworkInformation::GetHostNames();
-
- for (int i = 0; i < hostnames->Size; i++) {
- auto hostname = hostnames->GetAt(i);
-
- if (hostname->Type != HostNameType::Ipv4 && hostname->Type != HostNameType::Ipv6) {
- continue;
- }
-
- String name = hostname->RawName->Data();
- HashMap<String, Interface_Info>::Element *E = r_interfaces->find(name);
- if (!E) {
- Interface_Info info;
- info.name = name;
- info.name_friendly = hostname->DisplayName->Data();
- info.index = String::num_uint64(0);
- E = r_interfaces->insert(name, info);
- ERR_CONTINUE(!E);
- }
-
- Interface_Info &info = E->get();
-
- IPAddress ip = IPAddress(hostname->CanonicalName->Data());
- info.ip_addresses.push_front(ip);
- }
-}
-
-#else
-
void IPUnix::get_local_interfaces(HashMap<String, Interface_Info> *r_interfaces) const {
ULONG buf_size = 1024;
IP_ADAPTER_ADDRESSES *addrs;
@@ -208,8 +180,6 @@ void IPUnix::get_local_interfaces(HashMap<String, Interface_Info> *r_interfaces)
memfree(addrs);
}
-#endif
-
#else // UNIX
void IPUnix::get_local_interfaces(HashMap<String, Interface_Info> *r_interfaces) const {
@@ -248,7 +218,8 @@ void IPUnix::get_local_interfaces(HashMap<String, Interface_Info> *r_interfaces)
freeifaddrs(ifAddrStruct);
}
}
-#endif
+
+#endif // UNIX
void IPUnix::make_default() {
_create = _create_unix;
@@ -261,4 +232,4 @@ IP *IPUnix::_create_unix() {
IPUnix::IPUnix() {
}
-#endif
+#endif // UNIX_ENABLED || WINDOWS_ENABLED
diff --git a/drivers/unix/os_unix.cpp b/drivers/unix/os_unix.cpp
index 1ffacdf98d..4d9549c5a6 100644
--- a/drivers/unix/os_unix.cpp
+++ b/drivers/unix/os_unix.cpp
@@ -495,7 +495,7 @@ Error OS_Unix::execute(const String &p_path, const List<String> &p_arguments, St
}
FILE *f = popen(command.utf8().get_data(), "r");
- ERR_FAIL_COND_V_MSG(!f, ERR_CANT_OPEN, "Cannot create pipe from command: " + command);
+ ERR_FAIL_NULL_V_MSG(f, ERR_CANT_OPEN, "Cannot create pipe from command: " + command + ".");
char buf[65535];
while (fgets(buf, 65535, f)) {
if (p_pipe_mutex) {
@@ -647,7 +647,7 @@ Error OS_Unix::open_dynamic_library(const String p_path, void *&p_library_handle
}
p_library_handle = dlopen(path.utf8().get_data(), RTLD_NOW);
- ERR_FAIL_COND_V_MSG(!p_library_handle, ERR_CANT_OPEN, vformat("Can't open dynamic library: %s. Error: %s.", p_path, dlerror()));
+ ERR_FAIL_NULL_V_MSG(p_library_handle, ERR_CANT_OPEN, vformat("Can't open dynamic library: %s. Error: %s.", p_path, dlerror()));
if (r_resolved_path != nullptr) {
*r_resolved_path = path;