octave: liboctave/util/url-transfer.cc annotate

annotate liboctave/util/url-transfer.cc @ 27956:2310164737b3 stable

fix many spelling errors (bug #57613)

author	John W. Eaton <jwe@octave.org>
date	Fri, 17 Jan 2020 13:15:27 -0600
parents	00f796120a6d
children	c20b7290c778

rev	line source
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	1 /*
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	2
26376 00f796120a6d maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 25688 diff changeset	3 Copyright (C) 2013-2019 John W. Eaton
00f796120a6d maint: Update copyright dates in all source files. John W. Eaton <jwe@octave.org> parents: 25688 diff changeset	4 Copyright (C) 2006-2019 Alexander Barth
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	5 Copyright (C) 2009 David Bateman
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	6
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	7 This file is part of Octave.
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	8
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23807 diff changeset	9 Octave is free software: you can redistribute it and/or modify it
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22402 diff changeset	10 under the terms of the GNU General Public License as published by
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23807 diff changeset	11 the Free Software Foundation, either version 3 of the License, or
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22402 diff changeset	12 (at your option) any later version.
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	13
22755 3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22402 diff changeset	14 Octave is distributed in the hope that it will be useful, but
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22402 diff changeset	15 WITHOUT ANY WARRANTY; without even the implied warranty of
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22402 diff changeset	16 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
3a2b891d0b33 maint: Standardize Copyright formatting. Rik <rik@octave.org> parents: 22402 diff changeset	17 GNU General Public License for more details.
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	18
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	19 You should have received a copy of the GNU General Public License
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	20 along with Octave; see the file COPYING. If not, see
24534 194eb4bd202b maint: Update punctuation for GPL v3 license text. Rik <rik@octave.org> parents: 23807 diff changeset	21 <https://www.gnu.org/licenses/>.
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	22
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	23 */
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	24
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	25 // Author: Alexander Barth <abarth@marine.usf.edu>
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	26 // Author: jwe
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	27
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	28 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21202 diff changeset	29 # include "config.h"
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	30 #endif
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	31
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	32 #include <fstream>
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	33 #include <iomanip>
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	34 #include <iostream>
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	35
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	36 #include "dir-ops.h"
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	37 #include "file-ops.h"
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	38 #include "file-stat.h"
25516 8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	39 #include "lo-sysdep.h"
25281 35115cc6183b allow users to set path to CA certificates for cURL John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	40 #include "oct-env.h"
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	41 #include "unwind-prot.h"
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	42 #include "url-transfer.h"
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	43
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	44 #if defined (HAVE_CURL)
21202 f7121e111991 maint: indent #ifdef blocks in liboctave and src directories. Rik <rik@octave.org> parents: 20955 diff changeset	45 # include <curl/curl.h>
f7121e111991 maint: indent #ifdef blocks in liboctave and src directories. Rik <rik@octave.org> parents: 20955 diff changeset	46 # include <curl/curlver.h>
f7121e111991 maint: indent #ifdef blocks in liboctave and src directories. Rik <rik@octave.org> parents: 20955 diff changeset	47 # include <curl/easy.h>
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	48 #endif
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	49
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	50 namespace octave
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	51 {
25438 cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25281 diff changeset	52 base_url_transfer::base_url_transfer (void)
cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25281 diff changeset	53 : host_or_url (), valid (false), ftp (false),
cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25281 diff changeset	54 ascii_mode (false), ok (true), errmsg (),
cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25281 diff changeset	55 curr_istream (&std::cin), curr_ostream (&std::cout) { }
cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25281 diff changeset	56
cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25281 diff changeset	57 base_url_transfer::base_url_transfer (const std::string& host,
cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25281 diff changeset	58 const std::string& /* user_arg */,
cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25281 diff changeset	59 const std::string& /* passwd */,
cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25281 diff changeset	60 std::ostream& os)
cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25281 diff changeset	61 : host_or_url (host), valid (false), ftp (true),
cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25281 diff changeset	62 ascii_mode (false), ok (true), errmsg (), curr_istream (&std::cin),
cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25281 diff changeset	63 curr_ostream (&os) { }
cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25281 diff changeset	64
cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25281 diff changeset	65 base_url_transfer::base_url_transfer (const std::string& url,
cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25281 diff changeset	66 std::ostream& os)
cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25281 diff changeset	67 : host_or_url (url), valid (false), ftp (false),
cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25281 diff changeset	68 ascii_mode (false), ok (true), errmsg (),
cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25281 diff changeset	69 curr_istream (&std::cin), curr_ostream (&os) { }
cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25281 diff changeset	70
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	71 void
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	72 base_url_transfer::delete_file (const std::string& file)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	73 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	74 sys::unlink (file);
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	75 }
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	76
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	77 void
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	78 base_url_transfer::mget_directory (const std::string& directory,
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	79 const std::string& target)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	80 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	81 std::string sep = sys::file_ops::dir_sep_str ();
08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	82 sys::file_stat fs (directory);
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	83
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	84 if (! fs \|\| ! fs.is_dir ())
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	85 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	86 std::string msg;
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	87 int status = sys::mkdir (directory, 0777, msg);
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	88
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	89 if (status < 0)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	90 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	91 ok = false;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	92 errmsg = "__ftp_mget__: can not create directory '"
22402 4caa7b28d183 maint: Style check C++ code in liboctave/ Rik <rik@octave.org> parents: 22323 diff changeset	93 + target + sep + directory + "': " + msg;
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	94 return;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	95 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	96 }
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	97
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	98 cwd (directory);
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	99
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	100 if (good ())
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	101 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	102 unwind_protect_safe frame;
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	103
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	104 frame.add_fcn (reset_path, this);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	105
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	106 string_vector sv = list ();
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	107
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	108 for (octave_idx_type i = 0; i < sv.numel (); i++)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	109 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	110 time_t ftime;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	111 bool fisdir;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	112 double fsize;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	113
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	114 get_fileinfo (sv(i), fsize, ftime, fisdir);
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	115
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	116 if (fisdir)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	117 mget_directory (sv(i), target + directory + sep);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	118 else
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	119 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	120 std::string realfile = target + directory + sep + sv(i);
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	121
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	122 std::ofstream ofile (realfile.c_str (),
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	123 std::ios::out \| std::ios::binary);
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	124
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	125 if (! ofile.is_open ())
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	126 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	127 ok = false;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	128 errmsg = "__ftp_mget__: unable to open file";
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	129 break;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	130 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	131
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	132 unwind_protect_safe frame2;
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	133
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	134 frame2.add_fcn (delete_file, realfile);
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	135
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	136 get (sv(i), ofile);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	137
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	138 ofile.close ();
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	139
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	140 if (good ())
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	141 frame2.discard ();
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	142 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	143
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	144 if (! good ())
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	145 break;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	146 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	147 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	148 }
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	149
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	150 string_vector
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	151 base_url_transfer::mput_directory (const std::string& base,
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	152 const std::string& directory)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	153 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	154 string_vector file_list;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	155
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	156 std::string realdir
21885 0806871e3e1e maint: Prefer is_empty() rather than "length () == 0". Rik <rik@octave.org> parents: 21751 diff changeset	157 = (base.empty ()
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	158 ? directory : base + sys::file_ops::dir_sep_str () + directory);
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	159
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	160 mkdir (directory);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	161
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	162 if (! good ())
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	163 return file_list;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	164
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	165 cwd (directory);
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	166
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	167 if (good ())
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	168 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	169 unwind_protect_safe frame;
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	170
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	171 frame.add_fcn (reset_path, this);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	172
25516 8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	173 string_vector files;
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	174 std::string msg;
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	175
25516 8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	176 if (sys::get_dirlist (realdir, files, msg))
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	177 for (octave_idx_type i = 0; i < files.numel (); i++)
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	178 {
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	179 std::string file = files (i);
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	180
25516 8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	181 if (file == "." \|\| file == "..")
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	182 continue;
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	183
25516 8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	184 std::string realfile = realdir + sys::file_ops::dir_sep_str () + file;
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	185 sys::file_stat fs (realfile);
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	186
25516 8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	187 if (! fs.exists ())
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	188 {
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	189 ok = false;
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	190 errmsg = "__ftp__mput: file '" + realfile
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	191 + "' does not exist";
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	192 break;
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	193 }
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	194
25516 8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	195 if (fs.is_dir ())
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	196 {
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	197 file_list.append (mput_directory (realdir, file));
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	198
25516 8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	199 if (! good ())
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	200 break;
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	201 }
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	202 else
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	203 {
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	204 // FIXME: Does ascii mode need to be flagged here?
25604 ca413f326224 Fix lifetime issues with temporary char arrays returned by get_ASCII_filename (bug #54299). Markus Mützel <markus.muetzel@gmx.de> parents: 25548 diff changeset	205 std::string ascii_fname
ca413f326224 Fix lifetime issues with temporary char arrays returned by get_ASCII_filename (bug #54299). Markus Mützel <markus.muetzel@gmx.de> parents: 25548 diff changeset	206 = octave::sys::get_ASCII_filename (realfile);
ca413f326224 Fix lifetime issues with temporary char arrays returned by get_ASCII_filename (bug #54299). Markus Mützel <markus.muetzel@gmx.de> parents: 25548 diff changeset	207
ca413f326224 Fix lifetime issues with temporary char arrays returned by get_ASCII_filename (bug #54299). Markus Mützel <markus.muetzel@gmx.de> parents: 25548 diff changeset	208 std::ifstream ifile (ascii_fname.c_str (),
ca413f326224 Fix lifetime issues with temporary char arrays returned by get_ASCII_filename (bug #54299). Markus Mützel <markus.muetzel@gmx.de> parents: 25548 diff changeset	209 std::ios::in \| std::ios::binary);
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	210
25516 8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	211 if (! ifile.is_open ())
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	212 {
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	213 ok = false;
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	214 errmsg = "__ftp_mput__: unable to open file '"
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	215 + realfile + "'";
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	216 break;
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	217 }
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	218
25516 8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	219 put (file, ifile);
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	220
25516 8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	221 ifile.close ();
17597 e5932e528721 * url-transfer.cc (base_url_transfer::mput_directory): Return file list. John W. Eaton <jwe@octave.org> parents: 17596 diff changeset	222
25516 8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	223 if (! good ())
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	224 break;
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	225
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	226 file_list.append (realfile);
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	227 }
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	228 }
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	229 else
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	230 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	231 ok = false;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	232 errmsg = "__ftp_mput__: can not read the directory '"
22402 4caa7b28d183 maint: Style check C++ code in liboctave/ Rik <rik@octave.org> parents: 22323 diff changeset	233 + realdir + "'";
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	234 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	235 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	236
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	237 return file_list;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	238 }
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	239
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	240 #if defined (HAVE_CURL)
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	241
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	242 static int
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	243 write_data (void buffer, size_t size, size_t nmemb, void streamp)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	244 {
23447 db1fdf4384dd maint: Use convention "static_cast<void >" for casting of pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	245 std::ostream& stream = (static_cast<std::ostream > (streamp));
db1fdf4384dd maint: Use convention "static_cast<void >" for casting of pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	246 stream.write (static_cast<const char > (buffer), sizenmemb);
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	247 return (stream.fail () ? 0 : size * nmemb);
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	248 }
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	249
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	250 static int
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	251 read_data (void buffer, size_t size, size_t nmemb, void streamp)
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	252 {
23447 db1fdf4384dd maint: Use convention "static_cast<void >" for casting of pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	253 std::istream& stream = (static_cast<std::istream > (streamp));
db1fdf4384dd maint: Use convention "static_cast<void >" for casting of pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	254 stream.read (static_cast<char > (buffer), sizenmemb);
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	255 if (stream.eof ())
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	256 return stream.gcount ();
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	257 else
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	258 return (stream.fail () ? 0 : size * nmemb);
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	259 }
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	260
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	261 static size_t
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	262 throw_away (void , size_t size, size_t nmemb, void )
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	263 {
25688 b2917b7858ba maint: Use Octave convention for spacing of C++ cast statements. Rik <rik@octave.org> parents: 25604 diff changeset	264 return static_cast<size_t> (size * nmemb);
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	265 }
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	266
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	267 // I'd love to rewrite this as a private method of the url_transfer
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	268 // class, but you can't pass the va_list from the wrapper SETOPT to
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	269 // the curl_easy_setopt function.
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	270 #define SETOPT(option, parameter) \
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	271 do \
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	272 { \
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	273 CURLcode res = curl_easy_setopt (curl, option, parameter); \
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	274 if (res != CURLE_OK) \
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	275 { \
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	276 ok = false; \
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	277 errmsg = curl_easy_strerror (res); \
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	278 return; \
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	279 } \
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	280 } \
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	281 while (0)
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	282
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	283 // Same as above but with a return value.
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	284 #define SETOPTR(option, parameter) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	285 do \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	286 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	287 CURLcode res = curl_easy_setopt (curl, option, parameter); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	288 if (res != CURLE_OK) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	289 { \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	290 ok = false; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	291 errmsg = curl_easy_strerror (res); \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	292 return retval; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	293 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	294 } \
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	295 while (0)
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	296
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	297 class curl_transfer : public base_url_transfer
17596 43b9181340fb separate object creation from http actions in url_transfer class John W. Eaton <jwe@octave.org> parents: 17595 diff changeset	298 {
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	299 public:
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	300
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	301 curl_transfer (void)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	302 : base_url_transfer (), curl (curl_easy_init ()), errnum (), url (),
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	303 userpwd ()
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	304 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	305 if (curl)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	306 valid = true;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	307 else
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	308 errmsg = "can not create curl object";
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	309 }
17596 43b9181340fb separate object creation from http actions in url_transfer class John W. Eaton <jwe@octave.org> parents: 17595 diff changeset	310
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	311 curl_transfer (const std::string& host, const std::string& user_arg,
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	312 const std::string& passwd, std::ostream& os)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	313 : base_url_transfer (host, user_arg, passwd, os),
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	314 curl (curl_easy_init ()), errnum (), url (), userpwd ()
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	315 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	316 if (curl)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	317 valid = true;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	318 else
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	319 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	320 errmsg = "can not create curl object";
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	321 return;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	322 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	323
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	324 init (user_arg, passwd, std::cin, os);
17596 43b9181340fb separate object creation from http actions in url_transfer class John W. Eaton <jwe@octave.org> parents: 17595 diff changeset	325
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	326 url = "ftp://" + host;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	327 SETOPT (CURLOPT_URL, url.c_str ());
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	328
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	329 // Set up the link, with no transfer.
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	330 perform ();
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	331 }
17596 43b9181340fb separate object creation from http actions in url_transfer class John W. Eaton <jwe@octave.org> parents: 17595 diff changeset	332
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	333 curl_transfer (const std::string& url_str, std::ostream& os)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	334 : base_url_transfer (url_str, os), curl (curl_easy_init ()), errnum (),
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	335 url (), userpwd ()
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	336 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	337 if (curl)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	338 valid = true;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	339 else
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	340 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	341 errmsg = "can not create curl object";
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	342 return;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	343 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	344
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	345 init ("", "", std::cin, os);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	346
25281 35115cc6183b allow users to set path to CA certificates for cURL John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	347 std::string cainfo = sys::env::getenv ("CURLOPT_CAINFO");
35115cc6183b allow users to set path to CA certificates for cURL John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	348 if (! cainfo.empty ())
35115cc6183b allow users to set path to CA certificates for cURL John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	349 SETOPT (CURLOPT_CAINFO, cainfo.c_str ());
35115cc6183b allow users to set path to CA certificates for cURL John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	350
35115cc6183b allow users to set path to CA certificates for cURL John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	351 std::string capath = sys::env::getenv ("CURLOPT_CAPATH");
35115cc6183b allow users to set path to CA certificates for cURL John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	352 if (! capath.empty ())
35115cc6183b allow users to set path to CA certificates for cURL John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	353 SETOPT (CURLOPT_CAPATH, capath.c_str ());
35115cc6183b allow users to set path to CA certificates for cURL John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	354
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	355 SETOPT (CURLOPT_NOBODY, 0);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	356
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	357 // Restore the default HTTP request method to GET after setting
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	358 // NOBODY to true (in the init method) and back to false (above).
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	359 // This is needed for backward compatibility with versions of
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	360 // libcurl < 7.18.2.
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	361 SETOPT (CURLOPT_HTTPGET, 1);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	362 }
17596 43b9181340fb separate object creation from http actions in url_transfer class John W. Eaton <jwe@octave.org> parents: 17595 diff changeset	363
22869 f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	364 // No copying!
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	365
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	366 curl_transfer (const curl_transfer&) = delete;
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	367
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	368 curl_transfer& operator = (const curl_transfer&) = delete;
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	369
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	370 ~curl_transfer (void)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	371 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	372 if (curl)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	373 curl_easy_cleanup (curl);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	374 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	375
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	376 void perform (void)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	377 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	378 BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	379
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	380 errnum = curl_easy_perform (curl);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	381
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	382 if (errnum != CURLE_OK)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	383 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	384 ok = false;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	385 errmsg = curl_easy_strerror (errnum);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	386 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	387
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	388 END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	389 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	390
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	391 std::string lasterror (void) const
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	392 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	393 return std::string (curl_easy_strerror (errnum));
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	394 }
17596 43b9181340fb separate object creation from http actions in url_transfer class John W. Eaton <jwe@octave.org> parents: 17595 diff changeset	395
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	396 std::ostream& set_ostream (std::ostream& os)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	397 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	398 std::ostream& retval = *curr_ostream;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	399 curr_ostream = &os;
23447 db1fdf4384dd maint: Use convention "static_cast<void >" for casting of pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	400 SETOPTR (CURLOPT_WRITEDATA, static_cast<void *> (curr_ostream));
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	401 return retval;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	402 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	403
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	404 std::istream& set_istream (std::istream& is)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	405 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	406 std::istream& retval = *curr_istream;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	407 curr_istream = &is;
23447 db1fdf4384dd maint: Use convention "static_cast<void >" for casting of pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	408 SETOPTR (CURLOPT_READDATA, static_cast<void *> (curr_istream));
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	409 return retval;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	410 }
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	411
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	412 void ascii (void)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	413 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	414 ascii_mode = true;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	415 SETOPT (CURLOPT_TRANSFERTEXT, 1);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	416 }
17601 9e507e30c9ea keep a copy of user+password data for older cURL libraries John W. Eaton <jwe@octave.org> parents: 17598 diff changeset	417
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	418 void binary (void)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	419 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	420 ascii_mode = false;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	421 SETOPT (CURLOPT_TRANSFERTEXT, 0);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	422 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	423
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	424 void cwd (const std::string& path)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	425 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	426 ftp_file_or_dir_action (path, "cwd");
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	427 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	428
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	429 void del (const std::string& file)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	430 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	431 ftp_file_or_dir_action (file, "dele");
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	432 }
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	433
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	434 void rmdir (const std::string& path)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	435 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	436 ftp_file_or_dir_action (path, "rmd");
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	437 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	438
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	439 void mkdir (const std::string& path)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	440 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	441 ftp_file_or_dir_action (path, "mkd");
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	442 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	443
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	444 void rename (const std::string& oldname, const std::string& newname)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	445 {
23457 21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23447 diff changeset	446 struct curl_slist *slist = nullptr;
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	447
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	448 unwind_protect frame;
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	449 frame.add_fcn (curl_slist_free_all, slist);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	450
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	451 std::string cmd = "rnfr " + oldname;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	452 slist = curl_slist_append (slist, cmd.c_str ());
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	453 cmd = "rnto " + newname;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	454 slist = curl_slist_append (slist, cmd.c_str ());
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	455 SETOPT (CURLOPT_POSTQUOTE, slist);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	456
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	457 perform ();
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	458 if (! good ())
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	459 return;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	460
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	461 SETOPT (CURLOPT_POSTQUOTE, 0);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	462 }
17601 9e507e30c9ea keep a copy of user+password data for older cURL libraries John W. Eaton <jwe@octave.org> parents: 17598 diff changeset	463
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	464 void put (const std::string& file, std::istream& is)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	465 {
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23696 diff changeset	466 url = "ftp://" + host_or_url + '/' + file;
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	467 SETOPT (CURLOPT_URL, url.c_str ());
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	468 SETOPT (CURLOPT_UPLOAD, 1);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	469 SETOPT (CURLOPT_NOBODY, 0);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	470 std::istream& old_is = set_istream (is);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	471
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	472 perform ();
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	473 if (! good ())
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	474 return;
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	475
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	476 set_istream (old_is);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	477 SETOPT (CURLOPT_NOBODY, 1);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	478 SETOPT (CURLOPT_UPLOAD, 0);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	479 url = "ftp://" + host_or_url;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	480 SETOPT (CURLOPT_URL, url.c_str ());
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	481 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	482
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	483 void get (const std::string& file, std::ostream& os)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	484 {
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23696 diff changeset	485 url = "ftp://" + host_or_url + '/' + file;
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	486 SETOPT (CURLOPT_URL, url.c_str ());
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	487 SETOPT (CURLOPT_NOBODY, 0);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	488 std::ostream& old_os = set_ostream (os);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	489
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	490 perform ();
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	491 if (! good ())
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	492 return;
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	493
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	494 set_ostream (old_os);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	495 SETOPT (CURLOPT_NOBODY, 1);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	496 url = "ftp://" + host_or_url;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	497 SETOPT (CURLOPT_URL, url.c_str ());
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	498 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	499
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	500 void dir (void)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	501 {
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23696 diff changeset	502 url = "ftp://" + host_or_url + '/';
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	503 SETOPT (CURLOPT_URL, url.c_str ());
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	504 SETOPT (CURLOPT_NOBODY, 0);
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	505
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	506 perform ();
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	507 if (! good ())
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	508 return;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	509
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	510 SETOPT (CURLOPT_NOBODY, 1);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	511 url = "ftp://" + host_or_url;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	512 SETOPT (CURLOPT_URL, url.c_str ());
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	513 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	514
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	515 string_vector list (void)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	516 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	517 string_vector retval;
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	518
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	519 std::ostringstream buf;
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23696 diff changeset	520 url = "ftp://" + host_or_url + '/';
23447 db1fdf4384dd maint: Use convention "static_cast<void >" for casting of pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	521 SETOPTR (CURLOPT_WRITEDATA, static_cast<void *> (&buf));
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	522 SETOPTR (CURLOPT_URL, url.c_str ());
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	523 SETOPTR (CURLOPT_DIRLISTONLY, 1);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	524 SETOPTR (CURLOPT_NOBODY, 0);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	525
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	526 perform ();
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	527 if (! good ())
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	528 return retval;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	529
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	530 SETOPTR (CURLOPT_NOBODY, 1);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	531 url = "ftp://" + host_or_url;
23447 db1fdf4384dd maint: Use convention "static_cast<void >" for casting of pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	532 SETOPTR (CURLOPT_WRITEDATA, static_cast<void *> (curr_ostream));
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	533 SETOPTR (CURLOPT_DIRLISTONLY, 0);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	534 SETOPTR (CURLOPT_URL, url.c_str ());
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	535
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	536 // Count number of directory entries
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	537 std::string str = buf.str ();
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	538 octave_idx_type n = 0;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	539 size_t pos = 0;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	540 while (true)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	541 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	542 pos = str.find_first_of ('\n', pos);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	543 if (pos == std::string::npos)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	544 break;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	545 pos++;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	546 n++;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	547 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	548 retval.resize (n);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	549 pos = 0;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	550 for (octave_idx_type i = 0; i < n; i++)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	551 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	552 size_t newpos = str.find_first_of ('\n', pos);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	553 if (newpos == std::string::npos)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	554 break;
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	555
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	556 retval(i) = str.substr(pos, newpos - pos);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	557 pos = newpos + 1;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	558 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	559
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	560 return retval;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	561 }
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	562
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	563 void get_fileinfo (const std::string& filename, double& filesize,
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	564 time_t& filetime, bool& fileisdir)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	565 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	566 std::string path = pwd ();
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	567
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23696 diff changeset	568 url = "ftp://" + host_or_url + '/' + path + '/' + filename;
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	569 SETOPT (CURLOPT_URL, url.c_str ());
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	570 SETOPT (CURLOPT_FILETIME, 1);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	571 SETOPT (CURLOPT_HEADERFUNCTION, throw_away);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	572 SETOPT (CURLOPT_WRITEFUNCTION, throw_away);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	573
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	574 // FIXME
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	575 // The MDTM command fails for a directory on the servers I tested
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21744 diff changeset	576 // so this is a means of testing for directories. It also means
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	577 // I can't get the date of directories!
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	578
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	579 perform ();
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	580 if (! good ())
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	581 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	582 fileisdir = true;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	583 filetime = -1;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	584 filesize = 0;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	585
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	586 return;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	587 }
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	588
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	589 fileisdir = false;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	590 time_t ft;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	591 curl_easy_getinfo (curl, CURLINFO_FILETIME, &ft);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	592 filetime = ft;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	593 double fs;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	594 curl_easy_getinfo (curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &fs);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	595 filesize = fs;
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	596
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	597 SETOPT (CURLOPT_WRITEFUNCTION, write_data);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	598 SETOPT (CURLOPT_HEADERFUNCTION, 0);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	599 SETOPT (CURLOPT_FILETIME, 0);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	600 url = "ftp://" + host_or_url;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	601 SETOPT (CURLOPT_URL, url.c_str ());
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	602
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	603 // The MDTM command seems to reset the path to the root with the
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21744 diff changeset	604 // servers I tested with, so cd again into the correct path. Make
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	605 // the path absolute so that this will work even with servers that
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	606 // don't end up in the root after an MDTM command.
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23696 diff changeset	607 cwd ('/' + path);
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	608 }
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	609
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	610 std::string pwd (void)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	611 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	612 std::string retval;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	613
23457 21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23447 diff changeset	614 struct curl_slist *slist = nullptr;
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	615
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	616 unwind_protect frame;
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	617 frame.add_fcn (curl_slist_free_all, slist);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	618
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	619 slist = curl_slist_append (slist, "pwd");
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	620 SETOPTR (CURLOPT_POSTQUOTE, slist);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	621 SETOPTR (CURLOPT_HEADERFUNCTION, write_data);
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	622
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	623 std::ostringstream buf;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	624 SETOPTR (CURLOPT_WRITEHEADER, static_cast<void *>(&buf));
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	625
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	626 perform ();
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	627 if (! good ())
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	628 return retval;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	629
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	630 retval = buf.str ();
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	631
27956 2310164737b3 fix many spelling errors (bug #57613) John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	632 // Can I assume that the path is always in "" on the last line
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	633 size_t pos2 = retval.rfind ('"');
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	634 size_t pos1 = retval.rfind ('"', pos2 - 1);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	635 retval = retval.substr (pos1 + 1, pos2 - pos1 - 1);
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	636
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	637 SETOPTR (CURLOPT_HEADERFUNCTION, 0);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	638 SETOPTR (CURLOPT_WRITEHEADER, 0);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	639 SETOPTR (CURLOPT_POSTQUOTE, 0);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	640
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	641 return retval;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	642 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	643
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	644 void http_get (const Array<std::string>& param)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	645 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	646 url = host_or_url;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	647
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	648 std::string query_string = form_query_string (param);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	649
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	650 if (! query_string.empty ())
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23696 diff changeset	651 url += '?' + query_string;
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	652
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	653 SETOPT (CURLOPT_URL, url.c_str ());
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	654
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	655 perform ();
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	656 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	657
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	658 void http_post (const Array<std::string>& param)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	659 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	660 SETOPT (CURLOPT_URL, host_or_url.c_str ());
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	661
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	662 std::string query_string = form_query_string (param);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	663
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	664 SETOPT (CURLOPT_POSTFIELDS, query_string.c_str ());
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	665
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	666 perform ();
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	667 }
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	668
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	669 void http_action (const Array<std::string>& param, const std::string& action)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	670 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	671 if (action.empty () \|\| action == "get")
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	672 http_get (param);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	673 else if (action == "post")
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	674 http_post (param);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	675 else
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	676 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	677 ok = false;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	678 errmsg = "curl_transfer: unknown http action";
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	679 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	680 }
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	681
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	682 private:
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	683
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	684 // Pointer to cURL object.
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	685 CURL *curl;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	686
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	687 // cURL error code.
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	688 CURLcode errnum;
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	689
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	690 // The cURL library changed the curl_easy_setopt call to make an
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21744 diff changeset	691 // internal copy of string parameters in version 7.17.0. Prior
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	692 // versions only held a pointer to a string provided by the caller
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	693 // that must persist for the lifetime of the CURL handle.
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	694 //
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	695 // The associated API did not change, only the behavior of the library
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	696 // implementing the function call.
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	697 //
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	698 // To be compatible with any version of cURL, the caller must keep a
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	699 // copy of all string parameters associated with a CURL handle until
21751 b571fc85953f maint: Use two spaces after period to indicate sentence break. Rik <rik@octave.org> parents: 21744 diff changeset	700 // the handle is released. The curl_handle::curl_handle_rep class
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	701 // contains the pointer to the CURL handle and so is the best
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	702 // candidate for storing the strings as well. (bug #36717)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	703 std::string url;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	704 std::string userpwd;
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	705
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	706 void init (const std::string& user, const std::string& passwd,
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	707 std::istream& is, std::ostream& os)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	708 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	709 // No data transfer by default
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	710 SETOPT (CURLOPT_NOBODY, 1);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	711
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	712 // Set the username and password
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	713 userpwd = user;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	714 if (! passwd.empty ())
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23696 diff changeset	715 userpwd += ':' + passwd;
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	716 if (! userpwd.empty ())
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	717 SETOPT (CURLOPT_USERPWD, userpwd.c_str ());
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	718
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	719 // Define our callback to get called when there's data to be written.
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	720 SETOPT (CURLOPT_WRITEFUNCTION, write_data);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	721
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	722 // Set a pointer to our struct to pass to the callback.
23447 db1fdf4384dd maint: Use convention "static_cast<void >" for casting of pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	723 SETOPT (CURLOPT_WRITEDATA, static_cast<void *> (&os));
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	724
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	725 // Define our callback to get called when there's data to be read
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	726 SETOPT (CURLOPT_READFUNCTION, read_data);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	727
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	728 // Set a pointer to our struct to pass to the callback.
23447 db1fdf4384dd maint: Use convention "static_cast<void >" for casting of pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	729 SETOPT (CURLOPT_READDATA, static_cast<void *> (&is));
17595 4b65355a31f2 avoid some code duplication in url-transfer ftp methods John W. Eaton <jwe@octave.org> parents: 17563 diff changeset	730
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	731 // Follow redirects.
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	732 SETOPT (CURLOPT_FOLLOWLOCATION, true);
17595 4b65355a31f2 avoid some code duplication in url-transfer ftp methods John W. Eaton <jwe@octave.org> parents: 17563 diff changeset	733
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	734 // Don't use EPSV since connecting to sites that don't support it
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	735 // will hang for some time (3 minutes?) before moving on to try PASV
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	736 // instead.
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	737 SETOPT (CURLOPT_FTP_USE_EPSV, false);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	738
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	739 SETOPT (CURLOPT_NOPROGRESS, true);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	740 SETOPT (CURLOPT_FAILONERROR, true);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	741
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	742 SETOPT (CURLOPT_POSTQUOTE, 0);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	743 SETOPT (CURLOPT_QUOTE, 0);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	744 }
17595 4b65355a31f2 avoid some code duplication in url-transfer ftp methods John W. Eaton <jwe@octave.org> parents: 17563 diff changeset	745
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	746 std::string form_query_string (const Array<std::string>& param)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	747 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	748 std::ostringstream query;
17595 4b65355a31f2 avoid some code duplication in url-transfer ftp methods John W. Eaton <jwe@octave.org> parents: 17563 diff changeset	749
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	750 for (int i = 0; i < param.numel (); i += 2)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	751 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	752 std::string name = param(i);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	753 std::string text = param(i+1);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	754
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	755 // Encode strings.
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	756 char *enc_name = curl_easy_escape (curl, name.c_str (),
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	757 name.length ());
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	758 char *enc_text = curl_easy_escape (curl, text.c_str (),
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	759 text.length ());
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	760
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23696 diff changeset	761 query << enc_name << '=' << enc_text;
17595 4b65355a31f2 avoid some code duplication in url-transfer ftp methods John W. Eaton <jwe@octave.org> parents: 17563 diff changeset	762
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	763 curl_free (enc_name);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	764 curl_free (enc_text);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	765
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	766 if (i < param.numel ()-1)
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23696 diff changeset	767 query << '&';
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	768 }
17595 4b65355a31f2 avoid some code duplication in url-transfer ftp methods John W. Eaton <jwe@octave.org> parents: 17563 diff changeset	769
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	770 query.flush ();
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	771
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	772 return query.str ();
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	773 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	774
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	775 void ftp_file_or_dir_action (const std::string& file_or_dir,
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	776 const std::string& action)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	777 {
23457 21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23447 diff changeset	778 struct curl_slist *slist = nullptr;
17595 4b65355a31f2 avoid some code duplication in url-transfer ftp methods John W. Eaton <jwe@octave.org> parents: 17563 diff changeset	779
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	780 unwind_protect frame;
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	781
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	782 frame.add_fcn (curl_slist_free_all, slist);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	783
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23696 diff changeset	784 std::string cmd = action + ' ' + file_or_dir;
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	785
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	786 slist = curl_slist_append (slist, cmd.c_str ());
17595 4b65355a31f2 avoid some code duplication in url-transfer ftp methods John W. Eaton <jwe@octave.org> parents: 17563 diff changeset	787
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	788 SETOPT (CURLOPT_POSTQUOTE, slist);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	789
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	790 perform ();
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	791
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	792 if (! good ())
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	793 return;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	794
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	795 SETOPT (CURLOPT_POSTQUOTE, 0);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	796 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	797 };
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	798
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	799 #undef SETOPT
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	800
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	801 #endif
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	802
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	803 #if defined (HAVE_CURL)
21202 f7121e111991 maint: indent #ifdef blocks in liboctave and src directories. Rik <rik@octave.org> parents: 20955 diff changeset	804 # define REP_CLASS curl_transfer
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	805 #else
21202 f7121e111991 maint: indent #ifdef blocks in liboctave and src directories. Rik <rik@octave.org> parents: 20955 diff changeset	806 # define REP_CLASS base_url_transfer
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	807 #endif
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	808
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	809 url_transfer::url_transfer (void) : rep (new REP_CLASS ())
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	810 { }
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	811
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	812 url_transfer::url_transfer (const std::string& host, const std::string& user,
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	813 const std::string& passwd, std::ostream& os)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	814 : rep (new REP_CLASS (host, user, passwd, os))
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	815 { }
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	816
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	817 url_transfer::url_transfer (const std::string& url, std::ostream& os)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	818 : rep (new REP_CLASS (url, os))
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	819 { }
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	820
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	821 #undef REP_CLASS
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	822
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	823 }

Mercurial > octave

annotate liboctave/util/url-transfer.cc @ 27956:2310164737b3 stable