mirrors/mc
1
0
Fork 0
mirror of https://github.com/MidnightCommander/mc synced 2024-12-23 04:46:55 +03:00
Code Issues Packages Projects Releases Wiki Activity

fixed relative symlink operations. Symlink now stay relative

Browse Source 
Signed-off-by: Slava Zanko <slavazanko@gmail.com>
This commit is contained in:
Slava Zanko 2011-06-29 13:12:19 +03:00
parent ea4078e52e
commit 12af8e5db0
3 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/vfs/interface.c
View File

@ -265,7 +265,7 @@ mc_symlink (const char *name1, const char *path)
if (vpath1 == NULL) if (vpath1 == NULL)
return -1; return -1;
vpath2 = vfs_path_from_str (name1); vpath2 = vfs_path_from_str_flags (name1, VPF_NO_CANON);
if (vpath2 != NULL) if (vpath2 != NULL)
{ {

24
lib/vfs/path.c
View File

@ -607,15 +607,16 @@ vfs_path_to_str (const vfs_path_t * vpath)
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
/** /**
* Split path string to path elements. * Split path string to path elements with flags for change parce process.
* *
* @param path_str VFS-path * @param path_str VFS-path
* @param flags flags for parser
* *
* @return pointer to newly created vfs_path_t object with filled path elements array. * @return pointer to newly created vfs_path_t object with filled path elements array.
*/ */
vfs_path_t * vfs_path_t *
vfs_path_from_str (const char *path_str) vfs_path_from_str_flags (const char *path_str, vfs_path_flag_t flags)
{ {
vfs_path_t *vpath; vfs_path_t *vpath;
char *path; char *path;
@ -623,7 +624,11 @@ vfs_path_from_str (const char *path_str)
if (path_str == NULL) if (path_str == NULL)
return NULL; return NULL;
if ((flags & VPF_NO_CANON) == 0)
path = vfs_canon (path_str); path = vfs_canon (path_str);
else
path = g_strdup (path_str);
if (path == NULL) if (path == NULL)
return NULL; return NULL;
@ -637,6 +642,21 @@ vfs_path_from_str (const char *path_str)
return vpath; return vpath;
} }
/* --------------------------------------------------------------------------------------------- */
/**
* Split path string to path elements.
*
* @param path_str VFS-path
*
* @return pointer to newly created vfs_path_t object with filled path elements array.
*/
vfs_path_t *
vfs_path_from_str (const char *path_str)
{
return vfs_path_from_str_flags (path_str, VPF_NONE);
}
/* --------------------------------------------------------------------------------------------- */ /* --------------------------------------------------------------------------------------------- */
/* /*
* Create new vfs_path_t object. * Create new vfs_path_t object.

7
lib/vfs/path.h
View File

@ -7,6 +7,12 @@
/*** enums ***************************************************************************************/ /*** enums ***************************************************************************************/
typedef enum
{
VPF_NONE = 0,
VPF_NO_CANON = 1
} vfs_path_flag_t;
/*** structures declarations (and typedefs of structures)*****************************************/ /*** structures declarations (and typedefs of structures)*****************************************/
struct vfs_class; struct vfs_class;
@ -48,6 +54,7 @@ int vfs_path_elements_count (const vfs_path_t * path);
char *vfs_path_to_str (const vfs_path_t * path); char *vfs_path_to_str (const vfs_path_t * path);
char *vfs_path_to_str_elements_count (const vfs_path_t * path, int elements_count); char *vfs_path_to_str_elements_count (const vfs_path_t * path, int elements_count);
vfs_path_t *vfs_path_from_str (const char *path_str); vfs_path_t *vfs_path_from_str (const char *path_str);
vfs_path_t *vfs_path_from_str_flags (const char *path_str, vfs_path_flag_t flags);
vfs_path_element_t *vfs_path_get_by_index (const vfs_path_t * path, int element_index); vfs_path_element_t *vfs_path_get_by_index (const vfs_path_t * path, int element_index);
vfs_path_element_t *vfs_path_element_clone (const vfs_path_element_t * element); vfs_path_element_t *vfs_path_element_clone (const vfs_path_element_t * element);