From patchwork Sat Mar 1 22:45:43 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Maciej W. Rozycki" X-Patchwork-Id: 107284 X-Patchwork-Delegate: joseph@codesourcery.com 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 224223858C78 for ; Sat, 1 Mar 2025 22:51:04 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 224223858C78 X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from angie.orcam.me.uk (angie.orcam.me.uk [78.133.224.34]) by sourceware.org (Postfix) with ESMTP id CA5153858417 for ; Sat, 1 Mar 2025 22:45:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org CA5153858417 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=orcam.me.uk Authentication-Results: sourceware.org; spf=none smtp.mailfrom=orcam.me.uk ARC-Filter: OpenARC Filter v1.0.0 sourceware.org CA5153858417 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=78.133.224.34 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1740869144; cv=none; b=h0w7pc1KEuqaMKQtsq3ODyfV2sG3EK29AYgEEpALr3CWXBZd+NSKDzPSARDUWVGhvdYmJQOoZNUjBAmhx3pmhSv7+TJ1ymzxSlroOmwCGPcLaqZskgTSsS/EJpQADZIA31Lpef8O4T+PgQYIR2IpAVPdzSIqUCX82M8mqqu4v84= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1740869144; c=relaxed/simple; bh=Y/Lrbfo5dF+DXCiu4s7Vogw216TA1iooBnU8TiZ0rq0=; h=Date:From:To:Subject:Message-ID:MIME-Version; b=N8reKJsUEPlFMx8GuwNh/2ECdzLj2HFJ4YS8Hkge+Qs7d6LHEqkGbmJ8a6xUZ/Q12eqEUIkB7gKzbAMXhDYa/qJCWtD1JHqNl5d+FoIcgVnmYQ1emrot1eSZpckcNVB6glNr4RVv3B2rHbjr3SSX+/sk+cXCKda99u9rIR8TOG4= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org CA5153858417 Received: by angie.orcam.me.uk (Postfix, from userid 500) id 9A82E92009E; Sat, 1 Mar 2025 23:45:43 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by angie.orcam.me.uk (Postfix) with ESMTP id 9499292009C; Sat, 1 Mar 2025 22:45:43 +0000 (GMT) Date: Sat, 1 Mar 2025 22:45:43 +0000 (GMT) From: "Maciej W. Rozycki" To: libc-alpha@sourceware.org cc: "Maciej W. Rozycki" Subject: [PATCH v2 12/17] stdio-common: Add tests for formatted vscanf input specifiers In-Reply-To: Message-ID: References: User-Agent: Alpine 2.21 (DEB 202 2017-01-01) MIME-Version: 1.0 X-Spam-Status: No, score=-1162.1 required=5.0 tests=BAYES_00, KAM_ASCII_DIVIDERS, KAM_DMARC_STATUS, KAM_INFOUSMEBIZ, KAM_LAZY_DOMAIN_SECURITY, KAM_SHORT, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=no 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: , Reply-To: "Maciej W. Rozycki" Errors-To: libc-alpha-bounces~patchwork=sourceware.org@sourceware.org From: Maciej W. Rozycki Wire vscanf into test infrastructure for formatted scanf input specifiers. --- No change from v1. --- stdio-common/Makefile | 2 - stdio-common/tst-scanf-format-v-c.c | 22 ++++++++++++++++++ stdio-common/tst-scanf-format-v-char.c | 22 ++++++++++++++++++ stdio-common/tst-scanf-format-v-double.c | 22 ++++++++++++++++++ stdio-common/tst-scanf-format-v-float.c | 22 ++++++++++++++++++ stdio-common/tst-scanf-format-v-int.c | 22 ++++++++++++++++++ stdio-common/tst-scanf-format-v-ldouble.c | 22 ++++++++++++++++++ stdio-common/tst-scanf-format-v-llong.c | 22 ++++++++++++++++++ stdio-common/tst-scanf-format-v-long.c | 22 ++++++++++++++++++ stdio-common/tst-scanf-format-v-short.c | 22 ++++++++++++++++++ stdio-common/tst-scanf-format-v-uchar.c | 22 ++++++++++++++++++ stdio-common/tst-scanf-format-v-uint.c | 22 ++++++++++++++++++ stdio-common/tst-scanf-format-v-ullong.c | 22 ++++++++++++++++++ stdio-common/tst-scanf-format-v-ulong.c | 22 ++++++++++++++++++ stdio-common/tst-scanf-format-v-ushort.c | 22 ++++++++++++++++++ stdio-common/tst-scanf-format-v.h | 36 ++++++++++++++++++++++++++++++ 16 files changed, 345 insertions(+), 1 deletion(-) glibc-tst-scanf-format-all-vscanf.diff Index: glibc/stdio-common/Makefile =================================================================== --- glibc.orig/stdio-common/Makefile +++ glibc/stdio-common/Makefile @@ -52,7 +52,7 @@ nonfmt-xprintf-stems := \ xprintf-stems := $(sort $(fmt-xprintf-stems) $(nonfmt-xprintf-stems)) # List of markers for scanf family function tests. -xscanf-funcs := s f ss +xscanf-funcs := s f ss v # List of data types and formats for individual per-conversion scanf tests. # Further conversions are provided by sysdeps. Index: glibc/stdio-common/tst-scanf-format-v-c.c =================================================================== --- /dev/null +++ glibc/stdio-common/tst-scanf-format-v-c.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vscanf' input for the character conversions. + Copyright (C) 2025 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 + . */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-v.h" +#include "tst-scanf-format-character.h" +#include "tst-scanf-format-skeleton-c.c" Index: glibc/stdio-common/tst-scanf-format-v-char.c =================================================================== --- /dev/null +++ glibc/stdio-common/tst-scanf-format-v-char.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vscanf' input for signed char conversions. + Copyright (C) 2025 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 + . */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-v.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-char.c" Index: glibc/stdio-common/tst-scanf-format-v-double.c =================================================================== --- /dev/null +++ glibc/stdio-common/tst-scanf-format-v-double.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vscanf' input for double conversions. + Copyright (C) 2025 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 + . */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-v.h" +#include "tst-scanf-format-real.h" +#include "tst-scanf-format-skeleton-double.c" Index: glibc/stdio-common/tst-scanf-format-v-float.c =================================================================== --- /dev/null +++ glibc/stdio-common/tst-scanf-format-v-float.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vscanf' input for float conversions. + Copyright (C) 2025 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 + . */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-v.h" +#include "tst-scanf-format-real.h" +#include "tst-scanf-format-skeleton-float.c" Index: glibc/stdio-common/tst-scanf-format-v-int.c =================================================================== --- /dev/null +++ glibc/stdio-common/tst-scanf-format-v-int.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vscanf' input for int conversions. + Copyright (C) 2025 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 + . */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-v.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-int.c" Index: glibc/stdio-common/tst-scanf-format-v-ldouble.c =================================================================== --- /dev/null +++ glibc/stdio-common/tst-scanf-format-v-ldouble.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vscanf' input for long double conversions. + Copyright (C) 2025 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 + . */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-v.h" +#include "tst-scanf-format-real.h" +#include "tst-scanf-format-skeleton-ldouble.c" Index: glibc/stdio-common/tst-scanf-format-v-llong.c =================================================================== --- /dev/null +++ glibc/stdio-common/tst-scanf-format-v-llong.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vscanf' input for long long conversions. + Copyright (C) 2025 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 + . */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-v.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-llong.c" Index: glibc/stdio-common/tst-scanf-format-v-long.c =================================================================== --- /dev/null +++ glibc/stdio-common/tst-scanf-format-v-long.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vscanf' input for long conversions. + Copyright (C) 2025 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 + . */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-v.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-long.c" Index: glibc/stdio-common/tst-scanf-format-v-short.c =================================================================== --- /dev/null +++ glibc/stdio-common/tst-scanf-format-v-short.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vscanf' input for short int conversions. + Copyright (C) 2025 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 + . */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-v.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-short.c" Index: glibc/stdio-common/tst-scanf-format-v-uchar.c =================================================================== --- /dev/null +++ glibc/stdio-common/tst-scanf-format-v-uchar.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vscanf' input for unsigned char conversions. + Copyright (C) 2025 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 + . */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-v.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-uchar.c" Index: glibc/stdio-common/tst-scanf-format-v-uint.c =================================================================== --- /dev/null +++ glibc/stdio-common/tst-scanf-format-v-uint.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vscanf' input for unsigned int conversions. + Copyright (C) 2025 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 + . */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-v.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-uint.c" Index: glibc/stdio-common/tst-scanf-format-v-ullong.c =================================================================== --- /dev/null +++ glibc/stdio-common/tst-scanf-format-v-ullong.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vscanf' input for unsigned long long int conversions. + Copyright (C) 2025 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 + . */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-v.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-ullong.c" Index: glibc/stdio-common/tst-scanf-format-v-ulong.c =================================================================== --- /dev/null +++ glibc/stdio-common/tst-scanf-format-v-ulong.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vscanf' input for unsigned long int conversions. + Copyright (C) 2025 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 + . */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-v.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-ulong.c" Index: glibc/stdio-common/tst-scanf-format-v-ushort.c =================================================================== --- /dev/null +++ glibc/stdio-common/tst-scanf-format-v-ushort.c @@ -0,0 +1,22 @@ +/* Test for formatted 'vscanf' input for unsigned short int conversions. + Copyright (C) 2025 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 + . */ + +#include "tst-scanf-format-skeleton.h" +#include "tst-scanf-format-v.h" +#include "tst-scanf-format-integer.h" +#include "tst-scanf-format-skeleton-ushort.c" Index: glibc/stdio-common/tst-scanf-format-v.h =================================================================== --- /dev/null +++ glibc/stdio-common/tst-scanf-format-v.h @@ -0,0 +1,36 @@ +/* Test feature wrapper for formatted 'vscanf' input. + Copyright (C) 2025 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 + . */ + +#include +#include + +static int +scanf_under_test (const char *restrict fmt, ...) +{ + va_list ap; + int result; + + va_start (ap, fmt); + result = vscanf (fmt, ap); + va_end (ap); + if (ferror (stdin)) + result = INPUT_ERROR; + else if (result == EOF) + result = INPUT_EOF; + return result; +}