ec fix for search_path with std::filesystem.

closes #287.

doc/v2/quickstart.qbk

@@ -1,4 +1,4 @@
-[section:quickstart Quickstrat]
+[section:quickstart Quickstart]
 
 A process needs four things to be launched:
 

include/boost/process/detail/posix/search_path.hpp

@@ -27,7 +27,11 @@ inline boost::process::filesystem::path search_path(
     for (const boost::process::filesystem::path & pp : path)
     {
         auto p = pp / filename;
+#if defined(BOOST_PROCESS_USE_STD_FS)
+        std::error_code ec;
+#else
         boost::system::error_code ec;
+#endif
         bool file = boost::process::filesystem::is_regular_file(p, ec);
         if (!ec && file && ::access(p.c_str(), X_OK) == 0)
             return p;

include/boost/process/detail/windows/search_path.hpp

@@ -61,7 +61,11 @@ inline boost::process::filesystem::path search_path(
         {
             boost::process::filesystem::path pp_ext = p;
             pp_ext += ext;
+#if defined(BOOST_PROCESS_USE_STD_FS)
+            std::error_code ec;
+#else
             boost::system::error_code ec;
+#endif
             bool file = boost::process::filesystem::is_regular_file(pp_ext, ec);
             if (!ec && file &&
                 ::boost::winapi::sh_get_file_info(pp_ext.native().c_str(), 0, 0, 0, ::boost::winapi::SHGFI_EXETYPE_))

include/boost/process/v2/detail/config.hpp

@@ -19,6 +19,7 @@
 #include <filesystem>
 #include <string_view>
 #include <iomanip>
+#include <optional>
 
 #if defined(ASIO_WINDOWS)
 #define BOOST_PROCESS_V2_WINDOWS 1
@@ -51,6 +52,7 @@
 #include <boost/system/error_code.hpp>
 #include <boost/system/system_category.hpp>
 #include <boost/system/system_error.hpp>
+#include <boost/optional.hpp>
 
 #if defined(BOOST_WINDOWS_API)
 #define BOOST_PROCESS_V2_WINDOWS 1
@@ -72,11 +74,9 @@
 
 #if defined(BOOST_PROCESS_USE_STD_FS)
 #include <filesystem>
-#include <optional>
 #else
 #include <boost/filesystem/path.hpp>
 #include <boost/filesystem/operations.hpp>
-#include <boost/optional.hpp>
 #endif
 
 #define BOOST_PROCESS_V2_BEGIN_NAMESPACE namespace boost { namespace process { namespace v2 {
@@ -142,7 +142,7 @@ BOOST_PROCESS_V2_END_NAMESPACE
 #endif
 #endif
 
-#if defined(__FreeBSD__) && !defined(BOOST_PROCESS_V2_DISABLE_PDFORK)
+#if defined(__FreeBSD__) && defined(BOOST_PROCESS_V2_ENABLE_PDFORK)
 #define BOOST_PROCESS_V2_PDFORK 1
 #define BOOST_PROCESS_V2_HAS_PROCESS_HANDLE 1
 #endif

include/boost/process/v2/detail/process_handle_fd_or_signal.hpp

@@ -153,12 +153,9 @@ struct basic_process_handle_fd_or_signal
 
     void wait(native_exit_code_type &exit_status, error_code &ec)
     {
-
         if (pid_ <= 0)
             return;
-
-        int res = 0;
-        while ((res = ::waitpid(pid_, &exit_status, 0)) < 0)
+        while (::waitpid(pid_, &exit_status, 0) < 0)
         {
             if (errno != EINTR)
             {
@@ -166,6 +163,7 @@ struct basic_process_handle_fd_or_signal
                 break;
             }               
         }
+            
     }
 
     void wait(native_exit_code_type &exit_status)
@@ -288,37 +286,31 @@ struct basic_process_handle_fd_or_signal
 
     struct async_wait_op_
     {
-        BOOST_PROCESS_V2_ASIO_NAMESPACE::posix::basic_stream_descriptor<Executor> &descriptor;
+        BOOST_PROCESS_V2_ASIO_NAMESPACE::posix::basic_descriptor<Executor> &descriptor;
         BOOST_PROCESS_V2_ASIO_NAMESPACE::basic_signal_set<Executor> &handle;
         pid_type pid_;
         bool needs_post = true;
 
         template<typename Self>
-        void operator()(Self &&self, error_code ec = {}, int res = 0)
+        void operator()(Self &&self, error_code ec = {}, int = 0)
         {
-            printf("RES : %d -> %s\n", res, ec.message().c_str());
-            native_exit_code_type exit_code = -1;
+            native_exit_code_type exit_code{};
             int wait_res = -1;
             if (pid_ <= 0) // error, complete early
                 ec = BOOST_PROCESS_V2_ASIO_NAMESPACE::error::bad_descriptor;
             else 
             {
-                printf("test in %d\n", errno);
                 wait_res = ::waitpid(pid_, &exit_code, WNOHANG);
                 if (wait_res == -1)
                     ec = get_last_error();
-                else
-                    ec.clear();
-
             }
 
             if (!ec && (wait_res == 0))
             {
                 needs_post = false;
-                static int res[1] = {0};
                 if (descriptor.is_open())
                     descriptor.async_wait(
-                            BOOST_PROCESS_V2_ASIO_NAMESPACE::posix::stream_descriptor::wait_read,
+                            BOOST_PROCESS_V2_ASIO_NAMESPACE::posix::descriptor_base::wait_read, 
                             std::move(self));
                 else
                     handle.async_wait(std::move(self));

include/boost/process/v2/posix/bind_fd.hpp

@@ -94,6 +94,7 @@ struct bind_fd
     error_code on_setup(posix::default_launcher & launcher, const filesystem::path &, const char * const *)
     {
         launcher.fd_whitelist.push_back(target);
+        return {};
     }
 
     /// Implementation of the initialization function.

include/boost/process/v2/start_dir.hpp

@@ -11,6 +11,7 @@
 #define BOOST_PROCESS_v2_START_DIR_HPP
 
 #include <boost/process/v2/detail/config.hpp>
+#include <boost/process/v2/detail/last_error.hpp>
 #include <boost/process/v2/default_launcher.hpp>
 
 BOOST_PROCESS_V2_BEGIN_NAMESPACE

include/boost/process/v2/stdio.hpp

@@ -11,6 +11,7 @@
 #define BOOST_PROCESS_V2_STDIO_HPP
 
 #include <boost/process/v2/detail/config.hpp>
+#include <boost/process/v2/detail/last_error.hpp>
 #include <boost/process/v2/default_launcher.hpp>
 #include <cstddef>
 #if defined(BOOST_PROCESS_V2_STANDALONE)

meta/libraries.json

@@ -1,6 +1,6 @@
 {
   "key": "process",
-  "name": "process",
+  "name": "Process",
   "authors": [
     "Merino Vidal", "Ilya Sokolov", "Felipe Tanus", 
     "Jeff Flinn", "Thomas Jarosch", "Boris Schaeling", "Klemens D. Morgenstern"

test/Jamfile.jam

@@ -100,8 +100,8 @@ test-suite with-valgrind :
     [ run env.cpp     program_options system filesystem       : [ test-options env ] : sparring_partner ]
     [ run group.cpp     system thread filesystem              : [ test-options group ] : sub_launch ]
     [ run group.cpp          system thread filesystem         : [ test-options group ] : sub_launch : <build>no <target-os>windows:<build>yes <define>BOOST_USE_WINDOWS_H=1 : group-windows-h ]
-    [ run group_wait.cpp     system thread filesystem         : [ test-options group_wait ] : sparring_partner : <target-os>darwin:<build>no ]
-	[ run limit_fd.cpp     program_options system filesystem  : [ test-options limit_fd ] : sparring_partner ]
+    [ run group_wait.cpp     system thread filesystem         : [ test-options group_wait ] : sparring_partner : <target-os>darwin:<build>no <target-os>freebsd:<build>no ]
+	[ run limit_fd.cpp     program_options system filesystem  : [ test-options limit_fd ] : sparring_partner : <target-os>freebsd:<build>no ]
     [ run run_exe.cpp filesystem                              : : sparring_partner ]
     [ run run_exe_path.cpp filesystem                         : [ test-options run_exe_path ] : sparring_partner ]
     [ run search_path.cpp filesystem system                   : [ test-options search_path ] : : <target-os>windows:<source>shell32 ]

test/group_wait.cpp

@@ -16,7 +16,7 @@
 
 #include <boost/asio.hpp>
 #include <boost/algorithm/string/predicate.hpp>
-
+#include <boost/scope_exit.hpp>
 #include <boost/process/error.hpp>
 #include <boost/process/io.hpp>
 #include <boost/process/args.hpp>
@@ -45,6 +45,10 @@ BOOST_AUTO_TEST_CASE(wait_group_test, *boost::unit_test::timeout(5))
             BOOST_REQUIRE(done.load());
         }};
 
+    BOOST_SCOPE_EXIT_ALL(&) {    
+        done.store(true);
+        thr.join();
+    };
 
     using boost::unit_test::framework::master_test_suite;
 
@@ -78,9 +82,6 @@ BOOST_AUTO_TEST_CASE(wait_group_test, *boost::unit_test::timeout(5))
 
     BOOST_CHECK(!c1.running());
     BOOST_CHECK(!c2.running());
-
-    done.store(true);
-    thr.join();
 }
 
 

test/v2/process.cpp

@@ -434,7 +434,10 @@ std::string read_env(const char * name, Inits && ... inits)
   std::string out;
   bpv::error_code ec;
 
-  const auto sz = asio::read(rp, asio::dynamic_buffer(out),  ec);
+   auto sz = asio::read(rp, asio::dynamic_buffer(out),  ec);
+  while (ec == asio::error::interrupted)
+    sz += asio::read(rp, asio::dynamic_buffer(out),  ec);
+
   BOOST_CHECK_MESSAGE((ec == asio::error::broken_pipe) || (ec == asio::error::eof), ec.message());
   out.resize(sz);
   trim_end(out);
@@ -527,6 +530,8 @@ BOOST_AUTO_TEST_CASE(bind_launcher)
   bpv::error_code ec;
 
   auto sz = asio::read(rp, asio::dynamic_buffer(out),  ec);
+  while (ec == asio::error::interrupted)
+    sz += asio::read(rp, asio::dynamic_buffer(out),  ec);
   BOOST_CHECK(sz != 0);
   BOOST_CHECK_MESSAGE((ec == asio::error::broken_pipe) || (ec == asio::error::eof), ec.message());
   BOOST_CHECK_MESSAGE(bpv::filesystem::path(out) == target,

test/wait_for.cpp

@@ -40,7 +40,7 @@ BOOST_AUTO_TEST_CASE(wait_for)
 
 
     BOOST_CHECK(!c.wait_for(std::chrono::milliseconds(200)));
-    BOOST_CHECK( c.wait_for(std::chrono::milliseconds(1000)));
+    BOOST_CHECK( c.wait_for(std::chrono::milliseconds(2000)));
 
     auto timeout_t = std::chrono::system_clock::now();