mirror of
git://gcc.gnu.org/git/gcc.git
synced 2024-11-24 19:05:28 +08:00
3cec491196
The recent warning patches broke the libssp build on Solaris:
/vol/gcc/src/hg/master/local/libssp/gets-chk.c: In function '__gets_chk':
/vol/gcc/src/hg/master/local/libssp/gets-chk.c:67:12: error: implicit
declaration of function 'gets'; did you mean 'getw'?
[-Wimplicit-function-declaration]
67 | return gets (s);
| ^~~~
| getw
/vol/gcc/src/hg/master/local/libssp/gets-chk.c:67:12: error: returning
'int' from a function with return type 'char *' makes pointer from integer
without a cast [-Wint-conversion]
67 | return gets (s);
| ^~~~~~~~
/vol/gcc/src/hg/master/local/libssp/gets-chk.c:74:12: error: returning
'int' from a function with return type 'char *' makes pointer from integer
without a cast [-Wint-conversion]
74 | return gets (s);
| ^~~~~~~~
The guard around the gets declaration in gets-chk.c is
|| (defined __cplusplus && __cplusplus <= 201103L))
extern char *gets (char *);
where __USE_ISOC11 is glibc-only, while Solaris <iso/stdio_iso.h> declares
gets like
extern char *gets(char *) __ATTR_DEPRECATED;
Instead of using a target-specific macro, this patch just uses the
canonical autoconf test.
Tested on i386-pc-solaris2.11, sparc-sun-solaris2.11,
x86_64-pc-linux-gnu, x86_64-apple-darwin23.3.0, and amd64-freebsd14.0.
2023-12-07 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
libssp:
* configure.ac (AC_CHECK_DECLS): Check for gets.
* configure, config.h.in: Regenerate.
* gets-chk.c (gets): Guard declaration with !HAVE_DECL_GETS.
92 lines
2.4 KiB
C
92 lines
2.4 KiB
C
/* Checking gets.
|
|
Copyright (C) 2005-2024 Free Software Foundation, Inc.
|
|
|
|
This file is part of GCC.
|
|
|
|
GCC is free software; you can redistribute it and/or modify it under
|
|
the terms of the GNU General Public License as published by the Free
|
|
Software Foundation; either version 3, or (at your option) any later
|
|
version.
|
|
|
|
In addition to the permissions in the GNU General Public License, the
|
|
Free Software Foundation gives you unlimited permission to link the
|
|
compiled version of this file into combinations with other programs,
|
|
and to distribute those combinations without any restriction coming
|
|
from the use of this file. (The General Public License restrictions
|
|
do apply in other respects; for example, they cover modification of
|
|
the file, and distribution when not linked into a combine
|
|
executable.)
|
|
|
|
GCC 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 General Public License
|
|
for more details.
|
|
|
|
Under Section 7 of GPL version 3, you are granted additional
|
|
permissions described in the GCC Runtime Library Exception, version
|
|
3.1, as published by the Free Software Foundation.
|
|
|
|
You should have received a copy of the GNU General Public License and
|
|
a copy of the GCC Runtime Library Exception along with this program;
|
|
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
|
|
#include "config.h"
|
|
#include <ssp/ssp.h>
|
|
#include <stdarg.h>
|
|
#ifdef HAVE_STDLIB_H
|
|
# include <stdlib.h>
|
|
#endif
|
|
#ifdef HAVE_ALLOCA_H
|
|
# include <alloca.h>
|
|
#endif
|
|
#ifdef HAVE_LIMITS_H
|
|
# include <limits.h>
|
|
#endif
|
|
#ifdef HAVE_STDIO_H
|
|
# include <stdio.h>
|
|
#endif
|
|
#ifdef HAVE_STRING_H
|
|
# include <string.h>
|
|
#endif
|
|
|
|
#if !HAVE_DECL_GETS
|
|
extern char *gets (char *);
|
|
#endif
|
|
|
|
extern void __chk_fail (void) __attribute__((__noreturn__));
|
|
|
|
char *
|
|
__gets_chk (char *s, size_t slen)
|
|
{
|
|
char *ret, *buf;
|
|
|
|
if (slen >= (size_t) INT_MAX)
|
|
return gets (s);
|
|
|
|
if (slen <= 8192)
|
|
buf = alloca (slen + 1);
|
|
else
|
|
buf = malloc (slen + 1);
|
|
if (buf == NULL)
|
|
return gets (s);
|
|
|
|
ret = fgets (buf, (int) (slen + 1), stdin);
|
|
if (ret != NULL)
|
|
{
|
|
size_t len = strlen (buf);
|
|
if (len > 0 && buf[len - 1] == '\n')
|
|
--len;
|
|
if (len == slen)
|
|
__chk_fail ();
|
|
memcpy (s, buf, len);
|
|
s[len] = '\0';
|
|
ret = s;
|
|
}
|
|
|
|
if (slen > 8192)
|
|
free (buf);
|
|
return ret;
|
|
}
|