__dentry_prepend should not always add trailing '/'

diff --git a/tapset/dentry.stp b/tapset/dentry.stp
index 0ed50ef105bf4e873a3db8cf101744ca3665b77c..9c89d381b67861bd55b7e89084b8b8fa90289ca5 100644 (file)
--- a/tapset/dentry.stp
+++ b/tapset/dentry.stp
@@ -25,7 +25,11 @@ function __dentry_prepend:string(dentry:long,name:string)
         if (dname == "/" && c == "/")
                 return name;
 
-        return sprintf("%s/%s", dname, name);
+        if (name == "") {
+                return dname;
+        } else {
+                return sprintf("%s/%s", dname, name);
+        }
 }
 
 
@@ -115,5 +119,5 @@ function d_path:string(nd:long)
            ? @cast(nd,"nameidata")->path->mnt
            : @cast(nd,"nameidata")->mnt)
 
-       return task_dentry_path(task_current(), dentry, vfsmnt)
+       return sprintf("%s/", task_dentry_path(task_current(), dentry, vfsmnt))
 }