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

Fixes for previous commits 

".." used to be hidden together with hidden files,
and the symlink patch introduced a compiler warning.
This commit is contained in:
Přemysl Eric Janouch 2018-12-09 05:28:47 +01:00
parent 71fbaca9e5
commit 296c0cc66f
Signed by: p
GPG Key ID: A0420B94F92B9493
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sdn.cpp
View File

@ -764,8 +764,9 @@ fun reload (const string &old_cwd) {
while (auto f = readdir (dir)) { while (auto f = readdir (dir)) {
string name = f->d_name; string name = f->d_name;
// Two dots are for navigation but this ain't as useful // Two dots are for navigation but this ain't as useful
if (name != "." && (name != ".." || g.cwd != "/") if (name == ".")
&& (name[0] != '.' || g.show_hidden)) continue;
if (name == ".." ? g.cwd != "/" : (name[0] != '.' || g.show_hidden))
g.entries.push_back (make_entry (f)); g.entries.push_back (make_entry (f));
} }
closedir (dir); closedir (dir);
@ -1003,7 +1004,7 @@ fun change_dir (const string &path) {
explode_path (absolutize (g.cwd, path), in); explode_path (absolutize (g.cwd, path), in);
// Paths with exactly two leading slashes may get special treatment // Paths with exactly two leading slashes may get special treatment
int startempty = 1; size_t startempty = 1;
if (in.size () >= 2 && in[1] == "" && (in.size () < 3 || in[2] != "")) if (in.size () >= 2 && in[1] == "" && (in.size () < 3 || in[2] != ""))
startempty = 2; startempty = 2;