X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Fconcat_path_file.c;h=9aae601a4cca7ad100a561e78e383c93c0b1f079;hb=b95636c52fbb058a39548bcbc4e86456ebbd7b7b;hp=12a57c837391ba387312641de3c0c19e72370671;hpb=c911a4389bbaa5ac85d725c8c05e452dfba8583d;p=oweals%2Fbusybox.git

diff --git a/libbb/concat_path_file.c b/libbb/concat_path_file.c
index 12a57c837..9aae601a4 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 adding '/' if path name already has '/'
 */
 
 #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;
 	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);
 }