aboutsummaryrefslogtreecommitdiffstats
path: root/src/input/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'src/input/plugins')
-rw-r--r--src/input/plugins/FileInputPlugin.cxx47
1 files changed, 17 insertions, 30 deletions
diff --git a/src/input/plugins/FileInputPlugin.cxx b/src/input/plugins/FileInputPlugin.cxx
index 32ec71679..aa4676470 100644
--- a/src/input/plugins/FileInputPlugin.cxx
+++ b/src/input/plugins/FileInputPlugin.cxx
@@ -24,6 +24,8 @@
#include "util/Error.hxx"
#include "util/Domain.hxx"
#include "fs/Path.hxx"
+#include "fs/FileInfo.hxx"
+#include "fs/io/FileReader.hxx"
#include "system/FileDescriptor.hxx"
#include <sys/stat.h>
@@ -33,22 +35,18 @@
static constexpr Domain file_domain("file");
class FileInputStream final : public InputStream {
- FileDescriptor fd;
+ FileReader reader;
public:
- FileInputStream(const char *path, FileDescriptor _fd, off_t _size,
+ FileInputStream(const char *path, FileReader &&_reader, off_t _size,
Mutex &_mutex, Cond &_cond)
:InputStream(path, _mutex, _cond),
- fd(_fd) {
+ reader(std::move(_reader)) {
size = _size;
seekable = true;
SetReady();
}
- ~FileInputStream() {
- fd.Close();
- }
-
/* virtual methods from InputStream */
bool IsEOF() override {
@@ -64,33 +62,27 @@ OpenFileInputStream(Path path,
Mutex &mutex, Cond &cond,
Error &error)
{
- FileDescriptor fd;
- if (!fd.OpenReadOnly(path.c_str())) {
- error.FormatErrno("Failed to open \"%s\"",
- path.c_str());
+ FileReader reader(path, error);
+ if (!reader.IsDefined())
return nullptr;
- }
- struct stat st;
- if (fstat(fd.Get(), &st) < 0) {
- error.FormatErrno("Failed to stat \"%s\"", path.c_str());
- fd.Close();
+ FileInfo info;
+ if (!reader.GetFileInfo(info, error))
return nullptr;
- }
- if (!S_ISREG(st.st_mode)) {
+ if (!info.IsRegular()) {
error.Format(file_domain, "Not a regular file: %s",
path.c_str());
- fd.Close();
return nullptr;
}
#ifdef POSIX_FADV_SEQUENTIAL
- posix_fadvise(fd.Get(), (off_t)0, st.st_size, POSIX_FADV_SEQUENTIAL);
+ posix_fadvise(reader.GetFD().Get(), (off_t)0, info.GetSize(),
+ POSIX_FADV_SEQUENTIAL);
#endif
return new FileInputStream(path.ToUTF8().c_str(),
- fd, st.st_size,
+ std::move(reader), info.GetSize(),
mutex, cond);
}
@@ -107,24 +99,19 @@ input_file_open(gcc_unused const char *filename,
bool
FileInputStream::Seek(offset_type new_offset, Error &error)
{
- auto result = fd.Seek((off_t)new_offset);
- if (result < 0) {
- error.SetErrno("Failed to seek");
+ if (!reader.Seek((off_t)new_offset, error))
return false;
- }
- offset = (offset_type)result;
+ offset = new_offset;
return true;
}
size_t
FileInputStream::Read(void *ptr, size_t read_size, Error &error)
{
- ssize_t nbytes = fd.Read(ptr, read_size);
- if (nbytes < 0) {
- error.SetErrno("Failed to read");
+ ssize_t nbytes = reader.Read(ptr, read_size, error);
+ if (nbytes < 0)
return 0;
- }
offset += nbytes;
return (size_t)nbytes;