On 15.05.2012 17:51, Daniel P. Berrange wrote:
> From: "Daniel P. Berrange" <berrange@xxxxxxxxxx>
>
> 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@xxxxxxxxxx>
> ---
> src/util/util.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/src/util/util.c b/src/util/util.c
> index ec55118..ee48504 100644
> --- a/src/util/util.c
> +++ b/src/util/util.c
> @@ -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;
> }
Yeah, i've noticed it too, but you were faster.
ACK
Michal
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list