projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix config.xml corruption when it contains multi-byte UTF8 characters.
[dcpomatic.git]
/
src
/
lib
/
scp_uploader.cc
diff --git
a/src/lib/scp_uploader.cc
b/src/lib/scp_uploader.cc
index 18ace439bab012ba5eba2b67b4a4d2f49393a84c..0926ffa9f794bf22353cbce13f6ee998b7c239a3 100644
(file)
--- a/
src/lib/scp_uploader.cc
+++ b/
src/lib/scp_uploader.cc
@@
-1,19
+1,20
@@
/*
Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
@@
-23,13
+24,14
@@
#include "config.h"
#include "cross.h"
#include "compose.hpp"
#include "config.h"
#include "cross.h"
#include "compose.hpp"
+#include "warnings.h"
#include <sys/stat.h>
#include "i18n.h"
using std::string;
using std::min;
#include <sys/stat.h>
#include "i18n.h"
using std::string;
using std::min;
-using
boost
::shared_ptr;
+using
std
::shared_ptr;
using boost::function;
SCPUploader::SCPUploader (function<void (string)> set_status, function<void (float)> set_progress)
using boost::function;
SCPUploader::SCPUploader (function<void (string)> set_status, function<void (float)> set_progress)
@@
-50,10
+52,12
@@
SCPUploader::SCPUploader (function<void (string)> set_status, function<void (flo
throw NetworkError (String::compose (_("Could not connect to server %1 (%2)"), Config::instance()->tms_ip(), ssh_get_error (_session)));
}
throw NetworkError (String::compose (_("Could not connect to server %1 (%2)"), Config::instance()->tms_ip(), ssh_get_error (_session)));
}
+DCPOMATIC_DISABLE_WARNINGS
r = ssh_is_server_known (_session);
if (r == SSH_SERVER_ERROR) {
throw NetworkError (String::compose (_("SSH error (%1)"), ssh_get_error (_session)));
}
r = ssh_is_server_known (_session);
if (r == SSH_SERVER_ERROR) {
throw NetworkError (String::compose (_("SSH error (%1)"), ssh_get_error (_session)));
}
+DCPOMATIC_ENABLE_WARNINGS
r = ssh_userauth_password (_session, 0, Config::instance()->tms_password().c_str ());
if (r != SSH_AUTH_SUCCESS) {
r = ssh_userauth_password (_session, 0, Config::instance()->tms_password().c_str ());
if (r != SSH_AUTH_SUCCESS) {
@@
-81,7
+85,8
@@
SCPUploader::~SCPUploader ()
void
SCPUploader::create_directory (boost::filesystem::path directory)
{
void
SCPUploader::create_directory (boost::filesystem::path directory)
{
- int const r = ssh_scp_push_directory (_scp, directory.string().c_str(), S_IRWXU);
+ /* Use generic_string so that we get forward-slashes in the path, even on Windows */
+ int const r = ssh_scp_push_directory (_scp, directory.generic_string().c_str(), S_IRWXU);
if (r != SSH_OK) {
throw NetworkError (String::compose (_("Could not create remote directory %1 (%2)"), directory, ssh_get_error (_session)));
}
if (r != SSH_OK) {
throw NetworkError (String::compose (_("Could not create remote directory %1 (%2)"), directory, ssh_get_error (_session)));
}
@@
-91,7
+96,8
@@
void
SCPUploader::upload_file (boost::filesystem::path from, boost::filesystem::path to, boost::uintmax_t& transferred, boost::uintmax_t total_size)
{
boost::uintmax_t to_do = boost::filesystem::file_size (from);
SCPUploader::upload_file (boost::filesystem::path from, boost::filesystem::path to, boost::uintmax_t& transferred, boost::uintmax_t total_size)
{
boost::uintmax_t to_do = boost::filesystem::file_size (from);
- ssh_scp_push_file (_scp, to.string().c_str(), to_do, S_IRUSR | S_IWUSR);
+ /* Use generic_string so that we get forward-slashes in the path, even on Windows */
+ ssh_scp_push_file (_scp, to.generic_string().c_str(), to_do, S_IRUSR | S_IWUSR);
FILE* f = fopen_boost (from, "rb");
if (f == 0) {
FILE* f = fopen_boost (from, "rb");
if (f == 0) {