trait & fwd decl fixes

.circleci/config.yml

@@ -70,6 +70,7 @@ jobs:
 
             python <(curl -s https://report.ci/annotate.py) --tool gcc --input test.log
             python <(curl -s https://report.ci/annotate.py) --tool gcc --input no-valgrind.log
-            bash <(curl -s https://codecov.io/bash) -x gcov > /dev/null || true
+            python <(curl -s https://report.ci/upload.py) --name "Circle CI Gcc Tests" --framework boost
+            bash <(curl -s https://codecov.io/bash) -x gcov || true
             echo "BUILD_RESULT: $FAILED"
             exit $FAILED

.drone.star

@@ -1,38 +0,0 @@
-# Use, modification, and distribution are
-# subject to the Boost Software License, Version 1.0. (See accompanying
-# file LICENSE.txt)
-#
-# Copyright Rene Rivera 2020.
-
-# For Drone CI we use the Starlark scripting language to reduce duplication.
-# As the yaml syntax for Drone CI is rather limited.
-#
-#
-globalenv={'B2_CI_VERSION': '1', 'B2_VARIANT': 'release'}
-linuxglobalimage="cppalliance/droneubuntu1804:1"
-windowsglobalimage="cppalliance/dronevs2019"
-
-def main(ctx):
-  return [
-  freebsd_cxx("gcc 11 freebsd", "g++-11", buildtype="boost", buildscript="drone", freebsd_version="13.1", environment={'B2_TOOLSET': 'gcc-11', 'B2_CXXSTD': '17,20', 'B2_LINKFLAGS': '-Wl,-rpath=/usr/local/lib/gcc11'}, globalenv=globalenv),
-  freebsd_cxx("clang 14 freebsd", "clang++-14", buildtype="boost", buildscript="drone", freebsd_version="13.1", environment={'B2_TOOLSET': 'clang-14', 'B2_CXXSTD': '17,20'}, globalenv=globalenv),
-  linux_cxx("docs", "", packages="docbook docbook-xml docbook-xsl xsltproc libsaxonhe-java default-jre-headless flex libfl-dev bison unzip rsync", image="cppalliance/droneubuntu1804:1", buildtype="docs", buildscript="drone", environment={"COMMENT": "docs"}, globalenv=globalenv),
-  linux_cxx("asan",         "g++-8",  packages="g++-8",  buildtype="boost", buildscript="drone", image=linuxglobalimage,                        environment={'COMMENT': 'asan',  'B2_VARIANT': 'debug', 'B2_TOOLSET': 'gcc-8',  'B2_CXXSTD': '11', 'B2_ASAN':  '1', 'B2_DEFINES': 'BOOST_NO_STRESS_TEST=1', 'DRONE_EXTRA_PRIVILEGED': 'True', 'DRONE_JOB_UUID': '356a192b79'}, globalenv=globalenv, privileged=True),
-  linux_cxx("ubsan",        "g++-8",  packages="g++-8",  buildtype="boost", buildscript="drone", image=linuxglobalimage,                        environment={'COMMENT': 'ubsan', 'B2_VARIANT': 'debug', 'B2_TOOLSET': 'gcc-8',  'B2_CXXSTD': '11', 'B2_UBSAN': '1', 'B2_DEFINES': 'BOOST_NO_STRESS_TEST=1', 'B2_LINKFLAGS': '-fuse-ld=gold',  'DRONE_JOB_UUID': '77de68daec'}, globalenv=globalenv),
-  linux_cxx("gcc 11 arm64", "g++-11", packages="g++-11", buildtype="boost", buildscript="drone", image="cppalliance/droneubuntu2004:multiarch", environment={                                           'B2_TOOLSET': 'gcc-11', 'B2_CXXSTD': '11',                                                                                            'DRONE_JOB_UUID': '17ba079169m'}, arch="arm64", globalenv=globalenv),
-  linux_cxx("GCC 10, Debug + Coverage", "g++-10", packages="g++-10 libssl-dev libffi-dev binutils-gold gdb",
-                                                                                                 image="cppalliance/droneubuntu2004:1", buildtype="boost", buildscript="drone", environment={"GCOV": "gcov-10", "LCOV_VERSION": "1.15", "VARIANT": "process_coverage", "TOOLSET": "gcc", "COMPILER": "g++-10", "CXXSTD": "11", "DRONE_BEFORE_INSTALL" : "process_coverage", "CODECOV_TOKEN": {"from_secret": "codecov_token"}}, globalenv=globalenv, privileged=True),
-  # A set of jobs based on the earlier .travis.yml configuration:
-  linux_cxx("Default clang++ with libc++", "clang++-libc++", packages="libc++-dev", image="cppalliance/droneubuntu1604:1", buildtype="buildtype", buildscript="drone", environment={ "B2_TOOLSET": "clang-7", "B2_CXXSTD": "11", "VARIANT": "debug", "TOOLSET": "clang", "COMPILER": "clang++-libc++", "CXXSTD": "11", "CXX_FLAGS": "<cxxflags>-stdlib=libc++ <linkflags>-stdlib=libc++", "TRAVISCLANG" : "yes" }, globalenv=globalenv),
-  linux_cxx("Default g++", "g++", image="cppalliance/droneubuntu1604:1", buildtype="buildtype", buildscript="drone", environment={ "VARIANT": "release", "TOOLSET": "gcc", "COMPILER": "g++", "CXXSTD": "11" }, globalenv=globalenv),
-  linux_cxx("Clang 3.8, UBasan", "clang++-3.8", packages="clang-3.8 libssl-dev", llvm_os="precise", llvm_ver="3.8", image="cppalliance/droneubuntu1604:1", buildtype="boost", buildscript="drone", environment={"VARIANT": "process_ubasan", "TOOLSET": "clang", "COMPILER": "clang++-3.8", "CXXSTD": "11", "UBSAN_OPTIONS": 'print_stacktrace=1', "DRONE_BEFORE_INSTALL": "UBasan" }, globalenv=globalenv),
-  linux_cxx("gcc 6", "g++-6", packages="g++-6", buildtype="boost", buildscript="drone", image=linuxglobalimage, environment={'B2_TOOLSET': 'gcc-6', 'B2_CXXSTD': '11', 'DRONE_JOB_UUID': '902ba3cda1'}, globalenv=globalenv),
-  linux_cxx("clang 3.8", "clang++-3.8", packages="clang-3.8", buildtype="boost", buildscript="drone", image="cppalliance/droneubuntu1604:1", environment={'B2_TOOLSET': 'clang', 'COMPILER': 'clang++-3.8', 'B2_CXXSTD': '11', 'DRONE_JOB_UUID': '7b52009b64'}, globalenv=globalenv),
-  osx_cxx("clang", "g++", packages="", buildtype="boost",         buildscript="drone", environment={'B2_TOOLSET': 'clang', 'B2_CXXSTD': '11,17', 'DRONE_JOB_UUID': '91032ad7bb'}, globalenv=globalenv),
-  linux_cxx("coverity", "g++", packages="", buildtype="coverity", buildscript="drone", image=linuxglobalimage, environment={'COMMENT': 'Coverity Scan', 'B2_TOOLSET': 'clang', 'DRONE_JOB_UUID': '472b07b9fc'}, globalenv=globalenv),
-  windows_cxx("msvc-14.1", "", image="cppalliance/dronevs2017",   buildtype="boost", buildscript="drone", environment={ "VARIANT": "release", "TOOLSET": "msvc-14.1", "CXXSTD": "11", "DEFINE" : "BOOST_BEAST_USE_STD_STRING_VIEW", "ADDRESS_MODEL": "64"}),
-  windows_cxx("msvc-14.3", "", image="cppalliance/dronevs2022:1", buildtype="boost", buildscript="drone", environment={ "VARIANT": "release", "TOOLSET": "msvc-14.3", "CXXSTD": "11", "DEFINE" : "BOOST_BEAST_USE_STD_STRING_VIEW", "ADDRESS_MODEL": "64"}),
-    ]
-
-# from https://github.com/boostorg/boost-ci
-load("@boost_ci//ci/drone/:functions.star", "linux_cxx","windows_cxx","osx_cxx","freebsd_cxx")

.drone/drone.bat

@@ -1,36 +0,0 @@
-@ECHO ON
-setlocal enabledelayedexpansion
-
-if "%DRONE_JOB_BUILDTYPE%" == "boost" (
-
-echo '==================================> INSTALL'
-
-git clone https://github.com/boostorg/boost-ci.git boost-ci-cloned --depth 1
-cp -prf boost-ci-cloned/ci .
-rm -rf boost-ci-cloned
-
-REM source ci/travis/install.sh
-REM The contents of install.sh below:
-
-for /F %%i in ("%DRONE_REPO%") do @set SELF=%%~nxi
-SET BOOST_CI_TARGET_BRANCH=%DRONE_COMMIT_BRANCH%
-SET BOOST_CI_SRC_FOLDER=%cd%
-
-call ci\common_install.bat
-
-echo '==================================> COMPILE'
-
-REM set B2_TARGETS=libs/!SELF!/test libs/!SELF!/example
-set B2_TARGETS=libs/!SELF!/test
-
-cd !BOOST_ROOT!
-call bootstrap.bat
-b2 headers
-b2 --debug-configuration variant=%VARIANT% cxxstd=%CXXSTD% define=%DEFINE% address-model=%ADDRESS_MODEL% toolset=%TOOLSET% --verbose-test libs/!SELF!/test -j3
-b2 --debug-configuration variant=%VARIANT% cxxstd=%CXXSTD% define=%DEFINE% address-model=%ADDRESS_MODEL% toolset=%TOOLSET% --verbose-test libs/!SELF!/example -j3
-
-) else if "%DRONE_JOB_BUILDTYPE%" == "standalone-windows" (
-
-REM not used
-
-)

.drone/drone.sh

@@ -1,199 +0,0 @@
-#!/bin/bash
-
-# Copyright 2020 Rene Rivera, Sam Darwin
-# Distributed under the Boost Software License, Version 1.0.
-# (See accompanying file LICENSE.txt or copy at http://boost.org/LICENSE_1_0.txt)
-
-set -xe
-
-export TRAVIS_BUILD_DIR=$(pwd)
-export DRONE_BUILD_DIR=$(pwd)
-export TRAVIS_BRANCH=$DRONE_BRANCH
-export TRAVIS_EVENT_TYPE=$DRONE_BUILD_EVENT
-export VCS_COMMIT_ID=$DRONE_COMMIT
-export GIT_COMMIT=$DRONE_COMMIT
-export REPO_NAME=$DRONE_REPO
-export USER=$(whoami)
-export CC=${CC:-gcc}
-export PATH=~/.local/bin:/usr/local/bin:$PATH
-
-common_install () {
-  git clone https://github.com/boostorg/boost-ci.git boost-ci-cloned --depth 1
-  cp -prf boost-ci-cloned/ci .
-  rm -rf boost-ci-cloned
-
-  if [ "$TRAVIS_OS_NAME" == "osx" ]; then
-      unset -f cd
-  fi
-
-  export SELF=`basename $REPO_NAME`
-  export BOOST_CI_TARGET_BRANCH="$TRAVIS_BRANCH"
-  export BOOST_CI_SRC_FOLDER=$(pwd)
-
-  . ./ci/common_install.sh
-}
-
-if [ "$DRONE_JOB_BUILDTYPE" == "boost" ]; then
-
-echo '==================================> INSTALL'
-
-common_install
-
-echo '==================================> SCRIPT'
-
-$BOOST_ROOT/libs/$SELF/ci/travis/build.sh
-
-elif [ "$DRONE_JOB_BUILDTYPE" == "docs" ]; then
-
-echo '==================================> INSTALL'
-
-export SELF=`basename $REPO_NAME`
-
-pwd
-cd ..
-mkdir -p $HOME/cache && cd $HOME/cache
-if [ ! -d doxygen ]; then git clone -b 'Release_1_8_15' --depth 1 https://github.com/doxygen/doxygen.git && echo "not-cached" ; else echo "cached" ; fi
-cd doxygen
-cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Release
-cd build
-sudo make install
-cd ../..
-if [ ! -f saxonhe.zip ]; then wget -O saxonhe.zip https://sourceforge.net/projects/saxon/files/Saxon-HE/9.9/SaxonHE9-9-1-4J.zip/download && echo "not-cached" ; else echo "cached" ; fi
-unzip -o saxonhe.zip
-sudo rm /usr/share/java/Saxon-HE.jar
-sudo cp saxon9he.jar /usr/share/java/Saxon-HE.jar
-cd ..
-BOOST_BRANCH=develop && [ "$TRAVIS_BRANCH" == "master" ] && BOOST_BRANCH=master || true
-git clone -b $BOOST_BRANCH https://github.com/boostorg/boost.git boost-root --depth 1
-cd boost-root
-export BOOST_ROOT=$(pwd)
-git submodule update --init libs/context
-git submodule update --init tools/boostbook
-git submodule update --init tools/boostdep
-git submodule update --init tools/docca
-git submodule update --init tools/quickbook
-rsync -av $TRAVIS_BUILD_DIR/ libs/$SELF
-python tools/boostdep/depinst/depinst.py ../tools/quickbook
-./bootstrap.sh
-./b2 headers
-
-echo '==================================> SCRIPT'
-
-echo "using doxygen ; using boostbook ; using saxonhe ;" > tools/build/src/user-config.jam
-./b2 -j3 libs/$SELF/doc//boostrelease
-
-elif [ "$DRONE_JOB_BUILDTYPE" == "codecov" ]; then
-
-echo '==================================> INSTALL'
-
-common_install
-
-echo '==================================> SCRIPT'
-
-cd $BOOST_ROOT/libs/$SELF
-ci/travis/codecov.sh
-
-elif [ "$DRONE_JOB_BUILDTYPE" == "valgrind" ]; then
-
-echo '==================================> INSTALL'
-
-common_install
-
-echo '==================================> SCRIPT'
-
-cd $BOOST_ROOT/libs/$SELF
-ci/travis/valgrind.sh
-
-elif [ "$DRONE_JOB_BUILDTYPE" == "standalone" ]; then
-
-echo '==================================> INSTALL'
-
-# Installing cmake with apt-get, so not required here:
-# pip install --user cmake
-
-echo '==================================> SCRIPT'
-
-export CXXFLAGS="-Wall -Wextra -Werror -std=c++17"
-mkdir __build_17
-cd __build_17
-cmake -DBOOST_JSON_STANDALONE=1 ..
-cmake --build .
-ctest -V .
-export CXXFLAGS="-Wall -Wextra -Werror -std=c++2a"
-mkdir ../__build_2a
-cd ../__build_2a
-cmake -DBOOST_JSON_STANDALONE=1 ..
-cmake --build .
-ctest -V .
-
-elif [ "$DRONE_JOB_BUILDTYPE" == "coverity" ]; then
-
-echo '==================================> INSTALL'
-
-common_install
-
-echo '==================================> SCRIPT'
-
-if [ $VARIANT = "process_valgrind" ];
-then export USE_VALGRIND="testing.launcher=valgrind valgrind=on";
-fi ;
-
-if  [ -n "${COVERITY_SCAN_NOTIFICATION_EMAIL}" -a \( "$TRAVIS_BRANCH" = "develop" -o "$TRAVIS_BRANCH" = "master" \) -a \( "$DRONE_BUILD_EVENT" = "push" -o "$DRONE_BUILD_EVENT" = "cron" \) ] ; then
-cd $BOOST_ROOT/libs/$SELF
-ci/travis/coverity.sh
-fi
-
-elif [ "$DRONE_JOB_BUILDTYPE" == "cmake-superproject" ]; then
-
-echo '==================================> INSTALL'
-
-common_install
-
-echo '==================================> COMPILE'
-
-export CXXFLAGS="-Wall -Wextra -Werror"
-
-mkdir __build_static
-cd __build_static
-cmake -DBOOST_ENABLE_CMAKE=1 -DBUILD_TESTING=ON -DBoost_VERBOSE=1 \
-    -DBOOST_INCLUDE_LIBRARIES=$SELF ..
-cmake --build .
-ctest --output-on-failure -R boost_$SELF
-
-cd ..
-
-mkdir __build_shared
-cd __build_shared
-cmake -DBOOST_ENABLE_CMAKE=1 -DBUILD_TESTING=ON -DBoost_VERBOSE=1 \
-    -DBOOST_INCLUDE_LIBRARIES=$SELF -DBUILD_SHARED_LIBS=ON ..
-cmake --build .
-ctest --output-on-failure -R boost_$SELF
-
-elif [ "$DRONE_JOB_BUILDTYPE" == "cmake1" ]; then
-
-echo '==================================> INSTALL'
-
-pip install --user cmake
-
-echo '==================================> SCRIPT'
-
-export SELF=`basename $REPO_NAME`
-BOOST_BRANCH=develop && [ "$DRONE_BRANCH" == "master" ] && BOOST_BRANCH=master || true
-echo BOOST_BRANCH: $BOOST_BRANCH
-cd ..
-git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
-cd boost-root
-mkdir -p libs/$SELF
-cp -r $DRONE_BUILD_DIR/* libs/$SELF
-# git submodule update --init tools/boostdep
-git submodule update --init --recursive
-
-cd libs/$SELF
-
-../../../b2 -sBOOST_BUILD_PATH=.
-../../../b2 $MULTITHREAD with-valgrind address-model=64 architecture=x86 $USE_VALGRIND toolset=$TOOLSET cxxflags="--coverage -DBOOST_TRAVISCI_BUILD -std=$CXX_STANDARD" linkflags="--coverage" -sBOOST_BUILD_PATH=. $REPORT_CI
-../../../b2 $MULTITHREAD without-valgrind address-model=64 architecture=x86 toolset=$TOOLSET cxxflags="--coverage -DBOOST_TRAVISCI_BUILD -std=$CXX_STANDARD" linkflags="--coverage" -sBOOST_BUILD_PATH=. $REPORT_CI
-
-
-
-fi

.github/workflows/ci.yml

@@ -1,375 +0,0 @@
-name: CI
-
-on:
-  pull_request:
-  push:
-    branches:
-      - master
-      - develop
-      - feature/**
-
-env:
-  UBSAN_OPTIONS: print_stacktrace=1
-
-jobs:
-  posix:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - toolset: gcc-4.8
-            cxxstd: "11"
-            os: ubuntu-18.04
-            install: g++-4.8
-          - toolset: gcc-5
-            cxxstd: "11,14,1z"
-            os: ubuntu-18.04
-            install: g++-5
-          - toolset: gcc-6
-            cxxstd: "11,14,1z"
-            os: ubuntu-18.04
-            install: g++-6
-          - toolset: gcc-7
-            cxxstd: "11,14,17"
-            os: ubuntu-18.04
-          - toolset: gcc-8
-            cxxstd: "11,14,17,2a"
-            os: ubuntu-18.04
-            install: g++-8
-          - toolset: gcc-9
-            cxxstd: "11,14,17,2a"
-            os: ubuntu-20.04
-          - toolset: gcc-10
-            cxxstd: "11,14,17,2a"
-            os: ubuntu-20.04
-            install: g++-10
-          - toolset: gcc-11
-            cxxstd: "11,14,17,2a"
-            os: ubuntu-20.04
-            install: g++-11
-          - toolset: gcc-12
-            cxxstd: "11,14,17,20,2b"
-            os: ubuntu-22.04
-            install: g++-12
-          - toolset: clang
-            compiler: clang++-3.9
-            cxxstd: "11,14"
-            os: ubuntu-18.04
-            install: clang-3.9
-          - toolset: clang
-            compiler: clang++-4.0
-            cxxstd: "11,14"
-            os: ubuntu-18.04
-            install: clang-4.0
-          - toolset: clang
-            compiler: clang++-5.0
-            cxxstd: "11,14,1z"
-            os: ubuntu-18.04
-            install: clang-5.0
-          - toolset: clang
-            compiler: clang++-6.0
-            cxxstd: "11,14,17"
-            os: ubuntu-18.04
-            install: clang-6.0
-          - toolset: clang
-            compiler: clang++-7
-            cxxstd: "11,14,17"
-            os: ubuntu-18.04
-            install: clang-7
-          - toolset: clang
-            compiler: clang++-8
-            cxxstd: "11,14,17"
-            os: ubuntu-20.04
-            install: clang-8
-          - toolset: clang
-            compiler: clang++-9
-            cxxstd: "11,14,17,2a"
-            os: ubuntu-20.04
-            install: clang-9
-          - toolset: clang
-            compiler: clang++-10
-            cxxstd: "11,14,17,2a"
-            os: ubuntu-20.04
-            install: clang-10
-          - toolset: clang
-            compiler: clang++-11
-            cxxstd: "11,14,17,2a"
-            os: ubuntu-20.04
-            install: clang-11
-          - toolset: clang
-            compiler: clang++-12
-            cxxstd: "11,14,17,2a"
-            os: ubuntu-20.04
-            install: clang-12
-          - toolset: clang
-            compiler: clang++-13
-            cxxstd: "11,14,17,20,2b"
-            os: ubuntu-22.04
-            install: clang-13
-          - toolset: clang
-            compiler: clang++-14
-            cxxstd: "11,14,17,20,2b"
-            os: ubuntu-22.04
-            install: clang-14
-          - toolset: clang
-            cxxstd: "11,14,17,2a"
-            os: macos-11
-
-    runs-on: ${{matrix.os}}
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Install packages
-        if: matrix.install
-        run: sudo apt install ${{matrix.install}}
-
-      - name: Setup Boost
-        run: |
-          echo GITHUB_REPOSITORY: $GITHUB_REPOSITORY
-          LIBRARY=${GITHUB_REPOSITORY#*/}
-          echo LIBRARY: $LIBRARY
-          echo "LIBRARY=$LIBRARY" >> $GITHUB_ENV
-          echo GITHUB_BASE_REF: $GITHUB_BASE_REF
-          echo GITHUB_REF: $GITHUB_REF
-          REF=${GITHUB_BASE_REF:-$GITHUB_REF}
-          REF=${REF#refs/heads/}
-          echo REF: $REF
-          BOOST_BRANCH=develop && [ "$REF" == "master" ] && BOOST_BRANCH=master || true
-          echo BOOST_BRANCH: $BOOST_BRANCH
-          cd ..
-          git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
-          cd boost-root
-          cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
-          git submodule update --init tools/boostdep
-          python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY
-          ./bootstrap.sh
-          ./b2 -d0 headers
-
-      - name: Create user-config.jam
-        if: matrix.compiler
-        run: |
-          echo "using ${{matrix.toolset}} : : ${{matrix.compiler}} ;" > ~/user-config.jam
-
-      - name: Run tests
-        run: |
-          cd ../boost-root
-          ./b2 -j3 libs/$LIBRARY/test toolset=${{matrix.toolset}} cxxstd=${{matrix.cxxstd}} variant=debug,release
-
-  windows:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - toolset: msvc-14.0
-            cxxstd: "14,latest"
-            addrmd: 32,64
-            os: windows-2019
-          - toolset: msvc-14.2
-            cxxstd: "14,17,20,latest"
-            addrmd: 32,64
-            os: windows-2019
-          - toolset: msvc-14.3
-            cxxstd: "14,17,20,latest"
-            addrmd: 32,64
-            os: windows-2022
-          - toolset: clang-win
-            cxxstd: "14,17,latest"
-            addrmd: 32,64
-            os: windows-2022
-          - toolset: gcc
-            cxxstd: "11,14,17,2a"
-            addrmd: 64
-            os: windows-2019
-
-    runs-on: ${{matrix.os}}
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Setup Boost
-        shell: cmd
-        run: |
-          echo GITHUB_REPOSITORY: %GITHUB_REPOSITORY%
-          for /f %%i in ("%GITHUB_REPOSITORY%") do set LIBRARY=%%~nxi
-          echo LIBRARY: %LIBRARY%
-          echo LIBRARY=%LIBRARY%>>%GITHUB_ENV%
-          echo GITHUB_BASE_REF: %GITHUB_BASE_REF%
-          echo GITHUB_REF: %GITHUB_REF%
-          if "%GITHUB_BASE_REF%" == "" set GITHUB_BASE_REF=%GITHUB_REF%
-          set BOOST_BRANCH=develop
-          for /f %%i in ("%GITHUB_BASE_REF%") do if "%%~nxi" == "master" set BOOST_BRANCH=master
-          echo BOOST_BRANCH: %BOOST_BRANCH%
-          cd ..
-          git clone -b %BOOST_BRANCH% --depth 1 https://github.com/boostorg/boost.git boost-root
-          cd boost-root
-          xcopy /s /e /q %GITHUB_WORKSPACE% libs\%LIBRARY%\
-          git submodule update --init tools/boostdep
-          python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" %LIBRARY%
-          cmd /c bootstrap
-          b2 -d0 headers
-
-      - name: Run tests
-        shell: cmd
-        run: |
-          cd ../boost-root
-          b2 -j3 libs/%LIBRARY%/test toolset=${{matrix.toolset}} cxxstd=${{matrix.cxxstd}} address-model=${{matrix.addrmd}} variant=debug,release embed-manifest-via=linker
-
-  posix-cmake-subdir:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-18.04
-          - os: ubuntu-20.04
-          - os: ubuntu-22.04
-          - os: macos-11
-
-    runs-on: ${{matrix.os}}
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Install packages
-        if: matrix.install
-        run: sudo apt install ${{matrix.install}}
-
-      - name: Setup Boost
-        run: |
-          echo GITHUB_REPOSITORY: $GITHUB_REPOSITORY
-          LIBRARY=${GITHUB_REPOSITORY#*/}
-          echo LIBRARY: $LIBRARY
-          echo "LIBRARY=$LIBRARY" >> $GITHUB_ENV
-          echo GITHUB_BASE_REF: $GITHUB_BASE_REF
-          echo GITHUB_REF: $GITHUB_REF
-          REF=${GITHUB_BASE_REF:-$GITHUB_REF}
-          REF=${REF#refs/heads/}
-          echo REF: $REF
-          BOOST_BRANCH=develop && [ "$REF" == "master" ] && BOOST_BRANCH=master || true
-          echo BOOST_BRANCH: $BOOST_BRANCH
-          cd ..
-          git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
-          cd boost-root
-          cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
-          git submodule update --init tools/boostdep
-          python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY
-
-      - name: Use library with add_subdirectory
-        run: |
-          cd ../boost-root/libs/$LIBRARY/test/cmake_subdir_test
-          mkdir __build__ && cd __build__
-          cmake ..
-          cmake --build .
-          ctest --output-on-failure --no-tests=error
-
-  posix-cmake-install:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-18.04
-          - os: ubuntu-20.04
-          - os: ubuntu-22.04
-          - os: macos-11
-
-    runs-on: ${{matrix.os}}
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Install packages
-        if: matrix.install
-        run: sudo apt install ${{matrix.install}}
-
-      - name: Setup Boost
-        run: |
-          echo GITHUB_REPOSITORY: $GITHUB_REPOSITORY
-          LIBRARY=${GITHUB_REPOSITORY#*/}
-          echo LIBRARY: $LIBRARY
-          echo "LIBRARY=$LIBRARY" >> $GITHUB_ENV
-          echo GITHUB_BASE_REF: $GITHUB_BASE_REF
-          echo GITHUB_REF: $GITHUB_REF
-          REF=${GITHUB_BASE_REF:-$GITHUB_REF}
-          REF=${REF#refs/heads/}
-          echo REF: $REF
-          BOOST_BRANCH=develop && [ "$REF" == "master" ] && BOOST_BRANCH=master || true
-          echo BOOST_BRANCH: $BOOST_BRANCH
-          cd ..
-          git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
-          cd boost-root
-          cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
-          git submodule update --init tools/boostdep
-          python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY
-
-      - name: Configure
-        run: |
-          cd ../boost-root
-          mkdir __build__ && cd __build__
-          cmake -DBOOST_INCLUDE_LIBRARIES=$LIBRARY -DCMAKE_INSTALL_PREFIX=~/.local ..
-
-      - name: Install
-        run: |
-          cd ../boost-root/__build__
-          cmake --build . --target install
-
-      - name: Use the installed library
-        run: |
-          cd ../boost-root/libs/$LIBRARY/test/cmake_install_test && mkdir __build__ && cd __build__
-          cmake -DCMAKE_INSTALL_PREFIX=~/.local ..
-          cmake --build .
-          ctest --output-on-failure --no-tests=error
-
-  posix-cmake-test:
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-18.04
-          - os: ubuntu-20.04
-          - os: ubuntu-22.04
-          - os: macos-11
-
-    runs-on: ${{matrix.os}}
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Install packages
-        if: matrix.install
-        run: sudo apt install ${{matrix.install}}
-
-      - name: Setup Boost
-        run: |
-          echo GITHUB_REPOSITORY: $GITHUB_REPOSITORY
-          LIBRARY=${GITHUB_REPOSITORY#*/}
-          echo LIBRARY: $LIBRARY
-          echo "LIBRARY=$LIBRARY" >> $GITHUB_ENV
-          echo GITHUB_BASE_REF: $GITHUB_BASE_REF
-          echo GITHUB_REF: $GITHUB_REF
-          REF=${GITHUB_BASE_REF:-$GITHUB_REF}
-          REF=${REF#refs/heads/}
-          echo REF: $REF
-          BOOST_BRANCH=develop && [ "$REF" == "master" ] && BOOST_BRANCH=master || true
-          echo BOOST_BRANCH: $BOOST_BRANCH
-          cd ..
-          git clone -b $BOOST_BRANCH --depth 1 https://github.com/boostorg/boost.git boost-root
-          cd boost-root
-          cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
-          git submodule update --init tools/boostdep
-          python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" $LIBRARY
-
-      - name: Configure
-        run: |
-          cd ../boost-root
-          mkdir __build__ && cd __build__
-          cmake -DBOOST_INCLUDE_LIBRARIES=$LIBRARY -DBUILD_TESTING=ON ..
-
-      - name: Build tests
-        run: |
-          cd ../boost-root/__build__
-          cmake --build . --target tests
-
-      - name: Run tests
-        run: |
-          cd ../boost-root/__build__
-          ctest --output-on-failure --no-tests=error

.gitignore

@@ -31,5 +31,4 @@
 /notes.cpp
 /notes_p.txt
 .settings
-.DS_Store
 

.travis.yml

@@ -23,6 +23,8 @@ os:
   - linux
   - osx
 
+secure: "vs7qgXb0lQg8CTyDPSi3RQtOIOtssaCkBIx86UoEvTXwJCTOLPe7ZufQ0lobn0OVWo261AMx9GbumBBzqfsvJc1G6ixGBVwymiGli/R8DZDvvg9UdljsEk65s/XbujE/9qh97zKGGioFyCn1Bmf5+SdDAxsuXTZm/cBny5VxYaaCR7s2cFUmp4up/djqg1GI7uwBh3ceodT3OL1X3dlMV59gOJWWNsB+RO9b9DPhTW7nOlMNRiEFik4rweecQB0JS8LaHDjYwzIRrGYHX+lR9cE/O8GCCHcUOmq9jCozDdxx+HZRu4rb1ST1RiDbvYaoeTif0Df1fVXHWOoO2D4NlXB6tJPXw2mkop00j6zkcydUJYid6T1lwfEpXAhd5A9FvOIXO5hoju1wlqfkU2eFQ9Na8z8bCIX2niZmveZWp4Ag52gEPzJMFx9hHGT8J4FWMvkqTWezux1sPZrjZjc0kXdJrIp84D9MsBc1sKrxOAOb5ekSfIK5n4JDkgUtuwMSTvEdWqNJXFPZq1rEu4GTwX99z3/XF+pM5XaCDQtZ/zUA5SPHhy0dKLH/BvceUqLJt53+lMcpsltJDB+XxQ/CFL7IdgR91OKGus/z4dbVWiSdkoNvcuZqjQLFLOMVNxoqC6PRvDAEhpy21j/5GUPvM5baQS7IEin0NF7bOTtXJdY="
+
 env:
   matrix:
     - BADGE=linux
@@ -71,7 +73,7 @@ before_install:
   # Set this to the name of the library
   - PROJECT_TO_TEST=`basename $TRAVIS_BUILD_DIR`
   - echo "Testing $PROJECT_TO_TEST"
-  - if [ $TRAVIS_OS_NAME = "osx" ]; then brew install gcc5; brew install valgrind; brew install llvm; TOOLSET=clang; BOOST_TEST_CATCH_SYSTEM_ERRORS=no; MULTITHREAD=-j8; else TOOLSET=gcc-5; REPORT_CI=--boost-process-report-ci USE_VALGRIND="testing.launcher=valgrind valgrind=on"; fi
+  - if [ $TRAVIS_OS_NAME = "osx" ]; then brew install gcc5; brew install valgrind; brew install llvm; TOOLSET=clang; BOOST_TEST_CATCH_SYSTEM_ERRORS=no; MULTITHREAD=-j8; else TOOLSET=gcc-5; USE_VALGRIND="testing.launcher=valgrind valgrind=on"; fi
   # Cloning Boost libraries (fast nondeep cloning)
   - BOOST=$HOME/boost-local
   - git init $BOOST
@@ -85,7 +87,7 @@ before_install:
   - git checkout $BOOST_BRANCH
   - git submodule update --init --merge
   - git remote set-branches --add origin $BOOST_BRANCH
-  - git pull --recurse-submodules || true
+  - git pull --recurse-submodules
   - git submodule update --init
   - git checkout $BOOST_BRANCH
   - git submodule foreach "git reset --quiet --hard; git clean -fxd"
@@ -101,8 +103,8 @@ before_install:
   - echo BOOST_TEST_CATCH_SYSTEM_ERRORS $BOOST_TEST_CATCH_SYSTEM_ERRORS
 script:
   # `--coverage` flags required to generate coverage info for Coveralls
-  - ../../../b2 $MULTITHREAD with-valgrind address-model=64 architecture=x86 $USE_VALGRIND toolset=$TOOLSET cxxflags="--coverage -DBOOST_TRAVISCI_BUILD -std=$CXX_STANDARD" linkflags="--coverage" -sBOOST_BUILD_PATH=. $REPORT_CI
-  - ../../../b2 $MULTITHREAD without-valgrind address-model=64 architecture=x86 toolset=$TOOLSET cxxflags="--coverage -DBOOST_TRAVISCI_BUILD -std=$CXX_STANDARD" linkflags="--coverage" -sBOOST_BUILD_PATH=. $REPORT_CI
+  - ../../../b2 $MULTITHREAD with-valgrind address-model=64 architecture=x86 $USE_VALGRIND toolset=$TOOLSET cxxflags="--coverage -DBOOST_TRAVISCI_BUILD -std=$CXX_STANDARD" linkflags="--coverage" -sBOOST_BUILD_PATH=.
+  - ../../../b2 $MULTITHREAD without-valgrind address-model=64 architecture=x86 toolset=$TOOLSET cxxflags="--coverage -DBOOST_TRAVISCI_BUILD -std=$CXX_STANDARD" linkflags="--coverage" -sBOOST_BUILD_PATH=.
 after_success:
   # Copying Coveralls data to a separate folder
   - mkdir -p $TRAVIS_BUILD_DIR/coverals
@@ -131,6 +133,6 @@ after_success:
   - coveralls-lcov coverals/coverage.info
 
 after_script:
+  - curl -s https://report.ci/upload.py | python - --token=$REPORT_CI_TOKEN --name="$BADGE test run"
   - bash <(curl -s https://codecov.io/bash)
-  - cd $BOOST/libs/$PROJECT_TO_TEST/test
-  - curl -s https://report.ci/report.py | python - --name="$BADGE test run"
+

CMakeLists.txt

@@ -1,36 +0,0 @@
-# Generated by `boostdep --cmake process`
-# Copyright 2020 Peter Dimov
-# Distributed under the Boost Software License, Version 1.0.
-# https://www.boost.org/LICENSE_1_0.txt
-
-cmake_minimum_required(VERSION 3.5...3.16)
-
-project(boost_process VERSION "${BOOST_SUPERPROJECT_VERSION}" LANGUAGES CXX)
-
-add_library(boost_process INTERFACE)
-add_library(Boost::process ALIAS boost_process)
-
-target_include_directories(boost_process INTERFACE include)
-target_link_libraries(boost_process
-  INTERFACE
-    Boost::algorithm
-    Boost::asio
-    Boost::config
-    Boost::core
-    Boost::filesystem
-    Boost::fusion
-    Boost::iterator
-    Boost::move
-    Boost::optional
-    Boost::system
-    Boost::tokenizer
-    Boost::type_index
-    Boost::winapi
-)
-
-if(BUILD_TESTING AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")
-
-  add_subdirectory(test)
-
-endif()
-

README.md

@@ -1,21 +1,18 @@
-# [Boost Process (Boost.Process)](https://github.com/boostorg/process)
+# [Boost Process (Boost.Process)](https://github.com/klemens-morgenstern/boost-process)
 
 Boost.process is a library for comfortable management of processes, released with boost 1.64.0.
 
 ### Test results
 
-| Branches | Linux / Windows                                                                                                                              | Code coverage                                                                                                                                | Matrix                                                                                                                                        | 
-|----------|----------------------------------------------------------------------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------|
-| Develop: | [![Build Status](https://drone.cpp.al/api/badges/boostorg/process/status.svg)](https://drone.cpp.al/boostorg/process)                        | [![codecov](https://codecov.io/gh/boostorg/process/branch/develop/graph/badge.svg?token=AhunMqTSpA)](https://codecov.io/gh/boostorg/process) | [![Matrix](https://img.shields.io/badge/matrix-develop-lightgray.svg)](http://www.boost.org/development/tests/develop/developer/process.html) |
-| Master:  | [![Build Status](https://drone.cpp.al/api/badges/boostorg/process/status.svg?ref=refs/heads/develop)](https://drone.cpp.al/boostorg/process) | [![codecov](https://codecov.io/gh/boostorg/process/branch/master/graph/badge.svg?token=AhunMqTSpA)](https://codecov.io/gh/boostorg/process)  | [![Matrix](https://img.shields.io/badge/matrix-master-lightgray.svg)](http://www.boost.org/development/tests/master/developer/process.html)   |
+Branches        | Linux | OSX | Windows | Code coverage | Matrix | 
+----------------|-------|-----|---------| ------------- |--------|
+Develop:        | [![Build Status](https://travis-ci.org/klemens-morgenstern/boost-process.svg?branch=develop&env=BADGE=linux)](https://travis-ci.org/klemens-morgenstern/boost-process) [![badge](https://api.report.ci/status/klemens-morgenstern/boost-process/badge.svg?branch=develop&build=linux)](https://api.report.ci/status/klemens-morgenstern/boost-process?branch=develop&build=linux) | [![Build Status](https://travis-ci.org/klemens-morgenstern/boost-process.svg?branch=develop&env=BADGE=osx)](https://travis-ci.org/klemens-morgenstern/boost-process)  [![badge](https://api.report.ci/status/klemens-morgenstern/boost-process/badge.svg?branch=develop&build=osx)](https://api.report.ci/status/klemens-morgenstern/boost-process?branch=develop&build=osx) | [![Build status](https://ci.appveyor.com/api/projects/status/peup7e6m0e1bb5ba/branch/develop?svg=true)](https://ci.appveyor.com/project/klemens-morgenstern/boost-process/branch/develop) [![badge](https://api.report.ci/status/klemens-morgenstern/boost-process/badge.svg?branch=develop&build=windows)](https://api.report.ci/status/klemens-morgenstern/boost-process?branch=develop&build=windows) | [![Coverage Status](https://coveralls.io/repos/github/klemens-morgenstern/boost-process/badge.svg?branch=develop)](https://coveralls.io/github/klemens-morgenstern/boost-process?branch=develop) | [![Matrix](https://img.shields.io/badge/matrix-develop-lightgray.svg)](http://www.boost.org/development/tests/develop/developer/process.html)
+Master:         | [![Build Status](https://travis-ci.org/klemens-morgenstern/boost-process.svg?branch=master&env=BADGE=linux)](https://travis-ci.org/klemens-morgenstern/boost-process)  [![badge](https://api.report.ci/status/klemens-morgenstern/boost-process/badge.svg?branch=master&build=linux)](https://api.report.ci/status/klemens-morgenstern/boost-process?branch=master&build=linux)   | [![Build Status](https://travis-ci.org/klemens-morgenstern/boost-process.svg?branch=master&env=BADGE=osx)](https://travis-ci.org/klemens-morgenstern/boost-process)   [![badge](https://api.report.ci/status/klemens-morgenstern/boost-process/badge.svg?branch=master&build=osx)](https://api.report.ci/status/klemens-morgenstern/boost-process?branch=master&build=osx)   | [![Build status](https://ci.appveyor.com/api/projects/status/peup7e6m0e1bb5ba/branch/master?svg=true)](https://ci.appveyor.com/project/klemens-morgenstern/boost-process/branch/master)   [![badge](https://api.report.ci/status/klemens-morgenstern/boost-process/badge.svg?branch=master&build=windows)](https://api.report.ci/status/klemens-morgenstern/boost-process?branch=master&build=windows) | [![Coverage Status](https://coveralls.io/repos/github/klemens-morgenstern/boost-process/badge.svg?branch=master)](https://coveralls.io/github/klemens-morgenstern/boost-process?branch=master)   | [![Matrix](https://img.shields.io/badge/matrix-master-lightgray.svg)](http://www.boost.org/development/tests/master/developer/process.html)
 
 
+[Open Issues](https://github.com/klemens-morgenstern/boost-process/issues)
 
-
-
-[Open Issues](https://github.com/boostorg/process/issues)
-
-[Latest developer documentation](https://www.boost.org/doc/libs/develop/doc/html/process.html)
+[Latest developer documentation](http://klemens-morgenstern.github.io/process/)
 
 ### About
 This C++11 library is the current result of a long attempt to get a boost.process library, which is going on since 2006.

doc/Jamfile.jam

@@ -24,13 +24,12 @@ generators.register-standard common.copy : XML : XMLPROCESSWORKAROUND ;
 xmlprocessworkaround posix_pseudocode   : posix_pseudocode.xml   ; 
 xmlprocessworkaround windows_pseudocode : windows_pseudocode.xml ;
 
-path-constant INCLUDES : ../../.. ;
 
 doxygen autodoc
 :
-  $(INCLUDES)/boost/process.hpp
-  [ glob $(INCLUDES)/boost/process/*.hpp ]
-  :
+  ../../../boost/process.hpp
+  [ glob ../../../boost/process/*.hpp ]
+:
   <doxygen:param>EXCLUDE_SYMBOLS=BOOST_ASIO_INITFN_RESULT_TYPE
   <doxygen:param>PREDEFINED=BOOST_PROCESS_DOXYGEN
   <doxygen:param>HIDE_UNDOC_CLASSES=YES
@@ -43,49 +42,11 @@ doxygen autodoc
 
 
 
-doxygen reference_v2
-:
-  $(INCLUDES)/boost/process/v2.hpp
-  [ glob $(INCLUDES)/boost/process/v2/*.hpp ]
-  :
-  <doxygen:param>EXCLUDE_SYMBOLS=BOOST_ASIO_INITFN_RESULT_TYPE
-  <doxygen:param>PROJECT_NAME="Process V2"
-  <doxygen:param>PROJECT_BRIEF="The process library"
-  <doxygen:param>MACRO_EXPANSION=YES
-  <doxygen:param>EXPAND_ONLY_PREDEF=YES
-  <doxygen:param>"PREDEFINED=\\
-    GENERATING_DOCUMENTATION=1 \\
-    BOOST_PROCESS_V2_ASIO_NAMESPACE=boost::asio \\
-    \"BOOST_PROCESS_V2_BEGIN_NAMESPACE=namespace boost { namespace process { namespace v2 { \" \\
-    \"BOOST_PROCESS_V2_END_NAMESPACE= } } }\" \\
-    BOOST_PROCESS_V2_NAMESPACE=boost::process::v2 \\
-    BOOST_PROCESS_V2_DECL \\
-    BOOST_PROCESS_V2_SOURCE \\
-    BOOST_PROCESS_V2_INITFN_AUTO_RESULT_TYPE(x,y)=deduced \\
-    BOOST_PROCESS_V2_COMPLETION_TOKEN_FOR(X)=Token \\
-    BOOST_PROCESS_V2_DEFAULT_COMPLETION_TOKEN_TYPE(E)=DEFAULT_TYPE \\
-    BOOST_ASIO_DEFAULT_COMPLETION_TOKEN=DEFAULT \\ 
-    BOOST_CONSTEXPR=constexpr \\
-    BOOST_CXX14_CONSTEXPR=constexpr \\
-    BOOST_ATTRIBUTE_NODISCARD=[[nodiscard]]
-    "
-  <doxygen.doxproc.id>reference_v2
-  <doxygen:param>SHOW_USED_FILES=NO
-  <doxygen:param>SHOW_FILES=NO
-  <doxygen:param>SHOW_NAMESPACES=YES
-  <doxygen:param>CLASS_DIAGRAMS=NO
-  <doxygen:param>SORT_MEMBERS_CTORS_1ST=YES
-  <doxygen:param>HIDE_UNDOC_CLASSES=NO
-  <xsl:path>.
-;
-
-
 boostbook standalone
 :
   process.qbk
 :
   <dependency>autodoc
-  <dependency>reference_v2
   <dependency>images
   <dependency>images_glob
   <xsl:param>boost.root=../../../..

doc/acknowledgements.qbk

@@ -8,6 +8,4 @@ A special thank you goes to [@http://www.intra2net.com/ Intra2net AG] (especiall
 
 Great thanks also goes to Boris Schaeling, who despite having boost.process rejected, went on to work on it and maintained it up until this day and participated in the development of the current version.
 
-Many Thanks, to [@https://github.com/time-killer-games Samuel Venable] for contributing the v2::ext functionality and all the research that went into it.
-
 [endsect]

doc/concepts.qbk

@@ -16,11 +16,11 @@ In that it is different than other facilities (like sockets) and provides anothe
 Pipes are typically used for interprocess communication. The main reason is, that pipes can be directly assigned to the process stdio, i.e. stderr, stdin and stdout.
 Additionally, half of the pipe can be inherited to the child process and closed in the father process. This will cause the pipe to be broken when the child process exits.
 
-Though please note, that if the same thread reads and writes to a pipe, it will only talk to itself.
+Though please not, that if the the same thread reads and write to a pipe, it will only talk to itself.
 
 [section:anonymous Anonymous Pipes]
 
-The most common pipes are anonymous. Since they have no name,
+The usual type of pipes, are the anonymous ones. Since the have no name, 
 a handle to them can only be obtained from duplicating either handle.
 
 In this library the following functions are used for the creation of unnamed pipes:
@@ -57,12 +57,12 @@ Every process is identified by a unique number[footnote it is unique as long as
 
 [section:exit_code Exit code]
 A process will return an integer value indicating whether it was successful. On posix
-there are more codes associated with that, but not so on windows. Therefore there is no such encoding currently in the library.
+there are more codes associated with that, but not so on windows. Therefore there is not such encoding currently in the library.
 However an exit code of zero means the process was successful, while one different than zero indicates an error. 
 [endsect]
 
 [section:termination Termination]
-Processes can also be forced to exit. There are two ways to do this, signal the process to do so and wait, and just terminate the process without conditions.
+Processes can also be forced to exit. There are two ways to do this, signal the process to so and wait, and just terminate the process without conditions.
 
 Usually the first approach is to signal an exit request, but windows - unlike posix - does not provide a consistent way to do this. Hence this is not part of the
 library and only the hard terminate is. 
@@ -79,4 +79,4 @@ The environment is a map of variables local to every process. The most significa
 
 [endsect]
 
-[endsect]
+[endsect]

doc/design.qbk

@@ -1,12 +1,12 @@
 [section:design Design Rationale]
 [section Scope]
-This library is meant to give a wrapper around the different OS-specific methods
+This library is meant to give an wrapper around the different OS-specific methods
 to launch processes. Its aim is to provide all functionality that is available on 
 those systems and allow the user to do all related things, which require using the OS APIs.
 
-[*This library does not try to provide a full library for everything process related.] 
+[*This library does not try to provide a full library for everything process related] 
 In many discussions the proposal was made to build boost.process into a DSEL [footnote Domain Specific Embedded Language] of some sort. 
-This is not the goal, it rather provides the facilities to build such a DSEL-library on top of it. 
+This is not the goal, it rather provides the facilities to build such a DSEL-Library on top of it. 
 Therefore the library also does [*not] force any particular use (such as only asynchronous communication) on its user. 
 It rather could be integrated with such a library.  
 
@@ -33,7 +33,7 @@ Both styles can also be mixed in some cases.
 system("gcc", "-c", args+={"main.cpp"});
 ```
 
-In the following section the available styles will be described. Note that the
+In the following section the avaible styles will be described. Note that the
 overload style is implemented via type traits, so the types will be listed. 
 
 [caution There is no guarantee in which order the arguments will be applied! 
@@ -54,7 +54,7 @@ interpret each string as an argument.
 ] 
 
 When using the overloading variant, a single string will result in a cmd interpretation, 
-several strings will yield a exe-args interpretation. Both versions can be set explicitly:
+several strings will yield a exe-args interpretation. Both version can be set explicitly:
 
 ```
 system("grep -c false /etc/passwd"); //cmd style
@@ -65,7 +65,7 @@ system(exe="grep", args={"-c", "false", "/etc/passwd"}); //exe-/args-
 ```
 
 [note If a '"' sign is used in the argument style, it will be passed as part of the argument.
-If the same effect is wanted with the cmd syntax, it ought to be escaped, i.e. '\\\"'. ]
+If the same effect it wanted with the cmd syntax, it ought to be escaped, i.e. '\\\"'. ]
 [note The `PATH` variable will automatically be searched in the command style, 
 but the one of the launching process, not the one passed to the child process.]
 [endsect]

doc/extend.qbk

@@ -15,14 +15,14 @@ To extend the library, the header [headerref boost/process/extend.hpp extend] is
 
 It only provides the explicit style for custom properties, but no implicit style.
 
-What this means is, that a custom initializer can be implemented, a reference which can be passed to one of the launching functions.
-If a class inherits [classref boost::process::extend::handler] it will be regarded as an initializer and thus directly put into the sequence 
+What this means is, that a custom initializer can be implemented, a reference to which can be passed to one of the launching functions.
+If a class inherits [classref boost::process::extend::handler] it will be regarded as a initializer and thus directly put into the sequence 
 the executor gets passed.
 
 [section:structure Structure]
 
 The executor calls different handlers of the initializers during the process launch. 
-The basic structure consists of three functions, as given below:
+The basic structure is consists of three functions, as given below:
 
 * [globalref boost::process::extend::on_setup on_setup]
 * [globalref boost::process::extend::on_error on_error]
@@ -53,7 +53,7 @@ namespace ex = bp::extend;
 __child__ c("foo", __on_success__=[](auto & exec) {std::cout << "hello world" << std::endl;});
 ```
 
-Considering that lambdas can also capture values, data can easily be shared between handlers. 
+Considering that lambda can also capture values, data can easily be shared between handlers. 
 
 To see which members the executor has, refer to [classref boost::process::extend::windows_executor windows_executor]
 and [classref boost::process::extend::posix_executor posix_executor].
@@ -86,7 +86,7 @@ __child__ c("foo", hello_world());
 
 [note The implementation is done via overloading, not overriding.]
 
-Every handler not implemented defaults to [classref boost::process::extend::handler handler], where an empty handler is defined for each event.
+Every handler not implemented dafaults to [classref boost::process::extend::handler handler], where an empty handler is defined for each event.
 
 [endsect]
 
@@ -100,7 +100,7 @@ this functionality is also available for extensions. If the class needs the __io
 ```
 struct async_foo : __handler__, __require_io_context__
 {
-    template<typename Executor>
+    tempalte<typename Executor>
     void on_setup(Executor & exec)
     {
         __io_context__ & ios = __get_io_context__(exec.seq); //gives us a reference and a compiler error if not present.
@@ -139,10 +139,10 @@ struct async_bar : __handler, __async_handler__
 
 [section:error Error handling]
 
-If an error occurs in the initializers it shall be told to the executor and not handled directly. This is because
-the behaviour can be changed through arguments passed to the launching function. Hence the executor
+If an error occurs in the initializers it shall be told to the executor and not handles directly. This is because
+the behaviour can be changed through arguments passed to the launching function. Hence the the executor
 has the function `set_error`, which takes an [@http://en.cppreference.com/w/cpp/error/error_code std::error_code] and a string.
-Depending on the configuration of the executor, this may either throw, set an internal `error_code`, or do nothing.
+Depending on the cofiguration of the executor, this may either throw, set an internal `error_code`, or do nothing.
 
 So let's take a simple example, where we set a randomly chosen `error_code`.
 
@@ -202,8 +202,8 @@ struct hello_exe : __handler__
 };
 ```
 
-So given our example, the definitions with the non-native executor are still a template so that they will not be evaluated if not used. Hence this provides a
-way to implement system-specific code without using the preprocessor.
+So given our example, the definitions with the non-native exectur are still a template so that they will not be evaluated if not used. Hence this provides a
+way to implement systems-specific code without using the preprocessor.
 
 [note If you only write a partial implementation, e.g. only for __posix_executor__, the other variants will default to __handler__].
 

doc/faq.qbk

@@ -47,7 +47,7 @@ while (is >> file)
 This will also deadlock, because the pipe does not close when the subprocess exits.
 So the `ipstream` will still look for data even though the process has ended.
 
-[note It is not possible to use automatic pipe-closing in this library, because 
+[note It is not possible to use automatically pipe-closing in this library, because 
 a pipe might be a file-handle (as for async pipes on windows).]
 
 But, since pipes are buffered, you might get incomplete data if you do this:
@@ -64,7 +64,7 @@ while (c.running())
 }
 ```
 
-It is therefore highly recommended that you use the asynchronous API if you are
+It is therefore highly recommended that you use the asynchronous api if you are
 not absolutely sure how the output will look.
 
 [endsect]

doc/process.qbk

@@ -11,8 +11,6 @@
     ]
 ]
 
-[note [link process.v2 Process V2] is available as  experimental]
-
 [include introduction.qbk]
 [include concepts.qbk]
 [include tutorial.qbk]
@@ -21,4 +19,3 @@
 [include faq.qbk]
 [xinclude autodoc.xml]
 [include acknowledgements.qbk]
-[include v2.qbk]

doc/tutorial.qbk

@@ -68,12 +68,12 @@ namespace bp = boost::process; //we will assume this for all further examples
 int result = bp::system("g++ main.cpp");
 ```
 
-If a single string is given (or the explicit form bp::cmd), it will be interpreted as a command line. 
+If a single string (or the explicit form bp::cmd), it will be interpreted as a command line. 
 That will cause the execution function to search the `PATH` variable to find the executable. 
 The alternative is the `exe-args` style, where the first string will be interpreted as a filename (including the path),
 and the rest as arguments passed to said function.   
 
-[note For more details on the `cmd`/`exe-args` style look [link boost_process.design.arg_cmd_style here].]
+[note For more details on the `cmd`/`exe-args` style look [link boost_process.design.arg_cmd_style here]]
 
 So as a first step, we'll use the `exe-args` style.
 
@@ -82,10 +82,10 @@ int result = bp::system("/usr/bin/g++", "main.cpp");
 ```
 
 With that syntax we still have "g++" hard-coded, so let's assume we get the string
-from an external source as `boost::process::filesystem::path`, we can do this too.
+from an external source as `boost::filesystem::path`, we can do this too.
 
 ```
-boost::process::filesystem::path p = "/usr/bin/g++"; //or get it from somewhere else.
+boost::filesystem::path p = "/usr/bin/g++"; //or get it from somewhere else.
 int result = bp::system(p, "main.cpp");
 ```
 
@@ -93,7 +93,7 @@ Now we might want to find the `g++` executable in the `PATH`-variable, as the `c
 `Boost.process` provides a function to this end: bp::search_path.
 
 ```
-boost::process::filesystem::path p = bp::search_path("g++"); //or get it from somewhere else.
+boost::filesystem::path p = bp::search_path("g++"); //or get it from somewhere else.
 int result = bp::system(p, "main.cpp");
 ```
 
@@ -141,7 +141,7 @@ things while the process is running and afterwards get the exit code. The call
 to child_wait is necessary, to obtain it and tell the operating system, that no
 one is waiting for the process anymore.
 
-[note You can also wait for a time span or until a time point with __wait_for__ and __wait_until__.]
+[note You can also wait for a time span or a until a time point with __wait_for__ and __wait_until__]
 
 [warning If you don't call wait on a child object, it will be terminated on destruction.
 This can be avoided by calling __detach__ beforehand]  
@@ -217,7 +217,8 @@ std::vector<std::string> read_outline(std::string & file)
 What this does is redirect the `stdout` of the process into a pipe and we read this
 synchronously.
 
-[note You can do the same thing with [globalref boost::process::std_err std_err].]
+[warning The pipe will cause a deadlock if you try to read after nm exited]
+[note You can do the same thing with [globalref boost::process::std_err std_err]] 
 
 Now we get the name from `nm` and we might want to demangle it, so we use input and output.
 `nm` has a demangle option, but for the sake of the example, we'll use 
@@ -246,7 +247,7 @@ std::vector<std::string> read_demangled_outline(const std::string & file)
     
     std::vector<std::string> outline;
     
-    //we just use the same pipe, so the output of nm is directly passed as input to c++filt
+    //we just use the same pipe, so the 
     bp::child nm(bp::search_path("nm"), file,  bp::std_out > p); 
     bp::child filt(bp::search_path("c++filt"), bp::std_in < p, bp::std_out > is);
     
@@ -270,7 +271,7 @@ If you are familiar with [@http://www.boost.org/doc/libs/release/libs/asio/ boos
 you can use [classref boost::process::async_pipe async_pipe] which is implemented 
 as an I/O-Object and can be used like [classref boost::process::pipe pipe] as shown above.
 
-Now we get back to our compiling example. For `nm` we might analyze the output line by line,
+Now we get back to our compiling example. `nm` we might analyze it line by line,
 but the compiler output will just be put into one large buffer.
 
 With [@http://www.boost.org/doc/libs/release/libs/asio/ boost.asio] this is what it looks like.
@@ -290,7 +291,7 @@ ios.run();
 int result = c.exit_code();
 ```
 
-To make it easier, boost.process provides a simpler interface for that, so that the buffer can be passed directly, 
+To make it easier, boost.process provides simpler interface for that, so that the buffer can be passed directly, 
 provided we also pass a reference to an io_service. 
 
 ```
@@ -304,7 +305,7 @@ int result = c.exit_code();
 ```
 
 [note Passing an instance of io_service to the launching function automatically cause it to wait asynchronously for the exit, so no call of 
-[memberref boost::process::child::wait wait] is needed.]
+[memberref boost::process::child::wait wait] is needed]
  
 To make it even easier, you can use [@http://en.cppreference.com/w/cpp/thread/future std::future] for asynchronous operations
 (you will still need to pass a reference to a io_service) to the launching function, unless you use bp::system or bp::async_system.
@@ -331,7 +332,7 @@ auto err =  data.get();
 [endsect]
 [section:group Groups]
 
-When launching several processes, they can be grouped together. 
+When launching several processes, processes can be grouped together. 
 This will also apply for a child process, that launches other processes, 
 if they do not modify the group membership. E.g. if you call `make` which 
 launches other processes and call terminate on it, 
@@ -342,7 +343,7 @@ The two main reasons to use groups are:
 # Being able to terminate child processes of the child process
 # Grouping several processes into one, just so they can be terminated at once
 
-If we have a program like `make`, which does launch its own child processes, 
+If we have program like `make`, which does launch its own child processes, 
 a call of child_terminate might not suffice. I.e. if we have a makefile launching `gcc` 
 and use the following code, the `gcc` process will still run afterwards:
 
@@ -412,14 +413,14 @@ bp::system("stuff", env_);
 ```
 
 A more convenient way to modify the environment for the child is the 
-[globalref boost::process::env env] property, which can be used in the example as following:
+[globalref boost::process::env env] property, which the example as following:
 
 ```
 bp::system("stuff", bp::env["VALUE_1"]="foo", bp::env["VALUE_2"]+={"bar1", "bar2"});
 
 ```
 
-Please see the [headerref boost/process/environment.hpp reference] for more information.
+Please see to the [headerref boost/process/environment.hpp reference] for more information.
 
 [endsect]
 [endsect]

doc/v2.qbk

@@ -1,11 +0,0 @@
-[section:v2 Process V2]
-
-[include v2/introduction.qbk]
-[include v2/quickstart.qbk]
-[include v2/launcher.qbk]
-[include v2/start_dir.qbk]
-[include v2/stdio.qbk]
-[include v2/env.qbk]
-[xinclude reference_v2.xml]
-
-[endsect]

doc/v2/env.qbk

@@ -1,48 +0,0 @@
-[section:env Environment]
-
-The `environment` namespace provides all sorts of facilities to query and manipulate the environment of the current process.
-
-The api should be straight forward, but one oddity that needs to be pointed out is, that environment names
-are not case sensitive on windows. The key_traits class implements the proper traits depending on the current system.
-
-Additionally, environment can be lists separated by `:` or `;`; `environment::value` and
-`environment::value_view` can be used to iterate those.
-
-Beyond that, the requirements on an environment are a low as possible; 
-an environment is either a list of strings or a list of string-pairs. It is however recommented to use the environment types,
-as to have the right value comparisons.
-
-To note is the `find_executable` functions, which searches in an environment for an executable.
-
-```
-    // search in the current environment
-    auto exe = environment::find_executable("g++");
-
-    std::unordered_map<environment::key, environment::value> my_env =
-        {
-            {"SECRET", "THIS_IS_A_TEST"}
-            {"PATH", {"/bin", "/usr/bin"}
-        };
-
-    auto other_exe = environment::find_executable("g++", my_env);
-```
-
-[section:process_env Subprocess environment]
-
-The subprocess environment assignment follows the same constraints:
-
-```
-    asio::io_context ctx;
-    std::unordered_map<environment::key, environment::value> my_env =
-        {
-            {"SECRET", "THIS_IS_A_TEST"}
-            {"PATH", {"/bin", "/usr/bin"}
-        };
-    auto exe = find_executable("g++"), my_env);
-    process proc(ctx, exe, {"main.cpp"}, process_environment(my_env));
-    process pro2(ctx, exe, {"test.cpp"}, process_environment(my_env));
-```
-
-[endsect]
-
-[endsect]

doc/v2/introduction.qbk

@@ -1,94 +0,0 @@
-[section:introduction Introduction]
-
-Boost.process V2 is an redesign of boost.process, based on previous 
-design mistakes & improved system APIs.
-
-The major changes are
-
-* Simplified interface
-* Reliance on pidfd_open on linux
-* Full asio integration
-* Removed unreliable functionality
-* UTF8 Support
-* separate compilation
-* fd safe by default
-
-[section:simplified Simplified Interface]
-
-In process v1 one can define partial settings in the constructor of the process, 
-which has lead to a small DSL.
-
- child c{exe="test", args+="--help", std_in < null(), env["FOO"] += "BAR"};
-
-While this looks fancy at first, it really does not scale well with more parameters.
-For process v2, the interfaces is simple: 
-
- extern std::unordered_map<std::string, std::string> my_env;
- extern asio::io_context ctx;
- process proc(ctx, "./test", {"--help"}, process_io{nullptr, {}, {}}, process_environment(my_env));
-
-Every initializer adresses one logical compoent (e.g. stdio) instead of multiple ones accumulating.
-Furthermore, every process has a path and arguments, instead of a confusing mixture of cmd-style and 
-exe-args that can be randomly spread out.
-
-[endsect]
-
-[section:pidfd_open pidfd_open]
-
-Since process v1 came out, linux has moved along and added pidfd_open which allows users to get a 
-file descriptor for a process. This is much more reliable since it is not as easy to miss as a `SIGCHLD`.
-FreeBSD has a similar feature with `pdfork` which is also supported, while windows has provided `HANDLE`s 
-for processes all along.
-Unless the OS doesn't support it, process v2 will use file descriptors and handles to implement waiting 
-for processes.
-
-[endsect]
-
-[section:asio Full asio integration]
-
-Process v1 aimed to make asio optional, but synchronous IO with subprocesses usually means one is begging 
-for deadlocks.
-Since asio added pipes in boost 1.78, boost process V2 is fully asio based and uses it's pipes and 
-file-handles for the subprocess.
-
-[endsect]
-
-[section:unreliable Unreliable functionality]
-
-Certain parts of boost.process were not as reliable as they should've been. 
-
-This concerns especially the `wait_for`` and `wait_until` functions on the process.
-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.
-
-[endsect]
-
-[section:utf8 UTF-8]
-
-["UTF-8 or GTFO]--Vinnie Falco
-
-Instead of using ascii-APIs on windows, process V2 just assumes UTF-8 everywhere.
-
-[endsect]
-
-[section:src Separate compilation]
-
-Boost.process v2 supports separate compilation similar to other boost libraries. 
-It can be achieved by defining `BOOST_PROCESS_V2_SEPARATE_COMPILATION` and including 
-`<process/v2/src.hpp>` in a single compile unit.
-
-[endsect]
-
-[section:limit_fd Fd safe by default]
-
-While not a problem on windows (since HANDLEs get manually enabled for inheritance),
-posix systems create a problem with inheriting file handles by default.
-
-Process V2 will automatically close all non-whitelisted descriptors, 
-without needing any option to enable it.
-
-[endsect]
-
-[endsect]

doc/v2/launcher.qbk

@@ -1,128 +0,0 @@
-[section:launchers Launcher]
-
-The process creation is done by a process_launcher. 
-The constructor of `process` will use the default_launcher, which varies by system.
-There are additional launcher available on most systems.
-
-[table:launchers Launcher overview
-    [[Name]                           [Summary] [Default on] [Available on]]
-    [[`windows::default_launcher`]    [Launcher using `CreateProcessW`]   [windows] [windows]]
-    [[`windows::as_user_launcher`]    [Launcher using `CreateProcessAsUserW`]    [] [windows]]
-    [[`windows::with_logon_launcher`] [Launcher using `CreateProcessWithLogonW`] [] [windows]]
-    [[`windows::with_token_launcher`] [Launcher using `CreateProcessWithTokenW`] [] [windows]]
-    [[`posix::default_launcher`]      [Launcher using fork & an error pipe] [most of posix]  [posix]]
-    [[`posix::fork_and_forget`]       [Launcher using fork without error pipe] []            [posix]]
-    [[`posix::pdfork_launcher`]       [Launcher using pdfork with an error pipe] [FreeBSD] [FreeBSD]]
-    [[`posix::vfork_launcher`]        [Launcher using vfork] [] [posix]]
-]
-
-A launcher is invoked through the call operator.
-
-```
-    auto l = windows::as_user_launcher((HANDLE)0xDEADBEEF);
-    asio::io_context ctx;
-    boost::system::eror_code ec;
-    auto proc = l(ctx, ec, "C:\\User\\boost\\Downloads\\totally_not_a_virus.exe", {});
-```
-
-The launcher will call certain functions on the initializer if they're present, as documented below.
-The initializer are used to modify the process behaviour.
-
-[section:linux Linux Launchers]
-
-The default and pdfork launchers on linux open an internal pipe to communicate errors that occur after forking back to the parent process.
-
-This can be prevented by using the `fork_and_forget_launcher`. 
-Alternatively, the `vfork_launcher` can report errors directly back to the parent process.
-
-Thus some calls to the initializers occur after forking from the child process.
-
-```
-    struct custom_initalizer
-    {
-        // functions called from the parent process:
-
-
-        // called before a call to fork. A returned error will cancel the launch.
-        template<typename Launcher>
-        error_code on_setup(Launcher & launcher, const filesystem::path &executable, const char * const * (&cmd_line));
-
-        // called for every initializer if an error occured during setup or process creation
-        template<typename Launcher>
-        void on_error(Launcher & launcher, const filesystem::path &executable, const char * const * (&cmd_line),
-                      const error_code & ec);
-
-        // called after successful process creation
-        template<typename Launcher>
-        void on_success(Launcher & launcher, const filesystem::path &executable, const char * const * (&cmd_line));
-
-        // called for every initializer if an error occured when forking, in addtion to on_error.
-        template<typename Launcher>
-        void on_fork_error(Launcher & launcher, const filesystem::path &executable, const char * const * (&cmd_line),
-                           const error_code & ec);
-
-
-        // called before a call to execve. A returned error will cancel the launch. Called from the child process.
-        template<typename Launcher>
-        error_code on_exec_setup(Launcher & launcher, const filesystem::path &executable, const char * const * (&cmd_line));
-
-
-        // called after a failed call to execve from the child process.
-        template<typename Launcher>
-        void on_exec_error(Launcher & launcher, const filesystem::path &executable, const char * const * (&cmd_line));
-    };
-```
-
-The call sequence on success:
-'''
-<imagedata fileref="boost_process/posix_success.svg"/>
-'''
-
-The call sequence when fork fails:
-'''
-<imagedata fileref="boost_process/posix_fork_err.svg"/>
-'''
-
-The call sequence when exec fails:
-'''
-<imagedata fileref="boost_process/posix_exec_err.svg"/>
-'''
-
-The launcher will close all non-whitelisted file descriptors after `on_exec_setup`.
-
-[endsect]
-
-[section:windows Windows Launchers]
-
-Windows launchers are pretty streight forward, they will call the following functions on the initializer if present.
-
-```
-    struct custom_initializer
-    {
-        // called before a call to CreateProcess. A returned error will cancel the launch.
-        template<typename Launcher>
-        error_code on_setup(Launcher & launcher, const filesystem::path &executable, std::wstring &cmd_line);
-
-        // called for every initializer if an error occured during setup or process creation
-        template<typename Launcher>
-        void on_error(Launcher & launcher, const filesystem::path &executable, std::wstring &cmd_line,
-                      const error_code & ec);
-
-        // called after successful process creation
-        template<typename Launcher>
-        void on_success(Launcher & launcher, const filesystem::path &executable, std::wstring &cmd_line);
-
-    };
-```
-
-[note All the additional launchers for windows inherit `default_launcher`]
-
-The call sequence is as follows:
-'''
-<imagedata fileref="boost_process/windows_exec.svg"/>
-'''
-
-[endsect]
-
-
-[endsect]

doc/v2/quickstart.qbk

@@ -1,124 +0,0 @@
-[section:quickstart Quickstart]
-
-A process needs four things to be launched:
-
-* an asio execution_context / executor 
-* a path to an executable
-* a list of arguments
-* a variadic set of initializers
-
-```
-     // process(asio::any_io_executor, filesystem::path, range<string> args, AdditionalInitializers...)
-    asio::io_context ctx;
-    process proc(ctx, "/usr/bin/cp", {"source.txt", "target.txt"});
-```
- 
-
-The started process can then be awaited or terminated.
-
-[section:lifetime Lifetime]
-
-If the process handle goes out of scope, it will terminate the subprocess.
-You can prevent this, by calling `proc.detach()`; do however note that this 
-can lead to zombie processes.
-
-A process that completed will deliver an exit-code, 
-which can be obtained by calling `.exit_code` on the exited process and which is
-also returned from `.wait()`.
-
-```
- process proc("/bin/ls", {});
- assert(proc.wait() == 0);
-```
-
-The normal exit-code is what the subprocess returned from `main`;
-posix will however add addtional information about the process. 
-This is called the `native_exit_code`.
-
-
-The `.running()` function can be used to detect if the process is still active.
-
-[endsect]
-
-[section:signal Signalling the subprocess]
-
-The parent process can signal the subprocess demaning certain actions.
-
-`.terminate` will cause the subprocess to exit immediately (`SIGKILL` on posix).
-This is the only reliable & portable way to end a subprocess.
-
-```
-    process proc("/bin/totally-not-a-virus", {});
-    proc.terminate();
-```
-
-`.request_exit` will ask the subprocess to shutdown (`SIGTERM` on posix),
-which the subprocess might ignore.
-
-```
-    process proc("/bin/bash", {});
-    proc.request_exit();
-    proc.wait();
-```
-
-`.interrupt` will send an SIGINT to the subprocess, which a subprocess might 
-interpret as a signal to shutdown.
-
-[warning interrupt requires the initializer `windows::create_new_process_group` to be set]
-
-```
-    process proc("/usr/bin/addr2line", {});
-    proc.request_exit();
-    proc.wait();
-```
-
-[endsect]
-
-[section:execute Execute functions]
-
-Process v2 provides  `execute` and `async_execute` functons that can be used for managed executions.
-
-```
- assert(execute(process("/bin/ls", {}) == 0));
-```
-
-The async version supports cancellation and will forward cancellation types as follows:
-
-- asio::cancellation_type::total    -> interrupt
-- asio::cancellation_type::partial  -> request_exit
-- asio::cancellation_type::terminal -> terminate
-
-```
-    asio::io_context ctx;
-    asio::steady_timer timout{ctx, std::chrono::seconds(10)};
-
-    asio::cancellation_signal sig;
-    async_execute(process("/usr/bin/g++", {"hello_world.cpp"}), 
-                 asio::bind_cancellation_slot(sig.slot(), 
-                                              [&](error_code ec, int exit_code)
-                                              {
-                                                  timeout.cancel(); // we're done earlier
-                                              }));
-
-    timeout.async_wait(
-        [&](error_code ec) 
-        {
-            if (ec) // we were cancelled, do nothing
-                return ;
-            sig.emit(asio::cancellation_type::partial); 
-            // request exit first, but terminate after another 10 sec
-            timeout.expires_after(std::chrono::seconds(10));
-            timeout.async_wait(
-                [&](error_code ec)
-                {
-                    if (!ec)
-                        sig.emit(asio::cancellation_type::terminal); 
-                });
-            );
-        });
-
-```
-
-[endsect]
-
-[endsect]

doc/v2/start_dir.qbk

@@ -1,16 +0,0 @@
-[section:start_dir process_start_dir]
-
-The easier initializer to use is `process_start_dir`:
-
-```
-    asio::io_context ctx;
-    process ls(ctx, "/ls", {}, process_start_dir("/home"));
-    ls.wait();
-```
-
-This will run `ls` in the folder `/home` instead of the current folder.
-
-[warning If your path is relative, it may fail on posix, because the directory is changed before a call to execve.]
-
-
-[endsect]

doc/v2/stdio.qbk

@@ -1,89 +0,0 @@
-[section:stdio stdio]
-
-When using io with a subprocess, all three standard streams (stdin, stdout, stderr) get set for the child-process.
-The default setting is to inherit the parent process.
-
-This feature meant to be flexible, which is why there is little checking on the arguments assigned to one of those streams. 
-
-[section:pipe Pipe]
-
-asio pipes can be used for io. When using in process_stdio they will get 
-automatically connected and the other side will get assigned to the child process:
-
-```
-    asio::io_context ctx;
-    asio::readable_pipe rp;
-
-    process proc(ctx, "/usr/bin/g++", {"--version"}, process_stdio{{ /* in to default */}, rp, { /* err to default */ }});
-    std::string output;
-
-    system::error_code ec;
-    rp.read(asio::dynamic_buffer(output), ec);
-    assert(ec == asio::eof);
-    proc.wait();
-```
-
-readable pipes can be assigned to `out` an `err``, while writable_pipes can be assigned to `in`.
-
-[endsect]
-
-[section:file `FILE*`]
-
-`FILE*` can also be used for either side; this allows the `stdin`, `stderr`, `stdout` macros to be used:
-
-```
-    asio::io_context ctx;
-    // forward both stderr & stdout to stdout of the parent process
-    process proc(ctx, "/usr/bin/g++", {"--version"}, process_stdio{{ /* in to default */}, stdout, stdout});
-    proc.wait();
-```
-
-[endsect]
-
-[section:null `nullptr`]
-
-`nullptr` may be used to set a given stream to be opened on the null-device (`/dev/null` on posix, `NUL` on windows). 
-This is used to ignore output or give only EOF as input.
-
-```
-    asio::io_context ctx;
-    // ignore stderr
-    process proc(ctx, "/usr/bin/g++", {"--version"}, process_stdio{{ /* in to default */}, {}, nullptr});
-    proc.wait();
-```
-
-[endsect]
-
-
-[section:native_handle `native_handle`]
-
-A native handle can be used as well, which means an `int` on posix or a `HANDLE` on windows. 
-Furthermore, any object that has a `native_handle` returning that native handle type is valid, too.
-
-
-```
-    asio::io_context ctx;
-    // ignore stderr
-    asio::ip::tcp::socket sock{ctx};
-    connect_my_socket(sock);
-    process proc(ctx, "~/not-a-virus", {}, process_stdio{sock, sock, nullptr});
-    proc.wait();
-```
-
-[endsect]
-
-[section:popen popen]
-
-Additionally, process v2 provides a `popen` class. 
-It starts a process and connects pipes for stdin and stdout, so that the popen object can be used as a stream.
-
-```
-   popen proc(executor, "/usr/bin/addr2line, {argv[0]});
-   asio::write(proc, asio::buffer("main\n"));
-   std::string line;
-   asio::read_until(proc, asio::dynamic_buffer(line), '\n');
-```
-
-[endsect]
-
-[endsect]

example/intro.cpp

@@ -10,9 +10,6 @@
 //[intro
 #include <boost/process.hpp>
 
-#include <string>
-#include <iostream>
-
 using namespace boost::process;
 
 int main()

example/io.cpp

@@ -22,7 +22,7 @@ int main()
         bp::std_in < bp::null //null in
     );
 
-    boost::process::filesystem::path p = "input.txt";
+    boost::filesystem::path p = "input.txt";
 
     bp::system(
         "test.exe",

example/start_dir.cpp

@@ -8,7 +8,7 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/process.hpp>
-#include <boost/process/filesystem.hpp>
+#include <boost/filesystem.hpp>
 
 namespace bp = boost::process;
 
@@ -19,9 +19,9 @@ int main()
         bp::start_dir="../foo"
     );
 
-    boost::process::filesystem::path exe = "test.exe";
+    boost::filesystem::path exe = "test.exe";
     bp::system(
-        boost::process::filesystem::absolute(exe),
+        boost::filesystem::absolute(exe),
         bp::start_dir="../foo"
     );
 }

example/v2/Jamfile.jam

@@ -1,17 +0,0 @@
-# Copyright (c) 2022 Klemens Morgenstern
-#
-# 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)
-
-project : requirements
-  <include>../../..
-  <toolset>msvc:<define>_SCL_SECURE_NO_WARNINGS
-  <target-os>windows:<define>WIN32_LEAN_AND_MEAN
-;
-
-import testing ;
-
-alias filesystem   : /boost//filesystem : <link>static ;
-
-exe intro : intro.cpp filesystem ;
-exe intro_popen : intro_popen.cpp filesystem ;

example/v2/intro.cpp

@@ -1,39 +0,0 @@
-// Copyright (c) 2022Klemens Morgernstern
-//
-// 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)
-
-//[intro
-#include <boost/process/v2.hpp>
-
-#include <boost/asio/read.hpp>
-#include <boost/asio/readable_pipe.hpp>
-#include <boost/system/error_code.hpp>
-
-#include <string>
-#include <iostream>
-
-namespace proc   = boost::process::v2;
-namespace asio   = boost::asio;
-
-
-int main()
-{
-    asio::io_context ctx;
-    asio::readable_pipe p{ctx};
-
-    const auto exe = proc::environment::find_executable("gcc");
-
-    proc::process c{ctx, exe, {"--version"}, proc::process_stdio{nullptr, p}};
-
-    std::string line;
-    boost::system::error_code ec;
-
-    auto sz = asio::read(p, asio::dynamic_buffer(line), ec);
-    assert(ec == asio::error::eof);
-
-    std::cout << "Gcc version: '"  << line << "'" << std::endl;
-
-    c.wait();
-}
-//]

example/v2/intro_popen.cpp

@@ -1,36 +0,0 @@
-// Copyright (c) 2022Klemens Morgernstern
-//
-// 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)
-
-//[intro
-#include <boost/process/v2.hpp>
-
-#include <boost/asio/read.hpp>
-#include <boost/asio/readable_pipe.hpp>
-#include <boost/system/error_code.hpp>
-
-#include <string>
-#include <iostream>
-
-namespace proc   = boost::process::v2;
-namespace asio   = boost::asio;
-
-
-int main()
-{
-    asio::io_context ctx;
-    const auto exe = proc::environment::find_executable("gcc");
-    proc::popen c{ctx, exe, {"--version"}};
-
-    std::string line;
-    boost::system::error_code ec;
-
-    auto sz = asio::read(c, asio::dynamic_buffer(line), ec);
-    assert(ec == asio::error::eof);
-
-    std::cout << "Gcc version: '"  << line << "'" << std::endl;
-
-    c.wait();
-}
-//]

example/windows.cpp

@@ -8,7 +8,6 @@
 // file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/process.hpp>
-#include <boost/process/extend.hpp>
 #include <boost/process/windows.hpp>
 #include <iostream>
 
@@ -23,9 +22,9 @@ int main()
 
 
     bp::system("test.exe",
-        bp::extend::on_setup([](auto &e)
+        bp::on_setup([](auto &e)
             { e.startup_info.dwFlags = STARTF_RUNFULLSCREEN; }),
-        bp::extend::on_error([](auto&, const std::error_code & ec)
+        bp::on_error([](auto&, const std::error_code & ec)
             { std::cerr << ec.message() << std::endl; })
         );
 }

include/boost/process.hpp

@@ -30,7 +30,6 @@
 #include <boost/process/error.hpp>
 #include <boost/process/exe.hpp>
 #include <boost/process/group.hpp>
-#include <boost/process/handles.hpp>
 #include <boost/process/io.hpp>
 #include <boost/process/pipe.hpp>
 #include <boost/process/shell.hpp>

include/boost/process/args.hpp

@@ -138,7 +138,7 @@ struct args_
 
     arg_setter_<char, true> operator()(std::initializer_list<const char*> &&range) const
     {
-        return arg_setter_<char, true>(range.begin(), range.end());
+        return arg_setter_<char>(range.begin(), range.end());
     }
     arg_setter_<char, true> operator+=(std::initializer_list<const char*> &&range) const
     {
@@ -146,11 +146,11 @@ struct args_
     }
     arg_setter_<char, false> operator= (std::initializer_list<const char*> &&range) const
     {
-        return arg_setter_<char, false>(range.begin(), range.end());
+        return arg_setter_<char, true>(range.begin(), range.end());
     }
     arg_setter_<char, true> operator()(std::initializer_list<std::string> &&range) const
     {
-        return arg_setter_<char, true>(range.begin(), range.end());
+        return arg_setter_<char>(range.begin(), range.end());
     }
     arg_setter_<char, true> operator+=(std::initializer_list<std::string> &&range) const
     {
@@ -158,12 +158,12 @@ struct args_
     }
     arg_setter_<char, false> operator= (std::initializer_list<std::string> &&range) const
     {
-        return arg_setter_<char, false>(range.begin(), range.end());
+        return arg_setter_<char, true>(range.begin(), range.end());
     }
 
     arg_setter_<wchar_t, true> operator()(std::initializer_list<const wchar_t*> &&range) const
     {
-        return arg_setter_<wchar_t, true>(range.begin(), range.end());
+        return arg_setter_<wchar_t>(range.begin(), range.end());
     }
     arg_setter_<wchar_t, true> operator+=(std::initializer_list<const wchar_t*> &&range) const
     {
@@ -171,11 +171,11 @@ struct args_
     }
     arg_setter_<wchar_t, false> operator= (std::initializer_list<const wchar_t*> &&range) const
     {
-        return arg_setter_<wchar_t, false>(range.begin(), range.end());
+        return arg_setter_<wchar_t, true>(range.begin(), range.end());
     }
     arg_setter_<wchar_t, true> operator()(std::initializer_list<std::wstring> &&range) const
     {
-        return arg_setter_<wchar_t, true>(range.begin(), range.end());
+        return arg_setter_<wchar_t>(range.begin(), range.end());
     }
     arg_setter_<wchar_t, true> operator+=(std::initializer_list<std::wstring> &&range) const
     {
@@ -183,7 +183,7 @@ struct args_
     }
     arg_setter_<wchar_t, false> operator= (std::initializer_list<std::wstring> &&range) const
     {
-        return arg_setter_<wchar_t, false>(range.begin(), range.end());
+        return arg_setter_<wchar_t, true>(range.begin(), range.end());
     }
 };
 

include/boost/process/async.hpp

@@ -109,10 +109,10 @@ with `function` being a callable object with the signature `(int, const std::err
 \code{.cpp}
 io_context ios;
 
-child c("ls", ios, on_exit=[](int exit, const std::error_code& ec_in){});
+child c("ls", on_exit=[](int exit, const std::error_code& ec_in){});
 
 std::future<int> exit_code;
-chlid c2("ls", ios, on_exit=exit_code);
+chlid c2("ls", on_exit=exit_code);
 
 \endcode
 

include/boost/process/async_pipe.hpp

@@ -26,7 +26,7 @@ namespace boost { namespace process {
 #if defined(BOOST_PROCESS_DOXYGEN)
 
 
-/** Class implementing an asnychronous I/O-Object for use with boost.asio.
+/** Class implementing and asnychronous I/O-Object for use with boost.asio.
  *  It is based on the corresponding I/O Object, that is either boost::asio::windows::stream_handle or
  *  boost::asio::posix::stream_descriptor.
  *
@@ -47,8 +47,6 @@ public:
      */
     typedef platform_specific handle_type;
 
-    typedef typename handle_type::executor_type executor_type;
-
     /** Construct a new async_pipe, does automatically open the pipe.
      * Initializes source and sink with the same io_context.
      * @note Windows creates a named pipe here, where the name is automatically generated.

include/boost/process/async_system.hpp

@@ -38,11 +38,12 @@ namespace process {
 namespace detail
 {
 
-template<typename Handler>
+template<typename ExitHandler>
 struct async_system_handler : ::boost::process::detail::api::async_handler
 {
     boost::asio::io_context & ios;
-    Handler handler;
+    boost::asio::async_completion<
+            ExitHandler, void(boost::system::error_code, int)> init;
 
 #if defined(BOOST_POSIX_API)
     bool errored = false;
@@ -51,8 +52,9 @@ struct async_system_handler : ::boost::process::detail::api::async_handler
     template<typename ExitHandler_>
     async_system_handler(
             boost::asio::io_context & ios,
-            ExitHandler_ && exit_handler) : ios(ios), handler(std::forward<ExitHandler_>(exit_handler))
+            ExitHandler_ && exit_handler) : ios(ios), init(exit_handler)
     {
+
     }
 
 
@@ -62,15 +64,21 @@ struct async_system_handler : ::boost::process::detail::api::async_handler
 #if defined(BOOST_POSIX_API)
         errored = true;
 #endif
-        auto h = std::make_shared<Handler>(std::move(handler));
+        auto & h = init.completion_handler;
         boost::asio::post(
             ios.get_executor(),
             [h, ec]() mutable
             {
-                (*h)(boost::system::error_code(ec.value(), boost::system::system_category()), -1);
+                h(boost::system::error_code(ec.value(), boost::system::system_category()), -1);
             });
     }
 
+    BOOST_ASIO_INITFN_RESULT_TYPE(ExitHandler, void (boost::system::error_code, int))
+        get_result()
+    {
+        return init.result.get();
+    }
+
     template<typename Executor>
     std::function<void(int, const std::error_code&)> on_exit_handler(Executor&)
     {
@@ -78,10 +86,10 @@ struct async_system_handler : ::boost::process::detail::api::async_handler
         if (errored)
             return [](int , const std::error_code &){};
 #endif
-        auto h = std::make_shared<Handler>(std::move(handler));
+        auto & h = init.completion_handler;
         return [h](int exit_code, const std::error_code & ec) mutable
                {
-                    (*h)(boost::system::error_code(ec.value(), boost::system::system_category()), exit_code);
+                    h(boost::system::error_code(ec.value(), boost::system::system_category()), exit_code);
                };
     }
 };
@@ -112,36 +120,21 @@ inline boost::process::detail::dummy
     async_system(boost::asio::io_context & ios, ExitHandler && exit_handler, Args && ...args);
 #endif
 
-namespace detail
-{
-struct async_system_init_op
-{
-
-    template<typename Handler, typename ... Args>
-    void operator()(Handler && handler, asio::io_context & ios, Args && ... args)
-    {
-        detail::async_system_handler<typename std::decay<Handler>::type> async_h{ios, std::forward<Handler>(handler)};
-        child(ios, std::forward<Args>(args)..., async_h ).detach();
-    }
-};
-
-
-}
-
-
 template<typename ExitHandler, typename ...Args>
 inline BOOST_ASIO_INITFN_RESULT_TYPE(ExitHandler, void (boost::system::error_code, int))
     async_system(boost::asio::io_context & ios, ExitHandler && exit_handler, Args && ...args)
 {
-    
+    detail::async_system_handler<ExitHandler> async_h{ios, std::forward<ExitHandler>(exit_handler)};
+
     typedef typename ::boost::process::detail::has_error_handler<boost::fusion::tuple<Args...>>::type
             has_err_handling;
 
     static_assert(!has_err_handling::value, "async_system cannot have custom error handling");
 
-    return boost::asio::async_initiate<ExitHandler, void (boost::system::error_code, int)>(
-        detail::async_system_init_op{}, exit_handler, ios, std::forward<Args>(args)...
-    );
+
+    child(ios, std::forward<Args>(args)..., async_h ).detach();
+
+    return async_h.get_result();
 }
 
 

include/boost/process/cmd.hpp

@@ -43,7 +43,7 @@ namespace boost { namespace process { namespace detail {
 
 struct cmd_
 {
-    constexpr cmd_() = default;
+    constexpr cmd_() {}
 
     template<typename Char>
     inline api::cmd_setter_<Char> operator()(const Char *s) const

include/boost/process/detail/basic_cmd.hpp

@@ -168,7 +168,7 @@ struct exe_builder
     string_type exe;
     std::vector<string_type> args;
 
-    void operator()(const boost::process::filesystem::path & data)
+    void operator()(const boost::filesystem::path & data)
     {
         not_cmd = true;
         if (exe.empty())

include/boost/process/detail/child_decl.hpp

@@ -60,7 +60,7 @@ public:
     explicit child(child_handle &&ch, const std::shared_ptr<std::atomic<int>> &ptr) : _child_handle(std::move(ch)), _exit_status(ptr) {}
     explicit child(child_handle &&ch) : _child_handle(std::move(ch)) {}
 
-    explicit child(pid_t pid) : _child_handle(pid), _attached(false) {};
+    explicit child(pid_t & pid) : _child_handle(pid), _attached(false) {};
     child(const child&) = delete;
     child(child && lhs) noexcept
         : _child_handle(std::move(lhs._child_handle)),
@@ -73,7 +73,7 @@ public:
 
     template<typename ...Args>
     explicit child(Args&&...args);
-    child() { } // Must be kept non defaulted for MSVC 14.1 & 14.2 #113
+    child() {}
     child& operator=(const child&) = delete;
     child& operator=(child && lhs)
     {
@@ -125,10 +125,7 @@ public:
         boost::process::detail::throw_error(ec, "wait error");
     }
 
-#if !defined(BOOST_PROCESS_NO_DEPRECATED)
-
     template< class Rep, class Period >
-    BOOST_DEPRECATED("wait_for is unreliable")
     bool wait_for (const std::chrono::duration<Rep, Period>& rel_time)
     {
         std::error_code ec;
@@ -138,7 +135,6 @@ public:
     }
 
     template< class Clock, class Duration >
-    BOOST_DEPRECATED("wait_until is unreliable")
     bool wait_until(const std::chrono::time_point<Clock, Duration>& timeout_time )
     {
         std::error_code ec;
@@ -146,7 +142,6 @@ public:
         boost::process::detail::throw_error(ec, "wait_until error");
         return b;
     }
-#endif
 
     bool running(std::error_code & ec) noexcept
     {
@@ -183,16 +178,13 @@ public:
         }
     }
 
-#if !defined(BOOST_PROCESS_NO_DEPRECATED)
     template< class Rep, class Period >
-    BOOST_DEPRECATED("wait_for is unreliable")
     bool wait_for (const std::chrono::duration<Rep, Period>& rel_time, std::error_code & ec) noexcept
     {
         return wait_until(std::chrono::steady_clock::now() + rel_time, ec);
     }
 
     template< class Clock, class Duration >
-    BOOST_DEPRECATED("wait_until is unreliable")
     bool wait_until(const std::chrono::time_point<Clock, Duration>& timeout_time, std::error_code & ec) noexcept
     {
         if (!_exited())
@@ -205,7 +197,7 @@ public:
         }
         return true;
     }
-#endif
+
 
     bool valid() const
     {

include/boost/process/detail/config.hpp

@@ -114,8 +114,6 @@ template<typename Char> constexpr Char space_sign();
 template<> constexpr char     space_sign<char>    () {return  ' '; }
 template<> constexpr wchar_t  space_sign<wchar_t> () {return L' '; }
 
-}
-}
-}
 
+}}}
 #endif

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

@@ -7,33 +7,54 @@
 #define BOOST_PROCESS_DETAIL_POSIX_ASIO_FWD_HPP_
 
 #include <memory>
-#include <boost/asio/ts/netfwd.hpp>
 
 namespace boost { namespace asio {
 
-class mutable_buffer;
-class mutable_buffers_1;
+template<typename T>
+struct is_mutable_buffer_sequence;
+
+template<typename T>
+struct is_const_buffer_sequence;
+
 
-class const_buffer;
-class const_buffers_1;
 
 template<typename Allocator>
 class basic_streambuf;
 
 typedef basic_streambuf<std::allocator<char>> streambuf;
+class io_context;
 
+class executor;
+
+
+#if defined(BOOST_ASIO_ENABLE_OLD_SERVICES)
+class signal_set_service;
+template <typename SignalSetService>
+
+class basic_signal_set;
+typedef basic_signal_set<signal_set_service> signal_set;
+#else /* defined(BOOST_ASIO_ENABLE_OLD_SERVICES) */
 template <typename Executor>
 class basic_signal_set;
-typedef basic_signal_set<any_io_executor> signal_set;
+typedef basic_signal_set<executor> signal_set;
+#endif /* defined(BOOST_ASIO_ENABLE_OLD_SERVICES) */
 
 template <typename Handler>
 class basic_yield_context;
 
 namespace posix {
 
+#if defined(BOOST_ASIO_ENABLE_OLD_SERVICES)
+class stream_descriptor_service;
+
+template <typename StreamDesscriptorService>
+class basic_stream_descriptor;
+typedef basic_stream_descriptor<stream_descriptor_service> stream_descriptor;
+#else /* defined(BOOST_ASIO_ENABLE_OLD_SERVICES) */
 template <typename Executor>
 class basic_stream_descriptor;
-typedef basic_stream_descriptor<any_io_executor> stream_descriptor;
+typedef basic_stream_descriptor<executor> stream_descriptor;
+#endif /* defined(BOOST_ASIO_ENABLE_OLD_SERVICES) */
 
 } //posix
 } //asio

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

@@ -16,16 +16,13 @@
 #include <boost/process/async_pipe.hpp>
 #include <memory>
 #include <future>
-#include <boost/process/detail/used_handles.hpp>
-#include <array>
 
 namespace boost { namespace process { namespace detail { namespace posix {
 
 
 template<typename Buffer>
 struct async_in_buffer : ::boost::process::detail::posix::handler_base_ext,
-                         ::boost::process::detail::posix::require_io_context,
-                         ::boost::process::detail::uses_handles
+                         ::boost::process::detail::posix::require_io_context
 {
     Buffer & buf;
 
@@ -36,7 +33,6 @@ struct async_in_buffer : ::boost::process::detail::posix::handler_base_ext,
         fut = promise->get_future(); return std::move(*this);
     }
 
-
     std::shared_ptr<boost::process::async_pipe> pipe;
 
     async_in_buffer(Buffer & buf) : buf(buf)
@@ -80,19 +76,9 @@ struct async_in_buffer : ::boost::process::detail::posix::handler_base_ext,
     template<typename Executor>
     void on_setup(Executor & exec)
     {
-        if (!pipe)
-            pipe = std::make_shared<boost::process::async_pipe>(get_io_context(exec.seq));
+        pipe = std::make_shared<boost::process::async_pipe>(get_io_context(exec.seq));
     }
 
-    std::array<int, 3> get_used_handles()
-    {
-        if (pipe)
-            return {STDIN_FILENO, pipe->native_source(), pipe->native_sink()};
-        else  //if pipe is not constructed, limit_ds is invoked before -> this also means on_exec_setup gets invoked before.
-            return {STDIN_FILENO, STDIN_FILENO, STDIN_FILENO};
-    }
-
-
     template <typename Executor>
     void on_exec_setup(Executor &exec)
     {

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

@@ -19,8 +19,6 @@
 #include <memory>
 #include <exception>
 #include <future>
-#include <array>
-#include <boost/process/detail/used_handles.hpp>
 
 namespace boost { namespace process { namespace detail { namespace posix {
 
@@ -47,24 +45,12 @@ inline int apply_out_handles(int handle, std::integral_constant<int, 1>, std::in
 
 template<int p1, int p2, typename Buffer>
 struct async_out_buffer : ::boost::process::detail::posix::handler_base_ext,
-                          ::boost::process::detail::posix::require_io_context,
-                          ::boost::process::detail::uses_handles
+                          ::boost::process::detail::posix::require_io_context
 {
     Buffer & buf;
 
     std::shared_ptr<boost::process::async_pipe> pipe;
 
-    std::array<int, 4> get_used_handles()
-    {
-        const auto pp1 = p1 != -1 ? p1 : p2;
-        const auto pp2 = p2 != -1 ? p2 : p1;
-
-        if (pipe)
-            return {pipe->native_source(), pipe->native_sink(), pp1, pp2};
-        else  //if pipe is not constructed, limit_ds is invoked before -> this also means on_exec_setup gets invoked before.
-            return {pp1, pp2, pp1, pp2};
-    }
-
 
     async_out_buffer(Buffer & buf) : buf(buf)
     {
@@ -145,11 +131,8 @@ struct async_out_future : ::boost::process::detail::posix::handler_base_ext,
                     {
                         std::istream is (buffer_.get());
                         Type arg;
-                        if (buffer_->size() > 0)
-                        {
-                            arg.resize(buffer_->size());
-                            is.read(&*arg.begin(), buffer_->size());
-                        }
+                        arg.resize(buffer_->size());
+                        is.read(&*arg.begin(), buffer_->size());
                         promise_->set_value(std::move(arg));
                     }
                 });

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

@@ -23,12 +23,6 @@ class async_pipe
 public:
     typedef int native_handle_type;
     typedef ::boost::asio::posix::stream_descriptor handle_type;
-    typedef typename handle_type::executor_type executor_type;
-
-    executor_type get_executor()
-    {
-        return _source.get_executor();
-    }
 
     inline async_pipe(boost::asio::io_context & ios) : async_pipe(ios, ios) {}
 
@@ -50,8 +44,8 @@ public:
     inline async_pipe(const async_pipe& lhs);
     async_pipe(async_pipe&& lhs)  : _source(std::move(lhs._source)), _sink(std::move(lhs._sink))
     {
-        lhs._source = ::boost::asio::posix::stream_descriptor{lhs._source.get_executor()};
-        lhs._sink   = ::boost::asio::posix::stream_descriptor{lhs._sink.  get_executor()};
+        lhs._source.assign (-1);
+        lhs._sink  .assign (-1);
     }
 
     template<class CharT, class Traits = std::char_traits<CharT>>
@@ -76,8 +70,10 @@ public:
 
     ~async_pipe()
     {
-        boost::system::error_code ec;
-        close(ec);
+        if (_sink .native_handle()  != -1)
+            ::close(_sink.native_handle());
+        if (_source.native_handle() != -1)
+            ::close(_source.native_handle());
     }
 
     template<class CharT, class Traits = std::char_traits<CharT>>

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

@@ -139,7 +139,7 @@ struct exe_cmd_init<char> : boost::process::detail::api::handler_base_ext
     }
     static exe_cmd_init cmd_shell(std::string&& cmd)
     {
-        std::vector<std::string> args = {"-c", cmd};
+        std::vector<std::string> args = {"-c", "\"" + cmd + "\""};
         std::string sh = shell().string();
 
         return exe_cmd_init(
@@ -155,15 +155,13 @@ private:
 
 std::vector<char*> exe_cmd_init<char>::make_cmd()
 {
-    // any string must be writable.
-    static char empty_string[1] = "";
     std::vector<char*> vec;
     if (!exe.empty())
-        vec.push_back(exe.empty() ? empty_string : &exe.front());
+        vec.push_back(&exe.front());
 
     if (!args.empty()) {
         for (auto & v : args)
-            vec.push_back(v.empty() ? empty_string : &v.front());
+            vec.push_back(&v.front());
     }
 
     vec.push_back(nullptr);

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

@@ -11,7 +11,7 @@
 #define BOOST_PROCESS_POSIX_PIPE_HPP
 
 
-#include <boost/process/filesystem.hpp>
+#include <boost/filesystem.hpp>
 #include <boost/process/detail/posix/compare_handles.hpp>
 #include <system_error>
 #include <array>
@@ -82,30 +82,22 @@ public:
 
     int_type write(const char_type * data, int_type count)
     {
-        int_type write_len;
-        while ((write_len = ::write(_sink, data, count * sizeof(char_type))) == -1)
-        {
-            //Try again if interrupted
-            auto err = errno;
-            if (err != EINTR)
-                ::boost::process::detail::throw_last_error();
-        }
+        auto write_len = ::write(_sink, data, count * sizeof(char_type));
+        if (write_len == -1)
+            ::boost::process::detail::throw_last_error();
+
         return write_len;
     }
     int_type read(char_type * data, int_type count)
     {
-        int_type read_len;
-        while ((read_len = static_cast<int_type>(::read(_source, data, count * sizeof(char_type)))) == -1)
-        {
-            //Try again if interrupted
-            auto err = errno;
-            if (err != EINTR)
-                ::boost::process::detail::throw_last_error();
-        }
+        auto read_len = ::read(_source, data, count * sizeof(char_type));
+        if (read_len == -1)
+            ::boost::process::detail::throw_last_error();
+
         return read_len;
     }
 
-    bool is_open() const
+    bool is_open()
     {
         return (_source != -1) ||
                (_sink   != -1);

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

@@ -12,11 +12,10 @@
 
 
 #include <boost/process/detail/posix/handler.hpp>
-#include <boost/process/detail/used_handles.hpp>
 
 namespace boost { namespace process { namespace detail { namespace posix {
 
-struct close_in : handler_base_ext, ::boost::process::detail::uses_handles
+struct close_in : handler_base_ext
 {
     template <class Executor>
     void on_exec_setup(Executor &e) const
@@ -24,9 +23,6 @@ struct close_in : handler_base_ext, ::boost::process::detail::uses_handles
         if (::close(STDIN_FILENO) == -1)
             e.set_error(::boost::process::detail::get_last_error(), "close() failed");
     }
-
-    int get_used_handles() {return STDIN_FILENO;}
-
 };
 
 }}}}

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

@@ -10,9 +10,8 @@
 #ifndef BOOST_PROCESS_DETAIL_POSIX_CLOSE_OUT_HPP
 #define BOOST_PROCESS_DETAIL_POSIX_CLOSE_OUT_HPP
 
-#include <boost/process/detail/used_handles.hpp>
+
 #include <boost/process/detail/posix/handler.hpp>
-#include <array>
 
 namespace boost { namespace process { namespace detail { namespace posix {
 
@@ -21,8 +20,6 @@ struct close_out : handler_base_ext
 {
     template <class Executor>
     inline void on_exec_setup(Executor &e) const;
-
-    std::array<int, 2> get_used_handles() {return {{p1 != -1 ? p1 : p2, p2 != -1 ? p2 : p1}};}
 };
 
 template<>

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

@@ -56,7 +56,6 @@ public:
     {
         _buffer = _load();
         _impl = _load_var(_buffer);
-        _env_impl = _impl.data();
     }
 
     string_type get(const pointer_type id) { return get(string_type(id)); }
@@ -95,7 +94,7 @@ public:
     native_environment_impl & operator=(native_environment_impl && ) = default;
     native_handle_type _env_impl = _impl.data();
 
-    native_handle_type native_handle() const {return _env_impl;}
+    native_handle_type native_handle() const {return environ;}
 };
 
 template<>
@@ -231,7 +230,7 @@ template<typename Char>
 inline auto basic_environment_impl<Char>::get(const string_type &id) -> string_type
 {
     auto itr = std::find_if(_data.begin(), _data.end(), 
-            [&](const string_type & st) -> bool
+            [&](const string_type & st)
             {
                 if (st.size() <= id.size())
                     return false;
@@ -251,7 +250,7 @@ template<typename Char>
 inline void basic_environment_impl<Char>::set(const string_type &id, const string_type &value)
 {
     auto itr = std::find_if(_data.begin(), _data.end(), 
-        [&](const string_type & st) -> bool
+        [&](const string_type & st)
         {
             if (st.size() <= id.size())
                 return false;
@@ -271,7 +270,7 @@ template<typename Char>
 inline void  basic_environment_impl<Char>::reset(const string_type &id)
 {
     auto itr = std::find_if(_data.begin(), _data.end(), 
-        [&](const string_type & st) -> bool
+        [&](const string_type & st)
         {
             if (st.size() <= id.size())
                 return false;
@@ -295,11 +294,7 @@ std::vector<Char*> basic_environment_impl<Char>::_load_var(std::vector<std::basi
     ret.reserve(data.size() +1);
 
     for (auto & val : data)
-    {
-        if (val.empty())
-            val.push_back(0);
         ret.push_back(&val.front());
-    }
 
     ret.push_back(nullptr);
     return ret;

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

@@ -26,8 +26,6 @@
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/classification.hpp>
 
-#include <boost/core/ignore_unused.hpp>
-
 namespace boost { namespace process { namespace detail { namespace posix {
 
 template<typename Executor>
@@ -151,15 +149,15 @@ class executor
 
     int _pipe_sink = -1;
 
-
     void write_error(const std::error_code & ec, const char * msg)
     {
         //I am the child
-        const auto len = static_cast<int>(std::strlen(msg));
-        int data[2] = {ec.value(), len + 1};
+        int len = ec.value();
+        ::write(_pipe_sink, &len, sizeof(int));
 
-        boost::ignore_unused(::write(_pipe_sink, &data[0], sizeof(int) * 2));
-        boost::ignore_unused(::write(_pipe_sink, msg, len));
+        len = std::strlen(msg) + 1;
+        ::write(_pipe_sink, &len, sizeof(int));
+        ::write(_pipe_sink, msg, len);
     }
 
     void internal_error_handle(const std::error_code &ec, const char* msg, boost::mpl::true_ , boost::mpl::false_, boost::mpl::false_)
@@ -275,15 +273,14 @@ 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;
-            while ((e != nullptr) && (*e != nullptr) && !boost::starts_with(*e, "PATH="))
+            auto e = ::environ;
+            while ((*e != nullptr) && !boost::starts_with(*e, "PATH="))
                 e++;
 
-            if ((e != nullptr) && (*e != nullptr))
+            if (e != nullptr)
             {
                 std::vector<std::string> path;
-                //the beginning of the string contains "PATH="
-                boost::split(path, (*e) + 5, boost::is_any_of(":"));
+                boost::split(path, *e, boost::is_any_of(":"));
 
                 for (const std::string & pp : path)
                 {
@@ -328,13 +325,6 @@ public:
     }
     void set_error(const std::error_code &ec, const std::string &msg) {set_error(ec, msg.c_str());};
 
-    std::vector<int> get_used_handles() const 
-    {
-        if (_pipe_sink == -1)
-            return {};
-        else
-            return {_pipe_sink};
-    };
 };
 
 template<typename Sequence>
@@ -430,7 +420,7 @@ child executor<Sequence>::invoke(boost::mpl::false_, boost::mpl::false_)
             _msg = "execve failed";
             boost::fusion::for_each(seq, call_on_exec_error(*this, _ec));
 
-            _write_error(_pipe_sink);
+            _write_error(p.p[1]);
             ::close(p.p[1]);
 
             _exit(EXIT_FAILURE);
@@ -444,8 +434,6 @@ child executor<Sequence>::invoke(boost::mpl::false_, boost::mpl::false_)
     }
     if (_ec)
     {
-        //if an error occured we need to reap the child process
-        ::waitpid(this->pid, nullptr, WNOHANG);
         boost::fusion::for_each(seq, call_on_error(*this, _ec));
         return child();
     }
@@ -539,7 +527,6 @@ child executor<Sequence>::invoke(boost::mpl::false_, boost::mpl::true_)
 
     if (_ec)
     {
-        ::waitpid(this->pid, nullptr, WNOHANG);
         boost::fusion::for_each(seq, call_on_error(*this, _ec));
         return child();
     }

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

@@ -12,13 +12,11 @@
 
 #include <boost/process/detail/posix/handler.hpp>
 #include <unistd.h>
-#include <boost/process/detail/used_handles.hpp>
-#include <array>
 
 namespace boost { namespace process { namespace detail { namespace posix {
 
 
-struct close_fd_ : handler_base_ext, ::boost::process::detail::uses_handles
+struct close_fd_ : handler_base_ext
 {
     close_fd_(int fd) : fd_(fd) {}
 
@@ -29,15 +27,12 @@ struct close_fd_ : handler_base_ext, ::boost::process::detail::uses_handles
             e.set_error(::boost::process::detail::get_last_error(), "close() failed");
     }
 
-    int get_used_handles() {return fd_;}
-
-
 private:
     int fd_;
 };
 
 template <class Range>
-struct close_fds_ : handler_base_ext, ::boost::process::detail::uses_handles
+struct close_fds_ : handler_base_ext
 {
 public:
     close_fds_(const Range &fds) : fds_(fds) {}
@@ -53,8 +48,6 @@ public:
             }
     }
 
-    Range& get_used_handles() {return fds_;}
-
 private:
     Range fds_;
 };
@@ -62,7 +55,7 @@ private:
 
 
 template <class FileDescriptor>
-struct bind_fd_ : handler_base_ext, ::boost::process::detail::uses_handles
+struct bind_fd_ : handler_base_ext
 {
 public:
     bind_fd_(int id, const FileDescriptor &fd) : id_(id), fd_(fd) {}
@@ -74,9 +67,6 @@ public:
              e.set_error(::boost::process::detail::get_last_error(), "dup2() failed");
     }
 
-    std::array<int, 2> get_used_handles() {return {id_, fd_};}
-
-
 private:
     int id_;
     FileDescriptor fd_;

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

@@ -8,8 +8,7 @@
 
 #include <fcntl.h>
 #include <string>
-#include <boost/process/filesystem.hpp>
-#include <boost/core/exchange.hpp>
+#include <boost/filesystem/path.hpp>
 
 namespace boost { namespace process { namespace detail { namespace posix {
 
@@ -24,7 +23,7 @@ struct file_descriptor
 
 
     file_descriptor() = default;
-    explicit file_descriptor(const boost::process::filesystem::path& p, mode_t mode = read_write)
+    explicit file_descriptor(const boost::filesystem::path& p, mode_t mode = read_write)
         : file_descriptor(p.native(), mode)
     {
     }
@@ -40,22 +39,10 @@ struct file_descriptor
     }
 
     file_descriptor(const file_descriptor & ) = delete;
-    file_descriptor(file_descriptor &&other)
-        : _handle(boost::exchange(other._handle, -1))
-    {
-    }
+    file_descriptor(file_descriptor && ) = default;
 
     file_descriptor& operator=(const file_descriptor & ) = delete;
-    file_descriptor& operator=(file_descriptor &&other)
-    {
-        if (this != &other)
-        {
-            if (_handle != -1)
-                ::close(_handle);
-            _handle = boost::exchange(other._handle, -1);
-        }
-        return *this;
-    }
+    file_descriptor& operator=(file_descriptor && ) = default;
 
     ~file_descriptor()
     {

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

@@ -13,22 +13,16 @@
 #include <boost/process/pipe.hpp>
 #include <boost/process/detail/posix/handler.hpp>
 #include <boost/process/detail/posix/file_descriptor.hpp>
-#include <boost/process/detail/used_handles.hpp>
 #include <cstdio>
 #include <unistd.h>
 
 namespace boost { namespace process { namespace detail { namespace posix {
 
-struct file_in : handler_base_ext, ::boost::process::detail::uses_handles
+struct file_in : handler_base_ext
 {
     file_descriptor file;
     int handle = file.handle();
 
-    std::array<int, 2> get_used_handles()
-    {
-        return {{STDIN_FILENO, handle}};
-    }
-
     template<typename T>
     file_in(T&& t) : file(std::forward<T>(t)) {}
     file_in(FILE * f) : handle(fileno(f)) {}

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

@@ -13,13 +13,12 @@
 
 #include <boost/process/detail/posix/handler.hpp>
 #include <boost/process/detail/posix/file_descriptor.hpp>
-#include <boost/process/detail/used_handles.hpp>
-#include <unistd.h>
 
+#include <unistd.h>
 namespace boost { namespace process { namespace detail { namespace posix {
 
 template<int p1, int p2>
-struct file_out : handler_base_ext, ::boost::process::detail::uses_handles
+struct file_out : handler_base_ext
 {
     file_descriptor file;
     int handle = file.handle();
@@ -28,13 +27,6 @@ struct file_out : handler_base_ext, ::boost::process::detail::uses_handles
     file_out(T&& t) : file(std::forward<T>(t), file_descriptor::write), handle(file.handle()) {}
     file_out(FILE * f) : handle(fileno(f)) {}
 
-    std::array<int, 3> get_used_handles()
-    {
-        const auto pp1 = p1 != -1 ? p1 : p2;
-        const auto pp2 = p2 != -1 ? p2 : p1;
-
-        return {handle, pp1, pp2};
-    }
 
     template <typename Executor>
     void on_exec_setup(Executor &e) const;

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

@@ -42,7 +42,7 @@ struct group_handle
     }
 
     void add(handle_t proc)
-    {
+    {   
         if (::setpgid(proc, grp))
             throw_last_error();
     }

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

@@ -1,148 +0,0 @@
-// Copyright (c) 2019 Klemens D. Morgenstern
-//
-// 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)
-
-#ifndef BOOST_PROCESS_DETAIL_POSIX_HANDLES_HPP_
-#define BOOST_PROCESS_DETAIL_POSIX_HANDLES_HPP_
-
-#include <vector>
-#include <system_error>
-#include <dirent.h>
-#include <sys/stat.h>
-#include <algorithm>
-#include <memory>
-#include <cstdlib>
-#include <boost/process/detail/posix/handler.hpp>
-
-namespace boost { namespace process { namespace detail { namespace posix {
-
-
-using native_handle_type = int;
-
-inline std::vector<native_handle_type> get_handles(std::error_code & ec)
-{
-    std::vector<native_handle_type> res;
-
-    std::unique_ptr<DIR, void(*)(DIR*)> dir{::opendir("/dev/fd"), +[](DIR* p){::closedir(p);}};
-    if (!dir)
-    {
-        ec = ::boost::process::detail::get_last_error();
-        return {};
-    }
-    else
-        ec.clear();
-
-    auto my_fd = ::dirfd(dir.get());
-
-    struct ::dirent * ent_p;
-
-    while ((ent_p = readdir(dir.get())) != nullptr)
-    {
-        if (ent_p->d_name[0] == '.')
-            continue;
-
-        const auto conv = std::atoi(ent_p->d_name);
-        if (conv == 0 && (ent_p->d_name[0] != '0' && ent_p->d_name[1] != '\0'))
-            continue;
-
-        if (conv == my_fd)
-            continue;
-
-        res.push_back(conv);
-    }
-    return res;
-}
-
-inline std::vector<native_handle_type> get_handles()
-{
-    std::error_code ec;
-
-    auto res = get_handles(ec);
-    if (ec)
-        boost::process::detail::throw_error(ec, "open_dir(\"/dev/fd\") failed");
-
-    return res;
-}
-
-
-inline bool is_stream_handle(native_handle_type handle, std::error_code & ec)
-{
-    struct ::stat stat_;
-
-    if (::fstat(handle, &stat_) != 0)
-    {
-        ec = ::boost::process::detail::get_last_error();
-    }
-    else
-        ec.clear();
-
-    return S_ISCHR  (stat_.st_mode)  //This macro returns non-zero if the file is a character special file (a device like a terminal).
-        || S_ISBLK  (stat_.st_mode) // This macro returns non-zero if the file is a block special file (a device like a disk).
-        || S_ISREG  (stat_.st_mode) // This macro returns non-zero if the file is a regular file.
-        || S_ISFIFO (stat_.st_mode) // This macro returns non-zero if the file is a FIFO special file, or a pipe. See section 15. Pipes and FIFOs.
-        || S_ISSOCK (stat_.st_mode) ;// This macro returns non-zero if the file is a socket. See section 16. Sockets.;
-}
-
-
-inline bool is_stream_handle(native_handle_type handle)
-{
-    std::error_code ec;
-    auto res = is_stream_handle(handle, ec);
-    if (ec)
-        boost::process::detail::throw_error(ec, "fstat() failed");
-
-    return res;
-}
-
-struct limit_handles_ : handler_base_ext
-{
-    limit_handles_() {}
-    ~limit_handles_() {}
-    mutable std::vector<int> used_handles;
-
-    template<typename Executor>
-    void on_setup(Executor & exec) const
-    {
-        used_handles = get_used_handles(exec);
-    }
-
-    template<typename Executor>
-    void on_exec_setup(Executor & exec) const
-    {
-        auto dir = ::opendir("/dev/fd");
-        if (!dir)
-        {
-            exec.set_error(::boost::process::detail::get_last_error(), "opendir(\"/dev/fd\")");
-            return;
-        }
-
-        auto my_fd = ::dirfd(dir);
-        struct ::dirent * ent_p;
-
-        while ((ent_p = readdir(dir)) != nullptr)
-        {
-            if (ent_p->d_name[0] == '.')
-                continue;
-
-            const auto conv = std::atoi(ent_p->d_name);
-
-            if ((conv == my_fd) || (conv == -1))
-                continue;
-
-            if (std::find(used_handles.begin(), used_handles.end(), conv) != used_handles.end())
-                continue;
-
-            if (::close(conv) != 0)
-            {
-                exec.set_error(::boost::process::detail::get_last_error(), "close() failed");
-                return;
-            }
-        }
-        ::closedir(dir);
-    }
-};
-
-}}}}
-
-#endif //PROCESS_HANDLES_HPP

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2016 Klemens D. Morgenstern
+// Copyright (c) 2106 Klemens D. Morgenstern
 //
 // 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/detail/posix/null_in.hpp

@@ -14,21 +14,13 @@
 #include <boost/process/detail/posix/handler.hpp>
 #include <boost/process/detail/posix/file_descriptor.hpp>
 #include <unistd.h>
-#include <boost/process/detail/used_handles.hpp>
-#include <array>
 
 namespace boost { namespace process { namespace detail { namespace posix {
 
-struct null_in : handler_base_ext, ::boost::process::detail::uses_handles
+struct null_in : handler_base_ext
 {
     file_descriptor source{"/dev/null", file_descriptor::read};
 
-    std::array<int, 2> get_used_handles()
-    {
-        return {{STDIN_FILENO, source.handle()}};
-    }
-
-
 public:
     template <class Executor>
     void on_exec_setup(Executor &e) const

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

@@ -13,27 +13,17 @@
 
 #include <boost/process/detail/posix/handler.hpp>
 #include <boost/process/detail/posix/file_descriptor.hpp>
-#include <boost/process/detail/used_handles.hpp>
-#include <unistd.h>
-#include <array>
 
+#include <unistd.h>
 namespace boost { namespace process { namespace detail { namespace posix {
 
 template<int p1, int p2>
-struct null_out : handler_base_ext, ::boost::process::detail::uses_handles
+struct null_out : handler_base_ext
 {
     file_descriptor sink{"/dev/null", file_descriptor::write};
     
     template <typename Executor>
     void on_exec_setup(Executor &e) const;
-
-    std::array<int, 3> get_used_handles()
-    {
-        const auto pp1 = p1 != -1 ? p1 : p2;
-        const auto pp2 = p2 != -1 ? p2 : p1;
-
-        return {sink.handle(), pp1, pp2};
-    }
 };
 
 template<>

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

@@ -6,39 +6,26 @@
 #ifndef BOOST_PROCESS_POSIX_ON_EXIT_HPP_
 #define BOOST_PROCESS_POSIX_ON_EXIT_HPP_
 
-#include <boost/asio/execution.hpp>
-#include <boost/process/async.hpp>
 #include <boost/process/detail/config.hpp>
 #include <boost/process/detail/handler_base.hpp>
 #include <boost/process/detail/posix/async_handler.hpp>
 #include <system_error>
 #include <functional>
 
-namespace boost { namespace process { namespace detail {
-
-template<typename Tuple>
-inline asio::io_context& get_io_context(const Tuple & tup);
-
-namespace posix {
+namespace boost { namespace process { namespace detail { namespace posix {
 
 struct on_exit_ : boost::process::detail::posix::async_handler
 {
     std::function<void(int, const std::error_code&)> handler;
     on_exit_(const std::function<void(int, const std::error_code&)> & handler) : handler(handler)
     {
+
     }
 
     template<typename Executor>
-    std::function<void(int, const std::error_code&)> on_exit_handler(Executor& exec)
+    std::function<void(int, const std::error_code&)> on_exit_handler(Executor&) 
     {
-        auto v = boost::asio::prefer(boost::process::detail::get_io_context(exec.seq).get_executor(),
-                                     boost::asio::execution::outstanding_work.tracked);
-        auto handler_ = this->handler;
-        return
-            [handler_, v](int exit_code, const std::error_code & ec)
-            {
-                handler_(exit_code, ec);
-            };
+        return handler;
 
     }
 };

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

@@ -13,23 +13,17 @@
 #include <boost/process/pipe.hpp>
 #include <boost/process/detail/posix/handler.hpp>
 #include <unistd.h>
-#include <boost/process/detail/used_handles.hpp>
-#include <array>
+
 
 namespace boost { namespace process { namespace detail { namespace posix {
 
-struct pipe_in : handler_base_ext, ::boost::process::detail::uses_handles
+struct pipe_in : handler_base_ext
 {
     int source;
     int sink; //opposite end
 
     pipe_in(int sink, int source) : source(source), sink(sink) {}
 
-    std::array<int, 3> get_used_handles()
-    {
-        return {{STDIN_FILENO, source, sink}};
-    }
-
 
     template<typename T>
     pipe_in(T & p) : source(p.native_source()), sink(p.native_sink())
@@ -54,9 +48,7 @@ struct pipe_in : handler_base_ext, ::boost::process::detail::uses_handles
     {
         if (::dup2(source, STDIN_FILENO) == -1)
              e.set_error(::boost::process::detail::get_last_error(), "dup2() failed");
-        if (source != STDIN_FILENO)
-            ::close(source);
-
+        ::close(source);
         ::close(sink);
     }
 

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

@@ -52,10 +52,8 @@ template<typename Executor>
 void pipe_out<1,-1>::on_exec_setup(Executor &e) const
 {
     if (::dup2(sink, STDOUT_FILENO) == -1)
-         e.set_error(::boost::process::detail::get_last_error(), "dup2() failed");
-
-    if (sink != STDOUT_FILENO)
-        ::close(sink);
+         e.set_error(::boost::process::detail::get_last_error(), "dup3() failed");
+    ::close(sink);
     ::close(source);
 }
 
@@ -65,9 +63,7 @@ void pipe_out<2,-1>::on_exec_setup(Executor &e) const
 {
     if (::dup2(sink, STDERR_FILENO) == -1)
          e.set_error(::boost::process::detail::get_last_error(), "dup2() failed");
-
-    if (sink != STDOUT_FILENO)
-        ::close(sink);
+    ::close(sink);
     ::close(source);
 }
 
@@ -79,8 +75,8 @@ void pipe_out<1,2>::on_exec_setup(Executor &e) const
          e.set_error(::boost::process::detail::get_last_error(), "dup2() failed");
     if (::dup2(sink, STDERR_FILENO) == -1)
          e.set_error(::boost::process::detail::get_last_error(), "dup2() failed");
-    if ((sink != STDOUT_FILENO) && (sink != STDERR_FILENO))
-        ::close(sink);
+    ::close(sink);
+    ::close(source);
 }
 
 class async_pipe;

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

@@ -11,7 +11,7 @@
 #define BOOST_PROCESS_POSIX_SEARCH_PATH_HPP
 
 #include <boost/process/detail/config.hpp>
-#include <boost/process/filesystem.hpp>
+#include <boost/filesystem.hpp>
 #include <boost/tokenizer.hpp>
 #include <string>
 #include <stdexcept>
@@ -20,19 +20,15 @@
 
 namespace boost { namespace process { namespace detail { namespace posix {
 
-inline boost::process::filesystem::path search_path(
-        const boost::process::filesystem::path &filename,
-        const std::vector<boost::process::filesystem::path> &path)
+inline boost::filesystem::path search_path(
+        const boost::filesystem::path &filename,
+        const std::vector<boost::filesystem::path> &path)
 {
-    for (const boost::process::filesystem::path & pp : path)
+    for (const boost::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);
+        bool file = boost::filesystem::is_regular_file(p, ec);
         if (!ec && file && ::access(p.c_str(), X_OK) == 0)
             return p;
     }

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

@@ -12,16 +12,16 @@
 
 #include <boost/process/detail/config.hpp>
 #include <boost/system/error_code.hpp>
-#include <boost/process/filesystem.hpp>
+#include <boost/filesystem/path.hpp>
 
 namespace boost { namespace process { namespace detail { namespace posix {
 
-inline boost::process::filesystem::path shell_path()
+inline boost::filesystem::path shell_path()
 {
     return "/bin/sh";
 }
 
-inline boost::process::filesystem::path shell_path(std::error_code &ec)
+inline boost::filesystem::path shell_path(std::error_code &ec)
 {
     ec.clear();
     return "/bin/sh";

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

@@ -7,65 +7,24 @@
 #ifndef BOOST_PROCESS_DETAIL_POSIX_SIGCHLD_SERVICE_HPP_
 #define BOOST_PROCESS_DETAIL_POSIX_SIGCHLD_SERVICE_HPP_
 
-#include <boost/asio/bind_executor.hpp>
 #include <boost/asio/dispatch.hpp>
 #include <boost/asio/post.hpp>
-#include <boost/asio/consign.hpp>
-#include <boost/asio/append.hpp>
 #include <boost/asio/signal_set.hpp>
 #include <boost/asio/strand.hpp>
 #include <boost/optional.hpp>
 #include <signal.h>
 #include <functional>
 #include <sys/wait.h>
-#include <list>
 
 namespace boost { namespace process { namespace detail { namespace posix {
 
 class sigchld_service : public boost::asio::detail::service_base<sigchld_service>
 {
-    boost::asio::strand<boost::asio::io_context::executor_type> _strand{get_io_context().get_executor()};
+    boost::asio::io_context::strand _strand{get_io_context()};
     boost::asio::signal_set _signal_set{get_io_context(), SIGCHLD};
 
-    std::list<std::pair<::pid_t, std::function<void(int, std::error_code)>>> _receivers;
+    std::vector<std::pair<::pid_t, std::function<void(int, std::error_code)>>> _receivers;
     inline void _handle_signal(const boost::system::error_code & ec);
-
-    struct initiate_async_wait_op
-    {
-        sigchld_service * self;
-        template<typename Initiation>
-        void operator()(Initiation && init, ::pid_t pid)
-        {
-            // check if the child actually is running first
-            int status;
-            auto pid_res = ::waitpid(pid, &status, WNOHANG);
-            if (pid_res < 0)
-            {
-                auto ec = get_last_error();
-                boost::asio::post(
-                        self->_strand,
-                        asio::append(std::forward<Initiation>(init), pid_res, ec));
-            }
-            else if ((pid_res == pid) && (WIFEXITED(status) || WIFSIGNALED(status)))
-                boost::asio::post(
-                        self->_strand,
-                        boost::asio::append(std::forward<Initiation>(init), status, std::error_code{}));
-            else //still running
-            {
-                sigchld_service * self_ = self;
-                if (self->_receivers.empty())
-                    self->_signal_set.async_wait(
-                        boost::asio::bind_executor(
-                            self->_strand,
-                            [self_](const boost::system::error_code &ec, int)
-                            {
-                                self_->_handle_signal(ec);
-                            }));
-                self->_receivers.emplace_back(pid, init);
-            }
-        }
-    };
-
 public:
     sigchld_service(boost::asio::io_context & io_context)
         : boost::asio::detail::service_base<sigchld_service>(io_context)
@@ -77,10 +36,34 @@ public:
         void (int, std::error_code))
     async_wait(::pid_t pid, SignalHandler && handler)
     {
-        return boost::asio::async_initiate<
-            SignalHandler,
-            void(int, std::error_code)>(
-                initiate_async_wait_op{this}, handler, pid);
+        boost::asio::async_completion<
+        SignalHandler, void(boost::system::error_code)> init{handler};
+
+        auto & h = init.completion_handler;
+        boost::asio::dispatch(
+                _strand,
+                [this, pid, h]
+                {
+                    //check if the child actually is running first
+                    int status;
+                    auto pid_res = ::waitpid(pid, &status, WNOHANG);
+                    if (pid_res < 0)
+                        h(-1, get_last_error());
+                    else if ((pid_res == pid) && (WIFEXITED(status) || WIFSIGNALED(status)))
+                        h(status, {}); //successfully exited already
+                    else //still running
+                    {
+                        if (_receivers.empty())
+                            _signal_set.async_wait(
+                                    [this](const boost::system::error_code &ec, int)
+                                    {
+                                        boost::asio::dispatch(_strand, [this, ec]{this->_handle_signal(ec);});
+                                    });
+                        _receivers.emplace_back(pid, h);
+                    }
+                });
+
+        return init.result.get();
     }
     void shutdown() override
     {

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

@@ -13,7 +13,6 @@
 #include <boost/process/detail/posix/handler.hpp>
 #include <string>
 #include <unistd.h>
-#include <boost/core/ignore_unused.hpp>
 
 namespace boost { namespace process { namespace detail { namespace posix {
 
@@ -22,12 +21,12 @@ struct start_dir_init : handler_base_ext
 {
     typedef Char value_type;
     typedef std::basic_string<value_type> string_type;
-    start_dir_init(string_type s) : s_(std::move(s)) {}
+    start_dir_init(const string_type &s) : s_(s) {}
 
     template <class PosixExecutor>
     void on_exec_setup(PosixExecutor&) const
     {
-        boost::ignore_unused(::chdir(s_.c_str()));
+        ::chdir(s_.c_str());
     }
     const string_type & str() const {return s_;}
 private:

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

@@ -27,7 +27,7 @@ inline void terminate(const child_handle &p, std::error_code &ec) noexcept
         ec.clear();
 
     int status;
-    ::waitpid(p.pid, &status, 0); //should not be WNOHANG, since that would allow zombies.
+    ::waitpid(p.pid, &status, 0); //just to clean it up
 }
 
 inline void terminate(const child_handle &p)

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

@@ -54,35 +54,11 @@ inline bool wait_until(
         const std::chrono::time_point<Clock, Duration>& time_out,
         std::error_code & ec) noexcept
 {
+
     ::sigset_t  sigset;
 
-    //I need to set the signal, because it might be ignore / default, in which case sigwait might not work.
-
-    using _signal_t = void(*)(int);
-    static thread_local _signal_t sigchld_handler = SIG_DFL;
-
-    struct signal_interceptor_t
-    {
-        static void handler_func(int val)
-        {
-            if ((sigchld_handler != SIG_DFL) && (sigchld_handler != SIG_IGN))
-                sigchld_handler(val);
-        }
-        signal_interceptor_t()  { sigchld_handler = ::signal(SIGCHLD, &handler_func); }
-        ~signal_interceptor_t() { ::signal(SIGCHLD, sigchld_handler); sigchld_handler = SIG_DFL;}
-
-    } signal_interceptor{};
-
-    if (sigemptyset(&sigset) != 0)
-    {
-        ec = get_last_error();
-        return false;
-    }
-    if (sigaddset(&sigset, SIGCHLD) != 0)
-    {
-        ec = get_last_error();
-        return false;
-    }
+    sigemptyset(&sigset);
+    sigaddset(&sigset, SIGCHLD);
 
     auto get_timespec = 
             [](const Duration & dur)
@@ -93,8 +69,8 @@ inline bool wait_until(
                 return ts;
             };
 
-    int ret;
-    int status{0};
+    pid_t ret;
+    int status;
 
     struct ::sigaction old_sig;
     if (-1 == ::sigaction(SIGCHLD, nullptr, &old_sig))
@@ -104,7 +80,6 @@ inline bool wait_until(
     }
 
     bool timed_out;
-
 #if defined(BOOST_POSIX_HAS_SIGTIMEDWAIT)
     do
     {
@@ -138,16 +113,9 @@ inline bool wait_until(
     {
         auto ts = get_timespec(time_out - Clock::now());
         ::timespec rem;
-        while (ts.tv_sec > 0 || ts.tv_nsec > 0)
-        {
-            if (::nanosleep(&ts, &rem) != 0)
-            {
-                auto err = errno;
-                if ((err == EINVAL) || (err == EFAULT))
-                    break;
-            }
-            ts = get_timespec(time_out - Clock::now());
-        }
+        ::nanosleep(&ts, &rem);
+        while (rem.tv_sec > 0 || rem.tv_nsec > 0)
+            ::nanosleep(&rem, &rem);
         ::exit(0);
     }
 
@@ -157,29 +125,27 @@ inline bool wait_until(
         ~child_cleaner_t()
         {
             int res;
-            ::kill(pid, SIGKILL);
-            ::waitpid(pid, &res, 0);
+            ::kill(pid, -15);
+            ::waitpid(pid, &res, WNOHANG);
         }
     };
     child_cleaner_t child_cleaner{timeout_pid};
 
     do
     {
-        int sig_{0};
+        int ret_sig = 0;
         if ((::waitpid(timeout_pid, &status, WNOHANG) != 0)
-            && (WIFEXITED(status) || WIFSIGNALED(status)))
-
-            return false;
-
-        ret = ::sigwait(&sigset, &sig_);
+         && (WIFEXITED(status) || WIFSIGNALED(status)))
+            ret_sig = ::sigwait(&sigset, nullptr);
         errno = 0;
 
-        if ((sig_ == SIGCHLD) &&
+        ret = ::waitpid(p.pid, &status, WNOHANG);
+
+        if ((ret_sig == SIGCHLD) &&
             (old_sig.sa_handler != SIG_DFL) && (old_sig.sa_handler != SIG_IGN))
             old_sig.sa_handler(ret);
 
-        ret = ::waitpid(p.pid, &status, WNOHANG);
-        if (ret == 0) // == > is running
+        if (ret <= 0)
         {
             timed_out = Clock::now() >= time_out;
             if (timed_out)

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

@@ -59,33 +59,118 @@ inline bool wait_until(
         std::error_code & ec) noexcept
 {
 
+    ::sigset_t  sigset;
     ::siginfo_t siginfo;
 
+    sigemptyset(&sigset);
+    sigaddset(&sigset, SIGCHLD);
+
+
+    auto get_timespec = 
+            [](const Duration & dur)
+            {
+                ::timespec ts;
+                ts.tv_sec  = std::chrono::duration_cast<std::chrono::seconds>(dur).count();
+                ts.tv_nsec = std::chrono::duration_cast<std::chrono::nanoseconds>(dur).count() % 1000000000;
+                return ts;
+            };
+
+
     bool timed_out = false;
     int ret;
 
-    ::timespec sleep_interval;
-    sleep_interval.tv_sec = 0;
-    sleep_interval.tv_nsec = 100000000;
-
-
-    while (!(timed_out = (Clock::now() > time_out)))
+    struct ::sigaction old_sig;
+    if (-1 == ::sigaction(SIGCHLD, nullptr, &old_sig))
     {
-        ret = ::waitid(P_PGID, p.grp, &siginfo, WEXITED | WSTOPPED | WNOHANG);
+        ec = get_last_error();
+        return false;
+    }
+
+#if defined(BOOST_POSIX_HAS_SIGTIMEDWAIT)
+    do
+    {
+        auto ts = get_timespec(time_out - Clock::now());
+        ret = ::sigtimedwait(&sigset, nullptr, &ts);
+        errno = 0;
+        if ((ret == SIGCHLD) && (old_sig.sa_handler != SIG_DFL) && (old_sig.sa_handler != SIG_IGN))
+            old_sig.sa_handler(ret);
+
+        ret = ::waitpid(-p.grp, &siginfo.si_status, 0); //so in case it exited, we wanna reap it first
         if (ret == -1)
         {
-            if ((errno == ECHILD) || (errno == ESRCH))
-            {
-                ec.clear();
-                return true;
-            }
-            ec = boost::process::detail::get_last_error();
+            ec = get_last_error();
+            return false; 
+        }
+
+        //check if we're done
+        ret = ::waitid(P_PGID, p.grp, &siginfo, WEXITED | WNOHANG);
+
+    } 
+    while (((ret != -1) || (errno != ECHILD)) && !(timed_out = (Clock::now() > time_out)));
+#else
+    //if we do not have sigtimedwait, we fork off a child process  to get the signal in time
+    pid_t timeout_pid = ::fork();
+    if (timeout_pid == -1)
+    {
+        ec = boost::process::detail::get_last_error();
+        return true;
+    }
+    else if (timeout_pid == 0)
+    {
+        auto ts = get_timespec(time_out - Clock::now());
+        ::setpgid(0, p.grp);
+        ::nanosleep(&ts, nullptr);
+        ::exit(0);
+    }
+
+    struct child_cleaner_t
+    {
+        pid_t pid;
+        ~child_cleaner_t()
+        {
+            int res;
+            ::kill(pid, -15);
+            ::waitpid(pid, &res, WNOHANG);
+        }
+    };
+    child_cleaner_t child_cleaner{timeout_pid};
+
+    do
+    {
+        int status;
+        if ((::waitpid(timeout_pid, &status, WNOHANG) != 0)
+            && (WIFEXITED(status) || WIFSIGNALED(status)))
+            ret = ::sigwait(&sigset, nullptr);
+        errno = 0;
+        if ((ret == SIGCHLD) && (old_sig.sa_handler != SIG_DFL) && (old_sig.sa_handler != SIG_IGN))
+            old_sig.sa_handler(ret);
+
+        ret = ::waitpid(-p.grp, &siginfo.si_status, 0); //so in case it exited, we wanna reap it first
+        if (ret == -1)
+        {
+            ec = get_last_error();
             return false;
         }
-        //we can wait, because unlike in the wait_for_exit, we have no race condition regarding eh exit code.
-        ::nanosleep(&sleep_interval, nullptr);
+
+        //check if we're done
+        ret = ::waitid(P_PGID, p.grp, &siginfo, WEXITED | WNOHANG);
+
     }
-    return !timed_out;
+    while (((ret != -1) || (errno != ECHILD)) && !(timed_out = (Clock::now() > time_out)));
+
+#endif
+
+    if (errno != ECHILD)
+    {
+        ec = boost::process::detail::get_last_error();
+        return !timed_out;
+    }
+    else
+    {
+        ec.clear();
+        return true; //even if timed out, there are no child proccessess left
+    }
+
 }
 
 template< class Clock, class Duration >

include/boost/process/detail/traits/cmd_or_exe.hpp

@@ -11,7 +11,7 @@
 #include <vector>
 #include <type_traits>
 #include <initializer_list>
-#include <boost/process/filesystem.hpp>
+#include <boost/filesystem/path.hpp>
 #include <boost/process/detail/traits/decl.hpp>
 namespace boost { namespace process { namespace detail {
 
@@ -53,12 +53,12 @@ template<> struct initializer_tag<std::initializer_list<const wchar_t *>> { type
 
 template<> struct initializer_tag<shell_>
 {
-    typedef cmd_or_exe_tag<typename boost::process::filesystem::path::value_type> type;
+    typedef cmd_or_exe_tag<typename boost::filesystem::path::value_type> type;
 };
 
-template<> struct initializer_tag<boost::process::filesystem::path>
+template<> struct initializer_tag<boost::filesystem::path>
 {
-    typedef cmd_or_exe_tag<typename boost::process::filesystem::path::value_type> type;
+    typedef cmd_or_exe_tag<typename boost::filesystem::path::value_type> type;
 };
 
 template <typename Char>

include/boost/process/detail/traits/wchar_t.hpp

@@ -7,8 +7,6 @@
 #ifndef BOOST_PROCESS_DETAIL_TRAITS_WCHAR_T_HPP_
 #define BOOST_PROCESS_DETAIL_TRAITS_WCHAR_T_HPP_
 
-#include <algorithm>
-
 #include <boost/process/detail/traits/decl.hpp>
 #include <boost/process/detail/traits/cmd_or_exe.hpp>
 #include <boost/process/detail/traits/env.hpp>
@@ -20,7 +18,7 @@ namespace boost { namespace process { namespace detail {
 
 template<typename T> struct is_wchar_t : std::false_type {};
 
-template<> struct is_wchar_t<boost::process::filesystem::path> : std::is_same<typename boost::process::filesystem::path::value_type, wchar_t>
+template<> struct is_wchar_t<boost::filesystem::path> : std::is_same<typename boost::filesystem::path::value_type, wchar_t>
 {
 };
 

include/boost/process/detail/used_handles.hpp

@@ -1,81 +0,0 @@
-// Copyright (c) 2016 Klemens D. Morgenstern
-//
-// 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)
-
-#ifndef BOOST_PROCESS_DETAIL_USED_HANDLES_HPP_
-#define BOOST_PROCESS_DETAIL_USED_HANDLES_HPP_
-
-#include <type_traits>
-#include <boost/fusion/include/filter_if.hpp>
-#include <boost/fusion/include/for_each.hpp>
-
-#if defined(BOOST_POSIX_API)
-#include <boost/process/detail/posix/handles.hpp>
-#include <boost/process/detail/posix/asio_fwd.hpp>
-#else
-#include <boost/process/detail/windows/handles.hpp>
-#include <boost/process/detail/windows/asio_fwd.hpp>
-#endif
-
-namespace boost { namespace process { namespace detail {
-
-struct uses_handles
-{
-    //If you get an error here, you must add a `get_handles` function that returns a range or a single handle value
-    void get_used_handles() const;
-};
-
-template<typename T>
-struct does_use_handle: std::is_base_of<uses_handles, T> {};
-
-template<typename T>
-struct does_use_handle<T&> : std::is_base_of<uses_handles, T> {};
-
-template<typename T>
-struct does_use_handle<const T&> : std::is_base_of<uses_handles, T> {};
-
-template<typename Char, typename Sequence>
-class executor;
-
-template<typename Func>
-struct foreach_handle_invocator
-{
-    Func & func;
-    foreach_handle_invocator(Func & func) : func(func) {}
-
-
-    template<typename Range>
-    void invoke(const Range & range) const
-    {
-        for (auto handle_ : range)
-            func(handle_);
-
-    }
-    void invoke(::boost::process::detail::api::native_handle_type handle) const {func(handle);};
-
-    template<typename T>
-    void operator()(T & val) const {invoke(val.get_used_handles());}
-};
-
-template<typename Executor, typename Function>
-void foreach_used_handle(Executor &exec, Function &&func)
-{
-    boost::fusion::for_each(boost::fusion::filter_if<does_use_handle<boost::mpl::_>>(exec.seq),
-                            foreach_handle_invocator<Function>(func));
-}
-
-template<typename Executor>
-std::vector<::boost::process::detail::api::native_handle_type>
-        get_used_handles(Executor &exec)
-{
-    std::vector<::boost::process::detail::api::native_handle_type> res = exec.get_used_handles();
-    foreach_used_handle(exec, [&](::boost::process::detail::api::native_handle_type handle){res.push_back(handle);});
-    return res;
-}
-
-
-
-}}}
-
-#endif /* BOOST_PROCESS_DETAIL_USED_HANDLES_HPP_ */

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

@@ -7,32 +7,57 @@
 #define BOOST_PROCESS_DETAIL_WINDOWS_ASIO_FWD_HPP_
 
 #include <memory>
-#include <boost/asio/ts/netfwd.hpp>
 
 namespace boost { namespace asio {
 
-class mutable_buffer;
-class mutable_buffers_1;
-class const_buffer;
-class const_buffers_1;
+template<typename T>
+struct is_mutable_buffer_sequence;
+
+template<typename T>
+struct is_const_buffer_sequence;
+
 
 template<typename Allocator>
 class basic_streambuf;
 
 typedef basic_streambuf<std::allocator<char>> streambuf;
+class io_context;
+
+class executor;
+
 
 template <typename Handler>
 class basic_yield_context;
 
 namespace windows {
 
+#if defined(BOOST_ASIO_ENABLE_OLD_SERVICES)
+class stream_handle_service;
+
+template <typename StreamHandleService>
+class basic_stream_handle;
+
+typedef basic_stream_handle<stream_handle_service> stream_handle;
+#else /* defined(BOOST_ASIO_ENABLE_OLD_SERVICES) */
 template <typename Executor>
 class basic_stream_handle;
-typedef basic_stream_handle<any_io_executor> stream_handle;
+typedef basic_stream_handle<executor> stream_handle;
 
+#endif /* defined(BOOST_ASIO_ENABLE_OLD_SERVICES) */
+
+
+#if defined(BOOST_ASIO_ENABLE_OLD_SERVICES)
+class object_handle_service;
+
+template <typename ObjectHandleService>
+class basic_object_handle;
+
+typedef basic_object_handle<object_handle_service> object_handle;
+#else /* defined(BOOST_ASIO_ENABLE_OLD_SERVICES) */
 template <typename Executor>
 class basic_object_handle;
-typedef basic_object_handle<any_io_executor> object_handle;
+typedef basic_object_handle<executor> object_handle;
+#endif /* defined(BOOST_ASIO_ENABLE_OLD_SERVICES) */
 
 } //windows
 } //asio

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

@@ -17,20 +17,19 @@
 
 #include <boost/asio/write.hpp>
 #include <boost/process/detail/handler_base.hpp>
-#include <boost/process/detail/used_handles.hpp>
 #include <boost/process/detail/windows/async_handler.hpp>
 #include <boost/process/detail/windows/asio_fwd.hpp>
 #include <boost/process/async_pipe.hpp>
 #include <memory>
 #include <future>
 
+
 namespace boost { namespace process { namespace detail { namespace windows {
 
 
 template<typename Buffer>
 struct async_in_buffer : ::boost::process::detail::windows::handler_base_ext,
-                         ::boost::process::detail::windows::require_io_context,
-                         ::boost::process::detail::uses_handles
+                         ::boost::process::detail::windows::require_io_context
 {
     Buffer & buf;
 
@@ -43,11 +42,6 @@ struct async_in_buffer : ::boost::process::detail::windows::handler_base_ext,
 
     std::shared_ptr<boost::process::async_pipe> pipe;
 
-    ::boost::winapi::HANDLE_ get_used_handles() const
-    {
-        return std::move(*pipe).source().native_handle();
-    }
-
     async_in_buffer(Buffer & buf) : buf(buf)
     {
     }

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

@@ -16,7 +16,6 @@
 #include <boost/winapi/error_codes.hpp>
 #include <boost/asio/read.hpp>
 #include <boost/process/detail/handler_base.hpp>
-#include <boost/process/detail/used_handles.hpp>
 #include <boost/process/detail/windows/asio_fwd.hpp>
 
 #include <istream>
@@ -109,18 +108,12 @@ struct async_out_buffer : ::boost::process::detail::windows::handler_base_ext,
 
 template<int p1, int p2, typename Type>
 struct async_out_future : ::boost::process::detail::windows::handler_base_ext,
-                          ::boost::process::detail::windows::require_io_context,
-                          ::boost::process::detail::uses_handles
+                          ::boost::process::detail::windows::require_io_context
 {
     std::shared_ptr<boost::process::async_pipe> pipe;
     std::shared_ptr<std::promise<Type>> promise = std::make_shared<std::promise<Type>>();
     std::shared_ptr<boost::asio::streambuf> buffer = std::make_shared<boost::asio::streambuf>();
 
-    ::boost::winapi::HANDLE_ get_used_handles() const
-    {
-        return std::move(*pipe).sink().native_handle();
-    }
-
 
     async_out_future(std::future<Type> & fut)
     {

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

@@ -40,27 +40,17 @@ class async_pipe
 {
     ::boost::asio::windows::stream_handle _source;
     ::boost::asio::windows::stream_handle _sink  ;
-
-    inline async_pipe(boost::asio::io_context & ios_source,
-                      boost::asio::io_context & ios_sink,
-                      const std::string & name, bool private_);
-
 public:
     typedef ::boost::winapi::HANDLE_ native_handle_type;
     typedef ::boost::asio::windows::stream_handle   handle_type;
-    typedef typename handle_type::executor_type executor_type;
-
-    async_pipe(boost::asio::io_context & ios) : async_pipe(ios, ios, make_pipe_name(), true) {}
-    async_pipe(boost::asio::io_context & ios_source, boost::asio::io_context & ios_sink)
-                : async_pipe(ios_source, ios_sink, make_pipe_name(), true) {}
-
-    async_pipe(boost::asio::io_context & ios, const std::string & name)
-                : async_pipe(ios, ios, name, false) {}
-
-    async_pipe(boost::asio::io_context & ios_source, boost::asio::io_context & ios_sink, const std::string & name)
-            : async_pipe(ios_source, ios_sink, name, false) {}
 
+    inline async_pipe(boost::asio::io_context & ios,
+                      const std::string & name = make_pipe_name())
+                    : async_pipe(ios, ios, name) {}
 
+    inline async_pipe(boost::asio::io_context & ios_source,
+                      boost::asio::io_context & ios_sink,
+                      const std::string & name = make_pipe_name());
 
     inline async_pipe(const async_pipe& rhs);
     async_pipe(async_pipe&& rhs)  : _source(std::move(rhs._source)), _sink(std::move(rhs._sink))
@@ -284,7 +274,7 @@ async_pipe::async_pipe(const async_pipe& p)  :
 
 async_pipe::async_pipe(boost::asio::io_context & ios_source,
                        boost::asio::io_context & ios_sink,
-                       const std::string & name, bool private_) : _source(ios_source), _sink(ios_sink)
+                       const std::string & name) : _source(ios_source), _sink(ios_sink)
 {
     static constexpr int FILE_FLAG_OVERLAPPED_  = 0x40000000; //temporary
 
@@ -296,7 +286,7 @@ async_pipe::async_pipe(boost::asio::io_context & ios_source,
 #endif
             ::boost::winapi::PIPE_ACCESS_INBOUND_
             | FILE_FLAG_OVERLAPPED_, //write flag
-            0, private_ ? 1 : ::boost::winapi::PIPE_UNLIMITED_INSTANCES_, 8192, 8192, 0, nullptr);
+            0, 1, 8192, 8192, 0, nullptr);
 
 
     if (source == boost::winapi::INVALID_HANDLE_VALUE_)

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

@@ -30,17 +30,14 @@ inline std::string build_args(const std::string & exe, std::vector<std::string>
 {
     std::string st = exe;
 
-    //put in quotes if it has spaces or double quotes
-    if(!exe.empty())
+    //put in quotes if it has spaces
     {
-        auto it = st.find_first_of(" \"");
+        boost::replace_all(st, "\"", "\\\"");
 
-        if(it != st.npos)//contains spaces.
+        auto it = std::find(st.begin(), st.end(), ' ');
+
+        if (it != st.end())//contains spaces.
         {
-            // double existing quotes
-            boost::replace_all(st, "\"", "\"\"");
-
-            // surround with quotes
             st.insert(st.begin(), '"');
             st += '"';
         }
@@ -48,18 +45,15 @@ inline std::string build_args(const std::string & exe, std::vector<std::string>
 
     for (auto & arg : data)
     {
-        if(!arg.empty())
-        {
-            auto it = arg.find_first_of(" \"");//contains space or double quotes?
-            if(it != arg.npos)//yes
-            {
-                // double existing quotes
-                boost::replace_all(arg, "\"", "\"\"");
+        boost::replace_all(arg, "\"", "\\\"");
 
-                // surround with quotes
-                arg.insert(arg.begin(), '"');
-                arg += '"';
-            }
+        auto it = std::find(arg.begin(), arg.end(), ' ');//contains space?
+        if (it != arg.end())//ok, contains spaces.
+        {
+            //the first one is put directly onto the output,
+            //because then I don't have to copy the whole string
+            arg.insert(arg.begin(), '"');
+            arg += '"'; //thats the post one.
         }
 
         if (!st.empty())//first one does not need a preceeding space
@@ -74,36 +68,30 @@ inline std::wstring build_args(const std::wstring & exe, std::vector<std::wstrin
 {
     std::wstring st = exe;
 
-    //put in quotes if it has spaces or double quotes
-    if(!exe.empty())
+    //put in quotes if it has spaces
     {
-        auto it = st.find_first_of(L" \"");
+        boost::replace_all(st, L"\"", L"\\\"");
 
-        if(it != st.npos)//contains spaces or double quotes.
+        auto it = std::find(st.begin(), st.end(), L' ');
+
+        if (it != st.end())//contains spaces.
         {
-            // double existing quotes
-            boost::replace_all(st, L"\"", L"\"\"");
-
-            // surround with quotes
             st.insert(st.begin(), L'"');
             st += L'"';
         }
     }
 
-    for(auto & arg : data)
+    for (auto & arg : data)
     {
-        if(!arg.empty())
-        {
-            auto it = arg.find_first_of(L" \"");//contains space or double quotes?
-            if(it != arg.npos)//yes
-            {
-                // double existing quotes
-                boost::replace_all(arg, L"\"", L"\"\"");
+        boost::replace_all(arg, L"\"", L"\\\"");
 
-                // surround with quotes
-                arg.insert(arg.begin(), L'"');
-                arg += '"';
-            }
+        auto it = std::find(arg.begin(), arg.end(), L' ');//contains space?
+        if (it != arg.end())//ok, contains spaces.
+        {
+            //the first one is put directly onto the output,
+            //because then I don't have to copy the whole string
+            arg.insert(arg.begin(), L'"');
+            arg += L'"'; //thats the post one.
         }
 
         if (!st.empty())//first one does not need a preceeding space
@@ -159,13 +147,8 @@ struct exe_cmd_init : handler_base_ext
         return exe_cmd_init<Char>(std::move(sh), std::move(args_));
     }
 
-#ifdef BOOST_PROCESS_USE_STD_FS
-    static std:: string get_shell(char)    {return shell(). string(); }
-    static std::wstring get_shell(wchar_t) {return shell().wstring(); }
-#else
     static std:: string get_shell(char)    {return shell(). string(codecvt()); }
     static std::wstring get_shell(wchar_t) {return shell().wstring(codecvt());}
-#endif
 
     static exe_cmd_init<Char> cmd_shell(string_type&& cmd)
     {

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

@@ -98,7 +98,7 @@ public:
         return static_cast<int_type>(read_len);
     }
 
-    bool is_open() const
+    bool is_open()
     {
         return (_source != ::boost::winapi::INVALID_HANDLE_VALUE_) ||
                (_sink   != ::boost::winapi::INVALID_HANDLE_VALUE_);
@@ -152,7 +152,7 @@ basic_pipe<Char, Traits>::basic_pipe(const std::string & name)
             name_.c_str(),
             ::boost::winapi::PIPE_ACCESS_INBOUND_
             | FILE_FLAG_OVERLAPPED_, //write flag
-            0, ::boost::winapi::PIPE_UNLIMITED_INSTANCES_, 8192, 8192, 0, nullptr);
+            0, 1, 8192, 8192, 0, nullptr);
 
     if (source == boost::winapi::INVALID_HANDLE_VALUE_)
         ::boost::process::detail::throw_last_error("create_named_pipe() failed");

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

@@ -17,7 +17,7 @@
 
 namespace boost { namespace process { namespace detail { namespace windows {
 
-typedef ::boost::winapi::DWORD_ pid_t;
+typedef int pid_t;
 
 struct child_handle
 {
@@ -66,7 +66,7 @@ struct child_handle
 
     pid_t id() const
     {
-        return static_cast<pid_t>(proc_info.dwProcessId);
+        return static_cast<int>(proc_info.dwProcessId);
     }
 
     typedef ::boost::winapi::HANDLE_ process_handle_t;

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

@@ -90,12 +90,12 @@ inline auto native_environment_impl<Char>::get(const pointer_type id) -> string_
                 ::boost::process::detail::throw_last_error("GetEnvironmentVariable() failed");
             else
                 return std::basic_string<Char>(
-                        buf.data(), buf.data()+ size);
+                        buf.data(), buf.data()+ size + 1);
 
         }
 
     }
-    return std::basic_string<Char>(buf, buf+size);
+    return std::basic_string<Char>(buf, buf+size+1);
 }
 
 template<typename Char>
@@ -232,8 +232,6 @@ basic_environment_impl<Char>::basic_environment_impl(const native_environment_im
 template<typename Char>
 inline auto basic_environment_impl<Char>::get(const string_type &id) -> string_type
 {
-    if (id.size() >= _data.size()) //ok, so it's impossible id is in there.
-        return string_type(_data.data());
 
     if (std::equal(id.begin(), id.end(), _data.begin()) && (_data[id.size()] == equal_sign<Char>()))
         return string_type(_data.data()); //null-char is handled by the string.

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

@@ -10,8 +10,7 @@
 #include <boost/winapi/handles.hpp>
 #include <boost/winapi/file_management.hpp>
 #include <string>
-#include <boost/process/filesystem.hpp>
-#include <boost/core/exchange.hpp>
+#include <boost/filesystem/path.hpp>
 
 namespace boost { namespace process { namespace detail { namespace windows {
 
@@ -40,7 +39,7 @@ struct file_descriptor
     }
 
     file_descriptor() = default;
-    file_descriptor(const boost::process::filesystem::path& p, mode_t mode = read_write)
+    file_descriptor(const boost::filesystem::path& p, mode_t mode = read_write)
         : file_descriptor(p.native(), mode)
     {
     }
@@ -91,19 +90,10 @@ struct file_descriptor
 
 }
     file_descriptor(const file_descriptor & ) = delete;
-    file_descriptor(file_descriptor &&other)
-        : _handle( boost::exchange(other._handle, ::boost::winapi::INVALID_HANDLE_VALUE_) )
-    {
-    }
+    file_descriptor(file_descriptor && ) = default;
 
     file_descriptor& operator=(const file_descriptor & ) = delete;
-    file_descriptor& operator=(file_descriptor &&other)
-    {
-        if (_handle != ::boost::winapi::INVALID_HANDLE_VALUE_)
-            ::boost::winapi::CloseHandle(_handle);
-        _handle = boost::exchange(other._handle, ::boost::winapi::INVALID_HANDLE_VALUE_);
-        return *this;
-    }
+    file_descriptor& operator=(file_descriptor && ) = default;
 
     ~file_descriptor()
     {

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

@@ -13,20 +13,16 @@
 #include <boost/winapi/process.hpp>
 #include <boost/winapi/handles.hpp>
 #include <boost/process/detail/handler_base.hpp>
-#include <boost/process/detail/used_handles.hpp>
 #include <boost/process/detail/windows/file_descriptor.hpp>
 #include <io.h>
 
 namespace boost { namespace process { namespace detail { namespace windows {
 
-struct file_in : public ::boost::process::detail::handler_base,
-                        ::boost::process::detail::uses_handles
+struct file_in : public ::boost::process::detail::handler_base
 {
     file_descriptor file;
     ::boost::winapi::HANDLE_ handle = file.handle();
 
-    ::boost::winapi::HANDLE_ get_used_handles() const { return handle; }
-
     template<typename T>
     file_in(T&& t) : file(std::forward<T>(t), file_descriptor::read) {}
     file_in(FILE * f) : handle(reinterpret_cast<::boost::winapi::HANDLE_>(_get_osfhandle(_fileno(f)))) {}

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

@@ -14,21 +14,16 @@
 #include <boost/winapi/handles.hpp>
 #include <boost/winapi/handle_info.hpp>
 #include <boost/process/detail/handler_base.hpp>
-#include <boost/process/detail/used_handles.hpp>
 #include <boost/process/detail/windows/file_descriptor.hpp>
 
 namespace boost { namespace process { namespace detail { namespace windows {
 
 template<int p1, int p2>
-struct file_out : public ::boost::process::detail::handler_base,
-                         ::boost::process::detail::uses_handles
+struct file_out : public ::boost::process::detail::handler_base
 {
     file_descriptor file;
     ::boost::winapi::HANDLE_ handle = file.handle();
 
-    ::boost::winapi::HANDLE_ get_used_handles() const { return handle; }
-
-
     template<typename T>
     file_out(T&& t) : file(std::forward<T>(t), file_descriptor::write) {}
     file_out(FILE * f) : handle(reinterpret_cast<void*>(_get_osfhandle(_fileno(f)))) {}

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

@@ -6,10 +6,9 @@
 #ifndef BOOST_PROCESS_DETAIL_WINDOWS_GROUP_REF_HPP_
 #define BOOST_PROCESS_DETAIL_WINDOWS_GROUP_REF_HPP_
 
-#include <boost/winapi/process.hpp>
 #include <boost/process/detail/config.hpp>
 #include <boost/process/detail/windows/group_handle.hpp>
-#include <boost/process/detail/used_handles.hpp>
+#include <boost/winapi/process.hpp>
 #include <boost/process/detail/windows/handler.hpp>
 
 namespace boost { namespace process {
@@ -18,12 +17,10 @@ namespace detail { namespace windows {
 
 
 
-struct group_ref : handler_base_ext, ::boost::process::detail::uses_handles
+struct group_ref : handler_base_ext
 {
     ::boost::winapi::HANDLE_ handle;
 
-    ::boost::winapi::HANDLE_ get_used_handles() const { return handle; }
-
     explicit group_ref(group_handle &g) :
                 handle(g.handle())
     {}

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

@@ -1,262 +0,0 @@
-// Copyright (c) 2018 Klemens D. Morgenstern
-//
-// 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)
-
-#ifndef BOOST_PROCESS_DETAIL_WINDOWS_HANDLE_WORKAROUND_HPP_
-#define BOOST_PROCESS_DETAIL_WINDOWS_HANDLE_WORKAROUND_HPP_
-
-#include <boost/winapi/basic_types.hpp>
-#include <boost/winapi/dll.hpp>
-#include <boost/winapi/access_rights.hpp>
-//#define BOOST_USE_WINDOWS_H 1
-
-#if defined( BOOST_USE_WINDOWS_H )
-#include <winternl.h>
-#endif
-
-
-namespace boost { namespace process { namespace detail { namespace windows { namespace workaround
-{
-
-
-typedef struct _SYSTEM_HANDLE_ENTRY_
-{
-    ::boost::winapi::ULONG_ OwnerPid;
-    ::boost::winapi::BYTE_ ObjectType;
-    ::boost::winapi::BYTE_ HandleFlags;
-    ::boost::winapi::USHORT_ HandleValue;
-    ::boost::winapi::PVOID_ ObjectPointer;
-    ::boost::winapi::ULONG_ AccessMask;
-} SYSTEM_HANDLE_ENTRY_, *PSYSTEM_HANDLE_ENTRY_;
-
-typedef struct _SYSTEM_HANDLE_INFORMATION_
-{
-    ::boost::winapi::ULONG_ Count;
-    SYSTEM_HANDLE_ENTRY_ Handle[1];
-} SYSTEM_HANDLE_INFORMATION_, *PSYSTEM_HANDLE_INFORMATION_;
-
-#if defined( BOOST_USE_WINDOWS_H )
-
-using UNICODE_STRING_  = ::UNICODE_STRING;
-using GENERIC_MAPPING_ = ::GENERIC_MAPPING;
-using OBJECT_INFORMATION_CLASS_ = ::OBJECT_INFORMATION_CLASS;
-
-constexpr static OBJECT_INFORMATION_CLASS_  ObjectTypeInformation = ::OBJECT_INFORMATION_CLASS::ObjectTypeInformation;
-
-typedef struct _OBJECT_TYPE_INFORMATION_ {
-    UNICODE_STRING TypeName;
-    ULONG TotalNumberOfObjects;
-    ULONG TotalNumberOfHandles;
-    ULONG TotalPagedPoolUsage;
-    ULONG TotalNonPagedPoolUsage;
-    ULONG TotalNamePoolUsage;
-    ULONG TotalHandleTableUsage;
-    ULONG HighWaterNumberOfObjects;
-    ULONG HighWaterNumberOfHandles;
-    ULONG HighWaterPagedPoolUsage;
-    ULONG HighWaterNonPagedPoolUsage;
-    ULONG HighWaterNamePoolUsage;
-    ULONG HighWaterHandleTableUsage;
-    ULONG InvalidAttributes;
-    GENERIC_MAPPING GenericMapping;
-    ULONG ValidAccessMask;
-    BOOLEAN SecurityRequired;
-    BOOLEAN MaintainHandleCount;
-    UCHAR   TypeIndex;
-    CHAR    ReservedByte;
-    ULONG PoolType;
-    ULONG DefaultPagedPoolCharge;
-    ULONG DefaultNonPagedPoolCharge;
-} OBJECT_TYPE_INFORMATION_, *POBJECT_TYPE_INFORMATION_;
-
-#else
-
-typedef enum _OBJECT_INFORMATION_CLASS_
-{
-    ObjectBasicInformation,
-    ObjectNameInformation,
-    ObjectTypeInformation,
-    ObjectAllInformation,
-    ObjectDataInformation
-} OBJECT_INFORMATION_CLASS_, *POBJECT_INFORMATION_CLASS_;
-
-typedef struct _UNICODE_STRING_ {
-    ::boost::winapi::USHORT_ Length;
-    ::boost::winapi::USHORT_ MaximumLength;
-    ::boost::winapi::LPWSTR_ Buffer;
-} UNICODE_STRING_, *PUNICODE_STRING_;
-
-typedef struct _GENERIC_MAPPING_ {
-    ::boost::winapi::ACCESS_MASK_ GenericRead;
-    ::boost::winapi::ACCESS_MASK_ GenericWrite;
-    ::boost::winapi::ACCESS_MASK_ GenericExecute;
-    ::boost::winapi::ACCESS_MASK_ GenericAll;
-} GENERIC_MAPPING_;
-
-#endif
-
-typedef struct _OBJECT_BASIC_INFORMATION {
-    ::boost::winapi::ULONG_  Attributes;
-    ::boost::winapi::ACCESS_MASK_  GrantedAccess;
-    ::boost::winapi::ULONG_  HandleCount;
-    ::boost::winapi::ULONG_  PointerCount;
-    ::boost::winapi::ULONG_  PagedPoolUsage;
-    ::boost::winapi::ULONG_  NonPagedPoolUsage;
-    ::boost::winapi::ULONG_  Reserved[3];
-    ::boost::winapi::ULONG_  NameInformationLength;
-    ::boost::winapi::ULONG_  TypeInformationLength;
-    ::boost::winapi::ULONG_  SecurityDescriptorLength;
-    ::boost::winapi::LARGE_INTEGER_  CreateTime;
-} OBJECT_BASIC_INFORMATION_, *POBJECT_BASIC_INFORMATION_;
-
-typedef struct _OBJECT_NAME_INFORMATION {
-    UNICODE_STRING_ Name;
-} OBJECT_NAME_INFORMATION_, *POBJECT_NAME_INFORMATION_;
-
-
-#if defined( BOOST_USE_WINDOWS_H )
-
-extern "C"
-{
-
-using SYSTEM_INFORMATION_CLASS_  = ::SYSTEM_INFORMATION_CLASS;
-constexpr static SYSTEM_INFORMATION_CLASS_  SystemHandleInformation_ = static_cast<SYSTEM_INFORMATION_CLASS_>(16);
-
-inline ::boost::winapi::NTSTATUS_ nt_system_query_information(
-        SYSTEM_INFORMATION_CLASS SystemInformationClass,
-        void * SystemInformation,
-        ::boost::winapi::ULONG_ SystemInformationLength,
-        ::boost::winapi::PULONG_ ReturnLength)
-{
-    return ::NtQuerySystemInformation(SystemInformationClass, SystemInformation, SystemInformationLength, ReturnLength);
-}
-
-inline ::boost::winapi::NTSTATUS_ nt_query_object(
-        ::boost::winapi::HANDLE_ Handle,
-        OBJECT_INFORMATION_CLASS_ ObjectInformationClass,
-        ::boost::winapi::PVOID_  ObjectInformation,
-        ::boost::winapi::ULONG_  ObjectInformationLength,
-        ::boost::winapi::PULONG_ ReturnLength
-)
-{
-    return ::NtQueryObject(Handle, ObjectInformationClass, ObjectInformation, ObjectInformationLength, ReturnLength);
-}
-
-}
-
-#else
-
-//this import workaround is to keep it a header-only library. and enums cannot be imported from the winapi.
-
-extern "C"
-{
-
-typedef enum _SYSTEM_INFORMATION_CLASS_
-{
-    SystemBasicInformation_ = 0,
-    SystemProcessorInformation_ = 1,
-    SystemPerformanceInformation_ = 2,
-    SystemTimeOfDayInformation_ = 3,
-    SystemProcessInformation_ = 5,
-    SystemProcessorPerformanceInformation_ = 8,
-    SystemHandleInformation_ = 16,
-    SystemPagefileInformation_ = 18,
-    SystemInterruptInformation_ = 23,
-    SystemExceptionInformation_ = 33,
-    SystemRegistryQuotaInformation_ = 37,
-    SystemLookasideInformation_ = 45
-} SYSTEM_INFORMATION_CLASS_;
-
-
-typedef struct _OBJECT_TYPE_INFORMATION_ {
-    UNICODE_STRING_ TypeName;
-    ::boost::winapi::ULONG_ TotalNumberOfObjects;
-    ::boost::winapi::ULONG_ TotalNumberOfHandles;
-    ::boost::winapi::ULONG_ TotalPagedPoolUsage;
-    ::boost::winapi::ULONG_ TotalNonPagedPoolUsage;
-    ::boost::winapi::ULONG_ TotalNamePoolUsage;
-    ::boost::winapi::ULONG_ TotalHandleTableUsage;
-    ::boost::winapi::ULONG_ HighWaterNumberOfObjects;
-    ::boost::winapi::ULONG_ HighWaterNumberOfHandles;
-    ::boost::winapi::ULONG_ HighWaterPagedPoolUsage;
-    ::boost::winapi::ULONG_ HighWaterNonPagedPoolUsage;
-    ::boost::winapi::ULONG_ HighWaterNamePoolUsage;
-    ::boost::winapi::ULONG_ HighWaterHandleTableUsage;
-    ::boost::winapi::ULONG_ InvalidAttributes;
-    GENERIC_MAPPING_ GenericMapping;
-    ::boost::winapi::ULONG_ ValidAccessMask;
-    ::boost::winapi::BOOLEAN_ SecurityRequired;
-    ::boost::winapi::BOOLEAN_ MaintainHandleCount;
-    ::boost::winapi::UCHAR_   TypeIndex;
-    ::boost::winapi::CHAR_    ReservedByte;
-    ::boost::winapi::ULONG_ PoolType;
-    ::boost::winapi::ULONG_ DefaultPagedPoolCharge;
-    ::boost::winapi::ULONG_ DefaultNonPagedPoolCharge;
-} OBJECT_TYPE_INFORMATION_, *POBJECT_TYPE_INFORMATION_;
-
-
-
-/*
-NTSTATUS NtQuerySystemInformation(
-  IN SYSTEM_INFORMATION_CLASS SystemInformationClass,
-  OUT PVOID                   SystemInformation,
-  IN ULONG                    SystemInformationLength,
-  OUT PULONG                  ReturnLength
-);
- */
-typedef ::boost::winapi::NTSTATUS_ (*nt_system_query_information_p )(
-        SYSTEM_INFORMATION_CLASS_,
-        void *,
-        ::boost::winapi::ULONG_,
-        ::boost::winapi::PULONG_);
-/*
-NTSYSCALLAPI NTSTATUS NtQueryObject(
-  HANDLE                   Handle,
-  OBJECT_INFORMATION_CLASS ObjectInformationClass,
-  PVOID                    ObjectInformation,
-  ULONG                    ObjectInformationLength,
-  PULONG                   ReturnLength
-);
- */
-
-typedef ::boost::winapi::NTSTATUS_ (*nt_query_object_p )(
-        ::boost::winapi::HANDLE_,
-        OBJECT_INFORMATION_CLASS_,
-        void *,
-        ::boost::winapi::ULONG_,
-        ::boost::winapi::PULONG_);
-
-}
-
-inline ::boost::winapi::NTSTATUS_ nt_system_query_information(
-        SYSTEM_INFORMATION_CLASS_ SystemInformationClass,
-        void *SystemInformation,
-        ::boost::winapi::ULONG_ SystemInformationLength,
-        ::boost::winapi::PULONG_ ReturnLength)
-{
-    static ::boost::winapi::HMODULE_ h = ::boost::winapi::get_module_handle(L"Ntdll.dll");
-    static nt_system_query_information_p f = reinterpret_cast<nt_system_query_information_p>(::boost::winapi::get_proc_address(h, "NtQuerySystemInformation"));
-
-    return (*f)(SystemInformationClass, SystemInformation, SystemInformationLength, ReturnLength);
-}
-
-
-inline ::boost::winapi::BOOL_ nt_query_object(
-        ::boost::winapi::HANDLE_ Handle,
-        OBJECT_INFORMATION_CLASS_ ObjectInformationClass,
-        void *ObjectInformation,
-        ::boost::winapi::ULONG_ ObjectInformationLength,
-        ::boost::winapi::PULONG_ ReturnLength)
-{
-    static ::boost::winapi::HMODULE_ h = ::boost::winapi::get_module_handle(L"Ntdll.dll");
-    static nt_query_object_p f = reinterpret_cast<nt_query_object_p>(::boost::winapi::get_proc_address(h, "NtQueryObject"));
-
-    return (*f)(Handle, ObjectInformationClass, ObjectInformation, ObjectInformationLength, ReturnLength);
-}
-
-#endif
-
-}}}}}
-
-#endif /* BOOST_PROCESS_DETAIL_WINDOWS_JOB_WORKAROUND_HPP_ */

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

@@ -1,177 +0,0 @@
-// Copyright (c) 2019 Klemens D. Morgenstern
-//
-// 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)
-
-#ifndef BOOST_PROCESS_DETAIL_WINDOWS_HANDLES_HPP_
-#define BOOST_PROCESS_DETAIL_WINDOWS_HANDLES_HPP_
-
-#include <vector>
-#include <system_error>
-#include <boost/process/detail/windows/handle_workaround.hpp>
-#include <boost/process/detail/windows/handler.hpp>
-#include <boost/winapi/get_current_process_id.hpp>
-#include <boost/winapi/handles.hpp>
-
-namespace boost { namespace process { namespace detail {
-
-
-template<typename Executor, typename Function>
-void foreach_used_handle(Executor &exec, Function &&func);
-
-
-namespace windows {
-
-
-using native_handle_type = ::boost::winapi::HANDLE_ ;
-
-inline std::vector<native_handle_type> get_handles(std::error_code & ec)
-{
-    auto pid = ::boost::winapi::GetCurrentProcessId();
-
-    std::vector<char> buffer(2048);
-    constexpr static auto STATUS_INFO_LENGTH_MISMATCH_ = static_cast<::boost::winapi::NTSTATUS_>(0xC0000004l);
-    auto info_pointer = reinterpret_cast<workaround::SYSTEM_HANDLE_INFORMATION_*>(buffer.data());
-
-    ::boost::winapi::NTSTATUS_ nt_status = STATUS_INFO_LENGTH_MISMATCH_;
-
-    for (;
-           nt_status == STATUS_INFO_LENGTH_MISMATCH_;
-           nt_status = workaround::nt_system_query_information(
-                            workaround::SystemHandleInformation_,
-                            info_pointer, static_cast<::boost::winapi::ULONG_>(buffer.size()),
-                            nullptr))
-    {
-        buffer.resize(buffer.size() * 2);
-        info_pointer = reinterpret_cast<workaround::SYSTEM_HANDLE_INFORMATION_*>(buffer.data());
-    }
-
-
-    if (nt_status < 0 || nt_status > 0x7FFFFFFF)
-    {
-        ec = ::boost::process::detail::get_last_error();
-        return {};
-    }
-    else
-        ec.clear();
-
-    std::vector<native_handle_type> res;
-    for (auto itr = info_pointer->Handle; itr != (info_pointer->Handle + info_pointer->Count); itr++)
-    {
-        if (itr->OwnerPid == pid)
-            res.push_back(reinterpret_cast<native_handle_type>(static_cast<std::uintptr_t>(itr->HandleValue)));
-    }
-
-    return res;
-}
-
-inline std::vector<native_handle_type> get_handles()
-{
-    std::error_code ec;
-
-    auto res = get_handles(ec);
-    if (ec)
-        boost::process::detail::throw_error(ec, "NtQuerySystemInformation failed");
-
-    return res;
-}
-
-
-inline bool is_stream_handle(native_handle_type handle, std::error_code & ec)
-{
-    ::boost::winapi::ULONG_ actual_size;
-    auto nt_status = workaround::nt_query_object(
-            handle,
-            workaround::ObjectTypeInformation,
-            NULL,
-            0, &actual_size);
-
-    std::vector<char> vec;
-    vec.resize(actual_size);
-
-    workaround::OBJECT_TYPE_INFORMATION_ * type_info_p = reinterpret_cast<workaround::OBJECT_TYPE_INFORMATION_*>(vec.data());
-    nt_status = workaround::nt_query_object(
-            handle,
-            workaround::ObjectTypeInformation,
-            type_info_p,
-            actual_size, &actual_size);
-
-    if (nt_status < 0 || nt_status > 0x7FFFFFFF)
-    {
-        ec = ::boost::process::detail::get_last_error();
-        return false;
-    }
-    else
-        ec.clear();
-
-    auto &nm = type_info_p->TypeName.Buffer;
-    return type_info_p->TypeName.Length >= 5 &&
-            nm[0] == L'F' &&
-            nm[1] == L'i' &&
-            nm[2] == L'l' &&
-            nm[3] == L'e' &&
-            nm[4] == L'\0';
-}
-
-
-inline bool is_stream_handle(native_handle_type handle)
-{
-    std::error_code ec;
-    auto res = is_stream_handle(handle, ec);
-    if (ec)
-        boost::process::detail::throw_error(ec, "NtQueryObject failed");
-
-    return res;
-}
-
-
-struct limit_handles_ : handler_base_ext
-{
-    mutable std::vector<::boost::winapi::HANDLE_> handles_with_inherit_flag;
-
-    template<typename Executor>
-    void on_setup(Executor & exec) const
-    {
-        auto all_handles = get_handles();
-        foreach_used_handle(exec,
-                [&](::boost::winapi::HANDLE_ handle)
-                {
-                    auto itr = std::find(all_handles.begin(), all_handles .end(), handle);
-                    ::boost::winapi::DWORD_ flags = 0u;
-                    if (itr != all_handles.end())
-                        *itr = ::boost::winapi::INVALID_HANDLE_VALUE_;
-                    else if ((::boost::winapi::GetHandleInformation(*itr, &flags) != 0)
-                            &&((flags & ::boost::winapi::HANDLE_FLAG_INHERIT_) == 0)) //it is NOT inherited anyhow, so ignore too
-                        *itr = ::boost::winapi::INVALID_HANDLE_VALUE_;
-                });
-
-        auto part_itr = std::partition(all_handles.begin(), all_handles.end(),
-                                       [](::boost::winapi::HANDLE_ handle) {return handle != ::boost::winapi::INVALID_HANDLE_VALUE_;});
-
-        all_handles.erase(part_itr, all_handles.end()); //remove invalid handles
-        handles_with_inherit_flag = std::move(all_handles);
-
-        for (auto handle : handles_with_inherit_flag)
-            ::boost::winapi::SetHandleInformation(handle, ::boost::winapi::HANDLE_FLAG_INHERIT_, 0);
-    }
-
-    template<typename Executor>
-    void on_error(Executor & exec, const std::error_code & ec) const
-    {
-        for (auto handle : handles_with_inherit_flag)
-            ::boost::winapi::SetHandleInformation(handle, ::boost::winapi::HANDLE_FLAG_INHERIT_, ::boost::winapi::HANDLE_FLAG_INHERIT_);
-    }
-
-    template<typename Executor>
-    void on_sucess(Executor & exec) const
-    {
-        for (auto handle : handles_with_inherit_flag)
-            ::boost::winapi::SetHandleInformation(handle, ::boost::winapi::HANDLE_FLAG_INHERIT_, ::boost::winapi::HANDLE_FLAG_INHERIT_);
-    }
-
-};
-
-
-}}}}
-
-#endif //PROCESS_HANDLES_HPP

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

@@ -8,9 +8,7 @@
 
 #include <boost/process/detail/handler_base.hpp>
 #include <boost/process/detail/windows/async_handler.hpp>
-#include <boost/process/detail/windows/is_running.hpp>
 #include <boost/asio/io_context.hpp>
-#include <boost/asio/post.hpp>
 #include <boost/asio/windows/object_handle.hpp>
 #include <boost/winapi/process.hpp>
 #include <boost/winapi/handles.hpp>
@@ -116,15 +114,6 @@ struct io_context_ref : boost::process::detail::handler_base
 
         wait_handler wh(std::move(funcs), ios, process_handle, exec.exit_status);
 
-        ::boost::winapi::DWORD_ code;
-        if(::boost::winapi::GetExitCodeProcess(process_handle, &code)
-            && code != still_active)
-        {
-            ::boost::asio::post(wh.handle->get_executor(), std::move(wh));
-            return;
-        }
-
-
         auto handle_p = wh.handle.get();
         handle_p->async_wait(std::move(wh));
     }
@@ -141,13 +130,12 @@ struct io_context_ref : boost::process::detail::handler_base
                      boost::asio::io_context & ios, void * handle,
                      const std::shared_ptr<std::atomic<int>> &exit_status)
                 : funcs(std::move(funcs)),
-                  handle(new boost::asio::windows::object_handle(
-                          asio::prefer(ios.get_executor(), asio::execution::outstanding_work.tracked), handle)),
+                  handle(new boost::asio::windows::object_handle(ios.get_executor(), handle)),
                   exit_status(exit_status)
         {
 
         }
-        void operator()(const boost::system::error_code & ec_in = {})
+        void operator()(const boost::system::error_code & ec_in)
         {
             std::error_code ec;
             if (ec_in)

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

@@ -1,4 +1,4 @@
-// Copyright (c) 2016 Klemens D. Morgenstern
+// Copyright (c) 2106 Klemens D. Morgenstern
 //
 // 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)
@@ -7,7 +7,6 @@
 #define BOOST_PROCESS_WINDOWS_IS_RUNNING_HPP
 
 #include <boost/process/detail/config.hpp>
-#include <boost/process/detail/windows/child_handle.hpp>
 #include <system_error>
 #include <cstdlib>
 #include <boost/winapi/process.hpp>

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

@@ -14,18 +14,14 @@
 #include <boost/winapi/handles.hpp>
 #include <boost/winapi/handle_info.hpp>
 #include <boost/process/detail/handler_base.hpp>
-#include <boost/process/detail/used_handles.hpp>
 #include <boost/process/detail/windows/file_descriptor.hpp>
 
 namespace boost { namespace process { namespace detail { namespace windows {
 
-struct null_in : public ::boost::process::detail::handler_base, ::boost::process::detail::uses_handles
+struct null_in : public ::boost::process::detail::handler_base
 {
     file_descriptor source{"NUL", file_descriptor::read};
 
-    ::boost::winapi::HANDLE_ get_used_handles() const { return source.handle(); }
-
-
 public:
     template <class WindowsExecutor>
     void on_setup(WindowsExecutor &e) const

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

@@ -14,18 +14,15 @@
 #include <boost/winapi/handles.hpp>
 #include <boost/winapi/handle_info.hpp>
 #include <boost/process/detail/handler_base.hpp>
-#include <boost/process/detail/used_handles.hpp>
 #include <boost/process/detail/windows/file_descriptor.hpp>
 
 namespace boost { namespace process { namespace detail { namespace windows {
 
 template<int p1, int p2>
-struct null_out : public ::boost::process::detail::handler_base, ::boost::process::detail::uses_handles
+struct null_out : public ::boost::process::detail::handler_base
 {
     file_descriptor sink {"NUL", file_descriptor::write}; //works because it gets destroyed AFTER launch.
 
-    ::boost::winapi::HANDLE_ get_used_handles() const { return sink.handle(); }
-
     template <typename WindowsExecutor>
     void on_setup(WindowsExecutor &e) const;
 };

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

@@ -6,20 +6,13 @@
 #ifndef BOOST_PROCESS_WINDOWS_ON_EXIT_HPP_
 #define BOOST_PROCESS_WINDOWS_ON_EXIT_HPP_
 
-#include <boost/process/async.hpp>
 #include <boost/process/detail/config.hpp>
 #include <boost/process/detail/handler_base.hpp>
 #include <boost/process/detail/windows/async_handler.hpp>
-#include <boost/asio/execution.hpp>
 #include <system_error>
 #include <functional>
 
-namespace boost { namespace process { namespace detail {
-
-template<typename Tuple>
-inline asio::io_context& get_io_context(const Tuple & tup);
-
-namespace windows {
+namespace boost { namespace process { namespace detail { namespace windows {
 
 struct on_exit_ : boost::process::detail::windows::async_handler
 {
@@ -30,12 +23,10 @@ struct on_exit_ : boost::process::detail::windows::async_handler
     }
 
     template<typename Executor>
-    std::function<void(int, const std::error_code&)> on_exit_handler(Executor& exec)
+    std::function<void(int, const std::error_code&)> on_exit_handler(Executor&)
     {
-        auto v = boost::asio::prefer(boost::process::detail::get_io_context(exec.seq).get_executor(),
-                                     boost::asio::execution::outstanding_work.tracked);
         auto handler_ = this->handler;
-        return [v, handler_](int exit_code, const std::error_code & ec)
+        return [handler_](int exit_code, const std::error_code & ec)
                {
                     handler_(static_cast<int>(exit_code), ec);
                };

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

@@ -12,17 +12,14 @@
 
 #include <boost/winapi/process.hpp>
 #include <boost/winapi/handles.hpp>
-#include <boost/process/detail/used_handles.hpp>
 #include <boost/process/detail/handler_base.hpp>
 
 namespace boost { namespace process { namespace detail { namespace windows {
 
-struct pipe_in : public ::boost::process::detail::handler_base, ::boost::process::detail::uses_handles
+struct pipe_in : public ::boost::process::detail::handler_base
 {
     ::boost::winapi::HANDLE_ handle;
 
-    ::boost::winapi::HANDLE_ get_used_handles() const { return handle; }
-
     pipe_in(::boost::winapi::HANDLE_ handle) : handle(handle) {}
 
     template<typename T> //async_pipe

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

@@ -13,7 +13,6 @@
 
 #include <boost/winapi/process.hpp>
 #include <boost/winapi/handles.hpp>
-#include <boost/process/detail/used_handles.hpp>
 #include <boost/process/detail/handler_base.hpp>
 
 namespace boost { namespace process { namespace detail { namespace windows {
@@ -21,12 +20,10 @@ namespace boost { namespace process { namespace detail { namespace windows {
 
 
 template<int p1, int p2>
-struct pipe_out : public ::boost::process::detail::handler_base, ::boost::process::detail::uses_handles
+struct pipe_out : public ::boost::process::detail::handler_base
 {
     ::boost::winapi::HANDLE_ handle;
 
-    ::boost::winapi::HANDLE_ get_used_handles() const { return handle; }
-
     pipe_out(::boost::winapi::HANDLE_ handle) : handle(handle) {}
     template<typename T>
     pipe_out(T & p) : handle(p.native_sink())

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

@@ -11,7 +11,8 @@
 #define BOOST_PROCESS_WINDOWS_SEARCH_PATH_HPP
 
 #include <boost/process/detail/config.hpp>
-#include <boost/process/filesystem.hpp>
+#include <boost/filesystem/path.hpp>
+#include <boost/filesystem/operations.hpp>
 #include <boost/system/error_code.hpp>
 #include <string>
 #include <stdexcept>
@@ -23,9 +24,9 @@
 
 namespace boost { namespace process { namespace detail { namespace windows {
 
-inline boost::process::filesystem::path search_path(
-        const boost::process::filesystem::path &filename,
-        const std::vector<boost::process::filesystem::path> &path)
+inline boost::filesystem::path search_path(
+        const boost::filesystem::path &filename,
+        const std::vector<boost::filesystem::path> &path)
 {
     const ::boost::process::wnative_environment ne{};
     typedef typename ::boost::process::wnative_environment::const_entry_type value_type;
@@ -35,9 +36,7 @@ inline boost::process::filesystem::path search_path(
             [&](const value_type & e)
              {return id == ::boost::to_upper_copy(e.get_name(), ::boost::process::detail::process_locale());});
 
-    std::vector<std::wstring> extensions_in;
-    if (itr != ne.cend())
-        extensions_in = itr->to_vector();
+    auto extensions_in = itr->to_vector();
 
     std::vector<std::wstring> extensions((extensions_in.size() * 2) + 1);
 
@@ -56,23 +55,19 @@ inline boost::process::filesystem::path search_path(
     for (auto & ext : extensions)
         boost::to_lower(ext);
 
-    for (const boost::process::filesystem::path & pp_ : path)
+    for (const boost::filesystem::path & pp_ : path)
     {
         auto p = pp_ / filename;
-        for (boost::process::filesystem::path ext : extensions)
+        for (boost::filesystem::path ext : extensions)
         {
-            boost::process::filesystem::path pp_ext = p;
-            pp_ext += ext;
-#if defined(BOOST_PROCESS_USE_STD_FS)
-            std::error_code ec;
-#else
+            boost::filesystem::path pp = p;
+            pp += ext;
             boost::system::error_code ec;
-#endif
-            bool file = boost::process::filesystem::is_regular_file(pp_ext, ec);
+            bool file = boost::filesystem::is_regular_file(pp, ec);
             if (!ec && file &&
-                ::boost::winapi::sh_get_file_info(pp_ext.native().c_str(), 0, 0, 0, ::boost::winapi::SHGFI_EXETYPE_))
+                ::boost::winapi::sh_get_file_info(pp.native().c_str(), 0, 0, 0, ::boost::winapi::SHGFI_EXETYPE_))
             {
-                return pp_ext;
+                return pp;
             }
         }
     }

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

@@ -12,29 +12,29 @@
 
 #include <boost/process/detail/config.hpp>
 #include <system_error>
-#include <boost/process/filesystem.hpp>
+#include <boost/filesystem/path.hpp>
 #include <boost/winapi/basic_types.hpp>
 #include <boost/winapi/get_system_directory.hpp>
 
 namespace boost { namespace process { namespace detail { namespace windows {
 
-inline boost::process::filesystem::path shell_path()
+inline boost::filesystem::path shell_path()
 {
     ::boost::winapi::WCHAR_ sysdir[260];
     unsigned int size = ::boost::winapi::get_system_directory(sysdir, sizeof(sysdir));
     if (!size)
         throw_last_error("GetSystemDirectory() failed");
 
-    boost::process::filesystem::path p = sysdir;
+    boost::filesystem::path p = sysdir;
     return p / "cmd.exe";
 }
 
-inline boost::process::filesystem::path shell_path(std::error_code &ec) noexcept
+inline boost::filesystem::path shell_path(std::error_code &ec) noexcept
 {
 
     ::boost::winapi::WCHAR_ sysdir[260];
     unsigned int size = ::boost::winapi::get_system_directory(sysdir, sizeof(sysdir));
-    boost::process::filesystem::path p;
+    boost::filesystem::path p;
     if (!size)
         ec = std::error_code(
                 ::boost::winapi::GetLastError(),

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

@@ -27,7 +27,7 @@ inline bool wait_impl(const group_handle & p, std::error_code & ec, std::chrono:
 
     while (workaround::get_queued_completion_status(
                                        p._io_port, &completion_code,
-                                       &completion_key, &overlapped, static_cast<::boost::winapi::DWORD_>(wait_time)))
+                                       &completion_key, &overlapped, wait_time))
     {
         if (reinterpret_cast<::boost::winapi::HANDLE_>(completion_key) == p._job_object &&
              completion_code == workaround::JOB_OBJECT_MSG_ACTIVE_PROCESS_ZERO_)

include/boost/process/env.hpp

@@ -6,7 +6,6 @@
 #ifndef BOOST_PROCESS_DETAIL_ENV_HPP_
 #define BOOST_PROCESS_DETAIL_ENV_HPP_
 
-#include <boost/process/detail/traits/wchar_t.hpp>
 #include <boost/process/environment.hpp>
 #include <boost/none.hpp>
 

include/boost/process/environment.hpp

@@ -11,7 +11,7 @@
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/iterator/transform_iterator.hpp>
-#include <boost/process/filesystem.hpp>
+#include <boost/filesystem/path.hpp>
 
 #if defined(BOOST_POSIX_API)
 #include <boost/process/detail/posix/environment.hpp>
@@ -44,7 +44,7 @@ struct const_entry
             bool operator()(char c)    const {return c == api::env_seperator<char>   ();}
         } s;
         boost::split(data, _data, s);
-        return data;
+        return std::move(data);
     }
     string_type to_string()              const
     {
@@ -263,9 +263,7 @@ public:
         auto st1 = key + ::boost::process::detail::equal_sign<Char>();
         while (*p != nullptr)
         {
-            const int len = std::char_traits<Char>::length(*p);
-            if ((std::distance(st1.begin(), st1.end()) < len)
-                 && std::equal(st1.begin(), st1.end(), *p))
+            if (std::equal(st1.begin(), st1.end(), *p))
                 break;
             p++;
         }
@@ -277,9 +275,7 @@ public:
         auto st1 = key + ::boost::process::detail::equal_sign<Char>();
         while (*p != nullptr)
         {
-            const int len = std::char_traits<Char>::length(*p);
-            if ((std::distance(st1.begin(), st1.end()) < len)
-                && std::equal(st1.begin(), st1.end(), *p))
+            if (std::equal(st1.begin(), st1.end(), *p))
                 break;
             p++;
         }
@@ -292,9 +288,7 @@ public:
         auto st1 = st + ::boost::process::detail::equal_sign<Char>();
         while (*p != nullptr)
         {
-            const int len = std::char_traits<Char>::length(*p);
-            if ((std::distance(st1.begin(), st1.end()) < len)
-                && std::equal(st1.begin(), st1.end(), *p))
+            if (std::equal(st1.begin(), st1.end(), *p))
                 return 1u;
             p++;
         }
@@ -678,16 +672,16 @@ inline native_environment   environment() { return ::boost::process:: native_env
 ///Get the enviroment of the current process.
 inline wnative_environment wenvironment() { return ::boost::process::wnative_environment(); }
 ///Get the path environment variable of the current process runs.
-inline std::vector<boost::process::filesystem::path> path()
+inline std::vector<boost::filesystem::path> path()
 {
 #if defined(BOOST_WINDOWS_API)
     const ::boost::process::wnative_environment ne{};
     typedef typename ::boost::process::wnative_environment::const_entry_type value_type;
-    static constexpr auto id = L"PATH";
+    const auto id = L"PATH";
 #else
     const ::boost::process::native_environment ne{};
     typedef typename ::boost::process::native_environment::const_entry_type value_type;
-    static constexpr auto id = "PATH";
+    const auto id = "PATH";
 #endif
 
     auto itr = std::find_if(ne.cbegin(), ne.cend(),
@@ -699,7 +693,7 @@ inline std::vector<boost::process::filesystem::path> path()
 
     auto vec = itr->to_vector();
 
-    std::vector<boost::process::filesystem::path> val;
+    std::vector<boost::filesystem::path> val;
     val.resize(vec.size());
 
     std::copy(vec.begin(), vec.end(), val.begin());

include/boost/process/error.hpp

@@ -59,7 +59,7 @@ namespace detail {
 
 struct throw_on_error_ : ::boost::process::detail::api::handler_base_ext
 {
-    constexpr throw_on_error_() = default;
+    constexpr throw_on_error_() {};
 
     template <class Executor>
     void on_error(Executor&, const std::error_code & ec) const
@@ -72,7 +72,7 @@ struct throw_on_error_ : ::boost::process::detail::api::handler_base_ext
 
 struct ignore_error_ : ::boost::process::detail::api::handler_base_ext
 {
-    constexpr ignore_error_() = default;
+    constexpr ignore_error_() {};
 };
 
 struct set_on_error : ::boost::process::detail::api::handler_base_ext
@@ -81,7 +81,7 @@ struct set_on_error : ::boost::process::detail::api::handler_base_ext
     explicit set_on_error(std::error_code &ec) : ec_(ec) {}
 
     template <class Executor>
-    void on_error(Executor&, const std::error_code & ec) const noexcept
+    void on_error(Executor&, const std::error_code & ec) const
     {
         ec_ = ec;
     }
@@ -92,7 +92,7 @@ private:
 
 struct error_
 {
-    constexpr error_() = default;
+    constexpr error_() {}
     set_on_error operator()(std::error_code &ec) const {return set_on_error(ec);}
     set_on_error operator= (std::error_code &ec) const {return set_on_error(ec);}
 

include/boost/process/exe.hpp

@@ -36,15 +36,15 @@ namespace detail {
 struct exe_
 {
     template<typename = void>
-    inline exe_setter_<typename boost::process::filesystem::path::value_type> operator()(const boost::process::filesystem::path & pth) const
+    inline exe_setter_<typename boost::filesystem::path::value_type> operator()(const boost::filesystem::path & pth) const
     {
-        return exe_setter_<typename boost::process::filesystem::path::value_type>(pth.native());
+        return exe_setter_<typename boost::filesystem::path::value_type>(pth.native());
     }
 
     template<typename = void>
-    inline exe_setter_<typename boost::process::filesystem::path::value_type> operator=(const boost::process::filesystem::path & pth) const
+    inline exe_setter_<typename boost::filesystem::path::value_type> operator=(const boost::filesystem::path & pth) const
     {
-        return exe_setter_<typename boost::process::filesystem::path::value_type>(pth.native());
+        return exe_setter_<typename boost::filesystem::path::value_type>(pth.native());
     }
 
 
@@ -79,7 +79,7 @@ The overload form applies when to the first, when several strings are passed to
 function.
 
 The following expressions are valid, with `value` being either a C-String or
-a `std::basic_string` with `char` or `wchar_t` or a `boost::process::filesystem::path`.
+a `std::basic_string` with `char` or `wchar_t` or a `boost::filesystem::path`.
 
 \code{.cpp}
 exe="value";