mirror of
https://github.com/RGBCube/serenity
synced 2025-07-28 12:37:44 +00:00
LibC+Everywhere: Remove open_with_path_length() in favor of open()
This API was a mostly gratuitous deviation from POSIX that gave up some portability in exchange for avoiding the occasional strlen(). I don't think that was actually achieving anything valuable, so let's just chill out and have the same open() API as everyone else. :^)
This commit is contained in:
parent
d551263b11
commit
1a08ac72ad
21 changed files with 51 additions and 69 deletions
|
@ -53,42 +53,24 @@ 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)
|
||||
{
|
||||
return openat_with_path_length(AT_FDCWD, path, path_length, options, mode);
|
||||
}
|
||||
|
||||
int openat_with_path_length(int dirfd, const char* path, size_t path_length, int options, mode_t mode)
|
||||
{
|
||||
if (!path) {
|
||||
errno = EFAULT;
|
||||
return -1;
|
||||
}
|
||||
if (path_length > INT32_MAX) {
|
||||
errno = EINVAL;
|
||||
return -1;
|
||||
}
|
||||
Syscall::SC_open_params params { dirfd, { path, path_length }, options, mode };
|
||||
int rc = syscall(SC_open, ¶ms);
|
||||
__RETURN_WITH_ERRNO(rc, rc, -1);
|
||||
}
|
||||
|
||||
int open(const char* path, int options, ...)
|
||||
{
|
||||
if (!path) {
|
||||
errno = EFAULT;
|
||||
return -1;
|
||||
}
|
||||
auto path_length = strlen(path);
|
||||
if (path_length > INT32_MAX) {
|
||||
errno = EINVAL;
|
||||
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);
|
||||
Syscall::SC_open_params params { AT_FDCWD, { path, path_length }, options, mode };
|
||||
int rc = syscall(SC_open, ¶ms);
|
||||
__RETURN_WITH_ERRNO(rc, rc, -1);
|
||||
}
|
||||
|
||||
int openat(int dirfd, const char* path, int options, ...)
|
||||
|
@ -97,10 +79,17 @@ int openat(int dirfd, const char* path, int options, ...)
|
|||
errno = EFAULT;
|
||||
return -1;
|
||||
}
|
||||
auto path_length = strlen(path);
|
||||
if (path_length > INT32_MAX) {
|
||||
errno = EINVAL;
|
||||
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);
|
||||
Syscall::SC_open_params params { dirfd, { path, path_length }, options, mode };
|
||||
int rc = syscall(SC_open, ¶ms);
|
||||
__RETURN_WITH_ERRNO(rc, rc, -1);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -85,11 +85,8 @@ __BEGIN_DECLS
|
|||
|
||||
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, size_t path_length);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue