mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2025-03-07 17:28:15 +00:00
Remove redundant trailing slash in user dir paths
Callers of virGetUser{Config,Runtime,Cache}Directory all append further path component. We should not be adding a trailing slash in the return path otherwise we get paths containing '//' Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
parent
548563956e
commit
b3567ef37c
@ -2320,10 +2320,10 @@ static char *virGetXDGDirectory(uid_t uid, const char *xdgenvname, const char *x
|
||||
path = getenv(xdgenvname);
|
||||
|
||||
if (path && path[0]) {
|
||||
if (virAsprintf(&ret, "%s/libvirt/", path) < 0)
|
||||
if (virAsprintf(&ret, "%s/libvirt", path) < 0)
|
||||
goto no_memory;
|
||||
} else {
|
||||
if (virAsprintf(&ret, "%s/%s/libvirt/", home, xdgdefdir) < 0)
|
||||
if (virAsprintf(&ret, "%s/%s/libvirt", home, xdgdefdir) < 0)
|
||||
goto no_memory;
|
||||
}
|
||||
|
||||
@ -2357,7 +2357,7 @@ char *virGetUserRuntimeDirectory(uid_t uid)
|
||||
} else {
|
||||
char *ret;
|
||||
|
||||
if (virAsprintf(&ret, "%s/libvirt/", path) < 0) {
|
||||
if (virAsprintf(&ret, "%s/libvirt", path) < 0) {
|
||||
virReportOOMError();
|
||||
return NULL;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user