h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-02 22:21:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

expand: Stringify get_home_directory_name

Browse Source 
This is actually nicer than the pointilistic version.
This commit is contained in:
Fabian Homborg
2018-10-20 22:26:28 +02:00
parent 884b4c9a61
commit 410e13dd74
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/expand.cpp
View File

@@ -727,18 +727,18 @@ static bool expand_cmdsubst(const wcstring &input, std::vector<completion_t> *ou
// string if it is just a tilde. Also return by reference the index of the first character of the
// remaining part of the string (e.g. the subsequent slash).
static wcstring get_home_directory_name(const wcstring &input, size_t *out_tail_idx) {
const wchar_t *const in = input.c_str();
assert(in[0] == HOME_DIRECTORY || in[0] == L'~');
size_t tail_idx;
assert(input[0] == HOME_DIRECTORY || input[0] == L'~');
const wchar_t *name_end = wcschr(in, L'/');
if (name_end) {
tail_idx = name_end - in;
auto pos = input.find_first_of(L'/');
// We get the position of the /, but we need to remove it as well.
if (pos != wcstring::npos) {
pos -= 1;
*out_tail_idx = pos;
} else {
tail_idx = wcslen(in);
*out_tail_idx = input.length();
}
*out_tail_idx = tail_idx;
return input.substr(1, tail_idx - 1);
return input.substr(1, pos);
}
/// Attempts tilde expansion of the string specified, modifying it in place.