Larry suggested using concat_path_file() would be an even safer bet

for 'which'.  I ageed, so I whipped this up -- which revealed a bug in
concat_path_file.  It turns out that that a '/' can be appended from
either the path _or_ the filename, but only the former was checked.
 -Erik


git-svn-id: svn://busybox.net/trunk/busybox@2536 69ca8d6d-28ef-0310-b511-8ec308f3f277

1 files changed, 3 insertions, 1 deletions

diff --git a/libbb/concat_path_file.c b/libbb/concat_path_file.c
index d53dc0e2e..ce92310ea 100644
--- a/libbb/concat_path_file.c
+++ b/libbb/concat_path_file.c
@@ -15,9 +15,11 @@ extern char *concat_path_file(const char *path, const char *filename)
         int  flg_slash = 1;
 
         l = strlen(path);
-        if(l>0 && path[l-1] == '/')
+        if (l>0 && path[l-1] == '/')
                 flg_slash--;
         l += strlen(filename);
+        if (l>0 && filename[0] == '/')
+                flg_slash--;
         outbuf = xmalloc(l+1+flg_slash);
         sprintf(outbuf, (flg_slash ? "%s/%s" : "%s%s"), path, filename);
         return outbuf;