projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Document merges from coreutils.
[gnulib.git]
/
lib
/
path-concat.c
diff --git
a/lib/path-concat.c
b/lib/path-concat.c
index
ac2c8b8
..
3a143c7
100644
(file)
--- a/
lib/path-concat.c
+++ b/
lib/path-concat.c
@@
-1,5
+1,7
@@
/* path-concat.c -- concatenate two arbitrary pathnames
/* 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 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
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,36
@@
#endif
#include <stdio.h>
#endif
#include <stdio.h>
+
#if HAVE_STRING_H
#if HAVE_STRING_H
+# if !STDC_HEADERS && HAVE_MEMORY_H
+# include <memory.h>
+# endif
# include <string.h>
# 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
#endif
-#include <sys/types.h>
+#ifndef HAVE_DECL_MALLOC
+"this configure-time declaration test was not run"
+#endif
+#if !HAVE_DECL_MALLOC
char *malloc ();
char *malloc ();
-char *strdup ();
-
-#ifndef DIRECTORY_SEPARATOR
-# define DIRECTORY_SEPARATOR '/'
#endif
#endif
-#ifndef
ISSLASH
-# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
+#ifndef
strdup
+char *strdup ();
#endif
#endif
+#include "dirname.h"
#include "xalloc.h"
#include "path-concat.h"
#include "xalloc.h"
#include "path-concat.h"
@@
-63,8
+79,8
@@
path_concat (const char *dir, const char *base, char **base_in_result)
{
char *p;
char *p_concat;
{
char *p;
char *p_concat;
- size_t base
_
len;
- size_t dir
_
len;
+ size_t baselen;
+ size_t dirlen;
if (!dir)
{
if (!dir)
{
@@
-75,24
+91,28
@@
path_concat (const char *dir, const char *base, char **base_in_result)
}
/* DIR is not empty. */
}
/* DIR is not empty. */
- base
_len = str
len (base);
- dir
_
len = strlen (dir);
+ base
len = base_
len (base);
+ dirlen = strlen (dir);
- p_concat = malloc (dir
_len + base_
len + 2);
+ p_concat = malloc (dir
len + base
len + 2);
if (!p_concat)
return 0;
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;
if (base_in_result)
*base_in_result = p;
- memcpy (p, base, base_len + 1);
+ memcpy (p, base, baselen);
+ p[baselen] = '\0';
return p_concat;
}
return p_concat;
}
@@
-103,7
+123,7
@@
char *
xpath_concat (const char *dir, const char *base, char **base_in_result)
{
char *res = path_concat (dir, base, base_in_result);
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
;
}
}