Merge branch '1605_incorrect_parsing_ftp_string'

* 1605_incorrect_parsing_ftp_string:
  Ticket #1605: Incorrect parsing FTP-string
This commit is contained in:
Slava Zanko 2009-12-22 11:08:06 +02:00
commit 204b8ac66b

View File

@ -279,7 +279,7 @@ struct vfs_class *
vfs_split (char *path, char **inpath, char **op)
{
char *semi;
char *slash;
char *slash, *at_chr;
struct vfs_class *ret;
if (!path)
@ -289,7 +289,12 @@ vfs_split (char *path, char **inpath, char **op)
if (!semi || !path_magic(path))
return NULL;
slash = strchr (semi, PATH_SEP);
at_chr = strrchr (semi, '@');
if (at_chr)
slash = strchr (at_chr, PATH_SEP);
else
slash = strchr (semi, PATH_SEP);
*semi = 0;
if (op)