tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

make stringtotokens use vector

Browse Source
This commit is contained in:
Jean-Francois Dockes
2010-09-13 14:17:22 +02:00
parent c4a818fc64
commit e327ea0b4e
10 changed files with 23 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/utils/pathut.cpp
+4 -4
View File
@@ -331,10 +331,10 @@ extern string path_canon(const string &is)
}
s = path_cat(string(buf), s);
}
list<string>elems;
vector<string> elems;
stringToTokens(s, elems, "/");
list<string> cleaned;
for (list<string>::const_iterator it = elems.begin();
vector<string> cleaned;
for (vector<string>::const_iterator it = elems.begin();
it != elems.end(); it++){
if (*it == "..") {
if (!cleaned.empty())
@@ -346,7 +346,7 @@ extern string path_canon(const string &is)
}
string ret;
if (!cleaned.empty()) {
for (list<string>::const_iterator it = cleaned.begin();
for (vector<string>::const_iterator it = cleaned.begin();
it != cleaned.end(); it++) {
ret += "/";
ret += *it;