]>
Commit | Line | Data |
---|---|---|
c801d85f | 1 | /////////////////////////////////////////////////////////////////////////////// |
88a7a4e1 | 2 | // Name: src/common/config.cpp |
5fe256de | 3 | // Purpose: implementation of wxConfigBase class |
c801d85f | 4 | // Author: Vadim Zeitlin |
ba7f9a90 | 5 | // Modified by: |
c801d85f KB |
6 | // Created: 07.04.98 |
7 | // RCS-ID: $Id$ | |
9d55bfef | 8 | // Copyright: (c) 1997 Karsten Ballueder Ballueder@usa.net |
c801d85f | 9 | // Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr> |
65571936 | 10 | // Licence: wxWindows licence |
c801d85f KB |
11 | /////////////////////////////////////////////////////////////////////////////// |
12 | ||
855e92a8 VZ |
13 | // ---------------------------------------------------------------------------- |
14 | // headers | |
15 | // ---------------------------------------------------------------------------- | |
c801d85f | 16 | |
9869734d | 17 | #include "wx/wxprec.h" |
c801d85f | 18 | |
88a7a4e1 WS |
19 | #ifdef __BORLANDC__ |
20 | #pragma hdrstop | |
c801d85f KB |
21 | #endif //__BORLANDC__ |
22 | ||
ecef04c2 VZ |
23 | #ifndef wxUSE_CONFIG_NATIVE |
24 | #define wxUSE_CONFIG_NATIVE 1 | |
25 | #endif | |
26 | ||
21709999 | 27 | #include "wx/config.h" |
88a7a4e1 WS |
28 | |
29 | #ifndef WX_PRECOMP | |
30 | #include "wx/intl.h" | |
e4db172a | 31 | #include "wx/log.h" |
670f9935 | 32 | #include "wx/app.h" |
de6185e2 | 33 | #include "wx/utils.h" |
aaa6d89a | 34 | #include "wx/arrstr.h" |
18680f86 | 35 | #include "wx/math.h" |
88a7a4e1 WS |
36 | #endif //WX_PRECOMP |
37 | ||
48c8a76b | 38 | #if wxUSE_CONFIG && ((wxUSE_FILE && wxUSE_TEXTFILE) || wxUSE_CONFIG_NATIVE) |
ce4169a4 | 39 | |
84281b92 | 40 | #include "wx/apptrait.h" |
9869734d | 41 | #include "wx/file.h" |
9869734d | 42 | |
9869734d | 43 | #include <stdlib.h> |
f6bcfd97 | 44 | #include <ctype.h> |
2ba41305 | 45 | #include <limits.h> // for INT_MAX |
384859f8 | 46 | #include <float.h> // for FLT_MAX |
855e92a8 VZ |
47 | |
48 | // ---------------------------------------------------------------------------- | |
49 | // global and class static variables | |
50 | // ---------------------------------------------------------------------------- | |
51 | ||
275bf4c1 | 52 | wxConfigBase *wxConfigBase::ms_pConfig = NULL; |
c9d59ee7 | 53 | bool wxConfigBase::ms_bAutoCreate = true; |
c801d85f KB |
54 | |
55 | // ============================================================================ | |
56 | // implementation | |
57 | // ============================================================================ | |
58 | ||
84281b92 VZ |
59 | // ---------------------------------------------------------------------------- |
60 | // wxAppTraitsBase | |
61 | // ---------------------------------------------------------------------------- | |
62 | ||
63 | wxConfigBase *wxAppTraitsBase::CreateConfig() | |
64 | { | |
65 | return new | |
66 | #if defined(__WXMSW__) && wxUSE_CONFIG_NATIVE | |
67 | wxRegConfig(wxTheApp->GetAppName(), wxTheApp->GetVendorName()); | |
68 | #elif defined(__WXPALMOS__) && wxUSE_CONFIG_NATIVE | |
69 | wxPrefConfig(wxTheApp->GetAppName()); | |
70 | #else // either we're under Unix or wish to use files even under Windows | |
71 | wxFileConfig(wxTheApp->GetAppName()); | |
72 | #endif | |
73 | } | |
74 | ||
c801d85f | 75 | // ---------------------------------------------------------------------------- |
5fe256de | 76 | // wxConfigBase |
c801d85f | 77 | // ---------------------------------------------------------------------------- |
c4ec0ce8 | 78 | IMPLEMENT_ABSTRACT_CLASS(wxConfigBase, wxObject) |
c801d85f | 79 | |
f6bcfd97 BP |
80 | // Not all args will always be used by derived classes, but including them all |
81 | // in each class ensures compatibility. | |
82 | wxConfigBase::wxConfigBase(const wxString& appName, | |
83 | const wxString& vendorName, | |
84 | const wxString& WXUNUSED(localFilename), | |
85 | const wxString& WXUNUSED(globalFilename), | |
86 | long style) | |
87 | : m_appName(appName), m_vendorName(vendorName), m_style(style) | |
18244936 | 88 | { |
c9d59ee7 WS |
89 | m_bExpandEnvVars = true; |
90 | m_bRecordDefaults = false; | |
18244936 JS |
91 | } |
92 | ||
5e233068 WS |
93 | wxConfigBase::~wxConfigBase() |
94 | { | |
95 | // required here for Darwin | |
96 | } | |
97 | ||
5fe256de | 98 | wxConfigBase *wxConfigBase::Set(wxConfigBase *pConfig) |
855e92a8 | 99 | { |
5fe256de | 100 | wxConfigBase *pOld = ms_pConfig; |
855e92a8 VZ |
101 | ms_pConfig = pConfig; |
102 | return pOld; | |
103 | } | |
104 | ||
5fe256de | 105 | wxConfigBase *wxConfigBase::Create() |
855e92a8 | 106 | { |
275bf4c1 | 107 | if ( ms_bAutoCreate && ms_pConfig == NULL ) { |
84281b92 | 108 | wxAppTraits * const traits = wxTheApp ? wxTheApp->GetTraits() : NULL; |
9a83f860 | 109 | wxCHECK_MSG( traits, NULL, wxT("create wxApp before calling this") ); |
84281b92 VZ |
110 | |
111 | ms_pConfig = traits->CreateConfig(); | |
275bf4c1 VZ |
112 | } |
113 | ||
114 | return ms_pConfig; | |
855e92a8 VZ |
115 | } |
116 | ||
2ba41305 VZ |
117 | // ---------------------------------------------------------------------------- |
118 | // wxConfigBase reading entries | |
119 | // ---------------------------------------------------------------------------- | |
18244936 | 120 | |
2ba41305 VZ |
121 | // implement both Read() overloads for the given type in terms of DoRead() |
122 | #define IMPLEMENT_READ_FOR_TYPE(name, type, deftype, extra) \ | |
123 | bool wxConfigBase::Read(const wxString& key, type *val) const \ | |
124 | { \ | |
9a83f860 | 125 | wxCHECK_MSG( val, false, wxT("wxConfig::Read(): NULL parameter") ); \ |
2ba41305 | 126 | \ |
2b5f62a0 | 127 | if ( !DoRead##name(key, val) ) \ |
c9d59ee7 | 128 | return false; \ |
2b5f62a0 VZ |
129 | \ |
130 | *val = extra(*val); \ | |
131 | \ | |
c9d59ee7 | 132 | return true; \ |
2ba41305 VZ |
133 | } \ |
134 | \ | |
135 | bool wxConfigBase::Read(const wxString& key, \ | |
136 | type *val, \ | |
137 | deftype defVal) const \ | |
138 | { \ | |
9a83f860 | 139 | wxCHECK_MSG( val, false, wxT("wxConfig::Read(): NULL parameter") ); \ |
2ba41305 | 140 | \ |
2b5f62a0 VZ |
141 | bool read = DoRead##name(key, val); \ |
142 | if ( !read ) \ | |
2ba41305 | 143 | { \ |
2b5f62a0 VZ |
144 | if ( IsRecordingDefaults() ) \ |
145 | { \ | |
146 | ((wxConfigBase *)this)->DoWrite##name(key, defVal); \ | |
147 | } \ | |
148 | \ | |
149 | *val = defVal; \ | |
2ba41305 VZ |
150 | } \ |
151 | \ | |
2b5f62a0 | 152 | *val = extra(*val); \ |
2ba41305 | 153 | \ |
2b5f62a0 | 154 | return read; \ |
18244936 | 155 | } |
18244936 | 156 | |
18244936 | 157 | |
2ba41305 VZ |
158 | IMPLEMENT_READ_FOR_TYPE(String, wxString, const wxString&, ExpandEnvVars) |
159 | IMPLEMENT_READ_FOR_TYPE(Long, long, long, long) | |
2ba41305 VZ |
160 | IMPLEMENT_READ_FOR_TYPE(Double, double, double, double) |
161 | IMPLEMENT_READ_FOR_TYPE(Bool, bool, bool, bool) | |
f6bcfd97 | 162 | |
2ba41305 | 163 | #undef IMPLEMENT_READ_FOR_TYPE |
18244936 | 164 | |
3e1512cd VZ |
165 | // int is stored as long |
166 | bool wxConfigBase::Read(const wxString& key, int *pi) const | |
18244936 | 167 | { |
3e1512cd VZ |
168 | long l = *pi; |
169 | bool r = Read(key, &l); | |
9a83f860 | 170 | wxASSERT_MSG( l < INT_MAX, wxT("int overflow in wxConfig::Read") ); |
2ba41305 | 171 | *pi = (int)l; |
3e1512cd VZ |
172 | return r; |
173 | } | |
dfad0599 | 174 | |
3e1512cd VZ |
175 | bool wxConfigBase::Read(const wxString& key, int *pi, int defVal) const |
176 | { | |
177 | long l = *pi; | |
178 | bool r = Read(key, &l, defVal); | |
9a83f860 | 179 | wxASSERT_MSG( l < INT_MAX, wxT("int overflow in wxConfig::Read") ); |
3e1512cd VZ |
180 | *pi = (int)l; |
181 | return r; | |
dfad0599 JS |
182 | } |
183 | ||
384859f8 VZ |
184 | // Read floats as doubles then just type cast it down. |
185 | bool wxConfigBase::Read(const wxString& key, float* val) const | |
186 | { | |
187 | wxCHECK_MSG( val, false, wxT("wxConfig::Read(): NULL parameter") ); | |
188 | ||
189 | double temp; | |
190 | if ( !Read(key, &temp) ) | |
191 | return false; | |
192 | ||
193 | wxCHECK_MSG( fabs(temp) <= FLT_MAX, false, | |
194 | wxT("float overflow in wxConfig::Read") ); | |
195 | wxCHECK_MSG( (temp == 0.0) || (fabs(temp) >= FLT_MIN), false, | |
196 | wxT("float underflow in wxConfig::Read") ); | |
197 | ||
198 | *val = static_cast<float>(temp); | |
199 | ||
200 | return true; | |
201 | } | |
202 | ||
203 | bool wxConfigBase::Read(const wxString& key, float* val, float defVal) const | |
204 | { | |
205 | wxCHECK_MSG( val, false, wxT("wxConfig::Read(): NULL parameter") ); | |
206 | ||
207 | if ( Read(key, val) ) | |
208 | return true; | |
209 | ||
210 | *val = defVal; | |
211 | return false; | |
212 | } | |
213 | ||
3e1512cd VZ |
214 | // the DoReadXXX() for the other types have implementation in the base class |
215 | // but can be overridden in the derived ones | |
2ba41305 | 216 | bool wxConfigBase::DoReadBool(const wxString& key, bool* val) const |
dfad0599 | 217 | { |
9a83f860 | 218 | wxCHECK_MSG( val, false, wxT("wxConfig::Read(): NULL parameter") ); |
2ba41305 | 219 | |
dfad0599 | 220 | long l; |
2ba41305 | 221 | if ( !DoReadLong(key, &l) ) |
c9d59ee7 | 222 | return false; |
dfad0599 | 223 | |
0231d18f VZ |
224 | if ( l != 0 && l != 1 ) |
225 | { | |
226 | // Don't assert here as this could happen in the result of user editing | |
227 | // the file directly and this not indicate a bug in the program but | |
228 | // still complain that something is wrong. | |
229 | wxLogWarning(_("Invalid value %ld for a boolean key \"%s\" in " | |
230 | "config file."), | |
231 | l, key); | |
232 | } | |
855e92a8 | 233 | |
2ba41305 VZ |
234 | *val = l != 0; |
235 | ||
c9d59ee7 | 236 | return true; |
7c74e7fe | 237 | } |
1341230e | 238 | |
2ba41305 | 239 | bool wxConfigBase::DoReadDouble(const wxString& key, double* val) const |
68275b85 | 240 | { |
2ba41305 VZ |
241 | wxString str; |
242 | if ( Read(key, &str) ) | |
243 | { | |
7e22c2bd VZ |
244 | if ( str.ToCDouble(val) ) |
245 | return true; | |
246 | ||
247 | // Previous versions of wxFileConfig wrote the numbers out using the | |
248 | // current locale and not the C one as now, so attempt to parse the | |
249 | // string as a number in the current locale too, for compatibility. | |
250 | if ( str.ToDouble(val) ) | |
251 | return true; | |
2ba41305 VZ |
252 | } |
253 | ||
c9d59ee7 | 254 | return false; |
68275b85 VZ |
255 | } |
256 | ||
2ba41305 | 257 | // string reading helper |
6164d85e | 258 | wxString wxConfigBase::ExpandEnvVars(const wxString& str) const |
8bbe427f VZ |
259 | { |
260 | wxString tmp; // Required for BC++ | |
261 | if (IsExpandingEnvVars()) | |
262 | tmp = wxExpandEnvVars(str); | |
263 | else | |
264 | tmp = str; | |
265 | return tmp; | |
266 | } | |
18244936 | 267 | |
2ba41305 VZ |
268 | // ---------------------------------------------------------------------------- |
269 | // wxConfigBase writing | |
270 | // ---------------------------------------------------------------------------- | |
271 | ||
272 | bool wxConfigBase::DoWriteDouble(const wxString& key, double val) | |
273 | { | |
7e22c2bd VZ |
274 | // Notice that we always write out the numbers in C locale and not the |
275 | // current one. This makes the config files portable between machines using | |
276 | // different locales. | |
277 | return DoWriteString(key, wxString::FromCDouble(val)); | |
2ba41305 VZ |
278 | } |
279 | ||
2ba41305 VZ |
280 | bool wxConfigBase::DoWriteBool(const wxString& key, bool value) |
281 | { | |
282 | return DoWriteLong(key, value ? 1l : 0l); | |
283 | } | |
284 | ||
855e92a8 | 285 | // ---------------------------------------------------------------------------- |
18244936 | 286 | // wxConfigPathChanger |
855e92a8 VZ |
287 | // ---------------------------------------------------------------------------- |
288 | ||
18244936 | 289 | wxConfigPathChanger::wxConfigPathChanger(const wxConfigBase *pContainer, |
6f73419b | 290 | const wxString& strEntry) |
855e92a8 | 291 | { |
6f73419b | 292 | m_bChanged = false; |
f48a1159 | 293 | m_pContainer = const_cast<wxConfigBase *>(pContainer); |
08159082 | 294 | |
1af292a6 VZ |
295 | // the path is everything which precedes the last slash and the name is |
296 | // everything after it -- and this works correctly if there is no slash too | |
297 | wxString strPath = strEntry.BeforeLast(wxCONFIG_PATH_SEPARATOR, &m_strName); | |
855e92a8 | 298 | |
08159082 | 299 | // except in the special case of "/keyname" when there is nothing before "/" |
b713f891 WS |
300 | if ( strPath.empty() && |
301 | ((!strEntry.empty()) && strEntry[0] == wxCONFIG_PATH_SEPARATOR) ) | |
08159082 | 302 | { |
da468d38 | 303 | strPath = wxCONFIG_PATH_SEPARATOR; |
08159082 | 304 | } |
855e92a8 | 305 | |
b713f891 | 306 | if ( !strPath.empty() ) |
18860312 VZ |
307 | { |
308 | if ( m_pContainer->GetPath() != strPath ) | |
309 | { | |
6f73419b | 310 | // we do change the path so restore it later |
18860312 | 311 | m_bChanged = true; |
b9a59c91 JS |
312 | |
313 | /* JACS: work around a memory bug that causes an assert | |
314 | when using wxRegConfig, related to reference-counting. | |
86501081 | 315 | Can be reproduced by removing .wc_str() below and |
b9a59c91 JS |
316 | adding the following code to the config sample OnInit under |
317 | Windows: | |
318 | ||
319 | pConfig->SetPath(wxT("MySettings")); | |
320 | pConfig->SetPath(wxT("..")); | |
321 | int value; | |
9a83f860 | 322 | pConfig->Read(wxT("MainWindowX"), & value); |
b9a59c91 | 323 | */ |
86501081 | 324 | m_strOldPath = m_pContainer->GetPath().wc_str(); |
18860312 VZ |
325 | if ( *m_strOldPath.c_str() != wxCONFIG_PATH_SEPARATOR ) |
326 | m_strOldPath += wxCONFIG_PATH_SEPARATOR; | |
327 | m_pContainer->SetPath(strPath); | |
328 | } | |
855e92a8 VZ |
329 | } |
330 | } | |
331 | ||
41f30152 VZ |
332 | void wxConfigPathChanger::UpdateIfDeleted() |
333 | { | |
334 | // we don't have to do anything at all if we didn't change the path | |
335 | if ( !m_bChanged ) | |
336 | return; | |
337 | ||
338 | // find the deepest still existing parent path of the original path | |
339 | while ( !m_pContainer->HasGroup(m_strOldPath) ) | |
340 | { | |
341 | m_strOldPath = m_strOldPath.BeforeLast(wxCONFIG_PATH_SEPARATOR); | |
342 | if ( m_strOldPath.empty() ) | |
343 | m_strOldPath = wxCONFIG_PATH_SEPARATOR; | |
344 | } | |
345 | } | |
346 | ||
18244936 | 347 | wxConfigPathChanger::~wxConfigPathChanger() |
855e92a8 VZ |
348 | { |
349 | // only restore path if it was changed | |
350 | if ( m_bChanged ) { | |
351 | m_pContainer->SetPath(m_strOldPath); | |
352 | } | |
353 | } | |
354 | ||
f559e621 VZ |
355 | // this is a wxConfig method but it's mainly used with wxConfigPathChanger |
356 | /* static */ | |
357 | wxString wxConfigBase::RemoveTrailingSeparator(const wxString& key) | |
358 | { | |
359 | wxString path(key); | |
360 | ||
361 | // don't remove the only separator from a root group path! | |
362 | while ( path.length() > 1 ) | |
363 | { | |
364 | if ( *path.rbegin() != wxCONFIG_PATH_SEPARATOR ) | |
365 | break; | |
366 | ||
367 | path.erase(path.end() - 1); | |
368 | } | |
369 | ||
370 | return path; | |
371 | } | |
372 | ||
21709999 JS |
373 | #endif // wxUSE_CONFIG |
374 | ||
c801d85f KB |
375 | // ---------------------------------------------------------------------------- |
376 | // static & global functions | |
377 | // ---------------------------------------------------------------------------- | |
378 | ||
379 | // understands both Unix and Windows (but only under Windows) environment | |
380 | // variables expansion: i.e. $var, $(var) and ${var} are always understood | |
381 | // and in addition under Windows %var% is also. | |
1fd87ff7 SN |
382 | |
383 | // don't change the values the enum elements: they must be equal | |
384 | // to the matching [closing] delimiter. | |
385 | enum Bracket | |
386 | { | |
387 | Bracket_None, | |
388 | Bracket_Normal = ')', | |
389 | Bracket_Curly = '}', | |
390 | #ifdef __WXMSW__ | |
391 | Bracket_Windows = '%', // yeah, Windows people are a bit strange ;-) | |
392 | #endif | |
393 | Bracket_Max | |
394 | }; | |
395 | ||
f40ccee9 | 396 | wxString wxExpandEnvVars(const wxString& str) |
c801d85f KB |
397 | { |
398 | wxString strResult; | |
aaa6d89a | 399 | strResult.Alloc(str.length()); |
c801d85f | 400 | |
c86f1403 | 401 | size_t m; |
aaa6d89a | 402 | for ( size_t n = 0; n < str.length(); n++ ) { |
c9f78968 | 403 | switch ( str[n].GetValue() ) { |
2049ba38 | 404 | #ifdef __WXMSW__ |
f6bcfd97 | 405 | case wxT('%'): |
c801d85f | 406 | #endif //WINDOWS |
f6bcfd97 | 407 | case wxT('$'): |
c801d85f KB |
408 | { |
409 | Bracket bracket; | |
2049ba38 | 410 | #ifdef __WXMSW__ |
f6bcfd97 | 411 | if ( str[n] == wxT('%') ) |
c801d85f KB |
412 | bracket = Bracket_Windows; |
413 | else | |
414 | #endif //WINDOWS | |
aaa6d89a | 415 | if ( n == str.length() - 1 ) { |
c801d85f KB |
416 | bracket = Bracket_None; |
417 | } | |
418 | else { | |
c9f78968 | 419 | switch ( str[n + 1].GetValue() ) { |
f6bcfd97 | 420 | case wxT('('): |
ba7f9a90 | 421 | bracket = Bracket_Normal; |
c801d85f KB |
422 | n++; // skip the bracket |
423 | break; | |
424 | ||
f6bcfd97 | 425 | case wxT('{'): |
c801d85f KB |
426 | bracket = Bracket_Curly; |
427 | n++; // skip the bracket | |
428 | break; | |
429 | ||
430 | default: | |
431 | bracket = Bracket_None; | |
432 | } | |
433 | } | |
434 | ||
435 | m = n + 1; | |
436 | ||
aaa6d89a | 437 | while ( m < str.length() && (wxIsalnum(str[m]) || str[m] == wxT('_')) ) |
c801d85f | 438 | m++; |
03647350 | 439 | |
c801d85f KB |
440 | wxString strVarName(str.c_str() + n + 1, m - n - 1); |
441 | ||
1c193821 | 442 | #ifdef __WXWINCE__ |
86501081 | 443 | const bool expanded = false; |
1c193821 | 444 | #else |
bf7f7793 RR |
445 | // NB: use wxGetEnv instead of wxGetenv as otherwise variables |
446 | // set through wxSetEnv may not be read correctly! | |
86501081 | 447 | bool expanded = false; |
bf7f7793 RR |
448 | wxString tmp; |
449 | if (wxGetEnv(strVarName, &tmp)) | |
86501081 VS |
450 | { |
451 | strResult += tmp; | |
452 | expanded = true; | |
c801d85f | 453 | } |
86501081 VS |
454 | else |
455 | #endif | |
456 | { | |
c801d85f | 457 | // variable doesn't exist => don't change anything |
2049ba38 | 458 | #ifdef __WXMSW__ |
c801d85f KB |
459 | if ( bracket != Bracket_Windows ) |
460 | #endif | |
461 | if ( bracket != Bracket_None ) | |
462 | strResult << str[n - 1]; | |
463 | strResult << str[n] << strVarName; | |
464 | } | |
465 | ||
466 | // check the closing bracket | |
467 | if ( bracket != Bracket_None ) { | |
aaa6d89a | 468 | if ( m == str.length() || str[m] != (wxChar)bracket ) { |
2b5f62a0 VZ |
469 | // under MSW it's common to have '%' characters in the registry |
470 | // and it's annoying to have warnings about them each time, so | |
471 | // ignroe them silently if they are not used for env vars | |
472 | // | |
473 | // under Unix, OTOH, this warning could be useful for the user to | |
474 | // understand why isn't the variable expanded as intended | |
475 | #ifndef __WXMSW__ | |
c6d60564 RN |
476 | wxLogWarning(_("Environment variables expansion failed: missing '%c' at position %u in '%s'."), |
477 | (char)bracket, (unsigned int) (m + 1), str.c_str()); | |
2b5f62a0 | 478 | #endif // __WXMSW__ |
c801d85f KB |
479 | } |
480 | else { | |
906373bf | 481 | // skip closing bracket unless the variables wasn't expanded |
86501081 | 482 | if ( !expanded ) |
f6eaf52a | 483 | strResult << (wxChar)bracket; |
c801d85f KB |
484 | m++; |
485 | } | |
486 | } | |
487 | ||
488 | n = m - 1; // skip variable name | |
489 | } | |
490 | break; | |
491 | ||
c9f78968 | 492 | case wxT('\\'): |
906373bf | 493 | // backslash can be used to suppress special meaning of % and $ |
aaa6d89a | 494 | if ( n != str.length() - 1 && |
b11dd163 | 495 | (str[n + 1] == wxT('%') || str[n + 1] == wxT('$')) ) { |
906373bf VZ |
496 | strResult += str[++n]; |
497 | ||
498 | break; | |
499 | } | |
500 | //else: fall through | |
501 | ||
c801d85f KB |
502 | default: |
503 | strResult += str[n]; | |
504 | } | |
505 | } | |
506 | ||
507 | return strResult; | |
508 | } | |
855e92a8 VZ |
509 | |
510 | // this function is used to properly interpret '..' in path | |
86501081 | 511 | void wxSplitPath(wxArrayString& aParts, const wxString& path) |
855e92a8 | 512 | { |
df5168c4 | 513 | aParts.clear(); |
855e92a8 VZ |
514 | |
515 | wxString strCurrent; | |
86501081 | 516 | wxString::const_iterator pc = path.begin(); |
855e92a8 | 517 | for ( ;; ) { |
86501081 | 518 | if ( pc == path.end() || *pc == wxCONFIG_PATH_SEPARATOR ) { |
223d09f6 | 519 | if ( strCurrent == wxT(".") ) { |
855e92a8 VZ |
520 | // ignore |
521 | } | |
223d09f6 | 522 | else if ( strCurrent == wxT("..") ) { |
855e92a8 | 523 | // go up one level |
df5168c4 | 524 | if ( aParts.size() == 0 ) |
43b2d5e7 | 525 | { |
86501081 | 526 | wxLogWarning(_("'%s' has extra '..', ignored."), path); |
43b2d5e7 | 527 | } |
855e92a8 | 528 | else |
43b2d5e7 | 529 | { |
df5168c4 | 530 | aParts.erase(aParts.end() - 1); |
43b2d5e7 | 531 | } |
937d4f4d VZ |
532 | |
533 | strCurrent.Empty(); | |
855e92a8 | 534 | } |
b713f891 | 535 | else if ( !strCurrent.empty() ) { |
df5168c4 | 536 | aParts.push_back(strCurrent); |
855e92a8 VZ |
537 | strCurrent.Empty(); |
538 | } | |
539 | //else: | |
540 | // could log an error here, but we prefer to ignore extra '/' | |
541 | ||
86501081 | 542 | if ( pc == path.end() ) |
f6bcfd97 | 543 | break; |
855e92a8 VZ |
544 | } |
545 | else | |
546 | strCurrent += *pc; | |
547 | ||
86501081 | 548 | ++pc; |
855e92a8 VZ |
549 | } |
550 | } |