/* path-concat.c -- concatenate two arbitrary pathnames
- Copyright (C) 1996 Free Software Foundation, Inc.
+ Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001 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
/* Written by Jim Meyering. */
-#ifdef HAVE_CONFIG_H
-#include <config.h>
+#if HAVE_CONFIG_H
+# include <config.h>
#endif
+#ifndef HAVE_MEMPCPY
+# define mempcpy(D, S, N) ((void *) ((char *) memcpy (D, S, N) + (N)))
+#endif
+
+#include <stdio.h>
+
+#if HAVE_STRING_H
+# if !STDC_HEADERS && HAVE_MEMORY_H
+# include <memory.h>
+# endif
+# include <string.h>
+#else
+# if HAVE_STRINGS_H
+# include <strings.h>
+# endif
+#endif
+#if HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
+#if HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+#ifndef HAVE_DECL_MALLOC
+"this configure-time declaration test was not run"
+#endif
+#if !HAVE_DECL_MALLOC
char *malloc ();
-char *stpcpy ();
+#endif
+
+#ifndef strdup
+char *strdup ();
+#endif
-/* Concatenate two pathname components, DIR and BASE, in newly-allocated
- storage and return the result. Return 0 if out of memory. Add a slash
- between DIR and BASE in the result if neither would contribute one.
- If each would contribute at least one, elide one from the end of DIR.
- Otherwise, simply concatenate DIR and BASE. In any case, if
- BASE_IN_RESULT is non-NULL, set *BASE_IN_RESULT to point to the copy of
- BASE in the returned concatenation. */
+#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
+ memory. Add a slash between DIR and BASE in the result if neither
+ would contribute one. If each would contribute at least one, elide
+ one from the end of DIR. Otherwise, simply concatenate DIR and
+ BASE. In any case, if BASE_IN_RESULT is non-NULL, set
+ *BASE_IN_RESULT to point to the copy of BASE in the returned
+ concatenation.
+
+ DIR may be NULL, BASE must not be.
+
+ Return NULL if memory is exhausted. */
char *
path_concat (const char *dir, const char *base, char **base_in_result)
{
char *p;
char *p_concat;
+ size_t baselen;
+ size_t dirlen;
+
+ if (!dir)
+ {
+ p_concat = strdup (base);
+ if (base_in_result)
+ *base_in_result = p_concat;
+ return p_concat;
+ }
+
+ /* DIR is not empty. */
+ baselen = base_len (base);
+ dirlen = strlen (dir);
- p_concat = malloc (strlen (dir) + strlen (base) + 2);
+ p_concat = malloc (dirlen + baselen + 2);
if (!p_concat)
return 0;
- p = stpcpy (p_concat, dir);
+ p = mempcpy (p_concat, dir, dirlen);
- if (*(p - 1) == '/' && *base == '/')
- --p;
- else if (*(p - 1) != '/' && *base != '/')
- p = stpcpy (p, "/");
+ 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;
- stpcpy (p, base);
+ memcpy (p, base, baselen);
+ p[baselen] = '\0';
return p_concat;
}
+
+/* Same, but die when memory is exhausted. */
+
+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 ();
+}