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

annotate liboctave/util/url-transfer.cc @ 27933:863ae57eee69

maint: Use Octave coding conventions in liboctave/ * Array-C.cc, Array-d.cc, Array-f.cc, MSparse.cc, Sparse.cc, dim-vector.h, xerbla.cc, aepbalance.cc, eigs-base.cc, gepbalance.cc, oct-fftw.cc, randmtzig.cc, mx-inlines.cc, lo-sysdep.cc, base-list.h, cmd-edit.h, lo-regexp.cc, oct-atomic.h, oct-binmap.h, oct-inttypes.cc, oct-inttypes.h, quit.h, url-transfer.cc: Use Octave coding conventions in liboctave.

author	Rik <rik@octave.org>
date	Sat, 11 Jan 2020 12:53:20 -0800
parents	265b386f8b20
children	c20b7290c778

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
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	26 // Author: Alexander Barth <abarth@marine.usf.edu>
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	27
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	28 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21202 diff changeset	29 # include "config.h"
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	30 #endif
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	31
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	32 #include <fstream>
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	33 #include <iomanip>
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	34 #include <iostream>
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	35
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	36 #include "dir-ops.h"
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	37 #include "file-ops.h"
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	38 #include "file-stat.h"
25516 8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	39 #include "lo-sysdep.h"
25281 35115cc6183b allow users to set path to CA certificates for cURL John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	40 #include "oct-env.h"
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	41 #include "unwind-prot.h"
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	42 #include "url-transfer.h"
27048 159402e52cfa New implementation of RESTful web services as part of GSoC 2018 (patch #9795). Sahil Yadav <yadavsahil5198@gmail.com> parents: 26376 diff changeset	43 #include "version.h"
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	44
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21301 diff changeset	45 #if defined (HAVE_CURL)
21202 f7121e111991 maint: indent #ifdef blocks in liboctave and src directories. Rik <rik@octave.org> parents: 20955 diff changeset	46 # include <curl/curl.h>
f7121e111991 maint: indent #ifdef blocks in liboctave and src directories. Rik <rik@octave.org> parents: 20955 diff changeset	47 # include <curl/curlver.h>
f7121e111991 maint: indent #ifdef blocks in liboctave and src directories. Rik <rik@octave.org> parents: 20955 diff changeset	48 # include <curl/easy.h>
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	49 #endif
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	50
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	51 namespace octave
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	52 {
25438 cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25281 diff changeset	53 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	54 : 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	55 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	56 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	57 { }
25438 cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25281 diff changeset	58
cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25281 diff changeset	59 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	60 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	61 const std::string& /* passwd */,
cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25281 diff changeset	62 std::ostream& os)
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	63 : 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	64 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	65 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	66 { }
25438 cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25281 diff changeset	67
cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25281 diff changeset	68 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	69 std::ostream& os)
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	70 : 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	71 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	72 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	73 { }
25438 cb1606f78f6b prefer <istream>, <ostream>, or <iosfwd> to <iostream> where possible John W. Eaton <jwe@octave.org> parents: 25281 diff changeset	74
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	75 void
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	76 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	77 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	78 sys::unlink (file);
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	79 }
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	80
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	81 void
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	82 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	83 const std::string& target)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	84 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	85 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	86 sys::file_stat fs (directory);
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	87
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	88 if (! fs \|\| ! fs.is_dir ())
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	89 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	90 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	91 int status = sys::mkdir (directory, 0777, msg);
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	92
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	93 if (status < 0)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	94 {
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	95 m_ok = false;
b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	96 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	97 + target + sep + directory + "': " + msg;
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	98 return;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	99 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	100 }
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 cwd (directory);
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	103
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	104 if (good ())
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	105 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	106 unwind_protect_safe frame;
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	107
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	108 frame.add_fcn (reset_path, this);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	109
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	110 string_vector sv = list ();
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	111
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	112 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	113 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	114 time_t ftime;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	115 bool fisdir;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	116 double fsize;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	117
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	118 get_fileinfo (sv(i), fsize, ftime, fisdir);
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	119
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	120 if (fisdir)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	121 mget_directory (sv(i), target + directory + sep);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	122 else
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	123 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	124 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	125
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	126 std::ofstream ofile (realfile.c_str (),
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	127 std::ios::out \| std::ios::binary);
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	128
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	129 if (! ofile.is_open ())
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	130 {
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	131 m_ok = false;
b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	132 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	133 break;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	134 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	135
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	136 unwind_protect_safe frame2;
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	137
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	138 frame2.add_fcn (delete_file, realfile);
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	139
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	140 get (sv(i), ofile);
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 ofile.close ();
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	143
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	144 if (good ())
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	145 frame2.discard ();
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	146 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	147
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	148 if (! good ())
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	149 break;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	150 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	151 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	152 }
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	153
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	154 string_vector
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	155 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	156 const std::string& directory)
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 string_vector file_list;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	159
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	160 std::string realdir
21885 0806871e3e1e maint: Prefer is_empty() rather than "length () == 0". Rik <rik@octave.org> parents: 21751 diff changeset	161 = (base.empty ()
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	162 ? 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	163
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	164 mkdir (directory);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	165
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	166 if (! good ())
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	167 return file_list;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	168
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	169 cwd (directory);
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	170
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	171 if (good ())
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	172 {
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	173 unwind_protect_safe frame;
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	174
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	175 frame.add_fcn (reset_path, this);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	176
25516 8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	177 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	178 std::string msg;
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	179
25516 8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	180 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	181 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	182 {
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	183 std::string file = files (i);
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	184
25516 8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	185 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	186 continue;
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	187
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	188 std::string realfile
b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	189 = 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	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 sys::file_stat fs (realfile);
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	192
25516 8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	193 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	194 {
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	195 m_ok = false;
b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	196 m_errmsg = "__ftp__mput: file '" + realfile
27933 863ae57eee69 maint: Use Octave coding conventions in liboctave/ Rik <rik@octave.org> parents: 27929 diff changeset	197 + "' 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	198 break;
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	199 }
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	200
25516 8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	201 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	202 {
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	203 file_list.append (mput_directory (realdir, file));
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	204
25516 8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	205 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	206 break;
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 else
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	209 {
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	210 // 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	211 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	212
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	213 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	214 std::ios::in \| std::ios::binary);
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	215
25516 8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	216 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	217 {
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	218 m_ok = false;
b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	219 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	220 + 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	221 break;
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	222 }
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 put (file, ifile);
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 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 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	227
25516 8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	228 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	229 break;
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 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	232 }
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	233 }
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	234 else
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	235 {
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	236 m_ok = false;
b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	237 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	238 + realdir + "'";
21744 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 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	241
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	242 return file_list;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	243 }
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	244
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	245 #if defined (HAVE_CURL)
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	246
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	247 static int
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	248 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	249 {
23447 db1fdf4384dd maint: Use convention "static_cast<void >" for casting of pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	250 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	251 stream.write (static_cast<const char > (buffer), sizenmemb);
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	252 return (stream.fail () ? 0 : size * nmemb);
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	253 }
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	254
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	255 static int
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	256 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	257 {
23447 db1fdf4384dd maint: Use convention "static_cast<void >" for casting of pointers. Rik <rik@octave.org>* parents: 23220 diff changeset	258 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	259 stream.read (static_cast<char > (buffer), sizenmemb);
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	260 if (stream.eof ())
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	261 return stream.gcount ();
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	262 else
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	263 return (stream.fail () ? 0 : size * nmemb);
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	264 }
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	265
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	266 static size_t
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	267 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	268 {
25688 b2917b7858ba maint: Use Octave convention for spacing of C++ cast statements. Rik <rik@octave.org> parents: 25604 diff changeset	269 return static_cast<size_t> (size * nmemb);
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	270 }
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	271
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	272 // 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	273 // 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	274 // the curl_easy_setopt function.
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	275 #define SETOPT(option, parameter) \
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	276 do \
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	277 { \
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	278 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	279 if (res != CURLE_OK) \
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	280 { \
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	281 m_ok = false; \
b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	282 m_errmsg = curl_easy_strerror (res); \
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	283 return; \
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	284 } \
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	285 } \
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	286 while (0)
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	287
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	288 // 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	289 #define SETOPTR(option, parameter) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	290 do \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	291 { \
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	292 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	293 if (res != CURLE_OK) \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	294 { \
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	295 m_ok = false; \
b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	296 m_errmsg = curl_easy_strerror (res); \
22197 e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	297 return retval; \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	298 } \
e43d83253e28 refill multi-line macro definitions John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	299 } \
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	300 while (0)
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	301
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	302 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	303 {
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	304 public:
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	305
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	306 curl_transfer (void)
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	307 : 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	308 m_userpwd ()
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	309 {
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	310 if (m_curl)
b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	311 m_valid = true;
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	312 else
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	313 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	314 }
17596 43b9181340fb separate object creation from http actions in url_transfer class John W. Eaton <jwe@octave.org> parents: 17595 diff changeset	315
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	316 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	317 const std::string& passwd, std::ostream& os)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	318 : 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	319 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	320 {
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	321 if (m_curl)
b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	322 m_valid = true;
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	323 else
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	324 {
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	325 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	326 return;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	327 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	328
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	329 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	330
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	331 m_url = "ftp://" + host;
b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	332 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	333
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	334 // Set up the link, with no transfer.
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	335 perform ();
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	336 }
17596 43b9181340fb separate object creation from http actions in url_transfer class John W. Eaton <jwe@octave.org> parents: 17595 diff changeset	337
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	338 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	339 : 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	340 m_errnum (), m_url (), m_userpwd ()
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	341 {
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	342 if (m_curl)
b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	343 m_valid = true;
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	344 else
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	345 {
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	346 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	347 return;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	348 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	349
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	350 init ("", "", std::cin, os);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	351
25281 35115cc6183b allow users to set path to CA certificates for cURL John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	352 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	353 if (! cainfo.empty ())
35115cc6183b allow users to set path to CA certificates for cURL John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	354 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	355
35115cc6183b allow users to set path to CA certificates for cURL John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	356 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	357 if (! capath.empty ())
35115cc6183b allow users to set path to CA certificates for cURL John W. Eaton <jwe@octave.org> parents: 25054 diff changeset	358 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	359
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	360 SETOPT (CURLOPT_NOBODY, 0);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	361
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	362 // 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	363 // 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	364 // 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	365 // libcurl < 7.18.2.
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	366 SETOPT (CURLOPT_HTTPGET, 1);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	367 }
17596 43b9181340fb separate object creation from http actions in url_transfer class John W. Eaton <jwe@octave.org> parents: 17595 diff changeset	368
22869 f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	369 // No copying!
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 (const curl_transfer&) = delete;
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	372
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	373 curl_transfer& operator = (const curl_transfer&) = delete;
f75d289645ec make deleted functions public John W. Eaton <jwe@octave.org> parents: 22865 diff changeset	374
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	375 ~curl_transfer (void)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	376 {
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	377 if (m_curl)
b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	378 curl_easy_cleanup (m_curl);
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	379 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	380
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	381 void perform (void)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	382 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	383 BEGIN_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
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 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	386
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	387 if (m_errnum != CURLE_OK)
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	388 {
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	389 m_ok = false;
b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	390 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	391 }
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 END_INTERRUPT_IMMEDIATELY_IN_FOREIGN_CODE;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	394 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	395
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	396 std::string lasterror (void) const
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	397 {
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	398 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	399 }
17596 43b9181340fb separate object creation from http actions in url_transfer class John W. Eaton <jwe@octave.org> parents: 17595 diff changeset	400
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	401 std::ostream& set_ostream (std::ostream& os)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	402 {
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	403 std::ostream& retval = *m_curr_ostream;
b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	404 m_curr_ostream = &os;
b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	405 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	406 return retval;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	407 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	408
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	409 std::istream& set_istream (std::istream& is)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	410 {
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	411 std::istream& retval = *m_curr_istream;
b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	412 m_curr_istream = &is;
b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	413 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	414 return retval;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	415 }
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	416
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	417 void ascii (void)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	418 {
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	419 m_ascii_mode = true;
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	420 SETOPT (CURLOPT_TRANSFERTEXT, 1);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	421 }
17601 9e507e30c9ea keep a copy of user+password data for older cURL libraries John W. Eaton <jwe@octave.org> parents: 17598 diff changeset	422
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	423 void binary (void)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	424 {
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	425 m_ascii_mode = false;
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	426 SETOPT (CURLOPT_TRANSFERTEXT, 0);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	427 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	428
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	429 void cwd (const std::string& path)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	430 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	431 ftp_file_or_dir_action (path, "cwd");
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	432 }
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 void del (const std::string& file)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	435 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	436 ftp_file_or_dir_action (file, "dele");
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	437 }
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	438
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	439 void rmdir (const std::string& path)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	440 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	441 ftp_file_or_dir_action (path, "rmd");
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	442 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	443
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	444 void mkdir (const std::string& path)
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 ftp_file_or_dir_action (path, "mkd");
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	447 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	448
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	449 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	450 {
23457 21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23447 diff changeset	451 struct curl_slist *slist = nullptr;
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	452
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	453 unwind_protect frame;
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	454 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	455
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	456 std::string cmd = "rnfr " + oldname;
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 cmd = "rnto " + newname;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	459 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	460 SETOPT (CURLOPT_POSTQUOTE, slist);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	461
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	462 perform ();
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	463 if (! good ())
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	464 return;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	465
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	466 SETOPT (CURLOPT_POSTQUOTE, 0);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	467 }
17601 9e507e30c9ea keep a copy of user+password data for older cURL libraries John W. Eaton <jwe@octave.org> parents: 17598 diff changeset	468
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	469 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	470 {
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	471 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	472 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	473 SETOPT (CURLOPT_UPLOAD, 1);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	474 SETOPT (CURLOPT_NOBODY, 0);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	475 std::istream& old_is = set_istream (is);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	476
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	477 perform ();
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	478 if (! good ())
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	479 return;
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	480
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	481 set_istream (old_is);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	482 SETOPT (CURLOPT_NOBODY, 1);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	483 SETOPT (CURLOPT_UPLOAD, 0);
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	484 m_url = "ftp://" + m_host_or_url;
b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	485 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	486 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	487
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	488 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	489 {
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	490 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	491 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	492 SETOPT (CURLOPT_NOBODY, 0);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	493 std::ostream& old_os = set_ostream (os);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	494
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	495 perform ();
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	496 if (! good ())
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	497 return;
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	498
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	499 set_ostream (old_os);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	500 SETOPT (CURLOPT_NOBODY, 1);
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	501 m_url = "ftp://" + m_host_or_url;
b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	502 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	503 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	504
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	505 void dir (void)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	506 {
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	507 m_url = "ftp://" + m_host_or_url + '/';
b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	508 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	509 SETOPT (CURLOPT_NOBODY, 0);
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	510
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	511 perform ();
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	512 if (! good ())
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	513 return;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	514
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	515 SETOPT (CURLOPT_NOBODY, 1);
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	516 m_url = "ftp://" + m_host_or_url;
b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	517 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	518 }
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 list (void)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	521 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	522 string_vector retval;
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	523
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	524 std::ostringstream buf;
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	525 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	526 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	527 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	528 SETOPTR (CURLOPT_DIRLISTONLY, 1);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	529 SETOPTR (CURLOPT_NOBODY, 0);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	530
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	531 perform ();
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	532 if (! good ())
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	533 return retval;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	534
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	535 SETOPTR (CURLOPT_NOBODY, 1);
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	536 m_url = "ftp://" + m_host_or_url;
b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	537 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	538 SETOPTR (CURLOPT_DIRLISTONLY, 0);
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	539 SETOPTR (CURLOPT_URL, m_url.c_str ());
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	540
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	541 // Count number of directory entries
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	542 std::string str = buf.str ();
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	543 octave_idx_type n = 0;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	544 size_t pos = 0;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	545 while (true)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	546 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	547 pos = str.find_first_of ('\n', pos);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	548 if (pos == std::string::npos)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	549 break;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	550 pos++;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	551 n++;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	552 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	553 retval.resize (n);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	554 pos = 0;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	555 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	556 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	557 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	558 if (newpos == std::string::npos)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	559 break;
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	560
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	561 retval(i) = str.substr(pos, newpos - pos);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	562 pos = newpos + 1;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	563 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	564
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	565 return retval;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	566 }
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	567
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	568 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	569 time_t& filetime, bool& fileisdir)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	570 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	571 std::string path = pwd ();
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	572
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	573 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	574 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	575 SETOPT (CURLOPT_FILETIME, 1);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	576 SETOPT (CURLOPT_HEADERFUNCTION, throw_away);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	577 SETOPT (CURLOPT_WRITEFUNCTION, throw_away);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	578
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	579 // FIXME
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	580 // 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	581 // 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	582 // 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	583
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	584 perform ();
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	585 if (! good ())
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	586 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	587 fileisdir = true;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	588 filetime = -1;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	589 filesize = 0;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	590
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	591 return;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	592 }
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	593
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	594 fileisdir = false;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	595 time_t ft;
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	596 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	597 filetime = ft;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	598 double fs;
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	599 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	600 filesize = fs;
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	601
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	602 SETOPT (CURLOPT_WRITEFUNCTION, write_data);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	603 SETOPT (CURLOPT_HEADERFUNCTION, 0);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	604 SETOPT (CURLOPT_FILETIME, 0);
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	605 m_url = "ftp://" + m_host_or_url;
b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	606 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	607
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	608 // 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	609 // 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	610 // 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	611 // 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	612 cwd ('/' + path);
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	613 }
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	614
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	615 std::string pwd (void)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	616 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	617 std::string retval;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	618
23457 21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23447 diff changeset	619 struct curl_slist *slist = nullptr;
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	620
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	621 unwind_protect frame;
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	622 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	623
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	624 slist = curl_slist_append (slist, "pwd");
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	625 SETOPTR (CURLOPT_POSTQUOTE, slist);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	626 SETOPTR (CURLOPT_HEADERFUNCTION, write_data);
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	627
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	628 std::ostringstream buf;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	629 SETOPTR (CURLOPT_WRITEHEADER, static_cast<void *>(&buf));
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	630
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	631 perform ();
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	632 if (! good ())
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	633 return retval;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	634
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	635 retval = buf.str ();
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	636
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	637 // Can I assume that the path is alway in "" on the last line
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	638 size_t pos2 = retval.rfind ('"');
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	639 size_t pos1 = retval.rfind ('"', pos2 - 1);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	640 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	641
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	642 SETOPTR (CURLOPT_HEADERFUNCTION, 0);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	643 SETOPTR (CURLOPT_WRITEHEADER, 0);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	644 SETOPTR (CURLOPT_POSTQUOTE, 0);
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 return retval;
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	647 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	648
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	649 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	650 {
27048 159402e52cfa New implementation of RESTful web services as part of GSoC 2018 (patch #9795). Sahil Yadav <yadavsahil5198@gmail.com> parents: 26376 diff changeset	651 http_action (param, "get");
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	652 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	653
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	654 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	655 {
27048 159402e52cfa New implementation of RESTful web services as part of GSoC 2018 (patch #9795). Sahil Yadav <yadavsahil5198@gmail.com> parents: 26376 diff changeset	656 http_action (param, "post");
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	657 }
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	658
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	659 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	660 {
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	661 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	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 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	664
159402e52cfa New implementation of RESTful web services as part of GSoC 2018 (patch #9795). Sahil Yadav <yadavsahil5198@gmail.com> parents: 26376 diff changeset	665 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	666
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	667 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	668 {
159402e52cfa New implementation of RESTful web services as part of GSoC 2018 (patch #9795). Sahil Yadav <yadavsahil5198@gmail.com> parents: 26376 diff changeset	669 if (! query_string.empty ())
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	670 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	671
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	672 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	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 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	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 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	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 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	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 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	681 }
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 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	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 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	686 }
159402e52cfa New implementation of RESTful web services as part of GSoC 2018 (patch #9795). Sahil Yadav <yadavsahil5198@gmail.com> parents: 26376 diff changeset	687
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	688 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	689 }
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	690 else
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	691 {
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	692 m_ok = false;
b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	693 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	694 }
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
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	696 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	697 perform ();
159402e52cfa New implementation of RESTful web services as part of GSoC 2018 (patch #9795). Sahil Yadav <yadavsahil5198@gmail.com> parents: 26376 diff changeset	698 }
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 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	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_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	703
159402e52cfa New implementation of RESTful web services as part of GSoC 2018 (patch #9795). Sahil Yadav <yadavsahil5198@gmail.com> parents: 26376 diff changeset	704 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	705 }
159402e52cfa New implementation of RESTful web services as part of GSoC 2018 (patch #9795). Sahil Yadav <yadavsahil5198@gmail.com> parents: 26376 diff changeset	706
27929 265b386f8b20 maint: Use two spaces between sentences in code comments. Rik <rik@octave.org> parents: 27923 diff changeset	707 // 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	708 // 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	709 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	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 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	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 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	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 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	716
159402e52cfa New implementation of RESTful web services as part of GSoC 2018 (patch #9795). Sahil Yadav <yadavsahil5198@gmail.com> parents: 26376 diff changeset	717 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	718 {
27933 863ae57eee69 maint: Use Octave coding conventions in liboctave/ Rik <rik@octave.org> parents: 27929 diff changeset	719 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	720 {
863ae57eee69 maint: Use Octave coding conventions in liboctave/ Rik <rik@octave.org> parents: 27929 diff changeset	721 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	722
27933 863ae57eee69 maint: Use Octave coding conventions in liboctave/ Rik <rik@octave.org> parents: 27929 diff changeset	723 slist = curl_slist_append (slist, header.c_str ());
863ae57eee69 maint: Use Octave coding conventions in liboctave/ Rik <rik@octave.org> parents: 27929 diff changeset	724 }
27048 159402e52cfa New implementation of RESTful web services as part of GSoC 2018 (patch #9795). Sahil Yadav <yadavsahil5198@gmail.com> parents: 26376 diff changeset	725
27933 863ae57eee69 maint: Use Octave coding conventions in liboctave/ Rik <rik@octave.org> parents: 27929 diff changeset	726 SETOPT (CURLOPT_HTTPHEADER, slist);
863ae57eee69 maint: Use Octave coding conventions in liboctave/ Rik <rik@octave.org> parents: 27929 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 }
159402e52cfa New implementation of RESTful web services as part of GSoC 2018 (patch #9795). Sahil Yadav <yadavsahil5198@gmail.com> parents: 26376 diff changeset	729
159402e52cfa New implementation of RESTful web services as part of GSoC 2018 (patch #9795). Sahil Yadav <yadavsahil5198@gmail.com> parents: 26376 diff changeset	730 // 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	731 // 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	732 // 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	733 // 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	734 // 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	735 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	736 {
159402e52cfa New implementation of RESTful web services as part of GSoC 2018 (patch #9795). Sahil Yadav <yadavsahil5198@gmail.com> parents: 26376 diff changeset	737 struct curl_httppost post = NULL, last = NULL;
159402e52cfa New implementation of RESTful web services as part of GSoC 2018 (patch #9795). Sahil Yadav <yadavsahil5198@gmail.com> parents: 26376 diff changeset	738
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	739 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	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 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	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 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	744
159402e52cfa New implementation of RESTful web services as part of GSoC 2018 (patch #9795). Sahil Yadav <yadavsahil5198@gmail.com> parents: 26376 diff changeset	745 if (param.numel () >= 2)
27933 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 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	748 {
863ae57eee69 maint: Use Octave coding conventions in liboctave/ Rik <rik@octave.org> parents: 27929 diff changeset	749 std::string name = param(i);
863ae57eee69 maint: Use Octave coding conventions in liboctave/ Rik <rik@octave.org> parents: 27929 diff changeset	750 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	751
27933 863ae57eee69 maint: Use Octave coding conventions in liboctave/ Rik <rik@octave.org> parents: 27929 diff changeset	752 if (name == "file")
863ae57eee69 maint: Use Octave coding conventions in liboctave/ Rik <rik@octave.org> parents: 27929 diff changeset	753 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	754 CURLFORM_FILE, data.c_str (), CURLFORM_END);
863ae57eee69 maint: Use Octave coding conventions in liboctave/ Rik <rik@octave.org> parents: 27929 diff changeset	755 else
863ae57eee69 maint: Use Octave coding conventions in liboctave/ Rik <rik@octave.org> parents: 27929 diff changeset	756 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	757 CURLFORM_COPYCONTENTS, data.c_str (), CURLFORM_END);
863ae57eee69 maint: Use Octave coding conventions in liboctave/ Rik <rik@octave.org> parents: 27929 diff changeset	758 }
27048 159402e52cfa New implementation of RESTful web services as part of GSoC 2018 (patch #9795). Sahil Yadav <yadavsahil5198@gmail.com> parents: 26376 diff changeset	759
27933 863ae57eee69 maint: Use Octave coding conventions in liboctave/ Rik <rik@octave.org> parents: 27929 diff changeset	760 SETOPT (CURLOPT_HTTPPOST, post);
863ae57eee69 maint: Use Octave coding conventions in liboctave/ Rik <rik@octave.org> parents: 27929 diff changeset	761 }
27048 159402e52cfa New implementation of RESTful web services as part of GSoC 2018 (patch #9795). Sahil Yadav <yadavsahil5198@gmail.com> parents: 26376 diff changeset	762
159402e52cfa New implementation of RESTful web services as part of GSoC 2018 (patch #9795). Sahil Yadav <yadavsahil5198@gmail.com> parents: 26376 diff changeset	763 perform ();
159402e52cfa New implementation of RESTful web services as part of GSoC 2018 (patch #9795). Sahil Yadav <yadavsahil5198@gmail.com> parents: 26376 diff changeset	764 }
159402e52cfa New implementation of RESTful web services as part of GSoC 2018 (patch #9795). Sahil Yadav <yadavsahil5198@gmail.com> parents: 26376 diff changeset	765
159402e52cfa New implementation of RESTful web services as part of GSoC 2018 (patch #9795). Sahil Yadav <yadavsahil5198@gmail.com> parents: 26376 diff changeset	766 // 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	767 void set_weboptions (const struct weboptions& options)
159402e52cfa New implementation of RESTful web services as part of GSoC 2018 (patch #9795). Sahil Yadav <yadavsahil5198@gmail.com> parents: 26376 diff changeset	768 {
159402e52cfa New implementation of RESTful web services as part of GSoC 2018 (patch #9795). Sahil Yadav <yadavsahil5198@gmail.com> parents: 26376 diff changeset	769 // 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	770 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	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 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	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 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	775
159402e52cfa New implementation of RESTful web services as part of GSoC 2018 (patch #9795). Sahil Yadav <yadavsahil5198@gmail.com> parents: 26376 diff changeset	776 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	777 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	778
159402e52cfa New implementation of RESTful web services as part of GSoC 2018 (patch #9795). Sahil Yadav <yadavsahil5198@gmail.com> parents: 26376 diff changeset	779 if (! options.Username.empty ())
27933 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 if (! options.Password.empty ())
863ae57eee69 maint: Use Octave coding conventions in liboctave/ Rik <rik@octave.org> parents: 27929 diff changeset	782 {
863ae57eee69 maint: Use Octave coding conventions in liboctave/ Rik <rik@octave.org> parents: 27929 diff changeset	783 std::string tmp = options.Username + ":" + options.Password;
863ae57eee69 maint: Use Octave coding conventions in liboctave/ Rik <rik@octave.org> parents: 27929 diff changeset	784 SETOPT (CURLOPT_USERPWD, tmp.c_str ());
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 else
863ae57eee69 maint: Use Octave coding conventions in liboctave/ Rik <rik@octave.org> parents: 27929 diff changeset	787 {
863ae57eee69 maint: Use Octave coding conventions in liboctave/ Rik <rik@octave.org> parents: 27929 diff changeset	788 std::string tmp = options.Username + ":";
863ae57eee69 maint: Use Octave coding conventions in liboctave/ Rik <rik@octave.org> parents: 27929 diff changeset	789 SETOPT (CURLOPT_USERPWD, tmp.c_str ());
863ae57eee69 maint: Use Octave coding conventions in liboctave/ Rik <rik@octave.org> parents: 27929 diff changeset	790 }
863ae57eee69 maint: Use Octave coding conventions in liboctave/ Rik <rik@octave.org> parents: 27929 diff changeset	791 }
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
27929 265b386f8b20 maint: Use two spaces between sentences in code comments. Rik <rik@octave.org> parents: 27923 diff changeset	793 // 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	794 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	795 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	796
27929 265b386f8b20 maint: Use two spaces between sentences in code comments. Rik <rik@octave.org> parents: 27923 diff changeset	797 // 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	798 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	799 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	800
27929 265b386f8b20 maint: Use two spaces between sentences in code comments. Rik <rik@octave.org> parents: 27923 diff changeset	801 // 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	802 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	803 temp = options.CertificateFilename;
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	804 }
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 private:
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	807
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	808 // Pointer to cURL object.
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	809 CURL *m_curl;
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	810
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	811 // cURL error code.
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	812 CURLcode m_errnum;
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	813
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	814 // 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	815 // 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	816 // 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	817 // 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	818 //
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	819 // 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	820 // implementing the function call.
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	821 //
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	822 // 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	823 // 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	824 // 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	825 // 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	826 // 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	827 std::string m_url;
b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	828 std::string m_userpwd;
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	829
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	830 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	831 std::istream& is, std::ostream& os)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	832 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	833 // No data transfer by default
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	834 SETOPT (CURLOPT_NOBODY, 1);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	835
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	836 // Set the username and password
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	837 m_userpwd = user;
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	838 if (! passwd.empty ())
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	839 m_userpwd += ':' + passwd;
b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	840 if (! m_userpwd.empty ())
b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	841 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	842
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	843 // 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	844 SETOPT (CURLOPT_WRITEFUNCTION, write_data);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	845
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	846 // 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	847 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	848
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	849 // 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	850 SETOPT (CURLOPT_READFUNCTION, read_data);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	851
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	852 // 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	853 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	854
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	855 // Follow redirects.
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	856 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	857
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	858 // 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	859 // 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	860 // instead.
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	861 SETOPT (CURLOPT_FTP_USE_EPSV, false);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	862
27048 159402e52cfa New implementation of RESTful web services as part of GSoC 2018 (patch #9795). Sahil Yadav <yadavsahil5198@gmail.com> parents: 26376 diff changeset	863 // 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	864 // 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	865 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	866 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	867 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	868 ("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	869 + 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	870 + " (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	871 + 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	872
159402e52cfa New implementation of RESTful web services as part of GSoC 2018 (patch #9795). Sahil Yadav <yadavsahil5198@gmail.com> parents: 26376 diff changeset	873 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	874
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	875 SETOPT (CURLOPT_NOPROGRESS, true);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	876 SETOPT (CURLOPT_FAILONERROR, true);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	877
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	878 SETOPT (CURLOPT_POSTQUOTE, 0);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	879 SETOPT (CURLOPT_QUOTE, 0);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	880 }
17595 4b65355a31f2 avoid some code duplication in url-transfer ftp methods John W. Eaton <jwe@octave.org> parents: 17563 diff changeset	881
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	882 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	883 {
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	884 std::ostringstream query;
17595 4b65355a31f2 avoid some code duplication in url-transfer ftp methods John W. Eaton <jwe@octave.org> parents: 17563 diff changeset	885
27048 159402e52cfa New implementation of RESTful web services as part of GSoC 2018 (patch #9795). Sahil Yadav <yadavsahil5198@gmail.com> parents: 26376 diff changeset	886 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	887 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	888 {
159402e52cfa New implementation of RESTful web services as part of GSoC 2018 (patch #9795). Sahil Yadav <yadavsahil5198@gmail.com> parents: 26376 diff changeset	889 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	890 std::string text = param(i+1);
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	891
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 // Encode strings.
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	893 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	894 name.length ());
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	895 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	896 text.length ());
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 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 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	899
27048 159402e52cfa New implementation of RESTful web services as part of GSoC 2018 (patch #9795). Sahil Yadav <yadavsahil5198@gmail.com> parents: 26376 diff changeset	900 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	901 curl_free (enc_text);
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	902
27048 159402e52cfa New implementation of RESTful web services as part of GSoC 2018 (patch #9795). Sahil Yadav <yadavsahil5198@gmail.com> parents: 26376 diff changeset	903 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	904 query << '&';
159402e52cfa New implementation of RESTful web services as part of GSoC 2018 (patch #9795). Sahil Yadav <yadavsahil5198@gmail.com> parents: 26376 diff changeset	905 }
17595 4b65355a31f2 avoid some code duplication in url-transfer ftp methods John W. Eaton <jwe@octave.org> parents: 17563 diff changeset	906
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	907 query.flush ();
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 return query.str ();
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	910 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	911
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	912 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	913 const std::string& action)
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	914 {
23457 21baad6b35c4 maint: Use C++11 nullptr rather than 0 or NULL when possible. Rik <rik@octave.org> parents: 23447 diff changeset	915 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	916
23696 08036a7f3660 remove octave:: namespace tag from symbols used inside octave namespace John W. Eaton <jwe@octave.org> parents: 23457 diff changeset	917 unwind_protect frame;
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	918
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	919 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	920
23807 336f89b6208b Use character literals 'c' rather than string literals "c" when possible. Rik <rik@octave.org> parents: 23696 diff changeset	921 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	922
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	923 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	924
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	925 SETOPT (CURLOPT_POSTQUOTE, slist);
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 perform ();
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	928
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	929 if (! good ())
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	930 return;
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 SETOPT (CURLOPT_POSTQUOTE, 0);
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	933 }
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	934 };
17555 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 #undef SETOPT
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 #endif
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	939
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	940 #if defined (HAVE_CURL)
21202 f7121e111991 maint: indent #ifdef blocks in liboctave and src directories. Rik <rik@octave.org> parents: 20955 diff changeset	941 # define REP_CLASS curl_transfer
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	942 #else
21202 f7121e111991 maint: indent #ifdef blocks in liboctave and src directories. Rik <rik@octave.org> parents: 20955 diff changeset	943 # define REP_CLASS base_url_transfer
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	944 #endif
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	945
27174 b42350f18afb style fixes for url-transfer classes John W. Eaton <jwe@octave.org> parents: 27102 diff changeset	946 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	947 { }
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	948
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	949 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	950 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	951 : 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	952 { }
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	953
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	954 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	955 : 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	956 { }
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	957
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: diff changeset	958 #undef REP_CLASS
21744 e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	959
e1be0b36fbed use namespace for url_transfer class John W. Eaton <jwe@octave.org> parents: 21743 diff changeset	960 }

Mercurial > octave

annotate liboctave/util/url-transfer.cc @ 27933:863ae57eee69