diff options
| author | Roland McGrath <roland@hack.frob.com> | 2013-05-06 15:19:14 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2013-05-06 15:19:14 -0700 |
| commit | bd9ffde61a27945abf0498b5c562f9bf0dcc6419 (patch) | |
| tree | e453b482503f4a9d1fd46ba521a21e55ed8e3784 /debug | |
| parent | 8fb16a04e6be250fdae2ce85354aae3702151140 (diff) | |
| download | glibc-bd9ffde61a27945abf0498b5c562f9bf0dcc6419.tar.gz glibc-bd9ffde61a27945abf0498b5c562f9bf0dcc6419.tar.xz glibc-bd9ffde61a27945abf0498b5c562f9bf0dcc6419.zip | |
Move ptsname_r_chk to login/ subdir.
Diffstat (limited to 'debug')
| -rw-r--r-- | debug/Makefile | 5 | ||||
| -rw-r--r-- | debug/Versions | 2 | ||||
| -rw-r--r-- | debug/ptsname_r_chk.c | 28 |
3 files changed, 5 insertions, 30 deletions
diff --git a/debug/Makefile b/debug/Makefile index 55017d327c..682f14c7d3 100644 --- a/debug/Makefile +++ b/debug/Makefile @@ -22,6 +22,9 @@ subdir := debug headers := execinfo.h +# Note that ptsname_r_chk is not here but in login/Makefile instead. +# If that subdir is omitted from the build, its _FORTIFY_SOURCE +# support will be too. routines = backtrace backtracesyms backtracesymsfd noophooks \ memcpy_chk memmove_chk mempcpy_chk memset_chk stpcpy_chk \ strcat_chk strcpy_chk strncat_chk strncpy_chk stpncpy_chk \ @@ -30,7 +33,7 @@ routines = backtrace backtracesyms backtracesymsfd noophooks \ gets_chk chk_fail readonly-area fgets_chk fgets_u_chk \ read_chk pread_chk pread64_chk recv_chk recvfrom_chk \ readlink_chk readlinkat_chk getwd_chk getcwd_chk \ - realpath_chk ptsname_r_chk fread_chk fread_u_chk \ + realpath_chk fread_chk fread_u_chk \ wctomb_chk wcscpy_chk wmemcpy_chk wmemmove_chk wmempcpy_chk \ wcpcpy_chk wcsncpy_chk wcscat_chk wcsncat_chk wmemset_chk \ wcpncpy_chk \ diff --git a/debug/Versions b/debug/Versions index c1722fab20..e2b90ebed5 100644 --- a/debug/Versions +++ b/debug/Versions @@ -23,7 +23,7 @@ libc { __read_chk; __pread_chk; __pread64_chk; __readlink_chk; __getcwd_chk; __getwd_chk; __recv_chk; __recvfrom_chk; - __realpath_chk; __ptsname_r_chk; __wctomb_chk; + __realpath_chk; __wctomb_chk; __stpncpy_chk; __wcscpy_chk; __wmemcpy_chk; __wmemmove_chk; __wmempcpy_chk; __wcpcpy_chk; __wcsncpy_chk; __wcscat_chk; __wcsncat_chk; __wmemset_chk; __wcpncpy_chk; diff --git a/debug/ptsname_r_chk.c b/debug/ptsname_r_chk.c deleted file mode 100644 index 7e039acb74..0000000000 --- a/debug/ptsname_r_chk.c +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright (C) 2005-2013 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 - <http://www.gnu.org/licenses/>. */ - -#include <stdlib.h> - - -int -__ptsname_r_chk (int fd, char *buf, size_t buflen, size_t nreal) -{ - if (buflen > nreal) - __chk_fail (); - - return __ptsname_r (fd, buf, buflen); -} |