lineedit: do not hang on error, but return error indicator.

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

diff --git a/libbb/concat_path_file.c b/libbb/concat_path_file.c
index ef0d3282dfc310530e3a7acd272e75cf80494fb9..9ed295996db365b7ab561439daf1b61745547676 100644 (file)
--- a/libbb/concat_path_file.c
+++ b/libbb/concat_path_file.c
@@ -5,16 +5,18 @@
  * 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 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 "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;