X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fpath-concat.c;h=7f3bc5a494bf59deaf144c8a0550191bb84b1812;hb=87538f0d5dfb46f213de5dfe7ea9ac07bb4c0c9e;hp=ac2c8b8d512563e3299eb65f1ba698238f2e8bf6;hpb=e704e54e6aef6e1a319b727a1d6c847f0fec74aa;p=gnulib.git

diff --git a/lib/path-concat.c b/lib/path-concat.c
index ac2c8b8d5..7f3bc5a49 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, 2000 Free Software Foundation, Inc.
+
+   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 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
@@ -26,22 +28,18 @@
 #endif
 
 #include <stdio.h>
-#if HAVE_STRING_H
-# include <string.h>
-#endif
-#include <sys/types.h>
-
-char *malloc ();
-char *strdup ();
+#include <stdlib.h>
+#include <string.h>
 
-#ifndef DIRECTORY_SEPARATOR
-# define DIRECTORY_SEPARATOR '/'
+#if HAVE_UNISTD_H
+# include <unistd.h>
 #endif
 
-#ifndef ISSLASH
-# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
+#ifndef strdup
+char *strdup ();
 #endif
 
+#include "dirname.h"
 #include "xalloc.h"
 #include "path-concat.h"
 
@@ -63,8 +61,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)
     {
@@ -75,24 +73,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;
 }
@@ -103,7 +105,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;
 }