AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-12-31 15:01:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

[BZ #2450]

Browse Source 
* posix/unistd.h: Match return value of readlink to what POSIX
	says these days.
	* io/readlink.c: Likewise.
	* io/readlinkat.c: Likewise.
	* sysdeps/unix/sysv/linux/readlinkat.c: Likewise.
This commit is contained in:
Ulrich Drepper 2006-04-01 19:12:44 +00:00
parent 9388dcbb84
commit 6d893bd991
5 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,5 +1,12 @@
2006-04-01 Ulrich Drepper <drepper@redhat.com> 2006-04-01 Ulrich Drepper <drepper@redhat.com>
[BZ #2450]
* posix/unistd.h: Match return value of readlink to what POSIX
says these days.
* io/readlink.c: Likewise.
* io/readlinkat.c: Likewise.
* sysdeps/unix/sysv/linux/readlinkat.c: Likewise.
[BZ #2498] [BZ #2498]
* nscd/connections.c (main_loop_poll): If the connection cannot be * nscd/connections.c (main_loop_poll): If the connection cannot be
accepted because of user-imposed limits close the descriptor. accepted because of user-imposed limits close the descriptor.

4
io/readlink.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 1991, 1995, 1996, 1997 Free Software Foundation, Inc. /* Copyright (C) 1991, 1995, 1996, 1997, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -22,7 +22,7 @@
/* Read the contents of the symbolic link PATH into no more than /* Read the contents of the symbolic link PATH into no more than
LEN bytes of BUF. The contents are not null-terminated. LEN bytes of BUF. The contents are not null-terminated.
Returns the number of characters read, or -1 for errors. */ Returns the number of characters read, or -1 for errors. */
int ssize_t
__readlink (path, buf, len) __readlink (path, buf, len)
const char *path; const char *path;
char *buf; char *buf;

4
io/readlinkat.c
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2005 Free Software Foundation, Inc. /* Copyright (C) 2005, 2006 Free Software Foundation, Inc.
This file is part of the GNU C Library. This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or The GNU C Library is free software; you can redistribute it and/or
@ -23,7 +23,7 @@
/* Read the contents of the symbolic link PATH relative to FD into no /* Read the contents of the symbolic link PATH relative to FD into no
more than LEN bytes of BUF. The contents are not null-terminated. more than LEN bytes of BUF. The contents are not null-terminated.
Returns the number of characters read, or -1 for errors. */ Returns the number of characters read, or -1 for errors. */
int ssize_t
readlinkat (fd, path, buf, len) readlinkat (fd, path, buf, len)
int fd; int fd;
const char *path; const char *path;

7
posix/unistd.h
View File

@ -770,8 +770,9 @@ extern int symlink (__const char *__from, __const char *__to)
/* Read the contents of the symbolic link PATH into no more than /* Read the contents of the symbolic link PATH into no more than
LEN bytes of BUF. The contents are not null-terminated. LEN bytes of BUF. The contents are not null-terminated.
Returns the number of characters read, or -1 for errors. */ Returns the number of characters read, or -1 for errors. */
extern int readlink (__const char *__restrict __path, char *__restrict __buf, extern ssize_t readlink (__const char *__restrict __path,
size_t __len) __THROW __nonnull ((1, 2)) __wur; char *__restrict __buf, size_t __len)
__THROW __nonnull ((1, 2)) __wur;
#endif /* Use BSD. */ #endif /* Use BSD. */
#ifdef __USE_ATFILE #ifdef __USE_ATFILE
@ -780,7 +781,7 @@ extern int symlinkat (__const char *__from, int __tofd,
__const char *__to) __THROW __nonnull ((1, 3)) __wur; __const char *__to) __THROW __nonnull ((1, 3)) __wur;
/* Like readlink but a relative PATH is interpreted relative to FD. */ /* Like readlink but a relative PATH is interpreted relative to FD. */
extern int readlinkat (int __fd, __const char *__restrict __path, extern ssize_t readlinkat (int __fd, __const char *__restrict __path,
char *__restrict __buf, size_t __len) char *__restrict __buf, size_t __len)
__THROW __nonnull ((2, 3)) __wur; __THROW __nonnull ((2, 3)) __wur;
#endif #endif

2
sysdeps/unix/sysv/linux/readlinkat.c
View File

@ -29,7 +29,7 @@
/* Read the contents of the symbolic link PATH relative to FD into no /* Read the contents of the symbolic link PATH relative to FD into no
more than LEN bytes of BUF. */ more than LEN bytes of BUF. */
int ssize_t
readlinkat (fd, path, buf, len) readlinkat (fd, path, buf, len)
int fd; int fd;
const char *path; const char *path;