diff options
| author | Roland McGrath <roland@gnu.org> | 1995-10-04 17:06:55 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1995-10-04 17:06:55 +0000 |
| commit | 5f770861196fee245b039c1f349a25d460d30ade (patch) | |
| tree | bd3caa70201b5bbb51022524934a8ae6fbfd1a99 | |
| parent | 879bf2e65a9ddaea34fe0428ab0f71caca4b4d00 (diff) | |
| download | glibc-5f770861196fee245b039c1f349a25d460d30ade.zip glibc-5f770861196fee245b039c1f349a25d460d30ade.tar.gz glibc-5f770861196fee245b039c1f349a25d460d30ade.tar.bz2 | |
Wed Oct 4 00:21:03 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu>
* sysdeps/generic/stpncpy.c: Don't increment DEST when zero-filling.
* elf/dlopen.c (dlopen): Don't pass USER_ENTRY arg to _dl_map_object.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | elf/dlopen.c | 4 | ||||
| -rw-r--r-- | sysdeps/generic/stpncpy.c | 5 |
3 files changed, 10 insertions, 5 deletions
@@ -1,3 +1,9 @@ +Wed Oct 4 00:21:03 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu> + + * sysdeps/generic/stpncpy.c: Don't increment DEST when zero-filling. + + * elf/dlopen.c (dlopen): Don't pass USER_ENTRY arg to _dl_map_object. + Sat Sep 30 11:47:05 1995 Roland McGrath <roland@churchy.gnu.ai.mit.edu> * sysdeps/mach/hurd/dl-sysdep.c (_dl_sysdep_start): If started by diff --git a/elf/dlopen.c b/elf/dlopen.c index c16cff9..de65a20 100644 --- a/elf/dlopen.c +++ b/elf/dlopen.c @@ -30,7 +30,7 @@ dlopen (const char *file, dl_open_mode mode) { Elf32_Addr init; - new = _dl_map_object (_dl_loaded, file, NULL); + new = _dl_map_object (_dl_loaded, file); /* Map in any dependencies. */ for (l = new; l; l = l->l_next) @@ -43,7 +43,7 @@ dlopen (const char *file, dl_open_mode mode) const Elf32_Dyn *d; for (d = l->l_ld; d->d_tag != DT_NULL; ++d) if (d->d_tag == DT_NEEDED) - _dl_map_object (l, strtab + d->d_un.d_val, NULL); + _dl_map_object (l, strtab + d->d_un.d_val); } l->l_deps_loaded = 1; } diff --git a/sysdeps/generic/stpncpy.c b/sysdeps/generic/stpncpy.c index 40c9173..d4a5240 100644 --- a/sysdeps/generic/stpncpy.c +++ b/sysdeps/generic/stpncpy.c @@ -79,9 +79,8 @@ DEFUN(__stpncpy, (dest, src, n), char *dest AND CONST char *src AND size_t n) while (c != '\0'); zero_fill: - do - *++dest = '\0'; - while (--n > 0); + while (n-- > 0) + dest[n] = '\0'; return dest; } |