Mercurial > octave
annotate liboctave/util/kpse.cc @ 27919:1891570abac8
update Octave Project Developers copyright for the new year
In files that have the "Octave Project Developers" copyright notice,
update for 2020.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Mon, 06 Jan 2020 22:29:51 -0500 |
parents | b442ec6dda5c |
children | bd51beb6205e |
rev | line source |
---|---|
21751
b571fc85953f
maint: Use two spaces after period to indicate sentence break.
Rik <rik@octave.org>
parents:
21732
diff
changeset
|
1 // This file is not compiled to a separate object file. |
b571fc85953f
maint: Use two spaces after period to indicate sentence break.
Rik <rik@octave.org>
parents:
21732
diff
changeset
|
2 // It is included in pathsearch.cc. |
4399 | 3 |
4 /* Look up a filename in a path. | |
4378 | 5 |
27919
1891570abac8
update Octave Project Developers copyright for the new year
John W. Eaton <jwe@octave.org>
parents:
27918
diff
changeset
|
6 Copyright (C) 1991-2020 The Octave Project Developers |
27918
b442ec6dda5c
use centralized file for copyright info for individual contributors
John W. Eaton <jwe@octave.org>
parents:
27679
diff
changeset
|
7 |
b442ec6dda5c
use centralized file for copyright info for individual contributors
John W. Eaton <jwe@octave.org>
parents:
27679
diff
changeset
|
8 See the file COPYRIGHT.md in the top-level directory of this distribution |
b442ec6dda5c
use centralized file for copyright info for individual contributors
John W. Eaton <jwe@octave.org>
parents:
27679
diff
changeset
|
9 or <https://octave.org/COPYRIGHT.html/>. |
b442ec6dda5c
use centralized file for copyright info for individual contributors
John W. Eaton <jwe@octave.org>
parents:
27679
diff
changeset
|
10 |
4378 | 11 |
16768 | 12 This file is part of Octave. |
13 | |
24534
194eb4bd202b
maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents:
24199
diff
changeset
|
14 Octave is free software: you can redistribute it and/or modify it |
22755
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22402
diff
changeset
|
15 under the terms of the GNU General Public License as published by |
24534
194eb4bd202b
maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents:
24199
diff
changeset
|
16 the Free Software Foundation, either version 3 of the License, or |
22755
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22402
diff
changeset
|
17 (at your option) any later version. |
16768 | 18 |
22755
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22402
diff
changeset
|
19 Octave is distributed in the hope that it will be useful, but |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22402
diff
changeset
|
20 WITHOUT ANY WARRANTY; without even the implied warranty of |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22402
diff
changeset
|
21 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
3a2b891d0b33
maint: Standardize Copyright formatting.
Rik <rik@octave.org>
parents:
22402
diff
changeset
|
22 GNU General Public License for more details. |
16768 | 23 |
24 You should have received a copy of the GNU General Public License | |
25 along with Octave; see the file COPYING. If not, see | |
24534
194eb4bd202b
maint: Update punctuation for GPL v3 license text.
Rik <rik@octave.org>
parents:
24199
diff
changeset
|
26 <https://www.gnu.org/licenses/>. |
16768 | 27 |
28 */ | |
4378 | 29 |
21883
02add2f597a1
compile kpse.cc separately from pathsearch.cc
John W. Eaton <jwe@octave.org>
parents:
21882
diff
changeset
|
30 #if defined (HAVE_CONFIG_H) |
02add2f597a1
compile kpse.cc separately from pathsearch.cc
John W. Eaton <jwe@octave.org>
parents:
21882
diff
changeset
|
31 # include "config.h" |
02add2f597a1
compile kpse.cc separately from pathsearch.cc
John W. Eaton <jwe@octave.org>
parents:
21882
diff
changeset
|
32 #endif |
4378 | 33 |
21874 | 34 #include <cctype> |
35 #include <cerrno> | |
36 #include <cstdlib> | |
37 | |
4390 | 38 #include <map> |
21868
e2796ea8feac
* kpse.cc: Use iostream for debug messages.
John W. Eaton <jwe@octave.org>
parents:
21867
diff
changeset
|
39 #include <fstream> |
e2796ea8feac
* kpse.cc: Use iostream for debug messages.
John W. Eaton <jwe@octave.org>
parents:
21867
diff
changeset
|
40 #include <iostream> |
4389 | 41 #include <string> |
42 | |
21926 | 43 #include "dir-ops.h" |
21882
d8104206e8a9
additional cleanups for kpse.cc
John W. Eaton <jwe@octave.org>
parents:
21874
diff
changeset
|
44 #include "file-ops.h" |
21865 | 45 #include "file-stat.h" |
21883
02add2f597a1
compile kpse.cc separately from pathsearch.cc
John W. Eaton <jwe@octave.org>
parents:
21882
diff
changeset
|
46 #include "kpse.h" |
4391 | 47 #include "oct-env.h" |
48 #include "oct-passwd.h" | |
22061
737b1d9d7ee3
use octave::sys::time instead of C library time function
John W. Eaton <jwe@octave.org>
parents:
21979
diff
changeset
|
49 #include "oct-time.h" |
21883
02add2f597a1
compile kpse.cc separately from pathsearch.cc
John W. Eaton <jwe@octave.org>
parents:
21882
diff
changeset
|
50 #include "pathsearch.h" |
21910
4d723ba06b4a
provide wrappers for some unistd.h functions
John W. Eaton <jwe@octave.org>
parents:
21887
diff
changeset
|
51 #include "unistd-wrappers.h" |
4385 | 52 |
21979
d04da18a407a
use OCTAVE_USE_WINDOWS_API more consistently
John W. Eaton <jwe@octave.org>
parents:
21926
diff
changeset
|
53 #if defined (OCTAVE_USE_WINDOWS_API) |
21874 | 54 # define WIN32_LEAN_AND_MEAN 1 |
55 # include <windows.h> | |
27617
12f28f9368ec
* kpse.cc (READABLE): Use wide character file system API on Windows.
Markus Mützel <markus.muetzel@gmx.de>
parents:
27379
diff
changeset
|
56 |
12f28f9368ec
* kpse.cc (READABLE): Use wide character file system API on Windows.
Markus Mützel <markus.muetzel@gmx.de>
parents:
27379
diff
changeset
|
57 # include "lo-sysdep.h" |
21874 | 58 #endif |
4385 | 59 |
21874 | 60 // Define the characters which separate components of filenames and |
61 // environment variable paths. | |
4385 | 62 |
21882
d8104206e8a9
additional cleanups for kpse.cc
John W. Eaton <jwe@octave.org>
parents:
21874
diff
changeset
|
63 #define IS_DEVICE_SEP(ch) octave::sys::file_ops::is_dev_sep (ch) |
22197
e43d83253e28
refill multi-line macro definitions
John W. Eaton <jwe@octave.org>
parents:
22115
diff
changeset
|
64 #define NAME_BEGINS_WITH_DEVICE(name) \ |
21882
d8104206e8a9
additional cleanups for kpse.cc
John W. Eaton <jwe@octave.org>
parents:
21874
diff
changeset
|
65 (name.length () > 0 && IS_DEVICE_SEP ((name)[1])) |
d8104206e8a9
additional cleanups for kpse.cc
John W. Eaton <jwe@octave.org>
parents:
21874
diff
changeset
|
66 |
d8104206e8a9
additional cleanups for kpse.cc
John W. Eaton <jwe@octave.org>
parents:
21874
diff
changeset
|
67 #define DIR_SEP_STRING octave::sys::file_ops::dir_sep_str () |
d8104206e8a9
additional cleanups for kpse.cc
John W. Eaton <jwe@octave.org>
parents:
21874
diff
changeset
|
68 #define IS_DIR_SEP(ch) octave::sys::file_ops::is_dir_sep (ch) |
21863
a25110491607
eliminate obsolete sysdir.h header file
John W. Eaton <jwe@octave.org>
parents:
21751
diff
changeset
|
69 |
21882
d8104206e8a9
additional cleanups for kpse.cc
John W. Eaton <jwe@octave.org>
parents:
21874
diff
changeset
|
70 #define ENV_SEP octave::directory_path::path_sep_char () |
d8104206e8a9
additional cleanups for kpse.cc
John W. Eaton <jwe@octave.org>
parents:
21874
diff
changeset
|
71 #define ENV_SEP_STRING octave::directory_path::path_sep_str () |
d8104206e8a9
additional cleanups for kpse.cc
John W. Eaton <jwe@octave.org>
parents:
21874
diff
changeset
|
72 #define IS_ENV_SEP(ch) octave::directory_path::is_path_sep (ch) |
21874 | 73 |
74 // If NO_DEBUG is defined (not recommended), skip all this. | |
21724
aba2e6293dd8
use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents:
21690
diff
changeset
|
75 #if ! defined (NO_DEBUG) |
4385 | 76 |
21874 | 77 // OK, we'll have tracing support. |
78 # define KPSE_DEBUG | |
4385 | 79 |
21874 | 80 // Test if a bit is on. |
21882
d8104206e8a9
additional cleanups for kpse.cc
John W. Eaton <jwe@octave.org>
parents:
21874
diff
changeset
|
81 # define KPSE_DEBUG_P(bit) (kpse_debug & (1 << (bit))) |
4385 | 82 |
21874 | 83 # define KPSE_DEBUG_STAT 0 // stat calls |
84 # define KPSE_DEBUG_EXPAND 1 // path element expansion | |
85 # define KPSE_DEBUG_SEARCH 2 // searches | |
86 # define KPSE_DEBUG_VARS 3 // variable values | |
87 # define KPSE_LAST_DEBUG KPSE_DEBUG_VARS | |
4385 | 88 |
21874 | 89 #endif |
4385 | 90 |
21883
02add2f597a1
compile kpse.cc separately from pathsearch.cc
John W. Eaton <jwe@octave.org>
parents:
21882
diff
changeset
|
91 unsigned int kpse_debug = 0; |
4399 | 92 |
21883
02add2f597a1
compile kpse.cc separately from pathsearch.cc
John W. Eaton <jwe@octave.org>
parents:
21882
diff
changeset
|
93 void |
02add2f597a1
compile kpse.cc separately from pathsearch.cc
John W. Eaton <jwe@octave.org>
parents:
21882
diff
changeset
|
94 kpse_path_iterator::set_end (void) |
4394 | 95 { |
27379
3db033e86376
use m_ prefix for data members in most liboctave/util classes
John W. Eaton <jwe@octave.org>
parents:
26376
diff
changeset
|
96 m_e = m_b + 1; |
21883
02add2f597a1
compile kpse.cc separately from pathsearch.cc
John W. Eaton <jwe@octave.org>
parents:
21882
diff
changeset
|
97 |
27379
3db033e86376
use m_ prefix for data members in most liboctave/util classes
John W. Eaton <jwe@octave.org>
parents:
26376
diff
changeset
|
98 if (m_e == m_len) |
21883
02add2f597a1
compile kpse.cc separately from pathsearch.cc
John W. Eaton <jwe@octave.org>
parents:
21882
diff
changeset
|
99 ; // OK, we have found the last element. |
27379
3db033e86376
use m_ prefix for data members in most liboctave/util classes
John W. Eaton <jwe@octave.org>
parents:
26376
diff
changeset
|
100 else if (m_e > m_len) |
3db033e86376
use m_ prefix for data members in most liboctave/util classes
John W. Eaton <jwe@octave.org>
parents:
26376
diff
changeset
|
101 m_b = m_e = std::string::npos; |
21883
02add2f597a1
compile kpse.cc separately from pathsearch.cc
John W. Eaton <jwe@octave.org>
parents:
21882
diff
changeset
|
102 else |
02add2f597a1
compile kpse.cc separately from pathsearch.cc
John W. Eaton <jwe@octave.org>
parents:
21882
diff
changeset
|
103 { |
02add2f597a1
compile kpse.cc separately from pathsearch.cc
John W. Eaton <jwe@octave.org>
parents:
21882
diff
changeset
|
104 // Find the next colon not enclosed by braces (or the end of the |
02add2f597a1
compile kpse.cc separately from pathsearch.cc
John W. Eaton <jwe@octave.org>
parents:
21882
diff
changeset
|
105 // path). |
02add2f597a1
compile kpse.cc separately from pathsearch.cc
John W. Eaton <jwe@octave.org>
parents:
21882
diff
changeset
|
106 |
27379
3db033e86376
use m_ prefix for data members in most liboctave/util classes
John W. Eaton <jwe@octave.org>
parents:
26376
diff
changeset
|
107 while (m_e < m_len && ! octave::directory_path::is_path_sep (m_path[m_e])) |
3db033e86376
use m_ prefix for data members in most liboctave/util classes
John W. Eaton <jwe@octave.org>
parents:
26376
diff
changeset
|
108 m_e++; |
21883
02add2f597a1
compile kpse.cc separately from pathsearch.cc
John W. Eaton <jwe@octave.org>
parents:
21882
diff
changeset
|
109 } |
4394 | 110 } |
111 | |
21883
02add2f597a1
compile kpse.cc separately from pathsearch.cc
John W. Eaton <jwe@octave.org>
parents:
21882
diff
changeset
|
112 void |
02add2f597a1
compile kpse.cc separately from pathsearch.cc
John W. Eaton <jwe@octave.org>
parents:
21882
diff
changeset
|
113 kpse_path_iterator::next (void) |
4399 | 114 { |
27379
3db033e86376
use m_ prefix for data members in most liboctave/util classes
John W. Eaton <jwe@octave.org>
parents:
26376
diff
changeset
|
115 m_b = m_e + 1; |
4399 | 116 |
21883
02add2f597a1
compile kpse.cc separately from pathsearch.cc
John W. Eaton <jwe@octave.org>
parents:
21882
diff
changeset
|
117 // Skip any consecutive colons. |
27379
3db033e86376
use m_ prefix for data members in most liboctave/util classes
John W. Eaton <jwe@octave.org>
parents:
26376
diff
changeset
|
118 while (m_b < m_len && octave::directory_path::is_path_sep (m_path[m_b])) |
3db033e86376
use m_ prefix for data members in most liboctave/util classes
John W. Eaton <jwe@octave.org>
parents:
26376
diff
changeset
|
119 m_b++; |
4399 | 120 |
27379
3db033e86376
use m_ prefix for data members in most liboctave/util classes
John W. Eaton <jwe@octave.org>
parents:
26376
diff
changeset
|
121 if (m_b >= m_len) |
3db033e86376
use m_ prefix for data members in most liboctave/util classes
John W. Eaton <jwe@octave.org>
parents:
26376
diff
changeset
|
122 m_b = m_e = std::string::npos; |
21883
02add2f597a1
compile kpse.cc separately from pathsearch.cc
John W. Eaton <jwe@octave.org>
parents:
21882
diff
changeset
|
123 else |
02add2f597a1
compile kpse.cc separately from pathsearch.cc
John W. Eaton <jwe@octave.org>
parents:
21882
diff
changeset
|
124 set_end (); |
02add2f597a1
compile kpse.cc separately from pathsearch.cc
John W. Eaton <jwe@octave.org>
parents:
21882
diff
changeset
|
125 } |
4399 | 126 |
4391 | 127 /* Truncate any too-long components in NAME, returning the result. It's |
128 too bad this is necessary. See comments in readable.c for why. */ | |
129 | |
4393 | 130 static std::string |
131 kpse_truncate_filename (const std::string& name) | |
4391 | 132 { |
133 unsigned c_len = 0; /* Length of current component. */ | |
134 unsigned ret_len = 0; /* Length of constructed result. */ | |
135 | |
4393 | 136 std::string ret = name; |
137 | |
27379
3db033e86376
use m_ prefix for data members in most liboctave/util classes
John W. Eaton <jwe@octave.org>
parents:
26376
diff
changeset
|
138 size_t m_len = name.length (); |
4393 | 139 |
27379
3db033e86376
use m_ prefix for data members in most liboctave/util classes
John W. Eaton <jwe@octave.org>
parents:
26376
diff
changeset
|
140 for (size_t i = 0; i < m_len; i++) |
4391 | 141 { |
4393 | 142 if (IS_DIR_SEP (name[i]) || IS_DEVICE_SEP (name[i])) |
4391 | 143 { |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
144 /* At a directory delimiter, reset component length. */ |
4391 | 145 c_len = 0; |
146 } | |
22115
b017351e92e1
* kpse.cc (kpse_truncate_filename): Use namespace qualifier for static dir_entry function.
John W. Eaton <jwe@octave.org>
parents:
22061
diff
changeset
|
147 else if (c_len > octave::sys::dir_entry::max_name_length ()) |
4391 | 148 { |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
149 /* If past the max for a component, ignore this character. */ |
4391 | 150 continue; |
151 } | |
152 | |
153 /* Copy this character. */ | |
4393 | 154 ret[ret_len++] = name[i]; |
4391 | 155 c_len++; |
156 } | |
157 | |
4393 | 158 ret.resize (ret_len); |
4391 | 159 |
160 return ret; | |
161 } | |
162 | |
163 /* If access can read FN, run stat (assigning to stat buffer ST) and | |
164 check that fn is not a directory. Don't check for just being a | |
165 regular file, as it is potentially useful to read fifo's or some | |
166 kinds of devices. */ | |
167 | |
168 static inline bool | |
21865 | 169 READABLE (const std::string& fn) |
4391 | 170 { |
27617
12f28f9368ec
* kpse.cc (READABLE): Use wide character file system API on Windows.
Markus Mützel <markus.muetzel@gmx.de>
parents:
27379
diff
changeset
|
171 #if defined (OCTAVE_USE_WINDOWS_API) |
12f28f9368ec
* kpse.cc (READABLE): Use wide character file system API on Windows.
Markus Mützel <markus.muetzel@gmx.de>
parents:
27379
diff
changeset
|
172 |
27679
748aea34aecd
* kpse.cc (READABLE): Prefixing "\\?\" only works for absolute paths (bug #57215).
Markus Mützel <markus.muetzel@gmx.de>
parents:
27617
diff
changeset
|
173 std::wstring w_fn = octave::sys::u8_to_wstring (fn); |
27617
12f28f9368ec
* kpse.cc (READABLE): Use wide character file system API on Windows.
Markus Mützel <markus.muetzel@gmx.de>
parents:
27379
diff
changeset
|
174 |
12f28f9368ec
* kpse.cc (READABLE): Use wide character file system API on Windows.
Markus Mützel <markus.muetzel@gmx.de>
parents:
27379
diff
changeset
|
175 DWORD f_attr = GetFileAttributesW (w_fn.c_str ()); |
12f28f9368ec
* kpse.cc (READABLE): Use wide character file system API on Windows.
Markus Mützel <markus.muetzel@gmx.de>
parents:
27379
diff
changeset
|
176 |
12f28f9368ec
* kpse.cc (READABLE): Use wide character file system API on Windows.
Markus Mützel <markus.muetzel@gmx.de>
parents:
27379
diff
changeset
|
177 return (f_attr != 0xFFFFFFFF && ! (f_attr & FILE_ATTRIBUTE_DIRECTORY)); |
12f28f9368ec
* kpse.cc (READABLE): Use wide character file system API on Windows.
Markus Mützel <markus.muetzel@gmx.de>
parents:
27379
diff
changeset
|
178 |
4391 | 179 #else |
27617
12f28f9368ec
* kpse.cc (READABLE): Use wide character file system API on Windows.
Markus Mützel <markus.muetzel@gmx.de>
parents:
27379
diff
changeset
|
180 |
21865 | 181 bool retval = false; |
182 | |
4393 | 183 const char *t = fn.c_str (); |
21865 | 184 |
21910
4d723ba06b4a
provide wrappers for some unistd.h functions
John W. Eaton <jwe@octave.org>
parents:
21887
diff
changeset
|
185 if (octave_access_wrapper (t, octave_access_r_ok ()) == 0) |
21865 | 186 { |
187 octave::sys::file_stat fs (fn); | |
188 | |
189 retval = fs && ! fs.is_dir (); | |
190 } | |
191 | |
192 return retval; | |
27617
12f28f9368ec
* kpse.cc (READABLE): Use wide character file system API on Windows.
Markus Mützel <markus.muetzel@gmx.de>
parents:
27379
diff
changeset
|
193 |
12f28f9368ec
* kpse.cc (READABLE): Use wide character file system API on Windows.
Markus Mützel <markus.muetzel@gmx.de>
parents:
27379
diff
changeset
|
194 #endif |
4391 | 195 } |
196 | |
197 /* POSIX invented the brain-damage of not necessarily truncating | |
198 filename components; the system's behavior is defined by the value of | |
199 the symbol _POSIX_NO_TRUNC, but you can't change it dynamically! | |
200 | |
201 Generic const return warning. See extend-fname.c. */ | |
202 | |
4393 | 203 static std::string |
204 kpse_readable_file (const std::string& name) | |
4391 | 205 { |
4393 | 206 std::string ret; |
4391 | 207 |
21865 | 208 if (READABLE (name)) |
4391 | 209 { |
4393 | 210 ret = name; |
4391 | 211 |
21724
aba2e6293dd8
use "#if ..." consistently instead of "#ifdef" and "#ifndef"
John W. Eaton <jwe@octave.org>
parents:
21690
diff
changeset
|
212 #if defined (ENAMETOOLONG) |
4391 | 213 } |
214 else if (errno == ENAMETOOLONG) | |
215 { | |
216 ret = kpse_truncate_filename (name); | |
217 | |
218 /* Perhaps some other error will occur with the truncated name, | |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
219 so let's call access again. */ |
4391 | 220 |
21865 | 221 if (! READABLE (ret)) |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
222 { |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
223 /* Failed. */ |
21017
93748bcaec17
maint: Replace emtpy 'std::string ()' calls with "".
Rik <rik@octave.org>
parents:
20955
diff
changeset
|
224 ret = ""; |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
225 } |
4391 | 226 #endif /* ENAMETOOLONG */ |
227 | |
228 } | |
229 else | |
230 { | |
231 /* Some other error. */ | |
232 if (errno == EACCES) | |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
233 { |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
234 /* Maybe warn them if permissions are bad. */ |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
235 perror (name.c_str ()); |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
236 } |
4393 | 237 |
21017
93748bcaec17
maint: Replace emtpy 'std::string ()' calls with "".
Rik <rik@octave.org>
parents:
20955
diff
changeset
|
238 ret = ""; |
4391 | 239 } |
240 | |
241 return ret; | |
242 } | |
243 | |
244 static bool | |
245 kpse_absolute_p (const std::string& filename, int relative_ok) | |
246 { | |
21865 | 247 return (octave::sys::env::absolute_pathname (filename) |
248 || (relative_ok | |
249 && octave::sys::env::rooted_relative_pathname (filename))); | |
4391 | 250 } |
251 | |
4378 | 252 /* The very first search is for texmf.cnf, called when someone tries to |
253 initialize the TFM path or whatever. init_path calls kpse_cnf_get | |
254 which calls kpse_all_path_search to find all the texmf.cnf's. We | |
255 need to do various special things in this case, since we obviously | |
256 don't yet have the configuration files when we're searching for the | |
257 configuration files. */ | |
258 static bool first_search = true; | |
259 | |
21868
e2796ea8feac
* kpse.cc: Use iostream for debug messages.
John W. Eaton <jwe@octave.org>
parents:
21867
diff
changeset
|
260 /* This function is called after every search. */ |
4378 | 261 |
262 static void | |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
263 log_search (const std::list<std::string>& filenames) |
4378 | 264 { |
21868
e2796ea8feac
* kpse.cc: Use iostream for debug messages.
John W. Eaton <jwe@octave.org>
parents:
21867
diff
changeset
|
265 if (KPSE_DEBUG_P (KPSE_DEBUG_SEARCH)) |
4391 | 266 { |
23433
c9fab0bc983e
maint: Use convention 'int& x' for naming references.
Rik <rik@octave.org>
parents:
23220
diff
changeset
|
267 for (const auto& filename : filenames) |
22061
737b1d9d7ee3
use octave::sys::time instead of C library time function
John W. Eaton <jwe@octave.org>
parents:
21979
diff
changeset
|
268 { |
737b1d9d7ee3
use octave::sys::time instead of C library time function
John W. Eaton <jwe@octave.org>
parents:
21979
diff
changeset
|
269 octave::sys::time now; |
23807
336f89b6208b
Use character literals 'c' rather than string literals "c" when possible.
Rik <rik@octave.org>
parents:
23450
diff
changeset
|
270 std::cerr << now.unix_time () << ' ' << filename << std::endl; |
22061
737b1d9d7ee3
use octave::sys::time instead of C library time function
John W. Eaton <jwe@octave.org>
parents:
21979
diff
changeset
|
271 } |
4378 | 272 } |
273 } | |
4392 | 274 |
4378 | 275 /* Concatenate each element in DIRS with NAME (assume each ends with a |
276 /, to save time). If SEARCH_ALL is false, return the first readable | |
277 regular file. Else continue to search for more. In any case, if | |
278 none, return a list containing just NULL. | |
279 | |
280 We keep a single buffer for the potential filenames and reallocate | |
281 only when necessary. I'm not sure it's noticeably faster, but it | |
282 does seem cleaner. (We do waste a bit of space in the return | |
283 value, though, since we don't shrink it to the final size returned.) */ | |
284 | |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
285 static std::list<std::string> |
21873
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
286 dir_search (const std::string& dir, const std::string& name, |
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
287 bool search_all) |
4378 | 288 { |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
289 std::list<std::string> ret; |
4378 | 290 |
21873
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
291 std::string potential = dir + name; |
4393 | 292 |
21873
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
293 std::string tmp = kpse_readable_file (potential); |
4393 | 294 |
21873
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
295 if (! tmp.empty ()) |
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
296 { |
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
297 ret.push_back (potential); |
4391 | 298 |
21873
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
299 if (! search_all) |
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
300 return ret; |
4378 | 301 } |
4391 | 302 |
4378 | 303 return ret; |
304 } | |
4392 | 305 |
4378 | 306 /* This is called when NAME is absolute or explicitly relative; if it's |
307 readable, return (a list containing) it; otherwise, return NULL. */ | |
308 | |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
309 static std::list<std::string> |
4393 | 310 absolute_search (const std::string& name) |
4378 | 311 { |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
312 std::list<std::string> ret_list; |
4393 | 313 std::string found = kpse_readable_file (name); |
4391 | 314 |
15466
d174210ce1ec
use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents:
14155
diff
changeset
|
315 /* Add 'found' to the return list even if it's null; that tells |
4378 | 316 the caller we didn't find anything. */ |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
317 ret_list.push_back (found); |
4391 | 318 |
4378 | 319 return ret_list; |
320 } | |
4392 | 321 |
4378 | 322 /* This is the hard case -- look for NAME in PATH. If ALL is false, |
323 return the first file found. Otherwise, search all elements of PATH. */ | |
324 | |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
325 static std::list<std::string> |
21884
e8a8cb1a7258
eliminate unused parameter in kpse functions
John W. Eaton <jwe@octave.org>
parents:
21883
diff
changeset
|
326 path_search (const std::string& path, const std::string& name, bool all) |
4378 | 327 { |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
328 std::list<std::string> ret_list; |
4378 | 329 bool done = false; |
4390 | 330 |
8021 | 331 for (kpse_path_iterator pi (path); ! done && pi != std::string::npos; pi++) |
4390 | 332 { |
4394 | 333 std::string elt = *pi; |
334 | |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
335 std::list<std::string> found; |
4390 | 336 |
337 /* Do not touch the device if present */ | |
338 if (NAME_BEGINS_WITH_DEVICE (elt)) | |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
339 { |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
340 while (elt.length () > 3 |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
341 && IS_DIR_SEP (elt[2]) && IS_DIR_SEP (elt[3])) |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
342 { |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
343 elt[2] = elt[1]; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
344 elt[1] = elt[0]; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
345 elt = elt.substr (1); |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
346 } |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
347 } |
4390 | 348 else |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
349 { |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
350 /* We never want to search the whole disk. */ |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
351 while (elt.length () > 1 |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
352 && IS_DIR_SEP (elt[0]) && IS_DIR_SEP (elt[1])) |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
353 elt = elt.substr (1); |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
354 } |
4391 | 355 |
21872 | 356 /* Our caller (search), also tests first_search, and does |
357 the resetting. */ | |
21865 | 358 if (first_search) |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
359 found = std::list<std::string> (); |
21865 | 360 |
361 /* Search the filesystem. */ | |
362 | |
363 if (found.empty ()) | |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
364 { |
21873
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
365 std::string dir = kpse_element_dir (elt); |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
366 |
21873
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
367 if (! dir.empty ()) |
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
368 found = dir_search (dir, name, all); |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
369 } |
4390 | 370 |
371 /* Did we find anything anywhere? */ | |
372 if (! found.empty ()) | |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
373 { |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
374 if (all) |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
375 ret_list.splice (ret_list.end (), found); |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
376 else |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
377 { |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
378 ret_list.push_back (found.front ()); |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
379 done = true; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
380 } |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
381 } |
4378 | 382 } |
383 | |
384 return ret_list; | |
4390 | 385 } |
4392 | 386 |
26175
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
387 /* If NAME has a leading ~ or ~user, Unix-style, expand it to the user's |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
388 home directory, and return a new malloced string. If no ~, or no |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
389 <pwd.h>, just return NAME. */ |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
390 |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
391 static std::string |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
392 kpse_tilde_expand (const std::string& name) |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
393 { |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
394 std::string expansion; |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
395 |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
396 /* If no leading tilde, do nothing. */ |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
397 if (name.empty () || name[0] != '~') |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
398 { |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
399 expansion = name; |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
400 |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
401 /* If a bare tilde, return the home directory or '.'. (Very |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
402 unlikely that the directory name will do anyone any good, but |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
403 ... */ |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
404 } |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
405 else if (name.length () == 1) |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
406 { |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
407 expansion = octave::sys::env::get_home_directory (); |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
408 |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
409 if (expansion.empty ()) |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
410 expansion = "."; |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
411 |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
412 /* If '~/', remove any trailing / or replace leading // in $HOME. |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
413 Should really check for doubled intermediate slashes, too. */ |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
414 } |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
415 else if (IS_DIR_SEP (name[1])) |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
416 { |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
417 unsigned c = 1; |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
418 std::string home = octave::sys::env::get_home_directory (); |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
419 |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
420 if (home.empty ()) |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
421 home = "."; |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
422 |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
423 size_t home_len = home.length (); |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
424 |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
425 /* handle leading // */ |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
426 if (home_len > 1 && IS_DIR_SEP (home[0]) && IS_DIR_SEP (home[1])) |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
427 home = home.substr (1); |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
428 |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
429 /* omit / after ~ */ |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
430 if (IS_DIR_SEP (home[home_len - 1])) |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
431 c++; |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
432 |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
433 expansion = home + name.substr (c); |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
434 |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
435 /* If '~user' or '~user/', look up user in the passwd database (but |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
436 OS/2 doesn't have this concept. */ |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
437 } |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
438 else |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
439 #if defined (HAVE_PWD_H) |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
440 { |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
441 unsigned c = 2; |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
442 |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
443 /* find user name */ |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
444 while (name.length () > c && ! IS_DIR_SEP (name[c])) |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
445 c++; |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
446 |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
447 std::string user = name.substr (1, c-1); |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
448 |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
449 /* We only need the cast here for (deficient) systems |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
450 which do not declare 'getpwnam' in <pwd.h>. */ |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
451 octave::sys::password p = octave::sys::password::getpwnam (user); |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
452 |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
453 /* If no such user, just use '.'. */ |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
454 std::string home = (p ? p.dir () : "."); |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
455 |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
456 if (home.empty ()) |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
457 home = "."; |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
458 |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
459 /* handle leading // */ |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
460 if (home.length () > 1 && IS_DIR_SEP (home[0]) && IS_DIR_SEP (home[1])) |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
461 home = home.substr (1); |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
462 |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
463 /* If HOME ends in /, omit the / after ~user. */ |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
464 if (name.length () > c && IS_DIR_SEP (home.back ())) |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
465 c++; |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
466 |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
467 expansion = (name.length () > c ? home : home + name.substr (c)); |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
468 } |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
469 #else /* not HAVE_PWD_H */ |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
470 expansion = name; |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
471 #endif /* not HAVE_PWD_H */ |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
472 |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
473 return expansion; |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
474 } |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
475 |
4378 | 476 /* Search PATH for ORIGINAL_NAME. If ALL is false, or ORIGINAL_NAME is |
477 absolute_p, check ORIGINAL_NAME itself. Otherwise, look at each | |
478 element of PATH for the first readable ORIGINAL_NAME. | |
4391 | 479 |
4378 | 480 Always return a list; if no files are found, the list will |
481 contain just NULL. If ALL is true, the list will be | |
482 terminated with NULL. */ | |
483 | |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
484 static std::list<std::string> |
4390 | 485 search (const std::string& path, const std::string& original_name, |
21884
e8a8cb1a7258
eliminate unused parameter in kpse functions
John W. Eaton <jwe@octave.org>
parents:
21883
diff
changeset
|
486 bool all) |
4378 | 487 { |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
488 std::list<std::string> ret_list; |
4378 | 489 bool absolute_p; |
490 | |
26175
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
491 /* Make a leading ~ count as an absolute filename. */ |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
492 std::string name = kpse_tilde_expand (original_name); |
4391 | 493 |
4378 | 494 /* If the first name is absolute or explicitly relative, no need to |
495 consider PATH at all. */ | |
496 absolute_p = kpse_absolute_p (name, true); | |
4391 | 497 |
4378 | 498 if (KPSE_DEBUG_P (KPSE_DEBUG_SEARCH)) |
21868
e2796ea8feac
* kpse.cc: Use iostream for debug messages.
John W. Eaton <jwe@octave.org>
parents:
21867
diff
changeset
|
499 std::cerr << "kdebug: start search (file=" << name |
e2796ea8feac
* kpse.cc: Use iostream for debug messages.
John W. Eaton <jwe@octave.org>
parents:
21867
diff
changeset
|
500 << ", find_all=" << all << ", path=" << path << ")." |
e2796ea8feac
* kpse.cc: Use iostream for debug messages.
John W. Eaton <jwe@octave.org>
parents:
21867
diff
changeset
|
501 << std::endl; |
4378 | 502 |
503 /* Find the file(s). */ | |
21884
e8a8cb1a7258
eliminate unused parameter in kpse functions
John W. Eaton <jwe@octave.org>
parents:
21883
diff
changeset
|
504 ret_list = (absolute_p |
e8a8cb1a7258
eliminate unused parameter in kpse functions
John W. Eaton <jwe@octave.org>
parents:
21883
diff
changeset
|
505 ? absolute_search (name) |
e8a8cb1a7258
eliminate unused parameter in kpse functions
John W. Eaton <jwe@octave.org>
parents:
21883
diff
changeset
|
506 : path_search (path, name, all)); |
4391 | 507 |
4378 | 508 /* The very first search is for texmf.cnf. We can't log that, since |
509 we want to allow setting TEXMFLOG in texmf.cnf. */ | |
4391 | 510 if (first_search) |
511 { | |
512 first_search = false; | |
513 } | |
514 else | |
515 { | |
516 /* Record the filenames we found, if desired. And wrap them in a | |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
517 debugging line if we're doing that. */ |
4391 | 518 |
519 if (KPSE_DEBUG_P (KPSE_DEBUG_SEARCH)) | |
21868
e2796ea8feac
* kpse.cc: Use iostream for debug messages.
John W. Eaton <jwe@octave.org>
parents:
21867
diff
changeset
|
520 std::cerr << "kdebug: search (" << original_name << ") =>"; |
4391 | 521 |
522 log_search (ret_list); | |
523 | |
524 if (KPSE_DEBUG_P (KPSE_DEBUG_SEARCH)) | |
21868
e2796ea8feac
* kpse.cc: Use iostream for debug messages.
John W. Eaton <jwe@octave.org>
parents:
21867
diff
changeset
|
525 std::cerr << std::endl; |
4391 | 526 } |
4378 | 527 |
4390 | 528 return ret_list; |
4378 | 529 } |
4392 | 530 |
4378 | 531 /* Search PATH for the first NAME. */ |
532 | |
26175
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
533 /* Perform tilde expansion on NAME. If the result is an absolute or |
4399 | 534 explicitly relative filename, check whether it is a readable |
535 (regular) file. | |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11501
diff
changeset
|
536 |
4399 | 537 Otherwise, look in each of the directories specified in PATH (also do |
21865 | 538 tilde and variable expansion on elements in PATH). |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11501
diff
changeset
|
539 |
21751
b571fc85953f
maint: Use two spaces after period to indicate sentence break.
Rik <rik@octave.org>
parents:
21732
diff
changeset
|
540 The caller must expand PATH. This is because it makes more sense to |
4399 | 541 do this once, in advance, instead of for every search using it. |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11501
diff
changeset
|
542 |
4399 | 543 In any case, return the complete filename if found, otherwise NULL. */ |
544 | |
21883
02add2f597a1
compile kpse.cc separately from pathsearch.cc
John W. Eaton <jwe@octave.org>
parents:
21882
diff
changeset
|
545 std::string |
21884
e8a8cb1a7258
eliminate unused parameter in kpse functions
John W. Eaton <jwe@octave.org>
parents:
21883
diff
changeset
|
546 kpse_path_search (const std::string& path, const std::string& name) |
4378 | 547 { |
21884
e8a8cb1a7258
eliminate unused parameter in kpse functions
John W. Eaton <jwe@octave.org>
parents:
21883
diff
changeset
|
548 std::list<std::string> ret_list = search (path, name, false); |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
549 |
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
550 return ret_list.empty () ? "" : ret_list.front (); |
4378 | 551 } |
552 | |
15466
d174210ce1ec
use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents:
14155
diff
changeset
|
553 /* Like 'kpse_path_search' with MUST_EXIST true, but return a list of |
4399 | 554 all the filenames (or NULL if none), instead of taking the first. */ |
555 | |
21883
02add2f597a1
compile kpse.cc separately from pathsearch.cc
John W. Eaton <jwe@octave.org>
parents:
21882
diff
changeset
|
556 std::list<std::string> |
4390 | 557 kpse_all_path_search (const std::string& path, const std::string& name) |
4378 | 558 { |
21884
e8a8cb1a7258
eliminate unused parameter in kpse functions
John W. Eaton <jwe@octave.org>
parents:
21883
diff
changeset
|
559 return search (path, name, true); |
4378 | 560 } |
4392 | 561 |
4378 | 562 /* This is the hard case -- look in each element of PATH for each |
563 element of NAMES. If ALL is false, return the first file found. | |
564 Otherwise, search all elements of PATH. */ | |
565 | |
21883
02add2f597a1
compile kpse.cc separately from pathsearch.cc
John W. Eaton <jwe@octave.org>
parents:
21882
diff
changeset
|
566 std::list<std::string> |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
567 path_find_first_of (const std::string& path, |
21884
e8a8cb1a7258
eliminate unused parameter in kpse functions
John W. Eaton <jwe@octave.org>
parents:
21883
diff
changeset
|
568 const std::list<std::string>& names, bool all) |
4378 | 569 { |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
570 std::list<std::string> ret_list; |
4378 | 571 bool done = false; |
4390 | 572 |
8021 | 573 for (kpse_path_iterator pi (path); ! done && pi != std::string::npos; pi++) |
4378 | 574 { |
4394 | 575 std::string elt = *pi; |
576 | |
21873
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
577 std::string dir; |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
578 std::list<std::string> found; |
4378 | 579 |
580 /* Do not touch the device if present */ | |
581 | |
582 if (NAME_BEGINS_WITH_DEVICE (elt)) | |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
583 { |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
584 while (elt.length () > 3 |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
585 && IS_DIR_SEP (elt[2]) && IS_DIR_SEP (elt[3])) |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
586 { |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
587 elt[2] = elt[1]; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
588 elt[1] = elt[0]; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
589 elt = elt.substr (1); |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
590 } |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
591 } |
4378 | 592 else |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
593 { |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
594 /* We never want to search the whole disk. */ |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
595 while (elt.length () > 1 |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
596 && IS_DIR_SEP (elt[0]) && IS_DIR_SEP (elt[1])) |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
597 elt = elt.substr (1); |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
598 } |
4378 | 599 |
600 /* We have to search one directory at a time. */ | |
21873
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
601 dir = kpse_element_dir (elt); |
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
602 |
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
603 if (! dir.empty ()) |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
604 { |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
605 for (auto it = names.cbegin (); it != names.cend () && ! done; it++) |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
606 { |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
607 std::string name = *it; |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
608 |
21872 | 609 /* Our caller (find_first_of), also tests first_search, |
610 and does the resetting. */ | |
21865 | 611 if (first_search) |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
612 found = std::list<std::string> (); |
21865 | 613 |
614 /* Search the filesystem. */ | |
615 | |
616 if (found.empty ()) | |
21873
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
617 found = dir_search (dir, name, all); |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
618 |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
619 /* Did we find anything anywhere? */ |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
620 if (! found.empty ()) |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
621 { |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
622 if (all) |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
623 ret_list.splice (ret_list.end (), found); |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
624 else |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
625 { |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
626 ret_list.push_back (found.front ()); |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
627 done = true; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
628 } |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
629 } |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
630 } |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
631 } |
4378 | 632 } |
633 | |
634 return ret_list; | |
4391 | 635 } |
4378 | 636 |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
637 static std::list<std::string> |
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
638 find_first_of (const std::string& path, const std::list<std::string>& names, |
21884
e8a8cb1a7258
eliminate unused parameter in kpse functions
John W. Eaton <jwe@octave.org>
parents:
21883
diff
changeset
|
639 bool all) |
4378 | 640 { |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
641 std::list<std::string> ret_list; |
4378 | 642 |
643 if (KPSE_DEBUG_P (KPSE_DEBUG_SEARCH)) | |
644 { | |
21884
e8a8cb1a7258
eliminate unused parameter in kpse functions
John W. Eaton <jwe@octave.org>
parents:
21883
diff
changeset
|
645 std::cerr << "kdebug: start find_first_of ("; |
4391 | 646 |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
647 for (auto p = names.cbegin (); p != names.cend (); p++) |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
648 { |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
649 if (p == names.cbegin ()) |
21868
e2796ea8feac
* kpse.cc: Use iostream for debug messages.
John W. Eaton <jwe@octave.org>
parents:
21867
diff
changeset
|
650 std::cerr << *p; |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
651 else |
21868
e2796ea8feac
* kpse.cc: Use iostream for debug messages.
John W. Eaton <jwe@octave.org>
parents:
21867
diff
changeset
|
652 std::cerr << ", " << *p; |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
653 } |
4391 | 654 |
23807
336f89b6208b
Use character literals 'c' rather than string literals "c" when possible.
Rik <rik@octave.org>
parents:
23450
diff
changeset
|
655 std::cerr << "), path=" << path << '.' << std::endl; |
4378 | 656 } |
657 | |
23433
c9fab0bc983e
maint: Use convention 'int& x' for naming references.
Rik <rik@octave.org>
parents:
23220
diff
changeset
|
658 for (const auto& name : names) |
4409 | 659 { |
660 if (kpse_absolute_p (name, true)) | |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
661 { |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
662 /* If the name is absolute or explicitly relative, no need |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
663 to consider PATH at all. If we find something, then we |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
664 are done. */ |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
665 |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
666 ret_list = absolute_search (name); |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
667 |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
668 if (! ret_list.empty ()) |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
669 return ret_list; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
670 } |
4409 | 671 } |
672 | |
4378 | 673 /* Find the file. */ |
21884
e8a8cb1a7258
eliminate unused parameter in kpse functions
John W. Eaton <jwe@octave.org>
parents:
21883
diff
changeset
|
674 ret_list = path_find_first_of (path, names, all); |
4378 | 675 |
676 /* The very first search is for texmf.cnf. We can't log that, since | |
677 we want to allow setting TEXMFLOG in texmf.cnf. */ | |
4391 | 678 if (first_search) |
679 { | |
680 first_search = false; | |
681 } | |
682 else | |
683 { | |
684 /* Record the filenames we found, if desired. And wrap them in a | |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
685 debugging line if we're doing that. */ |
4391 | 686 |
687 if (KPSE_DEBUG_P (KPSE_DEBUG_SEARCH)) | |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
688 { |
21868
e2796ea8feac
* kpse.cc: Use iostream for debug messages.
John W. Eaton <jwe@octave.org>
parents:
21867
diff
changeset
|
689 std::cerr << "kdebug: find_first_of ("; |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
690 |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
691 for (auto p = names.cbegin (); p != names.cend (); p++) |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
692 { |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
693 if (p == names.cbegin ()) |
24199
2ac103974d00
Remove extra space between scope operator '::' and function.
Rik <rik@octave.org>
parents:
23829
diff
changeset
|
694 std::cerr << *p; |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
695 else |
21868
e2796ea8feac
* kpse.cc: Use iostream for debug messages.
John W. Eaton <jwe@octave.org>
parents:
21867
diff
changeset
|
696 std::cerr << ", " << *p; |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
697 } |
10411 | 698 |
21868
e2796ea8feac
* kpse.cc: Use iostream for debug messages.
John W. Eaton <jwe@octave.org>
parents:
21867
diff
changeset
|
699 std::cerr << ") =>"; |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
700 } |
4391 | 701 |
702 log_search (ret_list); | |
703 | |
704 if (KPSE_DEBUG_P (KPSE_DEBUG_SEARCH)) | |
21887
525b46f1d48f
* kpse.cc (find_first_of): Use iostream instead of stdio for debug message.
John W. Eaton <jwe@octave.org>
parents:
21884
diff
changeset
|
705 std::cerr << std::endl; |
4391 | 706 } |
4378 | 707 |
4390 | 708 return ret_list; |
4378 | 709 } |
710 | |
711 /* Search each element of PATH for each element of NAMES. Return the | |
712 first one found. */ | |
713 | |
4399 | 714 /* Search each element of PATH for each element in the list of NAMES. |
715 Return the first one found. */ | |
716 | |
21883
02add2f597a1
compile kpse.cc separately from pathsearch.cc
John W. Eaton <jwe@octave.org>
parents:
21882
diff
changeset
|
717 std::string |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
718 kpse_path_find_first_of (const std::string& path, |
21884
e8a8cb1a7258
eliminate unused parameter in kpse functions
John W. Eaton <jwe@octave.org>
parents:
21883
diff
changeset
|
719 const std::list<std::string>& names) |
4378 | 720 { |
21884
e8a8cb1a7258
eliminate unused parameter in kpse functions
John W. Eaton <jwe@octave.org>
parents:
21883
diff
changeset
|
721 std::list<std::string> ret_list = find_first_of (path, names, false); |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
722 |
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
723 return ret_list.empty () ? "" : ret_list.front (); |
4378 | 724 } |
725 | |
726 /* Search each element of PATH for each element of NAMES and return a | |
727 list containing everything found, in the order found. */ | |
728 | |
15466
d174210ce1ec
use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents:
14155
diff
changeset
|
729 /* Like 'kpse_path_find_first_of' with MUST_EXIST true, but return a |
4399 | 730 list of all the filenames (or NULL if none), instead of taking the |
731 first. */ | |
732 | |
21883
02add2f597a1
compile kpse.cc separately from pathsearch.cc
John W. Eaton <jwe@octave.org>
parents:
21882
diff
changeset
|
733 std::list<std::string> |
4390 | 734 kpse_all_path_find_first_of (const std::string& path, |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
735 const std::list<std::string>& names) |
4378 | 736 { |
21884
e8a8cb1a7258
eliminate unused parameter in kpse functions
John W. Eaton <jwe@octave.org>
parents:
21883
diff
changeset
|
737 return find_first_of (path, names, true); |
4378 | 738 } |
739 | |
26175
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
740 /* Perform tilde expansion on each element of the path, and include |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
741 canonical directory names for only the the actually existing |
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
742 directories in the result. */ |
4399 | 743 |
21883
02add2f597a1
compile kpse.cc separately from pathsearch.cc
John W. Eaton <jwe@octave.org>
parents:
21882
diff
changeset
|
744 std::string |
4397 | 745 kpse_path_expand (const std::string& path) |
4378 | 746 { |
4392 | 747 std::string ret; |
26175
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
748 unsigned len = 0; |
4392 | 749 |
4378 | 750 /* Now expand each of the path elements, printing the results */ |
26175
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
751 for (kpse_path_iterator pi (path); pi != std::string::npos; pi++) |
4391 | 752 { |
26175
6e1a800dd365
eliminate brace and variable expansion in PATH search code
John W. Eaton <jwe@octave.org>
parents:
26174
diff
changeset
|
753 std::string elt = kpse_tilde_expand (*pi); |
4394 | 754 |
21873
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
755 std::string dir; |
4391 | 756 |
757 /* Do not touch the device if present */ | |
758 if (NAME_BEGINS_WITH_DEVICE (elt)) | |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
759 { |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
760 while (elt.length () > 3 |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
761 && IS_DIR_SEP (elt[2]) && IS_DIR_SEP (elt[3])) |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
762 { |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
763 elt[2] = elt[1]; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
764 elt[1] = elt[0]; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
765 elt = elt.substr (1); |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
766 } |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
767 } |
4391 | 768 else |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
769 { |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
770 /* We never want to search the whole disk. */ |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
771 while (elt.length () > 1 |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
772 && IS_DIR_SEP (elt[0]) && IS_DIR_SEP (elt[1])) |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
773 elt = elt.substr (1); |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
774 } |
4378 | 775 |
4394 | 776 /* Search the disk for all dirs in the component specified. |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
777 Be faster to check the database, but this is more reliable. */ |
21873
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
778 dir = kpse_element_dir (elt); |
4394 | 779 |
21873
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
780 size_t dirlen = dir.length (); |
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
781 |
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
782 if (dirlen > 0) |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
783 { |
21873
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
784 ret += dir; |
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
785 len += dirlen; |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
786 |
21873
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
787 /* Retain trailing slash if that's the root directory. */ |
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
788 if (dirlen == 1 |
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
789 || (dirlen == 3 && NAME_BEGINS_WITH_DEVICE (dir) |
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
790 && IS_DIR_SEP (dir[2]))) |
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
791 { |
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
792 ret += ENV_SEP_STRING; |
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
793 len++; |
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
794 } |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
795 |
21873
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
796 ret[len-1] = ENV_SEP; |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
797 } |
4378 | 798 } |
4391 | 799 |
23812
057a894914df
Use C++11 string fcns back() and pop_back() to simplify code.
Rik <rik@octave.org>
parents:
23807
diff
changeset
|
800 if (! ret.empty ()) |
057a894914df
Use C++11 string fcns back() and pop_back() to simplify code.
Rik <rik@octave.org>
parents:
23807
diff
changeset
|
801 ret.pop_back (); |
4391 | 802 |
4378 | 803 return ret; |
804 } | |
4392 | 805 |
21751
b571fc85953f
maint: Use two spaces after period to indicate sentence break.
Rik <rik@octave.org>
parents:
21732
diff
changeset
|
806 /* braces.c -- code for doing word expansion in curly braces. Taken from |
16768 | 807 bash 1.14.5. [And subsequently modified for kpatshea.] |
808 | |
809 Copyright (C) 1987,1991 Free Software Foundation, Inc. */ | |
4378 | 810 |
4391 | 811 #define brace_whitespace(c) (! (c) || (c) == ' ' || (c) == '\t' || (c) == '\n') |
4378 | 812 |
813 /* Basic idea: | |
814 | |
815 Segregate the text into 3 sections: preamble (stuff before an open brace), | |
816 postamble (stuff after the matching close brace) and amble (stuff after | |
817 preamble, and before postamble). Expand amble, and then tack on the | |
818 expansions to preamble. Expand postamble, and tack on the expansions to | |
4391 | 819 the result so far. */ |
4378 | 820 |
4397 | 821 /* Return a new array of strings which is the result of appending each |
822 string in ARR2 to each string in ARR1. The resultant array is | |
823 len (arr1) * len (arr2) long. For convenience, ARR1 (and its contents) | |
824 are free ()'ed. ARR1 can be NULL, in that case, a new version of ARR2 | |
825 is returned. */ | |
826 | |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
827 static std::list<std::string> |
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
828 array_concat (const std::list<std::string>& arr1, |
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
829 const std::list<std::string>& arr2) |
4378 | 830 { |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
831 std::list<std::string> result; |
4397 | 832 |
833 if (arr1.empty ()) | |
834 result = arr2; | |
835 else if (arr2.empty ()) | |
836 result = arr1; | |
837 else | |
838 { | |
23433
c9fab0bc983e
maint: Use convention 'int& x' for naming references.
Rik <rik@octave.org>
parents:
23220
diff
changeset
|
839 for (const auto& elt_2 : arr2) |
c9fab0bc983e
maint: Use convention 'int& x' for naming references.
Rik <rik@octave.org>
parents:
23220
diff
changeset
|
840 for (const auto& elt_1 : arr1) |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
841 result.push_back (elt_1 + elt_2); |
4397 | 842 } |
843 | |
844 return result; | |
4378 | 845 } |
846 | |
4397 | 847 static int brace_gobbler (const std::string&, int&, int); |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
848 static std::list<std::string> expand_amble (const std::string&); |
4378 | 849 |
850 /* Return an array of strings; the brace expansion of TEXT. */ | |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
851 static std::list<std::string> |
4397 | 852 brace_expand (const std::string& text) |
4378 | 853 { |
854 /* Find the text of the preamble. */ | |
4397 | 855 int i = 0; |
856 int c = brace_gobbler (text, i, '{'); | |
857 | |
858 std::string preamble = text.substr (0, i); | |
859 | |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
860 std::list<std::string> result (1, preamble); |
4397 | 861 |
862 if (c == '{') | |
4378 | 863 { |
4397 | 864 /* Find the amble. This is the stuff inside this set of braces. */ |
865 int start = ++i; | |
866 c = brace_gobbler (text, i, '}'); | |
867 | |
868 /* What if there isn't a matching close brace? */ | |
869 if (! c) | |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
870 { |
19410
95c533ed464b
use warning IDs for all warnings in liboctave
John W. Eaton <jwe@octave.org>
parents:
18084
diff
changeset
|
871 (*current_liboctave_warning_with_id_handler) |
95c533ed464b
use warning IDs for all warnings in liboctave
John W. Eaton <jwe@octave.org>
parents:
18084
diff
changeset
|
872 ("Octave:pathsearch-syntax", |
95c533ed464b
use warning IDs for all warnings in liboctave
John W. Eaton <jwe@octave.org>
parents:
18084
diff
changeset
|
873 "%s: Unmatched {", text.c_str ()); |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
874 |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
875 result = std::list<std::string> (1, text); |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
876 } |
4397 | 877 else |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
878 { |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
879 std::string amble = text.substr (start, i-start); |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
880 result = array_concat (result, expand_amble (amble)); |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
881 |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
882 std::string postamble = text.substr (i+1); |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
883 result = array_concat (result, brace_expand (postamble)); |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
884 } |
4378 | 885 } |
886 | |
4397 | 887 return result; |
4378 | 888 } |
889 | |
4397 | 890 /* The character which is used to separate arguments. */ |
891 static int brace_arg_separator = ','; | |
892 | |
4378 | 893 /* Expand the text found inside of braces. We simply try to split the |
894 text at BRACE_ARG_SEPARATORs into separate strings. We then brace | |
895 expand each slot which needs it, until there are no more slots which | |
896 need it. */ | |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
897 static std::list<std::string> |
4397 | 898 expand_amble (const std::string& text) |
4378 | 899 { |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
900 std::list<std::string> result; |
4397 | 901 |
902 size_t text_len = text.length (); | |
903 size_t start; | |
904 int i, c; | |
905 | |
906 for (start = 0, i = 0, c = 1; c && start < text_len; start = ++i) | |
4378 | 907 { |
4397 | 908 int i0 = i; |
909 int c0 = brace_gobbler (text, i0, brace_arg_separator); | |
910 int i1 = i; | |
911 int c1 = brace_gobbler (text, i1, ENV_SEP); | |
4378 | 912 c = c0 | c1; |
913 i = (i0 < i1 ? i0 : i1); | |
914 | |
4397 | 915 std::string tem = text.substr (start, i-start); |
916 | |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
917 std::list<std::string> partial = brace_expand (tem); |
4397 | 918 |
919 if (result.empty ()) | |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
920 result = partial; |
4378 | 921 else |
21867
0cdfd6d230e6
use std::list<std::string> instead of string_vector in pathsearch functions
John W. Eaton <jwe@octave.org>
parents:
21865
diff
changeset
|
922 result.splice (result.end (), partial); |
4378 | 923 } |
4397 | 924 |
925 return result; | |
4378 | 926 } |
927 | |
21751
b571fc85953f
maint: Use two spaces after period to indicate sentence break.
Rik <rik@octave.org>
parents:
21732
diff
changeset
|
928 /* Start at INDEX, and skip characters in TEXT. Set INDEX to the |
4378 | 929 index of the character matching SATISFY. This understands about |
930 quoting. Return the character that caused us to stop searching; | |
931 this is either the same as SATISFY, or 0. */ | |
932 static int | |
4397 | 933 brace_gobbler (const std::string& text, int& indx, int satisfy) |
4378 | 934 { |
18084
8e056300994b
Follow coding convention of defining and initializing only 1 variable per line in liboctave.
Rik <rik@octave.org>
parents:
17769
diff
changeset
|
935 int c = 0; |
8e056300994b
Follow coding convention of defining and initializing only 1 variable per line in liboctave.
Rik <rik@octave.org>
parents:
17769
diff
changeset
|
936 int level = 0; |
8e056300994b
Follow coding convention of defining and initializing only 1 variable per line in liboctave.
Rik <rik@octave.org>
parents:
17769
diff
changeset
|
937 int quoted = 0; |
8e056300994b
Follow coding convention of defining and initializing only 1 variable per line in liboctave.
Rik <rik@octave.org>
parents:
17769
diff
changeset
|
938 int pass_next = 0; |
4397 | 939 |
940 size_t text_len = text.length (); | |
941 | |
942 size_t i = indx; | |
943 | |
944 for (; i < text_len; i++) | |
4378 | 945 { |
4397 | 946 c = text[i]; |
947 | |
4378 | 948 if (pass_next) |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
949 { |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
950 pass_next = 0; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
951 continue; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
952 } |
4378 | 953 |
954 /* A backslash escapes the next character. This allows backslash to | |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
955 escape the quote character in a double-quoted string. */ |
4378 | 956 if (c == '\\' && (quoted == 0 || quoted == '"' || quoted == '`')) |
957 { | |
958 pass_next = 1; | |
959 continue; | |
960 } | |
961 | |
962 if (quoted) | |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
963 { |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
964 if (c == quoted) |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
965 quoted = 0; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
966 continue; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
967 } |
4378 | 968 |
969 if (c == '"' || c == '\'' || c == '`') | |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
970 { |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
971 quoted = c; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
972 continue; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
973 } |
4391 | 974 |
20955
77f5591878bf
maint: Use '! expr' rather than '!expr' to conform to coding guidelines.
Rik <rik@octave.org>
parents:
20791
diff
changeset
|
975 if (c == satisfy && ! level && ! quoted) |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
976 { |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
977 /* We ignore an open brace surrounded by whitespace, and also |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
978 an open brace followed immediately by a close brace, that |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
979 was preceded with whitespace. */ |
19864
17d647821d61
maint: More cleanup of C++ code to follow Octave coding conventions.
John W. Eaton <jwe@octave.org>
parents:
19697
diff
changeset
|
980 if (c == '{' |
17d647821d61
maint: More cleanup of C++ code to follow Octave coding conventions.
John W. Eaton <jwe@octave.org>
parents:
19697
diff
changeset
|
981 && ((i == 0 || brace_whitespace (text[i-1])) |
17d647821d61
maint: More cleanup of C++ code to follow Octave coding conventions.
John W. Eaton <jwe@octave.org>
parents:
19697
diff
changeset
|
982 && (i+1 < text_len |
17d647821d61
maint: More cleanup of C++ code to follow Octave coding conventions.
John W. Eaton <jwe@octave.org>
parents:
19697
diff
changeset
|
983 && (brace_whitespace (text[i+1]) || text[i+1] == '}')))) |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
984 continue; |
15466
d174210ce1ec
use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents:
14155
diff
changeset
|
985 /* If this is being compiled as part of bash, ignore the '{' |
17769
49a5a4be04a1
maint: Use GNU style coding conventions for code in liboctave/
Rik <rik@octave.org>
parents:
17744
diff
changeset
|
986 in a '${ }' construct */ |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
987 if ((c != '{') || i == 0 || (text[i-1] != '$')) |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
988 break; |
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
989 } |
4378 | 990 |
991 if (c == '{') | |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
992 level++; |
4378 | 993 else if (c == '}' && level) |
10314
07ebe522dac2
untabify liboctave C++ sources
John W. Eaton <jwe@octave.org>
parents:
10182
diff
changeset
|
994 level--; |
4378 | 995 } |
996 | |
4397 | 997 indx = i; |
26084
8eae32b6bce0
Don't segfault for unmatched brace in PATH (bug #55013).
Rik <rik@octave.org>
parents:
25054
diff
changeset
|
998 c = (c == satisfy) ? c : 0; |
4397 | 999 return c; |
4378 | 1000 } |
1001 | |
4390 | 1002 /* Return true if FN is a directory or a symlink to a directory, |
1003 false if not. */ | |
1004 | |
1005 static bool | |
1006 dir_p (const std::string& fn) | |
1007 { | |
21865 | 1008 octave::sys::file_stat fs (fn); |
1009 | |
1010 return (fs && fs.is_dir ()); | |
4390 | 1011 } |
4391 | 1012 |
21873
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
1013 /* Given a path element ELT, return a the element with a trailing slash |
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
1014 or an empty string if the element is not a directory. |
11586
12df7854fa7c
strip trailing whitespace from source files
John W. Eaton <jwe@octave.org>
parents:
11501
diff
changeset
|
1015 |
4399 | 1016 It's up to the caller to expand ELT. This is because this routine is |
15466
d174210ce1ec
use ' instead of ` in error messages, warnings and most comments
John W. Eaton <jwe@octave.org>
parents:
14155
diff
changeset
|
1017 most likely only useful to be called from 'kpse_path_search', which |
4399 | 1018 has already assumed expansion has been done. */ |
1019 | |
21883
02add2f597a1
compile kpse.cc separately from pathsearch.cc
John W. Eaton <jwe@octave.org>
parents:
21882
diff
changeset
|
1020 std::string |
21873
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
1021 kpse_element_dir (const std::string& elt) |
4378 | 1022 { |
21873
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
1023 std::string ret; |
4378 | 1024 |
1025 /* If given nothing, return nothing. */ | |
4398 | 1026 if (elt.empty ()) |
21871
cab605836305
use std::list instead of custom list type in pathsearch code
John W. Eaton <jwe@octave.org>
parents:
21870
diff
changeset
|
1027 return ret; |
4378 | 1028 |
21873
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
1029 if (dir_p (elt)) |
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
1030 { |
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
1031 ret = elt; |
4378 | 1032 |
23812
057a894914df
Use C++11 string fcns back() and pop_back() to simplify code.
Rik <rik@octave.org>
parents:
23807
diff
changeset
|
1033 char last_char = ret.back (); |
21873
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
1034 |
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
1035 if (! (IS_DIR_SEP (last_char) || IS_DEVICE_SEP (last_char))) |
40195d04b17c
still more simplification of pathsearch
John W. Eaton <jwe@octave.org>
parents:
21872
diff
changeset
|
1036 ret += DIR_SEP_STRING; |
4378 | 1037 } |
1038 | |
1039 return ret; | |
1040 } |