This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.22-222-gd18c36e
- From: ppluzhnikov at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 10 Sep 2015 01:42:02 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.22-222-gd18c36e
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via d18c36e6007b03533a38c890c68544daa78d301a (commit)
from ec999b8e5ede67f42759657beb8c5fef87c8cc63 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=d18c36e6007b03533a38c890c68544daa78d301a
commit d18c36e6007b03533a38c890c68544daa78d301a
Author: Paul Pluzhnikov <ppluzhnikov@google.com>
Date: Wed Sep 9 18:41:25 2015 -0700
To fix BZ #18675, use __fstatvfs64 in __fpathconf.
diff --git a/ChangeLog b/ChangeLog
index 5f009a8..c9ec7cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-09-09 Justin Maggard <jmaggard@netgear.com>
+
+ [BZ #18675]
+ * sysdeps/posix/fpathconf.c (__fpathconf): Use __fstatvfs64.
+
2015-09-08 Joseph Myers <joseph@codesourcery.com>
[BZ #14912]
diff --git a/NEWS b/NEWS
index d397b54..4e1f3a6 100644
--- a/NEWS
+++ b/NEWS
@@ -11,9 +11,9 @@ Version 2.23
2898, 14341, 15786, 16141, 16517, 16519, 16520, 16734, 16973, 17787,
17905, 18084, 18086, 18240, 18265, 18370, 18421, 18480, 18525, 18610,
- 18618, 18647, 18661, 18674, 18681, 18757, 18778, 18781, 18787, 18789,
- 18790, 18795, 18796, 18820, 18823, 18824, 18863, 18870, 18873, 18887,
- 18921.
+ 18618, 18647, 18661, 18674, 18675, 18681, 18757, 18778, 18781, 18787,
+ 18789, 18790, 18795, 18796, 18820, 18823, 18824, 18863, 18870, 18873,
+ 18887, 18921.
* The obsolete header <regexp.h> has been removed. Programs that require
this header must be updated to use <regex.h> instead.
diff --git a/sysdeps/posix/fpathconf.c b/sysdeps/posix/fpathconf.c
index 25f632e..088eb15 100644
--- a/sysdeps/posix/fpathconf.c
+++ b/sysdeps/posix/fpathconf.c
@@ -66,10 +66,10 @@ __fpathconf (fd, name)
case _PC_NAME_MAX:
#ifdef NAME_MAX
{
- struct statfs buf;
+ struct statvfs64 sv;
int save_errno = errno;
- if (__fstatfs (fd, &buf) < 0)
+ if (__fstatvfs64 (fd, &sv) < 0)
{
if (errno == ENOSYS)
{
@@ -83,15 +83,7 @@ __fpathconf (fd, name)
}
else
{
-#ifdef _STATFS_F_NAMELEN
- return buf.f_namelen;
-#else
-# ifdef _STATFS_F_NAME_MAX
- return buf.f_name_max;
-# else
- return NAME_MAX;
-# endif
-#endif
+ return sv.f_namemax;
}
}
#else
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
NEWS | 6 +++---
sysdeps/posix/fpathconf.c | 14 +++-----------
3 files changed, 11 insertions(+), 14 deletions(-)
hooks/post-receive
--
GNU C Library master sources