about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2013-05-06 15:10:09 -0700
committerRoland McGrath <roland@hack.frob.com>2013-05-06 15:10:09 -0700
commit8fb16a04e6be250fdae2ce85354aae3702151140 (patch)
tree8f116a52dd46ff3585adb67cc6a7942e969202fa
parentb99b892f6854b98bac5a581cbd20a6a7ed2e2470 (diff)
downloadglibc-8fb16a04e6be250fdae2ce85354aae3702151140.tar.gz
glibc-8fb16a04e6be250fdae2ce85354aae3702151140.tar.xz
glibc-8fb16a04e6be250fdae2ce85354aae3702151140.zip
Move getlogin, getlogin_r, setlogin to login/ subdir.
-rw-r--r--ChangeLog11
-rw-r--r--login/Makefile3
-rw-r--r--login/Versions1
-rw-r--r--login/getlogin.c (renamed from posix/getlogin.c)0
-rw-r--r--login/getlogin_r.c (renamed from posix/getlogin_r.c)0
-rw-r--r--login/setlogin.c (renamed from posix/setlogin.c)0
-rw-r--r--posix/Makefile1
-rw-r--r--posix/Versions2
8 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 6da92f39db..c5ec238849 100644
--- 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 fa113fb623..4b057ec927 100644
--- 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 401fc0ebd0..0c9e75a7ef 100644
--- 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
index d1800ee9fa..d1800ee9fa 100644
--- a/posix/getlogin.c
+++ b/login/getlogin.c
diff --git a/posix/getlogin_r.c b/login/getlogin_r.c
index ac9e14833d..ac9e14833d 100644
--- a/posix/getlogin_r.c
+++ b/login/getlogin_r.c
diff --git a/posix/setlogin.c b/login/setlogin.c
index e215c62804..e215c62804 100644
--- a/posix/setlogin.c
+++ b/login/setlogin.c
diff --git a/posix/Makefile b/posix/Makefile
index a728630203..8265e763e1 100644
--- 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 1bc235acd2..68df3a9f39 100644
--- 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*