mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-26 04:31:03 +00:00
34a5a1460e
The GNU Coding Standards specify that line breaks in expressions should go before an operator, not after one. This patch fixes various code to do this. It only changes code that appears to be mostly following GNU style anyway, not files and directories with substantially different formatting. It is not exhaustive even for files using GNU style (for example, changes to sysdeps files are deferred for subsequent cleanups). Some files changed are shared with gnulib, but most are specific to glibc. Changes were made manually, with places to change found by grep (so some cases, e.g. where the operator was followed by a comment at end of line, are particularly liable to have been missed by grep, but I did include cases where the operator was followed by backslash-newline). This patch generally does not attempt to address other coding style issues in the expressions changed (for example, missing spaces before '(', or lack of parentheses to ensure indentation of continuation lines properly reflects operator precedence). Tested for x86_64, and with build-many-glibcs.py. * benchtests/bench-memmem.c (simple_memmem): Break lines before rather than after operators. * benchtests/bench-skeleton.c (TIMESPEC_AFTER): Likewise. * crypt/md5.c (md5_finish_ctx): Likewise. * crypt/sha256.c (__sha256_finish_ctx): Likewise. * crypt/sha512.c (__sha512_finish_ctx): Likewise. * elf/cache.c (load_aux_cache): Likewise. * elf/dl-load.c (open_verify): Likewise. * elf/get-dynamic-info.h (elf_get_dynamic_info): Likewise. * elf/readelflib.c (process_elf_file): Likewise. * elf/rtld.c (dl_main): Likewise. * elf/sprof.c (generate_call_graph): Likewise. * hurd/ctty-input.c (_hurd_ctty_input): Likewise. * hurd/ctty-output.c (_hurd_ctty_output): Likewise. * hurd/dtable.c (reauth_dtable): Likewise. * hurd/getdport.c (__getdport): Likewise. * hurd/hurd/signal.h (_hurd_interrupted_rpc_timeout): Likewise. * hurd/hurd/sigpreempt.h (HURD_PREEMPT_SIGNAL_P): Likewise. * hurd/hurdfault.c (_hurdsig_fault_catch_exception_raise): Likewise. * hurd/hurdioctl.c (fioctl): Likewise. * hurd/hurdselect.c (_hurd_select): Likewise. * hurd/hurdsig.c (_hurdsig_abort_rpcs): Likewise. (STOPSIGS): Likewise. * hurd/hurdstartup.c (_hurd_startup): Likewise. * hurd/intr-msg.c (_hurd_intr_rpc_mach_msg): Likewise. * hurd/lookup-retry.c (__hurd_file_name_lookup_retry): Likewise. * hurd/msgportdemux.c (msgport_server): Likewise. * hurd/setauth.c (_hurd_setauth): Likewise. * include/features.h (__GLIBC_USE_DEPRECATED_SCANF): Likewise. * libio/libioP.h [IO_DEBUG] (CHECK_FILE): Likewise. * locale/programs/ld-ctype.c (set_class_defaults): Likewise. * localedata/tests-mbwc/tst_swscanf.c (tst_swscanf): Likewise. * login/tst-utmp.c (do_check): Likewise. (simulate_login): Likewise. * mach/lowlevellock.h (lll_lock): Likewise. (lll_trylock): Likewise. * math/test-fenv.c (ALL_EXC): Likewise. * math/test-fenvinline.c (ALL_EXC): Likewise. * misc/sys/cdefs.h (__attribute_deprecated_msg__): Likewise. * nis/nis_call.c (__do_niscall3): Likewise. * nis/nis_callback.c (cb_prog_1): Likewise. * nis/nis_defaults.c (searchaccess): Likewise. * nis/nis_findserv.c (__nis_findfastest_with_timeout): Likewise. * nis/nis_ismember.c (internal_ismember): Likewise. * nis/nis_local_names.c (nis_local_principal): Likewise. * nis/nss_nis/nis-rpc.c (_nss_nis_getrpcbyname_r): Likewise. * nis/nss_nisplus/nisplus-netgrp.c (_nss_nisplus_getnetgrent_r): Likewise. * nis/ypclnt.c (yp_match): Likewise. (yp_first): Likewise. (yp_next): Likewise. (yp_master): Likewise. (yp_order): Likewise. * nscd/hstcache.c (cache_addhst): Likewise. * nscd/initgrcache.c (addinitgroupsX): Likewise. * nss/nss_compat/compat-pwd.c (copy_pwd_changes): Likewise. (internal_getpwuid_r): Likewise. * nss/nss_compat/compat-spwd.c (copy_spwd_changes): Likewise. * posix/glob.h (__GLOB_FLAGS): Likewise. * posix/regcomp.c (peek_token): Likewise. (peek_token_bracket): Likewise. (parse_expression): Likewise. * posix/regexec.c (sift_states_iter_mb): Likewise. (check_node_accept_bytes): Likewise. * posix/tst-spawn3.c (do_test): Likewise. * posix/wordexp-test.c (testit): Likewise. * posix/wordexp.c (parse_tilde): Likewise. (exec_comm): Likewise. * posix/wordexp.h (__WRDE_FLAGS): Likewise. * resource/vtimes.c (TIMEVAL_TO_VTIMES): Likewise. * setjmp/sigjmp.c (__sigjmp_save): Likewise. * stdio-common/printf_fp.c (__printf_fp_l): Likewise. * stdio-common/tst-fileno.c (do_test): Likewise. * stdio-common/vfprintf-internal.c (vfprintf): Likewise. * stdlib/strfmon_l.c (__vstrfmon_l_internal): Likewise. * stdlib/strtod_l.c (round_and_return): Likewise. (____STRTOF_INTERNAL): Likewise. * stdlib/tst-strfrom.h (TEST_STRFROM): Likewise. * string/strcspn.c (STRCSPN): Likewise. * string/test-memmem.c (simple_memmem): Likewise. * termios/tcsetattr.c (tcsetattr): Likewise. * time/alt_digit.c (_nl_parse_alt_digit): Likewise. * time/asctime.c (asctime_internal): Likewise. * time/strptime_l.c (__strptime_internal): Likewise. * time/sys/time.h (timercmp): Likewise. * time/tzfile.c (__tzfile_compute): Likewise.
186 lines
6.1 KiB
C
186 lines
6.1 KiB
C
/* Read the dynamic section at DYN and fill in INFO with indices DT_*.
|
|
Copyright (C) 2012-2019 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
The GNU C Library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
/* This file is included multiple times and therefore lacks a header
|
|
file inclusion guard. */
|
|
|
|
#include <assert.h>
|
|
#include <libc-diag.h>
|
|
|
|
#ifndef RESOLVE_MAP
|
|
static
|
|
#else
|
|
auto
|
|
#endif
|
|
inline void __attribute__ ((unused, always_inline))
|
|
elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp)
|
|
{
|
|
ElfW(Dyn) *dyn = l->l_ld;
|
|
ElfW(Dyn) **info;
|
|
#if __ELF_NATIVE_CLASS == 32
|
|
typedef Elf32_Word d_tag_utype;
|
|
#elif __ELF_NATIVE_CLASS == 64
|
|
typedef Elf64_Xword d_tag_utype;
|
|
#endif
|
|
|
|
#if !defined RTLD_BOOTSTRAP && !defined STATIC_PIE_BOOTSTRAP
|
|
if (dyn == NULL)
|
|
return;
|
|
#endif
|
|
|
|
info = l->l_info;
|
|
|
|
while (dyn->d_tag != DT_NULL)
|
|
{
|
|
if ((d_tag_utype) dyn->d_tag < DT_NUM)
|
|
info[dyn->d_tag] = dyn;
|
|
else if (dyn->d_tag >= DT_LOPROC
|
|
&& dyn->d_tag < DT_LOPROC + DT_THISPROCNUM)
|
|
{
|
|
/* This does not violate the array bounds of l->l_info, but
|
|
gcc 4.6 on sparc somehow does not see this. */
|
|
DIAG_PUSH_NEEDS_COMMENT;
|
|
DIAG_IGNORE_NEEDS_COMMENT (4.6,
|
|
"-Warray-bounds");
|
|
info[dyn->d_tag - DT_LOPROC + DT_NUM] = dyn;
|
|
DIAG_POP_NEEDS_COMMENT;
|
|
}
|
|
else if ((d_tag_utype) DT_VERSIONTAGIDX (dyn->d_tag) < DT_VERSIONTAGNUM)
|
|
info[VERSYMIDX (dyn->d_tag)] = dyn;
|
|
else if ((d_tag_utype) DT_EXTRATAGIDX (dyn->d_tag) < DT_EXTRANUM)
|
|
info[DT_EXTRATAGIDX (dyn->d_tag) + DT_NUM + DT_THISPROCNUM
|
|
+ DT_VERSIONTAGNUM] = dyn;
|
|
else if ((d_tag_utype) DT_VALTAGIDX (dyn->d_tag) < DT_VALNUM)
|
|
info[DT_VALTAGIDX (dyn->d_tag) + DT_NUM + DT_THISPROCNUM
|
|
+ DT_VERSIONTAGNUM + DT_EXTRANUM] = dyn;
|
|
else if ((d_tag_utype) DT_ADDRTAGIDX (dyn->d_tag) < DT_ADDRNUM)
|
|
info[DT_ADDRTAGIDX (dyn->d_tag) + DT_NUM + DT_THISPROCNUM
|
|
+ DT_VERSIONTAGNUM + DT_EXTRANUM + DT_VALNUM] = dyn;
|
|
++dyn;
|
|
}
|
|
|
|
#define DL_RO_DYN_TEMP_CNT 8
|
|
|
|
#ifndef DL_RO_DYN_SECTION
|
|
/* Don't adjust .dynamic unnecessarily. */
|
|
if (l->l_addr != 0)
|
|
{
|
|
ElfW(Addr) l_addr = l->l_addr;
|
|
int cnt = 0;
|
|
|
|
# define ADJUST_DYN_INFO(tag) \
|
|
do \
|
|
if (info[tag] != NULL) \
|
|
{ \
|
|
if (temp) \
|
|
{ \
|
|
temp[cnt].d_tag = info[tag]->d_tag; \
|
|
temp[cnt].d_un.d_ptr = info[tag]->d_un.d_ptr + l_addr; \
|
|
info[tag] = temp + cnt++; \
|
|
} \
|
|
else \
|
|
info[tag]->d_un.d_ptr += l_addr; \
|
|
} \
|
|
while (0)
|
|
|
|
ADJUST_DYN_INFO (DT_HASH);
|
|
ADJUST_DYN_INFO (DT_PLTGOT);
|
|
ADJUST_DYN_INFO (DT_STRTAB);
|
|
ADJUST_DYN_INFO (DT_SYMTAB);
|
|
# if ! ELF_MACHINE_NO_RELA
|
|
ADJUST_DYN_INFO (DT_RELA);
|
|
# endif
|
|
# if ! ELF_MACHINE_NO_REL
|
|
ADJUST_DYN_INFO (DT_REL);
|
|
# endif
|
|
ADJUST_DYN_INFO (DT_JMPREL);
|
|
ADJUST_DYN_INFO (VERSYMIDX (DT_VERSYM));
|
|
ADJUST_DYN_INFO (ADDRIDX (DT_GNU_HASH));
|
|
# undef ADJUST_DYN_INFO
|
|
assert (cnt <= DL_RO_DYN_TEMP_CNT);
|
|
}
|
|
#endif
|
|
if (info[DT_PLTREL] != NULL)
|
|
{
|
|
#if ELF_MACHINE_NO_RELA
|
|
assert (info[DT_PLTREL]->d_un.d_val == DT_REL);
|
|
#elif ELF_MACHINE_NO_REL
|
|
assert (info[DT_PLTREL]->d_un.d_val == DT_RELA);
|
|
#else
|
|
assert (info[DT_PLTREL]->d_un.d_val == DT_REL
|
|
|| info[DT_PLTREL]->d_un.d_val == DT_RELA);
|
|
#endif
|
|
}
|
|
#if ! ELF_MACHINE_NO_RELA
|
|
if (info[DT_RELA] != NULL)
|
|
assert (info[DT_RELAENT]->d_un.d_val == sizeof (ElfW(Rela)));
|
|
# endif
|
|
# if ! ELF_MACHINE_NO_REL
|
|
if (info[DT_REL] != NULL)
|
|
assert (info[DT_RELENT]->d_un.d_val == sizeof (ElfW(Rel)));
|
|
#endif
|
|
#ifdef RTLD_BOOTSTRAP
|
|
/* Only the bind now flags are allowed. */
|
|
assert (info[VERSYMIDX (DT_FLAGS_1)] == NULL
|
|
|| (info[VERSYMIDX (DT_FLAGS_1)]->d_un.d_val & ~DF_1_NOW) == 0);
|
|
/* Flags must not be set for ld.so. */
|
|
assert (info[DT_FLAGS] == NULL
|
|
|| (info[DT_FLAGS]->d_un.d_val & ~DF_BIND_NOW) == 0);
|
|
#endif
|
|
#if defined RTLD_BOOTSTRAP || defined STATIC_PIE_BOOTSTRAP
|
|
assert (info[DT_RUNPATH] == NULL);
|
|
assert (info[DT_RPATH] == NULL);
|
|
#else
|
|
if (info[DT_FLAGS] != NULL)
|
|
{
|
|
/* Flags are used. Translate to the old form where available.
|
|
Since these l_info entries are only tested for NULL pointers it
|
|
is ok if they point to the DT_FLAGS entry. */
|
|
l->l_flags = info[DT_FLAGS]->d_un.d_val;
|
|
|
|
if (l->l_flags & DF_SYMBOLIC)
|
|
info[DT_SYMBOLIC] = info[DT_FLAGS];
|
|
if (l->l_flags & DF_TEXTREL)
|
|
info[DT_TEXTREL] = info[DT_FLAGS];
|
|
if (l->l_flags & DF_BIND_NOW)
|
|
info[DT_BIND_NOW] = info[DT_FLAGS];
|
|
}
|
|
if (info[VERSYMIDX (DT_FLAGS_1)] != NULL)
|
|
{
|
|
l->l_flags_1 = info[VERSYMIDX (DT_FLAGS_1)]->d_un.d_val;
|
|
|
|
/* Only DT_1_SUPPORTED_MASK bits are supported, and we would like
|
|
to assert this, but we can't. Users have been setting
|
|
unsupported DF_1_* flags for a long time and glibc has ignored
|
|
them. Therefore to avoid breaking existing applications the
|
|
best we can do is add a warning during debugging with the
|
|
intent of notifying the user of the problem. */
|
|
if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_FILES, 0)
|
|
&& l->l_flags_1 & ~DT_1_SUPPORTED_MASK)
|
|
_dl_debug_printf ("\nWARNING: Unsupported flag value(s) of 0x%x in DT_FLAGS_1.\n",
|
|
l->l_flags_1 & ~DT_1_SUPPORTED_MASK);
|
|
|
|
if (l->l_flags_1 & DF_1_NOW)
|
|
info[DT_BIND_NOW] = info[VERSYMIDX (DT_FLAGS_1)];
|
|
}
|
|
if (info[DT_RUNPATH] != NULL)
|
|
/* If both RUNPATH and RPATH are given, the latter is ignored. */
|
|
info[DT_RPATH] = NULL;
|
|
#endif
|
|
}
|