/* Return the canonical absolute name of a given file.
- Copyright (C) 1996-2006 Free Software Foundation, Inc.
+ Copyright (C) 1996-2009 Free Software Foundation, Inc.
- 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
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; see the file COPYING.
- If not, write to the Free Software Foundation,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
#include "canonicalize.h"
+#include <errno.h>
#include <stdlib.h>
#include <string.h>
-
-#if HAVE_SYS_PARAM_H
-# include <sys/param.h>
-#endif
-
#include <sys/stat.h>
-
#include <unistd.h>
-#include <errno.h>
-#include <stddef.h>
-
-#include "cycle-check.h"
-#include "filenamecat.h"
-#include "stat-macros.h"
+#include "areadlink.h"
+#include "file-set.h"
+#include "hash-triple.h"
+#include "pathmax.h"
#include "xalloc.h"
#include "xgetcwd.h"
-#ifndef ELOOP
-# define ELOOP 0
+#ifndef DOUBLE_SLASH_IS_DISTINCT_ROOT
+# define DOUBLE_SLASH_IS_DISTINCT_ROOT 0
#endif
-#ifndef __set_errno
-# define __set_errno(Val) errno = (Val)
-#endif
-
-#include "pathmax.h"
-#include "xreadlink.h"
-#if !HAVE_CANONICALIZE_FILE_NAME
+#if !((HAVE_CANONICALIZE_FILE_NAME && FUNC_REALPATH_WORKS) \
+ || GNULIB_CANONICALIZE_LGPL)
/* Return the canonical absolute name of file NAME. A canonical name
does not contain any `.', `..' components nor any repeated file name
separators ('/') or symlinks. All components must exist.
char *
canonicalize_file_name (const char *name)
{
-# if HAVE_RESOLVEPATH
-
- char *resolved, *extra_buf = NULL;
- size_t resolved_size;
- ssize_t resolved_len;
-
- if (name == NULL)
- {
- __set_errno (EINVAL);
- return NULL;
- }
-
- if (name[0] == '\0')
- {
- __set_errno (ENOENT);
- return NULL;
- }
-
- /* All known hosts with resolvepath (e.g. Solaris 7) don't turn
- relative names into absolute ones, so prepend the working
- directory if the file name is not absolute. */
- if (name[0] != '/')
- {
- char *wd;
-
- if (!(wd = xgetcwd ()))
- return NULL;
-
- extra_buf = file_name_concat (wd, name, NULL);
- name = extra_buf;
- free (wd);
- }
+ return canonicalize_filename_mode (name, CAN_EXISTING);
+}
+#endif /* !HAVE_CANONICALIZE_FILE_NAME */
- resolved_size = strlen (name);
- while (1)
+/* Return true if we've already seen the triple, <FILENAME, dev, ino>.
+ If *HT is not initialized, initialize it. */
+static bool
+seen_triple (Hash_table **ht, char const *filename, struct stat const *st)
+{
+ if (*ht == NULL)
{
- resolved_size = 2 * resolved_size + 1;
- resolved = xmalloc (resolved_size);
- resolved_len = resolvepath (name, resolved, resolved_size);
- if (resolved_len < 0)
- {
- free (resolved);
- free (extra_buf);
- return NULL;
- }
- if (resolved_len < resolved_size)
- break;
- free (resolved);
+ size_t initial_capacity = 7;
+ *ht = hash_initialize (initial_capacity,
+ NULL,
+ triple_hash,
+ triple_compare_ino_str,
+ triple_free);
+ if (*ht == NULL)
+ xalloc_die ();
}
- free (extra_buf);
-
- /* NUL-terminate the resulting name. */
- resolved[resolved_len] = '\0';
-
- return resolved;
-
-# else
+ if (seen_file (*ht, filename, st))
+ return true;
- return canonicalize_filename_mode (name, CAN_EXISTING);
-
-# endif /* !HAVE_RESOLVEPATH */
+ record_file (*ht, filename, st);
+ return false;
}
-#endif /* !HAVE_CANONICALIZE_FILE_NAME */
-/* Return the canonical absolute name of file NAME. A canonical name
+/* Return the canonical absolute name of file NAME, while treating
+ missing elements according to CAN_MODE. A canonical name
does not contain any `.', `..' components nor any repeated file name
separators ('/') or symlinks. Whether components must exist
or not depends on canonicalize mode. The result is malloc'd. */
char const *end;
char const *rname_limit;
size_t extra_len = 0;
- struct cycle_check_state cycle_state;
+ Hash_table *ht = NULL;
+ int saved_errno;
if (name == NULL)
{
- __set_errno (EINVAL);
+ errno = EINVAL;
return NULL;
}
if (name[0] == '\0')
{
- __set_errno (ENOENT);
+ errno = ENOENT;
return NULL;
}
rname_limit = rname + PATH_MAX;
rname[0] = '/';
dest = rname + 1;
+ if (DOUBLE_SLASH_IS_DISTINCT_ROOT && name[1] == '/')
+ *dest++ = '/';
}
- cycle_check_init (&cycle_state);
- for (start = end = name; *start; start = end)
+ for (start = name; *start; start = end)
{
/* Skip sequence of multiple file name separators. */
while (*start == '/')
/* Back up to previous component, ignore if at root already. */
if (dest > rname + 1)
while ((--dest)[-1] != '/');
+ if (DOUBLE_SLASH_IS_DISTINCT_ROOT && dest == rname + 1
+ && *dest == '/')
+ dest++;
}
else
{
if (lstat (rname, &st) != 0)
{
+ saved_errno = errno;
if (can_mode == CAN_EXISTING)
goto error;
- if (can_mode == CAN_ALL_BUT_LAST && *end)
- goto error;
+ if (can_mode == CAN_ALL_BUT_LAST)
+ {
+ if (end[strspn (end, "/")] || saved_errno != ENOENT)
+ goto error;
+ continue;
+ }
st.st_mode = 0;
}
char *buf;
size_t n, len;
- if (cycle_check (&cycle_state, &st))
+ /* Detect loops. We cannot use the cycle-check module here,
+ since it's actually possible to encounter the same symlink
+ more than once in a given traversal. However, encountering
+ the same symlink,NAME pair twice does indicate a loop. */
+ if (seen_triple (&ht, name, &st))
{
- __set_errno (ELOOP);
if (can_mode == CAN_MISSING)
continue;
- else
- goto error;
+ saved_errno = ELOOP;
+ goto error;
}
- buf = xreadlink (rname, st.st_size);
+ buf = areadlink_with_size (rname, st.st_size);
if (!buf)
{
- if (can_mode == CAN_MISSING)
+ if (can_mode == CAN_MISSING && errno != ENOMEM)
continue;
- else
- goto error;
+ saved_errno = errno;
+ goto error;
}
n = strlen (buf);
name = end = memcpy (extra_buf, buf, n);
if (buf[0] == '/')
- dest = rname + 1; /* It's an absolute symlink */
+ {
+ dest = rname + 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 > rname + 1)
- while ((--dest)[-1] != '/');
+ {
+ /* Back up to previous component, ignore if at root
+ already: */
+ if (dest > rname + 1)
+ while ((--dest)[-1] != '/');
+ if (DOUBLE_SLASH_IS_DISTINCT_ROOT && dest == rname + 1
+ && *dest == '/')
+ dest++;
+ }
free (buf);
}
{
if (!S_ISDIR (st.st_mode) && *end && (can_mode != CAN_MISSING))
{
- errno = ENOTDIR;
+ saved_errno = ENOTDIR;
goto error;
}
}
}
if (dest > rname + 1 && dest[-1] == '/')
--dest;
+ if (DOUBLE_SLASH_IS_DISTINCT_ROOT && dest == rname + 1 && *dest == '/')
+ dest++;
*dest = '\0';
free (extra_buf);
+ if (ht)
+ hash_free (ht);
return rname;
error:
free (extra_buf);
free (rname);
+ if (ht)
+ hash_free (ht);
+ errno = saved_errno;
return NULL;
}