[Commits] r19923 - in /branches/eglibc-2_15: ./ libc/ChangeLog libc/sysdeps/unix/sysv/linux/faccessat.c

[joseph@xxxxxxxxxx]

Author: joseph
Date: Tue Jul 31 15:36:00 2012
New Revision: 19923

Log:
Merge changes between r19351 and r19922 from /fsf/glibc-2_15-branch.

Modified:
    branches/eglibc-2_15/   (props changed)
    branches/eglibc-2_15/libc/ChangeLog
    branches/eglibc-2_15/libc/sysdeps/unix/sysv/linux/faccessat.c

Propchange: branches/eglibc-2_15/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul 31 15:36:00 2012
@@ -1,2 +1,2 @@
-/fsf/glibc-2_15-branch:16509-19351
+/fsf/glibc-2_15-branch:16509-19922
 /fsf/trunk:15224-16494

Modified: branches/eglibc-2_15/libc/ChangeLog
==============================================================================
--- branches/eglibc-2_15/libc/ChangeLog (original)
+++ branches/eglibc-2_15/libc/ChangeLog Tue Jul 31 15:36:00 2012
@@ -1,3 +1,7 @@
+2012-01-28  Chris Metcalf  <cmetcalf@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/faccessat.c (faccessat): Call __fxstatat64.
+
 2012-01-28  Chris Metcalf  <cmetcalf@xxxxxxxxxx>
 
 	* include/sys/epoll.h: New file.

Modified: branches/eglibc-2_15/libc/sysdeps/unix/sysv/linux/faccessat.c
==============================================================================
--- branches/eglibc-2_15/libc/sysdeps/unix/sysv/linux/faccessat.c (original)
+++ branches/eglibc-2_15/libc/sysdeps/unix/sysv/linux/faccessat.c Tue Jul 31 15:36:00 2012
@@ -1,5 +1,5 @@
 /* Test for access to file, relative to open directory.  Linux version.
-   Copyright (C) 2006, 2009 Free Software Foundation, Inc.
+   Copyright (C) 2006, 2009, 2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -114,7 +114,7 @@
 #endif
 
   struct stat64 stats;
-  if (fstatat64 (fd, file, &stats, flag & AT_SYMLINK_NOFOLLOW))
+  if (__fxstatat64 (_STAT_VER, fd, file, &stats, flag & AT_SYMLINK_NOFOLLOW))
     return -1;
 
   mode &= (X_OK | W_OK | R_OK);	/* Clear any bogus bits. */

_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits