init: fix logically inverted FEATURE_EXTRA_QUIET check

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

diff --git a/libbb/concat_path_file.c b/libbb/concat_path_file.c
index 415b6a2fb48d42d2b35b3e6dfc0b7d3234caccb4..fb533547eb28fce402900240f7fe6f2a366c0556 100644 (file)
--- a/libbb/concat_path_file.c
+++ b/libbb/concat_path_file.c
@@ -8,14 +8,15 @@
  * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
  */
 
-/* concatenate path and file name to new allocation buffer,
- * not addition '/' if path name already have '/'
-*/
+/* Concatenate path and filename to new allocated buffer.
+ * Add '/' only as needed (no duplicate // are produced).
+ * If path is NULL, it is assumed to be "/".
+ * filename should not be NULL.
+ */
 
-#include <string.h>
 #include "libbb.h"
 
-char *concat_path_file(const char *path, const char *filename)
+char* FAST_FUNC concat_path_file(const char *path, const char *filename)
 {
        char *lc;
 
@@ -24,5 +25,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);
 }