On 02/10/2018 10:17 AM, Zack Weinberg wrote:
> The only difference between noncompliant and C99-compliant scanf is
> that the former accepts the archaic GNU extension '%as' (also %aS and
> %a[...]) meaning to allocate space for the input string with malloc.
> This extension conflicts with C99's use of %a as a format _type_
> meaning to read a floating-point number; POSIX.1-2001 standardized
POSIX.1-2008, from what I could tell (Issue 7 of IEEE 1003.1, if I'm
saying that right). This happens a few times throughout.
> equivalent functionality using the modifier letter 'm' instead (%ms,
> %mS, %m[...]).
...
> diff --git a/NEWS b/NEWS
> index 60dd2f778d9..45465b785e3 100644
> --- a/NEWS
> +++ b/NEWS
> @@ -28,6 +28,21 @@ Deprecated and removed features, and other changes affecting compatibility:
> investigate using (f)getc_unlocked and (f)putc_unlocked, and, if
> necessary, flockfile and funlockfile.
>
> + * The scanf formats '%as', '%aS', and '%a[...]', meaning to read a string
> + and allocate space for it using malloc, are no longer accepted in code
> + compiled with _GNU_SOURCE. They were already not accepted in code
> + compiled in the default mode with modern compilers (e.g. GCC new enough
> + to default to -std=gnu11, without _GNU_SOURCE).
> +
> + Using 'a' as a modifier letter for 's'-type scanf formats is an archaic
> + GNU extension that conflicts with C99's use of '%a' for floating-point
> + numbers. Equivalent functionality was standardized in POSIX.1-2001 using
> + the letter 'm' instead; programs using '%as', '%aS', and '%a[...]' should
> + change to '%ms', '%mS', and '%m[...]' respectively. GCC's -Wformat
> + warnings can detect most uses of the extension, as long as all functions
> + that call vscanf, vfscanf, or vsscanf are annotated with
> + __attribute__((format(scanf, ...))).
> +
> * The macros 'major', 'minor', and 'makedev' are now only available from
> the header <sys/sysmacros.h>; not from <sys/types.h> or various other
> headers that happen to include <sys/types.h>. These macros are rarely
> diff --git a/include/features.h b/include/features.h
> index 137a90b4055..e6b19c5789c 100644
> --- a/include/features.h
> +++ b/include/features.h
> @@ -140,6 +140,7 @@
> #undef __USE_FORTIFY_LEVEL
> #undef __KERNEL_STRICT_NAMES
> #undef __GLIBC_USE_DEPRECATED_GETS
> +#undef __GLIBC_USE_DEPRECATED_SCANF
Should be a tab.
>
> /* Suppress kernel-name space pollution unless user expressedly asks
> for it. */
> @@ -401,6 +402,20 @@
> # define __GLIBC_USE_DEPRECATED_GETS 1
> #endif
>
> +/* GNU formerly extended the 'scanf' functions with modified format
> + specifiers %as, %aS, and %a[...] that allocate a buffer for the
> + input using malloc. This extension conflicts with ISO C99, which
> + defines %a as a standalone format specifier that reads a
> + floating-point number; moreover, POSIX.1-2001 provides the same
> + functionality using the modifier letter 'm' instead (%ms, %mS,
> + %m[...]). We now follow C99 and POSIX unless an old, non-strict
> + conformance level is specifically selected. */
> +#if defined __USE_ISOC99 && (defined __USE_XOPEN2K || defined __STRICT_ANSI__)
> +# define __GLIBC_USE_DEPRECATED_SCANF 0
> +#else
> +# define __GLIBC_USE_DEPRECATED_SCANF 1
> +#endif
> +
> /* Get definitions of __STDC_* predefined macros, if the compiler has
> not preincluded this header automatically. */
> #include <stdc-predef.h>
> diff --git a/include/stdio.h b/include/stdio.h
> index 94bc2fdc7ef..d0e9343b2a9 100644
> --- a/include/stdio.h
> +++ b/include/stdio.h
> @@ -67,6 +67,7 @@ extern int __isoc99_vscanf (const char *__restrict __format,
> extern int __isoc99_vsscanf (const char *__restrict __s,
> const char *__restrict __format,
> __gnuc_va_list __arg) __THROW;
> +libc_hidden_proto (__isoc99_sscanf)
> libc_hidden_proto (__isoc99_vsscanf)
> libc_hidden_proto (__isoc99_vfscanf)
>
> @@ -154,7 +155,6 @@ libc_hidden_proto (__dprintf)
> libc_hidden_proto (fprintf)
> libc_hidden_proto (vfprintf)
> libc_hidden_proto (sprintf)
> -libc_hidden_proto (sscanf)
> libc_hidden_proto (fwrite)
> libc_hidden_proto (perror)
> libc_hidden_proto (remove)
> diff --git a/libio/bits/stdio-ldbl.h b/libio/bits/stdio-ldbl.h
> index 99d9bcc2334..ab55cbe7fb2 100644
> --- a/libio/bits/stdio-ldbl.h
> +++ b/libio/bits/stdio-ldbl.h
> @@ -26,9 +26,7 @@ __LDBL_REDIR_DECL (sprintf)
> __LDBL_REDIR_DECL (vfprintf)
> __LDBL_REDIR_DECL (vprintf)
> __LDBL_REDIR_DECL (vsprintf)
> -#if defined __USE_ISOC99 && !defined __USE_GNU \
> - && !defined __REDIRECT \
> - && (defined __STRICT_ANSI__ || defined __USE_XOPEN2K)
> +#if !__GLIBC_USE (DEPRECATED_SCANF) && defined __REDIRECT
> __LDBL_REDIR1_DECL (fscanf, __nldbl___isoc99_fscanf)
> __LDBL_REDIR1_DECL (scanf, __nldbl___isoc99_scanf)
> __LDBL_REDIR1_DECL (sscanf, __nldbl___isoc99_sscanf)
> @@ -44,8 +42,7 @@ __LDBL_REDIR_DECL (vsnprintf)
> #endif
>
> #ifdef __USE_ISOC99
> -# if !defined __USE_GNU && !defined __REDIRECT \
> - && (defined __STRICT_ANSI__ || defined __USE_XOPEN2K)
> +#if !__GLIBC_USE (DEPRECATED_SCANF) && defined __REDIRECT
This #if should still be indented one space, I believe. You might be
able to get rid of the outer "#ifdef __USE_ISOC99" though, since it only
wraps this this one block.
> __LDBL_REDIR1_DECL (vfscanf, __nldbl___isoc99_vfscanf)
> __LDBL_REDIR1_DECL (vscanf, __nldbl___isoc99_vscanf)
> __LDBL_REDIR1_DECL (vsscanf, __nldbl___isoc99_vsscanf)
> diff --git a/libio/iovsscanf.c b/libio/iovsscanf.c
> index b5514fc74ea..e072258ba30 100644
> --- a/libio/iovsscanf.c
> +++ b/libio/iovsscanf.c
> @@ -24,6 +24,11 @@
> This exception applies to code released by its copyright holders
> in files containing the exception. */
>
> +/* This file defines one of the deprecated scanf variants. */
> +#include <features.h>
> +#undef __GLIBC_USE_DEPRECATED_SCANF
> +#define __GLIBC_USE_DEPRECATED_SCANF 1
> +
> #include "libioP.h"
> #include "strfile.h"
>
> diff --git a/libio/stdio.h b/libio/stdio.h
> index 731f8e56f4c..a04539639db 100644
> --- a/libio/stdio.h
> +++ b/libio/stdio.h
> @@ -387,13 +387,11 @@ extern int scanf (const char *__restrict __format, ...) __wur;
> extern int sscanf (const char *__restrict __s,
> const char *__restrict __format, ...) __THROW;
>
> -#if defined __USE_ISOC99 && !defined __USE_GNU \
> - && (!defined __LDBL_COMPAT || !defined __REDIRECT) \
> - && (defined __STRICT_ANSI__ || defined __USE_XOPEN2K)
> -# ifdef __REDIRECT
> -/* For strict ISO C99 or POSIX compliance disallow %as, %aS and %a[
> - GNU extension which conflicts with valid %a followed by letter
> - s, S or [. */
> +/* For historical reasons, the C99-compliant versions of the scanf
> + functions are at alternative names. When __LDBL_COMPAT is in
> + effect, this is handled in bits/stdio-ldbl.h. */
> +#if !__GLIBC_USE (DEPRECATED_SCANF)
> +# if defined __REDIRECT && !defined __LDBL_COMPAT
> extern int __REDIRECT (fscanf, (FILE *__restrict __stream,
> const char *__restrict __format, ...),
> __isoc99_fscanf) __wur;
> @@ -402,7 +400,7 @@ extern int __REDIRECT (scanf, (const char *__restrict __format, ...),
> extern int __REDIRECT_NTH (sscanf, (const char *__restrict __s,
> const char *__restrict __format, ...),
> __isoc99_sscanf);
> -# else
> +# elif !defined __REDIRECT
Should this still include the "!defined __LDBL_COMPAT"? Or maybe put
that on the line with DEPRECATED_SCANF, so it also wraps the __REDIRECT
if-else?
> extern int __isoc99_fscanf (FILE *__restrict __stream,
> const char *__restrict __format, ...) __wur;
> extern int __isoc99_scanf (const char *__restrict __format, ...) __wur;
> @@ -435,13 +433,9 @@ extern int vsscanf (const char *__restrict __s,
> const char *__restrict __format, __gnuc_va_list __arg)
> __THROW __attribute__ ((__format__ (__scanf__, 2, 0)));
>
> -# if !defined __USE_GNU \
> - && (!defined __LDBL_COMPAT || !defined __REDIRECT) \
> - && (defined __STRICT_ANSI__ || defined __USE_XOPEN2K)
> -# ifdef __REDIRECT
> -/* For strict ISO C99 or POSIX compliance disallow %as, %aS and %a[
> - GNU extension which conflicts with valid %a followed by letter
> - s, S or [. */
> +/* Same redirection as above for the v*scanf family. */
> +# if !__GLIBC_USE (DEPRECATED_SCANF)
> +# if defined __REDIRECT && !defined __LDBL_COMPAT
> extern int __REDIRECT (vfscanf,
> (FILE *__restrict __s,
> const char *__restrict __format, __gnuc_va_list __arg),
> @@ -455,7 +449,7 @@ extern int __REDIRECT_NTH (vsscanf,
> const char *__restrict __format,
> __gnuc_va_list __arg), __isoc99_vsscanf)
> __attribute__ ((__format__ (__scanf__, 2, 0)));
> -# else
> +# elif !defined __REDIRECT
> extern int __isoc99_vfscanf (FILE *__restrict __s,
> const char *__restrict __format,
> __gnuc_va_list __arg) __wur;
Rical
@@ -28,6 +28,21 @@ Deprecated and removed features, and other changes affecting compatibility:
investigate using (f)getc_unlocked and (f)putc_unlocked, and, if
necessary, flockfile and funlockfile.
+ * The scanf formats '%as', '%aS', and '%a[...]', meaning to read a string
+ and allocate space for it using malloc, are no longer accepted in code
+ compiled with _GNU_SOURCE. They were already not accepted in code
+ compiled in the default mode with modern compilers (e.g. GCC new enough
+ to default to -std=gnu11, without _GNU_SOURCE).
+
+ Using 'a' as a modifier letter for 's'-type scanf formats is an archaic
+ GNU extension that conflicts with C99's use of '%a' for floating-point
+ numbers. Equivalent functionality was standardized in POSIX.1-2001 using
+ the letter 'm' instead; programs using '%as', '%aS', and '%a[...]' should
+ change to '%ms', '%mS', and '%m[...]' respectively. GCC's -Wformat
+ warnings can detect most uses of the extension, as long as all functions
+ that call vscanf, vfscanf, or vsscanf are annotated with
+ __attribute__((format(scanf, ...))).
+
* The macros 'major', 'minor', and 'makedev' are now only available from
the header <sys/sysmacros.h>; not from <sys/types.h> or various other
headers that happen to include <sys/types.h>. These macros are rarely
@@ -140,6 +140,7 @@
#undef __USE_FORTIFY_LEVEL
#undef __KERNEL_STRICT_NAMES
#undef __GLIBC_USE_DEPRECATED_GETS
+#undef __GLIBC_USE_DEPRECATED_SCANF
/* Suppress kernel-name space pollution unless user expressedly asks
for it. */
@@ -401,6 +402,20 @@
# define __GLIBC_USE_DEPRECATED_GETS 1
#endif
+/* GNU formerly extended the 'scanf' functions with modified format
+ specifiers %as, %aS, and %a[...] that allocate a buffer for the
+ input using malloc. This extension conflicts with ISO C99, which
+ defines %a as a standalone format specifier that reads a
+ floating-point number; moreover, POSIX.1-2001 provides the same
+ functionality using the modifier letter 'm' instead (%ms, %mS,
+ %m[...]). We now follow C99 and POSIX unless an old, non-strict
+ conformance level is specifically selected. */
+#if defined __USE_ISOC99 && (defined __USE_XOPEN2K || defined __STRICT_ANSI__)
+# define __GLIBC_USE_DEPRECATED_SCANF 0
+#else
+# define __GLIBC_USE_DEPRECATED_SCANF 1
+#endif
+
/* Get definitions of __STDC_* predefined macros, if the compiler has
not preincluded this header automatically. */
#include <stdc-predef.h>
@@ -67,6 +67,7 @@ extern int __isoc99_vscanf (const char *__restrict __format,
extern int __isoc99_vsscanf (const char *__restrict __s,
const char *__restrict __format,
__gnuc_va_list __arg) __THROW;
+libc_hidden_proto (__isoc99_sscanf)
libc_hidden_proto (__isoc99_vsscanf)
libc_hidden_proto (__isoc99_vfscanf)
@@ -154,7 +155,6 @@ libc_hidden_proto (__dprintf)
libc_hidden_proto (fprintf)
libc_hidden_proto (vfprintf)
libc_hidden_proto (sprintf)
-libc_hidden_proto (sscanf)
libc_hidden_proto (fwrite)
libc_hidden_proto (perror)
libc_hidden_proto (remove)
@@ -26,9 +26,7 @@ __LDBL_REDIR_DECL (sprintf)
__LDBL_REDIR_DECL (vfprintf)
__LDBL_REDIR_DECL (vprintf)
__LDBL_REDIR_DECL (vsprintf)
-#if defined __USE_ISOC99 && !defined __USE_GNU \
- && !defined __REDIRECT \
- && (defined __STRICT_ANSI__ || defined __USE_XOPEN2K)
+#if !__GLIBC_USE (DEPRECATED_SCANF) && defined __REDIRECT
__LDBL_REDIR1_DECL (fscanf, __nldbl___isoc99_fscanf)
__LDBL_REDIR1_DECL (scanf, __nldbl___isoc99_scanf)
__LDBL_REDIR1_DECL (sscanf, __nldbl___isoc99_sscanf)
@@ -44,8 +42,7 @@ __LDBL_REDIR_DECL (vsnprintf)
#endif
#ifdef __USE_ISOC99
-# if !defined __USE_GNU && !defined __REDIRECT \
- && (defined __STRICT_ANSI__ || defined __USE_XOPEN2K)
+#if !__GLIBC_USE (DEPRECATED_SCANF) && defined __REDIRECT
__LDBL_REDIR1_DECL (vfscanf, __nldbl___isoc99_vfscanf)
__LDBL_REDIR1_DECL (vscanf, __nldbl___isoc99_vscanf)
__LDBL_REDIR1_DECL (vsscanf, __nldbl___isoc99_vsscanf)
@@ -24,6 +24,11 @@
This exception applies to code released by its copyright holders
in files containing the exception. */
+/* This file defines one of the deprecated scanf variants. */
+#include <features.h>
+#undef __GLIBC_USE_DEPRECATED_SCANF
+#define __GLIBC_USE_DEPRECATED_SCANF 1
+
#include "libioP.h"
#include "strfile.h"
@@ -387,13 +387,11 @@ extern int scanf (const char *__restrict __format, ...) __wur;
extern int sscanf (const char *__restrict __s,
const char *__restrict __format, ...) __THROW;
-#if defined __USE_ISOC99 && !defined __USE_GNU \
- && (!defined __LDBL_COMPAT || !defined __REDIRECT) \
- && (defined __STRICT_ANSI__ || defined __USE_XOPEN2K)
-# ifdef __REDIRECT
-/* For strict ISO C99 or POSIX compliance disallow %as, %aS and %a[
- GNU extension which conflicts with valid %a followed by letter
- s, S or [. */
+/* For historical reasons, the C99-compliant versions of the scanf
+ functions are at alternative names. When __LDBL_COMPAT is in
+ effect, this is handled in bits/stdio-ldbl.h. */
+#if !__GLIBC_USE (DEPRECATED_SCANF)
+# if defined __REDIRECT && !defined __LDBL_COMPAT
extern int __REDIRECT (fscanf, (FILE *__restrict __stream,
const char *__restrict __format, ...),
__isoc99_fscanf) __wur;
@@ -402,7 +400,7 @@ extern int __REDIRECT (scanf, (const char *__restrict __format, ...),
extern int __REDIRECT_NTH (sscanf, (const char *__restrict __s,
const char *__restrict __format, ...),
__isoc99_sscanf);
-# else
+# elif !defined __REDIRECT
extern int __isoc99_fscanf (FILE *__restrict __stream,
const char *__restrict __format, ...) __wur;
extern int __isoc99_scanf (const char *__restrict __format, ...) __wur;
@@ -435,13 +433,9 @@ extern int vsscanf (const char *__restrict __s,
const char *__restrict __format, __gnuc_va_list __arg)
__THROW __attribute__ ((__format__ (__scanf__, 2, 0)));
-# if !defined __USE_GNU \
- && (!defined __LDBL_COMPAT || !defined __REDIRECT) \
- && (defined __STRICT_ANSI__ || defined __USE_XOPEN2K)
-# ifdef __REDIRECT
-/* For strict ISO C99 or POSIX compliance disallow %as, %aS and %a[
- GNU extension which conflicts with valid %a followed by letter
- s, S or [. */
+/* Same redirection as above for the v*scanf family. */
+# if !__GLIBC_USE (DEPRECATED_SCANF)
+# if defined __REDIRECT && !defined __LDBL_COMPAT
extern int __REDIRECT (vfscanf,
(FILE *__restrict __s,
const char *__restrict __format, __gnuc_va_list __arg),
@@ -455,7 +449,7 @@ extern int __REDIRECT_NTH (vsscanf,
const char *__restrict __format,
__gnuc_va_list __arg), __isoc99_vsscanf)
__attribute__ ((__format__ (__scanf__, 2, 0)));
-# else
+# elif !defined __REDIRECT
extern int __isoc99_vfscanf (FILE *__restrict __s,
const char *__restrict __format,
__gnuc_va_list __arg) __wur;
@@ -24,6 +24,11 @@
This exception applies to code released by its copyright holders
in files containing the exception. */
+/* This file defines one of the deprecated scanf variants. */
+#include <features.h>
+#undef __GLIBC_USE_DEPRECATED_SCANF
+#define __GLIBC_USE_DEPRECATED_SCANF 1
+
#include "libioP.h"
#include "stdio.h"
@@ -26,6 +26,10 @@
#define flockfile(s) _IO_flockfile (s)
#define funlockfile(s) _IO_funlockfile (s)
+/* __REDIRECT isn't transitive. */
+#undef sscanf
+#define sscanf __isoc99_sscanf
+
#undef __setmntent
#undef __endmntent
#undef __getmntent_r
@@ -61,6 +61,7 @@ tests := tstscanf test_rdwr test-popen tstgetln test-fseek \
tst-printf-bz18872 tst-vfprintf-width-prec tst-fmemopen4 \
tst-vfprintf-user-type \
tst-vfprintf-mbs-prec \
+ scanf14a scanf16a
test-srcs = tst-unbputc tst-printf
@@ -136,13 +137,11 @@ CFLAGS-isoc99_scanf.c += -fexceptions
CFLAGS-errlist.c += $(fno-unit-at-a-time)
CFLAGS-siglist.c += $(fno-unit-at-a-time)
-# The following is a hack since we must compile scanf1{5,7}.c without any
-# GNU extension. The latter are needed, though, when internal headers
-# are used. So made sure we see the installed headers first.
-CFLAGS-scanf15.c += -I../libio -I../stdlib -I../wcsmbs -I../time -I../string \
- -I../wctype
-CFLAGS-scanf17.c += -I../libio -I../stdlib -I../wcsmbs -I../time -I../string \
- -I../wctype
+# scanf14a.c and scanf16a.c test a deprecated extension which is no
+# longer visible under most conformance levels; see the source files
+# for more detail.
+CFLAGS-scanf14a.c += -std=gnu89
+CFLAGS-scanf16a.c += -std=gnu89
# tst-gets.c tests a deprecated function.
CFLAGS-tst-gets.c += -Wno-deprecated-declarations
@@ -1,5 +1,4 @@
#include <stdio.h>
-#include <libc-diag.h>
static int
do_test (void)
@@ -7,15 +6,7 @@ do_test (void)
static const char buf[] = " ";
char *str;
- /* GCC in C99 mode treats %a as the C99 format expecting float *,
- but glibc with _GNU_SOURCE treats %as as the GNU allocation
- extension, so resulting in "warning: format '%a' expects argument
- of type 'float *', but argument 3 has type 'char **'". This
- applies to the other %as, %aS and %a[] formats below as well. */
- DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wformat");
- int r = sscanf (buf, "%as", &str);
- DIAG_POP_NEEDS_COMMENT;
+ int r = sscanf (buf, "%ms", &str);
printf ("%d %p\n", r, str);
return r != -1 || str != NULL;
@@ -15,6 +15,11 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
+/* This file defines one of the deprecated scanf variants. */
+#include <features.h>
+#undef __GLIBC_USE_DEPRECATED_SCANF
+#define __GLIBC_USE_DEPRECATED_SCANF 1
+
#include <libioP.h>
#include <stdarg.h>
#include <stdio.h>
@@ -33,3 +33,4 @@ __isoc99_sscanf (const char *s, const char *format, ...)
return done;
}
+libc_hidden_def (__isoc99_sscanf)
@@ -15,6 +15,11 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
+/* This file defines one of the deprecated scanf variants. */
+#include <features.h>
+#undef __GLIBC_USE_DEPRECATED_SCANF
+#define __GLIBC_USE_DEPRECATED_SCANF 1
+
#include <stdarg.h>
#include <stdio.h>
@@ -2,7 +2,6 @@
#include <stdlib.h>
#include <string.h>
#include <wchar.h>
-#include <libc-diag.h>
#define FAIL() \
do { \
@@ -24,14 +23,7 @@ main (void)
FAIL ();
else if (f != 0.25 || memcmp (c, "s x", 3) != 0)
FAIL ();
- /* GCC in C99 mode treats %a as the C99 format expecting float *,
- but glibc with _GNU_SOURCE treats %as as the GNU allocation
- extension, so resulting in "warning: format '%a' expects argument
- of type 'float *', but argument 3 has type 'char **'". This
- applies to the other %as, %aS and %a[] formats below as well. */
- DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wformat");
- if (sscanf (" 1.25s x", "%as%2c", &sp, c) != 2)
+ if (sscanf (" 1.25s x", "%ms%2c", &sp, c) != 2)
FAIL ();
else
{
@@ -40,15 +32,11 @@ main (void)
memset (sp, 'x', sizeof "1.25s");
free (sp);
}
- DIAG_POP_NEEDS_COMMENT;
if (sscanf (" 2.25s x", "%las%2c", &d, c) != 2)
FAIL ();
else if (d != 2.25 || memcmp (c, " x", 2) != 0)
FAIL ();
- /* See explanation above. */
- DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wformat");
- if (sscanf (" 3.25S x", "%4aS%3c", &lsp, c) != 2)
+ if (sscanf (" 3.25S x", "%4mS%3c", &lsp, c) != 2)
FAIL ();
else
{
@@ -57,7 +45,7 @@ main (void)
memset (lsp, 'x', sizeof L"3.25");
free (lsp);
}
- if (sscanf ("4.25[0-9.] x", "%a[0-9.]%8c", &sp, c) != 2)
+ if (sscanf ("4.25[0-9.] x", "%m[0-9.]%8c", &sp, c) != 2)
FAIL ();
else
{
@@ -66,7 +54,6 @@ main (void)
memset (sp, 'x', sizeof "4.25");
free (sp);
}
- DIAG_POP_NEEDS_COMMENT;
if (sscanf ("5.25[0-9.] x", "%la[0-9.]%2c", &d, c) != 2)
FAIL ();
else if (d != 5.25 || memcmp (c, " x", 2) != 0)
@@ -95,10 +82,7 @@ main (void)
FAIL ();
if (fseek (fp, 0, SEEK_SET) != 0)
FAIL ();
- /* See explanation above. */
- DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wformat");
- if (fscanf (fp, "%as%2c", &sp, c) != 2)
+ if (fscanf (fp, "%ms%2c", &sp, c) != 2)
FAIL ();
else
{
@@ -107,16 +91,12 @@ main (void)
memset (sp, 'x', sizeof "1.25s");
free (sp);
}
- DIAG_POP_NEEDS_COMMENT;
if (freopen (fname, "r", stdin) == NULL)
FAIL ();
else
{
- /* See explanation above. */
- DIAG_PUSH_NEEDS_COMMENT;
- DIAG_IGNORE_NEEDS_COMMENT (4.9, "-Wformat");
- if (scanf ("%as%2c", &sp, c) != 2)
+ if (scanf ("%ms%2c", &sp, c) != 2)
FAIL ();
else
{
@@ -125,7 +105,6 @@ main (void)
memset (sp, 'x', sizeof "1.25s");
free (sp);
}
- DIAG_POP_NEEDS_COMMENT;
}
fclose (fp);
new file mode 100644
@@ -0,0 +1,133 @@
+/* This test exercises the deprecated GNU %as, %aS, and %a[...] scanf
+ modifiers, which are not available anymore under _GNU_SOURCE or any
+ conformance level including POSIX.1-2001. */
+#undef _GNU_SOURCE
+#undef _DEFAULT_SOURCE
+#undef _XOPEN_SOURCE
+#undef _XOPEN_SOURCE_EXTENDED
+#undef _POSIX_C_SOURCE
+#undef _POSIX_SOURCE
+#undef _ISOC11_SOURCE
+#undef _ISOC99_SOURCE
+#undef __STRICT_ANSI__
+
+#define _POSIX_C_SOURCE 199506L
+#define _XOPEN_SOURCE 1 /* for _XOPEN_SOURCE_EXTENDED */
+#define _XOPEN_SOURCE_EXTENDED 1 /* for mkstemp */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+
+#define FAIL() \
+ do { \
+ result = 1; \
+ printf ("test at line %d failed\n", __LINE__); \
+ } while (0)
+
+int
+main (void)
+{
+ wchar_t *lsp;
+ char *sp;
+ float f;
+ double d;
+ char c[8];
+ int result = 0;
+
+ if (sscanf (" 0.25s x", "%e%3c", &f, c) != 2)
+ FAIL ();
+ else if (f != 0.25 || memcmp (c, "s x", 3) != 0)
+ FAIL ();
+ if (sscanf (" 1.25s x", "%as%2c", &sp, c) != 2)
+ FAIL ();
+ else
+ {
+ if (strcmp (sp, "1.25s") != 0 || memcmp (c, " x", 2) != 0)
+ FAIL ();
+ memset (sp, 'x', sizeof "1.25s");
+ free (sp);
+ }
+ if (sscanf (" 2.25s x", "%las%2c", &d, c) != 2)
+ FAIL ();
+ else if (d != 2.25 || memcmp (c, " x", 2) != 0)
+ FAIL ();
+ if (sscanf (" 3.25S x", "%4aS%3c", &lsp, c) != 2)
+ FAIL ();
+ else
+ {
+ if (wcscmp (lsp, L"3.25") != 0 || memcmp (c, "S x", 3) != 0)
+ FAIL ();
+ memset (lsp, 'x', sizeof L"3.25");
+ free (lsp);
+ }
+ if (sscanf ("4.25[0-9.] x", "%a[0-9.]%8c", &sp, c) != 2)
+ FAIL ();
+ else
+ {
+ if (strcmp (sp, "4.25") != 0 || memcmp (c, "[0-9.] x", 8) != 0)
+ FAIL ();
+ memset (sp, 'x', sizeof "4.25");
+ free (sp);
+ }
+ if (sscanf ("5.25[0-9.] x", "%la[0-9.]%2c", &d, c) != 2)
+ FAIL ();
+ else if (d != 5.25 || memcmp (c, " x", 2) != 0)
+ FAIL ();
+
+ const char *tmpdir = getenv ("TMPDIR");
+ if (tmpdir == NULL || tmpdir[0] == '\0')
+ tmpdir = "/tmp";
+
+ char fname[strlen (tmpdir) + sizeof "/tst-scanf14.XXXXXX"];
+ sprintf (fname, "%s/tst-scanf14.XXXXXX", tmpdir);
+ if (fname == NULL)
+ FAIL ();
+
+ /* Create a temporary file. */
+ int fd = mkstemp (fname);
+ if (fd == -1)
+ FAIL ();
+
+ FILE *fp = fdopen (fd, "w+");
+ if (fp == NULL)
+ FAIL ();
+ else
+ {
+ if (fputs (" 1.25s x", fp) == EOF)
+ FAIL ();
+ if (fseek (fp, 0, SEEK_SET) != 0)
+ FAIL ();
+ if (fscanf (fp, "%as%2c", &sp, c) != 2)
+ FAIL ();
+ else
+ {
+ if (strcmp (sp, "1.25s") != 0 || memcmp (c, " x", 2) != 0)
+ FAIL ();
+ memset (sp, 'x', sizeof "1.25s");
+ free (sp);
+ }
+
+ if (freopen (fname, "r", stdin) == NULL)
+ FAIL ();
+ else
+ {
+ if (scanf ("%as%2c", &sp, c) != 2)
+ FAIL ();
+ else
+ {
+ if (strcmp (sp, "1.25s") != 0 || memcmp (c, " x", 2) != 0)
+ FAIL ();
+ memset (sp, 'x', sizeof "1.25s");
+ free (sp);
+ }
+ }
+
+ fclose (fp);
+ }
+
+ remove (fname);
+
+ return result;
+}
@@ -1,13 +1,3 @@
-#undef _GNU_SOURCE
-#define _XOPEN_SOURCE 600
-#undef _LIBC
-#undef _IO_MTSAFE_IO
-/* The following macro definitions are a hack. They word around disabling
- the GNU extension while still using a few internal headers. */
-#define u_char unsigned char
-#define u_short unsigned short
-#define u_int unsigned int
-#define u_long unsigned long
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -10,7 +10,7 @@
printf ("test at line %d failed\n", __LINE__); \
} while (0)
-static int
+static int __attribute__ ((format (scanf, 2, 3)))
xsscanf (const char *str, const char *fmt, ...)
{
va_list ap;
@@ -20,7 +20,7 @@ xsscanf (const char *str, const char *fmt, ...)
return ret;
}
-static int
+static int __attribute__ ((format (scanf, 1, 2)))
xscanf (const char *fmt, ...)
{
va_list ap;
@@ -30,7 +30,7 @@ xscanf (const char *fmt, ...)
return ret;
}
-static int
+static int __attribute__ ((format (scanf, 2, 3)))
xfscanf (FILE *f, const char *fmt, ...)
{
va_list ap;
@@ -54,7 +54,7 @@ main (void)
FAIL ();
else if (f != 0.25 || memcmp (c, "s x", 3) != 0)
FAIL ();
- if (xsscanf (" 1.25s x", "%as%2c", &sp, c) != 2)
+ if (xsscanf (" 1.25s x", "%ms%2c", &sp, c) != 2)
FAIL ();
else
{
@@ -67,7 +67,7 @@ main (void)
FAIL ();
else if (d != 2.25 || memcmp (c, " x", 2) != 0)
FAIL ();
- if (xsscanf (" 3.25S x", "%4aS%3c", &lsp, c) != 2)
+ if (xsscanf (" 3.25S x", "%4mS%3c", &lsp, c) != 2)
FAIL ();
else
{
@@ -76,7 +76,7 @@ main (void)
memset (lsp, 'x', sizeof L"3.25");
free (lsp);
}
- if (xsscanf ("4.25[0-9.] x", "%a[0-9.]%8c", &sp, c) != 2)
+ if (xsscanf ("4.25[0-9.] x", "%m[0-9.]%8c", &sp, c) != 2)
FAIL ();
else
{
@@ -113,7 +113,7 @@ main (void)
FAIL ();
if (fseek (fp, 0, SEEK_SET) != 0)
FAIL ();
- if (xfscanf (fp, "%as%2c", &sp, c) != 2)
+ if (xfscanf (fp, "%ms%2c", &sp, c) != 2)
FAIL ();
else
{
@@ -127,7 +127,7 @@ main (void)
FAIL ();
else
{
- if (xscanf ("%as%2c", &sp, c) != 2)
+ if (xscanf ("%ms%2c", &sp, c) != 2)
FAIL ();
else
{
new file mode 100644
@@ -0,0 +1,165 @@
+/* This test exercises the deprecated GNU %as, %aS, and %a[...] scanf
+ modifiers, which are not available anymore under _GNU_SOURCE or any
+ conformance level including POSIX.1-2001. */
+#undef _GNU_SOURCE
+#undef _DEFAULT_SOURCE
+#undef _XOPEN_SOURCE
+#undef _XOPEN_SOURCE_EXTENDED
+#undef _POSIX_C_SOURCE
+#undef _POSIX_SOURCE
+#undef _ISOC11_SOURCE
+#undef _ISOC99_SOURCE
+#undef __STRICT_ANSI__
+
+#define _POSIX_C_SOURCE 199506L
+#define _XOPEN_SOURCE 1 /* for _XOPEN_SOURCE_EXTENDED */
+#define _XOPEN_SOURCE_EXTENDED 1 /* for mkstemp */
+#define _ISOC99_SOURCE 1 /* for v*scanf */
+
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <wchar.h>
+
+#define FAIL() \
+ do { \
+ result = 1; \
+ printf ("test at line %d failed\n", __LINE__); \
+ } while (0)
+
+static int __attribute__ ((format (scanf, 2, 3)))
+xsscanf (const char *str, const char *fmt, ...)
+{
+ va_list ap;
+ va_start (ap, fmt);
+ int ret = vsscanf (str, fmt, ap);
+ va_end (ap);
+ return ret;
+}
+
+static int __attribute__ ((format (scanf, 1, 2)))
+xscanf (const char *fmt, ...)
+{
+ va_list ap;
+ va_start (ap, fmt);
+ int ret = vscanf (fmt, ap);
+ va_end (ap);
+ return ret;
+}
+
+static int __attribute__ ((format (scanf, 2, 3)))
+xfscanf (FILE *f, const char *fmt, ...)
+{
+ va_list ap;
+ va_start (ap, fmt);
+ int ret = vfscanf (f, fmt, ap);
+ va_end (ap);
+ return ret;
+}
+
+int
+main (void)
+{
+ wchar_t *lsp;
+ char *sp;
+ float f;
+ double d;
+ char c[8];
+ int result = 0;
+
+ if (xsscanf (" 0.25s x", "%e%3c", &f, c) != 2)
+ FAIL ();
+ else if (f != 0.25 || memcmp (c, "s x", 3) != 0)
+ FAIL ();
+ if (xsscanf (" 1.25s x", "%as%2c", &sp, c) != 2)
+ FAIL ();
+ else
+ {
+ if (strcmp (sp, "1.25s") != 0 || memcmp (c, " x", 2) != 0)
+ FAIL ();
+ memset (sp, 'x', sizeof "1.25s");
+ free (sp);
+ }
+ if (xsscanf (" 2.25s x", "%las%2c", &d, c) != 2)
+ FAIL ();
+ else if (d != 2.25 || memcmp (c, " x", 2) != 0)
+ FAIL ();
+ if (xsscanf (" 3.25S x", "%4aS%3c", &lsp, c) != 2)
+ FAIL ();
+ else
+ {
+ if (wcscmp (lsp, L"3.25") != 0 || memcmp (c, "S x", 3) != 0)
+ FAIL ();
+ memset (lsp, 'x', sizeof L"3.25");
+ free (lsp);
+ }
+ if (xsscanf ("4.25[0-9.] x", "%a[0-9.]%8c", &sp, c) != 2)
+ FAIL ();
+ else
+ {
+ if (strcmp (sp, "4.25") != 0 || memcmp (c, "[0-9.] x", 8) != 0)
+ FAIL ();
+ memset (sp, 'x', sizeof "4.25");
+ free (sp);
+ }
+ if (xsscanf ("5.25[0-9.] x", "%la[0-9.]%2c", &d, c) != 2)
+ FAIL ();
+ else if (d != 5.25 || memcmp (c, " x", 2) != 0)
+ FAIL ();
+
+ const char *tmpdir = getenv ("TMPDIR");
+ if (tmpdir == NULL || tmpdir[0] == '\0')
+ tmpdir = "/tmp";
+
+ char fname[strlen (tmpdir) + sizeof "/tst-scanf16.XXXXXX"];
+ sprintf (fname, "%s/tst-scanf16.XXXXXX", tmpdir);
+ if (fname == NULL)
+ FAIL ();
+
+ /* Create a temporary file. */
+ int fd = mkstemp (fname);
+ if (fd == -1)
+ FAIL ();
+
+ FILE *fp = fdopen (fd, "w+");
+ if (fp == NULL)
+ FAIL ();
+ else
+ {
+ if (fputs (" 1.25s x", fp) == EOF)
+ FAIL ();
+ if (fseek (fp, 0, SEEK_SET) != 0)
+ FAIL ();
+ if (xfscanf (fp, "%as%2c", &sp, c) != 2)
+ FAIL ();
+ else
+ {
+ if (strcmp (sp, "1.25s") != 0 || memcmp (c, " x", 2) != 0)
+ FAIL ();
+ memset (sp, 'x', sizeof "1.25s");
+ free (sp);
+ }
+
+ if (freopen (fname, "r", stdin) == NULL)
+ FAIL ();
+ else
+ {
+ if (xscanf ("%as%2c", &sp, c) != 2)
+ FAIL ();
+ else
+ {
+ if (strcmp (sp, "1.25s") != 0 || memcmp (c, " x", 2) != 0)
+ FAIL ();
+ memset (sp, 'x', sizeof "1.25s");
+ free (sp);
+ }
+ }
+
+ fclose (fp);
+ }
+
+ remove (fname);
+
+ return result;
+}
@@ -1,13 +1,3 @@
-#undef _GNU_SOURCE
-#define _XOPEN_SOURCE 600
-#undef _LIBC
-#undef _IO_MTSAFE_IO
-/* The following macro definitions are a hack. They word around disabling
- the GNU extension while still using a few internal headers. */
-#define u_char unsigned char
-#define u_short unsigned short
-#define u_int unsigned int
-#define u_long unsigned long
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
@@ -15,6 +15,11 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
+/* This file defines one of the deprecated scanf variants. */
+#include <features.h>
+#undef __GLIBC_USE_DEPRECATED_SCANF
+#define __GLIBC_USE_DEPRECATED_SCANF 1
+
#include <stdarg.h>
#include <stdio.h>
#include <libioP.h>
@@ -34,7 +39,6 @@ __sscanf (const char *s, const char *format, ...)
return done;
}
-ldbl_hidden_def (__sscanf, sscanf)
ldbl_strong_alias (__sscanf, sscanf)
#undef _IO_sscanf
/* This is for libg++. */
@@ -15,6 +15,11 @@
License along with the GNU C Library; if not, see
<http://www.gnu.org/licenses/>. */
+/* This file defines one of the deprecated scanf variants. */
+#include <features.h>
+#undef __GLIBC_USE_DEPRECATED_SCANF
+#define __GLIBC_USE_DEPRECATED_SCANF 1
+
#include <assert.h>
#include <errno.h>
#include <limits.h>
@@ -27,6 +27,10 @@
#include <timezone/tzfile.h>
+/* __REDIRECT isn't transitive. */
+#undef sscanf
+#define sscanf __isoc99_sscanf
+
#define SECSPERDAY 86400
char *__tzname[2] = { (char *) "GMT", (char *) "GMT" };