/* 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
#endif
#include <stdio.h>
-#if HAVE_STRING_H
-# include <string.h>
-#endif
-#include <sys/types.h>
+#include <stdlib.h>
+#include <string.h>
-#ifndef HAVE_DECL_MALLOC
-"this configure-time declaration test was not run"
-#endif
-#if !HAVE_DECL_MALLOC
-char *malloc ();
+#if HAVE_UNISTD_H
+# include <unistd.h>
#endif
#ifndef strdup
char *strdup ();
#endif
-#ifndef DIRECTORY_SEPARATOR
-# define DIRECTORY_SEPARATOR '/'
-#endif
-
-#ifndef ISSLASH
-# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
-#endif
-
+#include "dirname.h"
#include "xalloc.h"
#include "path-concat.h"
{
char *p;
char *p_concat;
- size_t base_len;
- size_t dir_len;
+ size_t baselen;
+ size_t dirlen;
if (!dir)
{
}
/* 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 (dir_len > 0)
+ if (FILESYSTEM_PREFIX_LEN (dir) < dirlen)
{
- if (ISSLASH (*(p - 1)) && ISSLASH(*base))
+ if (ISSLASH (*(p - 1)) && ISSLASH (*base))
--p;
- else if (!ISSLASH (*(p - 1)) && !ISSLASH(*base))
+ 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;
}
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;
}