Move piping stream lines to the log to common

src/plugin/host-process.cpp

@@ -61,28 +61,8 @@ HostProcess::HostProcess(boost::asio::io_context& io_context, Logger& logger)
     // Print the Wine host's STDOUT and STDERR streams to the log file. This
     // should be done before trying to accept the sockets as otherwise we will
     // miss all output.
-    async_log_pipe_lines(stdout_pipe, stdout_buffer, "[Wine STDOUT] ");
-    async_log_pipe_lines(stderr_pipe, stderr_buffer, "[Wine STDERR] ");
-}
-
-void HostProcess::async_log_pipe_lines(patched_async_pipe& pipe,
-                                       boost::asio::streambuf& buffer,
-                                       std::string prefix) {
-    boost::asio::async_read_until(
-        pipe, buffer, '\n',
-        [&, prefix](const boost::system::error_code& error, size_t) {
-            // When we get an error code then that likely means that the pipe
-            // has been clsoed and we have reached the end of the file
-            if (error.failed()) {
-                return;
-            }
-
-            std::string line;
-            std::getline(std::istream(&buffer), line);
-            logger.log(prefix + line);
-
-            async_log_pipe_lines(pipe, buffer, prefix);
-        });
+    logger.async_log_pipe_lines(stdout_pipe, stdout_buffer, "[Wine STDOUT] ");
+    logger.async_log_pipe_lines(stderr_pipe, stderr_buffer, "[Wine STDERR] ");
 }
 
 IndividualHost::IndividualHost(boost::asio::io_context& io_context,

src/plugin/host-process.h

@@ -81,18 +81,6 @@ class HostProcess {
     patched_async_pipe stderr_pipe;
 
    private:
-    /**
-     * Write output from an async pipe to the log on a line by line basis.
-     * Useful for logging the Wine process's STDOUT and STDERR streams.
-     *
-     * @param pipe The pipe to read from.
-     * @param buffer The stream buffer to write to.
-     * @param prefix Text to prepend to the line before writing to the log.
-     */
-    void async_log_pipe_lines(patched_async_pipe& pipe,
-                              boost::asio::streambuf& buffer,
-                              std::string prefix = "");
-
     /**
      * The logger the Wine output will be written to.
      */

src/plugin/utils.h

@@ -18,29 +18,11 @@
 
 #include <variant>
 
-#include <boost/process/async_pipe.hpp>
 #include <boost/process/environment.hpp>
 
 #include "../common/configuration.h"
 #include "../common/plugins.h"
 
-/**
- * Boost 1.72 was released with a known breaking bug caused by a missing
- * typedef: https://github.com/boostorg/process/issues/116.
- *
- * Luckily this is easy to fix since it's not really possible to downgrade Boost
- * as it would break other applications.
- *
- * Check if this is still needed for other distros after Arch starts packaging
- * Boost 1.73.
- */
-class patched_async_pipe : public boost::process::async_pipe {
-   public:
-    using boost::process::async_pipe::async_pipe;
-
-    typedef typename handle_type::executor_type executor_type;
-};
-
 /**
  * Marker struct for when we use the default Wine prefix.
  */