mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2025-01-22 03:02:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

Support of use ~ as home directory in hotlist.

Browse Source 
Expand tilde while vfs path canonicalize.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
This commit is contained in:
Andrew Borodin 2012-03-12 10:48:41 +03:00
parent cfc13ba3a0
commit dd9c7516a3
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/vfs/path.c
View File

@ -134,17 +134,24 @@ _vfs_split_with_semi_skip_count (char *path, const char **inpath, const char **o
static char *
vfs_canon (const char *path)
{
if (!path)
if (path == NULL)
vfs_die ("Cannot canonicalize NULL");
/* Relative to current directory */
if (*path != PATH_SEP)
{
char *local, *result, *curr_dir;
char *result, *local;
curr_dir = vfs_get_current_dir ();
local = mc_build_filename (curr_dir, path, NULL);
g_free (curr_dir);
local = tilde_expand (path);
if (*local != PATH_SEP)
{
char *curr_dir;
g_free (local);
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);
@ -156,7 +163,9 @@ vfs_canon (const char *path)
* /p1/p2#op/.././././p3#op/p4. Good luck.
*/
{
char *result = g_strdup (path);
char *result;
result = g_strdup (path);
canonicalize_pathname (result);
return result;
}