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

Merge branch '1828_ftpfs_improved_symlink_handling'

Browse Source 
* 1828_ftpfs_improved_symlink_handling:
  Ticket #1828: Improved symlink handling in ftpfs
This commit is contained in:
Slava Zanko 2009-12-25 15:54:43 +02:00
commit e8b41315ac
3 changed files with 114 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/util.h
View File

@ -146,6 +146,17 @@ extern struct sigaction startup_handler;
char *tilde_expand (const char *);
/* Pathname canonicalization */
typedef enum {
CANON_PATH_JOINSLASHES = 1L<<0, /* Multiple `/'s are collapsed to a single `/'. */
CANON_PATH_REMSLASHDOTS = 1L<<1, /* Leading `./'s, `/'s and trailing `/.'s are removed. */
CANON_PATH_REMDOUBLEDOTS = 1L<<3, /* Non-leading `../'s and trailing `..'s are handled by removing */
CANON_PATH_GUARDUNC = 1L<<4, /* Detect and preserve UNC paths: //server/... */
CANON_PATH_ALL = CANON_PATH_JOINSLASHES
| CANON_PATH_REMSLASHDOTS
| CANON_PATH_REMDOUBLEDOTS
| CANON_PATH_GUARDUNC
} CANON_PATH_FLAGS;
void custom_canonicalize_pathname (char *, CANON_PATH_FLAGS);
void canonicalize_pathname (char *);
/* Misc Unix functions */

184
src/utilunix.c
View File

@ -457,14 +457,14 @@ close_error_pipe (int error, const char *text)
* Well formed UNC paths are modified only in the local part.
*/
void
canonicalize_pathname (char *path)
custom_canonicalize_pathname (char *path, CANON_PATH_FLAGS flags)
{
char *p, *s;
int len;
char *lpath = path; /* path without leading UNC part */
/* Detect and preserve UNC paths: //server/... */
if (path[0] == PATH_SEP && path[1] == PATH_SEP) {
if ( ( flags & CANON_PATH_GUARDUNC ) && path[0] == PATH_SEP && path[1] == PATH_SEP) {
p = path + 2;
while (p[0] && p[0] != '/')
p++;
@ -475,112 +475,126 @@ canonicalize_pathname (char *path)
if (!lpath[0] || !lpath[1])
return;
/* Collapse multiple slashes */
p = lpath;
while (*p) {
if (p[0] == PATH_SEP && p[1] == PATH_SEP) {
s = p + 1;
while (*(++s) == PATH_SEP);
str_move (p + 1, s);
}
p++;
}
/* Collapse "/./" -> "/" */
p = lpath;
while (*p) {
if (p[0] == PATH_SEP && p[1] == '.' && p[2] == PATH_SEP)
str_move (p, p + 2);
else
if ( flags & CANON_PATH_JOINSLASHES ) {
/* Collapse multiple slashes */
p = lpath;
while (*p) {
if (p[0] == PATH_SEP && p[1] == PATH_SEP) {
s = p + 1;
while (*(++s) == PATH_SEP);
str_move (p + 1, s);
}
p++;
}
/* Remove trailing slashes */
p = lpath + strlen (lpath) - 1;
while (p > lpath && *p == PATH_SEP)
*p-- = 0;
/* Remove leading "./" */
if (lpath[0] == '.' && lpath[1] == PATH_SEP) {
if (lpath[2] == 0) {
lpath[1] = 0;
return;
} else {
str_move (lpath, lpath + 2);
}
}
/* Remove trailing "/" or "/." */
len = strlen (lpath);
if (len < 2)
return;
if (lpath[len - 1] == PATH_SEP) {
lpath[len - 1] = 0;
} else {
if (lpath[len - 1] == '.' && lpath[len - 2] == PATH_SEP) {
if (len == 2) {
if ( flags & CANON_PATH_JOINSLASHES ) {
/* Collapse "/./" -> "/" */
p = lpath;
while (*p) {
if (p[0] == PATH_SEP && p[1] == '.' && p[2] == PATH_SEP)
str_move (p, p + 2);
else
p++;
}
}
if ( flags & CANON_PATH_REMSLASHDOTS ) {
/* Remove trailing slashes */
p = lpath + strlen (lpath) - 1;
while (p > lpath && *p == PATH_SEP)
*p-- = 0;
/* Remove leading "./" */
if (lpath[0] == '.' && lpath[1] == PATH_SEP) {
if (lpath[2] == 0) {
lpath[1] = 0;
return;
} else {
lpath[len - 2] = 0;
str_move (lpath, lpath + 2);
}
}
/* Remove trailing "/" or "/." */
len = strlen (lpath);
if (len < 2)
return;
if (lpath[len - 1] == PATH_SEP) {
lpath[len - 1] = 0;
} else {
if (lpath[len - 1] == '.' && lpath[len - 2] == PATH_SEP) {
if (len == 2) {
lpath[1] = 0;
return;
} else {
lpath[len - 2] = 0;
}
}
}
}
/* Collapse "/.." with the previous part of path */
p = lpath;
while (p[0] && p[1] && p[2]) {
if ((p[0] != PATH_SEP || p[1] != '.' || p[2] != '.')
|| (p[3] != PATH_SEP && p[3] != 0)) {
p++;
continue;
}
if ( flags & CANON_PATH_REMDOUBLEDOTS ) {
/* Collapse "/.." with the previous part of path */
p = lpath;
while (p[0] && p[1] && p[2]) {
if ((p[0] != PATH_SEP || p[1] != '.' || p[2] != '.')
|| (p[3] != PATH_SEP && p[3] != 0)) {
p++;
continue;
}
/* search for the previous token */
s = p - 1;
while (s >= lpath && *s != PATH_SEP)
s--;
/* search for the previous token */
s = p - 1;
while (s >= lpath && *s != PATH_SEP)
s--;
s++;
s++;
/* If the previous token is "..", we cannot collapse it */
if (s[0] == '.' && s[1] == '.' && s + 2 == p) {
p += 3;
continue;
}
/* If the previous token is "..", we cannot collapse it */
if (s[0] == '.' && s[1] == '.' && s + 2 == p) {
p += 3;
continue;
}
if (p[3] != 0) {
if (s == lpath && *s == PATH_SEP) {
/* "/../foo" -> "/foo" */
str_move (s + 1, p + 4);
if (p[3] != 0) {
if (s == lpath && *s == PATH_SEP) {
/* "/../foo" -> "/foo" */
str_move (s + 1, p + 4);
} else {
/* "token/../foo" -> "foo" */
str_move (s, p + 4);
}
p = (s > lpath) ? s - 1 : s;
continue;
}
/* trailing ".." */
if (s == lpath) {
/* "token/.." -> "." */
if (lpath[0] != PATH_SEP) {
lpath[0] = '.';
}
lpath[1] = 0;
} else {
/* "token/../foo" -> "foo" */
str_move (s, p + 4);
/* "foo/token/.." -> "foo" */
if (s == lpath + 1)
s[0] = 0;
else
s[-1] = 0;
break;
}
p = (s > lpath) ? s - 1 : s;
continue;
}
/* trailing ".." */
if (s == lpath) {
/* "token/.." -> "." */
if (lpath[0] != PATH_SEP) {
lpath[0] = '.';
}
lpath[1] = 0;
} else {
/* "foo/token/.." -> "foo" */
if (s == lpath + 1)
s[0] = 0;
else
s[-1] = 0;
break;
}
break;
}
}
void
canonicalize_pathname (char *path)
{
custom_canonicalize_pathname (path, CANON_PATH_ALL);
}
#ifdef HAVE_GET_PROCESS_STATS
# include <sys/procstats.h>

6
vfs/direntry.c
View File

@ -263,7 +263,8 @@ vfs_s_find_entry_tree (struct vfs_class *me, struct vfs_s_inode *root,
char * const pathref = g_strdup (a_path);
char *path = pathref;
canonicalize_pathname (path);
/* canonicalize as well, but don't remove '../' from path */
custom_canonicalize_pathname (path, CANON_PATH_ALL & (~CANON_PATH_RMDBLDT));
while (root) {
while (*path == PATH_SEP) /* Strip leading '/' */
@ -336,7 +337,8 @@ vfs_s_find_entry_linear (struct vfs_class *me, struct vfs_s_inode *root,
if (root->super->root != root)
vfs_die ("We have to use _real_ root. Always. Sorry.");
canonicalize_pathname (path);
/* canonicalize as well, but don't remove '../' from path */
custom_canonicalize_pathname (path, CANON_PATH_ALL & (~CANON_PATH_RMDBLDT));
if (!(flags & FL_DIR)) {
char *dirname, *name, *save;