diff options
Diffstat (limited to 'lib/canonicalize.c')
| -rw-r--r-- | lib/canonicalize.c | 77 |
1 files changed, 53 insertions, 24 deletions
diff --git a/lib/canonicalize.c b/lib/canonicalize.c index 583c1a4a..6a39a022 100644 --- a/lib/canonicalize.c +++ b/lib/canonicalize.c @@ -1,5 +1,5 @@ /* Return the canonical absolute name of a given file. - Copyright (C) 1996-2012 Free Software Foundation, Inc. + Copyright (C) 1996-2013 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 @@ -30,6 +30,7 @@ #include "pathmax.h" #include "xalloc.h" #include "xgetcwd.h" +#include "dosname.h" #define MULTIPLE_BITS_SET(i) (((i) & ((i) - 1)) != 0) @@ -43,6 +44,12 @@ # define DOUBLE_SLASH_IS_DISTINCT_ROOT 0 #endif +#if ISSLASH ('\\') +# define SLASHES "/\\" +#else +# define SLASHES "/" +#endif + #if !((HAVE_CANONICALIZE_FILE_NAME && FUNC_REALPATH_WORKS) \ || GNULIB_CANONICALIZE_LGPL) /* Return the canonical absolute name of file NAME. A canonical name @@ -99,9 +106,10 @@ canonicalize_filename_mode (const char *name, canonicalize_mode_t can_mode) Hash_table *ht = NULL; int saved_errno; int can_flags = can_mode & ~CAN_MODE_MASK; - can_mode &= CAN_MODE_MASK; bool logical = can_flags & CAN_NOLINKS; - /* Perhaps in future we might support CAN_NOALLOC with CAN_NOLINKS. */ + size_t prefix_len; + + can_mode &= CAN_MODE_MASK; if (MULTIPLE_BITS_SET (can_mode)) { @@ -121,7 +129,11 @@ canonicalize_filename_mode (const char *name, canonicalize_mode_t can_mode) return NULL; } - if (name[0] != '/') + /* This is always zero for Posix hosts, but can be 2 for MS-Windows + and MS-DOS X:/foo/bar file names. */ + prefix_len = FILE_SYSTEM_PREFIX_LEN (name); + + if (!IS_ABSOLUTE_FILE_NAME (name)) { rname = xgetcwd (); if (!rname) @@ -138,29 +150,37 @@ canonicalize_filename_mode (const char *name, canonicalize_mode_t can_mode) { rname_limit = dest; } + start = name; + prefix_len = FILE_SYSTEM_PREFIX_LEN (rname); } else { rname = xmalloc (PATH_MAX); rname_limit = rname + PATH_MAX; - rname[0] = '/'; - dest = rname + 1; + dest = rname; + if (prefix_len) + { + memcpy (rname, name, prefix_len); + dest += prefix_len; + } + *dest++ = '/'; if (DOUBLE_SLASH_IS_DISTINCT_ROOT) { - if (name[1] == '/' && name[2] != '/') + if (ISSLASH (name[1]) && !ISSLASH (name[2]) && !prefix_len) *dest++ = '/'; *dest = '\0'; } + start = name + prefix_len; } - for (start = name; *start; start = end) + for ( ; *start; start = end) { /* Skip sequence of multiple file name separators. */ - while (*start == '/') + while (ISSLASH (*start)) ++start; /* Find end of component. */ - for (end = start; *end && *end != '/'; ++end) + for (end = start; *end && !ISSLASH (*end); ++end) /* Nothing. */; if (end - start == 0) @@ -170,17 +190,18 @@ canonicalize_filename_mode (const char *name, canonicalize_mode_t can_mode) else if (end - start == 2 && start[0] == '.' && start[1] == '.') { /* Back up to previous component, ignore if at root already. */ - if (dest > rname + 1) - while ((--dest)[-1] != '/'); + if (dest > rname + prefix_len + 1) + for (--dest; dest > rname && !ISSLASH (dest[-1]); --dest) + continue; if (DOUBLE_SLASH_IS_DISTINCT_ROOT && dest == rname + 1 - && *dest == '/' && dest[1] != '/') + && !prefix_len && ISSLASH (*dest) && !ISSLASH (dest[1])) dest++; } else { struct stat st; - if (dest[-1] != '/') + if (!ISSLASH (dest[-1])) *dest++ = '/'; if (dest + (end - start) >= rname_limit) @@ -216,7 +237,7 @@ canonicalize_filename_mode (const char *name, canonicalize_mode_t can_mode) goto error; if (can_mode == CAN_ALL_BUT_LAST) { - if (end[strspn (end, "/")] || saved_errno != ENOENT) + if (end[strspn (end, SLASHES)] || saved_errno != ENOENT) goto error; continue; } @@ -268,24 +289,32 @@ canonicalize_filename_mode (const char *name, canonicalize_mode_t can_mode) memmove (&extra_buf[n], end, len + 1); name = end = memcpy (extra_buf, buf, n); - if (buf[0] == '/') + if (IS_ABSOLUTE_FILE_NAME (buf)) { - dest = rname + 1; /* It's an absolute symlink */ + size_t pfxlen = FILE_SYSTEM_PREFIX_LEN (buf); + + if (pfxlen) + memcpy (rname, buf, pfxlen); + dest = rname + pfxlen; + *dest++ = '/'; /* It's an absolute symlink */ if (DOUBLE_SLASH_IS_DISTINCT_ROOT) { - if (buf[1] == '/' && buf[2] != '/') + if (ISSLASH (buf[1]) && !ISSLASH (buf[2]) && !pfxlen) *dest++ = '/'; *dest = '\0'; } + /* Install the new prefix to be in effect hereafter. */ + prefix_len = pfxlen; } else { /* Back up to previous component, ignore if at root already: */ - if (dest > rname + 1) - while ((--dest)[-1] != '/'); + if (dest > rname + prefix_len + 1) + for (--dest; dest > rname && !ISSLASH (dest[-1]); --dest) + continue; if (DOUBLE_SLASH_IS_DISTINCT_ROOT && dest == rname + 1 - && *dest == '/' && dest[1] != '/') + && ISSLASH (*dest) && !ISSLASH (dest[1]) && !prefix_len) dest++; } @@ -301,10 +330,10 @@ canonicalize_filename_mode (const char *name, canonicalize_mode_t can_mode) } } } - if (dest > rname + 1 && dest[-1] == '/') + if (dest > rname + prefix_len + 1 && ISSLASH (dest[-1])) --dest; - if (DOUBLE_SLASH_IS_DISTINCT_ROOT && dest == rname + 1 - && *dest == '/' && dest[1] != '/') + if (DOUBLE_SLASH_IS_DISTINCT_ROOT && dest == rname + 1 && !prefix_len + && ISSLASH (*dest) && !ISSLASH (dest[1])) dest++; *dest = '\0'; if (rname_limit != dest + 1) |