Mercurial > octave
annotate liboctave/util/url-transfer.cc @ 28223:45763d59cb4f stable
use nullptr instead of NULL or 0 in a few more places
* QWinTerminalImpl.cpp, oct-procbuf.cc, audioread.cc, jit-typeinfo.cc,
lo-sysdep.cc, url-transfer.cc, shared-fcns.h: Replace NULL and 0 with
nullptr where appropriate.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 15 Apr 2020 15:55:32 -0400 |
parents | a4268efb7334 |
children | 159b6a1eb408 |
rev | line source |
---|---|
27923
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
1 //////////////////////////////////////////////////////////////////////// |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
2 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
3 // Copyright (C) 2006-2020 The Octave Project Developers |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
4 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
5 // See the file COPYRIGHT.md in the top-level directory of this |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
6 // distribution or <https://octave.org/copyright/>. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
7 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
8 // This file is part of Octave. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
9 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
10 // Octave is free software: you can redistribute it and/or modify it |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
11 // under the terms of the GNU General Public License as published by |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
12 // the Free Software Foundation, either version 3 of the License, or |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
13 // (at your option) any later version. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
14 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
15 // Octave is distributed in the hope that it will be useful, but |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
16 // WITHOUT ANY WARRANTY; without even the implied warranty of |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
18 // GNU General Public License for more details. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
19 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
20 // You should have received a copy of the GNU General Public License |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
21 // along with Octave; see the file COPYING. If not, see |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
22 // <https://www.gnu.org/licenses/>. |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
23 // |
bd51beb6205e
update formatting of copyright notices
John W. Eaton <jwe@octave.org>
parents:
27919
diff
changeset
|
24 //////////////////////////////////////////////////////////////////////// |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
25 |
21724
aba2e6293dd8
use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
26 #if defined (HAVE_CONFIG_H) |
21301
40de9f8f23a6
Use '#include "config.h"' rather than <config.h>.
Rik <rik@octave.org>
parents:
21202
diff
changeset
|
27 # include "config.h" |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
28 #endif |
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
29 |
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
30 #include <fstream> |
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
31 #include <iomanip> |
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
32 #include <iostream> |
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
33 |
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
34 #include "dir-ops.h" |
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
35 #include "file-ops.h" |
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
36 #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
|
37 #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
|
38 #include "oct-env.h" |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
39 #include "unwind-prot.h" |
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
40 #include "url-transfer.h" |
27048
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
41 #include "version.h" |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
42 |
21724
aba2e6293dd8
use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents:
21301
diff
changeset
|
43 #if defined (HAVE_CURL) |
21202
f7121e111991
maint: indent #ifdef blocks in liboctave and src directories.
Rik <rik@octave.org>
parents:
20955
diff
changeset
|
44 # include <curl/curl.h> |
f7121e111991
maint: indent #ifdef blocks in liboctave and src directories.
Rik <rik@octave.org>
parents:
20955
diff
changeset
|
45 # include <curl/curlver.h> |
f7121e111991
maint: indent #ifdef blocks in liboctave and src directories.
Rik <rik@octave.org>
parents:
20955
diff
changeset
|
46 # include <curl/easy.h> |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
47 #endif |
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
48 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
49 namespace octave |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
50 { |
25438
cb1606f78f6b
prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible
John W. Eaton <jwe@octave.org>
parents:
25281
diff
changeset
|
51 base_url_transfer::base_url_transfer (void) |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
52 : m_host_or_url (), m_valid (false), m_ftp (false), |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
53 m_ascii_mode (false), m_ok (true), m_errmsg (), |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
54 m_curr_istream (&std::cin), m_curr_ostream (&std::cout) |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
55 { } |
25438
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) |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
61 : m_host_or_url (host), m_valid (false), m_ftp (true), |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
62 m_ascii_mode (false), m_ok (true), m_errmsg (), |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
63 m_curr_istream (&std::cin), m_curr_ostream (&os) |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
64 { } |
25438
cb1606f78f6b
prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible
John W. Eaton <jwe@octave.org>
parents:
25281
diff
changeset
|
65 |
cb1606f78f6b
prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible
John W. Eaton <jwe@octave.org>
parents:
25281
diff
changeset
|
66 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
|
67 std::ostream& os) |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
68 : m_host_or_url (url), m_valid (false), m_ftp (false), |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
69 m_ascii_mode (false), m_ok (true), m_errmsg (), |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
70 m_curr_istream (&std::cin), m_curr_ostream (&os) |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
71 { } |
25438
cb1606f78f6b
prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible
John W. Eaton <jwe@octave.org>
parents:
25281
diff
changeset
|
72 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
73 void |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
74 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
|
75 { |
23696
08036a7f3660
remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
23457
diff
changeset
|
76 sys::unlink (file); |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
77 } |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
78 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
79 void |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
80 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
|
81 const std::string& target) |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
82 { |
23696
08036a7f3660
remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
23457
diff
changeset
|
83 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
|
84 sys::file_stat fs (directory); |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
85 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
86 if (! fs || ! fs.is_dir ()) |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
87 { |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
88 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
|
89 int status = sys::mkdir (directory, 0777, msg); |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
90 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
91 if (status < 0) |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
92 { |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
93 m_ok = false; |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
94 m_errmsg = "__ftp_mget__: can not create directory '" |
27933
863ae57eee69
maint: Use Octave coding conventions in liboctave/
Rik <rik@octave.org>
parents:
27929
diff
changeset
|
95 + target + sep + directory + "': " + msg; |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
96 return; |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
97 } |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
98 } |
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 cwd (directory); |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
101 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
102 if (good ()) |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
103 { |
23696
08036a7f3660
remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
23457
diff
changeset
|
104 unwind_protect_safe frame; |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
105 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
106 frame.add_fcn (reset_path, this); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
107 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
108 string_vector sv = list (); |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
109 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
110 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
|
111 { |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
112 time_t ftime; |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
113 bool fisdir; |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
114 double fsize; |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
115 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
116 get_fileinfo (sv(i), fsize, ftime, fisdir); |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
117 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
118 if (fisdir) |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
119 mget_directory (sv(i), target + directory + sep); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
120 else |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
121 { |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
122 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
|
123 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
124 std::ofstream ofile (realfile.c_str (), |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
125 std::ios::out | std::ios::binary); |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
126 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
127 if (! ofile.is_open ()) |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
128 { |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
129 m_ok = false; |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
130 m_errmsg = "__ftp_mget__: unable to open file"; |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
131 break; |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
132 } |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
133 |
23696
08036a7f3660
remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
23457
diff
changeset
|
134 unwind_protect_safe frame2; |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
135 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
136 frame2.add_fcn (delete_file, realfile); |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
137 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
138 get (sv(i), ofile); |
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 ofile.close (); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
141 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
142 if (good ()) |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
143 frame2.discard (); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
144 } |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
145 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
146 if (! good ()) |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
147 break; |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
148 } |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
149 } |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
150 } |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
151 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
152 string_vector |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
153 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
|
154 const std::string& directory) |
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 string_vector file_list; |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
157 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
158 std::string realdir |
21885
0806871e3e1e
maint: Prefer is_empty() rather than "length () == 0".
Rik <rik@octave.org>
parents:
21751
diff
changeset
|
159 = (base.empty () |
23696
08036a7f3660
remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
23457
diff
changeset
|
160 ? 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
|
161 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
162 mkdir (directory); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
163 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
164 if (! good ()) |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
165 return file_list; |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
166 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
167 cwd (directory); |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
168 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
169 if (good ()) |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
170 { |
23696
08036a7f3660
remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
23457
diff
changeset
|
171 unwind_protect_safe frame; |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
172 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
173 frame.add_fcn (reset_path, this); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
174 |
25516
8945a6a6c0eb
Add Unicode support for getting directory listing in Windows (bug #49118).
Markus Mützel <markus.muetzel@gmx.de>
parents:
25438
diff
changeset
|
175 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
|
176 std::string msg; |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
177 |
25516
8945a6a6c0eb
Add Unicode support for getting directory listing in Windows (bug #49118).
Markus Mützel <markus.muetzel@gmx.de>
parents:
25438
diff
changeset
|
178 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
|
179 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
|
180 { |
8945a6a6c0eb
Add Unicode support for getting directory listing in Windows (bug #49118).
Markus Mützel <markus.muetzel@gmx.de>
parents:
25438
diff
changeset
|
181 std::string file = files (i); |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
182 |
25516
8945a6a6c0eb
Add Unicode support for getting directory listing in Windows (bug #49118).
Markus Mützel <markus.muetzel@gmx.de>
parents:
25438
diff
changeset
|
183 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
|
184 continue; |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
185 |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
186 std::string realfile |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
187 = realdir + sys::file_ops::dir_sep_str () + file; |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
188 |
25516
8945a6a6c0eb
Add Unicode support for getting directory listing in Windows (bug #49118).
Markus Mützel <markus.muetzel@gmx.de>
parents:
25438
diff
changeset
|
189 sys::file_stat fs (realfile); |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
190 |
25516
8945a6a6c0eb
Add Unicode support for getting directory listing in Windows (bug #49118).
Markus Mützel <markus.muetzel@gmx.de>
parents:
25438
diff
changeset
|
191 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
|
192 { |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
193 m_ok = false; |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
194 m_errmsg = "__ftp__mput: file '" + realfile |
27933
863ae57eee69
maint: Use Octave coding conventions in liboctave/
Rik <rik@octave.org>
parents:
27929
diff
changeset
|
195 + "' does not exist"; |
25516
8945a6a6c0eb
Add Unicode support for getting directory listing in Windows (bug #49118).
Markus Mützel <markus.muetzel@gmx.de>
parents:
25438
diff
changeset
|
196 break; |
8945a6a6c0eb
Add Unicode support for getting directory listing in Windows (bug #49118).
Markus Mützel <markus.muetzel@gmx.de>
parents:
25438
diff
changeset
|
197 } |
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 (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
|
200 { |
8945a6a6c0eb
Add Unicode support for getting directory listing in Windows (bug #49118).
Markus Mützel <markus.muetzel@gmx.de>
parents:
25438
diff
changeset
|
201 file_list.append (mput_directory (realdir, file)); |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
202 |
25516
8945a6a6c0eb
Add Unicode support for getting directory listing in Windows (bug #49118).
Markus Mützel <markus.muetzel@gmx.de>
parents:
25438
diff
changeset
|
203 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
|
204 break; |
8945a6a6c0eb
Add Unicode support for getting directory listing in Windows (bug #49118).
Markus Mützel <markus.muetzel@gmx.de>
parents:
25438
diff
changeset
|
205 } |
8945a6a6c0eb
Add Unicode support for getting directory listing in Windows (bug #49118).
Markus Mützel <markus.muetzel@gmx.de>
parents:
25438
diff
changeset
|
206 else |
8945a6a6c0eb
Add Unicode support for getting directory listing in Windows (bug #49118).
Markus Mützel <markus.muetzel@gmx.de>
parents:
25438
diff
changeset
|
207 { |
8945a6a6c0eb
Add Unicode support for getting directory listing in Windows (bug #49118).
Markus Mützel <markus.muetzel@gmx.de>
parents:
25438
diff
changeset
|
208 // FIXME: Does ascii mode need to be flagged here? |
27102
84ff9953faa1
where possible, eliminate octave:: namespace qualifier inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
27048
diff
changeset
|
209 std::string ascii_fname = sys::get_ASCII_filename (realfile); |
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
|
210 |
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
|
211 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
|
212 std::ios::in | std::ios::binary); |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
213 |
25516
8945a6a6c0eb
Add Unicode support for getting directory listing in Windows (bug #49118).
Markus Mützel <markus.muetzel@gmx.de>
parents:
25438
diff
changeset
|
214 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
|
215 { |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
216 m_ok = false; |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
217 m_errmsg = "__ftp_mput__: unable to open file '" |
27933
863ae57eee69
maint: Use Octave coding conventions in liboctave/
Rik <rik@octave.org>
parents:
27929
diff
changeset
|
218 + realfile + "'"; |
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 break; |
8945a6a6c0eb
Add Unicode support for getting directory listing in Windows (bug #49118).
Markus Mützel <markus.muetzel@gmx.de>
parents:
25438
diff
changeset
|
220 } |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
221 |
25516
8945a6a6c0eb
Add Unicode support for getting directory listing in Windows (bug #49118).
Markus Mützel <markus.muetzel@gmx.de>
parents:
25438
diff
changeset
|
222 put (file, ifile); |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
223 |
25516
8945a6a6c0eb
Add Unicode support for getting directory listing in Windows (bug #49118).
Markus Mützel <markus.muetzel@gmx.de>
parents:
25438
diff
changeset
|
224 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
|
225 |
25516
8945a6a6c0eb
Add Unicode support for getting directory listing in Windows (bug #49118).
Markus Mützel <markus.muetzel@gmx.de>
parents:
25438
diff
changeset
|
226 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
|
227 break; |
8945a6a6c0eb
Add Unicode support for getting directory listing in Windows (bug #49118).
Markus Mützel <markus.muetzel@gmx.de>
parents:
25438
diff
changeset
|
228 |
8945a6a6c0eb
Add Unicode support for getting directory listing in Windows (bug #49118).
Markus Mützel <markus.muetzel@gmx.de>
parents:
25438
diff
changeset
|
229 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
|
230 } |
8945a6a6c0eb
Add Unicode support for getting directory listing in Windows (bug #49118).
Markus Mützel <markus.muetzel@gmx.de>
parents:
25438
diff
changeset
|
231 } |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
232 else |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
233 { |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
234 m_ok = false; |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
235 m_errmsg = "__ftp_mput__: can not read the directory '" |
27933
863ae57eee69
maint: Use Octave coding conventions in liboctave/
Rik <rik@octave.org>
parents:
27929
diff
changeset
|
236 + realdir + "'"; |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
237 } |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
238 } |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
239 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
240 return file_list; |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
241 } |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
242 |
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
243 #if defined (HAVE_CURL) |
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
244 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
245 static int |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
246 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
|
247 { |
23447
db1fdf4384dd
maint: Use convention "static_cast<void *>" for casting of pointers.
Rik <rik@octave.org>
parents:
23220
diff
changeset
|
248 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
|
249 stream.write (static_cast<const char *> (buffer), size*nmemb); |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
250 return (stream.fail () ? 0 : size * nmemb); |
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
251 } |
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
252 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
253 static int |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
254 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
|
255 { |
23447
db1fdf4384dd
maint: Use convention "static_cast<void *>" for casting of pointers.
Rik <rik@octave.org>
parents:
23220
diff
changeset
|
256 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
|
257 stream.read (static_cast<char *> (buffer), size*nmemb); |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
258 if (stream.eof ()) |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
259 return stream.gcount (); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
260 else |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
261 return (stream.fail () ? 0 : size * nmemb); |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
262 } |
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
263 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
264 static size_t |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
265 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
|
266 { |
25688
b2917b7858ba
maint: Use Octave convention for spacing of C++ cast statements.
Rik <rik@octave.org>
parents:
25604
diff
changeset
|
267 return static_cast<size_t> (size * nmemb); |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
268 } |
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
269 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
270 // 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
|
271 // 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
|
272 // the curl_easy_setopt function. |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
273 #define SETOPT(option, parameter) \ |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
274 do \ |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
275 { \ |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
276 CURLcode res = curl_easy_setopt (m_curl, option, parameter); \ |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
277 if (res != CURLE_OK) \ |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
278 { \ |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
279 m_ok = false; \ |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
280 m_errmsg = curl_easy_strerror (res); \ |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
281 return; \ |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
282 } \ |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
283 } \ |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
284 while (0) |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
285 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
286 // 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
|
287 #define SETOPTR(option, parameter) \ |
e43d83253e28
refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents:
21885
diff
changeset
|
288 do \ |
e43d83253e28
refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents:
21885
diff
changeset
|
289 { \ |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
290 CURLcode res = curl_easy_setopt (m_curl, option, parameter); \ |
22197
e43d83253e28
refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents:
21885
diff
changeset
|
291 if (res != CURLE_OK) \ |
e43d83253e28
refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents:
21885
diff
changeset
|
292 { \ |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
293 m_ok = false; \ |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
294 m_errmsg = curl_easy_strerror (res); \ |
22197
e43d83253e28
refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents:
21885
diff
changeset
|
295 return retval; \ |
e43d83253e28
refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents:
21885
diff
changeset
|
296 } \ |
e43d83253e28
refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents:
21885
diff
changeset
|
297 } \ |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
298 while (0) |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
299 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
300 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
|
301 { |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
302 public: |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
303 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
304 curl_transfer (void) |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
305 : base_url_transfer (), m_curl (curl_easy_init ()), m_errnum (), m_url (), |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
306 m_userpwd () |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
307 { |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
308 if (m_curl) |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
309 m_valid = true; |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
310 else |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
311 m_errmsg = "can not create curl object"; |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
312 } |
17596
43b9181340fb
separate object creation from http actions in url_transfer class
John W. Eaton <jwe@octave.org>
parents:
17595
diff
changeset
|
313 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
314 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
|
315 const std::string& passwd, std::ostream& os) |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
316 : base_url_transfer (host, user_arg, passwd, os), |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
317 m_curl (curl_easy_init ()), m_errnum (), m_url (), m_userpwd () |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
318 { |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
319 if (m_curl) |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
320 m_valid = true; |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
321 else |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
322 { |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
323 m_errmsg = "can not create curl object"; |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
324 return; |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
325 } |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
326 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
327 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
|
328 |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
329 m_url = "ftp://" + host; |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
330 SETOPT (CURLOPT_URL, m_url.c_str ()); |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
331 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
332 // Set up the link, with no transfer. |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
333 perform (); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
334 } |
17596
43b9181340fb
separate object creation from http actions in url_transfer class
John W. Eaton <jwe@octave.org>
parents:
17595
diff
changeset
|
335 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
336 curl_transfer (const std::string& url_str, std::ostream& os) |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
337 : base_url_transfer (url_str, os), m_curl (curl_easy_init ()), |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
338 m_errnum (), m_url (), m_userpwd () |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
339 { |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
340 if (m_curl) |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
341 m_valid = true; |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
342 else |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
343 { |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
344 m_errmsg = "can not create curl object"; |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
345 return; |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
346 } |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
347 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
348 init ("", "", std::cin, os); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
349 |
25281
35115cc6183b
allow users to set path to CA certificates for cURL
John W. Eaton <jwe@octave.org>
parents:
25054
diff
changeset
|
350 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
|
351 if (! cainfo.empty ()) |
35115cc6183b
allow users to set path to CA certificates for cURL
John W. Eaton <jwe@octave.org>
parents:
25054
diff
changeset
|
352 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
|
353 |
35115cc6183b
allow users to set path to CA certificates for cURL
John W. Eaton <jwe@octave.org>
parents:
25054
diff
changeset
|
354 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
|
355 if (! capath.empty ()) |
35115cc6183b
allow users to set path to CA certificates for cURL
John W. Eaton <jwe@octave.org>
parents:
25054
diff
changeset
|
356 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
|
357 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
358 SETOPT (CURLOPT_NOBODY, 0); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
359 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
360 // 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
|
361 // 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
|
362 // 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
|
363 // libcurl < 7.18.2. |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
364 SETOPT (CURLOPT_HTTPGET, 1); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
365 } |
17596
43b9181340fb
separate object creation from http actions in url_transfer class
John W. Eaton <jwe@octave.org>
parents:
17595
diff
changeset
|
366 |
22869
f75d289645ec
make deleted functions public
John W. Eaton <jwe@octave.org>
parents:
22865
diff
changeset
|
367 // No copying! |
f75d289645ec
make deleted functions public
John W. Eaton <jwe@octave.org>
parents:
22865
diff
changeset
|
368 |
f75d289645ec
make deleted functions public
John W. Eaton <jwe@octave.org>
parents:
22865
diff
changeset
|
369 curl_transfer (const curl_transfer&) = delete; |
f75d289645ec
make deleted functions public
John W. Eaton <jwe@octave.org>
parents:
22865
diff
changeset
|
370 |
f75d289645ec
make deleted functions public
John W. Eaton <jwe@octave.org>
parents:
22865
diff
changeset
|
371 curl_transfer& operator = (const curl_transfer&) = delete; |
f75d289645ec
make deleted functions public
John W. Eaton <jwe@octave.org>
parents:
22865
diff
changeset
|
372 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
373 ~curl_transfer (void) |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
374 { |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
375 if (m_curl) |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
376 curl_easy_cleanup (m_curl); |
21744
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 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
379 void perform (void) |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
380 { |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
381 BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
382 |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
383 m_errnum = curl_easy_perform (m_curl); |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
384 |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
385 if (m_errnum != CURLE_OK) |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
386 { |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
387 m_ok = false; |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
388 m_errmsg = curl_easy_strerror (m_errnum); |
21744
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 END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE; |
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 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
394 std::string lasterror (void) const |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
395 { |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
396 return std::string (curl_easy_strerror (m_errnum)); |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
397 } |
17596
43b9181340fb
separate object creation from http actions in url_transfer class
John W. Eaton <jwe@octave.org>
parents:
17595
diff
changeset
|
398 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
399 std::ostream& set_ostream (std::ostream& os) |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
400 { |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
401 std::ostream& retval = *m_curr_ostream; |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
402 m_curr_ostream = &os; |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
403 SETOPTR (CURLOPT_WRITEDATA, static_cast<void *> (m_curr_ostream)); |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
404 return retval; |
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 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
407 std::istream& set_istream (std::istream& is) |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
408 { |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
409 std::istream& retval = *m_curr_istream; |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
410 m_curr_istream = &is; |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
411 SETOPTR (CURLOPT_READDATA, static_cast<void *> (m_curr_istream)); |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
412 return retval; |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
413 } |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
414 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
415 void ascii (void) |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
416 { |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
417 m_ascii_mode = true; |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
418 SETOPT (CURLOPT_TRANSFERTEXT, 1); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
419 } |
17601
9e507e30c9ea
keep a copy of user+password data for older cURL libraries
John W. Eaton <jwe@octave.org>
parents:
17598
diff
changeset
|
420 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
421 void binary (void) |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
422 { |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
423 m_ascii_mode = false; |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
424 SETOPT (CURLOPT_TRANSFERTEXT, 0); |
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 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
427 void cwd (const std::string& path) |
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 ftp_file_or_dir_action (path, "cwd"); |
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 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
432 void del (const std::string& file) |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
433 { |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
434 ftp_file_or_dir_action (file, "dele"); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
435 } |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
436 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
437 void rmdir (const std::string& path) |
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 ftp_file_or_dir_action (path, "rmd"); |
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 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
442 void mkdir (const std::string& path) |
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 ftp_file_or_dir_action (path, "mkd"); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
445 } |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
446 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
447 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
|
448 { |
23457
21baad6b35c4
maint: Use C++11 nullptr rather than 0 or NULL when possible.
Rik <rik@octave.org>
parents:
23447
diff
changeset
|
449 struct curl_slist *slist = nullptr; |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
450 |
23696
08036a7f3660
remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
23457
diff
changeset
|
451 unwind_protect frame; |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
452 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
|
453 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
454 std::string cmd = "rnfr " + oldname; |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
455 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
|
456 cmd = "rnto " + newname; |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
457 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
|
458 SETOPT (CURLOPT_POSTQUOTE, slist); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
459 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
460 perform (); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
461 if (! good ()) |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
462 return; |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
463 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
464 SETOPT (CURLOPT_POSTQUOTE, 0); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
465 } |
17601
9e507e30c9ea
keep a copy of user+password data for older cURL libraries
John W. Eaton <jwe@octave.org>
parents:
17598
diff
changeset
|
466 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
467 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
|
468 { |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
469 m_url = "ftp://" + m_host_or_url + '/' + file; |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
470 SETOPT (CURLOPT_URL, m_url.c_str ()); |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
471 SETOPT (CURLOPT_UPLOAD, 1); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
472 SETOPT (CURLOPT_NOBODY, 0); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
473 std::istream& old_is = set_istream (is); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
474 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
475 perform (); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
476 if (! good ()) |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
477 return; |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
478 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
479 set_istream (old_is); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
480 SETOPT (CURLOPT_NOBODY, 1); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
481 SETOPT (CURLOPT_UPLOAD, 0); |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
482 m_url = "ftp://" + m_host_or_url; |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
483 SETOPT (CURLOPT_URL, m_url.c_str ()); |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
484 } |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
485 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
486 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
|
487 { |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
488 m_url = "ftp://" + m_host_or_url + '/' + file; |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
489 SETOPT (CURLOPT_URL, m_url.c_str ()); |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
490 SETOPT (CURLOPT_NOBODY, 0); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
491 std::ostream& old_os = set_ostream (os); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
492 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
493 perform (); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
494 if (! good ()) |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
495 return; |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
496 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
497 set_ostream (old_os); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
498 SETOPT (CURLOPT_NOBODY, 1); |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
499 m_url = "ftp://" + m_host_or_url; |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
500 SETOPT (CURLOPT_URL, m_url.c_str ()); |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
501 } |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
502 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
503 void dir (void) |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
504 { |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
505 m_url = "ftp://" + m_host_or_url + '/'; |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
506 SETOPT (CURLOPT_URL, m_url.c_str ()); |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
507 SETOPT (CURLOPT_NOBODY, 0); |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
508 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
509 perform (); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
510 if (! good ()) |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
511 return; |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
512 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
513 SETOPT (CURLOPT_NOBODY, 1); |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
514 m_url = "ftp://" + m_host_or_url; |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
515 SETOPT (CURLOPT_URL, m_url.c_str ()); |
21744
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 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
518 string_vector list (void) |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
519 { |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
520 string_vector retval; |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
521 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
522 std::ostringstream buf; |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
523 m_url = "ftp://" + m_host_or_url + '/'; |
23447
db1fdf4384dd
maint: Use convention "static_cast<void *>" for casting of pointers.
Rik <rik@octave.org>
parents:
23220
diff
changeset
|
524 SETOPTR (CURLOPT_WRITEDATA, static_cast<void *> (&buf)); |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
525 SETOPTR (CURLOPT_URL, m_url.c_str ()); |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
526 SETOPTR (CURLOPT_DIRLISTONLY, 1); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
527 SETOPTR (CURLOPT_NOBODY, 0); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
528 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
529 perform (); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
530 if (! good ()) |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
531 return retval; |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
532 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
533 SETOPTR (CURLOPT_NOBODY, 1); |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
534 m_url = "ftp://" + m_host_or_url; |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
535 SETOPTR (CURLOPT_WRITEDATA, static_cast<void *> (m_curr_ostream)); |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
536 SETOPTR (CURLOPT_DIRLISTONLY, 0); |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
537 SETOPTR (CURLOPT_URL, m_url.c_str ()); |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
538 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
539 // Count number of directory entries |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
540 std::string str = buf.str (); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
541 octave_idx_type n = 0; |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
542 size_t pos = 0; |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
543 while (true) |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
544 { |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
545 pos = str.find_first_of ('\n', pos); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
546 if (pos == std::string::npos) |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
547 break; |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
548 pos++; |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
549 n++; |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
550 } |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
551 retval.resize (n); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
552 pos = 0; |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
553 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
|
554 { |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
555 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
|
556 if (newpos == std::string::npos) |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
557 break; |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
558 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
559 retval(i) = str.substr(pos, newpos - pos); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
560 pos = newpos + 1; |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
561 } |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
562 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
563 return retval; |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
564 } |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
565 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
566 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
|
567 time_t& filetime, bool& fileisdir) |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
568 { |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
569 std::string path = pwd (); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
570 |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
571 m_url = "ftp://" + m_host_or_url + '/' + path + '/' + filename; |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
572 SETOPT (CURLOPT_URL, m_url.c_str ()); |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
573 SETOPT (CURLOPT_FILETIME, 1); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
574 SETOPT (CURLOPT_HEADERFUNCTION, throw_away); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
575 SETOPT (CURLOPT_WRITEFUNCTION, throw_away); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
576 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
577 // FIXME |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
578 // 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
|
579 // 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
|
580 // 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
|
581 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
582 perform (); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
583 if (! good ()) |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
584 { |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
585 fileisdir = true; |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
586 filetime = -1; |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
587 filesize = 0; |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
588 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
589 return; |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
590 } |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
591 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
592 fileisdir = false; |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
593 time_t ft; |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
594 curl_easy_getinfo (m_curl, CURLINFO_FILETIME, &ft); |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
595 filetime = ft; |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
596 double fs; |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
597 curl_easy_getinfo (m_curl, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &fs); |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
598 filesize = fs; |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
599 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
600 SETOPT (CURLOPT_WRITEFUNCTION, write_data); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
601 SETOPT (CURLOPT_HEADERFUNCTION, 0); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
602 SETOPT (CURLOPT_FILETIME, 0); |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
603 m_url = "ftp://" + m_host_or_url; |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
604 SETOPT (CURLOPT_URL, m_url.c_str ()); |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
605 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
606 // 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
|
607 // 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
|
608 // 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
|
609 // 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
|
610 cwd ('/' + path); |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
611 } |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
612 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
613 std::string pwd (void) |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
614 { |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
615 std::string retval; |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
616 |
23457
21baad6b35c4
maint: Use C++11 nullptr rather than 0 or NULL when possible.
Rik <rik@octave.org>
parents:
23447
diff
changeset
|
617 struct curl_slist *slist = nullptr; |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
618 |
23696
08036a7f3660
remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
23457
diff
changeset
|
619 unwind_protect frame; |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
620 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
|
621 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
622 slist = curl_slist_append (slist, "pwd"); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
623 SETOPTR (CURLOPT_POSTQUOTE, slist); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
624 SETOPTR (CURLOPT_HEADERFUNCTION, write_data); |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
625 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
626 std::ostringstream buf; |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
627 SETOPTR (CURLOPT_WRITEHEADER, static_cast<void *>(&buf)); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
628 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
629 perform (); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
630 if (! good ()) |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
631 return retval; |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
632 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
633 retval = buf.str (); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
634 |
27956
2310164737b3
fix many spelling errors (bug #57613)
John W. Eaton <jwe@octave.org>
parents:
26376
diff
changeset
|
635 // 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
|
636 size_t pos2 = retval.rfind ('"'); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
637 size_t pos1 = retval.rfind ('"', pos2 - 1); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
638 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
|
639 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
640 SETOPTR (CURLOPT_HEADERFUNCTION, 0); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
641 SETOPTR (CURLOPT_WRITEHEADER, 0); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
642 SETOPTR (CURLOPT_POSTQUOTE, 0); |
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 return retval; |
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 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
647 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
|
648 { |
27048
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
649 http_action (param, "get"); |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
650 } |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
651 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
652 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
|
653 { |
27048
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
654 http_action (param, "post"); |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
655 } |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
656 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
657 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
|
658 { |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
659 m_url = m_host_or_url; |
27048
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
660 |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
661 std::string query_string; |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
662 |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
663 query_string = form_query_string (param); |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
664 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
665 if (action.empty () || action == "get") |
27048
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
666 { |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
667 if (! query_string.empty ()) |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
668 m_url += '?' + query_string; |
27048
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
669 |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
670 SETOPT (CURLOPT_URL, m_url.c_str ()); |
27048
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
671 } |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
672 else if (action == "post" || action == "put" || action == "delete") |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
673 { |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
674 SETOPT (CURLOPT_POSTFIELDS, query_string.c_str ()); |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
675 |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
676 if (action == "put") |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
677 { |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
678 SETOPT (CURLOPT_CUSTOMREQUEST, "PUT"); |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
679 } |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
680 |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
681 if (action == "delete") |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
682 { |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
683 SETOPT (CURLOPT_CUSTOMREQUEST, "DELETE"); |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
684 } |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
685 |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
686 SETOPT (CURLOPT_URL, m_url.c_str ()); |
27048
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
687 } |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
688 else |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
689 { |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
690 m_ok = false; |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
691 m_errmsg = "curl_transfer: unknown http action"; |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
692 } |
27048
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
693 |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
694 if (m_ok) |
27048
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
695 perform (); |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
696 } |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
697 |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
698 void cookie_jar (const std::string& filename) |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
699 { |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
700 SETOPT (CURLOPT_COOKIEJAR, filename.c_str ()); |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
701 |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
702 SETOPT (CURLOPT_COOKIEFILE, filename.c_str ()); |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
703 } |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
704 |
27929
265b386f8b20
maint: Use two spaces between sentences in code comments.
Rik <rik@octave.org>
parents:
27923
diff
changeset
|
705 // Sets the header fields in a transfer. Input should be in the form |
27048
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
706 // of an array of strings with pairs of keys and values together |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
707 void set_header_fields (const Array<std::string>& param) |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
708 { |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
709 struct curl_slist *slist = nullptr; |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
710 |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
711 unwind_protect frame; |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
712 |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
713 frame.add_fcn (curl_slist_free_all, slist); |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
714 |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
715 if (param.numel () >= 2) |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
716 { |
27933
863ae57eee69
maint: Use Octave coding conventions in liboctave/
Rik <rik@octave.org>
parents:
27929
diff
changeset
|
717 for (int i = 0; i < param.numel (); i += 2) |
863ae57eee69
maint: Use Octave coding conventions in liboctave/
Rik <rik@octave.org>
parents:
27929
diff
changeset
|
718 { |
863ae57eee69
maint: Use Octave coding conventions in liboctave/
Rik <rik@octave.org>
parents:
27929
diff
changeset
|
719 std::string header = param(i) + ": " + param(i+1); |
27048
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
720 |
27933
863ae57eee69
maint: Use Octave coding conventions in liboctave/
Rik <rik@octave.org>
parents:
27929
diff
changeset
|
721 slist = curl_slist_append (slist, header.c_str ()); |
863ae57eee69
maint: Use Octave coding conventions in liboctave/
Rik <rik@octave.org>
parents:
27929
diff
changeset
|
722 } |
27048
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
723 |
27933
863ae57eee69
maint: Use Octave coding conventions in liboctave/
Rik <rik@octave.org>
parents:
27929
diff
changeset
|
724 SETOPT (CURLOPT_HTTPHEADER, slist); |
863ae57eee69
maint: Use Octave coding conventions in liboctave/
Rik <rik@octave.org>
parents:
27929
diff
changeset
|
725 } |
27048
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
726 } |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
727 |
27048
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
728 // Sets and sends the form data associated with a transfer. |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
729 // Input should be an array of strings with each pair of strings |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
730 // corresponding to the fieldname and it's value. |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
731 // To attach a file, you should use 'file' as the fieldname with the |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
732 // path of the file as its value. |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
733 void form_data_post (const Array<std::string>& param) |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
734 { |
28223
45763d59cb4f
use nullptr instead of NULL or 0 in a few more places
John W. Eaton <jwe@octave.org>
parents:
27978
diff
changeset
|
735 struct curl_httppost *post = nullptr, *last = nullptr; |
27048
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
736 |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
737 SETOPT (CURLOPT_URL, m_host_or_url.c_str ()); |
27048
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
738 |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
739 unwind_protect frame; |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
740 |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
741 frame.add_fcn (curl_formfree, post); |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
742 |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
743 if (param.numel () >= 2) |
27933
863ae57eee69
maint: Use Octave coding conventions in liboctave/
Rik <rik@octave.org>
parents:
27929
diff
changeset
|
744 { |
863ae57eee69
maint: Use Octave coding conventions in liboctave/
Rik <rik@octave.org>
parents:
27929
diff
changeset
|
745 for (int i = 0; i < param.numel (); i += 2) |
863ae57eee69
maint: Use Octave coding conventions in liboctave/
Rik <rik@octave.org>
parents:
27929
diff
changeset
|
746 { |
863ae57eee69
maint: Use Octave coding conventions in liboctave/
Rik <rik@octave.org>
parents:
27929
diff
changeset
|
747 std::string name = param(i); |
863ae57eee69
maint: Use Octave coding conventions in liboctave/
Rik <rik@octave.org>
parents:
27929
diff
changeset
|
748 std::string data = param(i+1); |
27048
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
749 |
27933
863ae57eee69
maint: Use Octave coding conventions in liboctave/
Rik <rik@octave.org>
parents:
27929
diff
changeset
|
750 if (name == "file") |
863ae57eee69
maint: Use Octave coding conventions in liboctave/
Rik <rik@octave.org>
parents:
27929
diff
changeset
|
751 curl_formadd (&post, &last, CURLFORM_COPYNAME, name.c_str (), |
863ae57eee69
maint: Use Octave coding conventions in liboctave/
Rik <rik@octave.org>
parents:
27929
diff
changeset
|
752 CURLFORM_FILE, data.c_str (), CURLFORM_END); |
863ae57eee69
maint: Use Octave coding conventions in liboctave/
Rik <rik@octave.org>
parents:
27929
diff
changeset
|
753 else |
863ae57eee69
maint: Use Octave coding conventions in liboctave/
Rik <rik@octave.org>
parents:
27929
diff
changeset
|
754 curl_formadd(&post, &last, CURLFORM_COPYNAME, name.c_str (), |
863ae57eee69
maint: Use Octave coding conventions in liboctave/
Rik <rik@octave.org>
parents:
27929
diff
changeset
|
755 CURLFORM_COPYCONTENTS, data.c_str (), CURLFORM_END); |
863ae57eee69
maint: Use Octave coding conventions in liboctave/
Rik <rik@octave.org>
parents:
27929
diff
changeset
|
756 } |
27048
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
757 |
27933
863ae57eee69
maint: Use Octave coding conventions in liboctave/
Rik <rik@octave.org>
parents:
27929
diff
changeset
|
758 SETOPT (CURLOPT_HTTPPOST, post); |
863ae57eee69
maint: Use Octave coding conventions in liboctave/
Rik <rik@octave.org>
parents:
27929
diff
changeset
|
759 } |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
760 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
761 perform (); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
762 } |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
763 |
27048
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
764 // Sets the various options specified by weboptions object. |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
765 void set_weboptions (const struct weboptions& options) |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
766 { |
27048
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
767 // Remove this after completing fixmes. |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
768 std::string temp = ""; |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
769 |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
770 set_header_fields (options.HeaderFields); |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
771 |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
772 SETOPT (CURLOPT_TIMEOUT, options.Timeout); |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
773 |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
774 if (! options.UserAgent.empty ()) |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
775 SETOPT (CURLOPT_USERAGENT, options.UserAgent.c_str ()); |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
776 |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
777 if (! options.Username.empty ()) |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
778 { |
27933
863ae57eee69
maint: Use Octave coding conventions in liboctave/
Rik <rik@octave.org>
parents:
27929
diff
changeset
|
779 if (! options.Password.empty ()) |
863ae57eee69
maint: Use Octave coding conventions in liboctave/
Rik <rik@octave.org>
parents:
27929
diff
changeset
|
780 { |
863ae57eee69
maint: Use Octave coding conventions in liboctave/
Rik <rik@octave.org>
parents:
27929
diff
changeset
|
781 std::string tmp = options.Username + ":" + options.Password; |
863ae57eee69
maint: Use Octave coding conventions in liboctave/
Rik <rik@octave.org>
parents:
27929
diff
changeset
|
782 SETOPT (CURLOPT_USERPWD, tmp.c_str ()); |
863ae57eee69
maint: Use Octave coding conventions in liboctave/
Rik <rik@octave.org>
parents:
27929
diff
changeset
|
783 } |
863ae57eee69
maint: Use Octave coding conventions in liboctave/
Rik <rik@octave.org>
parents:
27929
diff
changeset
|
784 else |
863ae57eee69
maint: Use Octave coding conventions in liboctave/
Rik <rik@octave.org>
parents:
27929
diff
changeset
|
785 { |
863ae57eee69
maint: Use Octave coding conventions in liboctave/
Rik <rik@octave.org>
parents:
27929
diff
changeset
|
786 std::string tmp = options.Username + ":"; |
863ae57eee69
maint: Use Octave coding conventions in liboctave/
Rik <rik@octave.org>
parents:
27929
diff
changeset
|
787 SETOPT (CURLOPT_USERPWD, tmp.c_str ()); |
863ae57eee69
maint: Use Octave coding conventions in liboctave/
Rik <rik@octave.org>
parents:
27929
diff
changeset
|
788 } |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
789 } |
27048
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
790 |
27929
265b386f8b20
maint: Use two spaces between sentences in code comments.
Rik <rik@octave.org>
parents:
27923
diff
changeset
|
791 // Unimplemented. Only for MATLAB compatibility. |
27048
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
792 if (! options.ContentReader.empty ()) |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
793 temp = options.ContentReader; |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
794 |
27929
265b386f8b20
maint: Use two spaces between sentences in code comments.
Rik <rik@octave.org>
parents:
27923
diff
changeset
|
795 // Unimplemented. Only for MATLAB compatibility. |
27048
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
796 if (! options.ArrayFormat.empty ()) |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
797 temp = options.ArrayFormat; |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
798 |
27929
265b386f8b20
maint: Use two spaces between sentences in code comments.
Rik <rik@octave.org>
parents:
27923
diff
changeset
|
799 // Unimplemented. Only for MATLAB compatibility. |
27048
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
800 if (! options.CertificateFilename.empty ()) |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
801 temp = options.CertificateFilename; |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
802 } |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
803 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
804 private: |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
805 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
806 // Pointer to cURL object. |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
807 CURL *m_curl; |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
808 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
809 // cURL error code. |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
810 CURLcode m_errnum; |
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 // 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
|
813 // 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
|
814 // 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
|
815 // 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
|
816 // |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
817 // 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
|
818 // implementing the function call. |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
819 // |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
820 // 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
|
821 // 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
|
822 // 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
|
823 // 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
|
824 // candidate for storing the strings as well. (bug #36717) |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
825 std::string m_url; |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
826 std::string m_userpwd; |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
827 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
828 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
|
829 std::istream& is, std::ostream& os) |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
830 { |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
831 // No data transfer by default |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
832 SETOPT (CURLOPT_NOBODY, 1); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
833 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
834 // Set the username and password |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
835 m_userpwd = user; |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
836 if (! passwd.empty ()) |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
837 m_userpwd += ':' + passwd; |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
838 if (! m_userpwd.empty ()) |
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
839 SETOPT (CURLOPT_USERPWD, m_userpwd.c_str ()); |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
840 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
841 // 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
|
842 SETOPT (CURLOPT_WRITEFUNCTION, write_data); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
843 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
844 // 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
|
845 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
|
846 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
847 // 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
|
848 SETOPT (CURLOPT_READFUNCTION, read_data); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
849 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
850 // 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
|
851 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
|
852 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
853 // Follow redirects. |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
854 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
|
855 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
856 // 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
|
857 // 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
|
858 // instead. |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
859 SETOPT (CURLOPT_FTP_USE_EPSV, false); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
860 |
27048
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
861 // Set the user agent for the curl request |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
862 // Needed by mediaWiki API. |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
863 curl_version_info_data * data = curl_version_info(CURLVERSION_NOW); |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
864 const char *lib_ver = data->version; |
27277
db687716fed6
style fixes: generally aim to break long lines before operators, not after
John W. Eaton <jwe@octave.org>
parents:
27174
diff
changeset
|
865 std::string user_agent |
db687716fed6
style fixes: generally aim to break long lines before operators, not after
John W. Eaton <jwe@octave.org>
parents:
27174
diff
changeset
|
866 ("GNU Octave/" |
db687716fed6
style fixes: generally aim to break long lines before operators, not after
John W. Eaton <jwe@octave.org>
parents:
27174
diff
changeset
|
867 + std::string (OCTAVE_VERSION) |
db687716fed6
style fixes: generally aim to break long lines before operators, not after
John W. Eaton <jwe@octave.org>
parents:
27174
diff
changeset
|
868 + " (https://www.gnu.org/software/octave/ ; help@octave.org) libcurl/" |
db687716fed6
style fixes: generally aim to break long lines before operators, not after
John W. Eaton <jwe@octave.org>
parents:
27174
diff
changeset
|
869 + std::string (lib_ver)); |
27048
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
870 |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
871 SETOPT (CURLOPT_USERAGENT, user_agent.c_str ()); |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
872 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
873 SETOPT (CURLOPT_NOPROGRESS, true); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
874 SETOPT (CURLOPT_FAILONERROR, true); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
875 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
876 SETOPT (CURLOPT_POSTQUOTE, 0); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
877 SETOPT (CURLOPT_QUOTE, 0); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
878 } |
17595
4b65355a31f2
avoid some code duplication in url-transfer ftp methods
John W. Eaton <jwe@octave.org>
parents:
17563
diff
changeset
|
879 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
880 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
|
881 { |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
882 std::ostringstream query; |
17595
4b65355a31f2
avoid some code duplication in url-transfer ftp methods
John W. Eaton <jwe@octave.org>
parents:
17563
diff
changeset
|
883 |
27048
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
884 if (param.numel () >= 2) |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
885 for (int i = 0; i < param.numel (); i += 2) |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
886 { |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
887 std::string name = param(i); |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
888 std::string text = param(i+1); |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
889 |
27048
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
890 // Encode strings. |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
891 char *enc_name = curl_easy_escape (m_curl, name.c_str (), |
27048
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
892 name.length ()); |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
893 char *enc_text = curl_easy_escape (m_curl, text.c_str (), |
27048
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
894 text.length ()); |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
895 |
27048
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
896 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
|
897 |
27048
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
898 curl_free (enc_name); |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
899 curl_free (enc_text); |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
900 |
27048
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
901 if (i < param.numel ()-2) |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
902 query << '&'; |
159402e52cfa
New implementation of RESTful web services as part of GSoC 2018 (patch #9795).
Sahil Yadav <yadavsahil5198@gmail.com>
parents:
26376
diff
changeset
|
903 } |
17595
4b65355a31f2
avoid some code duplication in url-transfer ftp methods
John W. Eaton <jwe@octave.org>
parents:
17563
diff
changeset
|
904 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
905 query.flush (); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
906 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
907 return query.str (); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
908 } |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
909 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
910 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
|
911 const std::string& action) |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
912 { |
23457
21baad6b35c4
maint: Use C++11 nullptr rather than 0 or NULL when possible.
Rik <rik@octave.org>
parents:
23447
diff
changeset
|
913 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
|
914 |
23696
08036a7f3660
remove octave:: namespace tag from symbols used inside octave namespace
John W. Eaton <jwe@octave.org>
parents:
23457
diff
changeset
|
915 unwind_protect frame; |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
916 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
917 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
|
918 |
23807
336f89b6208b
Use character literals 'c' rather than string literals "c" when possible.
Rik <rik@octave.org>
parents:
23696
diff
changeset
|
919 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
|
920 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
921 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
|
922 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
923 SETOPT (CURLOPT_POSTQUOTE, slist); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
924 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
925 perform (); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
926 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
927 if (! good ()) |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
928 return; |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
929 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
930 SETOPT (CURLOPT_POSTQUOTE, 0); |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
931 } |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
932 }; |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
933 |
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
934 #undef SETOPT |
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
935 |
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
936 #endif |
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
937 |
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
938 #if defined (HAVE_CURL) |
21202
f7121e111991
maint: indent #ifdef blocks in liboctave and src directories.
Rik <rik@octave.org>
parents:
20955
diff
changeset
|
939 # define REP_CLASS curl_transfer |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
940 #else |
21202
f7121e111991
maint: indent #ifdef blocks in liboctave and src directories.
Rik <rik@octave.org>
parents:
20955
diff
changeset
|
941 # define REP_CLASS base_url_transfer |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
942 #endif |
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
943 |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
944 url_transfer::url_transfer (void) : m_rep (new REP_CLASS ()) |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
945 { } |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
946 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
947 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
|
948 const std::string& passwd, std::ostream& os) |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
949 : m_rep (new REP_CLASS (host, user, passwd, os)) |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
950 { } |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
951 |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
952 url_transfer::url_transfer (const std::string& url, std::ostream& os) |
27174
b42350f18afb
style fixes for url-transfer classes
John W. Eaton <jwe@octave.org>
parents:
27102
diff
changeset
|
953 : m_rep (new REP_CLASS (url, os)) |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
954 { } |
17555
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
955 |
0946b0e06544
move url_transfer classes to liboctave
John W. Eaton <jwe@octave.org>
parents:
diff
changeset
|
956 #undef REP_CLASS |
21744
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
957 |
e1be0b36fbed
use namespace for url_transfer class
John W. Eaton <jwe@octave.org>
parents:
21743
diff
changeset
|
958 } |