octave-nkf: libinterp/corefcn/urlwrite.cc annotate

annotate libinterp/corefcn/urlwrite.cc @ 19437:03067dab10ca

Use stricter input validation when looking for a string as input (bug #42651). * data.cc (get_sort_mode_option, Fissorted): Use is_string() to check string input. * debug.cc (Fdbstep): use "string" rather than "character string" in error messages. * error.cc (Flasterr, Flastwarn): use "string" rather than "character string" in error messages. * file-io.cc (do_stream_open, do_fread, do_fwrite, Fpopen, Ftempname, Fmkstemp): Use is_string() to check string input. * graphics.cc (Fgraphics_toolkit): Use is_string() to check string input. Rephrase error message. * help.cc (F__list_functions): Use is_string() to check string input. * input.cc (Fyes_or_no): Use is_string() to check string input. Rephrase error message. * input.cc (Fadd_input_event_hook): Rephrase error message. * load-path.cc (Fgenpath, Faddpath): Rephrase error message. * matrix_type.cc (Fmatrix_type): Use is_string() to check string input. * qz.cc (Fqz): Follow Octave coding convention for space after '!'. * regexp.cc (parse_options): Use is_string() to check string input. Rephrase error message. * schur.cc (Fschur): Use is_string() to check string input. * strfns.cc (Flist_in_columns): Use is_string() to check string input. Rephrase error message. * symtab.cc (Fignore_function_time_stamp): Use is_string() to check string input. Rephrase error message. * syscalls.cc (Fexec, Fpopen2, Fcanonicalize_file_name): Use is_string() to check string input. Rephrase error message. * sysdep.cc (Fsetenv): Use is_string() to check string input. * time.cc (Fstrftime, Fstrptime): Use is_string() to check string input. * toplev.cc (Fsystem, Fatexit): Use is_string() to check string input. * urlwrite.cc (Furlwrite, Furlread): Rephrase error message. * utils.cc (Ffile_in_path): Use is_string() to check string input. Rephrase error message. * variables.cc (extract_function): Add FIXME about potentially using is_string. * variables.cc (do_isglobal, Fmunlock, Fmislocked): Use is_string() to check string input. * variables.cc (set_internal_variable): Rephrase error message. * ov-base.cc (make_idx_args): Rephrase error message. * ov-class.cc (octave_class::all_strings, Fclass): Rephrase error message. * ov-fcn-handle.cc (Fstr2func): Use is_string() to check string input * ov-java.cc (FjavaObject, FjavaMethod, F__java_get__, F__java_set__): Use is_string() to check string input. * ov.cc (Fdecode_subscripts): Use is_string() to check string input. Rephrase error message. * pt-idx.cc (tree_index_expression::get_struct_index): Rephrase error message. * io.tst: Change %!warning test to %!error test to match stricter checking. * system.tst: Change %!warning test for setenv to %!error test to match stricter checking.

author	Rik <rik@octave.org>
date	Tue, 16 Dec 2014 09:21:29 -0800
parents	6443693a176f
children	c2f4f6eb5907

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
17744 d63878346099 maint: Update copyright notices for release. John W. Eaton <jwe@octave.org> parents: 17596 diff changeset	4 Copyright (C) 2006-2013 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)
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	83 {
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	84 ::error ("unable to create ch_manager!");
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	85
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	86 retval = false;
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
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	89 return retval;
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	90 }
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	91
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	92 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	93
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	94 static curl_handle get_handle (void)
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	95 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	96 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	97 }
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	98
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	99 static void free (const curl_handle& h)
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 if (instance_ok ())
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	102 instance->do_free (h);
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	103 }
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 static curl_handle lookup (double val)
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	106 {
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	107 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	108 }
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	109
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	110 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	111 {
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	112 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	113 : curl_handle ();
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	114 }
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	115
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	116 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	117 {
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	118 return get_object (lookup (val));
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	119 }
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	120
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	121 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	122 {
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	123 return get_object (lookup (val));
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	124 }
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	125
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	126 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	127 {
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	128 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	129 }
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	130
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	131 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	132 const std::string& user,
17556 9e8a9f043944 fix error in previous commit John W. Eaton <jwe@octave.org> parents: 17555 diff changeset	133 const std::string& passwd,
9e8a9f043944 fix error in previous commit John W. Eaton <jwe@octave.org> parents: 17555 diff changeset	134 std::ostream& os)
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 return instance_ok ()
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	137 ? 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	138 : curl_handle ();
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	139 }
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 static Matrix handle_list (void)
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	142 {
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	143 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	144 }
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	145
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	146 private:
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	147
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	148 static ch_manager *instance;
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	149
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	150 typedef std::map<curl_handle, url_transfer>::iterator iterator;
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	151 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	152
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	153 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	154 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	155
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	156 // A map of handles to curl objects.
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	157 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	158
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	159 // The available curl handles.
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	160 std::set<curl_handle> handle_free_list;
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	161
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	162 // 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	163 double next_handle;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	164
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	165 curl_handle do_get_handle (void);
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 void do_free (const curl_handle& h);
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 curl_handle do_lookup (double val)
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 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	172
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	173 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	174 }
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 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	177 {
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	178 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	179
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	180 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	181 }
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	182
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	183 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	184 const std::string& user,
17556 9e8a9f043944 fix error in previous commit John W. Eaton <jwe@octave.org> parents: 17555 diff changeset	185 const std::string& passwd,
9e8a9f043944 fix error in previous commit John W. Eaton <jwe@octave.org> parents: 17555 diff changeset	186 std::ostream& os)
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	187 {
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	188 curl_handle h = get_handle ();
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	189
17556 9e8a9f043944 fix error in previous commit John W. Eaton <jwe@octave.org> parents: 17555 diff changeset	190 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	191
18287 9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	192 if (obj.is_valid ())
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	193 {
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	194 if (! error_state)
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	195 handle_map[h] = obj;
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	196 else
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	197 h = curl_handle ();
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	198 }
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	199 else
18287 9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	200 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	201
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	202 return h;
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	203 }
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 Matrix do_handle_list (void)
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 Matrix retval (1, handle_map.size ());
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	208
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	209 octave_idx_type i = 0;
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	210 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	211 {
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	212 curl_handle h = p->first;
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	213
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	214 retval(i++) = h.value ();
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	215 }
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 return retval;
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	218 }
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 void
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	222 ch_manager::create_instance (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 instance = new ch_manager ();
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 if (instance)
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	227 singleton_cleanup_list::add (cleanup_instance);
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
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	230 static double
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	231 make_handle_fraction (void)
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	232 {
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	233 static double maxrand = RAND_MAX + 2.0;
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	234
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	235 return (rand () + 1.0) / maxrand;
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	236 }
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 curl_handle
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	239 ch_manager::do_get_handle (void)
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	240 {
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	241 curl_handle retval;
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	242
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	243 // 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	244 // 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	245 // 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	246
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	247 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	248
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	249 if (p != handle_free_list.end ())
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	250 {
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	251 retval = *p;
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	252 handle_free_list.erase (p);
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	253 }
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	254 else
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	255 {
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	256 retval = curl_handle (next_handle);
6992 980449b7e05c [project @ 2007-10-09 23:22:04 by jwe] jwe parents: 6986 diff changeset	257
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	258 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	259 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	260
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	261 return retval;
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	262 }
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	263
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	264 void
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	265 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	266 {
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	267 if (h.ok ())
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	268 {
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	269 iterator p = handle_map.find (h);
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 (p != handle_map.end ())
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	272 {
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	273 // 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	274 // 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	275 // 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	276 // each time.
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 handle_map.erase (p);
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 if (h.value () < 0)
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	281 handle_free_list.insert
175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	282 (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	283 }
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	284 else
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	285 error ("ch_manager::free: invalid object %g", h.value ());
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	286 }
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	287 }
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	288
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	289 ch_manager *ch_manager::instance = 0;
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	290
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	291 DEFUN (urlwrite, args, nargout,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	292 "-- texinfo --\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10377 diff changeset	293 @deftypefn {Loadable Function} {} urlwrite (@var{url}, @var{localfile})\n\
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	294 @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	295 @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	296 @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	297 Download a remote file specified by its @var{url} and save it as\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10377 diff changeset	298 @var{localfile}. For example:\n\
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	299 \n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	300 @example\n\
9064 7c02ec148a3c Check grammar on all .cc files Rik <rdrider0-list@yahoo.com> parents: 8920 diff changeset	301 @group\n\
19194 432ffa35de13 doc: Fix dead link in urlwrite/urlread docstring (bug #43082). Nir Krakauer < nkrakauer@ccny.cuny.edu> parents: 18391 diff changeset	302 urlwrite (\"ftp://ftp.octave.org/pub/README\",\n\
7031 120f3135952f [project @ 2007-10-15 15:30:03 by jwe] jwe parents: 7017 diff changeset	303 \"README.txt\");\n\
9064 7c02ec148a3c Check grammar on all .cc files Rik <rdrider0-list@yahoo.com> parents: 8920 diff changeset	304 @end group\n\
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	305 @end example\n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	306 \n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	307 The full path of the downloaded file is returned in @var{f}. The\n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	308 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	309 otherwise it is 0 in which case @var{message} contains an error\n\
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11548 diff changeset	310 message. If no output argument is specified and an error occurs,\n\
6588 4deaf99400b2 [project @ 2007-04-26 20:31:10 by jwe] jwe parents: 6549 diff changeset	311 then the error is signaled through Octave's error handling mechanism.\n\
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	312 \n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	313 This function uses libcurl. Curl supports, among others, the HTTP,\n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	314 FTP and FILE protocols. Username and password may be specified in\n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	315 the URL, for example:\n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	316 \n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	317 @example\n\
9064 7c02ec148a3c Check grammar on all .cc files Rik <rdrider0-list@yahoo.com> parents: 8920 diff changeset	318 @group\n\
6588 4deaf99400b2 [project @ 2007-04-26 20:31:10 by jwe] jwe parents: 6549 diff changeset	319 urlwrite (\"http://username:password@@example.com/file.txt\",\n\
4deaf99400b2 [project @ 2007-04-26 20:31:10 by jwe] jwe parents: 6549 diff changeset	320 \"file.txt\");\n\
9064 7c02ec148a3c Check grammar on all .cc files Rik <rdrider0-list@yahoo.com> parents: 8920 diff changeset	321 @end group\n\
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	322 @end example\n\
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 GET and POST requests can be specified by @var{method} and @var{param}.\n\
6589 1294fa07652b [project @ 2007-04-26 20:36:42 by jwe] jwe parents: 6588 diff changeset	325 The parameter @var{method} is either @samp{get} or @samp{post}\n\
6588 4deaf99400b2 [project @ 2007-04-26 20:31:10 by jwe] jwe parents: 6549 diff changeset	326 and @var{param} is a cell array of parameter and value pairs.\n\
4deaf99400b2 [project @ 2007-04-26 20:31:10 by jwe] jwe parents: 6549 diff changeset	327 For example:\n\
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	328 \n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	329 @example\n\
9064 7c02ec148a3c Check grammar on all .cc files Rik <rdrider0-list@yahoo.com> parents: 8920 diff changeset	330 @group\n\
6588 4deaf99400b2 [project @ 2007-04-26 20:31:10 by jwe] jwe parents: 6549 diff changeset	331 urlwrite (\"http://www.google.com/search\", \"search.html\",\n\
4deaf99400b2 [project @ 2007-04-26 20:31:10 by jwe] jwe parents: 6549 diff changeset	332 \"get\", @{\"query\", \"octave\"@});\n\
9064 7c02ec148a3c Check grammar on all .cc files Rik <rdrider0-list@yahoo.com> parents: 8920 diff changeset	333 @end group\n\
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	334 @end example\n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	335 @seealso{urlread}\n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	336 @end deftypefn")
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	337 {
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	338 octave_value_list retval;
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	339
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	340 int nargin = args.length ();
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	341
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	342 // verify arguments
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	343 if (nargin != 2 && nargin != 4)
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	344 {
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	345 print_usage ();
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	346 return retval;
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	347 }
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	348
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	349 std::string url = args(0).string_value ();
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	350
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	351 if (error_state)
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	352 {
19437 03067dab10ca Use stricter input validation when looking for a string as input (bug #42651). Rik <rik@octave.org> parents: 19254 diff changeset	353 error ("urlwrite: URL must be a string");
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	354 return retval;
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	355 }
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	356
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	357 // name to store the file if download is succesful
19437 03067dab10ca Use stricter input validation when looking for a string as input (bug #42651). Rik <rik@octave.org> parents: 19254 diff changeset	358 // FIXME: Maybe use is_string () for better input validation.
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	359 std::string filename = args(1).string_value ();
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 if (error_state)
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	362 {
19437 03067dab10ca Use stricter input validation when looking for a string as input (bug #42651). Rik <rik@octave.org> parents: 19254 diff changeset	363 error ("urlwrite: LOCALFILE must be a string");
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	364 return retval;
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	365 }
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	366
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	367 std::string method;
17554 f0d21e7d4653 avoid Cell arrays in usr_transfer classes John W. Eaton <jwe@octave.org> parents: 17553 diff changeset	368 Array<std::string> param;
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	369
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	370 if (nargin == 4)
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	371 {
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	372 method = args(2).string_value ();
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	373
19437 03067dab10ca Use stricter input validation when looking for a string as input (bug #42651). Rik <rik@octave.org> parents: 19254 diff changeset	374 if (error_state \|\| (method != "get" && method != "post"))
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	375 {
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11548 diff changeset	376 error ("urlwrite: METHOD must be \"get\" or \"post\"");
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	377 return retval;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	378 }
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	379
17554 f0d21e7d4653 avoid Cell arrays in usr_transfer classes John W. Eaton <jwe@octave.org> parents: 17553 diff changeset	380 param = args(3).cellstr_value ();
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	381
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	382 if (error_state)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	383 {
19437 03067dab10ca Use stricter input validation when looking for a string as input (bug #42651). Rik <rik@octave.org> parents: 19254 diff changeset	384 error ("urlwrite: parameters (PARAM) for get and post requests must be given as a cell array of strings");
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	385 return retval;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	386 }
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	387
18712 6113e0c6920b maint: Clean up extra spaces before/after parentheses. Rik <rik@octave.org> parents: 18391 diff changeset	388 if (param.numel () % 2 == 1)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	389 {
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11548 diff changeset	390 error ("urlwrite: number of elements in PARAM must be even");
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	391 return retval;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	392 }
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	393 }
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	394
8151 3725f819b5b3 urlwrite.cc (Furlwrite): delete files we create if download fails John W. Eaton <jwe@octave.org> parents: 7481 diff changeset	395 // 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	396 // 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	397 // 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	398
3725f819b5b3 urlwrite.cc (Furlwrite): delete files we create if download fails John W. Eaton <jwe@octave.org> parents: 7481 diff changeset	399 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	400
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	401 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	402
6986 4ad04ff722d7 [project @ 2007-10-09 17:43:00 by jwe] jwe parents: 6984 diff changeset	403 if (! ofile.is_open ())
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	404 {
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	405 error ("urlwrite: unable to open file");
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	406 return retval;
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	407 }
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	408
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 9918 diff changeset	409 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	410
17549 a646665cd574 eliminate unecessary static function in urlwrite.cc John W. Eaton <jwe@octave.org> parents: 17548 diff changeset	411 frame.add_fcn (delete_file, filename);
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	412
17596 43b9181340fb separate object creation from http actions in url_transfer class John W. Eaton <jwe@octave.org> parents: 17556 diff changeset	413 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	414
18391 af04b9d9f7ed allow urlwrite to work again John W. Eaton <jwe@octave.org> parents: 18329 diff changeset	415 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	416 {
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	417 curl.http_action (param, method);
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	418
18287 9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	419 ofile.close ();
17553 2d01e20abd85 rework error handling for url_transfer class John W. Eaton <jwe@octave.org> parents: 17551 diff changeset	420
2d01e20abd85 rework error handling for url_transfer class John W. Eaton <jwe@octave.org> parents: 17551 diff changeset	421 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	422 frame.discard ();
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	423
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	424 if (nargout > 0)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	425 {
18287 9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	426 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	427 {
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	428 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	429 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	430 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	431 }
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	432 else
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	433 {
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	434 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	435 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	436 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	437 }
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	438 }
18287 9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	439
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	440 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	441 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	442 }
18287 9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	443 else
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	444 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	445
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	446 return retval;
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	447 }
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	448
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	449 DEFUN (urlread, args, nargout,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	450 "-- texinfo --\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10377 diff changeset	451 @deftypefn {Loadable Function} {@var{s} =} urlread (@var{url})\n\
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	452 @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	453 @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	454 @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	455 Download a remote file specified by its @var{url} and return its content\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10377 diff changeset	456 in string @var{s}. For example:\n\
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	457 \n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	458 @example\n\
19194 432ffa35de13 doc: Fix dead link in urlwrite/urlread docstring (bug #43082). Nir Krakauer < nkrakauer@ccny.cuny.edu> parents: 18391 diff changeset	459 s = urlread (\"ftp://ftp.octave.org/pub/README\");\n\
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	460 @end example\n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	461 \n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	462 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	463 otherwise it is 0 in which case @var{message} contains an error\n\
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11548 diff changeset	464 message. If no output argument is specified and an error occurs,\n\
6588 4deaf99400b2 [project @ 2007-04-26 20:31:10 by jwe] jwe parents: 6549 diff changeset	465 then the error is signaled through Octave's error handling mechanism.\n\
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	466 \n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	467 This function uses libcurl. Curl supports, among others, the HTTP,\n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	468 FTP and FILE protocols. Username and password may be specified in the\n\
10840 89f4d7e294cc Grammarcheck .cc files Rik <octave@nomad.inbox5.com> parents: 10377 diff changeset	469 URL@. For example:\n\
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	470 \n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	471 @example\n\
7031 120f3135952f [project @ 2007-10-15 15:30:03 by jwe] jwe parents: 7017 diff changeset	472 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	473 @end example\n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	474 \n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	475 GET and POST requests can be specified by @var{method} and @var{param}.\n\
6588 4deaf99400b2 [project @ 2007-04-26 20:31:10 by jwe] jwe parents: 6549 diff changeset	476 The parameter @var{method} is either @samp{get} or @samp{post}\n\
4deaf99400b2 [project @ 2007-04-26 20:31:10 by jwe] jwe parents: 6549 diff changeset	477 and @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	478 For example:\n\
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	479 \n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	480 @example\n\
9064 7c02ec148a3c Check grammar on all .cc files Rik <rdrider0-list@yahoo.com> parents: 8920 diff changeset	481 @group\n\
6588 4deaf99400b2 [project @ 2007-04-26 20:31:10 by jwe] jwe parents: 6549 diff changeset	482 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	483 @{\"query\", \"octave\"@});\n\
9064 7c02ec148a3c Check grammar on all .cc files Rik <rdrider0-list@yahoo.com> parents: 8920 diff changeset	484 @end group\n\
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	485 @end example\n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	486 @seealso{urlwrite}\n\
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	487 @end deftypefn")
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	488 {
6588 4deaf99400b2 [project @ 2007-04-26 20:31:10 by jwe] jwe parents: 6549 diff changeset	489 // Octave's return value
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	490 octave_value_list retval;
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	491
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	492 int nargin = args.length ();
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	493
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	494 // verify arguments
19437 03067dab10ca Use stricter input validation when looking for a string as input (bug #42651). Rik <rik@octave.org> parents: 19254 diff changeset	495 if (nargin != 1 && nargin != 3)
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	496 {
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	497 print_usage ();
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	498 return retval;
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	499 }
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	500
19437 03067dab10ca Use stricter input validation when looking for a string as input (bug #42651). Rik <rik@octave.org> parents: 19254 diff changeset	501 // FIXME: Maybe use is_string () for better input validation.
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	502 std::string url = args(0).string_value ();
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	503
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	504 if (error_state)
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	505 {
19437 03067dab10ca Use stricter input validation when looking for a string as input (bug #42651). Rik <rik@octave.org> parents: 19254 diff changeset	506 error ("urlread: URL must be a string");
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	507 return retval;
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	508 }
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	509
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	510 std::string method;
17554 f0d21e7d4653 avoid Cell arrays in usr_transfer classes John W. Eaton <jwe@octave.org> parents: 17553 diff changeset	511 Array<std::string> param;
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	512
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	513 if (nargin == 3)
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	514 {
19437 03067dab10ca Use stricter input validation when looking for a string as input (bug #42651). Rik <rik@octave.org> parents: 19254 diff changeset	515 // FIXME: Maybe use is_string () for better input validation.
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	516 method = args(1).string_value ();
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	517
19437 03067dab10ca Use stricter input validation when looking for a string as input (bug #42651). Rik <rik@octave.org> parents: 19254 diff changeset	518 if (error_state \|\| (method != "get" && method != "post"))
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	519 {
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11548 diff changeset	520 error ("urlread: METHOD must be \"get\" or \"post\"");
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	521 return retval;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	522 }
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	523
17554 f0d21e7d4653 avoid Cell arrays in usr_transfer classes John W. Eaton <jwe@octave.org> parents: 17553 diff changeset	524 param = args(2).cellstr_value ();
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	525
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	526 if (error_state)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	527 {
19437 03067dab10ca Use stricter input validation when looking for a string as input (bug #42651). Rik <rik@octave.org> parents: 19254 diff changeset	528 error ("urlread: parameters (PARAM) for get and post requests must be given as a cell array of strings");
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	529 return retval;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	530 }
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	531
18712 6113e0c6920b maint: Clean up extra spaces before/after parentheses. Rik <rik@octave.org> parents: 18391 diff changeset	532 if (param.numel () % 2 == 1)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	533 {
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11548 diff changeset	534 error ("urlread: number of elements in PARAM must be even");
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	535 return retval;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	536 }
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	537 }
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	538
6986 4ad04ff722d7 [project @ 2007-10-09 17:43:00 by jwe] jwe parents: 6984 diff changeset	539 std::ostringstream buf;
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	540
17596 43b9181340fb separate object creation from http actions in url_transfer class John W. Eaton <jwe@octave.org> parents: 17556 diff changeset	541 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	542
18287 9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	543 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	544 {
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	545 curl.http_action (param, method);
6043 199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	546
18329 b522d04382cf Return all nargout from urlread if requested (bug #41260). Rik <rik@octave.org> parents: 18287 diff changeset	547 if (nargout > 0)
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	548 {
18329 b522d04382cf Return all nargout from urlread if requested (bug #41260). Rik <rik@octave.org> parents: 18287 diff changeset	549 // 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	550 retval(2) = curl.good () ? "" : curl.lasterror ();
b522d04382cf Return all nargout from urlread if requested (bug #41260). Rik <rik@octave.org> parents: 18287 diff changeset	551 retval(1) = curl.good ();
b522d04382cf Return all nargout from urlread if requested (bug #41260). Rik <rik@octave.org> parents: 18287 diff changeset	552 retval(0) = buf.str ();
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	553 }
18287 9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	554
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	555 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	556 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	557 }
18287 9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	558 else
9a43d8d6e29e avoid startup crash if curl library is not available (bug #41067) John W. Eaton <jwe@octave.org> parents: 17861 diff changeset	559 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	560
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	561 return retval;
199f15a8d1fc [project @ 2006-10-09 19:49:03 by jwe] jwe parents: diff changeset	562 }
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	563
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	564 DEFUN (__ftp__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	565 "-- texinfo --\n\
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	566 @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	567 @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	568 Undocumented internal function\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	569 @end deftypefn")
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	570 {
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	571 octave_value retval;
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	572
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	573 int nargin = args.length ();
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	574 std::string host;
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	575 std::string user = "anonymous";
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	576 std::string passwd = "";
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	577
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	578 if (nargin < 1 \|\| nargin > 3)
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	579 {
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	580 print_usage ();
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	581 return retval;
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	582 }
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	583 else
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	584 {
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	585 host = args(0).string_value ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	586
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	587 if (nargin > 1)
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	588 user = args(1).string_value ();
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	589
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	590 if (nargin > 2)
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	591 passwd = args(2).string_value ();
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	592
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	593 if (! error_state)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	594 {
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	595 curl_handle ch
0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	596 = 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	597
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	598 if (! error_state)
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	599 retval = ch.value ();
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	600 }
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	601 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	602
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	603 return retval;
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	604 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	605
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	606 DEFUN (__ftp_pwd__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	607 "-- texinfo --\n\
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	608 @deftypefn {Loadable Function} {} __ftp_pwd__ (@var{handle})\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	609 Undocumented internal function\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	610 @end deftypefn")
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	611 {
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	612 octave_value retval;
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	613
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	614 int nargin = args.length ();
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	615
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	616 if (nargin != 1)
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11548 diff changeset	617 error ("__ftp_pwd__: incorrect number of arguments");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	618 else
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	619 {
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	620 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	621
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	622 if (error_state)
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	623 return retval;
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	624
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	625 if (curl.is_valid ())
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	626 retval = curl.pwd ();
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	627 else
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	628 error ("__ftp_pwd__: invalid ftp handle");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	629 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	630
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	631 return retval;
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	632 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	633
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	634 DEFUN (__ftp_cwd__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	635 "-- texinfo --\n\
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	636 @deftypefn {Loadable Function} {} __ftp_cwd__ (@var{handle}, @var{path})\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	637 Undocumented internal function\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	638 @end deftypefn")
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	639 {
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	640 octave_value retval;
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	641
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	642 int nargin = args.length ();
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	643
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	644 if (nargin != 1 && nargin != 2)
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11548 diff changeset	645 error ("__ftp_cwd__: incorrect number of arguments");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	646 else
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	647 {
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	648 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	649
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	650 if (error_state)
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	651 return retval;
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	652
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	653 if (curl.is_valid ())
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	654 {
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	655 std::string path = "";
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	656
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	657 if (nargin > 1)
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	658 path = args(1).string_value ();
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	659
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	660 if (! error_state)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	661 curl.cwd (path);
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	662 else
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	663 error ("__ftp_cwd__: expecting path as second argument");
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	664 }
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	665 else
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	666 error ("__ftp_cwd__: invalid ftp handle");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	667 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	668
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	669 return retval;
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	670 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	671
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	672 DEFUN (__ftp_dir__, args, nargout,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	673 "-- texinfo --\n\
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	674 @deftypefn {Loadable Function} {} __ftp_dir__ (@var{handle})\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	675 Undocumented internal function\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	676 @end deftypefn")
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	677 {
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	678 octave_value retval;
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	679
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	680 int nargin = args.length ();
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	681
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	682 if (nargin != 1)
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11548 diff changeset	683 error ("__ftp_dir__: incorrect number of arguments");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	684 else
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	685 {
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	686 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	687
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	688 if (error_state)
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	689 return retval;
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	690
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	691 if (curl.is_valid ())
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	692 {
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	693 if (nargout == 0)
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	694 curl.dir ();
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	695 else
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	696 {
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	697 string_vector sv = curl.list ();
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	698 octave_idx_type n = sv.length ();
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	699
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	700 if (n == 0)
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	701 {
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	702 string_vector flds (5);
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	703
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	704 flds(0) = "name";
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	705 flds(1) = "date";
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	706 flds(2) = "bytes";
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	707 flds(3) = "isdir";
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	708 flds(4) = "datenum";
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	709
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	710 retval = octave_map (flds);
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	711 }
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	712 else
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	713 {
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	714 octave_map st;
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	715
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	716 Cell filectime (dim_vector (n, 1));
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	717 Cell filesize (dim_vector (n, 1));
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	718 Cell fileisdir (dim_vector (n, 1));
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	719 Cell filedatenum (dim_vector (n, 1));
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	720
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	721 st.assign ("name", Cell (sv));
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	722
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	723 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	724 {
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	725 time_t ftime;
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	726 bool fisdir;
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	727 double fsize;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	728
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	729 curl.get_fileinfo (sv(i), fsize, ftime, fisdir);
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	730
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	731 fileisdir (i) = fisdir;
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	732 filectime (i) = ctime (&ftime);
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	733 filesize (i) = fsize;
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	734 filedatenum (i) = double (ftime);
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	735 }
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	736
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	737 st.assign ("date", filectime);
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	738 st.assign ("bytes", filesize);
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	739 st.assign ("isdir", fileisdir);
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	740 st.assign ("datenum", filedatenum);
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	741
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	742 retval = st;
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	743 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	744 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	745 }
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	746 else
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	747 error ("__ftp_dir__: invalid ftp handle");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	748 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	749
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	750 return retval;
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	751 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	752
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	753 DEFUN (__ftp_ascii__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	754 "-- texinfo --\n\
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	755 @deftypefn {Loadable Function} {} __ftp_ascii__ (@var{handle})\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	756 Undocumented internal function\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	757 @end deftypefn")
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	758 {
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	759 octave_value retval;
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	760
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	761 int nargin = args.length ();
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	762
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	763 if (nargin != 1)
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11548 diff changeset	764 error ("__ftp_ascii__: incorrect number of arguments");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	765 else
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	766 {
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	767 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	768
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	769 if (error_state)
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	770 return retval;
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	771
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	772 if (curl.is_valid ())
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	773 curl.ascii ();
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	774 else
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	775 error ("__ftp_ascii__: invalid ftp handle");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	776 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	777
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	778 return retval;
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	779 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	780
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	781 DEFUN (__ftp_binary__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	782 "-- texinfo --\n\
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	783 @deftypefn {Loadable Function} {} __ftp_binary__ (@var{handle})\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	784 Undocumented internal function\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	785 @end deftypefn")
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	786 {
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	787 octave_value retval;
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	788
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	789 int nargin = args.length ();
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	790
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	791 if (nargin != 1)
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11548 diff changeset	792 error ("__ftp_binary__: incorrect number of arguments");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	793 else
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	794 {
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	795 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	796
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	797 if (error_state)
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	798 return retval;
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	799
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	800 if (curl.is_valid ())
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	801 curl.binary ();
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	802 else
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	803 error ("__ftp_binary__: invalid ftp handle");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	804 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	805
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	806 return retval;
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	807 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	808
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	809 DEFUN (__ftp_close__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	810 "-- texinfo --\n\
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	811 @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	812 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	813 @end deftypefn")
accafe1aee7c Make use of gripe_disabled_feature() instead of custom error message. Carnë Draug <carandraug@octave.org> parents: 15326 diff changeset	814 {
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	815 octave_value retval;
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	816
17318 accafe1aee7c Make use of gripe_disabled_feature() instead of custom error message. Carnë Draug <carandraug@octave.org> parents: 15326 diff changeset	817 int nargin = args.length ();
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	818
17318 accafe1aee7c Make use of gripe_disabled_feature() instead of custom error message. Carnë Draug <carandraug@octave.org> parents: 15326 diff changeset	819 if (nargin != 1)
accafe1aee7c Make use of gripe_disabled_feature() instead of custom error message. Carnë Draug <carandraug@octave.org> parents: 15326 diff changeset	820 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	821 else
accafe1aee7c Make use of gripe_disabled_feature() instead of custom error message. Carnë Draug <carandraug@octave.org> parents: 15326 diff changeset	822 {
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	823 curl_handle h = ch_manager::lookup (args(0));
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	824
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	825 if (error_state)
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	826 return retval;
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 (h.ok ())
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	829 ch_manager::free (h);
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	830 else
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	831 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	832 }
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	833
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	834 return retval;
17318 accafe1aee7c Make use of gripe_disabled_feature() instead of custom error message. Carnë Draug <carandraug@octave.org> parents: 15326 diff changeset	835 }
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	836
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	837 DEFUN (__ftp_mode__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	838 "-- texinfo --\n\
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	839 @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	840 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	841 @end deftypefn")
accafe1aee7c Make use of gripe_disabled_feature() instead of custom error message. Carnë Draug <carandraug@octave.org> parents: 15326 diff changeset	842 {
accafe1aee7c Make use of gripe_disabled_feature() instead of custom error message. Carnë Draug <carandraug@octave.org> parents: 15326 diff changeset	843 octave_value retval;
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	844
17318 accafe1aee7c Make use of gripe_disabled_feature() instead of custom error message. Carnë Draug <carandraug@octave.org> parents: 15326 diff changeset	845 int nargin = args.length ();
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	846
17318 accafe1aee7c Make use of gripe_disabled_feature() instead of custom error message. Carnë Draug <carandraug@octave.org> parents: 15326 diff changeset	847 if (nargin != 1)
accafe1aee7c Make use of gripe_disabled_feature() instead of custom error message. Carnë Draug <carandraug@octave.org> parents: 15326 diff changeset	848 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	849 else
accafe1aee7c Make use of gripe_disabled_feature() instead of custom error message. Carnë Draug <carandraug@octave.org> parents: 15326 diff changeset	850 {
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	851 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	852
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	853 if (error_state)
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	854 return retval;
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	855
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	856 if (curl.is_valid ())
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	857 retval = (curl.is_ascii () ? "ascii" : "binary");
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	858 else
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	859 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	860 }
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	861
17318 accafe1aee7c Make use of gripe_disabled_feature() instead of custom error message. Carnë Draug <carandraug@octave.org> parents: 15326 diff changeset	862 return retval;
accafe1aee7c Make use of gripe_disabled_feature() instead of custom error message. Carnë Draug <carandraug@octave.org> parents: 15326 diff changeset	863 }
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	864
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	865 DEFUN (__ftp_delete__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	866 "-- texinfo --\n\
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	867 @deftypefn {Loadable Function} {} __ftp_delete__ (@var{handle}, @var{path})\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	868 Undocumented internal function\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	869 @end deftypefn")
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	870 {
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	871 octave_value retval;
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	872
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	873 int nargin = args.length ();
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	874
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	875 if (nargin != 2)
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11548 diff changeset	876 error ("__ftp_delete__: incorrect number of arguments");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	877 else
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	878 {
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	879 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	880
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	881 if (error_state)
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	882 return retval;
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	883
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	884 if (curl.is_valid ())
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	885 {
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	886 std::string file = args(1).string_value ();
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	887
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	888 if (! error_state)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	889 curl.del (file);
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	890 else
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	891 error ("__ftp_delete__: expecting file name as second argument");
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	892 }
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	893 else
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	894 error ("__ftp_delete__: invalid ftp handle");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	895 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	896
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	897 return retval;
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	898 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	899
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	900 DEFUN (__ftp_rmdir__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	901 "-- texinfo --\n\
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	902 @deftypefn {Loadable Function} {} __ftp_rmdir__ (@var{handle}, @var{path})\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	903 Undocumented internal function\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	904 @end deftypefn")
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	905 {
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	906 octave_value retval;
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	907
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	908 int nargin = args.length ();
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	909
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	910 if (nargin != 2)
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11548 diff changeset	911 error ("__ftp_rmdir__: incorrect number of arguments");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	912 else
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	913 {
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	914 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	915
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	916 if (error_state)
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	917 return retval;
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	918
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	919 if (curl.is_valid ())
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	920 {
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	921 std::string dir = args(1).string_value ();
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	922
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	923 if (! error_state)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	924 curl.rmdir (dir);
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	925 else
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	926 error ("__ftp_rmdir__: expecting directory name as second argument");
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	927 }
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	928 else
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	929 error ("__ftp_rmdir__: invalid ftp handle");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	930 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	931
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	932 return retval;
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
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	935 DEFUN (__ftp_mkdir__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	936 "-- texinfo --\n\
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	937 @deftypefn {Loadable Function} {} __ftp_mkdir__ (@var{handle}, @var{path})\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	938 Undocumented internal function\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	939 @end deftypefn")
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	940 {
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	941 octave_value retval;
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	942
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	943 int nargin = args.length ();
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	944
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	945 if (nargin != 2)
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11548 diff changeset	946 error ("__ftp_mkdir__: incorrect number of arguments");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	947 else
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	948 {
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	949 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	950
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	951 if (error_state)
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	952 return retval;
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	953
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	954 if (curl.is_valid ())
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	955 {
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	956 std::string dir = args(1).string_value ();
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	957
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	958 if (! error_state)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	959 curl.mkdir (dir);
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	960 else
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	961 error ("__ftp_mkdir__: expecting directory name as second argument");
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	962 }
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	963 else
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	964 error ("__ftp_mkdir__: invalid ftp handle");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	965 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	966
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	967 return retval;
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	968 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	969
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	970 DEFUN (__ftp_rename__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	971 "-- texinfo --\n\
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	972 @deftypefn {Loadable Function} {} __ftp_rename__ (@var{handle}, @var{path})\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	973 Undocumented internal function\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	974 @end deftypefn")
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	975 {
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	976 octave_value retval;
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	977
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	978 int nargin = args.length ();
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	979
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	980 if (nargin != 3)
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11548 diff changeset	981 error ("__ftp_rename__: incorrect number of arguments");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	982 else
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	983 {
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	984 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	985
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	986 if (error_state)
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	987 return retval;
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	988
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	989 if (curl.is_valid ())
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	990 {
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	991 std::string oldname = args(1).string_value ();
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	992 std::string newname = args(2).string_value ();
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	993
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	994 if (! error_state)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	995 curl.rename (oldname, newname);
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	996 else
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	997 error ("__ftp_rename__: expecting file names for second and third arguments");
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	998 }
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	999 else
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	1000 error ("__ftp_rename__: invalid ftp handle");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1001 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1002
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	1003 return retval;
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1004 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1005
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	1006 DEFUN (__ftp_mput__, args, nargout,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1007 "-- texinfo --\n\
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1008 @deftypefn {Loadable Function} {} __ftp_mput__ (@var{handle}, @var{files})\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1009 Undocumented internal function\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1010 @end deftypefn")
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1011 {
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	1012 octave_value retval;
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 int nargin = args.length ();
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1015
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1016 if (nargin != 2)
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11548 diff changeset	1017 error ("__ftp_mput__: incorrect number of arguments");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1018 else
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1019 {
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	1020 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	1021
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	1022 if (error_state)
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	1023 return retval;
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1024
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	1025 if (curl.is_valid ())
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1026 {
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	1027 std::string pat = args(1).string_value ();
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1028
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	1029 if (! error_state)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1030 {
17553 2d01e20abd85 rework error handling for url_transfer class John W. Eaton <jwe@octave.org> parents: 17551 diff changeset	1031 string_vector file_list;
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	1032
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1033 glob_match pattern (file_ops::tilde_expand (pat));
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1034 string_vector files = pattern.glob ();
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1035
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1036 for (octave_idx_type i = 0; i < files.length (); i++)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1037 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1038 std::string file = files (i);
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1039
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1040 file_stat fs (file);
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1041
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1042 if (! fs.exists ())
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1043 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1044 error ("__ftp__mput: file does not exist");
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1045 break;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1046 }
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1047
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1048 if (fs.is_dir ())
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1049 {
17553 2d01e20abd85 rework error handling for url_transfer class John W. Eaton <jwe@octave.org> parents: 17551 diff changeset	1050 file_list.append (curl.mput_directory ("", file));
2d01e20abd85 rework error handling for url_transfer class John W. Eaton <jwe@octave.org> parents: 17551 diff changeset	1051
2d01e20abd85 rework error handling for url_transfer class John W. Eaton <jwe@octave.org> parents: 17551 diff changeset	1052 if (! curl.good ())
2d01e20abd85 rework error handling for url_transfer class John W. Eaton <jwe@octave.org> parents: 17551 diff changeset	1053 {
2d01e20abd85 rework error handling for url_transfer class John W. Eaton <jwe@octave.org> parents: 17551 diff changeset	1054 error ("__ftp_mput__: %s", curl.lasterror().c_str());
2d01e20abd85 rework error handling for url_transfer class John W. Eaton <jwe@octave.org> parents: 17551 diff changeset	1055 break;
2d01e20abd85 rework error handling for url_transfer class John W. Eaton <jwe@octave.org> parents: 17551 diff changeset	1056 }
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1057 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1058 else
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1059 {
17861 870f3e12e163 maint: Use phrase "FIXME:" for problem areas in code. Rik <rik@octave.org> parents: 17787 diff changeset	1060 // FIXME: Does ascii mode need to be flagged here?
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	1061 std::ifstream ifile (file.c_str (), std::ios::in \|
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1062 std::ios::binary);
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1063
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1064 if (! ifile.is_open ())
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1065 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1066 error ("__ftp_mput__: unable to open file");
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1067 break;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1068 }
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1069
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1070 curl.put (file, ifile);
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1071
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1072 ifile.close ();
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1073
17553 2d01e20abd85 rework error handling for url_transfer class John W. Eaton <jwe@octave.org> parents: 17551 diff changeset	1074 if (! curl.good ())
2d01e20abd85 rework error handling for url_transfer class John W. Eaton <jwe@octave.org> parents: 17551 diff changeset	1075 {
2d01e20abd85 rework error handling for url_transfer class John W. Eaton <jwe@octave.org> parents: 17551 diff changeset	1076 error ("__ftp_mput__: %s", curl.lasterror().c_str());
2d01e20abd85 rework error handling for url_transfer class John W. Eaton <jwe@octave.org> parents: 17551 diff changeset	1077 break;
2d01e20abd85 rework error handling for url_transfer class John W. Eaton <jwe@octave.org> parents: 17551 diff changeset	1078 }
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1079
17553 2d01e20abd85 rework error handling for url_transfer class John W. Eaton <jwe@octave.org> parents: 17551 diff changeset	1080 file_list.append (file);
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1081 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1082 }
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	1083
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	1084 if (nargout > 0)
17553 2d01e20abd85 rework error handling for url_transfer class John W. Eaton <jwe@octave.org> parents: 17551 diff changeset	1085 retval = file_list;
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1086 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1087 else
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	1088 error ("__ftp_mput__: expecting file name patter as second argument");
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1089 }
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	1090 else
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	1091 error ("__ftp_mput__: invalid ftp handle");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1092 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1093
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	1094 return retval;
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1095 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1096
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	1097 DEFUN (__ftp_mget__, args, ,
17787 175b392e91fe Use GNU style coding conventions for code in libinterp/ Rik <rik@octave.org> parents: 17744 diff changeset	1098 "-- texinfo --\n\
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1099 @deftypefn {Loadable Function} {} __ftp_mget__ (@var{handle}, @var{files})\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1100 Undocumented internal function\n\
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1101 @end deftypefn")
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1102 {
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	1103 octave_value retval;
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	1104
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1105 int nargin = args.length ();
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1106
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1107 if (nargin != 2 && nargin != 3)
11553 01f703952eff Improve docstrings for functions in DLD-FUNCTIONS directory. Rik <octave@nomad.inbox5.com> parents: 11548 diff changeset	1108 error ("__ftp_mget__: incorrect number of arguments");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1109 else
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1110 {
17555 0946b0e06544 move url_transfer classes to liboctave John W. Eaton <jwe@octave.org> parents: 17554 diff changeset	1111 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	1112
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	1113 if (error_state)
8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	1114 return retval;
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1115
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	1116 if (curl.is_valid ())
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	1117 {
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	1118 std::string file = args(1).string_value ();
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	1119 std::string target;
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1120
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	1121 if (nargin == 3)
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	1122 target = args(2).string_value () + file_ops::dir_sep_str ();
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1123
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	1124 if (! error_state)
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1125 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1126 string_vector sv = curl.list ();
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1127 octave_idx_type n = 0;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1128 glob_match pattern (file);
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1129
17553 2d01e20abd85 rework error handling for url_transfer class John W. Eaton <jwe@octave.org> parents: 17551 diff changeset	1130
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1131 for (octave_idx_type i = 0; i < sv.length (); i++)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1132 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1133 if (pattern.match (sv(i)))
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1134 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1135 n++;
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1136
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1137 time_t ftime;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1138 bool fisdir;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1139 double fsize;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	1140
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1141 curl.get_fileinfo (sv(i), fsize, ftime, fisdir);
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1142
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1143 if (fisdir)
17550 77127a3badaa move curl_object actions to rep class John W. Eaton <jwe@octave.org> parents: 17549 diff changeset	1144 curl.mget_directory (sv(i), target);
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1145 else
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1146 {
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	1147 std::ofstream ofile ((target + sv(i)).c_str (),
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11553 diff changeset	1148 std::ios::out \|
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1149 std::ios::binary);
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1150
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1151 if (! ofile.is_open ())
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1152 {
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1153 error ("__ftp_mget__: unable to open file");
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1154 break;
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1155 }
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1156
10066 2cd940306a06 make unwind_protect frames local Jaroslav Hajek <highegg@gmail.com> parents: 9918 diff changeset	1157 unwind_protect_safe frame;
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1158
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1159 frame.add_fcn (delete_file, target + sv(i));
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1160
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1161 curl.get (sv(i), ofile);
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1162
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1163 ofile.close ();
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1164
17553 2d01e20abd85 rework error handling for url_transfer class John W. Eaton <jwe@octave.org> parents: 17551 diff changeset	1165 if (curl.good ())
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1166 frame.discard ();
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1167 }
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1168
17553 2d01e20abd85 rework error handling for url_transfer class John W. Eaton <jwe@octave.org> parents: 17551 diff changeset	1169 if (! curl.good ())
2d01e20abd85 rework error handling for url_transfer class John W. Eaton <jwe@octave.org> parents: 17551 diff changeset	1170 {
2d01e20abd85 rework error handling for url_transfer class John W. Eaton <jwe@octave.org> parents: 17551 diff changeset	1171 error ("__ftp_mget__: %s", curl.lasterror().c_str());
2d01e20abd85 rework error handling for url_transfer class John W. Eaton <jwe@octave.org> parents: 17551 diff changeset	1172 break;
2d01e20abd85 rework error handling for url_transfer class John W. Eaton <jwe@octave.org> parents: 17551 diff changeset	1173 }
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1174 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1175 }
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1176 if (n == 0)
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1177 error ("__ftp_mget__: file not found");
40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1178 }
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	1179 else
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	1180 error ("__ftp_mget__: expecting file name and target as second and third arguments");
10154 40dfc0c99116 DLD-FUNCTIONS/.cc: untabify John W. Eaton <jwe@octave.org>* parents: 10084 diff changeset	1181 }
17548 92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	1182 else
92541ff4cc3c improve implementation of ftp object handles John W. Eaton <jwe@octave.org> parents: 17546 diff changeset	1183 error ("__ftp_mget__: invalid ftp handle");
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1184 }
7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1185
17551 8fca0bbdd4c1 reorganize curl wrapper class John W. Eaton <jwe@octave.org> parents: 17550 diff changeset	1186 return retval;
9880 7f77e5081e83 Add ftp objects David Bateman <dbateman@free.fr> parents: 9064 diff changeset	1187 }

Mercurial > octave-nkf

annotate libinterp/corefcn/urlwrite.cc @ 19437:03067dab10ca