lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-01 10:06:57 +03:00
Code Activity

Optimize grantpt.

Browse Source 
grantpt was performing two consecutive calls to stat with the same
file name.  Avoid this by creating a special version of the ptsname
function which allows to pass the stat result back to the caller.
This commit is contained in:
Ulrich Drepper
2009-11-24 18:50:32 -08:00
parent 0f622686af
commit aa9890239a
4 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sysdeps/unix/grantpt.c
View File

@ -38,7 +38,7 @@
this buffer, a sufficiently long buffer is allocated using malloc,
and returned in PTS. 0 is returned upon success, -1 otherwise. */
static int
pts_name (int fd, char **pts, size_t buf_len)
pts_name (int fd, char **pts, size_t buf_len, struct stat64 *stp)
{
int rv;
char *buf = *pts;
@ -49,7 +49,7 @@ pts_name (int fd, char **pts, size_t buf_len)
if (buf_len)
{
rv = __ptsname_r (fd, buf, buf_len);
rv = __ptsname_internal (fd, buf, buf_len, stp);
if (rv != 0)
{
if (rv == ENOTTY)
@ -107,8 +107,9 @@ grantpt (int fd)
char _buf[512];
#endif
char *buf = _buf;
struct stat64 st;
if (__builtin_expect (pts_name (fd, &buf, sizeof (_buf)), 0))
if (__builtin_expect (pts_name (fd, &buf, sizeof (_buf), &st), 0))
{
int save_errno = errno;
@ -127,10 +128,6 @@ grantpt (int fd)
return -1;
}
struct stat64 st;
if (__xstat64 (_STAT_VER, buf, &st) < 0)
goto cleanup;
/* Make sure that we own the device. */
uid_t uid = __getuid ();
if (st.st_uid != uid)