X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Fconcat_path_file.c;h=ef0d3282dfc310530e3a7acd272e75cf80494fb9;hb=ddec5af6b0803c7434a1cc2fdee5cb9873fe6bd0;hp=6b7abf24ba9508a61099a89faa099f3070e266da;hpb=4ad13e5d957ae85b3a6a61fce7b58a661adb2b1c;p=oweals%2Fbusybox.git

diff --git a/libbb/concat_path_file.c b/libbb/concat_path_file.c
index 6b7abf24b..ef0d3282d 100644
--- a/libbb/concat_path_file.c
+++ b/libbb/concat_path_file.c
@@ -1,22 +1,27 @@
+/* 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 file name to new allocation buffer,
+ * not addition '/' if path name already have '/'
 */
 
 #include "libbb.h"
 
-extern char *concat_path_file(const char *path, const char *filename)
+char *concat_path_file(const char *path, const char *filename)
 {
-	char *outbuf;
-	const char *lc;
-	
-	lc = last_char_is((char*)path, '/');
-	if (filename[0] == '/')
+	char *lc;
+
+	if (!path)
+		path = "";
+	lc = last_char_is(path, '/');
+	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);
 }