diff options
| author | Roland McGrath <roland@hack.frob.com> | 2013-05-06 15:58:44 -0700 |
|---|---|---|
| committer | Roland McGrath <roland@hack.frob.com> | 2013-05-06 15:58:44 -0700 |
| commit | ee586a6d5c1f904035b702886466aac2bf3a9ba7 (patch) | |
| tree | 0b6b55aad132e1fdeae29bef34234c3e045c7855 | |
| parent | 355f916505e3101f1952fd1a8e2c4c69b52cc36a (diff) | |
| download | glibc-ee586a6d5c1f904035b702886466aac2bf3a9ba7.tar.gz glibc-ee586a6d5c1f904035b702886466aac2bf3a9ba7.tar.xz glibc-ee586a6d5c1f904035b702886466aac2bf3a9ba7.zip | |
Move getlogin_r_chk to login/ subdir.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | debug/Makefile | 8 | ||||
| -rw-r--r-- | debug/Versions | 2 | ||||
| -rw-r--r-- | login/Makefile | 2 | ||||
| -rw-r--r-- | login/Versions | 1 | ||||
| -rw-r--r-- | login/getlogin_r_chk.c (renamed from debug/getlogin_r_chk.c) | 0 |
6 files changed, 14 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index fa96814f39..78fcc9c33e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2013-05-06 Roland McGrath <roland@hack.frob.com> + * debug/getlogin_r_chk.c: Moved to ... + * login/getlogin_r_chk.c: ... here. + * debug/Makefile (routines): Move getlogin_r_chk to ... + * login/Makefile (routines): ... here. + * debug/Versions (libc: GLIBC_2.4): Move getlogin_r_chk to ... + * login/Versions (libc: GLIBC_2.4): ... here. + * io/poll.c (__poll): Renamed from poll. Add libc_hidden_def. (poll): Define as weak alias. 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/login/Makefile b/login/Makefile index fa5aa71381..61c9d7efbe 100644 --- a/login/Makefile +++ b/login/Makefile @@ -23,7 +23,7 @@ subdir := login headers := utmp.h bits/utmp.h lastlog.h pty.h -routines := getlogin getlogin_r setlogin \ +routines := getlogin getlogin_r setlogin getlogin_r_chk \ getutent getutent_r getutid getutline getutid_r getutline_r \ utmp_file utmpname updwtmp getpt grantpt unlockpt ptsname \ ptsname_r_chk diff --git a/login/Versions b/login/Versions index f4df7183d5..475fcf063f 100644 --- a/login/Versions +++ b/login/Versions @@ -42,6 +42,7 @@ libc { posix_openpt; } GLIBC_2.4 { + __getlogin_r_chk; __ptsname_r_chk; } } diff --git a/debug/getlogin_r_chk.c b/login/getlogin_r_chk.c index 8e490858a5..8e490858a5 100644 --- a/debug/getlogin_r_chk.c +++ b/login/getlogin_r_chk.c |