Skip to content

Commit

Permalink
Kernel+LibC: Implement futimens(3)
Browse files Browse the repository at this point in the history
Implement futimes() in terms of utimensat(). Now, utimensat() strays
from POSIX compliance because it also accepts a combination of a file
descriptor of a regular file and an empty path. utimensat() then uses
this file descriptor instead of the path to update the last access
and/or modification time of a file. That being said, its prior behavior
remains intact.

With the new behavior of utimensat(), `path` must point to a valid
string; given a null pointer instead of an empty string, utimensat()
sets `errno` to `EFAULT` and returns a failure.
  • Loading branch information
arieldon authored and awesomekling committed May 21, 2022
1 parent 9a6bd85 commit 8a854ba
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 12 deletions.
41 changes: 29 additions & 12 deletions Kernel/Syscalls/utimensat.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ ErrorOr<FlatPtr> Process::sys$utimensat(Userspace<Syscall::SC_utimensat_params c
auto params = TRY(copy_typed_from_user(user_params));
auto now = kgettimeofday().to_truncated_seconds();

int dirfd = params.dirfd;
int follow_symlink = params.flag & AT_SYMLINK_NOFOLLOW ? O_NOFOLLOW_NOERROR : 0;

timespec times[2];
if (params.times) {
TRY(copy_from_user(times, params.times, sizeof(times)));
Expand All @@ -36,24 +39,38 @@ ErrorOr<FlatPtr> Process::sys$utimensat(Userspace<Syscall::SC_utimensat_params c
times[1].tv_nsec = UTIME_NOW;
}

int dirfd = params.dirfd;
auto path = TRY(get_syscall_path_argument(params.path));

OwnPtr<KString> path;
RefPtr<OpenFileDescription> description;
RefPtr<Custody> base;
if (dirfd == AT_FDCWD) {
base = current_directory();

auto path_or_error = get_syscall_path_argument(params.path);
if (path_or_error.is_error()) {
// If the path is empty ("") but not a nullptr, attempt to get a path
// from the file descriptor. This allows futimens() to be implemented
// in terms of utimensat().
if (params.path.characters && params.path.length == 0) {
description = TRY(open_file_description(dirfd));
path = TRY(description->original_absolute_path());
base = description->custody();
} else {
return path_or_error.release_error();
}
} else {
auto base_description = TRY(open_file_description(dirfd));
if (!KLexicalPath::is_absolute(path->view()) && !base_description->is_directory())
return ENOTDIR;
if (!base_description->custody())
return EINVAL;
base = base_description->custody();
path = path_or_error.release_value();
if (dirfd == AT_FDCWD) {
base = current_directory();
} else {
description = TRY(open_file_description(dirfd));
if (!KLexicalPath::is_absolute(path->view()) && !description->is_directory())
return ENOTDIR;
if (!description->custody())
return EINVAL;
base = description->custody();
}
}

auto& atime = times[0];
auto& mtime = times[1];
int follow_symlink = params.flag & AT_SYMLINK_NOFOLLOW ? O_NOFOLLOW_NOERROR : 0;
TRY(VirtualFileSystem::the().utimensat(path->view(), *base, atime, mtime, follow_symlink));
return 0;
}
Expand Down
6 changes: 6 additions & 0 deletions Userland/Libraries/LibC/stat.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -109,4 +109,10 @@ int fstatat(int fd, char const* path, struct stat* statbuf, int flags)
{
return do_stat(fd, path, statbuf, !(flags & AT_SYMLINK_NOFOLLOW));
}

// https://pubs.opengroup.org/onlinepubs/9699919799/functions/futimens.html
int futimens(int fd, struct timespec const times[2])
{
return utimensat(fd, "", times, 0);
}
}
1 change: 1 addition & 0 deletions Userland/Libraries/LibC/sys/stat.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,6 @@ int fstat(int fd, struct stat* statbuf);
int lstat(char const* path, struct stat* statbuf);
int stat(char const* path, struct stat* statbuf);
int fstatat(int fd, char const* path, struct stat* statbuf, int flags);
int futimens(int fd, struct timespec const times[2]);

__END_DECLS

0 comments on commit 8a854ba

Please sign in to comment.