From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS3215 2.6.0.0/16 X-Spam-Status: No, score=-4.2 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI,NICE_REPLY_A, RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by dcvr.yhbt.net (Postfix) with ESMTPS id 99B4B1F8C6 for ; Thu, 15 Jul 2021 05:19:15 +0000 (UTC) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B66FD39DC4F9 for ; Thu, 15 Jul 2021 05:19:11 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B66FD39DC4F9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1626326351; bh=l4MROhSFN5v1bhY0Eg6n7ICS65o6Z/O+iYoYkzS6gos=; h=Subject:To:References:Date:In-Reply-To:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=OZgct4iuxy7gFyLJhQ6g0FA8OahnaltHQ2p6QfawnTVSt3jMWrfafjAGd1bzky35E Hk0G/+forGMWXoqIGIyclUQsHyuaw3spnDZj5RCDS11fRHKL5X3mf5weXenbnwn7Rt G9FKQXEzIWscak0I7Ltpgy/WgOYtuZHXDG36QNUc= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTP id E16F939A28DC for ; Thu, 15 Jul 2021 05:02:07 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org E16F939A28DC Received: from mail-qt1-f199.google.com (mail-qt1-f199.google.com [209.85.160.199]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-260-8bT5QG1JOFC5wJXq6v24Lg-1; Thu, 15 Jul 2021 01:02:06 -0400 X-MC-Unique: 8bT5QG1JOFC5wJXq6v24Lg-1 Received: by mail-qt1-f199.google.com with SMTP id h17-20020ac858510000b0290251fc608f73so3416301qth.10 for ; Wed, 14 Jul 2021 22:02:06 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=l4MROhSFN5v1bhY0Eg6n7ICS65o6Z/O+iYoYkzS6gos=; b=Vjg7RXx5hkbg8qobsuPG59UFLrx7fqMMlTosPtZtYn6UG36Mje1Gm6KDBBusHBl6K1 zsI3P5q549GooHe0pD8+wqABqjgGLeGmyZ7Lz6ZCdNQq6qepu2XhjYEK7KedraRVQOOV chHe9QpB+yLEzCT29Kxbsmk256yjzXRSqnVuoU8DxW4WIBGwQvV4lJqeQ9bRVMozZrzf re9M0qm9Szwq4oo/wfZZRMfADZl5pOiRWfvt0faI44vHKK3Mqup3kM/2A/KC/XZshOW7 ZQYlSoIM4vaWNT1OyHMXc5duY3bv8zwshrcwItLP4b4ByO4Cza0Ewjwu0PMAUZ2tNeGd Sn5g== X-Gm-Message-State: AOAM532SMYC/Fl9SrgB4LFvaiHetdmsuQFVCKdr6o+nMgec+7AhKjsjp wnuneaVK6yckWceOf7mALBM7Ra1MY8qiAcCbdB1z+upw4DfWlhosdIJCicCRDEBxj58bJC+fMma oA4Efmo+roUmXkBv4/jDZDYZh3dZ+SgxrivDYMo3xtNdpFgCXy5e09qnIqGPzBAYjeQAOoQ== X-Received: by 2002:a37:96c2:: with SMTP id y185mr1948763qkd.6.1626325325663; Wed, 14 Jul 2021 22:02:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwTGhCax+ViilV/fdsRxKyX2KLHSMt5Gp9BoIN/3ceIimixL/etJkRNinNI540V6VbsUvngKw== X-Received: by 2002:a37:96c2:: with SMTP id y185mr1948746qkd.6.1626325325437; Wed, 14 Jul 2021 22:02:05 -0700 (PDT) Received: from [192.168.1.16] (198-84-214-74.cpe.teksavvy.com. [198.84.214.74]) by smtp.gmail.com with ESMTPSA id z7sm1578876qta.92.2021.07.14.22.02.04 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 14 Jul 2021 22:02:04 -0700 (PDT) Subject: Re: [PATCH 24/30] resolv: Move __res_context_hostalias into its own file and into libc To: Florian Weimer , libc-alpha@sourceware.org References: <231b884376f249b815f606f1f0bfd45bbeefadf6.1625755446.git.fweimer@redhat.com> Organization: Red Hat Message-ID: Date: Thu, 15 Jul 2021 01:02:04 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.11.0 MIME-Version: 1.0 In-Reply-To: <231b884376f249b815f606f1f0bfd45bbeefadf6.1625755446.git.fweimer@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Carlos O'Donell via Libc-alpha Reply-To: Carlos O'Donell Errors-To: libc-alpha-bounces+e=80x24.org@sourceware.org Sender: "Libc-alpha" On 7/8/21 11:06 AM, Florian Weimer via Libc-alpha wrote: > And reformat it to GNU style. Remove the unecessary setbuf call. > Use __fgets_unlocked for PLT avoidance; no locking is required here. OK for glibc 2.34. Tested without regression on x86_64 and i686. Reviewed-by: Carlos O'Donell Tested-by: Carlos O'Donell > --- > resolv/Makefile | 1 + > resolv/Versions | 2 +- > resolv/res_context_hostalias.c | 132 +++++++++++++++++++++++++++++++++ > resolv/res_query.c | 40 ---------- > resolv/resolv-internal.h | 2 +- > 5 files changed, 135 insertions(+), 42 deletions(-) > create mode 100644 resolv/res_context_hostalias.c > > diff --git a/resolv/Makefile b/resolv/Makefile > index 83ba39cb52..bfcca70f26 100644 > --- a/resolv/Makefile > +++ b/resolv/Makefile > @@ -48,6 +48,7 @@ routines := \ > res-close \ > res-name-checking \ > res-state \ > + res_context_hostalias \ OK. > res_get_nsaddr \ > res_hconf \ > res_init \ > diff --git a/resolv/Versions b/resolv/Versions > index 5bbda96230..b084660dde 100644 > --- a/resolv/Versions > +++ b/resolv/Versions > @@ -85,6 +85,7 @@ libc { > __ns_name_skip; > __ns_name_uncompress; > __ns_name_unpack; > + __res_context_hostalias; OK. > __res_get_nsaddr; > __res_iclose; > __resolv_context_get; > @@ -192,7 +193,6 @@ libresolv { > GLIBC_PRIVATE { > __ns_get16; > __ns_get32; > - __res_context_hostalias; OK. > __res_context_query; > __res_context_search; > } > diff --git a/resolv/res_context_hostalias.c b/resolv/res_context_hostalias.c > new file mode 100644 > index 0000000000..b4dc1763db > --- /dev/null > +++ b/resolv/res_context_hostalias.c > @@ -0,0 +1,132 @@ > +/* HOSTALIASES-based name resolution. Internal function. OK. > + Copyright (C) 2015-2021 Free Software Foundation, Inc. > + This file is part of the GNU C Library. > + > + The GNU C Library is free software; you can redistribute it and/or > + modify it under the terms of the GNU Lesser General Public > + License as published by the Free Software Foundation; either > + version 2.1 of the License, or (at your option) any later version. > + > + The GNU C Library is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + Lesser General Public License for more details. > + > + You should have received a copy of the GNU Lesser General Public > + License along with the GNU C Library; if not, see > + . */ > + > +/* > + * Copyright (c) 1988, 1993 > + * The Regents of the University of California. All rights reserved. > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * 1. Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * 2. Redistributions in binary form must reproduce the above copyright > + * notice, this list of conditions and the following disclaimer in the > + * documentation and/or other materials provided with the distribution. > + * 4. Neither the name of the University nor the names of its contributors > + * may be used to endorse or promote products derived from this software > + * without specific prior written permission. > + * > + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND > + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE > + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE > + * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE > + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL > + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS > + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) > + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT > + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY > + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > + * SUCH DAMAGE. > + */ > + > +/* > + * Portions Copyright (c) 1993 by Digital Equipment Corporation. > + * > + * Permission to use, copy, modify, and distribute this software for any > + * purpose with or without fee is hereby granted, provided that the above > + * copyright notice and this permission notice appear in all copies, and that > + * the name of Digital Equipment Corporation not be used in advertising or > + * publicity pertaining to distribution of the document or software without > + * specific, written prior permission. > + * > + * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL > + * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES > + * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT > + * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL > + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR > + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS > + * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS > + * SOFTWARE. > + */ > + > +/* > + * Portions Copyright (c) 1996-1999 by Internet Software Consortium. > + * > + * Permission to use, copy, modify, and distribute this software for any > + * purpose with or without fee is hereby granted, provided that the above > + * copyright notice and this permission notice appear in all copies. > + * > + * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS > + * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES > + * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE > + * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL > + * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR > + * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS > + * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS > + * SOFTWARE. > + */ > + > +#include > +#include > +#include > +#include > +#include > +#include > +#include > + > +const char * > +__res_context_hostalias (struct resolv_context *ctx, > + const char *name, char *dst, size_t siz) > +{ > + char *file, *cp1, *cp2; > + char buf[BUFSIZ]; > + FILE *fp; > + > + if (ctx->resp->options & RES_NOALIASES) > + return NULL; > + file = getenv ("HOSTALIASES"); > + if (file == NULL || (fp = fopen (file, "rce")) == NULL) > + return NULL; OK. Drop setbuf as not required. > + buf[sizeof (buf) - 1] = '\0'; OK. Terminate. > + while (__fgets_unlocked (buf, sizeof (buf), fp)) OK. > + { > + for (cp1 = buf; *cp1 && !isspace (*cp1); ++cp1) > + ; > + if (!*cp1) > + break; > + *cp1 = '\0'; > + if (__libc_ns_samename (buf, name) == 1) > + { > + while (isspace (*++cp1)) > + ; > + if (!*cp1) > + break; > + for (cp2 = cp1 + 1; *cp2 && !isspace (*cp2); ++cp2) > + ; > + *cp2 = '\0'; > + strncpy (dst, cp1, siz - 1); > + dst[siz - 1] = '\0'; > + fclose (fp); > + return dst; OK. > + } > + } > + fclose (fp); > + return NULL; OK. > +} > +libc_hidden_def (__res_context_hostalias) > diff --git a/resolv/res_query.c b/resolv/res_query.c > index 5b51af8451..45c591ae27 100644 > --- a/resolv/res_query.c > +++ b/resolv/res_query.c > @@ -635,46 +635,6 @@ res_querydomain (const char *name, const char *domain, int class, int type, > (__resolv_context_get (), name, domain, class, type, answer, anslen); > } > > -const char * > -__res_context_hostalias (struct resolv_context *ctx, > - const char *name, char *dst, size_t siz) > -{ > - char *file, *cp1, *cp2; > - char buf[BUFSIZ]; > - FILE *fp; > - > - if (ctx->resp->options & RES_NOALIASES) > - return (NULL); > - file = getenv("HOSTALIASES"); > - if (file == NULL || (fp = fopen(file, "rce")) == NULL) > - return (NULL); > - setbuf(fp, NULL); > - buf[sizeof(buf) - 1] = '\0'; > - while (fgets(buf, sizeof(buf), fp)) { > - for (cp1 = buf; *cp1 && !isspace(*cp1); ++cp1) > - ; > - if (!*cp1) > - break; > - *cp1 = '\0'; > - if (__libc_ns_samename(buf, name) == 1) { > - while (isspace(*++cp1)) > - ; > - if (!*cp1) > - break; > - for (cp2 = cp1 + 1; *cp2 && !isspace(*cp2); ++cp2) > - ; > - *cp2 = '\0'; > - strncpy(dst, cp1, siz - 1); > - dst[siz - 1] = '\0'; > - fclose(fp); > - return (dst); > - } > - } > - fclose(fp); > - return (NULL); > -} > -libresolv_hidden_def (__res_context_hostalias) OK. Remove. > - > /* Common part of res_hostalias and hostalias. */ > static const char * > context_hostalias_common (struct resolv_context *ctx, > diff --git a/resolv/resolv-internal.h b/resolv/resolv-internal.h > index c18b1d0472..7d37817232 100644 > --- a/resolv/resolv-internal.h > +++ b/resolv/resolv-internal.h > @@ -79,7 +79,7 @@ int __res_context_send (struct resolv_context *, const unsigned char *, int, > /* Internal function similar to res_hostalias. */ > const char *__res_context_hostalias (struct resolv_context *, > const char *, char *, size_t); > -libresolv_hidden_proto (__res_context_hostalias); > +libc_hidden_proto (__res_context_hostalias); OK. > > /* Add an OPT record to a DNS query. */ > int __res_nopt (struct resolv_context *, int n0, > -- Cheers, Carlos.