X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libbb%2Fconcat_path_file.c;h=ef0d3282dfc310530e3a7acd272e75cf80494fb9;hb=ddec5af6b0803c7434a1cc2fdee5cb9873fe6bd0;hp=00233ad9a37ebead3703e9d0b3d4f27afd204da6;hpb=9dc93ac5612a5439d1be71a0224817f509141b81;p=oweals%2Fbusybox.git

diff --git a/libbb/concat_path_file.c b/libbb/concat_path_file.c
index 00233ad9a..ef0d3282d 100644
--- a/libbb/concat_path_file.c
+++ b/libbb/concat_path_file.c
@@ -5,32 +5,17 @@
  * Copyright (C) many different people.
  * If you wrote this, please acknowledge your work.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- * USA
+ * 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 <string.h>
 #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)
@@ -38,7 +23,5 @@ extern char *concat_path_file(const char *path, const char *filename)
 	lc = last_char_is(path, '/');
 	while (*filename == '/')
 		filename++;
-	bb_xasprintf(&outbuf, "%s%s%s", path, (lc==NULL ? "/" : ""), filename);
-
-	return outbuf;
+	return xasprintf("%s%s%s", path, (lc==NULL ? "/" : ""), filename);
 }