OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Mark internal utmp functions with attribute_hidden [BZ #18822] 

Mark internal utmp functions with attribute_hidden to allow direct
access within libc.so and libc.a without using GOT nor PLT.

	[BZ #18822]
	* include/utmp.h (__updwtmp): Add libc_hidden_proto.
	(__getutent): Likewise.
	(__getutid): Likewise.
	(__getutline): Likewise.
	(__pututline): Likewise.
	(__getutent_r): Likewise.
	(__getutid_r): Likewise.
	(__getutline_r): Likewise.
	(__utmpname): Add attribute_hidden.
	(__setutent): Likewise.
	(__endutent): Likewise.
	* login/getutent.c (__getutent): Add libc_hidden_def.
	* login/getutent_r.c (__getutent_r): Likewise.
	(__pututline): Likewise.
	* login/getutid.c (__getutid): Likewise.
	* login/getutid_r.c (__getutid_r): Likewise.
	* login/getutline.c (__getutline): Likewise.
	* login/getutline_r.c (__getutline_r): Likewise.
	* login/updwtmp.c (__updwtmp): Likewise.
This commit is contained in:
H.J. Lu 2017-10-01 15:51:44 -07:00
parent 4587a421c5
commit 59c04e6763
9 changed files with 42 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ChangeLog
View File

@ -1,3 +1,26 @@
2017-10-01 H.J. Lu <hongjiu.lu@intel.com>
[BZ #18822]
* include/utmp.h (__updwtmp): Add libc_hidden_proto.
(__getutent): Likewise.
(__getutid): Likewise.
(__getutline): Likewise.
(__pututline): Likewise.
(__getutent_r): Likewise.
(__getutid_r): Likewise.
(__getutline_r): Likewise.
(__utmpname): Add attribute_hidden.
(__setutent): Likewise.
(__endutent): Likewise.
* login/getutent.c (__getutent): Add libc_hidden_def.
* login/getutent_r.c (__getutent_r): Likewise.
(__pututline): Likewise.
* login/getutid.c (__getutid): Likewise.
* login/getutid_r.c (__getutid_r): Likewise.
* login/getutline.c (__getutline): Likewise.
* login/getutline_r.c (__getutline_r): Likewise.
* login/updwtmp.c (__updwtmp): Likewise.
2017-10-01 H.J. Lu <hongjiu.lu@intel.com>
[BZ #18822]

14
include/utmp.h
View File

@ -5,18 +5,26 @@
/* Now define the internal interfaces. */
extern void __updwtmp (const char *__wtmp_file, const struct utmp *__utmp);
extern int __utmpname (const char *__file);
libc_hidden_proto (__updwtmp)
extern int __utmpname (const char *__file) attribute_hidden;
extern struct utmp *__getutent (void);
extern void __setutent (void);
extern void __endutent (void);
libc_hidden_proto (__getutent)
extern void __setutent (void) attribute_hidden;
extern void __endutent (void) attribute_hidden;
extern struct utmp *__getutid (const struct utmp *__id);
libc_hidden_proto (__getutid)
extern struct utmp *__getutline (const struct utmp *__line);
libc_hidden_proto (__getutline)
extern struct utmp *__pututline (const struct utmp *__utmp_ptr);
libc_hidden_proto (__pututline)
extern int __getutent_r (struct utmp *__buffer, struct utmp **__result);
libc_hidden_proto (__getutent_r)
extern int __getutid_r (const struct utmp *__id, struct utmp *__buffer,
struct utmp **__result);
libc_hidden_proto (__getutid_r)
extern int __getutline_r (const struct utmp *__line,
struct utmp *__buffer, struct utmp **__result);
libc_hidden_proto (__getutline_r)
libutil_hidden_proto (login_tty)

1
login/getutent.c
View File

@ -41,4 +41,5 @@ __getutent (void)
return result;
}
libc_hidden_def (__getutent)
weak_alias (__getutent, getutent)

2
login/getutent_r.c
View File

@ -151,6 +151,7 @@ __getutent_r (struct utmp *buffer, struct utmp **result)
return retval;
}
libc_hidden_def (__getutent_r)
weak_alias (__getutent_r, getutent_r)
@ -167,6 +168,7 @@ __pututline (const struct utmp *data)
return buffer;
}
libc_hidden_def (__pututline)
weak_alias (__pututline, pututline)

1
login/getutid.c
View File

@ -39,4 +39,5 @@ __getutid (const struct utmp *id)
return result;
}
libc_hidden_def (__getutid)
weak_alias (__getutid, getutid)

1
login/getutid_r.c
View File

@ -59,4 +59,5 @@ __getutid_r (const struct utmp *id, struct utmp *buffer, struct utmp **result)
return -1;
#endif
}
libc_hidden_def (__getutid_r)
weak_alias (__getutid_r, getutid_r)

1
login/getutline.c
View File

@ -40,4 +40,5 @@ __getutline (const struct utmp *line)
return result;
}
libc_hidden_def (__getutline)
weak_alias (__getutline, getutline)

1
login/getutline_r.c
View File

@ -42,4 +42,5 @@ __getutline_r (const struct utmp *line, struct utmp *buffer,
return retval;
}
libc_hidden_def (__getutline_r)
weak_alias (__getutline_r, getutline_r)

1
login/updwtmp.c
View File

@ -31,4 +31,5 @@ __updwtmp (const char *wtmp_file, const struct utmp *utmp)
(*__libc_utmp_file_functions.updwtmp) (file_name, utmp);
}
libc_hidden_def (__updwtmp)
weak_alias (__updwtmp, updwtmp)