qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

stdio-common: Add tests for formatted vsscanf input specifiers 

Wire vsscanf into test infrastructure for formatted scanf input
specifiers.

Reviewed-by: Joseph Myers <josmyers@redhat.com>
This commit is contained in:
Maciej W. Rozycki 2025-03-28 12:35:53 +00:00
parent 53ee7ede43
commit 47076b3163
16 changed files with 386 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stdio-common/Makefile
View File

@ -52,7 +52,7 @@ nonfmt-xprintf-stems := \
xprintf-stems := $(sort $(fmt-xprintf-stems) $(nonfmt-xprintf-stems)) xprintf-stems := $(sort $(fmt-xprintf-stems) $(nonfmt-xprintf-stems))
# List of markers for scanf family function tests. # List of markers for scanf family function tests.
xscanf-funcs := s f ss v vf xscanf-funcs := s f ss v vf vs
# List of data types and formats for individual per-conversion scanf tests. # List of data types and formats for individual per-conversion scanf tests.
# Further conversions are provided by sysdeps. # Further conversions are provided by sysdeps.

22
stdio-common/tst-scanf-format-vs-c.c Normal file
View File

@ -0,0 +1,22 @@
/* Test for formatted 'vsscanf' 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
<https://www.gnu.org/licenses/>. */
#include "tst-scanf-format-skeleton.h"
#include "tst-scanf-format-vs.h"
#include "tst-scanf-format-character.h"
#include "tst-scanf-format-skeleton-c.c"

22
stdio-common/tst-scanf-format-vs-char.c Normal file
View File

@ -0,0 +1,22 @@
/* Test for formatted 'vsscanf' 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
<https://www.gnu.org/licenses/>. */
#include "tst-scanf-format-skeleton.h"
#include "tst-scanf-format-vs.h"
#include "tst-scanf-format-integer.h"
#include "tst-scanf-format-skeleton-char.c"

22
stdio-common/tst-scanf-format-vs-double.c Normal file
View File

@ -0,0 +1,22 @@
/* Test for formatted 'vsscanf' 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
<https://www.gnu.org/licenses/>. */
#include "tst-scanf-format-skeleton.h"
#include "tst-scanf-format-vs.h"
#include "tst-scanf-format-real.h"
#include "tst-scanf-format-skeleton-double.c"

22
stdio-common/tst-scanf-format-vs-float.c Normal file
View File

@ -0,0 +1,22 @@
/* Test for formatted 'vsscanf' 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
<https://www.gnu.org/licenses/>. */
#include "tst-scanf-format-skeleton.h"
#include "tst-scanf-format-vs.h"
#include "tst-scanf-format-real.h"
#include "tst-scanf-format-skeleton-float.c"

22
stdio-common/tst-scanf-format-vs-int.c Normal file
View File

@ -0,0 +1,22 @@
/* Test for formatted 'vsscanf' 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
<https://www.gnu.org/licenses/>. */
#include "tst-scanf-format-skeleton.h"
#include "tst-scanf-format-vs.h"
#include "tst-scanf-format-integer.h"
#include "tst-scanf-format-skeleton-int.c"

22
stdio-common/tst-scanf-format-vs-ldouble.c Normal file
View File

@ -0,0 +1,22 @@
/* Test for formatted 'vsscanf' 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
<https://www.gnu.org/licenses/>. */
#include "tst-scanf-format-skeleton.h"
#include "tst-scanf-format-vs.h"
#include "tst-scanf-format-real.h"
#include "tst-scanf-format-skeleton-ldouble.c"

22
stdio-common/tst-scanf-format-vs-llong.c Normal file
View File

@ -0,0 +1,22 @@
/* Test for formatted 'vsscanf' 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
<https://www.gnu.org/licenses/>. */
#include "tst-scanf-format-skeleton.h"
#include "tst-scanf-format-vs.h"
#include "tst-scanf-format-integer.h"
#include "tst-scanf-format-skeleton-llong.c"

22
stdio-common/tst-scanf-format-vs-long.c Normal file
View File

@ -0,0 +1,22 @@
/* Test for formatted 'vsscanf' 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
<https://www.gnu.org/licenses/>. */
#include "tst-scanf-format-skeleton.h"
#include "tst-scanf-format-vs.h"
#include "tst-scanf-format-integer.h"
#include "tst-scanf-format-skeleton-long.c"

22
stdio-common/tst-scanf-format-vs-short.c Normal file
View File

@ -0,0 +1,22 @@
/* Test for formatted 'vsscanf' 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
<https://www.gnu.org/licenses/>. */
#include "tst-scanf-format-skeleton.h"
#include "tst-scanf-format-vs.h"
#include "tst-scanf-format-integer.h"
#include "tst-scanf-format-skeleton-short.c"

22
stdio-common/tst-scanf-format-vs-uchar.c Normal file
View File

@ -0,0 +1,22 @@
/* Test for formatted 'vsscanf' 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
<https://www.gnu.org/licenses/>. */
#include "tst-scanf-format-skeleton.h"
#include "tst-scanf-format-vs.h"
#include "tst-scanf-format-integer.h"
#include "tst-scanf-format-skeleton-uchar.c"

22
stdio-common/tst-scanf-format-vs-uint.c Normal file
View File

@ -0,0 +1,22 @@
/* Test for formatted 'vsscanf' 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
<https://www.gnu.org/licenses/>. */
#include "tst-scanf-format-skeleton.h"
#include "tst-scanf-format-vs.h"
#include "tst-scanf-format-integer.h"
#include "tst-scanf-format-skeleton-uint.c"

22
stdio-common/tst-scanf-format-vs-ullong.c Normal file
View File

@ -0,0 +1,22 @@
/* Test for formatted 'vsscanf' 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
<https://www.gnu.org/licenses/>. */
#include "tst-scanf-format-skeleton.h"
#include "tst-scanf-format-vs.h"
#include "tst-scanf-format-integer.h"
#include "tst-scanf-format-skeleton-ullong.c"

22
stdio-common/tst-scanf-format-vs-ulong.c Normal file
View File

@ -0,0 +1,22 @@
/* Test for formatted 'vsscanf' 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
<https://www.gnu.org/licenses/>. */
#include "tst-scanf-format-skeleton.h"
#include "tst-scanf-format-vs.h"
#include "tst-scanf-format-integer.h"
#include "tst-scanf-format-skeleton-ulong.c"

22
stdio-common/tst-scanf-format-vs-ushort.c Normal file
View File

@ -0,0 +1,22 @@
/* Test for formatted 'vsscanf' 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
<https://www.gnu.org/licenses/>. */
#include "tst-scanf-format-skeleton.h"
#include "tst-scanf-format-vs.h"
#include "tst-scanf-format-integer.h"
#include "tst-scanf-format-skeleton-ushort.c"

77
stdio-common/tst-scanf-format-vs.h Normal file
View File

@ -0,0 +1,77 @@
/* Test feature wrapper for formatted 'vsscanf' 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
<https://www.gnu.org/licenses/>. */
#include <stdarg.h>
#include <stddef.h>
#include <stdio.h>
#include <stdlib.h>
#include <support/support.h>
static char *sscanf_buf;
static size_t sscanf_buf_size;
static void __attribute__ ((destructor))
scanf_under_test_fini (void)
{
free (sscanf_buf);
}
static int
scanf_under_test (const char *restrict fmt, ...)
{
size_t i = 0;
va_list ap;
int result;
int ch;
do
{
ch = read_input ();
if (ch < 0)
{
result = ch;
goto out;
}
if (i == sscanf_buf_size)
{
sscanf_buf_size += SIZE_CHUNK;
/* Add an extra byte for the terminating null character. */
sscanf_buf = xrealloc (sscanf_buf, sscanf_buf_size + 1);
}
sscanf_buf[i++] = ch;
}
while (ch != ':');
sscanf_buf[i++] = '\0';
ch = ungetc (ch, stdin);
if (ch == EOF)
{
result = INPUT_ERROR;
goto out;
}
va_start (ap, fmt);
result = vsscanf (sscanf_buf, fmt, ap);
va_end (ap);
if (result == EOF)
result = INPUT_EOF;
out:
return result;
}