From 3e13713e87d25fb82979bcc4272dbe0029898578 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 21 Jul 2011 08:26:04 +0000 Subject: [PATCH] scstadmin: Modify make_path() such that there is only a single leading slash at the start of absolute paths and such that it does not convert relative paths into absolute paths. git-svn-id: http://svn.code.sf.net/p/scst/svn/trunk@3703 d57e44dd-8a1f-0410-8b47-8ef2f437770f --- scstadmin/scstadmin.sysfs/scst-0.9.00/lib/SCST/SCST.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scstadmin/scstadmin.sysfs/scst-0.9.00/lib/SCST/SCST.pm b/scstadmin/scstadmin.sysfs/scst-0.9.00/lib/SCST/SCST.pm index 9550b8116..6bc9b1482 100644 --- a/scstadmin/scstadmin.sysfs/scst-0.9.00/lib/SCST/SCST.pm +++ b/scstadmin/scstadmin.sysfs/scst-0.9.00/lib/SCST/SCST.pm @@ -3850,7 +3850,10 @@ sub make_path { my $path; foreach my $element (@_) { - $path .= "/$element"; + if ($path && rindex($path, '/') != length($path) - 1) { + $path .= '/'; + } + $path .= $element; } return $path;