X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fcanonicalize-lgpl.c;h=fa310fb59554ffdf1d64a6ffa0273a105cf61e40;hb=e9b552cf52b6200633c335b19a2f703f72f8683a;hp=05ced1103b07bec32a29752e03dc55d7eb69b617;hpb=39d80bf8ebd65c9ac5e36a327216c83b6318b858;p=gnulib.git
diff --git a/lib/canonicalize-lgpl.c b/lib/canonicalize-lgpl.c
index 05ced1103..fa310fb59 100644
--- a/lib/canonicalize-lgpl.c
+++ b/lib/canonicalize-lgpl.c
@@ -1,11 +1,11 @@
/* Return the canonical absolute name of a given file.
- Copyright (C) 1996-2003, 2005-2006 Free Software Foundation, Inc.
+ Copyright (C) 1996-2009 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- This program is free software; you can redistribute it and/or modify
+ 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 2, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 of the License, 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
@@ -13,48 +13,27 @@
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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see . */
-#include
-
-/* Avoid a clash of our rpl_realpath() function with the prototype in
- on Solaris 2.5.1. */
-#undef realpath
-
-#if !HAVE_CANONICALIZE_FILE_NAME || defined _LIBC
+#ifndef _LIBC
+# include
+#endif
-#include
+#if !HAVE_CANONICALIZE_FILE_NAME || !FUNC_REALPATH_WORKS || defined _LIBC
/* Specification. */
-#include "canonicalize.h"
-
-#include
#include
-#include
-
-#if HAVE_UNISTD_H || defined _LIBC
-# include
-#endif
+#include
+#include
+#include
#include
-
#if HAVE_SYS_PARAM_H || defined _LIBC
# include
#endif
-#ifndef MAXSYMLINKS
-# define MAXSYMLINKS 20
-#endif
-
#include
-
#include
-#ifndef _LIBC
-# define __set_errno(e) errno = (e)
-# ifndef ENAMETOOLONG
-# define ENAMETOOLONG EINVAL
-# endif
-#endif
+#include
#ifdef _LIBC
# include
@@ -64,9 +43,9 @@
# define compat_symbol(lib, local, symbol, version)
# define weak_alias(local, symbol)
# define __canonicalize_file_name canonicalize_file_name
-# define __realpath rpl_realpath
+# define __realpath realpath
# include "pathmax.h"
-# include "allocsa.h"
+# include "malloca.h"
# if HAVE_GETCWD
# ifdef VMS
/* We want the directory in Unix syntax, not in VMS syntax. */
@@ -78,12 +57,21 @@
# define __getcwd(buf, max) getwd (buf)
# endif
# define __readlink readlink
- /* On systems without symbolic links, call stat() instead of lstat(). */
-# if !defined S_ISNLK && !HAVE_READLINK
-# define lstat stat
+# define __set_errno(e) errno = (e)
+# ifndef MAXSYMLINKS
+# ifdef SYMLOOP_MAX
+# define MAXSYMLINKS SYMLOOP_MAX
+# else
+# define MAXSYMLINKS 20
+# endif
# endif
#endif
+#ifndef DOUBLE_SLASH_IS_DISTINCT_ROOT
+# define DOUBLE_SLASH_IS_DISTINCT_ROOT 0
+#endif
+
+#if !FUNC_REALPATH_WORKS || defined _LIBC
/* Return the canonical absolute name of file NAME. A canonical name
does not contain any `.', `..' components nor any repeated path
separators ('/') or symlinks. All path components must exist. If
@@ -101,9 +89,7 @@ __realpath (const char *name, char *resolved)
char *rpath, *dest, *extra_buf = NULL;
const char *start, *end, *rpath_limit;
long int path_max;
-#if HAVE_READLINK
int num_links = 0;
-#endif
if (name == NULL)
{
@@ -135,7 +121,12 @@ __realpath (const char *name, char *resolved)
{
rpath = malloc (path_max);
if (rpath == NULL)
- return NULL;
+ {
+ /* It's easier to set errno to ENOMEM than to rely on the
+ 'malloc-posix' gnulib module. */
+ errno = ENOMEM;
+ return NULL;
+ }
}
else
rpath = resolved;
@@ -154,6 +145,8 @@ __realpath (const char *name, char *resolved)
{
rpath[0] = '/';
dest = rpath + 1;
+ if (DOUBLE_SLASH_IS_DISTINCT_ROOT && name[1] == '/')
+ *dest++ = '/';
}
for (start = end = name; *start; start = end)
@@ -163,6 +156,7 @@ __realpath (const char *name, char *resolved)
#else
struct stat st;
#endif
+ int n;
/* Skip sequence of multiple path-separators. */
while (*start == '/')
@@ -181,6 +175,9 @@ __realpath (const char *name, char *resolved)
/* Back up to previous component, ignore if at root already. */
if (dest > rpath + 1)
while ((--dest)[-1] != '/');
+ if (DOUBLE_SLASH_IS_DISTINCT_ROOT && dest == rpath + 1
+ && *dest == '/')
+ dest++;
}
else
{
@@ -209,7 +206,12 @@ __realpath (const char *name, char *resolved)
new_size += path_max;
new_rpath = (char *) realloc (rpath, new_size);
if (new_rpath == NULL)
- goto error;
+ {
+ /* It's easier to set errno to ENOMEM than to rely on the
+ 'realloc-posix' gnulib module. */
+ errno = ENOMEM;
+ goto error;
+ }
rpath = new_rpath;
rpath_limit = rpath + new_size;
@@ -231,12 +233,10 @@ __realpath (const char *name, char *resolved)
#endif
goto error;
-#if HAVE_READLINK
if (S_ISLNK (st.st_mode))
{
char *buf;
size_t len;
- int n;
if (++num_links > MAXSYMLINKS)
{
@@ -244,18 +244,18 @@ __realpath (const char *name, char *resolved)
goto error;
}
- buf = allocsa (path_max);
+ buf = malloca (path_max);
if (!buf)
{
errno = ENOMEM;
goto error;
}
- n = __readlink (rpath, buf, path_max);
+ n = __readlink (rpath, buf, path_max - 1);
if (n < 0)
{
int saved_errno = errno;
- freesa (buf);
+ freea (buf);
errno = saved_errno;
goto error;
}
@@ -263,10 +263,10 @@ __realpath (const char *name, char *resolved)
if (!extra_buf)
{
- extra_buf = allocsa (path_max);
+ extra_buf = malloca (path_max);
if (!extra_buf)
{
- freesa (buf);
+ freea (buf);
errno = ENOMEM;
goto error;
}
@@ -275,7 +275,7 @@ __realpath (const char *name, char *resolved)
len = strlen (end);
if ((long int) (n + len) >= path_max)
{
- freesa (buf);
+ freea (buf);
__set_errno (ENAMETOOLONG);
goto error;
}
@@ -285,44 +285,58 @@ __realpath (const char *name, char *resolved)
name = end = memcpy (extra_buf, buf, n);
if (buf[0] == '/')
- dest = rpath + 1; /* It's an absolute symlink */
+ {
+ dest = rpath + 1; /* It's an absolute symlink */
+ if (DOUBLE_SLASH_IS_DISTINCT_ROOT && buf[1] == '/')
+ *dest++ = '/';
+ }
else
- /* Back up to previous component, ignore if at root already: */
- if (dest > rpath + 1)
- while ((--dest)[-1] != '/');
+ {
+ /* Back up to previous component, ignore if at root
+ already: */
+ if (dest > rpath + 1)
+ while ((--dest)[-1] != '/');
+ if (DOUBLE_SLASH_IS_DISTINCT_ROOT && dest == rpath + 1
+ && *dest == '/')
+ dest++;
+ }
+ }
+ else if (!S_ISDIR (st.st_mode) && *end != '\0')
+ {
+ __set_errno (ENOTDIR);
+ goto error;
}
-#endif
}
}
if (dest > rpath + 1 && dest[-1] == '/')
--dest;
+ if (DOUBLE_SLASH_IS_DISTINCT_ROOT && dest == rpath + 1 && *dest == '/')
+ dest++;
*dest = '\0';
if (extra_buf)
- freesa (extra_buf);
+ freea (extra_buf);
- return resolved ? memcpy (resolved, rpath, dest - rpath + 1) : rpath;
+ return rpath;
error:
{
int saved_errno = errno;
if (extra_buf)
- freesa (extra_buf);
- if (resolved)
- strcpy (resolved, rpath);
- else
+ freea (extra_buf);
+ if (resolved == NULL)
free (rpath);
errno = saved_errno;
}
return NULL;
}
-#ifdef _LIBC
versioned_symbol (libc, __realpath, realpath, GLIBC_2_3);
-#endif
+#endif /* !FUNC_REALPATH_WORKS || defined _LIBC */
#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3)
char *
+attribute_compat_text_section
__old_realpath (const char *name, char *resolved)
{
if (resolved == NULL)