From 8dc56b535f9b8f9498babf86cdb88df81f6b982a Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Tue, 19 Jun 2007 06:43:37 +0000 Subject: [PATCH] xreadlink-with-size: Remove module. No longer used. Ex-callers now use xreadlink or mreadlink-with-size. * modules/xreadlink-with-size: Remove module. * lib/xreadlink-with-size.c: Remove file. * lib/xreadlink.h (xreadlink_with_size): Remove prototype. (xreadlink): Remove inaccurate comment. The one in xreadlink.c, just before the function definition *is* accurate. --- ChangeLog | 8 ++++ lib/xreadlink-with-size.c | 105 -------------------------------------------- lib/xreadlink.h | 10 ----- modules/xreadlink-with-size | 26 ----------- 4 files changed, 8 insertions(+), 141 deletions(-) delete mode 100644 lib/xreadlink-with-size.c delete mode 100644 modules/xreadlink-with-size diff --git a/ChangeLog b/ChangeLog index 07db54214..8676d2e42 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2007-06-19 Jim Meyering + xreadlink-with-size: Remove module. No longer used. + Ex-callers now use xreadlink or mreadlink-with-size. + * modules/xreadlink-with-size: Remove module. + * lib/xreadlink-with-size.c: Remove file. + * lib/xreadlink.h (xreadlink_with_size): Remove prototype. + (xreadlink): Remove inaccurate comment. The one in xreadlink.c, + just before the function definition *is* accurate. + Eliminate one way canonicalize_filename_mode could exit. * lib/canonicalize.c (canonicalize_filename_mode): Use mreadlink_with_size, not xreadlink_with_size. diff --git a/lib/xreadlink-with-size.c b/lib/xreadlink-with-size.c deleted file mode 100644 index 5524a8ac4..000000000 --- a/lib/xreadlink-with-size.c +++ /dev/null @@ -1,105 +0,0 @@ -/* xreadlink.c -- readlink wrapper to return the link name in malloc'd storage - - Copyright (C) 2001, 2003, 2004, 2005, 2006, 2007 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; see the file COPYING. - If not, write to the Free Software Foundation, - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ - -/* Written by Jim Meyering */ - -#include - -#include "xreadlink.h" - -#include -#include -#include -#include -#include -#include - -#ifndef SIZE_MAX -# define SIZE_MAX ((size_t) -1) -#endif -#ifndef SSIZE_MAX -# define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2)) -#endif - -/* SYMLINK_MAX is used only for an initial memory-allocation sanity - check, so it's OK to guess too small on hosts where there is no - arbitrary limit to symbolic link length. */ -#ifndef SYMLINK_MAX -# define SYMLINK_MAX 1024 -#endif - -#define MAXSIZE (SIZE_MAX < SSIZE_MAX ? SIZE_MAX : SSIZE_MAX) - -#include "xalloc.h" - -/* Call readlink to get the symbolic link value of FILE. - SIZE is a hint as to how long the link is expected to be; - typically it is taken from st_size. It need not be correct. - Return a pointer to that NUL-terminated string in malloc'd storage. - If readlink fails, return NULL (caller may use errno to diagnose). - If malloc fails, or if the link value is longer than SSIZE_MAX :-), - give a diagnostic and exit. */ - -char * -xreadlink_with_size (char const *file, size_t size) -{ - /* Some buggy file systems report garbage in st_size. Defend - against them by ignoring outlandish st_size values in the initial - memory allocation. */ - size_t symlink_max = SYMLINK_MAX; - size_t INITIAL_LIMIT_BOUND = 8 * 1024; - size_t initial_limit = (symlink_max < INITIAL_LIMIT_BOUND - ? symlink_max + 1 - : INITIAL_LIMIT_BOUND); - - /* The initial buffer size for the link value. */ - size_t buf_size = size < initial_limit ? size + 1 : initial_limit; - - while (1) - { - char *buffer = xmalloc (buf_size); - ssize_t r = readlink (file, buffer, buf_size); - size_t link_length = r; - - /* On AIX 5L v5.3 and HP-UX 11i v2 04/09, readlink returns -1 - with errno == ERANGE if the buffer is too small. */ - if (r < 0 && errno != ERANGE) - { - int saved_errno = errno; - free (buffer); - errno = saved_errno; - return NULL; - } - - if (link_length < buf_size) - { - buffer[link_length] = 0; - return buffer; - } - - free (buffer); - if (buf_size <= MAXSIZE / 2) - buf_size *= 2; - else if (buf_size < MAXSIZE) - buf_size = MAXSIZE; - else - xalloc_die (); - } -} diff --git a/lib/xreadlink.h b/lib/xreadlink.h index 6d93fe6c3..417e6e4d5 100644 --- a/lib/xreadlink.h +++ b/lib/xreadlink.h @@ -21,14 +21,4 @@ #include -/* Call readlink to get the symbolic link value of FILENAME. - Return a pointer to that NUL-terminated string in malloc'd storage. - If readlink fails, return NULL and set errno. */ extern char *xreadlink (char const *filename); - -/* Call readlink to get the symbolic link value of FILENAME. - SIZE_HINT is a hint as to how long the link is expected to be; - typically it is taken from st_size. It need not be correct. - Return a pointer to that NUL-terminated string in malloc'd storage. - If readlink fails, return NULL and set errno. */ -extern char *xreadlink_with_size (char const *filename, size_t size_hint); diff --git a/modules/xreadlink-with-size b/modules/xreadlink-with-size deleted file mode 100644 index b2e17d12c..000000000 --- a/modules/xreadlink-with-size +++ /dev/null @@ -1,26 +0,0 @@ -Description: -Return the contents of a symbolic link, without size limitations. - -Files: -lib/xreadlink.h -lib/xreadlink-with-size.c - -Depends-on: -readlink -ssize_t -unistd -xalloc - -configure.ac: - -Makefile.am: -lib_SOURCES += xreadlink-with-size.c - -Include: -"xreadlink.h" - -License: -GPL - -Maintainer: -Jim Meyering -- 2.11.0