d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reduce diffs to vendor's 1.11.17.

Browse Source
This commit is contained in:
David E. O'Brien 2007-12-31 03:42:05 +00:00
parent 8ac3902acc
commit c24c464544
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
contrib/cvs/src/filesubr.c
View File

@ -877,7 +877,7 @@ xreadlink (link)
{ {
char *file = NULL; char *file = NULL;
int buflen = BUFSIZ; int buflen = BUFSIZ;
int linklen; int link_name_len;
/* Get the name of the file to which `from' is linked. /* Get the name of the file to which `from' is linked.
FIXME: what portability issues arise here? Are readlink & FIXME: what portability issues arise here? Are readlink &
@ -886,14 +886,15 @@ xreadlink (link)
{ {
file = xrealloc (file, buflen); file = xrealloc (file, buflen);
errno = 0; errno = 0;
linklen = readlink (link, file, buflen - 1); link_name_len = readlink (link, file, buflen - 1);
buflen *= 2; buflen *= 2;
} }
while (linklen == -1 && errno == ENAMETOOLONG); while (link_name_len < 0 && errno == ENAMETOOLONG);
if (linklen == -1) if (link_name_len < 0)
error (1, errno, "cannot readlink %s", link); error (1, errno, "cannot readlink %s", link);
file[linklen] = '\0';
file[link_name_len] = '\0';
return file; return file;
} }