Start 1.33.0 development cycle

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

diff --git a/libbb/concat_path_file.c b/libbb/concat_path_file.c
index 9aae601a4cca7ad100a561e78e383c93c0b1f079..5b4b7f113110abe51823c57a376bc1c8311e804f 100644 (file)
--- a/libbb/concat_path_file.c
+++ b/libbb/concat_path_file.c
@@ -5,16 +5,17 @@
  * 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.
+ * Licensed under GPLv2 or later, see file LICENSE in this source tree.
  */
-
-/* concatenate path and file name to new allocation buffer,
- * not adding '/' if path name already has '/'
-*/
-
 #include "libbb.h"
 
-char *concat_path_file(const char *path, const char *filename)
+/* 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.
+ */
+
+char* FAST_FUNC concat_path_file(const char *path, const char *filename)
 {
        char *lc;