X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=inline;f=lib%2Fxreadlink.c;h=1ec818e113924637e915d321b4beb2fba563a5bb;hb=fa3486514bd8f15f8eb4c49821d0356b52e5a335;hp=c38e2d3aad892630f37d84b906b272f93ad7f925;hpb=3bd23802ad65a4379e0c97d736dc6c2ab2d37f1d;p=gnulib.git
diff --git a/lib/xreadlink.c b/lib/xreadlink.c
index c38e2d3aa..1ec818e11 100644
--- a/lib/xreadlink.c
+++ b/lib/xreadlink.c
@@ -1,11 +1,11 @@
/* xreadlink.c -- readlink wrapper to return the link name in malloc'd storage
- Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc.
+ Copyright (C) 2001, 2003-2007 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
@@ -13,79 +13,32 @@
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,
- 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with this program. If not, see . */
-/* Written by Jim Meyering */
+/* Written by Jim Meyering
+ and Bruno Haible . */
-#if HAVE_CONFIG_H
-# include
-#endif
+#include
+/* Specification. */
#include "xreadlink.h"
-#include
#include
-#include
-#include
-#include
-#if HAVE_UNISTD_H
-# include
-#endif
-
-#ifndef SIZE_MAX
-# define SIZE_MAX ((size_t) -1)
-#endif
-#ifndef SSIZE_MAX
-# define SSIZE_MAX ((ssize_t) (SIZE_MAX / 2))
-#endif
-
-#define MAXSIZE (SIZE_MAX < SSIZE_MAX ? SIZE_MAX : SSIZE_MAX)
+#include "areadlink.h"
#include "xalloc.h"
/* Call readlink to get the symbolic link value of FILENAME.
- 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 :-),
+ If readlink fails, return NULL and set errno.
+ If realloc fails, or if the link value is longer than SIZE_MAX :-),
give a diagnostic and exit. */
char *
-xreadlink (char const *filename, size_t size)
+xreadlink (char const *filename)
{
- /* The initial buffer size for the link value. A power of 2
- detects arithmetic overflow earlier, but is not required. */
- size_t buf_size = size < MAXSIZE ? size + 1 : MAXSIZE;
-
- while (1)
- {
- char *buffer = xmalloc (buf_size);
- ssize_t r = readlink (filename, buffer, buf_size);
- size_t link_length = r;
-
- if (r < 0)
- {
- 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 ();
- }
+ char *result = areadlink (filename);
+ if (result == NULL && errno == ENOMEM)
+ xalloc_die ();
+ return result;
}