From: Daniel P. Berrange <berrange@redhat.com>
Date: Tue, 15 May 2012 15:49:26 +0000 (+0100)
Subject: Remove redundant trailing slash in user dir paths
X-Git-Tag: v0.9.13-rc1~265
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3567ef37c29f293cce982e7bb52d2b4e51438ab;p=thirdparty%2Flibvirt.git

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>
---

diff --git a/src/util/util.c b/src/util/util.c
index ec55118cdd..ee48504b72 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;
         }