Skip to content

Update namespace.cc: re-implement the member function NormalizePath #778

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ToWorld wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Update namespace.cc: re-implement the member function NormalizePath #778

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5cd0eb1
Update namespace.cc: re-implement the member function NormalizePath
ToWorld Jan 9, 2017
29bf881
Update namesapce.cc: re-implement the member function NormalizePath
ToWorld Jan 9, 2017
5bf3fe3
Update namespace.cc: re-implement the member function, NormalizePath.
ToWorld Jan 9, 2017
7678091
Update namespace.cc
ToWorld Jan 9, 2017
be5c289
re-implement the member function NormalizePath
ToWorld Jan 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 17 additions & 10 deletions src/nameserver/namespace.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -731,23 +731,30 @@ bool NameSpace::RebuildBlockMap(std::function<void (const FileInfo&)> callback)
}

std::string NameSpace::NormalizePath(const std::string& path) {
// Is there a better implementation?
std::string ret;
if (path.empty() || path[0] != '/') {
ret = "/";
}
bool slash = false;
for (uint32_t i = 0; i < path.size(); i++) {
uint32_t len = path.size();
uint32_t i = 1;
for (; i < len; ) {
if (path[i] == '/') {
if (slash) continue;
slash = true;
} else {
slash = false;
if (path[i-1] == '/') {
Copy link
Collaborator

@yvxiang yvxiang Jan 9, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

代码风格

Copy link
Contributor Author

@ToWorld ToWorld Jan 9, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I get it.

ret.push_back(path[i-1]);
}
i++;
}
else {
ret.push_back(path[i-1]);
ret.push_back(path[i]);
i += 2;
}
ret.push_back(path[i]);
}
if (ret.size() > 1U && ret[ret.size() - 1] == '/') {
ret.resize(ret.size() - 1);
if (i == len && path[len-1] != '/') {
ret.push_back(path[len-1]);
}
if (ret.empty()) {
ret = "/";
}
return ret;
}
Expand Down