diff options
| -rw-r--r-- | ChangeLog | 22 | ||||
| -rw-r--r-- | login/logout.c | 9 | ||||
| -rw-r--r-- | login/logwtmp.c | 9 | ||||
| -rw-r--r-- | login/utmp.h | 7 | ||||
| -rw-r--r-- | misc/tsearch.c | 2 | ||||
| -rw-r--r-- | posix/fnmatch.c | 22 | ||||
| -rw-r--r-- | sysdeps/generic/utmpbits.h | 4 | ||||
| -rw-r--r-- | sysdeps/gnu/utmpbits.h | 11 | ||||
| -rw-r--r-- | sysdeps/sparc/dl-machine.h | 250 | ||||
| -rw-r--r-- | sysdeps/sparc/elf/start.S | 111 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/utmpbits.h | 16 | ||||
| -rw-r--r-- | version.c | 2 |
12 files changed, 443 insertions, 22 deletions
diff --git a/ChangeLog b/ChangeLog index 2fde6f5f50..88bc8deec8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,27 @@ Fri Jun 21 00:27:51 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu> + * sysdeps/sparc/elf/start.S: New file. + * sysdeps/sparc/dl-machine.h: New file. + + * posix/fnmatch.c (fnmatch): Fix \*[*?]+ case to increment name ptr + only for ?s, not for *s. Fix from Chet Ramey. + + Fixes thanks to Raja R Harinath <harinath@cs.umn.edu>: + * sysdeps/unix/sysv/utmpbits.h: Define _HAVE_UT_{TYPE,ID,TV,HOST}. + Use __{BEGIN,END}_DECLS. + (_PATH_WTMP, _PATH_UTMP, _PATH_LASTLOG): New macros. + * login/utmp.h (UTMP_FILE, UTMP_FILENAME, WTMP_FILE, WTMP_FILENAME): + New macros, moved here from sysdeps/gnu/utmpbits.h. + * sysdeps/generic/utmpbits.h (_HAVE_UT_HOST): Define it. + * sysdeps/gnu/utmpbits.h (_HAVE_UT_HOST): Likewise. + * login/logout.c: Use ut_host only #if _HAVE_UT_HOST. + Use sizeof instead of UT_*SIZE. + * login/logwtmp.c: Likewise. + + * misc/tsearch.c (tdelete): Define as weak alias to __tdelete. + + * version.c (banner): Add trailing newline. + * login/utmp.h: Declare login_tty. Thu Jun 20 21:19:07 1996 Richard Henderson <rth@tamu.edu> diff --git a/login/logout.c b/login/logout.c index d47a392699..1b8dc317ff 100644 --- a/login/logout.c +++ b/login/logout.c @@ -41,15 +41,16 @@ logout (const char *line) #if _HAVE_UT_TYPE - 0 tmp.ut_type = USER_PROCESS; #endif - strncpy (tmp.ut_line, line, UT_LINESIZE); + strncpy (tmp.ut_line, line, sizeof tmp.ut_line); /* Read the record. */ if (getutline_r (&tmp, &ut, &data) >= 0 || errno == ESRCH) { /* Clear information about who & from where. */ - bzero (ut->ut_name, UT_NAMESIZE); - bzero (ut->ut_host, UT_HOSTSIZE); - + bzero (ut->ut_name, sizeof ut->ut_name); +#if _HAVE_UT_HOST - 0 + bzero (ut->ut_host, sizeof ut->ut_host); +#endif #if _HAVE_UT_TV - 0 gettimeofday (&ut->ut_tv, NULL); #else diff --git a/login/logwtmp.c b/login/logwtmp.c index 10f7384f6c..371f34ee76 100644 --- a/login/logwtmp.c +++ b/login/logwtmp.c @@ -45,9 +45,11 @@ logwtmp (const char *line, const char *name, const char *host) #if _HAVE_UT_TYPE - 0 ut.ut_type = USER_PROCESS; #endif - strncpy (ut.ut_line, line, UT_LINESIZE); - strncpy (ut.ut_name, name, UT_NAMESIZE); - strncpy (ut.ut_host, host, UT_HOSTSIZE); + strncpy (ut.ut_line, line, sizeof ut.ut_line); + strncpy (ut.ut_name, name, sizeof ut.ut_name); +#if _HAVE_UT_HOST - 0 + strncpy (ut.ut_host, host, sizeof ut.ut_host); +#endif #if _HAVE_UT_TV - 0 gettimeofday (&ut.ut_tv, NULL); @@ -60,5 +62,4 @@ logwtmp (const char *line, const char *name, const char *host) /* Close UTMP file. */ endutent_r (&data); - } diff --git a/login/utmp.h b/login/utmp.h index 71f1a093df..e9c1734258 100644 --- a/login/utmp.h +++ b/login/utmp.h @@ -28,6 +28,13 @@ Boston, MA 02111-1307, USA. */ /* Get system dependent values and data structures. */ #include <utmpbits.h> +/* Compatibility names for the strings of the canonical file names. */ +#define UTMP_FILE _PATH_UTMP +#define UTMP_FILENAME _PATH_UTMP +#define WTMP_FILE _PATH_WTMP +#define WTMP_FILENAME _PATH_WTMP + + /* Make FD be the controlling terminal, stdin, stdout, and stderr; then close FD. Returns 0 on success, nonzero on error. */ diff --git a/misc/tsearch.c b/misc/tsearch.c index deff96c478..689b2e1104 100644 --- a/misc/tsearch.c +++ b/misc/tsearch.c @@ -170,7 +170,7 @@ __tdelete (key, vrootp, compar) *rootp = q; /* link parent to new node */ return p; } -weak_alias (__tfind, tfind) +weak_alias (__tdelete, tdelete) /* Walk the nodes of a tree diff --git a/posix/fnmatch.c b/posix/fnmatch.c index 08c1c9448e..de45941f8f 100644 --- a/posix/fnmatch.c +++ b/posix/fnmatch.c @@ -92,10 +92,24 @@ fnmatch (pattern, string, flags) (n == string || ((flags & FNM_FILE_NAME) && n[-1] == '/'))) return FNM_NOMATCH; - for (c = *p++; c == '?' || c == '*'; c = *p++, ++n) - if (((flags & FNM_FILE_NAME) && *n == '/') || - (c == '?' && *n == '\0')) - return FNM_NOMATCH; + for (c = *p++; c == '?' || c == '*'; c = *p++) + { + if ((flags & FNM_FILE_NAME) && *n == '/') + /* A slash does not match a wildcard under FNM_FILE_NAME. */ + return FNM_NOMATCH; + else if (c == '?') + { + /* A ? needs to match one character. */ + if (*n == '\0') + /* There isn't another character; no match. */ + return FNM_NOMATCH; + else + /* One character of the string is consumed in matching + this ? wildcard, so *??? won't match if there are + less than three characters. */ + ++n; + } + } if (c == '\0') return 0; diff --git a/sysdeps/generic/utmpbits.h b/sysdeps/generic/utmpbits.h index 0cd8f1d238..b3fb36ab4a 100644 --- a/sysdeps/generic/utmpbits.h +++ b/sysdeps/generic/utmpbits.h @@ -46,6 +46,10 @@ struct utmp { long ut_time; }; + +#define _HAVE_UT_HOST 1 /* We have the ut_host field. */ + + __END_DECLS #endif /* utmpbits.h */ diff --git a/sysdeps/gnu/utmpbits.h b/sysdeps/gnu/utmpbits.h index 2244ecbf75..4749fdd3fe 100644 --- a/sysdeps/gnu/utmpbits.h +++ b/sysdeps/gnu/utmpbits.h @@ -28,11 +28,6 @@ Boston, MA 02111-1307, USA. */ #define _PATH_WTMP "/var/log/wtmp" #define _PATH_LASTLOG "/var/log/lastlog" -#define UTMP_FILE _PATH_UTMP -#define WTMP_FILE _PATH_WTMP -#define UTMP_FILENAME UTMP_FILE -#define WTMP_FILENAME WTMP_FILE - #define UT_UNKNOWN 0 /* for ut_type field */ #define RUN_LVL 1 @@ -45,8 +40,6 @@ Boston, MA 02111-1307, USA. */ #define USER_PROCESS 7 #define DEAD_PROCESS 8 -#define ut_name ut_user - #define UT_LINESIZE 32 #define UT_NAMESIZE 32 #define UT_HOSTSIZE 256 @@ -67,6 +60,7 @@ struct utmp char ut_line[UT_LINESIZE]; /* NUL-terminated devicename of tty. */ char ut_id[4]; /* Inittab id. */ char ut_user[UT_NAMESIZE]; /* Username (not NUL terminated). */ +#define ut_name ut_user /* Compatible field name for same. */ char ut_host[UT_HOSTSIZE]; /* Hostname for remote login. */ int ut_exit; /* Process termination/exit status. */ long ut_session; /* Session ID, used for windowing. */ @@ -77,11 +71,12 @@ struct utmp #define ut_time ut_tv.tv_sec /* Backwards compatibility. */ -/* Tell the user that we have a modern system with UT_TYPE, UT_ID +/* Tell the user that we have a modern system with UT_HOST, UT_TYPE, UT_ID and UT_TV fields. */ #define _HAVE_UT_TYPE 1 #define _HAVE_UT_ID 1 #define _HAVE_UT_TV 1 +#define _HAVE_UT_HOST 1 __END_DECLS diff --git a/sysdeps/sparc/dl-machine.h b/sysdeps/sparc/dl-machine.h new file mode 100644 index 0000000000..695b9d6af3 --- /dev/null +++ b/sysdeps/sparc/dl-machine.h @@ -0,0 +1,250 @@ +/* Machine-dependent ELF dynamic relocation inline functions. SPARC version. +Copyright (C) 1996 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., 675 Mass Ave, +Cambridge, MA 02139, USA. */ + +#define ELF_MACHINE_NAME "sparc" + +#include <assert.h> +#include <string.h> +#include <link.h> + + +/* Some SPARC opcodes we need to use for self-modifying code. */ +#define OPCODE_NOP 0x01000000 /* nop */ +#define OPCODE_CALL 0x04000000 /* call ?; add PC-rel word address */ +#define OPCODE_SETHI_G1 0x03000000 /* sethi ?, %g1; add value>>10 */ +#define OPCODE_JMP_G1 0x81c06000 /* jmp %g1+?; add lo 10 bits of value */ +#define OPCODE_SAVE_SP64 0x9de3bfc0 /* save %sp, -64, %sp */ + + +/* Return nonzero iff E_MACHINE is compatible with the running host. */ +static inline int +elf_machine_matches_host (Elf32_Half e_machine) +{ + switch (e_machine) + { + case EM_SPARC: + return 1; + default: + return 0; + } +} + + +/* Return the run-time address of the _GLOBAL_OFFSET_TABLE_. + Must be inlined in a function which uses global data. */ +static inline Elf32_Addr * +elf_machine_got (void) +{ + register Elf32_Addr *got asm ("%l7"); + return got; +} + + +/* Return the run-time load address of the shared object. */ +static inline Elf32_Addr +elf_machine_load_address (void) +{ + Elf32_Addr addr; +??? + return addr; +} + +/* The `subl' insn above will contain an R_68K_RELATIVE relocation + entry intended to insert the run-time address of the label `here'. + This will be the first relocation in the text of the dynamic + linker; we skip it to avoid trying to modify read-only text in this + early stage. */ +#define ELF_MACHINE_BEFORE_RTLD_RELOC(dynamic_info) \ + ((dynamic_info)[DT_RELA]->d_un.d_ptr += sizeof (Elf32_Rela), \ + (dynamic_info)[DT_RELASZ]->d_un.d_val -= sizeof (Elf32_Rela)) + +/* Perform the relocation specified by RELOC and SYM (which is fully resolved). + MAP is the object containing the reloc. */ + +static inline void +elf_machine_rela (struct link_map *map, + const Elf32_Rela *reloc, const Elf32_Sym *sym, + Elf32_Addr (*resolve) (const Elf32_Sym **ref, + Elf32_Addr reloc_addr, + int noplt)) +{ + Elf32_Addr *const reloc_addr = (void *) (map->l_addr + reloc->r_offset); + Elf32_Addr loadbase; + + switch (ELF32_R_TYPE (reloc->r_info)) + { + case R_SPARC_COPY: + loadbase = (*resolve) (&sym, (Elf32_Addr) reloc_addr, 0); + memcpy (reloc_addr, (void *) (loadbase + sym->st_value), sym->st_size); + break; + case R_SPARC_GLOB_DAT: + case R_SPARC_32: + loadbase = (resolve ? (*resolve) (&sym, (Elf32_Addr) reloc_addr, 0) : + /* RESOLVE is null during bootstrap relocation. */ + map->l_addr); + *reloc_addr = ((sym ? (loadbase + sym->st_value) : 0) + + reloc->r_addend); + break; + case R_SPARC_JMP_SLOT: + loadbase = (resolve ? (*resolve) (&sym, (Elf32_Addr) reloc_addr, 1) : + /* RESOLVE is null during bootstrap relocation. */ + map->l_addr); + { + Elf32_Addr value = ((sym ? (loadbase + sym->st_value) : 0) + + reloc->r_addend); + reloc_addr[1] = OPCODE_SETHI | (value >> 10); + reloc_addr[2] = OPCODE_JMP_G1 | (value & 0x3ff); + } + break; + case R_SPARC_8: + loadbase = (*resolve) (&sym, (Elf32_Addr) reloc_addr, 0); + *(char *) reloc_addr = ((sym ? (loadbase + sym->st_value) : 0) + + reloc->r_addend); + break; + case R_SPARC_16: + loadbase = (*resolve) (&sym, (Elf32_Addr) reloc_addr, 0); + *(short *) reloc_addr = ((sym ? (loadbase + sym->st_value) : 0) + + reloc->r_addend); + break; + case R_SPARC_32: + loadbase = (resolve ? (*resolve) (&sym, (Elf32_Addr) reloc_addr, 0) : + /* RESOLVE is null during bootstrap relocation. */ + map->l_addr); + break; + case R_SPARC_RELATIVE: + *reloc_addr = map->l_addr + reloc->r_addend; + break; + case R_SPARC_DISP8: + loadbase = (*resolve) (&sym, (Elf32_Addr) reloc_addr, 0); + *(char *) reloc_addr = ((sym ? (loadbase + sym->st_value) : 0) + + reloc->r_addend + - (Elf32_Addr) reloc_addr); + break; + case R_SPARC_DISP16: + loadbase = (*resolve) (&sym, (Elf32_Addr) reloc_addr, 0); + *(short *) reloc_addr = ((sym ? (loadbase + sym->st_value) : 0) + + reloc->r_addend + - (Elf32_Addr) reloc_addr); + break; + case R_SPARC_DISP32: + loadbase = (*resolve) (&sym, (Elf32_Addr) reloc_addr, 0); + *reloc_addr = ((sym ? (loadbase + sym->st_value) : 0) + + reloc->r_addend + - (Elf32_Addr) reloc_addr); + break; + case R_SPARC_NONE: /* Alright, Wilbur. */ + break; + default: + assert (! "unexpected dynamic reloc type"); + break; + } +} + +static inline void +elf_machine_lazy_rel (struct link_map *map, const Elf32_Rela *reloc) +{ + switch (ELF32_R_TYPE (reloc->r_info)) + { + case R_SPARC_NONE: + break; + case R_SPARC_JMP_SLOT: + break; + default: + assert (! "unexpected PLT reloc type"); + break; + } +} + +/* Nonzero iff TYPE describes relocation of a PLT entry, so + PLT entries should not be allowed to define the value. */ +#define elf_machine_pltrel_p(type) ((type) == R_SPARC_JMP_SLOT) + +/* The SPARC never uses Elf32_Rel relocations. */ +#define ELF_MACHINE_NO_REL 1 + + +/* Set up the loaded object described by L so its unrelocated PLT + entries will jump to the on-demand fixup code in dl-runtime.c. */ + +static inline void +elf_machine_runtime_setup (struct link_map *l, int lazy) +{ + Elf32_Addr *plt; + extern void _dl_runtime_resolve (Elf32_Word); + + if (l->l_info[DT_JMPREL] && lazy) + { + /* The entries for functions in the PLT have not yet been filled in. + Their initial contents will arrange when called to set the high 22 + bits of %g1 with an offset into the .rela.plt section and jump to + the beginning of the PLT. */ + plt = (Elf32_Addr *) (l->l_addr + l->l_info[DT_PLTGOT]->d_un.d_ptr); + + /* The beginning of the PLT does: + + save %sp, -64, %sp + pltpc: call _dl_runtime_resolve + nop + .word MAP + + This saves the register window containing the arguments, and the + PC value (pltpc) implicitly saved in %o7 by the call points near the + location where we store the link_map pointer for this object. */ + + plt[0] = OPCODE_SAVE_SP64; /* save %sp, -64, %sp */ + /* Construct PC-relative word address. */ + plt[1] = OPCODE_CALL | (((Elf32_Addr) &_dl_runtime_resolve - + (Elf32_Addr) &plt[1]) >> 2); + plt[2] = OPCODE_NOP; /* Fill call delay slot. */ + plt[3] = l; + } + + /* This code is used in dl-runtime.c to call the `fixup' function + and then redirect to the address it returns. */ +#define ELF_MACHINE_RUNTIME_TRAMPOLINE asm ("\ +| Trampoline for _dl_runtime_resolver + .globl _dl_runtime_resolve + .type _dl_runtime_resolve, @function +_dl_runtime_resolve: + | Pass two args to fixup: the PLT address computed from the PC saved + | in the PLT's call insn, and the reloc offset passed in %g1. + ld [%o7 + 8], %o1 | Second arg, loaded from PLTPC[2]. + call fixup + shrl %g1, 22, %o0 | First arg, set in delay slot of call. + | Jump to the real function. + jmpl %o0, %g0 + | In the delay slot of that jump, restore the register window + | saved by the first insn of the PLT. + restore + .size _dl_runtime_resolve, . - _dl_runtime_resolve +"); +/* The PLT uses Elf32_Rela relocs. */ +#define elf_machine_relplt elf_machine_rela +} + + +/* Mask identifying addresses reserved for the user program, + where the dynamic linker should not map anything. */ +#define ELF_MACHINE_USER_ADDRESS_MASK ??? + +/* Initial entry point code for the dynamic linker. + The C function `_dl_start' is the real entry point; + its return value is the user program's entry point. */ + +#define RTLD_START asm (???) diff --git a/sysdeps/sparc/elf/start.S b/sysdeps/sparc/elf/start.S new file mode 100644 index 0000000000..6dae08bafa --- /dev/null +++ b/sysdeps/sparc/elf/start.S @@ -0,0 +1,111 @@ +/* Startup code compliant to the ELF SPARC ABI. +Copyright (C) 1996 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., 675 Mass Ave, +Cambridge, MA 02139, USA. */ + +/* This is the canonical entry point, usually the first thing in the text + segment. The SVR4/SPARC ABI (NOTE: I don't actually have it) says that + when the entry point runs, most registers' values are unspecified, + except for: + + %g1 Contains a function pointer to be registered with `atexit'. + This is how the dynamic linker arranges to have DT_FINI + functions called for shared libraries that have been loaded + before this code runs. + + %sp The stack contains the arguments and environment: + 0(%sp) argc + 4(%sp) argv[0] + ... + (4*argc)(%sp) NULL + (4*(argc+1))(%sp) envp[0] + ... + NULL +*/ + + .text + .align 16 + .global _start +_start: + /* %g1 contains the address of the shared library termination + function, which we will register with `atexit' to be called by + `exit'. I suspect that on some systems, and when statically + linked, this will not be set by anything to any function + pointer; hopefully it will be zero so we don't try to call + random pointers. */ + orcc %g1, %g0, %o0 /* Move %g1 to %o0 while testing it. */ + be nofini + + /* In delay slot: clear the frame pointer. The ABI suggests this + be done, to mark the outermost frame obviously. */ + clr %fp + + /* Call atexit, argument was set in %o0 above. */ + call atexit + nop +nofini: + + /* We will use some local variables in registers below. %g1 and + the %oN registers are call-clobbered, so we can't just use them. */ +#define ARGC %l0 +#define ARGV %l1 +#define ENVP %l2 +#define TMP %l3 + + /* Do essential libc initialization. In statically linked + programs under the GNU Hurd, this is what sets up the + arguments on the stack for the code below. */ + call __libc_init_first + sethi %hi(_environ), TMP /* In delay slot: prepare to use &_environ. */ + + /* Extract the arguments and environment as encoded on the stack + and save them in local variables. */ + ld [%sp + 64], ARGC /* After the register save area, ARGC. */ + add %sp, 64+4, ARGV /* Next, the ARGV elements. */ + /* After ARGC words that are the ARGV elements, and a zero word, + are the ENVP elements. Do ENVP = &ARGV[ARGC + 1]. */ + add ARGC, 1, ENVP + sll ENVP, 2, ENVP + add ARGV, ENVP, ENVP + /* Store ENVP in the global variable `_environ'. */ + st [TMP + %lo(_environ)], ENVP + + /* Call `_init', which is the entry point to our own `.init' + section; and register with `atexit' to have `exit' call + `_fini', which is the entry point to our own `.fini' section. */ + call _init + sethi %hi(_fini), TMP /* In delay slot of call. */ + or TMP, %lo(_fini), %o0 /* Argument to atexit is &_fini. */ + call atexit + nop + + /* Call the user's main function, and exit with its value. */ + mov ARGC, %o0 + mov ARGV, %o1 + call main + mov ENVP, %o2 + + call exit /* This should never return. */ + unimp 0 /* Crash if somehow it does return. */ + +/* Define a symbol for the first piece of initialized data. */ + .data + .global __data_start +__data_start: + .long 0 + .weak data_start + data_start = __data_start diff --git a/sysdeps/unix/sysv/utmpbits.h b/sysdeps/unix/sysv/utmpbits.h index e8d9334af1..3d2ccf3b12 100644 --- a/sysdeps/unix/sysv/utmpbits.h +++ b/sysdeps/unix/sysv/utmpbits.h @@ -23,6 +23,12 @@ Cambridge, MA 02139, USA. */ #include <time.h> +#define _PATH_UTMP "/var/adm/utmp" +#define _PATH_WTMP "/var/adm/wtmp" +#define _PATH_LASTLOG "/var/adm/lastlog" + +__BEGIN_DECLS + struct utmp { #define ut_name ut_user @@ -39,4 +45,14 @@ struct utmp time_t ut_time; }; + +/* Tell the user that we have a modern system with UT_HOST, UT_TYPE, UT_ID + and UT_TV fields. */ +#define _HAVE_UT_TYPE 1 +#define _HAVE_UT_ID 1 +#define _HAVE_UT_TV 1 +#define _HAVE_UT_HOST 1 + +__END_DECLS + #endif /* utmpbits.h */ diff --git a/version.c b/version.c index 9366673c93..37468ad432 100644 --- a/version.c +++ b/version.c @@ -26,7 +26,7 @@ Compiled by GNU CC version "__VERSION__".\n\ Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.\n\ This is free software; see the source for copying conditions.\n\ There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A\n\ -PARTICULAR PURPOSE."; +PARTICULAR PURPOSE.\n"; #include <unistd.h> |