GNU C Library master sources branch master updated. glibc-2.18-32-g5d1f0a0

[roland at sourceware dot org]

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  5d1f0a09f3634b29d9cbbd7c7337d546502363cb (commit)
      from  6fcf28b352c435ee3d1a975619c5ae31923c44eb (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=5d1f0a09f3634b29d9cbbd7c7337d546502363cb

commit 5d1f0a09f3634b29d9cbbd7c7337d546502363cb
Author: Roland McGrath <roland@hack.frob.com>
Date:   Tue Aug 27 10:42:52 2013 -0700

    True stub __ifreq.

diff --git a/ChangeLog b/ChangeLog
index 91f99b6..4c31935 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2013-08-27  Roland McGrath  <roland@hack.frob.com>
 
+	* inet/ifreq.c: Moved to ...
+	* sysdeps/unix/ifreq.c: ... here.
+	* inet/ifreq.c: New file, true stub version.
+
 	* socket/sa_len.c: New file.
 	* socket/Makefile (aux): Add it.
 	* sysdeps/unix/sysv/linux/Makefile
diff --git a/inet/ifreq.c b/inet/ifreq.c
index 2db6d0c..d94d339 100644
--- a/inet/ifreq.c
+++ b/inet/ifreq.c
@@ -1,6 +1,6 @@
-/* Copyright (C) 1999-2013 Free Software Foundation, Inc.
+/* Collect network interface list.  Stub version.
+   Copyright (C) 2013 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
-   Contributed by Andreas Jaeger <aj@suse.de>.
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Lesser General Public
@@ -18,62 +18,9 @@
 
 #include "ifreq.h"
 
-
 void
 __ifreq (struct ifreq **ifreqs, int *num_ifs, int sockfd)
 {
-  int fd = sockfd;
-  struct ifconf ifc;
-  int rq_len;
-  int nifs;
-# define RQ_IFS	4
-
-  if (fd < 0)
-    fd = __opensock ();
-  if (fd < 0)
-    {
-      *num_ifs = 0;
-      *ifreqs = NULL;
-      return;
-    }
-
-  ifc.ifc_buf = NULL;
-  rq_len = RQ_IFS * sizeof (struct ifreq) / 2; /* Doubled in the loop.  */
-  do
-    {
-      ifc.ifc_len = rq_len *= 2;
-      void *newp = realloc (ifc.ifc_buf, ifc.ifc_len);
-      if (newp == NULL || __ioctl (fd, SIOCGIFCONF, &ifc) < 0)
-	{
-	  free (ifc.ifc_buf);
-
-	  if (fd != sockfd)
-	    __close (fd);
-	  *num_ifs = 0;
-	  *ifreqs = NULL;
-	  return;
-	}
-      ifc.ifc_buf = newp;
-    }
-  while (rq_len < sizeof (struct ifreq) + ifc.ifc_len);
-
-  if (fd != sockfd)
-    __close (fd);
-
-#ifdef _HAVE_SA_LEN
-  struct ifreq *ifr = *ifreqs;
-  nifs = 0;
-  while ((char *) ifr < ifc.ifc_buf + ifc.ifc_len)
-    {
-      ++nifs;
-      ifr = __if_nextreq (ifr);
-      if (ifr == NULL)
-	break;
-    }
-#else
-  nifs = ifc.ifc_len / sizeof (struct ifreq);
-#endif
-
-  *num_ifs = nifs;
-  *ifreqs = realloc (ifc.ifc_buf, nifs * sizeof (struct ifreq));
+  *num_ifs = 0;
+  *ifreqs = NULL;
 }
diff --git a/inet/ifreq.c b/sysdeps/unix/ifreq.c
similarity index 100%
copy from inet/ifreq.c
copy to sysdeps/unix/ifreq.c

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

Summary of changes:
 ChangeLog                      |    4 ++
 inet/ifreq.c                   |   61 ++-------------------------------------
 {inet => sysdeps/unix}/ifreq.c |    0
 3 files changed, 8 insertions(+), 57 deletions(-)
 copy {inet => sysdeps/unix}/ifreq.c (100%)


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