X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fxreadlink.c;h=347357897632b83fc53bb6155af1803850f06fc2;hb=6e9405a068eabd607da1b526b68e4373ae43da71;hp=b58330a1d019e35007558569aa064b2c2529baee;hpb=b6f4a765056b52c30e9b44ca0990f536dd0cb9de;p=gnulib.git diff --git a/lib/xreadlink.c b/lib/xreadlink.c index b58330a1d..347357897 100644 --- a/lib/xreadlink.c +++ b/lib/xreadlink.c @@ -1,6 +1,6 @@ -/* exclude.c -- exclude file names +/* xreadlink.c -- readlink wrapper to return the link name in malloc'd storage - Copyright 2001 Free Software Foundation, Inc. + Copyright (C) 2001, 2003 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 @@ -29,15 +29,9 @@ extern int errno; #endif -#if HAVE_LIMITS_H -# include -#endif -#if HAVE_SYS_TYPES_H -# include -#endif -#if HAVE_STDLIB_H -# include -#endif +#include +#include +#include #if HAVE_UNISTD_H # include #endif @@ -55,7 +49,7 @@ extern int errno; /* 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 (caller may use errno to diagnose). - If realloc fails, or if the link value is longer than SIZE_MAX :-), + If malloc fails, or if the link value is longer than SSIZE_MAX :-), give a diagnostic and exit. */ char * @@ -78,7 +72,7 @@ xreadlink (char const *filename) return NULL; } - if (link_length < buf_size) + if ((size_t) link_length < buf_size) { buffer[link_length] = 0; return buffer;