From 4a0004f6c2140607f0c5deb8aaad007d2a96fbd5 Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sat, 1 Sep 2012 13:06:20 +0400 Subject: [PATCH] Ticket #2874: enter on directory named '~' goes to the home one. Revert "Support of use ~ as home directory in hotlist." This partially reverts commit dd9c7516a383707d504eb0dca2dc9b24d8f4ff07. Signed-off-by: Andrew Borodin --- lib/vfs/path.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/lib/vfs/path.c b/lib/vfs/path.c index 3a6eb8b88..5b85c1d16 100644 --- a/lib/vfs/path.c +++ b/lib/vfs/path.c @@ -152,16 +152,11 @@ vfs_canon (const char *path) } else { - local = tilde_expand (path); - if (*local != PATH_SEP) - { - char *curr_dir; + char *curr_dir; - g_free (local); - curr_dir = vfs_get_current_dir (); - local = mc_build_filename (curr_dir, path, NULL); - g_free (curr_dir); - } + curr_dir = vfs_get_current_dir (); + local = mc_build_filename (curr_dir, path, NULL); + g_free (curr_dir); } result = vfs_canon (local); g_free (local); -- 2.11.4.GIT