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

(vfs_canon): merge local variables.

Browse Source
This commit is contained in:
Andrew Borodin 2015-06-27 16:27:41 +03:00 committed by Slava Zanko
parent cb567b5ea6
commit e9db0a0c12
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/vfs/path.c
View File

@ -135,13 +135,16 @@ _vfs_split_with_semi_skip_count (char *path, const char **inpath, const char **o
static char *
vfs_canon (const char *path)
{
char *result;
if (path == NULL)
vfs_die ("Cannot canonicalize NULL");
/* Relative to current directory */
if (!IS_PATH_SEP (*path))
{
char *result, *local;
/* Relative to current directory */
char *local;
if (g_str_has_prefix (path, VFS_ENCODING_PREFIX))
{
@ -161,20 +164,16 @@ vfs_canon (const char *path)
}
result = vfs_canon (local);
g_free (local);
return result;
}
/*
* So we have path of following form:
* /p1/p2#op/.././././p3#op/p4. Good luck.
*/
else
{
char *result;
/* Absolute path */
result = g_strdup (path);
canonicalize_pathname (result);
return result;
}
return result;
}
/* --------------------------------------------------------------------------------------------- */