From: Jim Meyering Date: Tue, 28 Aug 2007 09:13:04 +0000 (+0000) Subject: Rename mreadlink_with_size to areadlink_with_size. X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=39756f7a0ec9b7028ec1d95929213fd93f391e1d;p=pspp Rename mreadlink_with_size to areadlink_with_size. * NEWS: Document the change. * lib/mreadlink-with-size.c (mreadlink_with_size): Rename this to... * lib/areadlink-with-size.c (areadlink_with_size): ...this. * lib/mreadlink.h: Rename this to... * lib/areadlink.h: ...this. * modules/mreadlink-with-size: Rename this to... * modules/areadlink-with-size: ...this. * lib/canonicalize.c: Reflect the renaming. * modules/canonicalize: Likewise. --- diff --git a/ChangeLog b/ChangeLog index 82b2a848bc..01d182e54b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2007-08-28 Jim Meyering + + Rename mreadlink_with_size to areadlink_with_size. + * NEWS: Document the change. + * lib/mreadlink-with-size.c (mreadlink_with_size): Rename this to... + * lib/areadlink-with-size.c (areadlink_with_size): ...this. + * lib/mreadlink.h: Rename this to... + * lib/areadlink.h: ...this. + * modules/mreadlink-with-size: Rename this to... + * modules/areadlink-with-size: ...this. + * lib/canonicalize.c: Reflect the renaming. + * modules/canonicalize: Likewise. + 2007-08-26 Bruno Haible * gnulib-tool (func_import): When deciding which files to remove, diff --git a/NEWS b/NEWS index 438644ca07..34df55a375 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,11 @@ User visible incompatible changes Date Modules Changes +2007-08-28 areadlink-with-size + Renamed from mreadlink-with-size. + Function renamed: mreadlink_with_size -> + areadlink_with_size. + 2007-08-22 getdelim, getline The include file is changed from "getdelim.h" and "getline.h" to the POSIX 200x . diff --git a/lib/areadlink-with-size.c b/lib/areadlink-with-size.c new file mode 100644 index 0000000000..fdaab3f460 --- /dev/null +++ b/lib/areadlink-with-size.c @@ -0,0 +1,110 @@ +/* readlink wrapper to return the link name in malloc'd storage. + Unlike xreadlink and xreadlink_with_size, don't ever call exit. + + Copyright (C) 2001, 2003-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 "areadlink.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) + +/* 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, malloc fails, or if the link value is longer + than SSIZE_MAX, return NULL (caller may use errno to diagnose). */ + +char * +areadlink_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) + { + ssize_t r; + size_t link_length; + char *buffer = malloc (buf_size); + + if (buffer == NULL) + return NULL; + r = readlink (file, buffer, buf_size); + 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 + { + errno = ENOMEM; + return NULL; + } + } +} diff --git a/lib/areadlink.h b/lib/areadlink.h new file mode 100644 index 0000000000..e2baa6b31f --- /dev/null +++ b/lib/areadlink.h @@ -0,0 +1,24 @@ +/* Read symbolic links without size limitation. + + Copyright (C) 2001, 2003, 2004, 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 + +extern char *areadlink_with_size (char const *filename, size_t size_hint); diff --git a/lib/canonicalize.c b/lib/canonicalize.c index eed7f40a83..fa2c1ab944 100644 --- a/lib/canonicalize.c +++ b/lib/canonicalize.c @@ -47,7 +47,7 @@ #endif #include "pathmax.h" -#include "mreadlink.h" +#include "areadlink.h" #if !HAVE_CANONICALIZE_FILE_NAME /* Return the canonical absolute name of file NAME. A canonical name @@ -246,7 +246,7 @@ canonicalize_filename_mode (const char *name, canonicalize_mode_t can_mode) goto error; } - buf = mreadlink_with_size (rname, st.st_size); + buf = areadlink_with_size (rname, st.st_size); if (!buf) { if (can_mode == CAN_MISSING && errno != ENOMEM) diff --git a/lib/mreadlink-with-size.c b/lib/mreadlink-with-size.c deleted file mode 100644 index e18d5c43fb..0000000000 --- a/lib/mreadlink-with-size.c +++ /dev/null @@ -1,110 +0,0 @@ -/* readlink wrapper to return the link name in malloc'd storage. - Unlike xreadlink and xreadlink_with_size, don't ever call exit. - - Copyright (C) 2001, 2003-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 "mreadlink.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) - -/* 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, malloc fails, or if the link value is longer - than SSIZE_MAX, return NULL (caller may use errno to diagnose). */ - -char * -mreadlink_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) - { - ssize_t r; - size_t link_length; - char *buffer = malloc (buf_size); - - if (buffer == NULL) - return NULL; - r = readlink (file, buffer, buf_size); - 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 - { - errno = ENOMEM; - return NULL; - } - } -} diff --git a/lib/mreadlink.h b/lib/mreadlink.h deleted file mode 100644 index 28d3eec9e0..0000000000 --- a/lib/mreadlink.h +++ /dev/null @@ -1,24 +0,0 @@ -/* Read symbolic links without size limitation. - - Copyright (C) 2001, 2003, 2004, 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 - -extern char *mreadlink_with_size (char const *filename, size_t size_hint); diff --git a/modules/areadlink-with-size b/modules/areadlink-with-size new file mode 100644 index 0000000000..df6db33b0a --- /dev/null +++ b/modules/areadlink-with-size @@ -0,0 +1,25 @@ +Description: +Return the contents of a symbolic link, without size limitations. + +Files: +lib/areadlink.h +lib/areadlink-with-size.c + +Depends-on: +readlink +ssize_t +unistd + +configure.ac: + +Makefile.am: +lib_SOURCES += areadlink-with-size.c + +Include: +"areadlink.h" + +License: +GPL + +Maintainer: +Jim Meyering diff --git a/modules/canonicalize b/modules/canonicalize index cb135daf8a..52e80fbcbe 100644 --- a/modules/canonicalize +++ b/modules/canonicalize @@ -13,7 +13,7 @@ filenamecat sys_stat xalloc xgetcwd -mreadlink-with-size +areadlink-with-size configure.ac: AC_FUNC_CANONICALIZE_FILE_NAME diff --git a/modules/mreadlink-with-size b/modules/mreadlink-with-size deleted file mode 100644 index 70c88e731f..0000000000 --- a/modules/mreadlink-with-size +++ /dev/null @@ -1,25 +0,0 @@ -Description: -Return the contents of a symbolic link, without size limitations. - -Files: -lib/mreadlink.h -lib/mreadlink-with-size.c - -Depends-on: -readlink -ssize_t -unistd - -configure.ac: - -Makefile.am: -lib_SOURCES += mreadlink-with-size.c - -Include: -"mreadlink.h" - -License: -GPL - -Maintainer: -Jim Meyering