openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Daniel P. Berrange 2012-05-15 16:49:26 +01:00
parent 548563956e
commit b3567ef37c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/util/util.c
View File

@ -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;
}