Merge #3271

3271: [sftp] Remove sshfs append workaround r=townsend2010 a=sharder996 Fixes #3129 Co-authored-by: sharder996 <[email protected]>
canonical · Oct 31, 2023 · 642f5d9 · 642f5d9
2 parents 7e4dc40 + dfeb421
commit 642f5d9
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 17 deletions.
diff --git a/src/ssh/ssh_process.cpp b/src/ssh/ssh_process.cpp
@@ -114,13 +114,19 @@ std::string mp::SSHProcess::read_std_error()
 
 std::string mp::SSHProcess::read_stream(StreamType type, int timeout)
 {
-    mpl::log(mpl::Level::debug, category,
-             fmt::format("{}:{} {}(type = {}, timeout = {}): ", __FILE__, __LINE__, __FUNCTION__,
-                         static_cast<int>(type), timeout));
+    mpl::log(mpl::Level::trace,
+             category,
+             fmt::format("{}:{} {}(type = {}, timeout = {}): ",
+                         __FILE__,
+                         __LINE__,
+                         __FUNCTION__,
+                         static_cast<int>(type),
+                         timeout));
     // If the channel is closed there's no output to read
     if (ssh_channel_is_closed(channel.get()))
     {
-        mpl::log(mpl::Level::debug, category,
+        mpl::log(mpl::Level::trace,
+                 category,
                  fmt::format("{}:{} {}(): channel closed", __FILE__, __LINE__, __FUNCTION__));
         return std::string();
     }
@@ -132,14 +138,16 @@ std::string mp::SSHProcess::read_stream(StreamType type, int timeout)
     do
     {
         num_bytes = ssh_channel_read_timeout(channel.get(), buffer.data(), buffer.size(), is_std_err, timeout);
-        mpl::log(mpl::Level::debug, category,
+        mpl::log(mpl::Level::trace,
+                 category,
                  fmt::format("{}:{} {}(): num_bytes = {}", __FILE__, __LINE__, __FUNCTION__, num_bytes));
         if (num_bytes < 0)
         {
             // Latest libssh now returns an error if the channel has been closed instead of returning 0 bytes
             if (ssh_channel_is_closed(channel.get()))
             {
-                mpl::log(mpl::Level::debug, category,
+                mpl::log(mpl::Level::trace,
+                         category,
                          fmt::format("{}:{} {}(): channel closed", __FILE__, __LINE__, __FUNCTION__));
                 return output.str();
             }

diff --git a/src/sshfs_mount/sftp_server.cpp b/src/sshfs_mount/sftp_server.cpp
@@ -581,19 +581,8 @@ int mp::SftpServer::handle_open(sftp_client_message msg)
         mode |= QIODevice::ReadOnly;
 
     if (flags & SSH_FXF_WRITE)
-    {
         mode |= QIODevice::WriteOnly;
 
-        // This is needed to workaround an issue where sshfs does not pass through
-        // O_APPEND.  This is fixed in sshfs v. 3.2.
-        // Note: This goes against the default behavior of open().
-        if (flags == SSH_FXF_WRITE)
-        {
-            mode |= QIODevice::Append;
-            mpl::log(mpl::Level::info, category, "adding sshfs O_APPEND workaround");
-        }
-    }
-
     if (flags & SSH_FXF_APPEND)
         mode |= QIODevice::Append;