github-mirror/fish-shell
github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2025-02-21 04:39:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

wrealpath: Simplify

Browse Source 
- Reuse the buffer
- Don't duplicate the code for no "/"
This commit is contained in:
Fabian Homborg 2018-11-18 20:25:19 +01:00
parent ca1c499069
commit 442eb028c1
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/wutil.cpp
View File

@ -400,6 +400,7 @@ maybe_t<wcstring> wrealpath(const wcstring &pathname) {
if (narrow_res) {
real_path.append(narrow_res);
} else {
// Check if everything up to the last path component is valid.
size_t pathsep_idx = narrow_path.rfind('/');
if (pathsep_idx == 0) {
@ -407,29 +408,23 @@ maybe_t<wcstring> wrealpath(const wcstring &pathname) {
// single path component and thus doesn't need conversion.
real_path = narrow_path;
} else {
char tmpbuff[PATH_MAX];
// Only call realpath() on the portion up to the last component.
errno = 0;
if (pathsep_idx == cstring::npos) {
// No pathsep means a single path component relative to pwd.
errno = 0;
narrow_res = realpath(".", tmpbuff);
if (narrow_res == NULL) // likely no such file or dir
return none();
pathsep_idx = 0;
// If there is no "/", this is a file in $PWD, so give the realpath to that.
narrow_res = realpath(".", tmpbuf);
} else {
errno = 0;
// Only call realpath() on the portion up to the last component.
// Be sure to include the last "/", so that the penultimate component is considered as a directory.
// Be sure to include the last "/" to have the penultimate component considered a directory.
// Otherwise "file/something" succeeds.
narrow_res = realpath(narrow_path.substr(0, pathsep_idx + 1).c_str(), tmpbuff);
if (!narrow_res) return none();
pathsep_idx++;
narrow_res = realpath(narrow_path.substr(0, pathsep_idx + 1).c_str(), tmpbuf);
}
real_path.append(narrow_res); // if things went wrong, we are just appending NULL.
if (!narrow_res) return none();
pathsep_idx++;
real_path.append(narrow_res);
// This test is to deal with pathological cases such as /../../x => //x.
if (real_path.size() > 1) real_path.append("/");
real_path.append(narrow_path.substr(pathsep_idx, cstring::npos));