c6d234
commit 8fb16a04e6be250fdae2ce85354aae3702151140
c6d234
Author: Roland McGrath <roland@hack.frob.com>
c6d234
Date:   Mon May 6 15:10:09 2013 -0700
c6d234
c6d234
    Move getlogin, getlogin_r, setlogin to login/ subdir.
c6d234
c6d234
diff --git a/login/Makefile b/login/Makefile
c6d234
index f7620ea0051b5ebb..575301460b58197e 100644
c6d234
--- a/login/Makefile
c6d234
+++ b/login/Makefile
c6d234
@@ -24,7 +24,8 @@ subdir	:= login
c6d234
 
c6d234
 headers	:= utmp.h bits/utmp.h lastlog.h pty.h
c6d234
 
c6d234
-routines := getutent getutent_r getutid getutline getutid_r getutline_r \
c6d234
+routines := getlogin getlogin_r setlogin \
c6d234
+	    getutent getutent_r getutid getutline getutid_r getutline_r \
c6d234
 	    utmp_file utmpname updwtmp getpt grantpt unlockpt ptsname
c6d234
 
c6d234
 CFLAGS-grantpt.c = -DLIBEXECDIR='"$(libexecdir)"'
c6d234
diff --git a/login/Versions b/login/Versions
c6d234
index 401fc0ebd0715e0b..0c9e75a7efd295b6 100644
c6d234
--- a/login/Versions
c6d234
+++ b/login/Versions
c6d234
@@ -11,6 +11,7 @@ libc {
c6d234
     pututline;
c6d234
 
c6d234
     # s*
c6d234
+    setlogin;
c6d234
     setutent;
c6d234
 
c6d234
     # u*
c6d234
diff --git a/posix/getlogin.c b/login/getlogin.c
c6d234
similarity index 100%
c6d234
rename from posix/getlogin.c
c6d234
rename to login/getlogin.c
c6d234
diff --git a/posix/getlogin_r.c b/login/getlogin_r.c
c6d234
similarity index 100%
c6d234
rename from posix/getlogin_r.c
c6d234
rename to login/getlogin_r.c
c6d234
diff --git a/posix/setlogin.c b/login/setlogin.c
c6d234
similarity index 100%
c6d234
rename from posix/setlogin.c
c6d234
rename to login/setlogin.c
c6d234
diff --git a/posix/Makefile b/posix/Makefile
c6d234
index a68f0b7d041e65bd..683b6e4b272fdebb 100644
c6d234
--- a/posix/Makefile
c6d234
+++ b/posix/Makefile
c6d234
@@ -40,7 +40,6 @@ routines :=								      \
c6d234
 	getuid geteuid getgid getegid getgroups setuid setgid group_member    \
c6d234
 	getpgid setpgid getpgrp bsd-getpgrp setpgrp getsid setsid	      \
c6d234
 	getresuid getresgid setresuid setresgid				      \
c6d234
-	getlogin getlogin_r setlogin					      \
c6d234
 	pathconf sysconf fpathconf					      \
c6d234
 	glob glob64 fnmatch regex					      \
c6d234
 	confstr								      \
c6d234
diff --git a/posix/Versions b/posix/Versions
c6d234
index 686c446bcddeb696..5a5a05d036fbc6ba 100644
c6d234
--- a/posix/Versions
c6d234
+++ b/posix/Versions
c6d234
@@ -52,7 +52,7 @@ libc {
c6d234
     # s*
c6d234
     sched_get_priority_max; sched_get_priority_min; sched_getparam;
c6d234
     sched_getscheduler; sched_rr_get_interval; sched_setparam;
c6d234
-    sched_setscheduler; sched_yield; setegid; seteuid; setgid; setlogin;
c6d234
+    sched_setscheduler; sched_yield; setegid; seteuid; setgid;
c6d234
     setpgid; setpgrp; setsid; setuid; sleep; sysconf;
c6d234
 
c6d234
     # t*