If /dev/fd/X is a symlink and realpath() expands symlinks, /dev/fd/X

ends up pointing to the wrong place before it is passed to the client.
The path is only used internally so there is no real need for
realpath(), remove it and move the get_path function to file.c where all
the callers are.
This commit is contained in:
nicm
2019-12-16 16:39:03 +00:00
parent b4520aaf2c
commit 1bdd4828bd
3 changed files with 14 additions and 19 deletions

View File

@@ -2111,19 +2111,3 @@ server_client_get_cwd(struct client *c, struct session *s)
return (home);
return ("/");
}
/* Resolve an absolute path or relative to client working directory. */
char *
server_client_get_path(struct client *c, const char *file)
{
char *path, resolved[PATH_MAX];
if (*file == '/')
path = xstrdup(file);
else
xasprintf(&path, "%s/%s", server_client_get_cwd(c, NULL), file);
if (realpath(path, resolved) == NULL)
return (path);
free(path);
return (xstrdup(resolved));
}