From patchwork Fri Jun 20 22:44:23 2014
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Rich Felker <dalias@aerifal.cx>
X-Patchwork-Id: 1629
Received: (qmail 23358 invoked by alias); 20 Jun 2014 22:44:32 -0000
Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm
Precedence: bulk
List-Id: <libc-alpha.sourceware.org>
List-Unsubscribe: <mailto:libc-alpha-unsubscribe-##L=##H@sourceware.org>
List-Subscribe: <mailto:libc-alpha-subscribe@sourceware.org>
List-Archive: <http://sourceware.org/ml/libc-alpha/>
List-Post: <mailto:libc-alpha@sourceware.org>
List-Help: <mailto:libc-alpha-help@sourceware.org>,
	<http://sourceware.org/ml/#faqs>
Sender: libc-alpha-owner@sourceware.org
Delivered-To: mailing list libc-alpha@sourceware.org
Received: (qmail 23340 invoked by uid 89); 20 Jun 2014 22:44:32 -0000
Authentication-Results: sourceware.org; auth=none
X-Virus-Found: No
X-Spam-SWARE-Status: No, score=-0.4 required=5.0 tests=AWL, BAYES_00,
	RDNS_DYNAMIC, TVD_RCVD_IP autolearn=no version=3.3.2
X-HELO: brightrain.aerifal.cx
Date: Fri, 20 Jun 2014 18:44:23 -0400
From: Rich Felker <dalias@aerifal.cx>
To: "Joseph S. Myers" <joseph@codesourcery.com>
Cc: libc-alpha@sourceware.org
Subject: [PATCH] Add NI_NUMERICSCOPE support to getnameinfo
Message-ID: <20140620224423.GC179@brightrain.aerifal.cx>
References: <20121014220643.GA17229@brightrain.aerifal.cx>
	<20140604025109.GL507@brightrain.aerifal.cx>
	<Pine.LNX.4.64.1406192211300.2033@digraph.polyomino.org.uk>
MIME-Version: 1.0
Content-Disposition: inline
In-Reply-To: <Pine.LNX.4.64.1406192211300.2033@digraph.polyomino.org.uk>
User-Agent: Mutt/1.5.21 (2010-09-15)

On Thu, Jun 19, 2014 at 10:13:11PM +0000, Joseph S. Myers wrote:
> On Tue, 3 Jun 2014, Rich Felker wrote:
> 
> > On Sun, Oct 14, 2012 at 06:06:43PM -0400, Rich Felker wrote:
> > > See bug #14102: http://sourceware.org/bugzilla/show_bug.cgi?id=14102
> > > 
> > > Even if nobody is willing to add the functionality immediately, can we
> > > at least agree on a value it will have when it's added?
> > 
> > This issue is really trivial and I've been waiting for someone to
> > address it for almost 2 years now. Is the attached patch acceptable?
> 
> You need to explain why you think ignoring the flag is a valid 
> implementation (or that defining it without implementing it is more 
> helpful to applications, or better accords with established glibc 
> conventions, than not defining it until there is an implementation).

Trivial patch attached.

Rich

--- resolv/netdb.h.orig	2014-06-03 22:58:26.000000000 -0400
+++ resolv/netdb.h	2014-06-03 23:00:06.000000000 -0400
@@ -653,6 +653,7 @@
 #  define NI_IDN_USE_STD3_ASCII_RULES 128 /* Validate strings according to
 					     STD3 rules.  */
 # endif
+# define NI_NUMERICSCOPE	256	/* Don't convert scope_id to name.  */
 
 /* Translate name of a service location and/or a service name to set of
    socket addresses.
--- inet/getnameinfo.c.orig	2014-02-07 04:04:38.000000000 -0500
+++ inet/getnameinfo.c	2014-06-20 18:49:54.000000000 -0400
@@ -331,7 +331,8 @@
 			if (IN6_IS_ADDR_LINKLOCAL (&sin6p->sin6_addr)
 			    || IN6_IS_ADDR_MC_LINKLOCAL (&sin6p->sin6_addr))
 			  {
-			    if (if_indextoname (scopeid, scopeptr) == NULL)
+			    if ((flags & NI_NUMERICSCOPE) ||
+				if_indextoname (scopeid, scopeptr) == NULL)
 			      ++ni_numericscope;
 			    else
 			      scopelen = strlen (scopebuf);