aboutsummaryrefslogtreecommitdiff
path: root/libbb/concat_path_file.c
diff options
context:
space:
mode:
authorvodz <vodz@69ca8d6d-28ef-0310-b511-8ec308f3f277>2005-09-29 16:18:57 +0000
committervodz <vodz@69ca8d6d-28ef-0310-b511-8ec308f3f277>2005-09-29 16:18:57 +0000
commitf18b720f9a960d701f8d32a199e8b2a3975f9d6c (patch)
tree5b3a1d569d1e952d8c43899050dca4d6c47bf176 /libbb/concat_path_file.c
parent7c8bf4a0ff3205a5ee8d9a6292036d905db3c479 (diff)
downloadbusybox-w32-f18b720f9a960d701f8d32a199e8b2a3975f9d6c.tar.gz
busybox-w32-f18b720f9a960d701f8d32a199e8b2a3975f9d6c.tar.bz2
busybox-w32-f18b720f9a960d701f8d32a199e8b2a3975f9d6c.zip
change interface to bb_xasprintf() - more perfect for me.
ln.c: error_msg(str)->error_msg(%s, str) - remove standart "feature" for hackers reduce 100 bytes don't care in sum git-svn-id: svn://busybox.net/trunk/busybox@11694 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'libbb/concat_path_file.c')
-rw-r--r--libbb/concat_path_file.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/libbb/concat_path_file.c b/libbb/concat_path_file.c
index 00233ad9a..029c23272 100644
--- a/libbb/concat_path_file.c
+++ b/libbb/concat_path_file.c
@@ -30,7 +30,6 @@
30 30
31extern char *concat_path_file(const char *path, const char *filename) 31extern char *concat_path_file(const char *path, const char *filename)
32{ 32{
33 char *outbuf;
34 char *lc; 33 char *lc;
35 34
36 if (!path) 35 if (!path)
@@ -38,7 +37,5 @@ extern char *concat_path_file(const char *path, const char *filename)
38 lc = last_char_is(path, '/'); 37 lc = last_char_is(path, '/');
39 while (*filename == '/') 38 while (*filename == '/')
40 filename++; 39 filename++;
41 bb_xasprintf(&outbuf, "%s%s%s", path, (lc==NULL ? "/" : ""), filename); 40 return bb_xasprintf("%s%s%s", path, (lc==NULL ? "/" : ""), filename);
42
43 return outbuf;
44} 41}