octave: liboctave/file-ops.cc annotate

annotate liboctave/file-ops.cc @ 13983:7dd7cccf0757

clean up memory allocated for singletons before exit * singleton-cleanup.h, singleton-cleanup.cc: New files. * liboctave/Makefile.am (INCS, LIBOCTAVE_CXX_SOURCES): Add them to the lists. * toplev.cc (clean_up_and_exit): Call singleton_cleanup_list::cleanup. * debug.h, debug.cc (bp_table::instance_ok): Move definition to debug.cc. * coment-list.h (octave_comment_buffer::~octave_comment_buffer): Define destructor for class. * ov-typeinfo.h (octave_value_typeinfo::~octave_value_typeinfo): Likewise. * cmd-edit.h (command_editor::cleanup_instance): New function. * cmd-hist.h (command_history::cleanup_instance): New function. * file-ops.h (file_ops::cleanup_instance): New function. * mach-info.h (oct_mach_info::cleanup_instance): New function. * oct-env.h (octave_env::cleanup_instance): New function. * oct-fftw.h (octave_fftw_planner::cleanup_instance): New function. * oct-rand.h (octave_rand::cleanup_instance): New function. * oct-spparms.h (octave_sparse_params::cleanup_instance): New function. * pathsearch.h (static_members::cleanup_instance): New function. * comment-list.h (octave_comment_buffer::cleanup_instance): New function. * debug.h (bp_table::cleanup_instance): New function. * display.h (display_info::cleanup_instance): New function. * dynamic-ld.cc (octave_shlib_list::cleanup_instance, octave_mex_file_list::cleanup_instance): New functions. * dynamic-ld.h (octave_dynamic_loader::cleanup_instance): New function. * load-path.h (load_path::cleanup_instance): New function. * oct-stream.h (octave_stream_list::cleanup_instance): New function. * ov-typeinfo.h (octave_value_typeinfo::cleanup_instance): New function. * pager.h, pager.cc (octave_pager_stream::instance_ok, octave_pager_stream::cleanup_instance): New functions. (octave_diary_stream::instance_ok, octave_diary_stream::cleanup_instance): New functions. * sighandlers.h (octave_child_list::cleanup_instance): New function. * toplev.h (octave_call_stack * pager.cc (octave_pager_stream::stream, octave_diary_stream::stream): Use instance_ok to create instance. * toplev.h (octave_call_stack::cleanup_instance): New function. * cmd-edit.cc (command_editor::instance_ok): Register cleanup function. * cmd-hist.cc (command_history::instance_ok): Likewise. * file-ops.cc (file_ops::instance_ok): Likewise. * mach-info.cc (oct_mach_info::instance_ok): Likewise. * oct-env.cc (octave_env::instance_ok): Likewise. * oct-fftw.cc (octave_fftw_planner::instance_ok): Likewise. * oct-rand.cc (octave_rand::instance_ok): Likewise. * oct-spparms.cc (octave_sparse_params::instance_ok): Likewise. * pathsearch.cc (dir_path::static_members::instance_ok): Likewise. * comment-list.cc (comment_list::instance_ok): Likewise. * debug.cc (bp_table::instance_ok): Likewise. * display.cc (display_info::instance_ok): Likewise. * dynamic-ld.cc (octave_shlib_list::instance_ok, octave_mex_file_list::instance_ok, octave_dynamic_loader): Likewise. * load-path.cc (load_path::instance_ok): Likewise. * oct-stream.cc (octave_stream_list::instance_ok): Likewise. * ov-typeinfo.cc (octave_value_typeinfo::instance_ok): Likewise. * sighandlers.cc (octave_child_list::instance_ok): Likewise. * symtab.h, symtab.cc (symbol_table::scope_id::create_instance): New function. * symtab.h (symbol_table::scope_id::instance_ok): Call create_instance. * toplev.h, toplev.cc (octave_call_stack::create_instance): New function. * toplev.cc (octave_call_stack::instance_ok): Call create_instance. * pager.h, pager.cc (octave_pager_stream::set_diary_skip, octave_pager_stream::flush_current_contents_to_diary): Now static. octave_pager_stream::do_set_diary_skip, octave_pager_stream::do_flush_current_contents_to_diary): New functions. (octave_pager_stream::stream): Return std::ostream&, not octave_pager_stream&. If instance creation fails, return std::cout. (octave_diary_stream::stream): Return std::ostream&, not octave_diary_stream&. If instance creation fails, return std::cout. (octave_pager_stream::do_reset, octave_diary_stream::do_reset): Use instance_ok to create instance.

author	John W. Eaton <jwe@octave.org>
date	Sat, 03 Dec 2011 04:34:17 -0500
parents	12df7854fa7c
children	72c96de7a403

rev	line source
1765 a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	1 /*
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	2
11523 fd0a3ac60b0e update copyright notices John W. Eaton <jwe@octave.org> parents: 10463 diff changeset	3 Copyright (C) 1996-2011 John W. Eaton
1765 a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	4
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	5 This file is part of Octave.
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	6
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	7 Octave is free software; you can redistribute it and/or modify it
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	8 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: 6709 diff changeset	9 Free Software Foundation; either version 3 of the License, or (at your
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6709 diff changeset	10 option) any later version.
1765 a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	11
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	12 Octave is distributed in the hope that it will be useful, but WITHOUT
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	13 ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	14 FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	15 for more details.
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	16
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	17 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: 6709 diff changeset	18 along with Octave; see the file COPYING. If not, see
93c65f2a5668 [project @ 2007-10-12 06:40:56 by jwe] jwe parents: 6709 diff changeset	19 <http://www.gnu.org/licenses/>.
1765 a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	20
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	21 */
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	22
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	23 #ifdef HAVE_CONFIG_H
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	24 #include <config.h>
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	25 #endif
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	26
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	27 #include <cerrno>
10463 bbe99b2a5ba7 undo recent gnulib-related changes John W. Eaton <jwe@octave.org> parents: 10447 diff changeset	28 #include <cstdio>
bbe99b2a5ba7 undo recent gnulib-related changes John W. Eaton <jwe@octave.org> parents: 10447 diff changeset	29 #include <cstdlib>
bbe99b2a5ba7 undo recent gnulib-related changes John W. Eaton <jwe@octave.org> parents: 10447 diff changeset	30 #include <cstring>
1765 a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	31
3503 d14c483b3c12 [project @ 2000-02-01 04:06:07 by jwe] jwe parents: 3074 diff changeset	32 #include <iostream>
4726 14dc2267c343 [project @ 2004-01-23 20:04:35 by jwe] jwe parents: 4578 diff changeset	33 #include <vector>
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	34
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	35 #include <sys/stat.h>
1765 a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	36 #include <sys/types.h>
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	37 #include <unistd.h>
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2847 diff changeset	38
10279 323c9cbbd02a fix gnulib includes John W. Eaton <jwe@octave.org> parents: 10252 diff changeset	39 #include "pathmax.h"
1765 a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	40
5476 941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe] jwe parents: 5307 diff changeset	41 #include "dir-ops.h"
1765 a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	42 #include "file-ops.h"
5476 941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe] jwe parents: 5307 diff changeset	43 #include "file-stat.h"
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2847 diff changeset	44 #include "oct-env.h"
13983 7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	45 #include "oct-locbuf.h"
2934 dddc1b5c324e [project @ 1997-05-05 22:56:37 by jwe] jwe parents: 2926 diff changeset	46 #include "oct-passwd.h"
3710 9a77deefb8c9 [project @ 2000-08-02 20:47:44 by jwe] jwe parents: 3504 diff changeset	47 #include "pathlen.h"
5476 941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe] jwe parents: 5307 diff changeset	48 #include "quit.h"
13983 7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	49 #include "singleton-cleanup.h"
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2847 diff changeset	50 #include "str-vec.h"
1765 a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	51
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	52 file_ops *file_ops::instance = 0;
8007 a2ab20ba78f7 make file_ops a proper singleton class John W. Eaton <jwe@octave.org> parents: 7520 diff changeset	53
a2ab20ba78f7 make file_ops a proper singleton class John W. Eaton <jwe@octave.org> parents: 7520 diff changeset	54 bool
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	55 file_ops::instance_ok (void)
8007 a2ab20ba78f7 make file_ops a proper singleton class John W. Eaton <jwe@octave.org> parents: 7520 diff changeset	56 {
a2ab20ba78f7 make file_ops a proper singleton class John W. Eaton <jwe@octave.org> parents: 7520 diff changeset	57 bool retval = true;
a2ab20ba78f7 make file_ops a proper singleton class John W. Eaton <jwe@octave.org> parents: 7520 diff changeset	58
a2ab20ba78f7 make file_ops a proper singleton class John W. Eaton <jwe@octave.org> parents: 7520 diff changeset	59 if (! instance)
a2ab20ba78f7 make file_ops a proper singleton class John W. Eaton <jwe@octave.org> parents: 7520 diff changeset	60 {
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	61 #if (defined (OCTAVE_HAVE_WINDOWS_FILESYSTEM) && ! defined (OCTAVE_HAVE_POSIX_FILESYSTEM))
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	62 char system_dir_sep_char = '\\';
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	63 std::string system_dir_sep_str = "\\";
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	64 #else
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	65 char system_dir_sep_char = '/';
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	66 std::string system_dir_sep_str = "/";
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	67 #endif
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	68 #if defined (OCTAVE_HAVE_WINDOWS_FILESYSTEM)
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	69 std::string system_dir_sep_chars = "/\\";
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	70 #else
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	71 std::string system_dir_sep_chars = system_dir_sep_str;
5138 5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe] jwe parents: 4726 diff changeset	72 #endif
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe] jwe parents: 4726 diff changeset	73
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	74 instance = new file_ops (system_dir_sep_char, system_dir_sep_str,
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	75 system_dir_sep_chars);
6271 6fab59e81b4e [project @ 2007-02-06 01:36:46 by jwe] jwe parents: 6208 diff changeset	76
13983 7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	77 if (instance)
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	78 singleton_cleanup_list::add (cleanup_instance);
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	79 }
5138 5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe] jwe parents: 4726 diff changeset	80
13983 7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	81 if (! instance)
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	82 {
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	83 (*current_liboctave_error_handler)
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	84 ("unable to create file_ops object!");
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	85
7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	86 retval = false;
3504 5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe] jwe parents: 3503 diff changeset	87 }
1802 8173b1fa052d [project @ 1996-01-29 06:10:18 by jwe] jwe parents: 1779 diff changeset	88
8173b1fa052d [project @ 1996-01-29 06:10:18 by jwe] jwe parents: 1779 diff changeset	89 return retval;
8173b1fa052d [project @ 1996-01-29 06:10:18 by jwe] jwe parents: 1779 diff changeset	90 }
8173b1fa052d [project @ 1996-01-29 06:10:18 by jwe] jwe parents: 1779 diff changeset	91
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	92 // The following tilde-expansion code was stolen and adapted from
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	93 // readline.
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2847 diff changeset	94
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	95 // The default value of tilde_additional_prefixes. This is set to
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	96 // whitespace preceding a tilde so that simple programs which do not
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	97 // perform any word separation get desired behaviour.
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	98 static const char *default_prefixes[] = { " ~", "\t~", ":~", 0 };
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	99
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	100 // The default value of tilde_additional_suffixes. This is set to
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	101 // whitespace or newline so that simple programs which do not perform
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	102 // any word separation get desired behaviour.
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	103 static const char *default_suffixes[] = { " ", "\n", ":", 0 };
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	104
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	105 // If non-null, this contains the address of a function that the
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	106 // application wants called before trying the standard tilde
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	107 // expansions. The function is called with the text sans tilde, and
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	108 // returns a malloc()'ed string which is the expansion, or a NULL
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	109 // pointer if the expansion fails.
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	110 file_ops::tilde_expansion_hook file_ops::tilde_expansion_preexpansion_hook = 0;
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	111
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	112 // If non-null, this contains the address of a function to call if the
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	113 // standard meaning for expanding a tilde fails. The function is
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	114 // called with the text (sans tilde, as in "foo"), and returns a
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	115 // malloc()'ed string which is the expansion, or a NULL pointer if
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	116 // there is no expansion.
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	117 file_ops::tilde_expansion_hook file_ops::tilde_expansion_failure_hook = 0;
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	118
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	119 // When non-null, this is a NULL terminated array of strings which are
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	120 // duplicates for a tilde prefix. Bash uses this to expand `=~' and
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	121 // `:~'.
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	122 string_vector file_ops::tilde_additional_prefixes = default_prefixes;
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	123
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	124 // When non-null, this is a NULL terminated array of strings which
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	125 // match the end of a username, instead of just "/". Bash sets this
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	126 // to `:' and `=~'.
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	127 string_vector file_ops::tilde_additional_suffixes = default_suffixes;
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	128
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	129 // Find the start of a tilde expansion in S, and return the index
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	130 // of the tilde which starts the expansion. Place the length of the
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	131 // text which identified this tilde starter in LEN, excluding the
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	132 // tilde itself.
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	133
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	134 static size_t
3504 5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe] jwe parents: 3503 diff changeset	135 tilde_find_prefix (const std::string& s, size_t& len)
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	136 {
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	137 len = 0;
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	138
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	139 size_t s_len = s.length ();
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	140
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	141 if (s_len == 0 \|\| s[0] == '~')
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	142 return 0;
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	143
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	144 string_vector prefixes = file_ops::tilde_additional_prefixes;
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	145
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	146 if (! prefixes.empty ())
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	147 {
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	148 for (size_t i = 0; i < s_len; i++)
10180 be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	149 {
be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	150 for (int j = 0; j < prefixes.length (); j++)
be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	151 {
be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	152 size_t pfx_len = prefixes[j].length ();
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	153
10180 be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	154 if (prefixes[j].compare (s.substr (i, pfx_len)) == 0)
be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	155 {
be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	156 len = pfx_len - 1;
be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	157 return i + len;
be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	158 }
be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	159 }
be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	160 }
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	161 }
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	162
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	163 return s_len;
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	164 }
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	165
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	166 // Find the end of a tilde expansion in S, and return the index
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	167 // of the character which ends the tilde definition.
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	168
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	169 static size_t
3504 5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe] jwe parents: 3503 diff changeset	170 tilde_find_suffix (const std::string& s)
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	171 {
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	172 size_t s_len = s.length ();
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	173
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	174 string_vector suffixes = file_ops::tilde_additional_suffixes;
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	175
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	176 size_t i = 0;
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	177
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	178 for ( ; i < s_len; i++)
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	179 {
6694 3d913ba36b75 [project @ 2007-06-06 06:08:25 by jwe] jwe parents: 6363 diff changeset	180 if (file_ops::is_dir_sep (s[i]))
10180 be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	181 break;
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	182
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	183 if (! suffixes.empty ())
10180 be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	184 {
be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	185 for (int j = 0; j < suffixes.length (); j++)
be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	186 {
be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	187 size_t sfx_len = suffixes[j].length ();
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	188
10180 be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	189 if (suffixes[j].compare (s.substr (i, sfx_len)) == 0)
be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	190 return i;
be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	191 }
be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	192 }
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	193 }
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	194
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	195 return i;
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	196 }
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	197
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	198 // Take FNAME and return the tilde prefix we want expanded.
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	199
3504 5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe] jwe parents: 3503 diff changeset	200 static std::string
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe] jwe parents: 3503 diff changeset	201 isolate_tilde_prefix (const std::string& fname)
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	202 {
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	203 size_t f_len = fname.length ();
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	204
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	205 size_t len = 1;
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	206
6694 3d913ba36b75 [project @ 2007-06-06 06:08:25 by jwe] jwe parents: 6363 diff changeset	207 while (len < f_len && ! file_ops::is_dir_sep (fname[len]))
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	208 len++;
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	209
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	210 return fname.substr (1, len);
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	211 }
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	212
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	213 // Do the work of tilde expansion on FILENAME. FILENAME starts with a
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	214 // tilde.
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	215
3504 5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe] jwe parents: 3503 diff changeset	216 static std::string
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe] jwe parents: 3503 diff changeset	217 tilde_expand_word (const std::string& filename)
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	218 {
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	219 size_t f_len = filename.length ();
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	220
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	221 if (f_len == 0 \|\| filename[0] != '~')
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	222 return filename;
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	223
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	224 // A leading `~/' or a bare `~' is always translated to the value
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	225 // of $HOME or the home directory of the current user, regardless of
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	226 // any preexpansion hook.
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	227
6694 3d913ba36b75 [project @ 2007-06-06 06:08:25 by jwe] jwe parents: 6363 diff changeset	228 if (f_len == 1 \|\| file_ops::is_dir_sep (filename[1]))
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	229 return octave_env::get_home_directory () + filename.substr (1);
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	230
3504 5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe] jwe parents: 3503 diff changeset	231 std::string username = isolate_tilde_prefix (filename);
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	232
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	233 size_t user_len = username.length ();
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	234
3504 5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe] jwe parents: 3503 diff changeset	235 std::string dirname;
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	236
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	237 if (file_ops::tilde_expansion_preexpansion_hook)
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	238 {
3504 5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe] jwe parents: 3503 diff changeset	239 std::string expansion
10180 be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	240 = file_ops::tilde_expansion_preexpansion_hook (username);
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	241
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	242 if (! expansion.empty ())
10180 be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	243 return expansion + filename.substr (user_len+1);
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	244 }
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	245
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	246 // No preexpansion hook, or the preexpansion hook failed. Look in the
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	247 // password database.
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	248
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	249 octave_passwd pw = octave_passwd::getpwnam (username);
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	250
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	251 if (! pw)
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	252 {
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	253 // If the calling program has a special syntax for expanding tildes,
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	254 // and we couldn't find a standard expansion, then let them try.
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	255
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	256 if (file_ops::tilde_expansion_failure_hook)
10180 be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	257 {
be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	258 std::string expansion
be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	259 = file_ops::tilde_expansion_failure_hook (username);
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	260
10180 be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	261 if (! expansion.empty ())
be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	262 dirname = expansion + filename.substr (user_len+1);
be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	263 }
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	264
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	265 // If we don't have a failure hook, or if the failure hook did not
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	266 // expand the tilde, return a copy of what we were passed.
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	267
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	268 if (dirname.length () == 0)
10180 be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	269 dirname = filename;
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	270 }
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	271 else
3074 42975c59d2a0 [project @ 1997-07-24 19:33:35 by jwe] jwe parents: 3040 diff changeset	272 dirname = pw.dir () + filename.substr (user_len+1);
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	273
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	274 return dirname;
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	275 }
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	276
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	277 // If NAME has a leading ~ or ~user, Unix-style, expand it to the
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	278 // user's home directory. If no ~, or no <pwd.h>, just return NAME.
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	279
3504 5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe] jwe parents: 3503 diff changeset	280 std::string
5eef8a2294bd [project @ 2000-02-01 10:06:51 by jwe] jwe parents: 3503 diff changeset	281 file_ops::tilde_expand (const std::string& name)
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2847 diff changeset	282 {
8327 4a7a943581d0 Fast return case for file_ops::tilde_expand David Bateman <dbateman@free.fr> parents: 8009 diff changeset	283 if (name.find ('~') == std::string::npos)
4a7a943581d0 Fast return case for file_ops::tilde_expand David Bateman <dbateman@free.fr> parents: 8009 diff changeset	284 return name;
4a7a943581d0 Fast return case for file_ops::tilde_expand David Bateman <dbateman@free.fr> parents: 8009 diff changeset	285 else
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	286 {
8327 4a7a943581d0 Fast return case for file_ops::tilde_expand David Bateman <dbateman@free.fr> parents: 8009 diff changeset	287 std::string result;
4a7a943581d0 Fast return case for file_ops::tilde_expand David Bateman <dbateman@free.fr> parents: 8009 diff changeset	288
4a7a943581d0 Fast return case for file_ops::tilde_expand David Bateman <dbateman@free.fr> parents: 8009 diff changeset	289 size_t name_len = name.length ();
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2847 diff changeset	290
8327 4a7a943581d0 Fast return case for file_ops::tilde_expand David Bateman <dbateman@free.fr> parents: 8009 diff changeset	291 // Scan through S expanding tildes as we come to them.
4a7a943581d0 Fast return case for file_ops::tilde_expand David Bateman <dbateman@free.fr> parents: 8009 diff changeset	292
4a7a943581d0 Fast return case for file_ops::tilde_expand David Bateman <dbateman@free.fr> parents: 8009 diff changeset	293 size_t pos = 0;
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	294
8327 4a7a943581d0 Fast return case for file_ops::tilde_expand David Bateman <dbateman@free.fr> parents: 8009 diff changeset	295 while (1)
10180 be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	296 {
be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	297 if (pos > name_len)
be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	298 break;
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	299
10180 be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	300 size_t len;
8327 4a7a943581d0 Fast return case for file_ops::tilde_expand David Bateman <dbateman@free.fr> parents: 8009 diff changeset	301
10180 be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	302 // Make START point to the tilde which starts the expansion.
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2847 diff changeset	303
10180 be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	304 size_t start = tilde_find_prefix (name.substr (pos), len);
8327 4a7a943581d0 Fast return case for file_ops::tilde_expand David Bateman <dbateman@free.fr> parents: 8009 diff changeset	305
10180 be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	306 result.append (name.substr (pos, start));
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	307
10180 be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	308 // Advance STRING to the starting tilde.
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2847 diff changeset	309
10180 be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	310 pos += start;
8327 4a7a943581d0 Fast return case for file_ops::tilde_expand David Bateman <dbateman@free.fr> parents: 8009 diff changeset	311
10180 be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	312 // Make FINI be the index of one after the last character of the
be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	313 // username.
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2847 diff changeset	314
10180 be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	315 size_t fini = tilde_find_suffix (name.substr (pos));
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2847 diff changeset	316
10180 be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	317 // If both START and FINI are zero, we are all done.
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2847 diff changeset	318
10180 be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	319 if (! (start \|\| fini))
be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	320 break;
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2847 diff changeset	321
10180 be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	322 // Expand the entire tilde word, and copy it into RESULT.
2947 cf676ff8b702 [project @ 1997-05-09 13:32:46 by jwe] jwe parents: 2937 diff changeset	323
10180 be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	324 std::string tilde_word = name.substr (pos, fini);
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	325
10180 be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	326 pos += fini;
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2847 diff changeset	327
10180 be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	328 std::string expansion = tilde_expand_word (tilde_word);
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	329
10180 be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	330 result.append (expansion);
be952ce74023 bootstrap.conf fixes John W. Eaton <jwe@octave.org> parents: 10179 diff changeset	331 }
8327 4a7a943581d0 Fast return case for file_ops::tilde_expand David Bateman <dbateman@free.fr> parents: 8009 diff changeset	332
4a7a943581d0 Fast return case for file_ops::tilde_expand David Bateman <dbateman@free.fr> parents: 8009 diff changeset	333 return result;
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2847 diff changeset	334 }
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2847 diff changeset	335 }
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2847 diff changeset	336
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2847 diff changeset	337 // A vector version of the above.
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2847 diff changeset	338
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2847 diff changeset	339 string_vector
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2847 diff changeset	340 file_ops::tilde_expand (const string_vector& names)
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2847 diff changeset	341 {
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2847 diff changeset	342 string_vector retval;
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2847 diff changeset	343
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2847 diff changeset	344 int n = names.length ();
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2847 diff changeset	345
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2847 diff changeset	346 retval.resize (n);
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2847 diff changeset	347
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2847 diff changeset	348 for (int i = 0; i < n; i++)
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	349 retval[i] = tilde_expand (names[i]);
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2847 diff changeset	350
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2847 diff changeset	351 return retval;
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2847 diff changeset	352 }
1802 8173b1fa052d [project @ 1996-01-29 06:10:18 by jwe] jwe parents: 1779 diff changeset	353
7272 05ee52d7fad6 [project @ 2007-12-10 07:06:00 by jwe] jwe parents: 7017 diff changeset	354 std::string
05ee52d7fad6 [project @ 2007-12-10 07:06:00 by jwe] jwe parents: 7017 diff changeset	355 file_ops::concat (const std::string& dir, const std::string& file)
05ee52d7fad6 [project @ 2007-12-10 07:06:00 by jwe] jwe parents: 7017 diff changeset	356 {
05ee52d7fad6 [project @ 2007-12-10 07:06:00 by jwe] jwe parents: 7017 diff changeset	357 return dir.empty ()
05ee52d7fad6 [project @ 2007-12-10 07:06:00 by jwe] jwe parents: 7017 diff changeset	358 ? file
05ee52d7fad6 [project @ 2007-12-10 07:06:00 by jwe] jwe parents: 7017 diff changeset	359 : (is_dir_sep (dir[dir.length()-1])
05ee52d7fad6 [project @ 2007-12-10 07:06:00 by jwe] jwe parents: 7017 diff changeset	360 ? dir + file
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	361 : dir + dir_sep_char () + file);
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	362 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	363
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	364
10198 025564630c8d file-ops.cc: don't tag functions with OCTAVE_API i source file John W. Eaton <jwe@octave.org> parents: 10197 diff changeset	365 int
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	366 octave_mkdir (const std::string& nm, mode_t md)
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	367 {
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	368 std::string msg;
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	369 return octave_mkdir (nm, md, msg);
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	370 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	371
10198 025564630c8d file-ops.cc: don't tag functions with OCTAVE_API i source file John W. Eaton <jwe@octave.org> parents: 10197 diff changeset	372 int
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	373 octave_mkdir (const std::string& name, mode_t mode, std::string& msg)
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	374 {
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	375 msg = std::string ();
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	376
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	377 int status = -1;
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	378
10411 479cc8a0a846 use gnulib namespace John W. Eaton <jwe@octave.org> parents: 10279 diff changeset	379 status = gnulib::mkdir (name.c_str (), mode);
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	380
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	381 if (status < 0)
10411 479cc8a0a846 use gnulib namespace John W. Eaton <jwe@octave.org> parents: 10279 diff changeset	382 msg = gnulib::strerror (errno);
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	383
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	384 return status;
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	385 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	386
10198 025564630c8d file-ops.cc: don't tag functions with OCTAVE_API i source file John W. Eaton <jwe@octave.org> parents: 10197 diff changeset	387 int
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	388 octave_mkfifo (const std::string& nm, mode_t md)
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	389 {
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	390 std::string msg;
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	391 return octave_mkfifo (nm, md, msg);
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	392 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	393
10198 025564630c8d file-ops.cc: don't tag functions with OCTAVE_API i source file John W. Eaton <jwe@octave.org> parents: 10197 diff changeset	394 int
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	395 octave_mkfifo (const std::string& name, mode_t mode, std::string& msg)
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	396 {
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	397 msg = std::string ();
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	398
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	399 int status = -1;
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	400
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	401 // With gnulib we will always have mkfifo, but some systems like MinGW
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	402 // don't have working mkfifo functions. On those systems, mkfifo will
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	403 // always return -1 and set errno.
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	404
10411 479cc8a0a846 use gnulib namespace John W. Eaton <jwe@octave.org> parents: 10279 diff changeset	405 status = gnulib::mkfifo (name.c_str (), mode);
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	406
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	407 if (status < 0)
10411 479cc8a0a846 use gnulib namespace John W. Eaton <jwe@octave.org> parents: 10279 diff changeset	408 msg = gnulib::strerror (errno);
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	409
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	410 return status;
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	411 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	412
10198 025564630c8d file-ops.cc: don't tag functions with OCTAVE_API i source file John W. Eaton <jwe@octave.org> parents: 10197 diff changeset	413 int
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	414 octave_link (const std::string& old_name, const std::string& new_name)
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	415 {
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	416 std::string msg;
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	417 return octave_link (old_name, new_name, msg);
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	418 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	419
10198 025564630c8d file-ops.cc: don't tag functions with OCTAVE_API i source file John W. Eaton <jwe@octave.org> parents: 10197 diff changeset	420 int
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	421 octave_link (const std::string& old_name,
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	422 const std::string& new_name, std::string& msg)
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	423 {
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	424 msg = std::string ();
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	425
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	426 int status = -1;
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	427
10411 479cc8a0a846 use gnulib namespace John W. Eaton <jwe@octave.org> parents: 10279 diff changeset	428 status = gnulib::link (old_name.c_str (), new_name.c_str ());
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	429
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	430 if (status < 0)
10411 479cc8a0a846 use gnulib namespace John W. Eaton <jwe@octave.org> parents: 10279 diff changeset	431 msg = gnulib::strerror (errno);
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	432
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	433 return status;
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	434 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	435
10198 025564630c8d file-ops.cc: don't tag functions with OCTAVE_API i source file John W. Eaton <jwe@octave.org> parents: 10197 diff changeset	436 int
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	437 octave_symlink (const std::string& old_name, const std::string& new_name)
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	438 {
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	439 std::string msg;
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	440 return octave_symlink (old_name, new_name, msg);
7272 05ee52d7fad6 [project @ 2007-12-10 07:06:00 by jwe] jwe parents: 7017 diff changeset	441 }
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	442
10198 025564630c8d file-ops.cc: don't tag functions with OCTAVE_API i source file John W. Eaton <jwe@octave.org> parents: 10197 diff changeset	443 int
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	444 octave_symlink (const std::string& old_name,
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	445 const std::string& new_name, std::string& msg)
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	446 {
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	447 msg = std::string ();
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	448
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	449 int status = -1;
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	450
10411 479cc8a0a846 use gnulib namespace John W. Eaton <jwe@octave.org> parents: 10279 diff changeset	451 status = gnulib::symlink (old_name.c_str (), new_name.c_str ());
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	452
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	453 if (status < 0)
10411 479cc8a0a846 use gnulib namespace John W. Eaton <jwe@octave.org> parents: 10279 diff changeset	454 msg = gnulib::strerror (errno);
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	455
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	456 return status;
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	457 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	458
10198 025564630c8d file-ops.cc: don't tag functions with OCTAVE_API i source file John W. Eaton <jwe@octave.org> parents: 10197 diff changeset	459 int
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	460 octave_readlink (const std::string& path, std::string& result)
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	461 {
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	462 std::string msg;
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	463 return octave_readlink (path, result, msg);
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	464 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	465
10198 025564630c8d file-ops.cc: don't tag functions with OCTAVE_API i source file John W. Eaton <jwe@octave.org> parents: 10197 diff changeset	466 int
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	467 octave_readlink (const std::string& path, std::string& result,
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	468 std::string& msg)
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	469 {
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	470 int status = -1;
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	471
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	472 msg = std::string ();
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	473
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	474 char buf[MAXPATHLEN+1];
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	475
10411 479cc8a0a846 use gnulib namespace John W. Eaton <jwe@octave.org> parents: 10279 diff changeset	476 status = gnulib::readlink (path.c_str (), buf, MAXPATHLEN);
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	477
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	478 if (status < 0)
10411 479cc8a0a846 use gnulib namespace John W. Eaton <jwe@octave.org> parents: 10279 diff changeset	479 msg = gnulib::strerror (errno);
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	480 else
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	481 {
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	482 buf[status] = '\0';
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	483 result = std::string (buf);
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	484 status = 0;
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	485 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	486
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	487 return status;
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	488 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	489
10198 025564630c8d file-ops.cc: don't tag functions with OCTAVE_API i source file John W. Eaton <jwe@octave.org> parents: 10197 diff changeset	490 int
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	491 octave_rename (const std::string& from, const std::string& to)
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	492 {
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	493 std::string msg;
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	494 return octave_rename (from, to, msg);
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	495 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	496
10198 025564630c8d file-ops.cc: don't tag functions with OCTAVE_API i source file John W. Eaton <jwe@octave.org> parents: 10197 diff changeset	497 int
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	498 octave_rename (const std::string& from, const std::string& to,
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	499 std::string& msg)
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	500 {
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	501 int status = -1;
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	502
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	503 msg = std::string ();
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	504
10411 479cc8a0a846 use gnulib namespace John W. Eaton <jwe@octave.org> parents: 10279 diff changeset	505 status = gnulib::rename (from.c_str (), to.c_str ());
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	506
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	507 if (status < 0)
10411 479cc8a0a846 use gnulib namespace John W. Eaton <jwe@octave.org> parents: 10279 diff changeset	508 msg = gnulib::strerror (errno);
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	509
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	510 return status;
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	511 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	512
10198 025564630c8d file-ops.cc: don't tag functions with OCTAVE_API i source file John W. Eaton <jwe@octave.org> parents: 10197 diff changeset	513 int
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	514 octave_rmdir (const std::string& name)
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	515 {
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	516 std::string msg;
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	517 return octave_rmdir (name, msg);
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	518 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	519
10198 025564630c8d file-ops.cc: don't tag functions with OCTAVE_API i source file John W. Eaton <jwe@octave.org> parents: 10197 diff changeset	520 int
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	521 octave_rmdir (const std::string& name, std::string& msg)
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	522 {
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	523 msg = std::string ();
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	524
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	525 int status = -1;
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	526
10411 479cc8a0a846 use gnulib namespace John W. Eaton <jwe@octave.org> parents: 10279 diff changeset	527 status = gnulib::rmdir (name.c_str ());
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	528
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	529 if (status < 0)
10411 479cc8a0a846 use gnulib namespace John W. Eaton <jwe@octave.org> parents: 10279 diff changeset	530 msg = gnulib::strerror (errno);
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	531
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	532 return status;
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	533 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	534
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	535 // And a version that works recursively.
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	536
10198 025564630c8d file-ops.cc: don't tag functions with OCTAVE_API i source file John W. Eaton <jwe@octave.org> parents: 10197 diff changeset	537 int
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	538 octave_recursive_rmdir (const std::string& name)
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	539 {
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	540 std::string msg;
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	541 return octave_recursive_rmdir (name, msg);
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	542 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	543
10198 025564630c8d file-ops.cc: don't tag functions with OCTAVE_API i source file John W. Eaton <jwe@octave.org> parents: 10197 diff changeset	544 int
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	545 octave_recursive_rmdir (const std::string& name, std::string& msg)
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	546 {
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	547 msg = std::string ();
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	548
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	549 int status = 0;
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	550
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	551 dir_entry dir (name);
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	552
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	553 if (dir)
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	554 {
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	555 string_vector dirlist = dir.read ();
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	556
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	557 for (octave_idx_type i = 0; i < dirlist.length (); i++)
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	558 {
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	559 octave_quit ();
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	560
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	561 std::string nm = dirlist[i];
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	562
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	563 // Skip current directory and parent.
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	564 if (nm == "." \|\| nm == "..")
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	565 continue;
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	566
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	567 std::string fullnm = name + file_ops::dir_sep_str () + nm;
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	568
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	569 // Get info about the file. Don't follow links.
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	570 file_stat fs (fullnm, false);
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	571
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	572 if (fs)
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	573 {
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	574 if (fs.is_dir ())
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	575 {
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	576 status = octave_recursive_rmdir (fullnm, msg);
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	577
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	578 if (status < 0)
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	579 break;
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	580 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	581 else
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	582 {
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	583 status = octave_unlink (fullnm, msg);
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	584
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	585 if (status < 0)
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	586 break;
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	587 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	588 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	589 else
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	590 {
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	591 msg = fs.error ();
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	592 break;
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	593 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	594 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	595
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	596 if (status >= 0)
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	597 {
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	598 dir.close ();
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	599 status = octave_rmdir (name, msg);
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	600 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	601 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	602 else
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	603 {
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	604 status = -1;
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	605
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	606 msg = dir.error ();
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	607 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	608
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	609 return status;
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	610 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	611
10198 025564630c8d file-ops.cc: don't tag functions with OCTAVE_API i source file John W. Eaton <jwe@octave.org> parents: 10197 diff changeset	612 int
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	613 octave_umask (mode_t mode)
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	614 {
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	615 #if defined (HAVE_UMASK)
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	616 return umask (mode);
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	617 #else
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	618 return 0;
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	619 #endif
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	620 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	621
10198 025564630c8d file-ops.cc: don't tag functions with OCTAVE_API i source file John W. Eaton <jwe@octave.org> parents: 10197 diff changeset	622 int
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	623 octave_unlink (const std::string& name)
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	624 {
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	625 std::string msg;
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	626 return octave_unlink (name, msg);
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	627 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	628
10198 025564630c8d file-ops.cc: don't tag functions with OCTAVE_API i source file John W. Eaton <jwe@octave.org> parents: 10197 diff changeset	629 int
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	630 octave_unlink (const std::string& name, std::string& msg)
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	631 {
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	632 msg = std::string ();
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	633
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	634 int status = -1;
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	635
10411 479cc8a0a846 use gnulib namespace John W. Eaton <jwe@octave.org> parents: 10279 diff changeset	636 status = gnulib::unlink (name.c_str ());
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	637
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	638 if (status < 0)
10411 479cc8a0a846 use gnulib namespace John W. Eaton <jwe@octave.org> parents: 10279 diff changeset	639 msg = gnulib::strerror (errno);
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	640
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	641 return status;
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	642 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	643
10198 025564630c8d file-ops.cc: don't tag functions with OCTAVE_API i source file John W. Eaton <jwe@octave.org> parents: 10197 diff changeset	644 std::string
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	645 octave_tempnam (const std::string& dir, const std::string& pfx)
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	646 {
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	647 std::string msg;
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	648 return octave_tempnam (dir, pfx, msg);
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	649 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	650
10198 025564630c8d file-ops.cc: don't tag functions with OCTAVE_API i source file John W. Eaton <jwe@octave.org> parents: 10197 diff changeset	651 std::string
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	652 octave_tempnam (const std::string& dir, const std::string& pfx,
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	653 std::string& msg)
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	654 {
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	655 msg = std::string ();
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	656
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	657 std::string retval;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	658
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	659 const char *pdir = dir.empty () ? 0 : dir.c_str ();
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	660
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	661 const char *ppfx = pfx.empty () ? 0 : pfx.c_str ();
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	662
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	663 char *tmp = tempnam (pdir, ppfx);
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	664
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	665 if (tmp)
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	666 {
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	667 retval = tmp;
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	668
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	669 free (tmp);
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	670 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	671 else
10411 479cc8a0a846 use gnulib namespace John W. Eaton <jwe@octave.org> parents: 10279 diff changeset	672 msg = gnulib::strerror (errno);
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	673
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	674 return retval;
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	675 }
10252 2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	676
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	677 std::string
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	678 octave_canonicalize_file_name (const std::string& name)
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	679 {
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	680 std::string msg;
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	681 return octave_canonicalize_file_name (name, msg);
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	682 }
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	683
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	684 std::string
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	685 octave_canonicalize_file_name (const std::string& name, std::string& msg)
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	686 {
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	687 msg = std::string ();
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	688
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	689 std::string retval;
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	690
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	691 #if defined (HAVE_CANONICALIZE_FILE_NAME)
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	692
10411 479cc8a0a846 use gnulib namespace John W. Eaton <jwe@octave.org> parents: 10279 diff changeset	693 char *tmp = gnulib::canonicalize_file_name (name.c_str ());
10252 2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	694
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	695 if (tmp)
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	696 {
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	697 retval = tmp;
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	698 free (tmp);
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	699 }
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	700
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	701 #elif defined (HAVE_RESOLVEPATH)
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	702
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	703 #if !defined (errno)
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	704 extern int errno;
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	705 #endif
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	706
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	707 #if !defined (__set_errno)
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	708 # define __set_errno(Val) errno = (Val)
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	709 #endif
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	710
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	711 if (name.empty ())
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	712 {
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	713 __set_errno (ENOENT);
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	714 return retval;
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	715 }
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	716
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	717 // All known hosts with resolvepath (e.g. Solaris 7) don't turn
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	718 // relative names into absolute ones, so prepend the working
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	719 // directory if the path is not absolute.
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	720
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	721 std::string absolute_name = octave_env::make_absolute (name);
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	722
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	723 size_t resolved_size = absolute_name.length ();
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	724
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	725 while (true)
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	726 {
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	727 resolved_size = 2 * resolved_size + 1;
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	728
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	729 OCTAVE_LOCAL_BUFFER (char, resolved, resolved_size);
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	730
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	731 int resolved_len
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	732 = resolvepath (absolute_name.c_str (), resolved, resolved_size);
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	733
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	734 if (resolved_len < 0)
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	735 break;
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	736
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	737 if (resolved_len < resolved_size)
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	738 {
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	739 retval = resolved;
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	740 break;
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	741 }
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	742 }
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	743
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	744 #elif defined (__WIN32__)
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	745
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	746 int n = 1024;
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	747
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	748 std::string win_path (n, '\0');
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	749
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	750 while (true)
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	751 {
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	752 int status = GetFullPathName (name.c_str (), n, &win_path[0], 0);
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	753
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	754 if (status == 0)
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	755 break;
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	756 else if (status < n)
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	757 {
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	758 win_path.resize (status);
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	759 retval = win_path;
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	760 break;
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	761 }
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	762 else
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	763 {
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	764 n *= 2;
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	765 win_path.resize (n);
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	766 }
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	767 }
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	768
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	769 #elif defined (HAVE_REALPATH)
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	770
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	771 #if !defined (__set_errno)
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	772 # define __set_errno(Val) errno = (Val)
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	773 #endif
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	774
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	775 if (name.empty ())
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	776 {
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	777 __set_errno (ENOENT);
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	778 return retval;
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	779 }
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	780
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	781 OCTAVE_LOCAL_BUFFER (char, buf, PATH_MAX);
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	782
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	783 if (::realpath (name.c_str (), buf))
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	784 retval = buf;
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	785
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	786 #else
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	787
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	788 // FIXME -- provide replacement here...
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	789 retval = name;
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	790
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	791 #endif
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	792
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	793 if (retval.empty ())
10411 479cc8a0a846 use gnulib namespace John W. Eaton <jwe@octave.org> parents: 10279 diff changeset	794 msg = gnulib::strerror (errno);
10252 2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	795
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	796 return retval;
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	797 }
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	798

Mercurial > octave

annotate liboctave/file-ops.cc @ 13983:7dd7cccf0757