From ee586a6d5c1f904035b702886466aac2bf3a9ba7 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Mon, 6 May 2013 15:58:44 -0700 Subject: Move getlogin_r_chk to login/ subdir. --- debug/Makefile | 8 ++++---- debug/Versions | 2 +- debug/getlogin_r_chk.c | 28 ---------------------------- 3 files changed, 5 insertions(+), 33 deletions(-) delete mode 100644 debug/getlogin_r_chk.c (limited to 'debug') diff --git a/debug/Makefile b/debug/Makefile index 682f14c7d3..9b5afb4d22 100644 --- a/debug/Makefile +++ b/debug/Makefile @@ -22,9 +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. +# Note that ptsname_r_chk and getlogin_r are 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 \ @@ -39,7 +39,7 @@ routines = backtrace backtracesyms backtracesymsfd noophooks \ wcpncpy_chk \ swprintf_chk vswprintf_chk wprintf_chk fwprintf_chk \ vwprintf_chk vfwprintf_chk fgetws_chk fgetws_u_chk \ - confstr_chk getgroups_chk ttyname_r_chk getlogin_r_chk \ + confstr_chk getgroups_chk ttyname_r_chk \ gethostname_chk getdomainname_chk wcrtomb_chk mbsnrtowcs_chk \ wcsnrtombs_chk mbsrtowcs_chk wcsrtombs_chk mbstowcs_chk \ wcstombs_chk asprintf_chk vasprintf_chk dprintf_chk \ diff --git a/debug/Versions b/debug/Versions index e2b90ebed5..0482c85f19 100644 --- a/debug/Versions +++ b/debug/Versions @@ -29,7 +29,7 @@ libc { __wcsncpy_chk; __wcscat_chk; __wcsncat_chk; __wmemset_chk; __wcpncpy_chk; __swprintf_chk; __vswprintf_chk; __wprintf_chk; __fwprintf_chk; __vwprintf_chk; __vfwprintf_chk; __fgetws_chk; __fgetws_unlocked_chk; - __confstr_chk; __getgroups_chk; __ttyname_r_chk; __getlogin_r_chk; + __confstr_chk; __getgroups_chk; __ttyname_r_chk; __gethostname_chk; __getdomainname_chk; __wcrtomb_chk; __mbsnrtowcs_chk; __wcsnrtombs_chk; __mbsrtowcs_chk; __wcsrtombs_chk; __mbstowcs_chk; __wcstombs_chk; diff --git a/debug/getlogin_r_chk.c b/debug/getlogin_r_chk.c deleted file mode 100644 index 8e490858a5..0000000000 --- a/debug/getlogin_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 - . */ - -#include - - -int -__getlogin_r_chk (char *buf, size_t buflen, size_t nreal) -{ - if (buflen > nreal) - __chk_fail (); - - return getlogin_r (buf, buflen); -} -- cgit 1.4.1