diff options
author | Ulrich Drepper <drepper@redhat.com> | 1997-09-27 00:21:42 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 1997-09-27 00:21:42 +0000 |
commit | a2b08ee54130cf3a74655856e6ca6c29874a9df2 (patch) | |
tree | 71e7d867304f432bc57043e0c54a5cf101835651 /locale | |
parent | 650425ceb40e840b2123b6c8cc65389589f41218 (diff) | |
download | glibc-a2b08ee54130cf3a74655856e6ca6c29874a9df2.tar.gz |
Update.cvs/libc-ud-970926
1997-09-27 01:14 Ulrich Drepper <drepper@cygnus.com>
* Makeconfig (extra-objs): Depend in before-compile.
* configure.in: Locate Perl and substitute with complete path.
* config.make.in: Add PERL for substitution.
* elf/Makefile (routines): Add dl-addr.
* elf/dladdr.c: Move the real code into ...
* elf/dl-addr.c: New file.
* elf/link.h: Add prototype for _dl_addr.
* elf/dladdr.c (dladdr): Change address argument to be const.
* elf/dlfcn.h: Likewise.
* locale/C_name.c: Add _nl_POSIX_name.
* locale/localeinfo.h: Add declaration of _nl_POSIX_name.
* locale/findlocale.c (_nl_find_locale): Use _nl_POSIX_name.
(_nl_remove_locale): Free name of data set.
* locale/setlocale.c (clever_copy): Remove.
(new_composite_name): Use _nl_C_name and _nl_POSIX_name in compare.
(setname): Only remove old name when it is for category LC_ALL.
Change malloc, free, realloc, and memalign hooks for glibc to take
another parameter indicating the location of the caller.
* malloc/malloc.c: Change hook functions and variables.
* malloc/malloc.h: Likewise.
* malloc/mcheck.c: Likewise. Make sure later hooked function also
get the original caller address.
* malloc/mtrace.c: Likewise.
(tr_where): If no information in _mtrace_file is given use the
information about the caller.
* malloc/Makefile (distribute): Replace mtrace.awk by mtrace.pl.
Add rules to install mtrace.pl after rewriting.
* malloc/mtrace.pl: New file. Based on the old AWK script but
with extended functionality.
* malloc/mtrace.awk: Removed.
* po/fr.po: New version.
* string/Makefile: Do use builtins for tester.c and inl-tester.c.
* string/tester.c: Rewrite. Split in many small functions to not
exceed gcc's limits.
* sysdeps/unix/sysv/linux/syscalls.list: Add prctl.
1997-09-25 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de>
* string/bits/string2.h (__stpcpy_small): Don't use casts as
lvalues.
1997-09-26 Andreas Jaeger <aj@arthur.rhein-neckar.de>
* manual/time.texi (Formatting Date and Time): Clarify
explanation of strftime flags a bit.
Suggested by Robert Bihlmeyer <robbe@orcus.priv.at>.
1997-09-25 00:13 David S. Miller <davem@tanya.rutgers.edu>
* sysdeps/libm-ieee754/s_exp2f.c: Protect _GNU_SOURCE definition.
Fix typo, it is FLT_MANT_DIG.
1997-09-24 18:52 H.J. Lu <hjl@gnu.ai.mit.edu>
* math/atest-exp2.c: Include <stdlib/gmp.h> instead of <gmp.h>.
1997-08-27 08:10 H.J. Lu <hjl@gnu.ai.mit.edu>
* libio/libio.h, libio/libioP.h: Support libio in libstdc++.
* libio/libio.h (_IO_peekc): Defined as _IO_peekc_unlocked if
_IO_MTSAFE_IO is undefined.
1997-09-24 23:27 Richard Henderson <rth@cygnus.com>
* elf/dl-runtime.c (fixup): Don't go through elf_machine_relplt, but
lookup the value of the target symbol ourselves and call the new
elf_machine_fixup_plt. This kills the ELF_FIXUP_RETURN_VALUE hack.
(profile_fixup): Likewise, but don't fix up the plt.
* elf/rtld.c (_dl_main): ELF_MACHINE_RELOC_NOPLT renamed _JMP_SLOT.
* sysdeps/alpha/dl-machine.h (ELF_MACHINE_RELOC_NOPLT): Renamed.
(elf_alpha_fix_plt): Renamed elf_machine_fixup_plt.
* sysdeps/i386/dl-machine.h (elf_machine_relplt): Killed.
(ELF_MACHINE_JMP_SLOT): Renamed.
(elf_machine_fixup_plt): New function.
* sysdeps/m68k/dl-machine.h: Likewise.
* sysdeps/powerpc/dl-machine.h: Likewise.
(elf_machine_rela): Moved JMP_SLOT fixup out to elf_machine_fixup_plt.
* sysdeps/sparc/sparc32/dl-machine.h: Likewise.
* sysdeps/sparc/sparc64/dl-machine.h: Likewise.
* sysdeps/stub/dl-machine.h: Update, sorta.
* sysdeps/alpha/dl-machine.h (elf_machine_runtime_setup): Do profiling.
(TRAMPOLINE_TEMPLATE): From the carcas of _RUNTIME_TRAMPOLINE, do
both normal and profile code.
(elf_machine_rela): Handle r_addend for .got and .plt too.
Diffstat (limited to 'locale')
-rw-r--r-- | locale/C_name.c | 1 | ||||
-rw-r--r-- | locale/findlocale.c | 5 | ||||
-rw-r--r-- | locale/localeinfo.h | 3 | ||||
-rw-r--r-- | locale/setlocale.c | 30 |
4 files changed, 15 insertions, 24 deletions
diff --git a/locale/C_name.c b/locale/C_name.c index 5e7cb85a09..fa2ac0539c 100644 --- a/locale/C_name.c +++ b/locale/C_name.c @@ -5,3 +5,4 @@ /* Name of our standard locale. */ const char _nl_C_name[] = "C"; +const char _nl_POSIX_name[] = "POSIX"; diff --git a/locale/findlocale.c b/locale/findlocale.c index 308aa2b60f..c027968530 100644 --- a/locale/findlocale.c +++ b/locale/findlocale.c @@ -64,7 +64,7 @@ _nl_find_locale (const char *locale_path, size_t locale_path_len, *name = (char *) _nl_C_name; } - if (strcmp (*name, _nl_C_name) == 0 || strcmp (*name, "POSIX") == 0) + if (strcmp (*name, _nl_C_name) == 0 || strcmp (*name, _nl_POSIX_name) == 0) { /* We need not load anything. The needed data is contained in the library itself. */ @@ -203,6 +203,9 @@ _nl_remove_locale (int locale, struct locale_data *data) ptr->decided = 0; ptr->data = NULL; + /* Free the name. */ + free ((char *) data->name); + /* Really delete the data. First delete the real data. */ if (data->mmaped) { diff --git a/locale/localeinfo.h b/locale/localeinfo.h index 79db06d2f5..29731fa4c6 100644 --- a/locale/localeinfo.h +++ b/locale/localeinfo.h @@ -107,8 +107,9 @@ extern const char *const _nl_category_names[LC_ALL + 1]; extern const size_t _nl_category_name_sizes[LC_ALL + 1]; extern struct locale_data * *const _nl_current[LC_ALL + 1]; -/* Name of the standard locale. */ +/* Name of the standard locales. */ extern const char _nl_C_name[]; +extern const char _nl_POSIX_name[]; /* Extract the current CATEGORY locale's string for ITEM. */ #define _NL_CURRENT(category, item) \ diff --git a/locale/setlocale.c b/locale/setlocale.c index 79f15ccb40..42c1e5033a 100644 --- a/locale/setlocale.c +++ b/locale/setlocale.c @@ -130,24 +130,6 @@ __libc_lock_define_initialized (, __libc_setlocale_lock) } while (0) -static inline char * -clever_copy (const char *string) -{ - size_t len; - char *new; - - if (strcmp (string, "C") == 0 || strcmp (string, "POSIX") == 0) - /* This return is dangerous because the returned string might be - placed in read-only memory. But everything should be set up to - handle this case. */ - return (char *) _nl_C_name; - - len = strlen (string) + 1; - new = (char *) malloc (len); - return new != NULL ? memcpy (new, string, len) : NULL; -} - - /* Construct a new composite name. */ static inline char * new_composite_name (int category, const char *newnames[LC_ALL]) @@ -172,7 +154,8 @@ new_composite_name (int category, const char *newnames[LC_ALL]) if (same) { /* All the categories use the same name. */ - if (strcmp (newnames[0], "C") == 0 || strcmp (newnames[0], "POSIX") == 0) + if (strcmp (newnames[0], _nl_C_name) == 0 + || strcmp (newnames[0], _nl_POSIX_name) == 0) return (char *) _nl_C_name; new = malloc (last_len + 1); @@ -207,8 +190,8 @@ setname (int category, const char *name) if (_nl_current_names[category] == name) return; - if (_nl_current_names[category] != _nl_C_name) - free ((void *) _nl_current_names[category]); + if (category == LC_ALL && _nl_current_names[category] != _nl_C_name) + free ((char *) _nl_current_names[category]); _nl_current_names[category] = name; } @@ -375,7 +358,10 @@ setlocale (int category, const char *locale) goto abort_single; /* We must not simply free a global locale since we have no - control over the usage. So we mark it as un-deletable. */ + control over the usage. So we mark it as un-deletable. + + Note: do ont remove the `if', it's necessary to copy with + the builtin locale data. */ if (newdata->usage_count != MAX_USAGE_COUNT) newdata->usage_count = MAX_USAGE_COUNT; } |