octave: libinterp/corefcn/urlwrite.cc annotate

annotate libinterp/corefcn/urlwrite.cc @ 20831:35241c4b696c

eliminate return statements after calls to error * Cell.cc, __ichol__.cc, __lin_interpn__.cc, __pchip_deriv__.cc, besselj.cc, cellfun.cc, colloc.cc, debug.cc, dlmread.cc, dynamic-ld.cc, filter.cc, find.cc, gl2ps-renderer.cc, load-path.cc, load-save.cc, ls-mat4.cc, ls-mat5.cc, ls-oct-text.cc, luinc.cc, max.cc, nproc.cc, oct-hist.cc, oct-map.cc, oct-obj.cc, oct-stream.cc, ordschur.cc, pinv.cc, pr-output.cc, profiler.cc, psi.cc, quadcc.cc, qz.cc, rand.cc, strfind.cc, strfns.cc, sysdep.cc, toplev.cc, tril.cc, typecast.cc, urlwrite.cc, utils.cc, variables.cc: Eliminate return statements after calls to error.

author	John W. Eaton <jwe@octave.org>
date	Wed, 09 Dec 2015 14:00:43 -0500
parents	f428cbe7576f
children	1142cf6abc0d

rev	line source
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	1 // urlwrite and urlread, a curl front-end for octave
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	2 /*
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	3
19697 4197fc428c7d maint: Update copyright notices for 2015. John W. Eaton <jwe@octave.org> parents: 19597 diff changeset	4 Copyright (C) 2006-2015 Alexander Barth
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	5 Copyright (C) 2009 David Bateman
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	6
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	7 This file is part of Octave.
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	8
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	9 Octave is free software; you can redistribute it and/or modify it
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	10 under the terms of the GNU General Public License as published by the
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7013 diff changeset	11 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7013 diff changeset	12 option) any later version.
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	13
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	14 Octave is distributed in the hope that it will be useful, but WITHOUT
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	15 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	16 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	17 for more details.
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	18
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	19 You should have received a copy of the GNU General Public License
7016 93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7013 diff changeset	20 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 7013 diff changeset	21 <http://www.gnu.org/licenses/>.
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	22
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	23 */
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	24
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	25 // Author: Alexander Barth <abarth@marine.usf.edu>
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	26 // Adapted-By: jwe
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	27
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	28 #ifdef HAVE_CONFIG_H
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	29 #include <config.h>
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	30 #endif
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	31
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	32 #include <string>
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	33 #include <fstream>
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	34 #include <iomanip>
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	35 #include <iostream>
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	36
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	37 #include "dir-ops.h"
8151 3725f819b5b3 urlwrite.cc (Furlwrite): delete files we create if download fails John W. Eaton <jwe@octave.org> parents: 7481 diff changeset	38 #include "file-ops.h"
3725f819b5b3 urlwrite.cc (Furlwrite): delete files we create if download fails John W. Eaton <jwe@octave.org> parents: 7481 diff changeset	39 #include "file-stat.h"
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	40 #include "oct-env.h"
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	41 #include "oct-handle.h"
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	42 #include "glob-match.h"
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	43 #include "singleton-cleanup.h"
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	44 #include "url-transfer.h"
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	45
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	46 #include "defun.h"
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	47 #include "error.h"
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	48 #include "oct-obj.h"
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	49 #include "ov-cell.h"
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	50 #include "pager.h"
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	51 #include "oct-map.h"
13985 43cc49c7abd1 Use thread-safe atomic reference counting (GCC and MSVC). Michael Goffioul <michael.goffioul@gmail.com> parents: 13978 diff changeset	52 #include "oct-refcount.h"
8151 3725f819b5b3 urlwrite.cc (Furlwrite): delete files we create if download fails John W. Eaton <jwe@octave.org> parents: 7481 diff changeset	53 #include "unwind-prot.h"
17550 77127a3badaa move curl_object actions to rep class John W. Eaton <jwe@octave.org> parents: 17549 diff changeset	54
77127a3badaa move curl_object actions to rep class John W. Eaton <jwe@octave.org> parents: 17549 diff changeset	55 static void
77127a3badaa move curl_object actions to rep class John W. Eaton <jwe@octave.org> parents: 17549 diff changeset	56 delete_file (const std::string& file)
77127a3badaa move curl_object actions to rep class John W. Eaton <jwe@octave.org> parents: 17549 diff changeset	57 {
77127a3badaa move curl_object actions to rep class John W. Eaton <jwe@octave.org> parents: 17549 diff changeset	58 octave_unlink (file);
77127a3badaa move curl_object actions to rep class John W. Eaton <jwe@octave.org> parents: 17549 diff changeset	59 }
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	60
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	61 typedef octave_handle curl_handle;
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	62
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	63 class OCTINTERP_API ch_manager
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	64 {
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	65 protected:
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	66
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	67 ch_manager (void)
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	68 : handle_map (), handle_free_list (),
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	69 next_handle (-1.0 - (rand () + 1.0) / (RAND_MAX + 2.0)) { }
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	70
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	71 public:
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	72
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	73 static void create_instance (void);
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	74
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	75 static bool instance_ok (void)
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	76 {
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	77 bool retval = true;
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	78
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	79 if (! instance)
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	80 create_instance ();
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	81
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	82 if (! instance)
20831 35241c4b696c eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20819 diff changeset	83 error ("unable to create ch_manager!");
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	84
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	85 return retval;
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	86 }
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	87
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	88 static void cleanup_instance (void) { delete instance; instance = 0; }
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	89
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	90 static curl_handle get_handle (void)
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	91 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	92 return instance_ok () ? instance->do_get_handle () : curl_handle ();
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	93 }
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	94
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	95 static void free (const curl_handle& h)
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	96 {
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	97 if (instance_ok ())
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	98 instance->do_free (h);
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	99 }
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	100
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	101 static curl_handle lookup (double val)
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	102 {
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	103 return instance_ok () ? instance->do_lookup (val) : curl_handle ();
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	104 }
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	105
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	106 static curl_handle lookup (const octave_value& val)
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	107 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	108 return val.is_real_scalar () ? lookup (val.double_value ())
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	109 : curl_handle ();
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	110 }
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	111
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	112 static url_transfer get_object (double val)
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	113 {
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	114 return get_object (lookup (val));
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	115 }
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	116
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	117 static url_transfer get_object (const octave_value& val)
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	118 {
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	119 return get_object (lookup (val));
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	120 }
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	121
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	122 static url_transfer get_object (const curl_handle& h)
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	123 {
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	124 return instance_ok () ? instance->do_get_object (h) : url_transfer ();
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	125 }
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	126
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	127 static curl_handle make_curl_handle (const std::string& host,
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	128 const std::string& user,
17556 9e8a9f043944 fix error in previous commit John W. Eaton <jwe@octave.org> parents: 17555 diff changeset	129 const std::string& passwd,
9e8a9f043944 fix error in previous commit John W. Eaton <jwe@octave.org> parents: 17555 diff changeset	130 std::ostream& os)
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	131 {
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	132 return instance_ok ()
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	133 ? instance->do_make_curl_handle (host, user, passwd, os)
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	134 : curl_handle ();
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	135 }
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	136
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	137 static Matrix handle_list (void)
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	138 {
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	139 return instance_ok () ? instance->do_handle_list () : Matrix ();
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	140 }
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	141
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	142 private:
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	143
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	144 static ch_manager *instance;
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	145
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	146 typedef std::map<curl_handle, url_transfer>::iterator iterator;
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	147 typedef std::map<curl_handle, url_transfer>::const_iterator const_iterator;
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	148
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	149 typedef std::set<curl_handle>::iterator free_list_iterator;
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	150 typedef std::set<curl_handle>::const_iterator const_free_list_iterator;
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	151
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	152 // A map of handles to curl objects.
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	153 std::map<curl_handle, url_transfer> handle_map;
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	154
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	155 // The available curl handles.
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	156 std::set<curl_handle> handle_free_list;
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	157
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	158 // The next handle available if handle_free_list is empty.
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	159 double next_handle;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	160
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	161 curl_handle do_get_handle (void);
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	162
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	163 void do_free (const curl_handle& h);
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	164
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	165 curl_handle do_lookup (double val)
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	166 {
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	167 iterator p = (xisnan (val) ? handle_map.end () : handle_map.find (val));
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	168
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	169 return (p != handle_map.end ()) ? p->first : curl_handle ();
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	170 }
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	171
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	172 url_transfer do_get_object (const curl_handle& h)
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	173 {
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	174 iterator p = (h.ok () ? handle_map.find (h) : handle_map.end ());
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	175
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	176 return (p != handle_map.end ()) ? p->second : url_transfer ();
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	177 }
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	178
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	179 curl_handle do_make_curl_handle (const std::string& host,
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	180 const std::string& user,
17556 9e8a9f043944 fix error in previous commit John W. Eaton <jwe@octave.org> parents: 17555 diff changeset	181 const std::string& passwd,
9e8a9f043944 fix error in previous commit John W. Eaton <jwe@octave.org> parents: 17555 diff changeset	182 std::ostream& os)
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	183 {
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	184 curl_handle h = get_handle ();
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	185
17556 9e8a9f043944 fix error in previous commit John W. Eaton <jwe@octave.org> parents: 17555 diff changeset	186 url_transfer obj (host, user, passwd, os);
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	187
18287 9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	188 if (obj.is_valid ())
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	189 handle_map[h] = obj;
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	190 else
20726 25d676f9619c Preface error() messages with name of function when possible. Rik <rik@octave.org> parents: 20716 diff changeset	191 error ("support for URL transfers was disabled when Octave was built");
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	192
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	193 return h;
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	194 }
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	195
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	196 Matrix do_handle_list (void)
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	197 {
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	198 Matrix retval (1, handle_map.size ());
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	199
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	200 octave_idx_type i = 0;
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	201 for (const_iterator p = handle_map.begin (); p != handle_map.end (); p++)
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	202 {
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	203 curl_handle h = p->first;
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	204
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	205 retval(i++) = h.value ();
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	206 }
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	207
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	208 return retval;
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	209 }
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	210 };
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	211
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	212 void
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	213 ch_manager::create_instance (void)
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	214 {
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	215 instance = new ch_manager ();
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	216
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	217 if (instance)
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	218 singleton_cleanup_list::add (cleanup_instance);
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	219 }
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	220
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	221 static double
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	222 make_handle_fraction (void)
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	223 {
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	224 static double maxrand = RAND_MAX + 2.0;
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	225
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	226 return (rand () + 1.0) / maxrand;
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	227 }
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	228
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	229 curl_handle
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	230 ch_manager::do_get_handle (void)
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	231 {
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	232 curl_handle retval;
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	233
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	234 // Curl handles are negative integers plus some random fractional
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	235 // part. To avoid running out of integers, we recycle the integer
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	236 // part but tack on a new random part each time.
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	237
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	238 free_list_iterator p = handle_free_list.begin ();
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	239
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	240 if (p != handle_free_list.end ())
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	241 {
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	242 retval = *p;
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	243 handle_free_list.erase (p);
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	244 }
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	245 else
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	246 {
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	247 retval = curl_handle (next_handle);
6992 980449b7e05c [project @ 2007-10-09 23:22:04 by jwe] jwe parents: 6986 diff changeset	248
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	249 next_handle = std::ceil (next_handle) - 1.0 - make_handle_fraction ();
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	250 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	251
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	252 return retval;
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	253 }
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	254
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	255 void
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	256 ch_manager::do_free (const curl_handle& h)
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	257 {
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	258 if (h.ok ())
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	259 {
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	260 iterator p = handle_map.find (h);
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	261
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	262 if (p != handle_map.end ())
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	263 {
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	264 // Curl handles are negative integers plus some random
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	265 // fractional part. To avoid running out of integers, we
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	266 // recycle the integer part but tack on a new random part
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	267 // each time.
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	268
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	269 handle_map.erase (p);
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	270
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	271 if (h.value () < 0)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	272 handle_free_list.insert
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	273 (std::ceil (h.value ()) - make_handle_fraction ());
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	274 }
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	275 else
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	276 error ("ch_manager::free: invalid object %g", h.value ());
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	277 }
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	278 }
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	279
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	280 ch_manager *ch_manager::instance = 0;
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	281
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	282 DEFUN (urlwrite, args, nargout,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	283 "-- texinfo --\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10377 diff changeset	284 @deftypefn {Loadable Function} {} urlwrite (@var{url}, @var{localfile})\n\
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	285 @deftypefnx {Loadable Function} {@var{f} =} urlwrite (@var{url}, @var{localfile})\n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	286 @deftypefnx {Loadable Function} {[@var{f}, @var{success}] =} urlwrite (@var{url}, @var{localfile})\n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	287 @deftypefnx {Loadable Function} {[@var{f}, @var{success}, @var{message}] =} urlwrite (@var{url}, @var{localfile})\n\
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	288 Download a remote file specified by its @var{url} and save it as\n\
20172 4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19697 diff changeset	289 @var{localfile}.\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19697 diff changeset	290 \n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19697 diff changeset	291 For example:\n\
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	292 \n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	293 @example\n\
9064 7c02ec148a3c Check grammar on all .cc files Rik <rdrider0-list@yahoo.com> parents: 8920 diff changeset	294 @group\n\
19160 432ffa35de13 doc: Fix dead link in urlwrite/urlread docstring (bug #43082). Nir Krakauer < nkrakauer@ccny.cuny.edu> parents: 18391 diff changeset	295 urlwrite (\"ftp://ftp.octave.org/pub/README\",\n\
7031 120f3135952f [project @ 2007-10-15 15:30:03 by jwe] jwe parents: 7017 diff changeset	296 \"README.txt\");\n\
9064 7c02ec148a3c Check grammar on all .cc files Rik <rdrider0-list@yahoo.com> parents: 8920 diff changeset	297 @end group\n\
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	298 @end example\n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	299 \n\
20172 4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19697 diff changeset	300 The full path of the downloaded file is returned in @var{f}.\n\
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	301 \n\
20172 4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19697 diff changeset	302 The variable @var{success} is 1 if the download was successful,\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19697 diff changeset	303 otherwise it is 0 in which case @var{message} contains an error message.\n\
20181 aa36fb998a4d maint: Remove unnecessary whitespace at end of lines. Rik <rik@octave.org> parents: 20172 diff changeset	304 \n\
20172 4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19697 diff changeset	305 If no output argument is specified and an error occurs, then the error is\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19697 diff changeset	306 signaled through Octave's error handling mechanism.\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19697 diff changeset	307 \n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19697 diff changeset	308 This function uses libcurl. Curl supports, among others, the HTTP, FTP and\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19697 diff changeset	309 FILE protocols. Username and password may be specified in the URL, for\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19697 diff changeset	310 example:\n\
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	311 \n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	312 @example\n\
9064 7c02ec148a3c Check grammar on all .cc files Rik <rdrider0-list@yahoo.com> parents: 8920 diff changeset	313 @group\n\
6588 4deaf99400b2 [project @ 2007-04-26 20:31:10 by jwe] jwe parents: 6549 diff changeset	314 urlwrite (\"http://username:password@@example.com/file.txt\",\n\
4deaf99400b2 [project @ 2007-04-26 20:31:10 by jwe] jwe parents: 6549 diff changeset	315 \"file.txt\");\n\
9064 7c02ec148a3c Check grammar on all .cc files Rik <rdrider0-list@yahoo.com> parents: 8920 diff changeset	316 @end group\n\
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	317 @end example\n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	318 \n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	319 GET and POST requests can be specified by @var{method} and @var{param}.\n\
20172 4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19697 diff changeset	320 The parameter @var{method} is either @samp{get} or @samp{post} and\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19697 diff changeset	321 @var{param} is a cell array of parameter and value pairs.\n\
6588 4deaf99400b2 [project @ 2007-04-26 20:31:10 by jwe] jwe parents: 6549 diff changeset	322 For example:\n\
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	323 \n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	324 @example\n\
9064 7c02ec148a3c Check grammar on all .cc files Rik <rdrider0-list@yahoo.com> parents: 8920 diff changeset	325 @group\n\
6588 4deaf99400b2 [project @ 2007-04-26 20:31:10 by jwe] jwe parents: 6549 diff changeset	326 urlwrite (\"http://www.google.com/search\", \"search.html\",\n\
4deaf99400b2 [project @ 2007-04-26 20:31:10 by jwe] jwe parents: 6549 diff changeset	327 \"get\", @{\"query\", \"octave\"@});\n\
9064 7c02ec148a3c Check grammar on all .cc files Rik <rdrider0-list@yahoo.com> parents: 8920 diff changeset	328 @end group\n\
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	329 @end example\n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	330 @seealso{urlread}\n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	331 @end deftypefn")
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	332 {
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	333 octave_value_list retval;
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	334
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	335 int nargin = args.length ();
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	336
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	337 // verify arguments
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	338 if (nargin != 2 && nargin != 4)
20799 c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20726 diff changeset	339 print_usage ();
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	340
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20681 diff changeset	341 std::string url = args(0).xstring_value ("urlwrite: URL must be a string");
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	342
19404 c2f4f6eb5907 A few more instances of stricter input validation for strings (bug #42651). Rik <rik@octave.org> parents: 19403 diff changeset	343 // name to store the file if download is succesful
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20681 diff changeset	344 std::string filename = args(1).xstring_value ("urlwrite: LOCALFILE must be a string");
19404 c2f4f6eb5907 A few more instances of stricter input validation for strings (bug #42651). Rik <rik@octave.org> parents: 19403 diff changeset	345
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	346 std::string method;
17554 f0d21e7d4653 avoid Cell arrays in usr_transfer classes John W. Eaton <jwe@octave.org> parents: 17553 diff changeset	347 Array<std::string> param;
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	348
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	349 if (nargin == 4)
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	350 {
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20681 diff changeset	351 method = args(2).xstring_value ("urlwrite: METHOD must be a string");
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	352
19404 c2f4f6eb5907 A few more instances of stricter input validation for strings (bug #42651). Rik <rik@octave.org> parents: 19403 diff changeset	353 if (method != "get" && method != "post")
20831 35241c4b696c eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20819 diff changeset	354 error ("urlwrite: METHOD must be \"get\" or \"post\"");
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	355
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20681 diff changeset	356 param = args(3).xcellstr_value ("urlwrite: parameters (PARAM) for get and post requests must be given as a cell array of strings");
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	357
18678 6113e0c6920b maint: Clean up extra spaces before/after parentheses. Rik <rik@octave.org> parents: 18391 diff changeset	358 if (param.numel () % 2 == 1)
20831 35241c4b696c eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20819 diff changeset	359 error ("urlwrite: number of elements in PARAM must be even");
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	360 }
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	361
8151 3725f819b5b3 urlwrite.cc (Furlwrite): delete files we create if download fails John W. Eaton <jwe@octave.org> parents: 7481 diff changeset	362 // The file should only be deleted if it doesn't initially exist, we
3725f819b5b3 urlwrite.cc (Furlwrite): delete files we create if download fails John W. Eaton <jwe@octave.org> parents: 7481 diff changeset	363 // create it, and the download fails. We use unwind_protect to do
3725f819b5b3 urlwrite.cc (Furlwrite): delete files we create if download fails John W. Eaton <jwe@octave.org> parents: 7481 diff changeset	364 // it so that the deletion happens no matter how we exit the function.
3725f819b5b3 urlwrite.cc (Furlwrite): delete files we create if download fails John W. Eaton <jwe@octave.org> parents: 7481 diff changeset	365
3725f819b5b3 urlwrite.cc (Furlwrite): delete files we create if download fails John W. Eaton <jwe@octave.org> parents: 7481 diff changeset	366 file_stat fs (filename);
3725f819b5b3 urlwrite.cc (Furlwrite): delete files we create if download fails John W. Eaton <jwe@octave.org> parents: 7481 diff changeset	367
14846 460a3c6d8bf1 maint: Use Octave coding convention for cuddled parenthis in function calls with empty argument lists. Rik <octave@nomad.inbox5.com> parents: 14424 diff changeset	368 std::ofstream ofile (filename.c_str (), std::ios::out \| std::ios::binary);
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	369
6986 4ad04ff722d7 [project @ 2007-10-09 17:43:00 by jwe] jwe parents: 6984 diff changeset	370 if (! ofile.is_open ())
20831 35241c4b696c eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20819 diff changeset	371 error ("urlwrite: unable to open file");
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	372
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 9918 diff changeset	373 unwind_protect_safe frame;
8151 3725f819b5b3 urlwrite.cc (Furlwrite): delete files we create if download fails John W. Eaton <jwe@octave.org> parents: 7481 diff changeset	374
17549 a646665cd574 eliminate unecessary static function in urlwrite.cc John W. Eaton <jwe@octave.org> parents: 17548 diff changeset	375 frame.add_fcn (delete_file, filename);
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	376
17596 43b9181340fb separate object creation from http actions in url_transfer class John W. Eaton <jwe@octave.org> parents: 17556 diff changeset	377 url_transfer curl = url_transfer (url, ofile);
43b9181340fb separate object creation from http actions in url_transfer class John W. Eaton <jwe@octave.org> parents: 17556 diff changeset	378
18391 af04b9d9f7ed allow urlwrite to work again John W. Eaton <jwe@octave.org> parents: 18329 diff changeset	379 if (curl.is_valid ())
18287 9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	380 {
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	381 curl.http_action (param, method);
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	382
18287 9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	383 ofile.close ();
17553 2d01e20abd85 rework error handling for url_transfer class John W. Eaton <jwe@octave.org> parents: 17551 diff changeset	384
2d01e20abd85 rework error handling for url_transfer class John W. Eaton <jwe@octave.org> parents: 17551 diff changeset	385 if (curl.good ())
18287 9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	386 frame.discard ();
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	387
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	388 if (nargout > 0)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	389 {
18287 9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	390 if (curl.good ())
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	391 {
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	392 retval(2) = std::string ();
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	393 retval(1) = true;
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	394 retval(0) = octave_env::make_absolute (filename);
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	395 }
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	396 else
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	397 {
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	398 retval(2) = curl.lasterror ();
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	399 retval(1) = false;
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	400 retval(0) = std::string ();
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	401 }
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	402 }
18287 9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	403
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	404 if (nargout < 2 && ! curl.good ())
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	405 error ("urlwrite: %s", curl.lasterror ().c_str ());
17553 2d01e20abd85 rework error handling for url_transfer class John W. Eaton <jwe@octave.org> parents: 17551 diff changeset	406 }
18287 9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	407 else
20726 25d676f9619c Preface error() messages with name of function when possible. Rik <rik@octave.org> parents: 20716 diff changeset	408 error ("support for URL transfers was disabled when Octave was built");
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	409
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	410 return retval;
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	411 }
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	412
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	413 DEFUN (urlread, args, nargout,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	414 "-- texinfo --\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10377 diff changeset	415 @deftypefn {Loadable Function} {@var{s} =} urlread (@var{url})\n\
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	416 @deftypefnx {Loadable Function} {[@var{s}, @var{success}] =} urlread (@var{url})\n\
6549 5a5a09d7deb8 [project @ 2007-04-20 06:55:29 by jwe] jwe parents: 6547 diff changeset	417 @deftypefnx {Loadable Function} {[@var{s}, @var{success}, @var{message}] =} urlread (@var{url})\n\
6547 4fb053f24fd6 [project @ 2007-04-19 21:47:40 by jwe] jwe parents: 6484 diff changeset	418 @deftypefnx {Loadable Function} {[@dots{}] =} urlread (@var{url}, @var{method}, @var{param})\n\
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	419 Download a remote file specified by its @var{url} and return its content\n\
20172 4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19697 diff changeset	420 in string @var{s}.\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19697 diff changeset	421 \n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19697 diff changeset	422 For example:\n\
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	423 \n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	424 @example\n\
19160 432ffa35de13 doc: Fix dead link in urlwrite/urlread docstring (bug #43082). Nir Krakauer < nkrakauer@ccny.cuny.edu> parents: 18391 diff changeset	425 s = urlread (\"ftp://ftp.octave.org/pub/README\");\n\
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	426 @end example\n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	427 \n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	428 The variable @var{success} is 1 if the download was successful,\n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	429 otherwise it is 0 in which case @var{message} contains an error\n\
20172 4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19697 diff changeset	430 message.\n\
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	431 \n\
20172 4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19697 diff changeset	432 If no output argument is specified and an error occurs, then the error is\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19697 diff changeset	433 signaled through Octave's error handling mechanism.\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19697 diff changeset	434 \n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19697 diff changeset	435 This function uses libcurl. Curl supports, among others, the HTTP, FTP and\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19697 diff changeset	436 FILE protocols. Username and password may be specified in the URL@. For\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19697 diff changeset	437 example:\n\
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	438 \n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	439 @example\n\
7031 120f3135952f [project @ 2007-10-15 15:30:03 by jwe] jwe parents: 7017 diff changeset	440 s = urlread (\"http://user:password@@example.com/file.txt\");\n\
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	441 @end example\n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	442 \n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	443 GET and POST requests can be specified by @var{method} and @var{param}.\n\
20172 4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19697 diff changeset	444 The parameter @var{method} is either @samp{get} or @samp{post} and\n\
4f45eaf83908 doc: Update more docstrings to have one sentence summary as first line. Rik <rik@octave.org> parents: 19697 diff changeset	445 @var{param} is a cell array of parameter and value pairs.\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10377 diff changeset	446 For example:\n\
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	447 \n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	448 @example\n\
9064 7c02ec148a3c Check grammar on all .cc files Rik <rdrider0-list@yahoo.com> parents: 8920 diff changeset	449 @group\n\
6588 4deaf99400b2 [project @ 2007-04-26 20:31:10 by jwe] jwe parents: 6549 diff changeset	450 s = urlread (\"http://www.google.com/search\", \"get\",\n\
14360 97883071e8e4 doc: Correct off-by-1 spacings in all .cc docstrings Rik <octave@nomad.inbox5.com> parents: 14138 diff changeset	451 @{\"query\", \"octave\"@});\n\
9064 7c02ec148a3c Check grammar on all .cc files Rik <rdrider0-list@yahoo.com> parents: 8920 diff changeset	452 @end group\n\
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	453 @end example\n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	454 @seealso{urlwrite}\n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	455 @end deftypefn")
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	456 {
6588 4deaf99400b2 [project @ 2007-04-26 20:31:10 by jwe] jwe parents: 6549 diff changeset	457 // Octave's return value
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	458 octave_value_list retval;
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	459
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	460 int nargin = args.length ();
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	461
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	462 // verify arguments
19403 03067dab10ca Use stricter input validation when looking for a string as input (bug #42651). Rik <rik@octave.org> parents: 19220 diff changeset	463 if (nargin != 1 && nargin != 3)
20799 c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20726 diff changeset	464 print_usage ();
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	465
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20681 diff changeset	466 std::string url = args(0).xstring_value ("urlread: URL must be a string");
19404 c2f4f6eb5907 A few more instances of stricter input validation for strings (bug #42651). Rik <rik@octave.org> parents: 19403 diff changeset	467
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	468 std::string method;
17554 f0d21e7d4653 avoid Cell arrays in usr_transfer classes John W. Eaton <jwe@octave.org> parents: 17553 diff changeset	469 Array<std::string> param;
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	470
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	471 if (nargin == 3)
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	472 {
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20681 diff changeset	473 method = args(1).xstring_value ("urlread: METHOD must be a string");
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	474
19404 c2f4f6eb5907 A few more instances of stricter input validation for strings (bug #42651). Rik <rik@octave.org> parents: 19403 diff changeset	475 if (method != "get" && method != "post")
20831 35241c4b696c eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20819 diff changeset	476 error ("urlread: METHOD must be \"get\" or \"post\"");
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	477
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20681 diff changeset	478 param = args(2).xcellstr_value ("urlread: parameters (PARAM) for get and post requests must be given as a cell array of strings");
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	479
18678 6113e0c6920b maint: Clean up extra spaces before/after parentheses. Rik <rik@octave.org> parents: 18391 diff changeset	480 if (param.numel () % 2 == 1)
20831 35241c4b696c eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20819 diff changeset	481 error ("urlread: number of elements in PARAM must be even");
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	482 }
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	483
6986 4ad04ff722d7 [project @ 2007-10-09 17:43:00 by jwe] jwe parents: 6984 diff changeset	484 std::ostringstream buf;
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	485
17596 43b9181340fb separate object creation from http actions in url_transfer class John W. Eaton <jwe@octave.org> parents: 17556 diff changeset	486 url_transfer curl = url_transfer (url, buf);
43b9181340fb separate object creation from http actions in url_transfer class John W. Eaton <jwe@octave.org> parents: 17556 diff changeset	487
18287 9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	488 if (curl.is_valid ())
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	489 {
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	490 curl.http_action (param, method);
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	491
18329 b522d04382cf Return all nargout from urlread if requested (bug #41260). Rik <rik@octave.org> parents: 18287 diff changeset	492 if (nargout > 0)
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	493 {
18329 b522d04382cf Return all nargout from urlread if requested (bug #41260). Rik <rik@octave.org> parents: 18287 diff changeset	494 // Return empty string if no error occured.
b522d04382cf Return all nargout from urlread if requested (bug #41260). Rik <rik@octave.org> parents: 18287 diff changeset	495 retval(2) = curl.good () ? "" : curl.lasterror ();
b522d04382cf Return all nargout from urlread if requested (bug #41260). Rik <rik@octave.org> parents: 18287 diff changeset	496 retval(1) = curl.good ();
b522d04382cf Return all nargout from urlread if requested (bug #41260). Rik <rik@octave.org> parents: 18287 diff changeset	497 retval(0) = buf.str ();
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	498 }
18287 9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	499
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	500 if (nargout < 2 && ! curl.good ())
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	501 error ("urlread: %s", curl.lasterror().c_str());
17553 2d01e20abd85 rework error handling for url_transfer class John W. Eaton <jwe@octave.org> parents: 17551 diff changeset	502 }
18287 9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	503 else
20726 25d676f9619c Preface error() messages with name of function when possible. Rik <rik@octave.org> parents: 20716 diff changeset	504 error ("support for URL transfers was disabled when Octave was built");
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	505
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	506 return retval;
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	507 }
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	508
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	509 DEFUN (__ftp__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	510 "-- texinfo --\n\
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	511 @deftypefn {Loadable Function} {@var{handle} =} __ftp__ (@var{host})\n\
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	512 @deftypefnx {Loadable Function} {@var{handle} =} __ftp__ (@var{host}, @var{username}, @var{password})\n\
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	513 Undocumented internal function\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	514 @end deftypefn")
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	515 {
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	516 int nargin = args.length ();
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	517
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	518 if (nargin < 1 \|\| nargin > 3)
20799 c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20726 diff changeset	519 print_usage ();
c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20726 diff changeset	520
c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20726 diff changeset	521 std::string host = args(0).xstring_value ("__ftp__: HOST must be a string");
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	522
20799 c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20726 diff changeset	523 std::string user = (nargin > 1)
c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20726 diff changeset	524 ? args(1).xstring_value ("__ftp__: USER must be a string")
c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20726 diff changeset	525 : std::string ("anonymous");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	526
20799 c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20726 diff changeset	527 std::string passwd = (nargin > 2)
c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20726 diff changeset	528 ? args(2).xstring_value ("__ftp__: PASSWD must be a string")
c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20726 diff changeset	529 : std::string ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	530
20799 c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20726 diff changeset	531 curl_handle ch
c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20726 diff changeset	532 = ch_manager::make_curl_handle (host, user, passwd, octave_stdout);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	533
20799 c349d4c91ce2 eliminate return statements after calls to print_usage John W. Eaton <jwe@octave.org> parents: 20726 diff changeset	534 return octave_value (ch.value ());
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	535 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	536
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	537 DEFUN (__ftp_pwd__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	538 "-- texinfo --\n\
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	539 @deftypefn {Loadable Function} {} __ftp_pwd__ (@var{handle})\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	540 Undocumented internal function\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	541 @end deftypefn")
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	542 {
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	543 octave_value retval;
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	544
20819 f428cbe7576f eliminate unnecessary uses of nargin John W. Eaton <jwe@octave.org> parents: 20799 diff changeset	545 if (args.length () != 1)
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11548 diff changeset	546 error ("__ftp_pwd__: incorrect number of arguments");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	547 else
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	548 {
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	549 url_transfer curl = ch_manager::get_object (args(0));
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	550
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	551 if (curl.is_valid ())
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	552 retval = curl.pwd ();
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	553 else
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	554 error ("__ftp_pwd__: invalid ftp handle");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	555 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	556
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	557 return retval;
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	558 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	559
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	560 DEFUN (__ftp_cwd__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	561 "-- texinfo --\n\
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	562 @deftypefn {Loadable Function} {} __ftp_cwd__ (@var{handle}, @var{path})\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	563 Undocumented internal function\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	564 @end deftypefn")
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	565 {
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	566 octave_value retval;
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	567
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	568 int nargin = args.length ();
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	569
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	570 if (nargin != 1 && nargin != 2)
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11548 diff changeset	571 error ("__ftp_cwd__: incorrect number of arguments");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	572 else
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	573 {
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	574 url_transfer curl = ch_manager::get_object (args(0));
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	575
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	576 if (curl.is_valid ())
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	577 {
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	578 std::string path = "";
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	579
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	580 if (nargin > 1)
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20681 diff changeset	581 path = args(1).xstring_value ("__ftp_cwd__: PATH must be a string");
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	582
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	583 curl.cwd (path);
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	584 }
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	585 else
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	586 error ("__ftp_cwd__: invalid ftp handle");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	587 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	588
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	589 return retval;
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	590 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	591
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	592 DEFUN (__ftp_dir__, args, nargout,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	593 "-- texinfo --\n\
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	594 @deftypefn {Loadable Function} {} __ftp_dir__ (@var{handle})\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	595 Undocumented internal function\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	596 @end deftypefn")
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	597 {
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	598 octave_value retval;
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	599
20819 f428cbe7576f eliminate unnecessary uses of nargin John W. Eaton <jwe@octave.org> parents: 20799 diff changeset	600 if (args.length () != 1)
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11548 diff changeset	601 error ("__ftp_dir__: incorrect number of arguments");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	602 else
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	603 {
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	604 url_transfer curl = ch_manager::get_object (args(0));
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	605
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	606 if (curl.is_valid ())
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	607 {
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	608 if (nargout == 0)
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	609 curl.dir ();
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	610 else
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	611 {
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	612 string_vector sv = curl.list ();
20232 a9574e3c6e9e Deprecate Array::length() and Sparse::length() in favour of ::numel(). Carnë Draug <carandraug@octave.org> parents: 20181 diff changeset	613 octave_idx_type n = sv.numel ();
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	614
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	615 if (n == 0)
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	616 {
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	617 string_vector flds (5);
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	618
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	619 flds(0) = "name";
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	620 flds(1) = "date";
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	621 flds(2) = "bytes";
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	622 flds(3) = "isdir";
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	623 flds(4) = "datenum";
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	624
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	625 retval = octave_map (flds);
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	626 }
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	627 else
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	628 {
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	629 octave_map st;
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	630
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	631 Cell filectime (dim_vector (n, 1));
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	632 Cell filesize (dim_vector (n, 1));
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	633 Cell fileisdir (dim_vector (n, 1));
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	634 Cell filedatenum (dim_vector (n, 1));
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	635
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	636 st.assign ("name", Cell (sv));
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	637
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	638 for (octave_idx_type i = 0; i < n; i++)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	639 {
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	640 time_t ftime;
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	641 bool fisdir;
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	642 double fsize;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	643
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	644 curl.get_fileinfo (sv(i), fsize, ftime, fisdir);
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	645
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	646 fileisdir (i) = fisdir;
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	647 filectime (i) = ctime (&ftime);
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	648 filesize (i) = fsize;
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	649 filedatenum (i) = double (ftime);
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	650 }
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	651
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	652 st.assign ("date", filectime);
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	653 st.assign ("bytes", filesize);
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	654 st.assign ("isdir", fileisdir);
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	655 st.assign ("datenum", filedatenum);
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	656
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	657 retval = st;
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	658 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	659 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	660 }
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	661 else
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	662 error ("__ftp_dir__: invalid ftp handle");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	663 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	664
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	665 return retval;
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	666 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	667
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	668 DEFUN (__ftp_ascii__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	669 "-- texinfo --\n\
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	670 @deftypefn {Loadable Function} {} __ftp_ascii__ (@var{handle})\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	671 Undocumented internal function\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	672 @end deftypefn")
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	673 {
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	674 octave_value retval;
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	675
20819 f428cbe7576f eliminate unnecessary uses of nargin John W. Eaton <jwe@octave.org> parents: 20799 diff changeset	676 if (args.length () != 1)
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11548 diff changeset	677 error ("__ftp_ascii__: incorrect number of arguments");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	678 else
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	679 {
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	680 url_transfer curl = ch_manager::get_object (args(0));
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	681
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	682 if (curl.is_valid ())
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	683 curl.ascii ();
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	684 else
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	685 error ("__ftp_ascii__: invalid ftp handle");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	686 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	687
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	688 return retval;
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	689 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	690
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	691 DEFUN (__ftp_binary__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	692 "-- texinfo --\n\
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	693 @deftypefn {Loadable Function} {} __ftp_binary__ (@var{handle})\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	694 Undocumented internal function\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	695 @end deftypefn")
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	696 {
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	697 octave_value retval;
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	698
20819 f428cbe7576f eliminate unnecessary uses of nargin John W. Eaton <jwe@octave.org> parents: 20799 diff changeset	699 if (args.length () != 1)
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11548 diff changeset	700 error ("__ftp_binary__: incorrect number of arguments");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	701 else
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	702 {
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	703 url_transfer curl = ch_manager::get_object (args(0));
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	704
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	705 if (curl.is_valid ())
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	706 curl.binary ();
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	707 else
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	708 error ("__ftp_binary__: invalid ftp handle");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	709 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	710
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	711 return retval;
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	712 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	713
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	714 DEFUN (__ftp_close__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	715 "-- texinfo --\n\
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	716 @deftypefn {Loadable Function} {} __ftp_close__ (@var{handle})\n\
17318 accafe1aee7c Make use of gripe_disabled_feature() instead of custom error message. Carnë Draug <carandraug@octave.org> parents: 15326 diff changeset	717 Undocumented internal function\n\
accafe1aee7c Make use of gripe_disabled_feature() instead of custom error message. Carnë Draug <carandraug@octave.org> parents: 15326 diff changeset	718 @end deftypefn")
accafe1aee7c Make use of gripe_disabled_feature() instead of custom error message. Carnë Draug <carandraug@octave.org> parents: 15326 diff changeset	719 {
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	720 octave_value retval;
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	721
20819 f428cbe7576f eliminate unnecessary uses of nargin John W. Eaton <jwe@octave.org> parents: 20799 diff changeset	722 if (args.length () != 1)
17318 accafe1aee7c Make use of gripe_disabled_feature() instead of custom error message. Carnë Draug <carandraug@octave.org> parents: 15326 diff changeset	723 error ("__ftp_close__: incorrect number of arguments");
accafe1aee7c Make use of gripe_disabled_feature() instead of custom error message. Carnë Draug <carandraug@octave.org> parents: 15326 diff changeset	724 else
accafe1aee7c Make use of gripe_disabled_feature() instead of custom error message. Carnë Draug <carandraug@octave.org> parents: 15326 diff changeset	725 {
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	726 curl_handle h = ch_manager::lookup (args(0));
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	727
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	728 if (h.ok ())
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	729 ch_manager::free (h);
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	730 else
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	731 error ("__ftp_close__: invalid ftp handle");
17318 accafe1aee7c Make use of gripe_disabled_feature() instead of custom error message. Carnë Draug <carandraug@octave.org> parents: 15326 diff changeset	732 }
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	733
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	734 return retval;
17318 accafe1aee7c Make use of gripe_disabled_feature() instead of custom error message. Carnë Draug <carandraug@octave.org> parents: 15326 diff changeset	735 }
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	736
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	737 DEFUN (__ftp_mode__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	738 "-- texinfo --\n\
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	739 @deftypefn {Loadable Function} {} __ftp_mode__ (@var{handle})\n\
17318 accafe1aee7c Make use of gripe_disabled_feature() instead of custom error message. Carnë Draug <carandraug@octave.org> parents: 15326 diff changeset	740 Undocumented internal function\n\
accafe1aee7c Make use of gripe_disabled_feature() instead of custom error message. Carnë Draug <carandraug@octave.org> parents: 15326 diff changeset	741 @end deftypefn")
accafe1aee7c Make use of gripe_disabled_feature() instead of custom error message. Carnë Draug <carandraug@octave.org> parents: 15326 diff changeset	742 {
accafe1aee7c Make use of gripe_disabled_feature() instead of custom error message. Carnë Draug <carandraug@octave.org> parents: 15326 diff changeset	743 octave_value retval;
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	744
20819 f428cbe7576f eliminate unnecessary uses of nargin John W. Eaton <jwe@octave.org> parents: 20799 diff changeset	745 if (args.length () != 1)
17318 accafe1aee7c Make use of gripe_disabled_feature() instead of custom error message. Carnë Draug <carandraug@octave.org> parents: 15326 diff changeset	746 error ("__ftp_mode__: incorrect number of arguments");
accafe1aee7c Make use of gripe_disabled_feature() instead of custom error message. Carnë Draug <carandraug@octave.org> parents: 15326 diff changeset	747 else
accafe1aee7c Make use of gripe_disabled_feature() instead of custom error message. Carnë Draug <carandraug@octave.org> parents: 15326 diff changeset	748 {
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	749 url_transfer curl = ch_manager::get_object (args(0));
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	750
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	751 if (curl.is_valid ())
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	752 retval = (curl.is_ascii () ? "ascii" : "binary");
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	753 else
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	754 error ("__ftp_binary__: invalid ftp handle");
17318 accafe1aee7c Make use of gripe_disabled_feature() instead of custom error message. Carnë Draug <carandraug@octave.org> parents: 15326 diff changeset	755 }
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	756
17318 accafe1aee7c Make use of gripe_disabled_feature() instead of custom error message. Carnë Draug <carandraug@octave.org> parents: 15326 diff changeset	757 return retval;
accafe1aee7c Make use of gripe_disabled_feature() instead of custom error message. Carnë Draug <carandraug@octave.org> parents: 15326 diff changeset	758 }
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	759
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	760 DEFUN (__ftp_delete__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	761 "-- texinfo --\n\
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	762 @deftypefn {Loadable Function} {} __ftp_delete__ (@var{handle}, @var{path})\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	763 Undocumented internal function\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	764 @end deftypefn")
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	765 {
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	766 octave_value retval;
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	767
20819 f428cbe7576f eliminate unnecessary uses of nargin John W. Eaton <jwe@octave.org> parents: 20799 diff changeset	768 if (args.length () != 2)
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11548 diff changeset	769 error ("__ftp_delete__: incorrect number of arguments");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	770 else
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	771 {
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	772 url_transfer curl = ch_manager::get_object (args(0));
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	773
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	774 if (curl.is_valid ())
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	775 {
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20681 diff changeset	776 std::string file = args(1).xstring_value ("__ftp_delete__: FILE must be a string");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	777
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	778 curl.del (file);
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	779 }
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	780 else
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	781 error ("__ftp_delete__: invalid ftp handle");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	782 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	783
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	784 return retval;
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	785 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	786
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	787 DEFUN (__ftp_rmdir__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	788 "-- texinfo --\n\
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	789 @deftypefn {Loadable Function} {} __ftp_rmdir__ (@var{handle}, @var{path})\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	790 Undocumented internal function\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	791 @end deftypefn")
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	792 {
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	793 octave_value retval;
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	794
20819 f428cbe7576f eliminate unnecessary uses of nargin John W. Eaton <jwe@octave.org> parents: 20799 diff changeset	795 if (args.length () != 2)
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11548 diff changeset	796 error ("__ftp_rmdir__: incorrect number of arguments");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	797 else
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	798 {
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	799 url_transfer curl = ch_manager::get_object (args(0));
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	800
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	801 if (curl.is_valid ())
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	802 {
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20681 diff changeset	803 std::string dir = args(1).xstring_value ("__ftp_rmdir__: DIR must be a string");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	804
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	805 curl.rmdir (dir);
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	806 }
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	807 else
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	808 error ("__ftp_rmdir__: invalid ftp handle");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	809 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	810
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	811 return retval;
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	812 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	813
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	814 DEFUN (__ftp_mkdir__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	815 "-- texinfo --\n\
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	816 @deftypefn {Loadable Function} {} __ftp_mkdir__ (@var{handle}, @var{path})\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	817 Undocumented internal function\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	818 @end deftypefn")
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	819 {
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	820 octave_value retval;
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	821
20819 f428cbe7576f eliminate unnecessary uses of nargin John W. Eaton <jwe@octave.org> parents: 20799 diff changeset	822 if (args.length () != 2)
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11548 diff changeset	823 error ("__ftp_mkdir__: incorrect number of arguments");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	824 else
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	825 {
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	826 url_transfer curl = ch_manager::get_object (args(0));
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	827
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	828 if (curl.is_valid ())
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	829 {
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20681 diff changeset	830 std::string dir = args(1).xstring_value ("__ftp_mkdir__: DIR must be a string");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	831
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	832 curl.mkdir (dir);
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	833 }
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	834 else
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	835 error ("__ftp_mkdir__: invalid ftp handle");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	836 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	837
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	838 return retval;
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	839 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	840
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	841 DEFUN (__ftp_rename__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	842 "-- texinfo --\n\
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	843 @deftypefn {Loadable Function} {} __ftp_rename__ (@var{handle}, @var{path})\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	844 Undocumented internal function\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	845 @end deftypefn")
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	846 {
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	847 octave_value retval;
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	848
20819 f428cbe7576f eliminate unnecessary uses of nargin John W. Eaton <jwe@octave.org> parents: 20799 diff changeset	849 if (args.length () != 3)
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11548 diff changeset	850 error ("__ftp_rename__: incorrect number of arguments");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	851 else
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	852 {
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	853 url_transfer curl = ch_manager::get_object (args(0));
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	854
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	855 if (curl.is_valid ())
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	856 {
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20681 diff changeset	857 std::string oldname = args(1).xstring_value ("__ftp_rename__: OLDNAME must be a string");
68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20681 diff changeset	858 std::string newname = args(2).xstring_value ("__ftp_rename__: NEWNAME must be a string");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	859
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	860 curl.rename (oldname, newname);
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	861 }
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	862 else
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	863 error ("__ftp_rename__: invalid ftp handle");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	864 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	865
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	866 return retval;
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	867 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	868
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	869 DEFUN (__ftp_mput__, args, nargout,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	870 "-- texinfo --\n\
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	871 @deftypefn {Loadable Function} {} __ftp_mput__ (@var{handle}, @var{files})\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	872 Undocumented internal function\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	873 @end deftypefn")
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	874 {
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	875 octave_value retval;
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	876
20819 f428cbe7576f eliminate unnecessary uses of nargin John W. Eaton <jwe@octave.org> parents: 20799 diff changeset	877 if (args.length () != 2)
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11548 diff changeset	878 error ("__ftp_mput__: incorrect number of arguments");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	879 else
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	880 {
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	881 url_transfer curl = ch_manager::get_object (args(0));
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	882
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	883 if (curl.is_valid ())
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	884 {
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20681 diff changeset	885 std::string pat = args(1).xstring_value ("__ftp_mput__: PATTERN must be a string");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	886
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	887 string_vector file_list;
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	888
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	889 glob_match pattern (file_ops::tilde_expand (pat));
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	890 string_vector files = pattern.glob ();
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	891
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	892 for (octave_idx_type i = 0; i < files.numel (); i++)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	893 {
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	894 std::string file = files (i);
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	895
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	896 file_stat fs (file);
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	897
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	898 if (! fs.exists ())
20831 35241c4b696c eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20819 diff changeset	899 error ("__ftp__mput: file does not exist");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	900
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	901 if (fs.is_dir ())
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	902 {
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	903 file_list.append (curl.mput_directory ("", file));
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	904
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	905 if (! curl.good ())
20831 35241c4b696c eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20819 diff changeset	906 error ("__ftp_mput__: %s", curl.lasterror().c_str());
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	907 }
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	908 else
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	909 {
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	910 // FIXME: Does ascii mode need to be flagged here?
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	911 std::ifstream ifile (file.c_str (), std::ios::in \|
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	912 std::ios::binary);
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	913
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	914 if (! ifile.is_open ())
20831 35241c4b696c eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20819 diff changeset	915 error ("__ftp_mput__: unable to open file");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	916
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	917 curl.put (file, ifile);
17553 2d01e20abd85 rework error handling for url_transfer class John W. Eaton <jwe@octave.org> parents: 17551 diff changeset	918
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	919 ifile.close ();
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	920
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	921 if (! curl.good ())
20831 35241c4b696c eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20819 diff changeset	922 error ("__ftp_mput__: %s", curl.lasterror().c_str());
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	923
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	924 file_list.append (file);
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	925 }
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	926 }
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	927
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	928 if (nargout > 0)
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	929 retval = file_list;
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	930 }
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	931 else
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	932 error ("__ftp_mput__: invalid ftp handle");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	933 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	934
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	935 return retval;
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	936 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	937
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	938 DEFUN (__ftp_mget__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	939 "-- texinfo --\n\
20716 1ecee53513d7 doc: Peridodic grammar check of documentation. Rik <rik@octave.org> parents: 20710 diff changeset	940 @deftypefn {Loadable Function} {} __ftp_mget__ (@var{handle}, @var{pattern})\n\
20577 7374a3a6d594 use new string_value method to handle value extraction errors John W. Eaton <jwe@octave.org> parents: 20560 diff changeset	941 @deftypefnx {Loadable Function} {} __ftp_mget__ (@var{handle}, @var{pattern}, @var{target})\n\
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	942 Undocumented internal function\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	943 @end deftypefn")
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	944 {
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	945 octave_value retval;
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	946
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	947 int nargin = args.length ();
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	948
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	949 if (nargin != 2 && nargin != 3)
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11548 diff changeset	950 error ("__ftp_mget__: incorrect number of arguments");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	951 else
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	952 {
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	953 url_transfer curl = ch_manager::get_object (args(0));
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	954
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	955 if (curl.is_valid ())
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	956 {
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20681 diff changeset	957 std::string file = args(1).xstring_value ("__ftp_mget__: PATTERN must be a string");
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	958 std::string target;
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	959
20710 73800f39da6f @ftp/mget: honor the TARGET argument Pantxo Diribarne <pantxo.diribarne@gmail.com> parents: 20700 diff changeset	960 if (nargin == 3 && ! args(2).is_empty ())
20700 68e3a747ca02 rename octave_value value extractors that accept error message args John W. Eaton <jwe@octave.org> parents: 20681 diff changeset	961 target = args(2).xstring_value ("__ftp_mget__: TARGET must be a string") + file_ops::dir_sep_str ();
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	962
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	963 string_vector sv = curl.list ();
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	964 octave_idx_type n = 0;
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	965 glob_match pattern (file);
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	966
17553 2d01e20abd85 rework error handling for url_transfer class John W. Eaton <jwe@octave.org> parents: 17551 diff changeset	967
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	968 for (octave_idx_type i = 0; i < sv.numel (); i++)
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	969 {
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	970 if (pattern.match (sv(i)))
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	971 {
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	972 n++;
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	973
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	974 time_t ftime;
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	975 bool fisdir;
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	976 double fsize;
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	977
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	978 curl.get_fileinfo (sv(i), fsize, ftime, fisdir);
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	979
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	980 if (fisdir)
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	981 curl.mget_directory (sv(i), target);
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	982 else
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	983 {
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	984 std::ofstream ofile ((target + sv(i)).c_str (),
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	985 std::ios::out \|
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	986 std::ios::binary);
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	987
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	988 if (! ofile.is_open ())
20831 35241c4b696c eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20819 diff changeset	989 error ("__ftp_mget__: unable to open file");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	990
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	991 unwind_protect_safe frame;
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	992
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	993 frame.add_fcn (delete_file, target + sv(i));
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	994
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	995 curl.get (sv(i), ofile);
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	996
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	997 ofile.close ();
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	998
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	999 if (curl.good ())
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	1000 frame.discard ();
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	1001 }
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	1002
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	1003 if (! curl.good ())
20831 35241c4b696c eliminate return statements after calls to error John W. Eaton <jwe@octave.org> parents: 20819 diff changeset	1004 error ("__ftp_mget__: %s", curl.lasterror().c_str());
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1005 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1006 }
20679 19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	1007
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	1008 if (n == 0)
19d6f94c21cb eliminate more uses of error_state John W. Eaton <jwe@octave.org> parents: 20577 diff changeset	1009 error ("__ftp_mget__: file not found");
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1010 }
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	1011 else
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	1012 error ("__ftp_mget__: invalid ftp handle");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1013 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1014
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	1015 return retval;
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1016 }

Mercurial > octave

annotate libinterp/corefcn/urlwrite.cc @ 20831:35241c4b696c