projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(jm_ICONV): Recommend GNU libiconv.
[gnulib.git]
/
lib
/
path-concat.c
diff --git
a/lib/path-concat.c
b/lib/path-concat.c
index
d6dafc9
..
e6f44d3
100644
(file)
--- a/
lib/path-concat.c
+++ b/
lib/path-concat.c
@@
-1,5
+1,5
@@
/* 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
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,12
+26,31
@@
#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 ();
+#endif
+
#ifndef strdup
char *strdup ();
#endif
#ifndef strdup
char *strdup ();
#endif
@@
-40,6
+59,10
@@
char *strdup ();
# define DIRECTORY_SEPARATOR '/'
#endif
# define DIRECTORY_SEPARATOR '/'
#endif
+#ifndef FILESYSTEM_PREFIX_LEN
+# define FILESYSTEM_PREFIX_LEN(Filename) 0
+#endif
+
#ifndef ISSLASH
# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
#endif
#ifndef ISSLASH
# define ISSLASH(C) ((C) == DIRECTORY_SEPARATOR)
#endif
@@
-86,11
+109,11
@@
path_concat (const char *dir, const char *base, char **base_in_result)
p = mempcpy (p_concat, dir, dir_len);
p = mempcpy (p_concat, dir, dir_len);
- if (dir_len >
0
)
+ if (dir_len >
FILESYSTEM_PREFIX_LEN (dir)
)
{
{
- if (ISSLASH (*(p - 1)) && ISSLASH(*base))
+ if (ISSLASH (*(p - 1)) && ISSLASH
(*base))
--p;
--p;
- else if (!ISSLASH (*(p - 1)) && !ISSLASH(*base))
+ else if (!ISSLASH (*(p - 1)) && !ISSLASH
(*base))
*p++ = DIRECTORY_SEPARATOR;
}
*p++ = DIRECTORY_SEPARATOR;
}