From 044a72d0d50bb7380601232d1388453f01fff622 Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Fri, 4 May 2001 22:04:24 +0000 Subject: 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 --- libbb/concat_path_file.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'libbb/concat_path_file.c') 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; -- cgit v1.2.3