merge post-1.3.0 fixes

[oweals/busybox.git] / libbb / concat_path_file.c

diff --git a/libbb/concat_path_file.c b/libbb/concat_path_file.c
index 415b6a2fb48d42d2b35b3e6dfc0b7d3234caccb4..9aae601a4cca7ad100a561e78e383c93c0b1f079 100644 (file)
--- a/libbb/concat_path_file.c
+++ b/libbb/concat_path_file.c
@@ -9,10 +9,9 @@
  */
 
 /* concatenate path and file name to new allocation buffer,
- * not addition '/' if path name already have '/'
+ * not adding '/' if path name already has '/'
 */
 
-#include <string.h>
 #include "libbb.h"
 
 char *concat_path_file(const char *path, const char *filename)
@@ -24,5 +23,5 @@ char *concat_path_file(const char *path, const char *filename)
        lc = last_char_is(path, '/');
        while (*filename == '/')
                filename++;
-       return bb_xasprintf("%s%s%s", path, (lc==NULL ? "/" : ""), filename);
+       return xasprintf("%s%s%s", path, (lc==NULL ? "/" : ""), filename);
 }