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 12a57c837391ba387312641de3c0c19e72370671..fb533547eb28fce402900240f7fe6f2a366c0556 100644 (file)
--- a/libbb/concat_path_file.c
+++ b/libbb/concat_path_file.c
@@ -1,22 +1,29 @@
+/* vi: set sw=4 ts=4: */
 /*
- * busybox library eXtendet funcion
+ * Utility routines.
  *
- * concatenate path and file name to new allocation buffer,
- * not addition '/' if path name already have '/'
+ * Copyright (C) many different people.
+ * If you wrote this, please acknowledge your work.
  *
-*/
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
+ */
+
+/* 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 "libbb.h"
 
-extern char *concat_path_file(const char *path, const char *filename)
+char* FAST_FUNC concat_path_file(const char *path, const char *filename)
 {
-       char *outbuf;
        char *lc;
-       
+
+       if (!path)
+               path = "";
        lc = last_char_is(path, '/');
-       if (filename[0] == '/')
+       while (*filename == '/')
                filename++;
-       outbuf = xmalloc(strlen(path)+strlen(filename)+1+(lc==NULL));
-       sprintf(outbuf, (lc==NULL ? "%s/%s" : "%s%s"), path, filename);
-       return outbuf;
+       return xasprintf("%s%s%s", path, (lc==NULL ? "/" : ""), filename);
 }