Move getlogin, getlogin_r, setlogin to login/ subdir.

diff --git a/ChangeLog b/ChangeLog
index 6da92f39db904fc6c53e095a192be187bc8b8d33..c5ec2388499d07eac8ed1650958710a40a96731d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2013-05-06  Roland McGrath  <roland@hack.frob.com>
 
+       * posix/getlogin.c: Moved to ...
+       * login/getlogin.c: ... here.
+       * posix/getlogin_r.c: Moved to ...
+       * login/getlogin_r.c: ... here.
+       * posix/getlogin_r.c: Moved to ...
+       * login/getlogin_r.c: ... here.
+       * posix/Makefile (routines): Move getlogin, getlogin_r, setlogin to ...
+       * login/Makefile (routines): ... here.
+       * posix/Versions (libc: GLIBC_2.0): Move setlogin to ...
+       * login/Versions (libc: GLIBC_2.0): ... here.
+
        * resource/setrlimit.c (__setrlimit): Renamed from setrlimit.
        (setrlimit): Define as weak alias.
 

diff --git a/login/Makefile b/login/Makefile
index fa113fb623edb68beb3c5225e5be47b77ef2a337..4b057ec927d4c872c4bbb1f7060b25b86b7ae387 100644 (file)
--- a/login/Makefile
+++ b/login/Makefile
@@ -23,7 +23,8 @@ subdir        := login
 
 headers        := utmp.h bits/utmp.h lastlog.h pty.h
 
-routines := getutent getutent_r getutid getutline getutid_r getutline_r \
+routines := getlogin getlogin_r setlogin \
+           getutent getutent_r getutid getutline getutid_r getutline_r \
            utmp_file utmpname updwtmp getpt grantpt unlockpt ptsname
 
 CFLAGS-grantpt.c = -DLIBEXECDIR='"$(libexecdir)"'

diff --git a/login/Versions b/login/Versions
index 401fc0ebd0715e0bc12c034eef0f18cee36d881e..0c9e75a7efd295b636422ac60f777178ee10eb2d 100644 (file)
--- a/login/Versions
+++ b/login/Versions
@@ -11,6 +11,7 @@ libc {
     pututline;
 
     # s*
+    setlogin;
     setutent;
 
     # u*

diff --git a/posix/getlogin.c b/login/getlogin.c
similarity index 100%
rename from posix/getlogin.c
rename to login/getlogin.c

diff --git a/posix/getlogin_r.c b/login/getlogin_r.c
similarity index 100%
rename from posix/getlogin_r.c
rename to login/getlogin_r.c

diff --git a/posix/setlogin.c b/login/setlogin.c
similarity index 100%
rename from posix/setlogin.c
rename to login/setlogin.c

diff --git a/posix/Makefile b/posix/Makefile
index a7286302031b9308bde549e6e33edbfadcd4b319..8265e763e10497b33c712f975eb01ae657ba58b0 100644 (file)
--- a/posix/Makefile
+++ b/posix/Makefile
@@ -40,7 +40,6 @@ routines :=                                                                 \
        getuid geteuid getgid getegid getgroups setuid setgid group_member    \
        getpgid setpgid getpgrp bsd-getpgrp setpgrp getsid setsid             \
        getresuid getresgid setresuid setresgid                               \
-       getlogin getlogin_r setlogin                                          \
        pathconf sysconf fpathconf                                            \
        glob glob64 fnmatch regex                                             \
        confstr                                                               \

diff --git a/posix/Versions b/posix/Versions
index 1bc235acd2c84012a4d174bbc251fc53bbba9066..68df3a9f390bf01e08570ef3ed257c127ebad8ad 100644 (file)
--- a/posix/Versions
+++ b/posix/Versions
@@ -52,7 +52,7 @@ libc {
     # s*
     sched_get_priority_max; sched_get_priority_min; sched_getparam;
     sched_getscheduler; sched_rr_get_interval; sched_setparam;
-    sched_setscheduler; sched_yield; setegid; seteuid; setgid; setlogin;
+    sched_setscheduler; sched_yield; setegid; seteuid; setgid;
     setpgid; setpgrp; setsid; setuid; sleep; sysconf;
 
     # t*