No-op; fix GPL address and use the explicit-program-name version.

[dcpomatic.git] / src / lib / scp_uploader.cc

diff --git a/src/lib/scp_uploader.cc b/src/lib/scp_uploader.cc
index 7fb716813dc45f02a0ebf6c32947167f55d7c2a2..d6fa67592b35a3e1a3195105afa7116380bef892 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>
 
-    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.
 
-    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
-    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,6 +24,7 @@
 #include "config.h"
 #include "cross.h"
 #include "compose.hpp"
+#include <sys/stat.h>
 
 #include "i18n.h"
 
@@ -39,8 +41,6 @@ SCPUploader::SCPUploader (function<void (string)> set_status, function<void (flo
                throw NetworkError (_("could not start SSH session"));
        }
 
-       _set_status (_("connecting"));
-
        ssh_options_set (_session, SSH_OPTIONS_HOST, Config::instance()->tms_ip().c_str ());
        ssh_options_set (_session, SSH_OPTIONS_USER, Config::instance()->tms_user().c_str ());
        int const port = 22;
@@ -82,7 +82,8 @@ SCPUploader::~SCPUploader ()
 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)));
        }
@@ -91,10 +92,9 @@ SCPUploader::create_directory (boost::filesystem::path directory)
 void
 SCPUploader::upload_file (boost::filesystem::path from, boost::filesystem::path to, boost::uintmax_t& transferred, boost::uintmax_t total_size)
 {
-       _set_status (String::compose (_("copying %1"), from.leaf ()));
-
        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) {