refactoring

1 files changed, 15 insertions, 13 deletions

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 <string>
@@ -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<base_executor_type, error>;
+// 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<execv, error>
+{
+	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