X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fpath-concat.c;h=db96debad6dc1028e84de12707acd26582a8ae70;hb=0df2580e13bb5523b7f5569e9bec1fda9c812677;hp=fe70f757b0d3e63f1490b8487bcbf3cc0dcc8784;hpb=17addc5bbc18001d2ea1409bbf129243a75e1487;p=gnulib.git

diff --git a/lib/path-concat.c b/lib/path-concat.c
index fe70f757b..db96debad 100644
--- a/lib/path-concat.c
+++ b/lib/path-concat.c
@@ -1,5 +1,7 @@
 /* path-concat.c -- concatenate two arbitrary pathnames
-   Copyright (C) 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 Free
+   Software Foundation, Inc.
 
    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
@@ -21,28 +23,24 @@
 # include <config.h>
 #endif
 
+/* Specification.  */
+#include "path-concat.h"
+
 #ifndef HAVE_MEMPCPY
 # define mempcpy(D, S, N) ((void *) ((char *) memcpy (D, S, N) + (N)))
 #endif
 
 #include <stdio.h>
-#if HAVE_STRING_H
-# include <string.h>
-#endif
-#include <sys/types.h>
-
-char *malloc ();
+#include <stdlib.h>
+#include <string.h>
 
-#ifndef DIRECTORY_SEPARATOR
-# define DIRECTORY_SEPARATOR '/'
-#endif
-
-#ifndef ISSLASH
-# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
+#if HAVE_UNISTD_H
+# include <unistd.h>
 #endif
 
+#include "strdup.h"
+#include "dirname.h"
 #include "xalloc.h"
-#include "path-concat.h"
 
 /* Concatenate two pathname components, DIR and BASE, in
    newly-allocated storage and return the result.  Return 0 if out of
@@ -62,8 +60,8 @@ path_concat (const char *dir, const char *base, char **base_in_result)
 {
   char *p;
   char *p_concat;
-  size_t base_len;
-  size_t dir_len;
+  size_t baselen;
+  size_t dirlen;
 
   if (!dir)
     {
@@ -74,24 +72,28 @@ path_concat (const char *dir, const char *base, char **base_in_result)
     }
 
   /* DIR is not empty. */
-  base_len = strlen (base);
-  dir_len = strlen (dir);
+  baselen = base_len (base);
+  dirlen = strlen (dir);
 
-  p_concat = malloc (dir_len + base_len + 2);
+  p_concat = malloc (dirlen + baselen + 2);
   if (!p_concat)
     return 0;
 
-  p = mempcpy (p_concat, dir, dir_len);
+  p = mempcpy (p_concat, dir, dirlen);
 
-  if (ISSLASH (*(p - 1)) && ISSLASH(*base))
-    --p;
-  else if (!ISSLASH (*(p - 1)) && !ISSLASH(*base))
-    *p++ = DIRECTORY_SEPARATOR;
+  if (FILESYSTEM_PREFIX_LEN (dir) < dirlen)
+    {
+      if (ISSLASH (*(p - 1)) && ISSLASH (*base))
+	--p;
+      else if (!ISSLASH (*(p - 1)) && !ISSLASH (*base))
+	*p++ = DIRECTORY_SEPARATOR;
+    }
 
   if (base_in_result)
     *base_in_result = p;
 
-  memcpy (p, base, base_len + 1);
+  memcpy (p, base, baselen);
+  p[baselen] = '\0';
 
   return p_concat;
 }
@@ -102,7 +104,7 @@ char *
 xpath_concat (const char *dir, const char *base, char **base_in_result)
 {
   char *res = path_concat (dir, base, base_in_result);
-  if (res)
-    return res;
-  xalloc_die ();
+  if (! res)
+    xalloc_die ();
+  return res;
 }