diff mbox series

[1/3] Make tst-ungetc use libsupport

Message ID	20240814233534.1469084-2-siddhesh@sourceware.org
State	Superseded
Headers	DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 165F83858D3C sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id DA0525C5110; Wed, 14 Aug 2024 23:35:53 +0000 (UTC) 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 <siddhesh@sourceware.org> 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> In-Reply-To: <20240814233534.1469084-1-siddhesh@sourceware.org> References: <20240814233534.1469084-1-siddhesh@sourceware.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org
Series	ungetc fixes for BZ #27821 \| [0/3] ungetc fixes for BZ #27821 [1/3] Make tst-ungetc use libsupport [2/3] ungetc: Fix uninitialized read when putting into unused streams [BZ #27821] [3/3] ungetc: Fix backup buffer leak on program exit [BZ #27821]

Checks

Context	Check	Description
redhat-pt-bot/TryBot-apply_patch	success	Patch applied to master at the time it was sent
linaro-tcwg-bot/tcwg_glibc_build--master-aarch64	success	Build passed
linaro-tcwg-bot/tcwg_glibc_check--master-aarch64	fail	Patch failed to apply
linaro-tcwg-bot/tcwg_glibc_build--master-arm	fail	Patch failed to apply

Commit Message

Siddhesh Poyarekar Aug. 14, 2024, 11:35 p.m. UTC

  Signed-off-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
---
 stdio-common/tst-ungetc.c | 112 +++++++++++++++++++-------------------
 1 file changed, 57 insertions(+), 55 deletions(-)

Comments

Andreas Schwab Aug. 15, 2024, 3:20 p.m. UTC | #1

Ok.

Carlos O'Donell Aug. 15, 2024, 5:27 p.m. UTC | #2

On 8/14/24 7:35 PM, Siddhesh Poyarekar wrote:
> Signed-off-by: Siddhesh Poyarekar <siddhesh@sourceware.org>

LGTM.

Reviewed-by: Carlos O'Donell <carlos@redhat.com>

> ---
>  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
> +   <https://www.gnu.org/licenses/>.  */
>  
>  #include <stdio.h>
>  #include <stdlib.h>
> -#include <unistd.h>
> -
> -#undef assert
> -#define assert(x) \
> -  if (!(x)) \
> -    { \
> -      fputs ("test failed: " #x "\n", stderr); \
> -      retval = 1; \
> -      goto the_end; \
> -    }
> +#include <support/check.h>
> +#include <support/support.h>
> +#include <support/temp_file.h>
> +#include <support/xstdio.h>
> +#include <support/xunistd.h>
>  
> -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 <support/test-driver.c>

diff mbox series

Patch

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
+   <https://www.gnu.org/licenses/>.  */
 
 #include <stdio.h>
 #include <stdlib.h>
-#include <unistd.h>
-
-#undef assert
-#define assert(x) \
-  if (!(x)) \
-    { \
-      fputs ("test failed: " #x "\n", stderr); \
-      retval = 1; \
-      goto the_end; \
-    }
+#include <support/check.h>
+#include <support/support.h>
+#include <support/temp_file.h>
+#include <support/xstdio.h>
+#include <support/xunistd.h>
 
-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 <support/test-driver.c>