[sftp] Fix output format strings.

Forced by changes in libfmt.

Author: luis4a0

Diff for: src/ssh/sftp_client.cpp

@@ -188,7 +188,8 @@ bool SFTPClient::push_dir(const fs::path& source_path, const fs::path& target_pa
             {
                 if (sftp_mkdir(sftp.get(), remote_file_path.u8string().c_str(), 0777) != SSH_OK &&
                     sftp_get_error(sftp.get()) != SSH_FX_FILE_ALREADY_EXISTS)
-                    throw SFTPError{"cannot create remote directory {}: {}", remote_file_path,
+                    throw SFTPError{"cannot create remote directory \"{}\": {}",
+                                    remote_file_path,
                                     ssh_get_error(sftp->session)};
 
                 subdirectory_perms.emplace_back(remote_file_path, status.permissions());
@@ -202,13 +203,14 @@ bool SFTPClient::push_dir(const fs::path& source_path, const fs::path& target_pa
 
                 auto remote_file_info = mp_sftp_lstat(sftp.get(), remote_file_path.u8string().c_str());
                 if (remote_file_info && remote_file_info->type == SSH_FILEXFER_TYPE_DIRECTORY)
-                    throw SFTPError{"cannot overwrite remote directory {} with non-directory", remote_file_path};
+                    throw SFTPError{"cannot overwrite remote directory \"{}\" with non-directory", remote_file_path};
 
                 if ((sftp_unlink(sftp.get(), remote_file_path.u8string().c_str()) != SSH_FX_OK &&
                      sftp_get_error(sftp.get()) != SSH_FX_NO_SUCH_FILE) ||
                     sftp_symlink(sftp.get(), link_target.u8string().c_str(), remote_file_path.u8string().c_str()) !=
                         SSH_FX_OK)
-                    throw SFTPError{"cannot create remote symlink {}: {}", remote_file_path,
+                    throw SFTPError{"cannot create remote symlink \"{}\": {}",
+                                    remote_file_path,
                                     ssh_get_error(sftp->session)};
                 break;
             }
@@ -228,9 +230,11 @@ bool SFTPClient::push_dir(const fs::path& source_path, const fs::path& target_pa
         const auto& [path, perms] = *it;
         if (sftp_chmod(sftp.get(), path.u8string().c_str(), static_cast<mode_t>(perms)) != SSH_FX_OK)
         {
-            mpl::log(
-                mpl::Level::error, log_category,
-                fmt::format("cannot set permissions for remote directory {}: {}", path, ssh_get_error(sftp->session)));
+            mpl::log(mpl::Level::error,
+                     log_category,
+                     fmt::format("cannot set permissions for remote directory \"{}\": {}",
+                                 path,
+                                 ssh_get_error(sftp->session)));
             success = false;
         }
     }

Diff for: src/ssh/sftp_utils.cpp

@@ -79,7 +79,7 @@ fs::path SFTPUtils::get_remote_file_target(sftp_session sftp, const fs::path& so
     target_full_path += source_path.filename().u8string().insert(0, "/");
     target_attr = mp_sftp_stat(sftp, target_full_path.u8string().c_str());
     if (target_attr && target_attr->type == SSH_FILEXFER_TYPE_DIRECTORY)
-        throw SFTPError{"cannot overwrite remote directory {} with non-directory", target_full_path};
+        throw SFTPError{"cannot overwrite remote directory \"{}\" with non-directory", target_full_path};
 
     return target_full_path;
 }
@@ -121,25 +121,25 @@ fs::path SFTPUtils::get_remote_dir_target(sftp_session sftp, const fs::path& sou
     auto target_info = mp_sftp_stat(sftp, target_path_string.c_str());
 
     if (target_info && target_info->type != SSH_FILEXFER_TYPE_DIRECTORY)
-        throw SFTPError{"cannot overwrite remote non-directory {} with directory", target_path};
+        throw SFTPError{"cannot overwrite remote non-directory \"{}\" with directory", target_path};
 
     if (!target_info)
     {
         if (make_parent)
             mkdir_recursive(sftp, target_path);
         else if (sftp_mkdir(sftp, target_path_string.c_str(), 0777) != SSH_FX_OK)
-            throw SFTPError{"cannot create remote directory {}: {}", target_path, ssh_get_error(sftp->session)};
+            throw SFTPError{"cannot create remote directory \"{}\": {}", target_path, ssh_get_error(sftp->session)};
         return target_path;
     }
 
     fs::path child_path = target_path_string + '/' + source_path.filename().u8string();
     auto child_path_string = child_path.u8string();
     auto child_info = mp_sftp_stat(sftp, child_path_string.c_str());
     if (child_info && child_info->type != SSH_FILEXFER_TYPE_DIRECTORY)
-        throw SFTPError{"cannot overwrite remote non-directory {} with directory", child_path};
+        throw SFTPError{"cannot overwrite remote non-directory \"{}\" with directory", child_path};
 
     if (!child_info && sftp_mkdir(sftp, child_path_string.c_str(), 0777) != SSH_FX_OK)
-        throw SFTPError{"cannot create remote directory {}: {}", child_path, ssh_get_error(sftp->session)};
+        throw SFTPError{"cannot create remote directory \"{}\": {}", child_path, ssh_get_error(sftp->session)};
 
     return child_path;
 }
@@ -154,9 +154,9 @@ void SFTPUtils::mkdir_recursive(sftp_session sftp, const fs::path& path)
     for (const auto& partial_path : partial_paths)
         if (auto attr = mp_sftp_lstat(sftp, partial_path.u8string().c_str());
             attr && attr->type != SSH_FILEXFER_TYPE_DIRECTORY)
-            throw SFTPError{"cannot overwrite remote non-directory {} with directory", partial_path};
+            throw SFTPError{"cannot overwrite remote non-directory \"{}\" with directory", partial_path};
         else if (!attr && sftp_mkdir(sftp, partial_path.u8string().c_str(), 0777) != SSH_FX_OK)
-            throw SFTPError{"cannot create remote directory {}: {}", partial_path, ssh_get_error(sftp->session)};
+            throw SFTPError{"cannot create remote directory \"{}\": {}", partial_path, ssh_get_error(sftp->session)};
 }
 
 std::unique_ptr<SFTPClient> SFTPUtils::make_SFTPClient(const std::string& host, int port, const std::string& username,