From d6b06fd5a31ef6489895690f5fc4e0df113ea01e Mon Sep 17 00:00:00 2001 From: Andreas Kling Date: Mon, 6 Jan 2020 11:12:29 +0100 Subject: [PATCH] Kernel: Make watch_file() syscall take path length as a size_t We don't care to handle negative path lengths anyway. --- Kernel/Process.cpp | 2 +- Kernel/Process.h | 2 +- Libraries/LibC/fcntl.cpp | 2 +- Libraries/LibC/fcntl.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Kernel/Process.cpp b/Kernel/Process.cpp index 0d591219e0..78f663a83a 100644 --- a/Kernel/Process.cpp +++ b/Kernel/Process.cpp @@ -3447,7 +3447,7 @@ int Process::sys$ftruncate(int fd, off_t length) return description->truncate(length); } -int Process::sys$watch_file(const char* user_path, int path_length) +int Process::sys$watch_file(const char* user_path, size_t path_length) { auto path = get_syscall_path_argument(user_path, path_length); if (path.is_error()) diff --git a/Kernel/Process.h b/Kernel/Process.h index 6004371438..720fb80646 100644 --- a/Kernel/Process.h +++ b/Kernel/Process.h @@ -101,7 +101,7 @@ public: int sys$sync(); int sys$beep(); int sys$get_process_name(char* buffer, int buffer_size); - int sys$watch_file(const char* path, int path_length); + int sys$watch_file(const char* path, size_t path_length); int sys$dbgputch(u8); int sys$dbgputstr(const u8*, int length); int sys$dump_backtrace(); diff --git a/Libraries/LibC/fcntl.cpp b/Libraries/LibC/fcntl.cpp index 814416fb40..80a56c9e91 100644 --- a/Libraries/LibC/fcntl.cpp +++ b/Libraries/LibC/fcntl.cpp @@ -15,7 +15,7 @@ int fcntl(int fd, int cmd, ...) __RETURN_WITH_ERRNO(rc, rc, -1); } -int watch_file(const char* path, int path_length) +int watch_file(const char* path, size_t path_length) { int rc = syscall(SC_watch_file, path, path_length); __RETURN_WITH_ERRNO(rc, rc, -1); diff --git a/Libraries/LibC/fcntl.h b/Libraries/LibC/fcntl.h index f80c98b3cd..9ca005a430 100644 --- a/Libraries/LibC/fcntl.h +++ b/Libraries/LibC/fcntl.h @@ -64,7 +64,7 @@ int openat(int dirfd, const char* path, int options, ...); int openat_with_path_length(int dirfd, const char* path, size_t path_length, int options, mode_t); int fcntl(int fd, int cmd, ...); -int watch_file(const char* path, int path_length); +int watch_file(const char* path, size_t path_length); #define F_RDLCK 0 #define F_WRLCK 1