diff --git a/Libraries/LibC/fcntl.cpp b/Libraries/LibC/fcntl.cpp index 4ee34c6dac..814416fb40 100644 --- a/Libraries/LibC/fcntl.cpp +++ b/Libraries/LibC/fcntl.cpp @@ -2,7 +2,7 @@ #include #include #include -#include +#include extern "C" { @@ -21,4 +21,61 @@ int watch_file(const char* path, int path_length) __RETURN_WITH_ERRNO(rc, rc, -1); } +int creat(const char* path, mode_t mode) +{ + return open(path, O_CREAT | O_WRONLY | O_TRUNC, mode); +} + +int creat_with_path_length(const char* path, size_t path_length, mode_t mode) +{ + return open_with_path_length(path, path_length, O_CREAT | O_WRONLY | O_TRUNC, mode); +} + +int open_with_path_length(const char* path, size_t path_length, int options, mode_t mode) +{ + if (path_length > INT32_MAX) { + errno = EINVAL; + return -1; + } + Syscall::SC_open_params params { path, (int)path_length, options, mode }; + int rc = syscall(SC_open, ¶ms); + __RETURN_WITH_ERRNO(rc, rc, -1); +} + +int openat_with_path_length(int dirfd, const char* path, size_t path_length, int options, mode_t mode) +{ + if (path_length > INT32_MAX) { + errno = EINVAL; + return -1; + } + Syscall::SC_openat_params params { dirfd, path, (int)path_length, options, mode }; + int rc = syscall(SC_openat, ¶ms); + __RETURN_WITH_ERRNO(rc, rc, -1); +} + +int open(const char* path, int options, ...) +{ + if (!path) { + errno = EFAULT; + return -1; + } + va_list ap; + va_start(ap, options); + auto mode = (mode_t)va_arg(ap, unsigned); + va_end(ap); + return open_with_path_length(path, strlen(path), options, mode); +} + +int openat(int dirfd, const char* path, int options, ...) +{ + if (!path) { + errno = EFAULT; + return -1; + } + va_list ap; + va_start(ap, options); + auto mode = (mode_t)va_arg(ap, unsigned); + va_end(ap); + return openat_with_path_length(dirfd, path, strlen(path), options, mode); +} } diff --git a/Libraries/LibC/fcntl.h b/Libraries/LibC/fcntl.h index 381667e364..b42fa93097 100644 --- a/Libraries/LibC/fcntl.h +++ b/Libraries/LibC/fcntl.h @@ -54,6 +54,14 @@ __BEGIN_DECLS #define S_IRWXG (S_IRWXU >> 3) #define S_IRWXO (S_IRWXG >> 3) +int creat(const char* path, mode_t); +int open(const char* path, int options, ...); +int creat_with_path_length(const char* path, size_t path_length, mode_t); +int open_with_path_length(const char* path, size_t path_length, int options, mode_t); +#define AT_FDCWD -100 +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); diff --git a/Libraries/LibC/unistd.cpp b/Libraries/LibC/unistd.cpp index 0bfb109192..8715ecb4c8 100644 --- a/Libraries/LibC/unistd.cpp +++ b/Libraries/LibC/unistd.cpp @@ -186,64 +186,6 @@ pid_t getpgrp() __RETURN_WITH_ERRNO(rc, rc, -1); } -int creat(const char* path, mode_t mode) -{ - return open(path, O_CREAT | O_WRONLY | O_TRUNC, mode); -} - -int creat_with_path_length(const char* path, size_t path_length, mode_t mode) -{ - return open_with_path_length(path, path_length, O_CREAT | O_WRONLY | O_TRUNC, mode); -} - -int open_with_path_length(const char* path, size_t path_length, int options, mode_t mode) -{ - if (path_length > INT32_MAX) { - errno = EINVAL; - return -1; - } - Syscall::SC_open_params params { path, (int)path_length, options, mode }; - int rc = syscall(SC_open, ¶ms); - __RETURN_WITH_ERRNO(rc, rc, -1); -} - -int openat_with_path_length(int dirfd, const char* path, size_t path_length, int options, mode_t mode) -{ - if (path_length > INT32_MAX) { - errno = EINVAL; - return -1; - } - Syscall::SC_openat_params params { dirfd, path, (int)path_length, options, mode }; - int rc = syscall(SC_openat, ¶ms); - __RETURN_WITH_ERRNO(rc, rc, -1); -} - -int open(const char* path, int options, ...) -{ - if (!path) { - errno = EFAULT; - return -1; - } - va_list ap; - va_start(ap, options); - auto mode = (mode_t)va_arg(ap, unsigned); - va_end(ap); - return open_with_path_length(path, strlen(path), options, mode); -} - -int openat(int dirfd, const char* path, int options, ...) -{ - if (!path) { - errno = EFAULT; - return -1; - } - va_list ap; - va_start(ap, options); - auto mode = (mode_t)va_arg(ap, unsigned); - va_end(ap); - return openat_with_path_length(dirfd, path, strlen(path), options, mode); -} - ssize_t read(int fd, void* buf, size_t count) { int rc = syscall(SC_read, fd, buf, count); diff --git a/Libraries/LibC/unistd.h b/Libraries/LibC/unistd.h index b112a31263..f87a09b26b 100644 --- a/Libraries/LibC/unistd.h +++ b/Libraries/LibC/unistd.h @@ -73,13 +73,6 @@ int setuid(uid_t); int setgid(gid_t); pid_t tcgetpgrp(int fd); int tcsetpgrp(int fd, pid_t pgid); -int creat(const char* path, mode_t); -int open(const char* path, int options, ...); -int creat_with_path_length(const char* path, size_t path_length, mode_t); -int open_with_path_length(const char* path, size_t path_length, int options, mode_t); -#define AT_FDCWD -100 -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); ssize_t read(int fd, void* buf, size_t count); ssize_t write(int fd, const void* buf, size_t count); int close(int fd);