diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2014-12-02 21:31:24 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2014-12-02 21:31:24 +0000 |
| commit | 84e5e75640afe10758ea647e4704e9f66dc82df4 (patch) | |
| tree | 09a14db2a5a4c26f109bea012a1b11107ab355fc /resolv | |
| parent | 66cadc058dd7ce8106624df5732ea69a484621b9 (diff) | |
Fix fgets_unlocked namespace issues (bug 17664).
Various POSIX functions bring in res_init.o, res_hconf.o or
mntent_r.o, which use fgets_unlocked, which is not a POSIX function.
This patch arranges for them to use __fgets_unlocked instead. (The
IS_IN (libc) conditional in rec_hconf.c is needed because that file is
also used in nscd.)
Tested for x86_64 (testsuite, and that disassembly of installed shared
libraries is unchanged by the patch except for an assertion line
number). Note that most of the linknamespace tests that failed
because of fgets_unlocked from the resolver also fail because of other
symbols brought in by the resolver, so the number of XFAILs this
removes is limited. Also note that fgets_unlocked failures for
unistd.h for XPG3/XPG4 showed up that actually unistd.h is declaring
too much for XPG3/XPG4 (bug 17665) - there is no actual need to make
getusershell.c use __fgets_unlocked (at least as regards formal
standards are concerned; maybe it should still change for
namespace-cleanness of _DEFAULT_SOURCE) because the functions there
aren't actually in any of the supported standards; the correct fix for
those failures will be to stop the *usershell* functions appearing in
unistd.h for XPG3/XPG4.
[BZ #17664]
* misc/mntent_r.c (__getmntent_r): Use __fgets_unlocked instead of
fgets_unlocked.
* resolv/res_hconf.c [IS_IN (libc)] (fgets_unlocked): Define to
__fgets_unlocked.
* resolv/res_init.c (__res_vinit): Use __fgets_unlocked instead of
fgets_unlocked.
* conform/Makefile (test-xfail-XPG4/sys/statvfs.h/linknamespace):
Remove variable.
(test-xfail-POSIX/sys/mman.h/linknamespace): Likewise.
(test-xfail-UNIX98/sys/mman.h/linknamespace): Likewise.
(test-xfail-UNIX98/sys/statvfs.h/linknamespace): Likewise.
(test-xfail-XOPEN2K/sys/mman.h/linknamespace): Likewise.
(test-xfail-XOPEN2K/sys/statvfs.h/linknamespace): Likewise.
(test-xfail-POSIX2008/sys/mman.h/linknamespace): Likewise.
(test-xfail-POSIX2008/sys/statvfs.h/linknamespace): Likewise.
(test-xfail-XOPEN2K8/sys/mman.h/linknamespace): Likewise.
(test-xfail-XOPEN2K8/sys/statvfs.h/linknamespace): Likewise.
Diffstat (limited to 'resolv')
| -rw-r--r-- | resolv/res_hconf.c | 4 | ||||
| -rw-r--r-- | resolv/res_init.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/resolv/res_hconf.c b/resolv/res_hconf.c index cde0229330..6693b1216e 100644 --- a/resolv/res_hconf.c +++ b/resolv/res_hconf.c @@ -46,6 +46,10 @@ #include "res_hconf.h" #include <wchar.h> +#if IS_IN (libc) +# define fgets_unlocked __fgets_unlocked +#endif + #define _PATH_HOSTCONF "/etc/host.conf" /* Environment vars that all user to override default behavior: */ diff --git a/resolv/res_init.c b/resolv/res_init.c index ea133f8d82..90760ec8e6 100644 --- a/resolv/res_init.c +++ b/resolv/res_init.c @@ -238,7 +238,7 @@ __res_vinit(res_state statp, int preinit) { /* No threads use this stream. */ __fsetlocking (fp, FSETLOCKING_BYCALLER); /* read the config file */ - while (fgets_unlocked(buf, sizeof(buf), fp) != NULL) { + while (__fgets_unlocked(buf, sizeof(buf), fp) != NULL) { /* skip comments */ if (*buf == ';' || *buf == '#') continue; |