bbs/deb-goldedplus
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Trying to fix problem with UNC filepathes

Browse Source
This commit is contained in:
Alexander S. Aganichev 2001-07-23 03:56:44 +00:00
parent f68b970479
commit 0477998748
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
goldlib/gall/gfilutl2.cpp
View File

@ -214,11 +214,15 @@ bool maketruepath(std::string &dirname) {
} }
#endif #endif
size_t posn; size_t posn;
for(posn = 0; (posn=dirname.find('\\', posn)) != dirname.npos; posn++) for(posn = 0; (posn=dirname.find(GOLD_WRONG_SLASH_CHR, posn)) != dirname.npos; posn++)
dirname[posn] = '/'; dirname[posn] = GOLD_SLASH_CHR;
size_t skipfrom, skipto; size_t skipfrom, skipto;
while((skipfrom=dirname.find("//")) != dirname.npos) #ifdef __HAVE_DRIVES__ /* Prevent from destroying UNC names */
dirname.erase(skipfrom, 1); if(dirname.length() > 1) {
while((skipfrom=dirname.find("\\\\", 1)) != dirname.npos)
dirname.erase(skipfrom, 1);
}
#endif
size_t len = dirname.length(); size_t len = dirname.length();
#ifdef __HAVE_DRIVES__ #ifdef __HAVE_DRIVES__
while((len > 3) && isslash(dirname[--len])) while((len > 3) && isslash(dirname[--len]))
@ -230,7 +234,13 @@ bool maketruepath(std::string &dirname) {
dirname = cwd; dirname = cwd;
ok = false; ok = false;
} }
for(posn = 0; (posn=dirname.find('\\', posn)) != dirname.npos; posn++) #ifdef __HAVE_DRIVES__
if((dirname.length() > 2) and (dirname[0] == '\\') and (dirname[1] == '\\'))
posn = 2;
else
#endif
posn = 0;
for(; (posn=dirname.find('\\', posn)) != dirname.npos; posn++)
dirname[posn] = '/'; dirname[posn] = '/';
while((skipto=dirname.find("/../")) != dirname.npos) { while((skipto=dirname.find("/../")) != dirname.npos) {
skipfrom = (skipto == 0) ? 0 : dirname.rfind('/', skipto-1); skipfrom = (skipto == 0) ? 0 : dirname.rfind('/', skipto-1);