aboutsummaryrefslogtreecommitdiff
path: root/libbb/concat_path_file.c
diff options
context:
space:
mode:
authorsandman <sandman@69ca8d6d-28ef-0310-b511-8ec308f3f277>2002-07-19 00:05:54 +0000
committersandman <sandman@69ca8d6d-28ef-0310-b511-8ec308f3f277>2002-07-19 00:05:54 +0000
commit88c37e3b6514ce684e6f5f38282176f34fc73d0d (patch)
tree945ff88bbbde5a32c2b3342b22d801be90ea40f2 /libbb/concat_path_file.c
parentd4dbffaf02bf1c39047688988c44c8d60277a76a (diff)
downloadbusybox-w32-88c37e3b6514ce684e6f5f38282176f34fc73d0d.tar.gz
busybox-w32-88c37e3b6514ce684e6f5f38282176f34fc73d0d.tar.bz2
busybox-w32-88c37e3b6514ce684e6f5f38282176f34fc73d0d.zip
Applied vodz' patches #49 and #50 (with a small correction in runshell.c)
#49: I found one memory overflow and memory leak in "ln" applet. Last patch reduced also 54 bytes. ;) #50: I found bug in loginutils/Makefile.in. New patch have also new function to libbb and aplied this to applets and other cosmetic changes. git-svn-id: svn://busybox.net/trunk/busybox@5066 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'libbb/concat_path_file.c')
-rw-r--r--libbb/concat_path_file.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libbb/concat_path_file.c b/libbb/concat_path_file.c
index e62b99ef6..0146606a1 100644
--- a/libbb/concat_path_file.c
+++ b/libbb/concat_path_file.c
@@ -38,8 +38,7 @@ extern char *concat_path_file(const char *path, const char *filename)
38 lc = last_char_is(path, '/'); 38 lc = last_char_is(path, '/');
39 while (*filename == '/') 39 while (*filename == '/')
40 filename++; 40 filename++;
41 outbuf = xmalloc(strlen(path)+strlen(filename)+1+(lc==NULL)); 41 bb_asprintf(&outbuf, "%s%s%s", path, (lc==NULL)? "/" : "", filename);
42 sprintf(outbuf, "%s%s%s", path, (lc==NULL)? "/" : "", filename);
43 42
44 return outbuf; 43 return outbuf;
45} 44}