RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-05-16 20:25:07 +00:00
Code Issues Activity Actions

Kernel: Make File::absolute_path() const.

Browse source
This commit is contained in:
Andreas Kling 2019-06-01 18:56:56 +02:00
parent 00de8b9fc4
commit 2dd9ef6863
16 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Kernel/Devices/Device.cpp
View file

@ -14,7 +14,7 @@ Device::~Device()
VFS::the().unregister_device({}, *this); VFS::the().unregister_device({}, *this);
} }
String Device::absolute_path(FileDescriptor&) const String Device::absolute_path(const FileDescriptor&) const
{ {
return String::format("device:%u,%u (%s)", m_major, m_minor, class_name()); return String::format("device:%u,%u (%s)", m_major, m_minor, class_name());
} }

2
Kernel/Devices/Device.h
View file

@ -43,7 +43,7 @@ public:
unsigned major() const { return m_major; } unsigned major() const { return m_major; }
unsigned minor() const { return m_minor; } unsigned minor() const { return m_minor; }
virtual String absolute_path(FileDescriptor&) const override; virtual String absolute_path(const FileDescriptor&) const override;
uid_t uid() const { return m_uid; } uid_t uid() const { return m_uid; }
uid_t gid() const { return m_gid; } uid_t gid() const { return m_gid; }

2
Kernel/File.h
View file

@ -27,7 +27,7 @@ public:
virtual int ioctl(FileDescriptor&, unsigned request, unsigned arg); virtual int ioctl(FileDescriptor&, unsigned request, unsigned arg);
virtual KResultOr<Region*> mmap(Process&, LinearAddress preferred_laddr, size_t offset, size_t size, int prot); virtual KResultOr<Region*> mmap(Process&, LinearAddress preferred_laddr, size_t offset, size_t size, int prot);
virtual String absolute_path(FileDescriptor&) const = 0; virtual String absolute_path(const FileDescriptor&) const = 0;
virtual KResult truncate(off_t) { return KResult(-EINVAL); } virtual KResult truncate(off_t) { return KResult(-EINVAL); }

2
Kernel/FileSystem/FIFO.cpp
View file

@ -115,7 +115,7 @@ ssize_t FIFO::write(FileDescriptor&, const byte* buffer, ssize_t size)
return m_buffer.write(buffer, size); return m_buffer.write(buffer, size);
} }
String FIFO::absolute_path(FileDescriptor&) const String FIFO::absolute_path(const FileDescriptor&) const
{ {
return String::format("fifo:%u", this); return String::format("fifo:%u", this);
} }

2
Kernel/FileSystem/FIFO.h
View file

@ -33,7 +33,7 @@ private:
virtual ssize_t read(FileDescriptor&, byte*, ssize_t) override; virtual ssize_t read(FileDescriptor&, byte*, ssize_t) override;
virtual bool can_read(FileDescriptor&) const override; virtual bool can_read(FileDescriptor&) const override;
virtual bool can_write(FileDescriptor&) const override; virtual bool can_write(FileDescriptor&) const override;
virtual String absolute_path(FileDescriptor&) const override; virtual String absolute_path(const FileDescriptor&) const override;
virtual const char* class_name() const override { return "FIFO"; } virtual const char* class_name() const override { return "FIFO"; }
virtual bool is_fifo() const override { return true; } virtual bool is_fifo() const override { return true; }

2
Kernel/FileSystem/FileDescriptor.cpp
View file

@ -243,7 +243,7 @@ int FileDescriptor::close()
return 0; return 0;
} }
String FileDescriptor::absolute_path() String FileDescriptor::absolute_path() const
{ {
if (m_custody) if (m_custody)
return m_custody->absolute_path(); return m_custody->absolute_path();

2
Kernel/FileSystem/FileDescriptor.h
View file

@ -43,7 +43,7 @@ public:
ByteBuffer read_entire_file(); ByteBuffer read_entire_file();
String absolute_path(); String absolute_path() const;
bool is_directory() const; bool is_directory() const;

2
Kernel/FileSystem/InodeFile.cpp
View file

@ -41,7 +41,7 @@ KResultOr<Region*> InodeFile::mmap(Process& process, LinearAddress preferred_lad
return region; return region;
} }
String InodeFile::absolute_path(FileDescriptor& descriptor) const String InodeFile::absolute_path(const FileDescriptor& descriptor) const
{ {
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
ASSERT(descriptor.custody()); ASSERT(descriptor.custody());

2
Kernel/FileSystem/InodeFile.h
View file

@ -23,7 +23,7 @@ public:
virtual ssize_t write(FileDescriptor&, const byte*, ssize_t) override; virtual ssize_t write(FileDescriptor&, const byte*, ssize_t) override;
virtual KResultOr<Region*> mmap(Process&, LinearAddress preferred_laddr, size_t offset, size_t size, int prot) override; virtual KResultOr<Region*> mmap(Process&, LinearAddress preferred_laddr, size_t offset, size_t size, int prot) override;
virtual String absolute_path(FileDescriptor&) const override; virtual String absolute_path(const FileDescriptor&) const override;
virtual KResult truncate(off_t) override; virtual KResult truncate(off_t) override;

2
Kernel/Net/Socket.cpp
View file

@ -142,7 +142,7 @@ static const char* to_string(SocketRole role)
} }
} }
String Socket::absolute_path(FileDescriptor& descriptor) const String Socket::absolute_path(const FileDescriptor& descriptor) const
{ {
return String::format("socket:%x (role: %s)", this, to_string(descriptor.socket_role())); return String::format("socket:%x (role: %s)", this, to_string(descriptor.socket_role()));
} }

2
Kernel/Net/Socket.h
View file

@ -62,7 +62,7 @@ public:
Lock& lock() { return m_lock; } Lock& lock() { return m_lock; }
virtual String absolute_path(FileDescriptor&) const override; virtual String absolute_path(const FileDescriptor&) const override;
protected: protected:
Socket(int domain, int type, int protocol); Socket(int domain, int type, int protocol);

2
Kernel/ProcessTracer.cpp
View file

@ -29,7 +29,7 @@ int ProcessTracer::read(FileDescriptor&, byte* buffer, int buffer_size)
return sizeof(data); return sizeof(data);
} }
String ProcessTracer::absolute_path(FileDescriptor&) const String ProcessTracer::absolute_path(const FileDescriptor&) const
{ {
return String::format("tracer:%d", m_pid); return String::format("tracer:%d", m_pid);
} }

2
Kernel/ProcessTracer.h
View file

@ -18,7 +18,7 @@ public:
virtual bool can_write(FileDescriptor&) const override { return true; } virtual bool can_write(FileDescriptor&) const override { return true; }
virtual int write(FileDescriptor&, const byte*, int) override { return -EIO; } virtual int write(FileDescriptor&, const byte*, int) override { return -EIO; }
virtual String absolute_path(FileDescriptor&) const override; virtual String absolute_path(const FileDescriptor&) const override;
void did_syscall(dword function, dword arg1, dword arg2, dword arg3, dword result); void did_syscall(dword function, dword arg1, dword arg2, dword arg3, dword result);
pid_t pid() const { return m_pid; } pid_t pid() const { return m_pid; }

2
Kernel/SharedMemory.cpp
View file

@ -68,7 +68,7 @@ KResult SharedMemory::truncate(int length)
return KResult(-ENOTIMPL); return KResult(-ENOTIMPL);
} }
String SharedMemory::absolute_path(FileDescriptor&) const String SharedMemory::absolute_path(const FileDescriptor&) const
{ {
return String::format("shm:%u", this); return String::format("shm:%u", this);
} }

2
Kernel/SharedMemory.h
View file

@ -28,7 +28,7 @@ private:
virtual bool can_write(FileDescriptor&) const override { return true; } virtual bool can_write(FileDescriptor&) const override { return true; }
virtual int read(FileDescriptor&, byte*, int) override; virtual int read(FileDescriptor&, byte*, int) override;
virtual int write(FileDescriptor&, const byte*, int) override; virtual int write(FileDescriptor&, const byte*, int) override;
virtual String absolute_path(FileDescriptor&) const override; virtual String absolute_path(const FileDescriptor&) const override;
virtual const char* class_name() const override { return "SharedMemory"; } virtual const char* class_name() const override { return "SharedMemory"; }
virtual bool is_shared_memory() const override { return true; } virtual bool is_shared_memory() const override { return true; }
virtual KResultOr<Region*> mmap(Process&, LinearAddress, size_t offset, size_t size, int prot) override; virtual KResultOr<Region*> mmap(Process&, LinearAddress, size_t offset, size_t size, int prot) override;

2
Kernel/TTY/TTY.h
View file

@ -15,7 +15,7 @@ public:
virtual bool can_read(FileDescriptor&) const override; virtual bool can_read(FileDescriptor&) const override;
virtual bool can_write(FileDescriptor&) const override; virtual bool can_write(FileDescriptor&) const override;
virtual int ioctl(FileDescriptor&, unsigned request, unsigned arg) override final; virtual int ioctl(FileDescriptor&, unsigned request, unsigned arg) override final;
virtual String absolute_path(FileDescriptor&) const override { return tty_name(); } virtual String absolute_path(const FileDescriptor&) const override { return tty_name(); }
virtual String tty_name() const = 0; virtual String tty_name() const = 0;