Bump to version 1.22.1

[platform/upstream/busybox.git] / libbb / concat_path_file.c

diff --git a/libbb/concat_path_file.c b/libbb/concat_path_file.c
index d53dc0e..9ed2959 100644 (file)
--- a/libbb/concat_path_file.c
+++ b/libbb/concat_path_file.c
@@ -1,24 +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 source tree.
+ */
+
+/* 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;
-       int  l;
-       int  flg_slash = 1;
+       char *lc;
 
-       l = strlen(path);
-       if(l>0 && path[l-1] == '/')
-               flg_slash--;
-       l += strlen(filename);
-       outbuf = xmalloc(l+1+flg_slash);
-       sprintf(outbuf, (flg_slash ? "%s/%s" : "%s%s"), path, filename);
-       return outbuf;
+       if (!path)
+               path = "";
+       lc = last_char_is(path, '/');
+       while (*filename == '/')
+               filename++;
+       return xasprintf("%s%s%s", path, (lc==NULL ? "/" : ""), filename);
 }