AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-25 06:20:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix linknamespace errors and local-plt-usages in nss_files.

Browse Source 
After commit f9c8b11ed7
"nss: Access nss_files through direct references",
when building with -Os, multiple conform/.../linknamespace tests
and elf/check-localplt are failing:
Extra PLT reference: libc.so: fgetc_unlocked
Extra PLT reference: libc.so: getline

Or e.g.:
[initial] glob -> [libc.a(glob.o)] __getpwnam_r -> [libc.a(getpwnam_r.o)] __nss_database_custom -> [libc.a(nsswitch.o)] __nss_module_get_function -> [libc.a(nss_module.o)] __nss_files_functions -> [libc.a(nss_files_functions.o)] _nss_files_endaliasent -> [libc.a(files-alias.o)] feof_unlocked
[initial] glob -> [libc.a(glob.o)] __getpwnam_r -> [libc.a(getpwnam_r.o)] __nss_database_custom -> [libc.a(nsswitch.o)] __nss_module_get_function -> [libc.a(nss_module.o)] __nss_files_functions -> [libc.a(nss_files_functions.o)] _nss_files_endaliasent -> [libc.a(files-alias.o)] fgetc_unlocked
[initial] glob -> [libc.a(glob.o)] __getpwnam_r -> [libc.a(getpwnam_r.o)] __nss_database_custom -> [libc.a(nsswitch.o)] __nss_module_get_function -> [libc.a(nss_module.o)] __nss_files_functions -> [libc.a(nss_files_functions.o)] _nss_files_endnetgrent -> [libc.a(files-netgrp.o)] getline

This patch is using the hidden symbols where possible.
Instead of fputc_unlocked, __putc_unlocked is used.
(Compare to commit eeaa19f75e
"mntent: Use __putc_unlocked instead of fputc_unlocked")
This commit is contained in:
Stefan Liebler 2021-07-14 15:58:08 +02:00
parent 84d40d702f
commit 0e1f068108
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nss/nss_files/files-alias.c
View File

@ -189,7 +189,7 @@ get_next_alias (FILE *stream, const char *match, struct aliasent *result,
if (listfile != NULL if (listfile != NULL
&& (old_line = __strdup (line)) != NULL) && (old_line = __strdup (line)) != NULL)
{ {
while (! feof_unlocked (listfile)) while (! __feof_unlocked (listfile))
{ {
if (room_left < 2) if (room_left < 2)
{ {
@ -269,7 +269,7 @@ get_next_alias (FILE *stream, const char *match, struct aliasent *result,
just read character. */ just read character. */
int ch; int ch;
ch = fgetc_unlocked (stream); ch = __getc_unlocked (stream);
if (ch == EOF || ch == '\n' || !isspace (ch)) if (ch == EOF || ch == '\n' || !isspace (ch))
{ {
size_t cnt; size_t cnt;

4
nss/nss_files/files-initgroups.c
View File

@ -55,10 +55,10 @@ _nss_files_initgroups_dyn (const char *user, gid_t group, long int *start,
{ {
fpos_t pos; fpos_t pos;
fgetpos (stream, &pos); fgetpos (stream, &pos);
ssize_t n = getline (&line, &linelen, stream); ssize_t n = __getline (&line, &linelen, stream);
if (n < 0) if (n < 0)
{ {
if (! feof_unlocked (stream)) if (! __feof_unlocked (stream))
status = ((*errnop = errno) == ENOMEM status = ((*errnop = errno) == ENOMEM
? NSS_STATUS_TRYAGAIN : NSS_STATUS_UNAVAIL); ? NSS_STATUS_TRYAGAIN : NSS_STATUS_UNAVAIL);
break; break;

6
nss/nss_files/files-netgrp.c
View File

@ -77,9 +77,9 @@ _nss_files_setnetgrent (const char *group, struct __netgrent *result)
status = NSS_STATUS_NOTFOUND; status = NSS_STATUS_NOTFOUND;
result->cursor = result->data; result->cursor = result->data;
while (!feof_unlocked (fp)) while (!__feof_unlocked (fp))
{ {
ssize_t curlen = getline (&line, &line_len, fp); ssize_t curlen = __getline (&line, &line_len, fp);
int found; int found;
if (curlen < 0) if (curlen < 0)
@ -111,7 +111,7 @@ _nss_files_setnetgrent (const char *group, struct __netgrent *result)
result->cursor -= 2; result->cursor -= 2;
/* Get next line. */ /* Get next line. */
curlen = getline (&line, &line_len, fp); curlen = __getline (&line, &line_len, fp);
if (curlen <= 0) if (curlen <= 0)
break; break;

2
nss/nss_readline.c
View File

@ -42,7 +42,7 @@ __nss_readline (FILE *fp, char *buf, size_t len, off64_t *poffset)
buf[len - 1] = '\xff'; /* Marker to recognize truncation. */ buf[len - 1] = '\xff'; /* Marker to recognize truncation. */
if (__fgets_unlocked (buf, len, fp) == NULL) if (__fgets_unlocked (buf, len, fp) == NULL)
{ {
if (feof_unlocked (fp)) if (__feof_unlocked (fp))
{ {
__set_errno (ENOENT); __set_errno (ENOENT);
return ENOENT; return ENOENT;