From patchwork Fri Jul 17 08:30:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 40129 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 16D39393BC23; Fri, 17 Jul 2020 08:31:03 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 16D39393BC23 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1594974663; bh=xc0+YfINYgws/B/Iv096ccGNpCQqsest9qwYaa5QNZQ=; 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=buYdN7vgzlY0eSWPkNWqpPFsz/wm54/xcu50EOzSgGfaQb+rxnwelFErBSZ823PqG QSrKRw3ogLwTiJ9OGkYtvgD2mH5KrlRP5hYxNERKNBoG/6zmdVJ1GriVXYSXqc5CyW 7lno6yljIgg5CsJQCY1fRBE/uUIHbl6L35UbeI0U= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-1.mimecast.com (us-smtp-1.mimecast.com [205.139.110.61]) by sourceware.org (Postfix) with ESMTP id 82E1C393BC21 for ; Fri, 17 Jul 2020 08:31:00 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 82E1C393BC21 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-6-LomhsZcHPL2IufkfxwgJoQ-1; Fri, 17 Jul 2020 04:30:58 -0400 X-MC-Unique: LomhsZcHPL2IufkfxwgJoQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D2B33107ACCA for ; Fri, 17 Jul 2020 08:30:57 +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 58F7A71664 for ; Fri, 17 Jul 2020 08:30:57 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH 10/11] shadow: Implement fgetspent_r using __nss_fgetent_r In-Reply-To: References: Message-Id: <418bb5d8b04310cdb91a966af870031188dd36dd.1594974444.git.fweimer@redhat.com> Date: Fri, 17 Jul 2020 10:30:55 +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.11 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_H2, 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" --- gshadow/tst-fgetsgent_r.c | 1 + shadow/fgetspent_r.c | 43 ++++++--------------------------------- 2 files changed, 7 insertions(+), 37 deletions(-) Tested-by: Carlos O'Donell Reviewed-by: Carlos O'Donell diff --git a/gshadow/tst-fgetsgent_r.c b/gshadow/tst-fgetsgent_r.c index 780409afa9..f81e09b362 100644 --- a/gshadow/tst-fgetsgent_r.c +++ b/gshadow/tst-fgetsgent_r.c @@ -168,6 +168,7 @@ run_test (const char *path, size_t buffer_size) free (result_storage); } + xfclose (fp); return resized; } diff --git a/shadow/fgetspent_r.c b/shadow/fgetspent_r.c index da35846df0..d4d4e52f6a 100644 --- a/shadow/fgetspent_r.c +++ b/shadow/fgetspent_r.c @@ -20,9 +20,6 @@ #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. */ @@ -39,39 +36,11 @@ int __fgetspent_r (FILE *stream, struct spwd *resbuf, char *buffer, size_t buflen, struct spwd **result) { - char *p; - - flockfile (stream); - do - { - buffer[buflen - 1] = '\xff'; - p = fgets_unlocked (buffer, buflen, stream); - if (p == NULL && feof_unlocked (stream)) - { - funlockfile (stream); - *result = NULL; - __set_errno (ENOENT); - return errno; - } - if (p == NULL || 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_line (buffer, (void *) resbuf, NULL, 0, &errno)); - - funlockfile (stream); - - *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 (__fgetspent_r, fgetspent_r)