summaryrefslogtreecommitdiff
path: root/lib/path-concat.c
diff options
context:
space:
mode:
Diffstat (limited to 'lib/path-concat.c')
-rw-r--r--lib/path-concat.c109
1 files changed, 0 insertions, 109 deletions
diff --git a/lib/path-concat.c b/lib/path-concat.c
deleted file mode 100644
index cdd4dbe..0000000
--- a/lib/path-concat.c
+++ /dev/null
@@ -1,109 +0,0 @@
-/* path-concat.c -- concatenate two arbitrary pathnames
- Copyright (C) 1996, 1997, 1998, 1999 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
- the Free Software Foundation; either version 3, 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. */
-
-/* Written by Jim Meyering. */
-
-#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
-# include <string.h>
-#endif
-#include <sys/types.h>
-
-/* char *malloc (); */
-
-#ifndef DIRECTORY_SEPARATOR
-# define DIRECTORY_SEPARATOR '/'
-#endif
-
-#ifndef ISSLASH
-# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
-#endif
-
-#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 base_len;
- size_t dir_len;
-
- if (!dir)
- {
- p_concat = strdup (base);
- if (base_in_result)
- *base_in_result = p_concat;
- return p_concat;
- }
-
- /* DIR is not empty. */
- base_len = strlen (base);
- dir_len = strlen (dir);
-
- /* This cast is a kludge for SGI IRIX with C89 */
- p_concat = (char *) malloc (dir_len + base_len + 2);
- if (!p_concat)
- return 0;
-
- p = mempcpy (p_concat, dir, dir_len);
-
- 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);
-
- 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 ();
-}