From 4ad13e5d957ae85b3a6a61fce7b58a661adb2b1c Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Mon, 7 May 2001 23:01:32 +0000
Subject: A patch from Vladimir to simplify concat_path_file() and make it less
likely to break.
---
libbb/concat_path_file.c | 18 +++++++-----------
1 file changed, 7 insertions(+), 11 deletions(-)
(limited to 'libbb/concat_path_file.c')
diff --git a/libbb/concat_path_file.c b/libbb/concat_path_file.c
index ce92310ea..6b7abf24b 100644
--- a/libbb/concat_path_file.c
+++ b/libbb/concat_path_file.c
@@ -11,16 +11,12 @@
extern char *concat_path_file(const char *path, const char *filename)
{
char *outbuf;
- int l;
- int flg_slash = 1;
-
- l = strlen(path);
- 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);
+ const char *lc;
+
+ lc = last_char_is((char*)path, '/');
+ if (filename[0] == '/')
+ filename++;
+ outbuf = xmalloc(strlen(path)+strlen(filename)+1+(lc==NULL));
+ sprintf(outbuf, (lc==NULL ? "%s/%s" : "%s%s"), path, filename);
return outbuf;
}
--
cgit v1.2.3-55-g6feb