p
/
sdn
1
1
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Support tilde expansion in the "chdir" action 

The tilde may be escaped, and this first escape may be escaped
as well, so all paths should be expressable.

All will just work(TM) for those who need it, and those who start
filenames with backslashes are begging to have their foot shot.

It appears that even Shift JIS, Big5, GB 18030, and GBK are
compatible with Unix paths, meaning they don't redefine the slash
(0x2F), so I'm okay with my direct multibyte string handling in
unknown locales.

Legacy stuff smells.
This commit is contained in:
Přemysl Eric Janouch 2020-09-28 01:13:06 +02:00
parent 91df92f49a
commit 5759df156b
Signed by: p
GPG Key ID: A0420B94F92B9493
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
sdn.cpp
View File

@ -113,6 +113,28 @@ fun split (const string &s, const string &sep) -> vector<string> {
vector<string> result; split (s, sep, result); return result; vector<string> result; split (s, sep, result); return result;
} }
fun untilde (const string &path) -> string {
if (path.empty ())
return path;
string tail = path.substr (1);
if (path[0] == '\\')
return tail;
if (path[1] != '~')
return path;
// If there is something between the ~ and the first / (or the EOS)
if (size_t until_slash = tail.find ('/')) {
if (const auto *pw = getpwnam (tail.substr (0, until_slash).c_str ()))
return pw->pw_dir + tail.substr (until_slash);
} else if (const auto *home = getenv ("HOME")) {
return home + tail;
} else if (const auto *pw = getpwuid (getuid ())) {
return pw->pw_dir + tail;
}
return path;
}
fun needs_shell_quoting (const string &v) -> bool { fun needs_shell_quoting (const string &v) -> bool {
// IEEE Std 1003.1 sh + the exclamation mark because of csh/bash // IEEE Std 1003.1 sh + the exclamation mark because of csh/bash
// history expansion, implicitly also the NUL character // history expansion, implicitly also the NUL character
@ -1223,7 +1245,7 @@ fun handle (wint_t c) -> bool {
case ACTION_CHDIR: case ACTION_CHDIR:
g.editor = L"chdir"; g.editor = L"chdir";
g.editor_on_confirm = [] { g.editor_on_confirm = [] {
change_dir (to_mb (g.editor_line)); change_dir (untilde (to_mb (g.editor_line)));
}; };
break; break;
case ACTION_PARENT: case ACTION_PARENT:
@ -1233,10 +1255,7 @@ fun handle (wint_t c) -> bool {
change_dir (g.start_dir); change_dir (g.start_dir);
break; break;
case ACTION_GO_HOME: case ACTION_GO_HOME:
if (const auto *home = getenv ("HOME")) change_dir (untilde ("~"));
change_dir (home);
else if (const auto *pw = getpwuid (getuid ()))
change_dir (pw->pw_dir);
break; break;
case ACTION_SEARCH: case ACTION_SEARCH: