From 034cd404a129103a8dd7747e6bd00ffd5550da93 Mon Sep 17 00:00:00 2001 From: Lexi Winter Date: Mon, 30 Jun 2025 07:51:23 +0100 Subject: refactoring --- nihil.posix/execvp.ccm | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) (limited to 'nihil.posix/execvp.ccm') diff --git a/nihil.posix/execvp.ccm b/nihil.posix/execvp.ccm index 688ecb6..680a13e 100644 --- a/nihil.posix/execvp.ccm +++ b/nihil.posix/execvp.ccm @@ -1,7 +1,4 @@ -/* - * This source code is released into the public domain. - */ - +// This source code is released into the public domain. module; #include @@ -12,17 +9,22 @@ export module nihil.posix:execvp; import nihil.error; import :argv; -import :exec; +import :execv; +import :find_in_path; namespace nihil { -/* - * execvp: equivalent to fexecv(), except the command is passed as - * a filename instead of a file descriptor. If the filename is not - * an absolute path, it will be searched for in $PATH. - */ - -export [[nodiscard]] auto execvp(std::string_view file, argv &&argv) - -> std::expected; +// execvp: equivalent to execv, except the command is passed as +// a filename instead of a file descriptor. If the filename is not +// an absolute path, it will be searched for in $PATH. +export [[nodiscard]] auto +execvp(std::string_view file, argv &&argv) -> std::expected +{ + auto filename = nihil::find_in_path(file); + if (!filename) + return std::unexpected(nihil::error( + std::format("executable not found in path: {}", file))); + return execv(std::move(*filename), std::move(argv)); +} } // namespace nihil -- cgit v1.2.3