lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

Fix ttyslot namespace (bug 18547).

Browse Source 
ttyslot (XPG4) calls the non-XPG4 functions endttyent, getttyent and
setttyent, which in turn bring in references to fgets_unlocked and
getttynam.  This patch fixes this by making these functions into weak
aliases and calling the __* names as needed.

Tested for x86_64 and x86 (testsuite, and that disassembly of
installed stripped shared libraries is unchanged by the patch).

	[BZ #18547]
	* misc/getttyent.c (getttynam): Rename to __getttynam and define
	as weak alias of __getttynam.  Use prototype function definition.
	Call __setttyent, __getttyent and __endttyent instead of
	setttyent, getttyent and endttyent.
	(getttyent): Rename to __getttyent and define as weak alias of
	__getttyent.  Call __setttyent instead of setttyent.  Call
	__fgets_unlocked instead of fgets_unlocked.
	(setttyent): Rename to __setttyent and define as weak alias of
	__setttyent.
	(endttyent): Rename to __endttyent and define as weak alias of
	__endttyent.
	* include/ttyent.h (__getttyent): Declare.  Use libc_hidden_proto.
	(__setttyent): Likewise.
	(__endttyent): Likewise.
	(getttyent): Don't use libc_hidden_proto.
	(setttyent): Likewise.
	(endttyent): Likewise.
	* misc/ttyslot.c (ttyslot): Call __setttyent, __getttyent and
	__endttyent instead of setttyent, getttyent and endttyent.
	* conform/Makefile (test-xfail-XPG4/unistd.h/linknamespace):
	Remove variable.
This commit is contained in:
Joseph Myers
2015-06-17 20:21:19 +00:00
parent 0595c98494
commit abccad04b4
6 changed files with 50 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
misc/getttyent.c
View File

@ -44,24 +44,24 @@ static char zapchar;
static FILE *tf;
struct ttyent *
getttynam(tty)
const char *tty;
__getttynam (const char *tty)
{
struct ttyent *t;
setttyent();
while ((t = getttyent()))
__setttyent();
while ((t = __getttyent()))
if (!strcmp(tty, t->ty_name))
break;
endttyent();
__endttyent();
return (t);
}
weak_alias (__getttynam, getttynam)
static char *skip (char *) __THROW internal_function;
static char *value (char *) __THROW internal_function;
struct ttyent *
getttyent (void)
__getttyent (void)
{
static struct ttyent tty;
int c;
@ -69,11 +69,11 @@ getttyent (void)
#define MAXLINELENGTH 100
static char line[MAXLINELENGTH];
if (!tf && !setttyent())
if (!tf && !__setttyent())
return (NULL);
flockfile (tf);
for (;;) {
if (!fgets_unlocked(p = line, sizeof(line), tf)) {
if (!__fgets_unlocked(p = line, sizeof(line), tf)) {
funlockfile (tf);
return (NULL);
}
@ -131,7 +131,8 @@ getttyent (void)
*p = '\0';
return (&tty);
}
libc_hidden_def (getttyent)
libc_hidden_def (__getttyent)
weak_alias (__getttyent, getttyent)
#define QUOTED 1
@ -184,7 +185,7 @@ value(p)
}
int
setttyent (void)
__setttyent (void)
{
if (tf) {
@ -197,10 +198,11 @@ setttyent (void)
}
return (0);
}
libc_hidden_def (setttyent)
libc_hidden_def (__setttyent)
weak_alias (__setttyent, setttyent)
int
endttyent (void)
__endttyent (void)
{
int rval;
@ -211,4 +213,5 @@ endttyent (void)
}
return (1);
}
libc_hidden_def (endttyent)
libc_hidden_def (__endttyent)
weak_alias (__endttyent, endttyent)