mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-04-13 01:00:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #102365 from bruvzg/pipe_buffer_chk

Browse Source 
Implement `get_length()` for pipes.
This commit is contained in:
Thaddeus Crews 2025-02-03 11:14:40 -06:00
commit ccc306a454
No known key found for this signature in database
GPG Key ID: 62181B86FE9E5D84
6 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/io/file_access.cpp
View File

@ -451,7 +451,7 @@ String FileAccess::get_line() const {
uint8_t c = get_8();
while (!eof_reached()) {
if (c == '\n' || c == '\0') {
if (c == '\n' || c == '\0' || get_error() != OK) {
line.push_back(0);
return String::utf8(line.get_data());
} else if (c != '\r') {

2
doc/classes/FileAccess.xml
View File

@ -204,7 +204,7 @@
<method name="get_length" qualifiers="const">
<return type="int" />
<description>
Returns the size of the file in bytes.
Returns the size of the file in bytes. For a pipe, returns the number of bytes available for reading from the pipe.
</description>
</method>
<method name="get_line" qualifiers="const">

9
drivers/unix/file_access_unix_pipe.cpp
View File

@ -37,6 +37,7 @@
#include <errno.h>
#include <fcntl.h>
#include <sys/ioctl.h>
#include <sys/stat.h>
#include <sys/types.h>
#include <unistd.h>
@ -132,6 +133,14 @@ String FileAccessUnixPipe::get_path_absolute() const {
return path_src;
}
uint64_t FileAccessUnixPipe::get_length() const {
ERR_FAIL_COND_V_MSG(fd[0] < 0, 0, "Pipe must be opened before use.");
int buf_rem = 0;
ERR_FAIL_COND_V(ioctl(fd[0], FIONREAD, &buf_rem) != 0, 0);
return buf_rem;
}
uint64_t FileAccessUnixPipe::get_buffer(uint8_t *p_dst, uint64_t p_length) const {
ERR_FAIL_COND_V_MSG(fd[0] < 0, -1, "Pipe must be opened before use.");
ERR_FAIL_COND_V(!p_dst && p_length > 0, -1);

2
drivers/unix/file_access_unix_pipe.h
View File

@ -61,7 +61,7 @@ public:
virtual void seek(uint64_t p_position) override {}
virtual void seek_end(int64_t p_position = 0) override {}
virtual uint64_t get_position() const override { return 0; }
virtual uint64_t get_length() const override { return 0; }
virtual uint64_t get_length() const override;
virtual bool eof_reached() const override { return false; }

8
drivers/windows/file_access_windows_pipe.cpp
View File

@ -102,6 +102,14 @@ String FileAccessWindowsPipe::get_path_absolute() const {
return path_src;
}
uint64_t FileAccessWindowsPipe::get_length() const {
ERR_FAIL_COND_V_MSG(fd[0] == nullptr, -1, "Pipe must be opened before use.");
DWORD buf_rem = 0;
ERR_FAIL_COND_V(!PeekNamedPipe(fd[0], nullptr, 0, nullptr, &buf_rem, nullptr), 0);
return buf_rem;
}
uint64_t FileAccessWindowsPipe::get_buffer(uint8_t *p_dst, uint64_t p_length) const {
ERR_FAIL_COND_V_MSG(fd[0] == nullptr, -1, "Pipe must be opened before use.");
ERR_FAIL_COND_V(!p_dst && p_length > 0, -1);

2
drivers/windows/file_access_windows_pipe.h
View File

@ -60,7 +60,7 @@ public:
virtual void seek(uint64_t p_position) override {}
virtual void seek_end(int64_t p_position = 0) override {}
virtual uint64_t get_position() const override { return 0; }
virtual uint64_t get_length() const override { return 0; }
virtual uint64_t get_length() const override;
virtual bool eof_reached() const override { return false; }