diff --git a/Kernel/Devices/Device.cpp b/Kernel/Devices/Device.cpp index fb636d376f..fe3c28f01f 100644 --- a/Kernel/Devices/Device.cpp +++ b/Kernel/Devices/Device.cpp @@ -14,7 +14,7 @@ Device::~Device() 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()); } diff --git a/Kernel/Devices/Device.h b/Kernel/Devices/Device.h index ce0b407aa7..93817896e8 100644 --- a/Kernel/Devices/Device.h +++ b/Kernel/Devices/Device.h @@ -43,7 +43,7 @@ public: unsigned major() const { return m_major; } 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 gid() const { return m_gid; } diff --git a/Kernel/File.h b/Kernel/File.h index 9daa97ca79..7398c2a180 100644 --- a/Kernel/File.h +++ b/Kernel/File.h @@ -27,7 +27,7 @@ public: virtual int ioctl(FileDescriptor&, unsigned request, unsigned arg); virtual KResultOr 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); } diff --git a/Kernel/FileSystem/FIFO.cpp b/Kernel/FileSystem/FIFO.cpp index e20c022dbd..5851b53ecd 100644 --- a/Kernel/FileSystem/FIFO.cpp +++ b/Kernel/FileSystem/FIFO.cpp @@ -115,7 +115,7 @@ ssize_t FIFO::write(FileDescriptor&, const byte* buffer, ssize_t 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); } diff --git a/Kernel/FileSystem/FIFO.h b/Kernel/FileSystem/FIFO.h index 72faae428d..50e1c88ea4 100644 --- a/Kernel/FileSystem/FIFO.h +++ b/Kernel/FileSystem/FIFO.h @@ -33,7 +33,7 @@ private: virtual ssize_t read(FileDescriptor&, byte*, ssize_t) override; virtual bool can_read(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 bool is_fifo() const override { return true; } diff --git a/Kernel/FileSystem/FileDescriptor.cpp b/Kernel/FileSystem/FileDescriptor.cpp index 9e4b3264ee..f7e7a36027 100644 --- a/Kernel/FileSystem/FileDescriptor.cpp +++ b/Kernel/FileSystem/FileDescriptor.cpp @@ -243,7 +243,7 @@ int FileDescriptor::close() return 0; } -String FileDescriptor::absolute_path() +String FileDescriptor::absolute_path() const { if (m_custody) return m_custody->absolute_path(); diff --git a/Kernel/FileSystem/FileDescriptor.h b/Kernel/FileSystem/FileDescriptor.h index cf5f9891ee..d95ceb6456 100644 --- a/Kernel/FileSystem/FileDescriptor.h +++ b/Kernel/FileSystem/FileDescriptor.h @@ -43,7 +43,7 @@ public: ByteBuffer read_entire_file(); - String absolute_path(); + String absolute_path() const; bool is_directory() const; diff --git a/Kernel/FileSystem/InodeFile.cpp b/Kernel/FileSystem/InodeFile.cpp index 80a25e5301..81ddf69205 100644 --- a/Kernel/FileSystem/InodeFile.cpp +++ b/Kernel/FileSystem/InodeFile.cpp @@ -41,7 +41,7 @@ KResultOr InodeFile::mmap(Process& process, LinearAddress preferred_lad return region; } -String InodeFile::absolute_path(FileDescriptor& descriptor) const +String InodeFile::absolute_path(const FileDescriptor& descriptor) const { ASSERT_NOT_REACHED(); ASSERT(descriptor.custody()); diff --git a/Kernel/FileSystem/InodeFile.h b/Kernel/FileSystem/InodeFile.h index 5c86386005..6cad93211d 100644 --- a/Kernel/FileSystem/InodeFile.h +++ b/Kernel/FileSystem/InodeFile.h @@ -23,7 +23,7 @@ public: virtual ssize_t write(FileDescriptor&, const byte*, ssize_t) override; virtual KResultOr 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; diff --git a/Kernel/Net/Socket.cpp b/Kernel/Net/Socket.cpp index f7892ce759..8c800f8eba 100644 --- a/Kernel/Net/Socket.cpp +++ b/Kernel/Net/Socket.cpp @@ -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())); } diff --git a/Kernel/Net/Socket.h b/Kernel/Net/Socket.h index 45693a2ffc..f11f3e768b 100644 --- a/Kernel/Net/Socket.h +++ b/Kernel/Net/Socket.h @@ -62,7 +62,7 @@ public: Lock& lock() { return m_lock; } - virtual String absolute_path(FileDescriptor&) const override; + virtual String absolute_path(const FileDescriptor&) const override; protected: Socket(int domain, int type, int protocol); diff --git a/Kernel/ProcessTracer.cpp b/Kernel/ProcessTracer.cpp index 18493f54be..e81568b4a0 100644 --- a/Kernel/ProcessTracer.cpp +++ b/Kernel/ProcessTracer.cpp @@ -29,7 +29,7 @@ int ProcessTracer::read(FileDescriptor&, byte* buffer, int buffer_size) return sizeof(data); } -String ProcessTracer::absolute_path(FileDescriptor&) const +String ProcessTracer::absolute_path(const FileDescriptor&) const { return String::format("tracer:%d", m_pid); } diff --git a/Kernel/ProcessTracer.h b/Kernel/ProcessTracer.h index b0b0321b67..3f23e4e31d 100644 --- a/Kernel/ProcessTracer.h +++ b/Kernel/ProcessTracer.h @@ -18,7 +18,7 @@ public: virtual bool can_write(FileDescriptor&) const override { return true; } 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); pid_t pid() const { return m_pid; } diff --git a/Kernel/SharedMemory.cpp b/Kernel/SharedMemory.cpp index 8cf1603867..cfe42ac5d2 100644 --- a/Kernel/SharedMemory.cpp +++ b/Kernel/SharedMemory.cpp @@ -68,7 +68,7 @@ KResult SharedMemory::truncate(int length) return KResult(-ENOTIMPL); } -String SharedMemory::absolute_path(FileDescriptor&) const +String SharedMemory::absolute_path(const FileDescriptor&) const { return String::format("shm:%u", this); } diff --git a/Kernel/SharedMemory.h b/Kernel/SharedMemory.h index 2bdd13c59e..07bf2efa53 100644 --- a/Kernel/SharedMemory.h +++ b/Kernel/SharedMemory.h @@ -28,7 +28,7 @@ private: virtual bool can_write(FileDescriptor&) const override { return true; } virtual int read(FileDescriptor&, 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 bool is_shared_memory() const override { return true; } virtual KResultOr mmap(Process&, LinearAddress, size_t offset, size_t size, int prot) override; diff --git a/Kernel/TTY/TTY.h b/Kernel/TTY/TTY.h index e6d489579c..150b7c3761 100644 --- a/Kernel/TTY/TTY.h +++ b/Kernel/TTY/TTY.h @@ -15,7 +15,7 @@ public: virtual bool can_read(FileDescriptor&) const override; virtual bool can_write(FileDescriptor&) const override; 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;