Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Move getlogin_r_chk to login/ subdir.
  • Loading branch information
Roland McGrath committed May 6, 2013
1 parent 355f916 commit ee586a6
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 6 deletions.
7 changes: 7 additions & 0 deletions 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.
Expand Down
8 changes: 4 additions & 4 deletions debug/Makefile
Expand Up @@ -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 \
Expand All @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion debug/Versions
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion login/Makefile
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions login/Versions
Expand Up @@ -42,6 +42,7 @@ libc {
posix_openpt;
}
GLIBC_2.4 {
__getlogin_r_chk;
__ptsname_r_chk;
}
}
Expand Down
File renamed without changes.

0 comments on commit ee586a6

Please sign in to comment.