From e2d30731f8ced0389894f5cd1e81f484c50b1c02 Mon Sep 17 00:00:00 2001
From: "Peter S. Mazinger" <ps.m@gmx.net>
Date: Mon, 21 Nov 2005 20:40:14 +0000
Subject: Use internal hidden versions of __login_tty/__openpty

---
 libutil/forkpty.c   | 8 ++++++--
 libutil/login_tty.c | 4 +++-
 libutil/openpty.c   | 6 ++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'libutil')

diff --git a/libutil/forkpty.c b/libutil/forkpty.c
index af1d4becc..82ce8ba27 100644
--- a/libutil/forkpty.c
+++ b/libutil/forkpty.c
@@ -23,12 +23,16 @@
 #include <utmp.h>
 #include <pty.h>
 
+extern int __openpty (int *amaster, int *aslave, char *name, struct termios *termp,
+						struct winsize *winp) attribute_hidden;
+extern int __login_tty(int fd) attribute_hidden;
+
 int forkpty (int *amaster, char *name, 
 	struct termios *termp, struct winsize *winp)
 {
     int master, slave, pid;
 
-    if (openpty (&master, &slave, name, termp, winp) == -1)
+    if (__openpty (&master, &slave, name, termp, winp) == -1)
 	return -1;
 
     switch (pid = fork ())
@@ -38,7 +42,7 @@ int forkpty (int *amaster, char *name,
 	case 0:
 	    /* Child.  */
 	    close (master);
-	    if (login_tty (slave))
+	    if (__login_tty (slave))
 		_exit (1);
 
 	    return 0;
diff --git a/libutil/login_tty.c b/libutil/login_tty.c
index d354407f2..5ae31c52d 100644
--- a/libutil/login_tty.c
+++ b/libutil/login_tty.c
@@ -36,7 +36,7 @@
 #include <fcntl.h>
 #include <utmp.h>
 
-int login_tty(int fd)
+int attribute_hidden __login_tty(int fd)
 {
 	(void) setsid();
 #ifdef TIOCSCTTY
@@ -67,3 +67,5 @@ int login_tty(int fd)
 		(void) close(fd);
 	return (0);
 }
+
+strong_alias(__login_tty,login_tty)
diff --git a/libutil/openpty.c b/libutil/openpty.c
index f0574474b..c33407143 100644
--- a/libutil/openpty.c
+++ b/libutil/openpty.c
@@ -90,8 +90,8 @@ pts_name (int fd, char **pts, size_t buf_len)
 /* Create pseudo tty master slave pair and set terminal attributes
    according to TERMP and WINP.  Return handles for both ends in
    AMASTER and ASLAVE, and return the name of the slave end in NAME.  */
-int
-openpty (int *amaster, int *aslave, char *name, struct termios *termp,
+int attribute_hidden
+__openpty (int *amaster, int *aslave, char *name, struct termios *termp,
 	 struct winsize *winp)
 {
 #if 0
@@ -158,3 +158,5 @@ openpty (int *amaster, int *aslave, char *name, struct termios *termp,
   close (master);
   return -1;
 }
+
+strong_alias(__openpty,openpty)
-- 
cgit v1.2.3