Mercurial > octave

annotate liboctave/system/file-ops.cc @ 31216:f111d1caa73d stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
canonicalize_file_name: Trim trailing file separators from root of mapped network drive (bug #62847). * liboctave/system/file-ops.cc (canonicalize_file_name): Trim trailing file separators from root of mapped network drive before potentially replacing it in the canonicalized path.
author Markus Mützel <markus.muetzel@gmx.de>
date Tue, 30 Aug 2022 18:26:30 +0200
parents 4c38cf0ce06c
children 6a5e4ef80a95
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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 //
30564
796f54d4ddbf update Octave Project Developers copyright for the new year
John W. Eaton <jwe@octave.org>
parents: 30394
diff changeset
3 // Copyright (C) 1996-2022 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)
31097
b47bf773c508 canonicalize_file_path: Do not translate mapped network drive to UNC path (bug #62576).
Markus Mützel <markus.muetzel@gmx.de>
parents: 30564
diff changeset
38 # include <cctype>
b47bf773c508 canonicalize_file_path: Do not translate mapped network drive to UNC path (bug #62576).
Markus Mützel <markus.muetzel@gmx.de>
parents: 30564
diff changeset
39
27496
def608acdfa9 Canonicalize case of file path on Windows file systems (bug #56267).
Markus Mützel <markus.muetzel@gmx.de>
parents: 27102
diff changeset
40 # 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
41 # 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
42 #else
d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306).
Markus Mützel <markus.muetzel@gmx.de>
parents: 29516
diff changeset
43 # 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
44 #endif
3040
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
45
21896
83c824c727c9 hide gnulib pathlen header
John W. Eaton <jwe@octave.org>
parents: 21890
diff changeset
46 #include "areadlink-wrapper.h"
5476
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
47 #include "dir-ops.h"
1765
a51354c34bea [project @ 1996-01-23 03:33:34 by jwe]
jwe
parents:
diff changeset
48 #include "file-ops.h"
5476
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
49 #include "file-stat.h"
21896
83c824c727c9 hide gnulib pathlen header
John W. Eaton <jwe@octave.org>
parents: 21890
diff changeset
50 #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
51 #include "lo-sysdep.h"
2926
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2847
diff changeset
52 #include "oct-env.h"
13983
7dd7cccf0757 clean up memory allocated for singletons before exit
John W. Eaton <jwe@octave.org>
parents: 11586
diff changeset
53 #include "oct-locbuf.h"
30072
96a40641d86e maint: rename liboctave oct-passwd.* to oct-password.* to match class name.
Rik <rik@octave.org>
parents: 29950
diff changeset
54 #include "oct-password.h"
5476
941f0fc6b596 [project @ 2005-09-29 22:46:07 by jwe]
jwe
parents: 5307
diff changeset
55 #include "quit.h"
21909
d7cac41df82a provide wrappers for some sys/stat functions
John W. Eaton <jwe@octave.org>
parents: 21896
diff changeset
56 #include "stat-wrappers.h"
2926
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2847
diff changeset
57 #include "str-vec.h"
21910
4d723ba06b4a provide wrappers for some unistd.h functions
John W. Eaton <jwe@octave.org>
parents: 21909
diff changeset
58 #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
59
21734
11af9c03400c write namespace keyword and name on same line in C++ files
John W. Eaton <jwe@octave.org>
parents: 21733
diff changeset
60 namespace octave
8007
a2ab20ba78f7 make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents: 7520
diff changeset
61 {
27101
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
62 // 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
63 // readline.
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
64
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
65 // 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
66 // 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
67 // 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
68 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
69
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
70 // 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
71 // 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
72 // any word separation get desired behavior.
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
73 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
74
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
75 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
76 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
77 {
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
78 len = 0;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
79
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
80 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
81
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
82 if (s_len == 0 || s[0] == '~')
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
83 return 0;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
84
27102
84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27101
diff changeset
85 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
86
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
87 if (! prefixes.empty ())
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
88 {
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
89 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
90 {
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
91 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
92 {
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
93 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
94
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
95 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
96 {
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
97 len = pfx_len - 1;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
98 return i + len;
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 }
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 return s_len;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
105 }
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
106
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
107 // 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
108 // 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
109
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
110 static std::size_t
27101
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
111 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
112 {
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
113 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
114
27102
84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27101
diff changeset
115 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
116
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
117 std::size_t i = 0;
27101
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
118
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
119 for ( ; i < s_len; i++)
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
120 {
27102
84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27101
diff changeset
121 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
122 break;
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 if (! suffixes.empty ())
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
125 {
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
126 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
127 {
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
128 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
129
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
130 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
131 return i;
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 }
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 return i;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
137 }
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 // 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
140
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
141 static std::string
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
142 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
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 f_len = fname.length ();
27101
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
145
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
146 std::size_t len = 1;
27101
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
147
27102
84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27101
diff changeset
148 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
149 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 return fname.substr (1, len);
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
152 }
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
153
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
154 // 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
155 // tilde.
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
156
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
157 static std::string
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
158 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
159 {
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
160 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
161
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
162 if (f_len == 0 || filename[0] != '~')
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
163 return std::string (filename);
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
164
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
165 // 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
166 // 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
167 // any preexpansion hook.
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
168
27102
84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27101
diff changeset
169 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
170 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
171
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
172 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
173
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
174 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
175
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
176 std::string dirname;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
177
27102
84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27101
diff changeset
178 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
179 {
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
180 std::string expansion
27102
84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27101
diff changeset
181 = 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
182
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
183 if (! expansion.empty ())
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
184 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
185 }
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
186
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
187 // 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
188 // password database.
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
189
27102
84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27101
diff changeset
190 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
191
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
192 if (! pw)
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
193 {
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
194 // 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
195 // 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
196
27102
84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27101
diff changeset
197 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
198 {
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
199 std::string expansion
27102
84ff9953faa1 where possible, eliminate octave:: namespace qualifier inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 27101
diff changeset
200 = 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
201
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
202 if (! expansion.empty ())
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
203 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
204 }
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
205
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
206 // 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
207 // 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
208
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
209 if (dirname.empty ())
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
210 dirname = filename;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
211 }
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
212 else
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
213 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
214
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
215 return dirname;
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
216 }
097774bed4ed move some static functions inside octave namespace
John W. Eaton <jwe@octave.org>
parents: 26376
diff changeset
217
21734
11af9c03400c write namespace keyword and name on same line in C++ files
John W. Eaton <jwe@octave.org>
parents: 21733
diff changeset
218 namespace sys
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
219 {
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
220 namespace file_ops
8007
a2ab20ba78f7 make file_ops a proper singleton class
John W. Eaton <jwe@octave.org>
parents: 7520
diff changeset
221 {
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
222 char dev_sep_char (void)
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
223 {
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
224 #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
225 return ':';
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
226 #else
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
227 return 0;
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
228 #endif
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
229 }
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
230
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
231 char dir_sep_char (void)
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
232 {
10197
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way
John W. Eaton <jwe@octave.org>
parents: 10189
diff changeset
233 #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
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 #else
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
236 return '/';
10197
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way
John W. Eaton <jwe@octave.org>
parents: 10189
diff changeset
237 #endif
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
238 }
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 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
241 {
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
242 #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
243 return R"(\)";
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
244 #else
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
245 return "/";
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
246 #endif
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
247 }
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
248
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
249 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
250 {
10197
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way
John W. Eaton <jwe@octave.org>
parents: 10189
diff changeset
251 #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
252 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
253 #else
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
254 return dir_sep_str ();
5138
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
255 #endif
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
256 }
6271
6fab59e81b4e [project @ 2007-02-06 01:36:46 by jwe]
jwe
parents: 6208
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_preexpansion_hook = nullptr;
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
259
23795
980f39c3ab90 Use C++11 nullptr rather than 0 in code (bug #51565).
Rik <rik@octave.org>
parents: 23744
diff changeset
260 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
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_prefixes = default_prefixes;
5138
5fa9670b5956 [project @ 2005-02-09 23:13:03 by jwe]
jwe
parents: 4726
diff changeset
263
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
264 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
265
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
266 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
267 {
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
268 #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
269 return c == dev_sep_char ();
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
270 #else
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
271 octave_unused_parameter (c);
1802
8173b1fa052d [project @ 1996-01-29 06:10:18 by jwe]
jwe
parents: 1779
diff changeset
272
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
273 return false;
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
274 #endif
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
275 }
2926
66ef74ee5d9f [project @ 1997-05-05 03:20:52 by jwe]
jwe
parents: 2847
diff changeset
276
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
277 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
278 {
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
279 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
280 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
281 }
3040
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
282
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
283 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
284 {
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
285 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
286 return std::string (name);
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
287 else
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
288 {
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
289 std::string result;
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
290
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
291 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
292
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
293 // 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
294
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
295 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
296
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
297 while (1)
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
298 {
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
299 if (pos > name_len)
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
300 break;
3040
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
301
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
302 std::size_t len;
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
303
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
304 // 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
305
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
306 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
307
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
308 result.append (name.substr (pos, start));
3040
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
309
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
310 // 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
311
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
312 pos += start;
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
313
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
314 // 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
315 // username.
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
316
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
317 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
318
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
319 // 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
320
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
321 if (! (start || fini))
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
322 break;
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
323
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
324 // 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
325
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
326 std::string tilde_word = name.substr (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 pos += fini;
3040
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
329
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
330 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
331
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
332 result.append (expansion);
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
333 }
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 return result;
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
336 }
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
337 }
3040
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
338
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
339 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
340 {
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
341 int n = names.numel ();
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
342
23812
057a894914df Use C++11 string fcns back() and pop_back() to simplify code.
Rik <rik@octave.org>
parents: 23804
diff changeset
343 string_vector retval (n);
3040
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
344
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
345 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
346 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
347
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
348 return retval;
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
349 }
3040
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
350
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
351 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
352 {
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
353 return dir.empty ()
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
354 ? file
23812
057a894914df Use C++11 string fcns back() and pop_back() to simplify code.
Rik <rik@octave.org>
parents: 23804
diff changeset
355 : (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
356 ? dir + file
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
357 : dir + dir_sep_char () + file);
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
358 }
3040
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
359
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
360 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
361 {
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
362 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
363
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
364 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
365 }
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
366
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
367 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
368 {
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
369 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
370
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
371 if (ipos != std::string::npos)
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
372 ipos++;
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
373 else
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
374 ipos = 0;
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
375
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
376 return path.substr (ipos);
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
377 }
3040
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
378
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
379 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
380 {
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
381 std::string retval;
3040
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
382
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
383 if (dir_sep_char () == '/')
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
384 retval = path;
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
385 else
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
386 {
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
387 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
388 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
389 {
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
390 if (path[i] == '/')
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
391 retval += dir_sep_char();
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
392 else
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
393 retval += path[i];
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
394 }
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
395 }
3040
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
396
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
397 return retval;
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
398 }
3040
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
399 }
443851377f3f [project @ 1997-06-06 09:29:28 by jwe]
jwe
parents: 2947
diff changeset
400
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
401 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
402 {
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
403 std::string msg;
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
404 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
405 }
aea1bf9493c0 * file-ops.h, file-ops.cc (file_ops::file_ops): Now protected.
John W. Eaton <jwe@octave.org>
parents: 21852
diff changeset
406
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
407 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
408 {
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
409 msg = "";
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
410
21909
d7cac41df82a provide wrappers for some sys/stat functions
John W. Eaton <jwe@octave.org>
parents: 21896
diff changeset
411 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
412
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
413 if (status < 0)
21942
aab79a1885cc limit gnulib headers to liboctave/wrappers directory
John W. Eaton <jwe@octave.org>
parents: 21910
diff changeset
414 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
415
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
416 return status;
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
417 }
10197
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way
John W. Eaton <jwe@octave.org>
parents: 10189
diff changeset
418
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
419 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
420 {
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
421 std::string msg;
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
422 return mkfifo (nm, md, msg);
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
423 }
10197
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way
John W. Eaton <jwe@octave.org>
parents: 10189
diff changeset
424
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
425 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
426 {
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
427 msg = "";
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
428
21909
d7cac41df82a provide wrappers for some sys/stat functions
John W. Eaton <jwe@octave.org>
parents: 21896
diff changeset
429 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
430
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
431 if (status < 0)
21942
aab79a1885cc limit gnulib headers to liboctave/wrappers directory
John W. Eaton <jwe@octave.org>
parents: 21910
diff changeset
432 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
433
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
434 return status;
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
435 }
10197
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way
John W. Eaton <jwe@octave.org>
parents: 10189
diff changeset
436
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
437 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
438 {
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
439 std::string msg;
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
440 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
441 }
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
442
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
443 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
444 std::string& msg)
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
445 {
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
446 msg = "";
10197
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way
John W. Eaton <jwe@octave.org>
parents: 10189
diff changeset
447
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
448 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
449
21910
4d723ba06b4a provide wrappers for some unistd.h functions
John W. Eaton <jwe@octave.org>
parents: 21909
diff changeset
450 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
451
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
452 if (status < 0)
21942
aab79a1885cc limit gnulib headers to liboctave/wrappers directory
John W. Eaton <jwe@octave.org>
parents: 21910
diff changeset
453 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
454
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
455 return status;
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
456 }
10197
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way
John W. Eaton <jwe@octave.org>
parents: 10189
diff changeset
457
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
458 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
459 {
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
460 std::string msg;
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
461 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
462 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way
John W. Eaton <jwe@octave.org>
parents: 10189
diff changeset
463
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
464 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
465 std::string& msg)
21733
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 msg = "";
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
468
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
469 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
470
21910
4d723ba06b4a provide wrappers for some unistd.h functions
John W. Eaton <jwe@octave.org>
parents: 21909
diff changeset
471 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
472
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
473 if (status < 0)
21942
aab79a1885cc limit gnulib headers to liboctave/wrappers directory
John W. Eaton <jwe@octave.org>
parents: 21910
diff changeset
474 msg = std::strerror (errno);
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
475
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
476 return status;
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
477 }
10197
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way
John W. Eaton <jwe@octave.org>
parents: 10189
diff changeset
478
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
479 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
480 {
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
481 std::string msg;
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
482 return readlink (path, result, msg);
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
483 }
10197
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way
John W. Eaton <jwe@octave.org>
parents: 10189
diff changeset
484
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
485 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
486 {
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
487 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
488
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
489 msg = "";
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 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
492
21896
83c824c727c9 hide gnulib pathlen header
John W. Eaton <jwe@octave.org>
parents: 21890
diff changeset
493 if (! buf)
21942
aab79a1885cc limit gnulib headers to liboctave/wrappers directory
John W. Eaton <jwe@octave.org>
parents: 21910
diff changeset
494 msg = std::strerror (errno);
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
495 else
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
496 {
21896
83c824c727c9 hide gnulib pathlen header
John W. Eaton <jwe@octave.org>
parents: 21890
diff changeset
497 result = buf;
83c824c727c9 hide gnulib pathlen header
John W. Eaton <jwe@octave.org>
parents: 21890
diff changeset
498 ::free (buf);
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
499 status = 0;
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
500 }
10197
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way
John W. Eaton <jwe@octave.org>
parents: 10189
diff changeset
501
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
502 return status;
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
503 }
10197
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way
John W. Eaton <jwe@octave.org>
parents: 10189
diff changeset
504
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
505 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
506 {
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
507 std::string msg;
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
508 return rename (from, to, msg);
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
509 }
10197
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way
John W. Eaton <jwe@octave.org>
parents: 10189
diff changeset
510
25624
815cfd72ddf5 Fix "rename" for files with non-ASCII chars on Windows.
Markus Mützel <markus.muetzel@gmx.de>
parents: 25516
diff changeset
511 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
512 std::string& msg)
21733
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 int status = -1;
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
515
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
516 msg = "";
10197
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way
John W. Eaton <jwe@octave.org>
parents: 10189
diff changeset
517
25624
815cfd72ddf5 Fix "rename" for files with non-ASCII chars on Windows.
Markus Mützel <markus.muetzel@gmx.de>
parents: 25516
diff changeset
518 #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
519 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
520 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
521 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
522 #else
21942
aab79a1885cc limit gnulib headers to liboctave/wrappers directory
John W. Eaton <jwe@octave.org>
parents: 21910
diff changeset
523 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
524 #endif
10197
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way
John W. Eaton <jwe@octave.org>
parents: 10189
diff changeset
525
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
526 if (status < 0)
21942
aab79a1885cc limit gnulib headers to liboctave/wrappers directory
John W. Eaton <jwe@octave.org>
parents: 21910
diff changeset
527 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
528
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
529 return status;
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
530 }
10197
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way
John W. Eaton <jwe@octave.org>
parents: 10189
diff changeset
531
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
532 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
533 {
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
534 std::string msg;
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
535 return rmdir (name, msg);
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
536 }
10197
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way
John W. Eaton <jwe@octave.org>
parents: 10189
diff changeset
537
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
538 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
539 {
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
540 msg = "";
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
541
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
542 int status = -1;
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
543
21910
4d723ba06b4a provide wrappers for some unistd.h functions
John W. Eaton <jwe@octave.org>
parents: 21909
diff changeset
544 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
545
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
546 if (status < 0)
21942
aab79a1885cc limit gnulib headers to liboctave/wrappers directory
John W. Eaton <jwe@octave.org>
parents: 21910
diff changeset
547 msg = std::strerror (errno);
21733
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 return status;
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
550 }
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
551
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
552 // 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
553
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
554 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
555 {
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
556 std::string msg;
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
557 return recursive_rmdir (name, msg);
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
558 }
10197
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way
John W. Eaton <jwe@octave.org>
parents: 10189
diff changeset
559
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
560 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
561 {
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
562 msg = "";
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
563
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
564 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
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 string_vector dirlist;
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
567
25516
8945a6a6c0eb Add Unicode support for getting directory listing in Windows (bug #49118).
Markus Mützel <markus.muetzel@gmx.de>
parents: 25438
diff changeset
568 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
569 {
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
570 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
571 {
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
572 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
573
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
574 std::string nm = dirlist[i];
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
575
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
576 // Skip current directory and parent.
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
577 if (nm == "." || nm == "..")
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
578 continue;
10197
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way
John W. Eaton <jwe@octave.org>
parents: 10189
diff changeset
579
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
580 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
581
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
582 // 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
583 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
584
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
585 if (fs)
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 if (fs.is_dir ())
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
588 {
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
589 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
590
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
591 if (status < 0)
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
592 break;
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 else
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
595 {
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
596 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
597
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
598 if (status < 0)
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
599 break;
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
600 }
10197
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way
John W. Eaton <jwe@octave.org>
parents: 10189
diff changeset
601 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way
John W. Eaton <jwe@octave.org>
parents: 10189
diff changeset
602 else
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way
John W. Eaton <jwe@octave.org>
parents: 10189
diff changeset
603 {
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
604 msg = fs.error ();
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
605 break;
10197
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way
John W. Eaton <jwe@octave.org>
parents: 10189
diff changeset
606 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way
John W. Eaton <jwe@octave.org>
parents: 10189
diff changeset
607 }
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
608
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
609 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
610 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
611 }
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
612 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
613 status = -1;
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
614
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
615 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
616 }
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
617
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
618 int umask (mode_t mode)
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
619 {
21909
d7cac41df82a provide wrappers for some sys/stat functions
John W. Eaton <jwe@octave.org>
parents: 21896
diff changeset
620 return octave_umask_wrapper (mode);
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
621 }
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
622
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
623 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
624 {
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
625 std::string msg;
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
626 return unlink (name, msg);
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
627 }
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
628
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
629 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
630 {
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
631 msg = "";
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
632
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
633 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
634
21910
4d723ba06b4a provide wrappers for some unistd.h functions
John W. Eaton <jwe@octave.org>
parents: 21909
diff changeset
635 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
636
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
637 if (status < 0)
21942
aab79a1885cc limit gnulib headers to liboctave/wrappers directory
John W. Eaton <jwe@octave.org>
parents: 21910
diff changeset
638 msg = std::strerror (errno);
21733
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 return status;
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
641 }
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
642
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
643 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
644 {
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
645 std::string msg;
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
646 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
647 }
4d433bd2d4dc attempt to avoid trouble with gnulib #defines in a consistent way
John W. Eaton <jwe@octave.org>
parents: 10189
diff changeset
648
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
649 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
650 std::string& msg)
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
651 {
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
652 msg = "";
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 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
655
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
656 // 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
657 std::string templatename;
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
658 if (dir.empty ())
23744
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 ();
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
660 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
661 templatename = env::get_temp_directory ();
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
662 else
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
663 templatename = dir;
11586
12df7854fa7c strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents: 11523
diff changeset
664
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
665 // 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
666 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
667 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
668
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
669 if (pfx.empty ())
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
670 templatename += "file";
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
671 else
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
672 templatename += pfx;
19458
d8fd3842a507 Use gnulib gen_tempname to create temporary names (Bug #43872).
John Donoghue <john.donoghue@ieee.org>
parents: 19428
diff changeset
673
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
674 // 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
675 templatename += "XXXXXX";
19428
eee9f111c164 Check if tempfile name exists when changing path of temporary file name (Bug #43872)
John Donoghue
parents: 19420
diff changeset
676
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
677 // 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
678 char tname [templatename.length () + 1];
19597
db92e7e28e1f strip trailing whitespace from most source files
John W. Eaton <jwe@octave.org>
parents: 19458
diff changeset
679
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
680 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
681
21888
00f1249f2483 create wrappers for some gnulib functions
John W. Eaton <jwe@octave.org>
parents: 21885
diff changeset
682 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
683 msg = std::strerror (errno);
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
684 else
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
685 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
686
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
687 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
688 }
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
689
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
690 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
691 {
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
692 std::string msg;
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
693 return canonicalize_file_name (name, msg);
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
694 }
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
695
23744
ae74608b6a5d don't use singleton pattern for file_ops
John W. Eaton <jwe@octave.org>
parents: 23696
diff changeset
696 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
697 {
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
698 msg = "";
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
699
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
700 std::string retval;
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
701
29521
d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306).
Markus Mützel <markus.muetzel@gmx.de>
parents: 29516
diff changeset
702 // 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
703 // 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
704
29521
d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306).
Markus Mützel <markus.muetzel@gmx.de>
parents: 29516
diff changeset
705 #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
706 // 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
707 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
708 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
709 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
710 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
711
31177
51311efef5dd canonicalize_file_name: Handle symlinks to UNC network shares (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31097
diff changeset
712 // Might have been a symbolic link that points to a network share.
51311efef5dd canonicalize_file_name: Handle symlinks to UNC network shares (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31097
diff changeset
713 // It looks like opening a network share itself (not a file or folder
51311efef5dd canonicalize_file_name: Handle symlinks to UNC network shares (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31097
diff changeset
714 // *on* a share) might return an invalid handle. As a workaround, try to
51311efef5dd canonicalize_file_name: Handle symlinks to UNC network shares (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31097
diff changeset
715 // open a handle to the symbolic link itself (and do not resolve it).
51311efef5dd canonicalize_file_name: Handle symlinks to UNC network shares (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31097
diff changeset
716 if (h_file == INVALID_HANDLE_VALUE)
51311efef5dd canonicalize_file_name: Handle symlinks to UNC network shares (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31097
diff changeset
717 h_file = CreateFileW (wname.c_str (), GENERIC_READ,
51311efef5dd canonicalize_file_name: Handle symlinks to UNC network shares (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31097
diff changeset
718 FILE_SHARE_READ, nullptr, OPEN_EXISTING,
51311efef5dd canonicalize_file_name: Handle symlinks to UNC network shares (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31097
diff changeset
719 FILE_FLAG_BACKUP_SEMANTICS
51311efef5dd canonicalize_file_name: Handle symlinks to UNC network shares (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31097
diff changeset
720 | FILE_FLAG_OPEN_REPARSE_POINT, nullptr);
51311efef5dd canonicalize_file_name: Handle symlinks to UNC network shares (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31097
diff changeset
721
29521
d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306).
Markus Mützel <markus.muetzel@gmx.de>
parents: 29516
diff changeset
722 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
723 {
29521
d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306).
Markus Mützel <markus.muetzel@gmx.de>
parents: 29516
diff changeset
724 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
725 return retval;
d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306).
Markus Mützel <markus.muetzel@gmx.de>
parents: 29516
diff changeset
726 }
d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306).
Markus Mützel <markus.muetzel@gmx.de>
parents: 29516
diff changeset
727
29950
6549fa7558ba eliminate some unnecessary octave:: namespace tags
John W. Eaton <jwe@octave.org>
parents: 29657
diff changeset
728 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
729
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
730 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
731 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
732
29521
d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306).
Markus Mützel <markus.muetzel@gmx.de>
parents: 29516
diff changeset
733 // 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
734 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
735 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
736 if (len >= buf_size)
30394
f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release.
Rik <rik@octave.org>
parents: 30072
diff changeset
737 {
29521
d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306).
Markus Mützel <markus.muetzel@gmx.de>
parents: 29516
diff changeset
738 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
739 return retval;
30394
f3f3e3793fb5 maint: style check C++ files in liboctave/ ahead of 7.1 release.
Rik <rik@octave.org>
parents: 30072
diff changeset
740 }
28471
a6c89130cfaa Improve canonicalize_file_name with non-ASCII characters on Windows.
Markus Mützel <markus.muetzel@gmx.de>
parents: 28204
diff changeset
741
29521
d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306).
Markus Mützel <markus.muetzel@gmx.de>
parents: 29516
diff changeset
742 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
743
d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306).
Markus Mützel <markus.muetzel@gmx.de>
parents: 29516
diff changeset
744 // remove prefix
d7223245d26f canonicalize_file_name: Use newer Windows API functions (bug #60306).
Markus Mützel <markus.muetzel@gmx.de>
parents: 29516
diff changeset
745 // "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
746 // 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
747 if (retval.compare (0, 8, R"(\\?\UNC\)") == 0)
31097
b47bf773c508 canonicalize_file_path: Do not translate mapped network drive to UNC path (bug #62576).
Markus Mützel <markus.muetzel@gmx.de>
parents: 30564
diff changeset
748 {
b47bf773c508 canonicalize_file_path: Do not translate mapped network drive to UNC path (bug #62576).
Markus Mützel <markus.muetzel@gmx.de>
parents: 30564
diff changeset
749 retval = retval.erase (2, 6);
b47bf773c508 canonicalize_file_path: Do not translate mapped network drive to UNC path (bug #62576).
Markus Mützel <markus.muetzel@gmx.de>
parents: 30564
diff changeset
750
b47bf773c508 canonicalize_file_path: Do not translate mapped network drive to UNC path (bug #62576).
Markus Mützel <markus.muetzel@gmx.de>
parents: 30564
diff changeset
751 // If the initial path looked like a mapped network drive, replace
31185
84df79fb637d canonicalize_file_name: Generalize check for mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31177
diff changeset
752 // portion of path that corresponds to mapped root with drive root.
31196
4c38cf0ce06c canonicalize_file_name: Check root of potential mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31185
diff changeset
753 if (name.size () < 3 || name[1] != ':')
31185
84df79fb637d canonicalize_file_name: Generalize check for mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31177
diff changeset
754 return retval;
31177
51311efef5dd canonicalize_file_name: Handle symlinks to UNC network shares (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31097
diff changeset
755
31185
84df79fb637d canonicalize_file_name: Generalize check for mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31177
diff changeset
756 // UNC path corresponding to original drive letter (mappped drive)
31196
4c38cf0ce06c canonicalize_file_name: Check root of potential mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31185
diff changeset
757 std::wstring orig_map = wname.substr (0, 3);
4c38cf0ce06c canonicalize_file_name: Check root of potential mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31185
diff changeset
758 orig_map[2] = L'\\';
31185
84df79fb637d canonicalize_file_name: Generalize check for mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31177
diff changeset
759 HANDLE h_map = CreateFileW (orig_map.c_str (), GENERIC_READ,
84df79fb637d canonicalize_file_name: Generalize check for mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31177
diff changeset
760 FILE_SHARE_READ, nullptr, OPEN_EXISTING,
84df79fb637d canonicalize_file_name: Generalize check for mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31177
diff changeset
761 FILE_FLAG_BACKUP_SEMANTICS
84df79fb637d canonicalize_file_name: Generalize check for mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31177
diff changeset
762 | FILE_FLAG_OPEN_REPARSE_POINT,
84df79fb637d canonicalize_file_name: Generalize check for mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31177
diff changeset
763 nullptr);
31177
51311efef5dd canonicalize_file_name: Handle symlinks to UNC network shares (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31097
diff changeset
764
31185
84df79fb637d canonicalize_file_name: Generalize check for mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31177
diff changeset
765 if (h_map == INVALID_HANDLE_VALUE)
84df79fb637d canonicalize_file_name: Generalize check for mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31177
diff changeset
766 // cannot determine common root
84df79fb637d canonicalize_file_name: Generalize check for mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31177
diff changeset
767 return retval;
84df79fb637d canonicalize_file_name: Generalize check for mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31177
diff changeset
768
84df79fb637d canonicalize_file_name: Generalize check for mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31177
diff changeset
769 unwind_action close_map_handle (CloseHandle, h_map);
84df79fb637d canonicalize_file_name: Generalize check for mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31177
diff changeset
770 len = GetFinalPathNameByHandleW (h_map, buffer, buf_size,
84df79fb637d canonicalize_file_name: Generalize check for mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31177
diff changeset
771 FILE_NAME_NORMALIZED);
31177
51311efef5dd canonicalize_file_name: Handle symlinks to UNC network shares (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31097
diff changeset
772
31185
84df79fb637d canonicalize_file_name: Generalize check for mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31177
diff changeset
773 std::string orig_root
84df79fb637d canonicalize_file_name: Generalize check for mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31177
diff changeset
774 = u8_from_wstring (std::wstring (buffer, len));
84df79fb637d canonicalize_file_name: Generalize check for mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31177
diff changeset
775
84df79fb637d canonicalize_file_name: Generalize check for mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31177
diff changeset
776 if (orig_root.compare (0, 8, R"(\\?\UNC\)"))
84df79fb637d canonicalize_file_name: Generalize check for mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31177
diff changeset
777 // root was not a mapped share
84df79fb637d canonicalize_file_name: Generalize check for mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31177
diff changeset
778 return retval;
31177
51311efef5dd canonicalize_file_name: Handle symlinks to UNC network shares (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31097
diff changeset
779
31185
84df79fb637d canonicalize_file_name: Generalize check for mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31177
diff changeset
780 orig_root = orig_root.erase (2, 6);
31216
f111d1caa73d canonicalize_file_name: Trim trailing file separators from root of mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31196
diff changeset
781 // trim trailing file separators from UNC path corresponding to root
f111d1caa73d canonicalize_file_name: Trim trailing file separators from root of mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31196
diff changeset
782 std::string file_seps = file_ops::dir_sep_chars ();
f111d1caa73d canonicalize_file_name: Trim trailing file separators from root of mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31196
diff changeset
783 while (file_seps.find (orig_root.back ()) != std::string::npos)
f111d1caa73d canonicalize_file_name: Trim trailing file separators from root of mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31196
diff changeset
784 orig_root.pop_back ();
f111d1caa73d canonicalize_file_name: Trim trailing file separators from root of mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31196
diff changeset
785
31185
84df79fb637d canonicalize_file_name: Generalize check for mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31177
diff changeset
786 if (retval.compare (0, orig_root.size (), orig_root))
84df79fb637d canonicalize_file_name: Generalize check for mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31177
diff changeset
787 // start of UNC path doesn't match mapped drive root
84df79fb637d canonicalize_file_name: Generalize check for mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31177
diff changeset
788 return retval;
84df79fb637d canonicalize_file_name: Generalize check for mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31177
diff changeset
789
84df79fb637d canonicalize_file_name: Generalize check for mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31177
diff changeset
790 // file is on mapped share
84df79fb637d canonicalize_file_name: Generalize check for mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31177
diff changeset
791 size_t sep_pos = orig_root.size ();
84df79fb637d canonicalize_file_name: Generalize check for mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31177
diff changeset
792 if (sep_pos != retval.size ())
84df79fb637d canonicalize_file_name: Generalize check for mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31177
diff changeset
793 retval = retval.substr (sep_pos-2);
84df79fb637d canonicalize_file_name: Generalize check for mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31177
diff changeset
794 else
84df79fb637d canonicalize_file_name: Generalize check for mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31177
diff changeset
795 retval.resize (2); // no file component
84df79fb637d canonicalize_file_name: Generalize check for mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31177
diff changeset
796 retval[0] = std::toupper (name[0]);
84df79fb637d canonicalize_file_name: Generalize check for mapped network drive (bug #62847).
Markus Mützel <markus.muetzel@gmx.de>
parents: 31177
diff changeset
797 retval[1] = ':';
31097
b47bf773c508 canonicalize_file_path: Do not translate mapped network drive to UNC path (bug #62576).
Markus Mützel <markus.muetzel@gmx.de>
parents: 30564
diff changeset
798 }
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
799 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
800 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
801 #else
21888
00f1249f2483 create wrappers for some gnulib functions
John W. Eaton <jwe@octave.org>
parents: 21885
diff changeset
802 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
803
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
804 if (tmp)
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
805 {
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
806 retval = tmp;
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
807 free (tmp);
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
808 }
27496
def608acdfa9 Canonicalize case of file path on Windows file systems (bug #56267).
Markus Mützel <markus.muetzel@gmx.de>
parents: 27102
diff changeset
809
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
810 if (retval.empty ())
21942
aab79a1885cc limit gnulib headers to liboctave/wrappers directory
John W. Eaton <jwe@octave.org>
parents: 21910
diff changeset
811 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
812 #endif
10252
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
813
21733
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
814 return retval;
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
815 }
cb0fdd941d84 use namespace for system file_ops class
John W. Eaton <jwe@octave.org>
parents: 21732
diff changeset
816 }
10252
2fcc927a8757 liboctave/file-ops.h: avoid gnulib #define for canonicalize_file_name
John W. Eaton <jwe@octave.org>
parents: 10250
diff changeset
817 }