mirror of
https://github.com/RGBCube/serenity
synced 2025-07-28 08:17:34 +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);
|
||||
|
|
|
@ -27,6 +27,7 @@
|
|||
#include <LibCore/LocalServer.h>
|
||||
#include <LibCore/LocalSocket.h>
|
||||
#include <LibCore/Notifier.h>
|
||||
#include <fcntl.h>
|
||||
#include <stdio.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/stat.h>
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
|
||||
#include <LibCore/LocalSocket.h>
|
||||
#include <errno.h>
|
||||
#include <fcntl.h>
|
||||
#include <stdio.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/stat.h>
|
||||
|
|
|
@ -1050,9 +1050,9 @@ void TextEditor::timer_event(Core::TimerEvent&)
|
|||
update_cursor();
|
||||
}
|
||||
|
||||
bool TextEditor::write_to_file(const StringView& path)
|
||||
bool TextEditor::write_to_file(const String& path)
|
||||
{
|
||||
int fd = open_with_path_length(path.characters_without_null_termination(), path.length(), O_WRONLY | O_CREAT | O_TRUNC, 0666);
|
||||
int fd = open(path.characters(), O_WRONLY | O_CREAT | O_TRUNC, 0666);
|
||||
if (fd < 0) {
|
||||
perror("open");
|
||||
return false;
|
||||
|
|
|
@ -121,7 +121,7 @@ public:
|
|||
TextRange normalized_selection() const { return m_selection.normalized(); }
|
||||
|
||||
void insert_at_cursor_or_replace_selection(const StringView&);
|
||||
bool write_to_file(const StringView& path);
|
||||
bool write_to_file(const String& path);
|
||||
bool has_selection() const { return m_selection.is_valid(); }
|
||||
String selected_text() const;
|
||||
void set_selection(const TextRange&);
|
||||
|
|
|
@ -32,7 +32,7 @@
|
|||
|
||||
namespace PCIDB {
|
||||
|
||||
RefPtr<Database> Database::open(const StringView& file_name)
|
||||
RefPtr<Database> Database::open(const String& file_name)
|
||||
{
|
||||
auto file_or_error = MappedFile::map(file_name);
|
||||
if (file_or_error.is_error())
|
||||
|
|
|
@ -31,6 +31,7 @@
|
|||
#include <AK/NonnullOwnPtr.h>
|
||||
#include <AK/RefCounted.h>
|
||||
#include <AK/RefPtr.h>
|
||||
#include <AK/String.h>
|
||||
#include <AK/StringView.h>
|
||||
|
||||
namespace PCIDB {
|
||||
|
@ -72,7 +73,7 @@ struct Class {
|
|||
|
||||
class Database : public RefCounted<Database> {
|
||||
public:
|
||||
static RefPtr<Database> open(const StringView& file_name);
|
||||
static RefPtr<Database> open(const String& file_name);
|
||||
static RefPtr<Database> open() { return open("/res/pci.ids"); };
|
||||
|
||||
const StringView get_vendor(u16 vendor_id) const;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue