Fixes so "make allnoconfig" works again.

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

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