Fix up usage of std::move_backward

The destinations should point to the *end* of the destination range

https://en.cppreference.com/w/cpp/algorithm/move_backward

CMakeLists.txt

@@ -35,7 +35,6 @@ target_link_libraries(boost_process
     Boost::asio
     Boost::config
     Boost::core
-    Boost::filesystem
     Boost::fusion
     Boost::iterator
     Boost::move

doc/configuration.adoc

@@ -7,5 +7,5 @@ Boost process v2 can be configured in the following ways:
 | Macro | Description
 
 | `BOOST_PROCESS_V2_STANDALONE` | Build boost.process for standalone asio
-| `BOOST_PROCESS_USE_STD_FS`    | Use std::filesystem instead of boost::filsystem
+| `BOOST_PROCESS_USE_STD_FS`    | Use std::filesystem instead of boost::filesystem
 | `BOOST_PROCESS_V2_POSIX_FORCE_DISABLE_CLOSE_RANGE` | Disable usage of `close_range`.

doc/reference/bind_launcher.adoc

@@ -9,7 +9,7 @@ template<typename Launcher, typename ... Init>
 auto bind_launcher(Launcher && launcher, Init && ... init);
 
 // Calls bind_launcher with the default_launcher as the first parameter.
-// The new launcher with bound paramaters
+// The new launcher with bound parameters
 template<typename ... Init>
 auto bind_default_launcher(Init && ... init);
 ----

doc/reference/environment.adoc

@@ -25,13 +25,13 @@ namespace environment
  * Windows treats keys as case-insensitive yet perserving. The char traits are made to reflect
  * that behaviour.
 */
-tempalte<typename Char>
+template<typename Char>
 using key_char_traits = implementation_defined ;
 
 // A char traits type that reflects the OS rules for string representing environment values.
 /* Can be an alias of std::char_traits. May only be defined for `char` and `wchar_t`.
 */
-tempalte<typename Char>
+template<typename Char>
 using value_char_traits = implementation_defined ;
 
 // The character type used by the environment. Either `char` or `wchar_t`.

doc/reference/process_handle.adoc

@@ -2,7 +2,7 @@
 [#process_handle]
 
 A process handle is an unmanaged version of a process.
-This means it does not terminate the proces on destruction and
+This means it does not terminate the process on destruction and
 will not keep track of the exit-code.
 
 NOTE: that the exit code might be discovered early, during a call to `running`.

doc/stdio.adoc

@@ -16,7 +16,7 @@ automatically connected and the other side will get assigned to the child proces
 include::../example/stdio.cpp[tag=readable_pipe]
 ----
 
-readable pipes can be assigned to `out` an `err`, while writable_pipes can be assigned to `in`.
+readable pipes can be assigned to `out` and `err`, while writable_pipes can be assigned to `in`.
 
 == `FILE*`
 

doc/version2.adoc

@@ -64,7 +64,7 @@ This concerns especially the `wait_for` and `wait_until` functions on the proces
 The latter are easy to do on windows, but posix does not provide an API for this. 
 Thus the wait_for used signals or fork, which was all but safe. 
 Since process v2 is based on asio and thus supports cancellation, 
-a wait_for can not safely be implemented with an async_wait + timeout.
+a wait_for can now safely be implemented with an async_wait + timeout.
 
 == UTF-8
 

include/boost/process/posix/bind_fd.hpp

@@ -1 +1 @@
-#include <boost/process/v2/bind_fd.hpp>
+#include <boost/process/v2/posix/bind_fd.hpp>

include/boost/process/posix/default_launcher.hpp

@@ -1 +1 @@
-#include <boost/process/v2/default_launcher.hpp>
+#include <boost/process/v2/posix/default_launcher.hpp>

include/boost/process/posix/fork_and_forget_launcher.hpp

@@ -1 +1 @@
-#include <boost/process/v2/fork_and_forget_launcher.hpp>
+#include <boost/process/v2/posix/fork_and_forget_launcher.hpp>

include/boost/process/posix/pdfork_launcher.hpp

@@ -1 +1 @@
-#include <boost/process/v2/pdfork_launcher.hpp>
+#include <boost/process/v2/posix/pdfork_launcher.hpp>

include/boost/process/posix/vfork_launcher.hpp

@@ -1 +1 @@
-#include <boost/process/v2/vfork_launcher.hpp>
+#include <boost/process/v2/posix/vfork_launcher.hpp>

include/boost/process/v1/child.hpp

@@ -39,7 +39,7 @@ child::child(Args&&...args)
 typedef ::boost::process::v1::detail::api::pid_t pid_t;
 
 #if defined(BOOST_PROCESS_DOXYGEN)
-/** The main class to hold a child process. It is simliar to [std::thread](http://en.cppreference.com/w/cpp/thread/thread),
+/** The main class to hold a child process. It is similar to [std::thread](http://en.cppreference.com/w/cpp/thread/thread),
  * in that it has a join and detach function.
  *
  * @attention The destructor will call terminate on the process if not joined or detached without any warning.

include/boost/process/v1/detail/posix/environment.hpp

@@ -107,7 +107,7 @@ public:
     using string_type = std::basic_string<char_type>;
     using native_handle_type = char_type **;
 
-    void reload() {this->_env_impl = ::environ;}
+    void reload() {this->_env_impl = environ;}
 
     string_type get(const pointer_type id) { return getenv(id); }
     void        set(const pointer_type id, const pointer_type value)
@@ -136,7 +136,7 @@ public:
     native_environment_impl & operator=(native_environment_impl && ) = default;
     native_handle_type _env_impl = environ;
 
-    native_handle_type native_handle() const {return ::environ;}
+    native_handle_type native_handle() const {return environ;}
 };
 
 

include/boost/process/v1/detail/posix/executor.hpp

@@ -275,7 +275,7 @@ class executor
         prepare_cmd_style_fn = exe;
         if ((prepare_cmd_style_fn.find('/') == std::string::npos) && ::access(prepare_cmd_style_fn.c_str(), X_OK))
         {
-            const auto * e = ::environ;
+            const auto * e = environ;
             while ((e != nullptr) && (*e != nullptr) && !boost::starts_with(*e, "PATH="))
                 e++;
 
@@ -316,7 +316,7 @@ public:
     const char * exe      = nullptr;
     char *const* cmd_line = nullptr;
     bool cmd_style = false;
-    char **env      = ::environ;
+    char **env      = environ;
     pid_t pid = -1;
     std::shared_ptr<std::atomic<int>> exit_status = std::make_shared<std::atomic<int>>(still_active);
 

include/boost/process/v1/detail/windows/environment.hpp

@@ -222,7 +222,7 @@ basic_environment_impl<Char>::basic_environment_impl(const native_environment_im
     while ((*p != null_char<Char>()) || (*(p+1) !=  null_char<Char>()))
         p++;
     p++; //pointing to the second nullchar
-    p++; //to get the pointer behing the second nullchar, so it's end.
+    p++; //to get the pointer behind the second nullchar, so it's end.
 
     this->_data.assign(beg, p);
     this->reload();

include/boost/process/v1/environment.hpp

@@ -627,7 +627,7 @@ public:
     using base_type::operator=;
 };
 
-///Type definition to hold a seperate environment.
+///Type definition to hold a separate environment.
 template<typename Char>
 class basic_environment : public basic_environment_impl<Char, detail::api::basic_environment_impl>
 {
@@ -646,10 +646,10 @@ typedef basic_native_environment<char>     native_environment;
 typedef basic_native_environment<wchar_t> wnative_environment;
 
 #if !defined(BOOST_NO_ANSI_APIS)
-///Type definition to hold a seperate environment.
+///Type definition to hold a separate environment.
 typedef basic_environment<char>     environment;
 #endif
-///Type definition to hold a seperate environment.
+///Type definition to hold a separate environment.
 typedef basic_environment<wchar_t> wenvironment;
 
 }}
@@ -673,10 +673,10 @@ inline int get_id()                     { return ::boost::process::v1::detail::a
 ///Get the native handle of the current process.
 inline native_handle_type native_handle()  { return ::boost::process::v1::detail::api::native_handle();}
 #if !defined(BOOST_NO_ANSI_APIS)
-///Get the enviroment of the current process.
+///Get the environment of the current process.
 inline native_environment   environment() { return ::boost::process::v1:: native_environment(); }
 #endif
-///Get the enviroment of the current process.
+///Get the environment of the current process.
 inline wnative_environment wenvironment() { return ::boost::process::v1::wnative_environment(); }
 ///Get the path environment variable of the current process runs.
 inline std::vector<boost::process::v1::filesystem::path> path()

include/boost/process/v1/extend.hpp

@@ -124,7 +124,7 @@ struct handler
     template <class Executor>
     void on_setup(Executor&) const {}
 
-    /** This function is invoked if an error occured while trying to launch the process.
+    /** This function is invoked if an error occurred while trying to launch the process.
      * \note It is not required to be const.
      */
     template <class Executor>
@@ -136,7 +136,7 @@ struct handler
     template <class Executor>
     void on_success(Executor&) const {}
 
-    /**This function is invoked if an error occured during the call of `fork`.
+    /**This function is invoked if an error occurred during the call of `fork`.
      * \note This function will only be called on posix.
      */
     template<typename Executor>
@@ -249,7 +249,7 @@ struct posix_executor
      ///A pointer to the argument-vector.
      char *const* cmd_line = nullptr;
      ///A pointer to the environment variables, as default it is set to [environ](http://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap08.html)
-     char **env      = ::environ;
+     char **env      = environ;
      ///The pid of the process - it will be -1 before invoking [fork](http://pubs.opengroup.org/onlinepubs/009695399/functions/fork.html), and after forking either 0 for the new process or a positive value if in the current process. */
      pid_t pid = -1;
      ///This shared-pointer holds the exit code. It's done this way, so it can be shared between an `asio::io_context` and \ref child.
@@ -335,7 +335,7 @@ struct windows_executor
     void set_startup_info_ex();
     ///This element is an instance or a reference (if \ref startup_info_ex exists) to the [startup-info](https://msdn.microsoft.com/en-us/library/windows/desktop/ms686331.aspx) for the process.
     startup_info_t startup_info;
-    ///This element is the instance of the  [extended startup-info](https://msdn.microsoft.com/de-de/library/windows/desktop/ms686329.aspx). It is only available with a winapi-version equal or highter than 6.
+    ///This element is the instance of the  [extended startup-info](https://msdn.microsoft.com/de-de/library/windows/desktop/ms686329.aspx). It is only available with a winapi-version equal or higher than 6.
     startup_info_ex_t  startup_info_ex;
 };
 

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

@@ -14,8 +14,13 @@
 #include <boost/process/v2/detail/config.hpp>
 #include <boost/process/v2/cstring_ref.hpp>
 
-#if defined(__APPLE__) || defined(__MACH__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__sun)
-extern "C" { extern char **environ; }
+#if defined(__APPLE__)
+# include <crt_externs.h>
+# if !defined(environ)
+#  define environ (*_NSGetEnviron())
+# endif
+#elif defined(__MACH__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__sun)
+ extern "C" { extern char **environ; }
 #endif
 
 BOOST_PROCESS_V2_BEGIN_NAMESPACE

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

@@ -85,7 +85,7 @@ struct key_char_traits
     if (s1 < s2)
       return std::move(s2, s2 + n, s1);
     else
-      return std::move_backward(s2, s2 + n, s1);
+      return std::move_backward(s2, s2 + n, s1 + n);
   }
 
   BOOST_CONSTEXPR static

include/boost/process/v2/environment.hpp

@@ -43,13 +43,13 @@ namespace environment
  * Windows treats keys as case-insensitive yet perserving. The char traits are made to reflect 
  * that behaviour.
 */
-tempalte<typename Char>
+template<typename Char>
 using key_char_traits = implementation_defined ;
 
 /// A char traits type that reflects the OS rules for string representing environment values.
 /** Can be an alias of std::char_traits. May only be defined for `char` and `wchar_t`.
 */
-tempalte<typename Char>
+template<typename Char>
 using value_char_traits = implementation_defined ;
 
 /// The character type used by the environment. Either `char` or `wchar_t`.

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

@@ -30,9 +30,13 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-
-#if defined(__APPLE__) || defined(__MACH__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__sun)
-extern "C" { extern char **environ; }
+#if defined(__APPLE__)
+# include <crt_externs.h>
+# if !defined(environ)
+#  define environ (*_NSGetEnviron())
+# endif
+#elif defined(__MACH__) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__sun)
+ extern "C" { extern char **environ; }
 #endif
 
 BOOST_PROCESS_V2_BEGIN_NAMESPACE
@@ -260,7 +264,7 @@ inline void on_exec_error(Launcher & launcher, const filesystem::path &executabl
 struct default_launcher
 {
     /// The pointer to the environment forwarded to the subprocess.
-    const char * const * env = ::environ;
+    const char * const * env = environ;
     /// The pid of the subprocess - will be assigned after fork.
     int pid = -1;
 

include/boost/process/v2/process_handle.hpp

@@ -26,7 +26,7 @@ BOOST_PROCESS_V2_BEGIN_NAMESPACE
 
 #if defined(GENERATING_DOCUMENTATION)
 /** A process handle is an unmanaged version of a process.
- * This means it does not terminate the proces on destruction and
+ * This means it does not terminate the process on destruction and
  * will not keep track of the exit-code. 
  * 
  * Note that the exit code might be discovered early, during a call to `running`.

src/detail/environment_posix.cpp

@@ -51,7 +51,7 @@ void unset(basic_cstring_ref<char_type, key_char_traits<char_type>> key, error_c
 }
 
 
-native_handle_type load_native_handle() { return ::environ; }
+native_handle_type load_native_handle() { return environ; }
 
 
 native_iterator next(native_iterator nh)

src/ext/cwd.cpp

@@ -124,7 +124,7 @@ filesystem::path cwd(boost::process::v2::pid_type pid, error_code & ec)
             filesystem::path("/proc") / std::to_string(pid) / "cwd", ec
             );
 #elif defined(__sun)
-    return fileystem::canonical(
+    return filesystem::canonical(
             filesystem::path("/proc") / std::to_string(pid) / "path/cwd", ec
             );
 #endif

src/ext/exe.cpp

@@ -141,7 +141,7 @@ filesystem::path exe(boost::process::v2::pid_type pid, error_code & ec)
             filesystem::path("/proc") / std::to_string(pid) / "exe", ec
             );
 #elif defined(__sun)
-    return fileystem::canonical(
+    return filesystem::canonical(
             filesystem::path("/proc") / std::to_string(pid) / "path/a.out", ec
             );
 #endif

src/posix/close_handles.cpp

@@ -185,7 +185,7 @@ void close_all(const std::vector<int> & whitelist, error_code & ec)
         return ;
     }
 
-    auto dir_fd = ::dirfd(dir.get());
+    auto dir_fd = dirfd(dir.get());
     if (dir_fd == -1)
     {
         ec = BOOST_PROCESS_V2_NAMESPACE::detail::get_last_error();

test/v1/args_cmd.cpp

@@ -21,9 +21,7 @@
 
 #include <boost/algorithm/string/predicate.hpp>
 
-namespace bp = boost::process;
-
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 BOOST_AUTO_TEST_CASE(args, *boost::unit_test::timeout(2))
 {

test/v1/args_handling.cpp

@@ -19,7 +19,7 @@
 #include <boost/process/v1/error.hpp>
 #include <boost/process/v1/child.hpp>
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 
 BOOST_AUTO_TEST_CASE(implicit_args_fs_path)

test/v1/asio_no_deprecated.cpp

@@ -3,11 +3,34 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #define BOOST_ASIO_NO_DEPRECATED 1
-#include <boost/process.hpp>
+#include <boost/process/v1/args.hpp>
+#include <boost/process/v1/async.hpp>
+#include <boost/process/v1/async_pipe.hpp>
+#include <boost/process/v1/async_system.hpp>
+#include <boost/process/v1/child.hpp>
+#include <boost/process/v1/cmd.hpp>
+#include <boost/process/v1/env.hpp>
+#include <boost/process/v1/environment.hpp>
+#include <boost/process/v1/error.hpp>
+#include <boost/process/v1/exception.hpp>
+#include <boost/process/v1/exe.hpp>
+#include <boost/process/v1/extend.hpp>
+#include <boost/process/v1/filesystem.hpp>
+#include <boost/process/v1/group.hpp>
+#include <boost/process/v1/handles.hpp>
+#include <boost/process/v1/io.hpp>
+#include <boost/process/v1/locale.hpp>
+#include <boost/process/v1/pipe.hpp>
+#include <boost/process/v1/search_path.hpp>
+#include <boost/process/v1/shell.hpp>
+#include <boost/process/v1/spawn.hpp>
+#include <boost/process/v1/start_dir.hpp>
+#include <boost/process/v1/system.hpp>
+
 int main() {}
 
 #if defined(BOOST_POSIX_API)
 #include <boost/process/v1/posix.hpp>
 #else
 #include <boost/process/v1/windows.hpp>
-#endif
+#endif

test/v1/async.cpp

@@ -25,7 +25,7 @@
 
 using namespace std;
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 #if __APPLE__
 auto abort_sig = signal(SIGALRM, +[](int){std::terminate();});

test/v1/async_fut.cpp

@@ -29,7 +29,7 @@ BOOST_AUTO_TEST_SUITE( async );
 
 using namespace std;
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 BOOST_AUTO_TEST_CASE(async_out_future, *boost::unit_test::timeout(2))
 {
@@ -103,4 +103,4 @@ BOOST_AUTO_TEST_CASE(emtpy_out, *boost::unit_test::timeout(2))
     BOOST_CHECK_EQUAL(fut.get(), "");
 }
 
-BOOST_AUTO_TEST_SUITE_END();
+BOOST_AUTO_TEST_SUITE_END();

test/v1/async_pipe.cpp

@@ -20,7 +20,7 @@
 #include <boost/asio/streambuf.hpp>
 
 using namespace std;
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 namespace asio = boost::asio;
 
 BOOST_AUTO_TEST_SUITE( async );

test/v1/async_system_fail.cpp

@@ -18,7 +18,7 @@
 #include <boost/process/v1/async_system.hpp>
 #include <system_error>
 
-namespace bp = boost::process;;
+namespace bp = boost::process::v1;
 
 void fail_func()
 {

test/v1/async_system_future.cpp

@@ -23,7 +23,7 @@
 #include <vector>
 #include <array>
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 BOOST_AUTO_TEST_SUITE( async );
 
 BOOST_AUTO_TEST_CASE(future, *boost::unit_test::timeout(15))

test/v1/async_system_stackful.cpp

@@ -27,7 +27,7 @@
 #include <array>
 BOOST_AUTO_TEST_SUITE( async );
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 BOOST_AUTO_TEST_CASE(stackful, *boost::unit_test::timeout(15))
 {
     using boost::unit_test::framework::master_test_suite;

test/v1/async_system_stackful_error.cpp

@@ -26,7 +26,7 @@
 #include <array>
 BOOST_AUTO_TEST_SUITE( async );
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 BOOST_AUTO_TEST_CASE(stackful, *boost::unit_test::timeout(15))
 {
     using boost::unit_test::framework::master_test_suite;

test/v1/async_system_stackful_except.cpp

@@ -26,7 +26,7 @@
 #include <array>
 BOOST_AUTO_TEST_SUITE( async );
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 BOOST_AUTO_TEST_CASE(stackful_except, *boost::unit_test::timeout(15))
 {
     using boost::unit_test::framework::master_test_suite;

test/v1/async_system_stackless.cpp

@@ -25,7 +25,7 @@
 #include <array>
 BOOST_AUTO_TEST_SUITE( async );
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 BOOST_AUTO_TEST_CASE(stackless, *boost::unit_test::timeout(15))
 {
     using boost::unit_test::framework::master_test_suite;

test/v1/bind_stderr.cpp

@@ -39,7 +39,7 @@ typedef boost::asio::posix::stream_descriptor pipe_end;
 #endif
 
 namespace fs = boost::process::v1::filesystem;
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 BOOST_AUTO_TEST_SUITE( bind_stderr );
 
 BOOST_AUTO_TEST_CASE(sync_io, *boost::unit_test::timeout(2))

test/v1/bind_stdin.cpp

@@ -43,7 +43,7 @@ typedef boost::asio::posix::stream_descriptor pipe_end;
 
 
 namespace fs = boost::process::v1::filesystem;
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 BOOST_AUTO_TEST_CASE(sync_io, *boost::unit_test::timeout(10))
 {

test/v1/bind_stdin_stdout.cpp

@@ -22,7 +22,7 @@
 #include <string>
 #include <iostream>
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 BOOST_AUTO_TEST_SUITE( bind_stdin_stdout );
 
 BOOST_AUTO_TEST_CASE(sync_io, *boost::unit_test::timeout(10))

test/v1/bind_stdout.cpp

@@ -42,7 +42,7 @@ BOOST_AUTO_TEST_SUITE( bind_stdout );
 
 
 namespace fs = boost::process::v1::filesystem;
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 BOOST_AUTO_TEST_CASE(sync_io, *boost::unit_test::timeout(5))
 {

test/v1/bind_stdout_stderr.cpp

@@ -34,7 +34,7 @@ typedef boost::asio::windows::stream_handle pipe_end;
 typedef boost::asio::posix::stream_descriptor pipe_end;
 #endif
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 BOOST_AUTO_TEST_SUITE( bind_stdout_stderr );
 

test/v1/close_stderr.cpp

@@ -22,7 +22,7 @@
 #   include <sys/wait.h>
 #endif
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 
 BOOST_AUTO_TEST_CASE(close_stderr)

test/v1/close_stdin.cpp

@@ -22,7 +22,7 @@
 #   include <sys/wait.h>
 #endif
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 BOOST_AUTO_TEST_CASE(close_stdin)
 {

test/v1/close_stdout.cpp

@@ -22,7 +22,7 @@
 #   include <sys/wait.h>
 #endif
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 BOOST_AUTO_TEST_CASE(close_stdout)
 {

test/v1/cmd_test.cpp

@@ -26,7 +26,7 @@
 #include <boost/system/error_code.hpp>
 #include <cstdlib>
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 namespace fs = boost::process::v1::filesystem;
 
 

test/v1/env.cpp

@@ -27,7 +27,7 @@
 #include <stdlib.h>
 #include <list>
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 BOOST_AUTO_TEST_CASE(inherit_env, *boost::unit_test::timeout(2))
 {

test/v1/environment.cpp

@@ -12,7 +12,7 @@
 #include <boost/test/included/unit_test.hpp>
 #include <boost/process/v1/environment.hpp>
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 
 namespace std

test/v1/error.cpp

@@ -19,7 +19,7 @@
 
 
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 struct err_set
 {

test/v1/exit_code.cpp

@@ -26,7 +26,7 @@ typedef boost::asio::windows::stream_handle pipe_end;
 typedef boost::asio::posix::stream_descriptor pipe_end;
 #endif
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 BOOST_AUTO_TEST_CASE(sync_wait, *boost::unit_test::timeout(10))
 {

test/v1/extensions.cpp

@@ -17,7 +17,7 @@
 #include <boost/process/v1/extend.hpp>
 
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 
 struct run_exe

test/v1/group.cpp

@@ -29,7 +29,7 @@
 #include <iostream>
 #include <cstdlib>
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 BOOST_AUTO_TEST_CASE(group_test, *boost::unit_test::timeout(5))
 {

test/v1/group_wait.cpp

@@ -30,7 +30,7 @@
 #include <iostream>
 #include <cstdlib>
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 
 

test/v1/limit_fd.cpp

@@ -7,9 +7,7 @@
 #define BOOST_TEST_IGNORE_SIGCHLD
 #include <boost/test/included/unit_test.hpp>
 
-#include <iostream>
-
-#include <boost/process.hpp>
+#include <boost/process/v1/system.hpp>
 #include <boost/process/v1/handles.hpp>
 #include <boost/process/v1/pipe.hpp>
 #include <boost/process/v1/io.hpp>
@@ -32,8 +30,7 @@
 #include <dirent.h>
 #endif
 
-namespace fs = boost::process::v1::filesystem;
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 namespace bt = boost::this_process;
 
 BOOST_AUTO_TEST_CASE(leak_test, *boost::unit_test::timeout(5))
@@ -110,7 +107,7 @@ BOOST_AUTO_TEST_CASE(leak_test, *boost::unit_test::timeout(5))
     BOOST_CHECK(!bt::is_stream_handle(event_fd , ec)); BOOST_CHECK_MESSAGE(!ec, ec.message());
 #endif
     auto od = ::opendir(".");
-    int dir_fd = ::dirfd(od);
+    int dir_fd = dirfd(od);
     BOOST_CHECK(!bt::is_stream_handle(dir_fd , ec)); BOOST_CHECK_MESSAGE(!ec, ec.message());
 #endif
 

test/v1/multi_ref1.cpp

@@ -4,4 +4,32 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 
-#include <boost/process.hpp>
+#include <boost/process/v1/args.hpp>
+#include <boost/process/v1/async.hpp>
+#include <boost/process/v1/async_pipe.hpp>
+#include <boost/process/v1/async_system.hpp>
+#include <boost/process/v1/child.hpp>
+#include <boost/process/v1/cmd.hpp>
+#include <boost/process/v1/env.hpp>
+#include <boost/process/v1/environment.hpp>
+#include <boost/process/v1/error.hpp>
+#include <boost/process/v1/exception.hpp>
+#include <boost/process/v1/exe.hpp>
+#include <boost/process/v1/extend.hpp>
+#include <boost/process/v1/filesystem.hpp>
+#include <boost/process/v1/group.hpp>
+#include <boost/process/v1/handles.hpp>
+#include <boost/process/v1/io.hpp>
+#include <boost/process/v1/locale.hpp>
+#include <boost/process/v1/pipe.hpp>
+#include <boost/process/v1/search_path.hpp>
+#include <boost/process/v1/shell.hpp>
+#include <boost/process/v1/spawn.hpp>
+#include <boost/process/v1/start_dir.hpp>
+#include <boost/process/v1/system.hpp>
+
+#if defined(BOOST_POSIX_API)
+#include <boost/process/v1/posix.hpp>
+#else
+#include <boost/process/v1/windows.hpp>
+#endif

test/v1/multi_ref2.cpp

@@ -3,4 +3,32 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/process.hpp>
+#include <boost/process/v1/args.hpp>
+#include <boost/process/v1/async.hpp>
+#include <boost/process/v1/async_pipe.hpp>
+#include <boost/process/v1/async_system.hpp>
+#include <boost/process/v1/child.hpp>
+#include <boost/process/v1/cmd.hpp>
+#include <boost/process/v1/env.hpp>
+#include <boost/process/v1/environment.hpp>
+#include <boost/process/v1/error.hpp>
+#include <boost/process/v1/exception.hpp>
+#include <boost/process/v1/exe.hpp>
+#include <boost/process/v1/extend.hpp>
+#include <boost/process/v1/filesystem.hpp>
+#include <boost/process/v1/group.hpp>
+#include <boost/process/v1/handles.hpp>
+#include <boost/process/v1/io.hpp>
+#include <boost/process/v1/locale.hpp>
+#include <boost/process/v1/pipe.hpp>
+#include <boost/process/v1/search_path.hpp>
+#include <boost/process/v1/shell.hpp>
+#include <boost/process/v1/spawn.hpp>
+#include <boost/process/v1/start_dir.hpp>
+#include <boost/process/v1/system.hpp>
+
+#if defined(BOOST_POSIX_API)
+#include <boost/process/v1/posix.hpp>
+#else
+#include <boost/process/v1/windows.hpp>
+#endif

test/v1/no_ansi_apps.cpp

@@ -6,5 +6,30 @@
 #include <boost/system/api_config.hpp>
 #if defined(BOOST_WINDOWS_API)
 #define BOOST_NO_ANSI_APIS 1
+#include <boost/process/v1/args.hpp>
+#include <boost/process/v1/async.hpp>
+#include <boost/process/v1/async_pipe.hpp>
+#include <boost/process/v1/async_system.hpp>
+#include <boost/process/v1/child.hpp>
+#include <boost/process/v1/cmd.hpp>
+#include <boost/process/v1/env.hpp>
+#include <boost/process/v1/environment.hpp>
+#include <boost/process/v1/error.hpp>
+#include <boost/process/v1/exception.hpp>
+#include <boost/process/v1/exe.hpp>
+#include <boost/process/v1/extend.hpp>
+#include <boost/process/v1/filesystem.hpp>
+#include <boost/process/v1/group.hpp>
+#include <boost/process/v1/handles.hpp>
+#include <boost/process/v1/io.hpp>
+#include <boost/process/v1/locale.hpp>
+#include <boost/process/v1/pipe.hpp>
+#include <boost/process/v1/search_path.hpp>
+#include <boost/process/v1/shell.hpp>
+#include <boost/process/v1/spawn.hpp>
+#include <boost/process/v1/start_dir.hpp>
+#include <boost/process/v1/system.hpp>
+#include <boost/process/v1/windows.hpp>
 #endif
-#include <boost/process.hpp>
+
+int main() {}

test/v1/on_exit.cpp

@@ -10,7 +10,8 @@
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_IGNORE_SIGCHLD
 #include <boost/test/included/unit_test.hpp>
-#include <boost/process.hpp>
+#include <boost/process/v1/async.hpp>
+#include <boost/process/v1/child.hpp>
 #include <boost/asio.hpp>
 #include <chrono>
 #include <thread>
@@ -26,7 +27,7 @@ BOOST_AUTO_TEST_CASE(single_ios, *boost::unit_test::timeout(6))
         return;
     }
 
-    namespace bp = boost::process;
+    namespace bp = boost::process::v1;
     boost::asio::io_context ios;
     std::chrono::steady_clock::time_point p1, p2;
 

test/v1/on_exit2.cpp

@@ -10,7 +10,8 @@
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_IGNORE_SIGCHLD
 #include <boost/test/included/unit_test.hpp>
-#include <boost/process.hpp>
+#include <boost/process/v1/async.hpp>
+#include <boost/process/v1/child.hpp>
 #include <boost/asio.hpp>
 #include <chrono>
 #include <thread>
@@ -26,7 +27,7 @@ BOOST_AUTO_TEST_CASE(double_ios, *boost::unit_test::timeout(6))
         return;
     }
 
-    namespace bp = boost::process;
+    namespace bp = boost::process::v1;
     boost::asio::io_context ios;
     std::chrono::steady_clock::time_point p1, p2;
 

test/v1/on_exit3.cpp

@@ -10,7 +10,8 @@
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_IGNORE_SIGCHLD
 #include <boost/test/included/unit_test.hpp>
-#include <boost/process.hpp>
+#include <boost/process/v1/async.hpp>
+#include <boost/process/v1/child.hpp>
 #include <boost/asio.hpp>
 #include <chrono>
 #include <thread>
@@ -26,7 +27,7 @@ BOOST_AUTO_TEST_CASE(double_ios_threaded, *boost::unit_test::timeout(6))
         return;
     }
 
-    namespace bp = boost::process;
+    namespace bp = boost::process::v1;
     boost::asio::io_context ios;
     std::chrono::steady_clock::time_point p1, p2;
 

test/v1/pipe.cpp

@@ -14,7 +14,7 @@
 #include <boost/process/v1/environment.hpp>
 
 using namespace std;
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 BOOST_AUTO_TEST_SUITE( pipe_tests );
 

test/v1/pipe_fwd.cpp

@@ -29,7 +29,7 @@
 
 BOOST_AUTO_TEST_SUITE( pipe_tests );
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 BOOST_AUTO_TEST_CASE(sync_io, *boost::unit_test::timeout(5))
 {

test/v1/posix_specific.cpp

@@ -11,10 +11,14 @@
 #define BOOST_TEST_IGNORE_SIGCHLD
 #include <boost/test/included/unit_test.hpp>
 
-#include <boost/process.hpp>
-#include <boost/process/v1/posix.hpp>
-
+#include <boost/process/v1/child.hpp>
+#include <boost/process/v1/environment.hpp>
 #include <boost/process/v1/filesystem.hpp>
+#include <boost/process/v1/io.hpp>
+#include <boost/process/v1/pipe.hpp>
+#include <boost/process/v1/posix.hpp>
+#include <boost/process/v1/spawn.hpp>
+#include <boost/process/v1/system.hpp>
 
 #if !defined(BOOST_PROCESS_USE_STD_FS)
 #include <boost/filesystem/directory.hpp>
@@ -29,7 +33,7 @@
 #include <errno.h>
 
 namespace fs = boost::process::v1::filesystem;
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 BOOST_AUTO_TEST_CASE(bind_fd, *boost::unit_test::timeout(2))
 {

test/v1/run_exe.cpp

@@ -15,7 +15,7 @@
 #include <boost/process/v1/error.hpp>
 #include <boost/process/v1/child.hpp>
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 int main(int argc, char* argv[])
 {

test/v1/run_exe_path.cpp

@@ -18,7 +18,7 @@
 #include <boost/process/v1/error.hpp>
 #include <boost/process/v1/child.hpp>
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 
 BOOST_AUTO_TEST_CASE(run_exe_success)

test/v1/search_path.cpp

@@ -13,7 +13,7 @@
 #include <boost/process/v1/filesystem.hpp>
 #include <string>
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 namespace fs = boost::process::v1::filesystem;
 
 BOOST_AUTO_TEST_CASE(search_path)

test/v1/shell.cpp

@@ -22,7 +22,7 @@
 #include <boost/process/v1/child.hpp>
 #include <boost/process/v1/shell.hpp>
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 
 BOOST_AUTO_TEST_CASE(shell_simple, *boost::unit_test::timeout(5))

test/v1/shell_path.cpp

@@ -13,7 +13,7 @@
 #include <boost/process/v1/filesystem.hpp>
 #include <system_error>
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 BOOST_AUTO_TEST_CASE(shell_set_on_error)
 {

test/v1/spawn.cpp

@@ -39,7 +39,7 @@ typedef boost::asio::posix::stream_descriptor pipe_end;
 #endif
 
 namespace fs = boost::process::v1::filesystem;
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 BOOST_AUTO_TEST_CASE(sync_spawn, *boost::unit_test::timeout(5))
 {

test/v1/spawn_fail.cpp

@@ -35,7 +35,7 @@ typedef boost::asio::posix::stream_descriptor pipe_end;
 #endif
 
 namespace fs = boost::process::v1::filesystem;
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 int main()
 {

test/v1/start_dir.cpp

@@ -10,14 +10,19 @@
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_IGNORE_SIGCHLD
 #include <boost/test/included/unit_test.hpp>
-#include <boost/process.hpp>
 #include <boost/system/error_code.hpp>
+#include <boost/process/v1/args.hpp>
+#include <boost/process/v1/child.hpp>
+#include <boost/process/v1/exe.hpp>
 #include <boost/process/v1/filesystem.hpp>
+#include <boost/process/v1/io.hpp>
+#include <boost/process/v1/pipe.hpp>
+#include <boost/process/v1/start_dir.hpp>
 #include <boost/algorithm/string/compare.hpp>
-#include <string>
-#include <iostream>
 
-namespace bp  = boost::process;
+#include <string>
+
+namespace bp = boost::process::v1;
 
 
 struct test_dir

test/v1/sub_launcher.cpp

@@ -2,7 +2,9 @@
 // Distributed under the Boost Software License, Version 1.0. (See accompanying
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
-#include <boost/process.hpp>
+#include <boost/process/v1/child.hpp>
+#include <boost/process/v1/io.hpp>
+#include <boost/process/v1/group.hpp>
 #include <boost/program_options.hpp>
 
 #include <vector>
@@ -20,7 +22,7 @@ int main(int argc, char *argv[])
 {
     using namespace std;
     using namespace boost::program_options;
-    using namespace boost::process;
+    using namespace boost::process::v1;
 
     bool launch_detached = false;
     bool launch_attached = false;

test/v1/system_test1.cpp

@@ -44,7 +44,7 @@ typedef boost::asio::posix::stream_descriptor pipe_end;
 #endif
 
 namespace fs = boost::process::v1::filesystem;
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 BOOST_AUTO_TEST_CASE(system_exit_code, *boost::unit_test::timeout(5))
 {

test/v1/system_test2.cpp

@@ -38,7 +38,7 @@
 #include <cstdlib>
 
 namespace fs = boost::process::v1::filesystem;
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 BOOST_AUTO_TEST_CASE(explicit_async_io, *boost::unit_test::timeout(2))
 {

test/v1/terminate.cpp

@@ -20,7 +20,7 @@
 #include <system_error>
 #include <thread>
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 BOOST_AUTO_TEST_CASE(terminate_set_on_error, *boost::unit_test::timeout(5))
 {

test/v1/throw_on_error.cpp

@@ -9,11 +9,11 @@
 
 #include <boost/core/lightweight_test.hpp>
 
-#include <boost/process.hpp>
+#include <boost/process/v1/child.hpp>
 #include <boost/process/v1/cmd.hpp>
 #include <system_error>
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 int main(int argc, char* argv[])
 {

test/v1/vfork.cpp

@@ -11,7 +11,7 @@
 #define BOOST_TEST_IGNORE_SIGCHLD
 #include <boost/test/included/unit_test.hpp>
 
-#include <boost/process.hpp>
+#include <boost/process/v1.hpp>
 #include <boost/process/v1/posix.hpp>
 
 #include <system_error>
@@ -21,7 +21,7 @@
 #include <sys/wait.h>
 #include <errno.h>
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 #if defined(BOOST_POSIX_HAS_VFORK)
 

test/v1/wait.cpp

@@ -22,7 +22,7 @@
 #   include <signal.h>
 #endif
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 BOOST_AUTO_TEST_SUITE( wait_test );
 

test/v1/wait_for.cpp

@@ -21,7 +21,7 @@
 #   include <signal.h>
 #endif
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 BOOST_AUTO_TEST_SUITE( wait_test);
 
 BOOST_AUTO_TEST_CASE(wait_for)

test/v1/wargs_cmd.cpp

@@ -21,7 +21,7 @@
 
 #include <boost/algorithm/string/predicate.hpp>
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 
 BOOST_AUTO_TEST_CASE(wargs, *boost::unit_test::timeout(2))

test/v1/windows_specific.cpp

@@ -10,14 +10,14 @@
 #define BOOST_TEST_MAIN
 #define BOOST_TEST_IGNORE_SIGCHLD
 #include <boost/test/included/unit_test.hpp>
-#include <boost/process.hpp>
+#include <boost/process/v1.hpp>
 #include <boost/process/v1/windows.hpp>
 #include <boost/process/v1/extend.hpp>
 #include <boost/system/error_code.hpp>
 
 #include <string>
 
-namespace bp = boost::process;
+namespace bp = boost::process::v1;
 
 BOOST_AUTO_TEST_CASE(show_window)
 {