From patchwork Wed Aug 14 23:35:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Siddhesh Poyarekar X-Patchwork-Id: 1972624 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=cCcbTuZx; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces~incoming=patchwork.ozlabs.org@sourceware.org; receiver=patchwork.ozlabs.org) Received: from server2.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 ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4Wkl590Zqdz1yfL for ; Thu, 15 Aug 2024 09:36:29 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id BD1A23858C52 for ; Wed, 14 Aug 2024 23:36:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org BD1A23858C52 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1723678586; bh=8dvapLjorfqxRUrl2GkiBBwsDJBitvCzjKmax67BDP4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=cCcbTuZxi4p6ok0mDfUTUKRzZns2rUkH4I1Btlx/FPPfVyLe5HmsFuq0VqP7PCBLD nnt0kVrXDjcEiTUdY4VFgNnQbJD0gPnTiI+9pmOuTdYhqdiuA+pFvuwYvXCciRJUuC kxIx1nScMrid4tT5lh97+UlscvYi1fvXCt7LDnR8= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from rusty.tulip.relay.mailchannels.net (rusty.tulip.relay.mailchannels.net [23.83.218.252]) by sourceware.org (Postfix) with ESMTPS id 165F83858D3C for ; Wed, 14 Aug 2024 23:35:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 165F83858D3C Authentication-Results: sourceware.org; dmarc=fail (p=none dis=none) header.from=sourceware.org Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=sourceware.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 165F83858D3C Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=23.83.218.252 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1723678558; cv=pass; b=odOO4D6QlqSgmhD4rbbRhTsd8rwee0Q80Nm0WF774tKM1GJ7pHb+KUEuOmTOiwCDHwsFj9Qsm5B1BLn95EU2xknzPQwYveVLkCqHs3dp2hmF7r6zLibuvcknYGsx5zn4slPpwxqMqPw2QzCvC+sdrgP5t7r3gyq6Lnp1jAUXuHk= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1723678558; c=relaxed/simple; bh=AQ42oEC6igwvVlZfuEG0EbMYGZWnZEV52Lywy6z4WXM=; h=From:To:Subject:Date:Message-ID:MIME-Version; b=Da6/dznGsbqbXmVNlZifWafLoy7kSrcM7otgBTPSsA/aF8HyHJsMN9tPvcPeGz/UySMEfiNCrZRBDJq9FyVWFX54DgT7g2G3QGn/VFY+vCw3Y7VnAfc3/D6+IzTOCoMVtpxaV5NZKmLYZsRNDUP2bMY2QmNCG6n2eUBizrai83U= ARC-Authentication-Results: i=2; server2.sourceware.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 32D4D5C5168; Wed, 14 Aug 2024 23:35:54 +0000 (UTC) Received: from pdx1-sub0-mail-a310.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id DA0525C5110; Wed, 14 Aug 2024 23:35:53 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1723678553; a=rsa-sha256; cv=none; b=J/IMQ3Go18gdQz8bUT5Cm/tzo22pnwk41b7NnnCR1coj7LM9MuV180hR8BMovBQbXqse9Q A61qGxkJSxnrjVlK/DV6sjmtjwwHrzF6ega9P0DGzD/Fa4ncKpf3qzj387StOPoGlE3c6C 2C8NkvukxWQtkUWfwzlX4mYFsg0P9r6ZKv9azBi9mhoeeekG+uNIJR3vme1bSVFPx0T6qW wTYr77lLyH1b4J3FD6fXuaW4kvXzzryvy+8a5Xe16i5Vcff2Uz57jX/JD+aFcvXGPa4LF8 8+OyRg0zirS1uLMVRqQBbA7VXzon48QS2n31xUJbtrug0ECVHFeqmU6vEQD0Ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1723678553; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8dvapLjorfqxRUrl2GkiBBwsDJBitvCzjKmax67BDP4=; b=7EsnIuePfSk6fZjMDLiVfjLXQTwTDqI6SMGAFXjIFb8j4kh6Gwb2uI3kK/jduVNz1rY0rU 8SAHCB1stSIfbwVNR7lFx6BItpoRvt5e2tE5hKTeha8z3fNigBcanVZnD1bz83Ldj/cz7p w3H1KvH4VgnodJOYRUVjiiEVMakY6/tx5wQAgOrhMjCHzf7kenYRty3s0G8iYLPEdUV9rk bMXKQVXWWmdgieVTfC3bFcPGx+nNSzvVYKK/WSSvf293M80TbUWS64hrcGdng3AQNws/Ui e0nUFpHWGgX4SBVt2gFeso3x4lR72O5NwSKnP2U0Xdj6ntmZ4FiieIQ9hl8BHQ== ARC-Authentication-Results: i=1; rspamd-c4b59d8dc-vtfc5; auth=pass smtp.auth=dreamhost smtp.mailfrom=siddhesh@sourceware.org X-Sender-Id: dreamhost|x-authsender|siddhesh@gotplt.org X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|siddhesh@gotplt.org X-MailChannels-Auth-Id: dreamhost X-Callous-Tank: 730bbb4e280715b5_1723678554111_2636936558 X-MC-Loop-Signature: 1723678554111:4251515088 X-MC-Ingress-Time: 1723678554111 Received: from pdx1-sub0-mail-a310.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.121.240.13 (trex/7.0.2); Wed, 14 Aug 2024 23:35:54 +0000 Received: from fedora.redhat.com (unknown [184.146.171.51]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: siddhesh@gotplt.org) by pdx1-sub0-mail-a310.dreamhost.com (Postfix) with ESMTPSA id 4Wkl4T3R0pz9p; Wed, 14 Aug 2024 16:35:53 -0700 (PDT) From: Siddhesh Poyarekar To: libc-alpha@sourceware.org Cc: fweimer@redhat.com Subject: [PATCH 1/3] Make tst-ungetc use libsupport Date: Wed, 14 Aug 2024 19:35:32 -0400 Message-ID: <20240814233534.1469084-2-siddhesh@sourceware.org> X-Mailer: git-send-email 2.45.1 In-Reply-To: <20240814233534.1469084-1-siddhesh@sourceware.org> References: <20240814233534.1469084-1-siddhesh@sourceware.org> MIME-Version: 1.0 X-Spam-Status: No, score=-1170.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_NONE, KAM_DMARC_STATUS, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_SOFTFAIL, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces~incoming=patchwork.ozlabs.org@sourceware.org Signed-off-by: Siddhesh Poyarekar Reviewed-by: Carlos O'Donell --- stdio-common/tst-ungetc.c | 112 +++++++++++++++++++------------------- 1 file changed, 57 insertions(+), 55 deletions(-) diff --git a/stdio-common/tst-ungetc.c b/stdio-common/tst-ungetc.c index 1344b2b591..5c808f0734 100644 --- a/stdio-common/tst-ungetc.c +++ b/stdio-common/tst-ungetc.c @@ -1,70 +1,72 @@ -/* Test for ungetc bugs. */ +/* Test for ungetc bugs. + Copyright (C) 1996-2024 Free Software Foundation, Inc. + Copyright The GNU Toolchain Authors. + 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 + . */ #include #include -#include - -#undef assert -#define assert(x) \ - if (!(x)) \ - { \ - fputs ("test failed: " #x "\n", stderr); \ - retval = 1; \ - goto the_end; \ - } +#include +#include +#include +#include +#include -int -main (int argc, char *argv[]) +static int +do_test (void) { - char name[] = "/tmp/tst-ungetc.XXXXXX"; + char *name = NULL; FILE *fp = NULL; - int retval = 0; int c; char buffer[64]; - int fd = mkstemp (name); + int fd = create_temp_file ("tst-ungetc.", &name); if (fd == -1) - { - printf ("mkstemp failed: %m\n"); - return 1; - } - close (fd); - fp = fopen (name, "w"); - assert (fp != NULL) - fputs ("bla", fp); - fclose (fp); - fp = NULL; + FAIL_EXIT1 ("cannot create temporary file: %m"); + xclose (fd); - fp = fopen (name, "r"); - assert (fp != NULL); - assert (ungetc ('z', fp) == 'z'); - assert (getc (fp) == 'z'); - assert (getc (fp) == 'b'); - assert (getc (fp) == 'l'); - assert (ungetc ('m', fp) == 'm'); - assert (getc (fp) == 'm'); - assert ((c = getc (fp)) == 'a'); - assert (getc (fp) == EOF); - assert (ungetc (c, fp) == c); - assert (feof (fp) == 0); - assert (getc (fp) == c); - assert (getc (fp) == EOF); - fclose (fp); - fp = NULL; + fp = xfopen (name, "w"); + fputs ("bla", fp); + xfclose (fp); - fp = fopen (name, "r"); - assert (fp != NULL); - assert (getc (fp) == 'b'); - assert (getc (fp) == 'l'); - assert (ungetc ('b', fp) == 'b'); - assert (fread (buffer, 1, 64, fp) == 2); - assert (buffer[0] == 'b'); - assert (buffer[1] == 'a'); + fp = xfopen (name, "r"); + TEST_VERIFY_EXIT (ungetc ('z', fp) == 'z'); + TEST_VERIFY_EXIT (getc (fp) == 'z'); + TEST_VERIFY_EXIT (getc (fp) == 'b'); + TEST_VERIFY_EXIT (getc (fp) == 'l'); + TEST_VERIFY_EXIT (ungetc ('m', fp) == 'm'); + TEST_VERIFY_EXIT (getc (fp) == 'm'); + TEST_VERIFY_EXIT ((c = getc (fp)) == 'a'); + TEST_VERIFY_EXIT (getc (fp) == EOF); + TEST_VERIFY_EXIT (ungetc (c, fp) == c); + TEST_VERIFY_EXIT (feof (fp) == 0); + TEST_VERIFY_EXIT (getc (fp) == c); + TEST_VERIFY_EXIT (getc (fp) == EOF); + xfclose (fp); -the_end: - if (fp != NULL) - fclose (fp); - unlink (name); + fp = xfopen (name, "r"); + TEST_VERIFY_EXIT (getc (fp) == 'b'); + TEST_VERIFY_EXIT (getc (fp) == 'l'); + TEST_VERIFY_EXIT (ungetc ('b', fp) == 'b'); + TEST_VERIFY_EXIT (fread (buffer, 1, 64, fp) == 2); + TEST_VERIFY_EXIT (buffer[0] == 'b'); + TEST_VERIFY_EXIT (buffer[1] == 'a'); + xfclose (fp); - return retval; + return 0; } + +#include