From 0adcc6f7b2fdfdb14c560ad967ef0e61db3e2fde Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <miklos@szeredi.hu>
Date: Fri, 10 Dec 2004 11:55:25 +0000
Subject: fix

---
 util/fusermount.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'util/fusermount.c')

diff --git a/util/fusermount.c b/util/fusermount.c
index 77e808e..40df490 100644
--- a/util/fusermount.c
+++ b/util/fusermount.c
@@ -817,8 +817,13 @@ static char *resolve_path(const char *orig)
         dst = strdup(buf);
     else {
         dst = (char *) malloc(strlen(buf) + 1 + strlen(lastcomp) + 1);
-        if (dst)
-            sprintf(dst, "%s/%s", buf, lastcomp);
+        if (dst) {
+            unsigned buflen = strlen(buf);
+            if (buflen && buf[buflen-1] == '/')
+                sprintf(dst, "%s%s", buf, lastcomp);
+            else
+                sprintf(dst, "%s/%s", buf, lastcomp);
+        }
     }
     free(copy);
     if (dst == NULL)
-- 
cgit v1.2.3