mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-17 18:40:14 +00:00
5aa8ff620e
1998-04-21 18:00 Ulrich Drepper <drepper@cygnus.com> * iconv/gconv.c (__gconv): Remove bogus input buffer size computation. * iconv/gconv_open.c (__gconv_open): Initialize outbufend element. * iconv/gconv_simple.c (__gconv_transform_internal_ascii): Don't use character in comparison with uint32_t. (__gconv_transform_internal_utf8): Specify MAX_NEEDED_TO. (__gconv_transform_utf8_internal): Specify MAX_NEEDED_FROM. Optimize BODY a bit. * iconv/loop.c: Require MIN_NEEDED_INPUT and MIN_NEEDED_OUTPUT to be defined. * iconv/skeleton.c: Also reset converted counter in case of an error. Call reset function using correct value for output buffer start. * iconvdata/Makefile: Re-enable tests. * iconvdata/iso8859-1.c: Swap MIN_NEEDED_INPUT and MIN_NEEDED_OUTPUT value for to-conversion. * iconvdata/TESTS: Add new third column. * iconvdata/run-iconv-test.sh: Add support for charsets which are not ASCII based. * iconvdata/testdata/suntzus: New file. * elf/dl-minimal.c (__strtol_internal): Increment pointer to string while reading. Correctly used base. Little optimization. (__strtoul_internal): Likewise. * elf/rtld.c (dl_main): Test to avoid duplicate call of _dl_init_paths was wrong. Use explicit variable. 1998-04-20 23:49 Zack Weinberg <zack@rabi.phys.columbia.edu> * configure.in: Check for awk. * config.make.in: Add AWK to be substituted. * manual/xtract-typefun.awk: Rewrite to eliminate gawk extensions. * manual/users.texi: Fix typo exposed by above rewrite. * Makefile: Invoke awk using AWK variable. * csu/Makefile: Likewise. * elf/Makefile: Likewise. * mach/Makefile: Likewise. * manual/Makefile: Likewise. * sysdeps/gnu/Makefile: Likewise. * sysdeps/mach/hurd/Makefile: Likewise. * sysdeps/unix/Makefile: Likewise. * timezone/Makefile: Likewise. 1998-04-10 Gordon Matzigkeit <gord@profitpress.com> * sysdeps/gnu/errlist.awk (ERR_REMAP): Implement error code to array index translation. (SYS_ERRLIST_ALIAS, SYS_NERR_ALIAS): Make weak aliases only if these are defined. * sysdeps/mach/hurd/Dist: Add errlist.c to distribution. * sysdeps/mach/hurd/errlist.c: New file. (ERR_TRANSLATE): Map Hurd error codes into errlist indices. (_hurd_errlist): The Hurd error list doesn't have Unix sys_errlist semantics, so rename it. 1998-04-16 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> * iconvdata/run-iconv-test.sh: Make portable. Always test all conversions. 1998-04-21 12:30 H.J. Lu <hjl@gnu.org> * wcsmbs/wcsrtombs.c (__wcsrtombs): Initialize result to 0. * wcsmbs/wcsnrtombs.c: Likewise. 1998-04-21 Ulrich Drepper <drepper@cygnus.com> * sysdeps/generic/dl-sysdep.c: Handle _dl_hwcap correctly. * wcsmbs/btowc.c (__btowc): Declare inptr as const char *. * time/strftime.c (my_strftime): Initialize pad variable in declaration. * iconvdata/big5.c: Don't use character constants in comparisons with unsigned value. * sysdeps/generic/setutxent.c: New file. * sysdeps/generic/getutxent.c: New file. * sysdeps/generic/endutxent.c: New file. * sysdeps/generic/getutxid.c: New file. * sysdeps/generic/getutxline.c: New file. * sysdeps/generic/pututxline.c: New file. * sysdeps/generic/utmpxname.c: New file. * sysdeps/generic/updwtmpx.c: New file.
448 lines
11 KiB
C
448 lines
11 KiB
C
/* Operating system support for run-time dynamic linker. Generic Unix version.
|
|
Copyright (C) 1995, 1996, 1997, 1998 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 Library General Public License as
|
|
published by the Free Software Foundation; either version 2 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
|
|
Library General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Library General Public
|
|
License along with the GNU C Library; see the file COPYING.LIB. If not,
|
|
write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA. */
|
|
|
|
#include <elf.h>
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <sys/mman.h>
|
|
#include <elf/ldsodefs.h>
|
|
#include <stdio-common/_itoa.h>
|
|
|
|
#include <entry.h>
|
|
#include <dl-machine.h>
|
|
#include <dl-procinfo.h>
|
|
|
|
extern int _dl_argc;
|
|
extern char **_dl_argv;
|
|
extern char **_environ;
|
|
extern size_t _dl_pagesize;
|
|
extern const char *_dl_platform;
|
|
extern unsigned long int _dl_hwcap;
|
|
extern size_t _dl_platformlen;
|
|
extern void _end;
|
|
extern void ENTRY_POINT (void);
|
|
|
|
ElfW(Addr) _dl_base_addr;
|
|
int __libc_enable_secure;
|
|
int __libc_multiple_libcs; /* Defining this here avoids the inclusion
|
|
of init-first. */
|
|
static ElfW(auxv_t) *_dl_auxv;
|
|
unsigned long int _dl_hwcap_mask = HWCAP_IMPORTANT;
|
|
|
|
|
|
#ifndef DL_FIND_ARG_COMPONENTS
|
|
#define DL_FIND_ARG_COMPONENTS(cookie, argc, argv, envp, auxp) \
|
|
do { \
|
|
void **_tmp; \
|
|
(argc) = *(long *) cookie; \
|
|
(argv) = (char **) cookie + 1; \
|
|
(envp) = (argv) + (argc) + 1; \
|
|
for (_tmp = (void **) (envp); *_tmp; ++_tmp) \
|
|
continue; \
|
|
(auxp) = (void *) ++_tmp; \
|
|
} while (0)
|
|
#endif
|
|
|
|
|
|
ElfW(Addr)
|
|
_dl_sysdep_start (void **start_argptr,
|
|
void (*dl_main) (const ElfW(Phdr) *phdr, ElfW(Word) phnum,
|
|
ElfW(Addr) *user_entry))
|
|
{
|
|
const ElfW(Phdr) *phdr = NULL;
|
|
ElfW(Word) phnum = 0;
|
|
ElfW(Addr) user_entry;
|
|
ElfW(auxv_t) *av;
|
|
uid_t uid = 0;
|
|
uid_t euid = 0;
|
|
gid_t gid = 0;
|
|
gid_t egid = 0;
|
|
unsigned int seen;
|
|
|
|
DL_FIND_ARG_COMPONENTS (start_argptr, _dl_argc, _dl_argv, _environ, _dl_auxv);
|
|
|
|
user_entry = (ElfW(Addr)) &ENTRY_POINT;
|
|
_dl_platform = NULL; /* Default to nothing known about the platform. */
|
|
|
|
seen = 0;
|
|
#define M(type) (1 << (type))
|
|
|
|
for (av = _dl_auxv; av->a_type != AT_NULL; seen |= M ((++av)->a_type))
|
|
switch (av->a_type)
|
|
{
|
|
case AT_PHDR:
|
|
phdr = av->a_un.a_ptr;
|
|
break;
|
|
case AT_PHNUM:
|
|
phnum = av->a_un.a_val;
|
|
break;
|
|
case AT_PAGESZ:
|
|
_dl_pagesize = av->a_un.a_val;
|
|
break;
|
|
case AT_ENTRY:
|
|
user_entry = av->a_un.a_val;
|
|
break;
|
|
case AT_BASE:
|
|
_dl_base_addr = av->a_un.a_val;
|
|
break;
|
|
case AT_UID:
|
|
uid = av->a_un.a_val;
|
|
break;
|
|
case AT_GID:
|
|
gid = av->a_un.a_val;
|
|
break;
|
|
case AT_EUID:
|
|
euid = av->a_un.a_val;
|
|
break;
|
|
case AT_EGID:
|
|
egid = av->a_un.a_val;
|
|
break;
|
|
case AT_PLATFORM:
|
|
_dl_platform = av->a_un.a_ptr;
|
|
break;
|
|
case AT_HWCAP:
|
|
_dl_hwcap = av->a_un.a_val;
|
|
break;
|
|
}
|
|
|
|
/* Linux doesn't provide us with any of these values on the stack
|
|
when the dynamic linker is run directly as a program. */
|
|
|
|
#define SEE(UID, uid) if ((seen & M (AT_##UID)) == 0) uid = __get##uid ()
|
|
SEE (UID, uid);
|
|
SEE (GID, gid);
|
|
SEE (EUID, euid);
|
|
SEE (EGID, egid);
|
|
|
|
__libc_enable_secure = uid != euid || gid != egid;
|
|
|
|
if (_dl_pagesize == 0)
|
|
_dl_pagesize = __getpagesize ();
|
|
|
|
#ifdef DL_SYSDEP_INIT
|
|
DL_SYSDEP_INIT;
|
|
#endif
|
|
|
|
#ifdef DL_PLATFORM_INIT
|
|
DL_PLATFORM_INIT;
|
|
#endif
|
|
|
|
/* Determine the length of the platform name. */
|
|
if (_dl_platform != NULL)
|
|
_dl_platformlen = strlen (_dl_platform);
|
|
|
|
if (__sbrk (0) == &_end)
|
|
/* The dynamic linker was run as a program, and so the initial break
|
|
starts just after our bss, at &_end. The malloc in dl-minimal.c
|
|
will consume the rest of this page, so tell the kernel to move the
|
|
break up that far. When the user program examines its break, it
|
|
will see this new value and not clobber our data. */
|
|
__sbrk (_dl_pagesize - ((&_end - (void *) 0) & (_dl_pagesize - 1)));
|
|
|
|
(*dl_main) (phdr, phnum, &user_entry);
|
|
return user_entry;
|
|
}
|
|
|
|
void
|
|
_dl_sysdep_start_cleanup (void)
|
|
{
|
|
}
|
|
|
|
void
|
|
internal_function
|
|
_dl_show_auxv (void)
|
|
{
|
|
char buf[64];
|
|
ElfW(auxv_t) *av;
|
|
|
|
/* Terminate string. */
|
|
buf[63] = '\0';
|
|
|
|
for (av = _dl_auxv; av->a_type != AT_NULL; ++av)
|
|
switch (av->a_type)
|
|
{
|
|
case AT_PHDR:
|
|
_dl_sysdep_message ("AT_PHDR: 0x",
|
|
_itoa_word (av->a_un.a_val, buf + sizeof buf - 1,
|
|
16, 0),
|
|
"\n", NULL);
|
|
break;
|
|
case AT_PHNUM:
|
|
_dl_sysdep_message ("AT_PHNUM: ",
|
|
_itoa_word (av->a_un.a_val, buf + sizeof buf - 1,
|
|
10, 0),
|
|
"\n", NULL);
|
|
break;
|
|
case AT_PAGESZ:
|
|
_dl_sysdep_message ("AT_PAGESZ: ",
|
|
_itoa_word (av->a_un.a_val, buf + sizeof buf - 1,
|
|
10, 0),
|
|
"\n", NULL);
|
|
break;
|
|
case AT_ENTRY:
|
|
_dl_sysdep_message ("AT_ENTRY: 0x",
|
|
_itoa_word (av->a_un.a_val, buf + sizeof buf - 1,
|
|
16, 0),
|
|
"\n", NULL);
|
|
break;
|
|
case AT_BASE:
|
|
_dl_sysdep_message ("AT_BASE: 0x",
|
|
_itoa_word (av->a_un.a_val, buf + sizeof buf - 1,
|
|
16, 0),
|
|
"\n", NULL);
|
|
break;
|
|
case AT_UID:
|
|
_dl_sysdep_message ("AT_UID: ",
|
|
_itoa_word (av->a_un.a_val, buf + sizeof buf - 1,
|
|
10, 0),
|
|
"\n", NULL);
|
|
break;
|
|
case AT_GID:
|
|
_dl_sysdep_message ("AT_GID: ",
|
|
_itoa_word (av->a_un.a_val, buf + sizeof buf - 1,
|
|
10, 0),
|
|
"\n", NULL);
|
|
break;
|
|
case AT_EUID:
|
|
_dl_sysdep_message ("AT_EUID: ",
|
|
_itoa_word (av->a_un.a_val, buf + sizeof buf - 1,
|
|
10, 0),
|
|
"\n", NULL);
|
|
break;
|
|
case AT_EGID:
|
|
_dl_sysdep_message ("AT_EGID: ",
|
|
_itoa_word (av->a_un.a_val, buf + sizeof buf - 1,
|
|
10, 0),
|
|
"\n", NULL);
|
|
break;
|
|
case AT_PLATFORM:
|
|
_dl_sysdep_message ("AT_PLATFORM: ", av->a_un.a_ptr, "\n", NULL);
|
|
break;
|
|
case AT_HWCAP:
|
|
_dl_hwcap = av->a_un.a_val;
|
|
if (_dl_procinfo (_dl_hwcap) < 0)
|
|
_dl_sysdep_message ("AT_HWCAP: ",
|
|
_itoa_word (_dl_hwcap, buf + sizeof buf - 1,
|
|
16, 0),
|
|
"\n", NULL);
|
|
break;
|
|
}
|
|
}
|
|
|
|
/* Walk through the environment of the process and return all entries
|
|
starting with `LD_'. */
|
|
char *
|
|
internal_function
|
|
_dl_next_ld_env_entry (char ***position)
|
|
{
|
|
char **current = *position;
|
|
char *result = NULL;
|
|
|
|
if (current == NULL)
|
|
/* We start over. */
|
|
current = _environ;
|
|
|
|
while (result == NULL && *current != NULL)
|
|
{
|
|
if ((*current)[0] == 'L' && (*current)[1] == 'D' && (*current)[2] == '_')
|
|
result = *current;
|
|
|
|
++current;
|
|
}
|
|
|
|
/* Save current position for next visit. */
|
|
*position = current;
|
|
|
|
return result;
|
|
}
|
|
|
|
/* Return an array of useful/necessary hardware capability names. */
|
|
const struct r_strlenpair *
|
|
internal_function
|
|
_dl_important_hwcaps (const char *platform, size_t platform_len, size_t *sz,
|
|
size_t *max_capstrlen)
|
|
{
|
|
/* Determine how many important bits are set. */
|
|
unsigned long int masked = _dl_hwcap & _dl_hwcap_mask;
|
|
size_t cnt = platform != NULL;
|
|
size_t n, m;
|
|
size_t total;
|
|
struct r_strlenpair *temp;
|
|
struct r_strlenpair *result;
|
|
struct r_strlenpair *rp;
|
|
char *cp;
|
|
|
|
/* Count the number of bits set in the masked value. */
|
|
for (n = 0; (~((1UL << n) - 1) & masked) != 0; ++n)
|
|
if ((masked & (1UL << n)) != 0)
|
|
++cnt;
|
|
|
|
if (cnt == 0)
|
|
{
|
|
/* If we have platform name and no important capability we only have
|
|
the base directory to search. */
|
|
result = (struct r_strlenpair *) malloc (sizeof (*result));
|
|
if (result == NULL)
|
|
{
|
|
no_memory:
|
|
_dl_signal_error (ENOMEM, NULL, "cannot create capability list");
|
|
}
|
|
|
|
result[0].str = (char *) result; /* Does not really matter. */
|
|
result[0].len = 0;
|
|
|
|
*sz = 1;
|
|
return result;
|
|
}
|
|
|
|
/* Create temporary data structure to generate result table. */
|
|
temp = (struct r_strlenpair *) alloca (cnt * sizeof (*temp));
|
|
m = 0;
|
|
for (n = 0; masked != 0; ++n)
|
|
if ((masked & (1UL << n)) != 0)
|
|
{
|
|
temp[m].str = _dl_hwcap_string (n);
|
|
temp[m].len = strlen (temp[m].str);
|
|
masked ^= 1UL << n;
|
|
++m;
|
|
}
|
|
if (platform != NULL)
|
|
{
|
|
temp[m].str = platform;
|
|
temp[m].len = platform_len;
|
|
++m;
|
|
}
|
|
|
|
/* Determine the total size of all strings together. */
|
|
if (cnt == 1)
|
|
total = temp[0].len;
|
|
else
|
|
{
|
|
total = (1 << (cnt - 2)) * (temp[0].len + temp[cnt - 1].len + 2);
|
|
for (n = 1; n + 1 < cnt; ++n)
|
|
total += (1 << (cnt - 3)) * (temp[n].len + 1);
|
|
}
|
|
|
|
/* The result structure: we use a very compressed way to store the
|
|
various combinations of capability names. */
|
|
*sz = 1 << cnt;
|
|
result = (struct r_strlenpair *) malloc (*sz * sizeof (*result) + total);
|
|
if (result == NULL)
|
|
goto no_memory;
|
|
|
|
if (cnt == 1)
|
|
{
|
|
result[0].str = (char *) (result + *sz);
|
|
result[0].len = temp[0].len + 1;
|
|
result[1].str = (char *) (result + *sz);
|
|
result[1].len = 0;
|
|
cp = __mempcpy ((char *) (result + *sz), temp[0].str, temp[0].len);
|
|
*cp = '/';
|
|
*sz = 2;
|
|
*max_capstrlen = result[0].len;
|
|
|
|
return result;
|
|
}
|
|
|
|
/* Fill in the information. This follows the following scheme
|
|
(indeces from TEMP for four strings):
|
|
entry #0: 0, 1, 2, 3 binary: 1111
|
|
#1: 0, 1, 3 1101
|
|
#2: 0, 2, 3 1011
|
|
#3: 0, 3 1001
|
|
This allows to represent all possible combinations of capability
|
|
names in the string. First generate the strings. */
|
|
result[1].str = result[0].str = cp = (char *) (result + *sz);
|
|
#define add(idx) \
|
|
cp = __mempcpy (__mempcpy (cp, temp[idx].str, temp[idx].len), "/", 1);
|
|
if (cnt == 2)
|
|
{
|
|
add (1);
|
|
add (0);
|
|
}
|
|
else
|
|
{
|
|
n = 1 << cnt;
|
|
do
|
|
{
|
|
n -= 2;
|
|
|
|
/* We always add the last string. */
|
|
add (cnt - 1);
|
|
|
|
/* Add the strings which have the bit set in N. */
|
|
for (m = cnt - 2; m > 0; --m)
|
|
if ((n & (1 << m)) != 0)
|
|
add (m);
|
|
|
|
/* Always add the first string. */
|
|
add (0);
|
|
}
|
|
while (n != 0);
|
|
}
|
|
#undef add
|
|
|
|
/* Now we are ready to install the string pointers and length. */
|
|
for (n = 0; n < (1 << cnt); ++n)
|
|
result[n].len = 0;
|
|
n = cnt;
|
|
do
|
|
{
|
|
size_t mask = 1 << --n;
|
|
|
|
rp = result;
|
|
for (m = 1 << cnt; m > 0; ++rp)
|
|
if ((--m & mask) != 0)
|
|
rp->len += temp[n].len + 1;
|
|
}
|
|
while (n != 0);
|
|
|
|
/* The first half of the strings all include the first string. */
|
|
n = (1 << cnt) - 2;
|
|
rp = &result[2];
|
|
while (n != (1 << (cnt - 1)))
|
|
{
|
|
if ((n & 1) != 0)
|
|
rp[0].str = rp[-2].str + rp[-2].len;
|
|
else
|
|
rp[0].str = rp[-1].str;
|
|
++rp;
|
|
--n;
|
|
}
|
|
|
|
/* The second have starts right after the first part of the string of
|
|
corresponding entry in the first half. */
|
|
do
|
|
{
|
|
rp[0].str = rp[-(1 << (cnt - 1))].str + temp[cnt - 1].len + 1;
|
|
++rp;
|
|
}
|
|
while (--n != 0);
|
|
|
|
/* The maximum string length. */
|
|
*max_capstrlen = result[0].len;
|
|
|
|
return result;
|
|
}
|