lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

To fix BZ #18675, use __fstatvfs64 in __fpathconf.

Browse Source
This commit is contained in:
Paul Pluzhnikov
2015-09-09 18:41:25 -07:00
parent ec999b8e5e
commit d18c36e600
3 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> 2015-09-08 Joseph Myers <joseph@codesourcery.com>
[BZ #14912] [BZ #14912]

6
NEWS
View File

@ -11,9 +11,9 @@ Version 2.23
2898, 14341, 15786, 16141, 16517, 16519, 16520, 16734, 16973, 17787, 2898, 14341, 15786, 16141, 16517, 16519, 16520, 16734, 16973, 17787,
17905, 18084, 18086, 18240, 18265, 18370, 18421, 18480, 18525, 18610, 17905, 18084, 18086, 18240, 18265, 18370, 18421, 18480, 18525, 18610,
18618, 18647, 18661, 18674, 18681, 18757, 18778, 18781, 18787, 18789, 18618, 18647, 18661, 18674, 18675, 18681, 18757, 18778, 18781, 18787,
18790, 18795, 18796, 18820, 18823, 18824, 18863, 18870, 18873, 18887, 18789, 18790, 18795, 18796, 18820, 18823, 18824, 18863, 18870, 18873,
18921. 18887, 18921.
* The obsolete header <regexp.h> has been removed. Programs that require * The obsolete header <regexp.h> has been removed. Programs that require
this header must be updated to use <regex.h> instead. this header must be updated to use <regex.h> instead.

14
sysdeps/posix/fpathconf.c
View File

@ -66,10 +66,10 @@ __fpathconf (fd, name)
case _PC_NAME_MAX: case _PC_NAME_MAX:
#ifdef NAME_MAX #ifdef NAME_MAX
{ {
struct statfs buf; struct statvfs64 sv;
int save_errno = errno; int save_errno = errno;
if (__fstatfs (fd, &buf) < 0) if (__fstatvfs64 (fd, &sv) < 0)
{ {
if (errno == ENOSYS) if (errno == ENOSYS)
{ {
@ -83,15 +83,7 @@ __fpathconf (fd, name)
} }
else else
{ {
#ifdef _STATFS_F_NAMELEN return sv.f_namemax;
return buf.f_namelen;
#else
# ifdef _STATFS_F_NAME_MAX
return buf.f_name_max;
# else
return NAME_MAX;
# endif
#endif
} }
} }
#else #else