From patchwork Fri Jul 17 08:30:40 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 40126 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 05A46393BC18; Fri, 17 Jul 2020 08:30:47 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 05A46393BC18 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1594974647; bh=+hKWCXygtSthwDdnR/0ucdEvcNK3eb9QbGz/3YbBq3Y=; h=To:Subject:In-Reply-To:References:Date:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=hWzuauUgGSnEdlZIaHNfAtnXKaQufFdxiMzR46lNAYrHWidOKCcQU6rR9lJBi/bXe co7xmQktq4C8J+IgUNLzEI9PDMTb3mRtN64iR/sVvKiLFz1htFNXM6pFsKDvToPhLP O3mPWRp8r9MEnzI399WJzW8iE4zOXcJkzN582llo= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-1.mimecast.com (us-smtp-2.mimecast.com [207.211.31.81]) by sourceware.org (Postfix) with ESMTP id 01982393BC0D for ; Fri, 17 Jul 2020 08:30:44 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 01982393BC0D Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-83-KoBlYmEiO3aE0L1TUXt8Hw-1; Fri, 17 Jul 2020 04:30:42 -0400 X-MC-Unique: KoBlYmEiO3aE0L1TUXt8Hw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 186341923764 for ; Fri, 17 Jul 2020 08:30:42 +0000 (UTC) Received: from oldenburg2.str.redhat.com (ovpn-112-136.ams2.redhat.com [10.36.112.136]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 91A555C298 for ; Fri, 17 Jul 2020 08:30:41 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 07/11] grp: Implement fgetgrent_r using __nss_fgetent_r In-Reply-To: References: Message-Id: <87552a25db51905c292fa203e99c2184969e1c52.1594974444.git.fweimer@redhat.com> Date: Fri, 17 Jul 2020 10:30:40 +0200 User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.3 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org 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: , X-Patchwork-Original-From: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" --- grp/fgetgrent_r.c | 54 ++++++----------------------------------------- 1 file changed, 6 insertions(+), 48 deletions(-) Tested-by: Carlos O'Donell Reviewed-by: Carlos O'Donell diff --git a/grp/fgetgrent_r.c b/grp/fgetgrent_r.c index 03daf4f295..b598584830 100644 --- a/grp/fgetgrent_r.c +++ b/grp/fgetgrent_r.c @@ -20,10 +20,6 @@ #include #include -#include -#define flockfile(s) _IO_flockfile (s) -#define funlockfile(s) _IO_funlockfile (s) - /* Define a line parsing function using the common code used in the nss_files module. */ @@ -59,49 +55,11 @@ int __fgetgrent_r (FILE *stream, struct group *resbuf, char *buffer, size_t buflen, struct group **result) { - char *p; - int parse_result; - - flockfile (stream); - do - { - buffer[buflen - 1] = '\xff'; - p = fgets_unlocked (buffer, buflen, stream); - if (__builtin_expect (p == NULL, 0) && feof_unlocked (stream)) - { - funlockfile (stream); - *result = NULL; - __set_errno (ENOENT); - return errno; - } - if (__builtin_expect (p == NULL, 0) || buffer[buflen - 1] != '\xff') - { - funlockfile (stream); - *result = NULL; - __set_errno (ERANGE); - return errno; - } - - /* Skip leading blanks. */ - while (isspace (*p)) - ++p; - } while (*p == '\0' || *p == '#' /* Ignore empty and comment lines. */ - /* Parse the line. If it is invalid, loop to - get the next line of the file to parse. */ - || ! (parse_result = parse_line (p, resbuf, - (void *) buffer, buflen, - &errno))); - - funlockfile (stream); - - if (__builtin_expect (parse_result, 0) == -1) - { - /* The parser ran out of space. */ - *result = NULL; - return errno; - } - - *result = resbuf; - return 0; + int ret = __nss_fgetent_r (stream, resbuf, buffer, buflen, parse_line); + if (ret == 0) + *result = resbuf; + else + *result = NULL; + return ret; } weak_alias (__fgetgrent_r, fgetgrent_r)