diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-06-11 10:41:43 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-06-11 10:41:43 -0300 |
| commit | 64e83bfd1404ea593f0c79b478d196a3fcde42a8 (patch) | |
| tree | c18c61da239443532a94fb9fa54df702df12a90b /drivers/unix | |
| parent | 9b8696d3dd92e2ed6f310ad0f0bf3c2182c9c6ae (diff) | |
| parent | 5f5cd5e6d1508f85ac1bffa44e122b4dc0e2bb1d (diff) | |
Merge branch 'master' of https://github.com/okamstudio/godot
Diffstat (limited to 'drivers/unix')
| -rw-r--r-- | drivers/unix/dir_access_unix.cpp | 20 | ||||
| -rw-r--r-- | drivers/unix/dir_access_unix.h | 4 | ||||
| -rw-r--r-- | drivers/unix/tcp_server_posix.cpp | 3 |
3 files changed, 26 insertions, 1 deletions
diff --git a/drivers/unix/dir_access_unix.cpp b/drivers/unix/dir_access_unix.cpp index fff86c5a7e..452d791d96 100644 --- a/drivers/unix/dir_access_unix.cpp +++ b/drivers/unix/dir_access_unix.cpp @@ -81,6 +81,26 @@ bool DirAccessUnix::file_exists(String p_file) { } +bool DirAccessUnix::dir_exists(String p_dir) { + + GLOBAL_LOCK_FUNCTION + + + if (p_dir.is_rel_path()) + p_dir=current_dir+"/"+p_dir; + else + p_dir=fix_path(p_dir); + + struct stat flags; + bool success = (stat(p_dir.utf8().get_data(),&flags)==0); + + if (success && S_ISDIR(flags.st_mode)) + return true; + + return false; + +} + uint64_t DirAccessUnix::get_modified_time(String p_file) { if (p_file.is_rel_path()) diff --git a/drivers/unix/dir_access_unix.h b/drivers/unix/dir_access_unix.h index 7ede4fc31c..119cb5c3f4 100644 --- a/drivers/unix/dir_access_unix.h +++ b/drivers/unix/dir_access_unix.h @@ -66,7 +66,9 @@ public: virtual String get_current_dir(); ///< return current dir location virtual Error make_dir(String p_dir); - virtual bool file_exists(String p_file); + virtual bool file_exists(String p_file); + virtual bool dir_exists(String p_dir); + virtual uint64_t get_modified_time(String p_file); diff --git a/drivers/unix/tcp_server_posix.cpp b/drivers/unix/tcp_server_posix.cpp index f91ad36ef9..dfcf479fc0 100644 --- a/drivers/unix/tcp_server_posix.cpp +++ b/drivers/unix/tcp_server_posix.cpp @@ -93,6 +93,9 @@ Error TCPServerPosix::listen(uint16_t p_port,const List<String> *p_accepted_host close(sockfd); ERR_FAIL_V(FAILED); }; + } + else { + return ERR_ALREADY_IN_USE; }; if (listen_sockfd != -1) { |