octave: liboctave/system/file-ops.cc annotate

annotate liboctave/system/file-ops.cc @ 29950:6549fa7558ba

eliminate some unnecessary octave:: namespace tags Where possible, remove octave:: namespace tags used inside a "namespace octave" block. Files affected: event-manager.cc, hook-fcn.cc, input.cc, latex-text-renderer.cc, oct-hist.cc, sysdep.cc, cdef-object.cc, cdef-object.h, oct-parse.yy, pt-eval.cc, CollocWt.cc, oct-convn.cc, oct-norm.cc, file-ops.cc.

author	John W. Eaton <jwe@octave.org>
date	Fri, 13 Aug 2021 14:08:16 -0400
parents	ce4436d2b206
children	96a40641d86e

rev	line source
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	1 ////////////////////////////////////////////////////////////////////////
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	2 //
29358 0a5b15007766 update Octave Project Developers copyright for the new year John W. Eaton <jwe@octave.org> parents: 28471 diff changeset	3 // Copyright (C) 1996-2021 The Octave Project Developers
27923 bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	4 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	5 // See the file COPYRIGHT.md in the top-level directory of this
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	6 // distribution or <https://octave.org/copyright/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	7 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	8 // This file is part of Octave.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	9 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	10 // Octave is free software: you can redistribute it and/or modify it
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	11 // under the terms of the GNU General Public License as published by
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	12 // the Free Software Foundation, either version 3 of the License, or
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	13 // (at your option) any later version.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	14 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	15 // Octave is distributed in the hope that it will be useful, but
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	16 // WITHOUT ANY WARRANTY; without even the implied warranty of
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	17 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	18 // GNU General Public License for more details.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	19 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	20 // You should have received a copy of the GNU General Public License
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	21 // along with Octave; see the file COPYING. If not, see
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	22 // <https://www.gnu.org/licenses/>.
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	23 //
bd51beb6205e update formatting of copyright notices John W. Eaton <jwe@octave.org> parents: 27919 diff changeset	24 ////////////////////////////////////////////////////////////////////////
1765 a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	25
21724 aba2e6293dd8 use "#if ..." consistently instead of "#ifdef" and "#ifndef" John W. Eaton <jwe@octave.org> parents: 21308 diff changeset	26 #if defined (HAVE_CONFIG_H)
21301 40de9f8f23a6 Use '#include "config.h"' rather than <config.h>. Rik <rik@octave.org> parents: 21202 diff changeset	27 # include "config.h"
1765 a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	28 #endif
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	29
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	30 #include <cerrno>
10463 bbe99b2a5ba7 undo recent gnulib-related changes John W. Eaton <jwe@octave.org> parents: 10447 diff changeset	31 #include <cstdio>
bbe99b2a5ba7 undo recent gnulib-related changes John W. Eaton <jwe@octave.org> parents: 10447 diff changeset	32 #include <cstdlib>
bbe99b2a5ba7 undo recent gnulib-related changes John W. Eaton <jwe@octave.org> parents: 10447 diff changeset	33 #include <cstring>
1765 a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	34
28471 a6c89130cfaa Improve canonicalize_file_name with non-ASCII characters on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28204 diff changeset	35 #include <vector>
a6c89130cfaa Improve canonicalize_file_name with non-ASCII characters on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28204 diff changeset	36
27496 def608acdfa9 Canonicalize case of file path on Windows file systems (bug #56267). Markus Mützel <markus.muetzel@gmx.de> parents: 27102 diff changeset	37 #if defined (OCTAVE_USE_WINDOWS_API)
def608acdfa9 Canonicalize case of file path on Windows file systems (bug #56267). Markus Mützel <markus.muetzel@gmx.de> parents: 27102 diff changeset	38 # include <windows.h>
29521 d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306). Markus Mützel <markus.muetzel@gmx.de> parents: 29516 diff changeset	39 # include "unwind-prot.h"
d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306). Markus Mützel <markus.muetzel@gmx.de> parents: 29516 diff changeset	40 #else
d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306). Markus Mützel <markus.muetzel@gmx.de> parents: 29516 diff changeset	41 # include "canonicalize-file-name-wrapper.h"
28471 a6c89130cfaa Improve canonicalize_file_name with non-ASCII characters on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28204 diff changeset	42 #endif
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	43
21896 83c824c727c9 hide gnulib pathlen header John W. Eaton <jwe@octave.org> parents: 21890 diff changeset	44 #include "areadlink-wrapper.h"
5476 941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe] jwe parents: 5307 diff changeset	45 #include "dir-ops.h"
1765 a51354c34bea [project @ 1996-01-23 03:33:34 by jwe] jwe parents: diff changeset	46 #include "file-ops.h"
5476 941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe] jwe parents: 5307 diff changeset	47 #include "file-stat.h"
21896 83c824c727c9 hide gnulib pathlen header John W. Eaton <jwe@octave.org> parents: 21890 diff changeset	48 #include "gen-tempname-wrapper.h"
25516 8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	49 #include "lo-sysdep.h"
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2847 diff changeset	50 #include "oct-env.h"
13983 7dd7cccf0757 clean up memory allocated for singletons before exit John W. Eaton <jwe@octave.org> parents: 11586 diff changeset	51 #include "oct-locbuf.h"
2934 dddc1b5c324e [project @ 1997-05-05 22:56:37 by jwe] jwe parents: 2926 diff changeset	52 #include "oct-passwd.h"
5476 941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe] jwe parents: 5307 diff changeset	53 #include "quit.h"
21909 d7cac41df82a provide wrappers for some sys/stat functions John W. Eaton <jwe@octave.org> parents: 21896 diff changeset	54 #include "stat-wrappers.h"
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2847 diff changeset	55 #include "str-vec.h"
21910 4d723ba06b4a provide wrappers for some unistd.h functions John W. Eaton <jwe@octave.org> parents: 21909 diff changeset	56 #include "unistd-wrappers.h"
20503 0829b6ff3ac9 Use backslash as windows file separator for canonicalize_file_name (Bug #45816). Rik <rik@octave.org> parents: 19697 diff changeset	57
21734 11af9c03400c write namespace keyword and name on same line in C++ files John W. Eaton <jwe@octave.org> parents: 21733 diff changeset	58 namespace octave
8007 a2ab20ba78f7 make file_ops a proper singleton class John W. Eaton <jwe@octave.org> parents: 7520 diff changeset	59 {
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	60 // The following tilde-expansion code was stolen and adapted from
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	61 // readline.
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	62
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	63 // The default value of tilde_additional_prefixes. This is set to
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	64 // whitespace preceding a tilde so that simple programs which do not
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	65 // perform any word separation get desired behavior.
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	66 static const char *default_prefixes[] = { " ~", "\t~", ":~", nullptr };
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	67
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	68 // The default value of tilde_additional_suffixes. This is set to
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	69 // whitespace or newline so that simple programs which do not perform
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	70 // any word separation get desired behavior.
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	71 static const char *default_suffixes[] = { " ", "\n", ":", nullptr };
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	72
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	73 static std::size_t
d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	74 tilde_find_prefix (const std::string& s, std::size_t& len)
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	75 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	76 len = 0;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	77
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	78 std::size_t s_len = s.length ();
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	79
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	80 if (s_len == 0 \|\| s[0] == '~')
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	81 return 0;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	82
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	83 string_vector prefixes = sys::file_ops::tilde_additional_prefixes;
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	84
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	85 if (! prefixes.empty ())
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	86 {
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	87 for (std::size_t i = 0; i < s_len; i++)
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	88 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	89 for (int j = 0; j < prefixes.numel (); j++)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	90 {
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	91 std::size_t pfx_len = prefixes[j].length ();
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	92
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	93 if (prefixes[j] == s.substr (i, pfx_len))
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	94 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	95 len = pfx_len - 1;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	96 return i + len;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	97 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	98 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	99 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	100 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	101
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	102 return s_len;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	103 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	104
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	105 // Find the end of a tilde expansion in S, and return the index
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	106 // of the character which ends the tilde definition.
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	107
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	108 static std::size_t
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	109 tilde_find_suffix (const std::string& s)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	110 {
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	111 std::size_t s_len = s.length ();
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	112
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	113 string_vector suffixes = sys::file_ops::tilde_additional_suffixes;
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	114
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	115 std::size_t i = 0;
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	116
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	117 for ( ; i < s_len; i++)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	118 {
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	119 if (sys::file_ops::is_dir_sep (s[i]))
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	120 break;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	121
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	122 if (! suffixes.empty ())
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	123 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	124 for (int j = 0; j < suffixes.numel (); j++)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	125 {
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	126 std::size_t sfx_len = suffixes[j].length ();
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	127
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	128 if (suffixes[j] == s.substr (i, sfx_len))
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	129 return i;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	130 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	131 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	132 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	133
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	134 return i;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	135 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	136
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	137 // Take FNAME and return the tilde prefix we want expanded.
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	138
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	139 static std::string
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	140 isolate_tilde_prefix (const std::string& fname)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	141 {
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	142 std::size_t f_len = fname.length ();
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	143
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	144 std::size_t len = 1;
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	145
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	146 while (len < f_len && ! sys::file_ops::is_dir_sep (fname[len]))
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	147 len++;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	148
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	149 return fname.substr (1, len);
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	150 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	151
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	152 // Do the work of tilde expansion on FILENAME. FILENAME starts with a
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	153 // tilde.
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	154
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	155 static std::string
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	156 tilde_expand_word (const std::string& filename)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	157 {
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	158 std::size_t f_len = filename.length ();
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	159
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	160 if (f_len == 0 \|\| filename[0] != '~')
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	161 return std::string (filename);
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	162
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	163 // A leading '~/' or a bare '~' is always translated to the value
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	164 // of $HOME or the home directory of the current user, regardless of
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	165 // any preexpansion hook.
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	166
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	167 if (f_len == 1 \|\| sys::file_ops::is_dir_sep (filename[1]))
84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	168 return sys::env::get_home_directory () + filename.substr (1);
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	169
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	170 std::string username = isolate_tilde_prefix (filename);
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	171
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	172 std::size_t user_len = username.length ();
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	173
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	174 std::string dirname;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	175
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	176 if (sys::file_ops::tilde_expansion_preexpansion_hook)
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	177 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	178 std::string expansion
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	179 = sys::file_ops::tilde_expansion_preexpansion_hook (username);
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	180
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	181 if (! expansion.empty ())
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	182 return expansion + filename.substr (user_len+1);
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	183 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	184
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	185 // No preexpansion hook, or the preexpansion hook failed. Look in the
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	186 // password database.
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	187
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	188 sys::password pw = sys::password::getpwnam (username);
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	189
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	190 if (! pw)
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	191 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	192 // If the calling program has a special syntax for expanding tildes,
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	193 // and we couldn't find a standard expansion, then let them try.
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	194
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	195 if (sys::file_ops::tilde_expansion_failure_hook)
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	196 {
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	197 std::string expansion
27102 84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace John W. Eaton <jwe@octave.org> parents: 27101 diff changeset	198 = sys::file_ops::tilde_expansion_failure_hook (username);
27101 097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	199
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	200 if (! expansion.empty ())
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	201 dirname = expansion + filename.substr (user_len+1);
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	202 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	203
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	204 // If we don't have a failure hook, or if the failure hook did not
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	205 // expand the tilde, return a copy of what we were passed.
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	206
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	207 if (dirname.empty ())
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	208 dirname = filename;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	209 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	210 else
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	211 dirname = pw.dir () + filename.substr (user_len+1);
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	212
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	213 return dirname;
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	214 }
097774bed4ed move some static functions inside octave namespace John W. Eaton <jwe@octave.org> parents: 26376 diff changeset	215
21734 11af9c03400c write namespace keyword and name on same line in C++ files John W. Eaton <jwe@octave.org> parents: 21733 diff changeset	216 namespace sys
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	217 {
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	218 namespace file_ops
8007 a2ab20ba78f7 make file_ops a proper singleton class John W. Eaton <jwe@octave.org> parents: 7520 diff changeset	219 {
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	220 char dev_sep_char (void)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	221 {
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	222 #if (defined (OCTAVE_HAVE_WINDOWS_FILESYSTEM) && ! defined (OCTAVE_HAVE_POSIX_FILESYSTEM))
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	223 return ':';
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	224 #else
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	225 return 0;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	226 #endif
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	227 }
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	228
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	229 char dir_sep_char (void)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	230 {
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	231 #if (defined (OCTAVE_HAVE_WINDOWS_FILESYSTEM) && ! defined (OCTAVE_HAVE_POSIX_FILESYSTEM))
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	232 return '\\';
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	233 #else
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	234 return '/';
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	235 #endif
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	236 }
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	237
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	238 std::string dir_sep_str (void)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	239 {
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	240 #if (defined (OCTAVE_HAVE_WINDOWS_FILESYSTEM) && ! defined (OCTAVE_HAVE_POSIX_FILESYSTEM))
23804 8057d3f0673d Use C++11 raw string literals to avoid escaping backslashes in strings. Rik <rik@octave.org> parents: 23795 diff changeset	241 return R"(\)";
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	242 #else
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	243 return "/";
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	244 #endif
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	245 }
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	246
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	247 std::string dir_sep_chars (void)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	248 {
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	249 #if defined (OCTAVE_HAVE_WINDOWS_FILESYSTEM)
23804 8057d3f0673d Use C++11 raw string literals to avoid escaping backslashes in strings. Rik <rik@octave.org> parents: 23795 diff changeset	250 return R"(/\)";
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	251 #else
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	252 return dir_sep_str ();
5138 5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe] jwe parents: 4726 diff changeset	253 #endif
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	254 }
6271 6fab59e81b4e [project @ 2007-02-06 01:36:46 by jwe] jwe parents: 6208 diff changeset	255
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23744 diff changeset	256 tilde_expansion_hook tilde_expansion_preexpansion_hook = nullptr;
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	257
23795 980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565). Rik <rik@octave.org> parents: 23744 diff changeset	258 tilde_expansion_hook tilde_expansion_failure_hook = nullptr;
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	259
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	260 string_vector tilde_additional_prefixes = default_prefixes;
5138 5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe] jwe parents: 4726 diff changeset	261
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	262 string_vector tilde_additional_suffixes = default_suffixes;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	263
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	264 bool is_dev_sep (char c)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	265 {
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	266 #if (defined (OCTAVE_HAVE_WINDOWS_FILESYSTEM) && ! defined (OCTAVE_HAVE_POSIX_FILESYSTEM))
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	267 return c == dev_sep_char ();
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	268 #else
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	269 octave_unused_parameter (c);
1802 8173b1fa052d [project @ 1996-01-29 06:10:18 by jwe] jwe parents: 1779 diff changeset	270
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	271 return false;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	272 #endif
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	273 }
2926 66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe] jwe parents: 2847 diff changeset	274
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	275 bool is_dir_sep (char c)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	276 {
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	277 std::string tmp = dir_sep_chars ();
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	278 return tmp.find (c) != std::string::npos;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	279 }
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	280
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	281 std::string tilde_expand (const std::string& name)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	282 {
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	283 if (name.find ('~') == std::string::npos)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	284 return std::string (name);
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	285 else
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	286 {
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	287 std::string result;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	288
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	289 std::size_t name_len = name.length ();
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	290
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	291 // Scan through S expanding tildes as we come to them.
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	292
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	293 std::size_t pos = 0;
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	294
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	295 while (1)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	296 {
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	297 if (pos > name_len)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	298 break;
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	299
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	300 std::size_t len;
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	301
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	302 // Make START point to the tilde which starts the expansion.
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	303
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	304 std::size_t start = tilde_find_prefix (name.substr (pos), len);
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	305
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 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
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	308 // Advance STRING to the starting tilde.
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	309
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	310 pos += start;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	311
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	312 // Make FINI be the index of one after the last character of the
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	313 // username.
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	314
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	315 std::size_t fini = tilde_find_suffix (name.substr (pos));
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	316
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	317 // If both START and FINI are zero, we are all done.
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	318
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	319 if (! (start \|\| fini))
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	320 break;
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	321
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	322 // Expand the entire tilde word, and copy it into RESULT.
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	323
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 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
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	326 pos += fini;
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	327
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	328 std::string expansion = tilde_expand_word (tilde_word);
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	329
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	330 result.append (expansion);
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	331 }
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	332
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	333 return result;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	334 }
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	335 }
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	336
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	337 string_vector tilde_expand (const string_vector& names)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	338 {
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	339 int n = names.numel ();
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	340
23812 057a894914df Use C++11 string fcns back() and pop_back() to simplify code. Rik <rik@octave.org> parents: 23804 diff changeset	341 string_vector retval (n);
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	342
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	343 for (int i = 0; i < n; i++)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	344 retval[i] = tilde_expand (names[i]);
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	345
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	346 return retval;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	347 }
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	348
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	349 std::string concat (const std::string& dir, const std::string& file)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	350 {
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	351 return dir.empty ()
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	352 ? file
23812 057a894914df Use C++11 string fcns back() and pop_back() to simplify code. Rik <rik@octave.org> parents: 23804 diff changeset	353 : (is_dir_sep (dir.back ())
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	354 ? dir + file
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	355 : dir + dir_sep_char () + file);
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	356 }
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	357
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	358 std::string dirname (const std::string& path)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	359 {
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	360 std::size_t ipos = path.find_last_of (dir_sep_chars ());
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	361
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	362 return (ipos != std::string::npos) ? path.substr (0, ipos) : "";
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	363 }
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	364
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	365 std::string tail (const std::string& path)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	366 {
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	367 std::size_t ipos = path.find_last_of (dir_sep_chars ());
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	368
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	369 if (ipos != std::string::npos)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	370 ipos++;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	371 else
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	372 ipos = 0;
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	373
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	374 return path.substr (ipos);
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	375 }
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	376
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	377 std::string native_separator_path (const std::string& path)
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	378 {
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	379 std::string retval;
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	380
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	381 if (dir_sep_char () == '/')
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	382 retval = path;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	383 else
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	384 {
29654 d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	385 std::size_t n = path.length ();
d13d090cb03a use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29358 diff changeset	386 for (std::size_t i = 0; i < n; i++)
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	387 {
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	388 if (path[i] == '/')
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	389 retval += dir_sep_char();
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	390 else
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	391 retval += path[i];
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	392 }
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	393 }
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	394
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	395 return retval;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	396 }
3040 443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	397 }
443851377f3f [project @ 1997-06-06 09:29:28 by jwe] jwe parents: 2947 diff changeset	398
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	399 int mkdir (const std::string& nm, mode_t md)
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	400 {
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	401 std::string msg;
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	402 return mkdir (nm, md, msg);
21881 aea1bf9493c0 * file-ops.h, file-ops.cc (file_ops::file_ops): Now protected. John W. Eaton <jwe@octave.org> parents: 21852 diff changeset	403 }
aea1bf9493c0 * file-ops.h, file-ops.cc (file_ops::file_ops): Now protected. John W. Eaton <jwe@octave.org> parents: 21852 diff changeset	404
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	405 int mkdir (const std::string& name, mode_t mode, std::string& msg)
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	406 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	407 msg = "";
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	408
21909 d7cac41df82a provide wrappers for some sys/stat functions John W. Eaton <jwe@octave.org> parents: 21896 diff changeset	409 int status = octave_mkdir_wrapper (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	410
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	411 if (status < 0)
21942 aab79a1885cc limit gnulib headers to liboctave/wrappers directory John W. Eaton <jwe@octave.org> parents: 21910 diff changeset	412 msg = std::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	413
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	414 return status;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	415 }
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	416
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	417 int mkfifo (const std::string& nm, mode_t md)
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	418 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	419 std::string msg;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	420 return mkfifo (nm, md, msg);
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	421 }
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	422
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	423 int mkfifo (const std::string& name, mode_t mode, std::string& msg)
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	424 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	425 msg = "";
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	426
21909 d7cac41df82a provide wrappers for some sys/stat functions John W. Eaton <jwe@octave.org> parents: 21896 diff changeset	427 int status = octave_mkfifo_wrapper (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	428
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	429 if (status < 0)
21942 aab79a1885cc limit gnulib headers to liboctave/wrappers directory John W. Eaton <jwe@octave.org> parents: 21910 diff changeset	430 msg = std::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	431
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	432 return status;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	433 }
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	434
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	435 int link (const std::string& old_name, const std::string& new_name)
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	436 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	437 std::string msg;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	438 return link (old_name, new_name, msg);
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	439 }
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	440
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	441 int link (const std::string& old_name, const std::string& new_name,
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	442 std::string& msg)
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	443 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	444 msg = "";
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	445
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	446 int status = -1;
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	447
21910 4d723ba06b4a provide wrappers for some unistd.h functions John W. Eaton <jwe@octave.org> parents: 21909 diff changeset	448 status = octave_link_wrapper (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	449
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	450 if (status < 0)
21942 aab79a1885cc limit gnulib headers to liboctave/wrappers directory John W. Eaton <jwe@octave.org> parents: 21910 diff changeset	451 msg = std::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	452
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	453 return status;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	454 }
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	455
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	456 int symlink (const std::string& old_name, const std::string& new_name)
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	457 {
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	458 std::string msg;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	459 return symlink (old_name, new_name, msg);
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	460 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	461
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	462 int symlink (const std::string& old_name, const std::string& new_name,
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	463 std::string& msg)
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	464 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	465 msg = "";
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	466
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	467 int status = -1;
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	468
21910 4d723ba06b4a provide wrappers for some unistd.h functions John W. Eaton <jwe@octave.org> parents: 21909 diff changeset	469 status = octave_symlink_wrapper (old_name.c_str (), new_name.c_str ());
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	470
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	471 if (status < 0)
21942 aab79a1885cc limit gnulib headers to liboctave/wrappers directory John W. Eaton <jwe@octave.org> parents: 21910 diff changeset	472 msg = std::strerror (errno);
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	473
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	474 return status;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	475 }
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	476
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	477 int readlink (const std::string& path, std::string& result)
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	478 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	479 std::string msg;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	480 return readlink (path, result, msg);
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	481 }
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	482
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	483 int readlink (const std::string& path, std::string& result, std::string& msg)
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	484 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	485 int status = -1;
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	486
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	487 msg = "";
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	488
21896 83c824c727c9 hide gnulib pathlen header John W. Eaton <jwe@octave.org> parents: 21890 diff changeset	489 char *buf = octave_areadlink_wrapper (path.c_str ());
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	490
21896 83c824c727c9 hide gnulib pathlen header John W. Eaton <jwe@octave.org> parents: 21890 diff changeset	491 if (! buf)
21942 aab79a1885cc limit gnulib headers to liboctave/wrappers directory John W. Eaton <jwe@octave.org> parents: 21910 diff changeset	492 msg = std::strerror (errno);
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	493 else
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	494 {
21896 83c824c727c9 hide gnulib pathlen header John W. Eaton <jwe@octave.org> parents: 21890 diff changeset	495 result = buf;
83c824c727c9 hide gnulib pathlen header John W. Eaton <jwe@octave.org> parents: 21890 diff changeset	496 ::free (buf);
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	497 status = 0;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	498 }
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	499
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	500 return status;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	501 }
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	502
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	503 int rename (const std::string& from, const std::string& to)
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	504 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	505 std::string msg;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	506 return rename (from, to, msg);
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	507 }
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	508
25624 815cfd72ddf5 Fix "rename" for files with non-ASCII chars on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 25516 diff changeset	509 int rename (const std::string& from, const std::string& to,
815cfd72ddf5 Fix "rename" for files with non-ASCII chars on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 25516 diff changeset	510 std::string& msg)
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	511 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	512 int status = -1;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	513
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	514 msg = "";
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	515
25624 815cfd72ddf5 Fix "rename" for files with non-ASCII chars on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 25516 diff changeset	516 #if defined (OCTAVE_USE_WINDOWS_API)
28175 b895daca20e2 Avoid potential lifetime issues with temporary std::wstring objects. Markus Mützel <markus.muetzel@gmx.de> parents: 28053 diff changeset	517 std::wstring wfrom = u8_to_wstring (from);
b895daca20e2 Avoid potential lifetime issues with temporary std::wstring objects. Markus Mützel <markus.muetzel@gmx.de> parents: 28053 diff changeset	518 std::wstring wto = u8_to_wstring (to);
b895daca20e2 Avoid potential lifetime issues with temporary std::wstring objects. Markus Mützel <markus.muetzel@gmx.de> parents: 28053 diff changeset	519 status = _wrename (wfrom.c_str (), wto.c_str ());
25624 815cfd72ddf5 Fix "rename" for files with non-ASCII chars on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 25516 diff changeset	520 #else
21942 aab79a1885cc limit gnulib headers to liboctave/wrappers directory John W. Eaton <jwe@octave.org> parents: 21910 diff changeset	521 status = std::rename (from.c_str (), to.c_str ());
25624 815cfd72ddf5 Fix "rename" for files with non-ASCII chars on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 25516 diff changeset	522 #endif
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	523
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	524 if (status < 0)
21942 aab79a1885cc limit gnulib headers to liboctave/wrappers directory John W. Eaton <jwe@octave.org> parents: 21910 diff changeset	525 msg = std::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	526
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	527 return status;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	528 }
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	529
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	530 int rmdir (const std::string& name)
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	531 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	532 std::string msg;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	533 return rmdir (name, msg);
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	534 }
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	535
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	536 int rmdir (const std::string& name, std::string& msg)
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	537 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	538 msg = "";
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	539
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	540 int status = -1;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	541
21910 4d723ba06b4a provide wrappers for some unistd.h functions John W. Eaton <jwe@octave.org> parents: 21909 diff changeset	542 status = octave_rmdir_wrapper (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	543
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	544 if (status < 0)
21942 aab79a1885cc limit gnulib headers to liboctave/wrappers directory John W. Eaton <jwe@octave.org> parents: 21910 diff changeset	545 msg = std::strerror (errno);
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	546
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	547 return status;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	548 }
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	549
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	550 // And a version that works recursively.
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	551
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	552 int recursive_rmdir (const std::string& name)
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	553 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	554 std::string msg;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	555 return recursive_rmdir (name, msg);
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	556 }
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	557
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	558 int recursive_rmdir (const std::string& name, std::string& msg)
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	559 {
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	560 msg = "";
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	561
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	562 int status = 0;
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	563
25516 8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	564 string_vector dirlist;
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	565
25516 8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	566 if (get_dirlist (name, dirlist, msg))
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	567 {
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	568 for (octave_idx_type i = 0; i < dirlist.numel (); i++)
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	569 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	570 octave_quit ();
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	571
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	572 std::string nm = dirlist[i];
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	573
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	574 // Skip current directory and parent.
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	575 if (nm == "." \|\| nm == "..")
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	576 continue;
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	577
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	578 std::string fullnm = name + file_ops::dir_sep_str () + nm;
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	579
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	580 // Get info about the file. Don't follow links.
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	581 file_stat fs (fullnm, false);
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	582
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	583 if (fs)
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	584 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	585 if (fs.is_dir ())
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	586 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	587 status = recursive_rmdir (fullnm, msg);
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	588
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	589 if (status < 0)
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	590 break;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	591 }
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	592 else
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	593 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	594 status = unlink (fullnm, msg);
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	595
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	596 if (status < 0)
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	597 break;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	598 }
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	599 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	600 else
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	601 {
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	602 msg = fs.error ();
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	603 break;
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	604 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	605 }
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	606
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	607 if (status >= 0)
25516 8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	608 status = rmdir (name, msg);
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	609 }
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	610 else
25516 8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118). Markus Mützel <markus.muetzel@gmx.de> parents: 25438 diff changeset	611 status = -1;
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	612
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	613 return status;
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	614 }
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	615
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	616 int umask (mode_t mode)
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	617 {
21909 d7cac41df82a provide wrappers for some sys/stat functions John W. Eaton <jwe@octave.org> parents: 21896 diff changeset	618 return octave_umask_wrapper (mode);
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	619 }
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	620
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	621 int unlink (const std::string& name)
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	622 {
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	623 std::string msg;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	624 return unlink (name, msg);
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	625 }
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	626
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	627 int unlink (const std::string& name, std::string& msg)
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	628 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	629 msg = "";
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	630
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	631 int status = -1;
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	632
21910 4d723ba06b4a provide wrappers for some unistd.h functions John W. Eaton <jwe@octave.org> parents: 21909 diff changeset	633 status = octave_unlink_wrapper (name.c_str ());
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	634
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	635 if (status < 0)
21942 aab79a1885cc limit gnulib headers to liboctave/wrappers directory John W. Eaton <jwe@octave.org> parents: 21910 diff changeset	636 msg = std::strerror (errno);
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	637
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	638 return status;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	639 }
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	640
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	641 std::string tempnam (const std::string& dir, const std::string& pfx)
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	642 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	643 std::string msg;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	644 return tempnam (dir, pfx, msg);
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	645 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	646
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	647 std::string tempnam (const std::string& dir, const std::string& pfx,
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	648 std::string& msg)
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	649 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	650 msg = "";
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	651
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	652 std::string retval;
10197 4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way John W. Eaton <jwe@octave.org> parents: 10189 diff changeset	653
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	654 // get dir path to use for template
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	655 std::string templatename;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	656 if (dir.empty ())
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	657 templatename = env::get_temp_directory ();
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	658 else if (! file_stat (dir, false).is_dir ())
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	659 templatename = env::get_temp_directory ();
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	660 else
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	661 templatename = dir;
11586 12df7854fa7c strip trailing whitespace from source files John W. Eaton <jwe@octave.org> parents: 11523 diff changeset	662
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	663 // add dir sep char if it is not there
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	664 if (*templatename.rbegin () != file_ops::dir_sep_char ())
ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	665 templatename += file_ops::dir_sep_char ();
19420 82f2a3437e02 Fix tempname so it prioritizes user input dir rather than TMPDIR (bug #43844). Rik <rik@octave.org> parents: 18412 diff changeset	666
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	667 if (pfx.empty ())
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	668 templatename += "file";
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	669 else
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	670 templatename += pfx;
19458 d8fd3842a507 Use gnulib gen_tempname to create temporary names (Bug #43872). John Donoghue <john.donoghue@ieee.org> parents: 19428 diff changeset	671
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	672 // add the required XXXXXX for the template
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	673 templatename += "XXXXXX";
19428 eee9f111c164 Check if tempfile name exists when changing path of temporary file name (Bug #43872) John Donoghue parents: 19420 diff changeset	674
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	675 // create and copy template to char array for call to gen_tempname
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	676 char tname [templatename.length () + 1];
19597 db92e7e28e1f strip trailing whitespace from most source files John W. Eaton <jwe@octave.org> parents: 19458 diff changeset	677
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	678 strcpy (tname, templatename.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	679
21888 00f1249f2483 create wrappers for some gnulib functions John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	680 if (octave_gen_tempname_wrapper (tname) == -1)
21942 aab79a1885cc limit gnulib headers to liboctave/wrappers directory John W. Eaton <jwe@octave.org> parents: 21910 diff changeset	681 msg = std::strerror (errno);
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	682 else
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	683 retval = tname;
10252 2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	684
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	685 return retval;
10252 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
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	688 std::string canonicalize_file_name (const std::string& name)
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	689 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	690 std::string msg;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	691 return canonicalize_file_name (name, msg);
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	692 }
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	693
23744 ae74608b6a5d don't use singleton pattern for file_ops John W. Eaton <jwe@octave.org> parents: 23696 diff changeset	694 std::string canonicalize_file_name (const std::string& name, std::string& msg)
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	695 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	696 msg = "";
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	697
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	698 std::string retval;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	699
29521 d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306). Markus Mützel <markus.muetzel@gmx.de> parents: 29516 diff changeset	700 // FIXME: Consider replacing this with std::filesystem::canonical on all
d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306). Markus Mützel <markus.muetzel@gmx.de> parents: 29516 diff changeset	701 // platforms once we allow using C++17.
28471 a6c89130cfaa Improve canonicalize_file_name with non-ASCII characters on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28204 diff changeset	702
29521 d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306). Markus Mützel <markus.muetzel@gmx.de> parents: 29516 diff changeset	703 #if defined (OCTAVE_USE_WINDOWS_API)
d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306). Markus Mützel <markus.muetzel@gmx.de> parents: 29516 diff changeset	704 // open file handle
d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306). Markus Mützel <markus.muetzel@gmx.de> parents: 29516 diff changeset	705 std::wstring wname = u8_to_wstring (name);
d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306). Markus Mützel <markus.muetzel@gmx.de> parents: 29516 diff changeset	706 HANDLE h_file = CreateFileW (wname.c_str (), GENERIC_READ,
d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306). Markus Mützel <markus.muetzel@gmx.de> parents: 29516 diff changeset	707 FILE_SHARE_READ, nullptr, OPEN_EXISTING,
d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306). Markus Mützel <markus.muetzel@gmx.de> parents: 29516 diff changeset	708 FILE_FLAG_BACKUP_SEMANTICS, nullptr);
28471 a6c89130cfaa Improve canonicalize_file_name with non-ASCII characters on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28204 diff changeset	709
29521 d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306). Markus Mützel <markus.muetzel@gmx.de> parents: 29516 diff changeset	710 if (h_file == INVALID_HANDLE_VALUE)
28471 a6c89130cfaa Improve canonicalize_file_name with non-ASCII characters on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28204 diff changeset	711 {
29521 d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306). Markus Mützel <markus.muetzel@gmx.de> parents: 29516 diff changeset	712 msg = "Unable to open file \"" + name + "\"";
d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306). Markus Mützel <markus.muetzel@gmx.de> parents: 29516 diff changeset	713 return retval;
d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306). Markus Mützel <markus.muetzel@gmx.de> parents: 29516 diff changeset	714 }
d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306). Markus Mützel <markus.muetzel@gmx.de> parents: 29516 diff changeset	715
29950 6549fa7558ba eliminate some unnecessary octave:: namespace tags John W. Eaton <jwe@octave.org> parents: 29657 diff changeset	716 unwind_action close_file_handle (CloseHandle, h_file);
28471 a6c89130cfaa Improve canonicalize_file_name with non-ASCII characters on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28204 diff changeset	717
29572 aef11bb4e6d1 use std::size_t and std::ptrdiff_t in C++ code (bug #60471) John W. Eaton <jwe@octave.org> parents: 29530 diff changeset	718 const std::size_t buf_size = 32767;
29521 d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306). Markus Mützel <markus.muetzel@gmx.de> parents: 29516 diff changeset	719 wchar_t buffer[buf_size] = L"";
28471 a6c89130cfaa Improve canonicalize_file_name with non-ASCII characters on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28204 diff changeset	720
29521 d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306). Markus Mützel <markus.muetzel@gmx.de> parents: 29516 diff changeset	721 // query canonical name
d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306). Markus Mützel <markus.muetzel@gmx.de> parents: 29516 diff changeset	722 DWORD len = GetFinalPathNameByHandleW (h_file, buffer, buf_size,
d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306). Markus Mützel <markus.muetzel@gmx.de> parents: 29516 diff changeset	723 FILE_NAME_NORMALIZED);
d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306). Markus Mützel <markus.muetzel@gmx.de> parents: 29516 diff changeset	724 if (len >= buf_size)
d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306). Markus Mützel <markus.muetzel@gmx.de> parents: 29516 diff changeset	725 {
d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306). Markus Mützel <markus.muetzel@gmx.de> parents: 29516 diff changeset	726 msg = "Error querying normalized name for \"" + name + "\"";
d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306). Markus Mützel <markus.muetzel@gmx.de> parents: 29516 diff changeset	727 return retval;
d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306). Markus Mützel <markus.muetzel@gmx.de> parents: 29516 diff changeset	728 }
28471 a6c89130cfaa Improve canonicalize_file_name with non-ASCII characters on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28204 diff changeset	729
29521 d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306). Markus Mützel <markus.muetzel@gmx.de> parents: 29516 diff changeset	730 retval = u8_from_wstring (std::wstring (buffer, len));
d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306). Markus Mützel <markus.muetzel@gmx.de> parents: 29516 diff changeset	731
d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306). Markus Mützel <markus.muetzel@gmx.de> parents: 29516 diff changeset	732 // remove prefix
d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306). Markus Mützel <markus.muetzel@gmx.de> parents: 29516 diff changeset	733 // "Normal" paths are prefixed by "\\?\".
d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306). Markus Mützel <markus.muetzel@gmx.de> parents: 29516 diff changeset	734 // UNC paths are prefixed by "\\?\UNC\".
d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306). Markus Mützel <markus.muetzel@gmx.de> parents: 29516 diff changeset	735 if (retval.compare (0, 8, R"(\\?\UNC\)") == 0)
d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306). Markus Mützel <markus.muetzel@gmx.de> parents: 29516 diff changeset	736 retval = retval.erase (2, 6);
29530 47fc7cacc65d canonicalize_file_name: Be more wary when removing path prefix on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 29521 diff changeset	737 else if (retval.compare (0, 4, R"(\\?\)") == 0)
29521 d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306). Markus Mützel <markus.muetzel@gmx.de> parents: 29516 diff changeset	738 retval = retval.erase (0, 4);
28471 a6c89130cfaa Improve canonicalize_file_name with non-ASCII characters on Windows. Markus Mützel <markus.muetzel@gmx.de> parents: 28204 diff changeset	739 #else
21888 00f1249f2483 create wrappers for some gnulib functions John W. Eaton <jwe@octave.org> parents: 21885 diff changeset	740 char *tmp = octave_canonicalize_file_name_wrapper (name.c_str ());
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	741
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	742 if (tmp)
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	743 {
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	744 retval = tmp;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	745 free (tmp);
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	746 }
27496 def608acdfa9 Canonicalize case of file path on Windows file systems (bug #56267). Markus Mützel <markus.muetzel@gmx.de> parents: 27102 diff changeset	747
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	748 if (retval.empty ())
21942 aab79a1885cc limit gnulib headers to liboctave/wrappers directory John W. Eaton <jwe@octave.org> parents: 21910 diff changeset	749 msg = std::strerror (errno);
29521 d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306). Markus Mützel <markus.muetzel@gmx.de> parents: 29516 diff changeset	750 #endif
10252 2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	751
21733 cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	752 return retval;
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	753 }
cb0fdd941d84 use namespace for system file_ops class John W. Eaton <jwe@octave.org> parents: 21732 diff changeset	754 }
10252 2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name John W. Eaton <jwe@octave.org> parents: 10250 diff changeset	755 }

Mercurial > octave

annotate liboctave/system/file-ops.cc @ 29950:6549fa7558ba