This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.18-34-gc4e4256


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  c4e42566cfecc43f9ef3ddf9c7af57c6744e2ceb (commit)
      from  f890a59b10b6a4b8723b86545e8b38ccc690021c (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=c4e42566cfecc43f9ef3ddf9c7af57c6744e2ceb

commit c4e42566cfecc43f9ef3ddf9c7af57c6744e2ceb
Author: Roland McGrath <roland@hack.frob.com>
Date:   Tue Aug 27 10:50:06 2013 -0700

    Don't try to use ioctl unless [FIONREAD].

diff --git a/ChangeLog b/ChangeLog
index 30d90e0..8ae4979 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2013-08-27  Roland McGrath  <roland@hack.frob.com>
 
+	* resolv/res_send.c (send_dg): Don't try to use ioctl unless [FIONREAD].
+
 	* resolv/res_hconf.c [!NOT_IN_libc] (ifaddrs): Declare
 	only under [SIOCGIFCONF && SIOCGIFNETMASK].
 
diff --git a/resolv/res_send.c b/resolv/res_send.c
index 140efbe..5a73696 100644
--- a/resolv/res_send.c
+++ b/resolv/res_send.c
@@ -1229,8 +1229,11 @@ send_dg(res_state statp,
 		    /* Yes, we test ANSCP here.  If we have two buffers
 		       both will be allocatable.  */
 		    && anscp
+#ifdef FIONREAD
 		    && (ioctl (pfd[0].fd, FIONREAD, thisresplenp) < 0
-			|| *thisanssizp < *thisresplenp)) {
+			|| *thisanssizp < *thisresplenp)
+#endif
+                    ) {
 			u_char *newp = malloc (MAXPACKET);
 			if (newp != NULL) {
 				*anssizp = MAXPACKET;

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog         |    2 ++
 resolv/res_send.c |    5 ++++-
 2 files changed, 6 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]