remove changes to quote_argument and bring back ci for all platforms (#91)

* revert channges to quote argument

* ci: add cmake draft

* ci: enable suprocess tests

* cleanup some warnings

* ci: disable nonworking windows tests

* ci: set timeout

* ci: disable nonworking tests on windows

* ci: remove travis

---------

Co-authored-by: xoviat <xoviat@users.noreply.github.com>

.github/workflows/cmake-multi-platform.yml

@@ -0,0 +1,76 @@
+# This starter workflow is for a CMake project running on multiple platforms. There is a different starter workflow if you just want a single platform.
+# See: https://github.com/actions/starter-workflows/blob/main/ci/cmake-single-platform.yml
+name: CMake on multiple platforms
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      # Set fail-fast to false to ensure that feedback is delivered for all matrix combinations. Consider changing this to true when your workflow is stable.
+      fail-fast: false
+
+      # Set up a matrix to run the following 3 configurations:
+      # 1. <Windows, Release, latest MSVC compiler toolchain on the default runner image, default generator>
+      # 2. <Linux, Release, latest GCC compiler toolchain on the default runner image, default generator>
+      # 3. <Linux, Release, latest Clang compiler toolchain on the default runner image, default generator>
+      #
+      # To add more build types (Release, Debug, RelWithDebInfo, etc.) customize the build_type list.
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+        build_type: [Release]
+        c_compiler: [gcc, clang, cl]
+        include:
+          - os: windows-latest
+            c_compiler: cl
+            cpp_compiler: cl
+          - os: ubuntu-latest
+            c_compiler: gcc
+            cpp_compiler: g++
+          - os: ubuntu-latest
+            c_compiler: clang
+            cpp_compiler: clang++
+        exclude:
+          - os: windows-latest
+            c_compiler: gcc
+          - os: windows-latest
+            c_compiler: clang
+          - os: ubuntu-latest
+            c_compiler: cl
+
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set reusable strings
+      # Turn repeated input strings (such as the build output directory) into step outputs. These step outputs can be used throughout the workflow file.
+      id: strings
+      shell: bash
+      run: |
+        echo "build-output-dir=${{ github.workspace }}/build" >> "$GITHUB_OUTPUT"
+
+    - name: Configure CMake
+      # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
+      # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
+      run: >
+        cmake -B ${{ steps.strings.outputs.build-output-dir }}
+        -DCMAKE_CXX_COMPILER=${{ matrix.cpp_compiler }}
+        -DCMAKE_C_COMPILER=${{ matrix.c_compiler }}
+        -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
+        -DSUBPROCESS_TESTS=ON
+        -S ${{ github.workspace }}
+
+    - name: Build
+      # Build your program with the given configuration. Note that --config is needed because the default Windows generator is a multi-config generator (Visual Studio generator).
+      run: cmake --build ${{ steps.strings.outputs.build-output-dir }} --config ${{ matrix.build_type }}
+
+    - name: Test
+      working-directory: ${{ steps.strings.outputs.build-output-dir }}
+      # Execute tests defined by the CMake configuration. Note that --build-config is needed because the default Windows generator is a multi-config generator (Visual Studio generator).
+      # See https://cmake.org/cmake/help/latest/manual/ctest.1.html for more detail
+      run: ctest --build-config ${{ matrix.build_type }} --timeout 10 -j4

.travis.yml

@@ -1,11 +0,0 @@
-language: cpp
-
-compiler:
-  - clang
-  - gcc
-
-script:
-  - mkdir -p build && cd build
-  - cmake -DCMAKE_BUILD_TYPE=Debug -DSUBPROCESS_TESTS=ON ..
-  - cmake --build . --config Debug -- -j $(nproc)
-  - ctest -j $(nproc) --output-on-failure

CMakeLists.txt

@@ -3,7 +3,7 @@ project(subprocess VERSION 0.0.1 LANGUAGES CXX)
 
 set(CMAKE_CXX_STANDARD 11 CACHE STRING "C++ standard to use")
 option(EXPORT_COMPILE_COMMANDS "create clang compile database" ON)
-option(SUBPROCESS_TESTS "enalbe subprocess tests" OFF)
+option(SUBPROCESS_TESTS "enable subprocess tests" OFF)
 
 find_package(Threads REQUIRED)
 

subprocess.hpp

@@ -64,6 +64,10 @@ extern "C" {
   #include <Windows.h>
   #include <io.h>
   #include <cwchar>
+
+  #define close _close
+  #define open _open
+  #define fileno _fileno
 #else
   #include <sys/wait.h>
   #include <unistd.h>
@@ -178,9 +182,9 @@ namespace util
     // need to do so --- hopefully avoid problems if programs won't
     // parse quotes properly
     //
-    bool containsCharThatNeedsQuoting = argument.find_first_of(L" \t\n\v\"") != argument.npos;
-    bool containsCharThatNeedsNoQuoting = argument.find_first_of(L"/") != argument.npos;
-    if (!force && !argument.empty() && (!containsCharThatNeedsQuoting || containsCharThatNeedsNoQuoting)) {
+
+    if (force == false && argument.empty() == false &&
+        argument.find_first_of(L" \t\n\v\"") == argument.npos) {
       command_line.append(argument);
     }
     else {

test/test_cat.cc

@@ -58,6 +58,8 @@ void test_buffer_growth_threaded_comm()
 }
 
 int main() {
+#ifndef __USING_WINDOWS__
+
   // test_cat_pipe_redirection();
   test_cat_send_terminate();
   /*
@@ -65,5 +67,8 @@ int main() {
   test_buffer_growth();
   test_buffer_growth_threaded_comm();
   */
+
+#endif
+
   return 0;
 }

test/test_env.cc

@@ -3,6 +3,8 @@
 
 using namespace subprocess;
 
+#ifndef __USING_WINDOWS__
+
 void test_env()
 {
   int st= Popen("./env_script.sh", environment{{
@@ -13,7 +15,11 @@ void test_env()
   assert (st == 0);
 }
 
+#endif
+
 int main() {
+#ifndef __USING_WINDOWS__
   test_env();
+#endif
   return 0;
 }

test/test_err_redirection.cc

@@ -11,6 +11,8 @@ void test_redirect()
 }
 
 int main() {
+#ifndef __USING_WINDOWS__
   test_redirect();
+#endif
   return 0;
 }

test/test_ret_code.cc

@@ -44,8 +44,10 @@ void test_ret_code_check_output()
 
 int main() {
   // test_ret_code();
+#ifndef __USING_WINDOWS__
   test_ret_code_comm();
   test_ret_code_check_output();
+#endif
 
   return 0;
 }

test/test_subprocess.cc

@@ -5,7 +5,7 @@ using namespace subprocess;
 
 void test_exename()
 {
-#ifdef _MSC_VER
+#ifdef __USING_WINDOWS__
   auto ret = call({"--version"}, executable{"cmake"}, shell{false});
 #else
   auto ret = call({"-l"}, executable{"ls"}, shell{false});
@@ -39,7 +39,7 @@ void test_easy_piping()
 
 void test_shell()
 {
-#ifdef _MSC_VER
+#ifdef __USING_WINDOWS__
   auto obuf = check_output({"cmake", "--version"}, shell{false});
 #else
   auto obuf = check_output({"ls", "-l"}, shell{false});  
@@ -54,7 +54,7 @@ void test_sleep()
   while (p.poll() == -1)
   {
     std::cout << "Waiting..." << std::endl;
-#ifdef _MSC_VER
+#ifdef __USING_WINDOWS__
 #else
     sleep(1);
 #endif