From: Bruno Haible Date: Mon, 6 Nov 2006 19:18:32 +0000 (+0000) Subject: Move module 'canonicalize' to 'canonicalize-lgpl' in gnulib. X-Git-Tag: v0.17~678 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f7440a4c51c2f77b31a6cdbabc694d5eed4afd9;p=thirdparty%2Fgettext.git Move module 'canonicalize' to 'canonicalize-lgpl' in gnulib. --- diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog index 81b3c9285..748198bdf 100644 --- a/gnulib-local/ChangeLog +++ b/gnulib-local/ChangeLog @@ -1,3 +1,11 @@ +2006-11-06 Bruno Haible + + Moved canonicalize to gnulib. + * modules/canonicalize: Remove file. + * lib/canonicalize.h: Remove file. + * lib/canonicalize.c: Remove file. + * m4/canonicalize.m4: Remove file. + 2006-11-06 Bruno Haible * lib/canonicalize.h (canonicalize_file_name): Fix wrong comment diff --git a/gnulib-local/lib/canonicalize.c b/gnulib-local/lib/canonicalize.c deleted file mode 100644 index 2eadede50..000000000 --- a/gnulib-local/lib/canonicalize.c +++ /dev/null @@ -1,354 +0,0 @@ -/* Return the canonical absolute name of a given file. - Copyright (C) 1996-2003, 2005-2006 Free Software Foundation, Inc. - This file is part of the GNU C Library. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, write to the Free - Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - MA 02110-1301, USA. */ - -#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 - -#include - -/* Specification. */ -#include "canonicalize.h" - -#include -#include -#include - -#if HAVE_UNISTD_H || defined _LIBC -# include -#endif - -#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 - -#ifdef _LIBC -# include -#else -# define SHLIB_COMPAT(lib, introduced, obsoleted) 0 -# define versioned_symbol(lib, local, symbol, version) -# define compat_symbol(lib, local, symbol, version) -# define weak_alias(local, symbol) -# define __canonicalize_file_name canonicalize_file_name -# define __realpath rpl_realpath -# include "pathmax.h" -# include "allocsa.h" -# if HAVE_GETCWD -# ifdef VMS - /* We want the directory in Unix syntax, not in VMS syntax. */ -# define __getcwd(buf, max) getcwd (buf, max, 0) -# else -# define __getcwd getcwd -# endif -# else -# 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 -# endif -#endif - -/* 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 - RESOLVED is null, the result is malloc'd; otherwise, if the - canonical name is PATH_MAX chars or more, returns null with `errno' - set to ENAMETOOLONG; if the name fits in fewer than PATH_MAX chars, - returns the name in RESOLVED. If the name cannot be resolved and - RESOLVED is non-NULL, it contains the path of the first component - that cannot be resolved. If the path can be resolved, RESOLVED - holds the same value as the value returned. */ - -char * -__realpath (const char *name, char *resolved) -{ - char *rpath, *dest, *extra_buf = NULL; - const char *start, *end, *rpath_limit; - long int path_max; -#ifdef S_ISLNK - int num_links = 0; -#endif - - if (name == NULL) - { - /* As per Single Unix Specification V2 we must return an error if - either parameter is a null pointer. We extend this to allow - the RESOLVED parameter to be NULL in case the we are expected to - allocate the room for the return value. */ - __set_errno (EINVAL); - return NULL; - } - - if (name[0] == '\0') - { - /* As per Single Unix Specification V2 we must return an error if - the name argument points to an empty string. */ - __set_errno (ENOENT); - return NULL; - } - -#ifdef PATH_MAX - path_max = PATH_MAX; -#else - path_max = pathconf (name, _PC_PATH_MAX); - if (path_max <= 0) - path_max = 1024; -#endif - - if (resolved == NULL) - { - rpath = malloc (path_max); - if (rpath == NULL) - return NULL; - } - else - rpath = resolved; - rpath_limit = rpath + path_max; - - if (name[0] != '/') - { - if (!__getcwd (rpath, path_max)) - { - rpath[0] = '\0'; - goto error; - } - dest = strchr (rpath, '\0'); - } - else - { - rpath[0] = '/'; - dest = rpath + 1; - } - - for (start = end = name; *start; start = end) - { -#ifdef _LIBC - struct stat64 st; -#else - struct stat st; -#endif - - /* Skip sequence of multiple path-separators. */ - while (*start == '/') - ++start; - - /* Find end of path component. */ - for (end = start; *end && *end != '/'; ++end) - /* Nothing. */; - - if (end - start == 0) - break; - else if (end - start == 1 && start[0] == '.') - /* nothing */; - else if (end - start == 2 && start[0] == '.' && start[1] == '.') - { - /* Back up to previous component, ignore if at root already. */ - if (dest > rpath + 1) - while ((--dest)[-1] != '/'); - } - else - { - size_t new_size; - - if (dest[-1] != '/') - *dest++ = '/'; - - if (dest + (end - start) >= rpath_limit) - { - ptrdiff_t dest_offset = dest - rpath; - char *new_rpath; - - if (resolved) - { - __set_errno (ENAMETOOLONG); - if (dest > rpath + 1) - dest--; - *dest = '\0'; - goto error; - } - new_size = rpath_limit - rpath; - if (end - start + 1 > path_max) - new_size += end - start + 1; - else - new_size += path_max; - new_rpath = (char *) realloc (rpath, new_size); - if (new_rpath == NULL) - goto error; - rpath = new_rpath; - rpath_limit = rpath + new_size; - - dest = rpath + dest_offset; - } - -#ifdef _LIBC - dest = __mempcpy (dest, start, end - start); -#else - memcpy (dest, start, end - start); - dest += end - start; -#endif - *dest = '\0'; - -#ifdef _LIBC - if (__lxstat64 (_STAT_VER, rpath, &st) < 0) -#else - if (lstat (rpath, &st) < 0) -#endif - goto error; - -#ifdef S_ISLNK - if (S_ISLNK (st.st_mode)) - { - char *buf; - size_t len; - int n; - - if (++num_links > MAXSYMLINKS) - { - __set_errno (ELOOP); - goto error; - } - - buf = allocsa (path_max); - if (!buf) - { - errno = ENOMEM; - goto error; - } - - n = __readlink (rpath, buf, path_max); - if (n < 0) - { - int saved_errno = errno; - freesa (buf); - errno = saved_errno; - goto error; - } - buf[n] = '\0'; - - if (!extra_buf) - { - extra_buf = allocsa (path_max); - if (!extra_buf) - { - freesa (buf); - errno = ENOMEM; - goto error; - } - } - - len = strlen (end); - if ((long int) (n + len) >= path_max) - { - freesa (buf); - __set_errno (ENAMETOOLONG); - goto error; - } - - /* Careful here, end may be a pointer into extra_buf... */ - memmove (&extra_buf[n], end, len + 1); - name = end = memcpy (extra_buf, buf, n); - - if (buf[0] == '/') - dest = rpath + 1; /* It's an absolute symlink */ - else - /* Back up to previous component, ignore if at root already: */ - if (dest > rpath + 1) - while ((--dest)[-1] != '/'); - } -#endif - } - } - if (dest > rpath + 1 && dest[-1] == '/') - --dest; - *dest = '\0'; - - if (extra_buf) - freesa (extra_buf); - - return resolved ? memcpy (resolved, rpath, dest - rpath + 1) : rpath; - -error: - { - int saved_errno = errno; - if (extra_buf) - freesa (extra_buf); - if (resolved) - strcpy (resolved, rpath); - else - free (rpath); - errno = saved_errno; - } - return NULL; -} -#ifdef _LIBC -versioned_symbol (libc, __realpath, realpath, GLIBC_2_3); -#endif - - -#if SHLIB_COMPAT(libc, GLIBC_2_0, GLIBC_2_3) -char * -__old_realpath (const char *name, char *resolved) -{ - if (resolved == NULL) - { - __set_errno (EINVAL); - return NULL; - } - - return __realpath (name, resolved); -} -compat_symbol (libc, __old_realpath, realpath, GLIBC_2_0); -#endif - - -char * -__canonicalize_file_name (const char *name) -{ - return __realpath (name, NULL); -} -weak_alias (__canonicalize_file_name, canonicalize_file_name) - -#else - -/* This declaration is solely to ensure that after preprocessing - this file is never empty. */ -typedef int dummy; - -#endif diff --git a/gnulib-local/lib/canonicalize.h b/gnulib-local/lib/canonicalize.h deleted file mode 100644 index e54752f05..000000000 --- a/gnulib-local/lib/canonicalize.h +++ /dev/null @@ -1,21 +0,0 @@ -/* Return the canonical absolute name of a given file. - Copyright (C) 2003, 2006 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 - the Free Software Foundation; either version 2, 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 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - 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. */ - -/* Return a malloc'd string containing the canonical absolute name of the - named file. If any file name component does not exist or is a symlink - to a nonexistent file, return NULL. */ -extern char *canonicalize_file_name (const char *name); diff --git a/gnulib-local/m4/canonicalize.m4 b/gnulib-local/m4/canonicalize.m4 deleted file mode 100644 index 19df1db55..000000000 --- a/gnulib-local/m4/canonicalize.m4 +++ /dev/null @@ -1,25 +0,0 @@ -# canonicalize.m4 serial 2 (gettext-0.13) -dnl Copyright (C) 2003 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. - -AC_DEFUN([gl_CANONICALIZE], -[ - dnl Do this replacement check manually because the file name is shorter - dnl than the function name. - AC_CHECK_FUNCS(canonicalize_file_name) - if test $ac_cv_func_canonicalize_file_name = no; then - AC_LIBOBJ(canonicalize) - AC_DEFINE([realpath], [rpl_realpath], - [Define to a replacement function name for realpath().]) - gl_PREREQ_CANONICALIZE - fi -]) - -# Prerequisites of lib/canonicalize.c. -AC_DEFUN([gl_PREREQ_CANONICALIZE], -[ - AC_CHECK_HEADERS_ONCE(sys/param.h unistd.h) - AC_CHECK_FUNCS(getcwd readlink) -]) diff --git a/gnulib-local/modules/canonicalize b/gnulib-local/modules/canonicalize deleted file mode 100644 index dcdeb31de..000000000 --- a/gnulib-local/modules/canonicalize +++ /dev/null @@ -1,28 +0,0 @@ -Description: -Canonical absolute file name. - -Files: -lib/canonicalize.h -lib/canonicalize.c -m4/canonicalize.m4 - -Depends-on: -alloca-opt -allocsa -pathmax -readlink - -configure.ac: -gl_CANONICALIZE - -Makefile.am: - -Include: -"canonicalize.h" - -License: -LGPL - -Maintainer: -Bruno Haible -